]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-4.0.7-201507050833.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.1-4.0.7-201507050833.patch
CommitLineData
d77f18dd
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/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
238index 74b6c6d..eac0e77 100644
239--- a/Documentation/kbuild/makefiles.txt
240+++ b/Documentation/kbuild/makefiles.txt
241@@ -23,10 +23,11 @@ This document describes the Linux kernel Makefiles.
242 === 4 Host Program support
243 --- 4.1 Simple Host Program
244 --- 4.2 Composite Host Programs
245- --- 4.3 Using C++ for host programs
246- --- 4.4 Controlling compiler options for host programs
247- --- 4.5 When host programs are actually built
248- --- 4.6 Using hostprogs-$(CONFIG_FOO)
249+ --- 4.3 Defining shared libraries
250+ --- 4.4 Using C++ for host programs
251+ --- 4.5 Controlling compiler options for host programs
252+ --- 4.6 When host programs are actually built
253+ --- 4.7 Using hostprogs-$(CONFIG_FOO)
254
255 === 5 Kbuild clean infrastructure
256
257@@ -643,7 +644,29 @@ Both possibilities are described in the following.
258 Finally, the two .o files are linked to the executable, lxdialog.
259 Note: The syntax <executable>-y is not permitted for host-programs.
260
261---- 4.3 Using C++ for host programs
262+--- 4.3 Defining shared libraries
263+
264+ Objects with extension .so are considered shared libraries, and
265+ will be compiled as position independent objects.
266+ Kbuild provides support for shared libraries, but the usage
267+ shall be restricted.
268+ In the following example the libkconfig.so shared library is used
269+ to link the executable conf.
270+
271+ Example:
272+ #scripts/kconfig/Makefile
273+ hostprogs-y := conf
274+ conf-objs := conf.o libkconfig.so
275+ libkconfig-objs := expr.o type.o
276+
277+ Shared libraries always require a corresponding -objs line, and
278+ in the example above the shared library libkconfig is composed by
279+ the two objects expr.o and type.o.
280+ expr.o and type.o will be built as position independent code and
281+ linked as a shared library libkconfig.so. C++ is not supported for
282+ shared libraries.
283+
284+--- 4.4 Using C++ for host programs
285
286 kbuild offers support for host programs written in C++. This was
287 introduced solely to support kconfig, and is not recommended
288@@ -666,7 +689,7 @@ Both possibilities are described in the following.
289 qconf-cxxobjs := qconf.o
290 qconf-objs := check.o
291
292---- 4.4 Controlling compiler options for host programs
293+--- 4.5 Controlling compiler options for host programs
294
295 When compiling host programs, it is possible to set specific flags.
296 The programs will always be compiled utilising $(HOSTCC) passed
297@@ -694,7 +717,7 @@ Both possibilities are described in the following.
298 When linking qconf, it will be passed the extra option
299 "-L$(QTDIR)/lib".
300
301---- 4.5 When host programs are actually built
302+--- 4.6 When host programs are actually built
303
304 Kbuild will only build host-programs when they are referenced
305 as a prerequisite.
306@@ -725,7 +748,7 @@ Both possibilities are described in the following.
307 This will tell kbuild to build lxdialog even if not referenced in
308 any rule.
309
310---- 4.6 Using hostprogs-$(CONFIG_FOO)
311+--- 4.7 Using hostprogs-$(CONFIG_FOO)
312
313 A typical pattern in a Kbuild file looks like this:
314
315diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
316index 4d68ec8..9546b75 100644
317--- a/Documentation/kernel-parameters.txt
318+++ b/Documentation/kernel-parameters.txt
319@@ -1203,6 +1203,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
320 Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
321 Default: 1024
322
323+ grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
324+ ignore grsecurity's /proc restrictions
325+
326+ grsec_sysfs_restrict= Format: 0 | 1
327+ Default: 1
328+ Disables GRKERNSEC_SYSFS_RESTRICT if enabled in config
329+
330 hashdist= [KNL,NUMA] Large hashes allocated during boot
331 are distributed across NUMA nodes. Defaults on
332 for 64-bit NUMA, off otherwise.
333@@ -2300,6 +2307,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
334 noexec=on: enable non-executable mappings (default)
335 noexec=off: disable non-executable mappings
336
337+ nopcid [X86-64]
338+ Disable PCID (Process-Context IDentifier) even if it
339+ is supported by the processor.
340+
341 nosmap [X86]
342 Disable SMAP (Supervisor Mode Access Prevention)
343 even if it is supported by processor.
344@@ -2601,6 +2612,30 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
345 the specified number of seconds. This is to be used if
346 your oopses keep scrolling off the screen.
347
348+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
349+ virtualization environments that don't cope well with the
350+ expand down segment used by UDEREF on X86-32 or the frequent
351+ page table updates on X86-64.
352+
353+ pax_sanitize_slab=
354+ Format: { 0 | 1 | off | fast | full }
355+ Options '0' and '1' are only provided for backward
356+ compatibility, 'off' or 'fast' should be used instead.
357+ 0|off : disable slab object sanitization
358+ 1|fast: enable slab object sanitization excluding
359+ whitelisted slabs (default)
360+ full : sanitize all slabs, even the whitelisted ones
361+
362+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
363+
364+ pax_extra_latent_entropy
365+ Enable a very simple form of latent entropy extraction
366+ from the first 4GB of memory as the bootmem allocator
367+ passes the memory pages to the buddy allocator.
368+
369+ pax_weakuderef [X86-64] enables the weaker but faster form of UDEREF
370+ when the processor supports PCID.
371+
372 pcbit= [HW,ISDN]
373
374 pcd. [PARIDE]
375diff --git a/Makefile b/Makefile
376index bd76a8e..ed02758 100644
377--- a/Makefile
378+++ b/Makefile
379@@ -298,7 +298,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
380 HOSTCC = gcc
381 HOSTCXX = g++
382 HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
383-HOSTCXXFLAGS = -O2
384+HOSTCFLAGS = -W -Wno-unused-parameter -Wno-missing-field-initializers -fno-delete-null-pointer-checks
385+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
386+HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
387
388 ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
389 HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
390@@ -446,8 +448,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
391 # Rules shared between *config targets and build targets
392
393 # Basic helpers built in scripts/
394-PHONY += scripts_basic
395-scripts_basic:
396+PHONY += scripts_basic gcc-plugins
397+scripts_basic: gcc-plugins
398 $(Q)$(MAKE) $(build)=scripts/basic
399 $(Q)rm -f .tmp_quiet_recordmcount
400
401@@ -622,6 +624,74 @@ endif
402 # Tell gcc to never replace conditional load with a non-conditional one
403 KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
404
405+ifndef DISABLE_PAX_PLUGINS
406+ifeq ($(call cc-ifversion, -ge, 0408, y), y)
407+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
408+else
409+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
410+endif
411+ifneq ($(PLUGINCC),)
412+ifdef CONFIG_PAX_CONSTIFY_PLUGIN
413+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
414+endif
415+ifdef CONFIG_PAX_MEMORY_STACKLEAK
416+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
417+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
418+endif
419+ifdef CONFIG_KALLOCSTAT_PLUGIN
420+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
421+endif
422+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
423+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
424+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
425+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
426+endif
427+ifdef CONFIG_GRKERNSEC_RANDSTRUCT
428+RANDSTRUCT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/randomize_layout_plugin.so -DRANDSTRUCT_PLUGIN
429+ifdef CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE
430+RANDSTRUCT_PLUGIN_CFLAGS += -fplugin-arg-randomize_layout_plugin-performance-mode
431+endif
432+endif
433+ifdef CONFIG_CHECKER_PLUGIN
434+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
435+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
436+endif
437+endif
438+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
439+ifdef CONFIG_PAX_SIZE_OVERFLOW
440+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
441+endif
442+ifdef CONFIG_PAX_LATENT_ENTROPY
443+LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
444+endif
445+ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
446+STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
447+endif
448+INITIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/initify_plugin.so -DINITIFY_PLUGIN
449+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
450+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
451+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
452+GCC_PLUGINS_CFLAGS += $(INITIFY_PLUGIN_CFLAGS)
453+GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
454+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
455+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
456+ifeq ($(KBUILD_EXTMOD),)
457+gcc-plugins:
458+ $(Q)$(MAKE) $(build)=tools/gcc
459+else
460+gcc-plugins: ;
461+endif
462+else
463+gcc-plugins:
464+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
465+ $(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.))
466+else
467+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
468+endif
469+ $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
470+endif
471+endif
472+
473 ifdef CONFIG_READABLE_ASM
474 # Disable optimizations that make assembler listings hard to read.
475 # reorder blocks reorders the control in the function
476@@ -714,7 +784,7 @@ KBUILD_CFLAGS += $(call cc-option, -gsplit-dwarf, -g)
477 else
478 KBUILD_CFLAGS += -g
479 endif
480-KBUILD_AFLAGS += -Wa,-gdwarf-2
481+KBUILD_AFLAGS += -Wa,--gdwarf-2
482 endif
483 ifdef CONFIG_DEBUG_INFO_DWARF4
484 KBUILD_CFLAGS += $(call cc-option, -gdwarf-4,)
485@@ -884,7 +954,7 @@ export mod_sign_cmd
486
487
488 ifeq ($(KBUILD_EXTMOD),)
489-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
490+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
491
492 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
493 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
494@@ -934,6 +1004,8 @@ endif
495
496 # The actual objects are generated when descending,
497 # make sure no implicit rule kicks in
498+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
499+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
500 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
501
502 # Handle descending into subdirectories listed in $(vmlinux-dirs)
503@@ -943,7 +1015,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
504 # Error messages still appears in the original language
505
506 PHONY += $(vmlinux-dirs)
507-$(vmlinux-dirs): prepare scripts
508+$(vmlinux-dirs): gcc-plugins prepare scripts
509 $(Q)$(MAKE) $(build)=$@
510
511 define filechk_kernel.release
512@@ -986,10 +1058,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
513
514 archprepare: archheaders archscripts prepare1 scripts_basic
515
516+prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
517+prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
518 prepare0: archprepare FORCE
519 $(Q)$(MAKE) $(build)=.
520
521 # All the preparing..
522+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
523 prepare: prepare0
524
525 # Generate some files
526@@ -1103,6 +1178,8 @@ all: modules
527 # using awk while concatenating to the final file.
528
529 PHONY += modules
530+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
531+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
532 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
533 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
534 @$(kecho) ' Building modules, stage 2.';
535@@ -1118,7 +1195,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
536
537 # Target to prepare building external modules
538 PHONY += modules_prepare
539-modules_prepare: prepare scripts
540+modules_prepare: gcc-plugins prepare scripts
541
542 # Target to install modules
543 PHONY += modules_install
544@@ -1184,7 +1261,10 @@ MRPROPER_FILES += .config .config.old .version .old_version \
545 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
546 signing_key.priv signing_key.x509 x509.genkey \
547 extra_certificates signing_key.x509.keyid \
548- signing_key.x509.signer vmlinux-gdb.py
549+ signing_key.x509.signer vmlinux-gdb.py \
550+ tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
551+ tools/gcc/size_overflow_plugin/size_overflow_hash.h \
552+ tools/gcc/randomize_layout_seed.h
553
554 # clean - Delete most, but leave enough to build external modules
555 #
556@@ -1223,7 +1303,7 @@ distclean: mrproper
557 @find $(srctree) $(RCS_FIND_IGNORE) \
558 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
559 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
560- -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
561+ -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
562 -type f -print | xargs rm -f
563
564
565@@ -1389,6 +1469,8 @@ PHONY += $(module-dirs) modules
566 $(module-dirs): crmodverdir $(objtree)/Module.symvers
567 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
568
569+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
570+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
571 modules: $(module-dirs)
572 @$(kecho) ' Building modules, stage 2.';
573 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
574@@ -1529,17 +1611,21 @@ else
575 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
576 endif
577
578-%.s: %.c prepare scripts FORCE
579+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
580+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
581+%.s: %.c gcc-plugins prepare scripts FORCE
582 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
583 %.i: %.c prepare scripts FORCE
584 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
585-%.o: %.c prepare scripts FORCE
586+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
587+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
588+%.o: %.c gcc-plugins prepare scripts FORCE
589 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
590 %.lst: %.c prepare scripts FORCE
591 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
592-%.s: %.S prepare scripts FORCE
593+%.s: %.S gcc-plugins prepare scripts FORCE
594 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
595-%.o: %.S prepare scripts FORCE
596+%.o: %.S gcc-plugins prepare scripts FORCE
597 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
598 %.symtypes: %.c prepare scripts FORCE
599 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
600@@ -1551,11 +1637,15 @@ endif
601 $(build)=$(build-dir)
602 # Make sure the latest headers are built for Documentation
603 Documentation/: headers_install
604-%/: prepare scripts FORCE
605+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
606+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
607+%/: gcc-plugins prepare scripts FORCE
608 $(cmd_crmodverdir)
609 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
610 $(build)=$(build-dir)
611-%.ko: prepare scripts FORCE
612+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
613+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
614+%.ko: gcc-plugins prepare scripts FORCE
615 $(cmd_crmodverdir)
616 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
617 $(build)=$(build-dir) $(@:.ko=.o)
618diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
619index 8f8eafb..3405f46 100644
620--- a/arch/alpha/include/asm/atomic.h
621+++ b/arch/alpha/include/asm/atomic.h
622@@ -239,4 +239,14 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
623 #define atomic_dec(v) atomic_sub(1,(v))
624 #define atomic64_dec(v) atomic64_sub(1,(v))
625
626+#define atomic64_read_unchecked(v) atomic64_read(v)
627+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
628+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
629+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
630+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
631+#define atomic64_inc_unchecked(v) atomic64_inc(v)
632+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
633+#define atomic64_dec_unchecked(v) atomic64_dec(v)
634+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
635+
636 #endif /* _ALPHA_ATOMIC_H */
637diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
638index ad368a9..fbe0f25 100644
639--- a/arch/alpha/include/asm/cache.h
640+++ b/arch/alpha/include/asm/cache.h
641@@ -4,19 +4,19 @@
642 #ifndef __ARCH_ALPHA_CACHE_H
643 #define __ARCH_ALPHA_CACHE_H
644
645+#include <linux/const.h>
646
647 /* Bytes per L1 (data) cache line. */
648 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
649-# define L1_CACHE_BYTES 64
650 # define L1_CACHE_SHIFT 6
651 #else
652 /* Both EV4 and EV5 are write-through, read-allocate,
653 direct-mapped, physical.
654 */
655-# define L1_CACHE_BYTES 32
656 # define L1_CACHE_SHIFT 5
657 #endif
658
659+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
660 #define SMP_CACHE_BYTES L1_CACHE_BYTES
661
662 #endif
663diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
664index 968d999..d36b2df 100644
665--- a/arch/alpha/include/asm/elf.h
666+++ b/arch/alpha/include/asm/elf.h
667@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
668
669 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
670
671+#ifdef CONFIG_PAX_ASLR
672+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
673+
674+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
675+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
676+#endif
677+
678 /* $0 is set by ld.so to a pointer to a function which might be
679 registered using atexit. This provides a mean for the dynamic
680 linker to call DT_FINI functions for shared libraries that have
681diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
682index aab14a0..b4fa3e7 100644
683--- a/arch/alpha/include/asm/pgalloc.h
684+++ b/arch/alpha/include/asm/pgalloc.h
685@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
686 pgd_set(pgd, pmd);
687 }
688
689+static inline void
690+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
691+{
692+ pgd_populate(mm, pgd, pmd);
693+}
694+
695 extern pgd_t *pgd_alloc(struct mm_struct *mm);
696
697 static inline void
698diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
699index a9a1195..e9b8417 100644
700--- a/arch/alpha/include/asm/pgtable.h
701+++ b/arch/alpha/include/asm/pgtable.h
702@@ -101,6 +101,17 @@ struct vm_area_struct;
703 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
704 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
705 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
706+
707+#ifdef CONFIG_PAX_PAGEEXEC
708+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
709+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
710+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
711+#else
712+# define PAGE_SHARED_NOEXEC PAGE_SHARED
713+# define PAGE_COPY_NOEXEC PAGE_COPY
714+# define PAGE_READONLY_NOEXEC PAGE_READONLY
715+#endif
716+
717 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
718
719 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
720diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
721index 2fd00b7..cfd5069 100644
722--- a/arch/alpha/kernel/module.c
723+++ b/arch/alpha/kernel/module.c
724@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
725
726 /* The small sections were sorted to the end of the segment.
727 The following should definitely cover them. */
728- gp = (u64)me->module_core + me->core_size - 0x8000;
729+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
730 got = sechdrs[me->arch.gotsecindex].sh_addr;
731
732 for (i = 0; i < n; i++) {
733diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
734index e51f578..16c64a3 100644
735--- a/arch/alpha/kernel/osf_sys.c
736+++ b/arch/alpha/kernel/osf_sys.c
737@@ -1296,10 +1296,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
738 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
739
740 static unsigned long
741-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
742- unsigned long limit)
743+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
744+ unsigned long limit, unsigned long flags)
745 {
746 struct vm_unmapped_area_info info;
747+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
748
749 info.flags = 0;
750 info.length = len;
751@@ -1307,6 +1308,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
752 info.high_limit = limit;
753 info.align_mask = 0;
754 info.align_offset = 0;
755+ info.threadstack_offset = offset;
756 return vm_unmapped_area(&info);
757 }
758
759@@ -1339,20 +1341,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
760 merely specific addresses, but regions of memory -- perhaps
761 this feature should be incorporated into all ports? */
762
763+#ifdef CONFIG_PAX_RANDMMAP
764+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
765+#endif
766+
767 if (addr) {
768- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
769+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
770 if (addr != (unsigned long) -ENOMEM)
771 return addr;
772 }
773
774 /* Next, try allocating at TASK_UNMAPPED_BASE. */
775- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
776- len, limit);
777+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
778+
779 if (addr != (unsigned long) -ENOMEM)
780 return addr;
781
782 /* Finally, try allocating in low memory. */
783- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
784+ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
785
786 return addr;
787 }
788diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
789index 9d0ac09..479a962 100644
790--- a/arch/alpha/mm/fault.c
791+++ b/arch/alpha/mm/fault.c
792@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
793 __reload_thread(pcb);
794 }
795
796+#ifdef CONFIG_PAX_PAGEEXEC
797+/*
798+ * PaX: decide what to do with offenders (regs->pc = fault address)
799+ *
800+ * returns 1 when task should be killed
801+ * 2 when patched PLT trampoline was detected
802+ * 3 when unpatched PLT trampoline was detected
803+ */
804+static int pax_handle_fetch_fault(struct pt_regs *regs)
805+{
806+
807+#ifdef CONFIG_PAX_EMUPLT
808+ int err;
809+
810+ do { /* PaX: patched PLT emulation #1 */
811+ unsigned int ldah, ldq, jmp;
812+
813+ err = get_user(ldah, (unsigned int *)regs->pc);
814+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
815+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
816+
817+ if (err)
818+ break;
819+
820+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
821+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
822+ jmp == 0x6BFB0000U)
823+ {
824+ unsigned long r27, addr;
825+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
826+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
827+
828+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
829+ err = get_user(r27, (unsigned long *)addr);
830+ if (err)
831+ break;
832+
833+ regs->r27 = r27;
834+ regs->pc = r27;
835+ return 2;
836+ }
837+ } while (0);
838+
839+ do { /* PaX: patched PLT emulation #2 */
840+ unsigned int ldah, lda, br;
841+
842+ err = get_user(ldah, (unsigned int *)regs->pc);
843+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
844+ err |= get_user(br, (unsigned int *)(regs->pc+8));
845+
846+ if (err)
847+ break;
848+
849+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
850+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
851+ (br & 0xFFE00000U) == 0xC3E00000U)
852+ {
853+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
854+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
855+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
856+
857+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
858+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
859+ return 2;
860+ }
861+ } while (0);
862+
863+ do { /* PaX: unpatched PLT emulation */
864+ unsigned int br;
865+
866+ err = get_user(br, (unsigned int *)regs->pc);
867+
868+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
869+ unsigned int br2, ldq, nop, jmp;
870+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
871+
872+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
873+ err = get_user(br2, (unsigned int *)addr);
874+ err |= get_user(ldq, (unsigned int *)(addr+4));
875+ err |= get_user(nop, (unsigned int *)(addr+8));
876+ err |= get_user(jmp, (unsigned int *)(addr+12));
877+ err |= get_user(resolver, (unsigned long *)(addr+16));
878+
879+ if (err)
880+ break;
881+
882+ if (br2 == 0xC3600000U &&
883+ ldq == 0xA77B000CU &&
884+ nop == 0x47FF041FU &&
885+ jmp == 0x6B7B0000U)
886+ {
887+ regs->r28 = regs->pc+4;
888+ regs->r27 = addr+16;
889+ regs->pc = resolver;
890+ return 3;
891+ }
892+ }
893+ } while (0);
894+#endif
895+
896+ return 1;
897+}
898+
899+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
900+{
901+ unsigned long i;
902+
903+ printk(KERN_ERR "PAX: bytes at PC: ");
904+ for (i = 0; i < 5; i++) {
905+ unsigned int c;
906+ if (get_user(c, (unsigned int *)pc+i))
907+ printk(KERN_CONT "???????? ");
908+ else
909+ printk(KERN_CONT "%08x ", c);
910+ }
911+ printk("\n");
912+}
913+#endif
914
915 /*
916 * This routine handles page faults. It determines the address,
917@@ -133,8 +251,29 @@ retry:
918 good_area:
919 si_code = SEGV_ACCERR;
920 if (cause < 0) {
921- if (!(vma->vm_flags & VM_EXEC))
922+ if (!(vma->vm_flags & VM_EXEC)) {
923+
924+#ifdef CONFIG_PAX_PAGEEXEC
925+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
926+ goto bad_area;
927+
928+ up_read(&mm->mmap_sem);
929+ switch (pax_handle_fetch_fault(regs)) {
930+
931+#ifdef CONFIG_PAX_EMUPLT
932+ case 2:
933+ case 3:
934+ return;
935+#endif
936+
937+ }
938+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
939+ do_group_exit(SIGKILL);
940+#else
941 goto bad_area;
942+#endif
943+
944+ }
945 } else if (!cause) {
946 /* Allow reads even for write-only mappings */
947 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
948diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
949index cf4c0c9..a87ecf5 100644
950--- a/arch/arm/Kconfig
951+++ b/arch/arm/Kconfig
952@@ -1735,7 +1735,7 @@ config ALIGNMENT_TRAP
953
954 config UACCESS_WITH_MEMCPY
955 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
956- depends on MMU
957+ depends on MMU && !PAX_MEMORY_UDEREF
958 default y if CPU_FEROCEON
959 help
960 Implement faster copy_to_user and clear_user methods for CPU
961@@ -1999,6 +1999,7 @@ config XIP_PHYS_ADDR
962 config KEXEC
963 bool "Kexec system call (EXPERIMENTAL)"
964 depends on (!SMP || PM_SLEEP_SMP)
965+ depends on !GRKERNSEC_KMEM
966 help
967 kexec is a system call that implements the ability to shutdown your
968 current kernel, and to start another kernel. It is like a reboot
969diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
970index e22c119..abe7041 100644
971--- a/arch/arm/include/asm/atomic.h
972+++ b/arch/arm/include/asm/atomic.h
973@@ -18,17 +18,41 @@
974 #include <asm/barrier.h>
975 #include <asm/cmpxchg.h>
976
977+#ifdef CONFIG_GENERIC_ATOMIC64
978+#include <asm-generic/atomic64.h>
979+#endif
980+
981 #define ATOMIC_INIT(i) { (i) }
982
983 #ifdef __KERNEL__
984
985+#ifdef CONFIG_THUMB2_KERNEL
986+#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
987+#else
988+#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
989+#endif
990+
991+#define _ASM_EXTABLE(from, to) \
992+" .pushsection __ex_table,\"a\"\n"\
993+" .align 3\n" \
994+" .long " #from ", " #to"\n" \
995+" .popsection"
996+
997 /*
998 * On ARM, ordinary assignment (str instruction) doesn't clear the local
999 * strex/ldrex monitor on some implementations. The reason we can use it for
1000 * atomic_set() is the clrex or dummy strex done on every exception return.
1001 */
1002 #define atomic_read(v) ACCESS_ONCE((v)->counter)
1003+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
1004+{
1005+ return ACCESS_ONCE(v->counter);
1006+}
1007 #define atomic_set(v,i) (((v)->counter) = (i))
1008+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1009+{
1010+ v->counter = i;
1011+}
1012
1013 #if __LINUX_ARM_ARCH__ >= 6
1014
1015@@ -38,26 +62,50 @@
1016 * to ensure that the update happens.
1017 */
1018
1019-#define ATOMIC_OP(op, c_op, asm_op) \
1020-static inline void atomic_##op(int i, atomic_t *v) \
1021+#ifdef CONFIG_PAX_REFCOUNT
1022+#define __OVERFLOW_POST \
1023+ " bvc 3f\n" \
1024+ "2: " REFCOUNT_TRAP_INSN "\n"\
1025+ "3:\n"
1026+#define __OVERFLOW_POST_RETURN \
1027+ " bvc 3f\n" \
1028+" mov %0, %1\n" \
1029+ "2: " REFCOUNT_TRAP_INSN "\n"\
1030+ "3:\n"
1031+#define __OVERFLOW_EXTABLE \
1032+ "4:\n" \
1033+ _ASM_EXTABLE(2b, 4b)
1034+#else
1035+#define __OVERFLOW_POST
1036+#define __OVERFLOW_POST_RETURN
1037+#define __OVERFLOW_EXTABLE
1038+#endif
1039+
1040+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1041+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1042 { \
1043 unsigned long tmp; \
1044 int result; \
1045 \
1046 prefetchw(&v->counter); \
1047- __asm__ __volatile__("@ atomic_" #op "\n" \
1048+ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1049 "1: ldrex %0, [%3]\n" \
1050 " " #asm_op " %0, %0, %4\n" \
1051+ post_op \
1052 " strex %1, %0, [%3]\n" \
1053 " teq %1, #0\n" \
1054-" bne 1b" \
1055+" bne 1b\n" \
1056+ extable \
1057 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1058 : "r" (&v->counter), "Ir" (i) \
1059 : "cc"); \
1060 } \
1061
1062-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1063-static inline int atomic_##op##_return(int i, atomic_t *v) \
1064+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, _unchecked, c_op, asm_op, , )\
1065+ __ATOMIC_OP(op, , c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1066+
1067+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1068+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1069 { \
1070 unsigned long tmp; \
1071 int result; \
1072@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1073 smp_mb(); \
1074 prefetchw(&v->counter); \
1075 \
1076- __asm__ __volatile__("@ atomic_" #op "_return\n" \
1077+ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1078 "1: ldrex %0, [%3]\n" \
1079 " " #asm_op " %0, %0, %4\n" \
1080+ post_op \
1081 " strex %1, %0, [%3]\n" \
1082 " teq %1, #0\n" \
1083-" bne 1b" \
1084+" bne 1b\n" \
1085+ extable \
1086 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1087 : "r" (&v->counter), "Ir" (i) \
1088 : "cc"); \
1089@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1090 return result; \
1091 }
1092
1093+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op, , )\
1094+ __ATOMIC_OP_RETURN(op, , c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1095+
1096 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1097 {
1098 int oldval;
1099@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1100 __asm__ __volatile__ ("@ atomic_add_unless\n"
1101 "1: ldrex %0, [%4]\n"
1102 " teq %0, %5\n"
1103-" beq 2f\n"
1104-" add %1, %0, %6\n"
1105+" beq 4f\n"
1106+" adds %1, %0, %6\n"
1107+
1108+#ifdef CONFIG_PAX_REFCOUNT
1109+" bvc 3f\n"
1110+"2: " REFCOUNT_TRAP_INSN "\n"
1111+"3:\n"
1112+#endif
1113+
1114 " strex %2, %1, [%4]\n"
1115 " teq %2, #0\n"
1116 " bne 1b\n"
1117-"2:"
1118+"4:"
1119+
1120+#ifdef CONFIG_PAX_REFCOUNT
1121+ _ASM_EXTABLE(2b, 4b)
1122+#endif
1123+
1124 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1125 : "r" (&v->counter), "r" (u), "r" (a)
1126 : "cc");
1127@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1128 return oldval;
1129 }
1130
1131+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1132+{
1133+ unsigned long oldval, res;
1134+
1135+ smp_mb();
1136+
1137+ do {
1138+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1139+ "ldrex %1, [%3]\n"
1140+ "mov %0, #0\n"
1141+ "teq %1, %4\n"
1142+ "strexeq %0, %5, [%3]\n"
1143+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1144+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1145+ : "cc");
1146+ } while (res);
1147+
1148+ smp_mb();
1149+
1150+ return oldval;
1151+}
1152+
1153 #else /* ARM_ARCH_6 */
1154
1155 #ifdef CONFIG_SMP
1156 #error SMP not supported on pre-ARMv6 CPUs
1157 #endif
1158
1159-#define ATOMIC_OP(op, c_op, asm_op) \
1160-static inline void atomic_##op(int i, atomic_t *v) \
1161+#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1162+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1163 { \
1164 unsigned long flags; \
1165 \
1166@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1167 raw_local_irq_restore(flags); \
1168 } \
1169
1170-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1171-static inline int atomic_##op##_return(int i, atomic_t *v) \
1172+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1173+ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1174+
1175+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1176+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1177 { \
1178 unsigned long flags; \
1179 int val; \
1180@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1181 return val; \
1182 }
1183
1184+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1185+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1186+
1187 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1188 {
1189 int ret;
1190@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1191 return ret;
1192 }
1193
1194+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1195+{
1196+ return atomic_cmpxchg((atomic_t *)v, old, new);
1197+}
1198+
1199 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1200 {
1201 int c, old;
1202@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1203
1204 #undef ATOMIC_OPS
1205 #undef ATOMIC_OP_RETURN
1206+#undef __ATOMIC_OP_RETURN
1207 #undef ATOMIC_OP
1208+#undef __ATOMIC_OP
1209
1210 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1211+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1212+{
1213+ return xchg(&v->counter, new);
1214+}
1215
1216 #define atomic_inc(v) atomic_add(1, v)
1217+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1218+{
1219+ atomic_add_unchecked(1, v);
1220+}
1221 #define atomic_dec(v) atomic_sub(1, v)
1222+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1223+{
1224+ atomic_sub_unchecked(1, v);
1225+}
1226
1227 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1228+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1229+{
1230+ return atomic_add_return_unchecked(1, v) == 0;
1231+}
1232 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1233 #define atomic_inc_return(v) (atomic_add_return(1, v))
1234+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1235+{
1236+ return atomic_add_return_unchecked(1, v);
1237+}
1238 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1239 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1240
1241@@ -216,6 +336,14 @@ typedef struct {
1242 long long counter;
1243 } atomic64_t;
1244
1245+#ifdef CONFIG_PAX_REFCOUNT
1246+typedef struct {
1247+ long long counter;
1248+} atomic64_unchecked_t;
1249+#else
1250+typedef atomic64_t atomic64_unchecked_t;
1251+#endif
1252+
1253 #define ATOMIC64_INIT(i) { (i) }
1254
1255 #ifdef CONFIG_ARM_LPAE
1256@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1257 return result;
1258 }
1259
1260+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1261+{
1262+ long long result;
1263+
1264+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1265+" ldrd %0, %H0, [%1]"
1266+ : "=&r" (result)
1267+ : "r" (&v->counter), "Qo" (v->counter)
1268+ );
1269+
1270+ return result;
1271+}
1272+
1273 static inline void atomic64_set(atomic64_t *v, long long i)
1274 {
1275 __asm__ __volatile__("@ atomic64_set\n"
1276@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1277 : "r" (&v->counter), "r" (i)
1278 );
1279 }
1280+
1281+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1282+{
1283+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1284+" strd %2, %H2, [%1]"
1285+ : "=Qo" (v->counter)
1286+ : "r" (&v->counter), "r" (i)
1287+ );
1288+}
1289 #else
1290 static inline long long atomic64_read(const atomic64_t *v)
1291 {
1292@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1293 return result;
1294 }
1295
1296+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1297+{
1298+ long long result;
1299+
1300+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1301+" ldrexd %0, %H0, [%1]"
1302+ : "=&r" (result)
1303+ : "r" (&v->counter), "Qo" (v->counter)
1304+ );
1305+
1306+ return result;
1307+}
1308+
1309 static inline void atomic64_set(atomic64_t *v, long long i)
1310 {
1311 long long tmp;
1312@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1313 : "r" (&v->counter), "r" (i)
1314 : "cc");
1315 }
1316+
1317+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1318+{
1319+ long long tmp;
1320+
1321+ prefetchw(&v->counter);
1322+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1323+"1: ldrexd %0, %H0, [%2]\n"
1324+" strexd %0, %3, %H3, [%2]\n"
1325+" teq %0, #0\n"
1326+" bne 1b"
1327+ : "=&r" (tmp), "=Qo" (v->counter)
1328+ : "r" (&v->counter), "r" (i)
1329+ : "cc");
1330+}
1331 #endif
1332
1333-#define ATOMIC64_OP(op, op1, op2) \
1334-static inline void atomic64_##op(long long i, atomic64_t *v) \
1335+#undef __OVERFLOW_POST_RETURN
1336+#define __OVERFLOW_POST_RETURN \
1337+ " bvc 3f\n" \
1338+" mov %0, %1\n" \
1339+" mov %H0, %H1\n" \
1340+ "2: " REFCOUNT_TRAP_INSN "\n"\
1341+ "3:\n"
1342+
1343+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1344+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1345 { \
1346 long long result; \
1347 unsigned long tmp; \
1348 \
1349 prefetchw(&v->counter); \
1350- __asm__ __volatile__("@ atomic64_" #op "\n" \
1351+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1352 "1: ldrexd %0, %H0, [%3]\n" \
1353 " " #op1 " %Q0, %Q0, %Q4\n" \
1354 " " #op2 " %R0, %R0, %R4\n" \
1355+ post_op \
1356 " strexd %1, %0, %H0, [%3]\n" \
1357 " teq %1, #0\n" \
1358-" bne 1b" \
1359+" bne 1b\n" \
1360+ extable \
1361 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1362 : "r" (&v->counter), "r" (i) \
1363 : "cc"); \
1364 } \
1365
1366-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1367-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1368+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, _unchecked, op1, op2, , ) \
1369+ __ATOMIC64_OP(op, , op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1370+
1371+#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1372+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1373 { \
1374 long long result; \
1375 unsigned long tmp; \
1376@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1377 smp_mb(); \
1378 prefetchw(&v->counter); \
1379 \
1380- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1381+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1382 "1: ldrexd %0, %H0, [%3]\n" \
1383 " " #op1 " %Q0, %Q0, %Q4\n" \
1384 " " #op2 " %R0, %R0, %R4\n" \
1385+ post_op \
1386 " strexd %1, %0, %H0, [%3]\n" \
1387 " teq %1, #0\n" \
1388-" bne 1b" \
1389+" bne 1b\n" \
1390+ extable \
1391 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1392 : "r" (&v->counter), "r" (i) \
1393 : "cc"); \
1394@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1395 return result; \
1396 }
1397
1398+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2, , ) \
1399+ __ATOMIC64_OP_RETURN(op, , op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1400+
1401 #define ATOMIC64_OPS(op, op1, op2) \
1402 ATOMIC64_OP(op, op1, op2) \
1403 ATOMIC64_OP_RETURN(op, op1, op2)
1404@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1405
1406 #undef ATOMIC64_OPS
1407 #undef ATOMIC64_OP_RETURN
1408+#undef __ATOMIC64_OP_RETURN
1409 #undef ATOMIC64_OP
1410+#undef __ATOMIC64_OP
1411+#undef __OVERFLOW_EXTABLE
1412+#undef __OVERFLOW_POST_RETURN
1413+#undef __OVERFLOW_POST
1414
1415 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1416 long long new)
1417@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1418 return oldval;
1419 }
1420
1421+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1422+ long long new)
1423+{
1424+ long long oldval;
1425+ unsigned long res;
1426+
1427+ smp_mb();
1428+
1429+ do {
1430+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1431+ "ldrexd %1, %H1, [%3]\n"
1432+ "mov %0, #0\n"
1433+ "teq %1, %4\n"
1434+ "teqeq %H1, %H4\n"
1435+ "strexdeq %0, %5, %H5, [%3]"
1436+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1437+ : "r" (&ptr->counter), "r" (old), "r" (new)
1438+ : "cc");
1439+ } while (res);
1440+
1441+ smp_mb();
1442+
1443+ return oldval;
1444+}
1445+
1446 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1447 {
1448 long long result;
1449@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1450 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1451 {
1452 long long result;
1453- unsigned long tmp;
1454+ u64 tmp;
1455
1456 smp_mb();
1457 prefetchw(&v->counter);
1458
1459 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1460-"1: ldrexd %0, %H0, [%3]\n"
1461-" subs %Q0, %Q0, #1\n"
1462-" sbc %R0, %R0, #0\n"
1463+"1: ldrexd %1, %H1, [%3]\n"
1464+" subs %Q0, %Q1, #1\n"
1465+" sbcs %R0, %R1, #0\n"
1466+
1467+#ifdef CONFIG_PAX_REFCOUNT
1468+" bvc 3f\n"
1469+" mov %Q0, %Q1\n"
1470+" mov %R0, %R1\n"
1471+"2: " REFCOUNT_TRAP_INSN "\n"
1472+"3:\n"
1473+#endif
1474+
1475 " teq %R0, #0\n"
1476-" bmi 2f\n"
1477+" bmi 4f\n"
1478 " strexd %1, %0, %H0, [%3]\n"
1479 " teq %1, #0\n"
1480 " bne 1b\n"
1481-"2:"
1482+"4:\n"
1483+
1484+#ifdef CONFIG_PAX_REFCOUNT
1485+ _ASM_EXTABLE(2b, 4b)
1486+#endif
1487+
1488 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1489 : "r" (&v->counter)
1490 : "cc");
1491@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1492 " teq %0, %5\n"
1493 " teqeq %H0, %H5\n"
1494 " moveq %1, #0\n"
1495-" beq 2f\n"
1496+" beq 4f\n"
1497 " adds %Q0, %Q0, %Q6\n"
1498-" adc %R0, %R0, %R6\n"
1499+" adcs %R0, %R0, %R6\n"
1500+
1501+#ifdef CONFIG_PAX_REFCOUNT
1502+" bvc 3f\n"
1503+"2: " REFCOUNT_TRAP_INSN "\n"
1504+"3:\n"
1505+#endif
1506+
1507 " strexd %2, %0, %H0, [%4]\n"
1508 " teq %2, #0\n"
1509 " bne 1b\n"
1510-"2:"
1511+"4:\n"
1512+
1513+#ifdef CONFIG_PAX_REFCOUNT
1514+ _ASM_EXTABLE(2b, 4b)
1515+#endif
1516+
1517 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1518 : "r" (&v->counter), "r" (u), "r" (a)
1519 : "cc");
1520@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1521
1522 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1523 #define atomic64_inc(v) atomic64_add(1LL, (v))
1524+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1525 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1526+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1527 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1528 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1529 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1530+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1531 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1532 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1533 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1534diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1535index d2f81e6..3c4dba5 100644
1536--- a/arch/arm/include/asm/barrier.h
1537+++ b/arch/arm/include/asm/barrier.h
1538@@ -67,7 +67,7 @@
1539 do { \
1540 compiletime_assert_atomic_type(*p); \
1541 smp_mb(); \
1542- ACCESS_ONCE(*p) = (v); \
1543+ ACCESS_ONCE_RW(*p) = (v); \
1544 } while (0)
1545
1546 #define smp_load_acquire(p) \
1547diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1548index 75fe66b..ba3dee4 100644
1549--- a/arch/arm/include/asm/cache.h
1550+++ b/arch/arm/include/asm/cache.h
1551@@ -4,8 +4,10 @@
1552 #ifndef __ASMARM_CACHE_H
1553 #define __ASMARM_CACHE_H
1554
1555+#include <linux/const.h>
1556+
1557 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1558-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1559+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1560
1561 /*
1562 * Memory returned by kmalloc() may be used for DMA, so we must make
1563@@ -24,5 +26,6 @@
1564 #endif
1565
1566 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1567+#define __read_only __attribute__ ((__section__(".data..read_only")))
1568
1569 #endif
1570diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1571index 2d46862..a35415b 100644
1572--- a/arch/arm/include/asm/cacheflush.h
1573+++ b/arch/arm/include/asm/cacheflush.h
1574@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1575 void (*dma_unmap_area)(const void *, size_t, int);
1576
1577 void (*dma_flush_range)(const void *, const void *);
1578-};
1579+} __no_const;
1580
1581 /*
1582 * Select the calling method
1583diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1584index 5233151..87a71fa 100644
1585--- a/arch/arm/include/asm/checksum.h
1586+++ b/arch/arm/include/asm/checksum.h
1587@@ -37,7 +37,19 @@ __wsum
1588 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1589
1590 __wsum
1591-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1592+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1593+
1594+static inline __wsum
1595+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1596+{
1597+ __wsum ret;
1598+ pax_open_userland();
1599+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1600+ pax_close_userland();
1601+ return ret;
1602+}
1603+
1604+
1605
1606 /*
1607 * Fold a partial checksum without adding pseudo headers
1608diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1609index abb2c37..96db950 100644
1610--- a/arch/arm/include/asm/cmpxchg.h
1611+++ b/arch/arm/include/asm/cmpxchg.h
1612@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1613
1614 #define xchg(ptr,x) \
1615 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1616+#define xchg_unchecked(ptr,x) \
1617+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1618
1619 #include <asm-generic/cmpxchg-local.h>
1620
1621diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1622index 6ddbe44..b5e38b1a 100644
1623--- a/arch/arm/include/asm/domain.h
1624+++ b/arch/arm/include/asm/domain.h
1625@@ -48,18 +48,37 @@
1626 * Domain types
1627 */
1628 #define DOMAIN_NOACCESS 0
1629-#define DOMAIN_CLIENT 1
1630 #ifdef CONFIG_CPU_USE_DOMAINS
1631+#define DOMAIN_USERCLIENT 1
1632+#define DOMAIN_KERNELCLIENT 1
1633 #define DOMAIN_MANAGER 3
1634+#define DOMAIN_VECTORS DOMAIN_USER
1635 #else
1636+
1637+#ifdef CONFIG_PAX_KERNEXEC
1638 #define DOMAIN_MANAGER 1
1639+#define DOMAIN_KERNEXEC 3
1640+#else
1641+#define DOMAIN_MANAGER 1
1642+#endif
1643+
1644+#ifdef CONFIG_PAX_MEMORY_UDEREF
1645+#define DOMAIN_USERCLIENT 0
1646+#define DOMAIN_UDEREF 1
1647+#define DOMAIN_VECTORS DOMAIN_KERNEL
1648+#else
1649+#define DOMAIN_USERCLIENT 1
1650+#define DOMAIN_VECTORS DOMAIN_USER
1651+#endif
1652+#define DOMAIN_KERNELCLIENT 1
1653+
1654 #endif
1655
1656 #define domain_val(dom,type) ((type) << (2*(dom)))
1657
1658 #ifndef __ASSEMBLY__
1659
1660-#ifdef CONFIG_CPU_USE_DOMAINS
1661+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1662 static inline void set_domain(unsigned val)
1663 {
1664 asm volatile(
1665@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1666 isb();
1667 }
1668
1669-#define modify_domain(dom,type) \
1670- do { \
1671- struct thread_info *thread = current_thread_info(); \
1672- unsigned int domain = thread->cpu_domain; \
1673- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1674- thread->cpu_domain = domain | domain_val(dom, type); \
1675- set_domain(thread->cpu_domain); \
1676- } while (0)
1677-
1678+extern void modify_domain(unsigned int dom, unsigned int type);
1679 #else
1680 static inline void set_domain(unsigned val) { }
1681 static inline void modify_domain(unsigned dom, unsigned type) { }
1682diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1683index 674d03f..9a0bac0 100644
1684--- a/arch/arm/include/asm/elf.h
1685+++ b/arch/arm/include/asm/elf.h
1686@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1687 the loader. We need to make sure that it is out of the way of the program
1688 that it will "exec", and that there is sufficient room for the brk. */
1689
1690-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1691+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1692+
1693+#ifdef CONFIG_PAX_ASLR
1694+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1695+
1696+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1697+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1698+#endif
1699
1700 /* When the program starts, a1 contains a pointer to a function to be
1701 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1702@@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1703 extern void elf_set_personality(const struct elf32_hdr *);
1704 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1705
1706-struct mm_struct;
1707-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1708-#define arch_randomize_brk arch_randomize_brk
1709-
1710 #ifdef CONFIG_MMU
1711 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1712 struct linux_binprm;
1713diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1714index de53547..52b9a28 100644
1715--- a/arch/arm/include/asm/fncpy.h
1716+++ b/arch/arm/include/asm/fncpy.h
1717@@ -81,7 +81,9 @@
1718 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1719 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1720 \
1721+ pax_open_kernel(); \
1722 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1723+ pax_close_kernel(); \
1724 flush_icache_range((unsigned long)(dest_buf), \
1725 (unsigned long)(dest_buf) + (size)); \
1726 \
1727diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1728index 53e69da..3fdc896 100644
1729--- a/arch/arm/include/asm/futex.h
1730+++ b/arch/arm/include/asm/futex.h
1731@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1732 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1733 return -EFAULT;
1734
1735+ pax_open_userland();
1736+
1737 smp_mb();
1738 /* Prefetching cannot fault */
1739 prefetchw(uaddr);
1740@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1741 : "cc", "memory");
1742 smp_mb();
1743
1744+ pax_close_userland();
1745+
1746 *uval = val;
1747 return ret;
1748 }
1749@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1750 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1751 return -EFAULT;
1752
1753+ pax_open_userland();
1754+
1755 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1756 "1: " TUSER(ldr) " %1, [%4]\n"
1757 " teq %1, %2\n"
1758@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1759 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1760 : "cc", "memory");
1761
1762+ pax_close_userland();
1763+
1764 *uval = val;
1765 return ret;
1766 }
1767@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1768 return -EFAULT;
1769
1770 pagefault_disable(); /* implies preempt_disable() */
1771+ pax_open_userland();
1772
1773 switch (op) {
1774 case FUTEX_OP_SET:
1775@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1776 ret = -ENOSYS;
1777 }
1778
1779+ pax_close_userland();
1780 pagefault_enable(); /* subsumes preempt_enable() */
1781
1782 if (!ret) {
1783diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1784index 83eb2f7..ed77159 100644
1785--- a/arch/arm/include/asm/kmap_types.h
1786+++ b/arch/arm/include/asm/kmap_types.h
1787@@ -4,6 +4,6 @@
1788 /*
1789 * This is the "bare minimum". AIO seems to require this.
1790 */
1791-#define KM_TYPE_NR 16
1792+#define KM_TYPE_NR 17
1793
1794 #endif
1795diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1796index 9e614a1..3302cca 100644
1797--- a/arch/arm/include/asm/mach/dma.h
1798+++ b/arch/arm/include/asm/mach/dma.h
1799@@ -22,7 +22,7 @@ struct dma_ops {
1800 int (*residue)(unsigned int, dma_t *); /* optional */
1801 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1802 const char *type;
1803-};
1804+} __do_const;
1805
1806 struct dma_struct {
1807 void *addr; /* single DMA address */
1808diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1809index f98c7f3..e5c626d 100644
1810--- a/arch/arm/include/asm/mach/map.h
1811+++ b/arch/arm/include/asm/mach/map.h
1812@@ -23,17 +23,19 @@ struct map_desc {
1813
1814 /* types 0-3 are defined in asm/io.h */
1815 enum {
1816- MT_UNCACHED = 4,
1817- MT_CACHECLEAN,
1818- MT_MINICLEAN,
1819+ MT_UNCACHED_RW = 4,
1820+ MT_CACHECLEAN_RO,
1821+ MT_MINICLEAN_RO,
1822 MT_LOW_VECTORS,
1823 MT_HIGH_VECTORS,
1824- MT_MEMORY_RWX,
1825+ __MT_MEMORY_RWX,
1826 MT_MEMORY_RW,
1827- MT_ROM,
1828- MT_MEMORY_RWX_NONCACHED,
1829+ MT_MEMORY_RX,
1830+ MT_ROM_RX,
1831+ MT_MEMORY_RW_NONCACHED,
1832+ MT_MEMORY_RX_NONCACHED,
1833 MT_MEMORY_RW_DTCM,
1834- MT_MEMORY_RWX_ITCM,
1835+ MT_MEMORY_RX_ITCM,
1836 MT_MEMORY_RW_SO,
1837 MT_MEMORY_DMA_READY,
1838 };
1839diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1840index 563b92f..689d58e 100644
1841--- a/arch/arm/include/asm/outercache.h
1842+++ b/arch/arm/include/asm/outercache.h
1843@@ -39,7 +39,7 @@ struct outer_cache_fns {
1844 /* This is an ARM L2C thing */
1845 void (*write_sec)(unsigned long, unsigned);
1846 void (*configure)(const struct l2x0_regs *);
1847-};
1848+} __no_const;
1849
1850 extern struct outer_cache_fns outer_cache;
1851
1852diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1853index 4355f0e..cd9168e 100644
1854--- a/arch/arm/include/asm/page.h
1855+++ b/arch/arm/include/asm/page.h
1856@@ -23,6 +23,7 @@
1857
1858 #else
1859
1860+#include <linux/compiler.h>
1861 #include <asm/glue.h>
1862
1863 /*
1864@@ -114,7 +115,7 @@ struct cpu_user_fns {
1865 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1866 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1867 unsigned long vaddr, struct vm_area_struct *vma);
1868-};
1869+} __no_const;
1870
1871 #ifdef MULTI_USER
1872 extern struct cpu_user_fns cpu_user;
1873diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1874index 19cfab5..3f5c7e9 100644
1875--- a/arch/arm/include/asm/pgalloc.h
1876+++ b/arch/arm/include/asm/pgalloc.h
1877@@ -17,6 +17,7 @@
1878 #include <asm/processor.h>
1879 #include <asm/cacheflush.h>
1880 #include <asm/tlbflush.h>
1881+#include <asm/system_info.h>
1882
1883 #define check_pgt_cache() do { } while (0)
1884
1885@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1886 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1887 }
1888
1889+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1890+{
1891+ pud_populate(mm, pud, pmd);
1892+}
1893+
1894 #else /* !CONFIG_ARM_LPAE */
1895
1896 /*
1897@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1898 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1899 #define pmd_free(mm, pmd) do { } while (0)
1900 #define pud_populate(mm,pmd,pte) BUG()
1901+#define pud_populate_kernel(mm,pmd,pte) BUG()
1902
1903 #endif /* CONFIG_ARM_LPAE */
1904
1905@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1906 __free_page(pte);
1907 }
1908
1909+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1910+{
1911+#ifdef CONFIG_ARM_LPAE
1912+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1913+#else
1914+ if (addr & SECTION_SIZE)
1915+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1916+ else
1917+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1918+#endif
1919+ flush_pmd_entry(pmdp);
1920+}
1921+
1922 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1923 pmdval_t prot)
1924 {
1925diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1926index 5e68278..1869bae 100644
1927--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1928+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1929@@ -27,7 +27,7 @@
1930 /*
1931 * - section
1932 */
1933-#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1934+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1935 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1936 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1937 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1938@@ -39,6 +39,7 @@
1939 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1940 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1941 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1942+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1943
1944 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1945 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1946@@ -68,6 +69,7 @@
1947 * - extended small page/tiny page
1948 */
1949 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1950+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1951 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1952 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1953 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1954diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1955index bfd662e..f6cbb02 100644
1956--- a/arch/arm/include/asm/pgtable-2level.h
1957+++ b/arch/arm/include/asm/pgtable-2level.h
1958@@ -127,6 +127,9 @@
1959 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1960 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1961
1962+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1963+#define L_PTE_PXN (_AT(pteval_t, 0))
1964+
1965 /*
1966 * These are the memory types, defined to be compatible with
1967 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1968diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1969index a745a2a..481350a 100644
1970--- a/arch/arm/include/asm/pgtable-3level.h
1971+++ b/arch/arm/include/asm/pgtable-3level.h
1972@@ -80,6 +80,7 @@
1973 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
1974 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1975 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1976+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1977 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
1978 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
1979 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
1980@@ -91,10 +92,12 @@
1981 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
1982 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
1983 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
1984+#define PMD_SECT_RDONLY PMD_SECT_AP2
1985
1986 /*
1987 * To be used in assembly code with the upper page attributes.
1988 */
1989+#define L_PTE_PXN_HIGH (1 << (53 - 32))
1990 #define L_PTE_XN_HIGH (1 << (54 - 32))
1991 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
1992
1993diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
1994index f403541..b10df68 100644
1995--- a/arch/arm/include/asm/pgtable.h
1996+++ b/arch/arm/include/asm/pgtable.h
1997@@ -33,6 +33,9 @@
1998 #include <asm/pgtable-2level.h>
1999 #endif
2000
2001+#define ktla_ktva(addr) (addr)
2002+#define ktva_ktla(addr) (addr)
2003+
2004 /*
2005 * Just any arbitrary offset to the start of the vmalloc VM area: the
2006 * current 8MB value just means that there will be a 8MB "hole" after the
2007@@ -48,6 +51,9 @@
2008 #define LIBRARY_TEXT_START 0x0c000000
2009
2010 #ifndef __ASSEMBLY__
2011+extern pteval_t __supported_pte_mask;
2012+extern pmdval_t __supported_pmd_mask;
2013+
2014 extern void __pte_error(const char *file, int line, pte_t);
2015 extern void __pmd_error(const char *file, int line, pmd_t);
2016 extern void __pgd_error(const char *file, int line, pgd_t);
2017@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2018 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2019 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2020
2021+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2022+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2023+
2024+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2025+#include <asm/domain.h>
2026+#include <linux/thread_info.h>
2027+#include <linux/preempt.h>
2028+
2029+static inline int test_domain(int domain, int domaintype)
2030+{
2031+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2032+}
2033+#endif
2034+
2035+#ifdef CONFIG_PAX_KERNEXEC
2036+static inline unsigned long pax_open_kernel(void) {
2037+#ifdef CONFIG_ARM_LPAE
2038+ /* TODO */
2039+#else
2040+ preempt_disable();
2041+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2042+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2043+#endif
2044+ return 0;
2045+}
2046+
2047+static inline unsigned long pax_close_kernel(void) {
2048+#ifdef CONFIG_ARM_LPAE
2049+ /* TODO */
2050+#else
2051+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2052+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2053+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2054+ preempt_enable_no_resched();
2055+#endif
2056+ return 0;
2057+}
2058+#else
2059+static inline unsigned long pax_open_kernel(void) { return 0; }
2060+static inline unsigned long pax_close_kernel(void) { return 0; }
2061+#endif
2062+
2063 /*
2064 * This is the lowest virtual address we can permit any user space
2065 * mapping to be mapped at. This is particularly important for
2066@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2067 /*
2068 * The pgprot_* and protection_map entries will be fixed up in runtime
2069 * to include the cachable and bufferable bits based on memory policy,
2070- * as well as any architecture dependent bits like global/ASID and SMP
2071- * shared mapping bits.
2072+ * as well as any architecture dependent bits like global/ASID, PXN,
2073+ * and SMP shared mapping bits.
2074 */
2075 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2076
2077@@ -307,7 +355,7 @@ static inline pte_t pte_mknexec(pte_t pte)
2078 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2079 {
2080 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2081- L_PTE_NONE | L_PTE_VALID;
2082+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2083 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2084 return pte;
2085 }
2086diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2087index c25ef3e..735f14b 100644
2088--- a/arch/arm/include/asm/psci.h
2089+++ b/arch/arm/include/asm/psci.h
2090@@ -32,7 +32,7 @@ struct psci_operations {
2091 int (*affinity_info)(unsigned long target_affinity,
2092 unsigned long lowest_affinity_level);
2093 int (*migrate_info_type)(void);
2094-};
2095+} __no_const;
2096
2097 extern struct psci_operations psci_ops;
2098 extern struct smp_operations psci_smp_ops;
2099diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2100index 18f5a55..5072a40 100644
2101--- a/arch/arm/include/asm/smp.h
2102+++ b/arch/arm/include/asm/smp.h
2103@@ -107,7 +107,7 @@ struct smp_operations {
2104 int (*cpu_disable)(unsigned int cpu);
2105 #endif
2106 #endif
2107-};
2108+} __no_const;
2109
2110 struct of_cpu_method {
2111 const char *method;
2112diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2113index 72812a1..335f4f3 100644
2114--- a/arch/arm/include/asm/thread_info.h
2115+++ b/arch/arm/include/asm/thread_info.h
2116@@ -77,9 +77,9 @@ struct thread_info {
2117 .flags = 0, \
2118 .preempt_count = INIT_PREEMPT_COUNT, \
2119 .addr_limit = KERNEL_DS, \
2120- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2121- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2122- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2123+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2124+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2125+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2126 }
2127
2128 #define init_thread_info (init_thread_union.thread_info)
2129@@ -155,7 +155,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2130 #define TIF_SYSCALL_AUDIT 9
2131 #define TIF_SYSCALL_TRACEPOINT 10
2132 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2133-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2134+/* within 8 bits of TIF_SYSCALL_TRACE
2135+ * to meet flexible second operand requirements
2136+ */
2137+#define TIF_GRSEC_SETXID 12
2138+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2139 #define TIF_USING_IWMMXT 17
2140 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2141 #define TIF_RESTORE_SIGMASK 20
2142@@ -169,10 +173,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2143 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2144 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2145 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2146+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2147
2148 /* Checks for any syscall work in entry-common.S */
2149 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2150- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2151+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2152
2153 /*
2154 * Change these and you break ASM code in entry-common.S
2155diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2156index 5f833f7..76e6644 100644
2157--- a/arch/arm/include/asm/tls.h
2158+++ b/arch/arm/include/asm/tls.h
2159@@ -3,6 +3,7 @@
2160
2161 #include <linux/compiler.h>
2162 #include <asm/thread_info.h>
2163+#include <asm/pgtable.h>
2164
2165 #ifdef __ASSEMBLY__
2166 #include <asm/asm-offsets.h>
2167@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2168 * at 0xffff0fe0 must be used instead. (see
2169 * entry-armv.S for details)
2170 */
2171+ pax_open_kernel();
2172 *((unsigned int *)0xffff0ff0) = val;
2173+ pax_close_kernel();
2174 #endif
2175 }
2176
2177diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2178index ce0786e..a80c264 100644
2179--- a/arch/arm/include/asm/uaccess.h
2180+++ b/arch/arm/include/asm/uaccess.h
2181@@ -18,6 +18,7 @@
2182 #include <asm/domain.h>
2183 #include <asm/unified.h>
2184 #include <asm/compiler.h>
2185+#include <asm/pgtable.h>
2186
2187 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2188 #include <asm-generic/uaccess-unaligned.h>
2189@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2190 static inline void set_fs(mm_segment_t fs)
2191 {
2192 current_thread_info()->addr_limit = fs;
2193- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2194+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2195 }
2196
2197 #define segment_eq(a, b) ((a) == (b))
2198
2199+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2200+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2201+
2202+static inline void pax_open_userland(void)
2203+{
2204+
2205+#ifdef CONFIG_PAX_MEMORY_UDEREF
2206+ if (segment_eq(get_fs(), USER_DS)) {
2207+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2208+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2209+ }
2210+#endif
2211+
2212+}
2213+
2214+static inline void pax_close_userland(void)
2215+{
2216+
2217+#ifdef CONFIG_PAX_MEMORY_UDEREF
2218+ if (segment_eq(get_fs(), USER_DS)) {
2219+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2220+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2221+ }
2222+#endif
2223+
2224+}
2225+
2226 #define __addr_ok(addr) ({ \
2227 unsigned long flag; \
2228 __asm__("cmp %2, %0; movlo %0, #0" \
2229@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2230
2231 #define get_user(x, p) \
2232 ({ \
2233+ int __e; \
2234 might_fault(); \
2235- __get_user_check(x, p); \
2236+ pax_open_userland(); \
2237+ __e = __get_user_check((x), (p)); \
2238+ pax_close_userland(); \
2239+ __e; \
2240 })
2241
2242 extern int __put_user_1(void *, unsigned int);
2243@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2244
2245 #define put_user(x, p) \
2246 ({ \
2247+ int __e; \
2248 might_fault(); \
2249- __put_user_check(x, p); \
2250+ pax_open_userland(); \
2251+ __e = __put_user_check((x), (p)); \
2252+ pax_close_userland(); \
2253+ __e; \
2254 })
2255
2256 #else /* CONFIG_MMU */
2257@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2258
2259 #endif /* CONFIG_MMU */
2260
2261+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
2262 #define access_ok(type, addr, size) (__range_ok(addr, size) == 0)
2263
2264 #define user_addr_max() \
2265@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2266 #define __get_user(x, ptr) \
2267 ({ \
2268 long __gu_err = 0; \
2269+ pax_open_userland(); \
2270 __get_user_err((x), (ptr), __gu_err); \
2271+ pax_close_userland(); \
2272 __gu_err; \
2273 })
2274
2275 #define __get_user_error(x, ptr, err) \
2276 ({ \
2277+ pax_open_userland(); \
2278 __get_user_err((x), (ptr), err); \
2279+ pax_close_userland(); \
2280 (void) 0; \
2281 })
2282
2283@@ -368,13 +409,17 @@ do { \
2284 #define __put_user(x, ptr) \
2285 ({ \
2286 long __pu_err = 0; \
2287+ pax_open_userland(); \
2288 __put_user_err((x), (ptr), __pu_err); \
2289+ pax_close_userland(); \
2290 __pu_err; \
2291 })
2292
2293 #define __put_user_error(x, ptr, err) \
2294 ({ \
2295+ pax_open_userland(); \
2296 __put_user_err((x), (ptr), err); \
2297+ pax_close_userland(); \
2298 (void) 0; \
2299 })
2300
2301@@ -474,11 +519,44 @@ do { \
2302
2303
2304 #ifdef CONFIG_MMU
2305-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2306-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2307+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2308+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2309+
2310+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2311+{
2312+ unsigned long ret;
2313+
2314+ check_object_size(to, n, false);
2315+ pax_open_userland();
2316+ ret = ___copy_from_user(to, from, n);
2317+ pax_close_userland();
2318+ return ret;
2319+}
2320+
2321+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2322+{
2323+ unsigned long ret;
2324+
2325+ check_object_size(from, n, true);
2326+ pax_open_userland();
2327+ ret = ___copy_to_user(to, from, n);
2328+ pax_close_userland();
2329+ return ret;
2330+}
2331+
2332 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2333-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2334+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2335 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2336+
2337+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2338+{
2339+ unsigned long ret;
2340+ pax_open_userland();
2341+ ret = ___clear_user(addr, n);
2342+ pax_close_userland();
2343+ return ret;
2344+}
2345+
2346 #else
2347 #define __copy_from_user(to, from, n) (memcpy(to, (void __force *)from, n), 0)
2348 #define __copy_to_user(to, from, n) (memcpy((void __force *)to, from, n), 0)
2349@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2350
2351 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2352 {
2353+ if ((long)n < 0)
2354+ return n;
2355+
2356 if (access_ok(VERIFY_READ, from, n))
2357 n = __copy_from_user(to, from, n);
2358 else /* security hole - plug it */
2359@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2360
2361 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2362 {
2363+ if ((long)n < 0)
2364+ return n;
2365+
2366 if (access_ok(VERIFY_WRITE, to, n))
2367 n = __copy_to_user(to, from, n);
2368 return n;
2369diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2370index 5af0ed1..cea83883 100644
2371--- a/arch/arm/include/uapi/asm/ptrace.h
2372+++ b/arch/arm/include/uapi/asm/ptrace.h
2373@@ -92,7 +92,7 @@
2374 * ARMv7 groups of PSR bits
2375 */
2376 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2377-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2378+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2379 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2380 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2381
2382diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2383index a88671c..1cc895e 100644
2384--- a/arch/arm/kernel/armksyms.c
2385+++ b/arch/arm/kernel/armksyms.c
2386@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2387
2388 /* networking */
2389 EXPORT_SYMBOL(csum_partial);
2390-EXPORT_SYMBOL(csum_partial_copy_from_user);
2391+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2392 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2393 EXPORT_SYMBOL(__csum_ipv6_magic);
2394
2395@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2396 #ifdef CONFIG_MMU
2397 EXPORT_SYMBOL(copy_page);
2398
2399-EXPORT_SYMBOL(__copy_from_user);
2400-EXPORT_SYMBOL(__copy_to_user);
2401-EXPORT_SYMBOL(__clear_user);
2402+EXPORT_SYMBOL(___copy_from_user);
2403+EXPORT_SYMBOL(___copy_to_user);
2404+EXPORT_SYMBOL(___clear_user);
2405
2406 EXPORT_SYMBOL(__get_user_1);
2407 EXPORT_SYMBOL(__get_user_2);
2408diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2409index 672b219..4aa120a 100644
2410--- a/arch/arm/kernel/entry-armv.S
2411+++ b/arch/arm/kernel/entry-armv.S
2412@@ -48,6 +48,87 @@
2413 9997:
2414 .endm
2415
2416+ .macro pax_enter_kernel
2417+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2418+ @ make aligned space for saved DACR
2419+ sub sp, sp, #8
2420+ @ save regs
2421+ stmdb sp!, {r1, r2}
2422+ @ read DACR from cpu_domain into r1
2423+ mov r2, sp
2424+ @ assume 8K pages, since we have to split the immediate in two
2425+ bic r2, r2, #(0x1fc0)
2426+ bic r2, r2, #(0x3f)
2427+ ldr r1, [r2, #TI_CPU_DOMAIN]
2428+ @ store old DACR on stack
2429+ str r1, [sp, #8]
2430+#ifdef CONFIG_PAX_KERNEXEC
2431+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2432+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2433+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2434+#endif
2435+#ifdef CONFIG_PAX_MEMORY_UDEREF
2436+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2437+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2438+#endif
2439+ @ write r1 to current_thread_info()->cpu_domain
2440+ str r1, [r2, #TI_CPU_DOMAIN]
2441+ @ write r1 to DACR
2442+ mcr p15, 0, r1, c3, c0, 0
2443+ @ instruction sync
2444+ instr_sync
2445+ @ restore regs
2446+ ldmia sp!, {r1, r2}
2447+#endif
2448+ .endm
2449+
2450+ .macro pax_open_userland
2451+#ifdef CONFIG_PAX_MEMORY_UDEREF
2452+ @ save regs
2453+ stmdb sp!, {r0, r1}
2454+ @ read DACR from cpu_domain into r1
2455+ mov r0, sp
2456+ @ assume 8K pages, since we have to split the immediate in two
2457+ bic r0, r0, #(0x1fc0)
2458+ bic r0, r0, #(0x3f)
2459+ ldr r1, [r0, #TI_CPU_DOMAIN]
2460+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2461+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2462+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2463+ @ write r1 to current_thread_info()->cpu_domain
2464+ str r1, [r0, #TI_CPU_DOMAIN]
2465+ @ write r1 to DACR
2466+ mcr p15, 0, r1, c3, c0, 0
2467+ @ instruction sync
2468+ instr_sync
2469+ @ restore regs
2470+ ldmia sp!, {r0, r1}
2471+#endif
2472+ .endm
2473+
2474+ .macro pax_close_userland
2475+#ifdef CONFIG_PAX_MEMORY_UDEREF
2476+ @ save regs
2477+ stmdb sp!, {r0, r1}
2478+ @ read DACR from cpu_domain into r1
2479+ mov r0, sp
2480+ @ assume 8K pages, since we have to split the immediate in two
2481+ bic r0, r0, #(0x1fc0)
2482+ bic r0, r0, #(0x3f)
2483+ ldr r1, [r0, #TI_CPU_DOMAIN]
2484+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2485+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
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 pabt_helper
2498 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2499 #ifdef MULTI_PABORT
2500@@ -90,11 +171,15 @@
2501 * Invalid mode handlers
2502 */
2503 .macro inv_entry, reason
2504+
2505+ pax_enter_kernel
2506+
2507 sub sp, sp, #S_FRAME_SIZE
2508 ARM( stmib sp, {r1 - lr} )
2509 THUMB( stmia sp, {r0 - r12} )
2510 THUMB( str sp, [sp, #S_SP] )
2511 THUMB( str lr, [sp, #S_LR] )
2512+
2513 mov r1, #\reason
2514 .endm
2515
2516@@ -150,7 +235,11 @@ ENDPROC(__und_invalid)
2517 .macro svc_entry, stack_hole=0, trace=1
2518 UNWIND(.fnstart )
2519 UNWIND(.save {r0 - pc} )
2520+
2521+ pax_enter_kernel
2522+
2523 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2524+
2525 #ifdef CONFIG_THUMB2_KERNEL
2526 SPFIX( str r0, [sp] ) @ temporarily saved
2527 SPFIX( mov r0, sp )
2528@@ -165,7 +254,12 @@ ENDPROC(__und_invalid)
2529 ldmia r0, {r3 - r5}
2530 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2531 mov r6, #-1 @ "" "" "" ""
2532+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2533+ @ offset sp by 8 as done in pax_enter_kernel
2534+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2535+#else
2536 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2537+#endif
2538 SPFIX( addeq r2, r2, #4 )
2539 str r3, [sp, #-4]! @ save the "real" r0 copied
2540 @ from the exception stack
2541@@ -369,6 +463,9 @@ ENDPROC(__fiq_abt)
2542 .macro usr_entry, trace=1
2543 UNWIND(.fnstart )
2544 UNWIND(.cantunwind ) @ don't unwind the user space
2545+
2546+ pax_enter_kernel_user
2547+
2548 sub sp, sp, #S_FRAME_SIZE
2549 ARM( stmib sp, {r1 - r12} )
2550 THUMB( stmia sp, {r0 - r12} )
2551@@ -479,7 +576,9 @@ __und_usr:
2552 tst r3, #PSR_T_BIT @ Thumb mode?
2553 bne __und_usr_thumb
2554 sub r4, r2, #4 @ ARM instr at LR - 4
2555+ pax_open_userland
2556 1: ldrt r0, [r4]
2557+ pax_close_userland
2558 ARM_BE8(rev r0, r0) @ little endian instruction
2559
2560 @ r0 = 32-bit ARM instruction which caused the exception
2561@@ -513,11 +612,15 @@ __und_usr_thumb:
2562 */
2563 .arch armv6t2
2564 #endif
2565+ pax_open_userland
2566 2: ldrht r5, [r4]
2567+ pax_close_userland
2568 ARM_BE8(rev16 r5, r5) @ little endian instruction
2569 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2570 blo __und_usr_fault_16 @ 16bit undefined instruction
2571+ pax_open_userland
2572 3: ldrht r0, [r2]
2573+ pax_close_userland
2574 ARM_BE8(rev16 r0, r0) @ little endian instruction
2575 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2576 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2577@@ -547,7 +650,8 @@ ENDPROC(__und_usr)
2578 */
2579 .pushsection .fixup, "ax"
2580 .align 2
2581-4: str r4, [sp, #S_PC] @ retry current instruction
2582+4: pax_close_userland
2583+ str r4, [sp, #S_PC] @ retry current instruction
2584 ret r9
2585 .popsection
2586 .pushsection __ex_table,"a"
2587@@ -767,7 +871,7 @@ ENTRY(__switch_to)
2588 THUMB( str lr, [ip], #4 )
2589 ldr r4, [r2, #TI_TP_VALUE]
2590 ldr r5, [r2, #TI_TP_VALUE + 4]
2591-#ifdef CONFIG_CPU_USE_DOMAINS
2592+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2593 ldr r6, [r2, #TI_CPU_DOMAIN]
2594 #endif
2595 switch_tls r1, r4, r5, r3, r7
2596@@ -776,7 +880,7 @@ ENTRY(__switch_to)
2597 ldr r8, =__stack_chk_guard
2598 ldr r7, [r7, #TSK_STACK_CANARY]
2599 #endif
2600-#ifdef CONFIG_CPU_USE_DOMAINS
2601+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2602 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2603 #endif
2604 mov r5, r0
2605diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2606index 4e7f40c..0f9ee2c 100644
2607--- a/arch/arm/kernel/entry-common.S
2608+++ b/arch/arm/kernel/entry-common.S
2609@@ -11,18 +11,46 @@
2610 #include <asm/assembler.h>
2611 #include <asm/unistd.h>
2612 #include <asm/ftrace.h>
2613+#include <asm/domain.h>
2614 #include <asm/unwind.h>
2615
2616+#include "entry-header.S"
2617+
2618 #ifdef CONFIG_NEED_RET_TO_USER
2619 #include <mach/entry-macro.S>
2620 #else
2621 .macro arch_ret_to_user, tmp1, tmp2
2622+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2623+ @ save regs
2624+ stmdb sp!, {r1, r2}
2625+ @ read DACR from cpu_domain into r1
2626+ mov r2, sp
2627+ @ assume 8K pages, since we have to split the immediate in two
2628+ bic r2, r2, #(0x1fc0)
2629+ bic r2, r2, #(0x3f)
2630+ ldr r1, [r2, #TI_CPU_DOMAIN]
2631+#ifdef CONFIG_PAX_KERNEXEC
2632+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2633+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2634+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2635+#endif
2636+#ifdef CONFIG_PAX_MEMORY_UDEREF
2637+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2638+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2639+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2640+#endif
2641+ @ write r1 to current_thread_info()->cpu_domain
2642+ str r1, [r2, #TI_CPU_DOMAIN]
2643+ @ write r1 to DACR
2644+ mcr p15, 0, r1, c3, c0, 0
2645+ @ instruction sync
2646+ instr_sync
2647+ @ restore regs
2648+ ldmia sp!, {r1, r2}
2649+#endif
2650 .endm
2651 #endif
2652
2653-#include "entry-header.S"
2654-
2655-
2656 .align 5
2657 /*
2658 * This is the fast syscall return path. We do as little as
2659@@ -173,6 +201,12 @@ ENTRY(vector_swi)
2660 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2661 #endif
2662
2663+ /*
2664+ * do this here to avoid a performance hit of wrapping the code above
2665+ * that directly dereferences userland to parse the SWI instruction
2666+ */
2667+ pax_enter_kernel_user
2668+
2669 adr tbl, sys_call_table @ load syscall table pointer
2670
2671 #if defined(CONFIG_OABI_COMPAT)
2672diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2673index 1a0045a..9b4f34d 100644
2674--- a/arch/arm/kernel/entry-header.S
2675+++ b/arch/arm/kernel/entry-header.S
2676@@ -196,6 +196,60 @@
2677 msr cpsr_c, \rtemp @ switch back to the SVC mode
2678 .endm
2679
2680+ .macro pax_enter_kernel_user
2681+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2682+ @ save regs
2683+ stmdb sp!, {r0, r1}
2684+ @ read DACR from cpu_domain into r1
2685+ mov r0, sp
2686+ @ assume 8K pages, since we have to split the immediate in two
2687+ bic r0, r0, #(0x1fc0)
2688+ bic r0, r0, #(0x3f)
2689+ ldr r1, [r0, #TI_CPU_DOMAIN]
2690+#ifdef CONFIG_PAX_MEMORY_UDEREF
2691+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2692+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2693+#endif
2694+#ifdef CONFIG_PAX_KERNEXEC
2695+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2696+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2697+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2698+#endif
2699+ @ write r1 to current_thread_info()->cpu_domain
2700+ str r1, [r0, #TI_CPU_DOMAIN]
2701+ @ write r1 to DACR
2702+ mcr p15, 0, r1, c3, c0, 0
2703+ @ instruction sync
2704+ instr_sync
2705+ @ restore regs
2706+ ldmia sp!, {r0, r1}
2707+#endif
2708+ .endm
2709+
2710+ .macro pax_exit_kernel
2711+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2712+ @ save regs
2713+ stmdb sp!, {r0, r1}
2714+ @ read old DACR from stack into r1
2715+ ldr r1, [sp, #(8 + S_SP)]
2716+ sub r1, r1, #8
2717+ ldr r1, [r1]
2718+
2719+ @ write r1 to current_thread_info()->cpu_domain
2720+ mov r0, sp
2721+ @ assume 8K pages, since we have to split the immediate in two
2722+ bic r0, r0, #(0x1fc0)
2723+ bic r0, r0, #(0x3f)
2724+ str r1, [r0, #TI_CPU_DOMAIN]
2725+ @ write r1 to DACR
2726+ mcr p15, 0, r1, c3, c0, 0
2727+ @ instruction sync
2728+ instr_sync
2729+ @ restore regs
2730+ ldmia sp!, {r0, r1}
2731+#endif
2732+ .endm
2733+
2734 #ifndef CONFIG_THUMB2_KERNEL
2735 .macro svc_exit, rpsr, irq = 0
2736 .if \irq != 0
2737@@ -215,6 +269,9 @@
2738 blne trace_hardirqs_off
2739 #endif
2740 .endif
2741+
2742+ pax_exit_kernel
2743+
2744 msr spsr_cxsf, \rpsr
2745 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2746 @ We must avoid clrex due to Cortex-A15 erratum #830321
2747@@ -291,6 +348,9 @@
2748 blne trace_hardirqs_off
2749 #endif
2750 .endif
2751+
2752+ pax_exit_kernel
2753+
2754 ldr lr, [sp, #S_SP] @ top of the stack
2755 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2756
2757diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2758index 059c3da..8e45cfc 100644
2759--- a/arch/arm/kernel/fiq.c
2760+++ b/arch/arm/kernel/fiq.c
2761@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2762 void *base = vectors_page;
2763 unsigned offset = FIQ_OFFSET;
2764
2765+ pax_open_kernel();
2766 memcpy(base + offset, start, length);
2767+ pax_close_kernel();
2768+
2769 if (!cache_is_vipt_nonaliasing())
2770 flush_icache_range((unsigned long)base + offset, offset +
2771 length);
2772diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2773index 0196327..50ac8895 100644
2774--- a/arch/arm/kernel/head.S
2775+++ b/arch/arm/kernel/head.S
2776@@ -444,7 +444,7 @@ __enable_mmu:
2777 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2778 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2779 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2780- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2781+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2782 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2783 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2784 #endif
2785diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2786index 2e11961..07f0704 100644
2787--- a/arch/arm/kernel/module.c
2788+++ b/arch/arm/kernel/module.c
2789@@ -38,12 +38,39 @@
2790 #endif
2791
2792 #ifdef CONFIG_MMU
2793-void *module_alloc(unsigned long size)
2794+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2795 {
2796+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2797+ return NULL;
2798 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2799- GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
2800+ GFP_KERNEL, prot, 0, NUMA_NO_NODE,
2801 __builtin_return_address(0));
2802 }
2803+
2804+void *module_alloc(unsigned long size)
2805+{
2806+
2807+#ifdef CONFIG_PAX_KERNEXEC
2808+ return __module_alloc(size, PAGE_KERNEL);
2809+#else
2810+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2811+#endif
2812+
2813+}
2814+
2815+#ifdef CONFIG_PAX_KERNEXEC
2816+void module_memfree_exec(void *module_region)
2817+{
2818+ module_memfree(module_region);
2819+}
2820+EXPORT_SYMBOL(module_memfree_exec);
2821+
2822+void *module_alloc_exec(unsigned long size)
2823+{
2824+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2825+}
2826+EXPORT_SYMBOL(module_alloc_exec);
2827+#endif
2828 #endif
2829
2830 int
2831diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2832index 69bda1a..755113a 100644
2833--- a/arch/arm/kernel/patch.c
2834+++ b/arch/arm/kernel/patch.c
2835@@ -66,6 +66,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2836 else
2837 __acquire(&patch_lock);
2838
2839+ pax_open_kernel();
2840 if (thumb2 && __opcode_is_thumb16(insn)) {
2841 *(u16 *)waddr = __opcode_to_mem_thumb16(insn);
2842 size = sizeof(u16);
2843@@ -97,6 +98,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2844 *(u32 *)waddr = insn;
2845 size = sizeof(u32);
2846 }
2847+ pax_close_kernel();
2848
2849 if (waddr != addr) {
2850 flush_kernel_vmap_range(waddr, twopage ? size / 2 : size);
2851diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2852index 2bf1a16..d959d40 100644
2853--- a/arch/arm/kernel/process.c
2854+++ b/arch/arm/kernel/process.c
2855@@ -213,6 +213,7 @@ void machine_power_off(void)
2856
2857 if (pm_power_off)
2858 pm_power_off();
2859+ BUG();
2860 }
2861
2862 /*
2863@@ -226,7 +227,7 @@ void machine_power_off(void)
2864 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2865 * to use. Implementing such co-ordination would be essentially impossible.
2866 */
2867-void machine_restart(char *cmd)
2868+__noreturn void machine_restart(char *cmd)
2869 {
2870 local_irq_disable();
2871 smp_send_stop();
2872@@ -252,8 +253,8 @@ void __show_regs(struct pt_regs *regs)
2873
2874 show_regs_print_info(KERN_DEFAULT);
2875
2876- print_symbol("PC is at %s\n", instruction_pointer(regs));
2877- print_symbol("LR is at %s\n", regs->ARM_lr);
2878+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2879+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2880 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2881 "sp : %08lx ip : %08lx fp : %08lx\n",
2882 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2883@@ -430,12 +431,6 @@ unsigned long get_wchan(struct task_struct *p)
2884 return 0;
2885 }
2886
2887-unsigned long arch_randomize_brk(struct mm_struct *mm)
2888-{
2889- unsigned long range_end = mm->brk + 0x02000000;
2890- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2891-}
2892-
2893 #ifdef CONFIG_MMU
2894 #ifdef CONFIG_KUSER_HELPERS
2895 /*
2896@@ -451,7 +446,7 @@ static struct vm_area_struct gate_vma = {
2897
2898 static int __init gate_vma_init(void)
2899 {
2900- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2901+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2902 return 0;
2903 }
2904 arch_initcall(gate_vma_init);
2905@@ -480,81 +475,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2906 return is_gate_vma(vma) ? "[vectors]" : NULL;
2907 }
2908
2909-/* If possible, provide a placement hint at a random offset from the
2910- * stack for the signal page.
2911- */
2912-static unsigned long sigpage_addr(const struct mm_struct *mm,
2913- unsigned int npages)
2914-{
2915- unsigned long offset;
2916- unsigned long first;
2917- unsigned long last;
2918- unsigned long addr;
2919- unsigned int slots;
2920-
2921- first = PAGE_ALIGN(mm->start_stack);
2922-
2923- last = TASK_SIZE - (npages << PAGE_SHIFT);
2924-
2925- /* No room after stack? */
2926- if (first > last)
2927- return 0;
2928-
2929- /* Just enough room? */
2930- if (first == last)
2931- return first;
2932-
2933- slots = ((last - first) >> PAGE_SHIFT) + 1;
2934-
2935- offset = get_random_int() % slots;
2936-
2937- addr = first + (offset << PAGE_SHIFT);
2938-
2939- return addr;
2940-}
2941-
2942-static struct page *signal_page;
2943-extern struct page *get_signal_page(void);
2944-
2945-static const struct vm_special_mapping sigpage_mapping = {
2946- .name = "[sigpage]",
2947- .pages = &signal_page,
2948-};
2949-
2950 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2951 {
2952 struct mm_struct *mm = current->mm;
2953- struct vm_area_struct *vma;
2954- unsigned long addr;
2955- unsigned long hint;
2956- int ret = 0;
2957-
2958- if (!signal_page)
2959- signal_page = get_signal_page();
2960- if (!signal_page)
2961- return -ENOMEM;
2962
2963 down_write(&mm->mmap_sem);
2964- hint = sigpage_addr(mm, 1);
2965- addr = get_unmapped_area(NULL, hint, PAGE_SIZE, 0, 0);
2966- if (IS_ERR_VALUE(addr)) {
2967- ret = addr;
2968- goto up_fail;
2969- }
2970-
2971- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
2972- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2973- &sigpage_mapping);
2974-
2975- if (IS_ERR(vma)) {
2976- ret = PTR_ERR(vma);
2977- goto up_fail;
2978- }
2979-
2980- mm->context.sigpage = addr;
2981-
2982- up_fail:
2983+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2984 up_write(&mm->mmap_sem);
2985- return ret;
2986+ return 0;
2987 }
2988 #endif
2989diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2990index f90fdf4..24e8c84 100644
2991--- a/arch/arm/kernel/psci.c
2992+++ b/arch/arm/kernel/psci.c
2993@@ -26,7 +26,7 @@
2994 #include <asm/psci.h>
2995 #include <asm/system_misc.h>
2996
2997-struct psci_operations psci_ops;
2998+struct psci_operations psci_ops __read_only;
2999
3000 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3001 typedef int (*psci_initcall_t)(const struct device_node *);
3002diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3003index ef9119f..31995a3 100644
3004--- a/arch/arm/kernel/ptrace.c
3005+++ b/arch/arm/kernel/ptrace.c
3006@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3007 regs->ARM_ip = ip;
3008 }
3009
3010+#ifdef CONFIG_GRKERNSEC_SETXID
3011+extern void gr_delayed_cred_worker(void);
3012+#endif
3013+
3014 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3015 {
3016 current_thread_info()->syscall = scno;
3017
3018+#ifdef CONFIG_GRKERNSEC_SETXID
3019+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3020+ gr_delayed_cred_worker();
3021+#endif
3022+
3023 /* Do the secure computing check first; failures should be fast. */
3024 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3025 if (secure_computing() == -1)
3026diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3027index 1d60beb..4aa25d5 100644
3028--- a/arch/arm/kernel/setup.c
3029+++ b/arch/arm/kernel/setup.c
3030@@ -105,21 +105,23 @@ EXPORT_SYMBOL(elf_hwcap);
3031 unsigned int elf_hwcap2 __read_mostly;
3032 EXPORT_SYMBOL(elf_hwcap2);
3033
3034+pteval_t __supported_pte_mask __read_only;
3035+pmdval_t __supported_pmd_mask __read_only;
3036
3037 #ifdef MULTI_CPU
3038-struct processor processor __read_mostly;
3039+struct processor processor __read_only;
3040 #endif
3041 #ifdef MULTI_TLB
3042-struct cpu_tlb_fns cpu_tlb __read_mostly;
3043+struct cpu_tlb_fns cpu_tlb __read_only;
3044 #endif
3045 #ifdef MULTI_USER
3046-struct cpu_user_fns cpu_user __read_mostly;
3047+struct cpu_user_fns cpu_user __read_only;
3048 #endif
3049 #ifdef MULTI_CACHE
3050-struct cpu_cache_fns cpu_cache __read_mostly;
3051+struct cpu_cache_fns cpu_cache __read_only;
3052 #endif
3053 #ifdef CONFIG_OUTER_CACHE
3054-struct outer_cache_fns outer_cache __read_mostly;
3055+struct outer_cache_fns outer_cache __read_only;
3056 EXPORT_SYMBOL(outer_cache);
3057 #endif
3058
3059@@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
3060 * Register 0 and check for VMSAv7 or PMSAv7 */
3061 unsigned int mmfr0 = read_cpuid_ext(CPUID_EXT_MMFR0);
3062 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3063- (mmfr0 & 0x000000f0) >= 0x00000030)
3064+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3065 cpu_arch = CPU_ARCH_ARMv7;
3066- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3067+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3068+ __supported_pte_mask |= L_PTE_PXN;
3069+ __supported_pmd_mask |= PMD_PXNTABLE;
3070+ }
3071+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3072 (mmfr0 & 0x000000f0) == 0x00000020)
3073 cpu_arch = CPU_ARCH_ARMv6;
3074 else
3075diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3076index 023ac90..0a69950 100644
3077--- a/arch/arm/kernel/signal.c
3078+++ b/arch/arm/kernel/signal.c
3079@@ -24,8 +24,6 @@
3080
3081 extern const unsigned long sigreturn_codes[7];
3082
3083-static unsigned long signal_return_offset;
3084-
3085 #ifdef CONFIG_CRUNCH
3086 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3087 {
3088@@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3089 * except when the MPU has protected the vectors
3090 * page from PL0
3091 */
3092- retcode = mm->context.sigpage + signal_return_offset +
3093- (idx << 2) + thumb;
3094+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3095 } else
3096 #endif
3097 {
3098@@ -603,33 +600,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3099 } while (thread_flags & _TIF_WORK_MASK);
3100 return 0;
3101 }
3102-
3103-struct page *get_signal_page(void)
3104-{
3105- unsigned long ptr;
3106- unsigned offset;
3107- struct page *page;
3108- void *addr;
3109-
3110- page = alloc_pages(GFP_KERNEL, 0);
3111-
3112- if (!page)
3113- return NULL;
3114-
3115- addr = page_address(page);
3116-
3117- /* Give the signal return code some randomness */
3118- offset = 0x200 + (get_random_int() & 0x7fc);
3119- signal_return_offset = offset;
3120-
3121- /*
3122- * Copy signal return handlers into the vector page, and
3123- * set sigreturn to be a pointer to these.
3124- */
3125- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3126-
3127- ptr = (unsigned long)addr + offset;
3128- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3129-
3130- return page;
3131-}
3132diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3133index 86ef244..c518451 100644
3134--- a/arch/arm/kernel/smp.c
3135+++ b/arch/arm/kernel/smp.c
3136@@ -76,7 +76,7 @@ enum ipi_msg_type {
3137
3138 static DECLARE_COMPLETION(cpu_running);
3139
3140-static struct smp_operations smp_ops;
3141+static struct smp_operations smp_ops __read_only;
3142
3143 void __init smp_set_ops(struct smp_operations *ops)
3144 {
3145diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3146index 7a3be1d..b00c7de 100644
3147--- a/arch/arm/kernel/tcm.c
3148+++ b/arch/arm/kernel/tcm.c
3149@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3150 .virtual = ITCM_OFFSET,
3151 .pfn = __phys_to_pfn(ITCM_OFFSET),
3152 .length = 0,
3153- .type = MT_MEMORY_RWX_ITCM,
3154+ .type = MT_MEMORY_RX_ITCM,
3155 }
3156 };
3157
3158@@ -267,7 +267,9 @@ no_dtcm:
3159 start = &__sitcm_text;
3160 end = &__eitcm_text;
3161 ram = &__itcm_start;
3162+ pax_open_kernel();
3163 memcpy(start, ram, itcm_code_sz);
3164+ pax_close_kernel();
3165 pr_debug("CPU ITCM: copied code from %p - %p\n",
3166 start, end);
3167 itcm_present = true;
3168diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3169index 788e23f..6fa06a1 100644
3170--- a/arch/arm/kernel/traps.c
3171+++ b/arch/arm/kernel/traps.c
3172@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3173 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3174 {
3175 #ifdef CONFIG_KALLSYMS
3176- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3177+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3178 #else
3179 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3180 #endif
3181@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3182 static int die_owner = -1;
3183 static unsigned int die_nest_count;
3184
3185+extern void gr_handle_kernel_exploit(void);
3186+
3187 static unsigned long oops_begin(void)
3188 {
3189 int cpu;
3190@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3191 panic("Fatal exception in interrupt");
3192 if (panic_on_oops)
3193 panic("Fatal exception");
3194+
3195+ gr_handle_kernel_exploit();
3196+
3197 if (signr)
3198 do_exit(signr);
3199 }
3200@@ -880,7 +885,11 @@ void __init early_trap_init(void *vectors_base)
3201 kuser_init(vectors_base);
3202
3203 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3204- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3205+
3206+#ifndef CONFIG_PAX_MEMORY_UDEREF
3207+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3208+#endif
3209+
3210 #else /* ifndef CONFIG_CPU_V7M */
3211 /*
3212 * on V7-M there is no need to copy the vector table to a dedicated
3213diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3214index b31aa73..cc4b7a1 100644
3215--- a/arch/arm/kernel/vmlinux.lds.S
3216+++ b/arch/arm/kernel/vmlinux.lds.S
3217@@ -37,7 +37,7 @@
3218 #endif
3219
3220 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3221- defined(CONFIG_GENERIC_BUG)
3222+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3223 #define ARM_EXIT_KEEP(x) x
3224 #define ARM_EXIT_DISCARD(x)
3225 #else
3226@@ -123,6 +123,8 @@ SECTIONS
3227 #ifdef CONFIG_DEBUG_RODATA
3228 . = ALIGN(1<<SECTION_SHIFT);
3229 #endif
3230+ _etext = .; /* End of text section */
3231+
3232 RO_DATA(PAGE_SIZE)
3233
3234 . = ALIGN(4);
3235@@ -153,8 +155,6 @@ SECTIONS
3236
3237 NOTES
3238
3239- _etext = .; /* End of text and rodata section */
3240-
3241 #ifndef CONFIG_XIP_KERNEL
3242 # ifdef CONFIG_ARM_KERNMEM_PERMS
3243 . = ALIGN(1<<SECTION_SHIFT);
3244diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3245index b652af5..60231ab 100644
3246--- a/arch/arm/kvm/arm.c
3247+++ b/arch/arm/kvm/arm.c
3248@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3249 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3250
3251 /* The VMID used in the VTTBR */
3252-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3253+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3254 static u8 kvm_next_vmid;
3255 static DEFINE_SPINLOCK(kvm_vmid_lock);
3256
3257@@ -358,7 +358,7 @@ void force_vm_exit(const cpumask_t *mask)
3258 */
3259 static bool need_new_vmid_gen(struct kvm *kvm)
3260 {
3261- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3262+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3263 }
3264
3265 /**
3266@@ -391,7 +391,7 @@ static void update_vttbr(struct kvm *kvm)
3267
3268 /* First user of a new VMID generation? */
3269 if (unlikely(kvm_next_vmid == 0)) {
3270- atomic64_inc(&kvm_vmid_gen);
3271+ atomic64_inc_unchecked(&kvm_vmid_gen);
3272 kvm_next_vmid = 1;
3273
3274 /*
3275@@ -408,7 +408,7 @@ static void update_vttbr(struct kvm *kvm)
3276 kvm_call_hyp(__kvm_flush_vm_context);
3277 }
3278
3279- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3280+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3281 kvm->arch.vmid = kvm_next_vmid;
3282 kvm_next_vmid++;
3283
3284@@ -1087,7 +1087,7 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)
3285 /**
3286 * Initialize Hyp-mode and memory mappings on all CPUs.
3287 */
3288-int kvm_arch_init(void *opaque)
3289+int kvm_arch_init(const void *opaque)
3290 {
3291 int err;
3292 int ret, cpu;
3293diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3294index 14a0d98..7771a7d 100644
3295--- a/arch/arm/lib/clear_user.S
3296+++ b/arch/arm/lib/clear_user.S
3297@@ -12,14 +12,14 @@
3298
3299 .text
3300
3301-/* Prototype: int __clear_user(void *addr, size_t sz)
3302+/* Prototype: int ___clear_user(void *addr, size_t sz)
3303 * Purpose : clear some user memory
3304 * Params : addr - user memory address to clear
3305 * : sz - number of bytes to clear
3306 * Returns : number of bytes NOT cleared
3307 */
3308 ENTRY(__clear_user_std)
3309-WEAK(__clear_user)
3310+WEAK(___clear_user)
3311 stmfd sp!, {r1, lr}
3312 mov r2, #0
3313 cmp r1, #4
3314@@ -44,7 +44,7 @@ WEAK(__clear_user)
3315 USER( strnebt r2, [r0])
3316 mov r0, #0
3317 ldmfd sp!, {r1, pc}
3318-ENDPROC(__clear_user)
3319+ENDPROC(___clear_user)
3320 ENDPROC(__clear_user_std)
3321
3322 .pushsection .fixup,"ax"
3323diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3324index 7a235b9..73a0556 100644
3325--- a/arch/arm/lib/copy_from_user.S
3326+++ b/arch/arm/lib/copy_from_user.S
3327@@ -17,7 +17,7 @@
3328 /*
3329 * Prototype:
3330 *
3331- * size_t __copy_from_user(void *to, const void *from, size_t n)
3332+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3333 *
3334 * Purpose:
3335 *
3336@@ -89,11 +89,11 @@
3337
3338 .text
3339
3340-ENTRY(__copy_from_user)
3341+ENTRY(___copy_from_user)
3342
3343 #include "copy_template.S"
3344
3345-ENDPROC(__copy_from_user)
3346+ENDPROC(___copy_from_user)
3347
3348 .pushsection .fixup,"ax"
3349 .align 0
3350diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3351index 6ee2f67..d1cce76 100644
3352--- a/arch/arm/lib/copy_page.S
3353+++ b/arch/arm/lib/copy_page.S
3354@@ -10,6 +10,7 @@
3355 * ASM optimised string functions
3356 */
3357 #include <linux/linkage.h>
3358+#include <linux/const.h>
3359 #include <asm/assembler.h>
3360 #include <asm/asm-offsets.h>
3361 #include <asm/cache.h>
3362diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3363index a9d3db1..164b089 100644
3364--- a/arch/arm/lib/copy_to_user.S
3365+++ b/arch/arm/lib/copy_to_user.S
3366@@ -17,7 +17,7 @@
3367 /*
3368 * Prototype:
3369 *
3370- * size_t __copy_to_user(void *to, const void *from, size_t n)
3371+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3372 *
3373 * Purpose:
3374 *
3375@@ -93,11 +93,11 @@
3376 .text
3377
3378 ENTRY(__copy_to_user_std)
3379-WEAK(__copy_to_user)
3380+WEAK(___copy_to_user)
3381
3382 #include "copy_template.S"
3383
3384-ENDPROC(__copy_to_user)
3385+ENDPROC(___copy_to_user)
3386 ENDPROC(__copy_to_user_std)
3387
3388 .pushsection .fixup,"ax"
3389diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3390index 7d08b43..f7ca7ea 100644
3391--- a/arch/arm/lib/csumpartialcopyuser.S
3392+++ b/arch/arm/lib/csumpartialcopyuser.S
3393@@ -57,8 +57,8 @@
3394 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3395 */
3396
3397-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3398-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3399+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3400+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3401
3402 #include "csumpartialcopygeneric.S"
3403
3404diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3405index 312d43e..21d2322 100644
3406--- a/arch/arm/lib/delay.c
3407+++ b/arch/arm/lib/delay.c
3408@@ -29,7 +29,7 @@
3409 /*
3410 * Default to the loop-based delay implementation.
3411 */
3412-struct arm_delay_ops arm_delay_ops = {
3413+struct arm_delay_ops arm_delay_ops __read_only = {
3414 .delay = __loop_delay,
3415 .const_udelay = __loop_const_udelay,
3416 .udelay = __loop_udelay,
3417diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3418index 3e58d71..029817c 100644
3419--- a/arch/arm/lib/uaccess_with_memcpy.c
3420+++ b/arch/arm/lib/uaccess_with_memcpy.c
3421@@ -136,7 +136,7 @@ out:
3422 }
3423
3424 unsigned long
3425-__copy_to_user(void __user *to, const void *from, unsigned long n)
3426+___copy_to_user(void __user *to, const void *from, unsigned long n)
3427 {
3428 /*
3429 * This test is stubbed out of the main function above to keep
3430@@ -190,7 +190,7 @@ out:
3431 return n;
3432 }
3433
3434-unsigned long __clear_user(void __user *addr, unsigned long n)
3435+unsigned long ___clear_user(void __user *addr, unsigned long n)
3436 {
3437 /* See rational for this in __copy_to_user() above. */
3438 if (n < 64)
3439diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
3440index 582ef2d..d314e82 100644
3441--- a/arch/arm/mach-exynos/suspend.c
3442+++ b/arch/arm/mach-exynos/suspend.c
3443@@ -18,6 +18,7 @@
3444 #include <linux/syscore_ops.h>
3445 #include <linux/cpu_pm.h>
3446 #include <linux/io.h>
3447+#include <linux/irq.h>
3448 #include <linux/irqchip/arm-gic.h>
3449 #include <linux/err.h>
3450 #include <linux/regulator/machine.h>
3451@@ -635,8 +636,10 @@ void __init exynos_pm_init(void)
3452 tmp |= pm_data->wake_disable_mask;
3453 pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
3454
3455- exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3456- exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3457+ pax_open_kernel();
3458+ *(void **)&exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3459+ *(void **)&exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3460+ pax_close_kernel();
3461
3462 register_syscore_ops(&exynos_pm_syscore_ops);
3463 suspend_set_ops(&exynos_suspend_ops);
3464diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3465index 0662087..004d163 100644
3466--- a/arch/arm/mach-keystone/keystone.c
3467+++ b/arch/arm/mach-keystone/keystone.c
3468@@ -27,7 +27,7 @@
3469
3470 #include "keystone.h"
3471
3472-static struct notifier_block platform_nb;
3473+static notifier_block_no_const platform_nb;
3474 static unsigned long keystone_dma_pfn_offset __read_mostly;
3475
3476 static int keystone_platform_notifier(struct notifier_block *nb,
3477diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3478index e46e9ea..9141c83 100644
3479--- a/arch/arm/mach-mvebu/coherency.c
3480+++ b/arch/arm/mach-mvebu/coherency.c
3481@@ -117,7 +117,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3482
3483 /*
3484 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3485- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3486+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3487 * is needed as a workaround for a deadlock issue between the PCIe
3488 * interface and the cache controller.
3489 */
3490@@ -130,7 +130,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3491 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3492
3493 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3494- mtype = MT_UNCACHED;
3495+ mtype = MT_UNCACHED_RW;
3496
3497 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3498 }
3499diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3500index b6443a4..20a0b74 100644
3501--- a/arch/arm/mach-omap2/board-n8x0.c
3502+++ b/arch/arm/mach-omap2/board-n8x0.c
3503@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3504 }
3505 #endif
3506
3507-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3508+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3509 .late_init = n8x0_menelaus_late_init,
3510 };
3511
3512diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3513index 79f49d9..70bf184 100644
3514--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3515+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3516@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3517 void (*resume)(void);
3518 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3519 void (*hotplug_restart)(void);
3520-};
3521+} __no_const;
3522
3523 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3524 static struct powerdomain *mpuss_pd;
3525@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3526 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3527 {}
3528
3529-struct cpu_pm_ops omap_pm_ops = {
3530+static struct cpu_pm_ops omap_pm_ops __read_only = {
3531 .finish_suspend = default_finish_suspend,
3532 .resume = dummy_cpu_resume,
3533 .scu_prepare = dummy_scu_prepare,
3534diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
3535index 5305ec7..6d74045 100644
3536--- a/arch/arm/mach-omap2/omap-smp.c
3537+++ b/arch/arm/mach-omap2/omap-smp.c
3538@@ -19,6 +19,7 @@
3539 #include <linux/device.h>
3540 #include <linux/smp.h>
3541 #include <linux/io.h>
3542+#include <linux/irq.h>
3543 #include <linux/irqchip/arm-gic.h>
3544
3545 #include <asm/smp_scu.h>
3546diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3547index f961c46..4a453dc 100644
3548--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3549+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3550@@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3551 return NOTIFY_OK;
3552 }
3553
3554-static struct notifier_block __refdata irq_hotplug_notifier = {
3555+static struct notifier_block irq_hotplug_notifier = {
3556 .notifier_call = irq_cpu_hotplug_notify,
3557 };
3558
3559diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3560index be9541e..821805f 100644
3561--- a/arch/arm/mach-omap2/omap_device.c
3562+++ b/arch/arm/mach-omap2/omap_device.c
3563@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3564 struct platform_device __init *omap_device_build(const char *pdev_name,
3565 int pdev_id,
3566 struct omap_hwmod *oh,
3567- void *pdata, int pdata_len)
3568+ const void *pdata, int pdata_len)
3569 {
3570 struct omap_hwmod *ohs[] = { oh };
3571
3572@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3573 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3574 int pdev_id,
3575 struct omap_hwmod **ohs,
3576- int oh_cnt, void *pdata,
3577+ int oh_cnt, const void *pdata,
3578 int pdata_len)
3579 {
3580 int ret = -ENOMEM;
3581diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3582index 78c02b3..c94109a 100644
3583--- a/arch/arm/mach-omap2/omap_device.h
3584+++ b/arch/arm/mach-omap2/omap_device.h
3585@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3586 /* Core code interface */
3587
3588 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3589- struct omap_hwmod *oh, void *pdata,
3590+ struct omap_hwmod *oh, const void *pdata,
3591 int pdata_len);
3592
3593 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3594 struct omap_hwmod **oh, int oh_cnt,
3595- void *pdata, int pdata_len);
3596+ const void *pdata, int pdata_len);
3597
3598 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3599 struct omap_hwmod **ohs, int oh_cnt);
3600diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3601index 355b089..2c9d7c3 100644
3602--- a/arch/arm/mach-omap2/omap_hwmod.c
3603+++ b/arch/arm/mach-omap2/omap_hwmod.c
3604@@ -193,10 +193,10 @@ struct omap_hwmod_soc_ops {
3605 int (*init_clkdm)(struct omap_hwmod *oh);
3606 void (*update_context_lost)(struct omap_hwmod *oh);
3607 int (*get_context_lost)(struct omap_hwmod *oh);
3608-};
3609+} __no_const;
3610
3611 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3612-static struct omap_hwmod_soc_ops soc_ops;
3613+static struct omap_hwmod_soc_ops soc_ops __read_only;
3614
3615 /* omap_hwmod_list contains all registered struct omap_hwmods */
3616 static LIST_HEAD(omap_hwmod_list);
3617diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3618index 95fee54..cfa9cf1 100644
3619--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3620+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3621@@ -10,6 +10,7 @@
3622
3623 #include <linux/kernel.h>
3624 #include <linux/init.h>
3625+#include <asm/pgtable.h>
3626
3627 #include "powerdomain.h"
3628
3629@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3630
3631 void __init am43xx_powerdomains_init(void)
3632 {
3633- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3634+ pax_open_kernel();
3635+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3636+ pax_close_kernel();
3637 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3638 pwrdm_register_pwrdms(powerdomains_am43xx);
3639 pwrdm_complete_init();
3640diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3641index ff0a68c..b312aa0 100644
3642--- a/arch/arm/mach-omap2/wd_timer.c
3643+++ b/arch/arm/mach-omap2/wd_timer.c
3644@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3645 struct omap_hwmod *oh;
3646 char *oh_name = "wd_timer2";
3647 char *dev_name = "omap_wdt";
3648- struct omap_wd_timer_platform_data pdata;
3649+ static struct omap_wd_timer_platform_data pdata = {
3650+ .read_reset_sources = prm_read_reset_sources
3651+ };
3652
3653 if (!cpu_class_is_omap2() || of_have_populated_dt())
3654 return 0;
3655@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3656 return -EINVAL;
3657 }
3658
3659- pdata.read_reset_sources = prm_read_reset_sources;
3660-
3661 pdev = omap_device_build(dev_name, id, oh, &pdata,
3662 sizeof(struct omap_wd_timer_platform_data));
3663 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3664diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3665index 4f25a7c..a81be85 100644
3666--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3667+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3668@@ -179,7 +179,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3669 bool entered_lp2 = false;
3670
3671 if (tegra_pending_sgi())
3672- ACCESS_ONCE(abort_flag) = true;
3673+ ACCESS_ONCE_RW(abort_flag) = true;
3674
3675 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3676
3677diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
3678index ab95f53..4b977a7 100644
3679--- a/arch/arm/mach-tegra/irq.c
3680+++ b/arch/arm/mach-tegra/irq.c
3681@@ -20,6 +20,7 @@
3682 #include <linux/cpu_pm.h>
3683 #include <linux/interrupt.h>
3684 #include <linux/io.h>
3685+#include <linux/irq.h>
3686 #include <linux/irqchip/arm-gic.h>
3687 #include <linux/irq.h>
3688 #include <linux/kernel.h>
3689diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
3690index 2cb587b..6ddfebf 100644
3691--- a/arch/arm/mach-ux500/pm.c
3692+++ b/arch/arm/mach-ux500/pm.c
3693@@ -10,6 +10,7 @@
3694 */
3695
3696 #include <linux/kernel.h>
3697+#include <linux/irq.h>
3698 #include <linux/irqchip/arm-gic.h>
3699 #include <linux/delay.h>
3700 #include <linux/io.h>
3701diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3702index 2dea8b5..6499da2 100644
3703--- a/arch/arm/mach-ux500/setup.h
3704+++ b/arch/arm/mach-ux500/setup.h
3705@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3706 .type = MT_DEVICE, \
3707 }
3708
3709-#define __MEM_DEV_DESC(x, sz) { \
3710- .virtual = IO_ADDRESS(x), \
3711- .pfn = __phys_to_pfn(x), \
3712- .length = sz, \
3713- .type = MT_MEMORY_RWX, \
3714-}
3715-
3716 extern struct smp_operations ux500_smp_ops;
3717 extern void ux500_cpu_die(unsigned int cpu);
3718
3719diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
3720index 52d768f..5f93180 100644
3721--- a/arch/arm/mach-zynq/platsmp.c
3722+++ b/arch/arm/mach-zynq/platsmp.c
3723@@ -24,6 +24,7 @@
3724 #include <linux/io.h>
3725 #include <asm/cacheflush.h>
3726 #include <asm/smp_scu.h>
3727+#include <linux/irq.h>
3728 #include <linux/irqchip/arm-gic.h>
3729 #include "common.h"
3730
3731diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3732index 9b4f29e..bbf3bfa 100644
3733--- a/arch/arm/mm/Kconfig
3734+++ b/arch/arm/mm/Kconfig
3735@@ -446,6 +446,7 @@ config CPU_32v5
3736
3737 config CPU_32v6
3738 bool
3739+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3740 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3741
3742 config CPU_32v6K
3743@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3744
3745 config CPU_USE_DOMAINS
3746 bool
3747+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3748 help
3749 This option enables or disables the use of domain switching
3750 via the set_fs() function.
3751@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3752
3753 config KUSER_HELPERS
3754 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3755- depends on MMU
3756+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3757 default y
3758 help
3759 Warning: disabling this option may break user programs.
3760@@ -812,7 +814,7 @@ config KUSER_HELPERS
3761 See Documentation/arm/kernel_user_helpers.txt for details.
3762
3763 However, the fixed address nature of these helpers can be used
3764- by ROP (return orientated programming) authors when creating
3765+ by ROP (Return Oriented Programming) authors when creating
3766 exploits.
3767
3768 If all of the binaries and libraries which run on your platform
3769diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3770index 2c0c541..4585df9 100644
3771--- a/arch/arm/mm/alignment.c
3772+++ b/arch/arm/mm/alignment.c
3773@@ -216,10 +216,12 @@ union offset_union {
3774 #define __get16_unaligned_check(ins,val,addr) \
3775 do { \
3776 unsigned int err = 0, v, a = addr; \
3777+ pax_open_userland(); \
3778 __get8_unaligned_check(ins,v,a,err); \
3779 val = v << ((BE) ? 8 : 0); \
3780 __get8_unaligned_check(ins,v,a,err); \
3781 val |= v << ((BE) ? 0 : 8); \
3782+ pax_close_userland(); \
3783 if (err) \
3784 goto fault; \
3785 } while (0)
3786@@ -233,6 +235,7 @@ union offset_union {
3787 #define __get32_unaligned_check(ins,val,addr) \
3788 do { \
3789 unsigned int err = 0, v, a = addr; \
3790+ pax_open_userland(); \
3791 __get8_unaligned_check(ins,v,a,err); \
3792 val = v << ((BE) ? 24 : 0); \
3793 __get8_unaligned_check(ins,v,a,err); \
3794@@ -241,6 +244,7 @@ union offset_union {
3795 val |= v << ((BE) ? 8 : 16); \
3796 __get8_unaligned_check(ins,v,a,err); \
3797 val |= v << ((BE) ? 0 : 24); \
3798+ pax_close_userland(); \
3799 if (err) \
3800 goto fault; \
3801 } while (0)
3802@@ -254,6 +258,7 @@ union offset_union {
3803 #define __put16_unaligned_check(ins,val,addr) \
3804 do { \
3805 unsigned int err = 0, v = val, a = addr; \
3806+ pax_open_userland(); \
3807 __asm__( FIRST_BYTE_16 \
3808 ARM( "1: "ins" %1, [%2], #1\n" ) \
3809 THUMB( "1: "ins" %1, [%2]\n" ) \
3810@@ -273,6 +278,7 @@ union offset_union {
3811 " .popsection\n" \
3812 : "=r" (err), "=&r" (v), "=&r" (a) \
3813 : "0" (err), "1" (v), "2" (a)); \
3814+ pax_close_userland(); \
3815 if (err) \
3816 goto fault; \
3817 } while (0)
3818@@ -286,6 +292,7 @@ union offset_union {
3819 #define __put32_unaligned_check(ins,val,addr) \
3820 do { \
3821 unsigned int err = 0, v = val, a = addr; \
3822+ pax_open_userland(); \
3823 __asm__( FIRST_BYTE_32 \
3824 ARM( "1: "ins" %1, [%2], #1\n" ) \
3825 THUMB( "1: "ins" %1, [%2]\n" ) \
3826@@ -315,6 +322,7 @@ union offset_union {
3827 " .popsection\n" \
3828 : "=r" (err), "=&r" (v), "=&r" (a) \
3829 : "0" (err), "1" (v), "2" (a)); \
3830+ pax_close_userland(); \
3831 if (err) \
3832 goto fault; \
3833 } while (0)
3834diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3835index 8f15f70..d599a2b 100644
3836--- a/arch/arm/mm/cache-l2x0.c
3837+++ b/arch/arm/mm/cache-l2x0.c
3838@@ -43,7 +43,7 @@ struct l2c_init_data {
3839 void (*save)(void __iomem *);
3840 void (*configure)(void __iomem *);
3841 struct outer_cache_fns outer_cache;
3842-};
3843+} __do_const;
3844
3845 #define CACHE_LINE_SIZE 32
3846
3847diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3848index 845769e..4278fd7 100644
3849--- a/arch/arm/mm/context.c
3850+++ b/arch/arm/mm/context.c
3851@@ -43,7 +43,7 @@
3852 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3853
3854 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3855-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3856+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3857 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3858
3859 static DEFINE_PER_CPU(atomic64_t, active_asids);
3860@@ -178,7 +178,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3861 {
3862 static u32 cur_idx = 1;
3863 u64 asid = atomic64_read(&mm->context.id);
3864- u64 generation = atomic64_read(&asid_generation);
3865+ u64 generation = atomic64_read_unchecked(&asid_generation);
3866
3867 if (asid != 0) {
3868 /*
3869@@ -208,7 +208,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3870 */
3871 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3872 if (asid == NUM_USER_ASIDS) {
3873- generation = atomic64_add_return(ASID_FIRST_VERSION,
3874+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3875 &asid_generation);
3876 flush_context(cpu);
3877 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3878@@ -240,14 +240,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3879 cpu_set_reserved_ttbr0();
3880
3881 asid = atomic64_read(&mm->context.id);
3882- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3883+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3884 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3885 goto switch_mm_fastpath;
3886
3887 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3888 /* Check that our ASID belongs to the current generation. */
3889 asid = atomic64_read(&mm->context.id);
3890- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3891+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3892 asid = new_context(mm, cpu);
3893 atomic64_set(&mm->context.id, asid);
3894 }
3895diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3896index 6333d9c..3bb19f2 100644
3897--- a/arch/arm/mm/fault.c
3898+++ b/arch/arm/mm/fault.c
3899@@ -25,6 +25,7 @@
3900 #include <asm/system_misc.h>
3901 #include <asm/system_info.h>
3902 #include <asm/tlbflush.h>
3903+#include <asm/sections.h>
3904
3905 #include "fault.h"
3906
3907@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3908 if (fixup_exception(regs))
3909 return;
3910
3911+#ifdef CONFIG_PAX_MEMORY_UDEREF
3912+ if (addr < TASK_SIZE) {
3913+ if (current->signal->curr_ip)
3914+ printk(KERN_EMERG "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),
3915+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3916+ else
3917+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3918+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3919+ }
3920+#endif
3921+
3922+#ifdef CONFIG_PAX_KERNEXEC
3923+ if ((fsr & FSR_WRITE) &&
3924+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3925+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3926+ {
3927+ if (current->signal->curr_ip)
3928+ printk(KERN_EMERG "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),
3929+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3930+ else
3931+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3932+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3933+ }
3934+#endif
3935+
3936 /*
3937 * No handler, we'll have to terminate things with extreme prejudice.
3938 */
3939@@ -173,6 +199,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3940 }
3941 #endif
3942
3943+#ifdef CONFIG_PAX_PAGEEXEC
3944+ if (fsr & FSR_LNX_PF) {
3945+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3946+ do_group_exit(SIGKILL);
3947+ }
3948+#endif
3949+
3950 tsk->thread.address = addr;
3951 tsk->thread.error_code = fsr;
3952 tsk->thread.trap_no = 14;
3953@@ -400,6 +433,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3954 }
3955 #endif /* CONFIG_MMU */
3956
3957+#ifdef CONFIG_PAX_PAGEEXEC
3958+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3959+{
3960+ long i;
3961+
3962+ printk(KERN_ERR "PAX: bytes at PC: ");
3963+ for (i = 0; i < 20; i++) {
3964+ unsigned char c;
3965+ if (get_user(c, (__force unsigned char __user *)pc+i))
3966+ printk(KERN_CONT "?? ");
3967+ else
3968+ printk(KERN_CONT "%02x ", c);
3969+ }
3970+ printk("\n");
3971+
3972+ printk(KERN_ERR "PAX: bytes at SP-4: ");
3973+ for (i = -1; i < 20; i++) {
3974+ unsigned long c;
3975+ if (get_user(c, (__force unsigned long __user *)sp+i))
3976+ printk(KERN_CONT "???????? ");
3977+ else
3978+ printk(KERN_CONT "%08lx ", c);
3979+ }
3980+ printk("\n");
3981+}
3982+#endif
3983+
3984 /*
3985 * First Level Translation Fault Handler
3986 *
3987@@ -547,9 +607,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3988 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
3989 struct siginfo info;
3990
3991+#ifdef CONFIG_PAX_MEMORY_UDEREF
3992+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
3993+ if (current->signal->curr_ip)
3994+ printk(KERN_EMERG "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),
3995+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3996+ else
3997+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3998+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3999+ goto die;
4000+ }
4001+#endif
4002+
4003 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4004 return;
4005
4006+die:
4007 pr_alert("Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4008 inf->name, fsr, addr);
4009 show_pte(current->mm, addr);
4010@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4011 ifsr_info[nr].name = name;
4012 }
4013
4014+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4015+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4016+
4017 asmlinkage void __exception
4018 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4019 {
4020 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4021 struct siginfo info;
4022+ unsigned long pc = instruction_pointer(regs);
4023+
4024+ if (user_mode(regs)) {
4025+ unsigned long sigpage = current->mm->context.sigpage;
4026+
4027+ if (sigpage <= pc && pc < sigpage + 7*4) {
4028+ if (pc < sigpage + 3*4)
4029+ sys_sigreturn(regs);
4030+ else
4031+ sys_rt_sigreturn(regs);
4032+ return;
4033+ }
4034+ if (pc == 0xffff0f60UL) {
4035+ /*
4036+ * PaX: __kuser_cmpxchg64 emulation
4037+ */
4038+ // TODO
4039+ //regs->ARM_pc = regs->ARM_lr;
4040+ //return;
4041+ }
4042+ if (pc == 0xffff0fa0UL) {
4043+ /*
4044+ * PaX: __kuser_memory_barrier emulation
4045+ */
4046+ // dmb(); implied by the exception
4047+ regs->ARM_pc = regs->ARM_lr;
4048+ return;
4049+ }
4050+ if (pc == 0xffff0fc0UL) {
4051+ /*
4052+ * PaX: __kuser_cmpxchg emulation
4053+ */
4054+ // TODO
4055+ //long new;
4056+ //int op;
4057+
4058+ //op = FUTEX_OP_SET << 28;
4059+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4060+ //regs->ARM_r0 = old != new;
4061+ //regs->ARM_pc = regs->ARM_lr;
4062+ //return;
4063+ }
4064+ if (pc == 0xffff0fe0UL) {
4065+ /*
4066+ * PaX: __kuser_get_tls emulation
4067+ */
4068+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4069+ regs->ARM_pc = regs->ARM_lr;
4070+ return;
4071+ }
4072+ }
4073+
4074+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4075+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4076+ if (current->signal->curr_ip)
4077+ printk(KERN_EMERG "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),
4078+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4079+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4080+ else
4081+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4082+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4083+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4084+ goto die;
4085+ }
4086+#endif
4087+
4088+#ifdef CONFIG_PAX_REFCOUNT
4089+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4090+#ifdef CONFIG_THUMB2_KERNEL
4091+ unsigned short bkpt;
4092+
4093+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4094+#else
4095+ unsigned int bkpt;
4096+
4097+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4098+#endif
4099+ current->thread.error_code = ifsr;
4100+ current->thread.trap_no = 0;
4101+ pax_report_refcount_overflow(regs);
4102+ fixup_exception(regs);
4103+ return;
4104+ }
4105+ }
4106+#endif
4107
4108 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4109 return;
4110
4111+die:
4112 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4113 inf->name, ifsr, addr);
4114
4115diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4116index cf08bdf..772656c 100644
4117--- a/arch/arm/mm/fault.h
4118+++ b/arch/arm/mm/fault.h
4119@@ -3,6 +3,7 @@
4120
4121 /*
4122 * Fault status register encodings. We steal bit 31 for our own purposes.
4123+ * Set when the FSR value is from an instruction fault.
4124 */
4125 #define FSR_LNX_PF (1 << 31)
4126 #define FSR_WRITE (1 << 11)
4127@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4128 }
4129 #endif
4130
4131+/* valid for LPAE and !LPAE */
4132+static inline int is_xn_fault(unsigned int fsr)
4133+{
4134+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4135+}
4136+
4137+static inline int is_domain_fault(unsigned int fsr)
4138+{
4139+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4140+}
4141+
4142 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4143 unsigned long search_exception_table(unsigned long addr);
4144
4145diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4146index 1609b02..def0785 100644
4147--- a/arch/arm/mm/init.c
4148+++ b/arch/arm/mm/init.c
4149@@ -755,7 +755,46 @@ void free_tcmmem(void)
4150 {
4151 #ifdef CONFIG_HAVE_TCM
4152 extern char __tcm_start, __tcm_end;
4153+#endif
4154
4155+#ifdef CONFIG_PAX_KERNEXEC
4156+ unsigned long addr;
4157+ pgd_t *pgd;
4158+ pud_t *pud;
4159+ pmd_t *pmd;
4160+ int cpu_arch = cpu_architecture();
4161+ unsigned int cr = get_cr();
4162+
4163+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4164+ /* make pages tables, etc before .text NX */
4165+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4166+ pgd = pgd_offset_k(addr);
4167+ pud = pud_offset(pgd, addr);
4168+ pmd = pmd_offset(pud, addr);
4169+ __section_update(pmd, addr, PMD_SECT_XN);
4170+ }
4171+ /* make init NX */
4172+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4173+ pgd = pgd_offset_k(addr);
4174+ pud = pud_offset(pgd, addr);
4175+ pmd = pmd_offset(pud, addr);
4176+ __section_update(pmd, addr, PMD_SECT_XN);
4177+ }
4178+ /* make kernel code/rodata RX */
4179+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4180+ pgd = pgd_offset_k(addr);
4181+ pud = pud_offset(pgd, addr);
4182+ pmd = pmd_offset(pud, addr);
4183+#ifdef CONFIG_ARM_LPAE
4184+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4185+#else
4186+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4187+#endif
4188+ }
4189+ }
4190+#endif
4191+
4192+#ifdef CONFIG_HAVE_TCM
4193 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4194 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4195 #endif
4196diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4197index d1e5ad7..84dcbf2 100644
4198--- a/arch/arm/mm/ioremap.c
4199+++ b/arch/arm/mm/ioremap.c
4200@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4201 unsigned int mtype;
4202
4203 if (cached)
4204- mtype = MT_MEMORY_RWX;
4205+ mtype = MT_MEMORY_RX;
4206 else
4207- mtype = MT_MEMORY_RWX_NONCACHED;
4208+ mtype = MT_MEMORY_RX_NONCACHED;
4209
4210 return __arm_ioremap_caller(phys_addr, size, mtype,
4211 __builtin_return_address(0));
4212diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4213index 5e85ed3..b10a7ed 100644
4214--- a/arch/arm/mm/mmap.c
4215+++ b/arch/arm/mm/mmap.c
4216@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4217 struct vm_area_struct *vma;
4218 int do_align = 0;
4219 int aliasing = cache_is_vipt_aliasing();
4220+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4221 struct vm_unmapped_area_info info;
4222
4223 /*
4224@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4225 if (len > TASK_SIZE)
4226 return -ENOMEM;
4227
4228+#ifdef CONFIG_PAX_RANDMMAP
4229+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4230+#endif
4231+
4232 if (addr) {
4233 if (do_align)
4234 addr = COLOUR_ALIGN(addr, pgoff);
4235@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4236 addr = PAGE_ALIGN(addr);
4237
4238 vma = find_vma(mm, addr);
4239- if (TASK_SIZE - len >= addr &&
4240- (!vma || addr + len <= vma->vm_start))
4241+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4242 return addr;
4243 }
4244
4245@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4246 info.high_limit = TASK_SIZE;
4247 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4248 info.align_offset = pgoff << PAGE_SHIFT;
4249+ info.threadstack_offset = offset;
4250 return vm_unmapped_area(&info);
4251 }
4252
4253@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4254 unsigned long addr = addr0;
4255 int do_align = 0;
4256 int aliasing = cache_is_vipt_aliasing();
4257+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4258 struct vm_unmapped_area_info info;
4259
4260 /*
4261@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4262 return addr;
4263 }
4264
4265+#ifdef CONFIG_PAX_RANDMMAP
4266+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4267+#endif
4268+
4269 /* requesting a specific address */
4270 if (addr) {
4271 if (do_align)
4272@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4273 else
4274 addr = PAGE_ALIGN(addr);
4275 vma = find_vma(mm, addr);
4276- if (TASK_SIZE - len >= addr &&
4277- (!vma || addr + len <= vma->vm_start))
4278+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4279 return addr;
4280 }
4281
4282@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4283 info.high_limit = mm->mmap_base;
4284 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4285 info.align_offset = pgoff << PAGE_SHIFT;
4286+ info.threadstack_offset = offset;
4287 addr = vm_unmapped_area(&info);
4288
4289 /*
4290@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4291 {
4292 unsigned long random_factor = 0UL;
4293
4294+#ifdef CONFIG_PAX_RANDMMAP
4295+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4296+#endif
4297+
4298 /* 8 bits of randomness in 20 address space bits */
4299 if ((current->flags & PF_RANDOMIZE) &&
4300 !(current->personality & ADDR_NO_RANDOMIZE))
4301@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4302
4303 if (mmap_is_legacy()) {
4304 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4305+
4306+#ifdef CONFIG_PAX_RANDMMAP
4307+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4308+ mm->mmap_base += mm->delta_mmap;
4309+#endif
4310+
4311 mm->get_unmapped_area = arch_get_unmapped_area;
4312 } else {
4313 mm->mmap_base = mmap_base(random_factor);
4314+
4315+#ifdef CONFIG_PAX_RANDMMAP
4316+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4317+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4318+#endif
4319+
4320 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4321 }
4322 }
4323diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4324index 7186382..0c145cf 100644
4325--- a/arch/arm/mm/mmu.c
4326+++ b/arch/arm/mm/mmu.c
4327@@ -41,6 +41,22 @@
4328 #include "mm.h"
4329 #include "tcm.h"
4330
4331+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4332+void modify_domain(unsigned int dom, unsigned int type)
4333+{
4334+ struct thread_info *thread = current_thread_info();
4335+ unsigned int domain = thread->cpu_domain;
4336+ /*
4337+ * DOMAIN_MANAGER might be defined to some other value,
4338+ * use the arch-defined constant
4339+ */
4340+ domain &= ~domain_val(dom, 3);
4341+ thread->cpu_domain = domain | domain_val(dom, type);
4342+ set_domain(thread->cpu_domain);
4343+}
4344+EXPORT_SYMBOL(modify_domain);
4345+#endif
4346+
4347 /*
4348 * empty_zero_page is a special page that is used for
4349 * zero-initialized data and COW.
4350@@ -242,7 +258,15 @@ __setup("noalign", noalign_setup);
4351 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4352 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4353
4354-static struct mem_type mem_types[] = {
4355+#ifdef CONFIG_PAX_KERNEXEC
4356+#define L_PTE_KERNEXEC L_PTE_RDONLY
4357+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4358+#else
4359+#define L_PTE_KERNEXEC L_PTE_DIRTY
4360+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4361+#endif
4362+
4363+static struct mem_type mem_types[] __read_only = {
4364 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4365 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4366 L_PTE_SHARED,
4367@@ -271,19 +295,19 @@ static struct mem_type mem_types[] = {
4368 .prot_sect = PROT_SECT_DEVICE,
4369 .domain = DOMAIN_IO,
4370 },
4371- [MT_UNCACHED] = {
4372+ [MT_UNCACHED_RW] = {
4373 .prot_pte = PROT_PTE_DEVICE,
4374 .prot_l1 = PMD_TYPE_TABLE,
4375 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4376 .domain = DOMAIN_IO,
4377 },
4378- [MT_CACHECLEAN] = {
4379- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4380+ [MT_CACHECLEAN_RO] = {
4381+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4382 .domain = DOMAIN_KERNEL,
4383 },
4384 #ifndef CONFIG_ARM_LPAE
4385- [MT_MINICLEAN] = {
4386- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4387+ [MT_MINICLEAN_RO] = {
4388+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4389 .domain = DOMAIN_KERNEL,
4390 },
4391 #endif
4392@@ -291,15 +315,15 @@ static struct mem_type mem_types[] = {
4393 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4394 L_PTE_RDONLY,
4395 .prot_l1 = PMD_TYPE_TABLE,
4396- .domain = DOMAIN_USER,
4397+ .domain = DOMAIN_VECTORS,
4398 },
4399 [MT_HIGH_VECTORS] = {
4400 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4401 L_PTE_USER | L_PTE_RDONLY,
4402 .prot_l1 = PMD_TYPE_TABLE,
4403- .domain = DOMAIN_USER,
4404+ .domain = DOMAIN_VECTORS,
4405 },
4406- [MT_MEMORY_RWX] = {
4407+ [__MT_MEMORY_RWX] = {
4408 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4409 .prot_l1 = PMD_TYPE_TABLE,
4410 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4411@@ -312,17 +336,30 @@ static struct mem_type mem_types[] = {
4412 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4413 .domain = DOMAIN_KERNEL,
4414 },
4415- [MT_ROM] = {
4416- .prot_sect = PMD_TYPE_SECT,
4417+ [MT_MEMORY_RX] = {
4418+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4419+ .prot_l1 = PMD_TYPE_TABLE,
4420+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4421+ .domain = DOMAIN_KERNEL,
4422+ },
4423+ [MT_ROM_RX] = {
4424+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4425 .domain = DOMAIN_KERNEL,
4426 },
4427- [MT_MEMORY_RWX_NONCACHED] = {
4428+ [MT_MEMORY_RW_NONCACHED] = {
4429 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4430 L_PTE_MT_BUFFERABLE,
4431 .prot_l1 = PMD_TYPE_TABLE,
4432 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4433 .domain = DOMAIN_KERNEL,
4434 },
4435+ [MT_MEMORY_RX_NONCACHED] = {
4436+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4437+ L_PTE_MT_BUFFERABLE,
4438+ .prot_l1 = PMD_TYPE_TABLE,
4439+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4440+ .domain = DOMAIN_KERNEL,
4441+ },
4442 [MT_MEMORY_RW_DTCM] = {
4443 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4444 L_PTE_XN,
4445@@ -330,9 +367,10 @@ static struct mem_type mem_types[] = {
4446 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4447 .domain = DOMAIN_KERNEL,
4448 },
4449- [MT_MEMORY_RWX_ITCM] = {
4450- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4451+ [MT_MEMORY_RX_ITCM] = {
4452+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4453 .prot_l1 = PMD_TYPE_TABLE,
4454+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4455 .domain = DOMAIN_KERNEL,
4456 },
4457 [MT_MEMORY_RW_SO] = {
4458@@ -544,9 +582,14 @@ static void __init build_mem_type_table(void)
4459 * Mark cache clean areas and XIP ROM read only
4460 * from SVC mode and no access from userspace.
4461 */
4462- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4463- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4464- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4465+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4466+#ifdef CONFIG_PAX_KERNEXEC
4467+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4468+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4469+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4470+#endif
4471+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4472+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4473 #endif
4474
4475 /*
4476@@ -563,13 +606,17 @@ static void __init build_mem_type_table(void)
4477 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4478 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4479 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4480- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4481- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4482+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4483+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4484 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4485 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4486+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4487+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4488 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4489- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4490- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4491+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4492+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4493+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4494+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4495 }
4496 }
4497
4498@@ -580,15 +627,20 @@ static void __init build_mem_type_table(void)
4499 if (cpu_arch >= CPU_ARCH_ARMv6) {
4500 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4501 /* Non-cacheable Normal is XCB = 001 */
4502- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4503+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4504+ PMD_SECT_BUFFERED;
4505+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4506 PMD_SECT_BUFFERED;
4507 } else {
4508 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4509- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4510+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4511+ PMD_SECT_TEX(1);
4512+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4513 PMD_SECT_TEX(1);
4514 }
4515 } else {
4516- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4517+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4518+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4519 }
4520
4521 #ifdef CONFIG_ARM_LPAE
4522@@ -609,6 +661,8 @@ static void __init build_mem_type_table(void)
4523 user_pgprot |= PTE_EXT_PXN;
4524 #endif
4525
4526+ user_pgprot |= __supported_pte_mask;
4527+
4528 for (i = 0; i < 16; i++) {
4529 pteval_t v = pgprot_val(protection_map[i]);
4530 protection_map[i] = __pgprot(v | user_pgprot);
4531@@ -626,21 +680,24 @@ static void __init build_mem_type_table(void)
4532
4533 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4534 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4535- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4536- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4537+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4538+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4539 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4540 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4541+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4542+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4543 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4544- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4545- mem_types[MT_ROM].prot_sect |= cp->pmd;
4546+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4547+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4548+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4549
4550 switch (cp->pmd) {
4551 case PMD_SECT_WT:
4552- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4553+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4554 break;
4555 case PMD_SECT_WB:
4556 case PMD_SECT_WBWA:
4557- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4558+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4559 break;
4560 }
4561 pr_info("Memory policy: %sData cache %s\n",
4562@@ -854,7 +911,7 @@ static void __init create_mapping(struct map_desc *md)
4563 return;
4564 }
4565
4566- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4567+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4568 md->virtual >= PAGE_OFFSET &&
4569 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4570 pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
4571@@ -1218,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4572 * called function. This means you can't use any function or debugging
4573 * method which may touch any device, otherwise the kernel _will_ crash.
4574 */
4575+
4576+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4577+
4578 static void __init devicemaps_init(const struct machine_desc *mdesc)
4579 {
4580 struct map_desc map;
4581 unsigned long addr;
4582- void *vectors;
4583
4584- /*
4585- * Allocate the vector page early.
4586- */
4587- vectors = early_alloc(PAGE_SIZE * 2);
4588-
4589- early_trap_init(vectors);
4590+ early_trap_init(&vectors);
4591
4592 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4593 pmd_clear(pmd_off_k(addr));
4594@@ -1242,7 +1296,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4595 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4596 map.virtual = MODULES_VADDR;
4597 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4598- map.type = MT_ROM;
4599+ map.type = MT_ROM_RX;
4600 create_mapping(&map);
4601 #endif
4602
4603@@ -1253,14 +1307,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4604 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4605 map.virtual = FLUSH_BASE;
4606 map.length = SZ_1M;
4607- map.type = MT_CACHECLEAN;
4608+ map.type = MT_CACHECLEAN_RO;
4609 create_mapping(&map);
4610 #endif
4611 #ifdef FLUSH_BASE_MINICACHE
4612 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4613 map.virtual = FLUSH_BASE_MINICACHE;
4614 map.length = SZ_1M;
4615- map.type = MT_MINICLEAN;
4616+ map.type = MT_MINICLEAN_RO;
4617 create_mapping(&map);
4618 #endif
4619
4620@@ -1269,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4621 * location (0xffff0000). If we aren't using high-vectors, also
4622 * create a mapping at the low-vectors virtual address.
4623 */
4624- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4625+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4626 map.virtual = 0xffff0000;
4627 map.length = PAGE_SIZE;
4628 #ifdef CONFIG_KUSER_HELPERS
4629@@ -1329,8 +1383,10 @@ static void __init kmap_init(void)
4630 static void __init map_lowmem(void)
4631 {
4632 struct memblock_region *reg;
4633+#ifndef CONFIG_PAX_KERNEXEC
4634 phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4635 phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4636+#endif
4637
4638 /* Map all the lowmem memory banks. */
4639 for_each_memblock(memory, reg) {
4640@@ -1343,11 +1399,48 @@ static void __init map_lowmem(void)
4641 if (start >= end)
4642 break;
4643
4644+#ifdef CONFIG_PAX_KERNEXEC
4645+ map.pfn = __phys_to_pfn(start);
4646+ map.virtual = __phys_to_virt(start);
4647+ map.length = end - start;
4648+
4649+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4650+ struct map_desc kernel;
4651+ struct map_desc initmap;
4652+
4653+ /* when freeing initmem we will make this RW */
4654+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4655+ initmap.virtual = (unsigned long)__init_begin;
4656+ initmap.length = _sdata - __init_begin;
4657+ initmap.type = __MT_MEMORY_RWX;
4658+ create_mapping(&initmap);
4659+
4660+ /* when freeing initmem we will make this RX */
4661+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4662+ kernel.virtual = (unsigned long)_stext;
4663+ kernel.length = __init_begin - _stext;
4664+ kernel.type = __MT_MEMORY_RWX;
4665+ create_mapping(&kernel);
4666+
4667+ if (map.virtual < (unsigned long)_stext) {
4668+ map.length = (unsigned long)_stext - map.virtual;
4669+ map.type = __MT_MEMORY_RWX;
4670+ create_mapping(&map);
4671+ }
4672+
4673+ map.pfn = __phys_to_pfn(__pa(_sdata));
4674+ map.virtual = (unsigned long)_sdata;
4675+ map.length = end - __pa(_sdata);
4676+ }
4677+
4678+ map.type = MT_MEMORY_RW;
4679+ create_mapping(&map);
4680+#else
4681 if (end < kernel_x_start) {
4682 map.pfn = __phys_to_pfn(start);
4683 map.virtual = __phys_to_virt(start);
4684 map.length = end - start;
4685- map.type = MT_MEMORY_RWX;
4686+ map.type = __MT_MEMORY_RWX;
4687
4688 create_mapping(&map);
4689 } else if (start >= kernel_x_end) {
4690@@ -1371,7 +1464,7 @@ static void __init map_lowmem(void)
4691 map.pfn = __phys_to_pfn(kernel_x_start);
4692 map.virtual = __phys_to_virt(kernel_x_start);
4693 map.length = kernel_x_end - kernel_x_start;
4694- map.type = MT_MEMORY_RWX;
4695+ map.type = __MT_MEMORY_RWX;
4696
4697 create_mapping(&map);
4698
4699@@ -1384,6 +1477,7 @@ static void __init map_lowmem(void)
4700 create_mapping(&map);
4701 }
4702 }
4703+#endif
4704 }
4705 }
4706
4707diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4708index f412b53..fc89433 100644
4709--- a/arch/arm/net/bpf_jit_32.c
4710+++ b/arch/arm/net/bpf_jit_32.c
4711@@ -20,6 +20,7 @@
4712 #include <asm/cacheflush.h>
4713 #include <asm/hwcap.h>
4714 #include <asm/opcodes.h>
4715+#include <asm/pgtable.h>
4716
4717 #include "bpf_jit_32.h"
4718
4719@@ -71,7 +72,11 @@ struct jit_ctx {
4720 #endif
4721 };
4722
4723+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4724+int bpf_jit_enable __read_only;
4725+#else
4726 int bpf_jit_enable __read_mostly;
4727+#endif
4728
4729 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4730 {
4731@@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4732 {
4733 u32 *ptr;
4734 /* We are guaranteed to have aligned memory. */
4735+ pax_open_kernel();
4736 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4737 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4738+ pax_close_kernel();
4739 }
4740
4741 static void build_prologue(struct jit_ctx *ctx)
4742diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4743index 5b217f4..c23f40e 100644
4744--- a/arch/arm/plat-iop/setup.c
4745+++ b/arch/arm/plat-iop/setup.c
4746@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4747 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4748 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4749 .length = IOP3XX_PERIPHERAL_SIZE,
4750- .type = MT_UNCACHED,
4751+ .type = MT_UNCACHED_RW,
4752 },
4753 };
4754
4755diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4756index a5bc92d..0bb4730 100644
4757--- a/arch/arm/plat-omap/sram.c
4758+++ b/arch/arm/plat-omap/sram.c
4759@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4760 * Looks like we need to preserve some bootloader code at the
4761 * beginning of SRAM for jumping to flash for reboot to work...
4762 */
4763+ pax_open_kernel();
4764 memset_io(omap_sram_base + omap_sram_skip, 0,
4765 omap_sram_size - omap_sram_skip);
4766+ pax_close_kernel();
4767 }
4768diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
4769index 7047051..44e8675 100644
4770--- a/arch/arm64/include/asm/atomic.h
4771+++ b/arch/arm64/include/asm/atomic.h
4772@@ -252,5 +252,15 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
4773 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
4774 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
4775
4776+#define atomic64_read_unchecked(v) atomic64_read(v)
4777+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4778+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4779+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4780+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4781+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4782+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4783+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4784+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4785+
4786 #endif
4787 #endif
4788diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4789index a5abb00..9cbca9a 100644
4790--- a/arch/arm64/include/asm/barrier.h
4791+++ b/arch/arm64/include/asm/barrier.h
4792@@ -44,7 +44,7 @@
4793 do { \
4794 compiletime_assert_atomic_type(*p); \
4795 barrier(); \
4796- ACCESS_ONCE(*p) = (v); \
4797+ ACCESS_ONCE_RW(*p) = (v); \
4798 } while (0)
4799
4800 #define smp_load_acquire(p) \
4801diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
4802index 4fde8c1..441f84f 100644
4803--- a/arch/arm64/include/asm/percpu.h
4804+++ b/arch/arm64/include/asm/percpu.h
4805@@ -135,16 +135,16 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)
4806 {
4807 switch (size) {
4808 case 1:
4809- ACCESS_ONCE(*(u8 *)ptr) = (u8)val;
4810+ ACCESS_ONCE_RW(*(u8 *)ptr) = (u8)val;
4811 break;
4812 case 2:
4813- ACCESS_ONCE(*(u16 *)ptr) = (u16)val;
4814+ ACCESS_ONCE_RW(*(u16 *)ptr) = (u16)val;
4815 break;
4816 case 4:
4817- ACCESS_ONCE(*(u32 *)ptr) = (u32)val;
4818+ ACCESS_ONCE_RW(*(u32 *)ptr) = (u32)val;
4819 break;
4820 case 8:
4821- ACCESS_ONCE(*(u64 *)ptr) = (u64)val;
4822+ ACCESS_ONCE_RW(*(u64 *)ptr) = (u64)val;
4823 break;
4824 default:
4825 BUILD_BUG();
4826diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h
4827index e20df38..027ede3 100644
4828--- a/arch/arm64/include/asm/pgalloc.h
4829+++ b/arch/arm64/include/asm/pgalloc.h
4830@@ -46,6 +46,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4831 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
4832 }
4833
4834+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4835+{
4836+ pud_populate(mm, pud, pmd);
4837+}
4838+
4839 #endif /* CONFIG_ARM64_PGTABLE_LEVELS > 2 */
4840
4841 #if CONFIG_ARM64_PGTABLE_LEVELS > 3
4842diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4843index 07e1ba44..ec8cbbb 100644
4844--- a/arch/arm64/include/asm/uaccess.h
4845+++ b/arch/arm64/include/asm/uaccess.h
4846@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4847 flag; \
4848 })
4849
4850+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4851 #define access_ok(type, addr, size) __range_ok(addr, size)
4852 #define user_addr_max get_fs
4853
4854diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
4855index b0bd4e5..54e82f6 100644
4856--- a/arch/arm64/mm/dma-mapping.c
4857+++ b/arch/arm64/mm/dma-mapping.c
4858@@ -134,7 +134,7 @@ static void __dma_free_coherent(struct device *dev, size_t size,
4859 phys_to_page(paddr),
4860 size >> PAGE_SHIFT);
4861 if (!freed)
4862- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
4863+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
4864 }
4865
4866 static void *__dma_alloc(struct device *dev, size_t size,
4867diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4868index c3a58a1..78fbf54 100644
4869--- a/arch/avr32/include/asm/cache.h
4870+++ b/arch/avr32/include/asm/cache.h
4871@@ -1,8 +1,10 @@
4872 #ifndef __ASM_AVR32_CACHE_H
4873 #define __ASM_AVR32_CACHE_H
4874
4875+#include <linux/const.h>
4876+
4877 #define L1_CACHE_SHIFT 5
4878-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4879+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4880
4881 /*
4882 * Memory returned by kmalloc() may be used for DMA, so we must make
4883diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4884index d232888..87c8df1 100644
4885--- a/arch/avr32/include/asm/elf.h
4886+++ b/arch/avr32/include/asm/elf.h
4887@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4888 the loader. We need to make sure that it is out of the way of the program
4889 that it will "exec", and that there is sufficient room for the brk. */
4890
4891-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4892+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4893
4894+#ifdef CONFIG_PAX_ASLR
4895+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4896+
4897+#define PAX_DELTA_MMAP_LEN 15
4898+#define PAX_DELTA_STACK_LEN 15
4899+#endif
4900
4901 /* This yields a mask that user programs can use to figure out what
4902 instruction set this CPU supports. This could be done in user space,
4903diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4904index 479330b..53717a8 100644
4905--- a/arch/avr32/include/asm/kmap_types.h
4906+++ b/arch/avr32/include/asm/kmap_types.h
4907@@ -2,9 +2,9 @@
4908 #define __ASM_AVR32_KMAP_TYPES_H
4909
4910 #ifdef CONFIG_DEBUG_HIGHMEM
4911-# define KM_TYPE_NR 29
4912+# define KM_TYPE_NR 30
4913 #else
4914-# define KM_TYPE_NR 14
4915+# define KM_TYPE_NR 15
4916 #endif
4917
4918 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4919diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4920index d223a8b..69c5210 100644
4921--- a/arch/avr32/mm/fault.c
4922+++ b/arch/avr32/mm/fault.c
4923@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4924
4925 int exception_trace = 1;
4926
4927+#ifdef CONFIG_PAX_PAGEEXEC
4928+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4929+{
4930+ unsigned long i;
4931+
4932+ printk(KERN_ERR "PAX: bytes at PC: ");
4933+ for (i = 0; i < 20; i++) {
4934+ unsigned char c;
4935+ if (get_user(c, (unsigned char *)pc+i))
4936+ printk(KERN_CONT "???????? ");
4937+ else
4938+ printk(KERN_CONT "%02x ", c);
4939+ }
4940+ printk("\n");
4941+}
4942+#endif
4943+
4944 /*
4945 * This routine handles page faults. It determines the address and the
4946 * problem, and then passes it off to one of the appropriate routines.
4947@@ -178,6 +195,16 @@ bad_area:
4948 up_read(&mm->mmap_sem);
4949
4950 if (user_mode(regs)) {
4951+
4952+#ifdef CONFIG_PAX_PAGEEXEC
4953+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4954+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4955+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4956+ do_group_exit(SIGKILL);
4957+ }
4958+ }
4959+#endif
4960+
4961 if (exception_trace && printk_ratelimit())
4962 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4963 "sp %08lx ecr %lu\n",
4964diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4965index 568885a..f8008df 100644
4966--- a/arch/blackfin/include/asm/cache.h
4967+++ b/arch/blackfin/include/asm/cache.h
4968@@ -7,6 +7,7 @@
4969 #ifndef __ARCH_BLACKFIN_CACHE_H
4970 #define __ARCH_BLACKFIN_CACHE_H
4971
4972+#include <linux/const.h>
4973 #include <linux/linkage.h> /* for asmlinkage */
4974
4975 /*
4976@@ -14,7 +15,7 @@
4977 * Blackfin loads 32 bytes for cache
4978 */
4979 #define L1_CACHE_SHIFT 5
4980-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4981+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4982 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4983
4984 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4985diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4986index aea2718..3639a60 100644
4987--- a/arch/cris/include/arch-v10/arch/cache.h
4988+++ b/arch/cris/include/arch-v10/arch/cache.h
4989@@ -1,8 +1,9 @@
4990 #ifndef _ASM_ARCH_CACHE_H
4991 #define _ASM_ARCH_CACHE_H
4992
4993+#include <linux/const.h>
4994 /* Etrax 100LX have 32-byte cache-lines. */
4995-#define L1_CACHE_BYTES 32
4996 #define L1_CACHE_SHIFT 5
4997+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4998
4999 #endif /* _ASM_ARCH_CACHE_H */
5000diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
5001index 7caf25d..ee65ac5 100644
5002--- a/arch/cris/include/arch-v32/arch/cache.h
5003+++ b/arch/cris/include/arch-v32/arch/cache.h
5004@@ -1,11 +1,12 @@
5005 #ifndef _ASM_CRIS_ARCH_CACHE_H
5006 #define _ASM_CRIS_ARCH_CACHE_H
5007
5008+#include <linux/const.h>
5009 #include <arch/hwregs/dma.h>
5010
5011 /* A cache-line is 32 bytes. */
5012-#define L1_CACHE_BYTES 32
5013 #define L1_CACHE_SHIFT 5
5014+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5015
5016 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5017
5018diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5019index 102190a..5334cea 100644
5020--- a/arch/frv/include/asm/atomic.h
5021+++ b/arch/frv/include/asm/atomic.h
5022@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5023 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5024 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5025
5026+#define atomic64_read_unchecked(v) atomic64_read(v)
5027+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5028+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5029+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5030+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5031+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5032+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5033+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5034+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5035+
5036 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5037 {
5038 int c, old;
5039diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5040index 2797163..c2a401df9 100644
5041--- a/arch/frv/include/asm/cache.h
5042+++ b/arch/frv/include/asm/cache.h
5043@@ -12,10 +12,11 @@
5044 #ifndef __ASM_CACHE_H
5045 #define __ASM_CACHE_H
5046
5047+#include <linux/const.h>
5048
5049 /* bytes per L1 cache line */
5050 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5051-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5052+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5053
5054 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5055 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5056diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5057index 43901f2..0d8b865 100644
5058--- a/arch/frv/include/asm/kmap_types.h
5059+++ b/arch/frv/include/asm/kmap_types.h
5060@@ -2,6 +2,6 @@
5061 #ifndef _ASM_KMAP_TYPES_H
5062 #define _ASM_KMAP_TYPES_H
5063
5064-#define KM_TYPE_NR 17
5065+#define KM_TYPE_NR 18
5066
5067 #endif
5068diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5069index 836f147..4cf23f5 100644
5070--- a/arch/frv/mm/elf-fdpic.c
5071+++ b/arch/frv/mm/elf-fdpic.c
5072@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5073 {
5074 struct vm_area_struct *vma;
5075 struct vm_unmapped_area_info info;
5076+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5077
5078 if (len > TASK_SIZE)
5079 return -ENOMEM;
5080@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5081 if (addr) {
5082 addr = PAGE_ALIGN(addr);
5083 vma = find_vma(current->mm, addr);
5084- if (TASK_SIZE - len >= addr &&
5085- (!vma || addr + len <= vma->vm_start))
5086+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5087 goto success;
5088 }
5089
5090@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5091 info.high_limit = (current->mm->start_stack - 0x00200000);
5092 info.align_mask = 0;
5093 info.align_offset = 0;
5094+ info.threadstack_offset = offset;
5095 addr = vm_unmapped_area(&info);
5096 if (!(addr & ~PAGE_MASK))
5097 goto success;
5098diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5099index 69952c18..4fa2908 100644
5100--- a/arch/hexagon/include/asm/cache.h
5101+++ b/arch/hexagon/include/asm/cache.h
5102@@ -21,9 +21,11 @@
5103 #ifndef __ASM_CACHE_H
5104 #define __ASM_CACHE_H
5105
5106+#include <linux/const.h>
5107+
5108 /* Bytes per L1 cache line */
5109-#define L1_CACHE_SHIFT (5)
5110-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5111+#define L1_CACHE_SHIFT 5
5112+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5113
5114 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5115
5116diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5117index 074e52b..76afdac 100644
5118--- a/arch/ia64/Kconfig
5119+++ b/arch/ia64/Kconfig
5120@@ -548,6 +548,7 @@ source "drivers/sn/Kconfig"
5121 config KEXEC
5122 bool "kexec system call"
5123 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5124+ depends on !GRKERNSEC_KMEM
5125 help
5126 kexec is a system call that implements the ability to shutdown your
5127 current kernel, and to start another kernel. It is like a reboot
5128diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5129index 970d0bd..e750b9b 100644
5130--- a/arch/ia64/Makefile
5131+++ b/arch/ia64/Makefile
5132@@ -98,5 +98,6 @@ endef
5133 archprepare: make_nr_irqs_h FORCE
5134 PHONY += make_nr_irqs_h FORCE
5135
5136+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5137 make_nr_irqs_h: FORCE
5138 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5139diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5140index 0bf0350..2ad1957 100644
5141--- a/arch/ia64/include/asm/atomic.h
5142+++ b/arch/ia64/include/asm/atomic.h
5143@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5144 #define atomic64_inc(v) atomic64_add(1, (v))
5145 #define atomic64_dec(v) atomic64_sub(1, (v))
5146
5147+#define atomic64_read_unchecked(v) atomic64_read(v)
5148+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5149+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5150+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5151+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5152+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5153+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5154+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5155+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5156+
5157 #endif /* _ASM_IA64_ATOMIC_H */
5158diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5159index f6769eb..1cdb590 100644
5160--- a/arch/ia64/include/asm/barrier.h
5161+++ b/arch/ia64/include/asm/barrier.h
5162@@ -66,7 +66,7 @@
5163 do { \
5164 compiletime_assert_atomic_type(*p); \
5165 barrier(); \
5166- ACCESS_ONCE(*p) = (v); \
5167+ ACCESS_ONCE_RW(*p) = (v); \
5168 } while (0)
5169
5170 #define smp_load_acquire(p) \
5171diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5172index 988254a..e1ee885 100644
5173--- a/arch/ia64/include/asm/cache.h
5174+++ b/arch/ia64/include/asm/cache.h
5175@@ -1,6 +1,7 @@
5176 #ifndef _ASM_IA64_CACHE_H
5177 #define _ASM_IA64_CACHE_H
5178
5179+#include <linux/const.h>
5180
5181 /*
5182 * Copyright (C) 1998-2000 Hewlett-Packard Co
5183@@ -9,7 +10,7 @@
5184
5185 /* Bytes per L1 (data) cache line. */
5186 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5187-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5188+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5189
5190 #ifdef CONFIG_SMP
5191 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5192diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5193index 5a83c5c..4d7f553 100644
5194--- a/arch/ia64/include/asm/elf.h
5195+++ b/arch/ia64/include/asm/elf.h
5196@@ -42,6 +42,13 @@
5197 */
5198 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5199
5200+#ifdef CONFIG_PAX_ASLR
5201+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5202+
5203+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5204+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5205+#endif
5206+
5207 #define PT_IA_64_UNWIND 0x70000001
5208
5209 /* IA-64 relocations: */
5210diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5211index 5767cdf..7462574 100644
5212--- a/arch/ia64/include/asm/pgalloc.h
5213+++ b/arch/ia64/include/asm/pgalloc.h
5214@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5215 pgd_val(*pgd_entry) = __pa(pud);
5216 }
5217
5218+static inline void
5219+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5220+{
5221+ pgd_populate(mm, pgd_entry, pud);
5222+}
5223+
5224 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5225 {
5226 return quicklist_alloc(0, GFP_KERNEL, NULL);
5227@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5228 pud_val(*pud_entry) = __pa(pmd);
5229 }
5230
5231+static inline void
5232+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5233+{
5234+ pud_populate(mm, pud_entry, pmd);
5235+}
5236+
5237 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5238 {
5239 return quicklist_alloc(0, GFP_KERNEL, NULL);
5240diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5241index 7b6f880..ac8e008 100644
5242--- a/arch/ia64/include/asm/pgtable.h
5243+++ b/arch/ia64/include/asm/pgtable.h
5244@@ -12,7 +12,7 @@
5245 * David Mosberger-Tang <davidm@hpl.hp.com>
5246 */
5247
5248-
5249+#include <linux/const.h>
5250 #include <asm/mman.h>
5251 #include <asm/page.h>
5252 #include <asm/processor.h>
5253@@ -139,6 +139,17 @@
5254 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5255 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5256 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5257+
5258+#ifdef CONFIG_PAX_PAGEEXEC
5259+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5260+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5261+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5262+#else
5263+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5264+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5265+# define PAGE_COPY_NOEXEC PAGE_COPY
5266+#endif
5267+
5268 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5269 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5270 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5271diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5272index 45698cd..e8e2dbc 100644
5273--- a/arch/ia64/include/asm/spinlock.h
5274+++ b/arch/ia64/include/asm/spinlock.h
5275@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5276 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5277
5278 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5279- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5280+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5281 }
5282
5283 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5284diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5285index 4f3fb6cc..254055e 100644
5286--- a/arch/ia64/include/asm/uaccess.h
5287+++ b/arch/ia64/include/asm/uaccess.h
5288@@ -70,6 +70,7 @@
5289 && ((segment).seg == KERNEL_DS.seg \
5290 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5291 })
5292+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5293 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5294
5295 /*
5296@@ -241,12 +242,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5297 static inline unsigned long
5298 __copy_to_user (void __user *to, const void *from, unsigned long count)
5299 {
5300+ if (count > INT_MAX)
5301+ return count;
5302+
5303+ if (!__builtin_constant_p(count))
5304+ check_object_size(from, count, true);
5305+
5306 return __copy_user(to, (__force void __user *) from, count);
5307 }
5308
5309 static inline unsigned long
5310 __copy_from_user (void *to, const void __user *from, unsigned long count)
5311 {
5312+ if (count > INT_MAX)
5313+ return count;
5314+
5315+ if (!__builtin_constant_p(count))
5316+ check_object_size(to, count, false);
5317+
5318 return __copy_user((__force void __user *) to, from, count);
5319 }
5320
5321@@ -256,10 +269,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5322 ({ \
5323 void __user *__cu_to = (to); \
5324 const void *__cu_from = (from); \
5325- long __cu_len = (n); \
5326+ unsigned long __cu_len = (n); \
5327 \
5328- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5329+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5330+ if (!__builtin_constant_p(n)) \
5331+ check_object_size(__cu_from, __cu_len, true); \
5332 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5333+ } \
5334 __cu_len; \
5335 })
5336
5337@@ -267,11 +283,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5338 ({ \
5339 void *__cu_to = (to); \
5340 const void __user *__cu_from = (from); \
5341- long __cu_len = (n); \
5342+ unsigned long __cu_len = (n); \
5343 \
5344 __chk_user_ptr(__cu_from); \
5345- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5346+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5347+ if (!__builtin_constant_p(n)) \
5348+ check_object_size(__cu_to, __cu_len, false); \
5349 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5350+ } \
5351 __cu_len; \
5352 })
5353
5354diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5355index 29754aa..06d2838 100644
5356--- a/arch/ia64/kernel/module.c
5357+++ b/arch/ia64/kernel/module.c
5358@@ -492,15 +492,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5359 }
5360
5361 static inline int
5362+in_init_rx (const struct module *mod, uint64_t addr)
5363+{
5364+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5365+}
5366+
5367+static inline int
5368+in_init_rw (const struct module *mod, uint64_t addr)
5369+{
5370+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5371+}
5372+
5373+static inline int
5374 in_init (const struct module *mod, uint64_t addr)
5375 {
5376- return addr - (uint64_t) mod->module_init < mod->init_size;
5377+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5378+}
5379+
5380+static inline int
5381+in_core_rx (const struct module *mod, uint64_t addr)
5382+{
5383+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5384+}
5385+
5386+static inline int
5387+in_core_rw (const struct module *mod, uint64_t addr)
5388+{
5389+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5390 }
5391
5392 static inline int
5393 in_core (const struct module *mod, uint64_t addr)
5394 {
5395- return addr - (uint64_t) mod->module_core < mod->core_size;
5396+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5397 }
5398
5399 static inline int
5400@@ -683,7 +707,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5401 break;
5402
5403 case RV_BDREL:
5404- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5405+ if (in_init_rx(mod, val))
5406+ val -= (uint64_t) mod->module_init_rx;
5407+ else if (in_init_rw(mod, val))
5408+ val -= (uint64_t) mod->module_init_rw;
5409+ else if (in_core_rx(mod, val))
5410+ val -= (uint64_t) mod->module_core_rx;
5411+ else if (in_core_rw(mod, val))
5412+ val -= (uint64_t) mod->module_core_rw;
5413 break;
5414
5415 case RV_LTV:
5416@@ -818,15 +849,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5417 * addresses have been selected...
5418 */
5419 uint64_t gp;
5420- if (mod->core_size > MAX_LTOFF)
5421+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5422 /*
5423 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5424 * at the end of the module.
5425 */
5426- gp = mod->core_size - MAX_LTOFF / 2;
5427+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5428 else
5429- gp = mod->core_size / 2;
5430- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5431+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5432+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5433 mod->arch.gp = gp;
5434 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5435 }
5436diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5437index c39c3cd..3c77738 100644
5438--- a/arch/ia64/kernel/palinfo.c
5439+++ b/arch/ia64/kernel/palinfo.c
5440@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5441 return NOTIFY_OK;
5442 }
5443
5444-static struct notifier_block __refdata palinfo_cpu_notifier =
5445+static struct notifier_block palinfo_cpu_notifier =
5446 {
5447 .notifier_call = palinfo_cpu_callback,
5448 .priority = 0,
5449diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5450index 41e33f8..65180b2a 100644
5451--- a/arch/ia64/kernel/sys_ia64.c
5452+++ b/arch/ia64/kernel/sys_ia64.c
5453@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5454 unsigned long align_mask = 0;
5455 struct mm_struct *mm = current->mm;
5456 struct vm_unmapped_area_info info;
5457+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5458
5459 if (len > RGN_MAP_LIMIT)
5460 return -ENOMEM;
5461@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5462 if (REGION_NUMBER(addr) == RGN_HPAGE)
5463 addr = 0;
5464 #endif
5465+
5466+#ifdef CONFIG_PAX_RANDMMAP
5467+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5468+ addr = mm->free_area_cache;
5469+ else
5470+#endif
5471+
5472 if (!addr)
5473 addr = TASK_UNMAPPED_BASE;
5474
5475@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5476 info.high_limit = TASK_SIZE;
5477 info.align_mask = align_mask;
5478 info.align_offset = 0;
5479+ info.threadstack_offset = offset;
5480 return vm_unmapped_area(&info);
5481 }
5482
5483diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5484index 84f8a52..7c76178 100644
5485--- a/arch/ia64/kernel/vmlinux.lds.S
5486+++ b/arch/ia64/kernel/vmlinux.lds.S
5487@@ -192,7 +192,7 @@ SECTIONS {
5488 /* Per-cpu data: */
5489 . = ALIGN(PERCPU_PAGE_SIZE);
5490 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5491- __phys_per_cpu_start = __per_cpu_load;
5492+ __phys_per_cpu_start = per_cpu_load;
5493 /*
5494 * ensure percpu data fits
5495 * into percpu page size
5496diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5497index ba5ba7a..36e9d3a 100644
5498--- a/arch/ia64/mm/fault.c
5499+++ b/arch/ia64/mm/fault.c
5500@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5501 return pte_present(pte);
5502 }
5503
5504+#ifdef CONFIG_PAX_PAGEEXEC
5505+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5506+{
5507+ unsigned long i;
5508+
5509+ printk(KERN_ERR "PAX: bytes at PC: ");
5510+ for (i = 0; i < 8; i++) {
5511+ unsigned int c;
5512+ if (get_user(c, (unsigned int *)pc+i))
5513+ printk(KERN_CONT "???????? ");
5514+ else
5515+ printk(KERN_CONT "%08x ", c);
5516+ }
5517+ printk("\n");
5518+}
5519+#endif
5520+
5521 # define VM_READ_BIT 0
5522 # define VM_WRITE_BIT 1
5523 # define VM_EXEC_BIT 2
5524@@ -151,8 +168,21 @@ retry:
5525 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5526 goto bad_area;
5527
5528- if ((vma->vm_flags & mask) != mask)
5529+ if ((vma->vm_flags & mask) != mask) {
5530+
5531+#ifdef CONFIG_PAX_PAGEEXEC
5532+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5533+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5534+ goto bad_area;
5535+
5536+ up_read(&mm->mmap_sem);
5537+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5538+ do_group_exit(SIGKILL);
5539+ }
5540+#endif
5541+
5542 goto bad_area;
5543+ }
5544
5545 /*
5546 * If for any reason at all we couldn't handle the fault, make
5547diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5548index 52b7604b..455cb85 100644
5549--- a/arch/ia64/mm/hugetlbpage.c
5550+++ b/arch/ia64/mm/hugetlbpage.c
5551@@ -143,6 +143,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5552 unsigned long pgoff, unsigned long flags)
5553 {
5554 struct vm_unmapped_area_info info;
5555+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5556
5557 if (len > RGN_MAP_LIMIT)
5558 return -ENOMEM;
5559@@ -166,6 +167,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5560 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5561 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5562 info.align_offset = 0;
5563+ info.threadstack_offset = offset;
5564 return vm_unmapped_area(&info);
5565 }
5566
5567diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5568index 6b33457..88b5124 100644
5569--- a/arch/ia64/mm/init.c
5570+++ b/arch/ia64/mm/init.c
5571@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5572 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5573 vma->vm_end = vma->vm_start + PAGE_SIZE;
5574 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5575+
5576+#ifdef CONFIG_PAX_PAGEEXEC
5577+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5578+ vma->vm_flags &= ~VM_EXEC;
5579+
5580+#ifdef CONFIG_PAX_MPROTECT
5581+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5582+ vma->vm_flags &= ~VM_MAYEXEC;
5583+#endif
5584+
5585+ }
5586+#endif
5587+
5588 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5589 down_write(&current->mm->mmap_sem);
5590 if (insert_vm_struct(current->mm, vma)) {
5591@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5592 gate_vma.vm_start = FIXADDR_USER_START;
5593 gate_vma.vm_end = FIXADDR_USER_END;
5594 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5595- gate_vma.vm_page_prot = __P101;
5596+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5597
5598 return 0;
5599 }
5600diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5601index 40b3ee98..8c2c112 100644
5602--- a/arch/m32r/include/asm/cache.h
5603+++ b/arch/m32r/include/asm/cache.h
5604@@ -1,8 +1,10 @@
5605 #ifndef _ASM_M32R_CACHE_H
5606 #define _ASM_M32R_CACHE_H
5607
5608+#include <linux/const.h>
5609+
5610 /* L1 cache line size */
5611 #define L1_CACHE_SHIFT 4
5612-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5613+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5614
5615 #endif /* _ASM_M32R_CACHE_H */
5616diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5617index 82abd15..d95ae5d 100644
5618--- a/arch/m32r/lib/usercopy.c
5619+++ b/arch/m32r/lib/usercopy.c
5620@@ -14,6 +14,9 @@
5621 unsigned long
5622 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5623 {
5624+ if ((long)n < 0)
5625+ return n;
5626+
5627 prefetch(from);
5628 if (access_ok(VERIFY_WRITE, to, n))
5629 __copy_user(to,from,n);
5630@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5631 unsigned long
5632 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5633 {
5634+ if ((long)n < 0)
5635+ return n;
5636+
5637 prefetchw(to);
5638 if (access_ok(VERIFY_READ, from, n))
5639 __copy_user_zeroing(to,from,n);
5640diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5641index 0395c51..5f26031 100644
5642--- a/arch/m68k/include/asm/cache.h
5643+++ b/arch/m68k/include/asm/cache.h
5644@@ -4,9 +4,11 @@
5645 #ifndef __ARCH_M68K_CACHE_H
5646 #define __ARCH_M68K_CACHE_H
5647
5648+#include <linux/const.h>
5649+
5650 /* bytes per L1 cache line */
5651 #define L1_CACHE_SHIFT 4
5652-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5653+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5654
5655 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5656
5657diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5658index d703d8e..a8e2d70 100644
5659--- a/arch/metag/include/asm/barrier.h
5660+++ b/arch/metag/include/asm/barrier.h
5661@@ -90,7 +90,7 @@ static inline void fence(void)
5662 do { \
5663 compiletime_assert_atomic_type(*p); \
5664 smp_mb(); \
5665- ACCESS_ONCE(*p) = (v); \
5666+ ACCESS_ONCE_RW(*p) = (v); \
5667 } while (0)
5668
5669 #define smp_load_acquire(p) \
5670diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5671index 7ca80ac..794ba72 100644
5672--- a/arch/metag/mm/hugetlbpage.c
5673+++ b/arch/metag/mm/hugetlbpage.c
5674@@ -194,6 +194,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5675 info.high_limit = TASK_SIZE;
5676 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5677 info.align_offset = 0;
5678+ info.threadstack_offset = 0;
5679 return vm_unmapped_area(&info);
5680 }
5681
5682diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5683index 4efe96a..60e8699 100644
5684--- a/arch/microblaze/include/asm/cache.h
5685+++ b/arch/microblaze/include/asm/cache.h
5686@@ -13,11 +13,12 @@
5687 #ifndef _ASM_MICROBLAZE_CACHE_H
5688 #define _ASM_MICROBLAZE_CACHE_H
5689
5690+#include <linux/const.h>
5691 #include <asm/registers.h>
5692
5693 #define L1_CACHE_SHIFT 5
5694 /* word-granular cache in microblaze */
5695-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5696+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5697
5698 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5699
5700diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5701index 1a313c4..f27b613 100644
5702--- a/arch/mips/Kconfig
5703+++ b/arch/mips/Kconfig
5704@@ -2504,6 +2504,7 @@ source "kernel/Kconfig.preempt"
5705
5706 config KEXEC
5707 bool "Kexec system call"
5708+ depends on !GRKERNSEC_KMEM
5709 help
5710 kexec is a system call that implements the ability to shutdown your
5711 current kernel, and to start another kernel. It is like a reboot
5712diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5713index d8960d4..77dbd31 100644
5714--- a/arch/mips/cavium-octeon/dma-octeon.c
5715+++ b/arch/mips/cavium-octeon/dma-octeon.c
5716@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5717 if (dma_release_from_coherent(dev, order, vaddr))
5718 return;
5719
5720- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5721+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5722 }
5723
5724 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5725diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5726index 26d4363..3c9a82e 100644
5727--- a/arch/mips/include/asm/atomic.h
5728+++ b/arch/mips/include/asm/atomic.h
5729@@ -22,15 +22,39 @@
5730 #include <asm/cmpxchg.h>
5731 #include <asm/war.h>
5732
5733+#ifdef CONFIG_GENERIC_ATOMIC64
5734+#include <asm-generic/atomic64.h>
5735+#endif
5736+
5737 #define ATOMIC_INIT(i) { (i) }
5738
5739+#ifdef CONFIG_64BIT
5740+#define _ASM_EXTABLE(from, to) \
5741+" .section __ex_table,\"a\"\n" \
5742+" .dword " #from ", " #to"\n" \
5743+" .previous\n"
5744+#else
5745+#define _ASM_EXTABLE(from, to) \
5746+" .section __ex_table,\"a\"\n" \
5747+" .word " #from ", " #to"\n" \
5748+" .previous\n"
5749+#endif
5750+
5751 /*
5752 * atomic_read - read atomic variable
5753 * @v: pointer of type atomic_t
5754 *
5755 * Atomically reads the value of @v.
5756 */
5757-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5758+static inline int atomic_read(const atomic_t *v)
5759+{
5760+ return ACCESS_ONCE(v->counter);
5761+}
5762+
5763+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5764+{
5765+ return ACCESS_ONCE(v->counter);
5766+}
5767
5768 /*
5769 * atomic_set - set atomic variable
5770@@ -39,47 +63,77 @@
5771 *
5772 * Atomically sets the value of @v to @i.
5773 */
5774-#define atomic_set(v, i) ((v)->counter = (i))
5775+static inline void atomic_set(atomic_t *v, int i)
5776+{
5777+ v->counter = i;
5778+}
5779
5780-#define ATOMIC_OP(op, c_op, asm_op) \
5781-static __inline__ void atomic_##op(int i, atomic_t * v) \
5782+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5783+{
5784+ v->counter = i;
5785+}
5786+
5787+#ifdef CONFIG_PAX_REFCOUNT
5788+#define __OVERFLOW_POST \
5789+ " b 4f \n" \
5790+ " .set noreorder \n" \
5791+ "3: b 5f \n" \
5792+ " move %0, %1 \n" \
5793+ " .set reorder \n"
5794+#define __OVERFLOW_EXTABLE \
5795+ "3:\n" \
5796+ _ASM_EXTABLE(2b, 3b)
5797+#else
5798+#define __OVERFLOW_POST
5799+#define __OVERFLOW_EXTABLE
5800+#endif
5801+
5802+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5803+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5804 { \
5805 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5806 int temp; \
5807 \
5808 __asm__ __volatile__( \
5809- " .set arch=r4000 \n" \
5810- "1: ll %0, %1 # atomic_" #op " \n" \
5811- " " #asm_op " %0, %2 \n" \
5812+ " .set mips3 \n" \
5813+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5814+ "2: " #asm_op " %0, %2 \n" \
5815 " sc %0, %1 \n" \
5816 " beqzl %0, 1b \n" \
5817+ extable \
5818 " .set mips0 \n" \
5819 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5820 : "Ir" (i)); \
5821 } else if (kernel_uses_llsc) { \
5822 int temp; \
5823 \
5824- do { \
5825- __asm__ __volatile__( \
5826- " .set "MIPS_ISA_LEVEL" \n" \
5827- " ll %0, %1 # atomic_" #op "\n" \
5828- " " #asm_op " %0, %2 \n" \
5829- " sc %0, %1 \n" \
5830- " .set mips0 \n" \
5831- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5832- : "Ir" (i)); \
5833- } while (unlikely(!temp)); \
5834+ __asm__ __volatile__( \
5835+ " .set "MIPS_ISA_LEVEL" \n" \
5836+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5837+ "2: " #asm_op " %0, %2 \n" \
5838+ " sc %0, %1 \n" \
5839+ " beqz %0, 1b \n" \
5840+ extable \
5841+ " .set mips0 \n" \
5842+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5843+ : "Ir" (i)); \
5844 } else { \
5845 unsigned long flags; \
5846 \
5847 raw_local_irq_save(flags); \
5848- v->counter c_op i; \
5849+ __asm__ __volatile__( \
5850+ "2: " #asm_op " %0, %1 \n" \
5851+ extable \
5852+ : "+r" (v->counter) : "Ir" (i)); \
5853 raw_local_irq_restore(flags); \
5854 } \
5855 }
5856
5857-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5858-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5859+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, _unchecked, asm_op##u, ) \
5860+ __ATOMIC_OP(op, , asm_op, __OVERFLOW_EXTABLE)
5861+
5862+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5863+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5864 { \
5865 int result; \
5866 \
5867@@ -89,12 +143,15 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5868 int temp; \
5869 \
5870 __asm__ __volatile__( \
5871- " .set arch=r4000 \n" \
5872- "1: ll %1, %2 # atomic_" #op "_return \n" \
5873- " " #asm_op " %0, %1, %3 \n" \
5874+ " .set mips3 \n" \
5875+ "1: ll %1, %2 # atomic_" #op "_return" #suffix"\n" \
5876+ "2: " #asm_op " %0, %1, %3 \n" \
5877 " sc %0, %2 \n" \
5878 " beqzl %0, 1b \n" \
5879- " " #asm_op " %0, %1, %3 \n" \
5880+ post_op \
5881+ extable \
5882+ "4: " #asm_op " %0, %1, %3 \n" \
5883+ "5: \n" \
5884 " .set mips0 \n" \
5885 : "=&r" (result), "=&r" (temp), \
5886 "+" GCC_OFF_SMALL_ASM() (v->counter) \
5887@@ -102,26 +159,33 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5888 } else if (kernel_uses_llsc) { \
5889 int temp; \
5890 \
5891- do { \
5892- __asm__ __volatile__( \
5893- " .set "MIPS_ISA_LEVEL" \n" \
5894- " ll %1, %2 # atomic_" #op "_return \n" \
5895- " " #asm_op " %0, %1, %3 \n" \
5896- " sc %0, %2 \n" \
5897- " .set mips0 \n" \
5898- : "=&r" (result), "=&r" (temp), \
5899- "+" GCC_OFF_SMALL_ASM() (v->counter) \
5900- : "Ir" (i)); \
5901- } while (unlikely(!result)); \
5902+ __asm__ __volatile__( \
5903+ " .set "MIPS_ISA_LEVEL" \n" \
5904+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5905+ "2: " #asm_op " %0, %1, %3 \n" \
5906+ " sc %0, %2 \n" \
5907+ post_op \
5908+ extable \
5909+ "4: " #asm_op " %0, %1, %3 \n" \
5910+ "5: \n" \
5911+ " .set mips0 \n" \
5912+ : "=&r" (result), "=&r" (temp), \
5913+ "+" GCC_OFF_SMALL_ASM() (v->counter) \
5914+ : "Ir" (i)); \
5915 \
5916 result = temp; result c_op i; \
5917 } else { \
5918 unsigned long flags; \
5919 \
5920 raw_local_irq_save(flags); \
5921- result = v->counter; \
5922- result c_op i; \
5923- v->counter = result; \
5924+ __asm__ __volatile__( \
5925+ " lw %0, %1 \n" \
5926+ "2: " #asm_op " %0, %1, %2 \n" \
5927+ " sw %0, %1 \n" \
5928+ "3: \n" \
5929+ extable \
5930+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5931+ : "Ir" (i)); \
5932 raw_local_irq_restore(flags); \
5933 } \
5934 \
5935@@ -130,16 +194,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5936 return result; \
5937 }
5938
5939-#define ATOMIC_OPS(op, c_op, asm_op) \
5940- ATOMIC_OP(op, c_op, asm_op) \
5941- ATOMIC_OP_RETURN(op, c_op, asm_op)
5942+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, asm_op##u, , ) \
5943+ __ATOMIC_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
5944
5945-ATOMIC_OPS(add, +=, addu)
5946-ATOMIC_OPS(sub, -=, subu)
5947+#define ATOMIC_OPS(op, asm_op) \
5948+ ATOMIC_OP(op, asm_op) \
5949+ ATOMIC_OP_RETURN(op, asm_op)
5950+
5951+ATOMIC_OPS(add, add)
5952+ATOMIC_OPS(sub, sub)
5953
5954 #undef ATOMIC_OPS
5955 #undef ATOMIC_OP_RETURN
5956+#undef __ATOMIC_OP_RETURN
5957 #undef ATOMIC_OP
5958+#undef __ATOMIC_OP
5959
5960 /*
5961 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
5962@@ -149,7 +218,7 @@ ATOMIC_OPS(sub, -=, subu)
5963 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5964 * The function returns the old value of @v minus @i.
5965 */
5966-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5967+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5968 {
5969 int result;
5970
5971@@ -159,7 +228,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5972 int temp;
5973
5974 __asm__ __volatile__(
5975- " .set arch=r4000 \n"
5976+ " .set "MIPS_ISA_LEVEL" \n"
5977 "1: ll %1, %2 # atomic_sub_if_positive\n"
5978 " subu %0, %1, %3 \n"
5979 " bltz %0, 1f \n"
5980@@ -208,8 +277,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5981 return result;
5982 }
5983
5984-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5985-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5986+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5987+{
5988+ return cmpxchg(&v->counter, old, new);
5989+}
5990+
5991+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5992+ int new)
5993+{
5994+ return cmpxchg(&(v->counter), old, new);
5995+}
5996+
5997+static inline int atomic_xchg(atomic_t *v, int new)
5998+{
5999+ return xchg(&v->counter, new);
6000+}
6001+
6002+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6003+{
6004+ return xchg(&(v->counter), new);
6005+}
6006
6007 /**
6008 * __atomic_add_unless - add unless the number is a given value
6009@@ -237,6 +324,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6010
6011 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6012 #define atomic_inc_return(v) atomic_add_return(1, (v))
6013+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6014+{
6015+ return atomic_add_return_unchecked(1, v);
6016+}
6017
6018 /*
6019 * atomic_sub_and_test - subtract value from variable and test result
6020@@ -258,6 +349,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6021 * other cases.
6022 */
6023 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6024+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6025+{
6026+ return atomic_add_return_unchecked(1, v) == 0;
6027+}
6028
6029 /*
6030 * atomic_dec_and_test - decrement by 1 and test
6031@@ -282,6 +377,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6032 * Atomically increments @v by 1.
6033 */
6034 #define atomic_inc(v) atomic_add(1, (v))
6035+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6036+{
6037+ atomic_add_unchecked(1, v);
6038+}
6039
6040 /*
6041 * atomic_dec - decrement and test
6042@@ -290,6 +389,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6043 * Atomically decrements @v by 1.
6044 */
6045 #define atomic_dec(v) atomic_sub(1, (v))
6046+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6047+{
6048+ atomic_sub_unchecked(1, v);
6049+}
6050
6051 /*
6052 * atomic_add_negative - add and test if negative
6053@@ -311,54 +414,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6054 * @v: pointer of type atomic64_t
6055 *
6056 */
6057-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6058+static inline long atomic64_read(const atomic64_t *v)
6059+{
6060+ return ACCESS_ONCE(v->counter);
6061+}
6062+
6063+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6064+{
6065+ return ACCESS_ONCE(v->counter);
6066+}
6067
6068 /*
6069 * atomic64_set - set atomic variable
6070 * @v: pointer of type atomic64_t
6071 * @i: required value
6072 */
6073-#define atomic64_set(v, i) ((v)->counter = (i))
6074+static inline void atomic64_set(atomic64_t *v, long i)
6075+{
6076+ v->counter = i;
6077+}
6078
6079-#define ATOMIC64_OP(op, c_op, asm_op) \
6080-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6081+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6082+{
6083+ v->counter = i;
6084+}
6085+
6086+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6087+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6088 { \
6089 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6090 long temp; \
6091 \
6092 __asm__ __volatile__( \
6093- " .set arch=r4000 \n" \
6094- "1: lld %0, %1 # atomic64_" #op " \n" \
6095- " " #asm_op " %0, %2 \n" \
6096+ " .set "MIPS_ISA_LEVEL" \n" \
6097+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6098+ "2: " #asm_op " %0, %2 \n" \
6099 " scd %0, %1 \n" \
6100 " beqzl %0, 1b \n" \
6101+ extable \
6102 " .set mips0 \n" \
6103 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6104 : "Ir" (i)); \
6105 } else if (kernel_uses_llsc) { \
6106 long temp; \
6107 \
6108- do { \
6109- __asm__ __volatile__( \
6110- " .set "MIPS_ISA_LEVEL" \n" \
6111- " lld %0, %1 # atomic64_" #op "\n" \
6112- " " #asm_op " %0, %2 \n" \
6113- " scd %0, %1 \n" \
6114- " .set mips0 \n" \
6115- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6116- : "Ir" (i)); \
6117- } while (unlikely(!temp)); \
6118+ __asm__ __volatile__( \
6119+ " .set "MIPS_ISA_LEVEL" \n" \
6120+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6121+ "2: " #asm_op " %0, %2 \n" \
6122+ " scd %0, %1 \n" \
6123+ " beqz %0, 1b \n" \
6124+ extable \
6125+ " .set mips0 \n" \
6126+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6127+ : "Ir" (i)); \
6128 } else { \
6129 unsigned long flags; \
6130 \
6131 raw_local_irq_save(flags); \
6132- v->counter c_op i; \
6133+ __asm__ __volatile__( \
6134+ "2: " #asm_op " %0, %1 \n" \
6135+ extable \
6136+ : "+" GCC_OFF_SMALL_ASM() (v->counter) : "Ir" (i)); \
6137 raw_local_irq_restore(flags); \
6138 } \
6139 }
6140
6141-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6142-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6143+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, _unchecked, asm_op##u, ) \
6144+ __ATOMIC64_OP(op, , asm_op, __OVERFLOW_EXTABLE)
6145+
6146+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6147+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6148 { \
6149 long result; \
6150 \
6151@@ -368,12 +494,15 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6152 long temp; \
6153 \
6154 __asm__ __volatile__( \
6155- " .set arch=r4000 \n" \
6156+ " .set mips3 \n" \
6157 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6158- " " #asm_op " %0, %1, %3 \n" \
6159+ "2: " #asm_op " %0, %1, %3 \n" \
6160 " scd %0, %2 \n" \
6161 " beqzl %0, 1b \n" \
6162- " " #asm_op " %0, %1, %3 \n" \
6163+ post_op \
6164+ extable \
6165+ "4: " #asm_op " %0, %1, %3 \n" \
6166+ "5: \n" \
6167 " .set mips0 \n" \
6168 : "=&r" (result), "=&r" (temp), \
6169 "+" GCC_OFF_SMALL_ASM() (v->counter) \
6170@@ -381,27 +510,35 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6171 } else if (kernel_uses_llsc) { \
6172 long temp; \
6173 \
6174- do { \
6175- __asm__ __volatile__( \
6176- " .set "MIPS_ISA_LEVEL" \n" \
6177- " lld %1, %2 # atomic64_" #op "_return\n" \
6178- " " #asm_op " %0, %1, %3 \n" \
6179- " scd %0, %2 \n" \
6180- " .set mips0 \n" \
6181- : "=&r" (result), "=&r" (temp), \
6182- "=" GCC_OFF_SMALL_ASM() (v->counter) \
6183- : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6184- : "memory"); \
6185- } while (unlikely(!result)); \
6186+ __asm__ __volatile__( \
6187+ " .set "MIPS_ISA_LEVEL" \n" \
6188+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n"\
6189+ "2: " #asm_op " %0, %1, %3 \n" \
6190+ " scd %0, %2 \n" \
6191+ " beqz %0, 1b \n" \
6192+ post_op \
6193+ extable \
6194+ "4: " #asm_op " %0, %1, %3 \n" \
6195+ "5: \n" \
6196+ " .set mips0 \n" \
6197+ : "=&r" (result), "=&r" (temp), \
6198+ "=" GCC_OFF_SMALL_ASM() (v->counter) \
6199+ : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6200+ : "memory"); \
6201 \
6202 result = temp; result c_op i; \
6203 } else { \
6204 unsigned long flags; \
6205 \
6206 raw_local_irq_save(flags); \
6207- result = v->counter; \
6208- result c_op i; \
6209- v->counter = result; \
6210+ __asm__ __volatile__( \
6211+ " ld %0, %1 \n" \
6212+ "2: " #asm_op " %0, %1, %2 \n" \
6213+ " sd %0, %1 \n" \
6214+ "3: \n" \
6215+ extable \
6216+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6217+ : "Ir" (i)); \
6218 raw_local_irq_restore(flags); \
6219 } \
6220 \
6221@@ -410,16 +547,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6222 return result; \
6223 }
6224
6225-#define ATOMIC64_OPS(op, c_op, asm_op) \
6226- ATOMIC64_OP(op, c_op, asm_op) \
6227- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6228+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6229+ __ATOMIC64_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6230
6231-ATOMIC64_OPS(add, +=, daddu)
6232-ATOMIC64_OPS(sub, -=, dsubu)
6233+#define ATOMIC64_OPS(op, asm_op) \
6234+ ATOMIC64_OP(op, asm_op) \
6235+ ATOMIC64_OP_RETURN(op, asm_op)
6236+
6237+ATOMIC64_OPS(add, dadd)
6238+ATOMIC64_OPS(sub, dsub)
6239
6240 #undef ATOMIC64_OPS
6241 #undef ATOMIC64_OP_RETURN
6242+#undef __ATOMIC64_OP_RETURN
6243 #undef ATOMIC64_OP
6244+#undef __ATOMIC64_OP
6245+#undef __OVERFLOW_EXTABLE
6246+#undef __OVERFLOW_POST
6247
6248 /*
6249 * atomic64_sub_if_positive - conditionally subtract integer from atomic
6250@@ -430,7 +574,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6251 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6252 * The function returns the old value of @v minus @i.
6253 */
6254-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6255+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6256 {
6257 long result;
6258
6259@@ -440,7 +584,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6260 long temp;
6261
6262 __asm__ __volatile__(
6263- " .set arch=r4000 \n"
6264+ " .set "MIPS_ISA_LEVEL" \n"
6265 "1: lld %1, %2 # atomic64_sub_if_positive\n"
6266 " dsubu %0, %1, %3 \n"
6267 " bltz %0, 1f \n"
6268@@ -489,9 +633,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6269 return result;
6270 }
6271
6272-#define atomic64_cmpxchg(v, o, n) \
6273- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6274-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6275+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6276+{
6277+ return cmpxchg(&v->counter, old, new);
6278+}
6279+
6280+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6281+ long new)
6282+{
6283+ return cmpxchg(&(v->counter), old, new);
6284+}
6285+
6286+static inline long atomic64_xchg(atomic64_t *v, long new)
6287+{
6288+ return xchg(&v->counter, new);
6289+}
6290+
6291+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6292+{
6293+ return xchg(&(v->counter), new);
6294+}
6295
6296 /**
6297 * atomic64_add_unless - add unless the number is a given value
6298@@ -521,6 +682,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6299
6300 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6301 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6302+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6303
6304 /*
6305 * atomic64_sub_and_test - subtract value from variable and test result
6306@@ -542,6 +704,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6307 * other cases.
6308 */
6309 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6310+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6311
6312 /*
6313 * atomic64_dec_and_test - decrement by 1 and test
6314@@ -566,6 +729,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6315 * Atomically increments @v by 1.
6316 */
6317 #define atomic64_inc(v) atomic64_add(1, (v))
6318+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6319
6320 /*
6321 * atomic64_dec - decrement and test
6322@@ -574,6 +738,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6323 * Atomically decrements @v by 1.
6324 */
6325 #define atomic64_dec(v) atomic64_sub(1, (v))
6326+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6327
6328 /*
6329 * atomic64_add_negative - add and test if negative
6330diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6331index 2b8bbbc..4556df6 100644
6332--- a/arch/mips/include/asm/barrier.h
6333+++ b/arch/mips/include/asm/barrier.h
6334@@ -133,7 +133,7 @@
6335 do { \
6336 compiletime_assert_atomic_type(*p); \
6337 smp_mb(); \
6338- ACCESS_ONCE(*p) = (v); \
6339+ ACCESS_ONCE_RW(*p) = (v); \
6340 } while (0)
6341
6342 #define smp_load_acquire(p) \
6343diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6344index b4db69f..8f3b093 100644
6345--- a/arch/mips/include/asm/cache.h
6346+++ b/arch/mips/include/asm/cache.h
6347@@ -9,10 +9,11 @@
6348 #ifndef _ASM_CACHE_H
6349 #define _ASM_CACHE_H
6350
6351+#include <linux/const.h>
6352 #include <kmalloc.h>
6353
6354 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6355-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6356+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6357
6358 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6359 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6360diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6361index 694925a..990fa62 100644
6362--- a/arch/mips/include/asm/elf.h
6363+++ b/arch/mips/include/asm/elf.h
6364@@ -410,15 +410,18 @@ extern const char *__elf_platform;
6365 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6366 #endif
6367
6368+#ifdef CONFIG_PAX_ASLR
6369+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6370+
6371+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6372+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6373+#endif
6374+
6375 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6376 struct linux_binprm;
6377 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6378 int uses_interp);
6379
6380-struct mm_struct;
6381-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6382-#define arch_randomize_brk arch_randomize_brk
6383-
6384 struct arch_elf_state {
6385 int fp_abi;
6386 int interp_fp_abi;
6387diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6388index c1f6afa..38cc6e9 100644
6389--- a/arch/mips/include/asm/exec.h
6390+++ b/arch/mips/include/asm/exec.h
6391@@ -12,6 +12,6 @@
6392 #ifndef _ASM_EXEC_H
6393 #define _ASM_EXEC_H
6394
6395-extern unsigned long arch_align_stack(unsigned long sp);
6396+#define arch_align_stack(x) ((x) & ~0xfUL)
6397
6398 #endif /* _ASM_EXEC_H */
6399diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6400index 9e8ef59..1139d6b 100644
6401--- a/arch/mips/include/asm/hw_irq.h
6402+++ b/arch/mips/include/asm/hw_irq.h
6403@@ -10,7 +10,7 @@
6404
6405 #include <linux/atomic.h>
6406
6407-extern atomic_t irq_err_count;
6408+extern atomic_unchecked_t irq_err_count;
6409
6410 /*
6411 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6412diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6413index 8feaed6..1bd8a64 100644
6414--- a/arch/mips/include/asm/local.h
6415+++ b/arch/mips/include/asm/local.h
6416@@ -13,15 +13,25 @@ typedef struct
6417 atomic_long_t a;
6418 } local_t;
6419
6420+typedef struct {
6421+ atomic_long_unchecked_t a;
6422+} local_unchecked_t;
6423+
6424 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6425
6426 #define local_read(l) atomic_long_read(&(l)->a)
6427+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6428 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6429+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6430
6431 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6432+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6433 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6434+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6435 #define local_inc(l) atomic_long_inc(&(l)->a)
6436+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6437 #define local_dec(l) atomic_long_dec(&(l)->a)
6438+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6439
6440 /*
6441 * Same as above, but return the result value
6442@@ -71,6 +81,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6443 return result;
6444 }
6445
6446+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6447+{
6448+ unsigned long result;
6449+
6450+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6451+ unsigned long temp;
6452+
6453+ __asm__ __volatile__(
6454+ " .set mips3 \n"
6455+ "1:" __LL "%1, %2 # local_add_return \n"
6456+ " addu %0, %1, %3 \n"
6457+ __SC "%0, %2 \n"
6458+ " beqzl %0, 1b \n"
6459+ " addu %0, %1, %3 \n"
6460+ " .set mips0 \n"
6461+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6462+ : "Ir" (i), "m" (l->a.counter)
6463+ : "memory");
6464+ } else if (kernel_uses_llsc) {
6465+ unsigned long temp;
6466+
6467+ __asm__ __volatile__(
6468+ " .set mips3 \n"
6469+ "1:" __LL "%1, %2 # local_add_return \n"
6470+ " addu %0, %1, %3 \n"
6471+ __SC "%0, %2 \n"
6472+ " beqz %0, 1b \n"
6473+ " addu %0, %1, %3 \n"
6474+ " .set mips0 \n"
6475+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6476+ : "Ir" (i), "m" (l->a.counter)
6477+ : "memory");
6478+ } else {
6479+ unsigned long flags;
6480+
6481+ local_irq_save(flags);
6482+ result = l->a.counter;
6483+ result += i;
6484+ l->a.counter = result;
6485+ local_irq_restore(flags);
6486+ }
6487+
6488+ return result;
6489+}
6490+
6491 static __inline__ long local_sub_return(long i, local_t * l)
6492 {
6493 unsigned long result;
6494@@ -118,6 +173,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6495
6496 #define local_cmpxchg(l, o, n) \
6497 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6498+#define local_cmpxchg_unchecked(l, o, n) \
6499+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6500 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6501
6502 /**
6503diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6504index 154b70a..426ae3d 100644
6505--- a/arch/mips/include/asm/page.h
6506+++ b/arch/mips/include/asm/page.h
6507@@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6508 #ifdef CONFIG_CPU_MIPS32
6509 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6510 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6511- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6512+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6513 #else
6514 typedef struct { unsigned long long pte; } pte_t;
6515 #define pte_val(x) ((x).pte)
6516diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6517index b336037..5b874cc 100644
6518--- a/arch/mips/include/asm/pgalloc.h
6519+++ b/arch/mips/include/asm/pgalloc.h
6520@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6521 {
6522 set_pud(pud, __pud((unsigned long)pmd));
6523 }
6524+
6525+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6526+{
6527+ pud_populate(mm, pud, pmd);
6528+}
6529 #endif
6530
6531 /*
6532diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6533index f8f809f..b5f3fa4 100644
6534--- a/arch/mips/include/asm/pgtable.h
6535+++ b/arch/mips/include/asm/pgtable.h
6536@@ -20,6 +20,9 @@
6537 #include <asm/io.h>
6538 #include <asm/pgtable-bits.h>
6539
6540+#define ktla_ktva(addr) (addr)
6541+#define ktva_ktla(addr) (addr)
6542+
6543 struct mm_struct;
6544 struct vm_area_struct;
6545
6546diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6547index 55ed660..3dc9422 100644
6548--- a/arch/mips/include/asm/thread_info.h
6549+++ b/arch/mips/include/asm/thread_info.h
6550@@ -102,6 +102,9 @@ static inline struct thread_info *current_thread_info(void)
6551 #define TIF_SECCOMP 4 /* secure computing */
6552 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6553 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6554+/* li takes a 32bit immediate */
6555+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6556+
6557 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6558 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6559 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6560@@ -137,14 +140,16 @@ static inline struct thread_info *current_thread_info(void)
6561 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6562 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6563 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6564+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6565
6566 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6567 _TIF_SYSCALL_AUDIT | \
6568- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6569+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6570+ _TIF_GRSEC_SETXID)
6571
6572 /* work to do in syscall_trace_leave() */
6573 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6574- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6575+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6576
6577 /* work to do on interrupt/exception return */
6578 #define _TIF_WORK_MASK \
6579@@ -152,7 +157,7 @@ static inline struct thread_info *current_thread_info(void)
6580 /* work to do on any return to u-space */
6581 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6582 _TIF_WORK_SYSCALL_EXIT | \
6583- _TIF_SYSCALL_TRACEPOINT)
6584+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6585
6586 /*
6587 * We stash processor id into a COP0 register to retrieve it fast
6588diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6589index bf8b324..cec5705 100644
6590--- a/arch/mips/include/asm/uaccess.h
6591+++ b/arch/mips/include/asm/uaccess.h
6592@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6593 __ok == 0; \
6594 })
6595
6596+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6597 #define access_ok(type, addr, size) \
6598 likely(__access_ok((addr), (size), __access_mask))
6599
6600diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6601index 1188e00..41cf144 100644
6602--- a/arch/mips/kernel/binfmt_elfn32.c
6603+++ b/arch/mips/kernel/binfmt_elfn32.c
6604@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6605 #undef ELF_ET_DYN_BASE
6606 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6607
6608+#ifdef CONFIG_PAX_ASLR
6609+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6610+
6611+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6612+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6613+#endif
6614+
6615 #include <asm/processor.h>
6616 #include <linux/module.h>
6617 #include <linux/elfcore.h>
6618diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6619index 9287678..f870e47 100644
6620--- a/arch/mips/kernel/binfmt_elfo32.c
6621+++ b/arch/mips/kernel/binfmt_elfo32.c
6622@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6623 #undef ELF_ET_DYN_BASE
6624 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6625
6626+#ifdef CONFIG_PAX_ASLR
6627+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6628+
6629+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6630+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6631+#endif
6632+
6633 #include <asm/processor.h>
6634
6635 #include <linux/module.h>
6636diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6637index a74ec3a..4f06f18 100644
6638--- a/arch/mips/kernel/i8259.c
6639+++ b/arch/mips/kernel/i8259.c
6640@@ -202,7 +202,7 @@ spurious_8259A_irq:
6641 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6642 spurious_irq_mask |= irqmask;
6643 }
6644- atomic_inc(&irq_err_count);
6645+ atomic_inc_unchecked(&irq_err_count);
6646 /*
6647 * Theoretically we do not have to handle this IRQ,
6648 * but in Linux this does not cause problems and is
6649diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6650index 44a1f79..2bd6aa3 100644
6651--- a/arch/mips/kernel/irq-gt641xx.c
6652+++ b/arch/mips/kernel/irq-gt641xx.c
6653@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6654 }
6655 }
6656
6657- atomic_inc(&irq_err_count);
6658+ atomic_inc_unchecked(&irq_err_count);
6659 }
6660
6661 void __init gt641xx_irq_init(void)
6662diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6663index be15e52..a089cc4 100644
6664--- a/arch/mips/kernel/irq.c
6665+++ b/arch/mips/kernel/irq.c
6666@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6667 printk("unexpected IRQ # %d\n", irq);
6668 }
6669
6670-atomic_t irq_err_count;
6671+atomic_unchecked_t irq_err_count;
6672
6673 int arch_show_interrupts(struct seq_file *p, int prec)
6674 {
6675- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6676+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6677 return 0;
6678 }
6679
6680 asmlinkage void spurious_interrupt(void)
6681 {
6682- atomic_inc(&irq_err_count);
6683+ atomic_inc_unchecked(&irq_err_count);
6684 }
6685
6686 void __init init_IRQ(void)
6687@@ -110,6 +110,8 @@ void __init init_IRQ(void)
6688 }
6689
6690 #ifdef CONFIG_DEBUG_STACKOVERFLOW
6691+
6692+extern void gr_handle_kernel_exploit(void);
6693 static inline void check_stack_overflow(void)
6694 {
6695 unsigned long sp;
6696@@ -125,6 +127,7 @@ static inline void check_stack_overflow(void)
6697 printk("do_IRQ: stack overflow: %ld\n",
6698 sp - sizeof(struct thread_info));
6699 dump_stack();
6700+ gr_handle_kernel_exploit();
6701 }
6702 }
6703 #else
6704diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6705index 0614717..002fa43 100644
6706--- a/arch/mips/kernel/pm-cps.c
6707+++ b/arch/mips/kernel/pm-cps.c
6708@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6709 nc_core_ready_count = nc_addr;
6710
6711 /* Ensure ready_count is zero-initialised before the assembly runs */
6712- ACCESS_ONCE(*nc_core_ready_count) = 0;
6713+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6714 coupled_barrier(&per_cpu(pm_barrier, core), online);
6715
6716 /* Run the generated entry code */
6717diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6718index bf85cc1..b365c61 100644
6719--- a/arch/mips/kernel/process.c
6720+++ b/arch/mips/kernel/process.c
6721@@ -535,18 +535,6 @@ out:
6722 return pc;
6723 }
6724
6725-/*
6726- * Don't forget that the stack pointer must be aligned on a 8 bytes
6727- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6728- */
6729-unsigned long arch_align_stack(unsigned long sp)
6730-{
6731- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6732- sp -= get_random_int() & ~PAGE_MASK;
6733-
6734- return sp & ALMASK;
6735-}
6736-
6737 static void arch_dump_stack(void *info)
6738 {
6739 struct pt_regs *regs;
6740diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6741index 5104528..950bbdc 100644
6742--- a/arch/mips/kernel/ptrace.c
6743+++ b/arch/mips/kernel/ptrace.c
6744@@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6745 return ret;
6746 }
6747
6748+#ifdef CONFIG_GRKERNSEC_SETXID
6749+extern void gr_delayed_cred_worker(void);
6750+#endif
6751+
6752 /*
6753 * Notification of system call entry/exit
6754 * - triggered by current->work.syscall_trace
6755@@ -779,6 +783,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6756 tracehook_report_syscall_entry(regs))
6757 ret = -1;
6758
6759+#ifdef CONFIG_GRKERNSEC_SETXID
6760+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6761+ gr_delayed_cred_worker();
6762+#endif
6763+
6764 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6765 trace_sys_enter(regs, regs->regs[2]);
6766
6767diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6768index 07fc524..b9d7f28 100644
6769--- a/arch/mips/kernel/reset.c
6770+++ b/arch/mips/kernel/reset.c
6771@@ -13,6 +13,7 @@
6772 #include <linux/reboot.h>
6773
6774 #include <asm/reboot.h>
6775+#include <asm/bug.h>
6776
6777 /*
6778 * Urgs ... Too many MIPS machines to handle this in a generic way.
6779@@ -29,16 +30,19 @@ void machine_restart(char *command)
6780 {
6781 if (_machine_restart)
6782 _machine_restart(command);
6783+ BUG();
6784 }
6785
6786 void machine_halt(void)
6787 {
6788 if (_machine_halt)
6789 _machine_halt();
6790+ BUG();
6791 }
6792
6793 void machine_power_off(void)
6794 {
6795 if (pm_power_off)
6796 pm_power_off();
6797+ BUG();
6798 }
6799diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6800index 2242bdd..b284048 100644
6801--- a/arch/mips/kernel/sync-r4k.c
6802+++ b/arch/mips/kernel/sync-r4k.c
6803@@ -18,8 +18,8 @@
6804 #include <asm/mipsregs.h>
6805
6806 static atomic_t count_start_flag = ATOMIC_INIT(0);
6807-static atomic_t count_count_start = ATOMIC_INIT(0);
6808-static atomic_t count_count_stop = ATOMIC_INIT(0);
6809+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6810+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6811 static atomic_t count_reference = ATOMIC_INIT(0);
6812
6813 #define COUNTON 100
6814@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6815
6816 for (i = 0; i < NR_LOOPS; i++) {
6817 /* slaves loop on '!= 2' */
6818- while (atomic_read(&count_count_start) != 1)
6819+ while (atomic_read_unchecked(&count_count_start) != 1)
6820 mb();
6821- atomic_set(&count_count_stop, 0);
6822+ atomic_set_unchecked(&count_count_stop, 0);
6823 smp_wmb();
6824
6825 /* this lets the slaves write their count register */
6826- atomic_inc(&count_count_start);
6827+ atomic_inc_unchecked(&count_count_start);
6828
6829 /*
6830 * Everyone initialises count in the last loop:
6831@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6832 /*
6833 * Wait for all slaves to leave the synchronization point:
6834 */
6835- while (atomic_read(&count_count_stop) != 1)
6836+ while (atomic_read_unchecked(&count_count_stop) != 1)
6837 mb();
6838- atomic_set(&count_count_start, 0);
6839+ atomic_set_unchecked(&count_count_start, 0);
6840 smp_wmb();
6841- atomic_inc(&count_count_stop);
6842+ atomic_inc_unchecked(&count_count_stop);
6843 }
6844 /* Arrange for an interrupt in a short while */
6845 write_c0_compare(read_c0_count() + COUNTON);
6846@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6847 initcount = atomic_read(&count_reference);
6848
6849 for (i = 0; i < NR_LOOPS; i++) {
6850- atomic_inc(&count_count_start);
6851- while (atomic_read(&count_count_start) != 2)
6852+ atomic_inc_unchecked(&count_count_start);
6853+ while (atomic_read_unchecked(&count_count_start) != 2)
6854 mb();
6855
6856 /*
6857@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6858 if (i == NR_LOOPS-1)
6859 write_c0_count(initcount);
6860
6861- atomic_inc(&count_count_stop);
6862- while (atomic_read(&count_count_stop) != 2)
6863+ atomic_inc_unchecked(&count_count_stop);
6864+ while (atomic_read_unchecked(&count_count_stop) != 2)
6865 mb();
6866 }
6867 /* Arrange for an interrupt in a short while */
6868diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6869index 33984c0..666a96d 100644
6870--- a/arch/mips/kernel/traps.c
6871+++ b/arch/mips/kernel/traps.c
6872@@ -689,7 +689,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6873 siginfo_t info;
6874
6875 prev_state = exception_enter();
6876- die_if_kernel("Integer overflow", regs);
6877+ if (unlikely(!user_mode(regs))) {
6878+
6879+#ifdef CONFIG_PAX_REFCOUNT
6880+ if (fixup_exception(regs)) {
6881+ pax_report_refcount_overflow(regs);
6882+ exception_exit(prev_state);
6883+ return;
6884+ }
6885+#endif
6886+
6887+ die("Integer overflow", regs);
6888+ }
6889
6890 info.si_code = FPE_INTOVF;
6891 info.si_signo = SIGFPE;
6892diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6893index f5e7dda..47198ec 100644
6894--- a/arch/mips/kvm/mips.c
6895+++ b/arch/mips/kvm/mips.c
6896@@ -816,7 +816,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6897 return r;
6898 }
6899
6900-int kvm_arch_init(void *opaque)
6901+int kvm_arch_init(const void *opaque)
6902 {
6903 if (kvm_mips_callbacks) {
6904 kvm_err("kvm: module already exists\n");
6905diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6906index 7ff8637..6004edb 100644
6907--- a/arch/mips/mm/fault.c
6908+++ b/arch/mips/mm/fault.c
6909@@ -31,6 +31,23 @@
6910
6911 int show_unhandled_signals = 1;
6912
6913+#ifdef CONFIG_PAX_PAGEEXEC
6914+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6915+{
6916+ unsigned long i;
6917+
6918+ printk(KERN_ERR "PAX: bytes at PC: ");
6919+ for (i = 0; i < 5; i++) {
6920+ unsigned int c;
6921+ if (get_user(c, (unsigned int *)pc+i))
6922+ printk(KERN_CONT "???????? ");
6923+ else
6924+ printk(KERN_CONT "%08x ", c);
6925+ }
6926+ printk("\n");
6927+}
6928+#endif
6929+
6930 /*
6931 * This routine handles page faults. It determines the address,
6932 * and the problem, and then passes it off to one of the appropriate
6933@@ -206,6 +223,14 @@ bad_area:
6934 bad_area_nosemaphore:
6935 /* User mode accesses just cause a SIGSEGV */
6936 if (user_mode(regs)) {
6937+
6938+#ifdef CONFIG_PAX_PAGEEXEC
6939+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6940+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6941+ do_group_exit(SIGKILL);
6942+ }
6943+#endif
6944+
6945 tsk->thread.cp0_badvaddr = address;
6946 tsk->thread.error_code = write;
6947 if (show_unhandled_signals &&
6948diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6949index f1baadd..5472dca 100644
6950--- a/arch/mips/mm/mmap.c
6951+++ b/arch/mips/mm/mmap.c
6952@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6953 struct vm_area_struct *vma;
6954 unsigned long addr = addr0;
6955 int do_color_align;
6956+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6957 struct vm_unmapped_area_info info;
6958
6959 if (unlikely(len > TASK_SIZE))
6960@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6961 do_color_align = 1;
6962
6963 /* requesting a specific address */
6964+
6965+#ifdef CONFIG_PAX_RANDMMAP
6966+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6967+#endif
6968+
6969 if (addr) {
6970 if (do_color_align)
6971 addr = COLOUR_ALIGN(addr, pgoff);
6972@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6973 addr = PAGE_ALIGN(addr);
6974
6975 vma = find_vma(mm, addr);
6976- if (TASK_SIZE - len >= addr &&
6977- (!vma || addr + len <= vma->vm_start))
6978+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6979 return addr;
6980 }
6981
6982 info.length = len;
6983 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6984 info.align_offset = pgoff << PAGE_SHIFT;
6985+ info.threadstack_offset = offset;
6986
6987 if (dir == DOWN) {
6988 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6989@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6990 {
6991 unsigned long random_factor = 0UL;
6992
6993+#ifdef CONFIG_PAX_RANDMMAP
6994+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6995+#endif
6996+
6997 if (current->flags & PF_RANDOMIZE) {
6998 random_factor = get_random_int();
6999 random_factor = random_factor << PAGE_SHIFT;
7000@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7001
7002 if (mmap_is_legacy()) {
7003 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7004+
7005+#ifdef CONFIG_PAX_RANDMMAP
7006+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7007+ mm->mmap_base += mm->delta_mmap;
7008+#endif
7009+
7010 mm->get_unmapped_area = arch_get_unmapped_area;
7011 } else {
7012 mm->mmap_base = mmap_base(random_factor);
7013+
7014+#ifdef CONFIG_PAX_RANDMMAP
7015+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7016+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7017+#endif
7018+
7019 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7020 }
7021 }
7022
7023-static inline unsigned long brk_rnd(void)
7024-{
7025- unsigned long rnd = get_random_int();
7026-
7027- rnd = rnd << PAGE_SHIFT;
7028- /* 8MB for 32bit, 256MB for 64bit */
7029- if (TASK_IS_32BIT_ADDR)
7030- rnd = rnd & 0x7ffffful;
7031- else
7032- rnd = rnd & 0xffffffful;
7033-
7034- return rnd;
7035-}
7036-
7037-unsigned long arch_randomize_brk(struct mm_struct *mm)
7038-{
7039- unsigned long base = mm->brk;
7040- unsigned long ret;
7041-
7042- ret = PAGE_ALIGN(base + brk_rnd());
7043-
7044- if (ret < mm->brk)
7045- return mm->brk;
7046-
7047- return ret;
7048-}
7049-
7050 int __virt_addr_valid(const volatile void *kaddr)
7051 {
7052 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7053diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7054index a2358b4..7cead4f 100644
7055--- a/arch/mips/sgi-ip27/ip27-nmi.c
7056+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7057@@ -187,9 +187,9 @@ void
7058 cont_nmi_dump(void)
7059 {
7060 #ifndef REAL_NMI_SIGNAL
7061- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7062+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7063
7064- atomic_inc(&nmied_cpus);
7065+ atomic_inc_unchecked(&nmied_cpus);
7066 #endif
7067 /*
7068 * Only allow 1 cpu to proceed
7069@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7070 udelay(10000);
7071 }
7072 #else
7073- while (atomic_read(&nmied_cpus) != num_online_cpus());
7074+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7075 #endif
7076
7077 /*
7078diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7079index a046b30..6799527 100644
7080--- a/arch/mips/sni/rm200.c
7081+++ b/arch/mips/sni/rm200.c
7082@@ -270,7 +270,7 @@ spurious_8259A_irq:
7083 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7084 spurious_irq_mask |= irqmask;
7085 }
7086- atomic_inc(&irq_err_count);
7087+ atomic_inc_unchecked(&irq_err_count);
7088 /*
7089 * Theoretically we do not have to handle this IRQ,
7090 * but in Linux this does not cause problems and is
7091diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7092index 41e873b..34d33a7 100644
7093--- a/arch/mips/vr41xx/common/icu.c
7094+++ b/arch/mips/vr41xx/common/icu.c
7095@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7096
7097 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7098
7099- atomic_inc(&irq_err_count);
7100+ atomic_inc_unchecked(&irq_err_count);
7101
7102 return -1;
7103 }
7104diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7105index ae0e4ee..e8f0692 100644
7106--- a/arch/mips/vr41xx/common/irq.c
7107+++ b/arch/mips/vr41xx/common/irq.c
7108@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7109 irq_cascade_t *cascade;
7110
7111 if (irq >= NR_IRQS) {
7112- atomic_inc(&irq_err_count);
7113+ atomic_inc_unchecked(&irq_err_count);
7114 return;
7115 }
7116
7117@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7118 ret = cascade->get_irq(irq);
7119 irq = ret;
7120 if (ret < 0)
7121- atomic_inc(&irq_err_count);
7122+ atomic_inc_unchecked(&irq_err_count);
7123 else
7124 irq_dispatch(irq);
7125 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7126diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7127index 967d144..db12197 100644
7128--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7129+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7130@@ -11,12 +11,14 @@
7131 #ifndef _ASM_PROC_CACHE_H
7132 #define _ASM_PROC_CACHE_H
7133
7134+#include <linux/const.h>
7135+
7136 /* L1 cache */
7137
7138 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7139 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7140-#define L1_CACHE_BYTES 16 /* bytes per entry */
7141 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7142+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7143 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7144
7145 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7146diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7147index bcb5df2..84fabd2 100644
7148--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7149+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7150@@ -16,13 +16,15 @@
7151 #ifndef _ASM_PROC_CACHE_H
7152 #define _ASM_PROC_CACHE_H
7153
7154+#include <linux/const.h>
7155+
7156 /*
7157 * L1 cache
7158 */
7159 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7160 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7161-#define L1_CACHE_BYTES 32 /* bytes per entry */
7162 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7163+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7164 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7165
7166 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7167diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7168index 4ce7a01..449202a 100644
7169--- a/arch/openrisc/include/asm/cache.h
7170+++ b/arch/openrisc/include/asm/cache.h
7171@@ -19,11 +19,13 @@
7172 #ifndef __ASM_OPENRISC_CACHE_H
7173 #define __ASM_OPENRISC_CACHE_H
7174
7175+#include <linux/const.h>
7176+
7177 /* FIXME: How can we replace these with values from the CPU...
7178 * they shouldn't be hard-coded!
7179 */
7180
7181-#define L1_CACHE_BYTES 16
7182 #define L1_CACHE_SHIFT 4
7183+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7184
7185 #endif /* __ASM_OPENRISC_CACHE_H */
7186diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7187index 226f8ca9..9d9b87d 100644
7188--- a/arch/parisc/include/asm/atomic.h
7189+++ b/arch/parisc/include/asm/atomic.h
7190@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7191 return dec;
7192 }
7193
7194+#define atomic64_read_unchecked(v) atomic64_read(v)
7195+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7196+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7197+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7198+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7199+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7200+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7201+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7202+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7203+
7204 #endif /* !CONFIG_64BIT */
7205
7206
7207diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7208index 47f11c7..3420df2 100644
7209--- a/arch/parisc/include/asm/cache.h
7210+++ b/arch/parisc/include/asm/cache.h
7211@@ -5,6 +5,7 @@
7212 #ifndef __ARCH_PARISC_CACHE_H
7213 #define __ARCH_PARISC_CACHE_H
7214
7215+#include <linux/const.h>
7216
7217 /*
7218 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7219@@ -15,13 +16,13 @@
7220 * just ruin performance.
7221 */
7222 #ifdef CONFIG_PA20
7223-#define L1_CACHE_BYTES 64
7224 #define L1_CACHE_SHIFT 6
7225 #else
7226-#define L1_CACHE_BYTES 32
7227 #define L1_CACHE_SHIFT 5
7228 #endif
7229
7230+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7231+
7232 #ifndef __ASSEMBLY__
7233
7234 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7235diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7236index 78c9fd3..42fa66a 100644
7237--- a/arch/parisc/include/asm/elf.h
7238+++ b/arch/parisc/include/asm/elf.h
7239@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7240
7241 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7242
7243+#ifdef CONFIG_PAX_ASLR
7244+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7245+
7246+#define PAX_DELTA_MMAP_LEN 16
7247+#define PAX_DELTA_STACK_LEN 16
7248+#endif
7249+
7250 /* This yields a mask that user programs can use to figure out what
7251 instruction set this CPU supports. This could be done in user space,
7252 but it's not easy, and we've already done it here. */
7253diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7254index d174372..f27fe5c 100644
7255--- a/arch/parisc/include/asm/pgalloc.h
7256+++ b/arch/parisc/include/asm/pgalloc.h
7257@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7258 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7259 }
7260
7261+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7262+{
7263+ pgd_populate(mm, pgd, pmd);
7264+}
7265+
7266 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7267 {
7268 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7269@@ -96,6 +101,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7270 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7271 #define pmd_free(mm, x) do { } while (0)
7272 #define pgd_populate(mm, pmd, pte) BUG()
7273+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7274
7275 #endif
7276
7277diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7278index 15207b9..3209e65 100644
7279--- a/arch/parisc/include/asm/pgtable.h
7280+++ b/arch/parisc/include/asm/pgtable.h
7281@@ -215,6 +215,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7282 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7283 #define PAGE_COPY PAGE_EXECREAD
7284 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7285+
7286+#ifdef CONFIG_PAX_PAGEEXEC
7287+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7288+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7289+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7290+#else
7291+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7292+# define PAGE_COPY_NOEXEC PAGE_COPY
7293+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7294+#endif
7295+
7296 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7297 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7298 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7299diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7300index 0abdd4c..1af92f0 100644
7301--- a/arch/parisc/include/asm/uaccess.h
7302+++ b/arch/parisc/include/asm/uaccess.h
7303@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7304 const void __user *from,
7305 unsigned long n)
7306 {
7307- int sz = __compiletime_object_size(to);
7308+ size_t sz = __compiletime_object_size(to);
7309 int ret = -EFAULT;
7310
7311- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7312+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7313 ret = __copy_from_user(to, from, n);
7314 else
7315 copy_from_user_overflow();
7316diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7317index 3c63a82..b1d6ee9 100644
7318--- a/arch/parisc/kernel/module.c
7319+++ b/arch/parisc/kernel/module.c
7320@@ -98,16 +98,38 @@
7321
7322 /* three functions to determine where in the module core
7323 * or init pieces the location is */
7324+static inline int in_init_rx(struct module *me, void *loc)
7325+{
7326+ return (loc >= me->module_init_rx &&
7327+ loc < (me->module_init_rx + me->init_size_rx));
7328+}
7329+
7330+static inline int in_init_rw(struct module *me, void *loc)
7331+{
7332+ return (loc >= me->module_init_rw &&
7333+ loc < (me->module_init_rw + me->init_size_rw));
7334+}
7335+
7336 static inline int in_init(struct module *me, void *loc)
7337 {
7338- return (loc >= me->module_init &&
7339- loc <= (me->module_init + me->init_size));
7340+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7341+}
7342+
7343+static inline int in_core_rx(struct module *me, void *loc)
7344+{
7345+ return (loc >= me->module_core_rx &&
7346+ loc < (me->module_core_rx + me->core_size_rx));
7347+}
7348+
7349+static inline int in_core_rw(struct module *me, void *loc)
7350+{
7351+ return (loc >= me->module_core_rw &&
7352+ loc < (me->module_core_rw + me->core_size_rw));
7353 }
7354
7355 static inline int in_core(struct module *me, void *loc)
7356 {
7357- return (loc >= me->module_core &&
7358- loc <= (me->module_core + me->core_size));
7359+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7360 }
7361
7362 static inline int in_local(struct module *me, void *loc)
7363@@ -367,13 +389,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7364 }
7365
7366 /* align things a bit */
7367- me->core_size = ALIGN(me->core_size, 16);
7368- me->arch.got_offset = me->core_size;
7369- me->core_size += gots * sizeof(struct got_entry);
7370+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7371+ me->arch.got_offset = me->core_size_rw;
7372+ me->core_size_rw += gots * sizeof(struct got_entry);
7373
7374- me->core_size = ALIGN(me->core_size, 16);
7375- me->arch.fdesc_offset = me->core_size;
7376- me->core_size += fdescs * sizeof(Elf_Fdesc);
7377+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7378+ me->arch.fdesc_offset = me->core_size_rw;
7379+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7380
7381 me->arch.got_max = gots;
7382 me->arch.fdesc_max = fdescs;
7383@@ -391,7 +413,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7384
7385 BUG_ON(value == 0);
7386
7387- got = me->module_core + me->arch.got_offset;
7388+ got = me->module_core_rw + me->arch.got_offset;
7389 for (i = 0; got[i].addr; i++)
7390 if (got[i].addr == value)
7391 goto out;
7392@@ -409,7 +431,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7393 #ifdef CONFIG_64BIT
7394 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7395 {
7396- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7397+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7398
7399 if (!value) {
7400 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7401@@ -427,7 +449,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7402
7403 /* Create new one */
7404 fdesc->addr = value;
7405- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7406+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7407 return (Elf_Addr)fdesc;
7408 }
7409 #endif /* CONFIG_64BIT */
7410@@ -839,7 +861,7 @@ register_unwind_table(struct module *me,
7411
7412 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7413 end = table + sechdrs[me->arch.unwind_section].sh_size;
7414- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7415+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7416
7417 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7418 me->arch.unwind_section, table, end, gp);
7419diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7420index 5aba01a..47cdd5a 100644
7421--- a/arch/parisc/kernel/sys_parisc.c
7422+++ b/arch/parisc/kernel/sys_parisc.c
7423@@ -92,6 +92,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7424 unsigned long task_size = TASK_SIZE;
7425 int do_color_align, last_mmap;
7426 struct vm_unmapped_area_info info;
7427+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7428
7429 if (len > task_size)
7430 return -ENOMEM;
7431@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7432 goto found_addr;
7433 }
7434
7435+#ifdef CONFIG_PAX_RANDMMAP
7436+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7437+#endif
7438+
7439 if (addr) {
7440 if (do_color_align && last_mmap)
7441 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7442@@ -127,6 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7443 info.high_limit = mmap_upper_limit();
7444 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7445 info.align_offset = shared_align_offset(last_mmap, pgoff);
7446+ info.threadstack_offset = offset;
7447 addr = vm_unmapped_area(&info);
7448
7449 found_addr:
7450@@ -146,6 +152,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7451 unsigned long addr = addr0;
7452 int do_color_align, last_mmap;
7453 struct vm_unmapped_area_info info;
7454+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7455
7456 #ifdef CONFIG_64BIT
7457 /* This should only ever run for 32-bit processes. */
7458@@ -170,6 +177,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7459 }
7460
7461 /* requesting a specific address */
7462+#ifdef CONFIG_PAX_RANDMMAP
7463+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7464+#endif
7465+
7466 if (addr) {
7467 if (do_color_align && last_mmap)
7468 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7469@@ -187,6 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7470 info.high_limit = mm->mmap_base;
7471 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7472 info.align_offset = shared_align_offset(last_mmap, pgoff);
7473+ info.threadstack_offset = offset;
7474 addr = vm_unmapped_area(&info);
7475 if (!(addr & ~PAGE_MASK))
7476 goto found_addr;
7477@@ -252,6 +264,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7478 mm->mmap_legacy_base = mmap_legacy_base();
7479 mm->mmap_base = mmap_upper_limit();
7480
7481+#ifdef CONFIG_PAX_RANDMMAP
7482+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7483+ mm->mmap_legacy_base += mm->delta_mmap;
7484+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7485+ }
7486+#endif
7487+
7488 if (mmap_is_legacy()) {
7489 mm->mmap_base = mm->mmap_legacy_base;
7490 mm->get_unmapped_area = arch_get_unmapped_area;
7491diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7492index 47ee620..1107387 100644
7493--- a/arch/parisc/kernel/traps.c
7494+++ b/arch/parisc/kernel/traps.c
7495@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7496
7497 down_read(&current->mm->mmap_sem);
7498 vma = find_vma(current->mm,regs->iaoq[0]);
7499- if (vma && (regs->iaoq[0] >= vma->vm_start)
7500- && (vma->vm_flags & VM_EXEC)) {
7501-
7502+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7503 fault_address = regs->iaoq[0];
7504 fault_space = regs->iasq[0];
7505
7506diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7507index e5120e6..8ddb5cc 100644
7508--- a/arch/parisc/mm/fault.c
7509+++ b/arch/parisc/mm/fault.c
7510@@ -15,6 +15,7 @@
7511 #include <linux/sched.h>
7512 #include <linux/interrupt.h>
7513 #include <linux/module.h>
7514+#include <linux/unistd.h>
7515
7516 #include <asm/uaccess.h>
7517 #include <asm/traps.h>
7518@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7519 static unsigned long
7520 parisc_acctyp(unsigned long code, unsigned int inst)
7521 {
7522- if (code == 6 || code == 16)
7523+ if (code == 6 || code == 7 || code == 16)
7524 return VM_EXEC;
7525
7526 switch (inst & 0xf0000000) {
7527@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7528 }
7529 #endif
7530
7531+#ifdef CONFIG_PAX_PAGEEXEC
7532+/*
7533+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7534+ *
7535+ * returns 1 when task should be killed
7536+ * 2 when rt_sigreturn trampoline was detected
7537+ * 3 when unpatched PLT trampoline was detected
7538+ */
7539+static int pax_handle_fetch_fault(struct pt_regs *regs)
7540+{
7541+
7542+#ifdef CONFIG_PAX_EMUPLT
7543+ int err;
7544+
7545+ do { /* PaX: unpatched PLT emulation */
7546+ unsigned int bl, depwi;
7547+
7548+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7549+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7550+
7551+ if (err)
7552+ break;
7553+
7554+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7555+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7556+
7557+ err = get_user(ldw, (unsigned int *)addr);
7558+ err |= get_user(bv, (unsigned int *)(addr+4));
7559+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7560+
7561+ if (err)
7562+ break;
7563+
7564+ if (ldw == 0x0E801096U &&
7565+ bv == 0xEAC0C000U &&
7566+ ldw2 == 0x0E881095U)
7567+ {
7568+ unsigned int resolver, map;
7569+
7570+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7571+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7572+ if (err)
7573+ break;
7574+
7575+ regs->gr[20] = instruction_pointer(regs)+8;
7576+ regs->gr[21] = map;
7577+ regs->gr[22] = resolver;
7578+ regs->iaoq[0] = resolver | 3UL;
7579+ regs->iaoq[1] = regs->iaoq[0] + 4;
7580+ return 3;
7581+ }
7582+ }
7583+ } while (0);
7584+#endif
7585+
7586+#ifdef CONFIG_PAX_EMUTRAMP
7587+
7588+#ifndef CONFIG_PAX_EMUSIGRT
7589+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7590+ return 1;
7591+#endif
7592+
7593+ do { /* PaX: rt_sigreturn emulation */
7594+ unsigned int ldi1, ldi2, bel, nop;
7595+
7596+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7597+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7598+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7599+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7600+
7601+ if (err)
7602+ break;
7603+
7604+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7605+ ldi2 == 0x3414015AU &&
7606+ bel == 0xE4008200U &&
7607+ nop == 0x08000240U)
7608+ {
7609+ regs->gr[25] = (ldi1 & 2) >> 1;
7610+ regs->gr[20] = __NR_rt_sigreturn;
7611+ regs->gr[31] = regs->iaoq[1] + 16;
7612+ regs->sr[0] = regs->iasq[1];
7613+ regs->iaoq[0] = 0x100UL;
7614+ regs->iaoq[1] = regs->iaoq[0] + 4;
7615+ regs->iasq[0] = regs->sr[2];
7616+ regs->iasq[1] = regs->sr[2];
7617+ return 2;
7618+ }
7619+ } while (0);
7620+#endif
7621+
7622+ return 1;
7623+}
7624+
7625+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7626+{
7627+ unsigned long i;
7628+
7629+ printk(KERN_ERR "PAX: bytes at PC: ");
7630+ for (i = 0; i < 5; i++) {
7631+ unsigned int c;
7632+ if (get_user(c, (unsigned int *)pc+i))
7633+ printk(KERN_CONT "???????? ");
7634+ else
7635+ printk(KERN_CONT "%08x ", c);
7636+ }
7637+ printk("\n");
7638+}
7639+#endif
7640+
7641 int fixup_exception(struct pt_regs *regs)
7642 {
7643 const struct exception_table_entry *fix;
7644@@ -234,8 +345,33 @@ retry:
7645
7646 good_area:
7647
7648- if ((vma->vm_flags & acc_type) != acc_type)
7649+ if ((vma->vm_flags & acc_type) != acc_type) {
7650+
7651+#ifdef CONFIG_PAX_PAGEEXEC
7652+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7653+ (address & ~3UL) == instruction_pointer(regs))
7654+ {
7655+ up_read(&mm->mmap_sem);
7656+ switch (pax_handle_fetch_fault(regs)) {
7657+
7658+#ifdef CONFIG_PAX_EMUPLT
7659+ case 3:
7660+ return;
7661+#endif
7662+
7663+#ifdef CONFIG_PAX_EMUTRAMP
7664+ case 2:
7665+ return;
7666+#endif
7667+
7668+ }
7669+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7670+ do_group_exit(SIGKILL);
7671+ }
7672+#endif
7673+
7674 goto bad_area;
7675+ }
7676
7677 /*
7678 * If for any reason at all we couldn't handle the fault, make
7679diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7680index 22b0940..309f790 100644
7681--- a/arch/powerpc/Kconfig
7682+++ b/arch/powerpc/Kconfig
7683@@ -409,6 +409,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7684 config KEXEC
7685 bool "kexec system call"
7686 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7687+ depends on !GRKERNSEC_KMEM
7688 help
7689 kexec is a system call that implements the ability to shutdown your
7690 current kernel, and to start another kernel. It is like a reboot
7691diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7692index 512d278..d31fadd 100644
7693--- a/arch/powerpc/include/asm/atomic.h
7694+++ b/arch/powerpc/include/asm/atomic.h
7695@@ -12,6 +12,11 @@
7696
7697 #define ATOMIC_INIT(i) { (i) }
7698
7699+#define _ASM_EXTABLE(from, to) \
7700+" .section __ex_table,\"a\"\n" \
7701+ PPC_LONG" " #from ", " #to"\n" \
7702+" .previous\n"
7703+
7704 static __inline__ int atomic_read(const atomic_t *v)
7705 {
7706 int t;
7707@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7708 return t;
7709 }
7710
7711+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7712+{
7713+ int t;
7714+
7715+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7716+
7717+ return t;
7718+}
7719+
7720 static __inline__ void atomic_set(atomic_t *v, int i)
7721 {
7722 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7723 }
7724
7725-#define ATOMIC_OP(op, asm_op) \
7726-static __inline__ void atomic_##op(int a, atomic_t *v) \
7727+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7728+{
7729+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7730+}
7731+
7732+#ifdef CONFIG_PAX_REFCOUNT
7733+#define __REFCOUNT_OP(op) op##o.
7734+#define __OVERFLOW_PRE \
7735+ " mcrxr cr0\n"
7736+#define __OVERFLOW_POST \
7737+ " bf 4*cr0+so, 3f\n" \
7738+ "2: .long 0x00c00b00\n" \
7739+ "3:\n"
7740+#define __OVERFLOW_EXTABLE \
7741+ "\n4:\n"
7742+ _ASM_EXTABLE(2b, 4b)
7743+#else
7744+#define __REFCOUNT_OP(op) op
7745+#define __OVERFLOW_PRE
7746+#define __OVERFLOW_POST
7747+#define __OVERFLOW_EXTABLE
7748+#endif
7749+
7750+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7751+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7752 { \
7753 int t; \
7754 \
7755 __asm__ __volatile__( \
7756-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7757+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7758+ pre_op \
7759 #asm_op " %0,%2,%0\n" \
7760+ post_op \
7761 PPC405_ERR77(0,%3) \
7762 " stwcx. %0,0,%3 \n" \
7763 " bne- 1b\n" \
7764+ extable \
7765 : "=&r" (t), "+m" (v->counter) \
7766 : "r" (a), "r" (&v->counter) \
7767 : "cc"); \
7768 } \
7769
7770-#define ATOMIC_OP_RETURN(op, asm_op) \
7771-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7772+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7773+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7774+
7775+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7776+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7777 { \
7778 int t; \
7779 \
7780 __asm__ __volatile__( \
7781 PPC_ATOMIC_ENTRY_BARRIER \
7782-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7783+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7784+ pre_op \
7785 #asm_op " %0,%1,%0\n" \
7786+ post_op \
7787 PPC405_ERR77(0,%2) \
7788 " stwcx. %0,0,%2 \n" \
7789 " bne- 1b\n" \
7790+ extable \
7791 PPC_ATOMIC_EXIT_BARRIER \
7792 : "=&r" (t) \
7793 : "r" (a), "r" (&v->counter) \
7794@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7795 return t; \
7796 }
7797
7798+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7799+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7800+
7801 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7802
7803 ATOMIC_OPS(add, add)
7804@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7805
7806 #undef ATOMIC_OPS
7807 #undef ATOMIC_OP_RETURN
7808+#undef __ATOMIC_OP_RETURN
7809 #undef ATOMIC_OP
7810+#undef __ATOMIC_OP
7811
7812 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7813
7814-static __inline__ void atomic_inc(atomic_t *v)
7815-{
7816- int t;
7817+/*
7818+ * atomic_inc - increment atomic variable
7819+ * @v: pointer of type atomic_t
7820+ *
7821+ * Automatically increments @v by 1
7822+ */
7823+#define atomic_inc(v) atomic_add(1, (v))
7824+#define atomic_inc_return(v) atomic_add_return(1, (v))
7825
7826- __asm__ __volatile__(
7827-"1: lwarx %0,0,%2 # atomic_inc\n\
7828- addic %0,%0,1\n"
7829- PPC405_ERR77(0,%2)
7830-" stwcx. %0,0,%2 \n\
7831- bne- 1b"
7832- : "=&r" (t), "+m" (v->counter)
7833- : "r" (&v->counter)
7834- : "cc", "xer");
7835+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7836+{
7837+ atomic_add_unchecked(1, v);
7838 }
7839
7840-static __inline__ int atomic_inc_return(atomic_t *v)
7841+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7842 {
7843- int t;
7844-
7845- __asm__ __volatile__(
7846- PPC_ATOMIC_ENTRY_BARRIER
7847-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7848- addic %0,%0,1\n"
7849- PPC405_ERR77(0,%1)
7850-" stwcx. %0,0,%1 \n\
7851- bne- 1b"
7852- PPC_ATOMIC_EXIT_BARRIER
7853- : "=&r" (t)
7854- : "r" (&v->counter)
7855- : "cc", "xer", "memory");
7856-
7857- return t;
7858+ return atomic_add_return_unchecked(1, v);
7859 }
7860
7861 /*
7862@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7863 */
7864 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7865
7866-static __inline__ void atomic_dec(atomic_t *v)
7867+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7868 {
7869- int t;
7870-
7871- __asm__ __volatile__(
7872-"1: lwarx %0,0,%2 # atomic_dec\n\
7873- addic %0,%0,-1\n"
7874- PPC405_ERR77(0,%2)\
7875-" stwcx. %0,0,%2\n\
7876- bne- 1b"
7877- : "=&r" (t), "+m" (v->counter)
7878- : "r" (&v->counter)
7879- : "cc", "xer");
7880+ return atomic_add_return_unchecked(1, v) == 0;
7881 }
7882
7883-static __inline__ int atomic_dec_return(atomic_t *v)
7884+/*
7885+ * atomic_dec - decrement atomic variable
7886+ * @v: pointer of type atomic_t
7887+ *
7888+ * Atomically decrements @v by 1
7889+ */
7890+#define atomic_dec(v) atomic_sub(1, (v))
7891+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7892+
7893+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7894 {
7895- int t;
7896-
7897- __asm__ __volatile__(
7898- PPC_ATOMIC_ENTRY_BARRIER
7899-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7900- addic %0,%0,-1\n"
7901- PPC405_ERR77(0,%1)
7902-" stwcx. %0,0,%1\n\
7903- bne- 1b"
7904- PPC_ATOMIC_EXIT_BARRIER
7905- : "=&r" (t)
7906- : "r" (&v->counter)
7907- : "cc", "xer", "memory");
7908-
7909- return t;
7910+ atomic_sub_unchecked(1, v);
7911 }
7912
7913 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7914 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7915
7916+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7917+{
7918+ return cmpxchg(&(v->counter), old, new);
7919+}
7920+
7921+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7922+{
7923+ return xchg(&(v->counter), new);
7924+}
7925+
7926 /**
7927 * __atomic_add_unless - add unless the number is a given value
7928 * @v: pointer of type atomic_t
7929@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7930 PPC_ATOMIC_ENTRY_BARRIER
7931 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7932 cmpw 0,%0,%3 \n\
7933- beq- 2f \n\
7934- add %0,%2,%0 \n"
7935+ beq- 2f \n"
7936+
7937+#ifdef CONFIG_PAX_REFCOUNT
7938+" mcrxr cr0\n"
7939+" addo. %0,%2,%0\n"
7940+" bf 4*cr0+so, 4f\n"
7941+"3:.long " "0x00c00b00""\n"
7942+"4:\n"
7943+#else
7944+ "add %0,%2,%0 \n"
7945+#endif
7946+
7947 PPC405_ERR77(0,%2)
7948 " stwcx. %0,0,%1 \n\
7949 bne- 1b \n"
7950+"5:"
7951+
7952+#ifdef CONFIG_PAX_REFCOUNT
7953+ _ASM_EXTABLE(3b, 5b)
7954+#endif
7955+
7956 PPC_ATOMIC_EXIT_BARRIER
7957 " subf %0,%2,%0 \n\
7958 2:"
7959@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7960 }
7961 #define atomic_dec_if_positive atomic_dec_if_positive
7962
7963+#define smp_mb__before_atomic_dec() smp_mb()
7964+#define smp_mb__after_atomic_dec() smp_mb()
7965+#define smp_mb__before_atomic_inc() smp_mb()
7966+#define smp_mb__after_atomic_inc() smp_mb()
7967+
7968 #ifdef __powerpc64__
7969
7970 #define ATOMIC64_INIT(i) { (i) }
7971@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
7972 return t;
7973 }
7974
7975+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
7976+{
7977+ long t;
7978+
7979+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7980+
7981+ return t;
7982+}
7983+
7984 static __inline__ void atomic64_set(atomic64_t *v, long i)
7985 {
7986 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7987 }
7988
7989-#define ATOMIC64_OP(op, asm_op) \
7990-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
7991+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
7992+{
7993+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7994+}
7995+
7996+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7997+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
7998 { \
7999 long t; \
8000 \
8001 __asm__ __volatile__( \
8002 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8003+ pre_op \
8004 #asm_op " %0,%2,%0\n" \
8005+ post_op \
8006 " stdcx. %0,0,%3 \n" \
8007 " bne- 1b\n" \
8008+ extable \
8009 : "=&r" (t), "+m" (v->counter) \
8010 : "r" (a), "r" (&v->counter) \
8011 : "cc"); \
8012 }
8013
8014-#define ATOMIC64_OP_RETURN(op, asm_op) \
8015-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8016+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8017+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8018+
8019+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8020+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8021 { \
8022 long t; \
8023 \
8024 __asm__ __volatile__( \
8025 PPC_ATOMIC_ENTRY_BARRIER \
8026 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8027+ pre_op \
8028 #asm_op " %0,%1,%0\n" \
8029+ post_op \
8030 " stdcx. %0,0,%2 \n" \
8031 " bne- 1b\n" \
8032+ extable \
8033 PPC_ATOMIC_EXIT_BARRIER \
8034 : "=&r" (t) \
8035 : "r" (a), "r" (&v->counter) \
8036@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8037 return t; \
8038 }
8039
8040+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8041+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8042+
8043 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8044
8045 ATOMIC64_OPS(add, add)
8046@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8047
8048 #undef ATOMIC64_OPS
8049 #undef ATOMIC64_OP_RETURN
8050+#undef __ATOMIC64_OP_RETURN
8051 #undef ATOMIC64_OP
8052+#undef __ATOMIC64_OP
8053+#undef __OVERFLOW_EXTABLE
8054+#undef __OVERFLOW_POST
8055+#undef __OVERFLOW_PRE
8056+#undef __REFCOUNT_OP
8057
8058 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8059
8060-static __inline__ void atomic64_inc(atomic64_t *v)
8061-{
8062- long t;
8063+/*
8064+ * atomic64_inc - increment atomic variable
8065+ * @v: pointer of type atomic64_t
8066+ *
8067+ * Automatically increments @v by 1
8068+ */
8069+#define atomic64_inc(v) atomic64_add(1, (v))
8070+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8071
8072- __asm__ __volatile__(
8073-"1: ldarx %0,0,%2 # atomic64_inc\n\
8074- addic %0,%0,1\n\
8075- stdcx. %0,0,%2 \n\
8076- bne- 1b"
8077- : "=&r" (t), "+m" (v->counter)
8078- : "r" (&v->counter)
8079- : "cc", "xer");
8080+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8081+{
8082+ atomic64_add_unchecked(1, v);
8083 }
8084
8085-static __inline__ long atomic64_inc_return(atomic64_t *v)
8086+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8087 {
8088- long t;
8089-
8090- __asm__ __volatile__(
8091- PPC_ATOMIC_ENTRY_BARRIER
8092-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8093- addic %0,%0,1\n\
8094- stdcx. %0,0,%1 \n\
8095- bne- 1b"
8096- PPC_ATOMIC_EXIT_BARRIER
8097- : "=&r" (t)
8098- : "r" (&v->counter)
8099- : "cc", "xer", "memory");
8100-
8101- return t;
8102+ return atomic64_add_return_unchecked(1, v);
8103 }
8104
8105 /*
8106@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8107 */
8108 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8109
8110-static __inline__ void atomic64_dec(atomic64_t *v)
8111+/*
8112+ * atomic64_dec - decrement atomic variable
8113+ * @v: pointer of type atomic64_t
8114+ *
8115+ * Atomically decrements @v by 1
8116+ */
8117+#define atomic64_dec(v) atomic64_sub(1, (v))
8118+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8119+
8120+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8121 {
8122- long t;
8123-
8124- __asm__ __volatile__(
8125-"1: ldarx %0,0,%2 # atomic64_dec\n\
8126- addic %0,%0,-1\n\
8127- stdcx. %0,0,%2\n\
8128- bne- 1b"
8129- : "=&r" (t), "+m" (v->counter)
8130- : "r" (&v->counter)
8131- : "cc", "xer");
8132-}
8133-
8134-static __inline__ long atomic64_dec_return(atomic64_t *v)
8135-{
8136- long t;
8137-
8138- __asm__ __volatile__(
8139- PPC_ATOMIC_ENTRY_BARRIER
8140-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8141- addic %0,%0,-1\n\
8142- stdcx. %0,0,%1\n\
8143- bne- 1b"
8144- PPC_ATOMIC_EXIT_BARRIER
8145- : "=&r" (t)
8146- : "r" (&v->counter)
8147- : "cc", "xer", "memory");
8148-
8149- return t;
8150+ atomic64_sub_unchecked(1, v);
8151 }
8152
8153 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8154@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8155 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8156 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8157
8158+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8159+{
8160+ return cmpxchg(&(v->counter), old, new);
8161+}
8162+
8163+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8164+{
8165+ return xchg(&(v->counter), new);
8166+}
8167+
8168 /**
8169 * atomic64_add_unless - add unless the number is a given value
8170 * @v: pointer of type atomic64_t
8171@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8172
8173 __asm__ __volatile__ (
8174 PPC_ATOMIC_ENTRY_BARRIER
8175-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8176+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8177 cmpd 0,%0,%3 \n\
8178- beq- 2f \n\
8179- add %0,%2,%0 \n"
8180+ beq- 2f \n"
8181+
8182+#ifdef CONFIG_PAX_REFCOUNT
8183+" mcrxr cr0\n"
8184+" addo. %0,%2,%0\n"
8185+" bf 4*cr0+so, 4f\n"
8186+"3:.long " "0x00c00b00""\n"
8187+"4:\n"
8188+#else
8189+ "add %0,%2,%0 \n"
8190+#endif
8191+
8192 " stdcx. %0,0,%1 \n\
8193 bne- 1b \n"
8194 PPC_ATOMIC_EXIT_BARRIER
8195+"5:"
8196+
8197+#ifdef CONFIG_PAX_REFCOUNT
8198+ _ASM_EXTABLE(3b, 5b)
8199+#endif
8200+
8201 " subf %0,%2,%0 \n\
8202 2:"
8203 : "=&r" (t)
8204diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8205index a3bf5be..e03ba81 100644
8206--- a/arch/powerpc/include/asm/barrier.h
8207+++ b/arch/powerpc/include/asm/barrier.h
8208@@ -76,7 +76,7 @@
8209 do { \
8210 compiletime_assert_atomic_type(*p); \
8211 smp_lwsync(); \
8212- ACCESS_ONCE(*p) = (v); \
8213+ ACCESS_ONCE_RW(*p) = (v); \
8214 } while (0)
8215
8216 #define smp_load_acquire(p) \
8217diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8218index 34a05a1..a1f2c67 100644
8219--- a/arch/powerpc/include/asm/cache.h
8220+++ b/arch/powerpc/include/asm/cache.h
8221@@ -4,6 +4,7 @@
8222 #ifdef __KERNEL__
8223
8224 #include <asm/reg.h>
8225+#include <linux/const.h>
8226
8227 /* bytes per L1 cache line */
8228 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8229@@ -23,7 +24,7 @@
8230 #define L1_CACHE_SHIFT 7
8231 #endif
8232
8233-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8234+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8235
8236 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8237
8238diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8239index 57d289a..b36c98c 100644
8240--- a/arch/powerpc/include/asm/elf.h
8241+++ b/arch/powerpc/include/asm/elf.h
8242@@ -30,6 +30,18 @@
8243
8244 #define ELF_ET_DYN_BASE 0x20000000
8245
8246+#ifdef CONFIG_PAX_ASLR
8247+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8248+
8249+#ifdef __powerpc64__
8250+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8251+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8252+#else
8253+#define PAX_DELTA_MMAP_LEN 15
8254+#define PAX_DELTA_STACK_LEN 15
8255+#endif
8256+#endif
8257+
8258 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8259
8260 /*
8261@@ -128,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8262 (0x7ff >> (PAGE_SHIFT - 12)) : \
8263 (0x3ffff >> (PAGE_SHIFT - 12)))
8264
8265-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8266-#define arch_randomize_brk arch_randomize_brk
8267-
8268-
8269 #ifdef CONFIG_SPU_BASE
8270 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8271 #define NT_SPU 1
8272diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8273index 8196e9c..d83a9f3 100644
8274--- a/arch/powerpc/include/asm/exec.h
8275+++ b/arch/powerpc/include/asm/exec.h
8276@@ -4,6 +4,6 @@
8277 #ifndef _ASM_POWERPC_EXEC_H
8278 #define _ASM_POWERPC_EXEC_H
8279
8280-extern unsigned long arch_align_stack(unsigned long sp);
8281+#define arch_align_stack(x) ((x) & ~0xfUL)
8282
8283 #endif /* _ASM_POWERPC_EXEC_H */
8284diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8285index 5acabbd..7ea14fa 100644
8286--- a/arch/powerpc/include/asm/kmap_types.h
8287+++ b/arch/powerpc/include/asm/kmap_types.h
8288@@ -10,7 +10,7 @@
8289 * 2 of the License, or (at your option) any later version.
8290 */
8291
8292-#define KM_TYPE_NR 16
8293+#define KM_TYPE_NR 17
8294
8295 #endif /* __KERNEL__ */
8296 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8297diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8298index b8da913..c02b593 100644
8299--- a/arch/powerpc/include/asm/local.h
8300+++ b/arch/powerpc/include/asm/local.h
8301@@ -9,21 +9,65 @@ typedef struct
8302 atomic_long_t a;
8303 } local_t;
8304
8305+typedef struct
8306+{
8307+ atomic_long_unchecked_t a;
8308+} local_unchecked_t;
8309+
8310 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8311
8312 #define local_read(l) atomic_long_read(&(l)->a)
8313+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8314 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8315+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8316
8317 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8318+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8319 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8320+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8321 #define local_inc(l) atomic_long_inc(&(l)->a)
8322+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8323 #define local_dec(l) atomic_long_dec(&(l)->a)
8324+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8325
8326 static __inline__ long local_add_return(long a, local_t *l)
8327 {
8328 long t;
8329
8330 __asm__ __volatile__(
8331+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8332+
8333+#ifdef CONFIG_PAX_REFCOUNT
8334+" mcrxr cr0\n"
8335+" addo. %0,%1,%0\n"
8336+" bf 4*cr0+so, 3f\n"
8337+"2:.long " "0x00c00b00""\n"
8338+#else
8339+" add %0,%1,%0\n"
8340+#endif
8341+
8342+"3:\n"
8343+ PPC405_ERR77(0,%2)
8344+ PPC_STLCX "%0,0,%2 \n\
8345+ bne- 1b"
8346+
8347+#ifdef CONFIG_PAX_REFCOUNT
8348+"\n4:\n"
8349+ _ASM_EXTABLE(2b, 4b)
8350+#endif
8351+
8352+ : "=&r" (t)
8353+ : "r" (a), "r" (&(l->a.counter))
8354+ : "cc", "memory");
8355+
8356+ return t;
8357+}
8358+
8359+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8360+{
8361+ long t;
8362+
8363+ __asm__ __volatile__(
8364 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8365 add %0,%1,%0\n"
8366 PPC405_ERR77(0,%2)
8367@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8368
8369 #define local_cmpxchg(l, o, n) \
8370 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8371+#define local_cmpxchg_unchecked(l, o, n) \
8372+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8373 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8374
8375 /**
8376diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8377index 8565c25..2865190 100644
8378--- a/arch/powerpc/include/asm/mman.h
8379+++ b/arch/powerpc/include/asm/mman.h
8380@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8381 }
8382 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8383
8384-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8385+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8386 {
8387 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8388 }
8389diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8390index 69c0598..2c56964 100644
8391--- a/arch/powerpc/include/asm/page.h
8392+++ b/arch/powerpc/include/asm/page.h
8393@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8394 * and needs to be executable. This means the whole heap ends
8395 * up being executable.
8396 */
8397-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8398- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8399+#define VM_DATA_DEFAULT_FLAGS32 \
8400+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8401+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8402
8403 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8404 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8405@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8406 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8407 #endif
8408
8409+#define ktla_ktva(addr) (addr)
8410+#define ktva_ktla(addr) (addr)
8411+
8412 #ifndef CONFIG_PPC_BOOK3S_64
8413 /*
8414 * Use the top bit of the higher-level page table entries to indicate whether
8415diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8416index d908a46..3753f71 100644
8417--- a/arch/powerpc/include/asm/page_64.h
8418+++ b/arch/powerpc/include/asm/page_64.h
8419@@ -172,15 +172,18 @@ do { \
8420 * stack by default, so in the absence of a PT_GNU_STACK program header
8421 * we turn execute permission off.
8422 */
8423-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8424- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8425+#define VM_STACK_DEFAULT_FLAGS32 \
8426+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8427+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8428
8429 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8430 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8431
8432+#ifndef CONFIG_PAX_PAGEEXEC
8433 #define VM_STACK_DEFAULT_FLAGS \
8434 (is_32bit_task() ? \
8435 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8436+#endif
8437
8438 #include <asm-generic/getorder.h>
8439
8440diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8441index 4b0be20..c15a27d 100644
8442--- a/arch/powerpc/include/asm/pgalloc-64.h
8443+++ b/arch/powerpc/include/asm/pgalloc-64.h
8444@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8445 #ifndef CONFIG_PPC_64K_PAGES
8446
8447 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8448+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8449
8450 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8451 {
8452@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8453 pud_set(pud, (unsigned long)pmd);
8454 }
8455
8456+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8457+{
8458+ pud_populate(mm, pud, pmd);
8459+}
8460+
8461 #define pmd_populate(mm, pmd, pte_page) \
8462 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8463 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8464@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8465 #endif
8466
8467 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8468+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8469
8470 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8471 pte_t *pte)
8472diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8473index 9835ac4..900430f 100644
8474--- a/arch/powerpc/include/asm/pgtable.h
8475+++ b/arch/powerpc/include/asm/pgtable.h
8476@@ -2,6 +2,7 @@
8477 #define _ASM_POWERPC_PGTABLE_H
8478 #ifdef __KERNEL__
8479
8480+#include <linux/const.h>
8481 #ifndef __ASSEMBLY__
8482 #include <linux/mmdebug.h>
8483 #include <linux/mmzone.h>
8484diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8485index 62cfb0c..50c6402 100644
8486--- a/arch/powerpc/include/asm/pte-hash32.h
8487+++ b/arch/powerpc/include/asm/pte-hash32.h
8488@@ -20,6 +20,7 @@
8489 #define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */
8490 #define _PAGE_USER 0x004 /* usermode access allowed */
8491 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8492+#define _PAGE_EXEC _PAGE_GUARDED
8493 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8494 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8495 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8496diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8497index af56b5c..f86f3f6 100644
8498--- a/arch/powerpc/include/asm/reg.h
8499+++ b/arch/powerpc/include/asm/reg.h
8500@@ -253,6 +253,7 @@
8501 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8502 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8503 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8504+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8505 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8506 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8507 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8508diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8509index d607df5..08dc9ae 100644
8510--- a/arch/powerpc/include/asm/smp.h
8511+++ b/arch/powerpc/include/asm/smp.h
8512@@ -51,7 +51,7 @@ struct smp_ops_t {
8513 int (*cpu_disable)(void);
8514 void (*cpu_die)(unsigned int nr);
8515 int (*cpu_bootable)(unsigned int nr);
8516-};
8517+} __no_const;
8518
8519 extern void smp_send_debugger_break(void);
8520 extern void start_secondary_resume(void);
8521diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8522index 4dbe072..b803275 100644
8523--- a/arch/powerpc/include/asm/spinlock.h
8524+++ b/arch/powerpc/include/asm/spinlock.h
8525@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8526 __asm__ __volatile__(
8527 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8528 __DO_SIGN_EXTEND
8529-" addic. %0,%0,1\n\
8530- ble- 2f\n"
8531+
8532+#ifdef CONFIG_PAX_REFCOUNT
8533+" mcrxr cr0\n"
8534+" addico. %0,%0,1\n"
8535+" bf 4*cr0+so, 3f\n"
8536+"2:.long " "0x00c00b00""\n"
8537+#else
8538+" addic. %0,%0,1\n"
8539+#endif
8540+
8541+"3:\n"
8542+ "ble- 4f\n"
8543 PPC405_ERR77(0,%1)
8544 " stwcx. %0,0,%1\n\
8545 bne- 1b\n"
8546 PPC_ACQUIRE_BARRIER
8547-"2:" : "=&r" (tmp)
8548+"4:"
8549+
8550+#ifdef CONFIG_PAX_REFCOUNT
8551+ _ASM_EXTABLE(2b,4b)
8552+#endif
8553+
8554+ : "=&r" (tmp)
8555 : "r" (&rw->lock)
8556 : "cr0", "xer", "memory");
8557
8558@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8559 __asm__ __volatile__(
8560 "# read_unlock\n\t"
8561 PPC_RELEASE_BARRIER
8562-"1: lwarx %0,0,%1\n\
8563- addic %0,%0,-1\n"
8564+"1: lwarx %0,0,%1\n"
8565+
8566+#ifdef CONFIG_PAX_REFCOUNT
8567+" mcrxr cr0\n"
8568+" addico. %0,%0,-1\n"
8569+" bf 4*cr0+so, 3f\n"
8570+"2:.long " "0x00c00b00""\n"
8571+#else
8572+" addic. %0,%0,-1\n"
8573+#endif
8574+
8575+"3:\n"
8576 PPC405_ERR77(0,%1)
8577 " stwcx. %0,0,%1\n\
8578 bne- 1b"
8579+
8580+#ifdef CONFIG_PAX_REFCOUNT
8581+"\n4:\n"
8582+ _ASM_EXTABLE(2b, 4b)
8583+#endif
8584+
8585 : "=&r"(tmp)
8586 : "r"(&rw->lock)
8587 : "cr0", "xer", "memory");
8588diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8589index 7248979..80b75de 100644
8590--- a/arch/powerpc/include/asm/thread_info.h
8591+++ b/arch/powerpc/include/asm/thread_info.h
8592@@ -103,6 +103,8 @@ static inline struct thread_info *current_thread_info(void)
8593 #if defined(CONFIG_PPC64)
8594 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8595 #endif
8596+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8597+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8598
8599 /* as above, but as bit values */
8600 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8601@@ -121,9 +123,10 @@ static inline struct thread_info *current_thread_info(void)
8602 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8603 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8604 #define _TIF_NOHZ (1<<TIF_NOHZ)
8605+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8606 #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8607 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8608- _TIF_NOHZ)
8609+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8610
8611 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8612 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8613diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8614index a0c071d..49cdc7f 100644
8615--- a/arch/powerpc/include/asm/uaccess.h
8616+++ b/arch/powerpc/include/asm/uaccess.h
8617@@ -58,6 +58,7 @@
8618
8619 #endif
8620
8621+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8622 #define access_ok(type, addr, size) \
8623 (__chk_user_ptr(addr), \
8624 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8625@@ -318,52 +319,6 @@ do { \
8626 extern unsigned long __copy_tofrom_user(void __user *to,
8627 const void __user *from, unsigned long size);
8628
8629-#ifndef __powerpc64__
8630-
8631-static inline unsigned long copy_from_user(void *to,
8632- const void __user *from, unsigned long n)
8633-{
8634- unsigned long over;
8635-
8636- if (access_ok(VERIFY_READ, from, n))
8637- return __copy_tofrom_user((__force void __user *)to, from, n);
8638- if ((unsigned long)from < TASK_SIZE) {
8639- over = (unsigned long)from + n - TASK_SIZE;
8640- return __copy_tofrom_user((__force void __user *)to, from,
8641- n - over) + over;
8642- }
8643- return n;
8644-}
8645-
8646-static inline unsigned long copy_to_user(void __user *to,
8647- const void *from, unsigned long n)
8648-{
8649- unsigned long over;
8650-
8651- if (access_ok(VERIFY_WRITE, to, n))
8652- return __copy_tofrom_user(to, (__force void __user *)from, n);
8653- if ((unsigned long)to < TASK_SIZE) {
8654- over = (unsigned long)to + n - TASK_SIZE;
8655- return __copy_tofrom_user(to, (__force void __user *)from,
8656- n - over) + over;
8657- }
8658- return n;
8659-}
8660-
8661-#else /* __powerpc64__ */
8662-
8663-#define __copy_in_user(to, from, size) \
8664- __copy_tofrom_user((to), (from), (size))
8665-
8666-extern unsigned long copy_from_user(void *to, const void __user *from,
8667- unsigned long n);
8668-extern unsigned long copy_to_user(void __user *to, const void *from,
8669- unsigned long n);
8670-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8671- unsigned long n);
8672-
8673-#endif /* __powerpc64__ */
8674-
8675 static inline unsigned long __copy_from_user_inatomic(void *to,
8676 const void __user *from, unsigned long n)
8677 {
8678@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8679 if (ret == 0)
8680 return 0;
8681 }
8682+
8683+ if (!__builtin_constant_p(n))
8684+ check_object_size(to, n, false);
8685+
8686 return __copy_tofrom_user((__force void __user *)to, from, n);
8687 }
8688
8689@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8690 if (ret == 0)
8691 return 0;
8692 }
8693+
8694+ if (!__builtin_constant_p(n))
8695+ check_object_size(from, n, true);
8696+
8697 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8698 }
8699
8700@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8701 return __copy_to_user_inatomic(to, from, size);
8702 }
8703
8704+#ifndef __powerpc64__
8705+
8706+static inline unsigned long __must_check copy_from_user(void *to,
8707+ const void __user *from, unsigned long n)
8708+{
8709+ unsigned long over;
8710+
8711+ if ((long)n < 0)
8712+ return n;
8713+
8714+ if (access_ok(VERIFY_READ, from, n)) {
8715+ if (!__builtin_constant_p(n))
8716+ check_object_size(to, n, false);
8717+ return __copy_tofrom_user((__force void __user *)to, from, n);
8718+ }
8719+ if ((unsigned long)from < TASK_SIZE) {
8720+ over = (unsigned long)from + n - TASK_SIZE;
8721+ if (!__builtin_constant_p(n - over))
8722+ check_object_size(to, n - over, false);
8723+ return __copy_tofrom_user((__force void __user *)to, from,
8724+ n - over) + over;
8725+ }
8726+ return n;
8727+}
8728+
8729+static inline unsigned long __must_check copy_to_user(void __user *to,
8730+ const void *from, unsigned long n)
8731+{
8732+ unsigned long over;
8733+
8734+ if ((long)n < 0)
8735+ return n;
8736+
8737+ if (access_ok(VERIFY_WRITE, to, n)) {
8738+ if (!__builtin_constant_p(n))
8739+ check_object_size(from, n, true);
8740+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8741+ }
8742+ if ((unsigned long)to < TASK_SIZE) {
8743+ over = (unsigned long)to + n - TASK_SIZE;
8744+ if (!__builtin_constant_p(n))
8745+ check_object_size(from, n - over, true);
8746+ return __copy_tofrom_user(to, (__force void __user *)from,
8747+ n - over) + over;
8748+ }
8749+ return n;
8750+}
8751+
8752+#else /* __powerpc64__ */
8753+
8754+#define __copy_in_user(to, from, size) \
8755+ __copy_tofrom_user((to), (from), (size))
8756+
8757+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8758+{
8759+ if ((long)n < 0 || n > INT_MAX)
8760+ return n;
8761+
8762+ if (!__builtin_constant_p(n))
8763+ check_object_size(to, n, false);
8764+
8765+ if (likely(access_ok(VERIFY_READ, from, n)))
8766+ n = __copy_from_user(to, from, n);
8767+ else
8768+ memset(to, 0, n);
8769+ return n;
8770+}
8771+
8772+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8773+{
8774+ if ((long)n < 0 || n > INT_MAX)
8775+ return n;
8776+
8777+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8778+ if (!__builtin_constant_p(n))
8779+ check_object_size(from, n, true);
8780+ n = __copy_to_user(to, from, n);
8781+ }
8782+ return n;
8783+}
8784+
8785+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8786+ unsigned long n);
8787+
8788+#endif /* __powerpc64__ */
8789+
8790 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8791
8792 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8793diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8794index 502cf69..53936a1 100644
8795--- a/arch/powerpc/kernel/Makefile
8796+++ b/arch/powerpc/kernel/Makefile
8797@@ -15,6 +15,11 @@ CFLAGS_prom_init.o += -fPIC
8798 CFLAGS_btext.o += -fPIC
8799 endif
8800
8801+CFLAGS_REMOVE_cputable.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8802+CFLAGS_REMOVE_prom_init.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8803+CFLAGS_REMOVE_btext.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8804+CFLAGS_REMOVE_prom.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8805+
8806 ifdef CONFIG_FUNCTION_TRACER
8807 # Do not trace early boot code
8808 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
8809@@ -27,6 +32,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8810 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8811 endif
8812
8813+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8814+
8815 obj-y := cputable.o ptrace.o syscalls.o \
8816 irq.o align.o signal_32.o pmc.o vdso.o \
8817 process.o systbl.o idle.o \
8818diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8819index 3e68d1c..72a5ee6 100644
8820--- a/arch/powerpc/kernel/exceptions-64e.S
8821+++ b/arch/powerpc/kernel/exceptions-64e.S
8822@@ -1010,6 +1010,7 @@ storage_fault_common:
8823 std r14,_DAR(r1)
8824 std r15,_DSISR(r1)
8825 addi r3,r1,STACK_FRAME_OVERHEAD
8826+ bl save_nvgprs
8827 mr r4,r14
8828 mr r5,r15
8829 ld r14,PACA_EXGEN+EX_R14(r13)
8830@@ -1018,8 +1019,7 @@ storage_fault_common:
8831 cmpdi r3,0
8832 bne- 1f
8833 b ret_from_except_lite
8834-1: bl save_nvgprs
8835- mr r5,r3
8836+1: mr r5,r3
8837 addi r3,r1,STACK_FRAME_OVERHEAD
8838 ld r4,_DAR(r1)
8839 bl bad_page_fault
8840diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8841index 9519e6b..13f6c38 100644
8842--- a/arch/powerpc/kernel/exceptions-64s.S
8843+++ b/arch/powerpc/kernel/exceptions-64s.S
8844@@ -1599,10 +1599,10 @@ handle_page_fault:
8845 11: ld r4,_DAR(r1)
8846 ld r5,_DSISR(r1)
8847 addi r3,r1,STACK_FRAME_OVERHEAD
8848+ bl save_nvgprs
8849 bl do_page_fault
8850 cmpdi r3,0
8851 beq+ 12f
8852- bl save_nvgprs
8853 mr r5,r3
8854 addi r3,r1,STACK_FRAME_OVERHEAD
8855 lwz r4,_DAR(r1)
8856diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8857index 4509603..cdb491f 100644
8858--- a/arch/powerpc/kernel/irq.c
8859+++ b/arch/powerpc/kernel/irq.c
8860@@ -460,6 +460,8 @@ void migrate_irqs(void)
8861 }
8862 #endif
8863
8864+extern void gr_handle_kernel_exploit(void);
8865+
8866 static inline void check_stack_overflow(void)
8867 {
8868 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8869@@ -472,6 +474,7 @@ static inline void check_stack_overflow(void)
8870 pr_err("do_IRQ: stack overflow: %ld\n",
8871 sp - sizeof(struct thread_info));
8872 dump_stack();
8873+ gr_handle_kernel_exploit();
8874 }
8875 #endif
8876 }
8877diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8878index c94d2e0..992a9ce 100644
8879--- a/arch/powerpc/kernel/module_32.c
8880+++ b/arch/powerpc/kernel/module_32.c
8881@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8882 me->arch.core_plt_section = i;
8883 }
8884 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8885- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8886+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8887 return -ENOEXEC;
8888 }
8889
8890@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8891
8892 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8893 /* Init, or core PLT? */
8894- if (location >= mod->module_core
8895- && location < mod->module_core + mod->core_size)
8896+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8897+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8898 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8899- else
8900+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8901+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8902 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8903+ else {
8904+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8905+ return ~0UL;
8906+ }
8907
8908 /* Find this entry, or if that fails, the next avail. entry */
8909 while (entry->jump[0]) {
8910@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8911 }
8912 #ifdef CONFIG_DYNAMIC_FTRACE
8913 module->arch.tramp =
8914- do_plt_call(module->module_core,
8915+ do_plt_call(module->module_core_rx,
8916 (unsigned long)ftrace_caller,
8917 sechdrs, module);
8918 #endif
8919diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8920index b4cc7be..1fe8bb3 100644
8921--- a/arch/powerpc/kernel/process.c
8922+++ b/arch/powerpc/kernel/process.c
8923@@ -1036,8 +1036,8 @@ void show_regs(struct pt_regs * regs)
8924 * Lookup NIP late so we have the best change of getting the
8925 * above info out without failing
8926 */
8927- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8928- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8929+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8930+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8931 #endif
8932 show_stack(current, (unsigned long *) regs->gpr[1]);
8933 if (!user_mode(regs))
8934@@ -1549,10 +1549,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8935 newsp = stack[0];
8936 ip = stack[STACK_FRAME_LR_SAVE];
8937 if (!firstframe || ip != lr) {
8938- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8939+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8940 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8941 if ((ip == rth) && curr_frame >= 0) {
8942- printk(" (%pS)",
8943+ printk(" (%pA)",
8944 (void *)current->ret_stack[curr_frame].ret);
8945 curr_frame--;
8946 }
8947@@ -1572,7 +1572,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8948 struct pt_regs *regs = (struct pt_regs *)
8949 (sp + STACK_FRAME_OVERHEAD);
8950 lr = regs->link;
8951- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8952+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8953 regs->trap, (void *)regs->nip, (void *)lr);
8954 firstframe = 1;
8955 }
8956@@ -1608,49 +1608,3 @@ void notrace __ppc64_runlatch_off(void)
8957 mtspr(SPRN_CTRLT, ctrl);
8958 }
8959 #endif /* CONFIG_PPC64 */
8960-
8961-unsigned long arch_align_stack(unsigned long sp)
8962-{
8963- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8964- sp -= get_random_int() & ~PAGE_MASK;
8965- return sp & ~0xf;
8966-}
8967-
8968-static inline unsigned long brk_rnd(void)
8969-{
8970- unsigned long rnd = 0;
8971-
8972- /* 8MB for 32bit, 1GB for 64bit */
8973- if (is_32bit_task())
8974- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8975- else
8976- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8977-
8978- return rnd << PAGE_SHIFT;
8979-}
8980-
8981-unsigned long arch_randomize_brk(struct mm_struct *mm)
8982-{
8983- unsigned long base = mm->brk;
8984- unsigned long ret;
8985-
8986-#ifdef CONFIG_PPC_STD_MMU_64
8987- /*
8988- * If we are using 1TB segments and we are allowed to randomise
8989- * the heap, we can put it above 1TB so it is backed by a 1TB
8990- * segment. Otherwise the heap will be in the bottom 1TB
8991- * which always uses 256MB segments and this may result in a
8992- * performance penalty.
8993- */
8994- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8995- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8996-#endif
8997-
8998- ret = PAGE_ALIGN(base + brk_rnd());
8999-
9000- if (ret < mm->brk)
9001- return mm->brk;
9002-
9003- return ret;
9004-}
9005-
9006diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9007index f21897b..28c0428 100644
9008--- a/arch/powerpc/kernel/ptrace.c
9009+++ b/arch/powerpc/kernel/ptrace.c
9010@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9011 return ret;
9012 }
9013
9014+#ifdef CONFIG_GRKERNSEC_SETXID
9015+extern void gr_delayed_cred_worker(void);
9016+#endif
9017+
9018 /*
9019 * We must return the syscall number to actually look up in the table.
9020 * This can be -1L to skip running any syscall at all.
9021@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9022
9023 secure_computing_strict(regs->gpr[0]);
9024
9025+#ifdef CONFIG_GRKERNSEC_SETXID
9026+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9027+ gr_delayed_cred_worker();
9028+#endif
9029+
9030 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9031 tracehook_report_syscall_entry(regs))
9032 /*
9033@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9034 {
9035 int step;
9036
9037+#ifdef CONFIG_GRKERNSEC_SETXID
9038+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9039+ gr_delayed_cred_worker();
9040+#endif
9041+
9042 audit_syscall_exit(regs);
9043
9044 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9045diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9046index d3a831a..3a33123 100644
9047--- a/arch/powerpc/kernel/signal_32.c
9048+++ b/arch/powerpc/kernel/signal_32.c
9049@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9050 /* Save user registers on the stack */
9051 frame = &rt_sf->uc.uc_mcontext;
9052 addr = frame;
9053- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9054+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9055 sigret = 0;
9056 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9057 } else {
9058diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9059index c7c24d2..1bf7039 100644
9060--- a/arch/powerpc/kernel/signal_64.c
9061+++ b/arch/powerpc/kernel/signal_64.c
9062@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9063 current->thread.fp_state.fpscr = 0;
9064
9065 /* Set up to return from userspace. */
9066- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9067+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9068 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9069 } else {
9070 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9071diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9072index 19e4744..28a8d7b 100644
9073--- a/arch/powerpc/kernel/traps.c
9074+++ b/arch/powerpc/kernel/traps.c
9075@@ -36,6 +36,7 @@
9076 #include <linux/debugfs.h>
9077 #include <linux/ratelimit.h>
9078 #include <linux/context_tracking.h>
9079+#include <linux/uaccess.h>
9080
9081 #include <asm/emulated_ops.h>
9082 #include <asm/pgtable.h>
9083@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9084 return flags;
9085 }
9086
9087+extern void gr_handle_kernel_exploit(void);
9088+
9089 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9090 int signr)
9091 {
9092@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9093 panic("Fatal exception in interrupt");
9094 if (panic_on_oops)
9095 panic("Fatal exception");
9096+
9097+ gr_handle_kernel_exploit();
9098+
9099 do_exit(signr);
9100 }
9101
9102@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9103 enum ctx_state prev_state = exception_enter();
9104 unsigned int reason = get_reason(regs);
9105
9106+#ifdef CONFIG_PAX_REFCOUNT
9107+ unsigned int bkpt;
9108+ const struct exception_table_entry *entry;
9109+
9110+ if (reason & REASON_ILLEGAL) {
9111+ /* Check if PaX bad instruction */
9112+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9113+ current->thread.trap_nr = 0;
9114+ pax_report_refcount_overflow(regs);
9115+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9116+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9117+ regs->nip = entry->fixup;
9118+ return;
9119+ }
9120+ /* fixup_exception() could not handle */
9121+ goto bail;
9122+ }
9123+ }
9124+#endif
9125+
9126 /* We can now get here via a FP Unavailable exception if the core
9127 * has no FPU, in that case the reason flags will be 0 */
9128
9129diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9130index 305eb0d..accc5b40 100644
9131--- a/arch/powerpc/kernel/vdso.c
9132+++ b/arch/powerpc/kernel/vdso.c
9133@@ -34,6 +34,7 @@
9134 #include <asm/vdso.h>
9135 #include <asm/vdso_datapage.h>
9136 #include <asm/setup.h>
9137+#include <asm/mman.h>
9138
9139 #undef DEBUG
9140
9141@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9142 vdso_base = VDSO32_MBASE;
9143 #endif
9144
9145- current->mm->context.vdso_base = 0;
9146+ current->mm->context.vdso_base = ~0UL;
9147
9148 /* vDSO has a problem and was disabled, just don't "enable" it for the
9149 * process
9150@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9151 vdso_base = get_unmapped_area(NULL, vdso_base,
9152 (vdso_pages << PAGE_SHIFT) +
9153 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9154- 0, 0);
9155+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9156 if (IS_ERR_VALUE(vdso_base)) {
9157 rc = vdso_base;
9158 goto fail_mmapsem;
9159diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9160index 27c0fac..6ec4a32 100644
9161--- a/arch/powerpc/kvm/powerpc.c
9162+++ b/arch/powerpc/kvm/powerpc.c
9163@@ -1402,7 +1402,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9164 }
9165 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9166
9167-int kvm_arch_init(void *opaque)
9168+int kvm_arch_init(const void *opaque)
9169 {
9170 return 0;
9171 }
9172diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9173index 5eea6f3..5d10396 100644
9174--- a/arch/powerpc/lib/usercopy_64.c
9175+++ b/arch/powerpc/lib/usercopy_64.c
9176@@ -9,22 +9,6 @@
9177 #include <linux/module.h>
9178 #include <asm/uaccess.h>
9179
9180-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9181-{
9182- if (likely(access_ok(VERIFY_READ, from, n)))
9183- n = __copy_from_user(to, from, n);
9184- else
9185- memset(to, 0, n);
9186- return n;
9187-}
9188-
9189-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9190-{
9191- if (likely(access_ok(VERIFY_WRITE, to, n)))
9192- n = __copy_to_user(to, from, n);
9193- return n;
9194-}
9195-
9196 unsigned long copy_in_user(void __user *to, const void __user *from,
9197 unsigned long n)
9198 {
9199@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9200 return n;
9201 }
9202
9203-EXPORT_SYMBOL(copy_from_user);
9204-EXPORT_SYMBOL(copy_to_user);
9205 EXPORT_SYMBOL(copy_in_user);
9206
9207diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9208index b396868..3eb6b9f 100644
9209--- a/arch/powerpc/mm/fault.c
9210+++ b/arch/powerpc/mm/fault.c
9211@@ -33,6 +33,10 @@
9212 #include <linux/ratelimit.h>
9213 #include <linux/context_tracking.h>
9214 #include <linux/hugetlb.h>
9215+#include <linux/slab.h>
9216+#include <linux/pagemap.h>
9217+#include <linux/compiler.h>
9218+#include <linux/unistd.h>
9219
9220 #include <asm/firmware.h>
9221 #include <asm/page.h>
9222@@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9223 }
9224 #endif
9225
9226+#ifdef CONFIG_PAX_PAGEEXEC
9227+/*
9228+ * PaX: decide what to do with offenders (regs->nip = fault address)
9229+ *
9230+ * returns 1 when task should be killed
9231+ */
9232+static int pax_handle_fetch_fault(struct pt_regs *regs)
9233+{
9234+ return 1;
9235+}
9236+
9237+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9238+{
9239+ unsigned long i;
9240+
9241+ printk(KERN_ERR "PAX: bytes at PC: ");
9242+ for (i = 0; i < 5; i++) {
9243+ unsigned int c;
9244+ if (get_user(c, (unsigned int __user *)pc+i))
9245+ printk(KERN_CONT "???????? ");
9246+ else
9247+ printk(KERN_CONT "%08x ", c);
9248+ }
9249+ printk("\n");
9250+}
9251+#endif
9252+
9253 /*
9254 * Check whether the instruction at regs->nip is a store using
9255 * an update addressing form which will update r1.
9256@@ -227,7 +258,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9257 * indicate errors in DSISR but can validly be set in SRR1.
9258 */
9259 if (trap == 0x400)
9260- error_code &= 0x48200000;
9261+ error_code &= 0x58200000;
9262 else
9263 is_write = error_code & DSISR_ISSTORE;
9264 #else
9265@@ -383,12 +414,16 @@ good_area:
9266 * "undefined". Of those that can be set, this is the only
9267 * one which seems bad.
9268 */
9269- if (error_code & 0x10000000)
9270+ if (error_code & DSISR_GUARDED)
9271 /* Guarded storage error. */
9272 goto bad_area;
9273 #endif /* CONFIG_8xx */
9274
9275 if (is_exec) {
9276+#ifdef CONFIG_PPC_STD_MMU
9277+ if (error_code & DSISR_GUARDED)
9278+ goto bad_area;
9279+#endif
9280 /*
9281 * Allow execution from readable areas if the MMU does not
9282 * provide separate controls over reading and executing.
9283@@ -483,6 +518,23 @@ bad_area:
9284 bad_area_nosemaphore:
9285 /* User mode accesses cause a SIGSEGV */
9286 if (user_mode(regs)) {
9287+
9288+#ifdef CONFIG_PAX_PAGEEXEC
9289+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9290+#ifdef CONFIG_PPC_STD_MMU
9291+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9292+#else
9293+ if (is_exec && regs->nip == address) {
9294+#endif
9295+ switch (pax_handle_fetch_fault(regs)) {
9296+ }
9297+
9298+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9299+ do_group_exit(SIGKILL);
9300+ }
9301+ }
9302+#endif
9303+
9304 _exception(SIGSEGV, regs, code, address);
9305 goto bail;
9306 }
9307diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9308index cb8bdbe..cde4bc7 100644
9309--- a/arch/powerpc/mm/mmap.c
9310+++ b/arch/powerpc/mm/mmap.c
9311@@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9312 return sysctl_legacy_va_layout;
9313 }
9314
9315-static unsigned long mmap_rnd(void)
9316+static unsigned long mmap_rnd(struct mm_struct *mm)
9317 {
9318 unsigned long rnd = 0;
9319
9320+#ifdef CONFIG_PAX_RANDMMAP
9321+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9322+#endif
9323+
9324 if (current->flags & PF_RANDOMIZE) {
9325 /* 8MB for 32bit, 1GB for 64bit */
9326 if (is_32bit_task())
9327@@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9328 return rnd << PAGE_SHIFT;
9329 }
9330
9331-static inline unsigned long mmap_base(void)
9332+static inline unsigned long mmap_base(struct mm_struct *mm)
9333 {
9334 unsigned long gap = rlimit(RLIMIT_STACK);
9335
9336@@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9337 else if (gap > MAX_GAP)
9338 gap = MAX_GAP;
9339
9340- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9341+ return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9342 }
9343
9344 /*
9345@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9346 */
9347 if (mmap_is_legacy()) {
9348 mm->mmap_base = TASK_UNMAPPED_BASE;
9349+
9350+#ifdef CONFIG_PAX_RANDMMAP
9351+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9352+ mm->mmap_base += mm->delta_mmap;
9353+#endif
9354+
9355 mm->get_unmapped_area = arch_get_unmapped_area;
9356 } else {
9357- mm->mmap_base = mmap_base();
9358+ mm->mmap_base = mmap_base(mm);
9359+
9360+#ifdef CONFIG_PAX_RANDMMAP
9361+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9362+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9363+#endif
9364+
9365 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9366 }
9367 }
9368diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9369index 0f432a7..abfe841 100644
9370--- a/arch/powerpc/mm/slice.c
9371+++ b/arch/powerpc/mm/slice.c
9372@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9373 if ((mm->task_size - len) < addr)
9374 return 0;
9375 vma = find_vma(mm, addr);
9376- return (!vma || (addr + len) <= vma->vm_start);
9377+ return check_heap_stack_gap(vma, addr, len, 0);
9378 }
9379
9380 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9381@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9382 info.align_offset = 0;
9383
9384 addr = TASK_UNMAPPED_BASE;
9385+
9386+#ifdef CONFIG_PAX_RANDMMAP
9387+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9388+ addr += mm->delta_mmap;
9389+#endif
9390+
9391 while (addr < TASK_SIZE) {
9392 info.low_limit = addr;
9393 if (!slice_scan_available(addr, available, 1, &addr))
9394@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9395 if (fixed && addr > (mm->task_size - len))
9396 return -ENOMEM;
9397
9398+#ifdef CONFIG_PAX_RANDMMAP
9399+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9400+ addr = 0;
9401+#endif
9402+
9403 /* If hint, make sure it matches our alignment restrictions */
9404 if (!fixed && addr) {
9405 addr = _ALIGN_UP(addr, 1ul << pshift);
9406diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9407index d966bbe..372124a 100644
9408--- a/arch/powerpc/platforms/cell/spufs/file.c
9409+++ b/arch/powerpc/platforms/cell/spufs/file.c
9410@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9411 return VM_FAULT_NOPAGE;
9412 }
9413
9414-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9415+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9416 unsigned long address,
9417- void *buf, int len, int write)
9418+ void *buf, size_t len, int write)
9419 {
9420 struct spu_context *ctx = vma->vm_file->private_data;
9421 unsigned long offset = address - vma->vm_start;
9422diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9423index fa934fe..c296056 100644
9424--- a/arch/s390/include/asm/atomic.h
9425+++ b/arch/s390/include/asm/atomic.h
9426@@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9427 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9428 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9429
9430+#define atomic64_read_unchecked(v) atomic64_read(v)
9431+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9432+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9433+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9434+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9435+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9436+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9437+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9438+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9439+
9440 #endif /* __ARCH_S390_ATOMIC__ */
9441diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9442index 8d72471..5322500 100644
9443--- a/arch/s390/include/asm/barrier.h
9444+++ b/arch/s390/include/asm/barrier.h
9445@@ -42,7 +42,7 @@
9446 do { \
9447 compiletime_assert_atomic_type(*p); \
9448 barrier(); \
9449- ACCESS_ONCE(*p) = (v); \
9450+ ACCESS_ONCE_RW(*p) = (v); \
9451 } while (0)
9452
9453 #define smp_load_acquire(p) \
9454diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9455index 4d7ccac..d03d0ad 100644
9456--- a/arch/s390/include/asm/cache.h
9457+++ b/arch/s390/include/asm/cache.h
9458@@ -9,8 +9,10 @@
9459 #ifndef __ARCH_S390_CACHE_H
9460 #define __ARCH_S390_CACHE_H
9461
9462-#define L1_CACHE_BYTES 256
9463+#include <linux/const.h>
9464+
9465 #define L1_CACHE_SHIFT 8
9466+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9467 #define NET_SKB_PAD 32
9468
9469 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9470diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9471index c9c875d..b4b0e4c 100644
9472--- a/arch/s390/include/asm/elf.h
9473+++ b/arch/s390/include/asm/elf.h
9474@@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9475 the loader. We need to make sure that it is out of the way of the program
9476 that it will "exec", and that there is sufficient room for the brk. */
9477
9478-extern unsigned long randomize_et_dyn(void);
9479-#define ELF_ET_DYN_BASE randomize_et_dyn()
9480+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9481+
9482+#ifdef CONFIG_PAX_ASLR
9483+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9484+
9485+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9486+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9487+#endif
9488
9489 /* This yields a mask that user programs can use to figure out what
9490 instruction set this CPU supports. */
9491@@ -225,9 +231,6 @@ struct linux_binprm;
9492 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9493 int arch_setup_additional_pages(struct linux_binprm *, int);
9494
9495-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9496-#define arch_randomize_brk arch_randomize_brk
9497-
9498 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9499
9500 #endif
9501diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9502index c4a93d6..4d2a9b4 100644
9503--- a/arch/s390/include/asm/exec.h
9504+++ b/arch/s390/include/asm/exec.h
9505@@ -7,6 +7,6 @@
9506 #ifndef __ASM_EXEC_H
9507 #define __ASM_EXEC_H
9508
9509-extern unsigned long arch_align_stack(unsigned long sp);
9510+#define arch_align_stack(x) ((x) & ~0xfUL)
9511
9512 #endif /* __ASM_EXEC_H */
9513diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9514index cd4c68e..6764641 100644
9515--- a/arch/s390/include/asm/uaccess.h
9516+++ b/arch/s390/include/asm/uaccess.h
9517@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9518 __range_ok((unsigned long)(addr), (size)); \
9519 })
9520
9521+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9522 #define access_ok(type, addr, size) __access_ok(addr, size)
9523
9524 /*
9525@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9526 copy_to_user(void __user *to, const void *from, unsigned long n)
9527 {
9528 might_fault();
9529+
9530+ if ((long)n < 0)
9531+ return n;
9532+
9533 return __copy_to_user(to, from, n);
9534 }
9535
9536@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9537 static inline unsigned long __must_check
9538 copy_from_user(void *to, const void __user *from, unsigned long n)
9539 {
9540- unsigned int sz = __compiletime_object_size(to);
9541+ size_t sz = __compiletime_object_size(to);
9542
9543 might_fault();
9544- if (unlikely(sz != -1 && sz < n)) {
9545+
9546+ if ((long)n < 0)
9547+ return n;
9548+
9549+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9550 copy_from_user_overflow();
9551 return n;
9552 }
9553diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9554index 2ca9586..55682a9 100644
9555--- a/arch/s390/kernel/module.c
9556+++ b/arch/s390/kernel/module.c
9557@@ -165,11 +165,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9558
9559 /* Increase core size by size of got & plt and set start
9560 offsets for got and plt. */
9561- me->core_size = ALIGN(me->core_size, 4);
9562- me->arch.got_offset = me->core_size;
9563- me->core_size += me->arch.got_size;
9564- me->arch.plt_offset = me->core_size;
9565- me->core_size += me->arch.plt_size;
9566+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9567+ me->arch.got_offset = me->core_size_rw;
9568+ me->core_size_rw += me->arch.got_size;
9569+ me->arch.plt_offset = me->core_size_rx;
9570+ me->core_size_rx += me->arch.plt_size;
9571 return 0;
9572 }
9573
9574@@ -285,7 +285,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9575 if (info->got_initialized == 0) {
9576 Elf_Addr *gotent;
9577
9578- gotent = me->module_core + me->arch.got_offset +
9579+ gotent = me->module_core_rw + me->arch.got_offset +
9580 info->got_offset;
9581 *gotent = val;
9582 info->got_initialized = 1;
9583@@ -308,7 +308,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9584 rc = apply_rela_bits(loc, val, 0, 64, 0);
9585 else if (r_type == R_390_GOTENT ||
9586 r_type == R_390_GOTPLTENT) {
9587- val += (Elf_Addr) me->module_core - loc;
9588+ val += (Elf_Addr) me->module_core_rw - loc;
9589 rc = apply_rela_bits(loc, val, 1, 32, 1);
9590 }
9591 break;
9592@@ -321,7 +321,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9593 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9594 if (info->plt_initialized == 0) {
9595 unsigned int *ip;
9596- ip = me->module_core + me->arch.plt_offset +
9597+ ip = me->module_core_rx + me->arch.plt_offset +
9598 info->plt_offset;
9599 #ifndef CONFIG_64BIT
9600 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9601@@ -346,7 +346,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9602 val - loc + 0xffffUL < 0x1ffffeUL) ||
9603 (r_type == R_390_PLT32DBL &&
9604 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9605- val = (Elf_Addr) me->module_core +
9606+ val = (Elf_Addr) me->module_core_rx +
9607 me->arch.plt_offset +
9608 info->plt_offset;
9609 val += rela->r_addend - loc;
9610@@ -368,7 +368,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9611 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9612 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9613 val = val + rela->r_addend -
9614- ((Elf_Addr) me->module_core + me->arch.got_offset);
9615+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9616 if (r_type == R_390_GOTOFF16)
9617 rc = apply_rela_bits(loc, val, 0, 16, 0);
9618 else if (r_type == R_390_GOTOFF32)
9619@@ -378,7 +378,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9620 break;
9621 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9622 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9623- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9624+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9625 rela->r_addend - loc;
9626 if (r_type == R_390_GOTPC)
9627 rc = apply_rela_bits(loc, val, 1, 32, 0);
9628diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9629index 13fc097..84d375f 100644
9630--- a/arch/s390/kernel/process.c
9631+++ b/arch/s390/kernel/process.c
9632@@ -227,27 +227,3 @@ unsigned long get_wchan(struct task_struct *p)
9633 }
9634 return 0;
9635 }
9636-
9637-unsigned long arch_align_stack(unsigned long sp)
9638-{
9639- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9640- sp -= get_random_int() & ~PAGE_MASK;
9641- return sp & ~0xf;
9642-}
9643-
9644-static inline unsigned long brk_rnd(void)
9645-{
9646- /* 8MB for 32bit, 1GB for 64bit */
9647- if (is_32bit_task())
9648- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9649- else
9650- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9651-}
9652-
9653-unsigned long arch_randomize_brk(struct mm_struct *mm)
9654-{
9655- unsigned long ret;
9656-
9657- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9658- return (ret > mm->brk) ? ret : mm->brk;
9659-}
9660diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9661index 179a2c2..4ba9137 100644
9662--- a/arch/s390/mm/mmap.c
9663+++ b/arch/s390/mm/mmap.c
9664@@ -62,6 +62,12 @@ static inline int mmap_is_legacy(void)
9665
9666 static unsigned long mmap_rnd(void)
9667 {
9668+
9669+#ifdef CONFIG_PAX_RANDMMAP
9670+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
9671+ return 0;
9672+#endif
9673+
9674 if (!(current->flags & PF_RANDOMIZE))
9675 return 0;
9676 if (is_32bit_task())
9677@@ -204,9 +210,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9678 */
9679 if (mmap_is_legacy()) {
9680 mm->mmap_base = mmap_base_legacy();
9681+
9682+#ifdef CONFIG_PAX_RANDMMAP
9683+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9684+ mm->mmap_base += mm->delta_mmap;
9685+#endif
9686+
9687 mm->get_unmapped_area = arch_get_unmapped_area;
9688 } else {
9689 mm->mmap_base = mmap_base();
9690+
9691+#ifdef CONFIG_PAX_RANDMMAP
9692+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9693+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9694+#endif
9695+
9696 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9697 }
9698 }
9699@@ -279,9 +297,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9700 */
9701 if (mmap_is_legacy()) {
9702 mm->mmap_base = mmap_base_legacy();
9703+
9704+#ifdef CONFIG_PAX_RANDMMAP
9705+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9706+ mm->mmap_base += mm->delta_mmap;
9707+#endif
9708+
9709 mm->get_unmapped_area = s390_get_unmapped_area;
9710 } else {
9711 mm->mmap_base = mmap_base();
9712+
9713+#ifdef CONFIG_PAX_RANDMMAP
9714+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9715+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9716+#endif
9717+
9718 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9719 }
9720 }
9721diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9722index ae3d59f..f65f075 100644
9723--- a/arch/score/include/asm/cache.h
9724+++ b/arch/score/include/asm/cache.h
9725@@ -1,7 +1,9 @@
9726 #ifndef _ASM_SCORE_CACHE_H
9727 #define _ASM_SCORE_CACHE_H
9728
9729+#include <linux/const.h>
9730+
9731 #define L1_CACHE_SHIFT 4
9732-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9733+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9734
9735 #endif /* _ASM_SCORE_CACHE_H */
9736diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9737index f9f3cd5..58ff438 100644
9738--- a/arch/score/include/asm/exec.h
9739+++ b/arch/score/include/asm/exec.h
9740@@ -1,6 +1,6 @@
9741 #ifndef _ASM_SCORE_EXEC_H
9742 #define _ASM_SCORE_EXEC_H
9743
9744-extern unsigned long arch_align_stack(unsigned long sp);
9745+#define arch_align_stack(x) (x)
9746
9747 #endif /* _ASM_SCORE_EXEC_H */
9748diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9749index a1519ad3..e8ac1ff 100644
9750--- a/arch/score/kernel/process.c
9751+++ b/arch/score/kernel/process.c
9752@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9753
9754 return task_pt_regs(task)->cp0_epc;
9755 }
9756-
9757-unsigned long arch_align_stack(unsigned long sp)
9758-{
9759- return sp;
9760-}
9761diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9762index ef9e555..331bd29 100644
9763--- a/arch/sh/include/asm/cache.h
9764+++ b/arch/sh/include/asm/cache.h
9765@@ -9,10 +9,11 @@
9766 #define __ASM_SH_CACHE_H
9767 #ifdef __KERNEL__
9768
9769+#include <linux/const.h>
9770 #include <linux/init.h>
9771 #include <cpu/cache.h>
9772
9773-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9774+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9775
9776 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9777
9778diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9779index 6777177..cb5e44f 100644
9780--- a/arch/sh/mm/mmap.c
9781+++ b/arch/sh/mm/mmap.c
9782@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9783 struct mm_struct *mm = current->mm;
9784 struct vm_area_struct *vma;
9785 int do_colour_align;
9786+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9787 struct vm_unmapped_area_info info;
9788
9789 if (flags & MAP_FIXED) {
9790@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9791 if (filp || (flags & MAP_SHARED))
9792 do_colour_align = 1;
9793
9794+#ifdef CONFIG_PAX_RANDMMAP
9795+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9796+#endif
9797+
9798 if (addr) {
9799 if (do_colour_align)
9800 addr = COLOUR_ALIGN(addr, pgoff);
9801@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9802 addr = PAGE_ALIGN(addr);
9803
9804 vma = find_vma(mm, addr);
9805- if (TASK_SIZE - len >= addr &&
9806- (!vma || addr + len <= vma->vm_start))
9807+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9808 return addr;
9809 }
9810
9811 info.flags = 0;
9812 info.length = len;
9813- info.low_limit = TASK_UNMAPPED_BASE;
9814+ info.low_limit = mm->mmap_base;
9815 info.high_limit = TASK_SIZE;
9816 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9817 info.align_offset = pgoff << PAGE_SHIFT;
9818@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9819 struct mm_struct *mm = current->mm;
9820 unsigned long addr = addr0;
9821 int do_colour_align;
9822+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9823 struct vm_unmapped_area_info info;
9824
9825 if (flags & MAP_FIXED) {
9826@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9827 if (filp || (flags & MAP_SHARED))
9828 do_colour_align = 1;
9829
9830+#ifdef CONFIG_PAX_RANDMMAP
9831+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9832+#endif
9833+
9834 /* requesting a specific address */
9835 if (addr) {
9836 if (do_colour_align)
9837@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9838 addr = PAGE_ALIGN(addr);
9839
9840 vma = find_vma(mm, addr);
9841- if (TASK_SIZE - len >= addr &&
9842- (!vma || addr + len <= vma->vm_start))
9843+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9844 return addr;
9845 }
9846
9847@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9848 VM_BUG_ON(addr != -ENOMEM);
9849 info.flags = 0;
9850 info.low_limit = TASK_UNMAPPED_BASE;
9851+
9852+#ifdef CONFIG_PAX_RANDMMAP
9853+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9854+ info.low_limit += mm->delta_mmap;
9855+#endif
9856+
9857 info.high_limit = TASK_SIZE;
9858 addr = vm_unmapped_area(&info);
9859 }
9860diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9861index 4082749..fd97781 100644
9862--- a/arch/sparc/include/asm/atomic_64.h
9863+++ b/arch/sparc/include/asm/atomic_64.h
9864@@ -15,18 +15,38 @@
9865 #define ATOMIC64_INIT(i) { (i) }
9866
9867 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9868+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9869+{
9870+ return ACCESS_ONCE(v->counter);
9871+}
9872 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9873+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9874+{
9875+ return ACCESS_ONCE(v->counter);
9876+}
9877
9878 #define atomic_set(v, i) (((v)->counter) = i)
9879+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9880+{
9881+ v->counter = i;
9882+}
9883 #define atomic64_set(v, i) (((v)->counter) = i)
9884+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9885+{
9886+ v->counter = i;
9887+}
9888
9889-#define ATOMIC_OP(op) \
9890-void atomic_##op(int, atomic_t *); \
9891-void atomic64_##op(long, atomic64_t *);
9892+#define __ATOMIC_OP(op, suffix) \
9893+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9894+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9895
9896-#define ATOMIC_OP_RETURN(op) \
9897-int atomic_##op##_return(int, atomic_t *); \
9898-long atomic64_##op##_return(long, atomic64_t *);
9899+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9900+
9901+#define __ATOMIC_OP_RETURN(op, suffix) \
9902+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9903+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9904+
9905+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9906
9907 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9908
9909@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9910
9911 #undef ATOMIC_OPS
9912 #undef ATOMIC_OP_RETURN
9913+#undef __ATOMIC_OP_RETURN
9914 #undef ATOMIC_OP
9915+#undef __ATOMIC_OP
9916
9917 #define atomic_dec_return(v) atomic_sub_return(1, v)
9918 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9919
9920 #define atomic_inc_return(v) atomic_add_return(1, v)
9921+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9922+{
9923+ return atomic_add_return_unchecked(1, v);
9924+}
9925 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9926+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9927+{
9928+ return atomic64_add_return_unchecked(1, v);
9929+}
9930
9931 /*
9932 * atomic_inc_and_test - increment and test
9933@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9934 * other cases.
9935 */
9936 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9937+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9938+{
9939+ return atomic_inc_return_unchecked(v) == 0;
9940+}
9941 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9942
9943 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9944@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9945 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9946
9947 #define atomic_inc(v) atomic_add(1, v)
9948+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9949+{
9950+ atomic_add_unchecked(1, v);
9951+}
9952 #define atomic64_inc(v) atomic64_add(1, v)
9953+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9954+{
9955+ atomic64_add_unchecked(1, v);
9956+}
9957
9958 #define atomic_dec(v) atomic_sub(1, v)
9959+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9960+{
9961+ atomic_sub_unchecked(1, v);
9962+}
9963 #define atomic64_dec(v) atomic64_sub(1, v)
9964+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9965+{
9966+ atomic64_sub_unchecked(1, v);
9967+}
9968
9969 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9970 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9971
9972 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9973+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9974+{
9975+ return cmpxchg(&v->counter, old, new);
9976+}
9977 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9978+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9979+{
9980+ return xchg(&v->counter, new);
9981+}
9982
9983 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9984 {
9985- int c, old;
9986+ int c, old, new;
9987 c = atomic_read(v);
9988 for (;;) {
9989- if (unlikely(c == (u)))
9990+ if (unlikely(c == u))
9991 break;
9992- old = atomic_cmpxchg((v), c, c + (a));
9993+
9994+ asm volatile("addcc %2, %0, %0\n"
9995+
9996+#ifdef CONFIG_PAX_REFCOUNT
9997+ "tvs %%icc, 6\n"
9998+#endif
9999+
10000+ : "=r" (new)
10001+ : "0" (c), "ir" (a)
10002+ : "cc");
10003+
10004+ old = atomic_cmpxchg(v, c, new);
10005 if (likely(old == c))
10006 break;
10007 c = old;
10008@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10009 #define atomic64_cmpxchg(v, o, n) \
10010 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10011 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10012+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10013+{
10014+ return xchg(&v->counter, new);
10015+}
10016
10017 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10018 {
10019- long c, old;
10020+ long c, old, new;
10021 c = atomic64_read(v);
10022 for (;;) {
10023- if (unlikely(c == (u)))
10024+ if (unlikely(c == u))
10025 break;
10026- old = atomic64_cmpxchg((v), c, c + (a));
10027+
10028+ asm volatile("addcc %2, %0, %0\n"
10029+
10030+#ifdef CONFIG_PAX_REFCOUNT
10031+ "tvs %%xcc, 6\n"
10032+#endif
10033+
10034+ : "=r" (new)
10035+ : "0" (c), "ir" (a)
10036+ : "cc");
10037+
10038+ old = atomic64_cmpxchg(v, c, new);
10039 if (likely(old == c))
10040 break;
10041 c = old;
10042 }
10043- return c != (u);
10044+ return c != u;
10045 }
10046
10047 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10048diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10049index 7664894..45a974b 100644
10050--- a/arch/sparc/include/asm/barrier_64.h
10051+++ b/arch/sparc/include/asm/barrier_64.h
10052@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10053 do { \
10054 compiletime_assert_atomic_type(*p); \
10055 barrier(); \
10056- ACCESS_ONCE(*p) = (v); \
10057+ ACCESS_ONCE_RW(*p) = (v); \
10058 } while (0)
10059
10060 #define smp_load_acquire(p) \
10061diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10062index 5bb6991..5c2132e 100644
10063--- a/arch/sparc/include/asm/cache.h
10064+++ b/arch/sparc/include/asm/cache.h
10065@@ -7,10 +7,12 @@
10066 #ifndef _SPARC_CACHE_H
10067 #define _SPARC_CACHE_H
10068
10069+#include <linux/const.h>
10070+
10071 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10072
10073 #define L1_CACHE_SHIFT 5
10074-#define L1_CACHE_BYTES 32
10075+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10076
10077 #ifdef CONFIG_SPARC32
10078 #define SMP_CACHE_BYTES_SHIFT 5
10079diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10080index a24e41f..47677ff 100644
10081--- a/arch/sparc/include/asm/elf_32.h
10082+++ b/arch/sparc/include/asm/elf_32.h
10083@@ -114,6 +114,13 @@ typedef struct {
10084
10085 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10086
10087+#ifdef CONFIG_PAX_ASLR
10088+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10089+
10090+#define PAX_DELTA_MMAP_LEN 16
10091+#define PAX_DELTA_STACK_LEN 16
10092+#endif
10093+
10094 /* This yields a mask that user programs can use to figure out what
10095 instruction set this cpu supports. This can NOT be done in userspace
10096 on Sparc. */
10097diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10098index 370ca1e..d4f4a98 100644
10099--- a/arch/sparc/include/asm/elf_64.h
10100+++ b/arch/sparc/include/asm/elf_64.h
10101@@ -189,6 +189,13 @@ typedef struct {
10102 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10103 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10104
10105+#ifdef CONFIG_PAX_ASLR
10106+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10107+
10108+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10109+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10110+#endif
10111+
10112 extern unsigned long sparc64_elf_hwcap;
10113 #define ELF_HWCAP sparc64_elf_hwcap
10114
10115diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10116index a3890da..f6a408e 100644
10117--- a/arch/sparc/include/asm/pgalloc_32.h
10118+++ b/arch/sparc/include/asm/pgalloc_32.h
10119@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10120 }
10121
10122 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10123+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10124
10125 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10126 unsigned long address)
10127diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10128index 5e31871..13469c6 100644
10129--- a/arch/sparc/include/asm/pgalloc_64.h
10130+++ b/arch/sparc/include/asm/pgalloc_64.h
10131@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10132 }
10133
10134 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10135+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10136
10137 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10138 {
10139@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10140 }
10141
10142 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10143+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10144
10145 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10146 {
10147diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10148index 59ba6f6..4518128 100644
10149--- a/arch/sparc/include/asm/pgtable.h
10150+++ b/arch/sparc/include/asm/pgtable.h
10151@@ -5,4 +5,8 @@
10152 #else
10153 #include <asm/pgtable_32.h>
10154 #endif
10155+
10156+#define ktla_ktva(addr) (addr)
10157+#define ktva_ktla(addr) (addr)
10158+
10159 #endif
10160diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10161index f06b36a..bca3189 100644
10162--- a/arch/sparc/include/asm/pgtable_32.h
10163+++ b/arch/sparc/include/asm/pgtable_32.h
10164@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10165 #define PAGE_SHARED SRMMU_PAGE_SHARED
10166 #define PAGE_COPY SRMMU_PAGE_COPY
10167 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10168+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10169+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10170+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10171 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10172
10173 /* Top-level page directory - dummy used by init-mm.
10174@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10175
10176 /* xwr */
10177 #define __P000 PAGE_NONE
10178-#define __P001 PAGE_READONLY
10179-#define __P010 PAGE_COPY
10180-#define __P011 PAGE_COPY
10181+#define __P001 PAGE_READONLY_NOEXEC
10182+#define __P010 PAGE_COPY_NOEXEC
10183+#define __P011 PAGE_COPY_NOEXEC
10184 #define __P100 PAGE_READONLY
10185 #define __P101 PAGE_READONLY
10186 #define __P110 PAGE_COPY
10187 #define __P111 PAGE_COPY
10188
10189 #define __S000 PAGE_NONE
10190-#define __S001 PAGE_READONLY
10191-#define __S010 PAGE_SHARED
10192-#define __S011 PAGE_SHARED
10193+#define __S001 PAGE_READONLY_NOEXEC
10194+#define __S010 PAGE_SHARED_NOEXEC
10195+#define __S011 PAGE_SHARED_NOEXEC
10196 #define __S100 PAGE_READONLY
10197 #define __S101 PAGE_READONLY
10198 #define __S110 PAGE_SHARED
10199diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10200index ae51a11..eadfd03 100644
10201--- a/arch/sparc/include/asm/pgtsrmmu.h
10202+++ b/arch/sparc/include/asm/pgtsrmmu.h
10203@@ -111,6 +111,11 @@
10204 SRMMU_EXEC | SRMMU_REF)
10205 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10206 SRMMU_EXEC | SRMMU_REF)
10207+
10208+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10209+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10210+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10211+
10212 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10213 SRMMU_DIRTY | SRMMU_REF)
10214
10215diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10216index 29d64b1..4272fe8 100644
10217--- a/arch/sparc/include/asm/setup.h
10218+++ b/arch/sparc/include/asm/setup.h
10219@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10220 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10221
10222 /* init_64.c */
10223-extern atomic_t dcpage_flushes;
10224-extern atomic_t dcpage_flushes_xcall;
10225+extern atomic_unchecked_t dcpage_flushes;
10226+extern atomic_unchecked_t dcpage_flushes_xcall;
10227
10228 extern int sysctl_tsb_ratio;
10229 #endif
10230diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10231index 9689176..63c18ea 100644
10232--- a/arch/sparc/include/asm/spinlock_64.h
10233+++ b/arch/sparc/include/asm/spinlock_64.h
10234@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10235
10236 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10237
10238-static void inline arch_read_lock(arch_rwlock_t *lock)
10239+static inline void arch_read_lock(arch_rwlock_t *lock)
10240 {
10241 unsigned long tmp1, tmp2;
10242
10243 __asm__ __volatile__ (
10244 "1: ldsw [%2], %0\n"
10245 " brlz,pn %0, 2f\n"
10246-"4: add %0, 1, %1\n"
10247+"4: addcc %0, 1, %1\n"
10248+
10249+#ifdef CONFIG_PAX_REFCOUNT
10250+" tvs %%icc, 6\n"
10251+#endif
10252+
10253 " cas [%2], %0, %1\n"
10254 " cmp %0, %1\n"
10255 " bne,pn %%icc, 1b\n"
10256@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10257 " .previous"
10258 : "=&r" (tmp1), "=&r" (tmp2)
10259 : "r" (lock)
10260- : "memory");
10261+ : "memory", "cc");
10262 }
10263
10264-static int inline arch_read_trylock(arch_rwlock_t *lock)
10265+static inline int arch_read_trylock(arch_rwlock_t *lock)
10266 {
10267 int tmp1, tmp2;
10268
10269@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10270 "1: ldsw [%2], %0\n"
10271 " brlz,a,pn %0, 2f\n"
10272 " mov 0, %0\n"
10273-" add %0, 1, %1\n"
10274+" addcc %0, 1, %1\n"
10275+
10276+#ifdef CONFIG_PAX_REFCOUNT
10277+" tvs %%icc, 6\n"
10278+#endif
10279+
10280 " cas [%2], %0, %1\n"
10281 " cmp %0, %1\n"
10282 " bne,pn %%icc, 1b\n"
10283@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10284 return tmp1;
10285 }
10286
10287-static void inline arch_read_unlock(arch_rwlock_t *lock)
10288+static inline void arch_read_unlock(arch_rwlock_t *lock)
10289 {
10290 unsigned long tmp1, tmp2;
10291
10292 __asm__ __volatile__(
10293 "1: lduw [%2], %0\n"
10294-" sub %0, 1, %1\n"
10295+" subcc %0, 1, %1\n"
10296+
10297+#ifdef CONFIG_PAX_REFCOUNT
10298+" tvs %%icc, 6\n"
10299+#endif
10300+
10301 " cas [%2], %0, %1\n"
10302 " cmp %0, %1\n"
10303 " bne,pn %%xcc, 1b\n"
10304@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10305 : "memory");
10306 }
10307
10308-static void inline arch_write_lock(arch_rwlock_t *lock)
10309+static inline void arch_write_lock(arch_rwlock_t *lock)
10310 {
10311 unsigned long mask, tmp1, tmp2;
10312
10313@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10314 : "memory");
10315 }
10316
10317-static void inline arch_write_unlock(arch_rwlock_t *lock)
10318+static inline void arch_write_unlock(arch_rwlock_t *lock)
10319 {
10320 __asm__ __volatile__(
10321 " stw %%g0, [%0]"
10322@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10323 : "memory");
10324 }
10325
10326-static int inline arch_write_trylock(arch_rwlock_t *lock)
10327+static inline int arch_write_trylock(arch_rwlock_t *lock)
10328 {
10329 unsigned long mask, tmp1, tmp2, result;
10330
10331diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10332index fd7bd0a..2e2fa7a 100644
10333--- a/arch/sparc/include/asm/thread_info_32.h
10334+++ b/arch/sparc/include/asm/thread_info_32.h
10335@@ -47,6 +47,7 @@ struct thread_info {
10336 struct reg_window32 reg_window[NSWINS]; /* align for ldd! */
10337 unsigned long rwbuf_stkptrs[NSWINS];
10338 unsigned long w_saved;
10339+ unsigned long lowest_stack;
10340 };
10341
10342 /*
10343diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10344index ff45516..73001ab 100644
10345--- a/arch/sparc/include/asm/thread_info_64.h
10346+++ b/arch/sparc/include/asm/thread_info_64.h
10347@@ -61,6 +61,8 @@ struct thread_info {
10348 struct pt_regs *kern_una_regs;
10349 unsigned int kern_una_insn;
10350
10351+ unsigned long lowest_stack;
10352+
10353 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10354 __attribute__ ((aligned(64)));
10355 };
10356@@ -184,12 +186,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10357 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10358 /* flag bit 4 is available */
10359 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10360-/* flag bit 6 is available */
10361+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10362 #define TIF_32BIT 7 /* 32-bit binary */
10363 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10364 #define TIF_SECCOMP 9 /* secure computing */
10365 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10366 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10367+
10368 /* NOTE: Thread flags >= 12 should be ones we have no interest
10369 * in using in assembly, else we can't use the mask as
10370 * an immediate value in instructions such as andcc.
10371@@ -209,12 +212,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10372 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10373 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10374 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10375+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10376
10377 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10378 _TIF_DO_NOTIFY_RESUME_MASK | \
10379 _TIF_NEED_RESCHED)
10380 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10381
10382+#define _TIF_WORK_SYSCALL \
10383+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10384+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10385+
10386 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10387
10388 /*
10389diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10390index bd56c28..4b63d83 100644
10391--- a/arch/sparc/include/asm/uaccess.h
10392+++ b/arch/sparc/include/asm/uaccess.h
10393@@ -1,5 +1,6 @@
10394 #ifndef ___ASM_SPARC_UACCESS_H
10395 #define ___ASM_SPARC_UACCESS_H
10396+
10397 #if defined(__sparc__) && defined(__arch64__)
10398 #include <asm/uaccess_64.h>
10399 #else
10400diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10401index 64ee103..388aef0 100644
10402--- a/arch/sparc/include/asm/uaccess_32.h
10403+++ b/arch/sparc/include/asm/uaccess_32.h
10404@@ -47,6 +47,7 @@
10405 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10406 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10407 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
10408+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10409 #define access_ok(type, addr, size) \
10410 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10411
10412@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10413
10414 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10415 {
10416- if (n && __access_ok((unsigned long) to, n))
10417+ if ((long)n < 0)
10418+ return n;
10419+
10420+ if (n && __access_ok((unsigned long) to, n)) {
10421+ if (!__builtin_constant_p(n))
10422+ check_object_size(from, n, true);
10423 return __copy_user(to, (__force void __user *) from, n);
10424- else
10425+ } else
10426 return n;
10427 }
10428
10429 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10430 {
10431+ if ((long)n < 0)
10432+ return n;
10433+
10434+ if (!__builtin_constant_p(n))
10435+ check_object_size(from, n, true);
10436+
10437 return __copy_user(to, (__force void __user *) from, n);
10438 }
10439
10440 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10441 {
10442- if (n && __access_ok((unsigned long) from, n))
10443+ if ((long)n < 0)
10444+ return n;
10445+
10446+ if (n && __access_ok((unsigned long) from, n)) {
10447+ if (!__builtin_constant_p(n))
10448+ check_object_size(to, n, false);
10449 return __copy_user((__force void __user *) to, from, n);
10450- else
10451+ } else
10452 return n;
10453 }
10454
10455 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10456 {
10457+ if ((long)n < 0)
10458+ return n;
10459+
10460 return __copy_user((__force void __user *) to, from, n);
10461 }
10462
10463diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10464index a35194b..47dabc0d 100644
10465--- a/arch/sparc/include/asm/uaccess_64.h
10466+++ b/arch/sparc/include/asm/uaccess_64.h
10467@@ -10,6 +10,7 @@
10468 #include <linux/compiler.h>
10469 #include <linux/string.h>
10470 #include <linux/thread_info.h>
10471+#include <linux/kernel.h>
10472 #include <asm/asi.h>
10473 #include <asm/spitfire.h>
10474 #include <asm-generic/uaccess-unaligned.h>
10475@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10476 return 1;
10477 }
10478
10479+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10480+{
10481+ return 1;
10482+}
10483+
10484 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10485 {
10486 return 1;
10487@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10488 static inline unsigned long __must_check
10489 copy_from_user(void *to, const void __user *from, unsigned long size)
10490 {
10491- unsigned long ret = ___copy_from_user(to, from, size);
10492+ unsigned long ret;
10493
10494+ if ((long)size < 0 || size > INT_MAX)
10495+ return size;
10496+
10497+ if (!__builtin_constant_p(size))
10498+ check_object_size(to, size, false);
10499+
10500+ ret = ___copy_from_user(to, from, size);
10501 if (unlikely(ret))
10502 ret = copy_from_user_fixup(to, from, size);
10503
10504@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10505 static inline unsigned long __must_check
10506 copy_to_user(void __user *to, const void *from, unsigned long size)
10507 {
10508- unsigned long ret = ___copy_to_user(to, from, size);
10509+ unsigned long ret;
10510
10511+ if ((long)size < 0 || size > INT_MAX)
10512+ return size;
10513+
10514+ if (!__builtin_constant_p(size))
10515+ check_object_size(from, size, true);
10516+
10517+ ret = ___copy_to_user(to, from, size);
10518 if (unlikely(ret))
10519 ret = copy_to_user_fixup(to, from, size);
10520 return ret;
10521diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10522index 7cf9c6e..6206648 100644
10523--- a/arch/sparc/kernel/Makefile
10524+++ b/arch/sparc/kernel/Makefile
10525@@ -4,7 +4,7 @@
10526 #
10527
10528 asflags-y := -ansi
10529-ccflags-y := -Werror
10530+#ccflags-y := -Werror
10531
10532 extra-y := head_$(BITS).o
10533
10534diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10535index 50e7b62..79fae35 100644
10536--- a/arch/sparc/kernel/process_32.c
10537+++ b/arch/sparc/kernel/process_32.c
10538@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10539
10540 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10541 r->psr, r->pc, r->npc, r->y, print_tainted());
10542- printk("PC: <%pS>\n", (void *) r->pc);
10543+ printk("PC: <%pA>\n", (void *) r->pc);
10544 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10545 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10546 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10547 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10548 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10549 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10550- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10551+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10552
10553 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10554 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10555@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10556 rw = (struct reg_window32 *) fp;
10557 pc = rw->ins[7];
10558 printk("[%08lx : ", pc);
10559- printk("%pS ] ", (void *) pc);
10560+ printk("%pA ] ", (void *) pc);
10561 fp = rw->ins[6];
10562 } while (++count < 16);
10563 printk("\n");
10564diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10565index 46a5964..a35c62c 100644
10566--- a/arch/sparc/kernel/process_64.c
10567+++ b/arch/sparc/kernel/process_64.c
10568@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10569 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10570 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10571 if (regs->tstate & TSTATE_PRIV)
10572- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10573+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10574 }
10575
10576 void show_regs(struct pt_regs *regs)
10577@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10578
10579 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10580 regs->tpc, regs->tnpc, regs->y, print_tainted());
10581- printk("TPC: <%pS>\n", (void *) regs->tpc);
10582+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10583 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10584 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10585 regs->u_regs[3]);
10586@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10587 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10588 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10589 regs->u_regs[15]);
10590- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10591+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10592 show_regwindow(regs);
10593 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10594 }
10595@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10596 ((tp && tp->task) ? tp->task->pid : -1));
10597
10598 if (gp->tstate & TSTATE_PRIV) {
10599- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10600+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10601 (void *) gp->tpc,
10602 (void *) gp->o7,
10603 (void *) gp->i7,
10604diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10605index 79cc0d1..ec62734 100644
10606--- a/arch/sparc/kernel/prom_common.c
10607+++ b/arch/sparc/kernel/prom_common.c
10608@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10609
10610 unsigned int prom_early_allocated __initdata;
10611
10612-static struct of_pdt_ops prom_sparc_ops __initdata = {
10613+static struct of_pdt_ops prom_sparc_ops __initconst = {
10614 .nextprop = prom_common_nextprop,
10615 .getproplen = prom_getproplen,
10616 .getproperty = prom_getproperty,
10617diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10618index 9ddc492..27a5619 100644
10619--- a/arch/sparc/kernel/ptrace_64.c
10620+++ b/arch/sparc/kernel/ptrace_64.c
10621@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10622 return ret;
10623 }
10624
10625+#ifdef CONFIG_GRKERNSEC_SETXID
10626+extern void gr_delayed_cred_worker(void);
10627+#endif
10628+
10629 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10630 {
10631 int ret = 0;
10632@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10633 if (test_thread_flag(TIF_NOHZ))
10634 user_exit();
10635
10636+#ifdef CONFIG_GRKERNSEC_SETXID
10637+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10638+ gr_delayed_cred_worker();
10639+#endif
10640+
10641 if (test_thread_flag(TIF_SYSCALL_TRACE))
10642 ret = tracehook_report_syscall_entry(regs);
10643
10644@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10645 if (test_thread_flag(TIF_NOHZ))
10646 user_exit();
10647
10648+#ifdef CONFIG_GRKERNSEC_SETXID
10649+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10650+ gr_delayed_cred_worker();
10651+#endif
10652+
10653 audit_syscall_exit(regs);
10654
10655 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10656diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10657index 61139d9..c1a5f28 100644
10658--- a/arch/sparc/kernel/smp_64.c
10659+++ b/arch/sparc/kernel/smp_64.c
10660@@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10661 return;
10662
10663 #ifdef CONFIG_DEBUG_DCFLUSH
10664- atomic_inc(&dcpage_flushes);
10665+ atomic_inc_unchecked(&dcpage_flushes);
10666 #endif
10667
10668 this_cpu = get_cpu();
10669@@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10670 xcall_deliver(data0, __pa(pg_addr),
10671 (u64) pg_addr, cpumask_of(cpu));
10672 #ifdef CONFIG_DEBUG_DCFLUSH
10673- atomic_inc(&dcpage_flushes_xcall);
10674+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10675 #endif
10676 }
10677 }
10678@@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10679 preempt_disable();
10680
10681 #ifdef CONFIG_DEBUG_DCFLUSH
10682- atomic_inc(&dcpage_flushes);
10683+ atomic_inc_unchecked(&dcpage_flushes);
10684 #endif
10685 data0 = 0;
10686 pg_addr = page_address(page);
10687@@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10688 xcall_deliver(data0, __pa(pg_addr),
10689 (u64) pg_addr, cpu_online_mask);
10690 #ifdef CONFIG_DEBUG_DCFLUSH
10691- atomic_inc(&dcpage_flushes_xcall);
10692+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10693 #endif
10694 }
10695 __local_flush_dcache_page(page);
10696diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10697index 646988d..b88905f 100644
10698--- a/arch/sparc/kernel/sys_sparc_32.c
10699+++ b/arch/sparc/kernel/sys_sparc_32.c
10700@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10701 if (len > TASK_SIZE - PAGE_SIZE)
10702 return -ENOMEM;
10703 if (!addr)
10704- addr = TASK_UNMAPPED_BASE;
10705+ addr = current->mm->mmap_base;
10706
10707 info.flags = 0;
10708 info.length = len;
10709diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10710index 30e7ddb..266a3b0 100644
10711--- a/arch/sparc/kernel/sys_sparc_64.c
10712+++ b/arch/sparc/kernel/sys_sparc_64.c
10713@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10714 struct vm_area_struct * vma;
10715 unsigned long task_size = TASK_SIZE;
10716 int do_color_align;
10717+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10718 struct vm_unmapped_area_info info;
10719
10720 if (flags & MAP_FIXED) {
10721 /* We do not accept a shared mapping if it would violate
10722 * cache aliasing constraints.
10723 */
10724- if ((flags & MAP_SHARED) &&
10725+ if ((filp || (flags & MAP_SHARED)) &&
10726 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10727 return -EINVAL;
10728 return addr;
10729@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10730 if (filp || (flags & MAP_SHARED))
10731 do_color_align = 1;
10732
10733+#ifdef CONFIG_PAX_RANDMMAP
10734+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10735+#endif
10736+
10737 if (addr) {
10738 if (do_color_align)
10739 addr = COLOR_ALIGN(addr, pgoff);
10740@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10741 addr = PAGE_ALIGN(addr);
10742
10743 vma = find_vma(mm, addr);
10744- if (task_size - len >= addr &&
10745- (!vma || addr + len <= vma->vm_start))
10746+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10747 return addr;
10748 }
10749
10750 info.flags = 0;
10751 info.length = len;
10752- info.low_limit = TASK_UNMAPPED_BASE;
10753+ info.low_limit = mm->mmap_base;
10754 info.high_limit = min(task_size, VA_EXCLUDE_START);
10755 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10756 info.align_offset = pgoff << PAGE_SHIFT;
10757+ info.threadstack_offset = offset;
10758 addr = vm_unmapped_area(&info);
10759
10760 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10761 VM_BUG_ON(addr != -ENOMEM);
10762 info.low_limit = VA_EXCLUDE_END;
10763+
10764+#ifdef CONFIG_PAX_RANDMMAP
10765+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10766+ info.low_limit += mm->delta_mmap;
10767+#endif
10768+
10769 info.high_limit = task_size;
10770 addr = vm_unmapped_area(&info);
10771 }
10772@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10773 unsigned long task_size = STACK_TOP32;
10774 unsigned long addr = addr0;
10775 int do_color_align;
10776+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10777 struct vm_unmapped_area_info info;
10778
10779 /* This should only ever run for 32-bit processes. */
10780@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10781 /* We do not accept a shared mapping if it would violate
10782 * cache aliasing constraints.
10783 */
10784- if ((flags & MAP_SHARED) &&
10785+ if ((filp || (flags & MAP_SHARED)) &&
10786 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10787 return -EINVAL;
10788 return addr;
10789@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10790 if (filp || (flags & MAP_SHARED))
10791 do_color_align = 1;
10792
10793+#ifdef CONFIG_PAX_RANDMMAP
10794+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10795+#endif
10796+
10797 /* requesting a specific address */
10798 if (addr) {
10799 if (do_color_align)
10800@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10801 addr = PAGE_ALIGN(addr);
10802
10803 vma = find_vma(mm, addr);
10804- if (task_size - len >= addr &&
10805- (!vma || addr + len <= vma->vm_start))
10806+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10807 return addr;
10808 }
10809
10810@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10811 info.high_limit = mm->mmap_base;
10812 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10813 info.align_offset = pgoff << PAGE_SHIFT;
10814+ info.threadstack_offset = offset;
10815 addr = vm_unmapped_area(&info);
10816
10817 /*
10818@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10819 VM_BUG_ON(addr != -ENOMEM);
10820 info.flags = 0;
10821 info.low_limit = TASK_UNMAPPED_BASE;
10822+
10823+#ifdef CONFIG_PAX_RANDMMAP
10824+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10825+ info.low_limit += mm->delta_mmap;
10826+#endif
10827+
10828 info.high_limit = STACK_TOP32;
10829 addr = vm_unmapped_area(&info);
10830 }
10831@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10832 EXPORT_SYMBOL(get_fb_unmapped_area);
10833
10834 /* Essentially the same as PowerPC. */
10835-static unsigned long mmap_rnd(void)
10836+static unsigned long mmap_rnd(struct mm_struct *mm)
10837 {
10838 unsigned long rnd = 0UL;
10839
10840+#ifdef CONFIG_PAX_RANDMMAP
10841+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10842+#endif
10843+
10844 if (current->flags & PF_RANDOMIZE) {
10845 unsigned long val = get_random_int();
10846 if (test_thread_flag(TIF_32BIT))
10847@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10848
10849 void arch_pick_mmap_layout(struct mm_struct *mm)
10850 {
10851- unsigned long random_factor = mmap_rnd();
10852+ unsigned long random_factor = mmap_rnd(mm);
10853 unsigned long gap;
10854
10855 /*
10856@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10857 gap == RLIM_INFINITY ||
10858 sysctl_legacy_va_layout) {
10859 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10860+
10861+#ifdef CONFIG_PAX_RANDMMAP
10862+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10863+ mm->mmap_base += mm->delta_mmap;
10864+#endif
10865+
10866 mm->get_unmapped_area = arch_get_unmapped_area;
10867 } else {
10868 /* We know it's 32-bit */
10869@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10870 gap = (task_size / 6 * 5);
10871
10872 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10873+
10874+#ifdef CONFIG_PAX_RANDMMAP
10875+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10876+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10877+#endif
10878+
10879 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10880 }
10881 }
10882diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10883index bb00089..e0ea580 100644
10884--- a/arch/sparc/kernel/syscalls.S
10885+++ b/arch/sparc/kernel/syscalls.S
10886@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10887 #endif
10888 .align 32
10889 1: ldx [%g6 + TI_FLAGS], %l5
10890- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10891+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10892 be,pt %icc, rtrap
10893 nop
10894 call syscall_trace_leave
10895@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10896
10897 srl %i3, 0, %o3 ! IEU0
10898 srl %i2, 0, %o2 ! IEU0 Group
10899- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10900+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10901 bne,pn %icc, linux_syscall_trace32 ! CTI
10902 mov %i0, %l5 ! IEU1
10903 5: call %l7 ! CTI Group brk forced
10904@@ -218,7 +218,7 @@ linux_sparc_syscall:
10905
10906 mov %i3, %o3 ! IEU1
10907 mov %i4, %o4 ! IEU0 Group
10908- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10909+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10910 bne,pn %icc, linux_syscall_trace ! CTI Group
10911 mov %i0, %l5 ! IEU0
10912 2: call %l7 ! CTI Group brk forced
10913@@ -233,7 +233,7 @@ ret_sys_call:
10914
10915 cmp %o0, -ERESTART_RESTARTBLOCK
10916 bgeu,pn %xcc, 1f
10917- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10918+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10919 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10920
10921 2:
10922diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10923index 6fd386c5..6907d81 100644
10924--- a/arch/sparc/kernel/traps_32.c
10925+++ b/arch/sparc/kernel/traps_32.c
10926@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10927 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10928 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10929
10930+extern void gr_handle_kernel_exploit(void);
10931+
10932 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10933 {
10934 static int die_counter;
10935@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10936 count++ < 30 &&
10937 (((unsigned long) rw) >= PAGE_OFFSET) &&
10938 !(((unsigned long) rw) & 0x7)) {
10939- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10940+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10941 (void *) rw->ins[7]);
10942 rw = (struct reg_window32 *)rw->ins[6];
10943 }
10944 }
10945 printk("Instruction DUMP:");
10946 instruction_dump ((unsigned long *) regs->pc);
10947- if(regs->psr & PSR_PS)
10948+ if(regs->psr & PSR_PS) {
10949+ gr_handle_kernel_exploit();
10950 do_exit(SIGKILL);
10951+ }
10952 do_exit(SIGSEGV);
10953 }
10954
10955diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10956index 0e69974..0c15a6e 100644
10957--- a/arch/sparc/kernel/traps_64.c
10958+++ b/arch/sparc/kernel/traps_64.c
10959@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10960 i + 1,
10961 p->trapstack[i].tstate, p->trapstack[i].tpc,
10962 p->trapstack[i].tnpc, p->trapstack[i].tt);
10963- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10964+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10965 }
10966 }
10967
10968@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10969
10970 lvl -= 0x100;
10971 if (regs->tstate & TSTATE_PRIV) {
10972+
10973+#ifdef CONFIG_PAX_REFCOUNT
10974+ if (lvl == 6)
10975+ pax_report_refcount_overflow(regs);
10976+#endif
10977+
10978 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10979 die_if_kernel(buffer, regs);
10980 }
10981@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10982 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10983 {
10984 char buffer[32];
10985-
10986+
10987 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10988 0, lvl, SIGTRAP) == NOTIFY_STOP)
10989 return;
10990
10991+#ifdef CONFIG_PAX_REFCOUNT
10992+ if (lvl == 6)
10993+ pax_report_refcount_overflow(regs);
10994+#endif
10995+
10996 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10997
10998 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10999@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
11000 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
11001 printk("%s" "ERROR(%d): ",
11002 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
11003- printk("TPC<%pS>\n", (void *) regs->tpc);
11004+ printk("TPC<%pA>\n", (void *) regs->tpc);
11005 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
11006 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
11007 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
11008@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11009 smp_processor_id(),
11010 (type & 0x1) ? 'I' : 'D',
11011 regs->tpc);
11012- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11013+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11014 panic("Irrecoverable Cheetah+ parity error.");
11015 }
11016
11017@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11018 smp_processor_id(),
11019 (type & 0x1) ? 'I' : 'D',
11020 regs->tpc);
11021- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11022+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11023 }
11024
11025 struct sun4v_error_entry {
11026@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11027 /*0x38*/u64 reserved_5;
11028 };
11029
11030-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11031-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11032+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11033+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11034
11035 static const char *sun4v_err_type_to_str(u8 type)
11036 {
11037@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11038 }
11039
11040 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11041- int cpu, const char *pfx, atomic_t *ocnt)
11042+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11043 {
11044 u64 *raw_ptr = (u64 *) ent;
11045 u32 attrs;
11046@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11047
11048 show_regs(regs);
11049
11050- if ((cnt = atomic_read(ocnt)) != 0) {
11051- atomic_set(ocnt, 0);
11052+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11053+ atomic_set_unchecked(ocnt, 0);
11054 wmb();
11055 printk("%s: Queue overflowed %d times.\n",
11056 pfx, cnt);
11057@@ -2048,7 +2059,7 @@ out:
11058 */
11059 void sun4v_resum_overflow(struct pt_regs *regs)
11060 {
11061- atomic_inc(&sun4v_resum_oflow_cnt);
11062+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11063 }
11064
11065 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11066@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11067 /* XXX Actually even this can make not that much sense. Perhaps
11068 * XXX we should just pull the plug and panic directly from here?
11069 */
11070- atomic_inc(&sun4v_nonresum_oflow_cnt);
11071+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11072 }
11073
11074 static void sun4v_tlb_error(struct pt_regs *regs)
11075@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11076
11077 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11078 regs->tpc, tl);
11079- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11080+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11081 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11082- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11083+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11084 (void *) regs->u_regs[UREG_I7]);
11085 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11086 "pte[%lx] error[%lx]\n",
11087@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11088
11089 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11090 regs->tpc, tl);
11091- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11092+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11093 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11094- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11095+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11096 (void *) regs->u_regs[UREG_I7]);
11097 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11098 "pte[%lx] error[%lx]\n",
11099@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11100 fp = (unsigned long)sf->fp + STACK_BIAS;
11101 }
11102
11103- printk(" [%016lx] %pS\n", pc, (void *) pc);
11104+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11105 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11106 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11107 int index = tsk->curr_ret_stack;
11108 if (tsk->ret_stack && index >= graph) {
11109 pc = tsk->ret_stack[index - graph].ret;
11110- printk(" [%016lx] %pS\n", pc, (void *) pc);
11111+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11112 graph++;
11113 }
11114 }
11115@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11116 return (struct reg_window *) (fp + STACK_BIAS);
11117 }
11118
11119+extern void gr_handle_kernel_exploit(void);
11120+
11121 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11122 {
11123 static int die_counter;
11124@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11125 while (rw &&
11126 count++ < 30 &&
11127 kstack_valid(tp, (unsigned long) rw)) {
11128- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11129+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11130 (void *) rw->ins[7]);
11131
11132 rw = kernel_stack_up(rw);
11133@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11134 }
11135 if (panic_on_oops)
11136 panic("Fatal exception");
11137- if (regs->tstate & TSTATE_PRIV)
11138+ if (regs->tstate & TSTATE_PRIV) {
11139+ gr_handle_kernel_exploit();
11140 do_exit(SIGKILL);
11141+ }
11142 do_exit(SIGSEGV);
11143 }
11144 EXPORT_SYMBOL(die_if_kernel);
11145diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11146index 62098a8..547ab2c 100644
11147--- a/arch/sparc/kernel/unaligned_64.c
11148+++ b/arch/sparc/kernel/unaligned_64.c
11149@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11150 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11151
11152 if (__ratelimit(&ratelimit)) {
11153- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11154+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11155 regs->tpc, (void *) regs->tpc);
11156 }
11157 }
11158diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11159index 3269b02..64f5231 100644
11160--- a/arch/sparc/lib/Makefile
11161+++ b/arch/sparc/lib/Makefile
11162@@ -2,7 +2,7 @@
11163 #
11164
11165 asflags-y := -ansi -DST_DIV0=0x02
11166-ccflags-y := -Werror
11167+#ccflags-y := -Werror
11168
11169 lib-$(CONFIG_SPARC32) += ashrdi3.o
11170 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11171diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11172index 05dac43..76f8ed4 100644
11173--- a/arch/sparc/lib/atomic_64.S
11174+++ b/arch/sparc/lib/atomic_64.S
11175@@ -15,11 +15,22 @@
11176 * a value and does the barriers.
11177 */
11178
11179-#define ATOMIC_OP(op) \
11180-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11181+#ifdef CONFIG_PAX_REFCOUNT
11182+#define __REFCOUNT_OP(op) op##cc
11183+#define __OVERFLOW_IOP tvs %icc, 6;
11184+#define __OVERFLOW_XOP tvs %xcc, 6;
11185+#else
11186+#define __REFCOUNT_OP(op) op
11187+#define __OVERFLOW_IOP
11188+#define __OVERFLOW_XOP
11189+#endif
11190+
11191+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11192+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11193 BACKOFF_SETUP(%o2); \
11194 1: lduw [%o1], %g1; \
11195- op %g1, %o0, %g7; \
11196+ asm_op %g1, %o0, %g7; \
11197+ post_op \
11198 cas [%o1], %g1, %g7; \
11199 cmp %g1, %g7; \
11200 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11201@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11202 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11203 ENDPROC(atomic_##op); \
11204
11205-#define ATOMIC_OP_RETURN(op) \
11206-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11207+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11208+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11209+
11210+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11211+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11212 BACKOFF_SETUP(%o2); \
11213 1: lduw [%o1], %g1; \
11214- op %g1, %o0, %g7; \
11215+ asm_op %g1, %o0, %g7; \
11216+ post_op \
11217 cas [%o1], %g1, %g7; \
11218 cmp %g1, %g7; \
11219 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11220@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11221 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11222 ENDPROC(atomic_##op##_return);
11223
11224+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11225+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11226+
11227 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11228
11229 ATOMIC_OPS(add)
11230@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11231
11232 #undef ATOMIC_OPS
11233 #undef ATOMIC_OP_RETURN
11234+#undef __ATOMIC_OP_RETURN
11235 #undef ATOMIC_OP
11236+#undef __ATOMIC_OP
11237
11238-#define ATOMIC64_OP(op) \
11239-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11240+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11241+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11242 BACKOFF_SETUP(%o2); \
11243 1: ldx [%o1], %g1; \
11244- op %g1, %o0, %g7; \
11245+ asm_op %g1, %o0, %g7; \
11246+ post_op \
11247 casx [%o1], %g1, %g7; \
11248 cmp %g1, %g7; \
11249 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11250@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11251 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11252 ENDPROC(atomic64_##op); \
11253
11254-#define ATOMIC64_OP_RETURN(op) \
11255-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11256+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11257+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11258+
11259+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11260+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11261 BACKOFF_SETUP(%o2); \
11262 1: ldx [%o1], %g1; \
11263- op %g1, %o0, %g7; \
11264+ asm_op %g1, %o0, %g7; \
11265+ post_op \
11266 casx [%o1], %g1, %g7; \
11267 cmp %g1, %g7; \
11268 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11269@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11270 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11271 ENDPROC(atomic64_##op##_return);
11272
11273+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11274+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11275+
11276 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11277
11278 ATOMIC64_OPS(add)
11279@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11280
11281 #undef ATOMIC64_OPS
11282 #undef ATOMIC64_OP_RETURN
11283+#undef __ATOMIC64_OP_RETURN
11284 #undef ATOMIC64_OP
11285+#undef __ATOMIC64_OP
11286+#undef __OVERFLOW_XOP
11287+#undef __OVERFLOW_IOP
11288+#undef __REFCOUNT_OP
11289
11290 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11291 BACKOFF_SETUP(%o2)
11292diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11293index 1d649a9..fbc5bfc 100644
11294--- a/arch/sparc/lib/ksyms.c
11295+++ b/arch/sparc/lib/ksyms.c
11296@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11297 /* Atomic counter implementation. */
11298 #define ATOMIC_OP(op) \
11299 EXPORT_SYMBOL(atomic_##op); \
11300-EXPORT_SYMBOL(atomic64_##op);
11301+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11302+EXPORT_SYMBOL(atomic64_##op); \
11303+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11304
11305 #define ATOMIC_OP_RETURN(op) \
11306 EXPORT_SYMBOL(atomic_##op##_return); \
11307@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11308 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11309
11310 ATOMIC_OPS(add)
11311+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11312+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11313 ATOMIC_OPS(sub)
11314
11315 #undef ATOMIC_OPS
11316diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11317index 30c3ecc..736f015 100644
11318--- a/arch/sparc/mm/Makefile
11319+++ b/arch/sparc/mm/Makefile
11320@@ -2,7 +2,7 @@
11321 #
11322
11323 asflags-y := -ansi
11324-ccflags-y := -Werror
11325+#ccflags-y := -Werror
11326
11327 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11328 obj-y += fault_$(BITS).o
11329diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11330index 70d8171..274c6c0 100644
11331--- a/arch/sparc/mm/fault_32.c
11332+++ b/arch/sparc/mm/fault_32.c
11333@@ -21,6 +21,9 @@
11334 #include <linux/perf_event.h>
11335 #include <linux/interrupt.h>
11336 #include <linux/kdebug.h>
11337+#include <linux/slab.h>
11338+#include <linux/pagemap.h>
11339+#include <linux/compiler.h>
11340
11341 #include <asm/page.h>
11342 #include <asm/pgtable.h>
11343@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11344 return safe_compute_effective_address(regs, insn);
11345 }
11346
11347+#ifdef CONFIG_PAX_PAGEEXEC
11348+#ifdef CONFIG_PAX_DLRESOLVE
11349+static void pax_emuplt_close(struct vm_area_struct *vma)
11350+{
11351+ vma->vm_mm->call_dl_resolve = 0UL;
11352+}
11353+
11354+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11355+{
11356+ unsigned int *kaddr;
11357+
11358+ vmf->page = alloc_page(GFP_HIGHUSER);
11359+ if (!vmf->page)
11360+ return VM_FAULT_OOM;
11361+
11362+ kaddr = kmap(vmf->page);
11363+ memset(kaddr, 0, PAGE_SIZE);
11364+ kaddr[0] = 0x9DE3BFA8U; /* save */
11365+ flush_dcache_page(vmf->page);
11366+ kunmap(vmf->page);
11367+ return VM_FAULT_MAJOR;
11368+}
11369+
11370+static const struct vm_operations_struct pax_vm_ops = {
11371+ .close = pax_emuplt_close,
11372+ .fault = pax_emuplt_fault
11373+};
11374+
11375+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11376+{
11377+ int ret;
11378+
11379+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11380+ vma->vm_mm = current->mm;
11381+ vma->vm_start = addr;
11382+ vma->vm_end = addr + PAGE_SIZE;
11383+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11384+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11385+ vma->vm_ops = &pax_vm_ops;
11386+
11387+ ret = insert_vm_struct(current->mm, vma);
11388+ if (ret)
11389+ return ret;
11390+
11391+ ++current->mm->total_vm;
11392+ return 0;
11393+}
11394+#endif
11395+
11396+/*
11397+ * PaX: decide what to do with offenders (regs->pc = fault address)
11398+ *
11399+ * returns 1 when task should be killed
11400+ * 2 when patched PLT trampoline was detected
11401+ * 3 when unpatched PLT trampoline was detected
11402+ */
11403+static int pax_handle_fetch_fault(struct pt_regs *regs)
11404+{
11405+
11406+#ifdef CONFIG_PAX_EMUPLT
11407+ int err;
11408+
11409+ do { /* PaX: patched PLT emulation #1 */
11410+ unsigned int sethi1, sethi2, jmpl;
11411+
11412+ err = get_user(sethi1, (unsigned int *)regs->pc);
11413+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11414+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11415+
11416+ if (err)
11417+ break;
11418+
11419+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11420+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11421+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11422+ {
11423+ unsigned int addr;
11424+
11425+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11426+ addr = regs->u_regs[UREG_G1];
11427+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11428+ regs->pc = addr;
11429+ regs->npc = addr+4;
11430+ return 2;
11431+ }
11432+ } while (0);
11433+
11434+ do { /* PaX: patched PLT emulation #2 */
11435+ unsigned int ba;
11436+
11437+ err = get_user(ba, (unsigned int *)regs->pc);
11438+
11439+ if (err)
11440+ break;
11441+
11442+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11443+ unsigned int addr;
11444+
11445+ if ((ba & 0xFFC00000U) == 0x30800000U)
11446+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11447+ else
11448+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11449+ regs->pc = addr;
11450+ regs->npc = addr+4;
11451+ return 2;
11452+ }
11453+ } while (0);
11454+
11455+ do { /* PaX: patched PLT emulation #3 */
11456+ unsigned int sethi, bajmpl, nop;
11457+
11458+ err = get_user(sethi, (unsigned int *)regs->pc);
11459+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11460+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11461+
11462+ if (err)
11463+ break;
11464+
11465+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11466+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11467+ nop == 0x01000000U)
11468+ {
11469+ unsigned int addr;
11470+
11471+ addr = (sethi & 0x003FFFFFU) << 10;
11472+ regs->u_regs[UREG_G1] = addr;
11473+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11474+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11475+ else
11476+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11477+ regs->pc = addr;
11478+ regs->npc = addr+4;
11479+ return 2;
11480+ }
11481+ } while (0);
11482+
11483+ do { /* PaX: unpatched PLT emulation step 1 */
11484+ unsigned int sethi, ba, nop;
11485+
11486+ err = get_user(sethi, (unsigned int *)regs->pc);
11487+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11488+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11489+
11490+ if (err)
11491+ break;
11492+
11493+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11494+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11495+ nop == 0x01000000U)
11496+ {
11497+ unsigned int addr, save, call;
11498+
11499+ if ((ba & 0xFFC00000U) == 0x30800000U)
11500+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11501+ else
11502+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11503+
11504+ err = get_user(save, (unsigned int *)addr);
11505+ err |= get_user(call, (unsigned int *)(addr+4));
11506+ err |= get_user(nop, (unsigned int *)(addr+8));
11507+ if (err)
11508+ break;
11509+
11510+#ifdef CONFIG_PAX_DLRESOLVE
11511+ if (save == 0x9DE3BFA8U &&
11512+ (call & 0xC0000000U) == 0x40000000U &&
11513+ nop == 0x01000000U)
11514+ {
11515+ struct vm_area_struct *vma;
11516+ unsigned long call_dl_resolve;
11517+
11518+ down_read(&current->mm->mmap_sem);
11519+ call_dl_resolve = current->mm->call_dl_resolve;
11520+ up_read(&current->mm->mmap_sem);
11521+ if (likely(call_dl_resolve))
11522+ goto emulate;
11523+
11524+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11525+
11526+ down_write(&current->mm->mmap_sem);
11527+ if (current->mm->call_dl_resolve) {
11528+ call_dl_resolve = current->mm->call_dl_resolve;
11529+ up_write(&current->mm->mmap_sem);
11530+ if (vma)
11531+ kmem_cache_free(vm_area_cachep, vma);
11532+ goto emulate;
11533+ }
11534+
11535+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11536+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11537+ up_write(&current->mm->mmap_sem);
11538+ if (vma)
11539+ kmem_cache_free(vm_area_cachep, vma);
11540+ return 1;
11541+ }
11542+
11543+ if (pax_insert_vma(vma, call_dl_resolve)) {
11544+ up_write(&current->mm->mmap_sem);
11545+ kmem_cache_free(vm_area_cachep, vma);
11546+ return 1;
11547+ }
11548+
11549+ current->mm->call_dl_resolve = call_dl_resolve;
11550+ up_write(&current->mm->mmap_sem);
11551+
11552+emulate:
11553+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11554+ regs->pc = call_dl_resolve;
11555+ regs->npc = addr+4;
11556+ return 3;
11557+ }
11558+#endif
11559+
11560+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11561+ if ((save & 0xFFC00000U) == 0x05000000U &&
11562+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11563+ nop == 0x01000000U)
11564+ {
11565+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11566+ regs->u_regs[UREG_G2] = addr + 4;
11567+ addr = (save & 0x003FFFFFU) << 10;
11568+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11569+ regs->pc = addr;
11570+ regs->npc = addr+4;
11571+ return 3;
11572+ }
11573+ }
11574+ } while (0);
11575+
11576+ do { /* PaX: unpatched PLT emulation step 2 */
11577+ unsigned int save, call, nop;
11578+
11579+ err = get_user(save, (unsigned int *)(regs->pc-4));
11580+ err |= get_user(call, (unsigned int *)regs->pc);
11581+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11582+ if (err)
11583+ break;
11584+
11585+ if (save == 0x9DE3BFA8U &&
11586+ (call & 0xC0000000U) == 0x40000000U &&
11587+ nop == 0x01000000U)
11588+ {
11589+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11590+
11591+ regs->u_regs[UREG_RETPC] = regs->pc;
11592+ regs->pc = dl_resolve;
11593+ regs->npc = dl_resolve+4;
11594+ return 3;
11595+ }
11596+ } while (0);
11597+#endif
11598+
11599+ return 1;
11600+}
11601+
11602+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11603+{
11604+ unsigned long i;
11605+
11606+ printk(KERN_ERR "PAX: bytes at PC: ");
11607+ for (i = 0; i < 8; i++) {
11608+ unsigned int c;
11609+ if (get_user(c, (unsigned int *)pc+i))
11610+ printk(KERN_CONT "???????? ");
11611+ else
11612+ printk(KERN_CONT "%08x ", c);
11613+ }
11614+ printk("\n");
11615+}
11616+#endif
11617+
11618 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11619 int text_fault)
11620 {
11621@@ -226,6 +500,24 @@ good_area:
11622 if (!(vma->vm_flags & VM_WRITE))
11623 goto bad_area;
11624 } else {
11625+
11626+#ifdef CONFIG_PAX_PAGEEXEC
11627+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11628+ up_read(&mm->mmap_sem);
11629+ switch (pax_handle_fetch_fault(regs)) {
11630+
11631+#ifdef CONFIG_PAX_EMUPLT
11632+ case 2:
11633+ case 3:
11634+ return;
11635+#endif
11636+
11637+ }
11638+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11639+ do_group_exit(SIGKILL);
11640+ }
11641+#endif
11642+
11643 /* Allow reads even for write-only mappings */
11644 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11645 goto bad_area;
11646diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11647index 4798232..f76e3aa 100644
11648--- a/arch/sparc/mm/fault_64.c
11649+++ b/arch/sparc/mm/fault_64.c
11650@@ -22,6 +22,9 @@
11651 #include <linux/kdebug.h>
11652 #include <linux/percpu.h>
11653 #include <linux/context_tracking.h>
11654+#include <linux/slab.h>
11655+#include <linux/pagemap.h>
11656+#include <linux/compiler.h>
11657
11658 #include <asm/page.h>
11659 #include <asm/pgtable.h>
11660@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11661 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11662 regs->tpc);
11663 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11664- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11665+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11666 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11667 dump_stack();
11668 unhandled_fault(regs->tpc, current, regs);
11669@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11670 show_regs(regs);
11671 }
11672
11673+#ifdef CONFIG_PAX_PAGEEXEC
11674+#ifdef CONFIG_PAX_DLRESOLVE
11675+static void pax_emuplt_close(struct vm_area_struct *vma)
11676+{
11677+ vma->vm_mm->call_dl_resolve = 0UL;
11678+}
11679+
11680+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11681+{
11682+ unsigned int *kaddr;
11683+
11684+ vmf->page = alloc_page(GFP_HIGHUSER);
11685+ if (!vmf->page)
11686+ return VM_FAULT_OOM;
11687+
11688+ kaddr = kmap(vmf->page);
11689+ memset(kaddr, 0, PAGE_SIZE);
11690+ kaddr[0] = 0x9DE3BFA8U; /* save */
11691+ flush_dcache_page(vmf->page);
11692+ kunmap(vmf->page);
11693+ return VM_FAULT_MAJOR;
11694+}
11695+
11696+static const struct vm_operations_struct pax_vm_ops = {
11697+ .close = pax_emuplt_close,
11698+ .fault = pax_emuplt_fault
11699+};
11700+
11701+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11702+{
11703+ int ret;
11704+
11705+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11706+ vma->vm_mm = current->mm;
11707+ vma->vm_start = addr;
11708+ vma->vm_end = addr + PAGE_SIZE;
11709+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11710+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11711+ vma->vm_ops = &pax_vm_ops;
11712+
11713+ ret = insert_vm_struct(current->mm, vma);
11714+ if (ret)
11715+ return ret;
11716+
11717+ ++current->mm->total_vm;
11718+ return 0;
11719+}
11720+#endif
11721+
11722+/*
11723+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11724+ *
11725+ * returns 1 when task should be killed
11726+ * 2 when patched PLT trampoline was detected
11727+ * 3 when unpatched PLT trampoline was detected
11728+ */
11729+static int pax_handle_fetch_fault(struct pt_regs *regs)
11730+{
11731+
11732+#ifdef CONFIG_PAX_EMUPLT
11733+ int err;
11734+
11735+ do { /* PaX: patched PLT emulation #1 */
11736+ unsigned int sethi1, sethi2, jmpl;
11737+
11738+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11739+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11740+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11741+
11742+ if (err)
11743+ break;
11744+
11745+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11746+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11747+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11748+ {
11749+ unsigned long addr;
11750+
11751+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11752+ addr = regs->u_regs[UREG_G1];
11753+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11754+
11755+ if (test_thread_flag(TIF_32BIT))
11756+ addr &= 0xFFFFFFFFUL;
11757+
11758+ regs->tpc = addr;
11759+ regs->tnpc = addr+4;
11760+ return 2;
11761+ }
11762+ } while (0);
11763+
11764+ do { /* PaX: patched PLT emulation #2 */
11765+ unsigned int ba;
11766+
11767+ err = get_user(ba, (unsigned int *)regs->tpc);
11768+
11769+ if (err)
11770+ break;
11771+
11772+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11773+ unsigned long addr;
11774+
11775+ if ((ba & 0xFFC00000U) == 0x30800000U)
11776+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11777+ else
11778+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11779+
11780+ if (test_thread_flag(TIF_32BIT))
11781+ addr &= 0xFFFFFFFFUL;
11782+
11783+ regs->tpc = addr;
11784+ regs->tnpc = addr+4;
11785+ return 2;
11786+ }
11787+ } while (0);
11788+
11789+ do { /* PaX: patched PLT emulation #3 */
11790+ unsigned int sethi, bajmpl, nop;
11791+
11792+ err = get_user(sethi, (unsigned int *)regs->tpc);
11793+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11794+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11795+
11796+ if (err)
11797+ break;
11798+
11799+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11800+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11801+ nop == 0x01000000U)
11802+ {
11803+ unsigned long addr;
11804+
11805+ addr = (sethi & 0x003FFFFFU) << 10;
11806+ regs->u_regs[UREG_G1] = addr;
11807+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11808+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11809+ else
11810+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11811+
11812+ if (test_thread_flag(TIF_32BIT))
11813+ addr &= 0xFFFFFFFFUL;
11814+
11815+ regs->tpc = addr;
11816+ regs->tnpc = addr+4;
11817+ return 2;
11818+ }
11819+ } while (0);
11820+
11821+ do { /* PaX: patched PLT emulation #4 */
11822+ unsigned int sethi, mov1, call, mov2;
11823+
11824+ err = get_user(sethi, (unsigned int *)regs->tpc);
11825+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11826+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11827+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11828+
11829+ if (err)
11830+ break;
11831+
11832+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11833+ mov1 == 0x8210000FU &&
11834+ (call & 0xC0000000U) == 0x40000000U &&
11835+ mov2 == 0x9E100001U)
11836+ {
11837+ unsigned long addr;
11838+
11839+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11840+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11841+
11842+ if (test_thread_flag(TIF_32BIT))
11843+ addr &= 0xFFFFFFFFUL;
11844+
11845+ regs->tpc = addr;
11846+ regs->tnpc = addr+4;
11847+ return 2;
11848+ }
11849+ } while (0);
11850+
11851+ do { /* PaX: patched PLT emulation #5 */
11852+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11853+
11854+ err = get_user(sethi, (unsigned int *)regs->tpc);
11855+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11856+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11857+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11858+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11859+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11860+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11861+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11862+
11863+ if (err)
11864+ break;
11865+
11866+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11867+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11868+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11869+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11870+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11871+ sllx == 0x83287020U &&
11872+ jmpl == 0x81C04005U &&
11873+ nop == 0x01000000U)
11874+ {
11875+ unsigned long addr;
11876+
11877+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11878+ regs->u_regs[UREG_G1] <<= 32;
11879+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11880+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11881+ regs->tpc = addr;
11882+ regs->tnpc = addr+4;
11883+ return 2;
11884+ }
11885+ } while (0);
11886+
11887+ do { /* PaX: patched PLT emulation #6 */
11888+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11889+
11890+ err = get_user(sethi, (unsigned int *)regs->tpc);
11891+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11892+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11893+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11894+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11895+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11896+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11897+
11898+ if (err)
11899+ break;
11900+
11901+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11902+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11903+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11904+ sllx == 0x83287020U &&
11905+ (or & 0xFFFFE000U) == 0x8A116000U &&
11906+ jmpl == 0x81C04005U &&
11907+ nop == 0x01000000U)
11908+ {
11909+ unsigned long addr;
11910+
11911+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11912+ regs->u_regs[UREG_G1] <<= 32;
11913+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11914+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11915+ regs->tpc = addr;
11916+ regs->tnpc = addr+4;
11917+ return 2;
11918+ }
11919+ } while (0);
11920+
11921+ do { /* PaX: unpatched PLT emulation step 1 */
11922+ unsigned int sethi, ba, nop;
11923+
11924+ err = get_user(sethi, (unsigned int *)regs->tpc);
11925+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11926+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11927+
11928+ if (err)
11929+ break;
11930+
11931+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11932+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11933+ nop == 0x01000000U)
11934+ {
11935+ unsigned long addr;
11936+ unsigned int save, call;
11937+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11938+
11939+ if ((ba & 0xFFC00000U) == 0x30800000U)
11940+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11941+ else
11942+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11943+
11944+ if (test_thread_flag(TIF_32BIT))
11945+ addr &= 0xFFFFFFFFUL;
11946+
11947+ err = get_user(save, (unsigned int *)addr);
11948+ err |= get_user(call, (unsigned int *)(addr+4));
11949+ err |= get_user(nop, (unsigned int *)(addr+8));
11950+ if (err)
11951+ break;
11952+
11953+#ifdef CONFIG_PAX_DLRESOLVE
11954+ if (save == 0x9DE3BFA8U &&
11955+ (call & 0xC0000000U) == 0x40000000U &&
11956+ nop == 0x01000000U)
11957+ {
11958+ struct vm_area_struct *vma;
11959+ unsigned long call_dl_resolve;
11960+
11961+ down_read(&current->mm->mmap_sem);
11962+ call_dl_resolve = current->mm->call_dl_resolve;
11963+ up_read(&current->mm->mmap_sem);
11964+ if (likely(call_dl_resolve))
11965+ goto emulate;
11966+
11967+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11968+
11969+ down_write(&current->mm->mmap_sem);
11970+ if (current->mm->call_dl_resolve) {
11971+ call_dl_resolve = current->mm->call_dl_resolve;
11972+ up_write(&current->mm->mmap_sem);
11973+ if (vma)
11974+ kmem_cache_free(vm_area_cachep, vma);
11975+ goto emulate;
11976+ }
11977+
11978+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11979+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11980+ up_write(&current->mm->mmap_sem);
11981+ if (vma)
11982+ kmem_cache_free(vm_area_cachep, vma);
11983+ return 1;
11984+ }
11985+
11986+ if (pax_insert_vma(vma, call_dl_resolve)) {
11987+ up_write(&current->mm->mmap_sem);
11988+ kmem_cache_free(vm_area_cachep, vma);
11989+ return 1;
11990+ }
11991+
11992+ current->mm->call_dl_resolve = call_dl_resolve;
11993+ up_write(&current->mm->mmap_sem);
11994+
11995+emulate:
11996+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11997+ regs->tpc = call_dl_resolve;
11998+ regs->tnpc = addr+4;
11999+ return 3;
12000+ }
12001+#endif
12002+
12003+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
12004+ if ((save & 0xFFC00000U) == 0x05000000U &&
12005+ (call & 0xFFFFE000U) == 0x85C0A000U &&
12006+ nop == 0x01000000U)
12007+ {
12008+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12009+ regs->u_regs[UREG_G2] = addr + 4;
12010+ addr = (save & 0x003FFFFFU) << 10;
12011+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12012+
12013+ if (test_thread_flag(TIF_32BIT))
12014+ addr &= 0xFFFFFFFFUL;
12015+
12016+ regs->tpc = addr;
12017+ regs->tnpc = addr+4;
12018+ return 3;
12019+ }
12020+
12021+ /* PaX: 64-bit PLT stub */
12022+ err = get_user(sethi1, (unsigned int *)addr);
12023+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12024+ err |= get_user(or1, (unsigned int *)(addr+8));
12025+ err |= get_user(or2, (unsigned int *)(addr+12));
12026+ err |= get_user(sllx, (unsigned int *)(addr+16));
12027+ err |= get_user(add, (unsigned int *)(addr+20));
12028+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12029+ err |= get_user(nop, (unsigned int *)(addr+28));
12030+ if (err)
12031+ break;
12032+
12033+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12034+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12035+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12036+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12037+ sllx == 0x89293020U &&
12038+ add == 0x8A010005U &&
12039+ jmpl == 0x89C14000U &&
12040+ nop == 0x01000000U)
12041+ {
12042+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12043+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12044+ regs->u_regs[UREG_G4] <<= 32;
12045+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12046+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12047+ regs->u_regs[UREG_G4] = addr + 24;
12048+ addr = regs->u_regs[UREG_G5];
12049+ regs->tpc = addr;
12050+ regs->tnpc = addr+4;
12051+ return 3;
12052+ }
12053+ }
12054+ } while (0);
12055+
12056+#ifdef CONFIG_PAX_DLRESOLVE
12057+ do { /* PaX: unpatched PLT emulation step 2 */
12058+ unsigned int save, call, nop;
12059+
12060+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12061+ err |= get_user(call, (unsigned int *)regs->tpc);
12062+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12063+ if (err)
12064+ break;
12065+
12066+ if (save == 0x9DE3BFA8U &&
12067+ (call & 0xC0000000U) == 0x40000000U &&
12068+ nop == 0x01000000U)
12069+ {
12070+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12071+
12072+ if (test_thread_flag(TIF_32BIT))
12073+ dl_resolve &= 0xFFFFFFFFUL;
12074+
12075+ regs->u_regs[UREG_RETPC] = regs->tpc;
12076+ regs->tpc = dl_resolve;
12077+ regs->tnpc = dl_resolve+4;
12078+ return 3;
12079+ }
12080+ } while (0);
12081+#endif
12082+
12083+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12084+ unsigned int sethi, ba, nop;
12085+
12086+ err = get_user(sethi, (unsigned int *)regs->tpc);
12087+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12088+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12089+
12090+ if (err)
12091+ break;
12092+
12093+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12094+ (ba & 0xFFF00000U) == 0x30600000U &&
12095+ nop == 0x01000000U)
12096+ {
12097+ unsigned long addr;
12098+
12099+ addr = (sethi & 0x003FFFFFU) << 10;
12100+ regs->u_regs[UREG_G1] = addr;
12101+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12102+
12103+ if (test_thread_flag(TIF_32BIT))
12104+ addr &= 0xFFFFFFFFUL;
12105+
12106+ regs->tpc = addr;
12107+ regs->tnpc = addr+4;
12108+ return 2;
12109+ }
12110+ } while (0);
12111+
12112+#endif
12113+
12114+ return 1;
12115+}
12116+
12117+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12118+{
12119+ unsigned long i;
12120+
12121+ printk(KERN_ERR "PAX: bytes at PC: ");
12122+ for (i = 0; i < 8; i++) {
12123+ unsigned int c;
12124+ if (get_user(c, (unsigned int *)pc+i))
12125+ printk(KERN_CONT "???????? ");
12126+ else
12127+ printk(KERN_CONT "%08x ", c);
12128+ }
12129+ printk("\n");
12130+}
12131+#endif
12132+
12133 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12134 {
12135 enum ctx_state prev_state = exception_enter();
12136@@ -353,6 +816,29 @@ retry:
12137 if (!vma)
12138 goto bad_area;
12139
12140+#ifdef CONFIG_PAX_PAGEEXEC
12141+ /* PaX: detect ITLB misses on non-exec pages */
12142+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12143+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12144+ {
12145+ if (address != regs->tpc)
12146+ goto good_area;
12147+
12148+ up_read(&mm->mmap_sem);
12149+ switch (pax_handle_fetch_fault(regs)) {
12150+
12151+#ifdef CONFIG_PAX_EMUPLT
12152+ case 2:
12153+ case 3:
12154+ return;
12155+#endif
12156+
12157+ }
12158+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12159+ do_group_exit(SIGKILL);
12160+ }
12161+#endif
12162+
12163 /* Pure DTLB misses do not tell us whether the fault causing
12164 * load/store/atomic was a write or not, it only says that there
12165 * was no match. So in such a case we (carefully) read the
12166diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12167index 4242eab..9ae6360 100644
12168--- a/arch/sparc/mm/hugetlbpage.c
12169+++ b/arch/sparc/mm/hugetlbpage.c
12170@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12171 unsigned long addr,
12172 unsigned long len,
12173 unsigned long pgoff,
12174- unsigned long flags)
12175+ unsigned long flags,
12176+ unsigned long offset)
12177 {
12178+ struct mm_struct *mm = current->mm;
12179 unsigned long task_size = TASK_SIZE;
12180 struct vm_unmapped_area_info info;
12181
12182@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12183
12184 info.flags = 0;
12185 info.length = len;
12186- info.low_limit = TASK_UNMAPPED_BASE;
12187+ info.low_limit = mm->mmap_base;
12188 info.high_limit = min(task_size, VA_EXCLUDE_START);
12189 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12190 info.align_offset = 0;
12191+ info.threadstack_offset = offset;
12192 addr = vm_unmapped_area(&info);
12193
12194 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12195 VM_BUG_ON(addr != -ENOMEM);
12196 info.low_limit = VA_EXCLUDE_END;
12197+
12198+#ifdef CONFIG_PAX_RANDMMAP
12199+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12200+ info.low_limit += mm->delta_mmap;
12201+#endif
12202+
12203 info.high_limit = task_size;
12204 addr = vm_unmapped_area(&info);
12205 }
12206@@ -55,7 +64,8 @@ static unsigned long
12207 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12208 const unsigned long len,
12209 const unsigned long pgoff,
12210- const unsigned long flags)
12211+ const unsigned long flags,
12212+ const unsigned long offset)
12213 {
12214 struct mm_struct *mm = current->mm;
12215 unsigned long addr = addr0;
12216@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12217 info.high_limit = mm->mmap_base;
12218 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12219 info.align_offset = 0;
12220+ info.threadstack_offset = offset;
12221 addr = vm_unmapped_area(&info);
12222
12223 /*
12224@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12225 VM_BUG_ON(addr != -ENOMEM);
12226 info.flags = 0;
12227 info.low_limit = TASK_UNMAPPED_BASE;
12228+
12229+#ifdef CONFIG_PAX_RANDMMAP
12230+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12231+ info.low_limit += mm->delta_mmap;
12232+#endif
12233+
12234 info.high_limit = STACK_TOP32;
12235 addr = vm_unmapped_area(&info);
12236 }
12237@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12238 struct mm_struct *mm = current->mm;
12239 struct vm_area_struct *vma;
12240 unsigned long task_size = TASK_SIZE;
12241+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12242
12243 if (test_thread_flag(TIF_32BIT))
12244 task_size = STACK_TOP32;
12245@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12246 return addr;
12247 }
12248
12249+#ifdef CONFIG_PAX_RANDMMAP
12250+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12251+#endif
12252+
12253 if (addr) {
12254 addr = ALIGN(addr, HPAGE_SIZE);
12255 vma = find_vma(mm, addr);
12256- if (task_size - len >= addr &&
12257- (!vma || addr + len <= vma->vm_start))
12258+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12259 return addr;
12260 }
12261 if (mm->get_unmapped_area == arch_get_unmapped_area)
12262 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12263- pgoff, flags);
12264+ pgoff, flags, offset);
12265 else
12266 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12267- pgoff, flags);
12268+ pgoff, flags, offset);
12269 }
12270
12271 pte_t *huge_pte_alloc(struct mm_struct *mm,
12272diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12273index 4ca0d6b..e89bca1 100644
12274--- a/arch/sparc/mm/init_64.c
12275+++ b/arch/sparc/mm/init_64.c
12276@@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12277 int num_kernel_image_mappings;
12278
12279 #ifdef CONFIG_DEBUG_DCFLUSH
12280-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12281+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12282 #ifdef CONFIG_SMP
12283-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12284+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12285 #endif
12286 #endif
12287
12288@@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12289 {
12290 BUG_ON(tlb_type == hypervisor);
12291 #ifdef CONFIG_DEBUG_DCFLUSH
12292- atomic_inc(&dcpage_flushes);
12293+ atomic_inc_unchecked(&dcpage_flushes);
12294 #endif
12295
12296 #ifdef DCACHE_ALIASING_POSSIBLE
12297@@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12298
12299 #ifdef CONFIG_DEBUG_DCFLUSH
12300 seq_printf(m, "DCPageFlushes\t: %d\n",
12301- atomic_read(&dcpage_flushes));
12302+ atomic_read_unchecked(&dcpage_flushes));
12303 #ifdef CONFIG_SMP
12304 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12305- atomic_read(&dcpage_flushes_xcall));
12306+ atomic_read_unchecked(&dcpage_flushes_xcall));
12307 #endif /* CONFIG_SMP */
12308 #endif /* CONFIG_DEBUG_DCFLUSH */
12309 }
12310diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12311index 7cca418..53fc030 100644
12312--- a/arch/tile/Kconfig
12313+++ b/arch/tile/Kconfig
12314@@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12315
12316 config KEXEC
12317 bool "kexec system call"
12318+ depends on !GRKERNSEC_KMEM
12319 ---help---
12320 kexec is a system call that implements the ability to shutdown your
12321 current kernel, and to start another kernel. It is like a reboot
12322diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12323index 7b11c5f..755a026 100644
12324--- a/arch/tile/include/asm/atomic_64.h
12325+++ b/arch/tile/include/asm/atomic_64.h
12326@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12327
12328 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12329
12330+#define atomic64_read_unchecked(v) atomic64_read(v)
12331+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12332+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12333+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12334+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12335+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12336+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12337+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12338+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12339+
12340 /* Define this to indicate that cmpxchg is an efficient operation. */
12341 #define __HAVE_ARCH_CMPXCHG
12342
12343diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12344index 6160761..00cac88 100644
12345--- a/arch/tile/include/asm/cache.h
12346+++ b/arch/tile/include/asm/cache.h
12347@@ -15,11 +15,12 @@
12348 #ifndef _ASM_TILE_CACHE_H
12349 #define _ASM_TILE_CACHE_H
12350
12351+#include <linux/const.h>
12352 #include <arch/chip.h>
12353
12354 /* bytes per L1 data cache line */
12355 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12356-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12357+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12358
12359 /* bytes per L2 cache line */
12360 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12361diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12362index f41cb53..31d3ab4 100644
12363--- a/arch/tile/include/asm/uaccess.h
12364+++ b/arch/tile/include/asm/uaccess.h
12365@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12366 const void __user *from,
12367 unsigned long n)
12368 {
12369- int sz = __compiletime_object_size(to);
12370+ size_t sz = __compiletime_object_size(to);
12371
12372- if (likely(sz == -1 || sz >= n))
12373+ if (likely(sz == (size_t)-1 || sz >= n))
12374 n = _copy_from_user(to, from, n);
12375 else
12376 copy_from_user_overflow();
12377diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12378index 8416240..a012fb7 100644
12379--- a/arch/tile/mm/hugetlbpage.c
12380+++ b/arch/tile/mm/hugetlbpage.c
12381@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12382 info.high_limit = TASK_SIZE;
12383 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12384 info.align_offset = 0;
12385+ info.threadstack_offset = 0;
12386 return vm_unmapped_area(&info);
12387 }
12388
12389@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12390 info.high_limit = current->mm->mmap_base;
12391 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12392 info.align_offset = 0;
12393+ info.threadstack_offset = 0;
12394 addr = vm_unmapped_area(&info);
12395
12396 /*
12397diff --git a/arch/um/Makefile b/arch/um/Makefile
12398index e4b1a96..16162f8 100644
12399--- a/arch/um/Makefile
12400+++ b/arch/um/Makefile
12401@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12402 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12403 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12404
12405+ifdef CONSTIFY_PLUGIN
12406+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12407+endif
12408+
12409 #This will adjust *FLAGS accordingly to the platform.
12410 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12411
12412diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12413index 19e1bdd..3665b77 100644
12414--- a/arch/um/include/asm/cache.h
12415+++ b/arch/um/include/asm/cache.h
12416@@ -1,6 +1,7 @@
12417 #ifndef __UM_CACHE_H
12418 #define __UM_CACHE_H
12419
12420+#include <linux/const.h>
12421
12422 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12423 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12424@@ -12,6 +13,6 @@
12425 # define L1_CACHE_SHIFT 5
12426 #endif
12427
12428-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12429+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12430
12431 #endif
12432diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12433index 2e0a6b1..a64d0f5 100644
12434--- a/arch/um/include/asm/kmap_types.h
12435+++ b/arch/um/include/asm/kmap_types.h
12436@@ -8,6 +8,6 @@
12437
12438 /* No more #include "asm/arch/kmap_types.h" ! */
12439
12440-#define KM_TYPE_NR 14
12441+#define KM_TYPE_NR 15
12442
12443 #endif
12444diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12445index 71c5d13..4c7b9f1 100644
12446--- a/arch/um/include/asm/page.h
12447+++ b/arch/um/include/asm/page.h
12448@@ -14,6 +14,9 @@
12449 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12450 #define PAGE_MASK (~(PAGE_SIZE-1))
12451
12452+#define ktla_ktva(addr) (addr)
12453+#define ktva_ktla(addr) (addr)
12454+
12455 #ifndef __ASSEMBLY__
12456
12457 struct page;
12458diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12459index 2b4274e..754fe06 100644
12460--- a/arch/um/include/asm/pgtable-3level.h
12461+++ b/arch/um/include/asm/pgtable-3level.h
12462@@ -58,6 +58,7 @@
12463 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12464 #define pud_populate(mm, pud, pmd) \
12465 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12466+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12467
12468 #ifdef CONFIG_64BIT
12469 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12470diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12471index f17bca8..48adb87 100644
12472--- a/arch/um/kernel/process.c
12473+++ b/arch/um/kernel/process.c
12474@@ -356,22 +356,6 @@ int singlestepping(void * t)
12475 return 2;
12476 }
12477
12478-/*
12479- * Only x86 and x86_64 have an arch_align_stack().
12480- * All other arches have "#define arch_align_stack(x) (x)"
12481- * in their asm/exec.h
12482- * As this is included in UML from asm-um/system-generic.h,
12483- * we can use it to behave as the subarch does.
12484- */
12485-#ifndef arch_align_stack
12486-unsigned long arch_align_stack(unsigned long sp)
12487-{
12488- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12489- sp -= get_random_int() % 8192;
12490- return sp & ~0xf;
12491-}
12492-#endif
12493-
12494 unsigned long get_wchan(struct task_struct *p)
12495 {
12496 unsigned long stack_page, sp, ip;
12497diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12498index ad8f795..2c7eec6 100644
12499--- a/arch/unicore32/include/asm/cache.h
12500+++ b/arch/unicore32/include/asm/cache.h
12501@@ -12,8 +12,10 @@
12502 #ifndef __UNICORE_CACHE_H__
12503 #define __UNICORE_CACHE_H__
12504
12505-#define L1_CACHE_SHIFT (5)
12506-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12507+#include <linux/const.h>
12508+
12509+#define L1_CACHE_SHIFT 5
12510+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12511
12512 /*
12513 * Memory returned by kmalloc() may be used for DMA, so we must make
12514diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12515index b7d31ca..9481ec5 100644
12516--- a/arch/x86/Kconfig
12517+++ b/arch/x86/Kconfig
12518@@ -132,7 +132,7 @@ config X86
12519 select RTC_LIB
12520 select HAVE_DEBUG_STACKOVERFLOW
12521 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12522- select HAVE_CC_STACKPROTECTOR
12523+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12524 select GENERIC_CPU_AUTOPROBE
12525 select HAVE_ARCH_AUDITSYSCALL
12526 select ARCH_SUPPORTS_ATOMIC_RMW
12527@@ -266,7 +266,7 @@ config X86_HT
12528
12529 config X86_32_LAZY_GS
12530 def_bool y
12531- depends on X86_32 && !CC_STACKPROTECTOR
12532+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12533
12534 config ARCH_HWEIGHT_CFLAGS
12535 string
12536@@ -632,6 +632,7 @@ config SCHED_OMIT_FRAME_POINTER
12537
12538 menuconfig HYPERVISOR_GUEST
12539 bool "Linux guest support"
12540+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12541 ---help---
12542 Say Y here to enable options for running Linux under various hyper-
12543 visors. This option enables basic hypervisor detection and platform
12544@@ -1013,6 +1014,7 @@ config VM86
12545
12546 config X86_16BIT
12547 bool "Enable support for 16-bit segments" if EXPERT
12548+ depends on !GRKERNSEC
12549 default y
12550 ---help---
12551 This option is required by programs like Wine to run 16-bit
12552@@ -1186,6 +1188,7 @@ choice
12553
12554 config NOHIGHMEM
12555 bool "off"
12556+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12557 ---help---
12558 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12559 However, the address space of 32-bit x86 processors is only 4
12560@@ -1222,6 +1225,7 @@ config NOHIGHMEM
12561
12562 config HIGHMEM4G
12563 bool "4GB"
12564+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12565 ---help---
12566 Select this if you have a 32-bit processor and between 1 and 4
12567 gigabytes of physical RAM.
12568@@ -1274,7 +1278,7 @@ config PAGE_OFFSET
12569 hex
12570 default 0xB0000000 if VMSPLIT_3G_OPT
12571 default 0x80000000 if VMSPLIT_2G
12572- default 0x78000000 if VMSPLIT_2G_OPT
12573+ default 0x70000000 if VMSPLIT_2G_OPT
12574 default 0x40000000 if VMSPLIT_1G
12575 default 0xC0000000
12576 depends on X86_32
12577@@ -1715,6 +1719,7 @@ source kernel/Kconfig.hz
12578
12579 config KEXEC
12580 bool "kexec system call"
12581+ depends on !GRKERNSEC_KMEM
12582 ---help---
12583 kexec is a system call that implements the ability to shutdown your
12584 current kernel, and to start another kernel. It is like a reboot
12585@@ -1900,7 +1905,9 @@ config X86_NEED_RELOCS
12586
12587 config PHYSICAL_ALIGN
12588 hex "Alignment value to which kernel should be aligned"
12589- default "0x200000"
12590+ default "0x1000000"
12591+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12592+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12593 range 0x2000 0x1000000 if X86_32
12594 range 0x200000 0x1000000 if X86_64
12595 ---help---
12596@@ -1983,6 +1990,7 @@ config COMPAT_VDSO
12597 def_bool n
12598 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12599 depends on X86_32 || IA32_EMULATION
12600+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12601 ---help---
12602 Certain buggy versions of glibc will crash if they are
12603 presented with a 32-bit vDSO that is not mapped at the address
12604diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12605index 6983314..54ad7e8 100644
12606--- a/arch/x86/Kconfig.cpu
12607+++ b/arch/x86/Kconfig.cpu
12608@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12609
12610 config X86_F00F_BUG
12611 def_bool y
12612- depends on M586MMX || M586TSC || M586 || M486
12613+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12614
12615 config X86_INVD_BUG
12616 def_bool y
12617@@ -327,7 +327,7 @@ config X86_INVD_BUG
12618
12619 config X86_ALIGNMENT_16
12620 def_bool y
12621- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12622+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12623
12624 config X86_INTEL_USERCOPY
12625 def_bool y
12626@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12627 # generates cmov.
12628 config X86_CMOV
12629 def_bool y
12630- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12631+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12632
12633 config X86_MINIMUM_CPU_FAMILY
12634 int
12635diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12636index 20028da..88d5946 100644
12637--- a/arch/x86/Kconfig.debug
12638+++ b/arch/x86/Kconfig.debug
12639@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12640 config DEBUG_RODATA
12641 bool "Write protect kernel read-only data structures"
12642 default y
12643- depends on DEBUG_KERNEL
12644+ depends on DEBUG_KERNEL && BROKEN
12645 ---help---
12646 Mark the kernel read-only data as write-protected in the pagetables,
12647 in order to catch accidental (and incorrect) writes to such const
12648@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12649
12650 config DEBUG_SET_MODULE_RONX
12651 bool "Set loadable kernel module data as NX and text as RO"
12652- depends on MODULES
12653+ depends on MODULES && BROKEN
12654 ---help---
12655 This option helps catch unintended modifications to loadable
12656 kernel module's text and read-only data. It also prevents execution
12657diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12658index 5ba2d9c..41e5bb6 100644
12659--- a/arch/x86/Makefile
12660+++ b/arch/x86/Makefile
12661@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12662 # CPU-specific tuning. Anything which can be shared with UML should go here.
12663 include $(srctree)/arch/x86/Makefile_32.cpu
12664 KBUILD_CFLAGS += $(cflags-y)
12665-
12666- # temporary until string.h is fixed
12667- KBUILD_CFLAGS += -ffreestanding
12668 else
12669 BITS := 64
12670 UTS_MACHINE := x86_64
12671@@ -107,6 +104,9 @@ else
12672 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12673 endif
12674
12675+# temporary until string.h is fixed
12676+KBUILD_CFLAGS += -ffreestanding
12677+
12678 # Make sure compiler does not have buggy stack-protector support.
12679 ifdef CONFIG_CC_STACKPROTECTOR
12680 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12681@@ -181,6 +181,7 @@ archheaders:
12682 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12683
12684 archprepare:
12685+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12686 ifeq ($(CONFIG_KEXEC_FILE),y)
12687 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12688 endif
12689@@ -264,3 +265,9 @@ define archhelp
12690 echo ' FDARGS="..." arguments for the booted kernel'
12691 echo ' FDINITRD=file initrd for the booted kernel'
12692 endef
12693+
12694+define OLD_LD
12695+
12696+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12697+*** Please upgrade your binutils to 2.18 or newer
12698+endef
12699diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12700index 57bbf2f..b100fce 100644
12701--- a/arch/x86/boot/Makefile
12702+++ b/arch/x86/boot/Makefile
12703@@ -58,6 +58,9 @@ clean-files += cpustr.h
12704 # ---------------------------------------------------------------------------
12705
12706 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12707+ifdef CONSTIFY_PLUGIN
12708+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12709+endif
12710 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12711 GCOV_PROFILE := n
12712
12713diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12714index 878e4b9..20537ab 100644
12715--- a/arch/x86/boot/bitops.h
12716+++ b/arch/x86/boot/bitops.h
12717@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12718 u8 v;
12719 const u32 *p = (const u32 *)addr;
12720
12721- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12722+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12723 return v;
12724 }
12725
12726@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12727
12728 static inline void set_bit(int nr, void *addr)
12729 {
12730- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12731+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12732 }
12733
12734 #endif /* BOOT_BITOPS_H */
12735diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12736index bd49ec6..94c7f58 100644
12737--- a/arch/x86/boot/boot.h
12738+++ b/arch/x86/boot/boot.h
12739@@ -84,7 +84,7 @@ static inline void io_delay(void)
12740 static inline u16 ds(void)
12741 {
12742 u16 seg;
12743- asm("movw %%ds,%0" : "=rm" (seg));
12744+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12745 return seg;
12746 }
12747
12748diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12749index 0a291cd..9686efc 100644
12750--- a/arch/x86/boot/compressed/Makefile
12751+++ b/arch/x86/boot/compressed/Makefile
12752@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
12753 KBUILD_CFLAGS += -mno-mmx -mno-sse
12754 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12755 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12756+ifdef CONSTIFY_PLUGIN
12757+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12758+endif
12759
12760 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12761 GCOV_PROFILE := n
12762diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12763index a53440e..c3dbf1e 100644
12764--- a/arch/x86/boot/compressed/efi_stub_32.S
12765+++ b/arch/x86/boot/compressed/efi_stub_32.S
12766@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12767 * parameter 2, ..., param n. To make things easy, we save the return
12768 * address of efi_call_phys in a global variable.
12769 */
12770- popl %ecx
12771- movl %ecx, saved_return_addr(%edx)
12772- /* get the function pointer into ECX*/
12773- popl %ecx
12774- movl %ecx, efi_rt_function_ptr(%edx)
12775+ popl saved_return_addr(%edx)
12776+ popl efi_rt_function_ptr(%edx)
12777
12778 /*
12779 * 3. Call the physical function.
12780 */
12781- call *%ecx
12782+ call *efi_rt_function_ptr(%edx)
12783
12784 /*
12785 * 4. Balance the stack. And because EAX contain the return value,
12786@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12787 1: popl %edx
12788 subl $1b, %edx
12789
12790- movl efi_rt_function_ptr(%edx), %ecx
12791- pushl %ecx
12792+ pushl efi_rt_function_ptr(%edx)
12793
12794 /*
12795 * 10. Push the saved return address onto the stack and return.
12796 */
12797- movl saved_return_addr(%edx), %ecx
12798- pushl %ecx
12799- ret
12800+ jmpl *saved_return_addr(%edx)
12801 ENDPROC(efi_call_phys)
12802 .previous
12803
12804diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12805index 630384a..278e788 100644
12806--- a/arch/x86/boot/compressed/efi_thunk_64.S
12807+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12808@@ -189,8 +189,8 @@ efi_gdt64:
12809 .long 0 /* Filled out by user */
12810 .word 0
12811 .quad 0x0000000000000000 /* NULL descriptor */
12812- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12813- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12814+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12815+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12816 .quad 0x0080890000000000 /* TS descriptor */
12817 .quad 0x0000000000000000 /* TS continued */
12818 efi_gdt64_end:
12819diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12820index 1d7fbbc..36ecd58 100644
12821--- a/arch/x86/boot/compressed/head_32.S
12822+++ b/arch/x86/boot/compressed/head_32.S
12823@@ -140,10 +140,10 @@ preferred_addr:
12824 addl %eax, %ebx
12825 notl %eax
12826 andl %eax, %ebx
12827- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12828+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12829 jge 1f
12830 #endif
12831- movl $LOAD_PHYSICAL_ADDR, %ebx
12832+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12833 1:
12834
12835 /* Target address to relocate to for decompression */
12836diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12837index 6b1766c..ad465c9 100644
12838--- a/arch/x86/boot/compressed/head_64.S
12839+++ b/arch/x86/boot/compressed/head_64.S
12840@@ -94,10 +94,10 @@ ENTRY(startup_32)
12841 addl %eax, %ebx
12842 notl %eax
12843 andl %eax, %ebx
12844- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12845+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12846 jge 1f
12847 #endif
12848- movl $LOAD_PHYSICAL_ADDR, %ebx
12849+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12850 1:
12851
12852 /* Target address to relocate to for decompression */
12853@@ -322,10 +322,10 @@ preferred_addr:
12854 addq %rax, %rbp
12855 notq %rax
12856 andq %rax, %rbp
12857- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12858+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12859 jge 1f
12860 #endif
12861- movq $LOAD_PHYSICAL_ADDR, %rbp
12862+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12863 1:
12864
12865 /* Target address to relocate to for decompression */
12866@@ -434,8 +434,8 @@ gdt:
12867 .long gdt
12868 .word 0
12869 .quad 0x0000000000000000 /* NULL descriptor */
12870- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12871- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12872+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12873+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12874 .quad 0x0080890000000000 /* TS descriptor */
12875 .quad 0x0000000000000000 /* TS continued */
12876 gdt_end:
12877diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12878index a950864..c710239 100644
12879--- a/arch/x86/boot/compressed/misc.c
12880+++ b/arch/x86/boot/compressed/misc.c
12881@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12882 * Calculate the delta between where vmlinux was linked to load
12883 * and where it was actually loaded.
12884 */
12885- delta = min_addr - LOAD_PHYSICAL_ADDR;
12886+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12887 if (!delta) {
12888 debug_putstr("No relocation needed... ");
12889 return;
12890@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12891 Elf32_Ehdr ehdr;
12892 Elf32_Phdr *phdrs, *phdr;
12893 #endif
12894- void *dest;
12895+ void *dest, *prev;
12896 int i;
12897
12898 memcpy(&ehdr, output, sizeof(ehdr));
12899@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12900 case PT_LOAD:
12901 #ifdef CONFIG_RELOCATABLE
12902 dest = output;
12903- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12904+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12905 #else
12906 dest = (void *)(phdr->p_paddr);
12907 #endif
12908 memcpy(dest,
12909 output + phdr->p_offset,
12910 phdr->p_filesz);
12911+ if (i)
12912+ memset(prev, 0xff, dest - prev);
12913+ prev = dest + phdr->p_filesz;
12914 break;
12915 default: /* Ignore other PT_* */ break;
12916 }
12917@@ -416,7 +419,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12918 error("Destination address too large");
12919 #endif
12920 #ifndef CONFIG_RELOCATABLE
12921- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12922+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12923 error("Wrong destination address");
12924 #endif
12925
12926diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12927index 1fd7d57..0f7d096 100644
12928--- a/arch/x86/boot/cpucheck.c
12929+++ b/arch/x86/boot/cpucheck.c
12930@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12931 u32 ecx = MSR_K7_HWCR;
12932 u32 eax, edx;
12933
12934- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12935+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12936 eax &= ~(1 << 15);
12937- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12938+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12939
12940 get_cpuflags(); /* Make sure it really did something */
12941 err = check_cpuflags();
12942@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12943 u32 ecx = MSR_VIA_FCR;
12944 u32 eax, edx;
12945
12946- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12947+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12948 eax |= (1<<1)|(1<<7);
12949- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12950+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12951
12952 set_bit(X86_FEATURE_CX8, cpu.flags);
12953 err = check_cpuflags();
12954@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12955 u32 eax, edx;
12956 u32 level = 1;
12957
12958- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12959- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12960- asm("cpuid"
12961+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12962+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12963+ asm volatile("cpuid"
12964 : "+a" (level), "=d" (cpu.flags[0])
12965 : : "ecx", "ebx");
12966- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12967+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12968
12969 err = check_cpuflags();
12970 } else if (err == 0x01 &&
12971diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12972index 16ef025..91e033b 100644
12973--- a/arch/x86/boot/header.S
12974+++ b/arch/x86/boot/header.S
12975@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12976 # single linked list of
12977 # struct setup_data
12978
12979-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12980+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12981
12982 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12983+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12984+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12985+#else
12986 #define VO_INIT_SIZE (VO__end - VO__text)
12987+#endif
12988 #if ZO_INIT_SIZE > VO_INIT_SIZE
12989 #define INIT_SIZE ZO_INIT_SIZE
12990 #else
12991diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12992index db75d07..8e6d0af 100644
12993--- a/arch/x86/boot/memory.c
12994+++ b/arch/x86/boot/memory.c
12995@@ -19,7 +19,7 @@
12996
12997 static int detect_memory_e820(void)
12998 {
12999- int count = 0;
13000+ unsigned int count = 0;
13001 struct biosregs ireg, oreg;
13002 struct e820entry *desc = boot_params.e820_map;
13003 static struct e820entry buf; /* static so it is zeroed */
13004diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13005index ba3e100..6501b8f 100644
13006--- a/arch/x86/boot/video-vesa.c
13007+++ b/arch/x86/boot/video-vesa.c
13008@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13009
13010 boot_params.screen_info.vesapm_seg = oreg.es;
13011 boot_params.screen_info.vesapm_off = oreg.di;
13012+ boot_params.screen_info.vesapm_size = oreg.cx;
13013 }
13014
13015 /*
13016diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13017index 43eda28..5ab5fdb 100644
13018--- a/arch/x86/boot/video.c
13019+++ b/arch/x86/boot/video.c
13020@@ -96,7 +96,7 @@ static void store_mode_params(void)
13021 static unsigned int get_entry(void)
13022 {
13023 char entry_buf[4];
13024- int i, len = 0;
13025+ unsigned int i, len = 0;
13026 int key;
13027 unsigned int v;
13028
13029diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13030index 9105655..41779c1 100644
13031--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13032+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13033@@ -8,6 +8,8 @@
13034 * including this sentence is retained in full.
13035 */
13036
13037+#include <asm/alternative-asm.h>
13038+
13039 .extern crypto_ft_tab
13040 .extern crypto_it_tab
13041 .extern crypto_fl_tab
13042@@ -70,6 +72,8 @@
13043 je B192; \
13044 leaq 32(r9),r9;
13045
13046+#define ret pax_force_retaddr; ret
13047+
13048 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13049 movq r1,r2; \
13050 movq r3,r4; \
13051diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13052index 6bd2c6c..368c93e 100644
13053--- a/arch/x86/crypto/aesni-intel_asm.S
13054+++ b/arch/x86/crypto/aesni-intel_asm.S
13055@@ -31,6 +31,7 @@
13056
13057 #include <linux/linkage.h>
13058 #include <asm/inst.h>
13059+#include <asm/alternative-asm.h>
13060
13061 /*
13062 * The following macros are used to move an (un)aligned 16 byte value to/from
13063@@ -217,7 +218,7 @@ enc: .octa 0x2
13064 * num_initial_blocks = b mod 4
13065 * encrypt the initial num_initial_blocks blocks and apply ghash on
13066 * the ciphertext
13067-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13068+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13069 * are clobbered
13070 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13071 */
13072@@ -227,8 +228,8 @@ enc: .octa 0x2
13073 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13074 MOVADQ SHUF_MASK(%rip), %xmm14
13075 mov arg7, %r10 # %r10 = AAD
13076- mov arg8, %r12 # %r12 = aadLen
13077- mov %r12, %r11
13078+ mov arg8, %r15 # %r15 = aadLen
13079+ mov %r15, %r11
13080 pxor %xmm\i, %xmm\i
13081
13082 _get_AAD_loop\num_initial_blocks\operation:
13083@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
13084 psrldq $4, %xmm\i
13085 pxor \TMP1, %xmm\i
13086 add $4, %r10
13087- sub $4, %r12
13088+ sub $4, %r15
13089 jne _get_AAD_loop\num_initial_blocks\operation
13090
13091 cmp $16, %r11
13092 je _get_AAD_loop2_done\num_initial_blocks\operation
13093
13094- mov $16, %r12
13095+ mov $16, %r15
13096 _get_AAD_loop2\num_initial_blocks\operation:
13097 psrldq $4, %xmm\i
13098- sub $4, %r12
13099- cmp %r11, %r12
13100+ sub $4, %r15
13101+ cmp %r11, %r15
13102 jne _get_AAD_loop2\num_initial_blocks\operation
13103
13104 _get_AAD_loop2_done\num_initial_blocks\operation:
13105@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13106 * num_initial_blocks = b mod 4
13107 * encrypt the initial num_initial_blocks blocks and apply ghash on
13108 * the ciphertext
13109-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13110+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13111 * are clobbered
13112 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13113 */
13114@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13115 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13116 MOVADQ SHUF_MASK(%rip), %xmm14
13117 mov arg7, %r10 # %r10 = AAD
13118- mov arg8, %r12 # %r12 = aadLen
13119- mov %r12, %r11
13120+ mov arg8, %r15 # %r15 = aadLen
13121+ mov %r15, %r11
13122 pxor %xmm\i, %xmm\i
13123 _get_AAD_loop\num_initial_blocks\operation:
13124 movd (%r10), \TMP1
13125@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13126 psrldq $4, %xmm\i
13127 pxor \TMP1, %xmm\i
13128 add $4, %r10
13129- sub $4, %r12
13130+ sub $4, %r15
13131 jne _get_AAD_loop\num_initial_blocks\operation
13132 cmp $16, %r11
13133 je _get_AAD_loop2_done\num_initial_blocks\operation
13134- mov $16, %r12
13135+ mov $16, %r15
13136 _get_AAD_loop2\num_initial_blocks\operation:
13137 psrldq $4, %xmm\i
13138- sub $4, %r12
13139- cmp %r11, %r12
13140+ sub $4, %r15
13141+ cmp %r11, %r15
13142 jne _get_AAD_loop2\num_initial_blocks\operation
13143 _get_AAD_loop2_done\num_initial_blocks\operation:
13144 PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data
13145@@ -1280,7 +1281,7 @@ _esb_loop_\@:
13146 *
13147 *****************************************************************************/
13148 ENTRY(aesni_gcm_dec)
13149- push %r12
13150+ push %r15
13151 push %r13
13152 push %r14
13153 mov %rsp, %r14
13154@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
13155 */
13156 sub $VARIABLE_OFFSET, %rsp
13157 and $~63, %rsp # align rsp to 64 bytes
13158- mov %arg6, %r12
13159- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13160+ mov %arg6, %r15
13161+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13162 movdqa SHUF_MASK(%rip), %xmm2
13163 PSHUFB_XMM %xmm2, %xmm13
13164
13165@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
13166 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13167 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13168 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13169- mov %r13, %r12
13170- and $(3<<4), %r12
13171+ mov %r13, %r15
13172+ and $(3<<4), %r15
13173 jz _initial_num_blocks_is_0_decrypt
13174- cmp $(2<<4), %r12
13175+ cmp $(2<<4), %r15
13176 jb _initial_num_blocks_is_1_decrypt
13177 je _initial_num_blocks_is_2_decrypt
13178 _initial_num_blocks_is_3_decrypt:
13179@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
13180 sub $16, %r11
13181 add %r13, %r11
13182 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13183- lea SHIFT_MASK+16(%rip), %r12
13184- sub %r13, %r12
13185+ lea SHIFT_MASK+16(%rip), %r15
13186+ sub %r13, %r15
13187 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13188 # (%r13 is the number of bytes in plaintext mod 16)
13189- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13190+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13191 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13192
13193 movdqa %xmm1, %xmm2
13194 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13195- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13196+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13197 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13198 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13199 pand %xmm1, %xmm2
13200@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
13201 sub $1, %r13
13202 jne _less_than_8_bytes_left_decrypt
13203 _multiple_of_16_bytes_decrypt:
13204- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13205- shl $3, %r12 # convert into number of bits
13206- movd %r12d, %xmm15 # len(A) in %xmm15
13207+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13208+ shl $3, %r15 # convert into number of bits
13209+ movd %r15d, %xmm15 # len(A) in %xmm15
13210 shl $3, %arg4 # len(C) in bits (*128)
13211 MOVQ_R64_XMM %arg4, %xmm1
13212 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13213@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
13214 mov %r14, %rsp
13215 pop %r14
13216 pop %r13
13217- pop %r12
13218+ pop %r15
13219+ pax_force_retaddr
13220 ret
13221 ENDPROC(aesni_gcm_dec)
13222
13223@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
13224 * poly = x^128 + x^127 + x^126 + x^121 + 1
13225 ***************************************************************************/
13226 ENTRY(aesni_gcm_enc)
13227- push %r12
13228+ push %r15
13229 push %r13
13230 push %r14
13231 mov %rsp, %r14
13232@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
13233 #
13234 sub $VARIABLE_OFFSET, %rsp
13235 and $~63, %rsp
13236- mov %arg6, %r12
13237- movdqu (%r12), %xmm13
13238+ mov %arg6, %r15
13239+ movdqu (%r15), %xmm13
13240 movdqa SHUF_MASK(%rip), %xmm2
13241 PSHUFB_XMM %xmm2, %xmm13
13242
13243@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
13244 movdqa %xmm13, HashKey(%rsp)
13245 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13246 and $-16, %r13
13247- mov %r13, %r12
13248+ mov %r13, %r15
13249
13250 # Encrypt first few blocks
13251
13252- and $(3<<4), %r12
13253+ and $(3<<4), %r15
13254 jz _initial_num_blocks_is_0_encrypt
13255- cmp $(2<<4), %r12
13256+ cmp $(2<<4), %r15
13257 jb _initial_num_blocks_is_1_encrypt
13258 je _initial_num_blocks_is_2_encrypt
13259 _initial_num_blocks_is_3_encrypt:
13260@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
13261 sub $16, %r11
13262 add %r13, %r11
13263 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13264- lea SHIFT_MASK+16(%rip), %r12
13265- sub %r13, %r12
13266+ lea SHIFT_MASK+16(%rip), %r15
13267+ sub %r13, %r15
13268 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13269 # (%r13 is the number of bytes in plaintext mod 16)
13270- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13271+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13272 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13273 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13274- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13275+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13276 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13277 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13278 movdqa SHUF_MASK(%rip), %xmm10
13279@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
13280 sub $1, %r13
13281 jne _less_than_8_bytes_left_encrypt
13282 _multiple_of_16_bytes_encrypt:
13283- mov arg8, %r12 # %r12 = addLen (number of bytes)
13284- shl $3, %r12
13285- movd %r12d, %xmm15 # len(A) in %xmm15
13286+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13287+ shl $3, %r15
13288+ movd %r15d, %xmm15 # len(A) in %xmm15
13289 shl $3, %arg4 # len(C) in bits (*128)
13290 MOVQ_R64_XMM %arg4, %xmm1
13291 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13292@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
13293 mov %r14, %rsp
13294 pop %r14
13295 pop %r13
13296- pop %r12
13297+ pop %r15
13298+ pax_force_retaddr
13299 ret
13300 ENDPROC(aesni_gcm_enc)
13301
13302@@ -1733,6 +1736,7 @@ _key_expansion_256a:
13303 pxor %xmm1, %xmm0
13304 movaps %xmm0, (TKEYP)
13305 add $0x10, TKEYP
13306+ pax_force_retaddr
13307 ret
13308 ENDPROC(_key_expansion_128)
13309 ENDPROC(_key_expansion_256a)
13310@@ -1759,6 +1763,7 @@ _key_expansion_192a:
13311 shufps $0b01001110, %xmm2, %xmm1
13312 movaps %xmm1, 0x10(TKEYP)
13313 add $0x20, TKEYP
13314+ pax_force_retaddr
13315 ret
13316 ENDPROC(_key_expansion_192a)
13317
13318@@ -1779,6 +1784,7 @@ _key_expansion_192b:
13319
13320 movaps %xmm0, (TKEYP)
13321 add $0x10, TKEYP
13322+ pax_force_retaddr
13323 ret
13324 ENDPROC(_key_expansion_192b)
13325
13326@@ -1792,6 +1798,7 @@ _key_expansion_256b:
13327 pxor %xmm1, %xmm2
13328 movaps %xmm2, (TKEYP)
13329 add $0x10, TKEYP
13330+ pax_force_retaddr
13331 ret
13332 ENDPROC(_key_expansion_256b)
13333
13334@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
13335 #ifndef __x86_64__
13336 popl KEYP
13337 #endif
13338+ pax_force_retaddr
13339 ret
13340 ENDPROC(aesni_set_key)
13341
13342@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
13343 popl KLEN
13344 popl KEYP
13345 #endif
13346+ pax_force_retaddr
13347 ret
13348 ENDPROC(aesni_enc)
13349
13350@@ -1985,6 +1994,7 @@ _aesni_enc1:
13351 AESENC KEY STATE
13352 movaps 0x70(TKEYP), KEY
13353 AESENCLAST KEY STATE
13354+ pax_force_retaddr
13355 ret
13356 ENDPROC(_aesni_enc1)
13357
13358@@ -2094,6 +2104,7 @@ _aesni_enc4:
13359 AESENCLAST KEY STATE2
13360 AESENCLAST KEY STATE3
13361 AESENCLAST KEY STATE4
13362+ pax_force_retaddr
13363 ret
13364 ENDPROC(_aesni_enc4)
13365
13366@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
13367 popl KLEN
13368 popl KEYP
13369 #endif
13370+ pax_force_retaddr
13371 ret
13372 ENDPROC(aesni_dec)
13373
13374@@ -2175,6 +2187,7 @@ _aesni_dec1:
13375 AESDEC KEY STATE
13376 movaps 0x70(TKEYP), KEY
13377 AESDECLAST KEY STATE
13378+ pax_force_retaddr
13379 ret
13380 ENDPROC(_aesni_dec1)
13381
13382@@ -2284,6 +2297,7 @@ _aesni_dec4:
13383 AESDECLAST KEY STATE2
13384 AESDECLAST KEY STATE3
13385 AESDECLAST KEY STATE4
13386+ pax_force_retaddr
13387 ret
13388 ENDPROC(_aesni_dec4)
13389
13390@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
13391 popl KEYP
13392 popl LEN
13393 #endif
13394+ pax_force_retaddr
13395 ret
13396 ENDPROC(aesni_ecb_enc)
13397
13398@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
13399 popl KEYP
13400 popl LEN
13401 #endif
13402+ pax_force_retaddr
13403 ret
13404 ENDPROC(aesni_ecb_dec)
13405
13406@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
13407 popl LEN
13408 popl IVP
13409 #endif
13410+ pax_force_retaddr
13411 ret
13412 ENDPROC(aesni_cbc_enc)
13413
13414@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
13415 popl LEN
13416 popl IVP
13417 #endif
13418+ pax_force_retaddr
13419 ret
13420 ENDPROC(aesni_cbc_dec)
13421
13422@@ -2561,6 +2579,7 @@ _aesni_inc_init:
13423 mov $1, TCTR_LOW
13424 MOVQ_R64_XMM TCTR_LOW INC
13425 MOVQ_R64_XMM CTR TCTR_LOW
13426+ pax_force_retaddr
13427 ret
13428 ENDPROC(_aesni_inc_init)
13429
13430@@ -2590,6 +2609,7 @@ _aesni_inc:
13431 .Linc_low:
13432 movaps CTR, IV
13433 PSHUFB_XMM BSWAP_MASK IV
13434+ pax_force_retaddr
13435 ret
13436 ENDPROC(_aesni_inc)
13437
13438@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
13439 .Lctr_enc_ret:
13440 movups IV, (IVP)
13441 .Lctr_enc_just_ret:
13442+ pax_force_retaddr
13443 ret
13444 ENDPROC(aesni_ctr_enc)
13445
13446@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
13447 pxor INC, STATE4
13448 movdqu STATE4, 0x70(OUTP)
13449
13450+ pax_force_retaddr
13451 ret
13452 ENDPROC(aesni_xts_crypt8)
13453
13454diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13455index 246c670..466e2d6 100644
13456--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13457+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13458@@ -21,6 +21,7 @@
13459 */
13460
13461 #include <linux/linkage.h>
13462+#include <asm/alternative-asm.h>
13463
13464 .file "blowfish-x86_64-asm.S"
13465 .text
13466@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13467 jnz .L__enc_xor;
13468
13469 write_block();
13470+ pax_force_retaddr
13471 ret;
13472 .L__enc_xor:
13473 xor_block();
13474+ pax_force_retaddr
13475 ret;
13476 ENDPROC(__blowfish_enc_blk)
13477
13478@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13479
13480 movq %r11, %rbp;
13481
13482+ pax_force_retaddr
13483 ret;
13484 ENDPROC(blowfish_dec_blk)
13485
13486@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13487
13488 popq %rbx;
13489 popq %rbp;
13490+ pax_force_retaddr
13491 ret;
13492
13493 .L__enc_xor4:
13494@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13495
13496 popq %rbx;
13497 popq %rbp;
13498+ pax_force_retaddr
13499 ret;
13500 ENDPROC(__blowfish_enc_blk_4way)
13501
13502@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13503 popq %rbx;
13504 popq %rbp;
13505
13506+ pax_force_retaddr
13507 ret;
13508 ENDPROC(blowfish_dec_blk_4way)
13509diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13510index ce71f92..1dce7ec 100644
13511--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13512+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13513@@ -16,6 +16,7 @@
13514 */
13515
13516 #include <linux/linkage.h>
13517+#include <asm/alternative-asm.h>
13518
13519 #define CAMELLIA_TABLE_BYTE_LEN 272
13520
13521@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13522 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13523 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13524 %rcx, (%r9));
13525+ pax_force_retaddr
13526 ret;
13527 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13528
13529@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13530 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13531 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13532 %rax, (%r9));
13533+ pax_force_retaddr
13534 ret;
13535 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13536
13537@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13538 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13539 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13540
13541+ pax_force_retaddr
13542 ret;
13543
13544 .align 8
13545@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13546 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13547 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13548
13549+ pax_force_retaddr
13550 ret;
13551
13552 .align 8
13553@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13554 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13555 %xmm8, %rsi);
13556
13557+ pax_force_retaddr
13558 ret;
13559 ENDPROC(camellia_ecb_enc_16way)
13560
13561@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13562 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13563 %xmm8, %rsi);
13564
13565+ pax_force_retaddr
13566 ret;
13567 ENDPROC(camellia_ecb_dec_16way)
13568
13569@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13570 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13571 %xmm8, %rsi);
13572
13573+ pax_force_retaddr
13574 ret;
13575 ENDPROC(camellia_cbc_dec_16way)
13576
13577@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13578 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13579 %xmm8, %rsi);
13580
13581+ pax_force_retaddr
13582 ret;
13583 ENDPROC(camellia_ctr_16way)
13584
13585@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13586 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13587 %xmm8, %rsi);
13588
13589+ pax_force_retaddr
13590 ret;
13591 ENDPROC(camellia_xts_crypt_16way)
13592
13593diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13594index 0e0b886..5a3123c 100644
13595--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13596+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13597@@ -11,6 +11,7 @@
13598 */
13599
13600 #include <linux/linkage.h>
13601+#include <asm/alternative-asm.h>
13602
13603 #define CAMELLIA_TABLE_BYTE_LEN 272
13604
13605@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13606 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13607 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13608 %rcx, (%r9));
13609+ pax_force_retaddr
13610 ret;
13611 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13612
13613@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13614 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13615 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13616 %rax, (%r9));
13617+ pax_force_retaddr
13618 ret;
13619 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13620
13621@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13622 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13623 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13624
13625+ pax_force_retaddr
13626 ret;
13627
13628 .align 8
13629@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13630 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13631 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13632
13633+ pax_force_retaddr
13634 ret;
13635
13636 .align 8
13637@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13638
13639 vzeroupper;
13640
13641+ pax_force_retaddr
13642 ret;
13643 ENDPROC(camellia_ecb_enc_32way)
13644
13645@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13646
13647 vzeroupper;
13648
13649+ pax_force_retaddr
13650 ret;
13651 ENDPROC(camellia_ecb_dec_32way)
13652
13653@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13654
13655 vzeroupper;
13656
13657+ pax_force_retaddr
13658 ret;
13659 ENDPROC(camellia_cbc_dec_32way)
13660
13661@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13662
13663 vzeroupper;
13664
13665+ pax_force_retaddr
13666 ret;
13667 ENDPROC(camellia_ctr_32way)
13668
13669@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13670
13671 vzeroupper;
13672
13673+ pax_force_retaddr
13674 ret;
13675 ENDPROC(camellia_xts_crypt_32way)
13676
13677diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13678index 310319c..db3d7b5 100644
13679--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13680+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13681@@ -21,6 +21,7 @@
13682 */
13683
13684 #include <linux/linkage.h>
13685+#include <asm/alternative-asm.h>
13686
13687 .file "camellia-x86_64-asm_64.S"
13688 .text
13689@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13690 enc_outunpack(mov, RT1);
13691
13692 movq RRBP, %rbp;
13693+ pax_force_retaddr
13694 ret;
13695
13696 .L__enc_xor:
13697 enc_outunpack(xor, RT1);
13698
13699 movq RRBP, %rbp;
13700+ pax_force_retaddr
13701 ret;
13702 ENDPROC(__camellia_enc_blk)
13703
13704@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13705 dec_outunpack();
13706
13707 movq RRBP, %rbp;
13708+ pax_force_retaddr
13709 ret;
13710 ENDPROC(camellia_dec_blk)
13711
13712@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13713
13714 movq RRBP, %rbp;
13715 popq %rbx;
13716+ pax_force_retaddr
13717 ret;
13718
13719 .L__enc2_xor:
13720@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13721
13722 movq RRBP, %rbp;
13723 popq %rbx;
13724+ pax_force_retaddr
13725 ret;
13726 ENDPROC(__camellia_enc_blk_2way)
13727
13728@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13729
13730 movq RRBP, %rbp;
13731 movq RXOR, %rbx;
13732+ pax_force_retaddr
13733 ret;
13734 ENDPROC(camellia_dec_blk_2way)
13735diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13736index c35fd5d..2d8c7db 100644
13737--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13738+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13739@@ -24,6 +24,7 @@
13740 */
13741
13742 #include <linux/linkage.h>
13743+#include <asm/alternative-asm.h>
13744
13745 .file "cast5-avx-x86_64-asm_64.S"
13746
13747@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13748 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13749 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13750
13751+ pax_force_retaddr
13752 ret;
13753 ENDPROC(__cast5_enc_blk16)
13754
13755@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13756 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13757 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13758
13759+ pax_force_retaddr
13760 ret;
13761
13762 .L__skip_dec:
13763@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13764 vmovdqu RR4, (6*4*4)(%r11);
13765 vmovdqu RL4, (7*4*4)(%r11);
13766
13767+ pax_force_retaddr
13768 ret;
13769 ENDPROC(cast5_ecb_enc_16way)
13770
13771@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13772 vmovdqu RR4, (6*4*4)(%r11);
13773 vmovdqu RL4, (7*4*4)(%r11);
13774
13775+ pax_force_retaddr
13776 ret;
13777 ENDPROC(cast5_ecb_dec_16way)
13778
13779@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13780 * %rdx: src
13781 */
13782
13783- pushq %r12;
13784+ pushq %r14;
13785
13786 movq %rsi, %r11;
13787- movq %rdx, %r12;
13788+ movq %rdx, %r14;
13789
13790 vmovdqu (0*16)(%rdx), RL1;
13791 vmovdqu (1*16)(%rdx), RR1;
13792@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13793 call __cast5_dec_blk16;
13794
13795 /* xor with src */
13796- vmovq (%r12), RX;
13797+ vmovq (%r14), RX;
13798 vpshufd $0x4f, RX, RX;
13799 vpxor RX, RR1, RR1;
13800- vpxor 0*16+8(%r12), RL1, RL1;
13801- vpxor 1*16+8(%r12), RR2, RR2;
13802- vpxor 2*16+8(%r12), RL2, RL2;
13803- vpxor 3*16+8(%r12), RR3, RR3;
13804- vpxor 4*16+8(%r12), RL3, RL3;
13805- vpxor 5*16+8(%r12), RR4, RR4;
13806- vpxor 6*16+8(%r12), RL4, RL4;
13807+ vpxor 0*16+8(%r14), RL1, RL1;
13808+ vpxor 1*16+8(%r14), RR2, RR2;
13809+ vpxor 2*16+8(%r14), RL2, RL2;
13810+ vpxor 3*16+8(%r14), RR3, RR3;
13811+ vpxor 4*16+8(%r14), RL3, RL3;
13812+ vpxor 5*16+8(%r14), RR4, RR4;
13813+ vpxor 6*16+8(%r14), RL4, RL4;
13814
13815 vmovdqu RR1, (0*16)(%r11);
13816 vmovdqu RL1, (1*16)(%r11);
13817@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13818 vmovdqu RR4, (6*16)(%r11);
13819 vmovdqu RL4, (7*16)(%r11);
13820
13821- popq %r12;
13822+ popq %r14;
13823
13824+ pax_force_retaddr
13825 ret;
13826 ENDPROC(cast5_cbc_dec_16way)
13827
13828@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13829 * %rcx: iv (big endian, 64bit)
13830 */
13831
13832- pushq %r12;
13833+ pushq %r14;
13834
13835 movq %rsi, %r11;
13836- movq %rdx, %r12;
13837+ movq %rdx, %r14;
13838
13839 vpcmpeqd RTMP, RTMP, RTMP;
13840 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13841@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13842 call __cast5_enc_blk16;
13843
13844 /* dst = src ^ iv */
13845- vpxor (0*16)(%r12), RR1, RR1;
13846- vpxor (1*16)(%r12), RL1, RL1;
13847- vpxor (2*16)(%r12), RR2, RR2;
13848- vpxor (3*16)(%r12), RL2, RL2;
13849- vpxor (4*16)(%r12), RR3, RR3;
13850- vpxor (5*16)(%r12), RL3, RL3;
13851- vpxor (6*16)(%r12), RR4, RR4;
13852- vpxor (7*16)(%r12), RL4, RL4;
13853+ vpxor (0*16)(%r14), RR1, RR1;
13854+ vpxor (1*16)(%r14), RL1, RL1;
13855+ vpxor (2*16)(%r14), RR2, RR2;
13856+ vpxor (3*16)(%r14), RL2, RL2;
13857+ vpxor (4*16)(%r14), RR3, RR3;
13858+ vpxor (5*16)(%r14), RL3, RL3;
13859+ vpxor (6*16)(%r14), RR4, RR4;
13860+ vpxor (7*16)(%r14), RL4, RL4;
13861 vmovdqu RR1, (0*16)(%r11);
13862 vmovdqu RL1, (1*16)(%r11);
13863 vmovdqu RR2, (2*16)(%r11);
13864@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13865 vmovdqu RR4, (6*16)(%r11);
13866 vmovdqu RL4, (7*16)(%r11);
13867
13868- popq %r12;
13869+ popq %r14;
13870
13871+ pax_force_retaddr
13872 ret;
13873 ENDPROC(cast5_ctr_16way)
13874diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13875index e3531f8..e123f35 100644
13876--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13877+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13878@@ -24,6 +24,7 @@
13879 */
13880
13881 #include <linux/linkage.h>
13882+#include <asm/alternative-asm.h>
13883 #include "glue_helper-asm-avx.S"
13884
13885 .file "cast6-avx-x86_64-asm_64.S"
13886@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13887 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13888 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13889
13890+ pax_force_retaddr
13891 ret;
13892 ENDPROC(__cast6_enc_blk8)
13893
13894@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13895 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13896 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13897
13898+ pax_force_retaddr
13899 ret;
13900 ENDPROC(__cast6_dec_blk8)
13901
13902@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13903
13904 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13905
13906+ pax_force_retaddr
13907 ret;
13908 ENDPROC(cast6_ecb_enc_8way)
13909
13910@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13911
13912 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13913
13914+ pax_force_retaddr
13915 ret;
13916 ENDPROC(cast6_ecb_dec_8way)
13917
13918@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13919 * %rdx: src
13920 */
13921
13922- pushq %r12;
13923+ pushq %r14;
13924
13925 movq %rsi, %r11;
13926- movq %rdx, %r12;
13927+ movq %rdx, %r14;
13928
13929 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13930
13931 call __cast6_dec_blk8;
13932
13933- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13934+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13935
13936- popq %r12;
13937+ popq %r14;
13938
13939+ pax_force_retaddr
13940 ret;
13941 ENDPROC(cast6_cbc_dec_8way)
13942
13943@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13944 * %rcx: iv (little endian, 128bit)
13945 */
13946
13947- pushq %r12;
13948+ pushq %r14;
13949
13950 movq %rsi, %r11;
13951- movq %rdx, %r12;
13952+ movq %rdx, %r14;
13953
13954 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13955 RD2, RX, RKR, RKM);
13956
13957 call __cast6_enc_blk8;
13958
13959- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13960+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13961
13962- popq %r12;
13963+ popq %r14;
13964
13965+ pax_force_retaddr
13966 ret;
13967 ENDPROC(cast6_ctr_8way)
13968
13969@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13970 /* dst <= regs xor IVs(in dst) */
13971 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13972
13973+ pax_force_retaddr
13974 ret;
13975 ENDPROC(cast6_xts_enc_8way)
13976
13977@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13978 /* dst <= regs xor IVs(in dst) */
13979 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13980
13981+ pax_force_retaddr
13982 ret;
13983 ENDPROC(cast6_xts_dec_8way)
13984diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13985index 26d49eb..8bf39c8 100644
13986--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13987+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13988@@ -45,6 +45,7 @@
13989
13990 #include <asm/inst.h>
13991 #include <linux/linkage.h>
13992+#include <asm/alternative-asm.h>
13993
13994 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13995
13996@@ -309,6 +310,7 @@ do_return:
13997 popq %rsi
13998 popq %rdi
13999 popq %rbx
14000+ pax_force_retaddr
14001 ret
14002
14003 ################################################################
14004@@ -330,7 +332,7 @@ ENDPROC(crc_pcl)
14005 ## PCLMULQDQ tables
14006 ## Table is 128 entries x 2 words (8 bytes) each
14007 ################################################################
14008-.section .rotata, "a", %progbits
14009+.section .rodata, "a", %progbits
14010 .align 8
14011 K_table:
14012 .long 0x493c7d27, 0x00000001
14013diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14014index 5d1e007..098cb4f 100644
14015--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14016+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14017@@ -18,6 +18,7 @@
14018
14019 #include <linux/linkage.h>
14020 #include <asm/inst.h>
14021+#include <asm/alternative-asm.h>
14022
14023 .data
14024
14025@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14026 psrlq $1, T2
14027 pxor T2, T1
14028 pxor T1, DATA
14029+ pax_force_retaddr
14030 ret
14031 ENDPROC(__clmul_gf128mul_ble)
14032
14033@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14034 call __clmul_gf128mul_ble
14035 PSHUFB_XMM BSWAP DATA
14036 movups DATA, (%rdi)
14037+ pax_force_retaddr
14038 ret
14039 ENDPROC(clmul_ghash_mul)
14040
14041@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14042 PSHUFB_XMM BSWAP DATA
14043 movups DATA, (%rdi)
14044 .Lupdate_just_ret:
14045+ pax_force_retaddr
14046 ret
14047 ENDPROC(clmul_ghash_update)
14048diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14049index 9279e0b..c4b3d2c 100644
14050--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14051+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14052@@ -1,4 +1,5 @@
14053 #include <linux/linkage.h>
14054+#include <asm/alternative-asm.h>
14055
14056 # enter salsa20_encrypt_bytes
14057 ENTRY(salsa20_encrypt_bytes)
14058@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14059 add %r11,%rsp
14060 mov %rdi,%rax
14061 mov %rsi,%rdx
14062+ pax_force_retaddr
14063 ret
14064 # bytesatleast65:
14065 ._bytesatleast65:
14066@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14067 add %r11,%rsp
14068 mov %rdi,%rax
14069 mov %rsi,%rdx
14070+ pax_force_retaddr
14071 ret
14072 ENDPROC(salsa20_keysetup)
14073
14074@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14075 add %r11,%rsp
14076 mov %rdi,%rax
14077 mov %rsi,%rdx
14078+ pax_force_retaddr
14079 ret
14080 ENDPROC(salsa20_ivsetup)
14081diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14082index 2f202f4..d9164d6 100644
14083--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14084+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14085@@ -24,6 +24,7 @@
14086 */
14087
14088 #include <linux/linkage.h>
14089+#include <asm/alternative-asm.h>
14090 #include "glue_helper-asm-avx.S"
14091
14092 .file "serpent-avx-x86_64-asm_64.S"
14093@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14094 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14095 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14096
14097+ pax_force_retaddr
14098 ret;
14099 ENDPROC(__serpent_enc_blk8_avx)
14100
14101@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14102 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14103 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14104
14105+ pax_force_retaddr
14106 ret;
14107 ENDPROC(__serpent_dec_blk8_avx)
14108
14109@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14110
14111 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14112
14113+ pax_force_retaddr
14114 ret;
14115 ENDPROC(serpent_ecb_enc_8way_avx)
14116
14117@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14118
14119 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14120
14121+ pax_force_retaddr
14122 ret;
14123 ENDPROC(serpent_ecb_dec_8way_avx)
14124
14125@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14126
14127 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14128
14129+ pax_force_retaddr
14130 ret;
14131 ENDPROC(serpent_cbc_dec_8way_avx)
14132
14133@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14134
14135 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14136
14137+ pax_force_retaddr
14138 ret;
14139 ENDPROC(serpent_ctr_8way_avx)
14140
14141@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14142 /* dst <= regs xor IVs(in dst) */
14143 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14144
14145+ pax_force_retaddr
14146 ret;
14147 ENDPROC(serpent_xts_enc_8way_avx)
14148
14149@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14150 /* dst <= regs xor IVs(in dst) */
14151 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14152
14153+ pax_force_retaddr
14154 ret;
14155 ENDPROC(serpent_xts_dec_8way_avx)
14156diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14157index b222085..abd483c 100644
14158--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14159+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14160@@ -15,6 +15,7 @@
14161 */
14162
14163 #include <linux/linkage.h>
14164+#include <asm/alternative-asm.h>
14165 #include "glue_helper-asm-avx2.S"
14166
14167 .file "serpent-avx2-asm_64.S"
14168@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14169 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14170 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14171
14172+ pax_force_retaddr
14173 ret;
14174 ENDPROC(__serpent_enc_blk16)
14175
14176@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14177 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14178 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14179
14180+ pax_force_retaddr
14181 ret;
14182 ENDPROC(__serpent_dec_blk16)
14183
14184@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14185
14186 vzeroupper;
14187
14188+ pax_force_retaddr
14189 ret;
14190 ENDPROC(serpent_ecb_enc_16way)
14191
14192@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14193
14194 vzeroupper;
14195
14196+ pax_force_retaddr
14197 ret;
14198 ENDPROC(serpent_ecb_dec_16way)
14199
14200@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14201
14202 vzeroupper;
14203
14204+ pax_force_retaddr
14205 ret;
14206 ENDPROC(serpent_cbc_dec_16way)
14207
14208@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14209
14210 vzeroupper;
14211
14212+ pax_force_retaddr
14213 ret;
14214 ENDPROC(serpent_ctr_16way)
14215
14216@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14217
14218 vzeroupper;
14219
14220+ pax_force_retaddr
14221 ret;
14222 ENDPROC(serpent_xts_enc_16way)
14223
14224@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14225
14226 vzeroupper;
14227
14228+ pax_force_retaddr
14229 ret;
14230 ENDPROC(serpent_xts_dec_16way)
14231diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14232index acc066c..1559cc4 100644
14233--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14234+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14235@@ -25,6 +25,7 @@
14236 */
14237
14238 #include <linux/linkage.h>
14239+#include <asm/alternative-asm.h>
14240
14241 .file "serpent-sse2-x86_64-asm_64.S"
14242 .text
14243@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14244 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14245 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14246
14247+ pax_force_retaddr
14248 ret;
14249
14250 .L__enc_xor8:
14251 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14252 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14253
14254+ pax_force_retaddr
14255 ret;
14256 ENDPROC(__serpent_enc_blk_8way)
14257
14258@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14259 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14260 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14261
14262+ pax_force_retaddr
14263 ret;
14264 ENDPROC(serpent_dec_blk_8way)
14265diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14266index a410950..9dfe7ad 100644
14267--- a/arch/x86/crypto/sha1_ssse3_asm.S
14268+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14269@@ -29,6 +29,7 @@
14270 */
14271
14272 #include <linux/linkage.h>
14273+#include <asm/alternative-asm.h>
14274
14275 #define CTX %rdi // arg1
14276 #define BUF %rsi // arg2
14277@@ -75,9 +76,9 @@
14278
14279 push %rbx
14280 push %rbp
14281- push %r12
14282+ push %r14
14283
14284- mov %rsp, %r12
14285+ mov %rsp, %r14
14286 sub $64, %rsp # allocate workspace
14287 and $~15, %rsp # align stack
14288
14289@@ -99,11 +100,12 @@
14290 xor %rax, %rax
14291 rep stosq
14292
14293- mov %r12, %rsp # deallocate workspace
14294+ mov %r14, %rsp # deallocate workspace
14295
14296- pop %r12
14297+ pop %r14
14298 pop %rbp
14299 pop %rbx
14300+ pax_force_retaddr
14301 ret
14302
14303 ENDPROC(\name)
14304diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14305index 642f156..51a513c 100644
14306--- a/arch/x86/crypto/sha256-avx-asm.S
14307+++ b/arch/x86/crypto/sha256-avx-asm.S
14308@@ -49,6 +49,7 @@
14309
14310 #ifdef CONFIG_AS_AVX
14311 #include <linux/linkage.h>
14312+#include <asm/alternative-asm.h>
14313
14314 ## assume buffers not aligned
14315 #define VMOVDQ vmovdqu
14316@@ -460,6 +461,7 @@ done_hash:
14317 popq %r13
14318 popq %rbp
14319 popq %rbx
14320+ pax_force_retaddr
14321 ret
14322 ENDPROC(sha256_transform_avx)
14323
14324diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14325index 9e86944..3795e6a 100644
14326--- a/arch/x86/crypto/sha256-avx2-asm.S
14327+++ b/arch/x86/crypto/sha256-avx2-asm.S
14328@@ -50,6 +50,7 @@
14329
14330 #ifdef CONFIG_AS_AVX2
14331 #include <linux/linkage.h>
14332+#include <asm/alternative-asm.h>
14333
14334 ## assume buffers not aligned
14335 #define VMOVDQ vmovdqu
14336@@ -720,6 +721,7 @@ done_hash:
14337 popq %r12
14338 popq %rbp
14339 popq %rbx
14340+ pax_force_retaddr
14341 ret
14342 ENDPROC(sha256_transform_rorx)
14343
14344diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14345index f833b74..8c62a9e 100644
14346--- a/arch/x86/crypto/sha256-ssse3-asm.S
14347+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14348@@ -47,6 +47,7 @@
14349 ########################################################################
14350
14351 #include <linux/linkage.h>
14352+#include <asm/alternative-asm.h>
14353
14354 ## assume buffers not aligned
14355 #define MOVDQ movdqu
14356@@ -471,6 +472,7 @@ done_hash:
14357 popq %rbp
14358 popq %rbx
14359
14360+ pax_force_retaddr
14361 ret
14362 ENDPROC(sha256_transform_ssse3)
14363
14364diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14365index 974dde9..a823ff9 100644
14366--- a/arch/x86/crypto/sha512-avx-asm.S
14367+++ b/arch/x86/crypto/sha512-avx-asm.S
14368@@ -49,6 +49,7 @@
14369
14370 #ifdef CONFIG_AS_AVX
14371 #include <linux/linkage.h>
14372+#include <asm/alternative-asm.h>
14373
14374 .text
14375
14376@@ -364,6 +365,7 @@ updateblock:
14377 mov frame_RSPSAVE(%rsp), %rsp
14378
14379 nowork:
14380+ pax_force_retaddr
14381 ret
14382 ENDPROC(sha512_transform_avx)
14383
14384diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14385index 568b961..ed20c37 100644
14386--- a/arch/x86/crypto/sha512-avx2-asm.S
14387+++ b/arch/x86/crypto/sha512-avx2-asm.S
14388@@ -51,6 +51,7 @@
14389
14390 #ifdef CONFIG_AS_AVX2
14391 #include <linux/linkage.h>
14392+#include <asm/alternative-asm.h>
14393
14394 .text
14395
14396@@ -678,6 +679,7 @@ done_hash:
14397
14398 # Restore Stack Pointer
14399 mov frame_RSPSAVE(%rsp), %rsp
14400+ pax_force_retaddr
14401 ret
14402 ENDPROC(sha512_transform_rorx)
14403
14404diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14405index fb56855..6edd768 100644
14406--- a/arch/x86/crypto/sha512-ssse3-asm.S
14407+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14408@@ -48,6 +48,7 @@
14409 ########################################################################
14410
14411 #include <linux/linkage.h>
14412+#include <asm/alternative-asm.h>
14413
14414 .text
14415
14416@@ -363,6 +364,7 @@ updateblock:
14417 mov frame_RSPSAVE(%rsp), %rsp
14418
14419 nowork:
14420+ pax_force_retaddr
14421 ret
14422 ENDPROC(sha512_transform_ssse3)
14423
14424diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14425index 0505813..b067311 100644
14426--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14427+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14428@@ -24,6 +24,7 @@
14429 */
14430
14431 #include <linux/linkage.h>
14432+#include <asm/alternative-asm.h>
14433 #include "glue_helper-asm-avx.S"
14434
14435 .file "twofish-avx-x86_64-asm_64.S"
14436@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14437 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14438 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14439
14440+ pax_force_retaddr
14441 ret;
14442 ENDPROC(__twofish_enc_blk8)
14443
14444@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14445 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14446 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14447
14448+ pax_force_retaddr
14449 ret;
14450 ENDPROC(__twofish_dec_blk8)
14451
14452@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14453
14454 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14455
14456+ pax_force_retaddr
14457 ret;
14458 ENDPROC(twofish_ecb_enc_8way)
14459
14460@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14461
14462 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14463
14464+ pax_force_retaddr
14465 ret;
14466 ENDPROC(twofish_ecb_dec_8way)
14467
14468@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14469 * %rdx: src
14470 */
14471
14472- pushq %r12;
14473+ pushq %r14;
14474
14475 movq %rsi, %r11;
14476- movq %rdx, %r12;
14477+ movq %rdx, %r14;
14478
14479 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14480
14481 call __twofish_dec_blk8;
14482
14483- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14484+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14485
14486- popq %r12;
14487+ popq %r14;
14488
14489+ pax_force_retaddr
14490 ret;
14491 ENDPROC(twofish_cbc_dec_8way)
14492
14493@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14494 * %rcx: iv (little endian, 128bit)
14495 */
14496
14497- pushq %r12;
14498+ pushq %r14;
14499
14500 movq %rsi, %r11;
14501- movq %rdx, %r12;
14502+ movq %rdx, %r14;
14503
14504 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14505 RD2, RX0, RX1, RY0);
14506
14507 call __twofish_enc_blk8;
14508
14509- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14510+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14511
14512- popq %r12;
14513+ popq %r14;
14514
14515+ pax_force_retaddr
14516 ret;
14517 ENDPROC(twofish_ctr_8way)
14518
14519@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14520 /* dst <= regs xor IVs(in dst) */
14521 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14522
14523+ pax_force_retaddr
14524 ret;
14525 ENDPROC(twofish_xts_enc_8way)
14526
14527@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14528 /* dst <= regs xor IVs(in dst) */
14529 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14530
14531+ pax_force_retaddr
14532 ret;
14533 ENDPROC(twofish_xts_dec_8way)
14534diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14535index 1c3b7ce..02f578d 100644
14536--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14537+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14538@@ -21,6 +21,7 @@
14539 */
14540
14541 #include <linux/linkage.h>
14542+#include <asm/alternative-asm.h>
14543
14544 .file "twofish-x86_64-asm-3way.S"
14545 .text
14546@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14547 popq %r13;
14548 popq %r14;
14549 popq %r15;
14550+ pax_force_retaddr
14551 ret;
14552
14553 .L__enc_xor3:
14554@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14555 popq %r13;
14556 popq %r14;
14557 popq %r15;
14558+ pax_force_retaddr
14559 ret;
14560 ENDPROC(__twofish_enc_blk_3way)
14561
14562@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14563 popq %r13;
14564 popq %r14;
14565 popq %r15;
14566+ pax_force_retaddr
14567 ret;
14568 ENDPROC(twofish_dec_blk_3way)
14569diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14570index a039d21..524b8b2 100644
14571--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14572+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14573@@ -22,6 +22,7 @@
14574
14575 #include <linux/linkage.h>
14576 #include <asm/asm-offsets.h>
14577+#include <asm/alternative-asm.h>
14578
14579 #define a_offset 0
14580 #define b_offset 4
14581@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14582
14583 popq R1
14584 movq $1,%rax
14585+ pax_force_retaddr
14586 ret
14587 ENDPROC(twofish_enc_blk)
14588
14589@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14590
14591 popq R1
14592 movq $1,%rax
14593+ pax_force_retaddr
14594 ret
14595 ENDPROC(twofish_dec_blk)
14596diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14597index ae6aad1..719d6d9 100644
14598--- a/arch/x86/ia32/ia32_aout.c
14599+++ b/arch/x86/ia32/ia32_aout.c
14600@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14601 unsigned long dump_start, dump_size;
14602 struct user32 dump;
14603
14604+ memset(&dump, 0, sizeof(dump));
14605+
14606 fs = get_fs();
14607 set_fs(KERNEL_DS);
14608 has_dumped = 1;
14609diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14610index d0165c9..0d5639b 100644
14611--- a/arch/x86/ia32/ia32_signal.c
14612+++ b/arch/x86/ia32/ia32_signal.c
14613@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14614 if (__get_user(set.sig[0], &frame->sc.oldmask)
14615 || (_COMPAT_NSIG_WORDS > 1
14616 && __copy_from_user((((char *) &set.sig) + 4),
14617- &frame->extramask,
14618+ frame->extramask,
14619 sizeof(frame->extramask))))
14620 goto badframe;
14621
14622@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14623 sp -= frame_size;
14624 /* Align the stack pointer according to the i386 ABI,
14625 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14626- sp = ((sp + 4) & -16ul) - 4;
14627+ sp = ((sp - 12) & -16ul) - 4;
14628 return (void __user *) sp;
14629 }
14630
14631@@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14632 } else {
14633 /* Return stub is in 32bit vsyscall page */
14634 if (current->mm->context.vdso)
14635- restorer = current->mm->context.vdso +
14636- selected_vdso32->sym___kernel_sigreturn;
14637+ restorer = (void __force_user *)(current->mm->context.vdso +
14638+ selected_vdso32->sym___kernel_sigreturn);
14639 else
14640- restorer = &frame->retcode;
14641+ restorer = frame->retcode;
14642 }
14643
14644 put_user_try {
14645@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14646 * These are actually not used anymore, but left because some
14647 * gdb versions depend on them as a marker.
14648 */
14649- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14650+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14651 } put_user_catch(err);
14652
14653 if (err)
14654@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14655 0xb8,
14656 __NR_ia32_rt_sigreturn,
14657 0x80cd,
14658- 0,
14659+ 0
14660 };
14661
14662 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14663@@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14664
14665 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14666 restorer = ksig->ka.sa.sa_restorer;
14667+ else if (current->mm->context.vdso)
14668+ /* Return stub is in 32bit vsyscall page */
14669+ restorer = (void __force_user *)(current->mm->context.vdso +
14670+ selected_vdso32->sym___kernel_rt_sigreturn);
14671 else
14672- restorer = current->mm->context.vdso +
14673- selected_vdso32->sym___kernel_rt_sigreturn;
14674+ restorer = frame->retcode;
14675 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14676
14677 /*
14678 * Not actually used anymore, but left because some gdb
14679 * versions need it.
14680 */
14681- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14682+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14683 } put_user_catch(err);
14684
14685 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14686diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14687index 156ebca..9591cf0 100644
14688--- a/arch/x86/ia32/ia32entry.S
14689+++ b/arch/x86/ia32/ia32entry.S
14690@@ -15,8 +15,10 @@
14691 #include <asm/irqflags.h>
14692 #include <asm/asm.h>
14693 #include <asm/smap.h>
14694+#include <asm/pgtable.h>
14695 #include <linux/linkage.h>
14696 #include <linux/err.h>
14697+#include <asm/alternative-asm.h>
14698
14699 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14700 #include <linux/elf-em.h>
14701@@ -62,12 +64,12 @@
14702 */
14703 .macro LOAD_ARGS32 offset, _r9=0
14704 .if \_r9
14705- movl \offset+16(%rsp),%r9d
14706+ movl \offset+R9(%rsp),%r9d
14707 .endif
14708- movl \offset+40(%rsp),%ecx
14709- movl \offset+48(%rsp),%edx
14710- movl \offset+56(%rsp),%esi
14711- movl \offset+64(%rsp),%edi
14712+ movl \offset+RCX(%rsp),%ecx
14713+ movl \offset+RDX(%rsp),%edx
14714+ movl \offset+RSI(%rsp),%esi
14715+ movl \offset+RDI(%rsp),%edi
14716 movl %eax,%eax /* zero extension */
14717 .endm
14718
14719@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14720 ENDPROC(native_irq_enable_sysexit)
14721 #endif
14722
14723+ .macro pax_enter_kernel_user
14724+ pax_set_fptr_mask
14725+#ifdef CONFIG_PAX_MEMORY_UDEREF
14726+ call pax_enter_kernel_user
14727+#endif
14728+ .endm
14729+
14730+ .macro pax_exit_kernel_user
14731+#ifdef CONFIG_PAX_MEMORY_UDEREF
14732+ call pax_exit_kernel_user
14733+#endif
14734+#ifdef CONFIG_PAX_RANDKSTACK
14735+ pushq %rax
14736+ pushq %r11
14737+ call pax_randomize_kstack
14738+ popq %r11
14739+ popq %rax
14740+#endif
14741+ .endm
14742+
14743+ .macro pax_erase_kstack
14744+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14745+ call pax_erase_kstack
14746+#endif
14747+ .endm
14748+
14749 /*
14750 * 32bit SYSENTER instruction entry.
14751 *
14752@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14753 CFI_REGISTER rsp,rbp
14754 SWAPGS_UNSAFE_STACK
14755 movq PER_CPU_VAR(kernel_stack), %rsp
14756- addq $(KERNEL_STACK_OFFSET),%rsp
14757- /*
14758- * No need to follow this irqs on/off section: the syscall
14759- * disabled irqs, here we enable it straight after entry:
14760- */
14761- ENABLE_INTERRUPTS(CLBR_NONE)
14762 movl %ebp,%ebp /* zero extension */
14763 pushq_cfi $__USER32_DS
14764 /*CFI_REL_OFFSET ss,0*/
14765@@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14766 CFI_REL_OFFSET rsp,0
14767 pushfq_cfi
14768 /*CFI_REL_OFFSET rflags,0*/
14769- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14770- CFI_REGISTER rip,r10
14771+ orl $X86_EFLAGS_IF,(%rsp)
14772+ GET_THREAD_INFO(%r11)
14773+ movl TI_sysenter_return(%r11), %r11d
14774+ CFI_REGISTER rip,r11
14775 pushq_cfi $__USER32_CS
14776 /*CFI_REL_OFFSET cs,0*/
14777 movl %eax, %eax
14778- pushq_cfi %r10
14779+ pushq_cfi %r11
14780 CFI_REL_OFFSET rip,0
14781 pushq_cfi %rax
14782 cld
14783 SAVE_ARGS 0,1,0
14784+ pax_enter_kernel_user
14785+
14786+#ifdef CONFIG_PAX_RANDKSTACK
14787+ pax_erase_kstack
14788+#endif
14789+
14790+ /*
14791+ * No need to follow this irqs on/off section: the syscall
14792+ * disabled irqs, here we enable it straight after entry:
14793+ */
14794+ ENABLE_INTERRUPTS(CLBR_NONE)
14795 /* no need to do an access_ok check here because rbp has been
14796 32bit zero extended */
14797+
14798+#ifdef CONFIG_PAX_MEMORY_UDEREF
14799+ addq pax_user_shadow_base,%rbp
14800+ ASM_PAX_OPEN_USERLAND
14801+#endif
14802+
14803 ASM_STAC
14804 1: movl (%rbp),%ebp
14805 _ASM_EXTABLE(1b,ia32_badarg)
14806 ASM_CLAC
14807
14808+#ifdef CONFIG_PAX_MEMORY_UDEREF
14809+ ASM_PAX_CLOSE_USERLAND
14810+#endif
14811+
14812 /*
14813 * Sysenter doesn't filter flags, so we need to clear NT
14814 * ourselves. To save a few cycles, we can check whether
14815@@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14816 jnz sysenter_fix_flags
14817 sysenter_flags_fixed:
14818
14819- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14820- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14821+ GET_THREAD_INFO(%r11)
14822+ orl $TS_COMPAT,TI_status(%r11)
14823+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14824 CFI_REMEMBER_STATE
14825 jnz sysenter_tracesys
14826 cmpq $(IA32_NR_syscalls-1),%rax
14827@@ -172,14 +218,17 @@ sysenter_do_call:
14828 sysenter_dispatch:
14829 call *ia32_sys_call_table(,%rax,8)
14830 movq %rax,RAX-ARGOFFSET(%rsp)
14831+ GET_THREAD_INFO(%r11)
14832 DISABLE_INTERRUPTS(CLBR_NONE)
14833 TRACE_IRQS_OFF
14834- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14835+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14836 jnz sysexit_audit
14837 sysexit_from_sys_call:
14838- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14839+ pax_exit_kernel_user
14840+ pax_erase_kstack
14841+ andl $~TS_COMPAT,TI_status(%r11)
14842 /* clear IF, that popfq doesn't enable interrupts early */
14843- andl $~0x200,EFLAGS-ARGOFFSET(%rsp)
14844+ andl $~X86_EFLAGS_IF,EFLAGS-ARGOFFSET(%rsp)
14845 movl RIP-ARGOFFSET(%rsp),%edx /* User %eip */
14846 CFI_REGISTER rip,rdx
14847 RESTORE_ARGS 0,24,0,0,0,0
14848@@ -205,6 +254,9 @@ sysexit_from_sys_call:
14849 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14850 movl %eax,%edi /* 1st arg: syscall number */
14851 call __audit_syscall_entry
14852+
14853+ pax_erase_kstack
14854+
14855 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14856 cmpq $(IA32_NR_syscalls-1),%rax
14857 ja ia32_badsys
14858@@ -216,7 +268,7 @@ sysexit_from_sys_call:
14859 .endm
14860
14861 .macro auditsys_exit exit
14862- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14863+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14864 jnz ia32_ret_from_sys_call
14865 TRACE_IRQS_ON
14866 ENABLE_INTERRUPTS(CLBR_NONE)
14867@@ -227,11 +279,12 @@ sysexit_from_sys_call:
14868 1: setbe %al /* 1 if error, 0 if not */
14869 movzbl %al,%edi /* zero-extend that into %edi */
14870 call __audit_syscall_exit
14871+ GET_THREAD_INFO(%r11)
14872 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14873 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14874 DISABLE_INTERRUPTS(CLBR_NONE)
14875 TRACE_IRQS_OFF
14876- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14877+ testl %edi,TI_flags(%r11)
14878 jz \exit
14879 CLEAR_RREGS -ARGOFFSET
14880 jmp int_with_check
14881@@ -253,7 +306,7 @@ sysenter_fix_flags:
14882
14883 sysenter_tracesys:
14884 #ifdef CONFIG_AUDITSYSCALL
14885- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14886+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14887 jz sysenter_auditsys
14888 #endif
14889 SAVE_REST
14890@@ -265,6 +318,9 @@ sysenter_tracesys:
14891 RESTORE_REST
14892 cmpq $(IA32_NR_syscalls-1),%rax
14893 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14894+
14895+ pax_erase_kstack
14896+
14897 jmp sysenter_do_call
14898 CFI_ENDPROC
14899 ENDPROC(ia32_sysenter_target)
14900@@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14901 ENTRY(ia32_cstar_target)
14902 CFI_STARTPROC32 simple
14903 CFI_SIGNAL_FRAME
14904- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14905+ CFI_DEF_CFA rsp,0
14906 CFI_REGISTER rip,rcx
14907 /*CFI_REGISTER rflags,r11*/
14908 SWAPGS_UNSAFE_STACK
14909 movl %esp,%r8d
14910 CFI_REGISTER rsp,r8
14911 movq PER_CPU_VAR(kernel_stack),%rsp
14912+ SAVE_ARGS 8*6,0,0
14913+ pax_enter_kernel_user
14914+
14915+#ifdef CONFIG_PAX_RANDKSTACK
14916+ pax_erase_kstack
14917+#endif
14918+
14919 /*
14920 * No need to follow this irqs on/off section: the syscall
14921 * disabled irqs and here we enable it straight after entry:
14922 */
14923 ENABLE_INTERRUPTS(CLBR_NONE)
14924- SAVE_ARGS 8,0,0
14925 movl %eax,%eax /* zero extension */
14926 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14927 movq %rcx,RIP-ARGOFFSET(%rsp)
14928@@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14929 /* no need to do an access_ok check here because r8 has been
14930 32bit zero extended */
14931 /* hardware stack frame is complete now */
14932+
14933+#ifdef CONFIG_PAX_MEMORY_UDEREF
14934+ ASM_PAX_OPEN_USERLAND
14935+ movq pax_user_shadow_base,%r8
14936+ addq RSP-ARGOFFSET(%rsp),%r8
14937+#endif
14938+
14939 ASM_STAC
14940 1: movl (%r8),%r9d
14941 _ASM_EXTABLE(1b,ia32_badarg)
14942 ASM_CLAC
14943- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14944- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14945+
14946+#ifdef CONFIG_PAX_MEMORY_UDEREF
14947+ ASM_PAX_CLOSE_USERLAND
14948+#endif
14949+
14950+ GET_THREAD_INFO(%r11)
14951+ orl $TS_COMPAT,TI_status(%r11)
14952+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14953 CFI_REMEMBER_STATE
14954 jnz cstar_tracesys
14955 cmpq $IA32_NR_syscalls-1,%rax
14956@@ -335,13 +410,16 @@ cstar_do_call:
14957 cstar_dispatch:
14958 call *ia32_sys_call_table(,%rax,8)
14959 movq %rax,RAX-ARGOFFSET(%rsp)
14960+ GET_THREAD_INFO(%r11)
14961 DISABLE_INTERRUPTS(CLBR_NONE)
14962 TRACE_IRQS_OFF
14963- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14964+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14965 jnz sysretl_audit
14966 sysretl_from_sys_call:
14967- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14968- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14969+ pax_exit_kernel_user
14970+ pax_erase_kstack
14971+ andl $~TS_COMPAT,TI_status(%r11)
14972+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14973 movl RIP-ARGOFFSET(%rsp),%ecx
14974 CFI_REGISTER rip,rcx
14975 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14976@@ -368,7 +446,7 @@ sysretl_audit:
14977
14978 cstar_tracesys:
14979 #ifdef CONFIG_AUDITSYSCALL
14980- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14981+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14982 jz cstar_auditsys
14983 #endif
14984 xchgl %r9d,%ebp
14985@@ -382,11 +460,19 @@ cstar_tracesys:
14986 xchgl %ebp,%r9d
14987 cmpq $(IA32_NR_syscalls-1),%rax
14988 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14989+
14990+ pax_erase_kstack
14991+
14992 jmp cstar_do_call
14993 END(ia32_cstar_target)
14994
14995 ia32_badarg:
14996 ASM_CLAC
14997+
14998+#ifdef CONFIG_PAX_MEMORY_UDEREF
14999+ ASM_PAX_CLOSE_USERLAND
15000+#endif
15001+
15002 movq $-EFAULT,%rax
15003 jmp ia32_sysret
15004 CFI_ENDPROC
15005@@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
15006 CFI_REL_OFFSET rip,RIP-RIP
15007 PARAVIRT_ADJUST_EXCEPTION_FRAME
15008 SWAPGS
15009- /*
15010- * No need to follow this irqs on/off section: the syscall
15011- * disabled irqs and here we enable it straight after entry:
15012- */
15013- ENABLE_INTERRUPTS(CLBR_NONE)
15014 movl %eax,%eax
15015 pushq_cfi %rax
15016 cld
15017 /* note the registers are not zero extended to the sf.
15018 this could be a problem. */
15019 SAVE_ARGS 0,1,0
15020- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15021- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15022+ pax_enter_kernel_user
15023+
15024+#ifdef CONFIG_PAX_RANDKSTACK
15025+ pax_erase_kstack
15026+#endif
15027+
15028+ /*
15029+ * No need to follow this irqs on/off section: the syscall
15030+ * disabled irqs and here we enable it straight after entry:
15031+ */
15032+ ENABLE_INTERRUPTS(CLBR_NONE)
15033+ GET_THREAD_INFO(%r11)
15034+ orl $TS_COMPAT,TI_status(%r11)
15035+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15036 jnz ia32_tracesys
15037 cmpq $(IA32_NR_syscalls-1),%rax
15038 ja ia32_badsys
15039@@ -458,6 +551,9 @@ ia32_tracesys:
15040 RESTORE_REST
15041 cmpq $(IA32_NR_syscalls-1),%rax
15042 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15043+
15044+ pax_erase_kstack
15045+
15046 jmp ia32_do_call
15047 END(ia32_syscall)
15048
15049diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15050index 8e0ceec..af13504 100644
15051--- a/arch/x86/ia32/sys_ia32.c
15052+++ b/arch/x86/ia32/sys_ia32.c
15053@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15054 */
15055 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15056 {
15057- typeof(ubuf->st_uid) uid = 0;
15058- typeof(ubuf->st_gid) gid = 0;
15059+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15060+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15061 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15062 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15063 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15064diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15065index 372231c..51b537d 100644
15066--- a/arch/x86/include/asm/alternative-asm.h
15067+++ b/arch/x86/include/asm/alternative-asm.h
15068@@ -18,6 +18,45 @@
15069 .endm
15070 #endif
15071
15072+#ifdef KERNEXEC_PLUGIN
15073+ .macro pax_force_retaddr_bts rip=0
15074+ btsq $63,\rip(%rsp)
15075+ .endm
15076+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15077+ .macro pax_force_retaddr rip=0, reload=0
15078+ btsq $63,\rip(%rsp)
15079+ .endm
15080+ .macro pax_force_fptr ptr
15081+ btsq $63,\ptr
15082+ .endm
15083+ .macro pax_set_fptr_mask
15084+ .endm
15085+#endif
15086+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15087+ .macro pax_force_retaddr rip=0, reload=0
15088+ .if \reload
15089+ pax_set_fptr_mask
15090+ .endif
15091+ orq %r12,\rip(%rsp)
15092+ .endm
15093+ .macro pax_force_fptr ptr
15094+ orq %r12,\ptr
15095+ .endm
15096+ .macro pax_set_fptr_mask
15097+ movabs $0x8000000000000000,%r12
15098+ .endm
15099+#endif
15100+#else
15101+ .macro pax_force_retaddr rip=0, reload=0
15102+ .endm
15103+ .macro pax_force_fptr ptr
15104+ .endm
15105+ .macro pax_force_retaddr_bts rip=0
15106+ .endm
15107+ .macro pax_set_fptr_mask
15108+ .endm
15109+#endif
15110+
15111 .macro altinstruction_entry orig alt feature orig_len alt_len
15112 .long \orig - .
15113 .long \alt - .
15114diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15115index 473bdbe..b1e3377 100644
15116--- a/arch/x86/include/asm/alternative.h
15117+++ b/arch/x86/include/asm/alternative.h
15118@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15119 ".pushsection .discard,\"aw\",@progbits\n" \
15120 DISCARD_ENTRY(1) \
15121 ".popsection\n" \
15122- ".pushsection .altinstr_replacement, \"ax\"\n" \
15123+ ".pushsection .altinstr_replacement, \"a\"\n" \
15124 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15125 ".popsection"
15126
15127@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15128 DISCARD_ENTRY(1) \
15129 DISCARD_ENTRY(2) \
15130 ".popsection\n" \
15131- ".pushsection .altinstr_replacement, \"ax\"\n" \
15132+ ".pushsection .altinstr_replacement, \"a\"\n" \
15133 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15134 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15135 ".popsection"
15136diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15137index efc3b22..85c4f3a 100644
15138--- a/arch/x86/include/asm/apic.h
15139+++ b/arch/x86/include/asm/apic.h
15140@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15141
15142 #ifdef CONFIG_X86_LOCAL_APIC
15143
15144-extern unsigned int apic_verbosity;
15145+extern int apic_verbosity;
15146 extern int local_apic_timer_c2_ok;
15147
15148 extern int disable_apic;
15149diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15150index 20370c6..a2eb9b0 100644
15151--- a/arch/x86/include/asm/apm.h
15152+++ b/arch/x86/include/asm/apm.h
15153@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15154 __asm__ __volatile__(APM_DO_ZERO_SEGS
15155 "pushl %%edi\n\t"
15156 "pushl %%ebp\n\t"
15157- "lcall *%%cs:apm_bios_entry\n\t"
15158+ "lcall *%%ss:apm_bios_entry\n\t"
15159 "setc %%al\n\t"
15160 "popl %%ebp\n\t"
15161 "popl %%edi\n\t"
15162@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15163 __asm__ __volatile__(APM_DO_ZERO_SEGS
15164 "pushl %%edi\n\t"
15165 "pushl %%ebp\n\t"
15166- "lcall *%%cs:apm_bios_entry\n\t"
15167+ "lcall *%%ss:apm_bios_entry\n\t"
15168 "setc %%bl\n\t"
15169 "popl %%ebp\n\t"
15170 "popl %%edi\n\t"
15171diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15172index 5e5cd12..51cdc93 100644
15173--- a/arch/x86/include/asm/atomic.h
15174+++ b/arch/x86/include/asm/atomic.h
15175@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15176 }
15177
15178 /**
15179+ * atomic_read_unchecked - read atomic variable
15180+ * @v: pointer of type atomic_unchecked_t
15181+ *
15182+ * Atomically reads the value of @v.
15183+ */
15184+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15185+{
15186+ return ACCESS_ONCE((v)->counter);
15187+}
15188+
15189+/**
15190 * atomic_set - set atomic variable
15191 * @v: pointer of type atomic_t
15192 * @i: required value
15193@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15194 }
15195
15196 /**
15197+ * atomic_set_unchecked - set atomic variable
15198+ * @v: pointer of type atomic_unchecked_t
15199+ * @i: required value
15200+ *
15201+ * Atomically sets the value of @v to @i.
15202+ */
15203+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15204+{
15205+ v->counter = i;
15206+}
15207+
15208+/**
15209 * atomic_add - add integer to atomic variable
15210 * @i: integer value to add
15211 * @v: pointer of type atomic_t
15212@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15213 */
15214 static inline void atomic_add(int i, atomic_t *v)
15215 {
15216- asm volatile(LOCK_PREFIX "addl %1,%0"
15217+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15218+
15219+#ifdef CONFIG_PAX_REFCOUNT
15220+ "jno 0f\n"
15221+ LOCK_PREFIX "subl %1,%0\n"
15222+ "int $4\n0:\n"
15223+ _ASM_EXTABLE(0b, 0b)
15224+#endif
15225+
15226+ : "+m" (v->counter)
15227+ : "ir" (i));
15228+}
15229+
15230+/**
15231+ * atomic_add_unchecked - add integer to atomic variable
15232+ * @i: integer value to add
15233+ * @v: pointer of type atomic_unchecked_t
15234+ *
15235+ * Atomically adds @i to @v.
15236+ */
15237+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15238+{
15239+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15240 : "+m" (v->counter)
15241 : "ir" (i));
15242 }
15243@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15244 */
15245 static inline void atomic_sub(int i, atomic_t *v)
15246 {
15247- asm volatile(LOCK_PREFIX "subl %1,%0"
15248+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15249+
15250+#ifdef CONFIG_PAX_REFCOUNT
15251+ "jno 0f\n"
15252+ LOCK_PREFIX "addl %1,%0\n"
15253+ "int $4\n0:\n"
15254+ _ASM_EXTABLE(0b, 0b)
15255+#endif
15256+
15257+ : "+m" (v->counter)
15258+ : "ir" (i));
15259+}
15260+
15261+/**
15262+ * atomic_sub_unchecked - subtract integer from atomic variable
15263+ * @i: integer value to subtract
15264+ * @v: pointer of type atomic_unchecked_t
15265+ *
15266+ * Atomically subtracts @i from @v.
15267+ */
15268+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15269+{
15270+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15271 : "+m" (v->counter)
15272 : "ir" (i));
15273 }
15274@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15275 */
15276 static inline int atomic_sub_and_test(int i, atomic_t *v)
15277 {
15278- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15279+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15280 }
15281
15282 /**
15283@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15284 */
15285 static inline void atomic_inc(atomic_t *v)
15286 {
15287- asm volatile(LOCK_PREFIX "incl %0"
15288+ asm volatile(LOCK_PREFIX "incl %0\n"
15289+
15290+#ifdef CONFIG_PAX_REFCOUNT
15291+ "jno 0f\n"
15292+ LOCK_PREFIX "decl %0\n"
15293+ "int $4\n0:\n"
15294+ _ASM_EXTABLE(0b, 0b)
15295+#endif
15296+
15297+ : "+m" (v->counter));
15298+}
15299+
15300+/**
15301+ * atomic_inc_unchecked - increment atomic variable
15302+ * @v: pointer of type atomic_unchecked_t
15303+ *
15304+ * Atomically increments @v by 1.
15305+ */
15306+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15307+{
15308+ asm volatile(LOCK_PREFIX "incl %0\n"
15309 : "+m" (v->counter));
15310 }
15311
15312@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15313 */
15314 static inline void atomic_dec(atomic_t *v)
15315 {
15316- asm volatile(LOCK_PREFIX "decl %0"
15317+ asm volatile(LOCK_PREFIX "decl %0\n"
15318+
15319+#ifdef CONFIG_PAX_REFCOUNT
15320+ "jno 0f\n"
15321+ LOCK_PREFIX "incl %0\n"
15322+ "int $4\n0:\n"
15323+ _ASM_EXTABLE(0b, 0b)
15324+#endif
15325+
15326+ : "+m" (v->counter));
15327+}
15328+
15329+/**
15330+ * atomic_dec_unchecked - decrement atomic variable
15331+ * @v: pointer of type atomic_unchecked_t
15332+ *
15333+ * Atomically decrements @v by 1.
15334+ */
15335+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15336+{
15337+ asm volatile(LOCK_PREFIX "decl %0\n"
15338 : "+m" (v->counter));
15339 }
15340
15341@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15342 */
15343 static inline int atomic_dec_and_test(atomic_t *v)
15344 {
15345- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15346+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15347 }
15348
15349 /**
15350@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15351 */
15352 static inline int atomic_inc_and_test(atomic_t *v)
15353 {
15354- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15355+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15356+}
15357+
15358+/**
15359+ * atomic_inc_and_test_unchecked - increment and test
15360+ * @v: pointer of type atomic_unchecked_t
15361+ *
15362+ * Atomically increments @v by 1
15363+ * and returns true if the result is zero, or false for all
15364+ * other cases.
15365+ */
15366+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15367+{
15368+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15369 }
15370
15371 /**
15372@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15373 */
15374 static inline int atomic_add_negative(int i, atomic_t *v)
15375 {
15376- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15377+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15378 }
15379
15380 /**
15381@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15382 *
15383 * Atomically adds @i to @v and returns @i + @v
15384 */
15385-static inline int atomic_add_return(int i, atomic_t *v)
15386+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15387+{
15388+ return i + xadd_check_overflow(&v->counter, i);
15389+}
15390+
15391+/**
15392+ * atomic_add_return_unchecked - add integer and return
15393+ * @i: integer value to add
15394+ * @v: pointer of type atomic_unchecked_t
15395+ *
15396+ * Atomically adds @i to @v and returns @i + @v
15397+ */
15398+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15399 {
15400 return i + xadd(&v->counter, i);
15401 }
15402@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15403 *
15404 * Atomically subtracts @i from @v and returns @v - @i
15405 */
15406-static inline int atomic_sub_return(int i, atomic_t *v)
15407+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15408 {
15409 return atomic_add_return(-i, v);
15410 }
15411
15412 #define atomic_inc_return(v) (atomic_add_return(1, v))
15413+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15414+{
15415+ return atomic_add_return_unchecked(1, v);
15416+}
15417 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15418
15419-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15420+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15421+{
15422+ return cmpxchg(&v->counter, old, new);
15423+}
15424+
15425+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15426 {
15427 return cmpxchg(&v->counter, old, new);
15428 }
15429@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15430 return xchg(&v->counter, new);
15431 }
15432
15433+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15434+{
15435+ return xchg(&v->counter, new);
15436+}
15437+
15438 /**
15439 * __atomic_add_unless - add unless the number is already a given value
15440 * @v: pointer of type atomic_t
15441@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15442 */
15443 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15444 {
15445- int c, old;
15446+ int c, old, new;
15447 c = atomic_read(v);
15448 for (;;) {
15449- if (unlikely(c == (u)))
15450+ if (unlikely(c == u))
15451 break;
15452- old = atomic_cmpxchg((v), c, c + (a));
15453+
15454+ asm volatile("addl %2,%0\n"
15455+
15456+#ifdef CONFIG_PAX_REFCOUNT
15457+ "jno 0f\n"
15458+ "subl %2,%0\n"
15459+ "int $4\n0:\n"
15460+ _ASM_EXTABLE(0b, 0b)
15461+#endif
15462+
15463+ : "=r" (new)
15464+ : "0" (c), "ir" (a));
15465+
15466+ old = atomic_cmpxchg(v, c, new);
15467 if (likely(old == c))
15468 break;
15469 c = old;
15470@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15471 }
15472
15473 /**
15474+ * atomic_inc_not_zero_hint - increment if not null
15475+ * @v: pointer of type atomic_t
15476+ * @hint: probable value of the atomic before the increment
15477+ *
15478+ * This version of atomic_inc_not_zero() gives a hint of probable
15479+ * value of the atomic. This helps processor to not read the memory
15480+ * before doing the atomic read/modify/write cycle, lowering
15481+ * number of bus transactions on some arches.
15482+ *
15483+ * Returns: 0 if increment was not done, 1 otherwise.
15484+ */
15485+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15486+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15487+{
15488+ int val, c = hint, new;
15489+
15490+ /* sanity test, should be removed by compiler if hint is a constant */
15491+ if (!hint)
15492+ return __atomic_add_unless(v, 1, 0);
15493+
15494+ do {
15495+ asm volatile("incl %0\n"
15496+
15497+#ifdef CONFIG_PAX_REFCOUNT
15498+ "jno 0f\n"
15499+ "decl %0\n"
15500+ "int $4\n0:\n"
15501+ _ASM_EXTABLE(0b, 0b)
15502+#endif
15503+
15504+ : "=r" (new)
15505+ : "0" (c));
15506+
15507+ val = atomic_cmpxchg(v, c, new);
15508+ if (val == c)
15509+ return 1;
15510+ c = val;
15511+ } while (c);
15512+
15513+ return 0;
15514+}
15515+
15516+/**
15517 * atomic_inc_short - increment of a short integer
15518 * @v: pointer to type int
15519 *
15520@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15521 }
15522
15523 /* These are x86-specific, used by some header files */
15524-#define atomic_clear_mask(mask, addr) \
15525- asm volatile(LOCK_PREFIX "andl %0,%1" \
15526- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15527+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15528+{
15529+ asm volatile(LOCK_PREFIX "andl %1,%0"
15530+ : "+m" (v->counter)
15531+ : "r" (~(mask))
15532+ : "memory");
15533+}
15534
15535-#define atomic_set_mask(mask, addr) \
15536- asm volatile(LOCK_PREFIX "orl %0,%1" \
15537- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15538- : "memory")
15539+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15540+{
15541+ asm volatile(LOCK_PREFIX "andl %1,%0"
15542+ : "+m" (v->counter)
15543+ : "r" (~(mask))
15544+ : "memory");
15545+}
15546+
15547+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15548+{
15549+ asm volatile(LOCK_PREFIX "orl %1,%0"
15550+ : "+m" (v->counter)
15551+ : "r" (mask)
15552+ : "memory");
15553+}
15554+
15555+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15556+{
15557+ asm volatile(LOCK_PREFIX "orl %1,%0"
15558+ : "+m" (v->counter)
15559+ : "r" (mask)
15560+ : "memory");
15561+}
15562
15563 #ifdef CONFIG_X86_32
15564 # include <asm/atomic64_32.h>
15565diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15566index b154de7..bf18a5a 100644
15567--- a/arch/x86/include/asm/atomic64_32.h
15568+++ b/arch/x86/include/asm/atomic64_32.h
15569@@ -12,6 +12,14 @@ typedef struct {
15570 u64 __aligned(8) counter;
15571 } atomic64_t;
15572
15573+#ifdef CONFIG_PAX_REFCOUNT
15574+typedef struct {
15575+ u64 __aligned(8) counter;
15576+} atomic64_unchecked_t;
15577+#else
15578+typedef atomic64_t atomic64_unchecked_t;
15579+#endif
15580+
15581 #define ATOMIC64_INIT(val) { (val) }
15582
15583 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15584@@ -37,21 +45,31 @@ typedef struct {
15585 ATOMIC64_DECL_ONE(sym##_386)
15586
15587 ATOMIC64_DECL_ONE(add_386);
15588+ATOMIC64_DECL_ONE(add_unchecked_386);
15589 ATOMIC64_DECL_ONE(sub_386);
15590+ATOMIC64_DECL_ONE(sub_unchecked_386);
15591 ATOMIC64_DECL_ONE(inc_386);
15592+ATOMIC64_DECL_ONE(inc_unchecked_386);
15593 ATOMIC64_DECL_ONE(dec_386);
15594+ATOMIC64_DECL_ONE(dec_unchecked_386);
15595 #endif
15596
15597 #define alternative_atomic64(f, out, in...) \
15598 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15599
15600 ATOMIC64_DECL(read);
15601+ATOMIC64_DECL(read_unchecked);
15602 ATOMIC64_DECL(set);
15603+ATOMIC64_DECL(set_unchecked);
15604 ATOMIC64_DECL(xchg);
15605 ATOMIC64_DECL(add_return);
15606+ATOMIC64_DECL(add_return_unchecked);
15607 ATOMIC64_DECL(sub_return);
15608+ATOMIC64_DECL(sub_return_unchecked);
15609 ATOMIC64_DECL(inc_return);
15610+ATOMIC64_DECL(inc_return_unchecked);
15611 ATOMIC64_DECL(dec_return);
15612+ATOMIC64_DECL(dec_return_unchecked);
15613 ATOMIC64_DECL(dec_if_positive);
15614 ATOMIC64_DECL(inc_not_zero);
15615 ATOMIC64_DECL(add_unless);
15616@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15617 }
15618
15619 /**
15620+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15621+ * @p: pointer to type atomic64_unchecked_t
15622+ * @o: expected value
15623+ * @n: new value
15624+ *
15625+ * Atomically sets @v to @n if it was equal to @o and returns
15626+ * the old value.
15627+ */
15628+
15629+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15630+{
15631+ return cmpxchg64(&v->counter, o, n);
15632+}
15633+
15634+/**
15635 * atomic64_xchg - xchg atomic64 variable
15636 * @v: pointer to type atomic64_t
15637 * @n: value to assign
15638@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15639 }
15640
15641 /**
15642+ * atomic64_set_unchecked - set atomic64 variable
15643+ * @v: pointer to type atomic64_unchecked_t
15644+ * @n: value to assign
15645+ *
15646+ * Atomically sets the value of @v to @n.
15647+ */
15648+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15649+{
15650+ unsigned high = (unsigned)(i >> 32);
15651+ unsigned low = (unsigned)i;
15652+ alternative_atomic64(set, /* no output */,
15653+ "S" (v), "b" (low), "c" (high)
15654+ : "eax", "edx", "memory");
15655+}
15656+
15657+/**
15658 * atomic64_read - read atomic64 variable
15659 * @v: pointer to type atomic64_t
15660 *
15661@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15662 }
15663
15664 /**
15665+ * atomic64_read_unchecked - read atomic64 variable
15666+ * @v: pointer to type atomic64_unchecked_t
15667+ *
15668+ * Atomically reads the value of @v and returns it.
15669+ */
15670+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15671+{
15672+ long long r;
15673+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15674+ return r;
15675+ }
15676+
15677+/**
15678 * atomic64_add_return - add and return
15679 * @i: integer value to add
15680 * @v: pointer to type atomic64_t
15681@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15682 return i;
15683 }
15684
15685+/**
15686+ * atomic64_add_return_unchecked - add and return
15687+ * @i: integer value to add
15688+ * @v: pointer to type atomic64_unchecked_t
15689+ *
15690+ * Atomically adds @i to @v and returns @i + *@v
15691+ */
15692+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15693+{
15694+ alternative_atomic64(add_return_unchecked,
15695+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15696+ ASM_NO_INPUT_CLOBBER("memory"));
15697+ return i;
15698+}
15699+
15700 /*
15701 * Other variants with different arithmetic operators:
15702 */
15703@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15704 return a;
15705 }
15706
15707+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15708+{
15709+ long long a;
15710+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15711+ "S" (v) : "memory", "ecx");
15712+ return a;
15713+}
15714+
15715 static inline long long atomic64_dec_return(atomic64_t *v)
15716 {
15717 long long a;
15718@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15719 }
15720
15721 /**
15722+ * atomic64_add_unchecked - add integer to atomic64 variable
15723+ * @i: integer value to add
15724+ * @v: pointer to type atomic64_unchecked_t
15725+ *
15726+ * Atomically adds @i to @v.
15727+ */
15728+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15729+{
15730+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15731+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15732+ ASM_NO_INPUT_CLOBBER("memory"));
15733+ return i;
15734+}
15735+
15736+/**
15737 * atomic64_sub - subtract the atomic64 variable
15738 * @i: integer value to subtract
15739 * @v: pointer to type atomic64_t
15740diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15741index f8d273e..02f39f3 100644
15742--- a/arch/x86/include/asm/atomic64_64.h
15743+++ b/arch/x86/include/asm/atomic64_64.h
15744@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15745 }
15746
15747 /**
15748+ * atomic64_read_unchecked - read atomic64 variable
15749+ * @v: pointer of type atomic64_unchecked_t
15750+ *
15751+ * Atomically reads the value of @v.
15752+ * Doesn't imply a read memory barrier.
15753+ */
15754+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15755+{
15756+ return ACCESS_ONCE((v)->counter);
15757+}
15758+
15759+/**
15760 * atomic64_set - set atomic64 variable
15761 * @v: pointer to type atomic64_t
15762 * @i: required value
15763@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15764 }
15765
15766 /**
15767+ * atomic64_set_unchecked - set atomic64 variable
15768+ * @v: pointer to type atomic64_unchecked_t
15769+ * @i: required value
15770+ *
15771+ * Atomically sets the value of @v to @i.
15772+ */
15773+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15774+{
15775+ v->counter = i;
15776+}
15777+
15778+/**
15779 * atomic64_add - add integer to atomic64 variable
15780 * @i: integer value to add
15781 * @v: pointer to type atomic64_t
15782@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15783 */
15784 static inline void atomic64_add(long i, atomic64_t *v)
15785 {
15786+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15787+
15788+#ifdef CONFIG_PAX_REFCOUNT
15789+ "jno 0f\n"
15790+ LOCK_PREFIX "subq %1,%0\n"
15791+ "int $4\n0:\n"
15792+ _ASM_EXTABLE(0b, 0b)
15793+#endif
15794+
15795+ : "=m" (v->counter)
15796+ : "er" (i), "m" (v->counter));
15797+}
15798+
15799+/**
15800+ * atomic64_add_unchecked - add integer to atomic64 variable
15801+ * @i: integer value to add
15802+ * @v: pointer to type atomic64_unchecked_t
15803+ *
15804+ * Atomically adds @i to @v.
15805+ */
15806+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15807+{
15808 asm volatile(LOCK_PREFIX "addq %1,%0"
15809 : "=m" (v->counter)
15810 : "er" (i), "m" (v->counter));
15811@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15812 */
15813 static inline void atomic64_sub(long i, atomic64_t *v)
15814 {
15815- asm volatile(LOCK_PREFIX "subq %1,%0"
15816+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15817+
15818+#ifdef CONFIG_PAX_REFCOUNT
15819+ "jno 0f\n"
15820+ LOCK_PREFIX "addq %1,%0\n"
15821+ "int $4\n0:\n"
15822+ _ASM_EXTABLE(0b, 0b)
15823+#endif
15824+
15825+ : "=m" (v->counter)
15826+ : "er" (i), "m" (v->counter));
15827+}
15828+
15829+/**
15830+ * atomic64_sub_unchecked - subtract the atomic64 variable
15831+ * @i: integer value to subtract
15832+ * @v: pointer to type atomic64_unchecked_t
15833+ *
15834+ * Atomically subtracts @i from @v.
15835+ */
15836+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15837+{
15838+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15839 : "=m" (v->counter)
15840 : "er" (i), "m" (v->counter));
15841 }
15842@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15843 */
15844 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15845 {
15846- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15847+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15848 }
15849
15850 /**
15851@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15852 */
15853 static inline void atomic64_inc(atomic64_t *v)
15854 {
15855+ asm volatile(LOCK_PREFIX "incq %0\n"
15856+
15857+#ifdef CONFIG_PAX_REFCOUNT
15858+ "jno 0f\n"
15859+ LOCK_PREFIX "decq %0\n"
15860+ "int $4\n0:\n"
15861+ _ASM_EXTABLE(0b, 0b)
15862+#endif
15863+
15864+ : "=m" (v->counter)
15865+ : "m" (v->counter));
15866+}
15867+
15868+/**
15869+ * atomic64_inc_unchecked - increment atomic64 variable
15870+ * @v: pointer to type atomic64_unchecked_t
15871+ *
15872+ * Atomically increments @v by 1.
15873+ */
15874+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15875+{
15876 asm volatile(LOCK_PREFIX "incq %0"
15877 : "=m" (v->counter)
15878 : "m" (v->counter));
15879@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15880 */
15881 static inline void atomic64_dec(atomic64_t *v)
15882 {
15883- asm volatile(LOCK_PREFIX "decq %0"
15884+ asm volatile(LOCK_PREFIX "decq %0\n"
15885+
15886+#ifdef CONFIG_PAX_REFCOUNT
15887+ "jno 0f\n"
15888+ LOCK_PREFIX "incq %0\n"
15889+ "int $4\n0:\n"
15890+ _ASM_EXTABLE(0b, 0b)
15891+#endif
15892+
15893+ : "=m" (v->counter)
15894+ : "m" (v->counter));
15895+}
15896+
15897+/**
15898+ * atomic64_dec_unchecked - decrement atomic64 variable
15899+ * @v: pointer to type atomic64_t
15900+ *
15901+ * Atomically decrements @v by 1.
15902+ */
15903+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15904+{
15905+ asm volatile(LOCK_PREFIX "decq %0\n"
15906 : "=m" (v->counter)
15907 : "m" (v->counter));
15908 }
15909@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15910 */
15911 static inline int atomic64_dec_and_test(atomic64_t *v)
15912 {
15913- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15914+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15915 }
15916
15917 /**
15918@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15919 */
15920 static inline int atomic64_inc_and_test(atomic64_t *v)
15921 {
15922- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15923+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15924 }
15925
15926 /**
15927@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15928 */
15929 static inline int atomic64_add_negative(long i, atomic64_t *v)
15930 {
15931- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15932+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15933 }
15934
15935 /**
15936@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15937 */
15938 static inline long atomic64_add_return(long i, atomic64_t *v)
15939 {
15940+ return i + xadd_check_overflow(&v->counter, i);
15941+}
15942+
15943+/**
15944+ * atomic64_add_return_unchecked - add and return
15945+ * @i: integer value to add
15946+ * @v: pointer to type atomic64_unchecked_t
15947+ *
15948+ * Atomically adds @i to @v and returns @i + @v
15949+ */
15950+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15951+{
15952 return i + xadd(&v->counter, i);
15953 }
15954
15955@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15956 }
15957
15958 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15959+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15960+{
15961+ return atomic64_add_return_unchecked(1, v);
15962+}
15963 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15964
15965 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15966@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15967 return cmpxchg(&v->counter, old, new);
15968 }
15969
15970+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15971+{
15972+ return cmpxchg(&v->counter, old, new);
15973+}
15974+
15975 static inline long atomic64_xchg(atomic64_t *v, long new)
15976 {
15977 return xchg(&v->counter, new);
15978@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15979 */
15980 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15981 {
15982- long c, old;
15983+ long c, old, new;
15984 c = atomic64_read(v);
15985 for (;;) {
15986- if (unlikely(c == (u)))
15987+ if (unlikely(c == u))
15988 break;
15989- old = atomic64_cmpxchg((v), c, c + (a));
15990+
15991+ asm volatile("add %2,%0\n"
15992+
15993+#ifdef CONFIG_PAX_REFCOUNT
15994+ "jno 0f\n"
15995+ "sub %2,%0\n"
15996+ "int $4\n0:\n"
15997+ _ASM_EXTABLE(0b, 0b)
15998+#endif
15999+
16000+ : "=r" (new)
16001+ : "0" (c), "ir" (a));
16002+
16003+ old = atomic64_cmpxchg(v, c, new);
16004 if (likely(old == c))
16005 break;
16006 c = old;
16007 }
16008- return c != (u);
16009+ return c != u;
16010 }
16011
16012 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16013diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16014index 2ab1eb3..1e8cc5d 100644
16015--- a/arch/x86/include/asm/barrier.h
16016+++ b/arch/x86/include/asm/barrier.h
16017@@ -57,7 +57,7 @@
16018 do { \
16019 compiletime_assert_atomic_type(*p); \
16020 smp_mb(); \
16021- ACCESS_ONCE(*p) = (v); \
16022+ ACCESS_ONCE_RW(*p) = (v); \
16023 } while (0)
16024
16025 #define smp_load_acquire(p) \
16026@@ -74,7 +74,7 @@ do { \
16027 do { \
16028 compiletime_assert_atomic_type(*p); \
16029 barrier(); \
16030- ACCESS_ONCE(*p) = (v); \
16031+ ACCESS_ONCE_RW(*p) = (v); \
16032 } while (0)
16033
16034 #define smp_load_acquire(p) \
16035diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16036index cfe3b95..d01b118 100644
16037--- a/arch/x86/include/asm/bitops.h
16038+++ b/arch/x86/include/asm/bitops.h
16039@@ -50,7 +50,7 @@
16040 * a mask operation on a byte.
16041 */
16042 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16043-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16044+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16045 #define CONST_MASK(nr) (1 << ((nr) & 7))
16046
16047 /**
16048@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16049 */
16050 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16051 {
16052- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16053+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16054 }
16055
16056 /**
16057@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16058 */
16059 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16060 {
16061- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16062+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16063 }
16064
16065 /**
16066@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16067 */
16068 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16069 {
16070- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16071+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16072 }
16073
16074 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16075@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16076 *
16077 * Undefined if no bit exists, so code should check against 0 first.
16078 */
16079-static inline unsigned long __ffs(unsigned long word)
16080+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16081 {
16082 asm("rep; bsf %1,%0"
16083 : "=r" (word)
16084@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16085 *
16086 * Undefined if no zero exists, so code should check against ~0UL first.
16087 */
16088-static inline unsigned long ffz(unsigned long word)
16089+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16090 {
16091 asm("rep; bsf %1,%0"
16092 : "=r" (word)
16093@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16094 *
16095 * Undefined if no set bit exists, so code should check against 0 first.
16096 */
16097-static inline unsigned long __fls(unsigned long word)
16098+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16099 {
16100 asm("bsr %1,%0"
16101 : "=r" (word)
16102@@ -434,7 +434,7 @@ static inline int ffs(int x)
16103 * set bit if value is nonzero. The last (most significant) bit is
16104 * at position 32.
16105 */
16106-static inline int fls(int x)
16107+static inline int __intentional_overflow(-1) fls(int x)
16108 {
16109 int r;
16110
16111@@ -476,7 +476,7 @@ static inline int fls(int x)
16112 * at position 64.
16113 */
16114 #ifdef CONFIG_X86_64
16115-static __always_inline int fls64(__u64 x)
16116+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16117 {
16118 int bitpos = -1;
16119 /*
16120diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16121index 4fa687a..60f2d39 100644
16122--- a/arch/x86/include/asm/boot.h
16123+++ b/arch/x86/include/asm/boot.h
16124@@ -6,10 +6,15 @@
16125 #include <uapi/asm/boot.h>
16126
16127 /* Physical address where kernel should be loaded. */
16128-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16129+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16130 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16131 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16132
16133+#ifndef __ASSEMBLY__
16134+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16135+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16136+#endif
16137+
16138 /* Minimum kernel alignment, as a power of two */
16139 #ifdef CONFIG_X86_64
16140 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16141diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16142index 48f99f1..d78ebf9 100644
16143--- a/arch/x86/include/asm/cache.h
16144+++ b/arch/x86/include/asm/cache.h
16145@@ -5,12 +5,13 @@
16146
16147 /* L1 cache line size */
16148 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16149-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16150+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16151
16152 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16153+#define __read_only __attribute__((__section__(".data..read_only")))
16154
16155 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16156-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16157+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16158
16159 #ifdef CONFIG_X86_VSMP
16160 #ifdef CONFIG_SMP
16161diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16162index 1f1297b..72b8439 100644
16163--- a/arch/x86/include/asm/calling.h
16164+++ b/arch/x86/include/asm/calling.h
16165@@ -82,106 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16166 #define RSP 152
16167 #define SS 160
16168
16169-#define ARGOFFSET R11
16170+#define ARGOFFSET R15
16171
16172 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16173- subq $9*8+\addskip, %rsp
16174- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16175- movq_cfi rdi, 8*8
16176- movq_cfi rsi, 7*8
16177- movq_cfi rdx, 6*8
16178+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16179+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16180+ movq_cfi rdi, RDI
16181+ movq_cfi rsi, RSI
16182+ movq_cfi rdx, RDX
16183
16184 .if \save_rcx
16185- movq_cfi rcx, 5*8
16186+ movq_cfi rcx, RCX
16187 .endif
16188
16189 .if \rax_enosys
16190- movq $-ENOSYS, 4*8(%rsp)
16191+ movq $-ENOSYS, RAX(%rsp)
16192 .else
16193- movq_cfi rax, 4*8
16194+ movq_cfi rax, RAX
16195 .endif
16196
16197 .if \save_r891011
16198- movq_cfi r8, 3*8
16199- movq_cfi r9, 2*8
16200- movq_cfi r10, 1*8
16201- movq_cfi r11, 0*8
16202+ movq_cfi r8, R8
16203+ movq_cfi r9, R9
16204+ movq_cfi r10, R10
16205+ movq_cfi r11, R11
16206 .endif
16207
16208+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16209+ movq_cfi r12, R12
16210+#endif
16211+
16212 .endm
16213
16214-#define ARG_SKIP (9*8)
16215+#define ARG_SKIP ORIG_RAX
16216
16217 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16218 rstor_r8910=1, rstor_rdx=1
16219+
16220+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16221+ movq_cfi_restore R12, r12
16222+#endif
16223+
16224 .if \rstor_r11
16225- movq_cfi_restore 0*8, r11
16226+ movq_cfi_restore R11, r11
16227 .endif
16228
16229 .if \rstor_r8910
16230- movq_cfi_restore 1*8, r10
16231- movq_cfi_restore 2*8, r9
16232- movq_cfi_restore 3*8, r8
16233+ movq_cfi_restore R10, r10
16234+ movq_cfi_restore R9, r9
16235+ movq_cfi_restore R8, r8
16236 .endif
16237
16238 .if \rstor_rax
16239- movq_cfi_restore 4*8, rax
16240+ movq_cfi_restore RAX, rax
16241 .endif
16242
16243 .if \rstor_rcx
16244- movq_cfi_restore 5*8, rcx
16245+ movq_cfi_restore RCX, rcx
16246 .endif
16247
16248 .if \rstor_rdx
16249- movq_cfi_restore 6*8, rdx
16250+ movq_cfi_restore RDX, rdx
16251 .endif
16252
16253- movq_cfi_restore 7*8, rsi
16254- movq_cfi_restore 8*8, rdi
16255+ movq_cfi_restore RSI, rsi
16256+ movq_cfi_restore RDI, rdi
16257
16258- .if ARG_SKIP+\addskip > 0
16259- addq $ARG_SKIP+\addskip, %rsp
16260- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16261+ .if ORIG_RAX+\addskip > 0
16262+ addq $ORIG_RAX+\addskip, %rsp
16263+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16264 .endif
16265 .endm
16266
16267- .macro LOAD_ARGS offset, skiprax=0
16268- movq \offset(%rsp), %r11
16269- movq \offset+8(%rsp), %r10
16270- movq \offset+16(%rsp), %r9
16271- movq \offset+24(%rsp), %r8
16272- movq \offset+40(%rsp), %rcx
16273- movq \offset+48(%rsp), %rdx
16274- movq \offset+56(%rsp), %rsi
16275- movq \offset+64(%rsp), %rdi
16276+ .macro LOAD_ARGS skiprax=0
16277+ movq R11(%rsp), %r11
16278+ movq R10(%rsp), %r10
16279+ movq R9(%rsp), %r9
16280+ movq R8(%rsp), %r8
16281+ movq RCX(%rsp), %rcx
16282+ movq RDX(%rsp), %rdx
16283+ movq RSI(%rsp), %rsi
16284+ movq RDI(%rsp), %rdi
16285 .if \skiprax
16286 .else
16287- movq \offset+72(%rsp), %rax
16288+ movq ORIG_RAX(%rsp), %rax
16289 .endif
16290 .endm
16291
16292-#define REST_SKIP (6*8)
16293-
16294 .macro SAVE_REST
16295- subq $REST_SKIP, %rsp
16296- CFI_ADJUST_CFA_OFFSET REST_SKIP
16297- movq_cfi rbx, 5*8
16298- movq_cfi rbp, 4*8
16299- movq_cfi r12, 3*8
16300- movq_cfi r13, 2*8
16301- movq_cfi r14, 1*8
16302- movq_cfi r15, 0*8
16303+ movq_cfi rbx, RBX
16304+ movq_cfi rbp, RBP
16305+
16306+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16307+ movq_cfi r12, R12
16308+#endif
16309+
16310+ movq_cfi r13, R13
16311+ movq_cfi r14, R14
16312+ movq_cfi r15, R15
16313 .endm
16314
16315 .macro RESTORE_REST
16316- movq_cfi_restore 0*8, r15
16317- movq_cfi_restore 1*8, r14
16318- movq_cfi_restore 2*8, r13
16319- movq_cfi_restore 3*8, r12
16320- movq_cfi_restore 4*8, rbp
16321- movq_cfi_restore 5*8, rbx
16322- addq $REST_SKIP, %rsp
16323- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16324+ movq_cfi_restore R15, r15
16325+ movq_cfi_restore R14, r14
16326+ movq_cfi_restore R13, r13
16327+
16328+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16329+ movq_cfi_restore R12, r12
16330+#endif
16331+
16332+ movq_cfi_restore RBP, rbp
16333+ movq_cfi_restore RBX, rbx
16334 .endm
16335
16336 .macro SAVE_ALL
16337diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16338index f50de69..2b0a458 100644
16339--- a/arch/x86/include/asm/checksum_32.h
16340+++ b/arch/x86/include/asm/checksum_32.h
16341@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16342 int len, __wsum sum,
16343 int *src_err_ptr, int *dst_err_ptr);
16344
16345+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16346+ int len, __wsum sum,
16347+ int *src_err_ptr, int *dst_err_ptr);
16348+
16349+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16350+ int len, __wsum sum,
16351+ int *src_err_ptr, int *dst_err_ptr);
16352+
16353 /*
16354 * Note: when you get a NULL pointer exception here this means someone
16355 * passed in an incorrect kernel address to one of these functions.
16356@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16357
16358 might_sleep();
16359 stac();
16360- ret = csum_partial_copy_generic((__force void *)src, dst,
16361+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16362 len, sum, err_ptr, NULL);
16363 clac();
16364
16365@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16366 might_sleep();
16367 if (access_ok(VERIFY_WRITE, dst, len)) {
16368 stac();
16369- ret = csum_partial_copy_generic(src, (__force void *)dst,
16370+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16371 len, sum, NULL, err_ptr);
16372 clac();
16373 return ret;
16374diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16375index 99c105d7..2f667ac 100644
16376--- a/arch/x86/include/asm/cmpxchg.h
16377+++ b/arch/x86/include/asm/cmpxchg.h
16378@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16379 __compiletime_error("Bad argument size for cmpxchg");
16380 extern void __xadd_wrong_size(void)
16381 __compiletime_error("Bad argument size for xadd");
16382+extern void __xadd_check_overflow_wrong_size(void)
16383+ __compiletime_error("Bad argument size for xadd_check_overflow");
16384 extern void __add_wrong_size(void)
16385 __compiletime_error("Bad argument size for add");
16386+extern void __add_check_overflow_wrong_size(void)
16387+ __compiletime_error("Bad argument size for add_check_overflow");
16388
16389 /*
16390 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16391@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16392 __ret; \
16393 })
16394
16395+#ifdef CONFIG_PAX_REFCOUNT
16396+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16397+ ({ \
16398+ __typeof__ (*(ptr)) __ret = (arg); \
16399+ switch (sizeof(*(ptr))) { \
16400+ case __X86_CASE_L: \
16401+ asm volatile (lock #op "l %0, %1\n" \
16402+ "jno 0f\n" \
16403+ "mov %0,%1\n" \
16404+ "int $4\n0:\n" \
16405+ _ASM_EXTABLE(0b, 0b) \
16406+ : "+r" (__ret), "+m" (*(ptr)) \
16407+ : : "memory", "cc"); \
16408+ break; \
16409+ case __X86_CASE_Q: \
16410+ asm volatile (lock #op "q %q0, %1\n" \
16411+ "jno 0f\n" \
16412+ "mov %0,%1\n" \
16413+ "int $4\n0:\n" \
16414+ _ASM_EXTABLE(0b, 0b) \
16415+ : "+r" (__ret), "+m" (*(ptr)) \
16416+ : : "memory", "cc"); \
16417+ break; \
16418+ default: \
16419+ __ ## op ## _check_overflow_wrong_size(); \
16420+ } \
16421+ __ret; \
16422+ })
16423+#else
16424+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16425+#endif
16426+
16427 /*
16428 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16429 * Since this is generally used to protect other memory information, we
16430@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16431 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16432 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16433
16434+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16435+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16436+
16437 #define __add(ptr, inc, lock) \
16438 ({ \
16439 __typeof__ (*(ptr)) __ret = (inc); \
16440diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16441index 59c6c40..5e0b22c 100644
16442--- a/arch/x86/include/asm/compat.h
16443+++ b/arch/x86/include/asm/compat.h
16444@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16445 typedef u32 compat_uint_t;
16446 typedef u32 compat_ulong_t;
16447 typedef u64 __attribute__((aligned(4))) compat_u64;
16448-typedef u32 compat_uptr_t;
16449+typedef u32 __user compat_uptr_t;
16450
16451 struct compat_timespec {
16452 compat_time_t tv_sec;
16453diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16454index 90a5485..43b6211 100644
16455--- a/arch/x86/include/asm/cpufeature.h
16456+++ b/arch/x86/include/asm/cpufeature.h
16457@@ -213,7 +213,7 @@
16458 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16459 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16460 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16461-
16462+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16463
16464 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16465 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16466@@ -221,7 +221,7 @@
16467 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16468 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16469 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16470-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16471+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16472 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16473 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16474 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16475@@ -390,6 +390,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16476 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16477 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16478 #define cpu_has_bpext boot_cpu_has(X86_FEATURE_BPEXT)
16479+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16480
16481 #if __GNUC__ >= 4
16482 extern void warn_pre_alternatives(void);
16483@@ -441,7 +442,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16484
16485 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16486 t_warn:
16487- warn_pre_alternatives();
16488+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16489+ warn_pre_alternatives();
16490 return false;
16491 #endif
16492
16493@@ -461,7 +463,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16494 ".section .discard,\"aw\",@progbits\n"
16495 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16496 ".previous\n"
16497- ".section .altinstr_replacement,\"ax\"\n"
16498+ ".section .altinstr_replacement,\"a\"\n"
16499 "3: movb $1,%0\n"
16500 "4:\n"
16501 ".previous\n"
16502@@ -498,7 +500,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16503 " .byte 2b - 1b\n" /* src len */
16504 " .byte 4f - 3f\n" /* repl len */
16505 ".previous\n"
16506- ".section .altinstr_replacement,\"ax\"\n"
16507+ ".section .altinstr_replacement,\"a\"\n"
16508 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16509 "4:\n"
16510 ".previous\n"
16511@@ -531,7 +533,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16512 ".section .discard,\"aw\",@progbits\n"
16513 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16514 ".previous\n"
16515- ".section .altinstr_replacement,\"ax\"\n"
16516+ ".section .altinstr_replacement,\"a\"\n"
16517 "3: movb $0,%0\n"
16518 "4:\n"
16519 ".previous\n"
16520@@ -545,7 +547,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16521 ".section .discard,\"aw\",@progbits\n"
16522 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16523 ".previous\n"
16524- ".section .altinstr_replacement,\"ax\"\n"
16525+ ".section .altinstr_replacement,\"a\"\n"
16526 "5: movb $1,%0\n"
16527 "6:\n"
16528 ".previous\n"
16529diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16530index a94b82e..59ecefa 100644
16531--- a/arch/x86/include/asm/desc.h
16532+++ b/arch/x86/include/asm/desc.h
16533@@ -4,6 +4,7 @@
16534 #include <asm/desc_defs.h>
16535 #include <asm/ldt.h>
16536 #include <asm/mmu.h>
16537+#include <asm/pgtable.h>
16538
16539 #include <linux/smp.h>
16540 #include <linux/percpu.h>
16541@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16542
16543 desc->type = (info->read_exec_only ^ 1) << 1;
16544 desc->type |= info->contents << 2;
16545+ desc->type |= info->seg_not_present ^ 1;
16546
16547 desc->s = 1;
16548 desc->dpl = 0x3;
16549@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16550 }
16551
16552 extern struct desc_ptr idt_descr;
16553-extern gate_desc idt_table[];
16554-extern struct desc_ptr debug_idt_descr;
16555-extern gate_desc debug_idt_table[];
16556-
16557-struct gdt_page {
16558- struct desc_struct gdt[GDT_ENTRIES];
16559-} __attribute__((aligned(PAGE_SIZE)));
16560-
16561-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16562+extern gate_desc idt_table[IDT_ENTRIES];
16563+extern const struct desc_ptr debug_idt_descr;
16564+extern gate_desc debug_idt_table[IDT_ENTRIES];
16565
16566+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16567 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16568 {
16569- return per_cpu(gdt_page, cpu).gdt;
16570+ return cpu_gdt_table[cpu];
16571 }
16572
16573 #ifdef CONFIG_X86_64
16574@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16575 unsigned long base, unsigned dpl, unsigned flags,
16576 unsigned short seg)
16577 {
16578- gate->a = (seg << 16) | (base & 0xffff);
16579- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16580+ gate->gate.offset_low = base;
16581+ gate->gate.seg = seg;
16582+ gate->gate.reserved = 0;
16583+ gate->gate.type = type;
16584+ gate->gate.s = 0;
16585+ gate->gate.dpl = dpl;
16586+ gate->gate.p = 1;
16587+ gate->gate.offset_high = base >> 16;
16588 }
16589
16590 #endif
16591@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16592
16593 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16594 {
16595+ pax_open_kernel();
16596 memcpy(&idt[entry], gate, sizeof(*gate));
16597+ pax_close_kernel();
16598 }
16599
16600 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16601 {
16602+ pax_open_kernel();
16603 memcpy(&ldt[entry], desc, 8);
16604+ pax_close_kernel();
16605 }
16606
16607 static inline void
16608@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16609 default: size = sizeof(*gdt); break;
16610 }
16611
16612+ pax_open_kernel();
16613 memcpy(&gdt[entry], desc, size);
16614+ pax_close_kernel();
16615 }
16616
16617 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16618@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16619
16620 static inline void native_load_tr_desc(void)
16621 {
16622+ pax_open_kernel();
16623 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16624+ pax_close_kernel();
16625 }
16626
16627 static inline void native_load_gdt(const struct desc_ptr *dtr)
16628@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16629 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16630 unsigned int i;
16631
16632+ pax_open_kernel();
16633 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16634 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16635+ pax_close_kernel();
16636 }
16637
16638 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16639@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16640 preempt_enable();
16641 }
16642
16643-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16644+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16645 {
16646 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16647 }
16648@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16649 }
16650
16651 #ifdef CONFIG_X86_64
16652-static inline void set_nmi_gate(int gate, void *addr)
16653+static inline void set_nmi_gate(int gate, const void *addr)
16654 {
16655 gate_desc s;
16656
16657@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16658 #endif
16659
16660 #ifdef CONFIG_TRACING
16661-extern struct desc_ptr trace_idt_descr;
16662-extern gate_desc trace_idt_table[];
16663+extern const struct desc_ptr trace_idt_descr;
16664+extern gate_desc trace_idt_table[IDT_ENTRIES];
16665 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16666 {
16667 write_idt_entry(trace_idt_table, entry, gate);
16668 }
16669
16670-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16671+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16672 unsigned dpl, unsigned ist, unsigned seg)
16673 {
16674 gate_desc s;
16675@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16676 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16677 #endif
16678
16679-static inline void _set_gate(int gate, unsigned type, void *addr,
16680+static inline void _set_gate(int gate, unsigned type, const void *addr,
16681 unsigned dpl, unsigned ist, unsigned seg)
16682 {
16683 gate_desc s;
16684@@ -379,9 +392,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16685 #define set_intr_gate(n, addr) \
16686 do { \
16687 BUG_ON((unsigned)n > 0xFF); \
16688- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16689+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16690 __KERNEL_CS); \
16691- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16692+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16693 0, 0, __KERNEL_CS); \
16694 } while (0)
16695
16696@@ -409,19 +422,19 @@ static inline void alloc_system_vector(int vector)
16697 /*
16698 * This routine sets up an interrupt gate at directory privilege level 3.
16699 */
16700-static inline void set_system_intr_gate(unsigned int n, void *addr)
16701+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16702 {
16703 BUG_ON((unsigned)n > 0xFF);
16704 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16705 }
16706
16707-static inline void set_system_trap_gate(unsigned int n, void *addr)
16708+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16709 {
16710 BUG_ON((unsigned)n > 0xFF);
16711 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16712 }
16713
16714-static inline void set_trap_gate(unsigned int n, void *addr)
16715+static inline void set_trap_gate(unsigned int n, const void *addr)
16716 {
16717 BUG_ON((unsigned)n > 0xFF);
16718 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16719@@ -430,16 +443,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16720 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16721 {
16722 BUG_ON((unsigned)n > 0xFF);
16723- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16724+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16725 }
16726
16727-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16728+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16729 {
16730 BUG_ON((unsigned)n > 0xFF);
16731 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16732 }
16733
16734-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16735+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16736 {
16737 BUG_ON((unsigned)n > 0xFF);
16738 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16739@@ -511,4 +524,17 @@ static inline void load_current_idt(void)
16740 else
16741 load_idt((const struct desc_ptr *)&idt_descr);
16742 }
16743+
16744+#ifdef CONFIG_X86_32
16745+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16746+{
16747+ struct desc_struct d;
16748+
16749+ if (likely(limit))
16750+ limit = (limit - 1UL) >> PAGE_SHIFT;
16751+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16752+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16753+}
16754+#endif
16755+
16756 #endif /* _ASM_X86_DESC_H */
16757diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16758index 278441f..b95a174 100644
16759--- a/arch/x86/include/asm/desc_defs.h
16760+++ b/arch/x86/include/asm/desc_defs.h
16761@@ -31,6 +31,12 @@ struct desc_struct {
16762 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16763 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16764 };
16765+ struct {
16766+ u16 offset_low;
16767+ u16 seg;
16768+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16769+ unsigned offset_high: 16;
16770+ } gate;
16771 };
16772 } __attribute__((packed));
16773
16774diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16775index ced283a..ffe04cc 100644
16776--- a/arch/x86/include/asm/div64.h
16777+++ b/arch/x86/include/asm/div64.h
16778@@ -39,7 +39,7 @@
16779 __mod; \
16780 })
16781
16782-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16783+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16784 {
16785 union {
16786 u64 v64;
16787diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16788index ca3347a..1a5082a 100644
16789--- a/arch/x86/include/asm/elf.h
16790+++ b/arch/x86/include/asm/elf.h
16791@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16792
16793 #include <asm/vdso.h>
16794
16795-#ifdef CONFIG_X86_64
16796-extern unsigned int vdso64_enabled;
16797-#endif
16798 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16799 extern unsigned int vdso32_enabled;
16800 #endif
16801@@ -249,7 +246,25 @@ extern int force_personality32;
16802 the loader. We need to make sure that it is out of the way of the program
16803 that it will "exec", and that there is sufficient room for the brk. */
16804
16805+#ifdef CONFIG_PAX_SEGMEXEC
16806+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16807+#else
16808 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16809+#endif
16810+
16811+#ifdef CONFIG_PAX_ASLR
16812+#ifdef CONFIG_X86_32
16813+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16814+
16815+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16816+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16817+#else
16818+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16819+
16820+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16821+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16822+#endif
16823+#endif
16824
16825 /* This yields a mask that user programs can use to figure out what
16826 instruction set this CPU supports. This could be done in user space,
16827@@ -298,17 +313,13 @@ do { \
16828
16829 #define ARCH_DLINFO \
16830 do { \
16831- if (vdso64_enabled) \
16832- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16833- (unsigned long __force)current->mm->context.vdso); \
16834+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16835 } while (0)
16836
16837 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16838 #define ARCH_DLINFO_X32 \
16839 do { \
16840- if (vdso64_enabled) \
16841- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16842- (unsigned long __force)current->mm->context.vdso); \
16843+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16844 } while (0)
16845
16846 #define AT_SYSINFO 32
16847@@ -323,10 +334,10 @@ else \
16848
16849 #endif /* !CONFIG_X86_32 */
16850
16851-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16852+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16853
16854 #define VDSO_ENTRY \
16855- ((unsigned long)current->mm->context.vdso + \
16856+ (current->mm->context.vdso + \
16857 selected_vdso32->sym___kernel_vsyscall)
16858
16859 struct linux_binprm;
16860@@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16861 int uses_interp);
16862 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16863
16864-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16865-#define arch_randomize_brk arch_randomize_brk
16866-
16867 /*
16868 * True on X86_32 or when emulating IA32 on X86_64
16869 */
16870diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16871index 77a99ac..39ff7f5 100644
16872--- a/arch/x86/include/asm/emergency-restart.h
16873+++ b/arch/x86/include/asm/emergency-restart.h
16874@@ -1,6 +1,6 @@
16875 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16876 #define _ASM_X86_EMERGENCY_RESTART_H
16877
16878-extern void machine_emergency_restart(void);
16879+extern void machine_emergency_restart(void) __noreturn;
16880
16881 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16882diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16883index 1c7eefe..d0e4702 100644
16884--- a/arch/x86/include/asm/floppy.h
16885+++ b/arch/x86/include/asm/floppy.h
16886@@ -229,18 +229,18 @@ static struct fd_routine_l {
16887 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16888 } fd_routine[] = {
16889 {
16890- request_dma,
16891- free_dma,
16892- get_dma_residue,
16893- dma_mem_alloc,
16894- hard_dma_setup
16895+ ._request_dma = request_dma,
16896+ ._free_dma = free_dma,
16897+ ._get_dma_residue = get_dma_residue,
16898+ ._dma_mem_alloc = dma_mem_alloc,
16899+ ._dma_setup = hard_dma_setup
16900 },
16901 {
16902- vdma_request_dma,
16903- vdma_nop,
16904- vdma_get_dma_residue,
16905- vdma_mem_alloc,
16906- vdma_dma_setup
16907+ ._request_dma = vdma_request_dma,
16908+ ._free_dma = vdma_nop,
16909+ ._get_dma_residue = vdma_get_dma_residue,
16910+ ._dma_mem_alloc = vdma_mem_alloc,
16911+ ._dma_setup = vdma_dma_setup
16912 }
16913 };
16914
16915diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16916index 72ba21a..79f3f66 100644
16917--- a/arch/x86/include/asm/fpu-internal.h
16918+++ b/arch/x86/include/asm/fpu-internal.h
16919@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16920 #define user_insn(insn, output, input...) \
16921 ({ \
16922 int err; \
16923+ pax_open_userland(); \
16924 asm volatile(ASM_STAC "\n" \
16925- "1:" #insn "\n\t" \
16926+ "1:" \
16927+ __copyuser_seg \
16928+ #insn "\n\t" \
16929 "2: " ASM_CLAC "\n" \
16930 ".section .fixup,\"ax\"\n" \
16931 "3: movl $-1,%[err]\n" \
16932@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16933 _ASM_EXTABLE(1b, 3b) \
16934 : [err] "=r" (err), output \
16935 : "0"(0), input); \
16936+ pax_close_userland(); \
16937 err; \
16938 })
16939
16940@@ -300,7 +304,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16941 "fnclex\n\t"
16942 "emms\n\t"
16943 "fildl %P[addr]" /* set F?P to defined value */
16944- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16945+ : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16946 }
16947
16948 return fpu_restore_checking(&tsk->thread.fpu);
16949diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16950index b4c1f54..e290c08 100644
16951--- a/arch/x86/include/asm/futex.h
16952+++ b/arch/x86/include/asm/futex.h
16953@@ -12,6 +12,7 @@
16954 #include <asm/smap.h>
16955
16956 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16957+ typecheck(u32 __user *, uaddr); \
16958 asm volatile("\t" ASM_STAC "\n" \
16959 "1:\t" insn "\n" \
16960 "2:\t" ASM_CLAC "\n" \
16961@@ -20,15 +21,16 @@
16962 "\tjmp\t2b\n" \
16963 "\t.previous\n" \
16964 _ASM_EXTABLE(1b, 3b) \
16965- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16966+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16967 : "i" (-EFAULT), "0" (oparg), "1" (0))
16968
16969 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16970+ typecheck(u32 __user *, uaddr); \
16971 asm volatile("\t" ASM_STAC "\n" \
16972 "1:\tmovl %2, %0\n" \
16973 "\tmovl\t%0, %3\n" \
16974 "\t" insn "\n" \
16975- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16976+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16977 "\tjnz\t1b\n" \
16978 "3:\t" ASM_CLAC "\n" \
16979 "\t.section .fixup,\"ax\"\n" \
16980@@ -38,7 +40,7 @@
16981 _ASM_EXTABLE(1b, 4b) \
16982 _ASM_EXTABLE(2b, 4b) \
16983 : "=&a" (oldval), "=&r" (ret), \
16984- "+m" (*uaddr), "=&r" (tem) \
16985+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16986 : "r" (oparg), "i" (-EFAULT), "1" (0))
16987
16988 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16989@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16990
16991 pagefault_disable();
16992
16993+ pax_open_userland();
16994 switch (op) {
16995 case FUTEX_OP_SET:
16996- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16997+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16998 break;
16999 case FUTEX_OP_ADD:
17000- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
17001+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
17002 uaddr, oparg);
17003 break;
17004 case FUTEX_OP_OR:
17005@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17006 default:
17007 ret = -ENOSYS;
17008 }
17009+ pax_close_userland();
17010
17011 pagefault_enable();
17012
17013diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17014index 9662290..49ca5e5 100644
17015--- a/arch/x86/include/asm/hw_irq.h
17016+++ b/arch/x86/include/asm/hw_irq.h
17017@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
17018 #endif /* CONFIG_X86_LOCAL_APIC */
17019
17020 /* Statistics */
17021-extern atomic_t irq_err_count;
17022-extern atomic_t irq_mis_count;
17023+extern atomic_unchecked_t irq_err_count;
17024+extern atomic_unchecked_t irq_mis_count;
17025
17026 /* EISA */
17027 extern void eisa_set_level_irq(unsigned int irq);
17028diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17029index ccffa53..3c90c87 100644
17030--- a/arch/x86/include/asm/i8259.h
17031+++ b/arch/x86/include/asm/i8259.h
17032@@ -62,7 +62,7 @@ struct legacy_pic {
17033 void (*init)(int auto_eoi);
17034 int (*irq_pending)(unsigned int irq);
17035 void (*make_irq)(unsigned int irq);
17036-};
17037+} __do_const;
17038
17039 extern struct legacy_pic *legacy_pic;
17040 extern struct legacy_pic null_legacy_pic;
17041diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17042index 34a5b93..27e40a6 100644
17043--- a/arch/x86/include/asm/io.h
17044+++ b/arch/x86/include/asm/io.h
17045@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17046 "m" (*(volatile type __force *)addr) barrier); }
17047
17048 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17049-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17050-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17051+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17052+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17053
17054 build_mmio_read(__readb, "b", unsigned char, "=q", )
17055-build_mmio_read(__readw, "w", unsigned short, "=r", )
17056-build_mmio_read(__readl, "l", unsigned int, "=r", )
17057+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17058+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17059
17060 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17061 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17062@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17063 * this function
17064 */
17065
17066-static inline phys_addr_t virt_to_phys(volatile void *address)
17067+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17068 {
17069 return __pa(address);
17070 }
17071@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17072 return ioremap_nocache(offset, size);
17073 }
17074
17075-extern void iounmap(volatile void __iomem *addr);
17076+extern void iounmap(const volatile void __iomem *addr);
17077
17078 extern void set_iounmap_nonlazy(void);
17079
17080@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17081
17082 #include <linux/vmalloc.h>
17083
17084+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17085+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17086+{
17087+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17088+}
17089+
17090+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17091+{
17092+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17093+}
17094+
17095 /*
17096 * Convert a virtual cached pointer to an uncached pointer
17097 */
17098diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17099index 0a8b519..80e7d5b 100644
17100--- a/arch/x86/include/asm/irqflags.h
17101+++ b/arch/x86/include/asm/irqflags.h
17102@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17103 sti; \
17104 sysexit
17105
17106+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17107+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17108+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17109+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17110+
17111 #else
17112 #define INTERRUPT_RETURN iret
17113 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17114diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17115index 4421b5d..8543006 100644
17116--- a/arch/x86/include/asm/kprobes.h
17117+++ b/arch/x86/include/asm/kprobes.h
17118@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17119 #define RELATIVEJUMP_SIZE 5
17120 #define RELATIVECALL_OPCODE 0xe8
17121 #define RELATIVE_ADDR_SIZE 4
17122-#define MAX_STACK_SIZE 64
17123-#define MIN_STACK_SIZE(ADDR) \
17124- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17125- THREAD_SIZE - (unsigned long)(ADDR))) \
17126- ? (MAX_STACK_SIZE) \
17127- : (((unsigned long)current_thread_info()) + \
17128- THREAD_SIZE - (unsigned long)(ADDR)))
17129+#define MAX_STACK_SIZE 64UL
17130+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17131
17132 #define flush_insn_slot(p) do { } while (0)
17133
17134diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17135index 4ad6560..75c7bdd 100644
17136--- a/arch/x86/include/asm/local.h
17137+++ b/arch/x86/include/asm/local.h
17138@@ -10,33 +10,97 @@ typedef struct {
17139 atomic_long_t a;
17140 } local_t;
17141
17142+typedef struct {
17143+ atomic_long_unchecked_t a;
17144+} local_unchecked_t;
17145+
17146 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17147
17148 #define local_read(l) atomic_long_read(&(l)->a)
17149+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17150 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17151+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17152
17153 static inline void local_inc(local_t *l)
17154 {
17155- asm volatile(_ASM_INC "%0"
17156+ asm volatile(_ASM_INC "%0\n"
17157+
17158+#ifdef CONFIG_PAX_REFCOUNT
17159+ "jno 0f\n"
17160+ _ASM_DEC "%0\n"
17161+ "int $4\n0:\n"
17162+ _ASM_EXTABLE(0b, 0b)
17163+#endif
17164+
17165+ : "+m" (l->a.counter));
17166+}
17167+
17168+static inline void local_inc_unchecked(local_unchecked_t *l)
17169+{
17170+ asm volatile(_ASM_INC "%0\n"
17171 : "+m" (l->a.counter));
17172 }
17173
17174 static inline void local_dec(local_t *l)
17175 {
17176- asm volatile(_ASM_DEC "%0"
17177+ asm volatile(_ASM_DEC "%0\n"
17178+
17179+#ifdef CONFIG_PAX_REFCOUNT
17180+ "jno 0f\n"
17181+ _ASM_INC "%0\n"
17182+ "int $4\n0:\n"
17183+ _ASM_EXTABLE(0b, 0b)
17184+#endif
17185+
17186+ : "+m" (l->a.counter));
17187+}
17188+
17189+static inline void local_dec_unchecked(local_unchecked_t *l)
17190+{
17191+ asm volatile(_ASM_DEC "%0\n"
17192 : "+m" (l->a.counter));
17193 }
17194
17195 static inline void local_add(long i, local_t *l)
17196 {
17197- asm volatile(_ASM_ADD "%1,%0"
17198+ asm volatile(_ASM_ADD "%1,%0\n"
17199+
17200+#ifdef CONFIG_PAX_REFCOUNT
17201+ "jno 0f\n"
17202+ _ASM_SUB "%1,%0\n"
17203+ "int $4\n0:\n"
17204+ _ASM_EXTABLE(0b, 0b)
17205+#endif
17206+
17207+ : "+m" (l->a.counter)
17208+ : "ir" (i));
17209+}
17210+
17211+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17212+{
17213+ asm volatile(_ASM_ADD "%1,%0\n"
17214 : "+m" (l->a.counter)
17215 : "ir" (i));
17216 }
17217
17218 static inline void local_sub(long i, local_t *l)
17219 {
17220- asm volatile(_ASM_SUB "%1,%0"
17221+ asm volatile(_ASM_SUB "%1,%0\n"
17222+
17223+#ifdef CONFIG_PAX_REFCOUNT
17224+ "jno 0f\n"
17225+ _ASM_ADD "%1,%0\n"
17226+ "int $4\n0:\n"
17227+ _ASM_EXTABLE(0b, 0b)
17228+#endif
17229+
17230+ : "+m" (l->a.counter)
17231+ : "ir" (i));
17232+}
17233+
17234+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17235+{
17236+ asm volatile(_ASM_SUB "%1,%0\n"
17237 : "+m" (l->a.counter)
17238 : "ir" (i));
17239 }
17240@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17241 */
17242 static inline int local_sub_and_test(long i, local_t *l)
17243 {
17244- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17245+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17246 }
17247
17248 /**
17249@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17250 */
17251 static inline int local_dec_and_test(local_t *l)
17252 {
17253- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17254+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17255 }
17256
17257 /**
17258@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17259 */
17260 static inline int local_inc_and_test(local_t *l)
17261 {
17262- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17263+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17264 }
17265
17266 /**
17267@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17268 */
17269 static inline int local_add_negative(long i, local_t *l)
17270 {
17271- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17272+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17273 }
17274
17275 /**
17276@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17277 static inline long local_add_return(long i, local_t *l)
17278 {
17279 long __i = i;
17280+ asm volatile(_ASM_XADD "%0, %1\n"
17281+
17282+#ifdef CONFIG_PAX_REFCOUNT
17283+ "jno 0f\n"
17284+ _ASM_MOV "%0,%1\n"
17285+ "int $4\n0:\n"
17286+ _ASM_EXTABLE(0b, 0b)
17287+#endif
17288+
17289+ : "+r" (i), "+m" (l->a.counter)
17290+ : : "memory");
17291+ return i + __i;
17292+}
17293+
17294+/**
17295+ * local_add_return_unchecked - add and return
17296+ * @i: integer value to add
17297+ * @l: pointer to type local_unchecked_t
17298+ *
17299+ * Atomically adds @i to @l and returns @i + @l
17300+ */
17301+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17302+{
17303+ long __i = i;
17304 asm volatile(_ASM_XADD "%0, %1;"
17305 : "+r" (i), "+m" (l->a.counter)
17306 : : "memory");
17307@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17308
17309 #define local_cmpxchg(l, o, n) \
17310 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17311+#define local_cmpxchg_unchecked(l, o, n) \
17312+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17313 /* Always has a lock prefix */
17314 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17315
17316diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17317new file mode 100644
17318index 0000000..2bfd3ba
17319--- /dev/null
17320+++ b/arch/x86/include/asm/mman.h
17321@@ -0,0 +1,15 @@
17322+#ifndef _X86_MMAN_H
17323+#define _X86_MMAN_H
17324+
17325+#include <uapi/asm/mman.h>
17326+
17327+#ifdef __KERNEL__
17328+#ifndef __ASSEMBLY__
17329+#ifdef CONFIG_X86_32
17330+#define arch_mmap_check i386_mmap_check
17331+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17332+#endif
17333+#endif
17334+#endif
17335+
17336+#endif /* X86_MMAN_H */
17337diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17338index 09b9620..923aecd 100644
17339--- a/arch/x86/include/asm/mmu.h
17340+++ b/arch/x86/include/asm/mmu.h
17341@@ -9,7 +9,7 @@
17342 * we put the segment information here.
17343 */
17344 typedef struct {
17345- void *ldt;
17346+ struct desc_struct *ldt;
17347 int size;
17348
17349 #ifdef CONFIG_X86_64
17350@@ -18,7 +18,19 @@ typedef struct {
17351 #endif
17352
17353 struct mutex lock;
17354- void __user *vdso;
17355+ unsigned long vdso;
17356+
17357+#ifdef CONFIG_X86_32
17358+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17359+ unsigned long user_cs_base;
17360+ unsigned long user_cs_limit;
17361+
17362+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17363+ cpumask_t cpu_user_cs_mask;
17364+#endif
17365+
17366+#endif
17367+#endif
17368
17369 atomic_t perf_rdpmc_allowed; /* nonzero if rdpmc is allowed */
17370 } mm_context_t;
17371diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17372index 883f6b93..bb405b5 100644
17373--- a/arch/x86/include/asm/mmu_context.h
17374+++ b/arch/x86/include/asm/mmu_context.h
17375@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
17376
17377 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17378 {
17379+
17380+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17381+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17382+ unsigned int i;
17383+ pgd_t *pgd;
17384+
17385+ pax_open_kernel();
17386+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17387+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17388+ set_pgd_batched(pgd+i, native_make_pgd(0));
17389+ pax_close_kernel();
17390+ }
17391+#endif
17392+
17393 #ifdef CONFIG_SMP
17394 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17395 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17396@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17397 struct task_struct *tsk)
17398 {
17399 unsigned cpu = smp_processor_id();
17400+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17401+ int tlbstate = TLBSTATE_OK;
17402+#endif
17403
17404 if (likely(prev != next)) {
17405 #ifdef CONFIG_SMP
17406+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17407+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17408+#endif
17409 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17410 this_cpu_write(cpu_tlbstate.active_mm, next);
17411 #endif
17412 cpumask_set_cpu(cpu, mm_cpumask(next));
17413
17414 /* Re-load page tables */
17415+#ifdef CONFIG_PAX_PER_CPU_PGD
17416+ pax_open_kernel();
17417+
17418+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17419+ if (static_cpu_has(X86_FEATURE_PCID))
17420+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17421+ else
17422+#endif
17423+
17424+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17425+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17426+ pax_close_kernel();
17427+ 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));
17428+
17429+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17430+ if (static_cpu_has(X86_FEATURE_PCID)) {
17431+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17432+ u64 descriptor[2];
17433+ descriptor[0] = PCID_USER;
17434+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17435+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17436+ descriptor[0] = PCID_KERNEL;
17437+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17438+ }
17439+ } else {
17440+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17441+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17442+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17443+ else
17444+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17445+ }
17446+ } else
17447+#endif
17448+
17449+ load_cr3(get_cpu_pgd(cpu, kernel));
17450+#else
17451 load_cr3(next->pgd);
17452+#endif
17453 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17454
17455 /* Stop flush ipis for the previous mm */
17456@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17457 */
17458 if (unlikely(prev->context.ldt != next->context.ldt))
17459 load_LDT_nolock(&next->context);
17460+
17461+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17462+ if (!(__supported_pte_mask & _PAGE_NX)) {
17463+ smp_mb__before_atomic();
17464+ cpumask_clear_cpu(cpu, &prev->context.cpu_user_cs_mask);
17465+ smp_mb__after_atomic();
17466+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17467+ }
17468+#endif
17469+
17470+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17471+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17472+ prev->context.user_cs_limit != next->context.user_cs_limit))
17473+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17474+#ifdef CONFIG_SMP
17475+ else if (unlikely(tlbstate != TLBSTATE_OK))
17476+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17477+#endif
17478+#endif
17479+
17480 }
17481+ else {
17482+
17483+#ifdef CONFIG_PAX_PER_CPU_PGD
17484+ pax_open_kernel();
17485+
17486+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17487+ if (static_cpu_has(X86_FEATURE_PCID))
17488+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17489+ else
17490+#endif
17491+
17492+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17493+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17494+ pax_close_kernel();
17495+ 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));
17496+
17497+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17498+ if (static_cpu_has(X86_FEATURE_PCID)) {
17499+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17500+ u64 descriptor[2];
17501+ descriptor[0] = PCID_USER;
17502+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17503+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17504+ descriptor[0] = PCID_KERNEL;
17505+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17506+ }
17507+ } else {
17508+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17509+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17510+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17511+ else
17512+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17513+ }
17514+ } else
17515+#endif
17516+
17517+ load_cr3(get_cpu_pgd(cpu, kernel));
17518+#endif
17519+
17520 #ifdef CONFIG_SMP
17521- else {
17522 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17523 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17524
17525@@ -103,13 +218,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17526 * tlb flush IPI delivery. We must reload CR3
17527 * to make sure to use no freed page tables.
17528 */
17529+
17530+#ifndef CONFIG_PAX_PER_CPU_PGD
17531 load_cr3(next->pgd);
17532 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17533+#endif
17534+
17535 load_mm_cr4(next);
17536 load_LDT_nolock(&next->context);
17537+
17538+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17539+ if (!(__supported_pte_mask & _PAGE_NX))
17540+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17541+#endif
17542+
17543+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17544+#ifdef CONFIG_PAX_PAGEEXEC
17545+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17546+#endif
17547+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17548+#endif
17549+
17550 }
17551+#endif
17552 }
17553-#endif
17554 }
17555
17556 #define activate_mm(prev, next) \
17557diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17558index e3b7819..b257c64 100644
17559--- a/arch/x86/include/asm/module.h
17560+++ b/arch/x86/include/asm/module.h
17561@@ -5,6 +5,7 @@
17562
17563 #ifdef CONFIG_X86_64
17564 /* X86_64 does not define MODULE_PROC_FAMILY */
17565+#define MODULE_PROC_FAMILY ""
17566 #elif defined CONFIG_M486
17567 #define MODULE_PROC_FAMILY "486 "
17568 #elif defined CONFIG_M586
17569@@ -57,8 +58,20 @@
17570 #error unknown processor family
17571 #endif
17572
17573-#ifdef CONFIG_X86_32
17574-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17575+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17576+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17577+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17578+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17579+#else
17580+#define MODULE_PAX_KERNEXEC ""
17581 #endif
17582
17583+#ifdef CONFIG_PAX_MEMORY_UDEREF
17584+#define MODULE_PAX_UDEREF "UDEREF "
17585+#else
17586+#define MODULE_PAX_UDEREF ""
17587+#endif
17588+
17589+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17590+
17591 #endif /* _ASM_X86_MODULE_H */
17592diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17593index 5f2fc44..106caa6 100644
17594--- a/arch/x86/include/asm/nmi.h
17595+++ b/arch/x86/include/asm/nmi.h
17596@@ -36,26 +36,35 @@ enum {
17597
17598 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17599
17600+struct nmiaction;
17601+
17602+struct nmiwork {
17603+ const struct nmiaction *action;
17604+ u64 max_duration;
17605+ struct irq_work irq_work;
17606+};
17607+
17608 struct nmiaction {
17609 struct list_head list;
17610 nmi_handler_t handler;
17611- u64 max_duration;
17612- struct irq_work irq_work;
17613 unsigned long flags;
17614 const char *name;
17615-};
17616+ struct nmiwork *work;
17617+} __do_const;
17618
17619 #define register_nmi_handler(t, fn, fg, n, init...) \
17620 ({ \
17621- static struct nmiaction init fn##_na = { \
17622+ static struct nmiwork fn##_nw; \
17623+ static const struct nmiaction init fn##_na = { \
17624 .handler = (fn), \
17625 .name = (n), \
17626 .flags = (fg), \
17627+ .work = &fn##_nw, \
17628 }; \
17629 __register_nmi_handler((t), &fn##_na); \
17630 })
17631
17632-int __register_nmi_handler(unsigned int, struct nmiaction *);
17633+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17634
17635 void unregister_nmi_handler(unsigned int, const char *);
17636
17637diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17638index 802dde3..9183e68 100644
17639--- a/arch/x86/include/asm/page.h
17640+++ b/arch/x86/include/asm/page.h
17641@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17642 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17643
17644 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17645+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17646
17647 #define __boot_va(x) __va(x)
17648 #define __boot_pa(x) __pa(x)
17649@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17650 * virt_to_page(kaddr) returns a valid pointer if and only if
17651 * virt_addr_valid(kaddr) returns true.
17652 */
17653-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17654 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17655 extern bool __virt_addr_valid(unsigned long kaddr);
17656 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17657
17658+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17659+#define virt_to_page(kaddr) \
17660+ ({ \
17661+ const void *__kaddr = (const void *)(kaddr); \
17662+ BUG_ON(!virt_addr_valid(__kaddr)); \
17663+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17664+ })
17665+#else
17666+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17667+#endif
17668+
17669 #endif /* __ASSEMBLY__ */
17670
17671 #include <asm-generic/memory_model.h>
17672diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17673index b3bebf9..13ac22e 100644
17674--- a/arch/x86/include/asm/page_64.h
17675+++ b/arch/x86/include/asm/page_64.h
17676@@ -7,9 +7,9 @@
17677
17678 /* duplicated to the one in bootmem.h */
17679 extern unsigned long max_pfn;
17680-extern unsigned long phys_base;
17681+extern const unsigned long phys_base;
17682
17683-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17684+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17685 {
17686 unsigned long y = x - __START_KERNEL_map;
17687
17688@@ -20,8 +20,8 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17689 }
17690
17691 #ifdef CONFIG_DEBUG_VIRTUAL
17692-extern unsigned long __phys_addr(unsigned long);
17693-extern unsigned long __phys_addr_symbol(unsigned long);
17694+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17695+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17696 #else
17697 #define __phys_addr(x) __phys_addr_nodebug(x)
17698 #define __phys_addr_symbol(x) \
17699diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17700index 965c47d..ffe0af8 100644
17701--- a/arch/x86/include/asm/paravirt.h
17702+++ b/arch/x86/include/asm/paravirt.h
17703@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17704 return (pmd_t) { ret };
17705 }
17706
17707-static inline pmdval_t pmd_val(pmd_t pmd)
17708+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17709 {
17710 pmdval_t ret;
17711
17712@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17713 val);
17714 }
17715
17716+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17717+{
17718+ pgdval_t val = native_pgd_val(pgd);
17719+
17720+ if (sizeof(pgdval_t) > sizeof(long))
17721+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17722+ val, (u64)val >> 32);
17723+ else
17724+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17725+ val);
17726+}
17727+
17728 static inline void pgd_clear(pgd_t *pgdp)
17729 {
17730 set_pgd(pgdp, __pgd(0));
17731@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17732 pv_mmu_ops.set_fixmap(idx, phys, flags);
17733 }
17734
17735+#ifdef CONFIG_PAX_KERNEXEC
17736+static inline unsigned long pax_open_kernel(void)
17737+{
17738+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17739+}
17740+
17741+static inline unsigned long pax_close_kernel(void)
17742+{
17743+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17744+}
17745+#else
17746+static inline unsigned long pax_open_kernel(void) { return 0; }
17747+static inline unsigned long pax_close_kernel(void) { return 0; }
17748+#endif
17749+
17750 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17751
17752 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17753@@ -906,7 +933,7 @@ extern void default_banner(void);
17754
17755 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17756 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17757-#define PARA_INDIRECT(addr) *%cs:addr
17758+#define PARA_INDIRECT(addr) *%ss:addr
17759 #endif
17760
17761 #define INTERRUPT_RETURN \
17762@@ -981,6 +1008,21 @@ extern void default_banner(void);
17763 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17764 CLBR_NONE, \
17765 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17766+
17767+#define GET_CR0_INTO_RDI \
17768+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17769+ mov %rax,%rdi
17770+
17771+#define SET_RDI_INTO_CR0 \
17772+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17773+
17774+#define GET_CR3_INTO_RDI \
17775+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17776+ mov %rax,%rdi
17777+
17778+#define SET_RDI_INTO_CR3 \
17779+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17780+
17781 #endif /* CONFIG_X86_32 */
17782
17783 #endif /* __ASSEMBLY__ */
17784diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17785index 7549b8b..f0edfda 100644
17786--- a/arch/x86/include/asm/paravirt_types.h
17787+++ b/arch/x86/include/asm/paravirt_types.h
17788@@ -84,7 +84,7 @@ struct pv_init_ops {
17789 */
17790 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17791 unsigned long addr, unsigned len);
17792-};
17793+} __no_const __no_randomize_layout;
17794
17795
17796 struct pv_lazy_ops {
17797@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17798 void (*enter)(void);
17799 void (*leave)(void);
17800 void (*flush)(void);
17801-};
17802+} __no_randomize_layout;
17803
17804 struct pv_time_ops {
17805 unsigned long long (*sched_clock)(void);
17806 unsigned long long (*steal_clock)(int cpu);
17807 unsigned long (*get_tsc_khz)(void);
17808-};
17809+} __no_const __no_randomize_layout;
17810
17811 struct pv_cpu_ops {
17812 /* hooks for various privileged instructions */
17813@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17814
17815 void (*start_context_switch)(struct task_struct *prev);
17816 void (*end_context_switch)(struct task_struct *next);
17817-};
17818+} __no_const __no_randomize_layout;
17819
17820 struct pv_irq_ops {
17821 /*
17822@@ -215,7 +215,7 @@ struct pv_irq_ops {
17823 #ifdef CONFIG_X86_64
17824 void (*adjust_exception_frame)(void);
17825 #endif
17826-};
17827+} __no_randomize_layout;
17828
17829 struct pv_apic_ops {
17830 #ifdef CONFIG_X86_LOCAL_APIC
17831@@ -223,7 +223,7 @@ struct pv_apic_ops {
17832 unsigned long start_eip,
17833 unsigned long start_esp);
17834 #endif
17835-};
17836+} __no_const __no_randomize_layout;
17837
17838 struct pv_mmu_ops {
17839 unsigned long (*read_cr2)(void);
17840@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17841 struct paravirt_callee_save make_pud;
17842
17843 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17844+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17845 #endif /* PAGETABLE_LEVELS == 4 */
17846 #endif /* PAGETABLE_LEVELS >= 3 */
17847
17848@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17849 an mfn. We can tell which is which from the index. */
17850 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17851 phys_addr_t phys, pgprot_t flags);
17852-};
17853+
17854+#ifdef CONFIG_PAX_KERNEXEC
17855+ unsigned long (*pax_open_kernel)(void);
17856+ unsigned long (*pax_close_kernel)(void);
17857+#endif
17858+
17859+} __no_randomize_layout;
17860
17861 struct arch_spinlock;
17862 #ifdef CONFIG_SMP
17863@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17864 struct pv_lock_ops {
17865 struct paravirt_callee_save lock_spinning;
17866 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17867-};
17868+} __no_randomize_layout;
17869
17870 /* This contains all the paravirt structures: we get a convenient
17871 * number for each function using the offset which we use to indicate
17872- * what to patch. */
17873+ * what to patch.
17874+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17875+ */
17876+
17877 struct paravirt_patch_template {
17878 struct pv_init_ops pv_init_ops;
17879 struct pv_time_ops pv_time_ops;
17880@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17881 struct pv_apic_ops pv_apic_ops;
17882 struct pv_mmu_ops pv_mmu_ops;
17883 struct pv_lock_ops pv_lock_ops;
17884-};
17885+} __no_randomize_layout;
17886
17887 extern struct pv_info pv_info;
17888 extern struct pv_init_ops pv_init_ops;
17889diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17890index c4412e9..90e88c5 100644
17891--- a/arch/x86/include/asm/pgalloc.h
17892+++ b/arch/x86/include/asm/pgalloc.h
17893@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17894 pmd_t *pmd, pte_t *pte)
17895 {
17896 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17897+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17898+}
17899+
17900+static inline void pmd_populate_user(struct mm_struct *mm,
17901+ pmd_t *pmd, pte_t *pte)
17902+{
17903+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17904 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17905 }
17906
17907@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17908
17909 #ifdef CONFIG_X86_PAE
17910 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17911+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17912+{
17913+ pud_populate(mm, pudp, pmd);
17914+}
17915 #else /* !CONFIG_X86_PAE */
17916 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17917 {
17918 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17919 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17920 }
17921+
17922+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17923+{
17924+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17925+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17926+}
17927 #endif /* CONFIG_X86_PAE */
17928
17929 #if PAGETABLE_LEVELS > 3
17930@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17931 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17932 }
17933
17934+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17935+{
17936+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17937+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17938+}
17939+
17940 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17941 {
17942 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17943diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17944index fd74a11..35fd5af 100644
17945--- a/arch/x86/include/asm/pgtable-2level.h
17946+++ b/arch/x86/include/asm/pgtable-2level.h
17947@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17948
17949 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17950 {
17951+ pax_open_kernel();
17952 *pmdp = pmd;
17953+ pax_close_kernel();
17954 }
17955
17956 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17957diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17958index cdaa58c..e61122b 100644
17959--- a/arch/x86/include/asm/pgtable-3level.h
17960+++ b/arch/x86/include/asm/pgtable-3level.h
17961@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17962
17963 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17964 {
17965+ pax_open_kernel();
17966 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17967+ pax_close_kernel();
17968 }
17969
17970 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17971 {
17972+ pax_open_kernel();
17973 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17974+ pax_close_kernel();
17975 }
17976
17977 /*
17978diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17979index a0c35bf..7045c6a 100644
17980--- a/arch/x86/include/asm/pgtable.h
17981+++ b/arch/x86/include/asm/pgtable.h
17982@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17983
17984 #ifndef __PAGETABLE_PUD_FOLDED
17985 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17986+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17987 #define pgd_clear(pgd) native_pgd_clear(pgd)
17988 #endif
17989
17990@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17991
17992 #define arch_end_context_switch(prev) do {} while(0)
17993
17994+#define pax_open_kernel() native_pax_open_kernel()
17995+#define pax_close_kernel() native_pax_close_kernel()
17996 #endif /* CONFIG_PARAVIRT */
17997
17998+#define __HAVE_ARCH_PAX_OPEN_KERNEL
17999+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18000+
18001+#ifdef CONFIG_PAX_KERNEXEC
18002+static inline unsigned long native_pax_open_kernel(void)
18003+{
18004+ unsigned long cr0;
18005+
18006+ preempt_disable();
18007+ barrier();
18008+ cr0 = read_cr0() ^ X86_CR0_WP;
18009+ BUG_ON(cr0 & X86_CR0_WP);
18010+ write_cr0(cr0);
18011+ barrier();
18012+ return cr0 ^ X86_CR0_WP;
18013+}
18014+
18015+static inline unsigned long native_pax_close_kernel(void)
18016+{
18017+ unsigned long cr0;
18018+
18019+ barrier();
18020+ cr0 = read_cr0() ^ X86_CR0_WP;
18021+ BUG_ON(!(cr0 & X86_CR0_WP));
18022+ write_cr0(cr0);
18023+ barrier();
18024+ preempt_enable_no_resched();
18025+ return cr0 ^ X86_CR0_WP;
18026+}
18027+#else
18028+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18029+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18030+#endif
18031+
18032 /*
18033 * The following only work if pte_present() is true.
18034 * Undefined behaviour if not..
18035 */
18036+static inline int pte_user(pte_t pte)
18037+{
18038+ return pte_val(pte) & _PAGE_USER;
18039+}
18040+
18041 static inline int pte_dirty(pte_t pte)
18042 {
18043 return pte_flags(pte) & _PAGE_DIRTY;
18044@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18045 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18046 }
18047
18048+static inline unsigned long pgd_pfn(pgd_t pgd)
18049+{
18050+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18051+}
18052+
18053 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18054
18055 static inline int pmd_large(pmd_t pte)
18056@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18057 return pte_clear_flags(pte, _PAGE_RW);
18058 }
18059
18060+static inline pte_t pte_mkread(pte_t pte)
18061+{
18062+ return __pte(pte_val(pte) | _PAGE_USER);
18063+}
18064+
18065 static inline pte_t pte_mkexec(pte_t pte)
18066 {
18067- return pte_clear_flags(pte, _PAGE_NX);
18068+#ifdef CONFIG_X86_PAE
18069+ if (__supported_pte_mask & _PAGE_NX)
18070+ return pte_clear_flags(pte, _PAGE_NX);
18071+ else
18072+#endif
18073+ return pte_set_flags(pte, _PAGE_USER);
18074+}
18075+
18076+static inline pte_t pte_exprotect(pte_t pte)
18077+{
18078+#ifdef CONFIG_X86_PAE
18079+ if (__supported_pte_mask & _PAGE_NX)
18080+ return pte_set_flags(pte, _PAGE_NX);
18081+ else
18082+#endif
18083+ return pte_clear_flags(pte, _PAGE_USER);
18084 }
18085
18086 static inline pte_t pte_mkdirty(pte_t pte)
18087@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18088 #endif
18089
18090 #ifndef __ASSEMBLY__
18091+
18092+#ifdef CONFIG_PAX_PER_CPU_PGD
18093+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18094+enum cpu_pgd_type {kernel = 0, user = 1};
18095+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18096+{
18097+ return cpu_pgd[cpu][type];
18098+}
18099+#endif
18100+
18101 #include <linux/mm_types.h>
18102 #include <linux/mmdebug.h>
18103 #include <linux/log2.h>
18104@@ -571,7 +648,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18105 * Currently stuck as a macro due to indirect forward reference to
18106 * linux/mmzone.h's __section_mem_map_addr() definition:
18107 */
18108-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18109+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18110
18111 /* Find an entry in the second-level page table.. */
18112 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18113@@ -611,7 +688,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18114 * Currently stuck as a macro due to indirect forward reference to
18115 * linux/mmzone.h's __section_mem_map_addr() definition:
18116 */
18117-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18118+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18119
18120 /* to find an entry in a page-table-directory. */
18121 static inline unsigned long pud_index(unsigned long address)
18122@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18123
18124 static inline int pgd_bad(pgd_t pgd)
18125 {
18126- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18127+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18128 }
18129
18130 static inline int pgd_none(pgd_t pgd)
18131@@ -649,7 +726,12 @@ static inline int pgd_none(pgd_t pgd)
18132 * pgd_offset() returns a (pgd_t *)
18133 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18134 */
18135-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18136+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18137+
18138+#ifdef CONFIG_PAX_PER_CPU_PGD
18139+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18140+#endif
18141+
18142 /*
18143 * a shortcut which implies the use of the kernel's pgd, instead
18144 * of a process's
18145@@ -660,6 +742,25 @@ static inline int pgd_none(pgd_t pgd)
18146 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18147 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18148
18149+#ifdef CONFIG_X86_32
18150+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18151+#else
18152+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18153+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18154+
18155+#ifdef CONFIG_PAX_MEMORY_UDEREF
18156+#ifdef __ASSEMBLY__
18157+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18158+#else
18159+extern unsigned long pax_user_shadow_base;
18160+extern pgdval_t clone_pgd_mask;
18161+#endif
18162+#else
18163+#define pax_user_shadow_base (0UL)
18164+#endif
18165+
18166+#endif
18167+
18168 #ifndef __ASSEMBLY__
18169
18170 extern int direct_gbpages;
18171@@ -826,11 +927,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18172 * dst and src can be on the same page, but the range must not overlap,
18173 * and must not cross a page boundary.
18174 */
18175-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18176+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18177 {
18178- memcpy(dst, src, count * sizeof(pgd_t));
18179+ pax_open_kernel();
18180+ while (count--)
18181+ *dst++ = *src++;
18182+ pax_close_kernel();
18183 }
18184
18185+#ifdef CONFIG_PAX_PER_CPU_PGD
18186+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18187+#endif
18188+
18189+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18190+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18191+#else
18192+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18193+#endif
18194+
18195 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18196 static inline int page_level_shift(enum pg_level level)
18197 {
18198diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18199index b6c0b40..3535d47 100644
18200--- a/arch/x86/include/asm/pgtable_32.h
18201+++ b/arch/x86/include/asm/pgtable_32.h
18202@@ -25,9 +25,6 @@
18203 struct mm_struct;
18204 struct vm_area_struct;
18205
18206-extern pgd_t swapper_pg_dir[1024];
18207-extern pgd_t initial_page_table[1024];
18208-
18209 static inline void pgtable_cache_init(void) { }
18210 static inline void check_pgt_cache(void) { }
18211 void paging_init(void);
18212@@ -45,6 +42,12 @@ void paging_init(void);
18213 # include <asm/pgtable-2level.h>
18214 #endif
18215
18216+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18217+extern pgd_t initial_page_table[PTRS_PER_PGD];
18218+#ifdef CONFIG_X86_PAE
18219+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18220+#endif
18221+
18222 #if defined(CONFIG_HIGHPTE)
18223 #define pte_offset_map(dir, address) \
18224 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18225@@ -59,12 +62,17 @@ void paging_init(void);
18226 /* Clear a kernel PTE and flush it from the TLB */
18227 #define kpte_clear_flush(ptep, vaddr) \
18228 do { \
18229+ pax_open_kernel(); \
18230 pte_clear(&init_mm, (vaddr), (ptep)); \
18231+ pax_close_kernel(); \
18232 __flush_tlb_one((vaddr)); \
18233 } while (0)
18234
18235 #endif /* !__ASSEMBLY__ */
18236
18237+#define HAVE_ARCH_UNMAPPED_AREA
18238+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18239+
18240 /*
18241 * kern_addr_valid() is (1) for FLATMEM and (0) for
18242 * SPARSEMEM and DISCONTIGMEM
18243diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18244index 9fb2f2b..b04b4bf 100644
18245--- a/arch/x86/include/asm/pgtable_32_types.h
18246+++ b/arch/x86/include/asm/pgtable_32_types.h
18247@@ -8,7 +8,7 @@
18248 */
18249 #ifdef CONFIG_X86_PAE
18250 # include <asm/pgtable-3level_types.h>
18251-# define PMD_SIZE (1UL << PMD_SHIFT)
18252+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18253 # define PMD_MASK (~(PMD_SIZE - 1))
18254 #else
18255 # include <asm/pgtable-2level_types.h>
18256@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18257 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18258 #endif
18259
18260+#ifdef CONFIG_PAX_KERNEXEC
18261+#ifndef __ASSEMBLY__
18262+extern unsigned char MODULES_EXEC_VADDR[];
18263+extern unsigned char MODULES_EXEC_END[];
18264+#endif
18265+#include <asm/boot.h>
18266+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18267+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18268+#else
18269+#define ktla_ktva(addr) (addr)
18270+#define ktva_ktla(addr) (addr)
18271+#endif
18272+
18273 #define MODULES_VADDR VMALLOC_START
18274 #define MODULES_END VMALLOC_END
18275 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18276diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18277index 2ee7811..55aca24 100644
18278--- a/arch/x86/include/asm/pgtable_64.h
18279+++ b/arch/x86/include/asm/pgtable_64.h
18280@@ -16,11 +16,16 @@
18281
18282 extern pud_t level3_kernel_pgt[512];
18283 extern pud_t level3_ident_pgt[512];
18284+extern pud_t level3_vmalloc_start_pgt[512];
18285+extern pud_t level3_vmalloc_end_pgt[512];
18286+extern pud_t level3_vmemmap_pgt[512];
18287+extern pud_t level2_vmemmap_pgt[512];
18288 extern pmd_t level2_kernel_pgt[512];
18289 extern pmd_t level2_fixmap_pgt[512];
18290-extern pmd_t level2_ident_pgt[512];
18291-extern pte_t level1_fixmap_pgt[512];
18292-extern pgd_t init_level4_pgt[];
18293+extern pmd_t level2_ident_pgt[2][512];
18294+extern pte_t level1_fixmap_pgt[3][512];
18295+extern pte_t level1_vsyscall_pgt[512];
18296+extern pgd_t init_level4_pgt[512];
18297
18298 #define swapper_pg_dir init_level4_pgt
18299
18300@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18301
18302 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18303 {
18304+ pax_open_kernel();
18305 *pmdp = pmd;
18306+ pax_close_kernel();
18307 }
18308
18309 static inline void native_pmd_clear(pmd_t *pmd)
18310@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18311
18312 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18313 {
18314+ pax_open_kernel();
18315 *pudp = pud;
18316+ pax_close_kernel();
18317 }
18318
18319 static inline void native_pud_clear(pud_t *pud)
18320@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18321
18322 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18323 {
18324+ pax_open_kernel();
18325+ *pgdp = pgd;
18326+ pax_close_kernel();
18327+}
18328+
18329+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18330+{
18331 *pgdp = pgd;
18332 }
18333
18334diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18335index 602b602..acb53ed 100644
18336--- a/arch/x86/include/asm/pgtable_64_types.h
18337+++ b/arch/x86/include/asm/pgtable_64_types.h
18338@@ -61,11 +61,16 @@ typedef struct { pteval_t pte; } pte_t;
18339 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18340 #define MODULES_END _AC(0xffffffffff000000, UL)
18341 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18342+#define MODULES_EXEC_VADDR MODULES_VADDR
18343+#define MODULES_EXEC_END MODULES_END
18344 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18345 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18346 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18347 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18348
18349+#define ktla_ktva(addr) (addr)
18350+#define ktva_ktla(addr) (addr)
18351+
18352 #define EARLY_DYNAMIC_PAGE_TABLES 64
18353
18354 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18355diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18356index 8c7c108..1c1b77f 100644
18357--- a/arch/x86/include/asm/pgtable_types.h
18358+++ b/arch/x86/include/asm/pgtable_types.h
18359@@ -85,8 +85,10 @@
18360
18361 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18362 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18363-#else
18364+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18365 #define _PAGE_NX (_AT(pteval_t, 0))
18366+#else
18367+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18368 #endif
18369
18370 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
18371@@ -141,6 +143,9 @@ enum page_cache_mode {
18372 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18373 _PAGE_ACCESSED)
18374
18375+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18376+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18377+
18378 #define __PAGE_KERNEL_EXEC \
18379 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18380 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18381@@ -148,7 +153,7 @@ enum page_cache_mode {
18382 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18383 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18384 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18385-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18386+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18387 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18388 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18389 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18390@@ -194,7 +199,7 @@ enum page_cache_mode {
18391 #ifdef CONFIG_X86_64
18392 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18393 #else
18394-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18395+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18396 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18397 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18398 #endif
18399@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18400 {
18401 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18402 }
18403+#endif
18404
18405+#if PAGETABLE_LEVELS == 3
18406+#include <asm-generic/pgtable-nopud.h>
18407+#endif
18408+
18409+#if PAGETABLE_LEVELS == 2
18410+#include <asm-generic/pgtable-nopmd.h>
18411+#endif
18412+
18413+#ifndef __ASSEMBLY__
18414 #if PAGETABLE_LEVELS > 3
18415 typedef struct { pudval_t pud; } pud_t;
18416
18417@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18418 return pud.pud;
18419 }
18420 #else
18421-#include <asm-generic/pgtable-nopud.h>
18422-
18423 static inline pudval_t native_pud_val(pud_t pud)
18424 {
18425 return native_pgd_val(pud.pgd);
18426@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18427 return pmd.pmd;
18428 }
18429 #else
18430-#include <asm-generic/pgtable-nopmd.h>
18431-
18432 static inline pmdval_t native_pmd_val(pmd_t pmd)
18433 {
18434 return native_pgd_val(pmd.pud.pgd);
18435@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
18436
18437 extern pteval_t __supported_pte_mask;
18438 extern void set_nx(void);
18439-extern int nx_enabled;
18440
18441 #define pgprot_writecombine pgprot_writecombine
18442 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18443diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18444index 8f327184..368fb29 100644
18445--- a/arch/x86/include/asm/preempt.h
18446+++ b/arch/x86/include/asm/preempt.h
18447@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18448 */
18449 static __always_inline bool __preempt_count_dec_and_test(void)
18450 {
18451- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18452+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18453 }
18454
18455 /*
18456diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18457index ec1c935..5cc6023 100644
18458--- a/arch/x86/include/asm/processor.h
18459+++ b/arch/x86/include/asm/processor.h
18460@@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18461 /* Index into per_cpu list: */
18462 u16 cpu_index;
18463 u32 microcode;
18464-};
18465+} __randomize_layout;
18466
18467 #define X86_VENDOR_INTEL 0
18468 #define X86_VENDOR_CYRIX 1
18469@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18470 : "memory");
18471 }
18472
18473+/* invpcid (%rdx),%rax */
18474+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18475+
18476+#define INVPCID_SINGLE_ADDRESS 0UL
18477+#define INVPCID_SINGLE_CONTEXT 1UL
18478+#define INVPCID_ALL_GLOBAL 2UL
18479+#define INVPCID_ALL_NONGLOBAL 3UL
18480+
18481+#define PCID_KERNEL 0UL
18482+#define PCID_USER 1UL
18483+#define PCID_NOFLUSH (1UL << 63)
18484+
18485 static inline void load_cr3(pgd_t *pgdir)
18486 {
18487- write_cr3(__pa(pgdir));
18488+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18489 }
18490
18491 #ifdef CONFIG_X86_32
18492@@ -282,7 +294,7 @@ struct tss_struct {
18493
18494 } ____cacheline_aligned;
18495
18496-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18497+extern struct tss_struct init_tss[NR_CPUS];
18498
18499 /*
18500 * Save the original ist values for checking stack pointers during debugging
18501@@ -479,6 +491,7 @@ struct thread_struct {
18502 unsigned short ds;
18503 unsigned short fsindex;
18504 unsigned short gsindex;
18505+ unsigned short ss;
18506 #endif
18507 #ifdef CONFIG_X86_32
18508 unsigned long ip;
18509@@ -805,11 +818,18 @@ static inline void spin_lock_prefetch(const void *x)
18510 */
18511 #define TASK_SIZE PAGE_OFFSET
18512 #define TASK_SIZE_MAX TASK_SIZE
18513+
18514+#ifdef CONFIG_PAX_SEGMEXEC
18515+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18516+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18517+#else
18518 #define STACK_TOP TASK_SIZE
18519-#define STACK_TOP_MAX STACK_TOP
18520+#endif
18521+
18522+#define STACK_TOP_MAX TASK_SIZE
18523
18524 #define INIT_THREAD { \
18525- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18526+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18527 .vm86_info = NULL, \
18528 .sysenter_cs = __KERNEL_CS, \
18529 .io_bitmap_ptr = NULL, \
18530@@ -823,7 +843,7 @@ static inline void spin_lock_prefetch(const void *x)
18531 */
18532 #define INIT_TSS { \
18533 .x86_tss = { \
18534- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18535+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18536 .ss0 = __KERNEL_DS, \
18537 .ss1 = __KERNEL_CS, \
18538 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18539@@ -834,11 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18540 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18541
18542 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18543-#define KSTK_TOP(info) \
18544-({ \
18545- unsigned long *__ptr = (unsigned long *)(info); \
18546- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18547-})
18548+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18549
18550 /*
18551 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18552@@ -853,7 +869,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18553 #define task_pt_regs(task) \
18554 ({ \
18555 struct pt_regs *__regs__; \
18556- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18557+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18558 __regs__ - 1; \
18559 })
18560
18561@@ -869,13 +885,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18562 * particular problem by preventing anything from being mapped
18563 * at the maximum canonical address.
18564 */
18565-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18566+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18567
18568 /* This decides where the kernel will search for a free chunk of vm
18569 * space during mmap's.
18570 */
18571 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18572- 0xc0000000 : 0xFFFFe000)
18573+ 0xc0000000 : 0xFFFFf000)
18574
18575 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18576 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18577@@ -886,11 +902,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18578 #define STACK_TOP_MAX TASK_SIZE_MAX
18579
18580 #define INIT_THREAD { \
18581- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18582+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18583 }
18584
18585 #define INIT_TSS { \
18586- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18587+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18588 }
18589
18590 /*
18591@@ -918,6 +934,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18592 */
18593 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18594
18595+#ifdef CONFIG_PAX_SEGMEXEC
18596+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18597+#endif
18598+
18599 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18600
18601 /* Get/set a process' ability to use the timestamp counter instruction */
18602@@ -962,7 +982,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18603 return 0;
18604 }
18605
18606-extern unsigned long arch_align_stack(unsigned long sp);
18607+#define arch_align_stack(x) ((x) & ~0xfUL)
18608 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18609
18610 void default_idle(void);
18611@@ -972,6 +992,6 @@ bool xen_set_default_idle(void);
18612 #define xen_set_default_idle 0
18613 #endif
18614
18615-void stop_this_cpu(void *dummy);
18616+void stop_this_cpu(void *dummy) __noreturn;
18617 void df_debug(struct pt_regs *regs, long error_code);
18618 #endif /* _ASM_X86_PROCESSOR_H */
18619diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18620index 86fc2bb..bd5049a 100644
18621--- a/arch/x86/include/asm/ptrace.h
18622+++ b/arch/x86/include/asm/ptrace.h
18623@@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18624 }
18625
18626 /*
18627- * user_mode_vm(regs) determines whether a register set came from user mode.
18628+ * user_mode(regs) determines whether a register set came from user mode.
18629 * This is true if V8086 mode was enabled OR if the register set was from
18630 * protected mode with RPL-3 CS value. This tricky test checks that with
18631 * one comparison. Many places in the kernel can bypass this full check
18632- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18633+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18634+ * be used.
18635 */
18636-static inline int user_mode(struct pt_regs *regs)
18637+static inline int user_mode_novm(struct pt_regs *regs)
18638 {
18639 #ifdef CONFIG_X86_32
18640 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18641 #else
18642- return !!(regs->cs & 3);
18643+ return !!(regs->cs & SEGMENT_RPL_MASK);
18644 #endif
18645 }
18646
18647-static inline int user_mode_vm(struct pt_regs *regs)
18648+static inline int user_mode(struct pt_regs *regs)
18649 {
18650 #ifdef CONFIG_X86_32
18651 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18652 USER_RPL;
18653 #else
18654- return user_mode(regs);
18655+ return user_mode_novm(regs);
18656 #endif
18657 }
18658
18659@@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18660 #ifdef CONFIG_X86_64
18661 static inline bool user_64bit_mode(struct pt_regs *regs)
18662 {
18663+ unsigned long cs = regs->cs & 0xffff;
18664 #ifndef CONFIG_PARAVIRT
18665 /*
18666 * On non-paravirt systems, this is the only long mode CPL 3
18667 * selector. We do not allow long mode selectors in the LDT.
18668 */
18669- return regs->cs == __USER_CS;
18670+ return cs == __USER_CS;
18671 #else
18672 /* Headers are too twisted for this to go in paravirt.h. */
18673- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18674+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18675 #endif
18676 }
18677
18678@@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18679 * Traps from the kernel do not save sp and ss.
18680 * Use the helper function to retrieve sp.
18681 */
18682- if (offset == offsetof(struct pt_regs, sp) &&
18683- regs->cs == __KERNEL_CS)
18684- return kernel_stack_pointer(regs);
18685+ if (offset == offsetof(struct pt_regs, sp)) {
18686+ unsigned long cs = regs->cs & 0xffff;
18687+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18688+ return kernel_stack_pointer(regs);
18689+ }
18690 #endif
18691 return *(unsigned long *)((unsigned long)regs + offset);
18692 }
18693diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18694index ae0e241..e80b10b 100644
18695--- a/arch/x86/include/asm/qrwlock.h
18696+++ b/arch/x86/include/asm/qrwlock.h
18697@@ -7,8 +7,8 @@
18698 #define queue_write_unlock queue_write_unlock
18699 static inline void queue_write_unlock(struct qrwlock *lock)
18700 {
18701- barrier();
18702- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18703+ barrier();
18704+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18705 }
18706 #endif
18707
18708diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18709index 9c6b890..5305f53 100644
18710--- a/arch/x86/include/asm/realmode.h
18711+++ b/arch/x86/include/asm/realmode.h
18712@@ -22,16 +22,14 @@ struct real_mode_header {
18713 #endif
18714 /* APM/BIOS reboot */
18715 u32 machine_real_restart_asm;
18716-#ifdef CONFIG_X86_64
18717 u32 machine_real_restart_seg;
18718-#endif
18719 };
18720
18721 /* This must match data at trampoline_32/64.S */
18722 struct trampoline_header {
18723 #ifdef CONFIG_X86_32
18724 u32 start;
18725- u16 gdt_pad;
18726+ u16 boot_cs;
18727 u16 gdt_limit;
18728 u32 gdt_base;
18729 #else
18730diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18731index a82c4f1..ac45053 100644
18732--- a/arch/x86/include/asm/reboot.h
18733+++ b/arch/x86/include/asm/reboot.h
18734@@ -6,13 +6,13 @@
18735 struct pt_regs;
18736
18737 struct machine_ops {
18738- void (*restart)(char *cmd);
18739- void (*halt)(void);
18740- void (*power_off)(void);
18741+ void (* __noreturn restart)(char *cmd);
18742+ void (* __noreturn halt)(void);
18743+ void (* __noreturn power_off)(void);
18744 void (*shutdown)(void);
18745 void (*crash_shutdown)(struct pt_regs *);
18746- void (*emergency_restart)(void);
18747-};
18748+ void (* __noreturn emergency_restart)(void);
18749+} __no_const;
18750
18751 extern struct machine_ops machine_ops;
18752
18753diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18754index 8f7866a..e442f20 100644
18755--- a/arch/x86/include/asm/rmwcc.h
18756+++ b/arch/x86/include/asm/rmwcc.h
18757@@ -3,7 +3,34 @@
18758
18759 #ifdef CC_HAVE_ASM_GOTO
18760
18761-#define __GEN_RMWcc(fullop, var, cc, ...) \
18762+#ifdef CONFIG_PAX_REFCOUNT
18763+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18764+do { \
18765+ asm_volatile_goto (fullop \
18766+ ";jno 0f\n" \
18767+ fullantiop \
18768+ ";int $4\n0:\n" \
18769+ _ASM_EXTABLE(0b, 0b) \
18770+ ";j" cc " %l[cc_label]" \
18771+ : : "m" (var), ## __VA_ARGS__ \
18772+ : "memory" : cc_label); \
18773+ return 0; \
18774+cc_label: \
18775+ return 1; \
18776+} while (0)
18777+#else
18778+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18779+do { \
18780+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18781+ : : "m" (var), ## __VA_ARGS__ \
18782+ : "memory" : cc_label); \
18783+ return 0; \
18784+cc_label: \
18785+ return 1; \
18786+} while (0)
18787+#endif
18788+
18789+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18790 do { \
18791 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18792 : : "m" (var), ## __VA_ARGS__ \
18793@@ -13,15 +40,46 @@ cc_label: \
18794 return 1; \
18795 } while (0)
18796
18797-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18798- __GEN_RMWcc(op " " arg0, var, cc)
18799+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18800+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18801
18802-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18803- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18804+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18805+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18806+
18807+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18808+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18809+
18810+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18811+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18812
18813 #else /* !CC_HAVE_ASM_GOTO */
18814
18815-#define __GEN_RMWcc(fullop, var, cc, ...) \
18816+#ifdef CONFIG_PAX_REFCOUNT
18817+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18818+do { \
18819+ char c; \
18820+ asm volatile (fullop \
18821+ ";jno 0f\n" \
18822+ fullantiop \
18823+ ";int $4\n0:\n" \
18824+ _ASM_EXTABLE(0b, 0b) \
18825+ "; set" cc " %1" \
18826+ : "+m" (var), "=qm" (c) \
18827+ : __VA_ARGS__ : "memory"); \
18828+ return c != 0; \
18829+} while (0)
18830+#else
18831+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18832+do { \
18833+ char c; \
18834+ asm volatile (fullop "; set" cc " %1" \
18835+ : "+m" (var), "=qm" (c) \
18836+ : __VA_ARGS__ : "memory"); \
18837+ return c != 0; \
18838+} while (0)
18839+#endif
18840+
18841+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18842 do { \
18843 char c; \
18844 asm volatile (fullop "; set" cc " %1" \
18845@@ -30,11 +88,17 @@ do { \
18846 return c != 0; \
18847 } while (0)
18848
18849-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18850- __GEN_RMWcc(op " " arg0, var, cc)
18851+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18852+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18853+
18854+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18855+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18856+
18857+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18858+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18859
18860-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18861- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18862+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18863+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18864
18865 #endif /* CC_HAVE_ASM_GOTO */
18866
18867diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18868index cad82c9..2e5c5c1 100644
18869--- a/arch/x86/include/asm/rwsem.h
18870+++ b/arch/x86/include/asm/rwsem.h
18871@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18872 {
18873 asm volatile("# beginning down_read\n\t"
18874 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18875+
18876+#ifdef CONFIG_PAX_REFCOUNT
18877+ "jno 0f\n"
18878+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18879+ "int $4\n0:\n"
18880+ _ASM_EXTABLE(0b, 0b)
18881+#endif
18882+
18883 /* adds 0x00000001 */
18884 " jns 1f\n"
18885 " call call_rwsem_down_read_failed\n"
18886@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18887 "1:\n\t"
18888 " mov %1,%2\n\t"
18889 " add %3,%2\n\t"
18890+
18891+#ifdef CONFIG_PAX_REFCOUNT
18892+ "jno 0f\n"
18893+ "sub %3,%2\n"
18894+ "int $4\n0:\n"
18895+ _ASM_EXTABLE(0b, 0b)
18896+#endif
18897+
18898 " jle 2f\n\t"
18899 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18900 " jnz 1b\n\t"
18901@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18902 long tmp;
18903 asm volatile("# beginning down_write\n\t"
18904 LOCK_PREFIX " xadd %1,(%2)\n\t"
18905+
18906+#ifdef CONFIG_PAX_REFCOUNT
18907+ "jno 0f\n"
18908+ "mov %1,(%2)\n"
18909+ "int $4\n0:\n"
18910+ _ASM_EXTABLE(0b, 0b)
18911+#endif
18912+
18913 /* adds 0xffff0001, returns the old value */
18914 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18915 /* was the active mask 0 before? */
18916@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18917 long tmp;
18918 asm volatile("# beginning __up_read\n\t"
18919 LOCK_PREFIX " xadd %1,(%2)\n\t"
18920+
18921+#ifdef CONFIG_PAX_REFCOUNT
18922+ "jno 0f\n"
18923+ "mov %1,(%2)\n"
18924+ "int $4\n0:\n"
18925+ _ASM_EXTABLE(0b, 0b)
18926+#endif
18927+
18928 /* subtracts 1, returns the old value */
18929 " jns 1f\n\t"
18930 " call call_rwsem_wake\n" /* expects old value in %edx */
18931@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18932 long tmp;
18933 asm volatile("# beginning __up_write\n\t"
18934 LOCK_PREFIX " xadd %1,(%2)\n\t"
18935+
18936+#ifdef CONFIG_PAX_REFCOUNT
18937+ "jno 0f\n"
18938+ "mov %1,(%2)\n"
18939+ "int $4\n0:\n"
18940+ _ASM_EXTABLE(0b, 0b)
18941+#endif
18942+
18943 /* subtracts 0xffff0001, returns the old value */
18944 " jns 1f\n\t"
18945 " call call_rwsem_wake\n" /* expects old value in %edx */
18946@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18947 {
18948 asm volatile("# beginning __downgrade_write\n\t"
18949 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18950+
18951+#ifdef CONFIG_PAX_REFCOUNT
18952+ "jno 0f\n"
18953+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18954+ "int $4\n0:\n"
18955+ _ASM_EXTABLE(0b, 0b)
18956+#endif
18957+
18958 /*
18959 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18960 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18961@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18962 */
18963 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18964 {
18965- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18966+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18967+
18968+#ifdef CONFIG_PAX_REFCOUNT
18969+ "jno 0f\n"
18970+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18971+ "int $4\n0:\n"
18972+ _ASM_EXTABLE(0b, 0b)
18973+#endif
18974+
18975 : "+m" (sem->count)
18976 : "er" (delta));
18977 }
18978@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18979 */
18980 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18981 {
18982- return delta + xadd(&sem->count, delta);
18983+ return delta + xadd_check_overflow(&sem->count, delta);
18984 }
18985
18986 #endif /* __KERNEL__ */
18987diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18988index e657b7b..81fefb444 100644
18989--- a/arch/x86/include/asm/segment.h
18990+++ b/arch/x86/include/asm/segment.h
18991@@ -73,10 +73,15 @@
18992 * 26 - ESPFIX small SS
18993 * 27 - per-cpu [ offset to per-cpu data area ]
18994 * 28 - stack_canary-20 [ for stack protector ]
18995- * 29 - unused
18996- * 30 - unused
18997+ * 29 - PCI BIOS CS
18998+ * 30 - PCI BIOS DS
18999 * 31 - TSS for double fault handler
19000 */
19001+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19002+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19003+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19004+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19005+
19006 #define GDT_ENTRY_TLS_MIN 6
19007 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19008
19009@@ -88,6 +93,8 @@
19010
19011 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19012
19013+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19014+
19015 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19016
19017 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19018@@ -113,6 +120,12 @@
19019 #define __KERNEL_STACK_CANARY 0
19020 #endif
19021
19022+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19023+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19024+
19025+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19026+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19027+
19028 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19029
19030 /*
19031@@ -140,7 +153,7 @@
19032 */
19033
19034 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19035-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19036+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19037
19038
19039 #else
19040@@ -164,6 +177,8 @@
19041 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19042 #define __USER32_DS __USER_DS
19043
19044+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19045+
19046 #define GDT_ENTRY_TSS 8 /* needs two entries */
19047 #define GDT_ENTRY_LDT 10 /* needs two entries */
19048 #define GDT_ENTRY_TLS_MIN 12
19049@@ -172,6 +187,8 @@
19050 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19051 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19052
19053+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19054+
19055 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19056 #define FS_TLS 0
19057 #define GS_TLS 1
19058@@ -179,12 +196,14 @@
19059 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19060 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19061
19062-#define GDT_ENTRIES 16
19063+#define GDT_ENTRIES 17
19064
19065 #endif
19066
19067 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19068+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19069 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19070+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19071 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19072 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19073 #ifndef CONFIG_PARAVIRT
19074@@ -267,7 +286,7 @@ static inline unsigned long get_limit(unsigned long segment)
19075 {
19076 unsigned long __limit;
19077 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19078- return __limit + 1;
19079+ return __limit;
19080 }
19081
19082 #endif /* !__ASSEMBLY__ */
19083diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19084index 8d3120f..352b440 100644
19085--- a/arch/x86/include/asm/smap.h
19086+++ b/arch/x86/include/asm/smap.h
19087@@ -25,11 +25,40 @@
19088
19089 #include <asm/alternative-asm.h>
19090
19091+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19092+#define ASM_PAX_OPEN_USERLAND \
19093+ 661: jmp 663f; \
19094+ .pushsection .altinstr_replacement, "a" ; \
19095+ 662: pushq %rax; nop; \
19096+ .popsection ; \
19097+ .pushsection .altinstructions, "a" ; \
19098+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19099+ .popsection ; \
19100+ call __pax_open_userland; \
19101+ popq %rax; \
19102+ 663:
19103+
19104+#define ASM_PAX_CLOSE_USERLAND \
19105+ 661: jmp 663f; \
19106+ .pushsection .altinstr_replacement, "a" ; \
19107+ 662: pushq %rax; nop; \
19108+ .popsection; \
19109+ .pushsection .altinstructions, "a" ; \
19110+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19111+ .popsection; \
19112+ call __pax_close_userland; \
19113+ popq %rax; \
19114+ 663:
19115+#else
19116+#define ASM_PAX_OPEN_USERLAND
19117+#define ASM_PAX_CLOSE_USERLAND
19118+#endif
19119+
19120 #ifdef CONFIG_X86_SMAP
19121
19122 #define ASM_CLAC \
19123 661: ASM_NOP3 ; \
19124- .pushsection .altinstr_replacement, "ax" ; \
19125+ .pushsection .altinstr_replacement, "a" ; \
19126 662: __ASM_CLAC ; \
19127 .popsection ; \
19128 .pushsection .altinstructions, "a" ; \
19129@@ -38,7 +67,7 @@
19130
19131 #define ASM_STAC \
19132 661: ASM_NOP3 ; \
19133- .pushsection .altinstr_replacement, "ax" ; \
19134+ .pushsection .altinstr_replacement, "a" ; \
19135 662: __ASM_STAC ; \
19136 .popsection ; \
19137 .pushsection .altinstructions, "a" ; \
19138@@ -56,6 +85,37 @@
19139
19140 #include <asm/alternative.h>
19141
19142+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19143+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19144+
19145+extern void __pax_open_userland(void);
19146+static __always_inline unsigned long pax_open_userland(void)
19147+{
19148+
19149+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19150+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19151+ :
19152+ : [open] "i" (__pax_open_userland)
19153+ : "memory", "rax");
19154+#endif
19155+
19156+ return 0;
19157+}
19158+
19159+extern void __pax_close_userland(void);
19160+static __always_inline unsigned long pax_close_userland(void)
19161+{
19162+
19163+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19164+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19165+ :
19166+ : [close] "i" (__pax_close_userland)
19167+ : "memory", "rax");
19168+#endif
19169+
19170+ return 0;
19171+}
19172+
19173 #ifdef CONFIG_X86_SMAP
19174
19175 static __always_inline void clac(void)
19176diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19177index 8cd1cc3..827e09e 100644
19178--- a/arch/x86/include/asm/smp.h
19179+++ b/arch/x86/include/asm/smp.h
19180@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19181 /* cpus sharing the last level cache: */
19182 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19183 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19184-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19185+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19186
19187 static inline struct cpumask *cpu_sibling_mask(int cpu)
19188 {
19189@@ -78,7 +78,7 @@ struct smp_ops {
19190
19191 void (*send_call_func_ipi)(const struct cpumask *mask);
19192 void (*send_call_func_single_ipi)(int cpu);
19193-};
19194+} __no_const;
19195
19196 /* Globals due to paravirt */
19197 extern void set_cpu_sibling_map(int cpu);
19198@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19199 extern int safe_smp_processor_id(void);
19200
19201 #elif defined(CONFIG_X86_64_SMP)
19202-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19203-
19204-#define stack_smp_processor_id() \
19205-({ \
19206- struct thread_info *ti; \
19207- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19208- ti->cpu; \
19209-})
19210+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19211+#define stack_smp_processor_id() raw_smp_processor_id()
19212 #define safe_smp_processor_id() smp_processor_id()
19213
19214 #endif
19215diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19216index 6a99859..03cb807 100644
19217--- a/arch/x86/include/asm/stackprotector.h
19218+++ b/arch/x86/include/asm/stackprotector.h
19219@@ -47,7 +47,7 @@
19220 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19221 */
19222 #define GDT_STACK_CANARY_INIT \
19223- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19224+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19225
19226 /*
19227 * Initialize the stackprotector canary value.
19228@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19229
19230 static inline void load_stack_canary_segment(void)
19231 {
19232-#ifdef CONFIG_X86_32
19233+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19234 asm volatile ("mov %0, %%gs" : : "r" (0));
19235 #endif
19236 }
19237diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19238index 70bbe39..4ae2bd4 100644
19239--- a/arch/x86/include/asm/stacktrace.h
19240+++ b/arch/x86/include/asm/stacktrace.h
19241@@ -11,28 +11,20 @@
19242
19243 extern int kstack_depth_to_print;
19244
19245-struct thread_info;
19246+struct task_struct;
19247 struct stacktrace_ops;
19248
19249-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19250- unsigned long *stack,
19251- unsigned long bp,
19252- const struct stacktrace_ops *ops,
19253- void *data,
19254- unsigned long *end,
19255- int *graph);
19256+typedef unsigned long walk_stack_t(struct task_struct *task,
19257+ void *stack_start,
19258+ unsigned long *stack,
19259+ unsigned long bp,
19260+ const struct stacktrace_ops *ops,
19261+ void *data,
19262+ unsigned long *end,
19263+ int *graph);
19264
19265-extern unsigned long
19266-print_context_stack(struct thread_info *tinfo,
19267- unsigned long *stack, unsigned long bp,
19268- const struct stacktrace_ops *ops, void *data,
19269- unsigned long *end, int *graph);
19270-
19271-extern unsigned long
19272-print_context_stack_bp(struct thread_info *tinfo,
19273- unsigned long *stack, unsigned long bp,
19274- const struct stacktrace_ops *ops, void *data,
19275- unsigned long *end, int *graph);
19276+extern walk_stack_t print_context_stack;
19277+extern walk_stack_t print_context_stack_bp;
19278
19279 /* Generic stack tracer with callbacks */
19280
19281@@ -40,7 +32,7 @@ struct stacktrace_ops {
19282 void (*address)(void *data, unsigned long address, int reliable);
19283 /* On negative return stop dumping */
19284 int (*stack)(void *data, char *name);
19285- walk_stack_t walk_stack;
19286+ walk_stack_t *walk_stack;
19287 };
19288
19289 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19290diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19291index 751bf4b..a1278b5 100644
19292--- a/arch/x86/include/asm/switch_to.h
19293+++ b/arch/x86/include/asm/switch_to.h
19294@@ -112,7 +112,7 @@ do { \
19295 "call __switch_to\n\t" \
19296 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19297 __switch_canary \
19298- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19299+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19300 "movq %%rax,%%rdi\n\t" \
19301 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19302 "jnz ret_from_fork\n\t" \
19303@@ -123,7 +123,7 @@ do { \
19304 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19305 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19306 [_tif_fork] "i" (_TIF_FORK), \
19307- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19308+ [thread_info] "m" (current_tinfo), \
19309 [current_task] "m" (current_task) \
19310 __switch_canary_iparam \
19311 : "memory", "cc" __EXTRA_CLOBBER)
19312diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19313index 1d4e4f2..506db18 100644
19314--- a/arch/x86/include/asm/thread_info.h
19315+++ b/arch/x86/include/asm/thread_info.h
19316@@ -24,7 +24,6 @@ struct exec_domain;
19317 #include <linux/atomic.h>
19318
19319 struct thread_info {
19320- struct task_struct *task; /* main task structure */
19321 struct exec_domain *exec_domain; /* execution domain */
19322 __u32 flags; /* low level flags */
19323 __u32 status; /* thread synchronous flags */
19324@@ -32,13 +31,13 @@ struct thread_info {
19325 int saved_preempt_count;
19326 mm_segment_t addr_limit;
19327 void __user *sysenter_return;
19328+ unsigned long lowest_stack;
19329 unsigned int sig_on_uaccess_error:1;
19330 unsigned int uaccess_err:1; /* uaccess failed */
19331 };
19332
19333-#define INIT_THREAD_INFO(tsk) \
19334+#define INIT_THREAD_INFO \
19335 { \
19336- .task = &tsk, \
19337 .exec_domain = &default_exec_domain, \
19338 .flags = 0, \
19339 .cpu = 0, \
19340@@ -46,7 +45,7 @@ struct thread_info {
19341 .addr_limit = KERNEL_DS, \
19342 }
19343
19344-#define init_thread_info (init_thread_union.thread_info)
19345+#define init_thread_info (init_thread_union.stack)
19346 #define init_stack (init_thread_union.stack)
19347
19348 #else /* !__ASSEMBLY__ */
19349@@ -86,6 +85,7 @@ struct thread_info {
19350 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19351 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19352 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19353+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19354
19355 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19356 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19357@@ -109,17 +109,18 @@ struct thread_info {
19358 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19359 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19360 #define _TIF_X32 (1 << TIF_X32)
19361+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19362
19363 /* work to do in syscall_trace_enter() */
19364 #define _TIF_WORK_SYSCALL_ENTRY \
19365 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19366 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19367- _TIF_NOHZ)
19368+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19369
19370 /* work to do in syscall_trace_leave() */
19371 #define _TIF_WORK_SYSCALL_EXIT \
19372 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19373- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19374+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19375
19376 /* work to do on interrupt/exception return */
19377 #define _TIF_WORK_MASK \
19378@@ -130,7 +131,7 @@ struct thread_info {
19379 /* work to do on any return to user space */
19380 #define _TIF_ALLWORK_MASK \
19381 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19382- _TIF_NOHZ)
19383+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19384
19385 /* Only used for 64 bit */
19386 #define _TIF_DO_NOTIFY_MASK \
19387@@ -145,7 +146,6 @@ struct thread_info {
19388 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19389
19390 #define STACK_WARN (THREAD_SIZE/8)
19391-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19392
19393 /*
19394 * macros/functions for gaining access to the thread information structure
19395@@ -156,12 +156,11 @@ struct thread_info {
19396
19397 DECLARE_PER_CPU(unsigned long, kernel_stack);
19398
19399+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19400+
19401 static inline struct thread_info *current_thread_info(void)
19402 {
19403- struct thread_info *ti;
19404- ti = (void *)(this_cpu_read_stable(kernel_stack) +
19405- KERNEL_STACK_OFFSET - THREAD_SIZE);
19406- return ti;
19407+ return this_cpu_read_stable(current_tinfo);
19408 }
19409
19410 static inline unsigned long current_stack_pointer(void)
19411@@ -179,14 +178,7 @@ static inline unsigned long current_stack_pointer(void)
19412
19413 /* how to get the thread information struct from ASM */
19414 #define GET_THREAD_INFO(reg) \
19415- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19416- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19417-
19418-/*
19419- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19420- * a certain register (to be used in assembler memory operands).
19421- */
19422-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19423+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19424
19425 #endif
19426
19427@@ -242,5 +234,12 @@ static inline bool is_ia32_task(void)
19428 extern void arch_task_cache_init(void);
19429 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19430 extern void arch_release_task_struct(struct task_struct *tsk);
19431+
19432+#define __HAVE_THREAD_FUNCTIONS
19433+#define task_thread_info(task) (&(task)->tinfo)
19434+#define task_stack_page(task) ((task)->stack)
19435+#define setup_thread_stack(p, org) do {} while (0)
19436+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19437+
19438 #endif
19439 #endif /* _ASM_X86_THREAD_INFO_H */
19440diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19441index cd79194..e7a9491 100644
19442--- a/arch/x86/include/asm/tlbflush.h
19443+++ b/arch/x86/include/asm/tlbflush.h
19444@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
19445
19446 static inline void __native_flush_tlb(void)
19447 {
19448+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19449+ u64 descriptor[2];
19450+
19451+ descriptor[0] = PCID_KERNEL;
19452+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19453+ return;
19454+ }
19455+
19456+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19457+ if (static_cpu_has(X86_FEATURE_PCID)) {
19458+ unsigned int cpu = raw_get_cpu();
19459+
19460+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19461+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19462+ raw_put_cpu_no_resched();
19463+ return;
19464+ }
19465+#endif
19466+
19467 native_write_cr3(native_read_cr3());
19468 }
19469
19470 static inline void __native_flush_tlb_global_irq_disabled(void)
19471 {
19472- unsigned long cr4;
19473+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19474+ u64 descriptor[2];
19475
19476- cr4 = this_cpu_read(cpu_tlbstate.cr4);
19477- /* clear PGE */
19478- native_write_cr4(cr4 & ~X86_CR4_PGE);
19479- /* write old PGE again and flush TLBs */
19480- native_write_cr4(cr4);
19481+ descriptor[0] = PCID_KERNEL;
19482+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19483+ } else {
19484+ unsigned long cr4;
19485+
19486+ cr4 = this_cpu_read(cpu_tlbstate.cr4);
19487+ /* clear PGE */
19488+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19489+ /* write old PGE again and flush TLBs */
19490+ native_write_cr4(cr4);
19491+ }
19492 }
19493
19494 static inline void __native_flush_tlb_global(void)
19495@@ -118,6 +144,41 @@ static inline void __native_flush_tlb_global(void)
19496
19497 static inline void __native_flush_tlb_single(unsigned long addr)
19498 {
19499+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19500+ u64 descriptor[2];
19501+
19502+ descriptor[0] = PCID_KERNEL;
19503+ descriptor[1] = addr;
19504+
19505+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19506+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19507+ if (addr < TASK_SIZE_MAX)
19508+ descriptor[1] += pax_user_shadow_base;
19509+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19510+ }
19511+
19512+ descriptor[0] = PCID_USER;
19513+ descriptor[1] = addr;
19514+#endif
19515+
19516+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19517+ return;
19518+ }
19519+
19520+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19521+ if (static_cpu_has(X86_FEATURE_PCID)) {
19522+ unsigned int cpu = raw_get_cpu();
19523+
19524+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19525+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19526+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19527+ raw_put_cpu_no_resched();
19528+
19529+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19530+ addr += pax_user_shadow_base;
19531+ }
19532+#endif
19533+
19534 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19535 }
19536
19537diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19538index ace9dec..3f9e253 100644
19539--- a/arch/x86/include/asm/uaccess.h
19540+++ b/arch/x86/include/asm/uaccess.h
19541@@ -7,6 +7,7 @@
19542 #include <linux/compiler.h>
19543 #include <linux/thread_info.h>
19544 #include <linux/string.h>
19545+#include <linux/spinlock.h>
19546 #include <asm/asm.h>
19547 #include <asm/page.h>
19548 #include <asm/smap.h>
19549@@ -29,7 +30,12 @@
19550
19551 #define get_ds() (KERNEL_DS)
19552 #define get_fs() (current_thread_info()->addr_limit)
19553+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19554+void __set_fs(mm_segment_t x);
19555+void set_fs(mm_segment_t x);
19556+#else
19557 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19558+#endif
19559
19560 #define segment_eq(a, b) ((a).seg == (b).seg)
19561
19562@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19563 * checks that the pointer is in the user space range - after calling
19564 * this function, memory access functions may still return -EFAULT.
19565 */
19566-#define access_ok(type, addr, size) \
19567- likely(!__range_not_ok(addr, size, user_addr_max()))
19568+extern int _cond_resched(void);
19569+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19570+#define access_ok(type, addr, size) \
19571+({ \
19572+ unsigned long __size = size; \
19573+ unsigned long __addr = (unsigned long)addr; \
19574+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19575+ if (__ret_ao && __size) { \
19576+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19577+ unsigned long __end_ao = __addr + __size - 1; \
19578+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19579+ while (__addr_ao <= __end_ao) { \
19580+ char __c_ao; \
19581+ __addr_ao += PAGE_SIZE; \
19582+ if (__size > PAGE_SIZE) \
19583+ _cond_resched(); \
19584+ if (__get_user(__c_ao, (char __user *)__addr)) \
19585+ break; \
19586+ if (type != VERIFY_WRITE) { \
19587+ __addr = __addr_ao; \
19588+ continue; \
19589+ } \
19590+ if (__put_user(__c_ao, (char __user *)__addr)) \
19591+ break; \
19592+ __addr = __addr_ao; \
19593+ } \
19594+ } \
19595+ } \
19596+ __ret_ao; \
19597+})
19598
19599 /*
19600 * The exception table consists of pairs of addresses relative to the
19601@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19602 extern int __get_user_bad(void);
19603
19604 /*
19605- * This is a type: either unsigned long, if the argument fits into
19606- * that type, or otherwise unsigned long long.
19607+ * This is a type: either (un)signed int, if the argument fits into
19608+ * that type, or otherwise (un)signed long long.
19609 */
19610 #define __inttype(x) \
19611-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19612+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19613+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19614+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19615
19616 /**
19617 * get_user: - Get a simple variable from user space.
19618@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19619 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19620 __chk_user_ptr(ptr); \
19621 might_fault(); \
19622+ pax_open_userland(); \
19623 asm volatile("call __get_user_%P3" \
19624 : "=a" (__ret_gu), "=r" (__val_gu) \
19625 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19626 (x) = (__force __typeof__(*(ptr))) __val_gu; \
19627+ pax_close_userland(); \
19628 __ret_gu; \
19629 })
19630
19631@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19632 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19633 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19634
19635-
19636+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19637+#define __copyuser_seg "gs;"
19638+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19639+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19640+#else
19641+#define __copyuser_seg
19642+#define __COPYUSER_SET_ES
19643+#define __COPYUSER_RESTORE_ES
19644+#endif
19645
19646 #ifdef CONFIG_X86_32
19647 #define __put_user_asm_u64(x, addr, err, errret) \
19648 asm volatile(ASM_STAC "\n" \
19649- "1: movl %%eax,0(%2)\n" \
19650- "2: movl %%edx,4(%2)\n" \
19651+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19652+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19653 "3: " ASM_CLAC "\n" \
19654 ".section .fixup,\"ax\"\n" \
19655 "4: movl %3,%0\n" \
19656@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19657
19658 #define __put_user_asm_ex_u64(x, addr) \
19659 asm volatile(ASM_STAC "\n" \
19660- "1: movl %%eax,0(%1)\n" \
19661- "2: movl %%edx,4(%1)\n" \
19662+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19663+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19664 "3: " ASM_CLAC "\n" \
19665 _ASM_EXTABLE_EX(1b, 2b) \
19666 _ASM_EXTABLE_EX(2b, 3b) \
19667@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19668 __typeof__(*(ptr)) __pu_val; \
19669 __chk_user_ptr(ptr); \
19670 might_fault(); \
19671- __pu_val = x; \
19672+ __pu_val = (x); \
19673+ pax_open_userland(); \
19674 switch (sizeof(*(ptr))) { \
19675 case 1: \
19676 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19677@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19678 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19679 break; \
19680 } \
19681+ pax_close_userland(); \
19682 __ret_pu; \
19683 })
19684
19685@@ -355,8 +403,10 @@ do { \
19686 } while (0)
19687
19688 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19689+do { \
19690+ pax_open_userland(); \
19691 asm volatile(ASM_STAC "\n" \
19692- "1: mov"itype" %2,%"rtype"1\n" \
19693+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19694 "2: " ASM_CLAC "\n" \
19695 ".section .fixup,\"ax\"\n" \
19696 "3: mov %3,%0\n" \
19697@@ -364,8 +414,10 @@ do { \
19698 " jmp 2b\n" \
19699 ".previous\n" \
19700 _ASM_EXTABLE(1b, 3b) \
19701- : "=r" (err), ltype(x) \
19702- : "m" (__m(addr)), "i" (errret), "0" (err))
19703+ : "=r" (err), ltype (x) \
19704+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19705+ pax_close_userland(); \
19706+} while (0)
19707
19708 #define __get_user_size_ex(x, ptr, size) \
19709 do { \
19710@@ -389,7 +441,7 @@ do { \
19711 } while (0)
19712
19713 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19714- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19715+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19716 "2:\n" \
19717 _ASM_EXTABLE_EX(1b, 2b) \
19718 : ltype(x) : "m" (__m(addr)))
19719@@ -406,13 +458,24 @@ do { \
19720 int __gu_err; \
19721 unsigned long __gu_val; \
19722 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19723- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19724+ (x) = (__typeof__(*(ptr)))__gu_val; \
19725 __gu_err; \
19726 })
19727
19728 /* FIXME: this hack is definitely wrong -AK */
19729 struct __large_struct { unsigned long buf[100]; };
19730-#define __m(x) (*(struct __large_struct __user *)(x))
19731+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19732+#define ____m(x) \
19733+({ \
19734+ unsigned long ____x = (unsigned long)(x); \
19735+ if (____x < pax_user_shadow_base) \
19736+ ____x += pax_user_shadow_base; \
19737+ (typeof(x))____x; \
19738+})
19739+#else
19740+#define ____m(x) (x)
19741+#endif
19742+#define __m(x) (*(struct __large_struct __user *)____m(x))
19743
19744 /*
19745 * Tell gcc we read from memory instead of writing: this is because
19746@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19747 * aliasing issues.
19748 */
19749 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19750+do { \
19751+ pax_open_userland(); \
19752 asm volatile(ASM_STAC "\n" \
19753- "1: mov"itype" %"rtype"1,%2\n" \
19754+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19755 "2: " ASM_CLAC "\n" \
19756 ".section .fixup,\"ax\"\n" \
19757 "3: mov %3,%0\n" \
19758@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19759 ".previous\n" \
19760 _ASM_EXTABLE(1b, 3b) \
19761 : "=r"(err) \
19762- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19763+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19764+ pax_close_userland(); \
19765+} while (0)
19766
19767 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19768- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19769+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19770 "2:\n" \
19771 _ASM_EXTABLE_EX(1b, 2b) \
19772 : : ltype(x), "m" (__m(addr)))
19773@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19774 */
19775 #define uaccess_try do { \
19776 current_thread_info()->uaccess_err = 0; \
19777+ pax_open_userland(); \
19778 stac(); \
19779 barrier();
19780
19781 #define uaccess_catch(err) \
19782 clac(); \
19783+ pax_close_userland(); \
19784 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19785 } while (0)
19786
19787@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19788 * On error, the variable @x is set to zero.
19789 */
19790
19791+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19792+#define __get_user(x, ptr) get_user((x), (ptr))
19793+#else
19794 #define __get_user(x, ptr) \
19795 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19796+#endif
19797
19798 /**
19799 * __put_user: - Write a simple value into user space, with less checking.
19800@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19801 * Returns zero on success, or -EFAULT on error.
19802 */
19803
19804+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19805+#define __put_user(x, ptr) put_user((x), (ptr))
19806+#else
19807 #define __put_user(x, ptr) \
19808 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19809+#endif
19810
19811 #define __get_user_unaligned __get_user
19812 #define __put_user_unaligned __put_user
19813@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19814 #define get_user_ex(x, ptr) do { \
19815 unsigned long __gue_val; \
19816 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19817- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19818+ (x) = (__typeof__(*(ptr)))__gue_val; \
19819 } while (0)
19820
19821 #define put_user_try uaccess_try
19822@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19823 extern __must_check long strnlen_user(const char __user *str, long n);
19824
19825 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19826-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19827+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19828
19829 extern void __cmpxchg_wrong_size(void)
19830 __compiletime_error("Bad argument size for cmpxchg");
19831@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19832 __typeof__(ptr) __uval = (uval); \
19833 __typeof__(*(ptr)) __old = (old); \
19834 __typeof__(*(ptr)) __new = (new); \
19835+ pax_open_userland(); \
19836 switch (size) { \
19837 case 1: \
19838 { \
19839 asm volatile("\t" ASM_STAC "\n" \
19840- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19841+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19842 "2:\t" ASM_CLAC "\n" \
19843 "\t.section .fixup, \"ax\"\n" \
19844 "3:\tmov %3, %0\n" \
19845 "\tjmp 2b\n" \
19846 "\t.previous\n" \
19847 _ASM_EXTABLE(1b, 3b) \
19848- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19849+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19850 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19851 : "memory" \
19852 ); \
19853@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19854 case 2: \
19855 { \
19856 asm volatile("\t" ASM_STAC "\n" \
19857- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19858+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19859 "2:\t" ASM_CLAC "\n" \
19860 "\t.section .fixup, \"ax\"\n" \
19861 "3:\tmov %3, %0\n" \
19862 "\tjmp 2b\n" \
19863 "\t.previous\n" \
19864 _ASM_EXTABLE(1b, 3b) \
19865- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19866+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19867 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19868 : "memory" \
19869 ); \
19870@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19871 case 4: \
19872 { \
19873 asm volatile("\t" ASM_STAC "\n" \
19874- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19875+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19876 "2:\t" ASM_CLAC "\n" \
19877 "\t.section .fixup, \"ax\"\n" \
19878 "3:\tmov %3, %0\n" \
19879 "\tjmp 2b\n" \
19880 "\t.previous\n" \
19881 _ASM_EXTABLE(1b, 3b) \
19882- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19883+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19884 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19885 : "memory" \
19886 ); \
19887@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19888 __cmpxchg_wrong_size(); \
19889 \
19890 asm volatile("\t" ASM_STAC "\n" \
19891- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19892+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19893 "2:\t" ASM_CLAC "\n" \
19894 "\t.section .fixup, \"ax\"\n" \
19895 "3:\tmov %3, %0\n" \
19896 "\tjmp 2b\n" \
19897 "\t.previous\n" \
19898 _ASM_EXTABLE(1b, 3b) \
19899- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19900+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19901 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19902 : "memory" \
19903 ); \
19904@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
19905 default: \
19906 __cmpxchg_wrong_size(); \
19907 } \
19908+ pax_close_userland(); \
19909 *__uval = __old; \
19910 __ret; \
19911 })
19912@@ -636,17 +715,6 @@ extern struct movsl_mask {
19913
19914 #define ARCH_HAS_NOCACHE_UACCESS 1
19915
19916-#ifdef CONFIG_X86_32
19917-# include <asm/uaccess_32.h>
19918-#else
19919-# include <asm/uaccess_64.h>
19920-#endif
19921-
19922-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19923- unsigned n);
19924-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19925- unsigned n);
19926-
19927 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19928 # define copy_user_diag __compiletime_error
19929 #else
19930@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19931 extern void copy_user_diag("copy_from_user() buffer size is too small")
19932 copy_from_user_overflow(void);
19933 extern void copy_user_diag("copy_to_user() buffer size is too small")
19934-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19935+copy_to_user_overflow(void);
19936
19937 #undef copy_user_diag
19938
19939@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19940
19941 extern void
19942 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19943-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19944+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19945 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19946
19947 #else
19948@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19949
19950 #endif
19951
19952+#ifdef CONFIG_X86_32
19953+# include <asm/uaccess_32.h>
19954+#else
19955+# include <asm/uaccess_64.h>
19956+#endif
19957+
19958 static inline unsigned long __must_check
19959 copy_from_user(void *to, const void __user *from, unsigned long n)
19960 {
19961- int sz = __compiletime_object_size(to);
19962+ size_t sz = __compiletime_object_size(to);
19963
19964 might_fault();
19965
19966@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19967 * case, and do only runtime checking for non-constant sizes.
19968 */
19969
19970- if (likely(sz < 0 || sz >= n))
19971- n = _copy_from_user(to, from, n);
19972- else if(__builtin_constant_p(n))
19973- copy_from_user_overflow();
19974- else
19975- __copy_from_user_overflow(sz, n);
19976+ if (likely(sz != (size_t)-1 && sz < n)) {
19977+ if(__builtin_constant_p(n))
19978+ copy_from_user_overflow();
19979+ else
19980+ __copy_from_user_overflow(sz, n);
19981+ } else if (access_ok(VERIFY_READ, from, n))
19982+ n = __copy_from_user(to, from, n);
19983+ else if ((long)n > 0)
19984+ memset(to, 0, n);
19985
19986 return n;
19987 }
19988@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19989 static inline unsigned long __must_check
19990 copy_to_user(void __user *to, const void *from, unsigned long n)
19991 {
19992- int sz = __compiletime_object_size(from);
19993+ size_t sz = __compiletime_object_size(from);
19994
19995 might_fault();
19996
19997 /* See the comment in copy_from_user() above. */
19998- if (likely(sz < 0 || sz >= n))
19999- n = _copy_to_user(to, from, n);
20000- else if(__builtin_constant_p(n))
20001- copy_to_user_overflow();
20002- else
20003- __copy_to_user_overflow(sz, n);
20004+ if (likely(sz != (size_t)-1 && sz < n)) {
20005+ if(__builtin_constant_p(n))
20006+ copy_to_user_overflow();
20007+ else
20008+ __copy_to_user_overflow(sz, n);
20009+ } else if (access_ok(VERIFY_WRITE, to, n))
20010+ n = __copy_to_user(to, from, n);
20011
20012 return n;
20013 }
20014diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
20015index 3c03a5d..edb68ae 100644
20016--- a/arch/x86/include/asm/uaccess_32.h
20017+++ b/arch/x86/include/asm/uaccess_32.h
20018@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
20019 * anything, so this is accurate.
20020 */
20021
20022-static __always_inline unsigned long __must_check
20023+static __always_inline __size_overflow(3) unsigned long __must_check
20024 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20025 {
20026+ if ((long)n < 0)
20027+ return n;
20028+
20029+ check_object_size(from, n, true);
20030+
20031 if (__builtin_constant_p(n)) {
20032 unsigned long ret;
20033
20034@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20035 __copy_to_user(void __user *to, const void *from, unsigned long n)
20036 {
20037 might_fault();
20038+
20039 return __copy_to_user_inatomic(to, from, n);
20040 }
20041
20042-static __always_inline unsigned long
20043+static __always_inline __size_overflow(3) unsigned long
20044 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20045 {
20046+ if ((long)n < 0)
20047+ return n;
20048+
20049 /* Avoid zeroing the tail if the copy fails..
20050 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20051 * but as the zeroing behaviour is only significant when n is not
20052@@ -137,6 +146,12 @@ static __always_inline unsigned long
20053 __copy_from_user(void *to, const void __user *from, unsigned long n)
20054 {
20055 might_fault();
20056+
20057+ if ((long)n < 0)
20058+ return n;
20059+
20060+ check_object_size(to, n, false);
20061+
20062 if (__builtin_constant_p(n)) {
20063 unsigned long ret;
20064
20065@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20066 const void __user *from, unsigned long n)
20067 {
20068 might_fault();
20069+
20070+ if ((long)n < 0)
20071+ return n;
20072+
20073 if (__builtin_constant_p(n)) {
20074 unsigned long ret;
20075
20076@@ -181,7 +200,10 @@ static __always_inline unsigned long
20077 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20078 unsigned long n)
20079 {
20080- return __copy_from_user_ll_nocache_nozero(to, from, n);
20081+ if ((long)n < 0)
20082+ return n;
20083+
20084+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20085 }
20086
20087 #endif /* _ASM_X86_UACCESS_32_H */
20088diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20089index f2f9b39..2ae1bf8 100644
20090--- a/arch/x86/include/asm/uaccess_64.h
20091+++ b/arch/x86/include/asm/uaccess_64.h
20092@@ -10,6 +10,9 @@
20093 #include <asm/alternative.h>
20094 #include <asm/cpufeature.h>
20095 #include <asm/page.h>
20096+#include <asm/pgtable.h>
20097+
20098+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20099
20100 /*
20101 * Copy To/From Userspace
20102@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20103 __must_check unsigned long
20104 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20105
20106-static __always_inline __must_check unsigned long
20107-copy_user_generic(void *to, const void *from, unsigned len)
20108+static __always_inline __must_check __size_overflow(3) unsigned long
20109+copy_user_generic(void *to, const void *from, unsigned long len)
20110 {
20111 unsigned ret;
20112
20113@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20114 }
20115
20116 __must_check unsigned long
20117-copy_in_user(void __user *to, const void __user *from, unsigned len);
20118+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20119
20120 static __always_inline __must_check
20121-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20122+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20123 {
20124- int ret = 0;
20125+ size_t sz = __compiletime_object_size(dst);
20126+ unsigned ret = 0;
20127+
20128+ if (size > INT_MAX)
20129+ return size;
20130+
20131+ check_object_size(dst, size, false);
20132+
20133+#ifdef CONFIG_PAX_MEMORY_UDEREF
20134+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20135+ return size;
20136+#endif
20137+
20138+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20139+ if(__builtin_constant_p(size))
20140+ copy_from_user_overflow();
20141+ else
20142+ __copy_from_user_overflow(sz, size);
20143+ return size;
20144+ }
20145
20146 if (!__builtin_constant_p(size))
20147- return copy_user_generic(dst, (__force void *)src, size);
20148+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20149 switch (size) {
20150- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20151+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20152 ret, "b", "b", "=q", 1);
20153 return ret;
20154- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20155+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20156 ret, "w", "w", "=r", 2);
20157 return ret;
20158- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20159+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20160 ret, "l", "k", "=r", 4);
20161 return ret;
20162- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20163+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20164 ret, "q", "", "=r", 8);
20165 return ret;
20166 case 10:
20167- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20168+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20169 ret, "q", "", "=r", 10);
20170 if (unlikely(ret))
20171 return ret;
20172 __get_user_asm(*(u16 *)(8 + (char *)dst),
20173- (u16 __user *)(8 + (char __user *)src),
20174+ (const u16 __user *)(8 + (const char __user *)src),
20175 ret, "w", "w", "=r", 2);
20176 return ret;
20177 case 16:
20178- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20179+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20180 ret, "q", "", "=r", 16);
20181 if (unlikely(ret))
20182 return ret;
20183 __get_user_asm(*(u64 *)(8 + (char *)dst),
20184- (u64 __user *)(8 + (char __user *)src),
20185+ (const u64 __user *)(8 + (const char __user *)src),
20186 ret, "q", "", "=r", 8);
20187 return ret;
20188 default:
20189- return copy_user_generic(dst, (__force void *)src, size);
20190+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20191 }
20192 }
20193
20194 static __always_inline __must_check
20195-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20196+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20197 {
20198 might_fault();
20199 return __copy_from_user_nocheck(dst, src, size);
20200 }
20201
20202 static __always_inline __must_check
20203-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20204+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20205 {
20206- int ret = 0;
20207+ size_t sz = __compiletime_object_size(src);
20208+ unsigned ret = 0;
20209+
20210+ if (size > INT_MAX)
20211+ return size;
20212+
20213+ check_object_size(src, size, true);
20214+
20215+#ifdef CONFIG_PAX_MEMORY_UDEREF
20216+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20217+ return size;
20218+#endif
20219+
20220+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20221+ if(__builtin_constant_p(size))
20222+ copy_to_user_overflow();
20223+ else
20224+ __copy_to_user_overflow(sz, size);
20225+ return size;
20226+ }
20227
20228 if (!__builtin_constant_p(size))
20229- return copy_user_generic((__force void *)dst, src, size);
20230+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20231 switch (size) {
20232- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20233+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20234 ret, "b", "b", "iq", 1);
20235 return ret;
20236- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20237+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20238 ret, "w", "w", "ir", 2);
20239 return ret;
20240- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20241+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20242 ret, "l", "k", "ir", 4);
20243 return ret;
20244- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20245+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20246 ret, "q", "", "er", 8);
20247 return ret;
20248 case 10:
20249- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20250+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20251 ret, "q", "", "er", 10);
20252 if (unlikely(ret))
20253 return ret;
20254 asm("":::"memory");
20255- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20256+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20257 ret, "w", "w", "ir", 2);
20258 return ret;
20259 case 16:
20260- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20261+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20262 ret, "q", "", "er", 16);
20263 if (unlikely(ret))
20264 return ret;
20265 asm("":::"memory");
20266- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20267+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20268 ret, "q", "", "er", 8);
20269 return ret;
20270 default:
20271- return copy_user_generic((__force void *)dst, src, size);
20272+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20273 }
20274 }
20275
20276 static __always_inline __must_check
20277-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20278+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20279 {
20280 might_fault();
20281 return __copy_to_user_nocheck(dst, src, size);
20282 }
20283
20284 static __always_inline __must_check
20285-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20286+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20287 {
20288- int ret = 0;
20289+ unsigned ret = 0;
20290
20291 might_fault();
20292+
20293+ if (size > INT_MAX)
20294+ return size;
20295+
20296+#ifdef CONFIG_PAX_MEMORY_UDEREF
20297+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20298+ return size;
20299+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20300+ return size;
20301+#endif
20302+
20303 if (!__builtin_constant_p(size))
20304- return copy_user_generic((__force void *)dst,
20305- (__force void *)src, size);
20306+ return copy_user_generic((__force_kernel void *)____m(dst),
20307+ (__force_kernel const void *)____m(src), size);
20308 switch (size) {
20309 case 1: {
20310 u8 tmp;
20311- __get_user_asm(tmp, (u8 __user *)src,
20312+ __get_user_asm(tmp, (const u8 __user *)src,
20313 ret, "b", "b", "=q", 1);
20314 if (likely(!ret))
20315 __put_user_asm(tmp, (u8 __user *)dst,
20316@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20317 }
20318 case 2: {
20319 u16 tmp;
20320- __get_user_asm(tmp, (u16 __user *)src,
20321+ __get_user_asm(tmp, (const u16 __user *)src,
20322 ret, "w", "w", "=r", 2);
20323 if (likely(!ret))
20324 __put_user_asm(tmp, (u16 __user *)dst,
20325@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20326
20327 case 4: {
20328 u32 tmp;
20329- __get_user_asm(tmp, (u32 __user *)src,
20330+ __get_user_asm(tmp, (const u32 __user *)src,
20331 ret, "l", "k", "=r", 4);
20332 if (likely(!ret))
20333 __put_user_asm(tmp, (u32 __user *)dst,
20334@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20335 }
20336 case 8: {
20337 u64 tmp;
20338- __get_user_asm(tmp, (u64 __user *)src,
20339+ __get_user_asm(tmp, (const u64 __user *)src,
20340 ret, "q", "", "=r", 8);
20341 if (likely(!ret))
20342 __put_user_asm(tmp, (u64 __user *)dst,
20343@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20344 return ret;
20345 }
20346 default:
20347- return copy_user_generic((__force void *)dst,
20348- (__force void *)src, size);
20349+ return copy_user_generic((__force_kernel void *)____m(dst),
20350+ (__force_kernel const void *)____m(src), size);
20351 }
20352 }
20353
20354-static __must_check __always_inline int
20355-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20356+static __must_check __always_inline unsigned long
20357+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20358 {
20359 return __copy_from_user_nocheck(dst, src, size);
20360 }
20361
20362-static __must_check __always_inline int
20363-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20364+static __must_check __always_inline unsigned long
20365+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20366 {
20367 return __copy_to_user_nocheck(dst, src, size);
20368 }
20369
20370-extern long __copy_user_nocache(void *dst, const void __user *src,
20371- unsigned size, int zerorest);
20372+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20373+ unsigned long size, int zerorest);
20374
20375-static inline int
20376-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20377+static inline unsigned long
20378+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20379 {
20380 might_fault();
20381+
20382+ if (size > INT_MAX)
20383+ return size;
20384+
20385+#ifdef CONFIG_PAX_MEMORY_UDEREF
20386+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20387+ return size;
20388+#endif
20389+
20390 return __copy_user_nocache(dst, src, size, 1);
20391 }
20392
20393-static inline int
20394+static inline unsigned long
20395 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20396- unsigned size)
20397+ unsigned long size)
20398 {
20399+ if (size > INT_MAX)
20400+ return size;
20401+
20402+#ifdef CONFIG_PAX_MEMORY_UDEREF
20403+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20404+ return size;
20405+#endif
20406+
20407 return __copy_user_nocache(dst, src, size, 0);
20408 }
20409
20410 unsigned long
20411-copy_user_handle_tail(char *to, char *from, unsigned len);
20412+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
20413
20414 #endif /* _ASM_X86_UACCESS_64_H */
20415diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20416index 5b238981..77fdd78 100644
20417--- a/arch/x86/include/asm/word-at-a-time.h
20418+++ b/arch/x86/include/asm/word-at-a-time.h
20419@@ -11,7 +11,7 @@
20420 * and shift, for example.
20421 */
20422 struct word_at_a_time {
20423- const unsigned long one_bits, high_bits;
20424+ unsigned long one_bits, high_bits;
20425 };
20426
20427 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20428diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20429index f58a9c7..dc378042a 100644
20430--- a/arch/x86/include/asm/x86_init.h
20431+++ b/arch/x86/include/asm/x86_init.h
20432@@ -129,7 +129,7 @@ struct x86_init_ops {
20433 struct x86_init_timers timers;
20434 struct x86_init_iommu iommu;
20435 struct x86_init_pci pci;
20436-};
20437+} __no_const;
20438
20439 /**
20440 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20441@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20442 void (*setup_percpu_clockev)(void);
20443 void (*early_percpu_clock_init)(void);
20444 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20445-};
20446+} __no_const;
20447
20448 struct timespec;
20449
20450@@ -168,7 +168,7 @@ struct x86_platform_ops {
20451 void (*save_sched_clock_state)(void);
20452 void (*restore_sched_clock_state)(void);
20453 void (*apic_post_init)(void);
20454-};
20455+} __no_const;
20456
20457 struct pci_dev;
20458 struct msi_msg;
20459@@ -182,7 +182,7 @@ struct x86_msi_ops {
20460 void (*teardown_msi_irqs)(struct pci_dev *dev);
20461 void (*restore_msi_irqs)(struct pci_dev *dev);
20462 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20463-};
20464+} __no_const;
20465
20466 struct IO_APIC_route_entry;
20467 struct io_apic_irq_attr;
20468@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20469 unsigned int destination, int vector,
20470 struct io_apic_irq_attr *attr);
20471 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20472-};
20473+} __no_const;
20474
20475 extern struct x86_init_ops x86_init;
20476 extern struct x86_cpuinit_ops x86_cpuinit;
20477diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20478index 358dcd3..23c0bf1 100644
20479--- a/arch/x86/include/asm/xen/page.h
20480+++ b/arch/x86/include/asm/xen/page.h
20481@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20482 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20483 * cases needing an extended handling.
20484 */
20485-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20486+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20487 {
20488 unsigned long mfn;
20489
20490diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20491index c9a6d68..cb57f42 100644
20492--- a/arch/x86/include/asm/xsave.h
20493+++ b/arch/x86/include/asm/xsave.h
20494@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20495 if (unlikely(err))
20496 return -EFAULT;
20497
20498+ pax_open_userland();
20499 __asm__ __volatile__(ASM_STAC "\n"
20500- "1:"XSAVE"\n"
20501+ "1:"
20502+ __copyuser_seg
20503+ XSAVE"\n"
20504 "2: " ASM_CLAC "\n"
20505 xstate_fault
20506 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20507 : "memory");
20508+ pax_close_userland();
20509 return err;
20510 }
20511
20512@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20513 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20514 {
20515 int err = 0;
20516- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20517+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20518 u32 lmask = mask;
20519 u32 hmask = mask >> 32;
20520
20521+ pax_open_userland();
20522 __asm__ __volatile__(ASM_STAC "\n"
20523- "1:"XRSTOR"\n"
20524+ "1:"
20525+ __copyuser_seg
20526+ XRSTOR"\n"
20527 "2: " ASM_CLAC "\n"
20528 xstate_fault
20529 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20530 : "memory"); /* memory required? */
20531+ pax_close_userland();
20532 return err;
20533 }
20534
20535diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20536index d993e33..8db1b18 100644
20537--- a/arch/x86/include/uapi/asm/e820.h
20538+++ b/arch/x86/include/uapi/asm/e820.h
20539@@ -58,7 +58,7 @@ struct e820map {
20540 #define ISA_START_ADDRESS 0xa0000
20541 #define ISA_END_ADDRESS 0x100000
20542
20543-#define BIOS_BEGIN 0x000a0000
20544+#define BIOS_BEGIN 0x000c0000
20545 #define BIOS_END 0x00100000
20546
20547 #define BIOS_ROM_BASE 0xffe00000
20548diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20549index 7b0a55a..ad115bf 100644
20550--- a/arch/x86/include/uapi/asm/ptrace-abi.h
20551+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20552@@ -49,7 +49,6 @@
20553 #define EFLAGS 144
20554 #define RSP 152
20555 #define SS 160
20556-#define ARGOFFSET R11
20557 #endif /* __ASSEMBLY__ */
20558
20559 /* top of stack page */
20560diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20561index cdb1b70..426434c 100644
20562--- a/arch/x86/kernel/Makefile
20563+++ b/arch/x86/kernel/Makefile
20564@@ -28,7 +28,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20565 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20566 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20567 obj-y += probe_roms.o
20568-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20569+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20570 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20571 obj-$(CONFIG_X86_64) += mcount_64.o
20572 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20573diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20574index 803b684..68c64f1 100644
20575--- a/arch/x86/kernel/acpi/boot.c
20576+++ b/arch/x86/kernel/acpi/boot.c
20577@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
20578 * If your system is blacklisted here, but you find that acpi=force
20579 * works for you, please contact linux-acpi@vger.kernel.org
20580 */
20581-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20582+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20583 /*
20584 * Boxes that need ACPI disabled
20585 */
20586@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20587 };
20588
20589 /* second table for DMI checks that should run after early-quirks */
20590-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20591+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20592 /*
20593 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20594 * which includes some code which overrides all temperature
20595diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20596index d1daead..acd77e2 100644
20597--- a/arch/x86/kernel/acpi/sleep.c
20598+++ b/arch/x86/kernel/acpi/sleep.c
20599@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20600 #else /* CONFIG_64BIT */
20601 #ifdef CONFIG_SMP
20602 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20603+
20604+ pax_open_kernel();
20605 early_gdt_descr.address =
20606 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20607+ pax_close_kernel();
20608+
20609 initial_gs = per_cpu_offset(smp_processor_id());
20610 #endif
20611 initial_code = (unsigned long)wakeup_long64;
20612diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20613index 665c6b7..eae4d56 100644
20614--- a/arch/x86/kernel/acpi/wakeup_32.S
20615+++ b/arch/x86/kernel/acpi/wakeup_32.S
20616@@ -29,13 +29,11 @@ wakeup_pmode_return:
20617 # and restore the stack ... but you need gdt for this to work
20618 movl saved_context_esp, %esp
20619
20620- movl %cs:saved_magic, %eax
20621- cmpl $0x12345678, %eax
20622+ cmpl $0x12345678, saved_magic
20623 jne bogus_magic
20624
20625 # jump to place where we left off
20626- movl saved_eip, %eax
20627- jmp *%eax
20628+ jmp *(saved_eip)
20629
20630 bogus_magic:
20631 jmp bogus_magic
20632diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20633index 703130f..27a155d 100644
20634--- a/arch/x86/kernel/alternative.c
20635+++ b/arch/x86/kernel/alternative.c
20636@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20637 */
20638 for (a = start; a < end; a++) {
20639 instr = (u8 *)&a->instr_offset + a->instr_offset;
20640+
20641+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20642+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20643+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20644+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20645+#endif
20646+
20647 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20648 BUG_ON(a->replacementlen > a->instrlen);
20649 BUG_ON(a->instrlen > sizeof(insnbuf));
20650@@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20651 add_nops(insnbuf + a->replacementlen,
20652 a->instrlen - a->replacementlen);
20653
20654+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20655+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20656+ instr = ktva_ktla(instr);
20657+#endif
20658+
20659 text_poke_early(instr, insnbuf, a->instrlen);
20660 }
20661 }
20662@@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20663 for (poff = start; poff < end; poff++) {
20664 u8 *ptr = (u8 *)poff + *poff;
20665
20666+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20667+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20668+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20669+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20670+#endif
20671+
20672 if (!*poff || ptr < text || ptr >= text_end)
20673 continue;
20674 /* turn DS segment override prefix into lock prefix */
20675- if (*ptr == 0x3e)
20676+ if (*ktla_ktva(ptr) == 0x3e)
20677 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20678 }
20679 mutex_unlock(&text_mutex);
20680@@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20681 for (poff = start; poff < end; poff++) {
20682 u8 *ptr = (u8 *)poff + *poff;
20683
20684+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20685+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20686+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20687+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20688+#endif
20689+
20690 if (!*poff || ptr < text || ptr >= text_end)
20691 continue;
20692 /* turn lock prefix into DS segment override prefix */
20693- if (*ptr == 0xf0)
20694+ if (*ktla_ktva(ptr) == 0xf0)
20695 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20696 }
20697 mutex_unlock(&text_mutex);
20698@@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20699
20700 BUG_ON(p->len > MAX_PATCH_LEN);
20701 /* prep the buffer with the original instructions */
20702- memcpy(insnbuf, p->instr, p->len);
20703+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20704 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20705 (unsigned long)p->instr, p->len);
20706
20707@@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20708 if (!uniproc_patched || num_possible_cpus() == 1)
20709 free_init_pages("SMP alternatives",
20710 (unsigned long)__smp_locks,
20711- (unsigned long)__smp_locks_end);
20712+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20713 #endif
20714
20715 apply_paravirt(__parainstructions, __parainstructions_end);
20716@@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20717 * instructions. And on the local CPU you need to be protected again NMI or MCE
20718 * handlers seeing an inconsistent instruction while you patch.
20719 */
20720-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20721+void *__kprobes text_poke_early(void *addr, const void *opcode,
20722 size_t len)
20723 {
20724 unsigned long flags;
20725 local_irq_save(flags);
20726- memcpy(addr, opcode, len);
20727+
20728+ pax_open_kernel();
20729+ memcpy(ktla_ktva(addr), opcode, len);
20730 sync_core();
20731+ pax_close_kernel();
20732+
20733 local_irq_restore(flags);
20734 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20735 that causes hangs on some VIA CPUs. */
20736@@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20737 */
20738 void *text_poke(void *addr, const void *opcode, size_t len)
20739 {
20740- unsigned long flags;
20741- char *vaddr;
20742+ unsigned char *vaddr = ktla_ktva(addr);
20743 struct page *pages[2];
20744- int i;
20745+ size_t i;
20746
20747 if (!core_kernel_text((unsigned long)addr)) {
20748- pages[0] = vmalloc_to_page(addr);
20749- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20750+ pages[0] = vmalloc_to_page(vaddr);
20751+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20752 } else {
20753- pages[0] = virt_to_page(addr);
20754+ pages[0] = virt_to_page(vaddr);
20755 WARN_ON(!PageReserved(pages[0]));
20756- pages[1] = virt_to_page(addr + PAGE_SIZE);
20757+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20758 }
20759 BUG_ON(!pages[0]);
20760- local_irq_save(flags);
20761- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20762- if (pages[1])
20763- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20764- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20765- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20766- clear_fixmap(FIX_TEXT_POKE0);
20767- if (pages[1])
20768- clear_fixmap(FIX_TEXT_POKE1);
20769- local_flush_tlb();
20770- sync_core();
20771- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20772- that causes hangs on some VIA CPUs. */
20773+ text_poke_early(addr, opcode, len);
20774 for (i = 0; i < len; i++)
20775- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20776- local_irq_restore(flags);
20777+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20778 return addr;
20779 }
20780
20781@@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20782 if (likely(!bp_patching_in_progress))
20783 return 0;
20784
20785- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20786+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20787 return 0;
20788
20789 /* set up the specified breakpoint handler */
20790@@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20791 */
20792 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20793 {
20794- unsigned char int3 = 0xcc;
20795+ const unsigned char int3 = 0xcc;
20796
20797 bp_int3_handler = handler;
20798 bp_int3_addr = (u8 *)addr + sizeof(int3);
20799diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20800index ad3639a..bd4253c 100644
20801--- a/arch/x86/kernel/apic/apic.c
20802+++ b/arch/x86/kernel/apic/apic.c
20803@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20804 /*
20805 * Debug level, exported for io_apic.c
20806 */
20807-unsigned int apic_verbosity;
20808+int apic_verbosity;
20809
20810 int pic_mode;
20811
20812@@ -1918,7 +1918,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20813 apic_write(APIC_ESR, 0);
20814 v = apic_read(APIC_ESR);
20815 ack_APIC_irq();
20816- atomic_inc(&irq_err_count);
20817+ atomic_inc_unchecked(&irq_err_count);
20818
20819 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20820 smp_processor_id(), v);
20821diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20822index de918c4..32eed23 100644
20823--- a/arch/x86/kernel/apic/apic_flat_64.c
20824+++ b/arch/x86/kernel/apic/apic_flat_64.c
20825@@ -154,7 +154,7 @@ static int flat_probe(void)
20826 return 1;
20827 }
20828
20829-static struct apic apic_flat = {
20830+static struct apic apic_flat __read_only = {
20831 .name = "flat",
20832 .probe = flat_probe,
20833 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20834@@ -260,7 +260,7 @@ static int physflat_probe(void)
20835 return 0;
20836 }
20837
20838-static struct apic apic_physflat = {
20839+static struct apic apic_physflat __read_only = {
20840
20841 .name = "physical flat",
20842 .probe = physflat_probe,
20843diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20844index b205cdb..d8503ff 100644
20845--- a/arch/x86/kernel/apic/apic_noop.c
20846+++ b/arch/x86/kernel/apic/apic_noop.c
20847@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20848 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20849 }
20850
20851-struct apic apic_noop = {
20852+struct apic apic_noop __read_only = {
20853 .name = "noop",
20854 .probe = noop_probe,
20855 .acpi_madt_oem_check = NULL,
20856diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20857index c4a8d63..fe893ac 100644
20858--- a/arch/x86/kernel/apic/bigsmp_32.c
20859+++ b/arch/x86/kernel/apic/bigsmp_32.c
20860@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20861 return dmi_bigsmp;
20862 }
20863
20864-static struct apic apic_bigsmp = {
20865+static struct apic apic_bigsmp __read_only = {
20866
20867 .name = "bigsmp",
20868 .probe = probe_bigsmp,
20869diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20870index f4dc246..fbab133 100644
20871--- a/arch/x86/kernel/apic/io_apic.c
20872+++ b/arch/x86/kernel/apic/io_apic.c
20873@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20874 return ret;
20875 }
20876
20877-atomic_t irq_mis_count;
20878+atomic_unchecked_t irq_mis_count;
20879
20880 #ifdef CONFIG_GENERIC_PENDING_IRQ
20881 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20882@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
20883 * at the cpu.
20884 */
20885 if (!(v & (1 << (i & 0x1f)))) {
20886- atomic_inc(&irq_mis_count);
20887+ atomic_inc_unchecked(&irq_mis_count);
20888
20889 eoi_ioapic_irq(irq, cfg);
20890 }
20891@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
20892 ioapic_irqd_unmask(data, cfg, masked);
20893 }
20894
20895-static struct irq_chip ioapic_chip __read_mostly = {
20896+static struct irq_chip ioapic_chip = {
20897 .name = "IO-APIC",
20898 .irq_startup = startup_ioapic_irq,
20899 .irq_mask = mask_ioapic_irq,
20900@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
20901 ack_APIC_irq();
20902 }
20903
20904-static struct irq_chip lapic_chip __read_mostly = {
20905+static struct irq_chip lapic_chip = {
20906 .name = "local-APIC",
20907 .irq_mask = mask_lapic_irq,
20908 .irq_unmask = unmask_lapic_irq,
20909diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20910index bda4886..f9c7195 100644
20911--- a/arch/x86/kernel/apic/probe_32.c
20912+++ b/arch/x86/kernel/apic/probe_32.c
20913@@ -72,7 +72,7 @@ static int probe_default(void)
20914 return 1;
20915 }
20916
20917-static struct apic apic_default = {
20918+static struct apic apic_default __read_only = {
20919
20920 .name = "default",
20921 .probe = probe_default,
20922diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
20923index 6cedd79..023ff8e 100644
20924--- a/arch/x86/kernel/apic/vector.c
20925+++ b/arch/x86/kernel/apic/vector.c
20926@@ -21,7 +21,7 @@
20927
20928 static DEFINE_RAW_SPINLOCK(vector_lock);
20929
20930-void lock_vector_lock(void)
20931+void lock_vector_lock(void) __acquires(vector_lock)
20932 {
20933 /* Used to the online set of cpus does not change
20934 * during assign_irq_vector.
20935@@ -29,7 +29,7 @@ void lock_vector_lock(void)
20936 raw_spin_lock(&vector_lock);
20937 }
20938
20939-void unlock_vector_lock(void)
20940+void unlock_vector_lock(void) __releases(vector_lock)
20941 {
20942 raw_spin_unlock(&vector_lock);
20943 }
20944diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20945index e658f21..b695a1a 100644
20946--- a/arch/x86/kernel/apic/x2apic_cluster.c
20947+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20948@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20949 return notifier_from_errno(err);
20950 }
20951
20952-static struct notifier_block __refdata x2apic_cpu_notifier = {
20953+static struct notifier_block x2apic_cpu_notifier = {
20954 .notifier_call = update_clusterinfo,
20955 };
20956
20957@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20958 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20959 }
20960
20961-static struct apic apic_x2apic_cluster = {
20962+static struct apic apic_x2apic_cluster __read_only = {
20963
20964 .name = "cluster x2apic",
20965 .probe = x2apic_cluster_probe,
20966diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20967index 6fae733..5ca17af 100644
20968--- a/arch/x86/kernel/apic/x2apic_phys.c
20969+++ b/arch/x86/kernel/apic/x2apic_phys.c
20970@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20971 return apic == &apic_x2apic_phys;
20972 }
20973
20974-static struct apic apic_x2apic_phys = {
20975+static struct apic apic_x2apic_phys __read_only = {
20976
20977 .name = "physical x2apic",
20978 .probe = x2apic_phys_probe,
20979diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20980index 8e9dcfd..c61b3e4 100644
20981--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20982+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20983@@ -348,7 +348,7 @@ static int uv_probe(void)
20984 return apic == &apic_x2apic_uv_x;
20985 }
20986
20987-static struct apic __refdata apic_x2apic_uv_x = {
20988+static struct apic apic_x2apic_uv_x __read_only = {
20989
20990 .name = "UV large system",
20991 .probe = uv_probe,
20992diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20993index 927ec92..de68f32 100644
20994--- a/arch/x86/kernel/apm_32.c
20995+++ b/arch/x86/kernel/apm_32.c
20996@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
20997 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20998 * even though they are called in protected mode.
20999 */
21000-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
21001+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21002 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21003
21004 static const char driver_version[] = "1.16ac"; /* no spaces */
21005@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
21006 BUG_ON(cpu != 0);
21007 gdt = get_cpu_gdt_table(cpu);
21008 save_desc_40 = gdt[0x40 / 8];
21009+
21010+ pax_open_kernel();
21011 gdt[0x40 / 8] = bad_bios_desc;
21012+ pax_close_kernel();
21013
21014 apm_irq_save(flags);
21015 APM_DO_SAVE_SEGS;
21016@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
21017 &call->esi);
21018 APM_DO_RESTORE_SEGS;
21019 apm_irq_restore(flags);
21020+
21021+ pax_open_kernel();
21022 gdt[0x40 / 8] = save_desc_40;
21023+ pax_close_kernel();
21024+
21025 put_cpu();
21026
21027 return call->eax & 0xff;
21028@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
21029 BUG_ON(cpu != 0);
21030 gdt = get_cpu_gdt_table(cpu);
21031 save_desc_40 = gdt[0x40 / 8];
21032+
21033+ pax_open_kernel();
21034 gdt[0x40 / 8] = bad_bios_desc;
21035+ pax_close_kernel();
21036
21037 apm_irq_save(flags);
21038 APM_DO_SAVE_SEGS;
21039@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
21040 &call->eax);
21041 APM_DO_RESTORE_SEGS;
21042 apm_irq_restore(flags);
21043+
21044+ pax_open_kernel();
21045 gdt[0x40 / 8] = save_desc_40;
21046+ pax_close_kernel();
21047+
21048 put_cpu();
21049 return error;
21050 }
21051@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21052 return 0;
21053 }
21054
21055-static struct dmi_system_id __initdata apm_dmi_table[] = {
21056+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21057 {
21058 print_if_true,
21059 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21060@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21061 * code to that CPU.
21062 */
21063 gdt = get_cpu_gdt_table(0);
21064+
21065+ pax_open_kernel();
21066 set_desc_base(&gdt[APM_CS >> 3],
21067 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21068 set_desc_base(&gdt[APM_CS_16 >> 3],
21069 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21070 set_desc_base(&gdt[APM_DS >> 3],
21071 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21072+ pax_close_kernel();
21073
21074 proc_create("apm", 0, NULL, &apm_file_ops);
21075
21076diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21077index 9f6b934..cf5ffb3 100644
21078--- a/arch/x86/kernel/asm-offsets.c
21079+++ b/arch/x86/kernel/asm-offsets.c
21080@@ -32,6 +32,8 @@ void common(void) {
21081 OFFSET(TI_flags, thread_info, flags);
21082 OFFSET(TI_status, thread_info, status);
21083 OFFSET(TI_addr_limit, thread_info, addr_limit);
21084+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21085+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21086
21087 BLANK();
21088 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21089@@ -52,8 +54,26 @@ void common(void) {
21090 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21091 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21092 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21093+
21094+#ifdef CONFIG_PAX_KERNEXEC
21095+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21096 #endif
21097
21098+#ifdef CONFIG_PAX_MEMORY_UDEREF
21099+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21100+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21101+#ifdef CONFIG_X86_64
21102+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21103+#endif
21104+#endif
21105+
21106+#endif
21107+
21108+ BLANK();
21109+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21110+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21111+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21112+
21113 #ifdef CONFIG_XEN
21114 BLANK();
21115 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21116diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21117index fdcbb4d..036dd93 100644
21118--- a/arch/x86/kernel/asm-offsets_64.c
21119+++ b/arch/x86/kernel/asm-offsets_64.c
21120@@ -80,6 +80,7 @@ int main(void)
21121 BLANK();
21122 #undef ENTRY
21123
21124+ DEFINE(TSS_size, sizeof(struct tss_struct));
21125 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21126 BLANK();
21127
21128diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21129index 80091ae..0c5184f 100644
21130--- a/arch/x86/kernel/cpu/Makefile
21131+++ b/arch/x86/kernel/cpu/Makefile
21132@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21133 CFLAGS_REMOVE_perf_event.o = -pg
21134 endif
21135
21136-# Make sure load_percpu_segment has no stackprotector
21137-nostackp := $(call cc-option, -fno-stack-protector)
21138-CFLAGS_common.o := $(nostackp)
21139-
21140 obj-y := intel_cacheinfo.o scattered.o topology.o
21141 obj-y += common.o
21142 obj-y += rdrand.o
21143diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21144index a220239..607fc38 100644
21145--- a/arch/x86/kernel/cpu/amd.c
21146+++ b/arch/x86/kernel/cpu/amd.c
21147@@ -717,7 +717,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21148 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21149 {
21150 /* AMD errata T13 (order #21922) */
21151- if ((c->x86 == 6)) {
21152+ if (c->x86 == 6) {
21153 /* Duron Rev A0 */
21154 if (c->x86_model == 3 && c->x86_mask == 0)
21155 size = 64;
21156diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21157index 2346c95..c061472 100644
21158--- a/arch/x86/kernel/cpu/common.c
21159+++ b/arch/x86/kernel/cpu/common.c
21160@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
21161
21162 static const struct cpu_dev *this_cpu = &default_cpu;
21163
21164-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21165-#ifdef CONFIG_X86_64
21166- /*
21167- * We need valid kernel segments for data and code in long mode too
21168- * IRET will check the segment types kkeil 2000/10/28
21169- * Also sysret mandates a special GDT layout
21170- *
21171- * TLS descriptors are currently at a different place compared to i386.
21172- * Hopefully nobody expects them at a fixed place (Wine?)
21173- */
21174- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21175- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21176- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21177- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21178- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21179- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21180-#else
21181- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21182- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21183- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21184- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21185- /*
21186- * Segments used for calling PnP BIOS have byte granularity.
21187- * They code segments and data segments have fixed 64k limits,
21188- * the transfer segment sizes are set at run time.
21189- */
21190- /* 32-bit code */
21191- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21192- /* 16-bit code */
21193- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21194- /* 16-bit data */
21195- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21196- /* 16-bit data */
21197- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21198- /* 16-bit data */
21199- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21200- /*
21201- * The APM segments have byte granularity and their bases
21202- * are set at run time. All have 64k limits.
21203- */
21204- /* 32-bit code */
21205- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21206- /* 16-bit code */
21207- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21208- /* data */
21209- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21210-
21211- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21212- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21213- GDT_STACK_CANARY_INIT
21214-#endif
21215-} };
21216-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21217-
21218 static int __init x86_xsave_setup(char *s)
21219 {
21220 if (strlen(s))
21221@@ -306,6 +252,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21222 }
21223 }
21224
21225+#ifdef CONFIG_X86_64
21226+static __init int setup_disable_pcid(char *arg)
21227+{
21228+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21229+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21230+
21231+#ifdef CONFIG_PAX_MEMORY_UDEREF
21232+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21233+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21234+#endif
21235+
21236+ return 1;
21237+}
21238+__setup("nopcid", setup_disable_pcid);
21239+
21240+static void setup_pcid(struct cpuinfo_x86 *c)
21241+{
21242+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21243+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21244+
21245+#ifdef CONFIG_PAX_MEMORY_UDEREF
21246+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
21247+ pax_open_kernel();
21248+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21249+ pax_close_kernel();
21250+ printk("PAX: slow and weak UDEREF enabled\n");
21251+ } else
21252+ printk("PAX: UDEREF disabled\n");
21253+#endif
21254+
21255+ return;
21256+ }
21257+
21258+ printk("PAX: PCID detected\n");
21259+ cr4_set_bits(X86_CR4_PCIDE);
21260+
21261+#ifdef CONFIG_PAX_MEMORY_UDEREF
21262+ pax_open_kernel();
21263+ clone_pgd_mask = ~(pgdval_t)0UL;
21264+ pax_close_kernel();
21265+ if (pax_user_shadow_base)
21266+ printk("PAX: weak UDEREF enabled\n");
21267+ else {
21268+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21269+ printk("PAX: strong UDEREF enabled\n");
21270+ }
21271+#endif
21272+
21273+ if (cpu_has(c, X86_FEATURE_INVPCID))
21274+ printk("PAX: INVPCID detected\n");
21275+}
21276+#endif
21277+
21278 /*
21279 * Some CPU features depend on higher CPUID levels, which may not always
21280 * be available due to CPUID level capping or broken virtualization
21281@@ -406,7 +405,7 @@ void switch_to_new_gdt(int cpu)
21282 {
21283 struct desc_ptr gdt_descr;
21284
21285- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21286+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21287 gdt_descr.size = GDT_SIZE - 1;
21288 load_gdt(&gdt_descr);
21289 /* Reload the per-cpu base */
21290@@ -897,6 +896,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21291 setup_smep(c);
21292 setup_smap(c);
21293
21294+#ifdef CONFIG_X86_32
21295+#ifdef CONFIG_PAX_PAGEEXEC
21296+ if (!(__supported_pte_mask & _PAGE_NX))
21297+ clear_cpu_cap(c, X86_FEATURE_PSE);
21298+#endif
21299+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21300+ clear_cpu_cap(c, X86_FEATURE_SEP);
21301+#endif
21302+#endif
21303+
21304+#ifdef CONFIG_X86_64
21305+ setup_pcid(c);
21306+#endif
21307+
21308 /*
21309 * The vendor-specific functions might have changed features.
21310 * Now we do "generic changes."
21311@@ -979,7 +992,7 @@ static void syscall32_cpu_init(void)
21312 void enable_sep_cpu(void)
21313 {
21314 int cpu = get_cpu();
21315- struct tss_struct *tss = &per_cpu(init_tss, cpu);
21316+ struct tss_struct *tss = init_tss + cpu;
21317
21318 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21319 put_cpu();
21320@@ -1117,14 +1130,16 @@ static __init int setup_disablecpuid(char *arg)
21321 }
21322 __setup("clearcpuid=", setup_disablecpuid);
21323
21324+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21325+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21326+
21327 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21328- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21329+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21330 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21331
21332 #ifdef CONFIG_X86_64
21333-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21334-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21335- (unsigned long) debug_idt_table };
21336+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21337+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21338
21339 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21340 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21341@@ -1307,7 +1322,7 @@ void cpu_init(void)
21342 */
21343 load_ucode_ap();
21344
21345- t = &per_cpu(init_tss, cpu);
21346+ t = init_tss + cpu;
21347 oist = &per_cpu(orig_ist, cpu);
21348
21349 #ifdef CONFIG_NUMA
21350@@ -1339,7 +1354,6 @@ void cpu_init(void)
21351 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21352 barrier();
21353
21354- x86_configure_nx();
21355 x2apic_setup();
21356
21357 /*
21358@@ -1391,7 +1405,7 @@ void cpu_init(void)
21359 {
21360 int cpu = smp_processor_id();
21361 struct task_struct *curr = current;
21362- struct tss_struct *t = &per_cpu(init_tss, cpu);
21363+ struct tss_struct *t = init_tss + cpu;
21364 struct thread_struct *thread = &curr->thread;
21365
21366 wait_for_master_cpu(cpu);
21367diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21368index 6596433..1ad6eaf 100644
21369--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21370+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21371@@ -1024,6 +1024,22 @@ static struct attribute *default_attrs[] = {
21372 };
21373
21374 #ifdef CONFIG_AMD_NB
21375+static struct attribute *default_attrs_amd_nb[] = {
21376+ &type.attr,
21377+ &level.attr,
21378+ &coherency_line_size.attr,
21379+ &physical_line_partition.attr,
21380+ &ways_of_associativity.attr,
21381+ &number_of_sets.attr,
21382+ &size.attr,
21383+ &shared_cpu_map.attr,
21384+ &shared_cpu_list.attr,
21385+ NULL,
21386+ NULL,
21387+ NULL,
21388+ NULL
21389+};
21390+
21391 static struct attribute **amd_l3_attrs(void)
21392 {
21393 static struct attribute **attrs;
21394@@ -1034,18 +1050,7 @@ static struct attribute **amd_l3_attrs(void)
21395
21396 n = ARRAY_SIZE(default_attrs);
21397
21398- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21399- n += 2;
21400-
21401- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21402- n += 1;
21403-
21404- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21405- if (attrs == NULL)
21406- return attrs = default_attrs;
21407-
21408- for (n = 0; default_attrs[n]; n++)
21409- attrs[n] = default_attrs[n];
21410+ attrs = default_attrs_amd_nb;
21411
21412 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21413 attrs[n++] = &cache_disable_0.attr;
21414@@ -1096,6 +1101,13 @@ static struct kobj_type ktype_cache = {
21415 .default_attrs = default_attrs,
21416 };
21417
21418+#ifdef CONFIG_AMD_NB
21419+static struct kobj_type ktype_cache_amd_nb = {
21420+ .sysfs_ops = &sysfs_ops,
21421+ .default_attrs = default_attrs_amd_nb,
21422+};
21423+#endif
21424+
21425 static struct kobj_type ktype_percpu_entry = {
21426 .sysfs_ops = &sysfs_ops,
21427 };
21428@@ -1161,20 +1173,26 @@ static int cache_add_dev(struct device *dev)
21429 return retval;
21430 }
21431
21432+#ifdef CONFIG_AMD_NB
21433+ amd_l3_attrs();
21434+#endif
21435+
21436 for (i = 0; i < num_cache_leaves; i++) {
21437+ struct kobj_type *ktype;
21438+
21439 this_object = INDEX_KOBJECT_PTR(cpu, i);
21440 this_object->cpu = cpu;
21441 this_object->index = i;
21442
21443 this_leaf = CPUID4_INFO_IDX(cpu, i);
21444
21445- ktype_cache.default_attrs = default_attrs;
21446+ ktype = &ktype_cache;
21447 #ifdef CONFIG_AMD_NB
21448 if (this_leaf->base.nb)
21449- ktype_cache.default_attrs = amd_l3_attrs();
21450+ ktype = &ktype_cache_amd_nb;
21451 #endif
21452 retval = kobject_init_and_add(&(this_object->kobj),
21453- &ktype_cache,
21454+ ktype,
21455 per_cpu(ici_cache_kobject, cpu),
21456 "index%1lu", i);
21457 if (unlikely(retval)) {
21458diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21459index 11dd8f2..fd88f68 100644
21460--- a/arch/x86/kernel/cpu/mcheck/mce.c
21461+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21462@@ -47,6 +47,7 @@
21463 #include <asm/tlbflush.h>
21464 #include <asm/mce.h>
21465 #include <asm/msr.h>
21466+#include <asm/local.h>
21467
21468 #include "mce-internal.h"
21469
21470@@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
21471 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21472 m->cs, m->ip);
21473
21474- if (m->cs == __KERNEL_CS)
21475+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21476 print_symbol("{%s}", m->ip);
21477 pr_cont("\n");
21478 }
21479@@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
21480
21481 #define PANIC_TIMEOUT 5 /* 5 seconds */
21482
21483-static atomic_t mce_panicked;
21484+static atomic_unchecked_t mce_panicked;
21485
21486 static int fake_panic;
21487-static atomic_t mce_fake_panicked;
21488+static atomic_unchecked_t mce_fake_panicked;
21489
21490 /* Panic in progress. Enable interrupts and wait for final IPI */
21491 static void wait_for_panic(void)
21492@@ -318,7 +319,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21493 /*
21494 * Make sure only one CPU runs in machine check panic
21495 */
21496- if (atomic_inc_return(&mce_panicked) > 1)
21497+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21498 wait_for_panic();
21499 barrier();
21500
21501@@ -326,7 +327,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21502 console_verbose();
21503 } else {
21504 /* Don't log too much for fake panic */
21505- if (atomic_inc_return(&mce_fake_panicked) > 1)
21506+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21507 return;
21508 }
21509 /* First print corrected ones that are still unlogged */
21510@@ -365,7 +366,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21511 if (!fake_panic) {
21512 if (panic_timeout == 0)
21513 panic_timeout = mca_cfg.panic_timeout;
21514- panic(msg);
21515+ panic("%s", msg);
21516 } else
21517 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21518 }
21519@@ -746,7 +747,7 @@ static int mce_timed_out(u64 *t, const char *msg)
21520 * might have been modified by someone else.
21521 */
21522 rmb();
21523- if (atomic_read(&mce_panicked))
21524+ if (atomic_read_unchecked(&mce_panicked))
21525 wait_for_panic();
21526 if (!mca_cfg.monarch_timeout)
21527 goto out;
21528@@ -1672,7 +1673,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21529 }
21530
21531 /* Call the installed machine check handler for this CPU setup. */
21532-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21533+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21534 unexpected_machine_check;
21535
21536 /*
21537@@ -1695,7 +1696,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21538 return;
21539 }
21540
21541+ pax_open_kernel();
21542 machine_check_vector = do_machine_check;
21543+ pax_close_kernel();
21544
21545 __mcheck_cpu_init_generic();
21546 __mcheck_cpu_init_vendor(c);
21547@@ -1709,7 +1712,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21548 */
21549
21550 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21551-static int mce_chrdev_open_count; /* #times opened */
21552+static local_t mce_chrdev_open_count; /* #times opened */
21553 static int mce_chrdev_open_exclu; /* already open exclusive? */
21554
21555 static int mce_chrdev_open(struct inode *inode, struct file *file)
21556@@ -1717,7 +1720,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21557 spin_lock(&mce_chrdev_state_lock);
21558
21559 if (mce_chrdev_open_exclu ||
21560- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21561+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21562 spin_unlock(&mce_chrdev_state_lock);
21563
21564 return -EBUSY;
21565@@ -1725,7 +1728,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21566
21567 if (file->f_flags & O_EXCL)
21568 mce_chrdev_open_exclu = 1;
21569- mce_chrdev_open_count++;
21570+ local_inc(&mce_chrdev_open_count);
21571
21572 spin_unlock(&mce_chrdev_state_lock);
21573
21574@@ -1736,7 +1739,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21575 {
21576 spin_lock(&mce_chrdev_state_lock);
21577
21578- mce_chrdev_open_count--;
21579+ local_dec(&mce_chrdev_open_count);
21580 mce_chrdev_open_exclu = 0;
21581
21582 spin_unlock(&mce_chrdev_state_lock);
21583@@ -2411,7 +2414,7 @@ static __init void mce_init_banks(void)
21584
21585 for (i = 0; i < mca_cfg.banks; i++) {
21586 struct mce_bank *b = &mce_banks[i];
21587- struct device_attribute *a = &b->attr;
21588+ device_attribute_no_const *a = &b->attr;
21589
21590 sysfs_attr_init(&a->attr);
21591 a->attr.name = b->attrname;
21592@@ -2518,7 +2521,7 @@ struct dentry *mce_get_debugfs_dir(void)
21593 static void mce_reset(void)
21594 {
21595 cpu_missing = 0;
21596- atomic_set(&mce_fake_panicked, 0);
21597+ atomic_set_unchecked(&mce_fake_panicked, 0);
21598 atomic_set(&mce_executing, 0);
21599 atomic_set(&mce_callin, 0);
21600 atomic_set(&global_nwo, 0);
21601diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21602index 737b0ad..09ec66e 100644
21603--- a/arch/x86/kernel/cpu/mcheck/p5.c
21604+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21605@@ -12,6 +12,7 @@
21606 #include <asm/tlbflush.h>
21607 #include <asm/mce.h>
21608 #include <asm/msr.h>
21609+#include <asm/pgtable.h>
21610
21611 /* By default disabled */
21612 int mce_p5_enabled __read_mostly;
21613@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21614 if (!cpu_has(c, X86_FEATURE_MCE))
21615 return;
21616
21617+ pax_open_kernel();
21618 machine_check_vector = pentium_machine_check;
21619+ pax_close_kernel();
21620 /* Make sure the vector pointer is visible before we enable MCEs: */
21621 wmb();
21622
21623diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21624index 44f1382..315b292 100644
21625--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21626+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21627@@ -11,6 +11,7 @@
21628 #include <asm/tlbflush.h>
21629 #include <asm/mce.h>
21630 #include <asm/msr.h>
21631+#include <asm/pgtable.h>
21632
21633 /* Machine check handler for WinChip C6: */
21634 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21635@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21636 {
21637 u32 lo, hi;
21638
21639+ pax_open_kernel();
21640 machine_check_vector = winchip_machine_check;
21641+ pax_close_kernel();
21642 /* Make sure the vector pointer is visible before we enable MCEs: */
21643 wmb();
21644
21645diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21646index 36a8361..e7058c2 100644
21647--- a/arch/x86/kernel/cpu/microcode/core.c
21648+++ b/arch/x86/kernel/cpu/microcode/core.c
21649@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21650 return NOTIFY_OK;
21651 }
21652
21653-static struct notifier_block __refdata mc_cpu_notifier = {
21654+static struct notifier_block mc_cpu_notifier = {
21655 .notifier_call = mc_cpu_callback,
21656 };
21657
21658diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21659index 746e7fd..8dc677e 100644
21660--- a/arch/x86/kernel/cpu/microcode/intel.c
21661+++ b/arch/x86/kernel/cpu/microcode/intel.c
21662@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21663
21664 static int get_ucode_user(void *to, const void *from, size_t n)
21665 {
21666- return copy_from_user(to, from, n);
21667+ return copy_from_user(to, (const void __force_user *)from, n);
21668 }
21669
21670 static enum ucode_state
21671 request_microcode_user(int cpu, const void __user *buf, size_t size)
21672 {
21673- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21674+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21675 }
21676
21677 static void microcode_fini_cpu(int cpu)
21678diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21679index ea5f363..cb0e905 100644
21680--- a/arch/x86/kernel/cpu/mtrr/main.c
21681+++ b/arch/x86/kernel/cpu/mtrr/main.c
21682@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21683 u64 size_or_mask, size_and_mask;
21684 static bool mtrr_aps_delayed_init;
21685
21686-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21687+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21688
21689 const struct mtrr_ops *mtrr_if;
21690
21691diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21692index df5e41f..816c719 100644
21693--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21694+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21695@@ -25,7 +25,7 @@ struct mtrr_ops {
21696 int (*validate_add_page)(unsigned long base, unsigned long size,
21697 unsigned int type);
21698 int (*have_wrcomb)(void);
21699-};
21700+} __do_const;
21701
21702 extern int generic_get_free_region(unsigned long base, unsigned long size,
21703 int replace_reg);
21704diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21705index b71a7f8..534af0e 100644
21706--- a/arch/x86/kernel/cpu/perf_event.c
21707+++ b/arch/x86/kernel/cpu/perf_event.c
21708@@ -1376,7 +1376,7 @@ static void __init pmu_check_apic(void)
21709
21710 }
21711
21712-static struct attribute_group x86_pmu_format_group = {
21713+static attribute_group_no_const x86_pmu_format_group = {
21714 .name = "format",
21715 .attrs = NULL,
21716 };
21717@@ -1475,7 +1475,7 @@ static struct attribute *events_attr[] = {
21718 NULL,
21719 };
21720
21721-static struct attribute_group x86_pmu_events_group = {
21722+static attribute_group_no_const x86_pmu_events_group = {
21723 .name = "events",
21724 .attrs = events_attr,
21725 };
21726@@ -2037,7 +2037,7 @@ static unsigned long get_segment_base(unsigned int segment)
21727 if (idx > GDT_ENTRIES)
21728 return 0;
21729
21730- desc = raw_cpu_ptr(gdt_page.gdt);
21731+ desc = get_cpu_gdt_table(smp_processor_id());
21732 }
21733
21734 return get_desc_base(desc + idx);
21735@@ -2127,7 +2127,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21736 break;
21737
21738 perf_callchain_store(entry, frame.return_address);
21739- fp = frame.next_frame;
21740+ fp = (const void __force_user *)frame.next_frame;
21741 }
21742 }
21743
21744diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21745index 97242a9..cf9c30e 100644
21746--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21747+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21748@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21749 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21750 {
21751 struct attribute **attrs;
21752- struct attribute_group *attr_group;
21753+ attribute_group_no_const *attr_group;
21754 int i = 0, j;
21755
21756 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21757diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21758index 2589906..1ca1000 100644
21759--- a/arch/x86/kernel/cpu/perf_event_intel.c
21760+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21761@@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21762 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21763
21764 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21765- u64 capabilities;
21766+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21767
21768- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21769- x86_pmu.intel_cap.capabilities = capabilities;
21770+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21771+ x86_pmu.intel_cap.capabilities = capabilities;
21772 }
21773
21774 intel_ds_init();
21775diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21776index 76d8cbe..e5f9681 100644
21777--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21778+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21779@@ -465,7 +465,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21780 NULL,
21781 };
21782
21783-static struct attribute_group rapl_pmu_events_group = {
21784+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21785 .name = "events",
21786 .attrs = NULL, /* patched at runtime */
21787 };
21788diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21789index c635b8b..b78835e 100644
21790--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21791+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21792@@ -733,7 +733,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21793 static int __init uncore_type_init(struct intel_uncore_type *type)
21794 {
21795 struct intel_uncore_pmu *pmus;
21796- struct attribute_group *attr_group;
21797+ attribute_group_no_const *attr_group;
21798 struct attribute **attrs;
21799 int i, j;
21800
21801diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21802index 6c8c1e7..515b98a 100644
21803--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21804+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21805@@ -114,7 +114,7 @@ struct intel_uncore_box {
21806 struct uncore_event_desc {
21807 struct kobj_attribute attr;
21808 const char *config;
21809-};
21810+} __do_const;
21811
21812 ssize_t uncore_event_show(struct kobject *kobj,
21813 struct kobj_attribute *attr, char *buf);
21814diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21815index 83741a7..bd3507d 100644
21816--- a/arch/x86/kernel/cpuid.c
21817+++ b/arch/x86/kernel/cpuid.c
21818@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21819 return notifier_from_errno(err);
21820 }
21821
21822-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21823+static struct notifier_block cpuid_class_cpu_notifier =
21824 {
21825 .notifier_call = cpuid_class_cpu_callback,
21826 };
21827diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21828index aceb2f9..c76d3e3 100644
21829--- a/arch/x86/kernel/crash.c
21830+++ b/arch/x86/kernel/crash.c
21831@@ -105,7 +105,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21832 #ifdef CONFIG_X86_32
21833 struct pt_regs fixed_regs;
21834
21835- if (!user_mode_vm(regs)) {
21836+ if (!user_mode(regs)) {
21837 crash_fixup_ss_esp(&fixed_regs, regs);
21838 regs = &fixed_regs;
21839 }
21840diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21841index afa64ad..dce67dd 100644
21842--- a/arch/x86/kernel/crash_dump_64.c
21843+++ b/arch/x86/kernel/crash_dump_64.c
21844@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21845 return -ENOMEM;
21846
21847 if (userbuf) {
21848- if (copy_to_user(buf, vaddr + offset, csize)) {
21849+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21850 iounmap(vaddr);
21851 return -EFAULT;
21852 }
21853diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21854index f6dfd93..892ade4 100644
21855--- a/arch/x86/kernel/doublefault.c
21856+++ b/arch/x86/kernel/doublefault.c
21857@@ -12,7 +12,7 @@
21858
21859 #define DOUBLEFAULT_STACKSIZE (1024)
21860 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21861-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21862+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21863
21864 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21865
21866@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21867 unsigned long gdt, tss;
21868
21869 native_store_gdt(&gdt_desc);
21870- gdt = gdt_desc.address;
21871+ gdt = (unsigned long)gdt_desc.address;
21872
21873 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21874
21875@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21876 /* 0x2 bit is always set */
21877 .flags = X86_EFLAGS_SF | 0x2,
21878 .sp = STACK_START,
21879- .es = __USER_DS,
21880+ .es = __KERNEL_DS,
21881 .cs = __KERNEL_CS,
21882 .ss = __KERNEL_DS,
21883- .ds = __USER_DS,
21884+ .ds = __KERNEL_DS,
21885 .fs = __KERNEL_PERCPU,
21886
21887 .__cr3 = __pa_nodebug(swapper_pg_dir),
21888diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21889index cf3df1d..b637d9a 100644
21890--- a/arch/x86/kernel/dumpstack.c
21891+++ b/arch/x86/kernel/dumpstack.c
21892@@ -2,6 +2,9 @@
21893 * Copyright (C) 1991, 1992 Linus Torvalds
21894 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21895 */
21896+#ifdef CONFIG_GRKERNSEC_HIDESYM
21897+#define __INCLUDED_BY_HIDESYM 1
21898+#endif
21899 #include <linux/kallsyms.h>
21900 #include <linux/kprobes.h>
21901 #include <linux/uaccess.h>
21902@@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21903
21904 void printk_address(unsigned long address)
21905 {
21906- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21907+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21908 }
21909
21910 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21911 static void
21912 print_ftrace_graph_addr(unsigned long addr, void *data,
21913 const struct stacktrace_ops *ops,
21914- struct thread_info *tinfo, int *graph)
21915+ struct task_struct *task, int *graph)
21916 {
21917- struct task_struct *task;
21918 unsigned long ret_addr;
21919 int index;
21920
21921 if (addr != (unsigned long)return_to_handler)
21922 return;
21923
21924- task = tinfo->task;
21925 index = task->curr_ret_stack;
21926
21927 if (!task->ret_stack || index < *graph)
21928@@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21929 static inline void
21930 print_ftrace_graph_addr(unsigned long addr, void *data,
21931 const struct stacktrace_ops *ops,
21932- struct thread_info *tinfo, int *graph)
21933+ struct task_struct *task, int *graph)
21934 { }
21935 #endif
21936
21937@@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21938 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21939 */
21940
21941-static inline int valid_stack_ptr(struct thread_info *tinfo,
21942- void *p, unsigned int size, void *end)
21943+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21944 {
21945- void *t = tinfo;
21946 if (end) {
21947 if (p < end && p >= (end-THREAD_SIZE))
21948 return 1;
21949@@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21950 }
21951
21952 unsigned long
21953-print_context_stack(struct thread_info *tinfo,
21954+print_context_stack(struct task_struct *task, void *stack_start,
21955 unsigned long *stack, unsigned long bp,
21956 const struct stacktrace_ops *ops, void *data,
21957 unsigned long *end, int *graph)
21958 {
21959 struct stack_frame *frame = (struct stack_frame *)bp;
21960
21961- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21962+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21963 unsigned long addr;
21964
21965 addr = *stack;
21966@@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21967 } else {
21968 ops->address(data, addr, 0);
21969 }
21970- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21971+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21972 }
21973 stack++;
21974 }
21975@@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21976 EXPORT_SYMBOL_GPL(print_context_stack);
21977
21978 unsigned long
21979-print_context_stack_bp(struct thread_info *tinfo,
21980+print_context_stack_bp(struct task_struct *task, void *stack_start,
21981 unsigned long *stack, unsigned long bp,
21982 const struct stacktrace_ops *ops, void *data,
21983 unsigned long *end, int *graph)
21984@@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21985 struct stack_frame *frame = (struct stack_frame *)bp;
21986 unsigned long *ret_addr = &frame->return_address;
21987
21988- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21989+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21990 unsigned long addr = *ret_addr;
21991
21992 if (!__kernel_text_address(addr))
21993@@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21994 ops->address(data, addr, 1);
21995 frame = frame->next_frame;
21996 ret_addr = &frame->return_address;
21997- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21998+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21999 }
22000
22001 return (unsigned long)frame;
22002@@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
22003 static void print_trace_address(void *data, unsigned long addr, int reliable)
22004 {
22005 touch_nmi_watchdog();
22006- printk(data);
22007+ printk("%s", (char *)data);
22008 printk_stack_address(addr, reliable);
22009 }
22010
22011@@ -225,6 +224,8 @@ unsigned long oops_begin(void)
22012 EXPORT_SYMBOL_GPL(oops_begin);
22013 NOKPROBE_SYMBOL(oops_begin);
22014
22015+extern void gr_handle_kernel_exploit(void);
22016+
22017 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22018 {
22019 if (regs && kexec_should_crash(current))
22020@@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22021 panic("Fatal exception in interrupt");
22022 if (panic_on_oops)
22023 panic("Fatal exception");
22024- do_exit(signr);
22025+
22026+ gr_handle_kernel_exploit();
22027+
22028+ do_group_exit(signr);
22029 }
22030 NOKPROBE_SYMBOL(oops_end);
22031
22032@@ -278,7 +282,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22033 print_modules();
22034 show_regs(regs);
22035 #ifdef CONFIG_X86_32
22036- if (user_mode_vm(regs)) {
22037+ if (user_mode(regs)) {
22038 sp = regs->sp;
22039 ss = regs->ss & 0xffff;
22040 } else {
22041@@ -307,7 +311,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22042 unsigned long flags = oops_begin();
22043 int sig = SIGSEGV;
22044
22045- if (!user_mode_vm(regs))
22046+ if (!user_mode(regs))
22047 report_bug(regs->ip, regs);
22048
22049 if (__die(str, regs, err))
22050diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22051index 5abd4cd..ca97162 100644
22052--- a/arch/x86/kernel/dumpstack_32.c
22053+++ b/arch/x86/kernel/dumpstack_32.c
22054@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22055 bp = stack_frame(task, regs);
22056
22057 for (;;) {
22058- struct thread_info *context;
22059+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22060 void *end_stack;
22061
22062 end_stack = is_hardirq_stack(stack, cpu);
22063 if (!end_stack)
22064 end_stack = is_softirq_stack(stack, cpu);
22065
22066- context = task_thread_info(task);
22067- bp = ops->walk_stack(context, stack, bp, ops, data,
22068+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22069 end_stack, &graph);
22070
22071 /* Stop if not on irq stack */
22072@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22073 int i;
22074
22075 show_regs_print_info(KERN_EMERG);
22076- __show_regs(regs, !user_mode_vm(regs));
22077+ __show_regs(regs, !user_mode(regs));
22078
22079 /*
22080 * When in-kernel, we also print out the stack and code at the
22081 * time of the fault..
22082 */
22083- if (!user_mode_vm(regs)) {
22084+ if (!user_mode(regs)) {
22085 unsigned int code_prologue = code_bytes * 43 / 64;
22086 unsigned int code_len = code_bytes;
22087 unsigned char c;
22088 u8 *ip;
22089+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22090
22091 pr_emerg("Stack:\n");
22092 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22093
22094 pr_emerg("Code:");
22095
22096- ip = (u8 *)regs->ip - code_prologue;
22097+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22098 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22099 /* try starting at IP */
22100- ip = (u8 *)regs->ip;
22101+ ip = (u8 *)regs->ip + cs_base;
22102 code_len = code_len - code_prologue + 1;
22103 }
22104 for (i = 0; i < code_len; i++, ip++) {
22105@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22106 pr_cont(" Bad EIP value.");
22107 break;
22108 }
22109- if (ip == (u8 *)regs->ip)
22110+ if (ip == (u8 *)regs->ip + cs_base)
22111 pr_cont(" <%02x>", c);
22112 else
22113 pr_cont(" %02x", c);
22114@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22115 {
22116 unsigned short ud2;
22117
22118+ ip = ktla_ktva(ip);
22119 if (ip < PAGE_OFFSET)
22120 return 0;
22121 if (probe_kernel_address((unsigned short *)ip, ud2))
22122@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22123
22124 return ud2 == 0x0b0f;
22125 }
22126+
22127+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22128+void __used pax_check_alloca(unsigned long size)
22129+{
22130+ unsigned long sp = (unsigned long)&sp, stack_left;
22131+
22132+ /* all kernel stacks are of the same size */
22133+ stack_left = sp & (THREAD_SIZE - 1);
22134+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22135+}
22136+EXPORT_SYMBOL(pax_check_alloca);
22137+#endif
22138diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22139index ff86f19..a2efee8 100644
22140--- a/arch/x86/kernel/dumpstack_64.c
22141+++ b/arch/x86/kernel/dumpstack_64.c
22142@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22143 const struct stacktrace_ops *ops, void *data)
22144 {
22145 const unsigned cpu = get_cpu();
22146- struct thread_info *tinfo;
22147 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22148 unsigned long dummy;
22149 unsigned used = 0;
22150 int graph = 0;
22151 int done = 0;
22152+ void *stack_start;
22153
22154 if (!task)
22155 task = current;
22156@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22157 * current stack address. If the stacks consist of nested
22158 * exceptions
22159 */
22160- tinfo = task_thread_info(task);
22161 while (!done) {
22162 unsigned long *stack_end;
22163 enum stack_type stype;
22164@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22165 if (ops->stack(data, id) < 0)
22166 break;
22167
22168- bp = ops->walk_stack(tinfo, stack, bp, ops,
22169+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22170 data, stack_end, &graph);
22171 ops->stack(data, "<EOE>");
22172 /*
22173@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22174 * second-to-last pointer (index -2 to end) in the
22175 * exception stack:
22176 */
22177+ if ((u16)stack_end[-1] != __KERNEL_DS)
22178+ goto out;
22179 stack = (unsigned long *) stack_end[-2];
22180 done = 0;
22181 break;
22182@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22183
22184 if (ops->stack(data, "IRQ") < 0)
22185 break;
22186- bp = ops->walk_stack(tinfo, stack, bp,
22187+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22188 ops, data, stack_end, &graph);
22189 /*
22190 * We link to the next stack (which would be
22191@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22192 /*
22193 * This handles the process stack:
22194 */
22195- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22196+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22197+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22198+out:
22199 put_cpu();
22200 }
22201 EXPORT_SYMBOL(dump_trace);
22202@@ -344,8 +347,55 @@ int is_valid_bugaddr(unsigned long ip)
22203 {
22204 unsigned short ud2;
22205
22206- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22207+ if (probe_kernel_address((unsigned short *)ip, ud2))
22208 return 0;
22209
22210 return ud2 == 0x0b0f;
22211 }
22212+
22213+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22214+void __used pax_check_alloca(unsigned long size)
22215+{
22216+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22217+ unsigned cpu, used;
22218+ char *id;
22219+
22220+ /* check the process stack first */
22221+ stack_start = (unsigned long)task_stack_page(current);
22222+ stack_end = stack_start + THREAD_SIZE;
22223+ if (likely(stack_start <= sp && sp < stack_end)) {
22224+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22225+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22226+ return;
22227+ }
22228+
22229+ cpu = get_cpu();
22230+
22231+ /* check the irq stacks */
22232+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22233+ stack_start = stack_end - IRQ_STACK_SIZE;
22234+ if (stack_start <= sp && sp < stack_end) {
22235+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22236+ put_cpu();
22237+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22238+ return;
22239+ }
22240+
22241+ /* check the exception stacks */
22242+ used = 0;
22243+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22244+ stack_start = stack_end - EXCEPTION_STKSZ;
22245+ if (stack_end && stack_start <= sp && sp < stack_end) {
22246+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22247+ put_cpu();
22248+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22249+ return;
22250+ }
22251+
22252+ put_cpu();
22253+
22254+ /* unknown stack */
22255+ BUG();
22256+}
22257+EXPORT_SYMBOL(pax_check_alloca);
22258+#endif
22259diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22260index 46201de..ebffabf 100644
22261--- a/arch/x86/kernel/e820.c
22262+++ b/arch/x86/kernel/e820.c
22263@@ -794,8 +794,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22264
22265 static void early_panic(char *msg)
22266 {
22267- early_printk(msg);
22268- panic(msg);
22269+ early_printk("%s", msg);
22270+ panic("%s", msg);
22271 }
22272
22273 static int userdef __initdata;
22274diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22275index a62536a..8444df4 100644
22276--- a/arch/x86/kernel/early_printk.c
22277+++ b/arch/x86/kernel/early_printk.c
22278@@ -7,6 +7,7 @@
22279 #include <linux/pci_regs.h>
22280 #include <linux/pci_ids.h>
22281 #include <linux/errno.h>
22282+#include <linux/sched.h>
22283 #include <asm/io.h>
22284 #include <asm/processor.h>
22285 #include <asm/fcntl.h>
22286diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22287index 31e2d5b..b31c76d 100644
22288--- a/arch/x86/kernel/entry_32.S
22289+++ b/arch/x86/kernel/entry_32.S
22290@@ -177,13 +177,154 @@
22291 /*CFI_REL_OFFSET gs, PT_GS*/
22292 .endm
22293 .macro SET_KERNEL_GS reg
22294+
22295+#ifdef CONFIG_CC_STACKPROTECTOR
22296 movl $(__KERNEL_STACK_CANARY), \reg
22297+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22298+ movl $(__USER_DS), \reg
22299+#else
22300+ xorl \reg, \reg
22301+#endif
22302+
22303 movl \reg, %gs
22304 .endm
22305
22306 #endif /* CONFIG_X86_32_LAZY_GS */
22307
22308-.macro SAVE_ALL
22309+.macro pax_enter_kernel
22310+#ifdef CONFIG_PAX_KERNEXEC
22311+ call pax_enter_kernel
22312+#endif
22313+.endm
22314+
22315+.macro pax_exit_kernel
22316+#ifdef CONFIG_PAX_KERNEXEC
22317+ call pax_exit_kernel
22318+#endif
22319+.endm
22320+
22321+#ifdef CONFIG_PAX_KERNEXEC
22322+ENTRY(pax_enter_kernel)
22323+#ifdef CONFIG_PARAVIRT
22324+ pushl %eax
22325+ pushl %ecx
22326+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22327+ mov %eax, %esi
22328+#else
22329+ mov %cr0, %esi
22330+#endif
22331+ bts $16, %esi
22332+ jnc 1f
22333+ mov %cs, %esi
22334+ cmp $__KERNEL_CS, %esi
22335+ jz 3f
22336+ ljmp $__KERNEL_CS, $3f
22337+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22338+2:
22339+#ifdef CONFIG_PARAVIRT
22340+ mov %esi, %eax
22341+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22342+#else
22343+ mov %esi, %cr0
22344+#endif
22345+3:
22346+#ifdef CONFIG_PARAVIRT
22347+ popl %ecx
22348+ popl %eax
22349+#endif
22350+ ret
22351+ENDPROC(pax_enter_kernel)
22352+
22353+ENTRY(pax_exit_kernel)
22354+#ifdef CONFIG_PARAVIRT
22355+ pushl %eax
22356+ pushl %ecx
22357+#endif
22358+ mov %cs, %esi
22359+ cmp $__KERNEXEC_KERNEL_CS, %esi
22360+ jnz 2f
22361+#ifdef CONFIG_PARAVIRT
22362+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22363+ mov %eax, %esi
22364+#else
22365+ mov %cr0, %esi
22366+#endif
22367+ btr $16, %esi
22368+ ljmp $__KERNEL_CS, $1f
22369+1:
22370+#ifdef CONFIG_PARAVIRT
22371+ mov %esi, %eax
22372+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22373+#else
22374+ mov %esi, %cr0
22375+#endif
22376+2:
22377+#ifdef CONFIG_PARAVIRT
22378+ popl %ecx
22379+ popl %eax
22380+#endif
22381+ ret
22382+ENDPROC(pax_exit_kernel)
22383+#endif
22384+
22385+ .macro pax_erase_kstack
22386+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22387+ call pax_erase_kstack
22388+#endif
22389+ .endm
22390+
22391+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22392+/*
22393+ * ebp: thread_info
22394+ */
22395+ENTRY(pax_erase_kstack)
22396+ pushl %edi
22397+ pushl %ecx
22398+ pushl %eax
22399+
22400+ mov TI_lowest_stack(%ebp), %edi
22401+ mov $-0xBEEF, %eax
22402+ std
22403+
22404+1: mov %edi, %ecx
22405+ and $THREAD_SIZE_asm - 1, %ecx
22406+ shr $2, %ecx
22407+ repne scasl
22408+ jecxz 2f
22409+
22410+ cmp $2*16, %ecx
22411+ jc 2f
22412+
22413+ mov $2*16, %ecx
22414+ repe scasl
22415+ jecxz 2f
22416+ jne 1b
22417+
22418+2: cld
22419+ or $2*4, %edi
22420+ mov %esp, %ecx
22421+ sub %edi, %ecx
22422+
22423+ cmp $THREAD_SIZE_asm, %ecx
22424+ jb 3f
22425+ ud2
22426+3:
22427+
22428+ shr $2, %ecx
22429+ rep stosl
22430+
22431+ mov TI_task_thread_sp0(%ebp), %edi
22432+ sub $128, %edi
22433+ mov %edi, TI_lowest_stack(%ebp)
22434+
22435+ popl %eax
22436+ popl %ecx
22437+ popl %edi
22438+ ret
22439+ENDPROC(pax_erase_kstack)
22440+#endif
22441+
22442+.macro __SAVE_ALL _DS
22443 cld
22444 PUSH_GS
22445 pushl_cfi %fs
22446@@ -206,7 +347,7 @@
22447 CFI_REL_OFFSET ecx, 0
22448 pushl_cfi %ebx
22449 CFI_REL_OFFSET ebx, 0
22450- movl $(__USER_DS), %edx
22451+ movl $\_DS, %edx
22452 movl %edx, %ds
22453 movl %edx, %es
22454 movl $(__KERNEL_PERCPU), %edx
22455@@ -214,6 +355,15 @@
22456 SET_KERNEL_GS %edx
22457 .endm
22458
22459+.macro SAVE_ALL
22460+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22461+ __SAVE_ALL __KERNEL_DS
22462+ pax_enter_kernel
22463+#else
22464+ __SAVE_ALL __USER_DS
22465+#endif
22466+.endm
22467+
22468 .macro RESTORE_INT_REGS
22469 popl_cfi %ebx
22470 CFI_RESTORE ebx
22471@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22472 popfl_cfi
22473 jmp syscall_exit
22474 CFI_ENDPROC
22475-END(ret_from_fork)
22476+ENDPROC(ret_from_fork)
22477
22478 ENTRY(ret_from_kernel_thread)
22479 CFI_STARTPROC
22480@@ -340,7 +490,15 @@ ret_from_intr:
22481 andl $SEGMENT_RPL_MASK, %eax
22482 #endif
22483 cmpl $USER_RPL, %eax
22484+
22485+#ifdef CONFIG_PAX_KERNEXEC
22486+ jae resume_userspace
22487+
22488+ pax_exit_kernel
22489+ jmp resume_kernel
22490+#else
22491 jb resume_kernel # not returning to v8086 or userspace
22492+#endif
22493
22494 ENTRY(resume_userspace)
22495 LOCKDEP_SYS_EXIT
22496@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22497 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22498 # int/exception return?
22499 jne work_pending
22500- jmp restore_all
22501-END(ret_from_exception)
22502+ jmp restore_all_pax
22503+ENDPROC(ret_from_exception)
22504
22505 #ifdef CONFIG_PREEMPT
22506 ENTRY(resume_kernel)
22507@@ -365,7 +523,7 @@ need_resched:
22508 jz restore_all
22509 call preempt_schedule_irq
22510 jmp need_resched
22511-END(resume_kernel)
22512+ENDPROC(resume_kernel)
22513 #endif
22514 CFI_ENDPROC
22515
22516@@ -395,30 +553,45 @@ sysenter_past_esp:
22517 /*CFI_REL_OFFSET cs, 0*/
22518 /*
22519 * Push current_thread_info()->sysenter_return to the stack.
22520- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22521- * pushed above; +8 corresponds to copy_thread's esp0 setting.
22522 */
22523- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22524+ pushl_cfi $0
22525 CFI_REL_OFFSET eip, 0
22526
22527 pushl_cfi %eax
22528 SAVE_ALL
22529+ GET_THREAD_INFO(%ebp)
22530+ movl TI_sysenter_return(%ebp),%ebp
22531+ movl %ebp,PT_EIP(%esp)
22532 ENABLE_INTERRUPTS(CLBR_NONE)
22533
22534 /*
22535 * Load the potential sixth argument from user stack.
22536 * Careful about security.
22537 */
22538+ movl PT_OLDESP(%esp),%ebp
22539+
22540+#ifdef CONFIG_PAX_MEMORY_UDEREF
22541+ mov PT_OLDSS(%esp),%ds
22542+1: movl %ds:(%ebp),%ebp
22543+ push %ss
22544+ pop %ds
22545+#else
22546 cmpl $__PAGE_OFFSET-3,%ebp
22547 jae syscall_fault
22548 ASM_STAC
22549 1: movl (%ebp),%ebp
22550 ASM_CLAC
22551+#endif
22552+
22553 movl %ebp,PT_EBP(%esp)
22554 _ASM_EXTABLE(1b,syscall_fault)
22555
22556 GET_THREAD_INFO(%ebp)
22557
22558+#ifdef CONFIG_PAX_RANDKSTACK
22559+ pax_erase_kstack
22560+#endif
22561+
22562 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22563 jnz sysenter_audit
22564 sysenter_do_call:
22565@@ -434,12 +607,24 @@ sysenter_after_call:
22566 testl $_TIF_ALLWORK_MASK, %ecx
22567 jne sysexit_audit
22568 sysenter_exit:
22569+
22570+#ifdef CONFIG_PAX_RANDKSTACK
22571+ pushl_cfi %eax
22572+ movl %esp, %eax
22573+ call pax_randomize_kstack
22574+ popl_cfi %eax
22575+#endif
22576+
22577+ pax_erase_kstack
22578+
22579 /* if something modifies registers it must also disable sysexit */
22580 movl PT_EIP(%esp), %edx
22581 movl PT_OLDESP(%esp), %ecx
22582 xorl %ebp,%ebp
22583 TRACE_IRQS_ON
22584 1: mov PT_FS(%esp), %fs
22585+2: mov PT_DS(%esp), %ds
22586+3: mov PT_ES(%esp), %es
22587 PTGS_TO_GS
22588 ENABLE_INTERRUPTS_SYSEXIT
22589
22590@@ -453,6 +638,9 @@ sysenter_audit:
22591 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22592 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22593 call __audit_syscall_entry
22594+
22595+ pax_erase_kstack
22596+
22597 popl_cfi %ecx /* get that remapped edx off the stack */
22598 popl_cfi %ecx /* get that remapped esi off the stack */
22599 movl PT_EAX(%esp),%eax /* reload syscall number */
22600@@ -479,10 +667,16 @@ sysexit_audit:
22601
22602 CFI_ENDPROC
22603 .pushsection .fixup,"ax"
22604-2: movl $0,PT_FS(%esp)
22605+4: movl $0,PT_FS(%esp)
22606+ jmp 1b
22607+5: movl $0,PT_DS(%esp)
22608+ jmp 1b
22609+6: movl $0,PT_ES(%esp)
22610 jmp 1b
22611 .popsection
22612- _ASM_EXTABLE(1b,2b)
22613+ _ASM_EXTABLE(1b,4b)
22614+ _ASM_EXTABLE(2b,5b)
22615+ _ASM_EXTABLE(3b,6b)
22616 PTGS_TO_GS_EX
22617 ENDPROC(ia32_sysenter_target)
22618
22619@@ -493,6 +687,11 @@ ENTRY(system_call)
22620 pushl_cfi %eax # save orig_eax
22621 SAVE_ALL
22622 GET_THREAD_INFO(%ebp)
22623+
22624+#ifdef CONFIG_PAX_RANDKSTACK
22625+ pax_erase_kstack
22626+#endif
22627+
22628 # system call tracing in operation / emulation
22629 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22630 jnz syscall_trace_entry
22631@@ -512,6 +711,15 @@ syscall_exit:
22632 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22633 jne syscall_exit_work
22634
22635+restore_all_pax:
22636+
22637+#ifdef CONFIG_PAX_RANDKSTACK
22638+ movl %esp, %eax
22639+ call pax_randomize_kstack
22640+#endif
22641+
22642+ pax_erase_kstack
22643+
22644 restore_all:
22645 TRACE_IRQS_IRET
22646 restore_all_notrace:
22647@@ -566,14 +774,34 @@ ldt_ss:
22648 * compensating for the offset by changing to the ESPFIX segment with
22649 * a base address that matches for the difference.
22650 */
22651-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22652+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22653 mov %esp, %edx /* load kernel esp */
22654 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22655 mov %dx, %ax /* eax: new kernel esp */
22656 sub %eax, %edx /* offset (low word is 0) */
22657+#ifdef CONFIG_SMP
22658+ movl PER_CPU_VAR(cpu_number), %ebx
22659+ shll $PAGE_SHIFT_asm, %ebx
22660+ addl $cpu_gdt_table, %ebx
22661+#else
22662+ movl $cpu_gdt_table, %ebx
22663+#endif
22664 shr $16, %edx
22665- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22666- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22667+
22668+#ifdef CONFIG_PAX_KERNEXEC
22669+ mov %cr0, %esi
22670+ btr $16, %esi
22671+ mov %esi, %cr0
22672+#endif
22673+
22674+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22675+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22676+
22677+#ifdef CONFIG_PAX_KERNEXEC
22678+ bts $16, %esi
22679+ mov %esi, %cr0
22680+#endif
22681+
22682 pushl_cfi $__ESPFIX_SS
22683 pushl_cfi %eax /* new kernel esp */
22684 /* Disable interrupts, but do not irqtrace this section: we
22685@@ -603,20 +831,18 @@ work_resched:
22686 movl TI_flags(%ebp), %ecx
22687 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22688 # than syscall tracing?
22689- jz restore_all
22690+ jz restore_all_pax
22691 testb $_TIF_NEED_RESCHED, %cl
22692 jnz work_resched
22693
22694 work_notifysig: # deal with pending signals and
22695 # notify-resume requests
22696+ movl %esp, %eax
22697 #ifdef CONFIG_VM86
22698 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22699- movl %esp, %eax
22700 jne work_notifysig_v86 # returning to kernel-space or
22701 # vm86-space
22702 1:
22703-#else
22704- movl %esp, %eax
22705 #endif
22706 TRACE_IRQS_ON
22707 ENABLE_INTERRUPTS(CLBR_NONE)
22708@@ -637,7 +863,7 @@ work_notifysig_v86:
22709 movl %eax, %esp
22710 jmp 1b
22711 #endif
22712-END(work_pending)
22713+ENDPROC(work_pending)
22714
22715 # perform syscall exit tracing
22716 ALIGN
22717@@ -645,11 +871,14 @@ syscall_trace_entry:
22718 movl $-ENOSYS,PT_EAX(%esp)
22719 movl %esp, %eax
22720 call syscall_trace_enter
22721+
22722+ pax_erase_kstack
22723+
22724 /* What it returned is what we'll actually use. */
22725 cmpl $(NR_syscalls), %eax
22726 jnae syscall_call
22727 jmp syscall_exit
22728-END(syscall_trace_entry)
22729+ENDPROC(syscall_trace_entry)
22730
22731 # perform syscall exit tracing
22732 ALIGN
22733@@ -662,26 +891,30 @@ syscall_exit_work:
22734 movl %esp, %eax
22735 call syscall_trace_leave
22736 jmp resume_userspace
22737-END(syscall_exit_work)
22738+ENDPROC(syscall_exit_work)
22739 CFI_ENDPROC
22740
22741 RING0_INT_FRAME # can't unwind into user space anyway
22742 syscall_fault:
22743+#ifdef CONFIG_PAX_MEMORY_UDEREF
22744+ push %ss
22745+ pop %ds
22746+#endif
22747 ASM_CLAC
22748 GET_THREAD_INFO(%ebp)
22749 movl $-EFAULT,PT_EAX(%esp)
22750 jmp resume_userspace
22751-END(syscall_fault)
22752+ENDPROC(syscall_fault)
22753
22754 syscall_badsys:
22755 movl $-ENOSYS,%eax
22756 jmp syscall_after_call
22757-END(syscall_badsys)
22758+ENDPROC(syscall_badsys)
22759
22760 sysenter_badsys:
22761 movl $-ENOSYS,%eax
22762 jmp sysenter_after_call
22763-END(sysenter_badsys)
22764+ENDPROC(sysenter_badsys)
22765 CFI_ENDPROC
22766
22767 .macro FIXUP_ESPFIX_STACK
22768@@ -694,8 +927,15 @@ END(sysenter_badsys)
22769 */
22770 #ifdef CONFIG_X86_ESPFIX32
22771 /* fixup the stack */
22772- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22773- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22774+#ifdef CONFIG_SMP
22775+ movl PER_CPU_VAR(cpu_number), %ebx
22776+ shll $PAGE_SHIFT_asm, %ebx
22777+ addl $cpu_gdt_table, %ebx
22778+#else
22779+ movl $cpu_gdt_table, %ebx
22780+#endif
22781+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22782+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22783 shl $16, %eax
22784 addl %esp, %eax /* the adjusted stack pointer */
22785 pushl_cfi $__KERNEL_DS
22786@@ -751,7 +991,7 @@ vector=vector+1
22787 .endr
22788 2: jmp common_interrupt
22789 .endr
22790-END(irq_entries_start)
22791+ENDPROC(irq_entries_start)
22792
22793 .previous
22794 END(interrupt)
22795@@ -808,7 +1048,7 @@ ENTRY(coprocessor_error)
22796 pushl_cfi $do_coprocessor_error
22797 jmp error_code
22798 CFI_ENDPROC
22799-END(coprocessor_error)
22800+ENDPROC(coprocessor_error)
22801
22802 ENTRY(simd_coprocessor_error)
22803 RING0_INT_FRAME
22804@@ -821,7 +1061,7 @@ ENTRY(simd_coprocessor_error)
22805 .section .altinstructions,"a"
22806 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22807 .previous
22808-.section .altinstr_replacement,"ax"
22809+.section .altinstr_replacement,"a"
22810 663: pushl $do_simd_coprocessor_error
22811 664:
22812 .previous
22813@@ -830,7 +1070,7 @@ ENTRY(simd_coprocessor_error)
22814 #endif
22815 jmp error_code
22816 CFI_ENDPROC
22817-END(simd_coprocessor_error)
22818+ENDPROC(simd_coprocessor_error)
22819
22820 ENTRY(device_not_available)
22821 RING0_INT_FRAME
22822@@ -839,18 +1079,18 @@ ENTRY(device_not_available)
22823 pushl_cfi $do_device_not_available
22824 jmp error_code
22825 CFI_ENDPROC
22826-END(device_not_available)
22827+ENDPROC(device_not_available)
22828
22829 #ifdef CONFIG_PARAVIRT
22830 ENTRY(native_iret)
22831 iret
22832 _ASM_EXTABLE(native_iret, iret_exc)
22833-END(native_iret)
22834+ENDPROC(native_iret)
22835
22836 ENTRY(native_irq_enable_sysexit)
22837 sti
22838 sysexit
22839-END(native_irq_enable_sysexit)
22840+ENDPROC(native_irq_enable_sysexit)
22841 #endif
22842
22843 ENTRY(overflow)
22844@@ -860,7 +1100,7 @@ ENTRY(overflow)
22845 pushl_cfi $do_overflow
22846 jmp error_code
22847 CFI_ENDPROC
22848-END(overflow)
22849+ENDPROC(overflow)
22850
22851 ENTRY(bounds)
22852 RING0_INT_FRAME
22853@@ -869,7 +1109,7 @@ ENTRY(bounds)
22854 pushl_cfi $do_bounds
22855 jmp error_code
22856 CFI_ENDPROC
22857-END(bounds)
22858+ENDPROC(bounds)
22859
22860 ENTRY(invalid_op)
22861 RING0_INT_FRAME
22862@@ -878,7 +1118,7 @@ ENTRY(invalid_op)
22863 pushl_cfi $do_invalid_op
22864 jmp error_code
22865 CFI_ENDPROC
22866-END(invalid_op)
22867+ENDPROC(invalid_op)
22868
22869 ENTRY(coprocessor_segment_overrun)
22870 RING0_INT_FRAME
22871@@ -887,7 +1127,7 @@ ENTRY(coprocessor_segment_overrun)
22872 pushl_cfi $do_coprocessor_segment_overrun
22873 jmp error_code
22874 CFI_ENDPROC
22875-END(coprocessor_segment_overrun)
22876+ENDPROC(coprocessor_segment_overrun)
22877
22878 ENTRY(invalid_TSS)
22879 RING0_EC_FRAME
22880@@ -895,7 +1135,7 @@ ENTRY(invalid_TSS)
22881 pushl_cfi $do_invalid_TSS
22882 jmp error_code
22883 CFI_ENDPROC
22884-END(invalid_TSS)
22885+ENDPROC(invalid_TSS)
22886
22887 ENTRY(segment_not_present)
22888 RING0_EC_FRAME
22889@@ -903,7 +1143,7 @@ ENTRY(segment_not_present)
22890 pushl_cfi $do_segment_not_present
22891 jmp error_code
22892 CFI_ENDPROC
22893-END(segment_not_present)
22894+ENDPROC(segment_not_present)
22895
22896 ENTRY(stack_segment)
22897 RING0_EC_FRAME
22898@@ -911,7 +1151,7 @@ ENTRY(stack_segment)
22899 pushl_cfi $do_stack_segment
22900 jmp error_code
22901 CFI_ENDPROC
22902-END(stack_segment)
22903+ENDPROC(stack_segment)
22904
22905 ENTRY(alignment_check)
22906 RING0_EC_FRAME
22907@@ -919,7 +1159,7 @@ ENTRY(alignment_check)
22908 pushl_cfi $do_alignment_check
22909 jmp error_code
22910 CFI_ENDPROC
22911-END(alignment_check)
22912+ENDPROC(alignment_check)
22913
22914 ENTRY(divide_error)
22915 RING0_INT_FRAME
22916@@ -928,7 +1168,7 @@ ENTRY(divide_error)
22917 pushl_cfi $do_divide_error
22918 jmp error_code
22919 CFI_ENDPROC
22920-END(divide_error)
22921+ENDPROC(divide_error)
22922
22923 #ifdef CONFIG_X86_MCE
22924 ENTRY(machine_check)
22925@@ -938,7 +1178,7 @@ ENTRY(machine_check)
22926 pushl_cfi machine_check_vector
22927 jmp error_code
22928 CFI_ENDPROC
22929-END(machine_check)
22930+ENDPROC(machine_check)
22931 #endif
22932
22933 ENTRY(spurious_interrupt_bug)
22934@@ -948,7 +1188,7 @@ ENTRY(spurious_interrupt_bug)
22935 pushl_cfi $do_spurious_interrupt_bug
22936 jmp error_code
22937 CFI_ENDPROC
22938-END(spurious_interrupt_bug)
22939+ENDPROC(spurious_interrupt_bug)
22940
22941 #ifdef CONFIG_XEN
22942 /* Xen doesn't set %esp to be precisely what the normal sysenter
22943@@ -1057,7 +1297,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22944
22945 ENTRY(mcount)
22946 ret
22947-END(mcount)
22948+ENDPROC(mcount)
22949
22950 ENTRY(ftrace_caller)
22951 pushl %eax
22952@@ -1087,7 +1327,7 @@ ftrace_graph_call:
22953 .globl ftrace_stub
22954 ftrace_stub:
22955 ret
22956-END(ftrace_caller)
22957+ENDPROC(ftrace_caller)
22958
22959 ENTRY(ftrace_regs_caller)
22960 pushf /* push flags before compare (in cs location) */
22961@@ -1185,7 +1425,7 @@ trace:
22962 popl %ecx
22963 popl %eax
22964 jmp ftrace_stub
22965-END(mcount)
22966+ENDPROC(mcount)
22967 #endif /* CONFIG_DYNAMIC_FTRACE */
22968 #endif /* CONFIG_FUNCTION_TRACER */
22969
22970@@ -1203,7 +1443,7 @@ ENTRY(ftrace_graph_caller)
22971 popl %ecx
22972 popl %eax
22973 ret
22974-END(ftrace_graph_caller)
22975+ENDPROC(ftrace_graph_caller)
22976
22977 .globl return_to_handler
22978 return_to_handler:
22979@@ -1264,15 +1504,18 @@ error_code:
22980 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22981 REG_TO_PTGS %ecx
22982 SET_KERNEL_GS %ecx
22983- movl $(__USER_DS), %ecx
22984+ movl $(__KERNEL_DS), %ecx
22985 movl %ecx, %ds
22986 movl %ecx, %es
22987+
22988+ pax_enter_kernel
22989+
22990 TRACE_IRQS_OFF
22991 movl %esp,%eax # pt_regs pointer
22992 call *%edi
22993 jmp ret_from_exception
22994 CFI_ENDPROC
22995-END(page_fault)
22996+ENDPROC(page_fault)
22997
22998 /*
22999 * Debug traps and NMI can happen at the one SYSENTER instruction
23000@@ -1315,7 +1558,7 @@ debug_stack_correct:
23001 call do_debug
23002 jmp ret_from_exception
23003 CFI_ENDPROC
23004-END(debug)
23005+ENDPROC(debug)
23006
23007 /*
23008 * NMI is doubly nasty. It can happen _while_ we're handling
23009@@ -1355,6 +1598,9 @@ nmi_stack_correct:
23010 xorl %edx,%edx # zero error code
23011 movl %esp,%eax # pt_regs pointer
23012 call do_nmi
23013+
23014+ pax_exit_kernel
23015+
23016 jmp restore_all_notrace
23017 CFI_ENDPROC
23018
23019@@ -1392,13 +1638,16 @@ nmi_espfix_stack:
23020 FIXUP_ESPFIX_STACK # %eax == %esp
23021 xorl %edx,%edx # zero error code
23022 call do_nmi
23023+
23024+ pax_exit_kernel
23025+
23026 RESTORE_REGS
23027 lss 12+4(%esp), %esp # back to espfix stack
23028 CFI_ADJUST_CFA_OFFSET -24
23029 jmp irq_return
23030 #endif
23031 CFI_ENDPROC
23032-END(nmi)
23033+ENDPROC(nmi)
23034
23035 ENTRY(int3)
23036 RING0_INT_FRAME
23037@@ -1411,14 +1660,14 @@ ENTRY(int3)
23038 call do_int3
23039 jmp ret_from_exception
23040 CFI_ENDPROC
23041-END(int3)
23042+ENDPROC(int3)
23043
23044 ENTRY(general_protection)
23045 RING0_EC_FRAME
23046 pushl_cfi $do_general_protection
23047 jmp error_code
23048 CFI_ENDPROC
23049-END(general_protection)
23050+ENDPROC(general_protection)
23051
23052 #ifdef CONFIG_KVM_GUEST
23053 ENTRY(async_page_fault)
23054@@ -1427,6 +1676,6 @@ ENTRY(async_page_fault)
23055 pushl_cfi $do_async_page_fault
23056 jmp error_code
23057 CFI_ENDPROC
23058-END(async_page_fault)
23059+ENDPROC(async_page_fault)
23060 #endif
23061
23062diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23063index f0095a7..7ece039 100644
23064--- a/arch/x86/kernel/entry_64.S
23065+++ b/arch/x86/kernel/entry_64.S
23066@@ -59,6 +59,8 @@
23067 #include <asm/smap.h>
23068 #include <asm/pgtable_types.h>
23069 #include <linux/err.h>
23070+#include <asm/pgtable.h>
23071+#include <asm/alternative-asm.h>
23072
23073 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23074 #include <linux/elf-em.h>
23075@@ -81,6 +83,431 @@ ENTRY(native_usergs_sysret64)
23076 ENDPROC(native_usergs_sysret64)
23077 #endif /* CONFIG_PARAVIRT */
23078
23079+ .macro ljmpq sel, off
23080+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23081+ .byte 0x48; ljmp *1234f(%rip)
23082+ .pushsection .rodata
23083+ .align 16
23084+ 1234: .quad \off; .word \sel
23085+ .popsection
23086+#else
23087+ pushq $\sel
23088+ pushq $\off
23089+ lretq
23090+#endif
23091+ .endm
23092+
23093+ .macro pax_enter_kernel
23094+ pax_set_fptr_mask
23095+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23096+ call pax_enter_kernel
23097+#endif
23098+ .endm
23099+
23100+ .macro pax_exit_kernel
23101+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23102+ call pax_exit_kernel
23103+#endif
23104+
23105+ .endm
23106+
23107+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23108+ENTRY(pax_enter_kernel)
23109+ pushq %rdi
23110+
23111+#ifdef CONFIG_PARAVIRT
23112+ PV_SAVE_REGS(CLBR_RDI)
23113+#endif
23114+
23115+#ifdef CONFIG_PAX_KERNEXEC
23116+ GET_CR0_INTO_RDI
23117+ bts $X86_CR0_WP_BIT,%rdi
23118+ jnc 3f
23119+ mov %cs,%edi
23120+ cmp $__KERNEL_CS,%edi
23121+ jnz 2f
23122+1:
23123+#endif
23124+
23125+#ifdef CONFIG_PAX_MEMORY_UDEREF
23126+ 661: jmp 111f
23127+ .pushsection .altinstr_replacement, "a"
23128+ 662: ASM_NOP2
23129+ .popsection
23130+ .pushsection .altinstructions, "a"
23131+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23132+ .popsection
23133+ GET_CR3_INTO_RDI
23134+ cmp $0,%dil
23135+ jnz 112f
23136+ mov $__KERNEL_DS,%edi
23137+ mov %edi,%ss
23138+ jmp 111f
23139+112: cmp $1,%dil
23140+ jz 113f
23141+ ud2
23142+113: sub $4097,%rdi
23143+ bts $63,%rdi
23144+ SET_RDI_INTO_CR3
23145+ mov $__UDEREF_KERNEL_DS,%edi
23146+ mov %edi,%ss
23147+111:
23148+#endif
23149+
23150+#ifdef CONFIG_PARAVIRT
23151+ PV_RESTORE_REGS(CLBR_RDI)
23152+#endif
23153+
23154+ popq %rdi
23155+ pax_force_retaddr
23156+ retq
23157+
23158+#ifdef CONFIG_PAX_KERNEXEC
23159+2: ljmpq __KERNEL_CS,1b
23160+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23161+4: SET_RDI_INTO_CR0
23162+ jmp 1b
23163+#endif
23164+ENDPROC(pax_enter_kernel)
23165+
23166+ENTRY(pax_exit_kernel)
23167+ pushq %rdi
23168+
23169+#ifdef CONFIG_PARAVIRT
23170+ PV_SAVE_REGS(CLBR_RDI)
23171+#endif
23172+
23173+#ifdef CONFIG_PAX_KERNEXEC
23174+ mov %cs,%rdi
23175+ cmp $__KERNEXEC_KERNEL_CS,%edi
23176+ jz 2f
23177+ GET_CR0_INTO_RDI
23178+ bts $X86_CR0_WP_BIT,%rdi
23179+ jnc 4f
23180+1:
23181+#endif
23182+
23183+#ifdef CONFIG_PAX_MEMORY_UDEREF
23184+ 661: jmp 111f
23185+ .pushsection .altinstr_replacement, "a"
23186+ 662: ASM_NOP2
23187+ .popsection
23188+ .pushsection .altinstructions, "a"
23189+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23190+ .popsection
23191+ mov %ss,%edi
23192+ cmp $__UDEREF_KERNEL_DS,%edi
23193+ jnz 111f
23194+ GET_CR3_INTO_RDI
23195+ cmp $0,%dil
23196+ jz 112f
23197+ ud2
23198+112: add $4097,%rdi
23199+ bts $63,%rdi
23200+ SET_RDI_INTO_CR3
23201+ mov $__KERNEL_DS,%edi
23202+ mov %edi,%ss
23203+111:
23204+#endif
23205+
23206+#ifdef CONFIG_PARAVIRT
23207+ PV_RESTORE_REGS(CLBR_RDI);
23208+#endif
23209+
23210+ popq %rdi
23211+ pax_force_retaddr
23212+ retq
23213+
23214+#ifdef CONFIG_PAX_KERNEXEC
23215+2: GET_CR0_INTO_RDI
23216+ btr $X86_CR0_WP_BIT,%rdi
23217+ jnc 4f
23218+ ljmpq __KERNEL_CS,3f
23219+3: SET_RDI_INTO_CR0
23220+ jmp 1b
23221+4: ud2
23222+ jmp 4b
23223+#endif
23224+ENDPROC(pax_exit_kernel)
23225+#endif
23226+
23227+ .macro pax_enter_kernel_user
23228+ pax_set_fptr_mask
23229+#ifdef CONFIG_PAX_MEMORY_UDEREF
23230+ call pax_enter_kernel_user
23231+#endif
23232+ .endm
23233+
23234+ .macro pax_exit_kernel_user
23235+#ifdef CONFIG_PAX_MEMORY_UDEREF
23236+ call pax_exit_kernel_user
23237+#endif
23238+#ifdef CONFIG_PAX_RANDKSTACK
23239+ pushq %rax
23240+ pushq %r11
23241+ call pax_randomize_kstack
23242+ popq %r11
23243+ popq %rax
23244+#endif
23245+ .endm
23246+
23247+#ifdef CONFIG_PAX_MEMORY_UDEREF
23248+ENTRY(pax_enter_kernel_user)
23249+ pushq %rdi
23250+ pushq %rbx
23251+
23252+#ifdef CONFIG_PARAVIRT
23253+ PV_SAVE_REGS(CLBR_RDI)
23254+#endif
23255+
23256+ 661: jmp 111f
23257+ .pushsection .altinstr_replacement, "a"
23258+ 662: ASM_NOP2
23259+ .popsection
23260+ .pushsection .altinstructions, "a"
23261+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23262+ .popsection
23263+ GET_CR3_INTO_RDI
23264+ cmp $1,%dil
23265+ jnz 4f
23266+ sub $4097,%rdi
23267+ bts $63,%rdi
23268+ SET_RDI_INTO_CR3
23269+ jmp 3f
23270+111:
23271+
23272+ GET_CR3_INTO_RDI
23273+ mov %rdi,%rbx
23274+ add $__START_KERNEL_map,%rbx
23275+ sub phys_base(%rip),%rbx
23276+
23277+#ifdef CONFIG_PARAVIRT
23278+ cmpl $0, pv_info+PARAVIRT_enabled
23279+ jz 1f
23280+ pushq %rdi
23281+ i = 0
23282+ .rept USER_PGD_PTRS
23283+ mov i*8(%rbx),%rsi
23284+ mov $0,%sil
23285+ lea i*8(%rbx),%rdi
23286+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23287+ i = i + 1
23288+ .endr
23289+ popq %rdi
23290+ jmp 2f
23291+1:
23292+#endif
23293+
23294+ i = 0
23295+ .rept USER_PGD_PTRS
23296+ movb $0,i*8(%rbx)
23297+ i = i + 1
23298+ .endr
23299+
23300+2: SET_RDI_INTO_CR3
23301+
23302+#ifdef CONFIG_PAX_KERNEXEC
23303+ GET_CR0_INTO_RDI
23304+ bts $X86_CR0_WP_BIT,%rdi
23305+ SET_RDI_INTO_CR0
23306+#endif
23307+
23308+3:
23309+
23310+#ifdef CONFIG_PARAVIRT
23311+ PV_RESTORE_REGS(CLBR_RDI)
23312+#endif
23313+
23314+ popq %rbx
23315+ popq %rdi
23316+ pax_force_retaddr
23317+ retq
23318+4: ud2
23319+ENDPROC(pax_enter_kernel_user)
23320+
23321+ENTRY(pax_exit_kernel_user)
23322+ pushq %rdi
23323+ pushq %rbx
23324+
23325+#ifdef CONFIG_PARAVIRT
23326+ PV_SAVE_REGS(CLBR_RDI)
23327+#endif
23328+
23329+ GET_CR3_INTO_RDI
23330+ 661: jmp 1f
23331+ .pushsection .altinstr_replacement, "a"
23332+ 662: ASM_NOP2
23333+ .popsection
23334+ .pushsection .altinstructions, "a"
23335+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23336+ .popsection
23337+ cmp $0,%dil
23338+ jnz 3f
23339+ add $4097,%rdi
23340+ bts $63,%rdi
23341+ SET_RDI_INTO_CR3
23342+ jmp 2f
23343+1:
23344+
23345+ mov %rdi,%rbx
23346+
23347+#ifdef CONFIG_PAX_KERNEXEC
23348+ GET_CR0_INTO_RDI
23349+ btr $X86_CR0_WP_BIT,%rdi
23350+ jnc 3f
23351+ SET_RDI_INTO_CR0
23352+#endif
23353+
23354+ add $__START_KERNEL_map,%rbx
23355+ sub phys_base(%rip),%rbx
23356+
23357+#ifdef CONFIG_PARAVIRT
23358+ cmpl $0, pv_info+PARAVIRT_enabled
23359+ jz 1f
23360+ i = 0
23361+ .rept USER_PGD_PTRS
23362+ mov i*8(%rbx),%rsi
23363+ mov $0x67,%sil
23364+ lea i*8(%rbx),%rdi
23365+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23366+ i = i + 1
23367+ .endr
23368+ jmp 2f
23369+1:
23370+#endif
23371+
23372+ i = 0
23373+ .rept USER_PGD_PTRS
23374+ movb $0x67,i*8(%rbx)
23375+ i = i + 1
23376+ .endr
23377+2:
23378+
23379+#ifdef CONFIG_PARAVIRT
23380+ PV_RESTORE_REGS(CLBR_RDI)
23381+#endif
23382+
23383+ popq %rbx
23384+ popq %rdi
23385+ pax_force_retaddr
23386+ retq
23387+3: ud2
23388+ENDPROC(pax_exit_kernel_user)
23389+#endif
23390+
23391+ .macro pax_enter_kernel_nmi
23392+ pax_set_fptr_mask
23393+
23394+#ifdef CONFIG_PAX_KERNEXEC
23395+ GET_CR0_INTO_RDI
23396+ bts $X86_CR0_WP_BIT,%rdi
23397+ jc 110f
23398+ SET_RDI_INTO_CR0
23399+ or $2,%ebx
23400+110:
23401+#endif
23402+
23403+#ifdef CONFIG_PAX_MEMORY_UDEREF
23404+ 661: jmp 111f
23405+ .pushsection .altinstr_replacement, "a"
23406+ 662: ASM_NOP2
23407+ .popsection
23408+ .pushsection .altinstructions, "a"
23409+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23410+ .popsection
23411+ GET_CR3_INTO_RDI
23412+ cmp $0,%dil
23413+ jz 111f
23414+ sub $4097,%rdi
23415+ or $4,%ebx
23416+ bts $63,%rdi
23417+ SET_RDI_INTO_CR3
23418+ mov $__UDEREF_KERNEL_DS,%edi
23419+ mov %edi,%ss
23420+111:
23421+#endif
23422+ .endm
23423+
23424+ .macro pax_exit_kernel_nmi
23425+#ifdef CONFIG_PAX_KERNEXEC
23426+ btr $1,%ebx
23427+ jnc 110f
23428+ GET_CR0_INTO_RDI
23429+ btr $X86_CR0_WP_BIT,%rdi
23430+ SET_RDI_INTO_CR0
23431+110:
23432+#endif
23433+
23434+#ifdef CONFIG_PAX_MEMORY_UDEREF
23435+ btr $2,%ebx
23436+ jnc 111f
23437+ GET_CR3_INTO_RDI
23438+ add $4097,%rdi
23439+ bts $63,%rdi
23440+ SET_RDI_INTO_CR3
23441+ mov $__KERNEL_DS,%edi
23442+ mov %edi,%ss
23443+111:
23444+#endif
23445+ .endm
23446+
23447+ .macro pax_erase_kstack
23448+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23449+ call pax_erase_kstack
23450+#endif
23451+ .endm
23452+
23453+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23454+ENTRY(pax_erase_kstack)
23455+ pushq %rdi
23456+ pushq %rcx
23457+ pushq %rax
23458+ pushq %r11
23459+
23460+ GET_THREAD_INFO(%r11)
23461+ mov TI_lowest_stack(%r11), %rdi
23462+ mov $-0xBEEF, %rax
23463+ std
23464+
23465+1: mov %edi, %ecx
23466+ and $THREAD_SIZE_asm - 1, %ecx
23467+ shr $3, %ecx
23468+ repne scasq
23469+ jecxz 2f
23470+
23471+ cmp $2*8, %ecx
23472+ jc 2f
23473+
23474+ mov $2*8, %ecx
23475+ repe scasq
23476+ jecxz 2f
23477+ jne 1b
23478+
23479+2: cld
23480+ or $2*8, %rdi
23481+ mov %esp, %ecx
23482+ sub %edi, %ecx
23483+
23484+ cmp $THREAD_SIZE_asm, %rcx
23485+ jb 3f
23486+ ud2
23487+3:
23488+
23489+ shr $3, %ecx
23490+ rep stosq
23491+
23492+ mov TI_task_thread_sp0(%r11), %rdi
23493+ sub $256, %rdi
23494+ mov %rdi, TI_lowest_stack(%r11)
23495+
23496+ popq %r11
23497+ popq %rax
23498+ popq %rcx
23499+ popq %rdi
23500+ pax_force_retaddr
23501+ ret
23502+ENDPROC(pax_erase_kstack)
23503+#endif
23504
23505 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23506 #ifdef CONFIG_TRACE_IRQFLAGS
23507@@ -117,7 +544,7 @@ ENDPROC(native_usergs_sysret64)
23508 .endm
23509
23510 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23511- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23512+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23513 jnc 1f
23514 TRACE_IRQS_ON_DEBUG
23515 1:
23516@@ -243,9 +670,52 @@ ENTRY(save_paranoid)
23517 js 1f /* negative -> in kernel */
23518 SWAPGS
23519 xorl %ebx,%ebx
23520-1: ret
23521+1:
23522+#ifdef CONFIG_PAX_MEMORY_UDEREF
23523+ testb $3, CS+8(%rsp)
23524+ jnz 1f
23525+ pax_enter_kernel
23526+ jmp 2f
23527+1: pax_enter_kernel_user
23528+2:
23529+#else
23530+ pax_enter_kernel
23531+#endif
23532+ pax_force_retaddr
23533+ ret
23534 CFI_ENDPROC
23535-END(save_paranoid)
23536+ENDPROC(save_paranoid)
23537+
23538+ENTRY(save_paranoid_nmi)
23539+ XCPT_FRAME 1 RDI+8
23540+ cld
23541+ movq_cfi rdi, RDI+8
23542+ movq_cfi rsi, RSI+8
23543+ movq_cfi rdx, RDX+8
23544+ movq_cfi rcx, RCX+8
23545+ movq_cfi rax, RAX+8
23546+ movq_cfi r8, R8+8
23547+ movq_cfi r9, R9+8
23548+ movq_cfi r10, R10+8
23549+ movq_cfi r11, R11+8
23550+ movq_cfi rbx, RBX+8
23551+ movq_cfi rbp, RBP+8
23552+ movq_cfi r12, R12+8
23553+ movq_cfi r13, R13+8
23554+ movq_cfi r14, R14+8
23555+ movq_cfi r15, R15+8
23556+ movl $1,%ebx
23557+ movl $MSR_GS_BASE,%ecx
23558+ rdmsr
23559+ testl %edx,%edx
23560+ js 1f /* negative -> in kernel */
23561+ SWAPGS
23562+ xorl %ebx,%ebx
23563+1: pax_enter_kernel_nmi
23564+ pax_force_retaddr
23565+ ret
23566+ CFI_ENDPROC
23567+ENDPROC(save_paranoid_nmi)
23568
23569 /*
23570 * A newly forked process directly context switches into this address.
23571@@ -266,7 +736,7 @@ ENTRY(ret_from_fork)
23572
23573 RESTORE_REST
23574
23575- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23576+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23577 jz 1f
23578
23579 /*
23580@@ -279,15 +749,13 @@ ENTRY(ret_from_fork)
23581 jmp int_ret_from_sys_call
23582
23583 1:
23584- subq $REST_SKIP, %rsp # leave space for volatiles
23585- CFI_ADJUST_CFA_OFFSET REST_SKIP
23586 movq %rbp, %rdi
23587 call *%rbx
23588 movl $0, RAX(%rsp)
23589 RESTORE_REST
23590 jmp int_ret_from_sys_call
23591 CFI_ENDPROC
23592-END(ret_from_fork)
23593+ENDPROC(ret_from_fork)
23594
23595 /*
23596 * System call entry. Up to 6 arguments in registers are supported.
23597@@ -324,7 +792,7 @@ END(ret_from_fork)
23598 ENTRY(system_call)
23599 CFI_STARTPROC simple
23600 CFI_SIGNAL_FRAME
23601- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23602+ CFI_DEF_CFA rsp,0
23603 CFI_REGISTER rip,rcx
23604 /*CFI_REGISTER rflags,r11*/
23605 SWAPGS_UNSAFE_STACK
23606@@ -337,16 +805,23 @@ GLOBAL(system_call_after_swapgs)
23607
23608 movq %rsp,PER_CPU_VAR(old_rsp)
23609 movq PER_CPU_VAR(kernel_stack),%rsp
23610+ SAVE_ARGS 8*6, 0, rax_enosys=1
23611+ pax_enter_kernel_user
23612+
23613+#ifdef CONFIG_PAX_RANDKSTACK
23614+ pax_erase_kstack
23615+#endif
23616+
23617 /*
23618 * No need to follow this irqs off/on section - it's straight
23619 * and short:
23620 */
23621 ENABLE_INTERRUPTS(CLBR_NONE)
23622- SAVE_ARGS 8, 0, rax_enosys=1
23623 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23624 movq %rcx,RIP-ARGOFFSET(%rsp)
23625 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23626- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23627+ GET_THREAD_INFO(%rcx)
23628+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23629 jnz tracesys
23630 system_call_fastpath:
23631 #if __SYSCALL_MASK == ~0
23632@@ -376,10 +851,13 @@ ret_from_sys_call:
23633 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
23634 * very bad.
23635 */
23636- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23637+ GET_THREAD_INFO(%rcx)
23638+ testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
23639 jnz int_ret_from_sys_call_fixup /* Go the the slow path */
23640
23641 CFI_REMEMBER_STATE
23642+ pax_exit_kernel_user
23643+ pax_erase_kstack
23644 /*
23645 * sysretq will re-enable interrupts:
23646 */
23647@@ -399,12 +877,15 @@ int_ret_from_sys_call_fixup:
23648
23649 /* Do syscall tracing */
23650 tracesys:
23651- leaq -REST_SKIP(%rsp), %rdi
23652+ movq %rsp, %rdi
23653 movq $AUDIT_ARCH_X86_64, %rsi
23654 call syscall_trace_enter_phase1
23655 test %rax, %rax
23656 jnz tracesys_phase2 /* if needed, run the slow path */
23657- LOAD_ARGS 0 /* else restore clobbered regs */
23658+
23659+ pax_erase_kstack
23660+
23661+ LOAD_ARGS /* else restore clobbered regs */
23662 jmp system_call_fastpath /* and return to the fast path */
23663
23664 tracesys_phase2:
23665@@ -415,12 +896,14 @@ tracesys_phase2:
23666 movq %rax,%rdx
23667 call syscall_trace_enter_phase2
23668
23669+ pax_erase_kstack
23670+
23671 /*
23672 * Reload arg registers from stack in case ptrace changed them.
23673 * We don't reload %rax because syscall_trace_entry_phase2() returned
23674 * the value it wants us to use in the table lookup.
23675 */
23676- LOAD_ARGS ARGOFFSET, 1
23677+ LOAD_ARGS 1
23678 RESTORE_REST
23679 #if __SYSCALL_MASK == ~0
23680 cmpq $__NR_syscall_max,%rax
23681@@ -451,7 +934,9 @@ GLOBAL(int_with_check)
23682 andl %edi,%edx
23683 jnz int_careful
23684 andl $~TS_COMPAT,TI_status(%rcx)
23685- jmp retint_swapgs
23686+ pax_exit_kernel_user
23687+ pax_erase_kstack
23688+ jmp retint_swapgs_pax
23689
23690 /* Either reschedule or signal or syscall exit tracking needed. */
23691 /* First do a reschedule test. */
23692@@ -497,7 +982,7 @@ int_restore_rest:
23693 TRACE_IRQS_OFF
23694 jmp int_with_check
23695 CFI_ENDPROC
23696-END(system_call)
23697+ENDPROC(system_call)
23698
23699 .macro FORK_LIKE func
23700 ENTRY(stub_\func)
23701@@ -510,9 +995,10 @@ ENTRY(stub_\func)
23702 DEFAULT_FRAME 0 8 /* offset 8: return address */
23703 call sys_\func
23704 RESTORE_TOP_OF_STACK %r11, 8
23705- ret $REST_SKIP /* pop extended registers */
23706+ pax_force_retaddr
23707+ ret
23708 CFI_ENDPROC
23709-END(stub_\func)
23710+ENDPROC(stub_\func)
23711 .endm
23712
23713 .macro FIXED_FRAME label,func
23714@@ -522,9 +1008,10 @@ ENTRY(\label)
23715 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23716 call \func
23717 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23718+ pax_force_retaddr
23719 ret
23720 CFI_ENDPROC
23721-END(\label)
23722+ENDPROC(\label)
23723 .endm
23724
23725 FORK_LIKE clone
23726@@ -543,7 +1030,7 @@ ENTRY(stub_execve)
23727 RESTORE_REST
23728 jmp int_ret_from_sys_call
23729 CFI_ENDPROC
23730-END(stub_execve)
23731+ENDPROC(stub_execve)
23732
23733 ENTRY(stub_execveat)
23734 CFI_STARTPROC
23735@@ -557,7 +1044,7 @@ ENTRY(stub_execveat)
23736 RESTORE_REST
23737 jmp int_ret_from_sys_call
23738 CFI_ENDPROC
23739-END(stub_execveat)
23740+ENDPROC(stub_execveat)
23741
23742 /*
23743 * sigreturn is special because it needs to restore all registers on return.
23744@@ -574,7 +1061,7 @@ ENTRY(stub_rt_sigreturn)
23745 RESTORE_REST
23746 jmp int_ret_from_sys_call
23747 CFI_ENDPROC
23748-END(stub_rt_sigreturn)
23749+ENDPROC(stub_rt_sigreturn)
23750
23751 #ifdef CONFIG_X86_X32_ABI
23752 ENTRY(stub_x32_rt_sigreturn)
23753@@ -588,7 +1075,7 @@ ENTRY(stub_x32_rt_sigreturn)
23754 RESTORE_REST
23755 jmp int_ret_from_sys_call
23756 CFI_ENDPROC
23757-END(stub_x32_rt_sigreturn)
23758+ENDPROC(stub_x32_rt_sigreturn)
23759
23760 ENTRY(stub_x32_execve)
23761 CFI_STARTPROC
23762@@ -602,7 +1089,7 @@ ENTRY(stub_x32_execve)
23763 RESTORE_REST
23764 jmp int_ret_from_sys_call
23765 CFI_ENDPROC
23766-END(stub_x32_execve)
23767+ENDPROC(stub_x32_execve)
23768
23769 ENTRY(stub_x32_execveat)
23770 CFI_STARTPROC
23771@@ -616,7 +1103,7 @@ ENTRY(stub_x32_execveat)
23772 RESTORE_REST
23773 jmp int_ret_from_sys_call
23774 CFI_ENDPROC
23775-END(stub_x32_execveat)
23776+ENDPROC(stub_x32_execveat)
23777
23778 #endif
23779
23780@@ -653,7 +1140,7 @@ vector=vector+1
23781 2: jmp common_interrupt
23782 .endr
23783 CFI_ENDPROC
23784-END(irq_entries_start)
23785+ENDPROC(irq_entries_start)
23786
23787 .previous
23788 END(interrupt)
23789@@ -670,28 +1157,29 @@ END(interrupt)
23790 /* 0(%rsp): ~(interrupt number) */
23791 .macro interrupt func
23792 /* reserve pt_regs for scratch regs and rbp */
23793- subq $ORIG_RAX-RBP, %rsp
23794- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23795+ subq $ORIG_RAX, %rsp
23796+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
23797 cld
23798- /* start from rbp in pt_regs and jump over */
23799- movq_cfi rdi, (RDI-RBP)
23800- movq_cfi rsi, (RSI-RBP)
23801- movq_cfi rdx, (RDX-RBP)
23802- movq_cfi rcx, (RCX-RBP)
23803- movq_cfi rax, (RAX-RBP)
23804- movq_cfi r8, (R8-RBP)
23805- movq_cfi r9, (R9-RBP)
23806- movq_cfi r10, (R10-RBP)
23807- movq_cfi r11, (R11-RBP)
23808+ /* start from r15 in pt_regs and jump over */
23809+ movq_cfi rdi, RDI
23810+ movq_cfi rsi, RSI
23811+ movq_cfi rdx, RDX
23812+ movq_cfi rcx, RCX
23813+ movq_cfi rax, RAX
23814+ movq_cfi r8, R8
23815+ movq_cfi r9, R9
23816+ movq_cfi r10, R10
23817+ movq_cfi r11, R11
23818+ movq_cfi r12, R12
23819
23820 /* Save rbp so that we can unwind from get_irq_regs() */
23821- movq_cfi rbp, 0
23822+ movq_cfi rbp, RBP
23823
23824 /* Save previous stack value */
23825 movq %rsp, %rsi
23826
23827- leaq -RBP(%rsp),%rdi /* arg1 for handler */
23828- testl $3, CS-RBP(%rsi)
23829+ movq %rsp,%rdi /* arg1 for handler */
23830+ testb $3, CS(%rsi)
23831 je 1f
23832 SWAPGS
23833 /*
23834@@ -711,6 +1199,18 @@ END(interrupt)
23835 0x06 /* DW_OP_deref */, \
23836 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23837 0x22 /* DW_OP_plus */
23838+
23839+#ifdef CONFIG_PAX_MEMORY_UDEREF
23840+ testb $3, CS(%rdi)
23841+ jnz 1f
23842+ pax_enter_kernel
23843+ jmp 2f
23844+1: pax_enter_kernel_user
23845+2:
23846+#else
23847+ pax_enter_kernel
23848+#endif
23849+
23850 /* We entered an interrupt context - irqs are off: */
23851 TRACE_IRQS_OFF
23852
23853@@ -735,14 +1235,14 @@ ret_from_intr:
23854
23855 /* Restore saved previous stack */
23856 popq %rsi
23857- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23858- leaq ARGOFFSET-RBP(%rsi), %rsp
23859+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23860+ movq %rsi, %rsp
23861 CFI_DEF_CFA_REGISTER rsp
23862- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23863+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23864
23865 exit_intr:
23866 GET_THREAD_INFO(%rcx)
23867- testl $3,CS-ARGOFFSET(%rsp)
23868+ testb $3,CS-ARGOFFSET(%rsp)
23869 je retint_kernel
23870
23871 /* Interrupt came from user space */
23872@@ -764,14 +1264,16 @@ retint_swapgs: /* return to user-space */
23873 * The iretq could re-enable interrupts:
23874 */
23875 DISABLE_INTERRUPTS(CLBR_ANY)
23876+ pax_exit_kernel_user
23877+retint_swapgs_pax:
23878 TRACE_IRQS_IRETQ
23879
23880 /*
23881 * Try to use SYSRET instead of IRET if we're returning to
23882 * a completely clean 64-bit userspace context.
23883 */
23884- movq (RCX-R11)(%rsp), %rcx
23885- cmpq %rcx,(RIP-R11)(%rsp) /* RCX == RIP */
23886+ movq (RCX-ARGOFFSET)(%rsp), %rcx
23887+ cmpq %rcx,(RIP-ARGOFFSET)(%rsp) /* RCX == RIP */
23888 jne opportunistic_sysret_failed
23889
23890 /*
23891@@ -792,7 +1294,7 @@ retint_swapgs: /* return to user-space */
23892 shr $__VIRTUAL_MASK_SHIFT, %rcx
23893 jnz opportunistic_sysret_failed
23894
23895- cmpq $__USER_CS,(CS-R11)(%rsp) /* CS must match SYSRET */
23896+ cmpq $__USER_CS,(CS-ARGOFFSET)(%rsp) /* CS must match SYSRET */
23897 jne opportunistic_sysret_failed
23898
23899 movq (R11-ARGOFFSET)(%rsp), %r11
23900@@ -838,6 +1340,27 @@ opportunistic_sysret_failed:
23901
23902 retint_restore_args: /* return to kernel space */
23903 DISABLE_INTERRUPTS(CLBR_ANY)
23904+ pax_exit_kernel
23905+
23906+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23907+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23908+ * namely calling EFI runtime services with a phys mapping. We're
23909+ * starting off with NOPs and patch in the real instrumentation
23910+ * (BTS/OR) before starting any userland process; even before starting
23911+ * up the APs.
23912+ */
23913+ .pushsection .altinstr_replacement, "a"
23914+ 601: pax_force_retaddr (RIP-ARGOFFSET)
23915+ 602:
23916+ .popsection
23917+ 603: .fill 602b-601b, 1, 0x90
23918+ .pushsection .altinstructions, "a"
23919+ altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23920+ .popsection
23921+#else
23922+ pax_force_retaddr (RIP-ARGOFFSET)
23923+#endif
23924+
23925 /*
23926 * The iretq could re-enable interrupts:
23927 */
23928@@ -875,15 +1398,15 @@ native_irq_return_ldt:
23929 SWAPGS
23930 movq PER_CPU_VAR(espfix_waddr),%rdi
23931 movq %rax,(0*8)(%rdi) /* RAX */
23932- movq (2*8)(%rsp),%rax /* RIP */
23933+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23934 movq %rax,(1*8)(%rdi)
23935- movq (3*8)(%rsp),%rax /* CS */
23936+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23937 movq %rax,(2*8)(%rdi)
23938- movq (4*8)(%rsp),%rax /* RFLAGS */
23939+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23940 movq %rax,(3*8)(%rdi)
23941- movq (6*8)(%rsp),%rax /* SS */
23942+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23943 movq %rax,(5*8)(%rdi)
23944- movq (5*8)(%rsp),%rax /* RSP */
23945+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23946 movq %rax,(4*8)(%rdi)
23947 andl $0xffff0000,%eax
23948 popq_cfi %rdi
23949@@ -937,7 +1460,7 @@ ENTRY(retint_kernel)
23950 jmp exit_intr
23951 #endif
23952 CFI_ENDPROC
23953-END(common_interrupt)
23954+ENDPROC(common_interrupt)
23955
23956 /*
23957 * APIC interrupts.
23958@@ -951,7 +1474,7 @@ ENTRY(\sym)
23959 interrupt \do_sym
23960 jmp ret_from_intr
23961 CFI_ENDPROC
23962-END(\sym)
23963+ENDPROC(\sym)
23964 .endm
23965
23966 #ifdef CONFIG_TRACING
23967@@ -1024,7 +1547,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23968 /*
23969 * Exception entry points.
23970 */
23971-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23972+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23973
23974 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23975 ENTRY(\sym)
23976@@ -1080,6 +1603,12 @@ ENTRY(\sym)
23977 .endif
23978
23979 .if \shift_ist != -1
23980+#ifdef CONFIG_SMP
23981+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23982+ lea init_tss(%r13), %r13
23983+#else
23984+ lea init_tss(%rip), %r13
23985+#endif
23986 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23987 .endif
23988
23989@@ -1126,7 +1655,7 @@ ENTRY(\sym)
23990 .endif
23991
23992 CFI_ENDPROC
23993-END(\sym)
23994+ENDPROC(\sym)
23995 .endm
23996
23997 #ifdef CONFIG_TRACING
23998@@ -1167,9 +1696,10 @@ gs_change:
23999 2: mfence /* workaround */
24000 SWAPGS
24001 popfq_cfi
24002+ pax_force_retaddr
24003 ret
24004 CFI_ENDPROC
24005-END(native_load_gs_index)
24006+ENDPROC(native_load_gs_index)
24007
24008 _ASM_EXTABLE(gs_change,bad_gs)
24009 .section .fixup,"ax"
24010@@ -1197,9 +1727,10 @@ ENTRY(do_softirq_own_stack)
24011 CFI_DEF_CFA_REGISTER rsp
24012 CFI_ADJUST_CFA_OFFSET -8
24013 decl PER_CPU_VAR(irq_count)
24014+ pax_force_retaddr
24015 ret
24016 CFI_ENDPROC
24017-END(do_softirq_own_stack)
24018+ENDPROC(do_softirq_own_stack)
24019
24020 #ifdef CONFIG_XEN
24021 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24022@@ -1240,7 +1771,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24023 #endif
24024 jmp error_exit
24025 CFI_ENDPROC
24026-END(xen_do_hypervisor_callback)
24027+ENDPROC(xen_do_hypervisor_callback)
24028
24029 /*
24030 * Hypervisor uses this for application faults while it executes.
24031@@ -1299,7 +1830,7 @@ ENTRY(xen_failsafe_callback)
24032 SAVE_ALL
24033 jmp error_exit
24034 CFI_ENDPROC
24035-END(xen_failsafe_callback)
24036+ENDPROC(xen_failsafe_callback)
24037
24038 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24039 xen_hvm_callback_vector xen_evtchn_do_upcall
24040@@ -1344,18 +1875,25 @@ ENTRY(paranoid_exit)
24041 DEFAULT_FRAME
24042 DISABLE_INTERRUPTS(CLBR_NONE)
24043 TRACE_IRQS_OFF_DEBUG
24044- testl %ebx,%ebx /* swapgs needed? */
24045+ testl $1,%ebx /* swapgs needed? */
24046 jnz paranoid_restore
24047+#ifdef CONFIG_PAX_MEMORY_UDEREF
24048+ pax_exit_kernel_user
24049+#else
24050+ pax_exit_kernel
24051+#endif
24052 TRACE_IRQS_IRETQ 0
24053 SWAPGS_UNSAFE_STACK
24054 RESTORE_ALL 8
24055 INTERRUPT_RETURN
24056 paranoid_restore:
24057+ pax_exit_kernel
24058 TRACE_IRQS_IRETQ_DEBUG 0
24059 RESTORE_ALL 8
24060+ pax_force_retaddr_bts
24061 INTERRUPT_RETURN
24062 CFI_ENDPROC
24063-END(paranoid_exit)
24064+ENDPROC(paranoid_exit)
24065
24066 /*
24067 * Exception entry point. This expects an error code/orig_rax on the stack.
24068@@ -1382,12 +1920,23 @@ ENTRY(error_entry)
24069 movq %r14, R14+8(%rsp)
24070 movq %r15, R15+8(%rsp)
24071 xorl %ebx,%ebx
24072- testl $3,CS+8(%rsp)
24073+ testb $3,CS+8(%rsp)
24074 je error_kernelspace
24075 error_swapgs:
24076 SWAPGS
24077 error_sti:
24078+#ifdef CONFIG_PAX_MEMORY_UDEREF
24079+ testb $3, CS+8(%rsp)
24080+ jnz 1f
24081+ pax_enter_kernel
24082+ jmp 2f
24083+1: pax_enter_kernel_user
24084+2:
24085+#else
24086+ pax_enter_kernel
24087+#endif
24088 TRACE_IRQS_OFF
24089+ pax_force_retaddr
24090 ret
24091
24092 /*
24093@@ -1422,7 +1971,7 @@ error_bad_iret:
24094 decl %ebx /* Return to usergs */
24095 jmp error_sti
24096 CFI_ENDPROC
24097-END(error_entry)
24098+ENDPROC(error_entry)
24099
24100
24101 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24102@@ -1433,7 +1982,7 @@ ENTRY(error_exit)
24103 DISABLE_INTERRUPTS(CLBR_NONE)
24104 TRACE_IRQS_OFF
24105 GET_THREAD_INFO(%rcx)
24106- testl %eax,%eax
24107+ testl $1,%eax
24108 jne retint_kernel
24109 LOCKDEP_SYS_EXIT_IRQ
24110 movl TI_flags(%rcx),%edx
24111@@ -1442,7 +1991,7 @@ ENTRY(error_exit)
24112 jnz retint_careful
24113 jmp retint_swapgs
24114 CFI_ENDPROC
24115-END(error_exit)
24116+ENDPROC(error_exit)
24117
24118 /*
24119 * Test if a given stack is an NMI stack or not.
24120@@ -1500,9 +2049,11 @@ ENTRY(nmi)
24121 * If %cs was not the kernel segment, then the NMI triggered in user
24122 * space, which means it is definitely not nested.
24123 */
24124+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24125+ je 1f
24126 cmpl $__KERNEL_CS, 16(%rsp)
24127 jne first_nmi
24128-
24129+1:
24130 /*
24131 * Check the special variable on the stack to see if NMIs are
24132 * executing.
24133@@ -1536,8 +2087,7 @@ nested_nmi:
24134
24135 1:
24136 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24137- leaq -1*8(%rsp), %rdx
24138- movq %rdx, %rsp
24139+ subq $8, %rsp
24140 CFI_ADJUST_CFA_OFFSET 1*8
24141 leaq -10*8(%rsp), %rdx
24142 pushq_cfi $__KERNEL_DS
24143@@ -1555,6 +2105,7 @@ nested_nmi_out:
24144 CFI_RESTORE rdx
24145
24146 /* No need to check faults here */
24147+# pax_force_retaddr_bts
24148 INTERRUPT_RETURN
24149
24150 CFI_RESTORE_STATE
24151@@ -1651,13 +2202,13 @@ end_repeat_nmi:
24152 subq $ORIG_RAX-R15, %rsp
24153 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24154 /*
24155- * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24156+ * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24157 * as we should not be calling schedule in NMI context.
24158 * Even with normal interrupts enabled. An NMI should not be
24159 * setting NEED_RESCHED or anything that normal interrupts and
24160 * exceptions might do.
24161 */
24162- call save_paranoid
24163+ call save_paranoid_nmi
24164 DEFAULT_FRAME 0
24165
24166 /*
24167@@ -1667,9 +2218,9 @@ end_repeat_nmi:
24168 * NMI itself takes a page fault, the page fault that was preempted
24169 * will read the information from the NMI page fault and not the
24170 * origin fault. Save it off and restore it if it changes.
24171- * Use the r12 callee-saved register.
24172+ * Use the r13 callee-saved register.
24173 */
24174- movq %cr2, %r12
24175+ movq %cr2, %r13
24176
24177 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24178 movq %rsp,%rdi
24179@@ -1678,29 +2229,34 @@ end_repeat_nmi:
24180
24181 /* Did the NMI take a page fault? Restore cr2 if it did */
24182 movq %cr2, %rcx
24183- cmpq %rcx, %r12
24184+ cmpq %rcx, %r13
24185 je 1f
24186- movq %r12, %cr2
24187+ movq %r13, %cr2
24188 1:
24189
24190- testl %ebx,%ebx /* swapgs needed? */
24191+ testl $1,%ebx /* swapgs needed? */
24192 jnz nmi_restore
24193 nmi_swapgs:
24194 SWAPGS_UNSAFE_STACK
24195 nmi_restore:
24196+ pax_exit_kernel_nmi
24197 /* Pop the extra iret frame at once */
24198 RESTORE_ALL 6*8
24199+ testb $3, 8(%rsp)
24200+ jnz 1f
24201+ pax_force_retaddr_bts
24202+1:
24203
24204 /* Clear the NMI executing stack variable */
24205 movq $0, 5*8(%rsp)
24206 jmp irq_return
24207 CFI_ENDPROC
24208-END(nmi)
24209+ENDPROC(nmi)
24210
24211 ENTRY(ignore_sysret)
24212 CFI_STARTPROC
24213 mov $-ENOSYS,%eax
24214 sysret
24215 CFI_ENDPROC
24216-END(ignore_sysret)
24217+ENDPROC(ignore_sysret)
24218
24219diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24220index f5d0730..5bce89c 100644
24221--- a/arch/x86/kernel/espfix_64.c
24222+++ b/arch/x86/kernel/espfix_64.c
24223@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24224 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24225 static void *espfix_pages[ESPFIX_MAX_PAGES];
24226
24227-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24228- __aligned(PAGE_SIZE);
24229+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24230
24231 static unsigned int page_random, slot_random;
24232
24233@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24234 void __init init_espfix_bsp(void)
24235 {
24236 pgd_t *pgd_p;
24237+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24238
24239 /* Install the espfix pud into the kernel page directory */
24240- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24241+ pgd_p = &init_level4_pgt[index];
24242 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24243
24244+#ifdef CONFIG_PAX_PER_CPU_PGD
24245+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24246+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24247+#endif
24248+
24249 /* Randomize the locations */
24250 init_espfix_random();
24251
24252@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24253 set_pte(&pte_p[n*PTE_STRIDE], pte);
24254
24255 /* Job is done for this CPU and any CPU which shares this page */
24256- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24257+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24258
24259 unlock_done:
24260 mutex_unlock(&espfix_init_mutex);
24261diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24262index 8b7b0a5..02219db 100644
24263--- a/arch/x86/kernel/ftrace.c
24264+++ b/arch/x86/kernel/ftrace.c
24265@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24266 * kernel identity mapping to modify code.
24267 */
24268 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24269- ip = (unsigned long)__va(__pa_symbol(ip));
24270+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24271
24272 return ip;
24273 }
24274@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24275 {
24276 unsigned char replaced[MCOUNT_INSN_SIZE];
24277
24278+ ip = ktla_ktva(ip);
24279+
24280 /*
24281 * Note: Due to modules and __init, code can
24282 * disappear and change, we need to protect against faulting
24283@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24284 unsigned char old[MCOUNT_INSN_SIZE];
24285 int ret;
24286
24287- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24288+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24289
24290 ftrace_update_func = ip;
24291 /* Make sure the breakpoints see the ftrace_update_func update */
24292@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24293 unsigned char replaced[MCOUNT_INSN_SIZE];
24294 unsigned char brk = BREAKPOINT_INSTRUCTION;
24295
24296- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24297+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24298 return -EFAULT;
24299
24300 /* Make sure it is what we expect it to be */
24301@@ -670,11 +672,11 @@ static unsigned char *ftrace_jmp_replace(unsigned long ip, unsigned long addr)
24302 /* Module allocation simplifies allocating memory for code */
24303 static inline void *alloc_tramp(unsigned long size)
24304 {
24305- return module_alloc(size);
24306+ return module_alloc_exec(size);
24307 }
24308 static inline void tramp_free(void *tramp)
24309 {
24310- module_memfree(tramp);
24311+ module_memfree_exec(tramp);
24312 }
24313 #else
24314 /* Trampolines can only be created if modules are supported */
24315@@ -753,7 +755,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24316 *tramp_size = size + MCOUNT_INSN_SIZE + sizeof(void *);
24317
24318 /* Copy ftrace_caller onto the trampoline memory */
24319+ pax_open_kernel();
24320 ret = probe_kernel_read(trampoline, (void *)start_offset, size);
24321+ pax_close_kernel();
24322 if (WARN_ON(ret < 0)) {
24323 tramp_free(trampoline);
24324 return 0;
24325@@ -763,6 +767,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24326
24327 /* The trampoline ends with a jmp to ftrace_return */
24328 jmp = ftrace_jmp_replace(ip, (unsigned long)ftrace_return);
24329+ pax_open_kernel();
24330 memcpy(trampoline + size, jmp, MCOUNT_INSN_SIZE);
24331
24332 /*
24333@@ -775,6 +780,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24334
24335 ptr = (unsigned long *)(trampoline + size + MCOUNT_INSN_SIZE);
24336 *ptr = (unsigned long)ops;
24337+ pax_close_kernel();
24338
24339 op_offset -= start_offset;
24340 memcpy(&op_ptr, trampoline + op_offset, OP_REF_SIZE);
24341@@ -792,7 +798,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24342 op_ptr.offset = offset;
24343
24344 /* put in the new offset to the ftrace_ops */
24345+ pax_open_kernel();
24346 memcpy(trampoline + op_offset, &op_ptr, OP_REF_SIZE);
24347+ pax_close_kernel();
24348
24349 /* ALLOC_TRAMP flags lets us know we created it */
24350 ops->flags |= FTRACE_OPS_FL_ALLOC_TRAMP;
24351diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24352index b111ab5..3d419ea 100644
24353--- a/arch/x86/kernel/head64.c
24354+++ b/arch/x86/kernel/head64.c
24355@@ -68,12 +68,12 @@ again:
24356 pgd = *pgd_p;
24357
24358 /*
24359- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24360- * critical -- __PAGE_OFFSET would point us back into the dynamic
24361+ * The use of __early_va rather than __va here is critical:
24362+ * __va would point us back into the dynamic
24363 * range and we might end up looping forever...
24364 */
24365 if (pgd)
24366- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24367+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24368 else {
24369 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24370 reset_early_page_tables();
24371@@ -83,13 +83,13 @@ again:
24372 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24373 for (i = 0; i < PTRS_PER_PUD; i++)
24374 pud_p[i] = 0;
24375- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24376+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24377 }
24378 pud_p += pud_index(address);
24379 pud = *pud_p;
24380
24381 if (pud)
24382- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24383+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24384 else {
24385 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24386 reset_early_page_tables();
24387@@ -99,7 +99,7 @@ again:
24388 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24389 for (i = 0; i < PTRS_PER_PMD; i++)
24390 pmd_p[i] = 0;
24391- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24392+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24393 }
24394 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24395 pmd_p[pmd_index(address)] = pmd;
24396@@ -180,7 +180,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24397 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24398 early_printk("Kernel alive\n");
24399
24400- clear_page(init_level4_pgt);
24401 /* set init_level4_pgt kernel high mapping*/
24402 init_level4_pgt[511] = early_level4_pgt[511];
24403
24404diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24405index 30a2aa3..d62e1dd 100644
24406--- a/arch/x86/kernel/head_32.S
24407+++ b/arch/x86/kernel/head_32.S
24408@@ -26,6 +26,12 @@
24409 /* Physical address */
24410 #define pa(X) ((X) - __PAGE_OFFSET)
24411
24412+#ifdef CONFIG_PAX_KERNEXEC
24413+#define ta(X) (X)
24414+#else
24415+#define ta(X) ((X) - __PAGE_OFFSET)
24416+#endif
24417+
24418 /*
24419 * References to members of the new_cpu_data structure.
24420 */
24421@@ -55,11 +61,7 @@
24422 * and small than max_low_pfn, otherwise will waste some page table entries
24423 */
24424
24425-#if PTRS_PER_PMD > 1
24426-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24427-#else
24428-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24429-#endif
24430+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24431
24432 /* Number of possible pages in the lowmem region */
24433 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24434@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24435 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24436
24437 /*
24438+ * Real beginning of normal "text" segment
24439+ */
24440+ENTRY(stext)
24441+ENTRY(_stext)
24442+
24443+/*
24444 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24445 * %esi points to the real-mode code as a 32-bit pointer.
24446 * CS and DS must be 4 GB flat segments, but we don't depend on
24447@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24448 * can.
24449 */
24450 __HEAD
24451+
24452+#ifdef CONFIG_PAX_KERNEXEC
24453+ jmp startup_32
24454+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24455+.fill PAGE_SIZE-5,1,0xcc
24456+#endif
24457+
24458 ENTRY(startup_32)
24459 movl pa(stack_start),%ecx
24460
24461@@ -106,6 +121,59 @@ ENTRY(startup_32)
24462 2:
24463 leal -__PAGE_OFFSET(%ecx),%esp
24464
24465+#ifdef CONFIG_SMP
24466+ movl $pa(cpu_gdt_table),%edi
24467+ movl $__per_cpu_load,%eax
24468+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24469+ rorl $16,%eax
24470+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24471+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24472+ movl $__per_cpu_end - 1,%eax
24473+ subl $__per_cpu_start,%eax
24474+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24475+#endif
24476+
24477+#ifdef CONFIG_PAX_MEMORY_UDEREF
24478+ movl $NR_CPUS,%ecx
24479+ movl $pa(cpu_gdt_table),%edi
24480+1:
24481+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24482+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24483+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24484+ addl $PAGE_SIZE_asm,%edi
24485+ loop 1b
24486+#endif
24487+
24488+#ifdef CONFIG_PAX_KERNEXEC
24489+ movl $pa(boot_gdt),%edi
24490+ movl $__LOAD_PHYSICAL_ADDR,%eax
24491+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24492+ rorl $16,%eax
24493+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24494+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24495+ rorl $16,%eax
24496+
24497+ ljmp $(__BOOT_CS),$1f
24498+1:
24499+
24500+ movl $NR_CPUS,%ecx
24501+ movl $pa(cpu_gdt_table),%edi
24502+ addl $__PAGE_OFFSET,%eax
24503+1:
24504+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24505+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24506+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24507+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24508+ rorl $16,%eax
24509+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24510+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24511+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24512+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24513+ rorl $16,%eax
24514+ addl $PAGE_SIZE_asm,%edi
24515+ loop 1b
24516+#endif
24517+
24518 /*
24519 * Clear BSS first so that there are no surprises...
24520 */
24521@@ -201,8 +269,11 @@ ENTRY(startup_32)
24522 movl %eax, pa(max_pfn_mapped)
24523
24524 /* Do early initialization of the fixmap area */
24525- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24526- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24527+#ifdef CONFIG_COMPAT_VDSO
24528+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24529+#else
24530+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24531+#endif
24532 #else /* Not PAE */
24533
24534 page_pde_offset = (__PAGE_OFFSET >> 20);
24535@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24536 movl %eax, pa(max_pfn_mapped)
24537
24538 /* Do early initialization of the fixmap area */
24539- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24540- movl %eax,pa(initial_page_table+0xffc)
24541+#ifdef CONFIG_COMPAT_VDSO
24542+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24543+#else
24544+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24545+#endif
24546 #endif
24547
24548 #ifdef CONFIG_PARAVIRT
24549@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24550 cmpl $num_subarch_entries, %eax
24551 jae bad_subarch
24552
24553- movl pa(subarch_entries)(,%eax,4), %eax
24554- subl $__PAGE_OFFSET, %eax
24555- jmp *%eax
24556+ jmp *pa(subarch_entries)(,%eax,4)
24557
24558 bad_subarch:
24559 WEAK(lguest_entry)
24560@@ -261,10 +333,10 @@ WEAK(xen_entry)
24561 __INITDATA
24562
24563 subarch_entries:
24564- .long default_entry /* normal x86/PC */
24565- .long lguest_entry /* lguest hypervisor */
24566- .long xen_entry /* Xen hypervisor */
24567- .long default_entry /* Moorestown MID */
24568+ .long ta(default_entry) /* normal x86/PC */
24569+ .long ta(lguest_entry) /* lguest hypervisor */
24570+ .long ta(xen_entry) /* Xen hypervisor */
24571+ .long ta(default_entry) /* Moorestown MID */
24572 num_subarch_entries = (. - subarch_entries) / 4
24573 .previous
24574 #else
24575@@ -354,6 +426,7 @@ default_entry:
24576 movl pa(mmu_cr4_features),%eax
24577 movl %eax,%cr4
24578
24579+#ifdef CONFIG_X86_PAE
24580 testb $X86_CR4_PAE, %al # check if PAE is enabled
24581 jz enable_paging
24582
24583@@ -382,6 +455,9 @@ default_entry:
24584 /* Make changes effective */
24585 wrmsr
24586
24587+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24588+#endif
24589+
24590 enable_paging:
24591
24592 /*
24593@@ -449,14 +525,20 @@ is486:
24594 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24595 movl %eax,%ss # after changing gdt.
24596
24597- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24598+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24599 movl %eax,%ds
24600 movl %eax,%es
24601
24602 movl $(__KERNEL_PERCPU), %eax
24603 movl %eax,%fs # set this cpu's percpu
24604
24605+#ifdef CONFIG_CC_STACKPROTECTOR
24606 movl $(__KERNEL_STACK_CANARY),%eax
24607+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24608+ movl $(__USER_DS),%eax
24609+#else
24610+ xorl %eax,%eax
24611+#endif
24612 movl %eax,%gs
24613
24614 xorl %eax,%eax # Clear LDT
24615@@ -513,8 +595,11 @@ setup_once:
24616 * relocation. Manually set base address in stack canary
24617 * segment descriptor.
24618 */
24619- movl $gdt_page,%eax
24620+ movl $cpu_gdt_table,%eax
24621 movl $stack_canary,%ecx
24622+#ifdef CONFIG_SMP
24623+ addl $__per_cpu_load,%ecx
24624+#endif
24625 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24626 shrl $16, %ecx
24627 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24628@@ -551,7 +636,7 @@ early_idt_handler_common:
24629 cmpl $2,(%esp) # X86_TRAP_NMI
24630 je is_nmi # Ignore NMI
24631
24632- cmpl $2,%ss:early_recursion_flag
24633+ cmpl $1,%ss:early_recursion_flag
24634 je hlt_loop
24635 incl %ss:early_recursion_flag
24636
24637@@ -589,8 +674,8 @@ early_idt_handler_common:
24638 pushl (20+6*4)(%esp) /* trapno */
24639 pushl $fault_msg
24640 call printk
24641-#endif
24642 call dump_stack
24643+#endif
24644 hlt_loop:
24645 hlt
24646 jmp hlt_loop
24647@@ -610,8 +695,11 @@ ENDPROC(early_idt_handler_common)
24648 /* This is the default interrupt "handler" :-) */
24649 ALIGN
24650 ignore_int:
24651- cld
24652 #ifdef CONFIG_PRINTK
24653+ cmpl $2,%ss:early_recursion_flag
24654+ je hlt_loop
24655+ incl %ss:early_recursion_flag
24656+ cld
24657 pushl %eax
24658 pushl %ecx
24659 pushl %edx
24660@@ -620,9 +708,6 @@ ignore_int:
24661 movl $(__KERNEL_DS),%eax
24662 movl %eax,%ds
24663 movl %eax,%es
24664- cmpl $2,early_recursion_flag
24665- je hlt_loop
24666- incl early_recursion_flag
24667 pushl 16(%esp)
24668 pushl 24(%esp)
24669 pushl 32(%esp)
24670@@ -656,29 +741,34 @@ ENTRY(setup_once_ref)
24671 /*
24672 * BSS section
24673 */
24674-__PAGE_ALIGNED_BSS
24675- .align PAGE_SIZE
24676 #ifdef CONFIG_X86_PAE
24677+.section .initial_pg_pmd,"a",@progbits
24678 initial_pg_pmd:
24679 .fill 1024*KPMDS,4,0
24680 #else
24681+.section .initial_page_table,"a",@progbits
24682 ENTRY(initial_page_table)
24683 .fill 1024,4,0
24684 #endif
24685+.section .initial_pg_fixmap,"a",@progbits
24686 initial_pg_fixmap:
24687 .fill 1024,4,0
24688+.section .empty_zero_page,"a",@progbits
24689 ENTRY(empty_zero_page)
24690 .fill 4096,1,0
24691+.section .swapper_pg_dir,"a",@progbits
24692 ENTRY(swapper_pg_dir)
24693+#ifdef CONFIG_X86_PAE
24694+ .fill 4,8,0
24695+#else
24696 .fill 1024,4,0
24697+#endif
24698
24699 /*
24700 * This starts the data section.
24701 */
24702 #ifdef CONFIG_X86_PAE
24703-__PAGE_ALIGNED_DATA
24704- /* Page-aligned for the benefit of paravirt? */
24705- .align PAGE_SIZE
24706+.section .initial_page_table,"a",@progbits
24707 ENTRY(initial_page_table)
24708 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24709 # if KPMDS == 3
24710@@ -697,12 +787,20 @@ ENTRY(initial_page_table)
24711 # error "Kernel PMDs should be 1, 2 or 3"
24712 # endif
24713 .align PAGE_SIZE /* needs to be page-sized too */
24714+
24715+#ifdef CONFIG_PAX_PER_CPU_PGD
24716+ENTRY(cpu_pgd)
24717+ .rept 2*NR_CPUS
24718+ .fill 4,8,0
24719+ .endr
24720+#endif
24721+
24722 #endif
24723
24724 .data
24725 .balign 4
24726 ENTRY(stack_start)
24727- .long init_thread_union+THREAD_SIZE
24728+ .long init_thread_union+THREAD_SIZE-8
24729
24730 __INITRODATA
24731 int_msg:
24732@@ -730,7 +828,7 @@ fault_msg:
24733 * segment size, and 32-bit linear address value:
24734 */
24735
24736- .data
24737+.section .rodata,"a",@progbits
24738 .globl boot_gdt_descr
24739 .globl idt_descr
24740
24741@@ -739,7 +837,7 @@ fault_msg:
24742 .word 0 # 32 bit align gdt_desc.address
24743 boot_gdt_descr:
24744 .word __BOOT_DS+7
24745- .long boot_gdt - __PAGE_OFFSET
24746+ .long pa(boot_gdt)
24747
24748 .word 0 # 32-bit align idt_desc.address
24749 idt_descr:
24750@@ -750,7 +848,7 @@ idt_descr:
24751 .word 0 # 32 bit align gdt_desc.address
24752 ENTRY(early_gdt_descr)
24753 .word GDT_ENTRIES*8-1
24754- .long gdt_page /* Overwritten for secondary CPUs */
24755+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24756
24757 /*
24758 * The boot_gdt must mirror the equivalent in setup.S and is
24759@@ -759,5 +857,65 @@ ENTRY(early_gdt_descr)
24760 .align L1_CACHE_BYTES
24761 ENTRY(boot_gdt)
24762 .fill GDT_ENTRY_BOOT_CS,8,0
24763- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24764- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24765+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24766+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24767+
24768+ .align PAGE_SIZE_asm
24769+ENTRY(cpu_gdt_table)
24770+ .rept NR_CPUS
24771+ .quad 0x0000000000000000 /* NULL descriptor */
24772+ .quad 0x0000000000000000 /* 0x0b reserved */
24773+ .quad 0x0000000000000000 /* 0x13 reserved */
24774+ .quad 0x0000000000000000 /* 0x1b reserved */
24775+
24776+#ifdef CONFIG_PAX_KERNEXEC
24777+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24778+#else
24779+ .quad 0x0000000000000000 /* 0x20 unused */
24780+#endif
24781+
24782+ .quad 0x0000000000000000 /* 0x28 unused */
24783+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24784+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24785+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24786+ .quad 0x0000000000000000 /* 0x4b reserved */
24787+ .quad 0x0000000000000000 /* 0x53 reserved */
24788+ .quad 0x0000000000000000 /* 0x5b reserved */
24789+
24790+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24791+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24792+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24793+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24794+
24795+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24796+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24797+
24798+ /*
24799+ * Segments used for calling PnP BIOS have byte granularity.
24800+ * The code segments and data segments have fixed 64k limits,
24801+ * the transfer segment sizes are set at run time.
24802+ */
24803+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24804+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24805+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24806+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24807+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24808+
24809+ /*
24810+ * The APM segments have byte granularity and their bases
24811+ * are set at run time. All have 64k limits.
24812+ */
24813+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24814+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24815+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24816+
24817+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24818+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24819+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24820+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24821+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24822+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24823+
24824+ /* Be sure this is zeroed to avoid false validations in Xen */
24825+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24826+ .endr
24827diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24828index f8a8406..ad6d014 100644
24829--- a/arch/x86/kernel/head_64.S
24830+++ b/arch/x86/kernel/head_64.S
24831@@ -20,6 +20,8 @@
24832 #include <asm/processor-flags.h>
24833 #include <asm/percpu.h>
24834 #include <asm/nops.h>
24835+#include <asm/cpufeature.h>
24836+#include <asm/alternative-asm.h>
24837
24838 #ifdef CONFIG_PARAVIRT
24839 #include <asm/asm-offsets.h>
24840@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24841 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24842 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24843 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24844+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24845+L3_VMALLOC_START = pud_index(VMALLOC_START)
24846+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24847+L3_VMALLOC_END = pud_index(VMALLOC_END)
24848+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24849+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24850
24851 .text
24852 __HEAD
24853@@ -89,11 +97,26 @@ startup_64:
24854 * Fixup the physical addresses in the page table
24855 */
24856 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24857+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24858+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24859+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24860+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24861+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24862
24863- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24864- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24865+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24866+#ifndef CONFIG_XEN
24867+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24868+#endif
24869
24870+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24871+
24872+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24873+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24874+
24875+ addq %rbp, level2_fixmap_pgt + (504*8)(%rip)
24876+ addq %rbp, level2_fixmap_pgt + (505*8)(%rip)
24877 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24878+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24879
24880 /*
24881 * Set up the identity mapping for the switchover. These
24882@@ -174,11 +197,12 @@ ENTRY(secondary_startup_64)
24883 * after the boot processor executes this code.
24884 */
24885
24886+ orq $-1, %rbp
24887 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24888 1:
24889
24890- /* Enable PAE mode and PGE */
24891- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24892+ /* Enable PAE mode and PSE/PGE */
24893+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24894 movq %rcx, %cr4
24895
24896 /* Setup early boot stage 4 level pagetables. */
24897@@ -199,10 +223,21 @@ ENTRY(secondary_startup_64)
24898 movl $MSR_EFER, %ecx
24899 rdmsr
24900 btsl $_EFER_SCE, %eax /* Enable System Call */
24901- btl $20,%edi /* No Execute supported? */
24902+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24903 jnc 1f
24904 btsl $_EFER_NX, %eax
24905+ cmpq $-1, %rbp
24906+ je 1f
24907 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24908+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24909+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24910+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24911+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24912+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*504(%rip)
24913+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*505(%rip)
24914+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24915+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24916+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24917 1: wrmsr /* Make changes effective */
24918
24919 /* Setup cr0 */
24920@@ -282,6 +317,7 @@ ENTRY(secondary_startup_64)
24921 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24922 * address given in m16:64.
24923 */
24924+ pax_set_fptr_mask
24925 movq initial_code(%rip),%rax
24926 pushq $0 # fake return address to stop unwinder
24927 pushq $__KERNEL_CS # set correct cs
24928@@ -313,7 +349,7 @@ ENDPROC(start_cpu0)
24929 .quad INIT_PER_CPU_VAR(irq_stack_union)
24930
24931 GLOBAL(stack_start)
24932- .quad init_thread_union+THREAD_SIZE-8
24933+ .quad init_thread_union+THREAD_SIZE-16
24934 .word 0
24935 __FINITDATA
24936
24937@@ -393,7 +429,7 @@ early_idt_handler_common:
24938 call dump_stack
24939 #ifdef CONFIG_KALLSYMS
24940 leaq early_idt_ripmsg(%rip),%rdi
24941- movq 40(%rsp),%rsi # %rip again
24942+ movq 88(%rsp),%rsi # %rip again
24943 call __print_symbol
24944 #endif
24945 #endif /* EARLY_PRINTK */
24946@@ -422,6 +458,7 @@ ENDPROC(early_idt_handler_common)
24947 early_recursion_flag:
24948 .long 0
24949
24950+ .section .rodata,"a",@progbits
24951 #ifdef CONFIG_EARLY_PRINTK
24952 early_idt_msg:
24953 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24954@@ -449,29 +486,52 @@ NEXT_PAGE(early_level4_pgt)
24955 NEXT_PAGE(early_dynamic_pgts)
24956 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24957
24958- .data
24959+ .section .rodata,"a",@progbits
24960
24961-#ifndef CONFIG_XEN
24962 NEXT_PAGE(init_level4_pgt)
24963- .fill 512,8,0
24964-#else
24965-NEXT_PAGE(init_level4_pgt)
24966- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24967 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24968 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24969+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24970+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24971+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24972+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24973+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24974+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24975 .org init_level4_pgt + L4_START_KERNEL*8, 0
24976 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24977 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24978
24979+#ifdef CONFIG_PAX_PER_CPU_PGD
24980+NEXT_PAGE(cpu_pgd)
24981+ .rept 2*NR_CPUS
24982+ .fill 512,8,0
24983+ .endr
24984+#endif
24985+
24986 NEXT_PAGE(level3_ident_pgt)
24987 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24988+#ifdef CONFIG_XEN
24989 .fill 511, 8, 0
24990+#else
24991+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24992+ .fill 510,8,0
24993+#endif
24994+
24995+NEXT_PAGE(level3_vmalloc_start_pgt)
24996+ .fill 512,8,0
24997+
24998+NEXT_PAGE(level3_vmalloc_end_pgt)
24999+ .fill 512,8,0
25000+
25001+NEXT_PAGE(level3_vmemmap_pgt)
25002+ .fill L3_VMEMMAP_START,8,0
25003+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25004+
25005 NEXT_PAGE(level2_ident_pgt)
25006- /* Since I easily can, map the first 1G.
25007+ /* Since I easily can, map the first 2G.
25008 * Don't set NX because code runs from these pages.
25009 */
25010- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
25011-#endif
25012+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
25013
25014 NEXT_PAGE(level3_kernel_pgt)
25015 .fill L3_START_KERNEL,8,0
25016@@ -479,6 +539,9 @@ NEXT_PAGE(level3_kernel_pgt)
25017 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
25018 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25019
25020+NEXT_PAGE(level2_vmemmap_pgt)
25021+ .fill 512,8,0
25022+
25023 NEXT_PAGE(level2_kernel_pgt)
25024 /*
25025 * 512 MB kernel mapping. We spend a full page on this pagetable
25026@@ -494,23 +557,61 @@ NEXT_PAGE(level2_kernel_pgt)
25027 KERNEL_IMAGE_SIZE/PMD_SIZE)
25028
25029 NEXT_PAGE(level2_fixmap_pgt)
25030- .fill 506,8,0
25031- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25032- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
25033- .fill 5,8,0
25034+ .fill 504,8,0
25035+ .quad level1_fixmap_pgt - __START_KERNEL_map + 0 * PAGE_SIZE + _PAGE_TABLE
25036+ .quad level1_fixmap_pgt - __START_KERNEL_map + 1 * PAGE_SIZE + _PAGE_TABLE
25037+ .quad level1_fixmap_pgt - __START_KERNEL_map + 2 * PAGE_SIZE + _PAGE_TABLE
25038+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
25039+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
25040+ .fill 4,8,0
25041
25042 NEXT_PAGE(level1_fixmap_pgt)
25043+ .fill 3*512,8,0
25044+
25045+NEXT_PAGE(level1_vsyscall_pgt)
25046 .fill 512,8,0
25047
25048 #undef PMDS
25049
25050- .data
25051+ .align PAGE_SIZE
25052+ENTRY(cpu_gdt_table)
25053+ .rept NR_CPUS
25054+ .quad 0x0000000000000000 /* NULL descriptor */
25055+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25056+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25057+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25058+ .quad 0x00cffb000000ffff /* __USER32_CS */
25059+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25060+ .quad 0x00affb000000ffff /* __USER_CS */
25061+
25062+#ifdef CONFIG_PAX_KERNEXEC
25063+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25064+#else
25065+ .quad 0x0 /* unused */
25066+#endif
25067+
25068+ .quad 0,0 /* TSS */
25069+ .quad 0,0 /* LDT */
25070+ .quad 0,0,0 /* three TLS descriptors */
25071+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25072+ /* asm/segment.h:GDT_ENTRIES must match this */
25073+
25074+#ifdef CONFIG_PAX_MEMORY_UDEREF
25075+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25076+#else
25077+ .quad 0x0 /* unused */
25078+#endif
25079+
25080+ /* zero the remaining page */
25081+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25082+ .endr
25083+
25084 .align 16
25085 .globl early_gdt_descr
25086 early_gdt_descr:
25087 .word GDT_ENTRIES*8-1
25088 early_gdt_descr_base:
25089- .quad INIT_PER_CPU_VAR(gdt_page)
25090+ .quad cpu_gdt_table
25091
25092 ENTRY(phys_base)
25093 /* This must match the first entry in level2_kernel_pgt */
25094@@ -534,8 +635,8 @@ NEXT_PAGE(kasan_zero_pud)
25095
25096
25097 #include "../../x86/xen/xen-head.S"
25098-
25099- __PAGE_ALIGNED_BSS
25100+
25101+ .section .rodata,"a",@progbits
25102 NEXT_PAGE(empty_zero_page)
25103 .skip PAGE_SIZE
25104
25105diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25106index 05fd74f..c3548b1 100644
25107--- a/arch/x86/kernel/i386_ksyms_32.c
25108+++ b/arch/x86/kernel/i386_ksyms_32.c
25109@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25110 EXPORT_SYMBOL(cmpxchg8b_emu);
25111 #endif
25112
25113+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25114+
25115 /* Networking helper routines. */
25116 EXPORT_SYMBOL(csum_partial_copy_generic);
25117+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25118+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25119
25120 EXPORT_SYMBOL(__get_user_1);
25121 EXPORT_SYMBOL(__get_user_2);
25122@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25123 EXPORT_SYMBOL(___preempt_schedule_context);
25124 #endif
25125 #endif
25126+
25127+#ifdef CONFIG_PAX_KERNEXEC
25128+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25129+#endif
25130+
25131+#ifdef CONFIG_PAX_PER_CPU_PGD
25132+EXPORT_SYMBOL(cpu_pgd);
25133+#endif
25134diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25135index f341d56..d9b527b 100644
25136--- a/arch/x86/kernel/i387.c
25137+++ b/arch/x86/kernel/i387.c
25138@@ -68,7 +68,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25139 static inline bool interrupted_user_mode(void)
25140 {
25141 struct pt_regs *regs = get_irq_regs();
25142- return regs && user_mode_vm(regs);
25143+ return regs && user_mode(regs);
25144 }
25145
25146 /*
25147diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25148index e7cc537..67d7372 100644
25149--- a/arch/x86/kernel/i8259.c
25150+++ b/arch/x86/kernel/i8259.c
25151@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25152 static void make_8259A_irq(unsigned int irq)
25153 {
25154 disable_irq_nosync(irq);
25155- io_apic_irqs &= ~(1<<irq);
25156+ io_apic_irqs &= ~(1UL<<irq);
25157 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25158 enable_irq(irq);
25159 }
25160@@ -208,7 +208,7 @@ spurious_8259A_irq:
25161 "spurious 8259A interrupt: IRQ%d.\n", irq);
25162 spurious_irq_mask |= irqmask;
25163 }
25164- atomic_inc(&irq_err_count);
25165+ atomic_inc_unchecked(&irq_err_count);
25166 /*
25167 * Theoretically we do not have to handle this IRQ,
25168 * but in Linux this does not cause problems and is
25169@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25170 /* (slave's support for AEOI in flat mode is to be investigated) */
25171 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25172
25173+ pax_open_kernel();
25174 if (auto_eoi)
25175 /*
25176 * In AEOI mode we just have to mask the interrupt
25177 * when acking.
25178 */
25179- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25180+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25181 else
25182- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25183+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25184+ pax_close_kernel();
25185
25186 udelay(100); /* wait for 8259A to initialize */
25187
25188diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25189index a979b5b..1d6db75 100644
25190--- a/arch/x86/kernel/io_delay.c
25191+++ b/arch/x86/kernel/io_delay.c
25192@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25193 * Quirk table for systems that misbehave (lock up, etc.) if port
25194 * 0x80 is used:
25195 */
25196-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25197+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25198 {
25199 .callback = dmi_io_delay_0xed_port,
25200 .ident = "Compaq Presario V6000",
25201diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25202index 4ddaf66..49d5c18 100644
25203--- a/arch/x86/kernel/ioport.c
25204+++ b/arch/x86/kernel/ioport.c
25205@@ -6,6 +6,7 @@
25206 #include <linux/sched.h>
25207 #include <linux/kernel.h>
25208 #include <linux/capability.h>
25209+#include <linux/security.h>
25210 #include <linux/errno.h>
25211 #include <linux/types.h>
25212 #include <linux/ioport.h>
25213@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25214 return -EINVAL;
25215 if (turn_on && !capable(CAP_SYS_RAWIO))
25216 return -EPERM;
25217+#ifdef CONFIG_GRKERNSEC_IO
25218+ if (turn_on && grsec_disable_privio) {
25219+ gr_handle_ioperm();
25220+ return -ENODEV;
25221+ }
25222+#endif
25223
25224 /*
25225 * If it's the first ioperm() call in this thread's lifetime, set the
25226@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25227 * because the ->io_bitmap_max value must match the bitmap
25228 * contents:
25229 */
25230- tss = &per_cpu(init_tss, get_cpu());
25231+ tss = init_tss + get_cpu();
25232
25233 if (turn_on)
25234 bitmap_clear(t->io_bitmap_ptr, from, num);
25235@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25236 if (level > old) {
25237 if (!capable(CAP_SYS_RAWIO))
25238 return -EPERM;
25239+#ifdef CONFIG_GRKERNSEC_IO
25240+ if (grsec_disable_privio) {
25241+ gr_handle_iopl();
25242+ return -ENODEV;
25243+ }
25244+#endif
25245 }
25246 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25247 t->iopl = level << 12;
25248diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25249index 67b1cbe..6ad4cbc 100644
25250--- a/arch/x86/kernel/irq.c
25251+++ b/arch/x86/kernel/irq.c
25252@@ -22,7 +22,7 @@
25253 #define CREATE_TRACE_POINTS
25254 #include <asm/trace/irq_vectors.h>
25255
25256-atomic_t irq_err_count;
25257+atomic_unchecked_t irq_err_count;
25258
25259 /* Function pointer for generic interrupt vector handling */
25260 void (*x86_platform_ipi_callback)(void) = NULL;
25261@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25262 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25263 seq_puts(p, " Hypervisor callback interrupts\n");
25264 #endif
25265- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25266+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25267 #if defined(CONFIG_X86_IO_APIC)
25268- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25269+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25270 #endif
25271 return 0;
25272 }
25273@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25274
25275 u64 arch_irq_stat(void)
25276 {
25277- u64 sum = atomic_read(&irq_err_count);
25278+ u64 sum = atomic_read_unchecked(&irq_err_count);
25279 return sum;
25280 }
25281
25282diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25283index 28d28f5..e6cc9ae 100644
25284--- a/arch/x86/kernel/irq_32.c
25285+++ b/arch/x86/kernel/irq_32.c
25286@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25287
25288 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25289
25290+extern void gr_handle_kernel_exploit(void);
25291+
25292 int sysctl_panic_on_stackoverflow __read_mostly;
25293
25294 /* Debugging check for stack overflow: is there less than 1KB free? */
25295@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25296 __asm__ __volatile__("andl %%esp,%0" :
25297 "=r" (sp) : "0" (THREAD_SIZE - 1));
25298
25299- return sp < (sizeof(struct thread_info) + STACK_WARN);
25300+ return sp < STACK_WARN;
25301 }
25302
25303 static void print_stack_overflow(void)
25304 {
25305 printk(KERN_WARNING "low stack detected by irq handler\n");
25306 dump_stack();
25307+ gr_handle_kernel_exploit();
25308 if (sysctl_panic_on_stackoverflow)
25309 panic("low stack detected by irq handler - check messages\n");
25310 }
25311@@ -77,10 +80,9 @@ static inline void *current_stack(void)
25312 static inline int
25313 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25314 {
25315- struct irq_stack *curstk, *irqstk;
25316+ struct irq_stack *irqstk;
25317 u32 *isp, *prev_esp, arg1, arg2;
25318
25319- curstk = (struct irq_stack *) current_stack();
25320 irqstk = __this_cpu_read(hardirq_stack);
25321
25322 /*
25323@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25324 * handler) we can't do that and just have to keep using the
25325 * current stack (which is the irq stack already after all)
25326 */
25327- if (unlikely(curstk == irqstk))
25328+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25329 return 0;
25330
25331- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25332+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25333
25334 /* Save the next esp at the bottom of the stack */
25335 prev_esp = (u32 *)irqstk;
25336 *prev_esp = current_stack_pointer();
25337
25338+#ifdef CONFIG_PAX_MEMORY_UDEREF
25339+ __set_fs(MAKE_MM_SEG(0));
25340+#endif
25341+
25342 if (unlikely(overflow))
25343 call_on_stack(print_stack_overflow, isp);
25344
25345@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25346 : "0" (irq), "1" (desc), "2" (isp),
25347 "D" (desc->handle_irq)
25348 : "memory", "cc", "ecx");
25349+
25350+#ifdef CONFIG_PAX_MEMORY_UDEREF
25351+ __set_fs(current_thread_info()->addr_limit);
25352+#endif
25353+
25354 return 1;
25355 }
25356
25357@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25358 */
25359 void irq_ctx_init(int cpu)
25360 {
25361- struct irq_stack *irqstk;
25362-
25363 if (per_cpu(hardirq_stack, cpu))
25364 return;
25365
25366- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25367- THREADINFO_GFP,
25368- THREAD_SIZE_ORDER));
25369- per_cpu(hardirq_stack, cpu) = irqstk;
25370-
25371- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25372- THREADINFO_GFP,
25373- THREAD_SIZE_ORDER));
25374- per_cpu(softirq_stack, cpu) = irqstk;
25375-
25376- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25377- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25378+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25379+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25380 }
25381
25382 void do_softirq_own_stack(void)
25383 {
25384- struct thread_info *curstk;
25385 struct irq_stack *irqstk;
25386 u32 *isp, *prev_esp;
25387
25388- curstk = current_stack();
25389 irqstk = __this_cpu_read(softirq_stack);
25390
25391 /* build the stack frame on the softirq stack */
25392@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
25393 prev_esp = (u32 *)irqstk;
25394 *prev_esp = current_stack_pointer();
25395
25396+#ifdef CONFIG_PAX_MEMORY_UDEREF
25397+ __set_fs(MAKE_MM_SEG(0));
25398+#endif
25399+
25400 call_on_stack(__do_softirq, isp);
25401+
25402+#ifdef CONFIG_PAX_MEMORY_UDEREF
25403+ __set_fs(current_thread_info()->addr_limit);
25404+#endif
25405+
25406 }
25407
25408 bool handle_irq(unsigned irq, struct pt_regs *regs)
25409@@ -165,7 +171,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25410 if (unlikely(!desc))
25411 return false;
25412
25413- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25414+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25415 if (unlikely(overflow))
25416 print_stack_overflow();
25417 desc->handle_irq(irq, desc);
25418diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25419index e4b503d..824fce8 100644
25420--- a/arch/x86/kernel/irq_64.c
25421+++ b/arch/x86/kernel/irq_64.c
25422@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25423 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25424 EXPORT_PER_CPU_SYMBOL(irq_regs);
25425
25426+extern void gr_handle_kernel_exploit(void);
25427+
25428 int sysctl_panic_on_stackoverflow;
25429
25430 /*
25431@@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25432 u64 estack_top, estack_bottom;
25433 u64 curbase = (u64)task_stack_page(current);
25434
25435- if (user_mode_vm(regs))
25436+ if (user_mode(regs))
25437 return;
25438
25439 if (regs->sp >= curbase + sizeof(struct thread_info) +
25440@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25441 irq_stack_top, irq_stack_bottom,
25442 estack_top, estack_bottom);
25443
25444+ gr_handle_kernel_exploit();
25445+
25446 if (sysctl_panic_on_stackoverflow)
25447 panic("low stack detected by irq handler - check messages\n");
25448 #endif
25449diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25450index 26d5a55..a01160a 100644
25451--- a/arch/x86/kernel/jump_label.c
25452+++ b/arch/x86/kernel/jump_label.c
25453@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25454 * Jump label is enabled for the first time.
25455 * So we expect a default_nop...
25456 */
25457- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25458+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25459 != 0))
25460 bug_at((void *)entry->code, __LINE__);
25461 } else {
25462@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25463 * ...otherwise expect an ideal_nop. Otherwise
25464 * something went horribly wrong.
25465 */
25466- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25467+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25468 != 0))
25469 bug_at((void *)entry->code, __LINE__);
25470 }
25471@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25472 * are converting the default nop to the ideal nop.
25473 */
25474 if (init) {
25475- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25476+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25477 bug_at((void *)entry->code, __LINE__);
25478 } else {
25479 code.jump = 0xe9;
25480 code.offset = entry->target -
25481 (entry->code + JUMP_LABEL_NOP_SIZE);
25482- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25483+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25484 bug_at((void *)entry->code, __LINE__);
25485 }
25486 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25487diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25488index 25ecd56..e12482f 100644
25489--- a/arch/x86/kernel/kgdb.c
25490+++ b/arch/x86/kernel/kgdb.c
25491@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25492 #ifdef CONFIG_X86_32
25493 switch (regno) {
25494 case GDB_SS:
25495- if (!user_mode_vm(regs))
25496+ if (!user_mode(regs))
25497 *(unsigned long *)mem = __KERNEL_DS;
25498 break;
25499 case GDB_SP:
25500- if (!user_mode_vm(regs))
25501+ if (!user_mode(regs))
25502 *(unsigned long *)mem = kernel_stack_pointer(regs);
25503 break;
25504 case GDB_GS:
25505@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25506 bp->attr.bp_addr = breakinfo[breakno].addr;
25507 bp->attr.bp_len = breakinfo[breakno].len;
25508 bp->attr.bp_type = breakinfo[breakno].type;
25509- info->address = breakinfo[breakno].addr;
25510+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25511+ info->address = ktla_ktva(breakinfo[breakno].addr);
25512+ else
25513+ info->address = breakinfo[breakno].addr;
25514 info->len = breakinfo[breakno].len;
25515 info->type = breakinfo[breakno].type;
25516 val = arch_install_hw_breakpoint(bp);
25517@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25518 case 'k':
25519 /* clear the trace bit */
25520 linux_regs->flags &= ~X86_EFLAGS_TF;
25521- atomic_set(&kgdb_cpu_doing_single_step, -1);
25522+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25523
25524 /* set the trace bit if we're stepping */
25525 if (remcomInBuffer[0] == 's') {
25526 linux_regs->flags |= X86_EFLAGS_TF;
25527- atomic_set(&kgdb_cpu_doing_single_step,
25528+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25529 raw_smp_processor_id());
25530 }
25531
25532@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25533
25534 switch (cmd) {
25535 case DIE_DEBUG:
25536- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25537+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25538 if (user_mode(regs))
25539 return single_step_cont(regs, args);
25540 break;
25541@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25542 #endif /* CONFIG_DEBUG_RODATA */
25543
25544 bpt->type = BP_BREAKPOINT;
25545- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25546+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25547 BREAK_INSTR_SIZE);
25548 if (err)
25549 return err;
25550- err = probe_kernel_write((char *)bpt->bpt_addr,
25551+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25552 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25553 #ifdef CONFIG_DEBUG_RODATA
25554 if (!err)
25555@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25556 return -EBUSY;
25557 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25558 BREAK_INSTR_SIZE);
25559- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25560+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25561 if (err)
25562 return err;
25563 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25564@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25565 if (mutex_is_locked(&text_mutex))
25566 goto knl_write;
25567 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25568- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25569+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25570 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25571 goto knl_write;
25572 return err;
25573 knl_write:
25574 #endif /* CONFIG_DEBUG_RODATA */
25575- return probe_kernel_write((char *)bpt->bpt_addr,
25576+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25577 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25578 }
25579
25580diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25581index 03189d8..4705700 100644
25582--- a/arch/x86/kernel/kprobes/core.c
25583+++ b/arch/x86/kernel/kprobes/core.c
25584@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25585 s32 raddr;
25586 } __packed *insn;
25587
25588- insn = (struct __arch_relative_insn *)from;
25589+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25590+
25591+ pax_open_kernel();
25592 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25593 insn->op = op;
25594+ pax_close_kernel();
25595 }
25596
25597 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25598@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25599 kprobe_opcode_t opcode;
25600 kprobe_opcode_t *orig_opcodes = opcodes;
25601
25602- if (search_exception_tables((unsigned long)opcodes))
25603+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25604 return 0; /* Page fault may occur on this address. */
25605
25606 retry:
25607@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25608 * Fortunately, we know that the original code is the ideal 5-byte
25609 * long NOP.
25610 */
25611- memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25612+ memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25613 if (faddr)
25614 memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
25615 else
25616 buf[0] = kp->opcode;
25617- return (unsigned long)buf;
25618+ return ktva_ktla((unsigned long)buf);
25619 }
25620
25621 /*
25622@@ -367,7 +370,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25623 /* Another subsystem puts a breakpoint, failed to recover */
25624 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25625 return 0;
25626+ pax_open_kernel();
25627 memcpy(dest, insn.kaddr, length);
25628+ pax_close_kernel();
25629
25630 #ifdef CONFIG_X86_64
25631 if (insn_rip_relative(&insn)) {
25632@@ -394,7 +399,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25633 return 0;
25634 }
25635 disp = (u8 *) dest + insn_offset_displacement(&insn);
25636+ pax_open_kernel();
25637 *(s32 *) disp = (s32) newdisp;
25638+ pax_close_kernel();
25639 }
25640 #endif
25641 return length;
25642@@ -536,7 +543,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25643 * nor set current_kprobe, because it doesn't use single
25644 * stepping.
25645 */
25646- regs->ip = (unsigned long)p->ainsn.insn;
25647+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25648 preempt_enable_no_resched();
25649 return;
25650 }
25651@@ -553,9 +560,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25652 regs->flags &= ~X86_EFLAGS_IF;
25653 /* single step inline if the instruction is an int3 */
25654 if (p->opcode == BREAKPOINT_INSTRUCTION)
25655- regs->ip = (unsigned long)p->addr;
25656+ regs->ip = ktla_ktva((unsigned long)p->addr);
25657 else
25658- regs->ip = (unsigned long)p->ainsn.insn;
25659+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25660 }
25661 NOKPROBE_SYMBOL(setup_singlestep);
25662
25663@@ -605,7 +612,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25664 struct kprobe *p;
25665 struct kprobe_ctlblk *kcb;
25666
25667- if (user_mode_vm(regs))
25668+ if (user_mode(regs))
25669 return 0;
25670
25671 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25672@@ -640,7 +647,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25673 setup_singlestep(p, regs, kcb, 0);
25674 return 1;
25675 }
25676- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25677+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25678 /*
25679 * The breakpoint instruction was removed right
25680 * after we hit it. Another cpu has removed
25681@@ -687,6 +694,9 @@ static void __used kretprobe_trampoline_holder(void)
25682 " movq %rax, 152(%rsp)\n"
25683 RESTORE_REGS_STRING
25684 " popfq\n"
25685+#ifdef KERNEXEC_PLUGIN
25686+ " btsq $63,(%rsp)\n"
25687+#endif
25688 #else
25689 " pushf\n"
25690 SAVE_REGS_STRING
25691@@ -827,7 +837,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25692 struct kprobe_ctlblk *kcb)
25693 {
25694 unsigned long *tos = stack_addr(regs);
25695- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25696+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25697 unsigned long orig_ip = (unsigned long)p->addr;
25698 kprobe_opcode_t *insn = p->ainsn.insn;
25699
25700@@ -1010,7 +1020,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25701 struct die_args *args = data;
25702 int ret = NOTIFY_DONE;
25703
25704- if (args->regs && user_mode_vm(args->regs))
25705+ if (args->regs && user_mode(args->regs))
25706 return ret;
25707
25708 if (val == DIE_GPF) {
25709diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25710index 7b3b9d1..e2478b91 100644
25711--- a/arch/x86/kernel/kprobes/opt.c
25712+++ b/arch/x86/kernel/kprobes/opt.c
25713@@ -79,6 +79,7 @@ found:
25714 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25715 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25716 {
25717+ pax_open_kernel();
25718 #ifdef CONFIG_X86_64
25719 *addr++ = 0x48;
25720 *addr++ = 0xbf;
25721@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25722 *addr++ = 0xb8;
25723 #endif
25724 *(unsigned long *)addr = val;
25725+ pax_close_kernel();
25726 }
25727
25728 asm (
25729@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25730 * Verify if the address gap is in 2GB range, because this uses
25731 * a relative jump.
25732 */
25733- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25734+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25735 if (abs(rel) > 0x7fffffff) {
25736 __arch_remove_optimized_kprobe(op, 0);
25737 return -ERANGE;
25738@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25739 op->optinsn.size = ret;
25740
25741 /* Copy arch-dep-instance from template */
25742- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25743+ pax_open_kernel();
25744+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25745+ pax_close_kernel();
25746
25747 /* Set probe information */
25748 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25749
25750 /* Set probe function call */
25751- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25752+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25753
25754 /* Set returning jmp instruction at the tail of out-of-line buffer */
25755- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25756+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25757 (u8 *)op->kp.addr + op->optinsn.size);
25758
25759 flush_icache_range((unsigned long) buf,
25760@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25761 WARN_ON(kprobe_disabled(&op->kp));
25762
25763 /* Backup instructions which will be replaced by jump address */
25764- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25765+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25766 RELATIVE_ADDR_SIZE);
25767
25768 insn_buf[0] = RELATIVEJUMP_OPCODE;
25769@@ -441,7 +445,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25770 /* This kprobe is really able to run optimized path. */
25771 op = container_of(p, struct optimized_kprobe, kp);
25772 /* Detour through copied instructions */
25773- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25774+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25775 if (!reenter)
25776 reset_current_kprobe();
25777 preempt_enable_no_resched();
25778diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25779index c2bedae..25e7ab60 100644
25780--- a/arch/x86/kernel/ksysfs.c
25781+++ b/arch/x86/kernel/ksysfs.c
25782@@ -184,7 +184,7 @@ out:
25783
25784 static struct kobj_attribute type_attr = __ATTR_RO(type);
25785
25786-static struct bin_attribute data_attr = {
25787+static bin_attribute_no_const data_attr __read_only = {
25788 .attr = {
25789 .name = "data",
25790 .mode = S_IRUGO,
25791diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25792index c37886d..3f425e3 100644
25793--- a/arch/x86/kernel/ldt.c
25794+++ b/arch/x86/kernel/ldt.c
25795@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25796 if (reload) {
25797 #ifdef CONFIG_SMP
25798 preempt_disable();
25799- load_LDT(pc);
25800+ load_LDT_nolock(pc);
25801 if (!cpumask_equal(mm_cpumask(current->mm),
25802 cpumask_of(smp_processor_id())))
25803 smp_call_function(flush_ldt, current->mm, 1);
25804 preempt_enable();
25805 #else
25806- load_LDT(pc);
25807+ load_LDT_nolock(pc);
25808 #endif
25809 }
25810 if (oldsize) {
25811@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25812 return err;
25813
25814 for (i = 0; i < old->size; i++)
25815- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25816+ write_ldt_entry(new->ldt, i, old->ldt + i);
25817 return 0;
25818 }
25819
25820@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25821 retval = copy_ldt(&mm->context, &old_mm->context);
25822 mutex_unlock(&old_mm->context.lock);
25823 }
25824+
25825+ if (tsk == current) {
25826+ mm->context.vdso = 0;
25827+
25828+#ifdef CONFIG_X86_32
25829+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25830+ mm->context.user_cs_base = 0UL;
25831+ mm->context.user_cs_limit = ~0UL;
25832+
25833+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25834+ cpumask_clear(&mm->context.cpu_user_cs_mask);
25835+#endif
25836+
25837+#endif
25838+#endif
25839+
25840+ }
25841+
25842 return retval;
25843 }
25844
25845@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25846 }
25847 }
25848
25849+#ifdef CONFIG_PAX_SEGMEXEC
25850+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25851+ error = -EINVAL;
25852+ goto out_unlock;
25853+ }
25854+#endif
25855+
25856 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25857 error = -EINVAL;
25858 goto out_unlock;
25859diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
25860index ff3c3101d..d7c0cd8 100644
25861--- a/arch/x86/kernel/livepatch.c
25862+++ b/arch/x86/kernel/livepatch.c
25863@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25864 int ret, numpages, size = 4;
25865 bool readonly;
25866 unsigned long val;
25867- unsigned long core = (unsigned long)mod->module_core;
25868- unsigned long core_ro_size = mod->core_ro_size;
25869- unsigned long core_size = mod->core_size;
25870+ unsigned long core_rx = (unsigned long)mod->module_core_rx;
25871+ unsigned long core_rw = (unsigned long)mod->module_core_rw;
25872+ unsigned long core_size_rx = mod->core_size_rx;
25873+ unsigned long core_size_rw = mod->core_size_rw;
25874
25875 switch (type) {
25876 case R_X86_64_NONE:
25877@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25878 return -EINVAL;
25879 }
25880
25881- if (loc < core || loc >= core + core_size)
25882+ if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
25883+ (loc < core_rw || loc >= core_rw + core_size_rw))
25884 /* loc does not point to any symbol inside the module */
25885 return -EINVAL;
25886
25887- if (loc < core + core_ro_size)
25888+ if (loc < core_rx + core_size_rx)
25889 readonly = true;
25890 else
25891 readonly = false;
25892diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25893index 469b23d..5449cfe 100644
25894--- a/arch/x86/kernel/machine_kexec_32.c
25895+++ b/arch/x86/kernel/machine_kexec_32.c
25896@@ -26,7 +26,7 @@
25897 #include <asm/cacheflush.h>
25898 #include <asm/debugreg.h>
25899
25900-static void set_idt(void *newidt, __u16 limit)
25901+static void set_idt(struct desc_struct *newidt, __u16 limit)
25902 {
25903 struct desc_ptr curidt;
25904
25905@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
25906 }
25907
25908
25909-static void set_gdt(void *newgdt, __u16 limit)
25910+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25911 {
25912 struct desc_ptr curgdt;
25913
25914@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
25915 }
25916
25917 control_page = page_address(image->control_code_page);
25918- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25919+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25920
25921 relocate_kernel_ptr = control_page;
25922 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25923diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25924index 94ea120..4154cea 100644
25925--- a/arch/x86/kernel/mcount_64.S
25926+++ b/arch/x86/kernel/mcount_64.S
25927@@ -7,7 +7,7 @@
25928 #include <linux/linkage.h>
25929 #include <asm/ptrace.h>
25930 #include <asm/ftrace.h>
25931-
25932+#include <asm/alternative-asm.h>
25933
25934 .code64
25935 .section .entry.text, "ax"
25936@@ -148,8 +148,9 @@
25937 #ifdef CONFIG_DYNAMIC_FTRACE
25938
25939 ENTRY(function_hook)
25940+ pax_force_retaddr
25941 retq
25942-END(function_hook)
25943+ENDPROC(function_hook)
25944
25945 ENTRY(ftrace_caller)
25946 /* save_mcount_regs fills in first two parameters */
25947@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
25948 #endif
25949
25950 GLOBAL(ftrace_stub)
25951+ pax_force_retaddr
25952 retq
25953-END(ftrace_caller)
25954+ENDPROC(ftrace_caller)
25955
25956 ENTRY(ftrace_regs_caller)
25957 /* Save the current flags before any operations that can change them */
25958@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
25959
25960 jmp ftrace_return
25961
25962-END(ftrace_regs_caller)
25963+ENDPROC(ftrace_regs_caller)
25964
25965
25966 #else /* ! CONFIG_DYNAMIC_FTRACE */
25967@@ -272,18 +274,20 @@ fgraph_trace:
25968 #endif
25969
25970 GLOBAL(ftrace_stub)
25971+ pax_force_retaddr
25972 retq
25973
25974 trace:
25975 /* save_mcount_regs fills in first two parameters */
25976 save_mcount_regs
25977
25978+ pax_force_fptr ftrace_trace_function
25979 call *ftrace_trace_function
25980
25981 restore_mcount_regs
25982
25983 jmp fgraph_trace
25984-END(function_hook)
25985+ENDPROC(function_hook)
25986 #endif /* CONFIG_DYNAMIC_FTRACE */
25987 #endif /* CONFIG_FUNCTION_TRACER */
25988
25989@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
25990
25991 restore_mcount_regs
25992
25993+ pax_force_retaddr
25994 retq
25995-END(ftrace_graph_caller)
25996+ENDPROC(ftrace_graph_caller)
25997
25998 GLOBAL(return_to_handler)
25999 subq $24, %rsp
26000@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
26001 movq 8(%rsp), %rdx
26002 movq (%rsp), %rax
26003 addq $24, %rsp
26004+ pax_force_fptr %rdi
26005 jmp *%rdi
26006+ENDPROC(return_to_handler)
26007 #endif
26008diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
26009index d1ac80b..f593701 100644
26010--- a/arch/x86/kernel/module.c
26011+++ b/arch/x86/kernel/module.c
26012@@ -82,17 +82,17 @@ static unsigned long int get_module_load_offset(void)
26013 }
26014 #endif
26015
26016-void *module_alloc(unsigned long size)
26017+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
26018 {
26019 void *p;
26020
26021- if (PAGE_ALIGN(size) > MODULES_LEN)
26022+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
26023 return NULL;
26024
26025 p = __vmalloc_node_range(size, MODULE_ALIGN,
26026 MODULES_VADDR + get_module_load_offset(),
26027- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
26028- PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
26029+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
26030+ prot, 0, NUMA_NO_NODE,
26031 __builtin_return_address(0));
26032 if (p && (kasan_module_alloc(p, size) < 0)) {
26033 vfree(p);
26034@@ -102,6 +102,51 @@ void *module_alloc(unsigned long size)
26035 return p;
26036 }
26037
26038+void *module_alloc(unsigned long size)
26039+{
26040+
26041+#ifdef CONFIG_PAX_KERNEXEC
26042+ return __module_alloc(size, PAGE_KERNEL);
26043+#else
26044+ return __module_alloc(size, PAGE_KERNEL_EXEC);
26045+#endif
26046+
26047+}
26048+
26049+#ifdef CONFIG_PAX_KERNEXEC
26050+#ifdef CONFIG_X86_32
26051+void *module_alloc_exec(unsigned long size)
26052+{
26053+ struct vm_struct *area;
26054+
26055+ if (size == 0)
26056+ return NULL;
26057+
26058+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
26059+return area ? area->addr : NULL;
26060+}
26061+EXPORT_SYMBOL(module_alloc_exec);
26062+
26063+void module_memfree_exec(void *module_region)
26064+{
26065+ vunmap(module_region);
26066+}
26067+EXPORT_SYMBOL(module_memfree_exec);
26068+#else
26069+void module_memfree_exec(void *module_region)
26070+{
26071+ module_memfree(module_region);
26072+}
26073+EXPORT_SYMBOL(module_memfree_exec);
26074+
26075+void *module_alloc_exec(unsigned long size)
26076+{
26077+ return __module_alloc(size, PAGE_KERNEL_RX);
26078+}
26079+EXPORT_SYMBOL(module_alloc_exec);
26080+#endif
26081+#endif
26082+
26083 #ifdef CONFIG_X86_32
26084 int apply_relocate(Elf32_Shdr *sechdrs,
26085 const char *strtab,
26086@@ -112,14 +157,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26087 unsigned int i;
26088 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26089 Elf32_Sym *sym;
26090- uint32_t *location;
26091+ uint32_t *plocation, location;
26092
26093 DEBUGP("Applying relocate section %u to %u\n",
26094 relsec, sechdrs[relsec].sh_info);
26095 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26096 /* This is where to make the change */
26097- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26098- + rel[i].r_offset;
26099+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26100+ location = (uint32_t)plocation;
26101+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26102+ plocation = ktla_ktva((void *)plocation);
26103 /* This is the symbol it is referring to. Note that all
26104 undefined symbols have been resolved. */
26105 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26106@@ -128,11 +175,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26107 switch (ELF32_R_TYPE(rel[i].r_info)) {
26108 case R_386_32:
26109 /* We add the value into the location given */
26110- *location += sym->st_value;
26111+ pax_open_kernel();
26112+ *plocation += sym->st_value;
26113+ pax_close_kernel();
26114 break;
26115 case R_386_PC32:
26116 /* Add the value, subtract its position */
26117- *location += sym->st_value - (uint32_t)location;
26118+ pax_open_kernel();
26119+ *plocation += sym->st_value - location;
26120+ pax_close_kernel();
26121 break;
26122 default:
26123 pr_err("%s: Unknown relocation: %u\n",
26124@@ -177,21 +228,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26125 case R_X86_64_NONE:
26126 break;
26127 case R_X86_64_64:
26128+ pax_open_kernel();
26129 *(u64 *)loc = val;
26130+ pax_close_kernel();
26131 break;
26132 case R_X86_64_32:
26133+ pax_open_kernel();
26134 *(u32 *)loc = val;
26135+ pax_close_kernel();
26136 if (val != *(u32 *)loc)
26137 goto overflow;
26138 break;
26139 case R_X86_64_32S:
26140+ pax_open_kernel();
26141 *(s32 *)loc = val;
26142+ pax_close_kernel();
26143 if ((s64)val != *(s32 *)loc)
26144 goto overflow;
26145 break;
26146 case R_X86_64_PC32:
26147 val -= (u64)loc;
26148+ pax_open_kernel();
26149 *(u32 *)loc = val;
26150+ pax_close_kernel();
26151+
26152 #if 0
26153 if ((s64)val != *(s32 *)loc)
26154 goto overflow;
26155diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26156index 113e707..0a690e1 100644
26157--- a/arch/x86/kernel/msr.c
26158+++ b/arch/x86/kernel/msr.c
26159@@ -39,6 +39,7 @@
26160 #include <linux/notifier.h>
26161 #include <linux/uaccess.h>
26162 #include <linux/gfp.h>
26163+#include <linux/grsecurity.h>
26164
26165 #include <asm/processor.h>
26166 #include <asm/msr.h>
26167@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26168 int err = 0;
26169 ssize_t bytes = 0;
26170
26171+#ifdef CONFIG_GRKERNSEC_KMEM
26172+ gr_handle_msr_write();
26173+ return -EPERM;
26174+#endif
26175+
26176 if (count % 8)
26177 return -EINVAL; /* Invalid chunk size */
26178
26179@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26180 err = -EBADF;
26181 break;
26182 }
26183+#ifdef CONFIG_GRKERNSEC_KMEM
26184+ gr_handle_msr_write();
26185+ return -EPERM;
26186+#endif
26187 if (copy_from_user(&regs, uregs, sizeof regs)) {
26188 err = -EFAULT;
26189 break;
26190@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26191 return notifier_from_errno(err);
26192 }
26193
26194-static struct notifier_block __refdata msr_class_cpu_notifier = {
26195+static struct notifier_block msr_class_cpu_notifier = {
26196 .notifier_call = msr_class_cpu_callback,
26197 };
26198
26199diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26200index c3e985d..110a36a 100644
26201--- a/arch/x86/kernel/nmi.c
26202+++ b/arch/x86/kernel/nmi.c
26203@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26204
26205 static void nmi_max_handler(struct irq_work *w)
26206 {
26207- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26208+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26209 int remainder_ns, decimal_msecs;
26210- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26211+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26212
26213 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26214 decimal_msecs = remainder_ns / 1000;
26215
26216 printk_ratelimited(KERN_INFO
26217 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26218- a->handler, whole_msecs, decimal_msecs);
26219+ n->action->handler, whole_msecs, decimal_msecs);
26220 }
26221
26222 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26223@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26224 delta = sched_clock() - delta;
26225 trace_nmi_handler(a->handler, (int)delta, thishandled);
26226
26227- if (delta < nmi_longest_ns || delta < a->max_duration)
26228+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26229 continue;
26230
26231- a->max_duration = delta;
26232- irq_work_queue(&a->irq_work);
26233+ a->work->max_duration = delta;
26234+ irq_work_queue(&a->work->irq_work);
26235 }
26236
26237 rcu_read_unlock();
26238@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26239 }
26240 NOKPROBE_SYMBOL(nmi_handle);
26241
26242-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26243+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26244 {
26245 struct nmi_desc *desc = nmi_to_desc(type);
26246 unsigned long flags;
26247@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26248 if (!action->handler)
26249 return -EINVAL;
26250
26251- init_irq_work(&action->irq_work, nmi_max_handler);
26252+ action->work->action = action;
26253+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26254
26255 spin_lock_irqsave(&desc->lock, flags);
26256
26257@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26258 * event confuses some handlers (kdump uses this flag)
26259 */
26260 if (action->flags & NMI_FLAG_FIRST)
26261- list_add_rcu(&action->list, &desc->head);
26262+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26263 else
26264- list_add_tail_rcu(&action->list, &desc->head);
26265+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26266
26267 spin_unlock_irqrestore(&desc->lock, flags);
26268 return 0;
26269@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26270 if (!strcmp(n->name, name)) {
26271 WARN(in_nmi(),
26272 "Trying to free NMI (%s) from NMI context!\n", n->name);
26273- list_del_rcu(&n->list);
26274+ pax_list_del_rcu((struct list_head *)&n->list);
26275 break;
26276 }
26277 }
26278@@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26279 dotraplinkage notrace void
26280 do_nmi(struct pt_regs *regs, long error_code)
26281 {
26282+
26283+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26284+ if (!user_mode(regs)) {
26285+ unsigned long cs = regs->cs & 0xFFFF;
26286+ unsigned long ip = ktva_ktla(regs->ip);
26287+
26288+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26289+ regs->ip = ip;
26290+ }
26291+#endif
26292+
26293 nmi_nesting_preprocess(regs);
26294
26295 nmi_enter();
26296diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26297index 6d9582e..f746287 100644
26298--- a/arch/x86/kernel/nmi_selftest.c
26299+++ b/arch/x86/kernel/nmi_selftest.c
26300@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26301 {
26302 /* trap all the unknown NMIs we may generate */
26303 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26304- __initdata);
26305+ __initconst);
26306 }
26307
26308 static void __init cleanup_nmi_testsuite(void)
26309@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26310 unsigned long timeout;
26311
26312 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26313- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26314+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26315 nmi_fail = FAILURE;
26316 return;
26317 }
26318diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26319index bbb6c73..24a58ef 100644
26320--- a/arch/x86/kernel/paravirt-spinlocks.c
26321+++ b/arch/x86/kernel/paravirt-spinlocks.c
26322@@ -8,7 +8,7 @@
26323
26324 #include <asm/paravirt.h>
26325
26326-struct pv_lock_ops pv_lock_ops = {
26327+struct pv_lock_ops pv_lock_ops __read_only = {
26328 #ifdef CONFIG_SMP
26329 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26330 .unlock_kick = paravirt_nop,
26331diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26332index 548d25f..f8fb99c 100644
26333--- a/arch/x86/kernel/paravirt.c
26334+++ b/arch/x86/kernel/paravirt.c
26335@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26336 {
26337 return x;
26338 }
26339+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26340+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26341+#endif
26342
26343 void __init default_banner(void)
26344 {
26345@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26346
26347 if (opfunc == NULL)
26348 /* If there's no function, patch it with a ud2a (BUG) */
26349- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26350- else if (opfunc == _paravirt_nop)
26351+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26352+ else if (opfunc == (void *)_paravirt_nop)
26353 /* If the operation is a nop, then nop the callsite */
26354 ret = paravirt_patch_nop();
26355
26356 /* identity functions just return their single argument */
26357- else if (opfunc == _paravirt_ident_32)
26358+ else if (opfunc == (void *)_paravirt_ident_32)
26359 ret = paravirt_patch_ident_32(insnbuf, len);
26360- else if (opfunc == _paravirt_ident_64)
26361+ else if (opfunc == (void *)_paravirt_ident_64)
26362 ret = paravirt_patch_ident_64(insnbuf, len);
26363+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26364+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26365+ ret = paravirt_patch_ident_64(insnbuf, len);
26366+#endif
26367
26368 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26369 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26370@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26371 if (insn_len > len || start == NULL)
26372 insn_len = len;
26373 else
26374- memcpy(insnbuf, start, insn_len);
26375+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26376
26377 return insn_len;
26378 }
26379@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26380 return this_cpu_read(paravirt_lazy_mode);
26381 }
26382
26383-struct pv_info pv_info = {
26384+struct pv_info pv_info __read_only = {
26385 .name = "bare hardware",
26386 .paravirt_enabled = 0,
26387 .kernel_rpl = 0,
26388@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26389 #endif
26390 };
26391
26392-struct pv_init_ops pv_init_ops = {
26393+struct pv_init_ops pv_init_ops __read_only = {
26394 .patch = native_patch,
26395 };
26396
26397-struct pv_time_ops pv_time_ops = {
26398+struct pv_time_ops pv_time_ops __read_only = {
26399 .sched_clock = native_sched_clock,
26400 .steal_clock = native_steal_clock,
26401 };
26402
26403-__visible struct pv_irq_ops pv_irq_ops = {
26404+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26405 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26406 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26407 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26408@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26409 #endif
26410 };
26411
26412-__visible struct pv_cpu_ops pv_cpu_ops = {
26413+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26414 .cpuid = native_cpuid,
26415 .get_debugreg = native_get_debugreg,
26416 .set_debugreg = native_set_debugreg,
26417@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26418 NOKPROBE_SYMBOL(native_set_debugreg);
26419 NOKPROBE_SYMBOL(native_load_idt);
26420
26421-struct pv_apic_ops pv_apic_ops = {
26422+struct pv_apic_ops pv_apic_ops __read_only= {
26423 #ifdef CONFIG_X86_LOCAL_APIC
26424 .startup_ipi_hook = paravirt_nop,
26425 #endif
26426 };
26427
26428-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26429+#ifdef CONFIG_X86_32
26430+#ifdef CONFIG_X86_PAE
26431+/* 64-bit pagetable entries */
26432+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26433+#else
26434 /* 32-bit pagetable entries */
26435 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26436+#endif
26437 #else
26438 /* 64-bit pagetable entries */
26439 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26440 #endif
26441
26442-struct pv_mmu_ops pv_mmu_ops = {
26443+struct pv_mmu_ops pv_mmu_ops __read_only = {
26444
26445 .read_cr2 = native_read_cr2,
26446 .write_cr2 = native_write_cr2,
26447@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26448 .make_pud = PTE_IDENT,
26449
26450 .set_pgd = native_set_pgd,
26451+ .set_pgd_batched = native_set_pgd_batched,
26452 #endif
26453 #endif /* PAGETABLE_LEVELS >= 3 */
26454
26455@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26456 },
26457
26458 .set_fixmap = native_set_fixmap,
26459+
26460+#ifdef CONFIG_PAX_KERNEXEC
26461+ .pax_open_kernel = native_pax_open_kernel,
26462+ .pax_close_kernel = native_pax_close_kernel,
26463+#endif
26464+
26465 };
26466
26467 EXPORT_SYMBOL_GPL(pv_time_ops);
26468diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26469index a1da673..b6f5831 100644
26470--- a/arch/x86/kernel/paravirt_patch_64.c
26471+++ b/arch/x86/kernel/paravirt_patch_64.c
26472@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26473 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26474 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26475 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26476+
26477+#ifndef CONFIG_PAX_MEMORY_UDEREF
26478 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26479+#endif
26480+
26481 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26482 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26483
26484@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26485 PATCH_SITE(pv_mmu_ops, read_cr3);
26486 PATCH_SITE(pv_mmu_ops, write_cr3);
26487 PATCH_SITE(pv_cpu_ops, clts);
26488+
26489+#ifndef CONFIG_PAX_MEMORY_UDEREF
26490 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26491+#endif
26492+
26493 PATCH_SITE(pv_cpu_ops, wbinvd);
26494
26495 patch_site:
26496diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26497index 0497f71..7186c0d 100644
26498--- a/arch/x86/kernel/pci-calgary_64.c
26499+++ b/arch/x86/kernel/pci-calgary_64.c
26500@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26501 tce_space = be64_to_cpu(readq(target));
26502 tce_space = tce_space & TAR_SW_BITS;
26503
26504- tce_space = tce_space & (~specified_table_size);
26505+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26506 info->tce_space = (u64 *)__va(tce_space);
26507 }
26508 }
26509diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26510index 35ccf75..7a15747 100644
26511--- a/arch/x86/kernel/pci-iommu_table.c
26512+++ b/arch/x86/kernel/pci-iommu_table.c
26513@@ -2,7 +2,7 @@
26514 #include <asm/iommu_table.h>
26515 #include <linux/string.h>
26516 #include <linux/kallsyms.h>
26517-
26518+#include <linux/sched.h>
26519
26520 #define DEBUG 1
26521
26522diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26523index 77dd0ad..9ec4723 100644
26524--- a/arch/x86/kernel/pci-swiotlb.c
26525+++ b/arch/x86/kernel/pci-swiotlb.c
26526@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26527 struct dma_attrs *attrs)
26528 {
26529 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26530- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26531+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26532 else
26533 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26534 }
26535diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26536index a388bb8..97064ad 100644
26537--- a/arch/x86/kernel/process.c
26538+++ b/arch/x86/kernel/process.c
26539@@ -38,7 +38,8 @@
26540 * section. Since TSS's are completely CPU-local, we want them
26541 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26542 */
26543-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26544+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26545+EXPORT_SYMBOL(init_tss);
26546
26547 #ifdef CONFIG_X86_64
26548 static DEFINE_PER_CPU(unsigned char, is_idle);
26549@@ -96,7 +97,7 @@ void arch_task_cache_init(void)
26550 task_xstate_cachep =
26551 kmem_cache_create("task_xstate", xstate_size,
26552 __alignof__(union thread_xstate),
26553- SLAB_PANIC | SLAB_NOTRACK, NULL);
26554+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26555 setup_xstate_comp();
26556 }
26557
26558@@ -110,7 +111,7 @@ void exit_thread(void)
26559 unsigned long *bp = t->io_bitmap_ptr;
26560
26561 if (bp) {
26562- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26563+ struct tss_struct *tss = init_tss + get_cpu();
26564
26565 t->io_bitmap_ptr = NULL;
26566 clear_thread_flag(TIF_IO_BITMAP);
26567@@ -130,6 +131,9 @@ void flush_thread(void)
26568 {
26569 struct task_struct *tsk = current;
26570
26571+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26572+ loadsegment(gs, 0);
26573+#endif
26574 flush_ptrace_hw_breakpoint(tsk);
26575 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26576 drop_init_fpu(tsk);
26577@@ -276,7 +280,7 @@ static void __exit_idle(void)
26578 void exit_idle(void)
26579 {
26580 /* idle loop has pid 0 */
26581- if (current->pid)
26582+ if (task_pid_nr(current))
26583 return;
26584 __exit_idle();
26585 }
26586@@ -329,7 +333,7 @@ bool xen_set_default_idle(void)
26587 return ret;
26588 }
26589 #endif
26590-void stop_this_cpu(void *dummy)
26591+__noreturn void stop_this_cpu(void *dummy)
26592 {
26593 local_irq_disable();
26594 /*
26595@@ -508,16 +512,37 @@ static int __init idle_setup(char *str)
26596 }
26597 early_param("idle", idle_setup);
26598
26599-unsigned long arch_align_stack(unsigned long sp)
26600+#ifdef CONFIG_PAX_RANDKSTACK
26601+void pax_randomize_kstack(struct pt_regs *regs)
26602 {
26603- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26604- sp -= get_random_int() % 8192;
26605- return sp & ~0xf;
26606-}
26607+ struct thread_struct *thread = &current->thread;
26608+ unsigned long time;
26609
26610-unsigned long arch_randomize_brk(struct mm_struct *mm)
26611-{
26612- unsigned long range_end = mm->brk + 0x02000000;
26613- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26614-}
26615+ if (!randomize_va_space)
26616+ return;
26617+
26618+ if (v8086_mode(regs))
26619+ return;
26620
26621+ rdtscl(time);
26622+
26623+ /* P4 seems to return a 0 LSB, ignore it */
26624+#ifdef CONFIG_MPENTIUM4
26625+ time &= 0x3EUL;
26626+ time <<= 2;
26627+#elif defined(CONFIG_X86_64)
26628+ time &= 0xFUL;
26629+ time <<= 4;
26630+#else
26631+ time &= 0x1FUL;
26632+ time <<= 3;
26633+#endif
26634+
26635+ thread->sp0 ^= time;
26636+ load_sp0(init_tss + smp_processor_id(), thread);
26637+
26638+#ifdef CONFIG_X86_64
26639+ this_cpu_write(kernel_stack, thread->sp0);
26640+#endif
26641+}
26642+#endif
26643diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26644index 603c4f9..3a105d7 100644
26645--- a/arch/x86/kernel/process_32.c
26646+++ b/arch/x86/kernel/process_32.c
26647@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26648 unsigned long thread_saved_pc(struct task_struct *tsk)
26649 {
26650 return ((unsigned long *)tsk->thread.sp)[3];
26651+//XXX return tsk->thread.eip;
26652 }
26653
26654 void __show_regs(struct pt_regs *regs, int all)
26655@@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26656 unsigned long sp;
26657 unsigned short ss, gs;
26658
26659- if (user_mode_vm(regs)) {
26660+ if (user_mode(regs)) {
26661 sp = regs->sp;
26662 ss = regs->ss & 0xffff;
26663- gs = get_user_gs(regs);
26664 } else {
26665 sp = kernel_stack_pointer(regs);
26666 savesegment(ss, ss);
26667- savesegment(gs, gs);
26668 }
26669+ gs = get_user_gs(regs);
26670
26671 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26672 (u16)regs->cs, regs->ip, regs->flags,
26673- smp_processor_id());
26674+ raw_smp_processor_id());
26675 print_symbol("EIP is at %s\n", regs->ip);
26676
26677 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26678@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26679 int copy_thread(unsigned long clone_flags, unsigned long sp,
26680 unsigned long arg, struct task_struct *p)
26681 {
26682- struct pt_regs *childregs = task_pt_regs(p);
26683+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26684 struct task_struct *tsk;
26685 int err;
26686
26687 p->thread.sp = (unsigned long) childregs;
26688 p->thread.sp0 = (unsigned long) (childregs+1);
26689+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26690 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26691
26692 if (unlikely(p->flags & PF_KTHREAD)) {
26693 /* kernel thread */
26694 memset(childregs, 0, sizeof(struct pt_regs));
26695 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26696- task_user_gs(p) = __KERNEL_STACK_CANARY;
26697- childregs->ds = __USER_DS;
26698- childregs->es = __USER_DS;
26699+ savesegment(gs, childregs->gs);
26700+ childregs->ds = __KERNEL_DS;
26701+ childregs->es = __KERNEL_DS;
26702 childregs->fs = __KERNEL_PERCPU;
26703 childregs->bx = sp; /* function */
26704 childregs->bp = arg;
26705@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26706 struct thread_struct *prev = &prev_p->thread,
26707 *next = &next_p->thread;
26708 int cpu = smp_processor_id();
26709- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26710+ struct tss_struct *tss = init_tss + cpu;
26711 fpu_switch_t fpu;
26712
26713 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26714@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26715 */
26716 lazy_save_gs(prev->gs);
26717
26718+#ifdef CONFIG_PAX_MEMORY_UDEREF
26719+ __set_fs(task_thread_info(next_p)->addr_limit);
26720+#endif
26721+
26722 /*
26723 * Load the per-thread Thread-Local Storage descriptor.
26724 */
26725@@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26726 */
26727 arch_end_context_switch(next_p);
26728
26729- this_cpu_write(kernel_stack,
26730- (unsigned long)task_stack_page(next_p) +
26731- THREAD_SIZE - KERNEL_STACK_OFFSET);
26732+ this_cpu_write(current_task, next_p);
26733+ this_cpu_write(current_tinfo, &next_p->tinfo);
26734+ this_cpu_write(kernel_stack, next->sp0);
26735
26736 /*
26737 * Restore %gs if needed (which is common)
26738@@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26739
26740 switch_fpu_finish(next_p, fpu);
26741
26742- this_cpu_write(current_task, next_p);
26743-
26744 return prev_p;
26745 }
26746
26747@@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26748 } while (count++ < 16);
26749 return 0;
26750 }
26751-
26752diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26753index 67fcc43..0d2c630 100644
26754--- a/arch/x86/kernel/process_64.c
26755+++ b/arch/x86/kernel/process_64.c
26756@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26757 struct pt_regs *childregs;
26758 struct task_struct *me = current;
26759
26760- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26761+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26762 childregs = task_pt_regs(p);
26763 p->thread.sp = (unsigned long) childregs;
26764 p->thread.usersp = me->thread.usersp;
26765+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26766 set_tsk_thread_flag(p, TIF_FORK);
26767 p->thread.io_bitmap_ptr = NULL;
26768
26769@@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26770 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26771 savesegment(es, p->thread.es);
26772 savesegment(ds, p->thread.ds);
26773+ savesegment(ss, p->thread.ss);
26774+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26775 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26776
26777 if (unlikely(p->flags & PF_KTHREAD)) {
26778@@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26779 struct thread_struct *prev = &prev_p->thread;
26780 struct thread_struct *next = &next_p->thread;
26781 int cpu = smp_processor_id();
26782- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26783+ struct tss_struct *tss = init_tss + cpu;
26784 unsigned fsindex, gsindex;
26785 fpu_switch_t fpu;
26786
26787@@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26788 if (unlikely(next->ds | prev->ds))
26789 loadsegment(ds, next->ds);
26790
26791+ savesegment(ss, prev->ss);
26792+ if (unlikely(next->ss != prev->ss))
26793+ loadsegment(ss, next->ss);
26794+
26795 /*
26796 * Switch FS and GS.
26797 *
26798@@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26799 prev->usersp = this_cpu_read(old_rsp);
26800 this_cpu_write(old_rsp, next->usersp);
26801 this_cpu_write(current_task, next_p);
26802+ this_cpu_write(current_tinfo, &next_p->tinfo);
26803
26804 /*
26805 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26806@@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26807 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26808 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26809
26810- this_cpu_write(kernel_stack,
26811- (unsigned long)task_stack_page(next_p) +
26812- THREAD_SIZE - KERNEL_STACK_OFFSET);
26813+ this_cpu_write(kernel_stack, next->sp0);
26814
26815 /*
26816 * Now maybe reload the debug registers and handle I/O bitmaps
26817@@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
26818 if (!p || p == current || p->state == TASK_RUNNING)
26819 return 0;
26820 stack = (unsigned long)task_stack_page(p);
26821- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26822+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26823 return 0;
26824 fp = *(u64 *)(p->thread.sp);
26825 do {
26826- if (fp < (unsigned long)stack ||
26827- fp >= (unsigned long)stack+THREAD_SIZE)
26828+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26829 return 0;
26830 ip = *(u64 *)(fp+8);
26831 if (!in_sched_functions(ip))
26832diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26833index e510618..5165ac0 100644
26834--- a/arch/x86/kernel/ptrace.c
26835+++ b/arch/x86/kernel/ptrace.c
26836@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26837 unsigned long sp = (unsigned long)&regs->sp;
26838 u32 *prev_esp;
26839
26840- if (context == (sp & ~(THREAD_SIZE - 1)))
26841+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26842 return sp;
26843
26844- prev_esp = (u32 *)(context);
26845+ prev_esp = *(u32 **)(context);
26846 if (prev_esp)
26847 return (unsigned long)prev_esp;
26848
26849@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26850 if (child->thread.gs != value)
26851 return do_arch_prctl(child, ARCH_SET_GS, value);
26852 return 0;
26853+
26854+ case offsetof(struct user_regs_struct,ip):
26855+ /*
26856+ * Protect against any attempt to set ip to an
26857+ * impossible address. There are dragons lurking if the
26858+ * address is noncanonical. (This explicitly allows
26859+ * setting ip to TASK_SIZE_MAX, because user code can do
26860+ * that all by itself by running off the end of its
26861+ * address space.
26862+ */
26863+ if (value > TASK_SIZE_MAX)
26864+ return -EIO;
26865+ break;
26866+
26867 #endif
26868 }
26869
26870@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26871 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26872 {
26873 int i;
26874- int dr7 = 0;
26875+ unsigned long dr7 = 0;
26876 struct arch_hw_breakpoint *info;
26877
26878 for (i = 0; i < HBP_NUM; i++) {
26879@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26880 unsigned long addr, unsigned long data)
26881 {
26882 int ret;
26883- unsigned long __user *datap = (unsigned long __user *)data;
26884+ unsigned long __user *datap = (__force unsigned long __user *)data;
26885
26886 switch (request) {
26887 /* read the word at location addr in the USER area. */
26888@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26889 if ((int) addr < 0)
26890 return -EIO;
26891 ret = do_get_thread_area(child, addr,
26892- (struct user_desc __user *)data);
26893+ (__force struct user_desc __user *) data);
26894 break;
26895
26896 case PTRACE_SET_THREAD_AREA:
26897 if ((int) addr < 0)
26898 return -EIO;
26899 ret = do_set_thread_area(child, addr,
26900- (struct user_desc __user *)data, 0);
26901+ (__force struct user_desc __user *) data, 0);
26902 break;
26903 #endif
26904
26905@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26906
26907 #ifdef CONFIG_X86_64
26908
26909-static struct user_regset x86_64_regsets[] __read_mostly = {
26910+static user_regset_no_const x86_64_regsets[] __read_only = {
26911 [REGSET_GENERAL] = {
26912 .core_note_type = NT_PRSTATUS,
26913 .n = sizeof(struct user_regs_struct) / sizeof(long),
26914@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26915 #endif /* CONFIG_X86_64 */
26916
26917 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26918-static struct user_regset x86_32_regsets[] __read_mostly = {
26919+static user_regset_no_const x86_32_regsets[] __read_only = {
26920 [REGSET_GENERAL] = {
26921 .core_note_type = NT_PRSTATUS,
26922 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26923@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26924 */
26925 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26926
26927-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26928+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26929 {
26930 #ifdef CONFIG_X86_64
26931 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26932@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26933 memset(info, 0, sizeof(*info));
26934 info->si_signo = SIGTRAP;
26935 info->si_code = si_code;
26936- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26937+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26938 }
26939
26940 void user_single_step_siginfo(struct task_struct *tsk,
26941@@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26942 }
26943 }
26944
26945+#ifdef CONFIG_GRKERNSEC_SETXID
26946+extern void gr_delayed_cred_worker(void);
26947+#endif
26948+
26949 /*
26950 * We can return 0 to resume the syscall or anything else to go to phase
26951 * 2. If we resume the syscall, we need to put something appropriate in
26952@@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26953
26954 BUG_ON(regs != task_pt_regs(current));
26955
26956+#ifdef CONFIG_GRKERNSEC_SETXID
26957+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26958+ gr_delayed_cred_worker();
26959+#endif
26960+
26961 /*
26962 * If we stepped into a sysenter/syscall insn, it trapped in
26963 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26964@@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26965 */
26966 user_exit();
26967
26968+#ifdef CONFIG_GRKERNSEC_SETXID
26969+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26970+ gr_delayed_cred_worker();
26971+#endif
26972+
26973 audit_syscall_exit(regs);
26974
26975 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26976diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26977index e5ecd20..60f7eef 100644
26978--- a/arch/x86/kernel/pvclock.c
26979+++ b/arch/x86/kernel/pvclock.c
26980@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26981 reset_hung_task_detector();
26982 }
26983
26984-static atomic64_t last_value = ATOMIC64_INIT(0);
26985+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26986
26987 void pvclock_resume(void)
26988 {
26989- atomic64_set(&last_value, 0);
26990+ atomic64_set_unchecked(&last_value, 0);
26991 }
26992
26993 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26994@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26995 * updating at the same time, and one of them could be slightly behind,
26996 * making the assumption that last_value always go forward fail to hold.
26997 */
26998- last = atomic64_read(&last_value);
26999+ last = atomic64_read_unchecked(&last_value);
27000 do {
27001 if (ret < last)
27002 return last;
27003- last = atomic64_cmpxchg(&last_value, last, ret);
27004+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
27005 } while (unlikely(last != ret));
27006
27007 return ret;
27008diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
27009index 86db4bc..a50a54a 100644
27010--- a/arch/x86/kernel/reboot.c
27011+++ b/arch/x86/kernel/reboot.c
27012@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
27013
27014 void __noreturn machine_real_restart(unsigned int type)
27015 {
27016+
27017+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
27018+ struct desc_struct *gdt;
27019+#endif
27020+
27021 local_irq_disable();
27022
27023 /*
27024@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
27025
27026 /* Jump to the identity-mapped low memory code */
27027 #ifdef CONFIG_X86_32
27028- asm volatile("jmpl *%0" : :
27029+
27030+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
27031+ gdt = get_cpu_gdt_table(smp_processor_id());
27032+ pax_open_kernel();
27033+#ifdef CONFIG_PAX_MEMORY_UDEREF
27034+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
27035+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
27036+ loadsegment(ds, __KERNEL_DS);
27037+ loadsegment(es, __KERNEL_DS);
27038+ loadsegment(ss, __KERNEL_DS);
27039+#endif
27040+#ifdef CONFIG_PAX_KERNEXEC
27041+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
27042+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
27043+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
27044+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
27045+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
27046+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
27047+#endif
27048+ pax_close_kernel();
27049+#endif
27050+
27051+ asm volatile("ljmpl *%0" : :
27052 "rm" (real_mode_header->machine_real_restart_asm),
27053 "a" (type));
27054 #else
27055@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
27056 /*
27057 * This is a single dmi_table handling all reboot quirks.
27058 */
27059-static struct dmi_system_id __initdata reboot_dmi_table[] = {
27060+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
27061
27062 /* Acer */
27063 { /* Handle reboot issue on Acer Aspire one */
27064@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
27065 * This means that this function can never return, it can misbehave
27066 * by not rebooting properly and hanging.
27067 */
27068-static void native_machine_emergency_restart(void)
27069+static void __noreturn native_machine_emergency_restart(void)
27070 {
27071 int i;
27072 int attempt = 0;
27073@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
27074 #endif
27075 }
27076
27077-static void __machine_emergency_restart(int emergency)
27078+static void __noreturn __machine_emergency_restart(int emergency)
27079 {
27080 reboot_emergency = emergency;
27081 machine_ops.emergency_restart();
27082 }
27083
27084-static void native_machine_restart(char *__unused)
27085+static void __noreturn native_machine_restart(char *__unused)
27086 {
27087 pr_notice("machine restart\n");
27088
27089@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27090 __machine_emergency_restart(0);
27091 }
27092
27093-static void native_machine_halt(void)
27094+static void __noreturn native_machine_halt(void)
27095 {
27096 /* Stop other cpus and apics */
27097 machine_shutdown();
27098@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27099 stop_this_cpu(NULL);
27100 }
27101
27102-static void native_machine_power_off(void)
27103+static void __noreturn native_machine_power_off(void)
27104 {
27105 if (pm_power_off) {
27106 if (!reboot_force)
27107@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27108 }
27109 /* A fallback in case there is no PM info available */
27110 tboot_shutdown(TB_SHUTDOWN_HALT);
27111+ unreachable();
27112 }
27113
27114-struct machine_ops machine_ops = {
27115+struct machine_ops machine_ops __read_only = {
27116 .power_off = native_machine_power_off,
27117 .shutdown = native_machine_shutdown,
27118 .emergency_restart = native_machine_emergency_restart,
27119diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27120index c8e41e9..64049ef 100644
27121--- a/arch/x86/kernel/reboot_fixups_32.c
27122+++ b/arch/x86/kernel/reboot_fixups_32.c
27123@@ -57,7 +57,7 @@ struct device_fixup {
27124 unsigned int vendor;
27125 unsigned int device;
27126 void (*reboot_fixup)(struct pci_dev *);
27127-};
27128+} __do_const;
27129
27130 /*
27131 * PCI ids solely used for fixups_table go here
27132diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27133index 3fd2c69..a444264 100644
27134--- a/arch/x86/kernel/relocate_kernel_64.S
27135+++ b/arch/x86/kernel/relocate_kernel_64.S
27136@@ -96,8 +96,7 @@ relocate_kernel:
27137
27138 /* jump to identity mapped page */
27139 addq $(identity_mapped - relocate_kernel), %r8
27140- pushq %r8
27141- ret
27142+ jmp *%r8
27143
27144 identity_mapped:
27145 /* set return address to 0 if not preserving context */
27146diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27147index 0a2421c..11f3f36 100644
27148--- a/arch/x86/kernel/setup.c
27149+++ b/arch/x86/kernel/setup.c
27150@@ -111,6 +111,7 @@
27151 #include <asm/mce.h>
27152 #include <asm/alternative.h>
27153 #include <asm/prom.h>
27154+#include <asm/boot.h>
27155
27156 /*
27157 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27158@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
27159 #endif
27160
27161
27162-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27163-__visible unsigned long mmu_cr4_features;
27164+#ifdef CONFIG_X86_64
27165+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27166+#elif defined(CONFIG_X86_PAE)
27167+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27168 #else
27169-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27170+__visible unsigned long mmu_cr4_features __read_only;
27171 #endif
27172
27173 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27174@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
27175 * area (640->1Mb) as ram even though it is not.
27176 * take them out.
27177 */
27178- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27179+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27180
27181 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27182 }
27183@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
27184 /* called before trim_bios_range() to spare extra sanitize */
27185 static void __init e820_add_kernel_range(void)
27186 {
27187- u64 start = __pa_symbol(_text);
27188+ u64 start = __pa_symbol(ktla_ktva(_text));
27189 u64 size = __pa_symbol(_end) - start;
27190
27191 /*
27192@@ -855,8 +858,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27193
27194 void __init setup_arch(char **cmdline_p)
27195 {
27196+#ifdef CONFIG_X86_32
27197+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27198+#else
27199 memblock_reserve(__pa_symbol(_text),
27200 (unsigned long)__bss_stop - (unsigned long)_text);
27201+#endif
27202
27203 early_reserve_initrd();
27204
27205@@ -954,16 +961,16 @@ void __init setup_arch(char **cmdline_p)
27206
27207 if (!boot_params.hdr.root_flags)
27208 root_mountflags &= ~MS_RDONLY;
27209- init_mm.start_code = (unsigned long) _text;
27210- init_mm.end_code = (unsigned long) _etext;
27211+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27212+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27213 init_mm.end_data = (unsigned long) _edata;
27214 init_mm.brk = _brk_end;
27215
27216 mpx_mm_init(&init_mm);
27217
27218- code_resource.start = __pa_symbol(_text);
27219- code_resource.end = __pa_symbol(_etext)-1;
27220- data_resource.start = __pa_symbol(_etext);
27221+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27222+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27223+ data_resource.start = __pa_symbol(_sdata);
27224 data_resource.end = __pa_symbol(_edata)-1;
27225 bss_resource.start = __pa_symbol(__bss_start);
27226 bss_resource.end = __pa_symbol(__bss_stop)-1;
27227diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27228index e4fcb87..9c06c55 100644
27229--- a/arch/x86/kernel/setup_percpu.c
27230+++ b/arch/x86/kernel/setup_percpu.c
27231@@ -21,19 +21,17 @@
27232 #include <asm/cpu.h>
27233 #include <asm/stackprotector.h>
27234
27235-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27236+#ifdef CONFIG_SMP
27237+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27238 EXPORT_PER_CPU_SYMBOL(cpu_number);
27239+#endif
27240
27241-#ifdef CONFIG_X86_64
27242 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27243-#else
27244-#define BOOT_PERCPU_OFFSET 0
27245-#endif
27246
27247 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27248 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27249
27250-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27251+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27252 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27253 };
27254 EXPORT_SYMBOL(__per_cpu_offset);
27255@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27256 {
27257 #ifdef CONFIG_NEED_MULTIPLE_NODES
27258 pg_data_t *last = NULL;
27259- unsigned int cpu;
27260+ int cpu;
27261
27262 for_each_possible_cpu(cpu) {
27263 int node = early_cpu_to_node(cpu);
27264@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27265 {
27266 #ifdef CONFIG_X86_32
27267 struct desc_struct gdt;
27268+ unsigned long base = per_cpu_offset(cpu);
27269
27270- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27271- 0x2 | DESCTYPE_S, 0x8);
27272- gdt.s = 1;
27273+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27274+ 0x83 | DESCTYPE_S, 0xC);
27275 write_gdt_entry(get_cpu_gdt_table(cpu),
27276 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27277 #endif
27278@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27279 /* alrighty, percpu areas up and running */
27280 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27281 for_each_possible_cpu(cpu) {
27282+#ifdef CONFIG_CC_STACKPROTECTOR
27283+#ifdef CONFIG_X86_32
27284+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27285+#endif
27286+#endif
27287 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27288 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27289 per_cpu(cpu_number, cpu) = cpu;
27290@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27291 */
27292 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27293 #endif
27294+#ifdef CONFIG_CC_STACKPROTECTOR
27295+#ifdef CONFIG_X86_32
27296+ if (!cpu)
27297+ per_cpu(stack_canary.canary, cpu) = canary;
27298+#endif
27299+#endif
27300 /*
27301 * Up to this point, the boot CPU has been using .init.data
27302 * area. Reload any changed state for the boot CPU.
27303diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27304index e504246..ba10432 100644
27305--- a/arch/x86/kernel/signal.c
27306+++ b/arch/x86/kernel/signal.c
27307@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27308 * Align the stack pointer according to the i386 ABI,
27309 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27310 */
27311- sp = ((sp + 4) & -16ul) - 4;
27312+ sp = ((sp - 12) & -16ul) - 4;
27313 #else /* !CONFIG_X86_32 */
27314 sp = round_down(sp, 16) - 8;
27315 #endif
27316@@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27317 }
27318
27319 if (current->mm->context.vdso)
27320- restorer = current->mm->context.vdso +
27321- selected_vdso32->sym___kernel_sigreturn;
27322+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27323 else
27324- restorer = &frame->retcode;
27325+ restorer = (void __user *)&frame->retcode;
27326 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27327 restorer = ksig->ka.sa.sa_restorer;
27328
27329@@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27330 * reasons and because gdb uses it as a signature to notice
27331 * signal handler stack frames.
27332 */
27333- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27334+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27335
27336 if (err)
27337 return -EFAULT;
27338@@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27339 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27340
27341 /* Set up to return from userspace. */
27342- restorer = current->mm->context.vdso +
27343- selected_vdso32->sym___kernel_rt_sigreturn;
27344+ if (current->mm->context.vdso)
27345+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27346+ else
27347+ restorer = (void __user *)&frame->retcode;
27348 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27349 restorer = ksig->ka.sa.sa_restorer;
27350 put_user_ex(restorer, &frame->pretcode);
27351@@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27352 * reasons and because gdb uses it as a signature to notice
27353 * signal handler stack frames.
27354 */
27355- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27356+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27357 } put_user_catch(err);
27358
27359 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27360@@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27361 {
27362 int usig = signr_convert(ksig->sig);
27363 sigset_t *set = sigmask_to_save();
27364- compat_sigset_t *cset = (compat_sigset_t *) set;
27365+ sigset_t sigcopy;
27366+ compat_sigset_t *cset;
27367+
27368+ sigcopy = *set;
27369+
27370+ cset = (compat_sigset_t *) &sigcopy;
27371
27372 /* Set up the stack frame */
27373 if (is_ia32_frame()) {
27374@@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27375 } else if (is_x32_frame()) {
27376 return x32_setup_rt_frame(ksig, cset, regs);
27377 } else {
27378- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27379+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27380 }
27381 }
27382
27383diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27384index be8e1bd..a3d93fa 100644
27385--- a/arch/x86/kernel/smp.c
27386+++ b/arch/x86/kernel/smp.c
27387@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27388
27389 __setup("nonmi_ipi", nonmi_ipi_setup);
27390
27391-struct smp_ops smp_ops = {
27392+struct smp_ops smp_ops __read_only = {
27393 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27394 .smp_prepare_cpus = native_smp_prepare_cpus,
27395 .smp_cpus_done = native_smp_cpus_done,
27396diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27397index febc6aa..37d8edf 100644
27398--- a/arch/x86/kernel/smpboot.c
27399+++ b/arch/x86/kernel/smpboot.c
27400@@ -229,14 +229,17 @@ static void notrace start_secondary(void *unused)
27401
27402 enable_start_cpu0 = 0;
27403
27404-#ifdef CONFIG_X86_32
27405+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27406+ barrier();
27407+
27408 /* switch away from the initial page table */
27409+#ifdef CONFIG_PAX_PER_CPU_PGD
27410+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27411+#else
27412 load_cr3(swapper_pg_dir);
27413+#endif
27414 __flush_tlb_all();
27415-#endif
27416
27417- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27418- barrier();
27419 /*
27420 * Check TSC synchronization with the BP:
27421 */
27422@@ -800,8 +803,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27423 alternatives_enable_smp();
27424
27425 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27426- (THREAD_SIZE + task_stack_page(idle))) - 1);
27427+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27428 per_cpu(current_task, cpu) = idle;
27429+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27430
27431 #ifdef CONFIG_X86_32
27432 /* Stack for startup_32 can be just as for start_secondary onwards */
27433@@ -810,10 +814,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27434 clear_tsk_thread_flag(idle, TIF_FORK);
27435 initial_gs = per_cpu_offset(cpu);
27436 #endif
27437- per_cpu(kernel_stack, cpu) =
27438- (unsigned long)task_stack_page(idle) -
27439- KERNEL_STACK_OFFSET + THREAD_SIZE;
27440+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27441+ pax_open_kernel();
27442 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27443+ pax_close_kernel();
27444 initial_code = (unsigned long)start_secondary;
27445 stack_start = idle->thread.sp;
27446
27447@@ -953,6 +957,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27448 /* the FPU context is blank, nobody can own it */
27449 __cpu_disable_lazy_restore(cpu);
27450
27451+#ifdef CONFIG_PAX_PER_CPU_PGD
27452+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27453+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27454+ KERNEL_PGD_PTRS);
27455+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27456+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27457+ KERNEL_PGD_PTRS);
27458+#endif
27459+
27460 err = do_boot_cpu(apicid, cpu, tidle);
27461 if (err) {
27462 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27463diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27464index 9b4d51d..5d28b58 100644
27465--- a/arch/x86/kernel/step.c
27466+++ b/arch/x86/kernel/step.c
27467@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27468 struct desc_struct *desc;
27469 unsigned long base;
27470
27471- seg &= ~7UL;
27472+ seg >>= 3;
27473
27474 mutex_lock(&child->mm->context.lock);
27475- if (unlikely((seg >> 3) >= child->mm->context.size))
27476+ if (unlikely(seg >= child->mm->context.size))
27477 addr = -1L; /* bogus selector, access would fault */
27478 else {
27479 desc = child->mm->context.ldt + seg;
27480@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27481 addr += base;
27482 }
27483 mutex_unlock(&child->mm->context.lock);
27484- }
27485+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27486+ addr = ktla_ktva(addr);
27487
27488 return addr;
27489 }
27490@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27491 unsigned char opcode[15];
27492 unsigned long addr = convert_ip_to_linear(child, regs);
27493
27494+ if (addr == -EINVAL)
27495+ return 0;
27496+
27497 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27498 for (i = 0; i < copied; i++) {
27499 switch (opcode[i]) {
27500diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27501new file mode 100644
27502index 0000000..5877189
27503--- /dev/null
27504+++ b/arch/x86/kernel/sys_i386_32.c
27505@@ -0,0 +1,189 @@
27506+/*
27507+ * This file contains various random system calls that
27508+ * have a non-standard calling sequence on the Linux/i386
27509+ * platform.
27510+ */
27511+
27512+#include <linux/errno.h>
27513+#include <linux/sched.h>
27514+#include <linux/mm.h>
27515+#include <linux/fs.h>
27516+#include <linux/smp.h>
27517+#include <linux/sem.h>
27518+#include <linux/msg.h>
27519+#include <linux/shm.h>
27520+#include <linux/stat.h>
27521+#include <linux/syscalls.h>
27522+#include <linux/mman.h>
27523+#include <linux/file.h>
27524+#include <linux/utsname.h>
27525+#include <linux/ipc.h>
27526+#include <linux/elf.h>
27527+
27528+#include <linux/uaccess.h>
27529+#include <linux/unistd.h>
27530+
27531+#include <asm/syscalls.h>
27532+
27533+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27534+{
27535+ unsigned long pax_task_size = TASK_SIZE;
27536+
27537+#ifdef CONFIG_PAX_SEGMEXEC
27538+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27539+ pax_task_size = SEGMEXEC_TASK_SIZE;
27540+#endif
27541+
27542+ if (flags & MAP_FIXED)
27543+ if (len > pax_task_size || addr > pax_task_size - len)
27544+ return -EINVAL;
27545+
27546+ return 0;
27547+}
27548+
27549+/*
27550+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27551+ */
27552+static unsigned long get_align_mask(void)
27553+{
27554+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27555+ return 0;
27556+
27557+ if (!(current->flags & PF_RANDOMIZE))
27558+ return 0;
27559+
27560+ return va_align.mask;
27561+}
27562+
27563+unsigned long
27564+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27565+ unsigned long len, unsigned long pgoff, unsigned long flags)
27566+{
27567+ struct mm_struct *mm = current->mm;
27568+ struct vm_area_struct *vma;
27569+ unsigned long pax_task_size = TASK_SIZE;
27570+ struct vm_unmapped_area_info info;
27571+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27572+
27573+#ifdef CONFIG_PAX_SEGMEXEC
27574+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27575+ pax_task_size = SEGMEXEC_TASK_SIZE;
27576+#endif
27577+
27578+ pax_task_size -= PAGE_SIZE;
27579+
27580+ if (len > pax_task_size)
27581+ return -ENOMEM;
27582+
27583+ if (flags & MAP_FIXED)
27584+ return addr;
27585+
27586+#ifdef CONFIG_PAX_RANDMMAP
27587+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27588+#endif
27589+
27590+ if (addr) {
27591+ addr = PAGE_ALIGN(addr);
27592+ if (pax_task_size - len >= addr) {
27593+ vma = find_vma(mm, addr);
27594+ if (check_heap_stack_gap(vma, addr, len, offset))
27595+ return addr;
27596+ }
27597+ }
27598+
27599+ info.flags = 0;
27600+ info.length = len;
27601+ info.align_mask = filp ? get_align_mask() : 0;
27602+ info.align_offset = pgoff << PAGE_SHIFT;
27603+ info.threadstack_offset = offset;
27604+
27605+#ifdef CONFIG_PAX_PAGEEXEC
27606+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27607+ info.low_limit = 0x00110000UL;
27608+ info.high_limit = mm->start_code;
27609+
27610+#ifdef CONFIG_PAX_RANDMMAP
27611+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27612+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27613+#endif
27614+
27615+ if (info.low_limit < info.high_limit) {
27616+ addr = vm_unmapped_area(&info);
27617+ if (!IS_ERR_VALUE(addr))
27618+ return addr;
27619+ }
27620+ } else
27621+#endif
27622+
27623+ info.low_limit = mm->mmap_base;
27624+ info.high_limit = pax_task_size;
27625+
27626+ return vm_unmapped_area(&info);
27627+}
27628+
27629+unsigned long
27630+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27631+ const unsigned long len, const unsigned long pgoff,
27632+ const unsigned long flags)
27633+{
27634+ struct vm_area_struct *vma;
27635+ struct mm_struct *mm = current->mm;
27636+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27637+ struct vm_unmapped_area_info info;
27638+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27639+
27640+#ifdef CONFIG_PAX_SEGMEXEC
27641+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27642+ pax_task_size = SEGMEXEC_TASK_SIZE;
27643+#endif
27644+
27645+ pax_task_size -= PAGE_SIZE;
27646+
27647+ /* requested length too big for entire address space */
27648+ if (len > pax_task_size)
27649+ return -ENOMEM;
27650+
27651+ if (flags & MAP_FIXED)
27652+ return addr;
27653+
27654+#ifdef CONFIG_PAX_PAGEEXEC
27655+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27656+ goto bottomup;
27657+#endif
27658+
27659+#ifdef CONFIG_PAX_RANDMMAP
27660+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27661+#endif
27662+
27663+ /* requesting a specific address */
27664+ if (addr) {
27665+ addr = PAGE_ALIGN(addr);
27666+ if (pax_task_size - len >= addr) {
27667+ vma = find_vma(mm, addr);
27668+ if (check_heap_stack_gap(vma, addr, len, offset))
27669+ return addr;
27670+ }
27671+ }
27672+
27673+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27674+ info.length = len;
27675+ info.low_limit = PAGE_SIZE;
27676+ info.high_limit = mm->mmap_base;
27677+ info.align_mask = filp ? get_align_mask() : 0;
27678+ info.align_offset = pgoff << PAGE_SHIFT;
27679+ info.threadstack_offset = offset;
27680+
27681+ addr = vm_unmapped_area(&info);
27682+ if (!(addr & ~PAGE_MASK))
27683+ return addr;
27684+ VM_BUG_ON(addr != -ENOMEM);
27685+
27686+bottomup:
27687+ /*
27688+ * A failed mmap() very likely causes application failure,
27689+ * so fall back to the bottom-up function here. This scenario
27690+ * can happen with large stack limits and large mmap()
27691+ * allocations.
27692+ */
27693+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27694+}
27695diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27696index 30277e2..5664a29 100644
27697--- a/arch/x86/kernel/sys_x86_64.c
27698+++ b/arch/x86/kernel/sys_x86_64.c
27699@@ -81,8 +81,8 @@ out:
27700 return error;
27701 }
27702
27703-static void find_start_end(unsigned long flags, unsigned long *begin,
27704- unsigned long *end)
27705+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27706+ unsigned long *begin, unsigned long *end)
27707 {
27708 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27709 unsigned long new_begin;
27710@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27711 *begin = new_begin;
27712 }
27713 } else {
27714- *begin = current->mm->mmap_legacy_base;
27715+ *begin = mm->mmap_legacy_base;
27716 *end = TASK_SIZE;
27717 }
27718 }
27719@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27720 struct vm_area_struct *vma;
27721 struct vm_unmapped_area_info info;
27722 unsigned long begin, end;
27723+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27724
27725 if (flags & MAP_FIXED)
27726 return addr;
27727
27728- find_start_end(flags, &begin, &end);
27729+ find_start_end(mm, flags, &begin, &end);
27730
27731 if (len > end)
27732 return -ENOMEM;
27733
27734+#ifdef CONFIG_PAX_RANDMMAP
27735+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27736+#endif
27737+
27738 if (addr) {
27739 addr = PAGE_ALIGN(addr);
27740 vma = find_vma(mm, addr);
27741- if (end - len >= addr &&
27742- (!vma || addr + len <= vma->vm_start))
27743+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27744 return addr;
27745 }
27746
27747@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27748 info.high_limit = end;
27749 info.align_mask = filp ? get_align_mask() : 0;
27750 info.align_offset = pgoff << PAGE_SHIFT;
27751+ info.threadstack_offset = offset;
27752 return vm_unmapped_area(&info);
27753 }
27754
27755@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27756 struct mm_struct *mm = current->mm;
27757 unsigned long addr = addr0;
27758 struct vm_unmapped_area_info info;
27759+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27760
27761 /* requested length too big for entire address space */
27762 if (len > TASK_SIZE)
27763@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27764 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27765 goto bottomup;
27766
27767+#ifdef CONFIG_PAX_RANDMMAP
27768+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27769+#endif
27770+
27771 /* requesting a specific address */
27772 if (addr) {
27773 addr = PAGE_ALIGN(addr);
27774 vma = find_vma(mm, addr);
27775- if (TASK_SIZE - len >= addr &&
27776- (!vma || addr + len <= vma->vm_start))
27777+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27778 return addr;
27779 }
27780
27781@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27782 info.high_limit = mm->mmap_base;
27783 info.align_mask = filp ? get_align_mask() : 0;
27784 info.align_offset = pgoff << PAGE_SHIFT;
27785+ info.threadstack_offset = offset;
27786 addr = vm_unmapped_area(&info);
27787 if (!(addr & ~PAGE_MASK))
27788 return addr;
27789diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27790index 91a4496..42fc304 100644
27791--- a/arch/x86/kernel/tboot.c
27792+++ b/arch/x86/kernel/tboot.c
27793@@ -44,6 +44,7 @@
27794 #include <asm/setup.h>
27795 #include <asm/e820.h>
27796 #include <asm/io.h>
27797+#include <asm/tlbflush.h>
27798
27799 #include "../realmode/rm/wakeup.h"
27800
27801@@ -221,7 +222,7 @@ static int tboot_setup_sleep(void)
27802
27803 void tboot_shutdown(u32 shutdown_type)
27804 {
27805- void (*shutdown)(void);
27806+ void (* __noreturn shutdown)(void);
27807
27808 if (!tboot_enabled())
27809 return;
27810@@ -242,8 +243,9 @@ void tboot_shutdown(u32 shutdown_type)
27811 tboot->shutdown_type = shutdown_type;
27812
27813 switch_to_tboot_pt();
27814+ cr4_clear_bits(X86_CR4_PCIDE);
27815
27816- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27817+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27818 shutdown();
27819
27820 /* should not reach here */
27821@@ -310,7 +312,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27822 return -ENODEV;
27823 }
27824
27825-static atomic_t ap_wfs_count;
27826+static atomic_unchecked_t ap_wfs_count;
27827
27828 static int tboot_wait_for_aps(int num_aps)
27829 {
27830@@ -334,9 +336,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27831 {
27832 switch (action) {
27833 case CPU_DYING:
27834- atomic_inc(&ap_wfs_count);
27835+ atomic_inc_unchecked(&ap_wfs_count);
27836 if (num_online_cpus() == 1)
27837- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27838+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27839 return NOTIFY_BAD;
27840 break;
27841 }
27842@@ -422,7 +424,7 @@ static __init int tboot_late_init(void)
27843
27844 tboot_create_trampoline();
27845
27846- atomic_set(&ap_wfs_count, 0);
27847+ atomic_set_unchecked(&ap_wfs_count, 0);
27848 register_hotcpu_notifier(&tboot_cpu_notifier);
27849
27850 #ifdef CONFIG_DEBUG_FS
27851diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27852index 25adc0e..1df4349 100644
27853--- a/arch/x86/kernel/time.c
27854+++ b/arch/x86/kernel/time.c
27855@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27856 {
27857 unsigned long pc = instruction_pointer(regs);
27858
27859- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27860+ if (!user_mode(regs) && in_lock_functions(pc)) {
27861 #ifdef CONFIG_FRAME_POINTER
27862- return *(unsigned long *)(regs->bp + sizeof(long));
27863+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27864 #else
27865 unsigned long *sp =
27866 (unsigned long *)kernel_stack_pointer(regs);
27867@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27868 * or above a saved flags. Eflags has bits 22-31 zero,
27869 * kernel addresses don't.
27870 */
27871+
27872+#ifdef CONFIG_PAX_KERNEXEC
27873+ return ktla_ktva(sp[0]);
27874+#else
27875 if (sp[0] >> 22)
27876 return sp[0];
27877 if (sp[1] >> 22)
27878 return sp[1];
27879 #endif
27880+
27881+#endif
27882 }
27883 return pc;
27884 }
27885diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27886index 7fc5e84..c6e445a 100644
27887--- a/arch/x86/kernel/tls.c
27888+++ b/arch/x86/kernel/tls.c
27889@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27890 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27891 return -EINVAL;
27892
27893+#ifdef CONFIG_PAX_SEGMEXEC
27894+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27895+ return -EINVAL;
27896+#endif
27897+
27898 set_tls_desc(p, idx, &info, 1);
27899
27900 return 0;
27901@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27902
27903 if (kbuf)
27904 info = kbuf;
27905- else if (__copy_from_user(infobuf, ubuf, count))
27906+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27907 return -EFAULT;
27908 else
27909 info = infobuf;
27910diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27911index 1c113db..287b42e 100644
27912--- a/arch/x86/kernel/tracepoint.c
27913+++ b/arch/x86/kernel/tracepoint.c
27914@@ -9,11 +9,11 @@
27915 #include <linux/atomic.h>
27916
27917 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27918-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27919+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27920 (unsigned long) trace_idt_table };
27921
27922 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27923-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27924+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27925
27926 static int trace_irq_vector_refcount;
27927 static DEFINE_MUTEX(irq_vector_mutex);
27928diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27929index 4ff5d16..736e3e1 100644
27930--- a/arch/x86/kernel/traps.c
27931+++ b/arch/x86/kernel/traps.c
27932@@ -68,7 +68,7 @@
27933 #include <asm/proto.h>
27934
27935 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27936-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27937+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27938 #else
27939 #include <asm/processor-flags.h>
27940 #include <asm/setup.h>
27941@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
27942 #endif
27943
27944 /* Must be page-aligned because the real IDT is used in a fixmap. */
27945-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27946+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27947
27948 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27949 EXPORT_SYMBOL_GPL(used_vectors);
27950@@ -112,7 +112,7 @@ enum ctx_state ist_enter(struct pt_regs *regs)
27951 {
27952 enum ctx_state prev_state;
27953
27954- if (user_mode_vm(regs)) {
27955+ if (user_mode(regs)) {
27956 /* Other than that, we're just an exception. */
27957 prev_state = exception_enter();
27958 } else {
27959@@ -146,7 +146,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27960 /* Must be before exception_exit. */
27961 preempt_count_sub(HARDIRQ_OFFSET);
27962
27963- if (user_mode_vm(regs))
27964+ if (user_mode(regs))
27965 return exception_exit(prev_state);
27966 else
27967 rcu_nmi_exit();
27968@@ -158,7 +158,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27969 *
27970 * IST exception handlers normally cannot schedule. As a special
27971 * exception, if the exception interrupted userspace code (i.e.
27972- * user_mode_vm(regs) would return true) and the exception was not
27973+ * user_mode(regs) would return true) and the exception was not
27974 * a double fault, it can be safe to schedule. ist_begin_non_atomic()
27975 * begins a non-atomic section within an ist_enter()/ist_exit() region.
27976 * Callers are responsible for enabling interrupts themselves inside
27977@@ -167,7 +167,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27978 */
27979 void ist_begin_non_atomic(struct pt_regs *regs)
27980 {
27981- BUG_ON(!user_mode_vm(regs));
27982+ BUG_ON(!user_mode(regs));
27983
27984 /*
27985 * Sanity check: we need to be on the normal thread stack. This
27986@@ -191,11 +191,11 @@ void ist_end_non_atomic(void)
27987 }
27988
27989 static nokprobe_inline int
27990-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27991+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27992 struct pt_regs *regs, long error_code)
27993 {
27994 #ifdef CONFIG_X86_32
27995- if (regs->flags & X86_VM_MASK) {
27996+ if (v8086_mode(regs)) {
27997 /*
27998 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27999 * On nmi (interrupt 2), do_trap should not be called.
28000@@ -208,12 +208,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28001 return -1;
28002 }
28003 #endif
28004- if (!user_mode(regs)) {
28005+ if (!user_mode_novm(regs)) {
28006 if (!fixup_exception(regs)) {
28007 tsk->thread.error_code = error_code;
28008 tsk->thread.trap_nr = trapnr;
28009+
28010+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28011+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
28012+ str = "PAX: suspicious stack segment fault";
28013+#endif
28014+
28015 die(str, regs, error_code);
28016 }
28017+
28018+#ifdef CONFIG_PAX_REFCOUNT
28019+ if (trapnr == X86_TRAP_OF)
28020+ pax_report_refcount_overflow(regs);
28021+#endif
28022+
28023 return 0;
28024 }
28025
28026@@ -252,7 +264,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
28027 }
28028
28029 static void
28030-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28031+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
28032 long error_code, siginfo_t *info)
28033 {
28034 struct task_struct *tsk = current;
28035@@ -276,7 +288,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28036 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
28037 printk_ratelimit()) {
28038 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
28039- tsk->comm, tsk->pid, str,
28040+ tsk->comm, task_pid_nr(tsk), str,
28041 regs->ip, regs->sp, error_code);
28042 print_vma_addr(" in ", regs->ip);
28043 pr_cont("\n");
28044@@ -358,6 +370,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
28045 tsk->thread.error_code = error_code;
28046 tsk->thread.trap_nr = X86_TRAP_DF;
28047
28048+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
28049+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
28050+ die("grsec: kernel stack overflow detected", regs, error_code);
28051+#endif
28052+
28053 #ifdef CONFIG_DOUBLEFAULT
28054 df_debug(regs, error_code);
28055 #endif
28056@@ -384,7 +401,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code)
28057 goto exit;
28058 conditional_sti(regs);
28059
28060- if (!user_mode_vm(regs))
28061+ if (!user_mode(regs))
28062 die("bounds", regs, error_code);
28063
28064 if (!cpu_feature_enabled(X86_FEATURE_MPX)) {
28065@@ -463,7 +480,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
28066 conditional_sti(regs);
28067
28068 #ifdef CONFIG_X86_32
28069- if (regs->flags & X86_VM_MASK) {
28070+ if (v8086_mode(regs)) {
28071 local_irq_enable();
28072 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
28073 goto exit;
28074@@ -471,18 +488,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
28075 #endif
28076
28077 tsk = current;
28078- if (!user_mode(regs)) {
28079+ if (!user_mode_novm(regs)) {
28080 if (fixup_exception(regs))
28081 goto exit;
28082
28083 tsk->thread.error_code = error_code;
28084 tsk->thread.trap_nr = X86_TRAP_GP;
28085 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28086- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28087+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28088+
28089+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28090+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28091+ die("PAX: suspicious general protection fault", regs, error_code);
28092+ else
28093+#endif
28094+
28095 die("general protection fault", regs, error_code);
28096+ }
28097 goto exit;
28098 }
28099
28100+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28101+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28102+ struct mm_struct *mm = tsk->mm;
28103+ unsigned long limit;
28104+
28105+ down_write(&mm->mmap_sem);
28106+ limit = mm->context.user_cs_limit;
28107+ if (limit < TASK_SIZE) {
28108+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28109+ up_write(&mm->mmap_sem);
28110+ return;
28111+ }
28112+ up_write(&mm->mmap_sem);
28113+ }
28114+#endif
28115+
28116 tsk->thread.error_code = error_code;
28117 tsk->thread.trap_nr = X86_TRAP_GP;
28118
28119@@ -581,13 +622,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28120 container_of(task_pt_regs(current),
28121 struct bad_iret_stack, regs);
28122
28123+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28124+ new_stack = s;
28125+
28126 /* Copy the IRET target to the new stack. */
28127 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28128
28129 /* Copy the remainder of the stack from the current stack. */
28130 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28131
28132- BUG_ON(!user_mode_vm(&new_stack->regs));
28133+ BUG_ON(!user_mode(&new_stack->regs));
28134 return new_stack;
28135 }
28136 NOKPROBE_SYMBOL(fixup_bad_iret);
28137@@ -637,7 +681,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28138 * then it's very likely the result of an icebp/int01 trap.
28139 * User wants a sigtrap for that.
28140 */
28141- if (!dr6 && user_mode_vm(regs))
28142+ if (!dr6 && user_mode(regs))
28143 user_icebp = 1;
28144
28145 /* Catch kmemcheck conditions first of all! */
28146@@ -673,7 +717,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28147 /* It's safe to allow irq's after DR6 has been saved */
28148 preempt_conditional_sti(regs);
28149
28150- if (regs->flags & X86_VM_MASK) {
28151+ if (v8086_mode(regs)) {
28152 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28153 X86_TRAP_DB);
28154 preempt_conditional_cli(regs);
28155@@ -688,7 +732,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28156 * We already checked v86 mode above, so we can check for kernel mode
28157 * by just checking the CPL of CS.
28158 */
28159- if ((dr6 & DR_STEP) && !user_mode(regs)) {
28160+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28161 tsk->thread.debugreg6 &= ~DR_STEP;
28162 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28163 regs->flags &= ~X86_EFLAGS_TF;
28164@@ -721,7 +765,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28165 return;
28166 conditional_sti(regs);
28167
28168- if (!user_mode_vm(regs))
28169+ if (!user_mode(regs))
28170 {
28171 if (!fixup_exception(regs)) {
28172 task->thread.error_code = error_code;
28173diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28174index 5054497..139f8f8 100644
28175--- a/arch/x86/kernel/tsc.c
28176+++ b/arch/x86/kernel/tsc.c
28177@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28178 */
28179 smp_wmb();
28180
28181- ACCESS_ONCE(c2n->head) = data;
28182+ ACCESS_ONCE_RW(c2n->head) = data;
28183 }
28184
28185 /*
28186diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28187index 81f8adb0..fff670e 100644
28188--- a/arch/x86/kernel/uprobes.c
28189+++ b/arch/x86/kernel/uprobes.c
28190@@ -912,7 +912,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28191 int ret = NOTIFY_DONE;
28192
28193 /* We are only interested in userspace traps */
28194- if (regs && !user_mode_vm(regs))
28195+ if (regs && !user_mode(regs))
28196 return NOTIFY_DONE;
28197
28198 switch (val) {
28199@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28200
28201 if (nleft != rasize) {
28202 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28203- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28204+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28205
28206 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28207 }
28208diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28209index b9242ba..50c5edd 100644
28210--- a/arch/x86/kernel/verify_cpu.S
28211+++ b/arch/x86/kernel/verify_cpu.S
28212@@ -20,6 +20,7 @@
28213 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28214 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28215 * arch/x86/kernel/head_32.S: processor startup
28216+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28217 *
28218 * verify_cpu, returns the status of longmode and SSE in register %eax.
28219 * 0: Success 1: Failure
28220diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28221index e8edcf5..27f9344 100644
28222--- a/arch/x86/kernel/vm86_32.c
28223+++ b/arch/x86/kernel/vm86_32.c
28224@@ -44,6 +44,7 @@
28225 #include <linux/ptrace.h>
28226 #include <linux/audit.h>
28227 #include <linux/stddef.h>
28228+#include <linux/grsecurity.h>
28229
28230 #include <asm/uaccess.h>
28231 #include <asm/io.h>
28232@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28233 do_exit(SIGSEGV);
28234 }
28235
28236- tss = &per_cpu(init_tss, get_cpu());
28237+ tss = init_tss + get_cpu();
28238 current->thread.sp0 = current->thread.saved_sp0;
28239 current->thread.sysenter_cs = __KERNEL_CS;
28240 load_sp0(tss, &current->thread);
28241@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28242
28243 if (tsk->thread.saved_sp0)
28244 return -EPERM;
28245+
28246+#ifdef CONFIG_GRKERNSEC_VM86
28247+ if (!capable(CAP_SYS_RAWIO)) {
28248+ gr_handle_vm86();
28249+ return -EPERM;
28250+ }
28251+#endif
28252+
28253 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28254 offsetof(struct kernel_vm86_struct, vm86plus) -
28255 sizeof(info.regs));
28256@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28257 int tmp;
28258 struct vm86plus_struct __user *v86;
28259
28260+#ifdef CONFIG_GRKERNSEC_VM86
28261+ if (!capable(CAP_SYS_RAWIO)) {
28262+ gr_handle_vm86();
28263+ return -EPERM;
28264+ }
28265+#endif
28266+
28267 tsk = current;
28268 switch (cmd) {
28269 case VM86_REQUEST_IRQ:
28270@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28271 tsk->thread.saved_fs = info->regs32->fs;
28272 tsk->thread.saved_gs = get_user_gs(info->regs32);
28273
28274- tss = &per_cpu(init_tss, get_cpu());
28275+ tss = init_tss + get_cpu();
28276 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28277 if (cpu_has_sep)
28278 tsk->thread.sysenter_cs = 0;
28279@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28280 goto cannot_handle;
28281 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28282 goto cannot_handle;
28283- intr_ptr = (unsigned long __user *) (i << 2);
28284+ intr_ptr = (__force unsigned long __user *) (i << 2);
28285 if (get_user(segoffs, intr_ptr))
28286 goto cannot_handle;
28287 if ((segoffs >> 16) == BIOSSEG)
28288diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28289index 00bf300..129df8e 100644
28290--- a/arch/x86/kernel/vmlinux.lds.S
28291+++ b/arch/x86/kernel/vmlinux.lds.S
28292@@ -26,6 +26,13 @@
28293 #include <asm/page_types.h>
28294 #include <asm/cache.h>
28295 #include <asm/boot.h>
28296+#include <asm/segment.h>
28297+
28298+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28299+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28300+#else
28301+#define __KERNEL_TEXT_OFFSET 0
28302+#endif
28303
28304 #undef i386 /* in case the preprocessor is a 32bit one */
28305
28306@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28307
28308 PHDRS {
28309 text PT_LOAD FLAGS(5); /* R_E */
28310+#ifdef CONFIG_X86_32
28311+ module PT_LOAD FLAGS(5); /* R_E */
28312+#endif
28313+#ifdef CONFIG_XEN
28314+ rodata PT_LOAD FLAGS(5); /* R_E */
28315+#else
28316+ rodata PT_LOAD FLAGS(4); /* R__ */
28317+#endif
28318 data PT_LOAD FLAGS(6); /* RW_ */
28319-#ifdef CONFIG_X86_64
28320+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28321 #ifdef CONFIG_SMP
28322 percpu PT_LOAD FLAGS(6); /* RW_ */
28323 #endif
28324+ text.init PT_LOAD FLAGS(5); /* R_E */
28325+ text.exit PT_LOAD FLAGS(5); /* R_E */
28326 init PT_LOAD FLAGS(7); /* RWE */
28327-#endif
28328 note PT_NOTE FLAGS(0); /* ___ */
28329 }
28330
28331 SECTIONS
28332 {
28333 #ifdef CONFIG_X86_32
28334- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28335- phys_startup_32 = startup_32 - LOAD_OFFSET;
28336+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28337 #else
28338- . = __START_KERNEL;
28339- phys_startup_64 = startup_64 - LOAD_OFFSET;
28340+ . = __START_KERNEL;
28341 #endif
28342
28343 /* Text and read-only data */
28344- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28345- _text = .;
28346+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28347 /* bootstrapping code */
28348+#ifdef CONFIG_X86_32
28349+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28350+#else
28351+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28352+#endif
28353+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28354+ _text = .;
28355 HEAD_TEXT
28356 . = ALIGN(8);
28357 _stext = .;
28358@@ -104,13 +124,47 @@ SECTIONS
28359 IRQENTRY_TEXT
28360 *(.fixup)
28361 *(.gnu.warning)
28362- /* End of text section */
28363- _etext = .;
28364 } :text = 0x9090
28365
28366- NOTES :text :note
28367+ . += __KERNEL_TEXT_OFFSET;
28368
28369- EXCEPTION_TABLE(16) :text = 0x9090
28370+#ifdef CONFIG_X86_32
28371+ . = ALIGN(PAGE_SIZE);
28372+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28373+
28374+#ifdef CONFIG_PAX_KERNEXEC
28375+ MODULES_EXEC_VADDR = .;
28376+ BYTE(0)
28377+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28378+ . = ALIGN(HPAGE_SIZE) - 1;
28379+ MODULES_EXEC_END = .;
28380+#endif
28381+
28382+ } :module
28383+#endif
28384+
28385+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28386+ /* End of text section */
28387+ BYTE(0)
28388+ _etext = . - __KERNEL_TEXT_OFFSET;
28389+ }
28390+
28391+#ifdef CONFIG_X86_32
28392+ . = ALIGN(PAGE_SIZE);
28393+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28394+ . = ALIGN(PAGE_SIZE);
28395+ *(.empty_zero_page)
28396+ *(.initial_pg_fixmap)
28397+ *(.initial_pg_pmd)
28398+ *(.initial_page_table)
28399+ *(.swapper_pg_dir)
28400+ } :rodata
28401+#endif
28402+
28403+ . = ALIGN(PAGE_SIZE);
28404+ NOTES :rodata :note
28405+
28406+ EXCEPTION_TABLE(16) :rodata
28407
28408 #if defined(CONFIG_DEBUG_RODATA)
28409 /* .text should occupy whole number of pages */
28410@@ -122,16 +176,20 @@ SECTIONS
28411
28412 /* Data */
28413 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28414+
28415+#ifdef CONFIG_PAX_KERNEXEC
28416+ . = ALIGN(HPAGE_SIZE);
28417+#else
28418+ . = ALIGN(PAGE_SIZE);
28419+#endif
28420+
28421 /* Start of data section */
28422 _sdata = .;
28423
28424 /* init_task */
28425 INIT_TASK_DATA(THREAD_SIZE)
28426
28427-#ifdef CONFIG_X86_32
28428- /* 32 bit has nosave before _edata */
28429 NOSAVE_DATA
28430-#endif
28431
28432 PAGE_ALIGNED_DATA(PAGE_SIZE)
28433
28434@@ -174,12 +232,19 @@ SECTIONS
28435 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28436
28437 /* Init code and data - will be freed after init */
28438- . = ALIGN(PAGE_SIZE);
28439 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28440+ BYTE(0)
28441+
28442+#ifdef CONFIG_PAX_KERNEXEC
28443+ . = ALIGN(HPAGE_SIZE);
28444+#else
28445+ . = ALIGN(PAGE_SIZE);
28446+#endif
28447+
28448 __init_begin = .; /* paired with __init_end */
28449- }
28450+ } :init.begin
28451
28452-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28453+#ifdef CONFIG_SMP
28454 /*
28455 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28456 * output PHDR, so the next output section - .init.text - should
28457@@ -190,12 +255,27 @@ SECTIONS
28458 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28459 #endif
28460
28461- INIT_TEXT_SECTION(PAGE_SIZE)
28462-#ifdef CONFIG_X86_64
28463- :init
28464-#endif
28465+ . = ALIGN(PAGE_SIZE);
28466+ init_begin = .;
28467+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28468+ VMLINUX_SYMBOL(_sinittext) = .;
28469+ INIT_TEXT
28470+ . = ALIGN(PAGE_SIZE);
28471+ } :text.init
28472
28473- INIT_DATA_SECTION(16)
28474+ /*
28475+ * .exit.text is discard at runtime, not link time, to deal with
28476+ * references from .altinstructions and .eh_frame
28477+ */
28478+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28479+ EXIT_TEXT
28480+ VMLINUX_SYMBOL(_einittext) = .;
28481+ . = ALIGN(16);
28482+ } :text.exit
28483+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28484+
28485+ . = ALIGN(PAGE_SIZE);
28486+ INIT_DATA_SECTION(16) :init
28487
28488 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28489 __x86_cpu_dev_start = .;
28490@@ -266,19 +346,12 @@ SECTIONS
28491 }
28492
28493 . = ALIGN(8);
28494- /*
28495- * .exit.text is discard at runtime, not link time, to deal with
28496- * references from .altinstructions and .eh_frame
28497- */
28498- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28499- EXIT_TEXT
28500- }
28501
28502 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28503 EXIT_DATA
28504 }
28505
28506-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28507+#ifndef CONFIG_SMP
28508 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28509 #endif
28510
28511@@ -297,16 +370,10 @@ SECTIONS
28512 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28513 __smp_locks = .;
28514 *(.smp_locks)
28515- . = ALIGN(PAGE_SIZE);
28516 __smp_locks_end = .;
28517+ . = ALIGN(PAGE_SIZE);
28518 }
28519
28520-#ifdef CONFIG_X86_64
28521- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28522- NOSAVE_DATA
28523- }
28524-#endif
28525-
28526 /* BSS */
28527 . = ALIGN(PAGE_SIZE);
28528 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28529@@ -322,6 +389,7 @@ SECTIONS
28530 __brk_base = .;
28531 . += 64 * 1024; /* 64k alignment slop space */
28532 *(.brk_reservation) /* areas brk users have reserved */
28533+ . = ALIGN(HPAGE_SIZE);
28534 __brk_limit = .;
28535 }
28536
28537@@ -348,13 +416,12 @@ SECTIONS
28538 * for the boot processor.
28539 */
28540 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28541-INIT_PER_CPU(gdt_page);
28542 INIT_PER_CPU(irq_stack_union);
28543
28544 /*
28545 * Build-time check on the image size:
28546 */
28547-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28548+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28549 "kernel image bigger than KERNEL_IMAGE_SIZE");
28550
28551 #ifdef CONFIG_SMP
28552diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28553index 2dcc6ff..082dc7a 100644
28554--- a/arch/x86/kernel/vsyscall_64.c
28555+++ b/arch/x86/kernel/vsyscall_64.c
28556@@ -38,15 +38,13 @@
28557 #define CREATE_TRACE_POINTS
28558 #include "vsyscall_trace.h"
28559
28560-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28561+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28562
28563 static int __init vsyscall_setup(char *str)
28564 {
28565 if (str) {
28566 if (!strcmp("emulate", str))
28567 vsyscall_mode = EMULATE;
28568- else if (!strcmp("native", str))
28569- vsyscall_mode = NATIVE;
28570 else if (!strcmp("none", str))
28571 vsyscall_mode = NONE;
28572 else
28573@@ -264,8 +262,7 @@ do_ret:
28574 return true;
28575
28576 sigsegv:
28577- force_sig(SIGSEGV, current);
28578- return true;
28579+ do_group_exit(SIGKILL);
28580 }
28581
28582 /*
28583@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28584 static struct vm_area_struct gate_vma = {
28585 .vm_start = VSYSCALL_ADDR,
28586 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28587- .vm_page_prot = PAGE_READONLY_EXEC,
28588- .vm_flags = VM_READ | VM_EXEC,
28589+ .vm_page_prot = PAGE_READONLY,
28590+ .vm_flags = VM_READ,
28591 .vm_ops = &gate_vma_ops,
28592 };
28593
28594@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28595 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28596
28597 if (vsyscall_mode != NONE)
28598- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28599- vsyscall_mode == NATIVE
28600- ? PAGE_KERNEL_VSYSCALL
28601- : PAGE_KERNEL_VVAR);
28602+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28603
28604 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28605 (unsigned long)VSYSCALL_ADDR);
28606diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28607index 37d8fa4..66e319a 100644
28608--- a/arch/x86/kernel/x8664_ksyms_64.c
28609+++ b/arch/x86/kernel/x8664_ksyms_64.c
28610@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28611 EXPORT_SYMBOL(copy_user_generic_unrolled);
28612 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28613 EXPORT_SYMBOL(__copy_user_nocache);
28614-EXPORT_SYMBOL(_copy_from_user);
28615-EXPORT_SYMBOL(_copy_to_user);
28616
28617 EXPORT_SYMBOL(copy_page);
28618 EXPORT_SYMBOL(clear_page);
28619@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28620 EXPORT_SYMBOL(___preempt_schedule_context);
28621 #endif
28622 #endif
28623+
28624+#ifdef CONFIG_PAX_PER_CPU_PGD
28625+EXPORT_SYMBOL(cpu_pgd);
28626+#endif
28627diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28628index 234b072..b7ab191 100644
28629--- a/arch/x86/kernel/x86_init.c
28630+++ b/arch/x86/kernel/x86_init.c
28631@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28632 static void default_nmi_init(void) { };
28633 static int default_i8042_detect(void) { return 1; };
28634
28635-struct x86_platform_ops x86_platform = {
28636+struct x86_platform_ops x86_platform __read_only = {
28637 .calibrate_tsc = native_calibrate_tsc,
28638 .get_wallclock = mach_get_cmos_time,
28639 .set_wallclock = mach_set_rtc_mmss,
28640@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28641 EXPORT_SYMBOL_GPL(x86_platform);
28642
28643 #if defined(CONFIG_PCI_MSI)
28644-struct x86_msi_ops x86_msi = {
28645+struct x86_msi_ops x86_msi __read_only = {
28646 .setup_msi_irqs = native_setup_msi_irqs,
28647 .compose_msi_msg = native_compose_msi_msg,
28648 .teardown_msi_irq = native_teardown_msi_irq,
28649@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28650 }
28651 #endif
28652
28653-struct x86_io_apic_ops x86_io_apic_ops = {
28654+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28655 .init = native_io_apic_init_mappings,
28656 .read = native_io_apic_read,
28657 .write = native_io_apic_write,
28658diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28659index cdc6cf9..e04f495 100644
28660--- a/arch/x86/kernel/xsave.c
28661+++ b/arch/x86/kernel/xsave.c
28662@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28663
28664 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28665 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28666- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28667+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28668
28669 if (!use_xsave())
28670 return err;
28671
28672- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28673+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28674
28675 /*
28676 * Read the xstate_bv which we copied (directly from the cpu or
28677 * from the state in task struct) to the user buffers.
28678 */
28679- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28680+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28681
28682 /*
28683 * For legacy compatible, we always set FP/SSE bits in the bit
28684@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28685 */
28686 xstate_bv |= XSTATE_FPSSE;
28687
28688- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28689+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28690
28691 return err;
28692 }
28693@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28694 {
28695 int err;
28696
28697+ buf = (struct xsave_struct __user *)____m(buf);
28698 if (use_xsave())
28699 err = xsave_user(buf);
28700 else if (use_fxsr())
28701@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28702 */
28703 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28704 {
28705+ buf = (void __user *)____m(buf);
28706 if (use_xsave()) {
28707 if ((unsigned long)buf % 64 || fx_only) {
28708 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28709diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28710index 307f9ec..0d8aa91 100644
28711--- a/arch/x86/kvm/cpuid.c
28712+++ b/arch/x86/kvm/cpuid.c
28713@@ -186,15 +186,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28714 struct kvm_cpuid2 *cpuid,
28715 struct kvm_cpuid_entry2 __user *entries)
28716 {
28717- int r;
28718+ int r, i;
28719
28720 r = -E2BIG;
28721 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28722 goto out;
28723 r = -EFAULT;
28724- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28725- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28726+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28727 goto out;
28728+ for (i = 0; i < cpuid->nent; ++i) {
28729+ struct kvm_cpuid_entry2 cpuid_entry;
28730+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28731+ goto out;
28732+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28733+ }
28734 vcpu->arch.cpuid_nent = cpuid->nent;
28735 kvm_apic_set_version(vcpu);
28736 kvm_x86_ops->cpuid_update(vcpu);
28737@@ -207,15 +212,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28738 struct kvm_cpuid2 *cpuid,
28739 struct kvm_cpuid_entry2 __user *entries)
28740 {
28741- int r;
28742+ int r, i;
28743
28744 r = -E2BIG;
28745 if (cpuid->nent < vcpu->arch.cpuid_nent)
28746 goto out;
28747 r = -EFAULT;
28748- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28749- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28750+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28751 goto out;
28752+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28753+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28754+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28755+ goto out;
28756+ }
28757 return 0;
28758
28759 out:
28760diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28761index 106c015..2db7161 100644
28762--- a/arch/x86/kvm/emulate.c
28763+++ b/arch/x86/kvm/emulate.c
28764@@ -3572,7 +3572,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28765 int cr = ctxt->modrm_reg;
28766 u64 efer = 0;
28767
28768- static u64 cr_reserved_bits[] = {
28769+ static const u64 cr_reserved_bits[] = {
28770 0xffffffff00000000ULL,
28771 0, 0, 0, /* CR3 checked later */
28772 CR4_RESERVED_BITS,
28773diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28774index 3cb2b58..83c8e31 100644
28775--- a/arch/x86/kvm/lapic.c
28776+++ b/arch/x86/kvm/lapic.c
28777@@ -56,7 +56,7 @@
28778 #define APIC_BUS_CYCLE_NS 1
28779
28780 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28781-#define apic_debug(fmt, arg...)
28782+#define apic_debug(fmt, arg...) do {} while (0)
28783
28784 #define APIC_LVT_NUM 6
28785 /* 14 is the version for Xeon and Pentium 8.4.8*/
28786diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
28787index 0bc6c65..ca4f92d 100644
28788--- a/arch/x86/kvm/lapic.h
28789+++ b/arch/x86/kvm/lapic.h
28790@@ -165,7 +165,7 @@ static inline u16 apic_logical_id(struct kvm_apic_map *map, u32 ldr)
28791
28792 static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu)
28793 {
28794- return vcpu->arch.apic->pending_events;
28795+ return kvm_vcpu_has_lapic(vcpu) && vcpu->arch.apic->pending_events;
28796 }
28797
28798 bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector);
28799diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28800index 6e6d115..43fecbf 100644
28801--- a/arch/x86/kvm/paging_tmpl.h
28802+++ b/arch/x86/kvm/paging_tmpl.h
28803@@ -343,7 +343,7 @@ retry_walk:
28804 if (unlikely(kvm_is_error_hva(host_addr)))
28805 goto error;
28806
28807- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28808+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28809 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28810 goto error;
28811 walker->ptep_user[walker->level - 1] = ptep_user;
28812diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28813index a4e62fc..fbbad55 100644
28814--- a/arch/x86/kvm/svm.c
28815+++ b/arch/x86/kvm/svm.c
28816@@ -3568,7 +3568,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28817 int cpu = raw_smp_processor_id();
28818
28819 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28820+
28821+ pax_open_kernel();
28822 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28823+ pax_close_kernel();
28824+
28825 load_TR_desc();
28826 }
28827
28828@@ -3964,6 +3968,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28829 #endif
28830 #endif
28831
28832+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28833+ __set_fs(current_thread_info()->addr_limit);
28834+#endif
28835+
28836 reload_tss(vcpu);
28837
28838 local_irq_disable();
28839diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28840index 5318d64..ff5f7aa 100644
28841--- a/arch/x86/kvm/vmx.c
28842+++ b/arch/x86/kvm/vmx.c
28843@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28844 #endif
28845 }
28846
28847-static void vmcs_clear_bits(unsigned long field, u32 mask)
28848+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28849 {
28850 vmcs_writel(field, vmcs_readl(field) & ~mask);
28851 }
28852
28853-static void vmcs_set_bits(unsigned long field, u32 mask)
28854+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28855 {
28856 vmcs_writel(field, vmcs_readl(field) | mask);
28857 }
28858@@ -1705,7 +1705,11 @@ static void reload_tss(void)
28859 struct desc_struct *descs;
28860
28861 descs = (void *)gdt->address;
28862+
28863+ pax_open_kernel();
28864 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28865+ pax_close_kernel();
28866+
28867 load_TR_desc();
28868 }
28869
28870@@ -1941,6 +1945,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28871 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28872 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28873
28874+#ifdef CONFIG_PAX_PER_CPU_PGD
28875+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28876+#endif
28877+
28878 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28879 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28880 vmx->loaded_vmcs->cpu = cpu;
28881@@ -2233,7 +2241,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28882 * reads and returns guest's timestamp counter "register"
28883 * guest_tsc = host_tsc + tsc_offset -- 21.3
28884 */
28885-static u64 guest_read_tsc(void)
28886+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28887 {
28888 u64 host_tsc, tsc_offset;
28889
28890@@ -4466,7 +4474,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28891 unsigned long cr4;
28892
28893 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28894+
28895+#ifndef CONFIG_PAX_PER_CPU_PGD
28896 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28897+#endif
28898
28899 /* Save the most likely value for this task's CR4 in the VMCS. */
28900 cr4 = cr4_read_shadow();
28901@@ -4493,7 +4504,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28902 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28903 vmx->host_idt_base = dt.address;
28904
28905- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28906+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28907
28908 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28909 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28910@@ -6104,11 +6115,17 @@ static __init int hardware_setup(void)
28911 * page upon invalidation. No need to do anything if not
28912 * using the APIC_ACCESS_ADDR VMCS field.
28913 */
28914- if (!flexpriority_enabled)
28915- kvm_x86_ops->set_apic_access_page_addr = NULL;
28916+ if (!flexpriority_enabled) {
28917+ pax_open_kernel();
28918+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28919+ pax_close_kernel();
28920+ }
28921
28922- if (!cpu_has_vmx_tpr_shadow())
28923- kvm_x86_ops->update_cr8_intercept = NULL;
28924+ if (!cpu_has_vmx_tpr_shadow()) {
28925+ pax_open_kernel();
28926+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28927+ pax_close_kernel();
28928+ }
28929
28930 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28931 kvm_disable_largepages();
28932@@ -6119,14 +6136,16 @@ static __init int hardware_setup(void)
28933 if (!cpu_has_vmx_apicv())
28934 enable_apicv = 0;
28935
28936+ pax_open_kernel();
28937 if (enable_apicv)
28938- kvm_x86_ops->update_cr8_intercept = NULL;
28939+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28940 else {
28941- kvm_x86_ops->hwapic_irr_update = NULL;
28942- kvm_x86_ops->hwapic_isr_update = NULL;
28943- kvm_x86_ops->deliver_posted_interrupt = NULL;
28944- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28945+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28946+ *(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
28947+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28948+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28949 }
28950+ pax_close_kernel();
28951
28952 vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
28953 vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
28954@@ -6179,10 +6198,12 @@ static __init int hardware_setup(void)
28955 enable_pml = 0;
28956
28957 if (!enable_pml) {
28958- kvm_x86_ops->slot_enable_log_dirty = NULL;
28959- kvm_x86_ops->slot_disable_log_dirty = NULL;
28960- kvm_x86_ops->flush_log_dirty = NULL;
28961- kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28962+ pax_open_kernel();
28963+ *(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
28964+ *(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
28965+ *(void **)&kvm_x86_ops->flush_log_dirty = NULL;
28966+ *(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28967+ pax_close_kernel();
28968 }
28969
28970 return alloc_kvm_area();
28971@@ -8227,6 +8248,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28972 "jmp 2f \n\t"
28973 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28974 "2: "
28975+
28976+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28977+ "ljmp %[cs],$3f\n\t"
28978+ "3: "
28979+#endif
28980+
28981 /* Save guest registers, load host registers, keep flags */
28982 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28983 "pop %0 \n\t"
28984@@ -8279,6 +8306,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28985 #endif
28986 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28987 [wordsize]"i"(sizeof(ulong))
28988+
28989+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28990+ ,[cs]"i"(__KERNEL_CS)
28991+#endif
28992+
28993 : "cc", "memory"
28994 #ifdef CONFIG_X86_64
28995 , "rax", "rbx", "rdi", "rsi"
28996@@ -8292,7 +8324,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28997 if (debugctlmsr)
28998 update_debugctlmsr(debugctlmsr);
28999
29000-#ifndef CONFIG_X86_64
29001+#ifdef CONFIG_X86_32
29002 /*
29003 * The sysexit path does not restore ds/es, so we must set them to
29004 * a reasonable value ourselves.
29005@@ -8301,8 +8333,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29006 * may be executed in interrupt context, which saves and restore segments
29007 * around it, nullifying its effect.
29008 */
29009- loadsegment(ds, __USER_DS);
29010- loadsegment(es, __USER_DS);
29011+ loadsegment(ds, __KERNEL_DS);
29012+ loadsegment(es, __KERNEL_DS);
29013+ loadsegment(ss, __KERNEL_DS);
29014+
29015+#ifdef CONFIG_PAX_KERNEXEC
29016+ loadsegment(fs, __KERNEL_PERCPU);
29017+#endif
29018+
29019+#ifdef CONFIG_PAX_MEMORY_UDEREF
29020+ __set_fs(current_thread_info()->addr_limit);
29021+#endif
29022+
29023 #endif
29024
29025 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
29026diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
29027index 8838057..8f42ce3 100644
29028--- a/arch/x86/kvm/x86.c
29029+++ b/arch/x86/kvm/x86.c
29030@@ -1895,8 +1895,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
29031 {
29032 struct kvm *kvm = vcpu->kvm;
29033 int lm = is_long_mode(vcpu);
29034- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29035- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29036+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29037+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29038 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
29039 : kvm->arch.xen_hvm_config.blob_size_32;
29040 u32 page_num = data & ~PAGE_MASK;
29041@@ -2833,6 +2833,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
29042 if (n < msr_list.nmsrs)
29043 goto out;
29044 r = -EFAULT;
29045+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
29046+ goto out;
29047 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
29048 num_msrs_to_save * sizeof(u32)))
29049 goto out;
29050@@ -5737,7 +5739,7 @@ static struct notifier_block pvclock_gtod_notifier = {
29051 };
29052 #endif
29053
29054-int kvm_arch_init(void *opaque)
29055+int kvm_arch_init(const void *opaque)
29056 {
29057 int r;
29058 struct kvm_x86_ops *ops = opaque;
29059diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
29060index ac4453d..1f43bf3 100644
29061--- a/arch/x86/lguest/boot.c
29062+++ b/arch/x86/lguest/boot.c
29063@@ -1340,9 +1340,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
29064 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
29065 * Launcher to reboot us.
29066 */
29067-static void lguest_restart(char *reason)
29068+static __noreturn void lguest_restart(char *reason)
29069 {
29070 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
29071+ BUG();
29072 }
29073
29074 /*G:050
29075diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
29076index 00933d5..3a64af9 100644
29077--- a/arch/x86/lib/atomic64_386_32.S
29078+++ b/arch/x86/lib/atomic64_386_32.S
29079@@ -48,6 +48,10 @@ BEGIN(read)
29080 movl (v), %eax
29081 movl 4(v), %edx
29082 RET_ENDP
29083+BEGIN(read_unchecked)
29084+ movl (v), %eax
29085+ movl 4(v), %edx
29086+RET_ENDP
29087 #undef v
29088
29089 #define v %esi
29090@@ -55,6 +59,10 @@ BEGIN(set)
29091 movl %ebx, (v)
29092 movl %ecx, 4(v)
29093 RET_ENDP
29094+BEGIN(set_unchecked)
29095+ movl %ebx, (v)
29096+ movl %ecx, 4(v)
29097+RET_ENDP
29098 #undef v
29099
29100 #define v %esi
29101@@ -70,6 +78,20 @@ RET_ENDP
29102 BEGIN(add)
29103 addl %eax, (v)
29104 adcl %edx, 4(v)
29105+
29106+#ifdef CONFIG_PAX_REFCOUNT
29107+ jno 0f
29108+ subl %eax, (v)
29109+ sbbl %edx, 4(v)
29110+ int $4
29111+0:
29112+ _ASM_EXTABLE(0b, 0b)
29113+#endif
29114+
29115+RET_ENDP
29116+BEGIN(add_unchecked)
29117+ addl %eax, (v)
29118+ adcl %edx, 4(v)
29119 RET_ENDP
29120 #undef v
29121
29122@@ -77,6 +99,24 @@ RET_ENDP
29123 BEGIN(add_return)
29124 addl (v), %eax
29125 adcl 4(v), %edx
29126+
29127+#ifdef CONFIG_PAX_REFCOUNT
29128+ into
29129+1234:
29130+ _ASM_EXTABLE(1234b, 2f)
29131+#endif
29132+
29133+ movl %eax, (v)
29134+ movl %edx, 4(v)
29135+
29136+#ifdef CONFIG_PAX_REFCOUNT
29137+2:
29138+#endif
29139+
29140+RET_ENDP
29141+BEGIN(add_return_unchecked)
29142+ addl (v), %eax
29143+ adcl 4(v), %edx
29144 movl %eax, (v)
29145 movl %edx, 4(v)
29146 RET_ENDP
29147@@ -86,6 +126,20 @@ RET_ENDP
29148 BEGIN(sub)
29149 subl %eax, (v)
29150 sbbl %edx, 4(v)
29151+
29152+#ifdef CONFIG_PAX_REFCOUNT
29153+ jno 0f
29154+ addl %eax, (v)
29155+ adcl %edx, 4(v)
29156+ int $4
29157+0:
29158+ _ASM_EXTABLE(0b, 0b)
29159+#endif
29160+
29161+RET_ENDP
29162+BEGIN(sub_unchecked)
29163+ subl %eax, (v)
29164+ sbbl %edx, 4(v)
29165 RET_ENDP
29166 #undef v
29167
29168@@ -96,6 +150,27 @@ BEGIN(sub_return)
29169 sbbl $0, %edx
29170 addl (v), %eax
29171 adcl 4(v), %edx
29172+
29173+#ifdef CONFIG_PAX_REFCOUNT
29174+ into
29175+1234:
29176+ _ASM_EXTABLE(1234b, 2f)
29177+#endif
29178+
29179+ movl %eax, (v)
29180+ movl %edx, 4(v)
29181+
29182+#ifdef CONFIG_PAX_REFCOUNT
29183+2:
29184+#endif
29185+
29186+RET_ENDP
29187+BEGIN(sub_return_unchecked)
29188+ negl %edx
29189+ negl %eax
29190+ sbbl $0, %edx
29191+ addl (v), %eax
29192+ adcl 4(v), %edx
29193 movl %eax, (v)
29194 movl %edx, 4(v)
29195 RET_ENDP
29196@@ -105,6 +180,20 @@ RET_ENDP
29197 BEGIN(inc)
29198 addl $1, (v)
29199 adcl $0, 4(v)
29200+
29201+#ifdef CONFIG_PAX_REFCOUNT
29202+ jno 0f
29203+ subl $1, (v)
29204+ sbbl $0, 4(v)
29205+ int $4
29206+0:
29207+ _ASM_EXTABLE(0b, 0b)
29208+#endif
29209+
29210+RET_ENDP
29211+BEGIN(inc_unchecked)
29212+ addl $1, (v)
29213+ adcl $0, 4(v)
29214 RET_ENDP
29215 #undef v
29216
29217@@ -114,6 +203,26 @@ BEGIN(inc_return)
29218 movl 4(v), %edx
29219 addl $1, %eax
29220 adcl $0, %edx
29221+
29222+#ifdef CONFIG_PAX_REFCOUNT
29223+ into
29224+1234:
29225+ _ASM_EXTABLE(1234b, 2f)
29226+#endif
29227+
29228+ movl %eax, (v)
29229+ movl %edx, 4(v)
29230+
29231+#ifdef CONFIG_PAX_REFCOUNT
29232+2:
29233+#endif
29234+
29235+RET_ENDP
29236+BEGIN(inc_return_unchecked)
29237+ movl (v), %eax
29238+ movl 4(v), %edx
29239+ addl $1, %eax
29240+ adcl $0, %edx
29241 movl %eax, (v)
29242 movl %edx, 4(v)
29243 RET_ENDP
29244@@ -123,6 +232,20 @@ RET_ENDP
29245 BEGIN(dec)
29246 subl $1, (v)
29247 sbbl $0, 4(v)
29248+
29249+#ifdef CONFIG_PAX_REFCOUNT
29250+ jno 0f
29251+ addl $1, (v)
29252+ adcl $0, 4(v)
29253+ int $4
29254+0:
29255+ _ASM_EXTABLE(0b, 0b)
29256+#endif
29257+
29258+RET_ENDP
29259+BEGIN(dec_unchecked)
29260+ subl $1, (v)
29261+ sbbl $0, 4(v)
29262 RET_ENDP
29263 #undef v
29264
29265@@ -132,6 +255,26 @@ BEGIN(dec_return)
29266 movl 4(v), %edx
29267 subl $1, %eax
29268 sbbl $0, %edx
29269+
29270+#ifdef CONFIG_PAX_REFCOUNT
29271+ into
29272+1234:
29273+ _ASM_EXTABLE(1234b, 2f)
29274+#endif
29275+
29276+ movl %eax, (v)
29277+ movl %edx, 4(v)
29278+
29279+#ifdef CONFIG_PAX_REFCOUNT
29280+2:
29281+#endif
29282+
29283+RET_ENDP
29284+BEGIN(dec_return_unchecked)
29285+ movl (v), %eax
29286+ movl 4(v), %edx
29287+ subl $1, %eax
29288+ sbbl $0, %edx
29289 movl %eax, (v)
29290 movl %edx, 4(v)
29291 RET_ENDP
29292@@ -143,6 +286,13 @@ BEGIN(add_unless)
29293 adcl %edx, %edi
29294 addl (v), %eax
29295 adcl 4(v), %edx
29296+
29297+#ifdef CONFIG_PAX_REFCOUNT
29298+ into
29299+1234:
29300+ _ASM_EXTABLE(1234b, 2f)
29301+#endif
29302+
29303 cmpl %eax, %ecx
29304 je 3f
29305 1:
29306@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29307 1:
29308 addl $1, %eax
29309 adcl $0, %edx
29310+
29311+#ifdef CONFIG_PAX_REFCOUNT
29312+ into
29313+1234:
29314+ _ASM_EXTABLE(1234b, 2f)
29315+#endif
29316+
29317 movl %eax, (v)
29318 movl %edx, 4(v)
29319 movl $1, %eax
29320@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29321 movl 4(v), %edx
29322 subl $1, %eax
29323 sbbl $0, %edx
29324+
29325+#ifdef CONFIG_PAX_REFCOUNT
29326+ into
29327+1234:
29328+ _ASM_EXTABLE(1234b, 1f)
29329+#endif
29330+
29331 js 1f
29332 movl %eax, (v)
29333 movl %edx, 4(v)
29334diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29335index f5cc9eb..51fa319 100644
29336--- a/arch/x86/lib/atomic64_cx8_32.S
29337+++ b/arch/x86/lib/atomic64_cx8_32.S
29338@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29339 CFI_STARTPROC
29340
29341 read64 %ecx
29342+ pax_force_retaddr
29343 ret
29344 CFI_ENDPROC
29345 ENDPROC(atomic64_read_cx8)
29346
29347+ENTRY(atomic64_read_unchecked_cx8)
29348+ CFI_STARTPROC
29349+
29350+ read64 %ecx
29351+ pax_force_retaddr
29352+ ret
29353+ CFI_ENDPROC
29354+ENDPROC(atomic64_read_unchecked_cx8)
29355+
29356 ENTRY(atomic64_set_cx8)
29357 CFI_STARTPROC
29358
29359@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29360 cmpxchg8b (%esi)
29361 jne 1b
29362
29363+ pax_force_retaddr
29364 ret
29365 CFI_ENDPROC
29366 ENDPROC(atomic64_set_cx8)
29367
29368+ENTRY(atomic64_set_unchecked_cx8)
29369+ CFI_STARTPROC
29370+
29371+1:
29372+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29373+ * are atomic on 586 and newer */
29374+ cmpxchg8b (%esi)
29375+ jne 1b
29376+
29377+ pax_force_retaddr
29378+ ret
29379+ CFI_ENDPROC
29380+ENDPROC(atomic64_set_unchecked_cx8)
29381+
29382 ENTRY(atomic64_xchg_cx8)
29383 CFI_STARTPROC
29384
29385@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29386 cmpxchg8b (%esi)
29387 jne 1b
29388
29389+ pax_force_retaddr
29390 ret
29391 CFI_ENDPROC
29392 ENDPROC(atomic64_xchg_cx8)
29393
29394-.macro addsub_return func ins insc
29395-ENTRY(atomic64_\func\()_return_cx8)
29396+.macro addsub_return func ins insc unchecked=""
29397+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29398 CFI_STARTPROC
29399 SAVE ebp
29400 SAVE ebx
29401@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29402 movl %edx, %ecx
29403 \ins\()l %esi, %ebx
29404 \insc\()l %edi, %ecx
29405+
29406+.ifb \unchecked
29407+#ifdef CONFIG_PAX_REFCOUNT
29408+ into
29409+2:
29410+ _ASM_EXTABLE(2b, 3f)
29411+#endif
29412+.endif
29413+
29414 LOCK_PREFIX
29415 cmpxchg8b (%ebp)
29416 jne 1b
29417-
29418-10:
29419 movl %ebx, %eax
29420 movl %ecx, %edx
29421+
29422+.ifb \unchecked
29423+#ifdef CONFIG_PAX_REFCOUNT
29424+3:
29425+#endif
29426+.endif
29427+
29428 RESTORE edi
29429 RESTORE esi
29430 RESTORE ebx
29431 RESTORE ebp
29432+ pax_force_retaddr
29433 ret
29434 CFI_ENDPROC
29435-ENDPROC(atomic64_\func\()_return_cx8)
29436+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29437 .endm
29438
29439 addsub_return add add adc
29440 addsub_return sub sub sbb
29441+addsub_return add add adc _unchecked
29442+addsub_return sub sub sbb _unchecked
29443
29444-.macro incdec_return func ins insc
29445-ENTRY(atomic64_\func\()_return_cx8)
29446+.macro incdec_return func ins insc unchecked=""
29447+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29448 CFI_STARTPROC
29449 SAVE ebx
29450
29451@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29452 movl %edx, %ecx
29453 \ins\()l $1, %ebx
29454 \insc\()l $0, %ecx
29455+
29456+.ifb \unchecked
29457+#ifdef CONFIG_PAX_REFCOUNT
29458+ into
29459+2:
29460+ _ASM_EXTABLE(2b, 3f)
29461+#endif
29462+.endif
29463+
29464 LOCK_PREFIX
29465 cmpxchg8b (%esi)
29466 jne 1b
29467
29468-10:
29469 movl %ebx, %eax
29470 movl %ecx, %edx
29471+
29472+.ifb \unchecked
29473+#ifdef CONFIG_PAX_REFCOUNT
29474+3:
29475+#endif
29476+.endif
29477+
29478 RESTORE ebx
29479+ pax_force_retaddr
29480 ret
29481 CFI_ENDPROC
29482-ENDPROC(atomic64_\func\()_return_cx8)
29483+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29484 .endm
29485
29486 incdec_return inc add adc
29487 incdec_return dec sub sbb
29488+incdec_return inc add adc _unchecked
29489+incdec_return dec sub sbb _unchecked
29490
29491 ENTRY(atomic64_dec_if_positive_cx8)
29492 CFI_STARTPROC
29493@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29494 movl %edx, %ecx
29495 subl $1, %ebx
29496 sbb $0, %ecx
29497+
29498+#ifdef CONFIG_PAX_REFCOUNT
29499+ into
29500+1234:
29501+ _ASM_EXTABLE(1234b, 2f)
29502+#endif
29503+
29504 js 2f
29505 LOCK_PREFIX
29506 cmpxchg8b (%esi)
29507@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29508 movl %ebx, %eax
29509 movl %ecx, %edx
29510 RESTORE ebx
29511+ pax_force_retaddr
29512 ret
29513 CFI_ENDPROC
29514 ENDPROC(atomic64_dec_if_positive_cx8)
29515@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29516 movl %edx, %ecx
29517 addl %ebp, %ebx
29518 adcl %edi, %ecx
29519+
29520+#ifdef CONFIG_PAX_REFCOUNT
29521+ into
29522+1234:
29523+ _ASM_EXTABLE(1234b, 3f)
29524+#endif
29525+
29526 LOCK_PREFIX
29527 cmpxchg8b (%esi)
29528 jne 1b
29529@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29530 CFI_ADJUST_CFA_OFFSET -8
29531 RESTORE ebx
29532 RESTORE ebp
29533+ pax_force_retaddr
29534 ret
29535 4:
29536 cmpl %edx, 4(%esp)
29537@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29538 xorl %ecx, %ecx
29539 addl $1, %ebx
29540 adcl %edx, %ecx
29541+
29542+#ifdef CONFIG_PAX_REFCOUNT
29543+ into
29544+1234:
29545+ _ASM_EXTABLE(1234b, 3f)
29546+#endif
29547+
29548 LOCK_PREFIX
29549 cmpxchg8b (%esi)
29550 jne 1b
29551@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29552 movl $1, %eax
29553 3:
29554 RESTORE ebx
29555+ pax_force_retaddr
29556 ret
29557 CFI_ENDPROC
29558 ENDPROC(atomic64_inc_not_zero_cx8)
29559diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29560index e78b8eee..7e173a8 100644
29561--- a/arch/x86/lib/checksum_32.S
29562+++ b/arch/x86/lib/checksum_32.S
29563@@ -29,7 +29,8 @@
29564 #include <asm/dwarf2.h>
29565 #include <asm/errno.h>
29566 #include <asm/asm.h>
29567-
29568+#include <asm/segment.h>
29569+
29570 /*
29571 * computes a partial checksum, e.g. for TCP/UDP fragments
29572 */
29573@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29574
29575 #define ARGBASE 16
29576 #define FP 12
29577-
29578-ENTRY(csum_partial_copy_generic)
29579+
29580+ENTRY(csum_partial_copy_generic_to_user)
29581 CFI_STARTPROC
29582+
29583+#ifdef CONFIG_PAX_MEMORY_UDEREF
29584+ pushl_cfi %gs
29585+ popl_cfi %es
29586+ jmp csum_partial_copy_generic
29587+#endif
29588+
29589+ENTRY(csum_partial_copy_generic_from_user)
29590+
29591+#ifdef CONFIG_PAX_MEMORY_UDEREF
29592+ pushl_cfi %gs
29593+ popl_cfi %ds
29594+#endif
29595+
29596+ENTRY(csum_partial_copy_generic)
29597 subl $4,%esp
29598 CFI_ADJUST_CFA_OFFSET 4
29599 pushl_cfi %edi
29600@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29601 jmp 4f
29602 SRC(1: movw (%esi), %bx )
29603 addl $2, %esi
29604-DST( movw %bx, (%edi) )
29605+DST( movw %bx, %es:(%edi) )
29606 addl $2, %edi
29607 addw %bx, %ax
29608 adcl $0, %eax
29609@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29610 SRC(1: movl (%esi), %ebx )
29611 SRC( movl 4(%esi), %edx )
29612 adcl %ebx, %eax
29613-DST( movl %ebx, (%edi) )
29614+DST( movl %ebx, %es:(%edi) )
29615 adcl %edx, %eax
29616-DST( movl %edx, 4(%edi) )
29617+DST( movl %edx, %es:4(%edi) )
29618
29619 SRC( movl 8(%esi), %ebx )
29620 SRC( movl 12(%esi), %edx )
29621 adcl %ebx, %eax
29622-DST( movl %ebx, 8(%edi) )
29623+DST( movl %ebx, %es:8(%edi) )
29624 adcl %edx, %eax
29625-DST( movl %edx, 12(%edi) )
29626+DST( movl %edx, %es:12(%edi) )
29627
29628 SRC( movl 16(%esi), %ebx )
29629 SRC( movl 20(%esi), %edx )
29630 adcl %ebx, %eax
29631-DST( movl %ebx, 16(%edi) )
29632+DST( movl %ebx, %es:16(%edi) )
29633 adcl %edx, %eax
29634-DST( movl %edx, 20(%edi) )
29635+DST( movl %edx, %es:20(%edi) )
29636
29637 SRC( movl 24(%esi), %ebx )
29638 SRC( movl 28(%esi), %edx )
29639 adcl %ebx, %eax
29640-DST( movl %ebx, 24(%edi) )
29641+DST( movl %ebx, %es:24(%edi) )
29642 adcl %edx, %eax
29643-DST( movl %edx, 28(%edi) )
29644+DST( movl %edx, %es:28(%edi) )
29645
29646 lea 32(%esi), %esi
29647 lea 32(%edi), %edi
29648@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29649 shrl $2, %edx # This clears CF
29650 SRC(3: movl (%esi), %ebx )
29651 adcl %ebx, %eax
29652-DST( movl %ebx, (%edi) )
29653+DST( movl %ebx, %es:(%edi) )
29654 lea 4(%esi), %esi
29655 lea 4(%edi), %edi
29656 dec %edx
29657@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29658 jb 5f
29659 SRC( movw (%esi), %cx )
29660 leal 2(%esi), %esi
29661-DST( movw %cx, (%edi) )
29662+DST( movw %cx, %es:(%edi) )
29663 leal 2(%edi), %edi
29664 je 6f
29665 shll $16,%ecx
29666 SRC(5: movb (%esi), %cl )
29667-DST( movb %cl, (%edi) )
29668+DST( movb %cl, %es:(%edi) )
29669 6: addl %ecx, %eax
29670 adcl $0, %eax
29671 7:
29672@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29673
29674 6001:
29675 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29676- movl $-EFAULT, (%ebx)
29677+ movl $-EFAULT, %ss:(%ebx)
29678
29679 # zero the complete destination - computing the rest
29680 # is too much work
29681@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29682
29683 6002:
29684 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29685- movl $-EFAULT,(%ebx)
29686+ movl $-EFAULT,%ss:(%ebx)
29687 jmp 5000b
29688
29689 .previous
29690
29691+ pushl_cfi %ss
29692+ popl_cfi %ds
29693+ pushl_cfi %ss
29694+ popl_cfi %es
29695 popl_cfi %ebx
29696 CFI_RESTORE ebx
29697 popl_cfi %esi
29698@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29699 popl_cfi %ecx # equivalent to addl $4,%esp
29700 ret
29701 CFI_ENDPROC
29702-ENDPROC(csum_partial_copy_generic)
29703+ENDPROC(csum_partial_copy_generic_to_user)
29704
29705 #else
29706
29707 /* Version for PentiumII/PPro */
29708
29709 #define ROUND1(x) \
29710+ nop; nop; nop; \
29711 SRC(movl x(%esi), %ebx ) ; \
29712 addl %ebx, %eax ; \
29713- DST(movl %ebx, x(%edi) ) ;
29714+ DST(movl %ebx, %es:x(%edi)) ;
29715
29716 #define ROUND(x) \
29717+ nop; nop; nop; \
29718 SRC(movl x(%esi), %ebx ) ; \
29719 adcl %ebx, %eax ; \
29720- DST(movl %ebx, x(%edi) ) ;
29721+ DST(movl %ebx, %es:x(%edi)) ;
29722
29723 #define ARGBASE 12
29724-
29725-ENTRY(csum_partial_copy_generic)
29726+
29727+ENTRY(csum_partial_copy_generic_to_user)
29728 CFI_STARTPROC
29729+
29730+#ifdef CONFIG_PAX_MEMORY_UDEREF
29731+ pushl_cfi %gs
29732+ popl_cfi %es
29733+ jmp csum_partial_copy_generic
29734+#endif
29735+
29736+ENTRY(csum_partial_copy_generic_from_user)
29737+
29738+#ifdef CONFIG_PAX_MEMORY_UDEREF
29739+ pushl_cfi %gs
29740+ popl_cfi %ds
29741+#endif
29742+
29743+ENTRY(csum_partial_copy_generic)
29744 pushl_cfi %ebx
29745 CFI_REL_OFFSET ebx, 0
29746 pushl_cfi %edi
29747@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29748 subl %ebx, %edi
29749 lea -1(%esi),%edx
29750 andl $-32,%edx
29751- lea 3f(%ebx,%ebx), %ebx
29752+ lea 3f(%ebx,%ebx,2), %ebx
29753 testl %esi, %esi
29754 jmp *%ebx
29755 1: addl $64,%esi
29756@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29757 jb 5f
29758 SRC( movw (%esi), %dx )
29759 leal 2(%esi), %esi
29760-DST( movw %dx, (%edi) )
29761+DST( movw %dx, %es:(%edi) )
29762 leal 2(%edi), %edi
29763 je 6f
29764 shll $16,%edx
29765 5:
29766 SRC( movb (%esi), %dl )
29767-DST( movb %dl, (%edi) )
29768+DST( movb %dl, %es:(%edi) )
29769 6: addl %edx, %eax
29770 adcl $0, %eax
29771 7:
29772 .section .fixup, "ax"
29773 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29774- movl $-EFAULT, (%ebx)
29775+ movl $-EFAULT, %ss:(%ebx)
29776 # zero the complete destination (computing the rest is too much work)
29777 movl ARGBASE+8(%esp),%edi # dst
29778 movl ARGBASE+12(%esp),%ecx # len
29779@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29780 rep; stosb
29781 jmp 7b
29782 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29783- movl $-EFAULT, (%ebx)
29784+ movl $-EFAULT, %ss:(%ebx)
29785 jmp 7b
29786 .previous
29787
29788+#ifdef CONFIG_PAX_MEMORY_UDEREF
29789+ pushl_cfi %ss
29790+ popl_cfi %ds
29791+ pushl_cfi %ss
29792+ popl_cfi %es
29793+#endif
29794+
29795 popl_cfi %esi
29796 CFI_RESTORE esi
29797 popl_cfi %edi
29798@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29799 CFI_RESTORE ebx
29800 ret
29801 CFI_ENDPROC
29802-ENDPROC(csum_partial_copy_generic)
29803+ENDPROC(csum_partial_copy_generic_to_user)
29804
29805 #undef ROUND
29806 #undef ROUND1
29807diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29808index f2145cf..cea889d 100644
29809--- a/arch/x86/lib/clear_page_64.S
29810+++ b/arch/x86/lib/clear_page_64.S
29811@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29812 movl $4096/8,%ecx
29813 xorl %eax,%eax
29814 rep stosq
29815+ pax_force_retaddr
29816 ret
29817 CFI_ENDPROC
29818 ENDPROC(clear_page_c)
29819@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29820 movl $4096,%ecx
29821 xorl %eax,%eax
29822 rep stosb
29823+ pax_force_retaddr
29824 ret
29825 CFI_ENDPROC
29826 ENDPROC(clear_page_c_e)
29827@@ -43,6 +45,7 @@ ENTRY(clear_page)
29828 leaq 64(%rdi),%rdi
29829 jnz .Lloop
29830 nop
29831+ pax_force_retaddr
29832 ret
29833 CFI_ENDPROC
29834 .Lclear_page_end:
29835@@ -58,7 +61,7 @@ ENDPROC(clear_page)
29836
29837 #include <asm/cpufeature.h>
29838
29839- .section .altinstr_replacement,"ax"
29840+ .section .altinstr_replacement,"a"
29841 1: .byte 0xeb /* jmp <disp8> */
29842 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29843 2: .byte 0xeb /* jmp <disp8> */
29844diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29845index 40a1725..5d12ac4 100644
29846--- a/arch/x86/lib/cmpxchg16b_emu.S
29847+++ b/arch/x86/lib/cmpxchg16b_emu.S
29848@@ -8,6 +8,7 @@
29849 #include <linux/linkage.h>
29850 #include <asm/dwarf2.h>
29851 #include <asm/percpu.h>
29852+#include <asm/alternative-asm.h>
29853
29854 .text
29855
29856@@ -46,12 +47,14 @@ CFI_STARTPROC
29857 CFI_REMEMBER_STATE
29858 popfq_cfi
29859 mov $1, %al
29860+ pax_force_retaddr
29861 ret
29862
29863 CFI_RESTORE_STATE
29864 .Lnot_same:
29865 popfq_cfi
29866 xor %al,%al
29867+ pax_force_retaddr
29868 ret
29869
29870 CFI_ENDPROC
29871diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29872index 176cca6..e0d658e 100644
29873--- a/arch/x86/lib/copy_page_64.S
29874+++ b/arch/x86/lib/copy_page_64.S
29875@@ -9,6 +9,7 @@ copy_page_rep:
29876 CFI_STARTPROC
29877 movl $4096/8, %ecx
29878 rep movsq
29879+ pax_force_retaddr
29880 ret
29881 CFI_ENDPROC
29882 ENDPROC(copy_page_rep)
29883@@ -24,8 +25,8 @@ ENTRY(copy_page)
29884 CFI_ADJUST_CFA_OFFSET 2*8
29885 movq %rbx, (%rsp)
29886 CFI_REL_OFFSET rbx, 0
29887- movq %r12, 1*8(%rsp)
29888- CFI_REL_OFFSET r12, 1*8
29889+ movq %r13, 1*8(%rsp)
29890+ CFI_REL_OFFSET r13, 1*8
29891
29892 movl $(4096/64)-5, %ecx
29893 .p2align 4
29894@@ -38,7 +39,7 @@ ENTRY(copy_page)
29895 movq 0x8*4(%rsi), %r9
29896 movq 0x8*5(%rsi), %r10
29897 movq 0x8*6(%rsi), %r11
29898- movq 0x8*7(%rsi), %r12
29899+ movq 0x8*7(%rsi), %r13
29900
29901 prefetcht0 5*64(%rsi)
29902
29903@@ -49,7 +50,7 @@ ENTRY(copy_page)
29904 movq %r9, 0x8*4(%rdi)
29905 movq %r10, 0x8*5(%rdi)
29906 movq %r11, 0x8*6(%rdi)
29907- movq %r12, 0x8*7(%rdi)
29908+ movq %r13, 0x8*7(%rdi)
29909
29910 leaq 64 (%rsi), %rsi
29911 leaq 64 (%rdi), %rdi
29912@@ -68,7 +69,7 @@ ENTRY(copy_page)
29913 movq 0x8*4(%rsi), %r9
29914 movq 0x8*5(%rsi), %r10
29915 movq 0x8*6(%rsi), %r11
29916- movq 0x8*7(%rsi), %r12
29917+ movq 0x8*7(%rsi), %r13
29918
29919 movq %rax, 0x8*0(%rdi)
29920 movq %rbx, 0x8*1(%rdi)
29921@@ -77,7 +78,7 @@ ENTRY(copy_page)
29922 movq %r9, 0x8*4(%rdi)
29923 movq %r10, 0x8*5(%rdi)
29924 movq %r11, 0x8*6(%rdi)
29925- movq %r12, 0x8*7(%rdi)
29926+ movq %r13, 0x8*7(%rdi)
29927
29928 leaq 64(%rdi), %rdi
29929 leaq 64(%rsi), %rsi
29930@@ -85,10 +86,11 @@ ENTRY(copy_page)
29931
29932 movq (%rsp), %rbx
29933 CFI_RESTORE rbx
29934- movq 1*8(%rsp), %r12
29935- CFI_RESTORE r12
29936+ movq 1*8(%rsp), %r13
29937+ CFI_RESTORE r13
29938 addq $2*8, %rsp
29939 CFI_ADJUST_CFA_OFFSET -2*8
29940+ pax_force_retaddr
29941 ret
29942 .Lcopy_page_end:
29943 CFI_ENDPROC
29944@@ -99,7 +101,7 @@ ENDPROC(copy_page)
29945
29946 #include <asm/cpufeature.h>
29947
29948- .section .altinstr_replacement,"ax"
29949+ .section .altinstr_replacement,"a"
29950 1: .byte 0xeb /* jmp <disp8> */
29951 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29952 2:
29953diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29954index dee945d..a84067b 100644
29955--- a/arch/x86/lib/copy_user_64.S
29956+++ b/arch/x86/lib/copy_user_64.S
29957@@ -18,31 +18,7 @@
29958 #include <asm/alternative-asm.h>
29959 #include <asm/asm.h>
29960 #include <asm/smap.h>
29961-
29962-/*
29963- * By placing feature2 after feature1 in altinstructions section, we logically
29964- * implement:
29965- * If CPU has feature2, jmp to alt2 is used
29966- * else if CPU has feature1, jmp to alt1 is used
29967- * else jmp to orig is used.
29968- */
29969- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29970-0:
29971- .byte 0xe9 /* 32bit jump */
29972- .long \orig-1f /* by default jump to orig */
29973-1:
29974- .section .altinstr_replacement,"ax"
29975-2: .byte 0xe9 /* near jump with 32bit immediate */
29976- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29977-3: .byte 0xe9 /* near jump with 32bit immediate */
29978- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29979- .previous
29980-
29981- .section .altinstructions,"a"
29982- altinstruction_entry 0b,2b,\feature1,5,5
29983- altinstruction_entry 0b,3b,\feature2,5,5
29984- .previous
29985- .endm
29986+#include <asm/pgtable.h>
29987
29988 .macro ALIGN_DESTINATION
29989 #ifdef FIX_ALIGNMENT
29990@@ -70,52 +46,6 @@
29991 #endif
29992 .endm
29993
29994-/* Standard copy_to_user with segment limit checking */
29995-ENTRY(_copy_to_user)
29996- CFI_STARTPROC
29997- GET_THREAD_INFO(%rax)
29998- movq %rdi,%rcx
29999- addq %rdx,%rcx
30000- jc bad_to_user
30001- cmpq TI_addr_limit(%rax),%rcx
30002- ja bad_to_user
30003- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
30004- copy_user_generic_unrolled,copy_user_generic_string, \
30005- copy_user_enhanced_fast_string
30006- CFI_ENDPROC
30007-ENDPROC(_copy_to_user)
30008-
30009-/* Standard copy_from_user with segment limit checking */
30010-ENTRY(_copy_from_user)
30011- CFI_STARTPROC
30012- GET_THREAD_INFO(%rax)
30013- movq %rsi,%rcx
30014- addq %rdx,%rcx
30015- jc bad_from_user
30016- cmpq TI_addr_limit(%rax),%rcx
30017- ja bad_from_user
30018- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
30019- copy_user_generic_unrolled,copy_user_generic_string, \
30020- copy_user_enhanced_fast_string
30021- CFI_ENDPROC
30022-ENDPROC(_copy_from_user)
30023-
30024- .section .fixup,"ax"
30025- /* must zero dest */
30026-ENTRY(bad_from_user)
30027-bad_from_user:
30028- CFI_STARTPROC
30029- movl %edx,%ecx
30030- xorl %eax,%eax
30031- rep
30032- stosb
30033-bad_to_user:
30034- movl %edx,%eax
30035- ret
30036- CFI_ENDPROC
30037-ENDPROC(bad_from_user)
30038- .previous
30039-
30040 /*
30041 * copy_user_generic_unrolled - memory copy with exception handling.
30042 * This version is for CPUs like P4 that don't have efficient micro
30043@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
30044 */
30045 ENTRY(copy_user_generic_unrolled)
30046 CFI_STARTPROC
30047+ ASM_PAX_OPEN_USERLAND
30048 ASM_STAC
30049 cmpl $8,%edx
30050 jb 20f /* less then 8 bytes, go to byte copy loop */
30051@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
30052 jnz 21b
30053 23: xor %eax,%eax
30054 ASM_CLAC
30055+ ASM_PAX_CLOSE_USERLAND
30056+ pax_force_retaddr
30057 ret
30058
30059 .section .fixup,"ax"
30060@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
30061 */
30062 ENTRY(copy_user_generic_string)
30063 CFI_STARTPROC
30064+ ASM_PAX_OPEN_USERLAND
30065 ASM_STAC
30066 cmpl $8,%edx
30067 jb 2f /* less than 8 bytes, go to byte copy loop */
30068@@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
30069 movsb
30070 xorl %eax,%eax
30071 ASM_CLAC
30072+ ASM_PAX_CLOSE_USERLAND
30073+ pax_force_retaddr
30074 ret
30075
30076 .section .fixup,"ax"
30077@@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
30078 */
30079 ENTRY(copy_user_enhanced_fast_string)
30080 CFI_STARTPROC
30081+ ASM_PAX_OPEN_USERLAND
30082 ASM_STAC
30083 movl %edx,%ecx
30084 1: rep
30085 movsb
30086 xorl %eax,%eax
30087 ASM_CLAC
30088+ ASM_PAX_CLOSE_USERLAND
30089+ pax_force_retaddr
30090 ret
30091
30092 .section .fixup,"ax"
30093diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
30094index 6a4f43c..c70fb52 100644
30095--- a/arch/x86/lib/copy_user_nocache_64.S
30096+++ b/arch/x86/lib/copy_user_nocache_64.S
30097@@ -8,6 +8,7 @@
30098
30099 #include <linux/linkage.h>
30100 #include <asm/dwarf2.h>
30101+#include <asm/alternative-asm.h>
30102
30103 #define FIX_ALIGNMENT 1
30104
30105@@ -16,6 +17,7 @@
30106 #include <asm/thread_info.h>
30107 #include <asm/asm.h>
30108 #include <asm/smap.h>
30109+#include <asm/pgtable.h>
30110
30111 .macro ALIGN_DESTINATION
30112 #ifdef FIX_ALIGNMENT
30113@@ -49,6 +51,16 @@
30114 */
30115 ENTRY(__copy_user_nocache)
30116 CFI_STARTPROC
30117+
30118+#ifdef CONFIG_PAX_MEMORY_UDEREF
30119+ mov pax_user_shadow_base,%rcx
30120+ cmp %rcx,%rsi
30121+ jae 1f
30122+ add %rcx,%rsi
30123+1:
30124+#endif
30125+
30126+ ASM_PAX_OPEN_USERLAND
30127 ASM_STAC
30128 cmpl $8,%edx
30129 jb 20f /* less then 8 bytes, go to byte copy loop */
30130@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30131 jnz 21b
30132 23: xorl %eax,%eax
30133 ASM_CLAC
30134+ ASM_PAX_CLOSE_USERLAND
30135 sfence
30136+ pax_force_retaddr
30137 ret
30138
30139 .section .fixup,"ax"
30140diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30141index 2419d5f..fe52d0e 100644
30142--- a/arch/x86/lib/csum-copy_64.S
30143+++ b/arch/x86/lib/csum-copy_64.S
30144@@ -9,6 +9,7 @@
30145 #include <asm/dwarf2.h>
30146 #include <asm/errno.h>
30147 #include <asm/asm.h>
30148+#include <asm/alternative-asm.h>
30149
30150 /*
30151 * Checksum copy with exception handling.
30152@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30153 CFI_ADJUST_CFA_OFFSET 7*8
30154 movq %rbx, 2*8(%rsp)
30155 CFI_REL_OFFSET rbx, 2*8
30156- movq %r12, 3*8(%rsp)
30157- CFI_REL_OFFSET r12, 3*8
30158+ movq %r15, 3*8(%rsp)
30159+ CFI_REL_OFFSET r15, 3*8
30160 movq %r14, 4*8(%rsp)
30161 CFI_REL_OFFSET r14, 4*8
30162 movq %r13, 5*8(%rsp)
30163@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30164 movl %edx, %ecx
30165
30166 xorl %r9d, %r9d
30167- movq %rcx, %r12
30168+ movq %rcx, %r15
30169
30170- shrq $6, %r12
30171+ shrq $6, %r15
30172 jz .Lhandle_tail /* < 64 */
30173
30174 clc
30175
30176 /* main loop. clear in 64 byte blocks */
30177 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30178- /* r11: temp3, rdx: temp4, r12 loopcnt */
30179+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30180 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30181 .p2align 4
30182 .Lloop:
30183@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30184 adcq %r14, %rax
30185 adcq %r13, %rax
30186
30187- decl %r12d
30188+ decl %r15d
30189
30190 dest
30191 movq %rbx, (%rsi)
30192@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30193 .Lende:
30194 movq 2*8(%rsp), %rbx
30195 CFI_RESTORE rbx
30196- movq 3*8(%rsp), %r12
30197- CFI_RESTORE r12
30198+ movq 3*8(%rsp), %r15
30199+ CFI_RESTORE r15
30200 movq 4*8(%rsp), %r14
30201 CFI_RESTORE r14
30202 movq 5*8(%rsp), %r13
30203@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30204 CFI_RESTORE rbp
30205 addq $7*8, %rsp
30206 CFI_ADJUST_CFA_OFFSET -7*8
30207+ pax_force_retaddr
30208 ret
30209 CFI_RESTORE_STATE
30210
30211diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30212index 1318f75..44c30fd 100644
30213--- a/arch/x86/lib/csum-wrappers_64.c
30214+++ b/arch/x86/lib/csum-wrappers_64.c
30215@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30216 len -= 2;
30217 }
30218 }
30219+ pax_open_userland();
30220 stac();
30221- isum = csum_partial_copy_generic((__force const void *)src,
30222+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30223 dst, len, isum, errp, NULL);
30224 clac();
30225+ pax_close_userland();
30226 if (unlikely(*errp))
30227 goto out_err;
30228
30229@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30230 }
30231
30232 *errp = 0;
30233+ pax_open_userland();
30234 stac();
30235- ret = csum_partial_copy_generic(src, (void __force *)dst,
30236+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30237 len, isum, NULL, errp);
30238 clac();
30239+ pax_close_userland();
30240 return ret;
30241 }
30242 EXPORT_SYMBOL(csum_partial_copy_to_user);
30243diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30244index a451235..a74bfa3 100644
30245--- a/arch/x86/lib/getuser.S
30246+++ b/arch/x86/lib/getuser.S
30247@@ -33,17 +33,40 @@
30248 #include <asm/thread_info.h>
30249 #include <asm/asm.h>
30250 #include <asm/smap.h>
30251+#include <asm/segment.h>
30252+#include <asm/pgtable.h>
30253+#include <asm/alternative-asm.h>
30254+
30255+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30256+#define __copyuser_seg gs;
30257+#else
30258+#define __copyuser_seg
30259+#endif
30260
30261 .text
30262 ENTRY(__get_user_1)
30263 CFI_STARTPROC
30264+
30265+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30266 GET_THREAD_INFO(%_ASM_DX)
30267 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30268 jae bad_get_user
30269+
30270+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30271+ mov pax_user_shadow_base,%_ASM_DX
30272+ cmp %_ASM_DX,%_ASM_AX
30273+ jae 1234f
30274+ add %_ASM_DX,%_ASM_AX
30275+1234:
30276+#endif
30277+
30278+#endif
30279+
30280 ASM_STAC
30281-1: movzbl (%_ASM_AX),%edx
30282+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30283 xor %eax,%eax
30284 ASM_CLAC
30285+ pax_force_retaddr
30286 ret
30287 CFI_ENDPROC
30288 ENDPROC(__get_user_1)
30289@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30290 ENTRY(__get_user_2)
30291 CFI_STARTPROC
30292 add $1,%_ASM_AX
30293+
30294+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30295 jc bad_get_user
30296 GET_THREAD_INFO(%_ASM_DX)
30297 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30298 jae bad_get_user
30299+
30300+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30301+ mov pax_user_shadow_base,%_ASM_DX
30302+ cmp %_ASM_DX,%_ASM_AX
30303+ jae 1234f
30304+ add %_ASM_DX,%_ASM_AX
30305+1234:
30306+#endif
30307+
30308+#endif
30309+
30310 ASM_STAC
30311-2: movzwl -1(%_ASM_AX),%edx
30312+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30313 xor %eax,%eax
30314 ASM_CLAC
30315+ pax_force_retaddr
30316 ret
30317 CFI_ENDPROC
30318 ENDPROC(__get_user_2)
30319@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30320 ENTRY(__get_user_4)
30321 CFI_STARTPROC
30322 add $3,%_ASM_AX
30323+
30324+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30325 jc bad_get_user
30326 GET_THREAD_INFO(%_ASM_DX)
30327 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30328 jae bad_get_user
30329+
30330+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30331+ mov pax_user_shadow_base,%_ASM_DX
30332+ cmp %_ASM_DX,%_ASM_AX
30333+ jae 1234f
30334+ add %_ASM_DX,%_ASM_AX
30335+1234:
30336+#endif
30337+
30338+#endif
30339+
30340 ASM_STAC
30341-3: movl -3(%_ASM_AX),%edx
30342+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30343 xor %eax,%eax
30344 ASM_CLAC
30345+ pax_force_retaddr
30346 ret
30347 CFI_ENDPROC
30348 ENDPROC(__get_user_4)
30349@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30350 GET_THREAD_INFO(%_ASM_DX)
30351 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30352 jae bad_get_user
30353+
30354+#ifdef CONFIG_PAX_MEMORY_UDEREF
30355+ mov pax_user_shadow_base,%_ASM_DX
30356+ cmp %_ASM_DX,%_ASM_AX
30357+ jae 1234f
30358+ add %_ASM_DX,%_ASM_AX
30359+1234:
30360+#endif
30361+
30362 ASM_STAC
30363 4: movq -7(%_ASM_AX),%rdx
30364 xor %eax,%eax
30365 ASM_CLAC
30366+ pax_force_retaddr
30367 ret
30368 #else
30369 add $7,%_ASM_AX
30370@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30371 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30372 jae bad_get_user_8
30373 ASM_STAC
30374-4: movl -7(%_ASM_AX),%edx
30375-5: movl -3(%_ASM_AX),%ecx
30376+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30377+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30378 xor %eax,%eax
30379 ASM_CLAC
30380+ pax_force_retaddr
30381 ret
30382 #endif
30383 CFI_ENDPROC
30384@@ -113,6 +175,7 @@ bad_get_user:
30385 xor %edx,%edx
30386 mov $(-EFAULT),%_ASM_AX
30387 ASM_CLAC
30388+ pax_force_retaddr
30389 ret
30390 CFI_ENDPROC
30391 END(bad_get_user)
30392@@ -124,6 +187,7 @@ bad_get_user_8:
30393 xor %ecx,%ecx
30394 mov $(-EFAULT),%_ASM_AX
30395 ASM_CLAC
30396+ pax_force_retaddr
30397 ret
30398 CFI_ENDPROC
30399 END(bad_get_user_8)
30400diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30401index 85994f5..9929d7f 100644
30402--- a/arch/x86/lib/insn.c
30403+++ b/arch/x86/lib/insn.c
30404@@ -20,8 +20,10 @@
30405
30406 #ifdef __KERNEL__
30407 #include <linux/string.h>
30408+#include <asm/pgtable_types.h>
30409 #else
30410 #include <string.h>
30411+#define ktla_ktva(addr) addr
30412 #endif
30413 #include <asm/inat.h>
30414 #include <asm/insn.h>
30415@@ -60,9 +62,9 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30416 buf_len = MAX_INSN_SIZE;
30417
30418 memset(insn, 0, sizeof(*insn));
30419- insn->kaddr = kaddr;
30420- insn->end_kaddr = kaddr + buf_len;
30421- insn->next_byte = kaddr;
30422+ insn->kaddr = ktla_ktva(kaddr);
30423+ insn->end_kaddr = insn->kaddr + buf_len;
30424+ insn->next_byte = insn->kaddr;
30425 insn->x86_64 = x86_64 ? 1 : 0;
30426 insn->opnd_bytes = 4;
30427 if (x86_64)
30428diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30429index 05a95e7..326f2fa 100644
30430--- a/arch/x86/lib/iomap_copy_64.S
30431+++ b/arch/x86/lib/iomap_copy_64.S
30432@@ -17,6 +17,7 @@
30433
30434 #include <linux/linkage.h>
30435 #include <asm/dwarf2.h>
30436+#include <asm/alternative-asm.h>
30437
30438 /*
30439 * override generic version in lib/iomap_copy.c
30440@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30441 CFI_STARTPROC
30442 movl %edx,%ecx
30443 rep movsd
30444+ pax_force_retaddr
30445 ret
30446 CFI_ENDPROC
30447 ENDPROC(__iowrite32_copy)
30448diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30449index 89b53c9..97357ca 100644
30450--- a/arch/x86/lib/memcpy_64.S
30451+++ b/arch/x86/lib/memcpy_64.S
30452@@ -24,7 +24,7 @@
30453 * This gets patched over the unrolled variant (below) via the
30454 * alternative instructions framework:
30455 */
30456- .section .altinstr_replacement, "ax", @progbits
30457+ .section .altinstr_replacement, "a", @progbits
30458 .Lmemcpy_c:
30459 movq %rdi, %rax
30460 movq %rdx, %rcx
30461@@ -33,6 +33,7 @@
30462 rep movsq
30463 movl %edx, %ecx
30464 rep movsb
30465+ pax_force_retaddr
30466 ret
30467 .Lmemcpy_e:
30468 .previous
30469@@ -44,11 +45,12 @@
30470 * This gets patched over the unrolled variant (below) via the
30471 * alternative instructions framework:
30472 */
30473- .section .altinstr_replacement, "ax", @progbits
30474+ .section .altinstr_replacement, "a", @progbits
30475 .Lmemcpy_c_e:
30476 movq %rdi, %rax
30477 movq %rdx, %rcx
30478 rep movsb
30479+ pax_force_retaddr
30480 ret
30481 .Lmemcpy_e_e:
30482 .previous
30483@@ -138,6 +140,7 @@ ENTRY(memcpy)
30484 movq %r9, 1*8(%rdi)
30485 movq %r10, -2*8(%rdi, %rdx)
30486 movq %r11, -1*8(%rdi, %rdx)
30487+ pax_force_retaddr
30488 retq
30489 .p2align 4
30490 .Lless_16bytes:
30491@@ -150,6 +153,7 @@ ENTRY(memcpy)
30492 movq -1*8(%rsi, %rdx), %r9
30493 movq %r8, 0*8(%rdi)
30494 movq %r9, -1*8(%rdi, %rdx)
30495+ pax_force_retaddr
30496 retq
30497 .p2align 4
30498 .Lless_8bytes:
30499@@ -163,6 +167,7 @@ ENTRY(memcpy)
30500 movl -4(%rsi, %rdx), %r8d
30501 movl %ecx, (%rdi)
30502 movl %r8d, -4(%rdi, %rdx)
30503+ pax_force_retaddr
30504 retq
30505 .p2align 4
30506 .Lless_3bytes:
30507@@ -181,6 +186,7 @@ ENTRY(memcpy)
30508 movb %cl, (%rdi)
30509
30510 .Lend:
30511+ pax_force_retaddr
30512 retq
30513 CFI_ENDPROC
30514 ENDPROC(memcpy)
30515diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30516index 9c4b530..830b77a 100644
30517--- a/arch/x86/lib/memmove_64.S
30518+++ b/arch/x86/lib/memmove_64.S
30519@@ -205,14 +205,16 @@ ENTRY(__memmove)
30520 movb (%rsi), %r11b
30521 movb %r11b, (%rdi)
30522 13:
30523+ pax_force_retaddr
30524 retq
30525 CFI_ENDPROC
30526
30527- .section .altinstr_replacement,"ax"
30528+ .section .altinstr_replacement,"a"
30529 .Lmemmove_begin_forward_efs:
30530 /* Forward moving data. */
30531 movq %rdx, %rcx
30532 rep movsb
30533+ pax_force_retaddr
30534 retq
30535 .Lmemmove_end_forward_efs:
30536 .previous
30537diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30538index 6f44935..fbf5f6d 100644
30539--- a/arch/x86/lib/memset_64.S
30540+++ b/arch/x86/lib/memset_64.S
30541@@ -16,7 +16,7 @@
30542 *
30543 * rax original destination
30544 */
30545- .section .altinstr_replacement, "ax", @progbits
30546+ .section .altinstr_replacement, "a", @progbits
30547 .Lmemset_c:
30548 movq %rdi,%r9
30549 movq %rdx,%rcx
30550@@ -30,6 +30,7 @@
30551 movl %edx,%ecx
30552 rep stosb
30553 movq %r9,%rax
30554+ pax_force_retaddr
30555 ret
30556 .Lmemset_e:
30557 .previous
30558@@ -45,13 +46,14 @@
30559 *
30560 * rax original destination
30561 */
30562- .section .altinstr_replacement, "ax", @progbits
30563+ .section .altinstr_replacement, "a", @progbits
30564 .Lmemset_c_e:
30565 movq %rdi,%r9
30566 movb %sil,%al
30567 movq %rdx,%rcx
30568 rep stosb
30569 movq %r9,%rax
30570+ pax_force_retaddr
30571 ret
30572 .Lmemset_e_e:
30573 .previous
30574@@ -120,6 +122,7 @@ ENTRY(__memset)
30575
30576 .Lende:
30577 movq %r10,%rax
30578+ pax_force_retaddr
30579 ret
30580
30581 CFI_RESTORE_STATE
30582diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30583index c9f2d9b..e7fd2c0 100644
30584--- a/arch/x86/lib/mmx_32.c
30585+++ b/arch/x86/lib/mmx_32.c
30586@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30587 {
30588 void *p;
30589 int i;
30590+ unsigned long cr0;
30591
30592 if (unlikely(in_interrupt()))
30593 return __memcpy(to, from, len);
30594@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30595 kernel_fpu_begin();
30596
30597 __asm__ __volatile__ (
30598- "1: prefetch (%0)\n" /* This set is 28 bytes */
30599- " prefetch 64(%0)\n"
30600- " prefetch 128(%0)\n"
30601- " prefetch 192(%0)\n"
30602- " prefetch 256(%0)\n"
30603+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30604+ " prefetch 64(%1)\n"
30605+ " prefetch 128(%1)\n"
30606+ " prefetch 192(%1)\n"
30607+ " prefetch 256(%1)\n"
30608 "2: \n"
30609 ".section .fixup, \"ax\"\n"
30610- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30611+ "3: \n"
30612+
30613+#ifdef CONFIG_PAX_KERNEXEC
30614+ " movl %%cr0, %0\n"
30615+ " movl %0, %%eax\n"
30616+ " andl $0xFFFEFFFF, %%eax\n"
30617+ " movl %%eax, %%cr0\n"
30618+#endif
30619+
30620+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30621+
30622+#ifdef CONFIG_PAX_KERNEXEC
30623+ " movl %0, %%cr0\n"
30624+#endif
30625+
30626 " jmp 2b\n"
30627 ".previous\n"
30628 _ASM_EXTABLE(1b, 3b)
30629- : : "r" (from));
30630+ : "=&r" (cr0) : "r" (from) : "ax");
30631
30632 for ( ; i > 5; i--) {
30633 __asm__ __volatile__ (
30634- "1: prefetch 320(%0)\n"
30635- "2: movq (%0), %%mm0\n"
30636- " movq 8(%0), %%mm1\n"
30637- " movq 16(%0), %%mm2\n"
30638- " movq 24(%0), %%mm3\n"
30639- " movq %%mm0, (%1)\n"
30640- " movq %%mm1, 8(%1)\n"
30641- " movq %%mm2, 16(%1)\n"
30642- " movq %%mm3, 24(%1)\n"
30643- " movq 32(%0), %%mm0\n"
30644- " movq 40(%0), %%mm1\n"
30645- " movq 48(%0), %%mm2\n"
30646- " movq 56(%0), %%mm3\n"
30647- " movq %%mm0, 32(%1)\n"
30648- " movq %%mm1, 40(%1)\n"
30649- " movq %%mm2, 48(%1)\n"
30650- " movq %%mm3, 56(%1)\n"
30651+ "1: prefetch 320(%1)\n"
30652+ "2: movq (%1), %%mm0\n"
30653+ " movq 8(%1), %%mm1\n"
30654+ " movq 16(%1), %%mm2\n"
30655+ " movq 24(%1), %%mm3\n"
30656+ " movq %%mm0, (%2)\n"
30657+ " movq %%mm1, 8(%2)\n"
30658+ " movq %%mm2, 16(%2)\n"
30659+ " movq %%mm3, 24(%2)\n"
30660+ " movq 32(%1), %%mm0\n"
30661+ " movq 40(%1), %%mm1\n"
30662+ " movq 48(%1), %%mm2\n"
30663+ " movq 56(%1), %%mm3\n"
30664+ " movq %%mm0, 32(%2)\n"
30665+ " movq %%mm1, 40(%2)\n"
30666+ " movq %%mm2, 48(%2)\n"
30667+ " movq %%mm3, 56(%2)\n"
30668 ".section .fixup, \"ax\"\n"
30669- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30670+ "3:\n"
30671+
30672+#ifdef CONFIG_PAX_KERNEXEC
30673+ " movl %%cr0, %0\n"
30674+ " movl %0, %%eax\n"
30675+ " andl $0xFFFEFFFF, %%eax\n"
30676+ " movl %%eax, %%cr0\n"
30677+#endif
30678+
30679+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30680+
30681+#ifdef CONFIG_PAX_KERNEXEC
30682+ " movl %0, %%cr0\n"
30683+#endif
30684+
30685 " jmp 2b\n"
30686 ".previous\n"
30687 _ASM_EXTABLE(1b, 3b)
30688- : : "r" (from), "r" (to) : "memory");
30689+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30690
30691 from += 64;
30692 to += 64;
30693@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30694 static void fast_copy_page(void *to, void *from)
30695 {
30696 int i;
30697+ unsigned long cr0;
30698
30699 kernel_fpu_begin();
30700
30701@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30702 * but that is for later. -AV
30703 */
30704 __asm__ __volatile__(
30705- "1: prefetch (%0)\n"
30706- " prefetch 64(%0)\n"
30707- " prefetch 128(%0)\n"
30708- " prefetch 192(%0)\n"
30709- " prefetch 256(%0)\n"
30710+ "1: prefetch (%1)\n"
30711+ " prefetch 64(%1)\n"
30712+ " prefetch 128(%1)\n"
30713+ " prefetch 192(%1)\n"
30714+ " prefetch 256(%1)\n"
30715 "2: \n"
30716 ".section .fixup, \"ax\"\n"
30717- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30718+ "3: \n"
30719+
30720+#ifdef CONFIG_PAX_KERNEXEC
30721+ " movl %%cr0, %0\n"
30722+ " movl %0, %%eax\n"
30723+ " andl $0xFFFEFFFF, %%eax\n"
30724+ " movl %%eax, %%cr0\n"
30725+#endif
30726+
30727+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30728+
30729+#ifdef CONFIG_PAX_KERNEXEC
30730+ " movl %0, %%cr0\n"
30731+#endif
30732+
30733 " jmp 2b\n"
30734 ".previous\n"
30735- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30736+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30737
30738 for (i = 0; i < (4096-320)/64; i++) {
30739 __asm__ __volatile__ (
30740- "1: prefetch 320(%0)\n"
30741- "2: movq (%0), %%mm0\n"
30742- " movntq %%mm0, (%1)\n"
30743- " movq 8(%0), %%mm1\n"
30744- " movntq %%mm1, 8(%1)\n"
30745- " movq 16(%0), %%mm2\n"
30746- " movntq %%mm2, 16(%1)\n"
30747- " movq 24(%0), %%mm3\n"
30748- " movntq %%mm3, 24(%1)\n"
30749- " movq 32(%0), %%mm4\n"
30750- " movntq %%mm4, 32(%1)\n"
30751- " movq 40(%0), %%mm5\n"
30752- " movntq %%mm5, 40(%1)\n"
30753- " movq 48(%0), %%mm6\n"
30754- " movntq %%mm6, 48(%1)\n"
30755- " movq 56(%0), %%mm7\n"
30756- " movntq %%mm7, 56(%1)\n"
30757+ "1: prefetch 320(%1)\n"
30758+ "2: movq (%1), %%mm0\n"
30759+ " movntq %%mm0, (%2)\n"
30760+ " movq 8(%1), %%mm1\n"
30761+ " movntq %%mm1, 8(%2)\n"
30762+ " movq 16(%1), %%mm2\n"
30763+ " movntq %%mm2, 16(%2)\n"
30764+ " movq 24(%1), %%mm3\n"
30765+ " movntq %%mm3, 24(%2)\n"
30766+ " movq 32(%1), %%mm4\n"
30767+ " movntq %%mm4, 32(%2)\n"
30768+ " movq 40(%1), %%mm5\n"
30769+ " movntq %%mm5, 40(%2)\n"
30770+ " movq 48(%1), %%mm6\n"
30771+ " movntq %%mm6, 48(%2)\n"
30772+ " movq 56(%1), %%mm7\n"
30773+ " movntq %%mm7, 56(%2)\n"
30774 ".section .fixup, \"ax\"\n"
30775- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30776+ "3:\n"
30777+
30778+#ifdef CONFIG_PAX_KERNEXEC
30779+ " movl %%cr0, %0\n"
30780+ " movl %0, %%eax\n"
30781+ " andl $0xFFFEFFFF, %%eax\n"
30782+ " movl %%eax, %%cr0\n"
30783+#endif
30784+
30785+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30786+
30787+#ifdef CONFIG_PAX_KERNEXEC
30788+ " movl %0, %%cr0\n"
30789+#endif
30790+
30791 " jmp 2b\n"
30792 ".previous\n"
30793- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30794+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30795
30796 from += 64;
30797 to += 64;
30798@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30799 static void fast_copy_page(void *to, void *from)
30800 {
30801 int i;
30802+ unsigned long cr0;
30803
30804 kernel_fpu_begin();
30805
30806 __asm__ __volatile__ (
30807- "1: prefetch (%0)\n"
30808- " prefetch 64(%0)\n"
30809- " prefetch 128(%0)\n"
30810- " prefetch 192(%0)\n"
30811- " prefetch 256(%0)\n"
30812+ "1: prefetch (%1)\n"
30813+ " prefetch 64(%1)\n"
30814+ " prefetch 128(%1)\n"
30815+ " prefetch 192(%1)\n"
30816+ " prefetch 256(%1)\n"
30817 "2: \n"
30818 ".section .fixup, \"ax\"\n"
30819- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30820+ "3: \n"
30821+
30822+#ifdef CONFIG_PAX_KERNEXEC
30823+ " movl %%cr0, %0\n"
30824+ " movl %0, %%eax\n"
30825+ " andl $0xFFFEFFFF, %%eax\n"
30826+ " movl %%eax, %%cr0\n"
30827+#endif
30828+
30829+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30830+
30831+#ifdef CONFIG_PAX_KERNEXEC
30832+ " movl %0, %%cr0\n"
30833+#endif
30834+
30835 " jmp 2b\n"
30836 ".previous\n"
30837- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30838+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30839
30840 for (i = 0; i < 4096/64; i++) {
30841 __asm__ __volatile__ (
30842- "1: prefetch 320(%0)\n"
30843- "2: movq (%0), %%mm0\n"
30844- " movq 8(%0), %%mm1\n"
30845- " movq 16(%0), %%mm2\n"
30846- " movq 24(%0), %%mm3\n"
30847- " movq %%mm0, (%1)\n"
30848- " movq %%mm1, 8(%1)\n"
30849- " movq %%mm2, 16(%1)\n"
30850- " movq %%mm3, 24(%1)\n"
30851- " movq 32(%0), %%mm0\n"
30852- " movq 40(%0), %%mm1\n"
30853- " movq 48(%0), %%mm2\n"
30854- " movq 56(%0), %%mm3\n"
30855- " movq %%mm0, 32(%1)\n"
30856- " movq %%mm1, 40(%1)\n"
30857- " movq %%mm2, 48(%1)\n"
30858- " movq %%mm3, 56(%1)\n"
30859+ "1: prefetch 320(%1)\n"
30860+ "2: movq (%1), %%mm0\n"
30861+ " movq 8(%1), %%mm1\n"
30862+ " movq 16(%1), %%mm2\n"
30863+ " movq 24(%1), %%mm3\n"
30864+ " movq %%mm0, (%2)\n"
30865+ " movq %%mm1, 8(%2)\n"
30866+ " movq %%mm2, 16(%2)\n"
30867+ " movq %%mm3, 24(%2)\n"
30868+ " movq 32(%1), %%mm0\n"
30869+ " movq 40(%1), %%mm1\n"
30870+ " movq 48(%1), %%mm2\n"
30871+ " movq 56(%1), %%mm3\n"
30872+ " movq %%mm0, 32(%2)\n"
30873+ " movq %%mm1, 40(%2)\n"
30874+ " movq %%mm2, 48(%2)\n"
30875+ " movq %%mm3, 56(%2)\n"
30876 ".section .fixup, \"ax\"\n"
30877- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30878+ "3:\n"
30879+
30880+#ifdef CONFIG_PAX_KERNEXEC
30881+ " movl %%cr0, %0\n"
30882+ " movl %0, %%eax\n"
30883+ " andl $0xFFFEFFFF, %%eax\n"
30884+ " movl %%eax, %%cr0\n"
30885+#endif
30886+
30887+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30888+
30889+#ifdef CONFIG_PAX_KERNEXEC
30890+ " movl %0, %%cr0\n"
30891+#endif
30892+
30893 " jmp 2b\n"
30894 ".previous\n"
30895 _ASM_EXTABLE(1b, 3b)
30896- : : "r" (from), "r" (to) : "memory");
30897+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30898
30899 from += 64;
30900 to += 64;
30901diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30902index f6d13ee..d789440 100644
30903--- a/arch/x86/lib/msr-reg.S
30904+++ b/arch/x86/lib/msr-reg.S
30905@@ -3,6 +3,7 @@
30906 #include <asm/dwarf2.h>
30907 #include <asm/asm.h>
30908 #include <asm/msr.h>
30909+#include <asm/alternative-asm.h>
30910
30911 #ifdef CONFIG_X86_64
30912 /*
30913@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30914 movl %edi, 28(%r10)
30915 popq_cfi %rbp
30916 popq_cfi %rbx
30917+ pax_force_retaddr
30918 ret
30919 3:
30920 CFI_RESTORE_STATE
30921diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30922index fc6ba17..14ad9a5 100644
30923--- a/arch/x86/lib/putuser.S
30924+++ b/arch/x86/lib/putuser.S
30925@@ -16,7 +16,9 @@
30926 #include <asm/errno.h>
30927 #include <asm/asm.h>
30928 #include <asm/smap.h>
30929-
30930+#include <asm/segment.h>
30931+#include <asm/pgtable.h>
30932+#include <asm/alternative-asm.h>
30933
30934 /*
30935 * __put_user_X
30936@@ -30,57 +32,125 @@
30937 * as they get called from within inline assembly.
30938 */
30939
30940-#define ENTER CFI_STARTPROC ; \
30941- GET_THREAD_INFO(%_ASM_BX)
30942-#define EXIT ASM_CLAC ; \
30943- ret ; \
30944+#define ENTER CFI_STARTPROC
30945+#define EXIT ASM_CLAC ; \
30946+ pax_force_retaddr ; \
30947+ ret ; \
30948 CFI_ENDPROC
30949
30950+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30951+#define _DEST %_ASM_CX,%_ASM_BX
30952+#else
30953+#define _DEST %_ASM_CX
30954+#endif
30955+
30956+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30957+#define __copyuser_seg gs;
30958+#else
30959+#define __copyuser_seg
30960+#endif
30961+
30962 .text
30963 ENTRY(__put_user_1)
30964 ENTER
30965+
30966+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30967+ GET_THREAD_INFO(%_ASM_BX)
30968 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30969 jae bad_put_user
30970+
30971+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30972+ mov pax_user_shadow_base,%_ASM_BX
30973+ cmp %_ASM_BX,%_ASM_CX
30974+ jb 1234f
30975+ xor %ebx,%ebx
30976+1234:
30977+#endif
30978+
30979+#endif
30980+
30981 ASM_STAC
30982-1: movb %al,(%_ASM_CX)
30983+1: __copyuser_seg movb %al,(_DEST)
30984 xor %eax,%eax
30985 EXIT
30986 ENDPROC(__put_user_1)
30987
30988 ENTRY(__put_user_2)
30989 ENTER
30990+
30991+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30992+ GET_THREAD_INFO(%_ASM_BX)
30993 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30994 sub $1,%_ASM_BX
30995 cmp %_ASM_BX,%_ASM_CX
30996 jae bad_put_user
30997+
30998+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30999+ mov pax_user_shadow_base,%_ASM_BX
31000+ cmp %_ASM_BX,%_ASM_CX
31001+ jb 1234f
31002+ xor %ebx,%ebx
31003+1234:
31004+#endif
31005+
31006+#endif
31007+
31008 ASM_STAC
31009-2: movw %ax,(%_ASM_CX)
31010+2: __copyuser_seg movw %ax,(_DEST)
31011 xor %eax,%eax
31012 EXIT
31013 ENDPROC(__put_user_2)
31014
31015 ENTRY(__put_user_4)
31016 ENTER
31017+
31018+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31019+ GET_THREAD_INFO(%_ASM_BX)
31020 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31021 sub $3,%_ASM_BX
31022 cmp %_ASM_BX,%_ASM_CX
31023 jae bad_put_user
31024+
31025+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31026+ mov pax_user_shadow_base,%_ASM_BX
31027+ cmp %_ASM_BX,%_ASM_CX
31028+ jb 1234f
31029+ xor %ebx,%ebx
31030+1234:
31031+#endif
31032+
31033+#endif
31034+
31035 ASM_STAC
31036-3: movl %eax,(%_ASM_CX)
31037+3: __copyuser_seg movl %eax,(_DEST)
31038 xor %eax,%eax
31039 EXIT
31040 ENDPROC(__put_user_4)
31041
31042 ENTRY(__put_user_8)
31043 ENTER
31044+
31045+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31046+ GET_THREAD_INFO(%_ASM_BX)
31047 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31048 sub $7,%_ASM_BX
31049 cmp %_ASM_BX,%_ASM_CX
31050 jae bad_put_user
31051+
31052+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31053+ mov pax_user_shadow_base,%_ASM_BX
31054+ cmp %_ASM_BX,%_ASM_CX
31055+ jb 1234f
31056+ xor %ebx,%ebx
31057+1234:
31058+#endif
31059+
31060+#endif
31061+
31062 ASM_STAC
31063-4: mov %_ASM_AX,(%_ASM_CX)
31064+4: __copyuser_seg mov %_ASM_AX,(_DEST)
31065 #ifdef CONFIG_X86_32
31066-5: movl %edx,4(%_ASM_CX)
31067+5: __copyuser_seg movl %edx,4(_DEST)
31068 #endif
31069 xor %eax,%eax
31070 EXIT
31071diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
31072index 5dff5f0..cadebf4 100644
31073--- a/arch/x86/lib/rwsem.S
31074+++ b/arch/x86/lib/rwsem.S
31075@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
31076 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31077 CFI_RESTORE __ASM_REG(dx)
31078 restore_common_regs
31079+ pax_force_retaddr
31080 ret
31081 CFI_ENDPROC
31082 ENDPROC(call_rwsem_down_read_failed)
31083@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
31084 movq %rax,%rdi
31085 call rwsem_down_write_failed
31086 restore_common_regs
31087+ pax_force_retaddr
31088 ret
31089 CFI_ENDPROC
31090 ENDPROC(call_rwsem_down_write_failed)
31091@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
31092 movq %rax,%rdi
31093 call rwsem_wake
31094 restore_common_regs
31095-1: ret
31096+1: pax_force_retaddr
31097+ ret
31098 CFI_ENDPROC
31099 ENDPROC(call_rwsem_wake)
31100
31101@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
31102 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31103 CFI_RESTORE __ASM_REG(dx)
31104 restore_common_regs
31105+ pax_force_retaddr
31106 ret
31107 CFI_ENDPROC
31108 ENDPROC(call_rwsem_downgrade_wake)
31109diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
31110index b30b5eb..2b57052 100644
31111--- a/arch/x86/lib/thunk_64.S
31112+++ b/arch/x86/lib/thunk_64.S
31113@@ -9,6 +9,7 @@
31114 #include <asm/dwarf2.h>
31115 #include <asm/calling.h>
31116 #include <asm/asm.h>
31117+#include <asm/alternative-asm.h>
31118
31119 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
31120 .macro THUNK name, func, put_ret_addr_in_rdi=0
31121@@ -16,11 +17,11 @@
31122 \name:
31123 CFI_STARTPROC
31124
31125- /* this one pushes 9 elems, the next one would be %rIP */
31126- SAVE_ARGS
31127+ /* this one pushes 15+1 elems, the next one would be %rIP */
31128+ SAVE_ARGS 8
31129
31130 .if \put_ret_addr_in_rdi
31131- movq_cfi_restore 9*8, rdi
31132+ movq_cfi_restore RIP, rdi
31133 .endif
31134
31135 call \func
31136@@ -47,9 +48,10 @@
31137
31138 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
31139 CFI_STARTPROC
31140- SAVE_ARGS
31141+ SAVE_ARGS 8
31142 restore:
31143- RESTORE_ARGS
31144+ RESTORE_ARGS 1,8
31145+ pax_force_retaddr
31146 ret
31147 CFI_ENDPROC
31148 _ASM_NOKPROBE(restore)
31149diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31150index e2f5e21..4b22130 100644
31151--- a/arch/x86/lib/usercopy_32.c
31152+++ b/arch/x86/lib/usercopy_32.c
31153@@ -42,11 +42,13 @@ do { \
31154 int __d0; \
31155 might_fault(); \
31156 __asm__ __volatile__( \
31157+ __COPYUSER_SET_ES \
31158 ASM_STAC "\n" \
31159 "0: rep; stosl\n" \
31160 " movl %2,%0\n" \
31161 "1: rep; stosb\n" \
31162 "2: " ASM_CLAC "\n" \
31163+ __COPYUSER_RESTORE_ES \
31164 ".section .fixup,\"ax\"\n" \
31165 "3: lea 0(%2,%0,4),%0\n" \
31166 " jmp 2b\n" \
31167@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31168
31169 #ifdef CONFIG_X86_INTEL_USERCOPY
31170 static unsigned long
31171-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31172+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31173 {
31174 int d0, d1;
31175 __asm__ __volatile__(
31176@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31177 " .align 2,0x90\n"
31178 "3: movl 0(%4), %%eax\n"
31179 "4: movl 4(%4), %%edx\n"
31180- "5: movl %%eax, 0(%3)\n"
31181- "6: movl %%edx, 4(%3)\n"
31182+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31183+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31184 "7: movl 8(%4), %%eax\n"
31185 "8: movl 12(%4),%%edx\n"
31186- "9: movl %%eax, 8(%3)\n"
31187- "10: movl %%edx, 12(%3)\n"
31188+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31189+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31190 "11: movl 16(%4), %%eax\n"
31191 "12: movl 20(%4), %%edx\n"
31192- "13: movl %%eax, 16(%3)\n"
31193- "14: movl %%edx, 20(%3)\n"
31194+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31195+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31196 "15: movl 24(%4), %%eax\n"
31197 "16: movl 28(%4), %%edx\n"
31198- "17: movl %%eax, 24(%3)\n"
31199- "18: movl %%edx, 28(%3)\n"
31200+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31201+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31202 "19: movl 32(%4), %%eax\n"
31203 "20: movl 36(%4), %%edx\n"
31204- "21: movl %%eax, 32(%3)\n"
31205- "22: movl %%edx, 36(%3)\n"
31206+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31207+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31208 "23: movl 40(%4), %%eax\n"
31209 "24: movl 44(%4), %%edx\n"
31210- "25: movl %%eax, 40(%3)\n"
31211- "26: movl %%edx, 44(%3)\n"
31212+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31213+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31214 "27: movl 48(%4), %%eax\n"
31215 "28: movl 52(%4), %%edx\n"
31216- "29: movl %%eax, 48(%3)\n"
31217- "30: movl %%edx, 52(%3)\n"
31218+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31219+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31220 "31: movl 56(%4), %%eax\n"
31221 "32: movl 60(%4), %%edx\n"
31222- "33: movl %%eax, 56(%3)\n"
31223- "34: movl %%edx, 60(%3)\n"
31224+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31225+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31226 " addl $-64, %0\n"
31227 " addl $64, %4\n"
31228 " addl $64, %3\n"
31229@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31230 " shrl $2, %0\n"
31231 " andl $3, %%eax\n"
31232 " cld\n"
31233+ __COPYUSER_SET_ES
31234 "99: rep; movsl\n"
31235 "36: movl %%eax, %0\n"
31236 "37: rep; movsb\n"
31237 "100:\n"
31238+ __COPYUSER_RESTORE_ES
31239+ ".section .fixup,\"ax\"\n"
31240+ "101: lea 0(%%eax,%0,4),%0\n"
31241+ " jmp 100b\n"
31242+ ".previous\n"
31243+ _ASM_EXTABLE(1b,100b)
31244+ _ASM_EXTABLE(2b,100b)
31245+ _ASM_EXTABLE(3b,100b)
31246+ _ASM_EXTABLE(4b,100b)
31247+ _ASM_EXTABLE(5b,100b)
31248+ _ASM_EXTABLE(6b,100b)
31249+ _ASM_EXTABLE(7b,100b)
31250+ _ASM_EXTABLE(8b,100b)
31251+ _ASM_EXTABLE(9b,100b)
31252+ _ASM_EXTABLE(10b,100b)
31253+ _ASM_EXTABLE(11b,100b)
31254+ _ASM_EXTABLE(12b,100b)
31255+ _ASM_EXTABLE(13b,100b)
31256+ _ASM_EXTABLE(14b,100b)
31257+ _ASM_EXTABLE(15b,100b)
31258+ _ASM_EXTABLE(16b,100b)
31259+ _ASM_EXTABLE(17b,100b)
31260+ _ASM_EXTABLE(18b,100b)
31261+ _ASM_EXTABLE(19b,100b)
31262+ _ASM_EXTABLE(20b,100b)
31263+ _ASM_EXTABLE(21b,100b)
31264+ _ASM_EXTABLE(22b,100b)
31265+ _ASM_EXTABLE(23b,100b)
31266+ _ASM_EXTABLE(24b,100b)
31267+ _ASM_EXTABLE(25b,100b)
31268+ _ASM_EXTABLE(26b,100b)
31269+ _ASM_EXTABLE(27b,100b)
31270+ _ASM_EXTABLE(28b,100b)
31271+ _ASM_EXTABLE(29b,100b)
31272+ _ASM_EXTABLE(30b,100b)
31273+ _ASM_EXTABLE(31b,100b)
31274+ _ASM_EXTABLE(32b,100b)
31275+ _ASM_EXTABLE(33b,100b)
31276+ _ASM_EXTABLE(34b,100b)
31277+ _ASM_EXTABLE(35b,100b)
31278+ _ASM_EXTABLE(36b,100b)
31279+ _ASM_EXTABLE(37b,100b)
31280+ _ASM_EXTABLE(99b,101b)
31281+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31282+ : "1"(to), "2"(from), "0"(size)
31283+ : "eax", "edx", "memory");
31284+ return size;
31285+}
31286+
31287+static unsigned long
31288+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31289+{
31290+ int d0, d1;
31291+ __asm__ __volatile__(
31292+ " .align 2,0x90\n"
31293+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31294+ " cmpl $67, %0\n"
31295+ " jbe 3f\n"
31296+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31297+ " .align 2,0x90\n"
31298+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31299+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31300+ "5: movl %%eax, 0(%3)\n"
31301+ "6: movl %%edx, 4(%3)\n"
31302+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31303+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31304+ "9: movl %%eax, 8(%3)\n"
31305+ "10: movl %%edx, 12(%3)\n"
31306+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31307+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31308+ "13: movl %%eax, 16(%3)\n"
31309+ "14: movl %%edx, 20(%3)\n"
31310+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31311+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31312+ "17: movl %%eax, 24(%3)\n"
31313+ "18: movl %%edx, 28(%3)\n"
31314+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31315+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31316+ "21: movl %%eax, 32(%3)\n"
31317+ "22: movl %%edx, 36(%3)\n"
31318+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31319+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31320+ "25: movl %%eax, 40(%3)\n"
31321+ "26: movl %%edx, 44(%3)\n"
31322+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31323+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31324+ "29: movl %%eax, 48(%3)\n"
31325+ "30: movl %%edx, 52(%3)\n"
31326+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31327+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31328+ "33: movl %%eax, 56(%3)\n"
31329+ "34: movl %%edx, 60(%3)\n"
31330+ " addl $-64, %0\n"
31331+ " addl $64, %4\n"
31332+ " addl $64, %3\n"
31333+ " cmpl $63, %0\n"
31334+ " ja 1b\n"
31335+ "35: movl %0, %%eax\n"
31336+ " shrl $2, %0\n"
31337+ " andl $3, %%eax\n"
31338+ " cld\n"
31339+ "99: rep; "__copyuser_seg" movsl\n"
31340+ "36: movl %%eax, %0\n"
31341+ "37: rep; "__copyuser_seg" movsb\n"
31342+ "100:\n"
31343 ".section .fixup,\"ax\"\n"
31344 "101: lea 0(%%eax,%0,4),%0\n"
31345 " jmp 100b\n"
31346@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31347 int d0, d1;
31348 __asm__ __volatile__(
31349 " .align 2,0x90\n"
31350- "0: movl 32(%4), %%eax\n"
31351+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31352 " cmpl $67, %0\n"
31353 " jbe 2f\n"
31354- "1: movl 64(%4), %%eax\n"
31355+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31356 " .align 2,0x90\n"
31357- "2: movl 0(%4), %%eax\n"
31358- "21: movl 4(%4), %%edx\n"
31359+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31360+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31361 " movl %%eax, 0(%3)\n"
31362 " movl %%edx, 4(%3)\n"
31363- "3: movl 8(%4), %%eax\n"
31364- "31: movl 12(%4),%%edx\n"
31365+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31366+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31367 " movl %%eax, 8(%3)\n"
31368 " movl %%edx, 12(%3)\n"
31369- "4: movl 16(%4), %%eax\n"
31370- "41: movl 20(%4), %%edx\n"
31371+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31372+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31373 " movl %%eax, 16(%3)\n"
31374 " movl %%edx, 20(%3)\n"
31375- "10: movl 24(%4), %%eax\n"
31376- "51: movl 28(%4), %%edx\n"
31377+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31378+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31379 " movl %%eax, 24(%3)\n"
31380 " movl %%edx, 28(%3)\n"
31381- "11: movl 32(%4), %%eax\n"
31382- "61: movl 36(%4), %%edx\n"
31383+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31384+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31385 " movl %%eax, 32(%3)\n"
31386 " movl %%edx, 36(%3)\n"
31387- "12: movl 40(%4), %%eax\n"
31388- "71: movl 44(%4), %%edx\n"
31389+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31390+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31391 " movl %%eax, 40(%3)\n"
31392 " movl %%edx, 44(%3)\n"
31393- "13: movl 48(%4), %%eax\n"
31394- "81: movl 52(%4), %%edx\n"
31395+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31396+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31397 " movl %%eax, 48(%3)\n"
31398 " movl %%edx, 52(%3)\n"
31399- "14: movl 56(%4), %%eax\n"
31400- "91: movl 60(%4), %%edx\n"
31401+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31402+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31403 " movl %%eax, 56(%3)\n"
31404 " movl %%edx, 60(%3)\n"
31405 " addl $-64, %0\n"
31406@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31407 " shrl $2, %0\n"
31408 " andl $3, %%eax\n"
31409 " cld\n"
31410- "6: rep; movsl\n"
31411+ "6: rep; "__copyuser_seg" movsl\n"
31412 " movl %%eax,%0\n"
31413- "7: rep; movsb\n"
31414+ "7: rep; "__copyuser_seg" movsb\n"
31415 "8:\n"
31416 ".section .fixup,\"ax\"\n"
31417 "9: lea 0(%%eax,%0,4),%0\n"
31418@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31419
31420 __asm__ __volatile__(
31421 " .align 2,0x90\n"
31422- "0: movl 32(%4), %%eax\n"
31423+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31424 " cmpl $67, %0\n"
31425 " jbe 2f\n"
31426- "1: movl 64(%4), %%eax\n"
31427+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31428 " .align 2,0x90\n"
31429- "2: movl 0(%4), %%eax\n"
31430- "21: movl 4(%4), %%edx\n"
31431+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31432+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31433 " movnti %%eax, 0(%3)\n"
31434 " movnti %%edx, 4(%3)\n"
31435- "3: movl 8(%4), %%eax\n"
31436- "31: movl 12(%4),%%edx\n"
31437+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31438+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31439 " movnti %%eax, 8(%3)\n"
31440 " movnti %%edx, 12(%3)\n"
31441- "4: movl 16(%4), %%eax\n"
31442- "41: movl 20(%4), %%edx\n"
31443+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31444+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31445 " movnti %%eax, 16(%3)\n"
31446 " movnti %%edx, 20(%3)\n"
31447- "10: movl 24(%4), %%eax\n"
31448- "51: movl 28(%4), %%edx\n"
31449+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31450+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31451 " movnti %%eax, 24(%3)\n"
31452 " movnti %%edx, 28(%3)\n"
31453- "11: movl 32(%4), %%eax\n"
31454- "61: movl 36(%4), %%edx\n"
31455+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31456+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31457 " movnti %%eax, 32(%3)\n"
31458 " movnti %%edx, 36(%3)\n"
31459- "12: movl 40(%4), %%eax\n"
31460- "71: movl 44(%4), %%edx\n"
31461+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31462+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31463 " movnti %%eax, 40(%3)\n"
31464 " movnti %%edx, 44(%3)\n"
31465- "13: movl 48(%4), %%eax\n"
31466- "81: movl 52(%4), %%edx\n"
31467+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31468+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31469 " movnti %%eax, 48(%3)\n"
31470 " movnti %%edx, 52(%3)\n"
31471- "14: movl 56(%4), %%eax\n"
31472- "91: movl 60(%4), %%edx\n"
31473+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31474+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31475 " movnti %%eax, 56(%3)\n"
31476 " movnti %%edx, 60(%3)\n"
31477 " addl $-64, %0\n"
31478@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31479 " shrl $2, %0\n"
31480 " andl $3, %%eax\n"
31481 " cld\n"
31482- "6: rep; movsl\n"
31483+ "6: rep; "__copyuser_seg" movsl\n"
31484 " movl %%eax,%0\n"
31485- "7: rep; movsb\n"
31486+ "7: rep; "__copyuser_seg" movsb\n"
31487 "8:\n"
31488 ".section .fixup,\"ax\"\n"
31489 "9: lea 0(%%eax,%0,4),%0\n"
31490@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31491
31492 __asm__ __volatile__(
31493 " .align 2,0x90\n"
31494- "0: movl 32(%4), %%eax\n"
31495+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31496 " cmpl $67, %0\n"
31497 " jbe 2f\n"
31498- "1: movl 64(%4), %%eax\n"
31499+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31500 " .align 2,0x90\n"
31501- "2: movl 0(%4), %%eax\n"
31502- "21: movl 4(%4), %%edx\n"
31503+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31504+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31505 " movnti %%eax, 0(%3)\n"
31506 " movnti %%edx, 4(%3)\n"
31507- "3: movl 8(%4), %%eax\n"
31508- "31: movl 12(%4),%%edx\n"
31509+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31510+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31511 " movnti %%eax, 8(%3)\n"
31512 " movnti %%edx, 12(%3)\n"
31513- "4: movl 16(%4), %%eax\n"
31514- "41: movl 20(%4), %%edx\n"
31515+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31516+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31517 " movnti %%eax, 16(%3)\n"
31518 " movnti %%edx, 20(%3)\n"
31519- "10: movl 24(%4), %%eax\n"
31520- "51: movl 28(%4), %%edx\n"
31521+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31522+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31523 " movnti %%eax, 24(%3)\n"
31524 " movnti %%edx, 28(%3)\n"
31525- "11: movl 32(%4), %%eax\n"
31526- "61: movl 36(%4), %%edx\n"
31527+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31528+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31529 " movnti %%eax, 32(%3)\n"
31530 " movnti %%edx, 36(%3)\n"
31531- "12: movl 40(%4), %%eax\n"
31532- "71: movl 44(%4), %%edx\n"
31533+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31534+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31535 " movnti %%eax, 40(%3)\n"
31536 " movnti %%edx, 44(%3)\n"
31537- "13: movl 48(%4), %%eax\n"
31538- "81: movl 52(%4), %%edx\n"
31539+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31540+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31541 " movnti %%eax, 48(%3)\n"
31542 " movnti %%edx, 52(%3)\n"
31543- "14: movl 56(%4), %%eax\n"
31544- "91: movl 60(%4), %%edx\n"
31545+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31546+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31547 " movnti %%eax, 56(%3)\n"
31548 " movnti %%edx, 60(%3)\n"
31549 " addl $-64, %0\n"
31550@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31551 " shrl $2, %0\n"
31552 " andl $3, %%eax\n"
31553 " cld\n"
31554- "6: rep; movsl\n"
31555+ "6: rep; "__copyuser_seg" movsl\n"
31556 " movl %%eax,%0\n"
31557- "7: rep; movsb\n"
31558+ "7: rep; "__copyuser_seg" movsb\n"
31559 "8:\n"
31560 ".section .fixup,\"ax\"\n"
31561 "9: lea 0(%%eax,%0,4),%0\n"
31562@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31563 */
31564 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31565 unsigned long size);
31566-unsigned long __copy_user_intel(void __user *to, const void *from,
31567+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31568+ unsigned long size);
31569+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31570 unsigned long size);
31571 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31572 const void __user *from, unsigned long size);
31573 #endif /* CONFIG_X86_INTEL_USERCOPY */
31574
31575 /* Generic arbitrary sized copy. */
31576-#define __copy_user(to, from, size) \
31577+#define __copy_user(to, from, size, prefix, set, restore) \
31578 do { \
31579 int __d0, __d1, __d2; \
31580 __asm__ __volatile__( \
31581+ set \
31582 " cmp $7,%0\n" \
31583 " jbe 1f\n" \
31584 " movl %1,%0\n" \
31585 " negl %0\n" \
31586 " andl $7,%0\n" \
31587 " subl %0,%3\n" \
31588- "4: rep; movsb\n" \
31589+ "4: rep; "prefix"movsb\n" \
31590 " movl %3,%0\n" \
31591 " shrl $2,%0\n" \
31592 " andl $3,%3\n" \
31593 " .align 2,0x90\n" \
31594- "0: rep; movsl\n" \
31595+ "0: rep; "prefix"movsl\n" \
31596 " movl %3,%0\n" \
31597- "1: rep; movsb\n" \
31598+ "1: rep; "prefix"movsb\n" \
31599 "2:\n" \
31600+ restore \
31601 ".section .fixup,\"ax\"\n" \
31602 "5: addl %3,%0\n" \
31603 " jmp 2b\n" \
31604@@ -538,14 +650,14 @@ do { \
31605 " negl %0\n" \
31606 " andl $7,%0\n" \
31607 " subl %0,%3\n" \
31608- "4: rep; movsb\n" \
31609+ "4: rep; "__copyuser_seg"movsb\n" \
31610 " movl %3,%0\n" \
31611 " shrl $2,%0\n" \
31612 " andl $3,%3\n" \
31613 " .align 2,0x90\n" \
31614- "0: rep; movsl\n" \
31615+ "0: rep; "__copyuser_seg"movsl\n" \
31616 " movl %3,%0\n" \
31617- "1: rep; movsb\n" \
31618+ "1: rep; "__copyuser_seg"movsb\n" \
31619 "2:\n" \
31620 ".section .fixup,\"ax\"\n" \
31621 "5: addl %3,%0\n" \
31622@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31623 {
31624 stac();
31625 if (movsl_is_ok(to, from, n))
31626- __copy_user(to, from, n);
31627+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31628 else
31629- n = __copy_user_intel(to, from, n);
31630+ n = __generic_copy_to_user_intel(to, from, n);
31631 clac();
31632 return n;
31633 }
31634@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31635 {
31636 stac();
31637 if (movsl_is_ok(to, from, n))
31638- __copy_user(to, from, n);
31639+ __copy_user(to, from, n, __copyuser_seg, "", "");
31640 else
31641- n = __copy_user_intel((void __user *)to,
31642- (const void *)from, n);
31643+ n = __generic_copy_from_user_intel(to, from, n);
31644 clac();
31645 return n;
31646 }
31647@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31648 if (n > 64 && cpu_has_xmm2)
31649 n = __copy_user_intel_nocache(to, from, n);
31650 else
31651- __copy_user(to, from, n);
31652+ __copy_user(to, from, n, __copyuser_seg, "", "");
31653 #else
31654- __copy_user(to, from, n);
31655+ __copy_user(to, from, n, __copyuser_seg, "", "");
31656 #endif
31657 clac();
31658 return n;
31659 }
31660 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31661
31662-/**
31663- * copy_to_user: - Copy a block of data into user space.
31664- * @to: Destination address, in user space.
31665- * @from: Source address, in kernel space.
31666- * @n: Number of bytes to copy.
31667- *
31668- * Context: User context only. This function may sleep.
31669- *
31670- * Copy data from kernel space to user space.
31671- *
31672- * Returns number of bytes that could not be copied.
31673- * On success, this will be zero.
31674- */
31675-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31676+#ifdef CONFIG_PAX_MEMORY_UDEREF
31677+void __set_fs(mm_segment_t x)
31678 {
31679- if (access_ok(VERIFY_WRITE, to, n))
31680- n = __copy_to_user(to, from, n);
31681- return n;
31682+ switch (x.seg) {
31683+ case 0:
31684+ loadsegment(gs, 0);
31685+ break;
31686+ case TASK_SIZE_MAX:
31687+ loadsegment(gs, __USER_DS);
31688+ break;
31689+ case -1UL:
31690+ loadsegment(gs, __KERNEL_DS);
31691+ break;
31692+ default:
31693+ BUG();
31694+ }
31695 }
31696-EXPORT_SYMBOL(_copy_to_user);
31697+EXPORT_SYMBOL(__set_fs);
31698
31699-/**
31700- * copy_from_user: - Copy a block of data from user space.
31701- * @to: Destination address, in kernel space.
31702- * @from: Source address, in user space.
31703- * @n: Number of bytes to copy.
31704- *
31705- * Context: User context only. This function may sleep.
31706- *
31707- * Copy data from user space to kernel space.
31708- *
31709- * Returns number of bytes that could not be copied.
31710- * On success, this will be zero.
31711- *
31712- * If some data could not be copied, this function will pad the copied
31713- * data to the requested size using zero bytes.
31714- */
31715-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31716+void set_fs(mm_segment_t x)
31717 {
31718- if (access_ok(VERIFY_READ, from, n))
31719- n = __copy_from_user(to, from, n);
31720- else
31721- memset(to, 0, n);
31722- return n;
31723+ current_thread_info()->addr_limit = x;
31724+ __set_fs(x);
31725 }
31726-EXPORT_SYMBOL(_copy_from_user);
31727+EXPORT_SYMBOL(set_fs);
31728+#endif
31729diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31730index 0a42327..7a82465 100644
31731--- a/arch/x86/lib/usercopy_64.c
31732+++ b/arch/x86/lib/usercopy_64.c
31733@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31734 might_fault();
31735 /* no memory constraint because it doesn't change any memory gcc knows
31736 about */
31737+ pax_open_userland();
31738 stac();
31739 asm volatile(
31740 " testq %[size8],%[size8]\n"
31741@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31742 _ASM_EXTABLE(0b,3b)
31743 _ASM_EXTABLE(1b,2b)
31744 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31745- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31746+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31747 [zero] "r" (0UL), [eight] "r" (8UL));
31748 clac();
31749+ pax_close_userland();
31750 return size;
31751 }
31752 EXPORT_SYMBOL(__clear_user);
31753@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31754 }
31755 EXPORT_SYMBOL(clear_user);
31756
31757-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31758+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31759 {
31760- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31761- return copy_user_generic((__force void *)to, (__force void *)from, len);
31762- }
31763- return len;
31764+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31765+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31766+ return len;
31767 }
31768 EXPORT_SYMBOL(copy_in_user);
31769
31770@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
31771 * it is not necessary to optimize tail handling.
31772 */
31773 __visible unsigned long
31774-copy_user_handle_tail(char *to, char *from, unsigned len)
31775+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
31776 {
31777+ clac();
31778+ pax_close_userland();
31779 for (; len; --len, to++) {
31780 char c;
31781
31782@@ -79,10 +82,9 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
31783 if (__put_user_nocheck(c, to, sizeof(char)))
31784 break;
31785 }
31786- clac();
31787
31788 /* If the destination is a kernel buffer, we always clear the end */
31789- if (!__addr_ok(to))
31790+ if (!__addr_ok(to) && (unsigned long)to >= TASK_SIZE_MAX + pax_user_shadow_base)
31791 memset(to, 0, len);
31792 return len;
31793 }
31794diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31795index c4cc740..60a7362 100644
31796--- a/arch/x86/mm/Makefile
31797+++ b/arch/x86/mm/Makefile
31798@@ -35,3 +35,7 @@ obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31799 obj-$(CONFIG_MEMTEST) += memtest.o
31800
31801 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
31802+
31803+quote:="
31804+obj-$(CONFIG_X86_64) += uderef_64.o
31805+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31806diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31807index 903ec1e..c4166b2 100644
31808--- a/arch/x86/mm/extable.c
31809+++ b/arch/x86/mm/extable.c
31810@@ -6,12 +6,24 @@
31811 static inline unsigned long
31812 ex_insn_addr(const struct exception_table_entry *x)
31813 {
31814- return (unsigned long)&x->insn + x->insn;
31815+ unsigned long reloc = 0;
31816+
31817+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31818+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31819+#endif
31820+
31821+ return (unsigned long)&x->insn + x->insn + reloc;
31822 }
31823 static inline unsigned long
31824 ex_fixup_addr(const struct exception_table_entry *x)
31825 {
31826- return (unsigned long)&x->fixup + x->fixup;
31827+ unsigned long reloc = 0;
31828+
31829+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31830+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31831+#endif
31832+
31833+ return (unsigned long)&x->fixup + x->fixup + reloc;
31834 }
31835
31836 int fixup_exception(struct pt_regs *regs)
31837@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31838 unsigned long new_ip;
31839
31840 #ifdef CONFIG_PNPBIOS
31841- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31842+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31843 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31844 extern u32 pnp_bios_is_utter_crap;
31845 pnp_bios_is_utter_crap = 1;
31846@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31847 i += 4;
31848 p->fixup -= i;
31849 i += 4;
31850+
31851+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31852+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31853+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31854+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31855+#endif
31856+
31857 }
31858 }
31859
31860diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31861index ede025f..ecc2d96 100644
31862--- a/arch/x86/mm/fault.c
31863+++ b/arch/x86/mm/fault.c
31864@@ -13,12 +13,19 @@
31865 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31866 #include <linux/prefetch.h> /* prefetchw */
31867 #include <linux/context_tracking.h> /* exception_enter(), ... */
31868+#include <linux/unistd.h>
31869+#include <linux/compiler.h>
31870
31871 #include <asm/traps.h> /* dotraplinkage, ... */
31872 #include <asm/pgalloc.h> /* pgd_*(), ... */
31873 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31874 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31875 #include <asm/vsyscall.h> /* emulate_vsyscall */
31876+#include <asm/tlbflush.h>
31877+
31878+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31879+#include <asm/stacktrace.h>
31880+#endif
31881
31882 #define CREATE_TRACE_POINTS
31883 #include <asm/trace/exceptions.h>
31884@@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31885 int ret = 0;
31886
31887 /* kprobe_running() needs smp_processor_id() */
31888- if (kprobes_built_in() && !user_mode_vm(regs)) {
31889+ if (kprobes_built_in() && !user_mode(regs)) {
31890 preempt_disable();
31891 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31892 ret = 1;
31893@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31894 return !instr_lo || (instr_lo>>1) == 1;
31895 case 0x00:
31896 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31897- if (probe_kernel_address(instr, opcode))
31898+ if (user_mode(regs)) {
31899+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31900+ return 0;
31901+ } else if (probe_kernel_address(instr, opcode))
31902 return 0;
31903
31904 *prefetch = (instr_lo == 0xF) &&
31905@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31906 while (instr < max_instr) {
31907 unsigned char opcode;
31908
31909- if (probe_kernel_address(instr, opcode))
31910+ if (user_mode(regs)) {
31911+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31912+ break;
31913+ } else if (probe_kernel_address(instr, opcode))
31914 break;
31915
31916 instr++;
31917@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31918 force_sig_info(si_signo, &info, tsk);
31919 }
31920
31921+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31922+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31923+#endif
31924+
31925+#ifdef CONFIG_PAX_EMUTRAMP
31926+static int pax_handle_fetch_fault(struct pt_regs *regs);
31927+#endif
31928+
31929+#ifdef CONFIG_PAX_PAGEEXEC
31930+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31931+{
31932+ pgd_t *pgd;
31933+ pud_t *pud;
31934+ pmd_t *pmd;
31935+
31936+ pgd = pgd_offset(mm, address);
31937+ if (!pgd_present(*pgd))
31938+ return NULL;
31939+ pud = pud_offset(pgd, address);
31940+ if (!pud_present(*pud))
31941+ return NULL;
31942+ pmd = pmd_offset(pud, address);
31943+ if (!pmd_present(*pmd))
31944+ return NULL;
31945+ return pmd;
31946+}
31947+#endif
31948+
31949 DEFINE_SPINLOCK(pgd_lock);
31950 LIST_HEAD(pgd_list);
31951
31952@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31953 for (address = VMALLOC_START & PMD_MASK;
31954 address >= TASK_SIZE && address < FIXADDR_TOP;
31955 address += PMD_SIZE) {
31956+
31957+#ifdef CONFIG_PAX_PER_CPU_PGD
31958+ unsigned long cpu;
31959+#else
31960 struct page *page;
31961+#endif
31962
31963 spin_lock(&pgd_lock);
31964+
31965+#ifdef CONFIG_PAX_PER_CPU_PGD
31966+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31967+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31968+ pmd_t *ret;
31969+
31970+ ret = vmalloc_sync_one(pgd, address);
31971+ if (!ret)
31972+ break;
31973+ pgd = get_cpu_pgd(cpu, kernel);
31974+#else
31975 list_for_each_entry(page, &pgd_list, lru) {
31976+ pgd_t *pgd;
31977 spinlock_t *pgt_lock;
31978 pmd_t *ret;
31979
31980@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31981 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31982
31983 spin_lock(pgt_lock);
31984- ret = vmalloc_sync_one(page_address(page), address);
31985+ pgd = page_address(page);
31986+#endif
31987+
31988+ ret = vmalloc_sync_one(pgd, address);
31989+
31990+#ifndef CONFIG_PAX_PER_CPU_PGD
31991 spin_unlock(pgt_lock);
31992+#endif
31993
31994 if (!ret)
31995 break;
31996@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31997 * an interrupt in the middle of a task switch..
31998 */
31999 pgd_paddr = read_cr3();
32000+
32001+#ifdef CONFIG_PAX_PER_CPU_PGD
32002+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
32003+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
32004+#endif
32005+
32006 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
32007 if (!pmd_k)
32008 return -1;
32009@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
32010 * happen within a race in page table update. In the later
32011 * case just flush:
32012 */
32013- pgd = pgd_offset(current->active_mm, address);
32014+
32015 pgd_ref = pgd_offset_k(address);
32016 if (pgd_none(*pgd_ref))
32017 return -1;
32018
32019+#ifdef CONFIG_PAX_PER_CPU_PGD
32020+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
32021+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
32022+ if (pgd_none(*pgd)) {
32023+ set_pgd(pgd, *pgd_ref);
32024+ arch_flush_lazy_mmu_mode();
32025+ } else {
32026+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
32027+ }
32028+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
32029+#else
32030+ pgd = pgd_offset(current->active_mm, address);
32031+#endif
32032+
32033 if (pgd_none(*pgd)) {
32034 set_pgd(pgd, *pgd_ref);
32035 arch_flush_lazy_mmu_mode();
32036@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
32037 static int is_errata100(struct pt_regs *regs, unsigned long address)
32038 {
32039 #ifdef CONFIG_X86_64
32040- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
32041+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
32042 return 1;
32043 #endif
32044 return 0;
32045@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
32046 }
32047
32048 static const char nx_warning[] = KERN_CRIT
32049-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
32050+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
32051 static const char smep_warning[] = KERN_CRIT
32052-"unable to execute userspace code (SMEP?) (uid: %d)\n";
32053+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
32054
32055 static void
32056 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32057@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32058 if (!oops_may_print())
32059 return;
32060
32061- if (error_code & PF_INSTR) {
32062+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
32063 unsigned int level;
32064 pgd_t *pgd;
32065 pte_t *pte;
32066@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32067 pte = lookup_address_in_pgd(pgd, address, &level);
32068
32069 if (pte && pte_present(*pte) && !pte_exec(*pte))
32070- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
32071+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32072 if (pte && pte_present(*pte) && pte_exec(*pte) &&
32073 (pgd_flags(*pgd) & _PAGE_USER) &&
32074 (__read_cr4() & X86_CR4_SMEP))
32075- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
32076+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32077 }
32078
32079+#ifdef CONFIG_PAX_KERNEXEC
32080+ if (init_mm.start_code <= address && address < init_mm.end_code) {
32081+ if (current->signal->curr_ip)
32082+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
32083+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
32084+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32085+ else
32086+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
32087+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32088+ }
32089+#endif
32090+
32091 printk(KERN_ALERT "BUG: unable to handle kernel ");
32092 if (address < PAGE_SIZE)
32093 printk(KERN_CONT "NULL pointer dereference");
32094@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
32095 return;
32096 }
32097 #endif
32098+
32099+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32100+ if (pax_is_fetch_fault(regs, error_code, address)) {
32101+
32102+#ifdef CONFIG_PAX_EMUTRAMP
32103+ switch (pax_handle_fetch_fault(regs)) {
32104+ case 2:
32105+ return;
32106+ }
32107+#endif
32108+
32109+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32110+ do_group_exit(SIGKILL);
32111+ }
32112+#endif
32113+
32114 /* Kernel addresses are always protection faults: */
32115 if (address >= TASK_SIZE)
32116 error_code |= PF_PROT;
32117@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
32118 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
32119 printk(KERN_ERR
32120 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
32121- tsk->comm, tsk->pid, address);
32122+ tsk->comm, task_pid_nr(tsk), address);
32123 code = BUS_MCEERR_AR;
32124 }
32125 #endif
32126@@ -916,6 +1028,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
32127 return 1;
32128 }
32129
32130+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32131+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32132+{
32133+ pte_t *pte;
32134+ pmd_t *pmd;
32135+ spinlock_t *ptl;
32136+ unsigned char pte_mask;
32137+
32138+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32139+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
32140+ return 0;
32141+
32142+ /* PaX: it's our fault, let's handle it if we can */
32143+
32144+ /* PaX: take a look at read faults before acquiring any locks */
32145+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32146+ /* instruction fetch attempt from a protected page in user mode */
32147+ up_read(&mm->mmap_sem);
32148+
32149+#ifdef CONFIG_PAX_EMUTRAMP
32150+ switch (pax_handle_fetch_fault(regs)) {
32151+ case 2:
32152+ return 1;
32153+ }
32154+#endif
32155+
32156+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32157+ do_group_exit(SIGKILL);
32158+ }
32159+
32160+ pmd = pax_get_pmd(mm, address);
32161+ if (unlikely(!pmd))
32162+ return 0;
32163+
32164+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32165+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32166+ pte_unmap_unlock(pte, ptl);
32167+ return 0;
32168+ }
32169+
32170+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32171+ /* write attempt to a protected page in user mode */
32172+ pte_unmap_unlock(pte, ptl);
32173+ return 0;
32174+ }
32175+
32176+#ifdef CONFIG_SMP
32177+ if (likely(address > get_limit(regs->cs) && cpumask_test_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask)))
32178+#else
32179+ if (likely(address > get_limit(regs->cs)))
32180+#endif
32181+ {
32182+ set_pte(pte, pte_mkread(*pte));
32183+ __flush_tlb_one(address);
32184+ pte_unmap_unlock(pte, ptl);
32185+ up_read(&mm->mmap_sem);
32186+ return 1;
32187+ }
32188+
32189+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32190+
32191+ /*
32192+ * PaX: fill DTLB with user rights and retry
32193+ */
32194+ __asm__ __volatile__ (
32195+ "orb %2,(%1)\n"
32196+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32197+/*
32198+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32199+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32200+ * page fault when examined during a TLB load attempt. this is true not only
32201+ * for PTEs holding a non-present entry but also present entries that will
32202+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32203+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32204+ * for our target pages since their PTEs are simply not in the TLBs at all.
32205+
32206+ * the best thing in omitting it is that we gain around 15-20% speed in the
32207+ * fast path of the page fault handler and can get rid of tracing since we
32208+ * can no longer flush unintended entries.
32209+ */
32210+ "invlpg (%0)\n"
32211+#endif
32212+ __copyuser_seg"testb $0,(%0)\n"
32213+ "xorb %3,(%1)\n"
32214+ :
32215+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32216+ : "memory", "cc");
32217+ pte_unmap_unlock(pte, ptl);
32218+ up_read(&mm->mmap_sem);
32219+ return 1;
32220+}
32221+#endif
32222+
32223 /*
32224 * Handle a spurious fault caused by a stale TLB entry.
32225 *
32226@@ -1001,6 +1206,9 @@ int show_unhandled_signals = 1;
32227 static inline int
32228 access_error(unsigned long error_code, struct vm_area_struct *vma)
32229 {
32230+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32231+ return 1;
32232+
32233 if (error_code & PF_WRITE) {
32234 /* write, present and write, not present: */
32235 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32236@@ -1035,7 +1243,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32237 if (error_code & PF_USER)
32238 return false;
32239
32240- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32241+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32242 return false;
32243
32244 return true;
32245@@ -1063,6 +1271,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32246 tsk = current;
32247 mm = tsk->mm;
32248
32249+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32250+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32251+ if (!search_exception_tables(regs->ip)) {
32252+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32253+ bad_area_nosemaphore(regs, error_code, address);
32254+ return;
32255+ }
32256+ if (address < pax_user_shadow_base) {
32257+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32258+ printk(KERN_EMERG "PAX: faulting IP: %pS\n", (void *)regs->ip);
32259+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_EMERG);
32260+ } else
32261+ address -= pax_user_shadow_base;
32262+ }
32263+#endif
32264+
32265 /*
32266 * Detect and handle instructions that would cause a page fault for
32267 * both a tracked kernel page and a userspace page.
32268@@ -1140,7 +1364,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32269 * User-mode registers count as a user access even for any
32270 * potential system fault or CPU buglet:
32271 */
32272- if (user_mode_vm(regs)) {
32273+ if (user_mode(regs)) {
32274 local_irq_enable();
32275 error_code |= PF_USER;
32276 flags |= FAULT_FLAG_USER;
32277@@ -1187,6 +1411,11 @@ retry:
32278 might_sleep();
32279 }
32280
32281+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32282+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32283+ return;
32284+#endif
32285+
32286 vma = find_vma(mm, address);
32287 if (unlikely(!vma)) {
32288 bad_area(regs, error_code, address);
32289@@ -1198,18 +1427,24 @@ retry:
32290 bad_area(regs, error_code, address);
32291 return;
32292 }
32293- if (error_code & PF_USER) {
32294- /*
32295- * Accessing the stack below %sp is always a bug.
32296- * The large cushion allows instructions like enter
32297- * and pusha to work. ("enter $65535, $31" pushes
32298- * 32 pointers and then decrements %sp by 65535.)
32299- */
32300- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32301- bad_area(regs, error_code, address);
32302- return;
32303- }
32304+ /*
32305+ * Accessing the stack below %sp is always a bug.
32306+ * The large cushion allows instructions like enter
32307+ * and pusha to work. ("enter $65535, $31" pushes
32308+ * 32 pointers and then decrements %sp by 65535.)
32309+ */
32310+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32311+ bad_area(regs, error_code, address);
32312+ return;
32313 }
32314+
32315+#ifdef CONFIG_PAX_SEGMEXEC
32316+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32317+ bad_area(regs, error_code, address);
32318+ return;
32319+ }
32320+#endif
32321+
32322 if (unlikely(expand_stack(vma, address))) {
32323 bad_area(regs, error_code, address);
32324 return;
32325@@ -1329,3 +1564,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32326 }
32327 NOKPROBE_SYMBOL(trace_do_page_fault);
32328 #endif /* CONFIG_TRACING */
32329+
32330+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32331+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32332+{
32333+ struct mm_struct *mm = current->mm;
32334+ unsigned long ip = regs->ip;
32335+
32336+ if (v8086_mode(regs))
32337+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32338+
32339+#ifdef CONFIG_PAX_PAGEEXEC
32340+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32341+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32342+ return true;
32343+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32344+ return true;
32345+ return false;
32346+ }
32347+#endif
32348+
32349+#ifdef CONFIG_PAX_SEGMEXEC
32350+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32351+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32352+ return true;
32353+ return false;
32354+ }
32355+#endif
32356+
32357+ return false;
32358+}
32359+#endif
32360+
32361+#ifdef CONFIG_PAX_EMUTRAMP
32362+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32363+{
32364+ int err;
32365+
32366+ do { /* PaX: libffi trampoline emulation */
32367+ unsigned char mov, jmp;
32368+ unsigned int addr1, addr2;
32369+
32370+#ifdef CONFIG_X86_64
32371+ if ((regs->ip + 9) >> 32)
32372+ break;
32373+#endif
32374+
32375+ err = get_user(mov, (unsigned char __user *)regs->ip);
32376+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32377+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32378+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32379+
32380+ if (err)
32381+ break;
32382+
32383+ if (mov == 0xB8 && jmp == 0xE9) {
32384+ regs->ax = addr1;
32385+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32386+ return 2;
32387+ }
32388+ } while (0);
32389+
32390+ do { /* PaX: gcc trampoline emulation #1 */
32391+ unsigned char mov1, mov2;
32392+ unsigned short jmp;
32393+ unsigned int addr1, addr2;
32394+
32395+#ifdef CONFIG_X86_64
32396+ if ((regs->ip + 11) >> 32)
32397+ break;
32398+#endif
32399+
32400+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32401+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32402+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32403+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32404+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32405+
32406+ if (err)
32407+ break;
32408+
32409+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32410+ regs->cx = addr1;
32411+ regs->ax = addr2;
32412+ regs->ip = addr2;
32413+ return 2;
32414+ }
32415+ } while (0);
32416+
32417+ do { /* PaX: gcc trampoline emulation #2 */
32418+ unsigned char mov, jmp;
32419+ unsigned int addr1, addr2;
32420+
32421+#ifdef CONFIG_X86_64
32422+ if ((regs->ip + 9) >> 32)
32423+ break;
32424+#endif
32425+
32426+ err = get_user(mov, (unsigned char __user *)regs->ip);
32427+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32428+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32429+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32430+
32431+ if (err)
32432+ break;
32433+
32434+ if (mov == 0xB9 && jmp == 0xE9) {
32435+ regs->cx = addr1;
32436+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32437+ return 2;
32438+ }
32439+ } while (0);
32440+
32441+ return 1; /* PaX in action */
32442+}
32443+
32444+#ifdef CONFIG_X86_64
32445+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32446+{
32447+ int err;
32448+
32449+ do { /* PaX: libffi trampoline emulation */
32450+ unsigned short mov1, mov2, jmp1;
32451+ unsigned char stcclc, jmp2;
32452+ unsigned long addr1, addr2;
32453+
32454+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32455+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32456+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32457+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32458+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32459+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32460+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32461+
32462+ if (err)
32463+ break;
32464+
32465+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32466+ regs->r11 = addr1;
32467+ regs->r10 = addr2;
32468+ if (stcclc == 0xF8)
32469+ regs->flags &= ~X86_EFLAGS_CF;
32470+ else
32471+ regs->flags |= X86_EFLAGS_CF;
32472+ regs->ip = addr1;
32473+ return 2;
32474+ }
32475+ } while (0);
32476+
32477+ do { /* PaX: gcc trampoline emulation #1 */
32478+ unsigned short mov1, mov2, jmp1;
32479+ unsigned char jmp2;
32480+ unsigned int addr1;
32481+ unsigned long addr2;
32482+
32483+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32484+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32485+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32486+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32487+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32488+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32489+
32490+ if (err)
32491+ break;
32492+
32493+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32494+ regs->r11 = addr1;
32495+ regs->r10 = addr2;
32496+ regs->ip = addr1;
32497+ return 2;
32498+ }
32499+ } while (0);
32500+
32501+ do { /* PaX: gcc trampoline emulation #2 */
32502+ unsigned short mov1, mov2, jmp1;
32503+ unsigned char jmp2;
32504+ unsigned long addr1, addr2;
32505+
32506+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32507+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32508+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32509+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32510+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32511+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32512+
32513+ if (err)
32514+ break;
32515+
32516+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32517+ regs->r11 = addr1;
32518+ regs->r10 = addr2;
32519+ regs->ip = addr1;
32520+ return 2;
32521+ }
32522+ } while (0);
32523+
32524+ return 1; /* PaX in action */
32525+}
32526+#endif
32527+
32528+/*
32529+ * PaX: decide what to do with offenders (regs->ip = fault address)
32530+ *
32531+ * returns 1 when task should be killed
32532+ * 2 when gcc trampoline was detected
32533+ */
32534+static int pax_handle_fetch_fault(struct pt_regs *regs)
32535+{
32536+ if (v8086_mode(regs))
32537+ return 1;
32538+
32539+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32540+ return 1;
32541+
32542+#ifdef CONFIG_X86_32
32543+ return pax_handle_fetch_fault_32(regs);
32544+#else
32545+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32546+ return pax_handle_fetch_fault_32(regs);
32547+ else
32548+ return pax_handle_fetch_fault_64(regs);
32549+#endif
32550+}
32551+#endif
32552+
32553+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32554+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32555+{
32556+ long i;
32557+
32558+ printk(KERN_ERR "PAX: bytes at PC: ");
32559+ for (i = 0; i < 20; i++) {
32560+ unsigned char c;
32561+ if (get_user(c, (unsigned char __force_user *)pc+i))
32562+ printk(KERN_CONT "?? ");
32563+ else
32564+ printk(KERN_CONT "%02x ", c);
32565+ }
32566+ printk("\n");
32567+
32568+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32569+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32570+ unsigned long c;
32571+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32572+#ifdef CONFIG_X86_32
32573+ printk(KERN_CONT "???????? ");
32574+#else
32575+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32576+ printk(KERN_CONT "???????? ???????? ");
32577+ else
32578+ printk(KERN_CONT "???????????????? ");
32579+#endif
32580+ } else {
32581+#ifdef CONFIG_X86_64
32582+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32583+ printk(KERN_CONT "%08x ", (unsigned int)c);
32584+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32585+ } else
32586+#endif
32587+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32588+ }
32589+ }
32590+ printk("\n");
32591+}
32592+#endif
32593+
32594+/**
32595+ * probe_kernel_write(): safely attempt to write to a location
32596+ * @dst: address to write to
32597+ * @src: pointer to the data that shall be written
32598+ * @size: size of the data chunk
32599+ *
32600+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32601+ * happens, handle that and return -EFAULT.
32602+ */
32603+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32604+{
32605+ long ret;
32606+ mm_segment_t old_fs = get_fs();
32607+
32608+ set_fs(KERNEL_DS);
32609+ pagefault_disable();
32610+ pax_open_kernel();
32611+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32612+ pax_close_kernel();
32613+ pagefault_enable();
32614+ set_fs(old_fs);
32615+
32616+ return ret ? -EFAULT : 0;
32617+}
32618diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32619index 81bf3d2..7ef25c2 100644
32620--- a/arch/x86/mm/gup.c
32621+++ b/arch/x86/mm/gup.c
32622@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32623 addr = start;
32624 len = (unsigned long) nr_pages << PAGE_SHIFT;
32625 end = start + len;
32626- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32627+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32628 (void __user *)start, len)))
32629 return 0;
32630
32631@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32632 goto slow_irqon;
32633 #endif
32634
32635+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32636+ (void __user *)start, len)))
32637+ return 0;
32638+
32639 /*
32640 * XXX: batch / limit 'nr', to avoid large irq off latency
32641 * needs some instrumenting to determine the common sizes used by
32642diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32643index 4500142..53a363c 100644
32644--- a/arch/x86/mm/highmem_32.c
32645+++ b/arch/x86/mm/highmem_32.c
32646@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32647 idx = type + KM_TYPE_NR*smp_processor_id();
32648 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32649 BUG_ON(!pte_none(*(kmap_pte-idx)));
32650+
32651+ pax_open_kernel();
32652 set_pte(kmap_pte-idx, mk_pte(page, prot));
32653+ pax_close_kernel();
32654+
32655 arch_flush_lazy_mmu_mode();
32656
32657 return (void *)vaddr;
32658diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32659index 42982b2..7168fc3 100644
32660--- a/arch/x86/mm/hugetlbpage.c
32661+++ b/arch/x86/mm/hugetlbpage.c
32662@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32663 #ifdef CONFIG_HUGETLB_PAGE
32664 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32665 unsigned long addr, unsigned long len,
32666- unsigned long pgoff, unsigned long flags)
32667+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32668 {
32669 struct hstate *h = hstate_file(file);
32670 struct vm_unmapped_area_info info;
32671-
32672+
32673 info.flags = 0;
32674 info.length = len;
32675 info.low_limit = current->mm->mmap_legacy_base;
32676 info.high_limit = TASK_SIZE;
32677 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32678 info.align_offset = 0;
32679+ info.threadstack_offset = offset;
32680 return vm_unmapped_area(&info);
32681 }
32682
32683 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32684 unsigned long addr0, unsigned long len,
32685- unsigned long pgoff, unsigned long flags)
32686+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32687 {
32688 struct hstate *h = hstate_file(file);
32689 struct vm_unmapped_area_info info;
32690@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32691 info.high_limit = current->mm->mmap_base;
32692 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32693 info.align_offset = 0;
32694+ info.threadstack_offset = offset;
32695 addr = vm_unmapped_area(&info);
32696
32697 /*
32698@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32699 VM_BUG_ON(addr != -ENOMEM);
32700 info.flags = 0;
32701 info.low_limit = TASK_UNMAPPED_BASE;
32702+
32703+#ifdef CONFIG_PAX_RANDMMAP
32704+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32705+ info.low_limit += current->mm->delta_mmap;
32706+#endif
32707+
32708 info.high_limit = TASK_SIZE;
32709 addr = vm_unmapped_area(&info);
32710 }
32711@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32712 struct hstate *h = hstate_file(file);
32713 struct mm_struct *mm = current->mm;
32714 struct vm_area_struct *vma;
32715+ unsigned long pax_task_size = TASK_SIZE;
32716+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32717
32718 if (len & ~huge_page_mask(h))
32719 return -EINVAL;
32720- if (len > TASK_SIZE)
32721+
32722+#ifdef CONFIG_PAX_SEGMEXEC
32723+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32724+ pax_task_size = SEGMEXEC_TASK_SIZE;
32725+#endif
32726+
32727+ pax_task_size -= PAGE_SIZE;
32728+
32729+ if (len > pax_task_size)
32730 return -ENOMEM;
32731
32732 if (flags & MAP_FIXED) {
32733@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32734 return addr;
32735 }
32736
32737+#ifdef CONFIG_PAX_RANDMMAP
32738+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32739+#endif
32740+
32741 if (addr) {
32742 addr = ALIGN(addr, huge_page_size(h));
32743 vma = find_vma(mm, addr);
32744- if (TASK_SIZE - len >= addr &&
32745- (!vma || addr + len <= vma->vm_start))
32746+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32747 return addr;
32748 }
32749 if (mm->get_unmapped_area == arch_get_unmapped_area)
32750 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32751- pgoff, flags);
32752+ pgoff, flags, offset);
32753 else
32754 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32755- pgoff, flags);
32756+ pgoff, flags, offset);
32757 }
32758 #endif /* CONFIG_HUGETLB_PAGE */
32759
32760diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32761index a110efc..a31a18f 100644
32762--- a/arch/x86/mm/init.c
32763+++ b/arch/x86/mm/init.c
32764@@ -4,6 +4,7 @@
32765 #include <linux/swap.h>
32766 #include <linux/memblock.h>
32767 #include <linux/bootmem.h> /* for max_low_pfn */
32768+#include <linux/tboot.h>
32769
32770 #include <asm/cacheflush.h>
32771 #include <asm/e820.h>
32772@@ -17,6 +18,8 @@
32773 #include <asm/proto.h>
32774 #include <asm/dma.h> /* for MAX_DMA_PFN */
32775 #include <asm/microcode.h>
32776+#include <asm/desc.h>
32777+#include <asm/bios_ebda.h>
32778
32779 /*
32780 * We need to define the tracepoints somewhere, and tlb.c
32781@@ -620,7 +623,18 @@ void __init init_mem_mapping(void)
32782 early_ioremap_page_table_range_init();
32783 #endif
32784
32785+#ifdef CONFIG_PAX_PER_CPU_PGD
32786+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32787+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32788+ KERNEL_PGD_PTRS);
32789+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32790+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32791+ KERNEL_PGD_PTRS);
32792+ load_cr3(get_cpu_pgd(0, kernel));
32793+#else
32794 load_cr3(swapper_pg_dir);
32795+#endif
32796+
32797 __flush_tlb_all();
32798
32799 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32800@@ -636,10 +650,40 @@ void __init init_mem_mapping(void)
32801 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32802 * mmio resources as well as potential bios/acpi data regions.
32803 */
32804+
32805+#ifdef CONFIG_GRKERNSEC_KMEM
32806+static unsigned int ebda_start __read_only;
32807+static unsigned int ebda_end __read_only;
32808+#endif
32809+
32810 int devmem_is_allowed(unsigned long pagenr)
32811 {
32812- if (pagenr < 256)
32813+#ifdef CONFIG_GRKERNSEC_KMEM
32814+ /* allow BDA */
32815+ if (!pagenr)
32816 return 1;
32817+ /* allow EBDA */
32818+ if (pagenr >= ebda_start && pagenr < ebda_end)
32819+ return 1;
32820+ /* if tboot is in use, allow access to its hardcoded serial log range */
32821+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32822+ return 1;
32823+#else
32824+ if (!pagenr)
32825+ return 1;
32826+#ifdef CONFIG_VM86
32827+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32828+ return 1;
32829+#endif
32830+#endif
32831+
32832+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32833+ return 1;
32834+#ifdef CONFIG_GRKERNSEC_KMEM
32835+ /* throw out everything else below 1MB */
32836+ if (pagenr <= 256)
32837+ return 0;
32838+#endif
32839 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32840 return 0;
32841 if (!page_is_ram(pagenr))
32842@@ -685,8 +729,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32843 #endif
32844 }
32845
32846+#ifdef CONFIG_GRKERNSEC_KMEM
32847+static inline void gr_init_ebda(void)
32848+{
32849+ unsigned int ebda_addr;
32850+ unsigned int ebda_size = 0;
32851+
32852+ ebda_addr = get_bios_ebda();
32853+ if (ebda_addr) {
32854+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32855+ ebda_size <<= 10;
32856+ }
32857+ if (ebda_addr && ebda_size) {
32858+ ebda_start = ebda_addr >> PAGE_SHIFT;
32859+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32860+ } else {
32861+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32862+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32863+ }
32864+}
32865+#else
32866+static inline void gr_init_ebda(void) { }
32867+#endif
32868+
32869 void free_initmem(void)
32870 {
32871+#ifdef CONFIG_PAX_KERNEXEC
32872+#ifdef CONFIG_X86_32
32873+ /* PaX: limit KERNEL_CS to actual size */
32874+ unsigned long addr, limit;
32875+ struct desc_struct d;
32876+ int cpu;
32877+#else
32878+ pgd_t *pgd;
32879+ pud_t *pud;
32880+ pmd_t *pmd;
32881+ unsigned long addr, end;
32882+#endif
32883+#endif
32884+
32885+ gr_init_ebda();
32886+
32887+#ifdef CONFIG_PAX_KERNEXEC
32888+#ifdef CONFIG_X86_32
32889+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32890+ limit = (limit - 1UL) >> PAGE_SHIFT;
32891+
32892+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32893+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32894+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32895+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32896+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32897+ }
32898+
32899+ /* PaX: make KERNEL_CS read-only */
32900+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32901+ if (!paravirt_enabled())
32902+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32903+/*
32904+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32905+ pgd = pgd_offset_k(addr);
32906+ pud = pud_offset(pgd, addr);
32907+ pmd = pmd_offset(pud, addr);
32908+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32909+ }
32910+*/
32911+#ifdef CONFIG_X86_PAE
32912+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32913+/*
32914+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32915+ pgd = pgd_offset_k(addr);
32916+ pud = pud_offset(pgd, addr);
32917+ pmd = pmd_offset(pud, addr);
32918+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32919+ }
32920+*/
32921+#endif
32922+
32923+#ifdef CONFIG_MODULES
32924+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32925+#endif
32926+
32927+#else
32928+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32929+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32930+ pgd = pgd_offset_k(addr);
32931+ pud = pud_offset(pgd, addr);
32932+ pmd = pmd_offset(pud, addr);
32933+ if (!pmd_present(*pmd))
32934+ continue;
32935+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32936+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32937+ else
32938+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32939+ }
32940+
32941+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32942+ end = addr + KERNEL_IMAGE_SIZE;
32943+ for (; addr < end; addr += PMD_SIZE) {
32944+ pgd = pgd_offset_k(addr);
32945+ pud = pud_offset(pgd, addr);
32946+ pmd = pmd_offset(pud, addr);
32947+ if (!pmd_present(*pmd))
32948+ continue;
32949+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32950+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32951+ }
32952+#endif
32953+
32954+ flush_tlb_all();
32955+#endif
32956+
32957 free_init_pages("unused kernel",
32958 (unsigned long)(&__init_begin),
32959 (unsigned long)(&__init_end));
32960diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32961index c8140e1..59257fc 100644
32962--- a/arch/x86/mm/init_32.c
32963+++ b/arch/x86/mm/init_32.c
32964@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32965 bool __read_mostly __vmalloc_start_set = false;
32966
32967 /*
32968- * Creates a middle page table and puts a pointer to it in the
32969- * given global directory entry. This only returns the gd entry
32970- * in non-PAE compilation mode, since the middle layer is folded.
32971- */
32972-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32973-{
32974- pud_t *pud;
32975- pmd_t *pmd_table;
32976-
32977-#ifdef CONFIG_X86_PAE
32978- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32979- pmd_table = (pmd_t *)alloc_low_page();
32980- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32981- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32982- pud = pud_offset(pgd, 0);
32983- BUG_ON(pmd_table != pmd_offset(pud, 0));
32984-
32985- return pmd_table;
32986- }
32987-#endif
32988- pud = pud_offset(pgd, 0);
32989- pmd_table = pmd_offset(pud, 0);
32990-
32991- return pmd_table;
32992-}
32993-
32994-/*
32995 * Create a page table and place a pointer to it in a middle page
32996 * directory entry:
32997 */
32998@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32999 pte_t *page_table = (pte_t *)alloc_low_page();
33000
33001 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
33002+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
33003+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
33004+#else
33005 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
33006+#endif
33007 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
33008 }
33009
33010 return pte_offset_kernel(pmd, 0);
33011 }
33012
33013+static pmd_t * __init one_md_table_init(pgd_t *pgd)
33014+{
33015+ pud_t *pud;
33016+ pmd_t *pmd_table;
33017+
33018+ pud = pud_offset(pgd, 0);
33019+ pmd_table = pmd_offset(pud, 0);
33020+
33021+ return pmd_table;
33022+}
33023+
33024 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
33025 {
33026 int pgd_idx = pgd_index(vaddr);
33027@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33028 int pgd_idx, pmd_idx;
33029 unsigned long vaddr;
33030 pgd_t *pgd;
33031+ pud_t *pud;
33032 pmd_t *pmd;
33033 pte_t *pte = NULL;
33034 unsigned long count = page_table_range_init_count(start, end);
33035@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33036 pgd = pgd_base + pgd_idx;
33037
33038 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
33039- pmd = one_md_table_init(pgd);
33040- pmd = pmd + pmd_index(vaddr);
33041+ pud = pud_offset(pgd, vaddr);
33042+ pmd = pmd_offset(pud, vaddr);
33043+
33044+#ifdef CONFIG_X86_PAE
33045+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33046+#endif
33047+
33048 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
33049 pmd++, pmd_idx++) {
33050 pte = page_table_kmap_check(one_page_table_init(pmd),
33051@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33052 }
33053 }
33054
33055-static inline int is_kernel_text(unsigned long addr)
33056+static inline int is_kernel_text(unsigned long start, unsigned long end)
33057 {
33058- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
33059- return 1;
33060- return 0;
33061+ if ((start >= ktla_ktva((unsigned long)_etext) ||
33062+ end <= ktla_ktva((unsigned long)_stext)) &&
33063+ (start >= ktla_ktva((unsigned long)_einittext) ||
33064+ end <= ktla_ktva((unsigned long)_sinittext)) &&
33065+
33066+#ifdef CONFIG_ACPI_SLEEP
33067+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
33068+#endif
33069+
33070+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
33071+ return 0;
33072+ return 1;
33073 }
33074
33075 /*
33076@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
33077 unsigned long last_map_addr = end;
33078 unsigned long start_pfn, end_pfn;
33079 pgd_t *pgd_base = swapper_pg_dir;
33080- int pgd_idx, pmd_idx, pte_ofs;
33081+ unsigned int pgd_idx, pmd_idx, pte_ofs;
33082 unsigned long pfn;
33083 pgd_t *pgd;
33084+ pud_t *pud;
33085 pmd_t *pmd;
33086 pte_t *pte;
33087 unsigned pages_2m, pages_4k;
33088@@ -291,8 +295,13 @@ repeat:
33089 pfn = start_pfn;
33090 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33091 pgd = pgd_base + pgd_idx;
33092- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
33093- pmd = one_md_table_init(pgd);
33094+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
33095+ pud = pud_offset(pgd, 0);
33096+ pmd = pmd_offset(pud, 0);
33097+
33098+#ifdef CONFIG_X86_PAE
33099+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33100+#endif
33101
33102 if (pfn >= end_pfn)
33103 continue;
33104@@ -304,14 +313,13 @@ repeat:
33105 #endif
33106 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
33107 pmd++, pmd_idx++) {
33108- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
33109+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
33110
33111 /*
33112 * Map with big pages if possible, otherwise
33113 * create normal page tables:
33114 */
33115 if (use_pse) {
33116- unsigned int addr2;
33117 pgprot_t prot = PAGE_KERNEL_LARGE;
33118 /*
33119 * first pass will use the same initial
33120@@ -322,11 +330,7 @@ repeat:
33121 _PAGE_PSE);
33122
33123 pfn &= PMD_MASK >> PAGE_SHIFT;
33124- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
33125- PAGE_OFFSET + PAGE_SIZE-1;
33126-
33127- if (is_kernel_text(addr) ||
33128- is_kernel_text(addr2))
33129+ if (is_kernel_text(address, address + PMD_SIZE))
33130 prot = PAGE_KERNEL_LARGE_EXEC;
33131
33132 pages_2m++;
33133@@ -343,7 +347,7 @@ repeat:
33134 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33135 pte += pte_ofs;
33136 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33137- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33138+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33139 pgprot_t prot = PAGE_KERNEL;
33140 /*
33141 * first pass will use the same initial
33142@@ -351,7 +355,7 @@ repeat:
33143 */
33144 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33145
33146- if (is_kernel_text(addr))
33147+ if (is_kernel_text(address, address + PAGE_SIZE))
33148 prot = PAGE_KERNEL_EXEC;
33149
33150 pages_4k++;
33151@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33152
33153 pud = pud_offset(pgd, va);
33154 pmd = pmd_offset(pud, va);
33155- if (!pmd_present(*pmd))
33156+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33157 break;
33158
33159 /* should not be large page here */
33160@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33161
33162 static void __init pagetable_init(void)
33163 {
33164- pgd_t *pgd_base = swapper_pg_dir;
33165-
33166- permanent_kmaps_init(pgd_base);
33167+ permanent_kmaps_init(swapper_pg_dir);
33168 }
33169
33170-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33171+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33172 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33173
33174 /* user-defined highmem size */
33175@@ -787,10 +789,10 @@ void __init mem_init(void)
33176 ((unsigned long)&__init_end -
33177 (unsigned long)&__init_begin) >> 10,
33178
33179- (unsigned long)&_etext, (unsigned long)&_edata,
33180- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33181+ (unsigned long)&_sdata, (unsigned long)&_edata,
33182+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33183
33184- (unsigned long)&_text, (unsigned long)&_etext,
33185+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33186 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33187
33188 /*
33189@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33190 if (!kernel_set_to_readonly)
33191 return;
33192
33193+ start = ktla_ktva(start);
33194 pr_debug("Set kernel text: %lx - %lx for read write\n",
33195 start, start+size);
33196
33197@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33198 if (!kernel_set_to_readonly)
33199 return;
33200
33201+ start = ktla_ktva(start);
33202 pr_debug("Set kernel text: %lx - %lx for read only\n",
33203 start, start+size);
33204
33205@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33206 unsigned long start = PFN_ALIGN(_text);
33207 unsigned long size = PFN_ALIGN(_etext) - start;
33208
33209+ start = ktla_ktva(start);
33210 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33211 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33212 size >> 10);
33213diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33214index 30eb05a..ae671ac 100644
33215--- a/arch/x86/mm/init_64.c
33216+++ b/arch/x86/mm/init_64.c
33217@@ -150,7 +150,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33218 * around without checking the pgd every time.
33219 */
33220
33221-pteval_t __supported_pte_mask __read_mostly = ~0;
33222+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33223 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33224
33225 int force_personality32;
33226@@ -183,7 +183,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33227
33228 for (address = start; address <= end; address += PGDIR_SIZE) {
33229 const pgd_t *pgd_ref = pgd_offset_k(address);
33230+
33231+#ifdef CONFIG_PAX_PER_CPU_PGD
33232+ unsigned long cpu;
33233+#else
33234 struct page *page;
33235+#endif
33236
33237 /*
33238 * When it is called after memory hot remove, pgd_none()
33239@@ -194,6 +199,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33240 continue;
33241
33242 spin_lock(&pgd_lock);
33243+
33244+#ifdef CONFIG_PAX_PER_CPU_PGD
33245+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33246+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33247+
33248+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33249+ BUG_ON(pgd_page_vaddr(*pgd)
33250+ != pgd_page_vaddr(*pgd_ref));
33251+
33252+ if (removed) {
33253+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33254+ pgd_clear(pgd);
33255+ } else {
33256+ if (pgd_none(*pgd))
33257+ set_pgd(pgd, *pgd_ref);
33258+ }
33259+
33260+ pgd = pgd_offset_cpu(cpu, kernel, address);
33261+#else
33262 list_for_each_entry(page, &pgd_list, lru) {
33263 pgd_t *pgd;
33264 spinlock_t *pgt_lock;
33265@@ -202,6 +226,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33266 /* the pgt_lock only for Xen */
33267 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33268 spin_lock(pgt_lock);
33269+#endif
33270
33271 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33272 BUG_ON(pgd_page_vaddr(*pgd)
33273@@ -215,7 +240,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33274 set_pgd(pgd, *pgd_ref);
33275 }
33276
33277+#ifndef CONFIG_PAX_PER_CPU_PGD
33278 spin_unlock(pgt_lock);
33279+#endif
33280+
33281 }
33282 spin_unlock(&pgd_lock);
33283 }
33284@@ -248,7 +276,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33285 {
33286 if (pgd_none(*pgd)) {
33287 pud_t *pud = (pud_t *)spp_getpage();
33288- pgd_populate(&init_mm, pgd, pud);
33289+ pgd_populate_kernel(&init_mm, pgd, pud);
33290 if (pud != pud_offset(pgd, 0))
33291 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33292 pud, pud_offset(pgd, 0));
33293@@ -260,7 +288,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33294 {
33295 if (pud_none(*pud)) {
33296 pmd_t *pmd = (pmd_t *) spp_getpage();
33297- pud_populate(&init_mm, pud, pmd);
33298+ pud_populate_kernel(&init_mm, pud, pmd);
33299 if (pmd != pmd_offset(pud, 0))
33300 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33301 pmd, pmd_offset(pud, 0));
33302@@ -289,7 +317,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33303 pmd = fill_pmd(pud, vaddr);
33304 pte = fill_pte(pmd, vaddr);
33305
33306+ pax_open_kernel();
33307 set_pte(pte, new_pte);
33308+ pax_close_kernel();
33309
33310 /*
33311 * It's enough to flush this one mapping.
33312@@ -351,14 +381,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33313 pgd = pgd_offset_k((unsigned long)__va(phys));
33314 if (pgd_none(*pgd)) {
33315 pud = (pud_t *) spp_getpage();
33316- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33317- _PAGE_USER));
33318+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33319 }
33320 pud = pud_offset(pgd, (unsigned long)__va(phys));
33321 if (pud_none(*pud)) {
33322 pmd = (pmd_t *) spp_getpage();
33323- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33324- _PAGE_USER));
33325+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33326 }
33327 pmd = pmd_offset(pud, phys);
33328 BUG_ON(!pmd_none(*pmd));
33329@@ -599,7 +627,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33330 prot);
33331
33332 spin_lock(&init_mm.page_table_lock);
33333- pud_populate(&init_mm, pud, pmd);
33334+ pud_populate_kernel(&init_mm, pud, pmd);
33335 spin_unlock(&init_mm.page_table_lock);
33336 }
33337 __flush_tlb_all();
33338@@ -640,7 +668,7 @@ kernel_physical_mapping_init(unsigned long start,
33339 page_size_mask);
33340
33341 spin_lock(&init_mm.page_table_lock);
33342- pgd_populate(&init_mm, pgd, pud);
33343+ pgd_populate_kernel(&init_mm, pgd, pud);
33344 spin_unlock(&init_mm.page_table_lock);
33345 pgd_changed = true;
33346 }
33347diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33348index 9ca35fc..4b2b7b7 100644
33349--- a/arch/x86/mm/iomap_32.c
33350+++ b/arch/x86/mm/iomap_32.c
33351@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33352 type = kmap_atomic_idx_push();
33353 idx = type + KM_TYPE_NR * smp_processor_id();
33354 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33355+
33356+ pax_open_kernel();
33357 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33358+ pax_close_kernel();
33359+
33360 arch_flush_lazy_mmu_mode();
33361
33362 return (void *)vaddr;
33363diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33364index fdf617c..b9e85bc 100644
33365--- a/arch/x86/mm/ioremap.c
33366+++ b/arch/x86/mm/ioremap.c
33367@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33368 unsigned long i;
33369
33370 for (i = 0; i < nr_pages; ++i)
33371- if (pfn_valid(start_pfn + i) &&
33372- !PageReserved(pfn_to_page(start_pfn + i)))
33373+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33374+ !PageReserved(pfn_to_page(start_pfn + i))))
33375 return 1;
33376
33377 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33378@@ -283,7 +283,7 @@ EXPORT_SYMBOL(ioremap_prot);
33379 *
33380 * Caller must ensure there is only one unmapping for the same pointer.
33381 */
33382-void iounmap(volatile void __iomem *addr)
33383+void iounmap(const volatile void __iomem *addr)
33384 {
33385 struct vm_struct *p, *o;
33386
33387@@ -332,30 +332,29 @@ EXPORT_SYMBOL(iounmap);
33388 */
33389 void *xlate_dev_mem_ptr(phys_addr_t phys)
33390 {
33391- void *addr;
33392- unsigned long start = phys & PAGE_MASK;
33393-
33394 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33395- if (page_is_ram(start >> PAGE_SHIFT))
33396+ if (page_is_ram(phys >> PAGE_SHIFT))
33397+#ifdef CONFIG_HIGHMEM
33398+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33399+#endif
33400 return __va(phys);
33401
33402- addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33403- if (addr)
33404- addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
33405-
33406- return addr;
33407+ return (void __force *)ioremap_cache(phys, PAGE_SIZE);
33408 }
33409
33410 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33411 {
33412 if (page_is_ram(phys >> PAGE_SHIFT))
33413+#ifdef CONFIG_HIGHMEM
33414+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33415+#endif
33416 return;
33417
33418 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33419 return;
33420 }
33421
33422-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33423+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33424
33425 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33426 {
33427@@ -391,8 +390,7 @@ void __init early_ioremap_init(void)
33428 early_ioremap_setup();
33429
33430 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33431- memset(bm_pte, 0, sizeof(bm_pte));
33432- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33433+ pmd_populate_user(&init_mm, pmd, bm_pte);
33434
33435 /*
33436 * The boot-ioremap range spans multiple pmds, for which
33437diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33438index b4f2e7e..96c9c3e 100644
33439--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33440+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33441@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33442 * memory (e.g. tracked pages)? For now, we need this to avoid
33443 * invoking kmemcheck for PnP BIOS calls.
33444 */
33445- if (regs->flags & X86_VM_MASK)
33446+ if (v8086_mode(regs))
33447 return false;
33448- if (regs->cs != __KERNEL_CS)
33449+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33450 return false;
33451
33452 pte = kmemcheck_pte_lookup(address);
33453diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33454index df4552b..12c129c 100644
33455--- a/arch/x86/mm/mmap.c
33456+++ b/arch/x86/mm/mmap.c
33457@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33458 * Leave an at least ~128 MB hole with possible stack randomization.
33459 */
33460 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33461-#define MAX_GAP (TASK_SIZE/6*5)
33462+#define MAX_GAP (pax_task_size/6*5)
33463
33464 static int mmap_is_legacy(void)
33465 {
33466@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33467 return rnd << PAGE_SHIFT;
33468 }
33469
33470-static unsigned long mmap_base(void)
33471+static unsigned long mmap_base(struct mm_struct *mm)
33472 {
33473 unsigned long gap = rlimit(RLIMIT_STACK);
33474+ unsigned long pax_task_size = TASK_SIZE;
33475+
33476+#ifdef CONFIG_PAX_SEGMEXEC
33477+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33478+ pax_task_size = SEGMEXEC_TASK_SIZE;
33479+#endif
33480
33481 if (gap < MIN_GAP)
33482 gap = MIN_GAP;
33483 else if (gap > MAX_GAP)
33484 gap = MAX_GAP;
33485
33486- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33487+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33488 }
33489
33490 /*
33491 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33492 * does, but not when emulating X86_32
33493 */
33494-static unsigned long mmap_legacy_base(void)
33495+static unsigned long mmap_legacy_base(struct mm_struct *mm)
33496 {
33497- if (mmap_is_ia32())
33498+ if (mmap_is_ia32()) {
33499+
33500+#ifdef CONFIG_PAX_SEGMEXEC
33501+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33502+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33503+ else
33504+#endif
33505+
33506 return TASK_UNMAPPED_BASE;
33507- else
33508+ } else
33509 return TASK_UNMAPPED_BASE + mmap_rnd();
33510 }
33511
33512@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33513 */
33514 void arch_pick_mmap_layout(struct mm_struct *mm)
33515 {
33516- mm->mmap_legacy_base = mmap_legacy_base();
33517- mm->mmap_base = mmap_base();
33518+ mm->mmap_legacy_base = mmap_legacy_base(mm);
33519+ mm->mmap_base = mmap_base(mm);
33520+
33521+#ifdef CONFIG_PAX_RANDMMAP
33522+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33523+ mm->mmap_legacy_base += mm->delta_mmap;
33524+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33525+ }
33526+#endif
33527
33528 if (mmap_is_legacy()) {
33529 mm->mmap_base = mm->mmap_legacy_base;
33530diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33531index 0057a7a..95c7edd 100644
33532--- a/arch/x86/mm/mmio-mod.c
33533+++ b/arch/x86/mm/mmio-mod.c
33534@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33535 break;
33536 default:
33537 {
33538- unsigned char *ip = (unsigned char *)instptr;
33539+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33540 my_trace->opcode = MMIO_UNKNOWN_OP;
33541 my_trace->width = 0;
33542 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33543@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33544 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33545 void __iomem *addr)
33546 {
33547- static atomic_t next_id;
33548+ static atomic_unchecked_t next_id;
33549 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33550 /* These are page-unaligned. */
33551 struct mmiotrace_map map = {
33552@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33553 .private = trace
33554 },
33555 .phys = offset,
33556- .id = atomic_inc_return(&next_id)
33557+ .id = atomic_inc_return_unchecked(&next_id)
33558 };
33559 map.map_id = trace->id;
33560
33561@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33562 ioremap_trace_core(offset, size, addr);
33563 }
33564
33565-static void iounmap_trace_core(volatile void __iomem *addr)
33566+static void iounmap_trace_core(const volatile void __iomem *addr)
33567 {
33568 struct mmiotrace_map map = {
33569 .phys = 0,
33570@@ -328,7 +328,7 @@ not_enabled:
33571 }
33572 }
33573
33574-void mmiotrace_iounmap(volatile void __iomem *addr)
33575+void mmiotrace_iounmap(const volatile void __iomem *addr)
33576 {
33577 might_sleep();
33578 if (is_enabled()) /* recheck and proper locking in *_core() */
33579diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33580index cd4785b..25188b6 100644
33581--- a/arch/x86/mm/numa.c
33582+++ b/arch/x86/mm/numa.c
33583@@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33584 }
33585 }
33586
33587-static int __init numa_register_memblks(struct numa_meminfo *mi)
33588+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33589 {
33590 unsigned long uninitialized_var(pfn_align);
33591 int i, nid;
33592diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33593index 536ea2f..f42c293 100644
33594--- a/arch/x86/mm/pageattr.c
33595+++ b/arch/x86/mm/pageattr.c
33596@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33597 */
33598 #ifdef CONFIG_PCI_BIOS
33599 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33600- pgprot_val(forbidden) |= _PAGE_NX;
33601+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33602 #endif
33603
33604 /*
33605@@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33606 * Does not cover __inittext since that is gone later on. On
33607 * 64bit we do not enforce !NX on the low mapping
33608 */
33609- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33610- pgprot_val(forbidden) |= _PAGE_NX;
33611+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33612+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33613
33614+#ifdef CONFIG_DEBUG_RODATA
33615 /*
33616 * The .rodata section needs to be read-only. Using the pfn
33617 * catches all aliases.
33618@@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33619 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33620 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33621 pgprot_val(forbidden) |= _PAGE_RW;
33622+#endif
33623
33624 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33625 /*
33626@@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33627 }
33628 #endif
33629
33630+#ifdef CONFIG_PAX_KERNEXEC
33631+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33632+ pgprot_val(forbidden) |= _PAGE_RW;
33633+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33634+ }
33635+#endif
33636+
33637 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33638
33639 return prot;
33640@@ -440,23 +449,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33641 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33642 {
33643 /* change init_mm */
33644+ pax_open_kernel();
33645 set_pte_atomic(kpte, pte);
33646+
33647 #ifdef CONFIG_X86_32
33648 if (!SHARED_KERNEL_PMD) {
33649+
33650+#ifdef CONFIG_PAX_PER_CPU_PGD
33651+ unsigned long cpu;
33652+#else
33653 struct page *page;
33654+#endif
33655
33656+#ifdef CONFIG_PAX_PER_CPU_PGD
33657+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33658+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33659+#else
33660 list_for_each_entry(page, &pgd_list, lru) {
33661- pgd_t *pgd;
33662+ pgd_t *pgd = (pgd_t *)page_address(page);
33663+#endif
33664+
33665 pud_t *pud;
33666 pmd_t *pmd;
33667
33668- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33669+ pgd += pgd_index(address);
33670 pud = pud_offset(pgd, address);
33671 pmd = pmd_offset(pud, address);
33672 set_pte_atomic((pte_t *)pmd, pte);
33673 }
33674 }
33675 #endif
33676+ pax_close_kernel();
33677 }
33678
33679 static int
33680diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33681index 7ac6869..c0ba541 100644
33682--- a/arch/x86/mm/pat.c
33683+++ b/arch/x86/mm/pat.c
33684@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33685 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33686
33687 if (pg_flags == _PGMT_DEFAULT)
33688- return -1;
33689+ return _PAGE_CACHE_MODE_NUM;
33690 else if (pg_flags == _PGMT_WC)
33691 return _PAGE_CACHE_MODE_WC;
33692 else if (pg_flags == _PGMT_UC_MINUS)
33693@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33694
33695 page = pfn_to_page(pfn);
33696 type = get_page_memtype(page);
33697- if (type != -1) {
33698+ if (type != _PAGE_CACHE_MODE_NUM) {
33699 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33700 start, end - 1, type, req_type);
33701 if (new_type)
33702@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33703
33704 if (!entry) {
33705 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33706- current->comm, current->pid, start, end - 1);
33707+ current->comm, task_pid_nr(current), start, end - 1);
33708 return -EINVAL;
33709 }
33710
33711@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33712 page = pfn_to_page(paddr >> PAGE_SHIFT);
33713 rettype = get_page_memtype(page);
33714 /*
33715- * -1 from get_page_memtype() implies RAM page is in its
33716+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33717 * default state and not reserved, and hence of type WB
33718 */
33719- if (rettype == -1)
33720+ if (rettype == _PAGE_CACHE_MODE_NUM)
33721 rettype = _PAGE_CACHE_MODE_WB;
33722
33723 return rettype;
33724@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33725
33726 while (cursor < to) {
33727 if (!devmem_is_allowed(pfn)) {
33728- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33729- current->comm, from, to - 1);
33730+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33731+ current->comm, from, to - 1, cursor);
33732 return 0;
33733 }
33734 cursor += PAGE_SIZE;
33735@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33736 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33737 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33738 "for [mem %#010Lx-%#010Lx]\n",
33739- current->comm, current->pid,
33740+ current->comm, task_pid_nr(current),
33741 cattr_name(pcm),
33742 base, (unsigned long long)(base + size-1));
33743 return -EINVAL;
33744@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33745 pcm = lookup_memtype(paddr);
33746 if (want_pcm != pcm) {
33747 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33748- current->comm, current->pid,
33749+ current->comm, task_pid_nr(current),
33750 cattr_name(want_pcm),
33751 (unsigned long long)paddr,
33752 (unsigned long long)(paddr + size - 1),
33753@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33754 free_memtype(paddr, paddr + size);
33755 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33756 " for [mem %#010Lx-%#010Lx], got %s\n",
33757- current->comm, current->pid,
33758+ current->comm, task_pid_nr(current),
33759 cattr_name(want_pcm),
33760 (unsigned long long)paddr,
33761 (unsigned long long)(paddr + size - 1),
33762diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33763index 6582adc..fcc5d0b 100644
33764--- a/arch/x86/mm/pat_rbtree.c
33765+++ b/arch/x86/mm/pat_rbtree.c
33766@@ -161,7 +161,7 @@ success:
33767
33768 failure:
33769 printk(KERN_INFO "%s:%d conflicting memory types "
33770- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33771+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33772 end, cattr_name(found_type), cattr_name(match->type));
33773 return -EBUSY;
33774 }
33775diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33776index 9f0614d..92ae64a 100644
33777--- a/arch/x86/mm/pf_in.c
33778+++ b/arch/x86/mm/pf_in.c
33779@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33780 int i;
33781 enum reason_type rv = OTHERS;
33782
33783- p = (unsigned char *)ins_addr;
33784+ p = (unsigned char *)ktla_ktva(ins_addr);
33785 p += skip_prefix(p, &prf);
33786 p += get_opcode(p, &opcode);
33787
33788@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33789 struct prefix_bits prf;
33790 int i;
33791
33792- p = (unsigned char *)ins_addr;
33793+ p = (unsigned char *)ktla_ktva(ins_addr);
33794 p += skip_prefix(p, &prf);
33795 p += get_opcode(p, &opcode);
33796
33797@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33798 struct prefix_bits prf;
33799 int i;
33800
33801- p = (unsigned char *)ins_addr;
33802+ p = (unsigned char *)ktla_ktva(ins_addr);
33803 p += skip_prefix(p, &prf);
33804 p += get_opcode(p, &opcode);
33805
33806@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33807 struct prefix_bits prf;
33808 int i;
33809
33810- p = (unsigned char *)ins_addr;
33811+ p = (unsigned char *)ktla_ktva(ins_addr);
33812 p += skip_prefix(p, &prf);
33813 p += get_opcode(p, &opcode);
33814 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33815@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33816 struct prefix_bits prf;
33817 int i;
33818
33819- p = (unsigned char *)ins_addr;
33820+ p = (unsigned char *)ktla_ktva(ins_addr);
33821 p += skip_prefix(p, &prf);
33822 p += get_opcode(p, &opcode);
33823 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33824diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33825index 7b22ada..b11e66f 100644
33826--- a/arch/x86/mm/pgtable.c
33827+++ b/arch/x86/mm/pgtable.c
33828@@ -97,10 +97,75 @@ static inline void pgd_list_del(pgd_t *pgd)
33829 list_del(&page->lru);
33830 }
33831
33832-#define UNSHARED_PTRS_PER_PGD \
33833- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33834+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33835+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33836
33837+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33838+{
33839+ unsigned int count = USER_PGD_PTRS;
33840
33841+ if (!pax_user_shadow_base)
33842+ return;
33843+
33844+ while (count--)
33845+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33846+}
33847+#endif
33848+
33849+#ifdef CONFIG_PAX_PER_CPU_PGD
33850+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33851+{
33852+ unsigned int count = USER_PGD_PTRS;
33853+
33854+ while (count--) {
33855+ pgd_t pgd;
33856+
33857+#ifdef CONFIG_X86_64
33858+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33859+#else
33860+ pgd = *src++;
33861+#endif
33862+
33863+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33864+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33865+#endif
33866+
33867+ *dst++ = pgd;
33868+ }
33869+
33870+}
33871+#endif
33872+
33873+#ifdef CONFIG_X86_64
33874+#define pxd_t pud_t
33875+#define pyd_t pgd_t
33876+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33877+#define pgtable_pxd_page_ctor(page) true
33878+#define pgtable_pxd_page_dtor(page) do {} while (0)
33879+#define pxd_free(mm, pud) pud_free((mm), (pud))
33880+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33881+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33882+#define PYD_SIZE PGDIR_SIZE
33883+#define mm_inc_nr_pxds(mm) do {} while (0)
33884+#define mm_dec_nr_pxds(mm) do {} while (0)
33885+#else
33886+#define pxd_t pmd_t
33887+#define pyd_t pud_t
33888+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33889+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33890+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33891+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33892+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33893+#define pyd_offset(mm, address) pud_offset((mm), (address))
33894+#define PYD_SIZE PUD_SIZE
33895+#define mm_inc_nr_pxds(mm) mm_inc_nr_pmds(mm)
33896+#define mm_dec_nr_pxds(mm) mm_dec_nr_pmds(mm)
33897+#endif
33898+
33899+#ifdef CONFIG_PAX_PER_CPU_PGD
33900+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33901+static inline void pgd_dtor(pgd_t *pgd) {}
33902+#else
33903 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33904 {
33905 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33906@@ -141,6 +206,7 @@ static void pgd_dtor(pgd_t *pgd)
33907 pgd_list_del(pgd);
33908 spin_unlock(&pgd_lock);
33909 }
33910+#endif
33911
33912 /*
33913 * List of all pgd's needed for non-PAE so it can invalidate entries
33914@@ -153,7 +219,7 @@ static void pgd_dtor(pgd_t *pgd)
33915 * -- nyc
33916 */
33917
33918-#ifdef CONFIG_X86_PAE
33919+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33920 /*
33921 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33922 * updating the top-level pagetable entries to guarantee the
33923@@ -165,7 +231,7 @@ static void pgd_dtor(pgd_t *pgd)
33924 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33925 * and initialize the kernel pmds here.
33926 */
33927-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33928+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33929
33930 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33931 {
33932@@ -183,46 +249,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33933 */
33934 flush_tlb_mm(mm);
33935 }
33936+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33937+#define PREALLOCATED_PXDS USER_PGD_PTRS
33938 #else /* !CONFIG_X86_PAE */
33939
33940 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33941-#define PREALLOCATED_PMDS 0
33942+#define PREALLOCATED_PXDS 0
33943
33944 #endif /* CONFIG_X86_PAE */
33945
33946-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
33947+static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
33948 {
33949 int i;
33950
33951- for(i = 0; i < PREALLOCATED_PMDS; i++)
33952- if (pmds[i]) {
33953- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33954- free_page((unsigned long)pmds[i]);
33955- mm_dec_nr_pmds(mm);
33956+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33957+ if (pxds[i]) {
33958+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33959+ free_page((unsigned long)pxds[i]);
33960+ mm_dec_nr_pxds(mm);
33961 }
33962 }
33963
33964-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33965+static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
33966 {
33967 int i;
33968 bool failed = false;
33969
33970- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33971- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33972- if (!pmd)
33973+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33974+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33975+ if (!pxd)
33976 failed = true;
33977- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33978- free_page((unsigned long)pmd);
33979- pmd = NULL;
33980+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33981+ free_page((unsigned long)pxd);
33982+ pxd = NULL;
33983 failed = true;
33984 }
33985- if (pmd)
33986- mm_inc_nr_pmds(mm);
33987- pmds[i] = pmd;
33988+ if (pxd)
33989+ mm_inc_nr_pxds(mm);
33990+ pxds[i] = pxd;
33991 }
33992
33993 if (failed) {
33994- free_pmds(mm, pmds);
33995+ free_pxds(mm, pxds);
33996 return -ENOMEM;
33997 }
33998
33999@@ -235,50 +303,54 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
34000 * preallocate which never got a corresponding vma will need to be
34001 * freed manually.
34002 */
34003-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
34004+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
34005 {
34006 int i;
34007
34008- for(i = 0; i < PREALLOCATED_PMDS; i++) {
34009+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
34010 pgd_t pgd = pgdp[i];
34011
34012 if (pgd_val(pgd) != 0) {
34013- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
34014+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
34015
34016- pgdp[i] = native_make_pgd(0);
34017+ set_pgd(pgdp + i, native_make_pgd(0));
34018
34019- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
34020- pmd_free(mm, pmd);
34021- mm_dec_nr_pmds(mm);
34022+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
34023+ pxd_free(mm, pxd);
34024+ mm_dec_nr_pxds(mm);
34025 }
34026 }
34027 }
34028
34029-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
34030+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
34031 {
34032- pud_t *pud;
34033+ pyd_t *pyd;
34034 int i;
34035
34036- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
34037+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
34038 return;
34039
34040- pud = pud_offset(pgd, 0);
34041+#ifdef CONFIG_X86_64
34042+ pyd = pyd_offset(mm, 0L);
34043+#else
34044+ pyd = pyd_offset(pgd, 0L);
34045+#endif
34046
34047- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
34048- pmd_t *pmd = pmds[i];
34049+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
34050+ pxd_t *pxd = pxds[i];
34051
34052 if (i >= KERNEL_PGD_BOUNDARY)
34053- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34054- sizeof(pmd_t) * PTRS_PER_PMD);
34055+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34056+ sizeof(pxd_t) * PTRS_PER_PMD);
34057
34058- pud_populate(mm, pud, pmd);
34059+ pyd_populate(mm, pyd, pxd);
34060 }
34061 }
34062
34063 pgd_t *pgd_alloc(struct mm_struct *mm)
34064 {
34065 pgd_t *pgd;
34066- pmd_t *pmds[PREALLOCATED_PMDS];
34067+ pxd_t *pxds[PREALLOCATED_PXDS];
34068
34069 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
34070
34071@@ -287,11 +359,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34072
34073 mm->pgd = pgd;
34074
34075- if (preallocate_pmds(mm, pmds) != 0)
34076+ if (preallocate_pxds(mm, pxds) != 0)
34077 goto out_free_pgd;
34078
34079 if (paravirt_pgd_alloc(mm) != 0)
34080- goto out_free_pmds;
34081+ goto out_free_pxds;
34082
34083 /*
34084 * Make sure that pre-populating the pmds is atomic with
34085@@ -301,14 +373,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34086 spin_lock(&pgd_lock);
34087
34088 pgd_ctor(mm, pgd);
34089- pgd_prepopulate_pmd(mm, pgd, pmds);
34090+ pgd_prepopulate_pxd(mm, pgd, pxds);
34091
34092 spin_unlock(&pgd_lock);
34093
34094 return pgd;
34095
34096-out_free_pmds:
34097- free_pmds(mm, pmds);
34098+out_free_pxds:
34099+ free_pxds(mm, pxds);
34100 out_free_pgd:
34101 free_page((unsigned long)pgd);
34102 out:
34103@@ -317,7 +389,7 @@ out:
34104
34105 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
34106 {
34107- pgd_mop_up_pmds(mm, pgd);
34108+ pgd_mop_up_pxds(mm, pgd);
34109 pgd_dtor(pgd);
34110 paravirt_pgd_free(mm, pgd);
34111 free_page((unsigned long)pgd);
34112diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
34113index 75cc097..79a097f 100644
34114--- a/arch/x86/mm/pgtable_32.c
34115+++ b/arch/x86/mm/pgtable_32.c
34116@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
34117 return;
34118 }
34119 pte = pte_offset_kernel(pmd, vaddr);
34120+
34121+ pax_open_kernel();
34122 if (pte_val(pteval))
34123 set_pte_at(&init_mm, vaddr, pte, pteval);
34124 else
34125 pte_clear(&init_mm, vaddr, pte);
34126+ pax_close_kernel();
34127
34128 /*
34129 * It's enough to flush this one mapping.
34130diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34131index e666cbb..61788c45 100644
34132--- a/arch/x86/mm/physaddr.c
34133+++ b/arch/x86/mm/physaddr.c
34134@@ -10,7 +10,7 @@
34135 #ifdef CONFIG_X86_64
34136
34137 #ifdef CONFIG_DEBUG_VIRTUAL
34138-unsigned long __phys_addr(unsigned long x)
34139+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34140 {
34141 unsigned long y = x - __START_KERNEL_map;
34142
34143@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34144 #else
34145
34146 #ifdef CONFIG_DEBUG_VIRTUAL
34147-unsigned long __phys_addr(unsigned long x)
34148+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34149 {
34150 unsigned long phys_addr = x - PAGE_OFFSET;
34151 /* VMALLOC_* aren't constants */
34152diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34153index 90555bf..f5f1828 100644
34154--- a/arch/x86/mm/setup_nx.c
34155+++ b/arch/x86/mm/setup_nx.c
34156@@ -5,8 +5,10 @@
34157 #include <asm/pgtable.h>
34158 #include <asm/proto.h>
34159
34160+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34161 static int disable_nx;
34162
34163+#ifndef CONFIG_PAX_PAGEEXEC
34164 /*
34165 * noexec = on|off
34166 *
34167@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34168 return 0;
34169 }
34170 early_param("noexec", noexec_setup);
34171+#endif
34172+
34173+#endif
34174
34175 void x86_configure_nx(void)
34176 {
34177+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34178 if (cpu_has_nx && !disable_nx)
34179 __supported_pte_mask |= _PAGE_NX;
34180 else
34181+#endif
34182 __supported_pte_mask &= ~_PAGE_NX;
34183 }
34184
34185diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34186index 3250f23..7a97ba2 100644
34187--- a/arch/x86/mm/tlb.c
34188+++ b/arch/x86/mm/tlb.c
34189@@ -45,7 +45,11 @@ void leave_mm(int cpu)
34190 BUG();
34191 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34192 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34193+
34194+#ifndef CONFIG_PAX_PER_CPU_PGD
34195 load_cr3(swapper_pg_dir);
34196+#endif
34197+
34198 /*
34199 * This gets called in the idle path where RCU
34200 * functions differently. Tracing normally
34201diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34202new file mode 100644
34203index 0000000..3fda3f3
34204--- /dev/null
34205+++ b/arch/x86/mm/uderef_64.c
34206@@ -0,0 +1,37 @@
34207+#include <linux/mm.h>
34208+#include <asm/pgtable.h>
34209+#include <asm/uaccess.h>
34210+
34211+#ifdef CONFIG_PAX_MEMORY_UDEREF
34212+/* PaX: due to the special call convention these functions must
34213+ * - remain leaf functions under all configurations,
34214+ * - never be called directly, only dereferenced from the wrappers.
34215+ */
34216+void __used __pax_open_userland(void)
34217+{
34218+ unsigned int cpu;
34219+
34220+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34221+ return;
34222+
34223+ cpu = raw_get_cpu();
34224+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34225+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34226+ raw_put_cpu_no_resched();
34227+}
34228+EXPORT_SYMBOL(__pax_open_userland);
34229+
34230+void __used __pax_close_userland(void)
34231+{
34232+ unsigned int cpu;
34233+
34234+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34235+ return;
34236+
34237+ cpu = raw_get_cpu();
34238+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34239+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34240+ raw_put_cpu_no_resched();
34241+}
34242+EXPORT_SYMBOL(__pax_close_userland);
34243+#endif
34244diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34245index 6440221..f84b5c7 100644
34246--- a/arch/x86/net/bpf_jit.S
34247+++ b/arch/x86/net/bpf_jit.S
34248@@ -9,6 +9,7 @@
34249 */
34250 #include <linux/linkage.h>
34251 #include <asm/dwarf2.h>
34252+#include <asm/alternative-asm.h>
34253
34254 /*
34255 * Calling convention :
34256@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34257 jle bpf_slow_path_word
34258 mov (SKBDATA,%rsi),%eax
34259 bswap %eax /* ntohl() */
34260+ pax_force_retaddr
34261 ret
34262
34263 sk_load_half:
34264@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34265 jle bpf_slow_path_half
34266 movzwl (SKBDATA,%rsi),%eax
34267 rol $8,%ax # ntohs()
34268+ pax_force_retaddr
34269 ret
34270
34271 sk_load_byte:
34272@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34273 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34274 jle bpf_slow_path_byte
34275 movzbl (SKBDATA,%rsi),%eax
34276+ pax_force_retaddr
34277 ret
34278
34279 /* rsi contains offset and can be scratched */
34280@@ -90,6 +94,7 @@ bpf_slow_path_word:
34281 js bpf_error
34282 mov - MAX_BPF_STACK + 32(%rbp),%eax
34283 bswap %eax
34284+ pax_force_retaddr
34285 ret
34286
34287 bpf_slow_path_half:
34288@@ -98,12 +103,14 @@ bpf_slow_path_half:
34289 mov - MAX_BPF_STACK + 32(%rbp),%ax
34290 rol $8,%ax
34291 movzwl %ax,%eax
34292+ pax_force_retaddr
34293 ret
34294
34295 bpf_slow_path_byte:
34296 bpf_slow_path_common(1)
34297 js bpf_error
34298 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34299+ pax_force_retaddr
34300 ret
34301
34302 #define sk_negative_common(SIZE) \
34303@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34304 sk_negative_common(4)
34305 mov (%rax), %eax
34306 bswap %eax
34307+ pax_force_retaddr
34308 ret
34309
34310 bpf_slow_path_half_neg:
34311@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34312 mov (%rax),%ax
34313 rol $8,%ax
34314 movzwl %ax,%eax
34315+ pax_force_retaddr
34316 ret
34317
34318 bpf_slow_path_byte_neg:
34319@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34320 .globl sk_load_byte_negative_offset
34321 sk_negative_common(1)
34322 movzbl (%rax), %eax
34323+ pax_force_retaddr
34324 ret
34325
34326 bpf_error:
34327@@ -156,4 +166,5 @@ bpf_error:
34328 mov - MAX_BPF_STACK + 16(%rbp),%r14
34329 mov - MAX_BPF_STACK + 24(%rbp),%r15
34330 leaveq
34331+ pax_force_retaddr
34332 ret
34333diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34334index ddeff48..877ead6 100644
34335--- a/arch/x86/net/bpf_jit_comp.c
34336+++ b/arch/x86/net/bpf_jit_comp.c
34337@@ -13,7 +13,11 @@
34338 #include <linux/if_vlan.h>
34339 #include <asm/cacheflush.h>
34340
34341+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34342+int bpf_jit_enable __read_only;
34343+#else
34344 int bpf_jit_enable __read_mostly;
34345+#endif
34346
34347 /*
34348 * assembly code in arch/x86/net/bpf_jit.S
34349@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34350 static void jit_fill_hole(void *area, unsigned int size)
34351 {
34352 /* fill whole space with int3 instructions */
34353+ pax_open_kernel();
34354 memset(area, 0xcc, size);
34355+ pax_close_kernel();
34356 }
34357
34358 struct jit_context {
34359@@ -924,7 +930,9 @@ common_load:
34360 pr_err("bpf_jit_compile fatal error\n");
34361 return -EFAULT;
34362 }
34363+ pax_open_kernel();
34364 memcpy(image + proglen, temp, ilen);
34365+ pax_close_kernel();
34366 }
34367 proglen += ilen;
34368 addrs[i] = proglen;
34369@@ -1001,7 +1009,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34370
34371 if (image) {
34372 bpf_flush_icache(header, image + proglen);
34373- set_memory_ro((unsigned long)header, header->pages);
34374 prog->bpf_func = (void *)image;
34375 prog->jited = true;
34376 }
34377@@ -1014,12 +1021,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34378 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34379 struct bpf_binary_header *header = (void *)addr;
34380
34381- if (!fp->jited)
34382- goto free_filter;
34383+ if (fp->jited)
34384+ bpf_jit_binary_free(header);
34385
34386- set_memory_rw(addr, header->pages);
34387- bpf_jit_binary_free(header);
34388-
34389-free_filter:
34390 bpf_prog_unlock_free(fp);
34391 }
34392diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34393index 5d04be5..2beeaa2 100644
34394--- a/arch/x86/oprofile/backtrace.c
34395+++ b/arch/x86/oprofile/backtrace.c
34396@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34397 struct stack_frame_ia32 *fp;
34398 unsigned long bytes;
34399
34400- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34401+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34402 if (bytes != 0)
34403 return NULL;
34404
34405- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34406+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34407
34408 oprofile_add_trace(bufhead[0].return_address);
34409
34410@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34411 struct stack_frame bufhead[2];
34412 unsigned long bytes;
34413
34414- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34415+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34416 if (bytes != 0)
34417 return NULL;
34418
34419@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34420 {
34421 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34422
34423- if (!user_mode_vm(regs)) {
34424+ if (!user_mode(regs)) {
34425 unsigned long stack = kernel_stack_pointer(regs);
34426 if (depth)
34427 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34428diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34429index 1d2e639..f6ef82a 100644
34430--- a/arch/x86/oprofile/nmi_int.c
34431+++ b/arch/x86/oprofile/nmi_int.c
34432@@ -23,6 +23,7 @@
34433 #include <asm/nmi.h>
34434 #include <asm/msr.h>
34435 #include <asm/apic.h>
34436+#include <asm/pgtable.h>
34437
34438 #include "op_counter.h"
34439 #include "op_x86_model.h"
34440@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34441 if (ret)
34442 return ret;
34443
34444- if (!model->num_virt_counters)
34445- model->num_virt_counters = model->num_counters;
34446+ if (!model->num_virt_counters) {
34447+ pax_open_kernel();
34448+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34449+ pax_close_kernel();
34450+ }
34451
34452 mux_init(ops);
34453
34454diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34455index 50d86c0..7985318 100644
34456--- a/arch/x86/oprofile/op_model_amd.c
34457+++ b/arch/x86/oprofile/op_model_amd.c
34458@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34459 num_counters = AMD64_NUM_COUNTERS;
34460 }
34461
34462- op_amd_spec.num_counters = num_counters;
34463- op_amd_spec.num_controls = num_counters;
34464- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34465+ pax_open_kernel();
34466+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34467+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34468+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34469+ pax_close_kernel();
34470
34471 return 0;
34472 }
34473diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34474index d90528e..0127e2b 100644
34475--- a/arch/x86/oprofile/op_model_ppro.c
34476+++ b/arch/x86/oprofile/op_model_ppro.c
34477@@ -19,6 +19,7 @@
34478 #include <asm/msr.h>
34479 #include <asm/apic.h>
34480 #include <asm/nmi.h>
34481+#include <asm/pgtable.h>
34482
34483 #include "op_x86_model.h"
34484 #include "op_counter.h"
34485@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34486
34487 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34488
34489- op_arch_perfmon_spec.num_counters = num_counters;
34490- op_arch_perfmon_spec.num_controls = num_counters;
34491+ pax_open_kernel();
34492+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34493+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34494+ pax_close_kernel();
34495 }
34496
34497 static int arch_perfmon_init(struct oprofile_operations *ignore)
34498diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34499index 71e8a67..6a313bb 100644
34500--- a/arch/x86/oprofile/op_x86_model.h
34501+++ b/arch/x86/oprofile/op_x86_model.h
34502@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34503 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34504 struct op_msrs const * const msrs);
34505 #endif
34506-};
34507+} __do_const;
34508
34509 struct op_counter_config;
34510
34511diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34512index 852aa4c..71613f2 100644
34513--- a/arch/x86/pci/intel_mid_pci.c
34514+++ b/arch/x86/pci/intel_mid_pci.c
34515@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34516 pci_mmcfg_late_init();
34517 pcibios_enable_irq = intel_mid_pci_irq_enable;
34518 pcibios_disable_irq = intel_mid_pci_irq_disable;
34519- pci_root_ops = intel_mid_pci_ops;
34520+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34521 pci_soc_mode = 1;
34522 /* Continue with standard init */
34523 return 1;
34524diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34525index 5dc6ca5..25c03f5 100644
34526--- a/arch/x86/pci/irq.c
34527+++ b/arch/x86/pci/irq.c
34528@@ -51,7 +51,7 @@ struct irq_router {
34529 struct irq_router_handler {
34530 u16 vendor;
34531 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34532-};
34533+} __do_const;
34534
34535 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34536 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34537@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34538 return 0;
34539 }
34540
34541-static __initdata struct irq_router_handler pirq_routers[] = {
34542+static __initconst const struct irq_router_handler pirq_routers[] = {
34543 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34544 { PCI_VENDOR_ID_AL, ali_router_probe },
34545 { PCI_VENDOR_ID_ITE, ite_router_probe },
34546@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34547 static void __init pirq_find_router(struct irq_router *r)
34548 {
34549 struct irq_routing_table *rt = pirq_table;
34550- struct irq_router_handler *h;
34551+ const struct irq_router_handler *h;
34552
34553 #ifdef CONFIG_PCI_BIOS
34554 if (!rt->signature) {
34555@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34556 return 0;
34557 }
34558
34559-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34560+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34561 {
34562 .callback = fix_broken_hp_bios_irq9,
34563 .ident = "HP Pavilion N5400 Series Laptop",
34564diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34565index 9b83b90..4112152 100644
34566--- a/arch/x86/pci/pcbios.c
34567+++ b/arch/x86/pci/pcbios.c
34568@@ -79,7 +79,7 @@ union bios32 {
34569 static struct {
34570 unsigned long address;
34571 unsigned short segment;
34572-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34573+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34574
34575 /*
34576 * Returns the entry point for the given service, NULL on error
34577@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34578 unsigned long length; /* %ecx */
34579 unsigned long entry; /* %edx */
34580 unsigned long flags;
34581+ struct desc_struct d, *gdt;
34582
34583 local_irq_save(flags);
34584- __asm__("lcall *(%%edi); cld"
34585+
34586+ gdt = get_cpu_gdt_table(smp_processor_id());
34587+
34588+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34589+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34590+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34591+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34592+
34593+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34594 : "=a" (return_code),
34595 "=b" (address),
34596 "=c" (length),
34597 "=d" (entry)
34598 : "0" (service),
34599 "1" (0),
34600- "D" (&bios32_indirect));
34601+ "D" (&bios32_indirect),
34602+ "r"(__PCIBIOS_DS)
34603+ : "memory");
34604+
34605+ pax_open_kernel();
34606+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34607+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34608+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34609+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34610+ pax_close_kernel();
34611+
34612 local_irq_restore(flags);
34613
34614 switch (return_code) {
34615- case 0:
34616- return address + entry;
34617- case 0x80: /* Not present */
34618- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34619- return 0;
34620- default: /* Shouldn't happen */
34621- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34622- service, return_code);
34623+ case 0: {
34624+ int cpu;
34625+ unsigned char flags;
34626+
34627+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34628+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34629+ printk(KERN_WARNING "bios32_service: not valid\n");
34630 return 0;
34631+ }
34632+ address = address + PAGE_OFFSET;
34633+ length += 16UL; /* some BIOSs underreport this... */
34634+ flags = 4;
34635+ if (length >= 64*1024*1024) {
34636+ length >>= PAGE_SHIFT;
34637+ flags |= 8;
34638+ }
34639+
34640+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34641+ gdt = get_cpu_gdt_table(cpu);
34642+ pack_descriptor(&d, address, length, 0x9b, flags);
34643+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34644+ pack_descriptor(&d, address, length, 0x93, flags);
34645+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34646+ }
34647+ return entry;
34648+ }
34649+ case 0x80: /* Not present */
34650+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34651+ return 0;
34652+ default: /* Shouldn't happen */
34653+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34654+ service, return_code);
34655+ return 0;
34656 }
34657 }
34658
34659 static struct {
34660 unsigned long address;
34661 unsigned short segment;
34662-} pci_indirect = { 0, __KERNEL_CS };
34663+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34664
34665-static int pci_bios_present;
34666+static int pci_bios_present __read_only;
34667
34668 static int __init check_pcibios(void)
34669 {
34670@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34671 unsigned long flags, pcibios_entry;
34672
34673 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34674- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34675+ pci_indirect.address = pcibios_entry;
34676
34677 local_irq_save(flags);
34678- __asm__(
34679- "lcall *(%%edi); cld\n\t"
34680+ __asm__("movw %w6, %%ds\n\t"
34681+ "lcall *%%ss:(%%edi); cld\n\t"
34682+ "push %%ss\n\t"
34683+ "pop %%ds\n\t"
34684 "jc 1f\n\t"
34685 "xor %%ah, %%ah\n"
34686 "1:"
34687@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34688 "=b" (ebx),
34689 "=c" (ecx)
34690 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34691- "D" (&pci_indirect)
34692+ "D" (&pci_indirect),
34693+ "r" (__PCIBIOS_DS)
34694 : "memory");
34695 local_irq_restore(flags);
34696
34697@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34698
34699 switch (len) {
34700 case 1:
34701- __asm__("lcall *(%%esi); cld\n\t"
34702+ __asm__("movw %w6, %%ds\n\t"
34703+ "lcall *%%ss:(%%esi); cld\n\t"
34704+ "push %%ss\n\t"
34705+ "pop %%ds\n\t"
34706 "jc 1f\n\t"
34707 "xor %%ah, %%ah\n"
34708 "1:"
34709@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34710 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34711 "b" (bx),
34712 "D" ((long)reg),
34713- "S" (&pci_indirect));
34714+ "S" (&pci_indirect),
34715+ "r" (__PCIBIOS_DS));
34716 /*
34717 * Zero-extend the result beyond 8 bits, do not trust the
34718 * BIOS having done it:
34719@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34720 *value &= 0xff;
34721 break;
34722 case 2:
34723- __asm__("lcall *(%%esi); cld\n\t"
34724+ __asm__("movw %w6, %%ds\n\t"
34725+ "lcall *%%ss:(%%esi); cld\n\t"
34726+ "push %%ss\n\t"
34727+ "pop %%ds\n\t"
34728 "jc 1f\n\t"
34729 "xor %%ah, %%ah\n"
34730 "1:"
34731@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34732 : "1" (PCIBIOS_READ_CONFIG_WORD),
34733 "b" (bx),
34734 "D" ((long)reg),
34735- "S" (&pci_indirect));
34736+ "S" (&pci_indirect),
34737+ "r" (__PCIBIOS_DS));
34738 /*
34739 * Zero-extend the result beyond 16 bits, do not trust the
34740 * BIOS having done it:
34741@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34742 *value &= 0xffff;
34743 break;
34744 case 4:
34745- __asm__("lcall *(%%esi); cld\n\t"
34746+ __asm__("movw %w6, %%ds\n\t"
34747+ "lcall *%%ss:(%%esi); cld\n\t"
34748+ "push %%ss\n\t"
34749+ "pop %%ds\n\t"
34750 "jc 1f\n\t"
34751 "xor %%ah, %%ah\n"
34752 "1:"
34753@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34754 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34755 "b" (bx),
34756 "D" ((long)reg),
34757- "S" (&pci_indirect));
34758+ "S" (&pci_indirect),
34759+ "r" (__PCIBIOS_DS));
34760 break;
34761 }
34762
34763@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34764
34765 switch (len) {
34766 case 1:
34767- __asm__("lcall *(%%esi); cld\n\t"
34768+ __asm__("movw %w6, %%ds\n\t"
34769+ "lcall *%%ss:(%%esi); cld\n\t"
34770+ "push %%ss\n\t"
34771+ "pop %%ds\n\t"
34772 "jc 1f\n\t"
34773 "xor %%ah, %%ah\n"
34774 "1:"
34775@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34776 "c" (value),
34777 "b" (bx),
34778 "D" ((long)reg),
34779- "S" (&pci_indirect));
34780+ "S" (&pci_indirect),
34781+ "r" (__PCIBIOS_DS));
34782 break;
34783 case 2:
34784- __asm__("lcall *(%%esi); cld\n\t"
34785+ __asm__("movw %w6, %%ds\n\t"
34786+ "lcall *%%ss:(%%esi); cld\n\t"
34787+ "push %%ss\n\t"
34788+ "pop %%ds\n\t"
34789 "jc 1f\n\t"
34790 "xor %%ah, %%ah\n"
34791 "1:"
34792@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34793 "c" (value),
34794 "b" (bx),
34795 "D" ((long)reg),
34796- "S" (&pci_indirect));
34797+ "S" (&pci_indirect),
34798+ "r" (__PCIBIOS_DS));
34799 break;
34800 case 4:
34801- __asm__("lcall *(%%esi); cld\n\t"
34802+ __asm__("movw %w6, %%ds\n\t"
34803+ "lcall *%%ss:(%%esi); cld\n\t"
34804+ "push %%ss\n\t"
34805+ "pop %%ds\n\t"
34806 "jc 1f\n\t"
34807 "xor %%ah, %%ah\n"
34808 "1:"
34809@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34810 "c" (value),
34811 "b" (bx),
34812 "D" ((long)reg),
34813- "S" (&pci_indirect));
34814+ "S" (&pci_indirect),
34815+ "r" (__PCIBIOS_DS));
34816 break;
34817 }
34818
34819@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34820
34821 DBG("PCI: Fetching IRQ routing table... ");
34822 __asm__("push %%es\n\t"
34823+ "movw %w8, %%ds\n\t"
34824 "push %%ds\n\t"
34825 "pop %%es\n\t"
34826- "lcall *(%%esi); cld\n\t"
34827+ "lcall *%%ss:(%%esi); cld\n\t"
34828 "pop %%es\n\t"
34829+ "push %%ss\n\t"
34830+ "pop %%ds\n"
34831 "jc 1f\n\t"
34832 "xor %%ah, %%ah\n"
34833 "1:"
34834@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34835 "1" (0),
34836 "D" ((long) &opt),
34837 "S" (&pci_indirect),
34838- "m" (opt)
34839+ "m" (opt),
34840+ "r" (__PCIBIOS_DS)
34841 : "memory");
34842 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34843 if (ret & 0xff00)
34844@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34845 {
34846 int ret;
34847
34848- __asm__("lcall *(%%esi); cld\n\t"
34849+ __asm__("movw %w5, %%ds\n\t"
34850+ "lcall *%%ss:(%%esi); cld\n\t"
34851+ "push %%ss\n\t"
34852+ "pop %%ds\n"
34853 "jc 1f\n\t"
34854 "xor %%ah, %%ah\n"
34855 "1:"
34856@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34857 : "0" (PCIBIOS_SET_PCI_HW_INT),
34858 "b" ((dev->bus->number << 8) | dev->devfn),
34859 "c" ((irq << 8) | (pin + 10)),
34860- "S" (&pci_indirect));
34861+ "S" (&pci_indirect),
34862+ "r" (__PCIBIOS_DS));
34863 return !(ret & 0xff00);
34864 }
34865 EXPORT_SYMBOL(pcibios_set_irq_routing);
34866diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34867index 40e7cda..c7e6672 100644
34868--- a/arch/x86/platform/efi/efi_32.c
34869+++ b/arch/x86/platform/efi/efi_32.c
34870@@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34871 {
34872 struct desc_ptr gdt_descr;
34873
34874+#ifdef CONFIG_PAX_KERNEXEC
34875+ struct desc_struct d;
34876+#endif
34877+
34878 local_irq_save(efi_rt_eflags);
34879
34880 load_cr3(initial_page_table);
34881 __flush_tlb_all();
34882
34883+#ifdef CONFIG_PAX_KERNEXEC
34884+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34885+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34886+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34887+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34888+#endif
34889+
34890 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34891 gdt_descr.size = GDT_SIZE - 1;
34892 load_gdt(&gdt_descr);
34893@@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34894 {
34895 struct desc_ptr gdt_descr;
34896
34897+#ifdef CONFIG_PAX_KERNEXEC
34898+ struct desc_struct d;
34899+
34900+ memset(&d, 0, sizeof d);
34901+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34902+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34903+#endif
34904+
34905 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34906 gdt_descr.size = GDT_SIZE - 1;
34907 load_gdt(&gdt_descr);
34908
34909+#ifdef CONFIG_PAX_PER_CPU_PGD
34910+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34911+#else
34912 load_cr3(swapper_pg_dir);
34913+#endif
34914+
34915 __flush_tlb_all();
34916
34917 local_irq_restore(efi_rt_eflags);
34918diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34919index 17e80d8..9fa6e41 100644
34920--- a/arch/x86/platform/efi/efi_64.c
34921+++ b/arch/x86/platform/efi/efi_64.c
34922@@ -98,6 +98,11 @@ void __init efi_call_phys_prolog(void)
34923 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34924 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34925 }
34926+
34927+#ifdef CONFIG_PAX_PER_CPU_PGD
34928+ load_cr3(swapper_pg_dir);
34929+#endif
34930+
34931 __flush_tlb_all();
34932 }
34933
34934@@ -115,6 +120,11 @@ void __init efi_call_phys_epilog(void)
34935 for (pgd = 0; pgd < n_pgds; pgd++)
34936 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34937 kfree(save_pgd);
34938+
34939+#ifdef CONFIG_PAX_PER_CPU_PGD
34940+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34941+#endif
34942+
34943 __flush_tlb_all();
34944 local_irq_restore(efi_flags);
34945 early_code_mapping_set_exec(0);
34946@@ -145,8 +155,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34947 unsigned npages;
34948 pgd_t *pgd;
34949
34950- if (efi_enabled(EFI_OLD_MEMMAP))
34951+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34952+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34953+ * able to execute the EFI services.
34954+ */
34955+ if (__supported_pte_mask & _PAGE_NX) {
34956+ unsigned long addr = (unsigned long) __va(0);
34957+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34958+
34959+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34960+#ifdef CONFIG_PAX_PER_CPU_PGD
34961+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34962+#endif
34963+ set_pgd(pgd_offset_k(addr), pe);
34964+ }
34965+
34966 return 0;
34967+ }
34968
34969 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34970 pgd = __va(efi_scratch.efi_pgt);
34971diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34972index 040192b..7d3300f 100644
34973--- a/arch/x86/platform/efi/efi_stub_32.S
34974+++ b/arch/x86/platform/efi/efi_stub_32.S
34975@@ -6,7 +6,9 @@
34976 */
34977
34978 #include <linux/linkage.h>
34979+#include <linux/init.h>
34980 #include <asm/page_types.h>
34981+#include <asm/segment.h>
34982
34983 /*
34984 * efi_call_phys(void *, ...) is a function with variable parameters.
34985@@ -20,7 +22,7 @@
34986 * service functions will comply with gcc calling convention, too.
34987 */
34988
34989-.text
34990+__INIT
34991 ENTRY(efi_call_phys)
34992 /*
34993 * 0. The function can only be called in Linux kernel. So CS has been
34994@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34995 * The mapping of lower virtual memory has been created in prolog and
34996 * epilog.
34997 */
34998- movl $1f, %edx
34999- subl $__PAGE_OFFSET, %edx
35000- jmp *%edx
35001+#ifdef CONFIG_PAX_KERNEXEC
35002+ movl $(__KERNEXEC_EFI_DS), %edx
35003+ mov %edx, %ds
35004+ mov %edx, %es
35005+ mov %edx, %ss
35006+ addl $2f,(1f)
35007+ ljmp *(1f)
35008+
35009+__INITDATA
35010+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
35011+.previous
35012+
35013+2:
35014+ subl $2b,(1b)
35015+#else
35016+ jmp 1f-__PAGE_OFFSET
35017 1:
35018+#endif
35019
35020 /*
35021 * 2. Now on the top of stack is the return
35022@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
35023 * parameter 2, ..., param n. To make things easy, we save the return
35024 * address of efi_call_phys in a global variable.
35025 */
35026- popl %edx
35027- movl %edx, saved_return_addr
35028- /* get the function pointer into ECX*/
35029- popl %ecx
35030- movl %ecx, efi_rt_function_ptr
35031- movl $2f, %edx
35032- subl $__PAGE_OFFSET, %edx
35033- pushl %edx
35034+ popl (saved_return_addr)
35035+ popl (efi_rt_function_ptr)
35036
35037 /*
35038 * 3. Clear PG bit in %CR0.
35039@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
35040 /*
35041 * 5. Call the physical function.
35042 */
35043- jmp *%ecx
35044+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
35045
35046-2:
35047 /*
35048 * 6. After EFI runtime service returns, control will return to
35049 * following instruction. We'd better readjust stack pointer first.
35050@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
35051 movl %cr0, %edx
35052 orl $0x80000000, %edx
35053 movl %edx, %cr0
35054- jmp 1f
35055-1:
35056+
35057 /*
35058 * 8. Now restore the virtual mode from flat mode by
35059 * adding EIP with PAGE_OFFSET.
35060 */
35061- movl $1f, %edx
35062- jmp *%edx
35063+#ifdef CONFIG_PAX_KERNEXEC
35064+ movl $(__KERNEL_DS), %edx
35065+ mov %edx, %ds
35066+ mov %edx, %es
35067+ mov %edx, %ss
35068+ ljmp $(__KERNEL_CS),$1f
35069+#else
35070+ jmp 1f+__PAGE_OFFSET
35071+#endif
35072 1:
35073
35074 /*
35075 * 9. Balance the stack. And because EAX contain the return value,
35076 * we'd better not clobber it.
35077 */
35078- leal efi_rt_function_ptr, %edx
35079- movl (%edx), %ecx
35080- pushl %ecx
35081+ pushl (efi_rt_function_ptr)
35082
35083 /*
35084- * 10. Push the saved return address onto the stack and return.
35085+ * 10. Return to the saved return address.
35086 */
35087- leal saved_return_addr, %edx
35088- movl (%edx), %ecx
35089- pushl %ecx
35090- ret
35091+ jmpl *(saved_return_addr)
35092 ENDPROC(efi_call_phys)
35093 .previous
35094
35095-.data
35096+__INITDATA
35097 saved_return_addr:
35098 .long 0
35099 efi_rt_function_ptr:
35100diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
35101index 86d0f9e..6d499f4 100644
35102--- a/arch/x86/platform/efi/efi_stub_64.S
35103+++ b/arch/x86/platform/efi/efi_stub_64.S
35104@@ -11,6 +11,7 @@
35105 #include <asm/msr.h>
35106 #include <asm/processor-flags.h>
35107 #include <asm/page_types.h>
35108+#include <asm/alternative-asm.h>
35109
35110 #define SAVE_XMM \
35111 mov %rsp, %rax; \
35112@@ -88,6 +89,7 @@ ENTRY(efi_call)
35113 RESTORE_PGT
35114 addq $48, %rsp
35115 RESTORE_XMM
35116+ pax_force_retaddr 0, 1
35117 ret
35118 ENDPROC(efi_call)
35119
35120diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35121index 3005f0c..d06aeb0 100644
35122--- a/arch/x86/platform/intel-mid/intel-mid.c
35123+++ b/arch/x86/platform/intel-mid/intel-mid.c
35124@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
35125 /* intel_mid_ops to store sub arch ops */
35126 struct intel_mid_ops *intel_mid_ops;
35127 /* getter function for sub arch ops*/
35128-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35129+static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35130 enum intel_mid_cpu_type __intel_mid_cpu_chip;
35131 EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
35132
35133@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35134 {
35135 };
35136
35137-static void intel_mid_reboot(void)
35138+static void __noreturn intel_mid_reboot(void)
35139 {
35140 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35141+ BUG();
35142 }
35143
35144 static unsigned long __init intel_mid_calibrate_tsc(void)
35145diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35146index 3c1c386..59a68ed 100644
35147--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35148+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35149@@ -13,6 +13,6 @@
35150 /* For every CPU addition a new get_<cpuname>_ops interface needs
35151 * to be added.
35152 */
35153-extern void *get_penwell_ops(void);
35154-extern void *get_cloverview_ops(void);
35155-extern void *get_tangier_ops(void);
35156+extern const void *get_penwell_ops(void);
35157+extern const void *get_cloverview_ops(void);
35158+extern const void *get_tangier_ops(void);
35159diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35160index 23381d2..8ddc10e 100644
35161--- a/arch/x86/platform/intel-mid/mfld.c
35162+++ b/arch/x86/platform/intel-mid/mfld.c
35163@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35164 pm_power_off = mfld_power_off;
35165 }
35166
35167-void *get_penwell_ops(void)
35168+const void *get_penwell_ops(void)
35169 {
35170 return &penwell_ops;
35171 }
35172
35173-void *get_cloverview_ops(void)
35174+const void *get_cloverview_ops(void)
35175 {
35176 return &penwell_ops;
35177 }
35178diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35179index aaca917..66eadbc 100644
35180--- a/arch/x86/platform/intel-mid/mrfl.c
35181+++ b/arch/x86/platform/intel-mid/mrfl.c
35182@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35183 .arch_setup = tangier_arch_setup,
35184 };
35185
35186-void *get_tangier_ops(void)
35187+const void *get_tangier_ops(void)
35188 {
35189 return &tangier_ops;
35190 }
35191diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
35192index c9a0838..fae0977 100644
35193--- a/arch/x86/platform/intel-quark/imr_selftest.c
35194+++ b/arch/x86/platform/intel-quark/imr_selftest.c
35195@@ -54,7 +54,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
35196 */
35197 static void __init imr_self_test(void)
35198 {
35199- phys_addr_t base = virt_to_phys(&_text);
35200+ phys_addr_t base = virt_to_phys(ktla_ktva(_text));
35201 size_t size = virt_to_phys(&__end_rodata) - base;
35202 const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
35203 int ret;
35204diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35205index d6ee929..3637cb5 100644
35206--- a/arch/x86/platform/olpc/olpc_dt.c
35207+++ b/arch/x86/platform/olpc/olpc_dt.c
35208@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35209 return res;
35210 }
35211
35212-static struct of_pdt_ops prom_olpc_ops __initdata = {
35213+static struct of_pdt_ops prom_olpc_ops __initconst = {
35214 .nextprop = olpc_dt_nextprop,
35215 .getproplen = olpc_dt_getproplen,
35216 .getproperty = olpc_dt_getproperty,
35217diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35218index 3e32ed5..cc0adc5 100644
35219--- a/arch/x86/power/cpu.c
35220+++ b/arch/x86/power/cpu.c
35221@@ -134,11 +134,8 @@ static void do_fpu_end(void)
35222 static void fix_processor_context(void)
35223 {
35224 int cpu = smp_processor_id();
35225- struct tss_struct *t = &per_cpu(init_tss, cpu);
35226-#ifdef CONFIG_X86_64
35227- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35228- tss_desc tss;
35229-#endif
35230+ struct tss_struct *t = init_tss + cpu;
35231+
35232 set_tss_desc(cpu, t); /*
35233 * This just modifies memory; should not be
35234 * necessary. But... This is necessary, because
35235@@ -147,10 +144,6 @@ static void fix_processor_context(void)
35236 */
35237
35238 #ifdef CONFIG_X86_64
35239- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35240- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35241- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35242-
35243 syscall_init(); /* This sets MSR_*STAR and related */
35244 #endif
35245 load_TR_desc(); /* This does ltr */
35246diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35247index 0b7a63d..0d0f2c2 100644
35248--- a/arch/x86/realmode/init.c
35249+++ b/arch/x86/realmode/init.c
35250@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35251 __va(real_mode_header->trampoline_header);
35252
35253 #ifdef CONFIG_X86_32
35254- trampoline_header->start = __pa_symbol(startup_32_smp);
35255+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35256+
35257+#ifdef CONFIG_PAX_KERNEXEC
35258+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35259+#endif
35260+
35261+ trampoline_header->boot_cs = __BOOT_CS;
35262 trampoline_header->gdt_limit = __BOOT_DS + 7;
35263 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35264 #else
35265@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35266 *trampoline_cr4_features = __read_cr4();
35267
35268 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35269- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35270+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35271 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35272 #endif
35273 }
35274diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35275index 2730d77..2e4cd19 100644
35276--- a/arch/x86/realmode/rm/Makefile
35277+++ b/arch/x86/realmode/rm/Makefile
35278@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35279
35280 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35281 -I$(srctree)/arch/x86/boot
35282+ifdef CONSTIFY_PLUGIN
35283+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35284+endif
35285 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35286 GCOV_PROFILE := n
35287diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35288index a28221d..93c40f1 100644
35289--- a/arch/x86/realmode/rm/header.S
35290+++ b/arch/x86/realmode/rm/header.S
35291@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35292 #endif
35293 /* APM/BIOS reboot */
35294 .long pa_machine_real_restart_asm
35295-#ifdef CONFIG_X86_64
35296+#ifdef CONFIG_X86_32
35297+ .long __KERNEL_CS
35298+#else
35299 .long __KERNEL32_CS
35300 #endif
35301 END(real_mode_header)
35302diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
35303index d66c607..3def845 100644
35304--- a/arch/x86/realmode/rm/reboot.S
35305+++ b/arch/x86/realmode/rm/reboot.S
35306@@ -27,6 +27,10 @@ ENTRY(machine_real_restart_asm)
35307 lgdtl pa_tr_gdt
35308
35309 /* Disable paging to drop us out of long mode */
35310+ movl %cr4, %eax
35311+ andl $~X86_CR4_PCIDE, %eax
35312+ movl %eax, %cr4
35313+
35314 movl %cr0, %eax
35315 andl $~X86_CR0_PG, %eax
35316 movl %eax, %cr0
35317diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35318index 48ddd76..c26749f 100644
35319--- a/arch/x86/realmode/rm/trampoline_32.S
35320+++ b/arch/x86/realmode/rm/trampoline_32.S
35321@@ -24,6 +24,12 @@
35322 #include <asm/page_types.h>
35323 #include "realmode.h"
35324
35325+#ifdef CONFIG_PAX_KERNEXEC
35326+#define ta(X) (X)
35327+#else
35328+#define ta(X) (pa_ ## X)
35329+#endif
35330+
35331 .text
35332 .code16
35333
35334@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35335
35336 cli # We should be safe anyway
35337
35338- movl tr_start, %eax # where we need to go
35339-
35340 movl $0xA5A5A5A5, trampoline_status
35341 # write marker for master knows we're running
35342
35343@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35344 movw $1, %dx # protected mode (PE) bit
35345 lmsw %dx # into protected mode
35346
35347- ljmpl $__BOOT_CS, $pa_startup_32
35348+ ljmpl *(trampoline_header)
35349
35350 .section ".text32","ax"
35351 .code32
35352@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35353 .balign 8
35354 GLOBAL(trampoline_header)
35355 tr_start: .space 4
35356- tr_gdt_pad: .space 2
35357+ tr_boot_cs: .space 2
35358 tr_gdt: .space 6
35359 END(trampoline_header)
35360
35361diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35362index dac7b20..72dbaca 100644
35363--- a/arch/x86/realmode/rm/trampoline_64.S
35364+++ b/arch/x86/realmode/rm/trampoline_64.S
35365@@ -93,6 +93,7 @@ ENTRY(startup_32)
35366 movl %edx, %gs
35367
35368 movl pa_tr_cr4, %eax
35369+ andl $~X86_CR4_PCIDE, %eax
35370 movl %eax, %cr4 # Enable PAE mode
35371
35372 # Setup trampoline 4 level pagetables
35373@@ -106,7 +107,7 @@ ENTRY(startup_32)
35374 wrmsr
35375
35376 # Enable paging and in turn activate Long Mode
35377- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35378+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35379 movl %eax, %cr0
35380
35381 /*
35382diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35383index 9e7e147..25a4158 100644
35384--- a/arch/x86/realmode/rm/wakeup_asm.S
35385+++ b/arch/x86/realmode/rm/wakeup_asm.S
35386@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35387 lgdtl pmode_gdt
35388
35389 /* This really couldn't... */
35390- movl pmode_entry, %eax
35391 movl pmode_cr0, %ecx
35392 movl %ecx, %cr0
35393- ljmpl $__KERNEL_CS, $pa_startup_32
35394- /* -> jmp *%eax in trampoline_32.S */
35395+
35396+ ljmpl *pmode_entry
35397 #else
35398 jmp trampoline_start
35399 #endif
35400diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35401index 604a37e..e49702a 100644
35402--- a/arch/x86/tools/Makefile
35403+++ b/arch/x86/tools/Makefile
35404@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35405
35406 $(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
35407
35408-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35409+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35410 hostprogs-y += relocs
35411 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35412 PHONY += relocs
35413diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35414index 0c2fae8..88036b7 100644
35415--- a/arch/x86/tools/relocs.c
35416+++ b/arch/x86/tools/relocs.c
35417@@ -1,5 +1,7 @@
35418 /* This is included from relocs_32/64.c */
35419
35420+#include "../../../include/generated/autoconf.h"
35421+
35422 #define ElfW(type) _ElfW(ELF_BITS, type)
35423 #define _ElfW(bits, type) __ElfW(bits, type)
35424 #define __ElfW(bits, type) Elf##bits##_##type
35425@@ -11,6 +13,7 @@
35426 #define Elf_Sym ElfW(Sym)
35427
35428 static Elf_Ehdr ehdr;
35429+static Elf_Phdr *phdr;
35430
35431 struct relocs {
35432 uint32_t *offset;
35433@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35434 }
35435 }
35436
35437+static void read_phdrs(FILE *fp)
35438+{
35439+ unsigned int i;
35440+
35441+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35442+ if (!phdr) {
35443+ die("Unable to allocate %d program headers\n",
35444+ ehdr.e_phnum);
35445+ }
35446+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35447+ die("Seek to %d failed: %s\n",
35448+ ehdr.e_phoff, strerror(errno));
35449+ }
35450+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35451+ die("Cannot read ELF program headers: %s\n",
35452+ strerror(errno));
35453+ }
35454+ for(i = 0; i < ehdr.e_phnum; i++) {
35455+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35456+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35457+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35458+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35459+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35460+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35461+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35462+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35463+ }
35464+
35465+}
35466+
35467 static void read_shdrs(FILE *fp)
35468 {
35469- int i;
35470+ unsigned int i;
35471 Elf_Shdr shdr;
35472
35473 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35474@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35475
35476 static void read_strtabs(FILE *fp)
35477 {
35478- int i;
35479+ unsigned int i;
35480 for (i = 0; i < ehdr.e_shnum; i++) {
35481 struct section *sec = &secs[i];
35482 if (sec->shdr.sh_type != SHT_STRTAB) {
35483@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35484
35485 static void read_symtabs(FILE *fp)
35486 {
35487- int i,j;
35488+ unsigned int i,j;
35489 for (i = 0; i < ehdr.e_shnum; i++) {
35490 struct section *sec = &secs[i];
35491 if (sec->shdr.sh_type != SHT_SYMTAB) {
35492@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35493 }
35494
35495
35496-static void read_relocs(FILE *fp)
35497+static void read_relocs(FILE *fp, int use_real_mode)
35498 {
35499- int i,j;
35500+ unsigned int i,j;
35501+ uint32_t base;
35502+
35503 for (i = 0; i < ehdr.e_shnum; i++) {
35504 struct section *sec = &secs[i];
35505 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35506@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35507 die("Cannot read symbol table: %s\n",
35508 strerror(errno));
35509 }
35510+ base = 0;
35511+
35512+#ifdef CONFIG_X86_32
35513+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35514+ if (phdr[j].p_type != PT_LOAD )
35515+ continue;
35516+ 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)
35517+ continue;
35518+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35519+ break;
35520+ }
35521+#endif
35522+
35523 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35524 Elf_Rel *rel = &sec->reltab[j];
35525- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35526+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35527 rel->r_info = elf_xword_to_cpu(rel->r_info);
35528 #if (SHT_REL_TYPE == SHT_RELA)
35529 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35530@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35531
35532 static void print_absolute_symbols(void)
35533 {
35534- int i;
35535+ unsigned int i;
35536 const char *format;
35537
35538 if (ELF_BITS == 64)
35539@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35540 for (i = 0; i < ehdr.e_shnum; i++) {
35541 struct section *sec = &secs[i];
35542 char *sym_strtab;
35543- int j;
35544+ unsigned int j;
35545
35546 if (sec->shdr.sh_type != SHT_SYMTAB) {
35547 continue;
35548@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35549
35550 static void print_absolute_relocs(void)
35551 {
35552- int i, printed = 0;
35553+ unsigned int i, printed = 0;
35554 const char *format;
35555
35556 if (ELF_BITS == 64)
35557@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35558 struct section *sec_applies, *sec_symtab;
35559 char *sym_strtab;
35560 Elf_Sym *sh_symtab;
35561- int j;
35562+ unsigned int j;
35563 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35564 continue;
35565 }
35566@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35567 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35568 Elf_Sym *sym, const char *symname))
35569 {
35570- int i;
35571+ unsigned int i;
35572 /* Walk through the relocations */
35573 for (i = 0; i < ehdr.e_shnum; i++) {
35574 char *sym_strtab;
35575 Elf_Sym *sh_symtab;
35576 struct section *sec_applies, *sec_symtab;
35577- int j;
35578+ unsigned int j;
35579 struct section *sec = &secs[i];
35580
35581 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35582@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35583 {
35584 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35585 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35586+ char *sym_strtab = sec->link->link->strtab;
35587+
35588+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35589+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35590+ return 0;
35591+
35592+#ifdef CONFIG_PAX_KERNEXEC
35593+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35594+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35595+ return 0;
35596+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35597+ return 0;
35598+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35599+ return 0;
35600+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35601+ return 0;
35602+#endif
35603
35604 switch (r_type) {
35605 case R_386_NONE:
35606@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35607
35608 static void emit_relocs(int as_text, int use_real_mode)
35609 {
35610- int i;
35611+ unsigned int i;
35612 int (*write_reloc)(uint32_t, FILE *) = write32;
35613 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35614 const char *symname);
35615@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35616 {
35617 regex_init(use_real_mode);
35618 read_ehdr(fp);
35619+ read_phdrs(fp);
35620 read_shdrs(fp);
35621 read_strtabs(fp);
35622 read_symtabs(fp);
35623- read_relocs(fp);
35624+ read_relocs(fp, use_real_mode);
35625 if (ELF_BITS == 64)
35626 percpu_init();
35627 if (show_absolute_syms) {
35628diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35629index f40281e..92728c9 100644
35630--- a/arch/x86/um/mem_32.c
35631+++ b/arch/x86/um/mem_32.c
35632@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35633 gate_vma.vm_start = FIXADDR_USER_START;
35634 gate_vma.vm_end = FIXADDR_USER_END;
35635 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35636- gate_vma.vm_page_prot = __P101;
35637+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35638
35639 return 0;
35640 }
35641diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35642index 80ffa5b..a33bd15 100644
35643--- a/arch/x86/um/tls_32.c
35644+++ b/arch/x86/um/tls_32.c
35645@@ -260,7 +260,7 @@ out:
35646 if (unlikely(task == current &&
35647 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35648 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35649- "without flushed TLS.", current->pid);
35650+ "without flushed TLS.", task_pid_nr(current));
35651 }
35652
35653 return 0;
35654diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35655index 8533c96..ff98c52 100644
35656--- a/arch/x86/vdso/Makefile
35657+++ b/arch/x86/vdso/Makefile
35658@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO $@
35659 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35660 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35661
35662-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35663+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35664 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35665 GCOV_PROFILE := n
35666
35667diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35668index 0224987..c7d65a5 100644
35669--- a/arch/x86/vdso/vdso2c.h
35670+++ b/arch/x86/vdso/vdso2c.h
35671@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35672 unsigned long load_size = -1; /* Work around bogus warning */
35673 unsigned long mapping_size;
35674 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35675- int i;
35676+ unsigned int i;
35677 unsigned long j;
35678 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35679 *alt_sec = NULL;
35680diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35681index e904c27..b9eaa03 100644
35682--- a/arch/x86/vdso/vdso32-setup.c
35683+++ b/arch/x86/vdso/vdso32-setup.c
35684@@ -14,6 +14,7 @@
35685 #include <asm/cpufeature.h>
35686 #include <asm/processor.h>
35687 #include <asm/vdso.h>
35688+#include <asm/mman.h>
35689
35690 #ifdef CONFIG_COMPAT_VDSO
35691 #define VDSO_DEFAULT 0
35692diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35693index 1c9f750..cfddb1a 100644
35694--- a/arch/x86/vdso/vma.c
35695+++ b/arch/x86/vdso/vma.c
35696@@ -19,10 +19,7 @@
35697 #include <asm/page.h>
35698 #include <asm/hpet.h>
35699 #include <asm/desc.h>
35700-
35701-#if defined(CONFIG_X86_64)
35702-unsigned int __read_mostly vdso64_enabled = 1;
35703-#endif
35704+#include <asm/mman.h>
35705
35706 void __init init_vdso_image(const struct vdso_image *image)
35707 {
35708@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35709 .pages = no_pages,
35710 };
35711
35712+#ifdef CONFIG_PAX_RANDMMAP
35713+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35714+ calculate_addr = false;
35715+#endif
35716+
35717 if (calculate_addr) {
35718 addr = vdso_addr(current->mm->start_stack,
35719 image->size - image->sym_vvar_start);
35720@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35721 down_write(&mm->mmap_sem);
35722
35723 addr = get_unmapped_area(NULL, addr,
35724- image->size - image->sym_vvar_start, 0, 0);
35725+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35726 if (IS_ERR_VALUE(addr)) {
35727 ret = addr;
35728 goto up_fail;
35729 }
35730
35731 text_start = addr - image->sym_vvar_start;
35732- current->mm->context.vdso = (void __user *)text_start;
35733+ mm->context.vdso = text_start;
35734
35735 /*
35736 * MAYWRITE to allow gdb to COW and set breakpoints
35737@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35738 hpet_address >> PAGE_SHIFT,
35739 PAGE_SIZE,
35740 pgprot_noncached(PAGE_READONLY));
35741-
35742- if (ret)
35743- goto up_fail;
35744 }
35745 #endif
35746
35747 up_fail:
35748 if (ret)
35749- current->mm->context.vdso = NULL;
35750+ current->mm->context.vdso = 0;
35751
35752 up_write(&mm->mmap_sem);
35753 return ret;
35754@@ -191,8 +190,8 @@ static int load_vdso32(void)
35755
35756 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35757 current_thread_info()->sysenter_return =
35758- current->mm->context.vdso +
35759- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35760+ (void __force_user *)(current->mm->context.vdso +
35761+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35762
35763 return 0;
35764 }
35765@@ -201,9 +200,6 @@ static int load_vdso32(void)
35766 #ifdef CONFIG_X86_64
35767 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35768 {
35769- if (!vdso64_enabled)
35770- return 0;
35771-
35772 return map_vdso(&vdso_image_64, true);
35773 }
35774
35775@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35776 int uses_interp)
35777 {
35778 #ifdef CONFIG_X86_X32_ABI
35779- if (test_thread_flag(TIF_X32)) {
35780- if (!vdso64_enabled)
35781- return 0;
35782-
35783+ if (test_thread_flag(TIF_X32))
35784 return map_vdso(&vdso_image_x32, true);
35785- }
35786 #endif
35787
35788 return load_vdso32();
35789@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35790 #endif
35791
35792 #ifdef CONFIG_X86_64
35793-static __init int vdso_setup(char *s)
35794-{
35795- vdso64_enabled = simple_strtoul(s, NULL, 0);
35796- return 0;
35797-}
35798-__setup("vdso=", vdso_setup);
35799-#endif
35800-
35801-#ifdef CONFIG_X86_64
35802 static void vgetcpu_cpu_init(void *arg)
35803 {
35804 int cpu = smp_processor_id();
35805diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35806index e88fda8..76ce7ce 100644
35807--- a/arch/x86/xen/Kconfig
35808+++ b/arch/x86/xen/Kconfig
35809@@ -9,6 +9,7 @@ config XEN
35810 select XEN_HAVE_PVMMU
35811 depends on X86_64 || (X86_32 && X86_PAE)
35812 depends on X86_TSC
35813+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35814 help
35815 This is the Linux Xen port. Enabling this will allow the
35816 kernel to boot in a paravirtualized environment under the
35817diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35818index 5240f56..0c12163 100644
35819--- a/arch/x86/xen/enlighten.c
35820+++ b/arch/x86/xen/enlighten.c
35821@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35822
35823 struct shared_info xen_dummy_shared_info;
35824
35825-void *xen_initial_gdt;
35826-
35827 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35828 __read_mostly int xen_have_vector_callback;
35829 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35830@@ -544,8 +542,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35831 {
35832 unsigned long va = dtr->address;
35833 unsigned int size = dtr->size + 1;
35834- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35835- unsigned long frames[pages];
35836+ unsigned long frames[65536 / PAGE_SIZE];
35837 int f;
35838
35839 /*
35840@@ -593,8 +590,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35841 {
35842 unsigned long va = dtr->address;
35843 unsigned int size = dtr->size + 1;
35844- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35845- unsigned long frames[pages];
35846+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35847 int f;
35848
35849 /*
35850@@ -602,7 +598,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35851 * 8-byte entries, or 16 4k pages..
35852 */
35853
35854- BUG_ON(size > 65536);
35855+ BUG_ON(size > GDT_SIZE);
35856 BUG_ON(va & ~PAGE_MASK);
35857
35858 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35859@@ -991,7 +987,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35860 return 0;
35861 }
35862
35863-static void set_xen_basic_apic_ops(void)
35864+static void __init set_xen_basic_apic_ops(void)
35865 {
35866 apic->read = xen_apic_read;
35867 apic->write = xen_apic_write;
35868@@ -1308,30 +1304,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35869 #endif
35870 };
35871
35872-static void xen_reboot(int reason)
35873+static __noreturn void xen_reboot(int reason)
35874 {
35875 struct sched_shutdown r = { .reason = reason };
35876
35877- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35878- BUG();
35879+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35880+ BUG();
35881 }
35882
35883-static void xen_restart(char *msg)
35884+static __noreturn void xen_restart(char *msg)
35885 {
35886 xen_reboot(SHUTDOWN_reboot);
35887 }
35888
35889-static void xen_emergency_restart(void)
35890+static __noreturn void xen_emergency_restart(void)
35891 {
35892 xen_reboot(SHUTDOWN_reboot);
35893 }
35894
35895-static void xen_machine_halt(void)
35896+static __noreturn void xen_machine_halt(void)
35897 {
35898 xen_reboot(SHUTDOWN_poweroff);
35899 }
35900
35901-static void xen_machine_power_off(void)
35902+static __noreturn void xen_machine_power_off(void)
35903 {
35904 if (pm_power_off)
35905 pm_power_off();
35906@@ -1484,8 +1480,11 @@ static void __ref xen_setup_gdt(int cpu)
35907 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35908 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35909
35910- setup_stack_canary_segment(0);
35911- switch_to_new_gdt(0);
35912+ setup_stack_canary_segment(cpu);
35913+#ifdef CONFIG_X86_64
35914+ load_percpu_segment(cpu);
35915+#endif
35916+ switch_to_new_gdt(cpu);
35917
35918 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35919 pv_cpu_ops.load_gdt = xen_load_gdt;
35920@@ -1600,7 +1599,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35921 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35922
35923 /* Work out if we support NX */
35924- x86_configure_nx();
35925+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35926+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35927+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35928+ unsigned l, h;
35929+
35930+ __supported_pte_mask |= _PAGE_NX;
35931+ rdmsr(MSR_EFER, l, h);
35932+ l |= EFER_NX;
35933+ wrmsr(MSR_EFER, l, h);
35934+ }
35935+#endif
35936
35937 /* Get mfn list */
35938 xen_build_dynamic_phys_to_machine();
35939@@ -1628,13 +1637,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35940
35941 machine_ops = xen_machine_ops;
35942
35943- /*
35944- * The only reliable way to retain the initial address of the
35945- * percpu gdt_page is to remember it here, so we can go and
35946- * mark it RW later, when the initial percpu area is freed.
35947- */
35948- xen_initial_gdt = &per_cpu(gdt_page, 0);
35949-
35950 xen_smp_init();
35951
35952 #ifdef CONFIG_ACPI_NUMA
35953diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35954index adca9e2..cdba9d1 100644
35955--- a/arch/x86/xen/mmu.c
35956+++ b/arch/x86/xen/mmu.c
35957@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35958 return val;
35959 }
35960
35961-static pteval_t pte_pfn_to_mfn(pteval_t val)
35962+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35963 {
35964 if (val & _PAGE_PRESENT) {
35965 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35966@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35967 * L3_k[511] -> level2_fixmap_pgt */
35968 convert_pfn_mfn(level3_kernel_pgt);
35969
35970+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35971+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35972+ convert_pfn_mfn(level3_vmemmap_pgt);
35973 /* L3_k[511][506] -> level1_fixmap_pgt */
35974+ /* L3_k[511][507] -> level1_vsyscall_pgt */
35975 convert_pfn_mfn(level2_fixmap_pgt);
35976 }
35977 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35978@@ -1860,11 +1864,18 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35979 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35980 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35981 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35982+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35983+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35984+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35985 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35986 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35987+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35988 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35989 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35990- set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35991+ set_page_prot(level1_fixmap_pgt[0], PAGE_KERNEL_RO);
35992+ set_page_prot(level1_fixmap_pgt[1], PAGE_KERNEL_RO);
35993+ set_page_prot(level1_fixmap_pgt[2], PAGE_KERNEL_RO);
35994+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35995
35996 /* Pin down new L4 */
35997 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35998@@ -2048,6 +2059,7 @@ static void __init xen_post_allocator_init(void)
35999 pv_mmu_ops.set_pud = xen_set_pud;
36000 #if PAGETABLE_LEVELS == 4
36001 pv_mmu_ops.set_pgd = xen_set_pgd;
36002+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
36003 #endif
36004
36005 /* This will work as long as patching hasn't happened yet
36006@@ -2126,6 +2138,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
36007 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
36008 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
36009 .set_pgd = xen_set_pgd_hyper,
36010+ .set_pgd_batched = xen_set_pgd_hyper,
36011
36012 .alloc_pud = xen_alloc_pmd_init,
36013 .release_pud = xen_release_pmd_init,
36014diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
36015index 08e8489..b1e182f 100644
36016--- a/arch/x86/xen/smp.c
36017+++ b/arch/x86/xen/smp.c
36018@@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
36019
36020 if (xen_pv_domain()) {
36021 if (!xen_feature(XENFEAT_writable_page_tables))
36022- /* We've switched to the "real" per-cpu gdt, so make
36023- * sure the old memory can be recycled. */
36024- make_lowmem_page_readwrite(xen_initial_gdt);
36025-
36026 #ifdef CONFIG_X86_32
36027 /*
36028 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
36029 * expects __USER_DS
36030 */
36031- loadsegment(ds, __USER_DS);
36032- loadsegment(es, __USER_DS);
36033+ loadsegment(ds, __KERNEL_DS);
36034+ loadsegment(es, __KERNEL_DS);
36035 #endif
36036
36037 xen_filter_cpu_maps();
36038@@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36039 #ifdef CONFIG_X86_32
36040 /* Note: PVH is not yet supported on x86_32. */
36041 ctxt->user_regs.fs = __KERNEL_PERCPU;
36042- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
36043+ savesegment(gs, ctxt->user_regs.gs);
36044 #endif
36045 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
36046
36047@@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36048 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
36049 ctxt->flags = VGCF_IN_KERNEL;
36050 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
36051- ctxt->user_regs.ds = __USER_DS;
36052- ctxt->user_regs.es = __USER_DS;
36053+ ctxt->user_regs.ds = __KERNEL_DS;
36054+ ctxt->user_regs.es = __KERNEL_DS;
36055 ctxt->user_regs.ss = __KERNEL_DS;
36056
36057 xen_copy_trap_info(ctxt->trap_ctxt);
36058@@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
36059 int rc;
36060
36061 per_cpu(current_task, cpu) = idle;
36062+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
36063 #ifdef CONFIG_X86_32
36064 irq_ctx_init(cpu);
36065 #else
36066 clear_tsk_thread_flag(idle, TIF_FORK);
36067 #endif
36068- per_cpu(kernel_stack, cpu) =
36069- (unsigned long)task_stack_page(idle) -
36070- KERNEL_STACK_OFFSET + THREAD_SIZE;
36071+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
36072
36073 xen_setup_runstate_info(cpu);
36074 xen_setup_timer(cpu);
36075@@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
36076
36077 void __init xen_smp_init(void)
36078 {
36079- smp_ops = xen_smp_ops;
36080+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
36081 xen_fill_possible_map();
36082 }
36083
36084diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
36085index fd92a64..1f72641 100644
36086--- a/arch/x86/xen/xen-asm_32.S
36087+++ b/arch/x86/xen/xen-asm_32.S
36088@@ -99,7 +99,7 @@ ENTRY(xen_iret)
36089 pushw %fs
36090 movl $(__KERNEL_PERCPU), %eax
36091 movl %eax, %fs
36092- movl %fs:xen_vcpu, %eax
36093+ mov PER_CPU_VAR(xen_vcpu), %eax
36094 POP_FS
36095 #else
36096 movl %ss:xen_vcpu, %eax
36097diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
36098index 674b2225..f1f5dc1 100644
36099--- a/arch/x86/xen/xen-head.S
36100+++ b/arch/x86/xen/xen-head.S
36101@@ -39,6 +39,17 @@ ENTRY(startup_xen)
36102 #ifdef CONFIG_X86_32
36103 mov %esi,xen_start_info
36104 mov $init_thread_union+THREAD_SIZE,%esp
36105+#ifdef CONFIG_SMP
36106+ movl $cpu_gdt_table,%edi
36107+ movl $__per_cpu_load,%eax
36108+ movw %ax,__KERNEL_PERCPU + 2(%edi)
36109+ rorl $16,%eax
36110+ movb %al,__KERNEL_PERCPU + 4(%edi)
36111+ movb %ah,__KERNEL_PERCPU + 7(%edi)
36112+ movl $__per_cpu_end - 1,%eax
36113+ subl $__per_cpu_start,%eax
36114+ movw %ax,__KERNEL_PERCPU + 0(%edi)
36115+#endif
36116 #else
36117 mov %rsi,xen_start_info
36118 mov $init_thread_union+THREAD_SIZE,%rsp
36119diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
36120index 9e195c6..523ed36 100644
36121--- a/arch/x86/xen/xen-ops.h
36122+++ b/arch/x86/xen/xen-ops.h
36123@@ -16,8 +16,6 @@ void xen_syscall_target(void);
36124 void xen_syscall32_target(void);
36125 #endif
36126
36127-extern void *xen_initial_gdt;
36128-
36129 struct trap_info;
36130 void xen_copy_trap_info(struct trap_info *traps);
36131
36132diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
36133index 525bd3d..ef888b1 100644
36134--- a/arch/xtensa/variants/dc232b/include/variant/core.h
36135+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
36136@@ -119,9 +119,9 @@
36137 ----------------------------------------------------------------------*/
36138
36139 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
36140-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
36141 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
36142 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
36143+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36144
36145 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
36146 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
36147diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
36148index 2f33760..835e50a 100644
36149--- a/arch/xtensa/variants/fsf/include/variant/core.h
36150+++ b/arch/xtensa/variants/fsf/include/variant/core.h
36151@@ -11,6 +11,7 @@
36152 #ifndef _XTENSA_CORE_H
36153 #define _XTENSA_CORE_H
36154
36155+#include <linux/const.h>
36156
36157 /****************************************************************************
36158 Parameters Useful for Any Code, USER or PRIVILEGED
36159@@ -112,9 +113,9 @@
36160 ----------------------------------------------------------------------*/
36161
36162 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36163-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36164 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36165 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36166+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36167
36168 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
36169 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
36170diff --git a/block/bio.c b/block/bio.c
36171index f66a4ea..73ddf55 100644
36172--- a/block/bio.c
36173+++ b/block/bio.c
36174@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36175 /*
36176 * Overflow, abort
36177 */
36178- if (end < start)
36179+ if (end < start || end - start > INT_MAX - nr_pages)
36180 return ERR_PTR(-EINVAL);
36181
36182 nr_pages += end - start;
36183@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
36184 /*
36185 * Overflow, abort
36186 */
36187- if (end < start)
36188+ if (end < start || end - start > INT_MAX - nr_pages)
36189 return ERR_PTR(-EINVAL);
36190
36191 nr_pages += end - start;
36192diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36193index 0736729..2ec3b48 100644
36194--- a/block/blk-iopoll.c
36195+++ b/block/blk-iopoll.c
36196@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36197 }
36198 EXPORT_SYMBOL(blk_iopoll_complete);
36199
36200-static void blk_iopoll_softirq(struct softirq_action *h)
36201+static __latent_entropy void blk_iopoll_softirq(void)
36202 {
36203 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36204 int rearm = 0, budget = blk_iopoll_budget;
36205diff --git a/block/blk-map.c b/block/blk-map.c
36206index b8d2725..08c52b0 100644
36207--- a/block/blk-map.c
36208+++ b/block/blk-map.c
36209@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36210 if (!len || !kbuf)
36211 return -EINVAL;
36212
36213- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36214+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36215 if (do_copy)
36216 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36217 else
36218diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36219index 53b1737..08177d2e 100644
36220--- a/block/blk-softirq.c
36221+++ b/block/blk-softirq.c
36222@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36223 * Softirq action handler - move entries to local list and loop over them
36224 * while passing them to the queue registered handler.
36225 */
36226-static void blk_done_softirq(struct softirq_action *h)
36227+static __latent_entropy void blk_done_softirq(void)
36228 {
36229 struct list_head *cpu_list, local_list;
36230
36231diff --git a/block/bsg.c b/block/bsg.c
36232index d214e92..9649863 100644
36233--- a/block/bsg.c
36234+++ b/block/bsg.c
36235@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36236 struct sg_io_v4 *hdr, struct bsg_device *bd,
36237 fmode_t has_write_perm)
36238 {
36239+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36240+ unsigned char *cmdptr;
36241+
36242 if (hdr->request_len > BLK_MAX_CDB) {
36243 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36244 if (!rq->cmd)
36245 return -ENOMEM;
36246- }
36247+ cmdptr = rq->cmd;
36248+ } else
36249+ cmdptr = tmpcmd;
36250
36251- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36252+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36253 hdr->request_len))
36254 return -EFAULT;
36255
36256+ if (cmdptr != rq->cmd)
36257+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36258+
36259 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36260 if (blk_verify_command(rq->cmd, has_write_perm))
36261 return -EPERM;
36262diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36263index f678c73..f35aa18 100644
36264--- a/block/compat_ioctl.c
36265+++ b/block/compat_ioctl.c
36266@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36267 cgc = compat_alloc_user_space(sizeof(*cgc));
36268 cgc32 = compat_ptr(arg);
36269
36270- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36271+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36272 get_user(data, &cgc32->buffer) ||
36273 put_user(compat_ptr(data), &cgc->buffer) ||
36274 copy_in_user(&cgc->buflen, &cgc32->buflen,
36275@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36276 err |= __get_user(f->spec1, &uf->spec1);
36277 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36278 err |= __get_user(name, &uf->name);
36279- f->name = compat_ptr(name);
36280+ f->name = (void __force_kernel *)compat_ptr(name);
36281 if (err) {
36282 err = -EFAULT;
36283 goto out;
36284diff --git a/block/genhd.c b/block/genhd.c
36285index ea982ea..86e0f9e 100644
36286--- a/block/genhd.c
36287+++ b/block/genhd.c
36288@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36289
36290 /*
36291 * Register device numbers dev..(dev+range-1)
36292- * range must be nonzero
36293+ * Noop if @range is zero.
36294 * The hash chain is sorted on range, so that subranges can override.
36295 */
36296 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36297 struct kobject *(*probe)(dev_t, int *, void *),
36298 int (*lock)(dev_t, void *), void *data)
36299 {
36300- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36301+ if (range)
36302+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36303 }
36304
36305 EXPORT_SYMBOL(blk_register_region);
36306
36307+/* undo blk_register_region(), noop if @range is zero */
36308 void blk_unregister_region(dev_t devt, unsigned long range)
36309 {
36310- kobj_unmap(bdev_map, devt, range);
36311+ if (range)
36312+ kobj_unmap(bdev_map, devt, range);
36313 }
36314
36315 EXPORT_SYMBOL(blk_unregister_region);
36316diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36317index 26cb624..a49c3a5 100644
36318--- a/block/partitions/efi.c
36319+++ b/block/partitions/efi.c
36320@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36321 if (!gpt)
36322 return NULL;
36323
36324+ if (!le32_to_cpu(gpt->num_partition_entries))
36325+ return NULL;
36326+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36327+ if (!pte)
36328+ return NULL;
36329+
36330 count = le32_to_cpu(gpt->num_partition_entries) *
36331 le32_to_cpu(gpt->sizeof_partition_entry);
36332- if (!count)
36333- return NULL;
36334- pte = kmalloc(count, GFP_KERNEL);
36335- if (!pte)
36336- return NULL;
36337-
36338 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36339 (u8 *) pte, count) < count) {
36340 kfree(pte);
36341diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36342index e1f71c3..02d295a 100644
36343--- a/block/scsi_ioctl.c
36344+++ b/block/scsi_ioctl.c
36345@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36346 return put_user(0, p);
36347 }
36348
36349-static int sg_get_timeout(struct request_queue *q)
36350+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36351 {
36352 return jiffies_to_clock_t(q->sg_timeout);
36353 }
36354@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36355 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36356 struct sg_io_hdr *hdr, fmode_t mode)
36357 {
36358- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36359+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36360+ unsigned char *cmdptr;
36361+
36362+ if (rq->cmd != rq->__cmd)
36363+ cmdptr = rq->cmd;
36364+ else
36365+ cmdptr = tmpcmd;
36366+
36367+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36368 return -EFAULT;
36369+
36370+ if (cmdptr != rq->cmd)
36371+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36372+
36373 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36374 return -EPERM;
36375
36376@@ -422,6 +434,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36377 int err;
36378 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36379 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36380+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36381+ unsigned char *cmdptr;
36382
36383 if (!sic)
36384 return -EINVAL;
36385@@ -460,9 +474,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36386 */
36387 err = -EFAULT;
36388 rq->cmd_len = cmdlen;
36389- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36390+
36391+ if (rq->cmd != rq->__cmd)
36392+ cmdptr = rq->cmd;
36393+ else
36394+ cmdptr = tmpcmd;
36395+
36396+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36397 goto error;
36398
36399+ if (rq->cmd != cmdptr)
36400+ memcpy(rq->cmd, cmdptr, cmdlen);
36401+
36402 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36403 goto error;
36404
36405diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36406index 650afac1..f3307de 100644
36407--- a/crypto/cryptd.c
36408+++ b/crypto/cryptd.c
36409@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36410
36411 struct cryptd_blkcipher_request_ctx {
36412 crypto_completion_t complete;
36413-};
36414+} __no_const;
36415
36416 struct cryptd_hash_ctx {
36417 struct crypto_shash *child;
36418@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36419
36420 struct cryptd_aead_request_ctx {
36421 crypto_completion_t complete;
36422-};
36423+} __no_const;
36424
36425 static void cryptd_queue_worker(struct work_struct *work);
36426
36427diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36428index c305d41..a96de79 100644
36429--- a/crypto/pcrypt.c
36430+++ b/crypto/pcrypt.c
36431@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36432 int ret;
36433
36434 pinst->kobj.kset = pcrypt_kset;
36435- ret = kobject_add(&pinst->kobj, NULL, name);
36436+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36437 if (!ret)
36438 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36439
36440diff --git a/crypto/zlib.c b/crypto/zlib.c
36441index 0eefa9d..0fa3d29 100644
36442--- a/crypto/zlib.c
36443+++ b/crypto/zlib.c
36444@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36445 zlib_comp_exit(ctx);
36446
36447 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36448- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36449+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36450 : MAX_WBITS;
36451 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36452- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36453+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36454 : DEF_MEM_LEVEL;
36455
36456 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36457diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36458index 3b37676..898edfa 100644
36459--- a/drivers/acpi/acpica/hwxfsleep.c
36460+++ b/drivers/acpi/acpica/hwxfsleep.c
36461@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36462 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36463
36464 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36465- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36466- acpi_hw_extended_sleep},
36467- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36468- acpi_hw_extended_wake_prep},
36469- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36470+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36471+ .extended_function = acpi_hw_extended_sleep},
36472+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36473+ .extended_function = acpi_hw_extended_wake_prep},
36474+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36475+ .extended_function = acpi_hw_extended_wake}
36476 };
36477
36478 /*
36479diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36480index 16129c7..8b675cd 100644
36481--- a/drivers/acpi/apei/apei-internal.h
36482+++ b/drivers/acpi/apei/apei-internal.h
36483@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36484 struct apei_exec_ins_type {
36485 u32 flags;
36486 apei_exec_ins_func_t run;
36487-};
36488+} __do_const;
36489
36490 struct apei_exec_context {
36491 u32 ip;
36492diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36493index e82d097..0c855c1 100644
36494--- a/drivers/acpi/apei/ghes.c
36495+++ b/drivers/acpi/apei/ghes.c
36496@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36497 const struct acpi_hest_generic *generic,
36498 const struct acpi_hest_generic_status *estatus)
36499 {
36500- static atomic_t seqno;
36501+ static atomic_unchecked_t seqno;
36502 unsigned int curr_seqno;
36503 char pfx_seq[64];
36504
36505@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36506 else
36507 pfx = KERN_ERR;
36508 }
36509- curr_seqno = atomic_inc_return(&seqno);
36510+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36511 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36512 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36513 pfx_seq, generic->header.source_id);
36514diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36515index a83e3c6..c3d617f 100644
36516--- a/drivers/acpi/bgrt.c
36517+++ b/drivers/acpi/bgrt.c
36518@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36519 if (!bgrt_image)
36520 return -ENODEV;
36521
36522- bin_attr_image.private = bgrt_image;
36523- bin_attr_image.size = bgrt_image_size;
36524+ pax_open_kernel();
36525+ *(void **)&bin_attr_image.private = bgrt_image;
36526+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36527+ pax_close_kernel();
36528
36529 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36530 if (!bgrt_kobj)
36531diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36532index 9b693d5..8953d54 100644
36533--- a/drivers/acpi/blacklist.c
36534+++ b/drivers/acpi/blacklist.c
36535@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36536 u32 is_critical_error;
36537 };
36538
36539-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36540+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36541
36542 /*
36543 * POLICY: If *anything* doesn't work, put it on the blacklist.
36544@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36545 return 0;
36546 }
36547
36548-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36549+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36550 {
36551 .callback = dmi_disable_osi_vista,
36552 .ident = "Fujitsu Siemens",
36553diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36554index 8b67bd0..b59593e 100644
36555--- a/drivers/acpi/bus.c
36556+++ b/drivers/acpi/bus.c
36557@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36558 }
36559 #endif
36560
36561-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36562+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36563 /*
36564 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36565 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36566@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36567 {}
36568 };
36569 #else
36570-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36571+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36572 {}
36573 };
36574 #endif
36575diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36576index c68e724..e863008 100644
36577--- a/drivers/acpi/custom_method.c
36578+++ b/drivers/acpi/custom_method.c
36579@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36580 struct acpi_table_header table;
36581 acpi_status status;
36582
36583+#ifdef CONFIG_GRKERNSEC_KMEM
36584+ return -EPERM;
36585+#endif
36586+
36587 if (!(*ppos)) {
36588 /* parse the table header to get the table length */
36589 if (count <= sizeof(struct acpi_table_header))
36590diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36591index 735db11..91e07ff 100644
36592--- a/drivers/acpi/device_pm.c
36593+++ b/drivers/acpi/device_pm.c
36594@@ -1025,6 +1025,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36595
36596 #endif /* CONFIG_PM_SLEEP */
36597
36598+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36599+
36600 static struct dev_pm_domain acpi_general_pm_domain = {
36601 .ops = {
36602 .runtime_suspend = acpi_subsys_runtime_suspend,
36603@@ -1041,6 +1043,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36604 .restore_early = acpi_subsys_resume_early,
36605 #endif
36606 },
36607+ .detach = acpi_dev_pm_detach
36608 };
36609
36610 /**
36611@@ -1110,7 +1113,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36612 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36613 }
36614
36615- dev->pm_domain->detach = acpi_dev_pm_detach;
36616 return 0;
36617 }
36618 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36619diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36620index a8dd2f7..e15950e 100644
36621--- a/drivers/acpi/ec.c
36622+++ b/drivers/acpi/ec.c
36623@@ -1242,7 +1242,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36624 return 0;
36625 }
36626
36627-static struct dmi_system_id ec_dmi_table[] __initdata = {
36628+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36629 {
36630 ec_skip_dsdt_scan, "Compal JFL92", {
36631 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36632diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36633index 139d9e4..9a9d799 100644
36634--- a/drivers/acpi/pci_slot.c
36635+++ b/drivers/acpi/pci_slot.c
36636@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36637 return 0;
36638 }
36639
36640-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36641+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36642 /*
36643 * Fujitsu Primequest machines will return 1023 to indicate an
36644 * error if the _SUN method is evaluated on SxFy objects that
36645diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36646index d9f7158..168e742 100644
36647--- a/drivers/acpi/processor_driver.c
36648+++ b/drivers/acpi/processor_driver.c
36649@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36650 return NOTIFY_OK;
36651 }
36652
36653-static struct notifier_block __refdata acpi_cpu_notifier = {
36654+static struct notifier_block __refconst acpi_cpu_notifier = {
36655 .notifier_call = acpi_cpu_soft_notify,
36656 };
36657
36658diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36659index f98db0b..8309c83 100644
36660--- a/drivers/acpi/processor_idle.c
36661+++ b/drivers/acpi/processor_idle.c
36662@@ -912,7 +912,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36663 {
36664 int i, count = CPUIDLE_DRIVER_STATE_START;
36665 struct acpi_processor_cx *cx;
36666- struct cpuidle_state *state;
36667+ cpuidle_state_no_const *state;
36668 struct cpuidle_driver *drv = &acpi_idle_driver;
36669
36670 if (!pr->flags.power_setup_done)
36671diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36672index e5dd808..1eceed1 100644
36673--- a/drivers/acpi/processor_pdc.c
36674+++ b/drivers/acpi/processor_pdc.c
36675@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36676 return 0;
36677 }
36678
36679-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36680+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36681 {
36682 set_no_mwait, "Extensa 5220", {
36683 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36684diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36685index 7f251dd..47b262c 100644
36686--- a/drivers/acpi/sleep.c
36687+++ b/drivers/acpi/sleep.c
36688@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36689 return 0;
36690 }
36691
36692-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36693+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36694 {
36695 .callback = init_old_suspend_ordering,
36696 .ident = "Abit KN9 (nForce4 variant)",
36697diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36698index 13e577c..cef11ee 100644
36699--- a/drivers/acpi/sysfs.c
36700+++ b/drivers/acpi/sysfs.c
36701@@ -423,11 +423,11 @@ static u32 num_counters;
36702 static struct attribute **all_attrs;
36703 static u32 acpi_gpe_count;
36704
36705-static struct attribute_group interrupt_stats_attr_group = {
36706+static attribute_group_no_const interrupt_stats_attr_group = {
36707 .name = "interrupts",
36708 };
36709
36710-static struct kobj_attribute *counter_attrs;
36711+static kobj_attribute_no_const *counter_attrs;
36712
36713 static void delete_gpe_attr_array(void)
36714 {
36715diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36716index d24fa19..782f1e6 100644
36717--- a/drivers/acpi/thermal.c
36718+++ b/drivers/acpi/thermal.c
36719@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36720 return 0;
36721 }
36722
36723-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36724+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36725 /*
36726 * Award BIOS on this AOpen makes thermal control almost worthless.
36727 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36728diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36729index 26eb70c..4d66ddf 100644
36730--- a/drivers/acpi/video.c
36731+++ b/drivers/acpi/video.c
36732@@ -418,7 +418,7 @@ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
36733 return 0;
36734 }
36735
36736-static struct dmi_system_id video_dmi_table[] __initdata = {
36737+static const struct dmi_system_id video_dmi_table[] __initconst = {
36738 /*
36739 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36740 */
36741diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36742index 287c4ba..6a600bc 100644
36743--- a/drivers/ata/libahci.c
36744+++ b/drivers/ata/libahci.c
36745@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36746 }
36747 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36748
36749-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36750+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36751 struct ata_taskfile *tf, int is_cmd, u16 flags,
36752 unsigned long timeout_msec)
36753 {
36754diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36755index 87b4b7f..d876fbd 100644
36756--- a/drivers/ata/libata-core.c
36757+++ b/drivers/ata/libata-core.c
36758@@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36759 static void ata_dev_xfermask(struct ata_device *dev);
36760 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36761
36762-atomic_t ata_print_id = ATOMIC_INIT(0);
36763+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36764
36765 struct ata_force_param {
36766 const char *name;
36767@@ -4780,7 +4780,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36768 struct ata_port *ap;
36769 unsigned int tag;
36770
36771- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36772+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36773 ap = qc->ap;
36774
36775 qc->flags = 0;
36776@@ -4797,7 +4797,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36777 struct ata_port *ap;
36778 struct ata_link *link;
36779
36780- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36781+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36782 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36783 ap = qc->ap;
36784 link = qc->dev->link;
36785@@ -5901,6 +5901,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36786 return;
36787
36788 spin_lock(&lock);
36789+ pax_open_kernel();
36790
36791 for (cur = ops->inherits; cur; cur = cur->inherits) {
36792 void **inherit = (void **)cur;
36793@@ -5914,8 +5915,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36794 if (IS_ERR(*pp))
36795 *pp = NULL;
36796
36797- ops->inherits = NULL;
36798+ *(struct ata_port_operations **)&ops->inherits = NULL;
36799
36800+ pax_close_kernel();
36801 spin_unlock(&lock);
36802 }
36803
36804@@ -6111,7 +6113,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36805
36806 /* give ports names and add SCSI hosts */
36807 for (i = 0; i < host->n_ports; i++) {
36808- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36809+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36810 host->ports[i]->local_port_no = i + 1;
36811 }
36812
36813diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36814index b061ba2..fdcd85f 100644
36815--- a/drivers/ata/libata-scsi.c
36816+++ b/drivers/ata/libata-scsi.c
36817@@ -4172,7 +4172,7 @@ int ata_sas_port_init(struct ata_port *ap)
36818
36819 if (rc)
36820 return rc;
36821- ap->print_id = atomic_inc_return(&ata_print_id);
36822+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36823 return 0;
36824 }
36825 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36826diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36827index f840ca1..edd6ef3 100644
36828--- a/drivers/ata/libata.h
36829+++ b/drivers/ata/libata.h
36830@@ -53,7 +53,7 @@ enum {
36831 ATA_DNXFER_QUIET = (1 << 31),
36832 };
36833
36834-extern atomic_t ata_print_id;
36835+extern atomic_unchecked_t ata_print_id;
36836 extern int atapi_passthru16;
36837 extern int libata_fua;
36838 extern int libata_noacpi;
36839diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36840index a9b0c82..207d97d 100644
36841--- a/drivers/ata/pata_arasan_cf.c
36842+++ b/drivers/ata/pata_arasan_cf.c
36843@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36844 /* Handle platform specific quirks */
36845 if (quirk) {
36846 if (quirk & CF_BROKEN_PIO) {
36847- ap->ops->set_piomode = NULL;
36848+ pax_open_kernel();
36849+ *(void **)&ap->ops->set_piomode = NULL;
36850+ pax_close_kernel();
36851 ap->pio_mask = 0;
36852 }
36853 if (quirk & CF_BROKEN_MWDMA)
36854diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36855index f9b983a..887b9d8 100644
36856--- a/drivers/atm/adummy.c
36857+++ b/drivers/atm/adummy.c
36858@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36859 vcc->pop(vcc, skb);
36860 else
36861 dev_kfree_skb_any(skb);
36862- atomic_inc(&vcc->stats->tx);
36863+ atomic_inc_unchecked(&vcc->stats->tx);
36864
36865 return 0;
36866 }
36867diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36868index f1a9198..f466a4a 100644
36869--- a/drivers/atm/ambassador.c
36870+++ b/drivers/atm/ambassador.c
36871@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36872 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36873
36874 // VC layer stats
36875- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36876+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36877
36878 // free the descriptor
36879 kfree (tx_descr);
36880@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36881 dump_skb ("<<<", vc, skb);
36882
36883 // VC layer stats
36884- atomic_inc(&atm_vcc->stats->rx);
36885+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36886 __net_timestamp(skb);
36887 // end of our responsibility
36888 atm_vcc->push (atm_vcc, skb);
36889@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36890 } else {
36891 PRINTK (KERN_INFO, "dropped over-size frame");
36892 // should we count this?
36893- atomic_inc(&atm_vcc->stats->rx_drop);
36894+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36895 }
36896
36897 } else {
36898@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36899 }
36900
36901 if (check_area (skb->data, skb->len)) {
36902- atomic_inc(&atm_vcc->stats->tx_err);
36903+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36904 return -ENOMEM; // ?
36905 }
36906
36907diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36908index 480fa6f..947067c 100644
36909--- a/drivers/atm/atmtcp.c
36910+++ b/drivers/atm/atmtcp.c
36911@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36912 if (vcc->pop) vcc->pop(vcc,skb);
36913 else dev_kfree_skb(skb);
36914 if (dev_data) return 0;
36915- atomic_inc(&vcc->stats->tx_err);
36916+ atomic_inc_unchecked(&vcc->stats->tx_err);
36917 return -ENOLINK;
36918 }
36919 size = skb->len+sizeof(struct atmtcp_hdr);
36920@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36921 if (!new_skb) {
36922 if (vcc->pop) vcc->pop(vcc,skb);
36923 else dev_kfree_skb(skb);
36924- atomic_inc(&vcc->stats->tx_err);
36925+ atomic_inc_unchecked(&vcc->stats->tx_err);
36926 return -ENOBUFS;
36927 }
36928 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36929@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36930 if (vcc->pop) vcc->pop(vcc,skb);
36931 else dev_kfree_skb(skb);
36932 out_vcc->push(out_vcc,new_skb);
36933- atomic_inc(&vcc->stats->tx);
36934- atomic_inc(&out_vcc->stats->rx);
36935+ atomic_inc_unchecked(&vcc->stats->tx);
36936+ atomic_inc_unchecked(&out_vcc->stats->rx);
36937 return 0;
36938 }
36939
36940@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36941 read_unlock(&vcc_sklist_lock);
36942 if (!out_vcc) {
36943 result = -EUNATCH;
36944- atomic_inc(&vcc->stats->tx_err);
36945+ atomic_inc_unchecked(&vcc->stats->tx_err);
36946 goto done;
36947 }
36948 skb_pull(skb,sizeof(struct atmtcp_hdr));
36949@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36950 __net_timestamp(new_skb);
36951 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36952 out_vcc->push(out_vcc,new_skb);
36953- atomic_inc(&vcc->stats->tx);
36954- atomic_inc(&out_vcc->stats->rx);
36955+ atomic_inc_unchecked(&vcc->stats->tx);
36956+ atomic_inc_unchecked(&out_vcc->stats->rx);
36957 done:
36958 if (vcc->pop) vcc->pop(vcc,skb);
36959 else dev_kfree_skb(skb);
36960diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36961index 6339efd..2b441d5 100644
36962--- a/drivers/atm/eni.c
36963+++ b/drivers/atm/eni.c
36964@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36965 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36966 vcc->dev->number);
36967 length = 0;
36968- atomic_inc(&vcc->stats->rx_err);
36969+ atomic_inc_unchecked(&vcc->stats->rx_err);
36970 }
36971 else {
36972 length = ATM_CELL_SIZE-1; /* no HEC */
36973@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36974 size);
36975 }
36976 eff = length = 0;
36977- atomic_inc(&vcc->stats->rx_err);
36978+ atomic_inc_unchecked(&vcc->stats->rx_err);
36979 }
36980 else {
36981 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36982@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36983 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36984 vcc->dev->number,vcc->vci,length,size << 2,descr);
36985 length = eff = 0;
36986- atomic_inc(&vcc->stats->rx_err);
36987+ atomic_inc_unchecked(&vcc->stats->rx_err);
36988 }
36989 }
36990 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36991@@ -770,7 +770,7 @@ rx_dequeued++;
36992 vcc->push(vcc,skb);
36993 pushed++;
36994 }
36995- atomic_inc(&vcc->stats->rx);
36996+ atomic_inc_unchecked(&vcc->stats->rx);
36997 }
36998 wake_up(&eni_dev->rx_wait);
36999 }
37000@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
37001 DMA_TO_DEVICE);
37002 if (vcc->pop) vcc->pop(vcc,skb);
37003 else dev_kfree_skb_irq(skb);
37004- atomic_inc(&vcc->stats->tx);
37005+ atomic_inc_unchecked(&vcc->stats->tx);
37006 wake_up(&eni_dev->tx_wait);
37007 dma_complete++;
37008 }
37009diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
37010index 82f2ae0..f205c02 100644
37011--- a/drivers/atm/firestream.c
37012+++ b/drivers/atm/firestream.c
37013@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
37014 }
37015 }
37016
37017- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37018+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37019
37020 fs_dprintk (FS_DEBUG_TXMEM, "i");
37021 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
37022@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37023 #endif
37024 skb_put (skb, qe->p1 & 0xffff);
37025 ATM_SKB(skb)->vcc = atm_vcc;
37026- atomic_inc(&atm_vcc->stats->rx);
37027+ atomic_inc_unchecked(&atm_vcc->stats->rx);
37028 __net_timestamp(skb);
37029 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
37030 atm_vcc->push (atm_vcc, skb);
37031@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37032 kfree (pe);
37033 }
37034 if (atm_vcc)
37035- atomic_inc(&atm_vcc->stats->rx_drop);
37036+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37037 break;
37038 case 0x1f: /* Reassembly abort: no buffers. */
37039 /* Silently increment error counter. */
37040 if (atm_vcc)
37041- atomic_inc(&atm_vcc->stats->rx_drop);
37042+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37043 break;
37044 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
37045 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
37046diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
37047index 75dde90..4309ead 100644
37048--- a/drivers/atm/fore200e.c
37049+++ b/drivers/atm/fore200e.c
37050@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
37051 #endif
37052 /* check error condition */
37053 if (*entry->status & STATUS_ERROR)
37054- atomic_inc(&vcc->stats->tx_err);
37055+ atomic_inc_unchecked(&vcc->stats->tx_err);
37056 else
37057- atomic_inc(&vcc->stats->tx);
37058+ atomic_inc_unchecked(&vcc->stats->tx);
37059 }
37060 }
37061
37062@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37063 if (skb == NULL) {
37064 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
37065
37066- atomic_inc(&vcc->stats->rx_drop);
37067+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37068 return -ENOMEM;
37069 }
37070
37071@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37072
37073 dev_kfree_skb_any(skb);
37074
37075- atomic_inc(&vcc->stats->rx_drop);
37076+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37077 return -ENOMEM;
37078 }
37079
37080 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37081
37082 vcc->push(vcc, skb);
37083- atomic_inc(&vcc->stats->rx);
37084+ atomic_inc_unchecked(&vcc->stats->rx);
37085
37086 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37087
37088@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
37089 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
37090 fore200e->atm_dev->number,
37091 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
37092- atomic_inc(&vcc->stats->rx_err);
37093+ atomic_inc_unchecked(&vcc->stats->rx_err);
37094 }
37095 }
37096
37097@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
37098 goto retry_here;
37099 }
37100
37101- atomic_inc(&vcc->stats->tx_err);
37102+ atomic_inc_unchecked(&vcc->stats->tx_err);
37103
37104 fore200e->tx_sat++;
37105 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
37106diff --git a/drivers/atm/he.c b/drivers/atm/he.c
37107index 93dca2e..c5daa69 100644
37108--- a/drivers/atm/he.c
37109+++ b/drivers/atm/he.c
37110@@ -1692,7 +1692,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37111
37112 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
37113 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
37114- atomic_inc(&vcc->stats->rx_drop);
37115+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37116 goto return_host_buffers;
37117 }
37118
37119@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37120 RBRQ_LEN_ERR(he_dev->rbrq_head)
37121 ? "LEN_ERR" : "",
37122 vcc->vpi, vcc->vci);
37123- atomic_inc(&vcc->stats->rx_err);
37124+ atomic_inc_unchecked(&vcc->stats->rx_err);
37125 goto return_host_buffers;
37126 }
37127
37128@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37129 vcc->push(vcc, skb);
37130 spin_lock(&he_dev->global_lock);
37131
37132- atomic_inc(&vcc->stats->rx);
37133+ atomic_inc_unchecked(&vcc->stats->rx);
37134
37135 return_host_buffers:
37136 ++pdus_assembled;
37137@@ -2097,7 +2097,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
37138 tpd->vcc->pop(tpd->vcc, tpd->skb);
37139 else
37140 dev_kfree_skb_any(tpd->skb);
37141- atomic_inc(&tpd->vcc->stats->tx_err);
37142+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
37143 }
37144 dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
37145 return;
37146@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37147 vcc->pop(vcc, skb);
37148 else
37149 dev_kfree_skb_any(skb);
37150- atomic_inc(&vcc->stats->tx_err);
37151+ atomic_inc_unchecked(&vcc->stats->tx_err);
37152 return -EINVAL;
37153 }
37154
37155@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37156 vcc->pop(vcc, skb);
37157 else
37158 dev_kfree_skb_any(skb);
37159- atomic_inc(&vcc->stats->tx_err);
37160+ atomic_inc_unchecked(&vcc->stats->tx_err);
37161 return -EINVAL;
37162 }
37163 #endif
37164@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37165 vcc->pop(vcc, skb);
37166 else
37167 dev_kfree_skb_any(skb);
37168- atomic_inc(&vcc->stats->tx_err);
37169+ atomic_inc_unchecked(&vcc->stats->tx_err);
37170 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37171 return -ENOMEM;
37172 }
37173@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37174 vcc->pop(vcc, skb);
37175 else
37176 dev_kfree_skb_any(skb);
37177- atomic_inc(&vcc->stats->tx_err);
37178+ atomic_inc_unchecked(&vcc->stats->tx_err);
37179 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37180 return -ENOMEM;
37181 }
37182@@ -2605,7 +2605,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37183 __enqueue_tpd(he_dev, tpd, cid);
37184 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37185
37186- atomic_inc(&vcc->stats->tx);
37187+ atomic_inc_unchecked(&vcc->stats->tx);
37188
37189 return 0;
37190 }
37191diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
37192index 527bbd5..96570c8 100644
37193--- a/drivers/atm/horizon.c
37194+++ b/drivers/atm/horizon.c
37195@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
37196 {
37197 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
37198 // VC layer stats
37199- atomic_inc(&vcc->stats->rx);
37200+ atomic_inc_unchecked(&vcc->stats->rx);
37201 __net_timestamp(skb);
37202 // end of our responsibility
37203 vcc->push (vcc, skb);
37204@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37205 dev->tx_iovec = NULL;
37206
37207 // VC layer stats
37208- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37209+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37210
37211 // free the skb
37212 hrz_kfree_skb (skb);
37213diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37214index 074616b..d6b3d5f 100644
37215--- a/drivers/atm/idt77252.c
37216+++ b/drivers/atm/idt77252.c
37217@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37218 else
37219 dev_kfree_skb(skb);
37220
37221- atomic_inc(&vcc->stats->tx);
37222+ atomic_inc_unchecked(&vcc->stats->tx);
37223 }
37224
37225 atomic_dec(&scq->used);
37226@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37227 if ((sb = dev_alloc_skb(64)) == NULL) {
37228 printk("%s: Can't allocate buffers for aal0.\n",
37229 card->name);
37230- atomic_add(i, &vcc->stats->rx_drop);
37231+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37232 break;
37233 }
37234 if (!atm_charge(vcc, sb->truesize)) {
37235 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37236 card->name);
37237- atomic_add(i - 1, &vcc->stats->rx_drop);
37238+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37239 dev_kfree_skb(sb);
37240 break;
37241 }
37242@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37243 ATM_SKB(sb)->vcc = vcc;
37244 __net_timestamp(sb);
37245 vcc->push(vcc, sb);
37246- atomic_inc(&vcc->stats->rx);
37247+ atomic_inc_unchecked(&vcc->stats->rx);
37248
37249 cell += ATM_CELL_PAYLOAD;
37250 }
37251@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37252 "(CDC: %08x)\n",
37253 card->name, len, rpp->len, readl(SAR_REG_CDC));
37254 recycle_rx_pool_skb(card, rpp);
37255- atomic_inc(&vcc->stats->rx_err);
37256+ atomic_inc_unchecked(&vcc->stats->rx_err);
37257 return;
37258 }
37259 if (stat & SAR_RSQE_CRC) {
37260 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37261 recycle_rx_pool_skb(card, rpp);
37262- atomic_inc(&vcc->stats->rx_err);
37263+ atomic_inc_unchecked(&vcc->stats->rx_err);
37264 return;
37265 }
37266 if (skb_queue_len(&rpp->queue) > 1) {
37267@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37268 RXPRINTK("%s: Can't alloc RX skb.\n",
37269 card->name);
37270 recycle_rx_pool_skb(card, rpp);
37271- atomic_inc(&vcc->stats->rx_err);
37272+ atomic_inc_unchecked(&vcc->stats->rx_err);
37273 return;
37274 }
37275 if (!atm_charge(vcc, skb->truesize)) {
37276@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37277 __net_timestamp(skb);
37278
37279 vcc->push(vcc, skb);
37280- atomic_inc(&vcc->stats->rx);
37281+ atomic_inc_unchecked(&vcc->stats->rx);
37282
37283 return;
37284 }
37285@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37286 __net_timestamp(skb);
37287
37288 vcc->push(vcc, skb);
37289- atomic_inc(&vcc->stats->rx);
37290+ atomic_inc_unchecked(&vcc->stats->rx);
37291
37292 if (skb->truesize > SAR_FB_SIZE_3)
37293 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37294@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37295 if (vcc->qos.aal != ATM_AAL0) {
37296 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37297 card->name, vpi, vci);
37298- atomic_inc(&vcc->stats->rx_drop);
37299+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37300 goto drop;
37301 }
37302
37303 if ((sb = dev_alloc_skb(64)) == NULL) {
37304 printk("%s: Can't allocate buffers for AAL0.\n",
37305 card->name);
37306- atomic_inc(&vcc->stats->rx_err);
37307+ atomic_inc_unchecked(&vcc->stats->rx_err);
37308 goto drop;
37309 }
37310
37311@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37312 ATM_SKB(sb)->vcc = vcc;
37313 __net_timestamp(sb);
37314 vcc->push(vcc, sb);
37315- atomic_inc(&vcc->stats->rx);
37316+ atomic_inc_unchecked(&vcc->stats->rx);
37317
37318 drop:
37319 skb_pull(queue, 64);
37320@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37321
37322 if (vc == NULL) {
37323 printk("%s: NULL connection in send().\n", card->name);
37324- atomic_inc(&vcc->stats->tx_err);
37325+ atomic_inc_unchecked(&vcc->stats->tx_err);
37326 dev_kfree_skb(skb);
37327 return -EINVAL;
37328 }
37329 if (!test_bit(VCF_TX, &vc->flags)) {
37330 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37331- atomic_inc(&vcc->stats->tx_err);
37332+ atomic_inc_unchecked(&vcc->stats->tx_err);
37333 dev_kfree_skb(skb);
37334 return -EINVAL;
37335 }
37336@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37337 break;
37338 default:
37339 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37340- atomic_inc(&vcc->stats->tx_err);
37341+ atomic_inc_unchecked(&vcc->stats->tx_err);
37342 dev_kfree_skb(skb);
37343 return -EINVAL;
37344 }
37345
37346 if (skb_shinfo(skb)->nr_frags != 0) {
37347 printk("%s: No scatter-gather yet.\n", card->name);
37348- atomic_inc(&vcc->stats->tx_err);
37349+ atomic_inc_unchecked(&vcc->stats->tx_err);
37350 dev_kfree_skb(skb);
37351 return -EINVAL;
37352 }
37353@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37354
37355 err = queue_skb(card, vc, skb, oam);
37356 if (err) {
37357- atomic_inc(&vcc->stats->tx_err);
37358+ atomic_inc_unchecked(&vcc->stats->tx_err);
37359 dev_kfree_skb(skb);
37360 return err;
37361 }
37362@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37363 skb = dev_alloc_skb(64);
37364 if (!skb) {
37365 printk("%s: Out of memory in send_oam().\n", card->name);
37366- atomic_inc(&vcc->stats->tx_err);
37367+ atomic_inc_unchecked(&vcc->stats->tx_err);
37368 return -ENOMEM;
37369 }
37370 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37371diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37372index 924f8e2..3375a3e 100644
37373--- a/drivers/atm/iphase.c
37374+++ b/drivers/atm/iphase.c
37375@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37376 status = (u_short) (buf_desc_ptr->desc_mode);
37377 if (status & (RX_CER | RX_PTE | RX_OFL))
37378 {
37379- atomic_inc(&vcc->stats->rx_err);
37380+ atomic_inc_unchecked(&vcc->stats->rx_err);
37381 IF_ERR(printk("IA: bad packet, dropping it");)
37382 if (status & RX_CER) {
37383 IF_ERR(printk(" cause: packet CRC error\n");)
37384@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37385 len = dma_addr - buf_addr;
37386 if (len > iadev->rx_buf_sz) {
37387 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37388- atomic_inc(&vcc->stats->rx_err);
37389+ atomic_inc_unchecked(&vcc->stats->rx_err);
37390 goto out_free_desc;
37391 }
37392
37393@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37394 ia_vcc = INPH_IA_VCC(vcc);
37395 if (ia_vcc == NULL)
37396 {
37397- atomic_inc(&vcc->stats->rx_err);
37398+ atomic_inc_unchecked(&vcc->stats->rx_err);
37399 atm_return(vcc, skb->truesize);
37400 dev_kfree_skb_any(skb);
37401 goto INCR_DLE;
37402@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37403 if ((length > iadev->rx_buf_sz) || (length >
37404 (skb->len - sizeof(struct cpcs_trailer))))
37405 {
37406- atomic_inc(&vcc->stats->rx_err);
37407+ atomic_inc_unchecked(&vcc->stats->rx_err);
37408 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37409 length, skb->len);)
37410 atm_return(vcc, skb->truesize);
37411@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37412
37413 IF_RX(printk("rx_dle_intr: skb push");)
37414 vcc->push(vcc,skb);
37415- atomic_inc(&vcc->stats->rx);
37416+ atomic_inc_unchecked(&vcc->stats->rx);
37417 iadev->rx_pkt_cnt++;
37418 }
37419 INCR_DLE:
37420@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37421 {
37422 struct k_sonet_stats *stats;
37423 stats = &PRIV(_ia_dev[board])->sonet_stats;
37424- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37425- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37426- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37427- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37428- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37429- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37430- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37431- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37432- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37433+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37434+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37435+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37436+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37437+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37438+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37439+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37440+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37441+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37442 }
37443 ia_cmds.status = 0;
37444 break;
37445@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37446 if ((desc == 0) || (desc > iadev->num_tx_desc))
37447 {
37448 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37449- atomic_inc(&vcc->stats->tx);
37450+ atomic_inc_unchecked(&vcc->stats->tx);
37451 if (vcc->pop)
37452 vcc->pop(vcc, skb);
37453 else
37454@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37455 ATM_DESC(skb) = vcc->vci;
37456 skb_queue_tail(&iadev->tx_dma_q, skb);
37457
37458- atomic_inc(&vcc->stats->tx);
37459+ atomic_inc_unchecked(&vcc->stats->tx);
37460 iadev->tx_pkt_cnt++;
37461 /* Increment transaction counter */
37462 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37463
37464 #if 0
37465 /* add flow control logic */
37466- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37467+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37468 if (iavcc->vc_desc_cnt > 10) {
37469 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37470 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37471diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37472index ce43ae3..969de38 100644
37473--- a/drivers/atm/lanai.c
37474+++ b/drivers/atm/lanai.c
37475@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37476 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37477 lanai_endtx(lanai, lvcc);
37478 lanai_free_skb(lvcc->tx.atmvcc, skb);
37479- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37480+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37481 }
37482
37483 /* Try to fill the buffer - don't call unless there is backlog */
37484@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37485 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37486 __net_timestamp(skb);
37487 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37488- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37489+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37490 out:
37491 lvcc->rx.buf.ptr = end;
37492 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37493@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37494 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37495 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37496 lanai->stats.service_rxnotaal5++;
37497- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37498+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37499 return 0;
37500 }
37501 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37502@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37503 int bytes;
37504 read_unlock(&vcc_sklist_lock);
37505 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37506- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37507+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37508 lvcc->stats.x.aal5.service_trash++;
37509 bytes = (SERVICE_GET_END(s) * 16) -
37510 (((unsigned long) lvcc->rx.buf.ptr) -
37511@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37512 }
37513 if (s & SERVICE_STREAM) {
37514 read_unlock(&vcc_sklist_lock);
37515- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37516+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37517 lvcc->stats.x.aal5.service_stream++;
37518 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37519 "PDU on VCI %d!\n", lanai->number, vci);
37520@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37521 return 0;
37522 }
37523 DPRINTK("got rx crc error on vci %d\n", vci);
37524- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37525+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37526 lvcc->stats.x.aal5.service_rxcrc++;
37527 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37528 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37529diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37530index b7e1cc0..eb336bfe 100644
37531--- a/drivers/atm/nicstar.c
37532+++ b/drivers/atm/nicstar.c
37533@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37534 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37535 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37536 card->index);
37537- atomic_inc(&vcc->stats->tx_err);
37538+ atomic_inc_unchecked(&vcc->stats->tx_err);
37539 dev_kfree_skb_any(skb);
37540 return -EINVAL;
37541 }
37542@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37543 if (!vc->tx) {
37544 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37545 card->index);
37546- atomic_inc(&vcc->stats->tx_err);
37547+ atomic_inc_unchecked(&vcc->stats->tx_err);
37548 dev_kfree_skb_any(skb);
37549 return -EINVAL;
37550 }
37551@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37552 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37553 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37554 card->index);
37555- atomic_inc(&vcc->stats->tx_err);
37556+ atomic_inc_unchecked(&vcc->stats->tx_err);
37557 dev_kfree_skb_any(skb);
37558 return -EINVAL;
37559 }
37560
37561 if (skb_shinfo(skb)->nr_frags != 0) {
37562 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37563- atomic_inc(&vcc->stats->tx_err);
37564+ atomic_inc_unchecked(&vcc->stats->tx_err);
37565 dev_kfree_skb_any(skb);
37566 return -EINVAL;
37567 }
37568@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37569 }
37570
37571 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37572- atomic_inc(&vcc->stats->tx_err);
37573+ atomic_inc_unchecked(&vcc->stats->tx_err);
37574 dev_kfree_skb_any(skb);
37575 return -EIO;
37576 }
37577- atomic_inc(&vcc->stats->tx);
37578+ atomic_inc_unchecked(&vcc->stats->tx);
37579
37580 return 0;
37581 }
37582@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37583 printk
37584 ("nicstar%d: Can't allocate buffers for aal0.\n",
37585 card->index);
37586- atomic_add(i, &vcc->stats->rx_drop);
37587+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37588 break;
37589 }
37590 if (!atm_charge(vcc, sb->truesize)) {
37591 RXPRINTK
37592 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37593 card->index);
37594- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37595+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37596 dev_kfree_skb_any(sb);
37597 break;
37598 }
37599@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37600 ATM_SKB(sb)->vcc = vcc;
37601 __net_timestamp(sb);
37602 vcc->push(vcc, sb);
37603- atomic_inc(&vcc->stats->rx);
37604+ atomic_inc_unchecked(&vcc->stats->rx);
37605 cell += ATM_CELL_PAYLOAD;
37606 }
37607
37608@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37609 if (iovb == NULL) {
37610 printk("nicstar%d: Out of iovec buffers.\n",
37611 card->index);
37612- atomic_inc(&vcc->stats->rx_drop);
37613+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37614 recycle_rx_buf(card, skb);
37615 return;
37616 }
37617@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37618 small or large buffer itself. */
37619 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37620 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37621- atomic_inc(&vcc->stats->rx_err);
37622+ atomic_inc_unchecked(&vcc->stats->rx_err);
37623 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37624 NS_MAX_IOVECS);
37625 NS_PRV_IOVCNT(iovb) = 0;
37626@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37627 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37628 card->index);
37629 which_list(card, skb);
37630- atomic_inc(&vcc->stats->rx_err);
37631+ atomic_inc_unchecked(&vcc->stats->rx_err);
37632 recycle_rx_buf(card, skb);
37633 vc->rx_iov = NULL;
37634 recycle_iov_buf(card, iovb);
37635@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37636 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37637 card->index);
37638 which_list(card, skb);
37639- atomic_inc(&vcc->stats->rx_err);
37640+ atomic_inc_unchecked(&vcc->stats->rx_err);
37641 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37642 NS_PRV_IOVCNT(iovb));
37643 vc->rx_iov = NULL;
37644@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37645 printk(" - PDU size mismatch.\n");
37646 else
37647 printk(".\n");
37648- atomic_inc(&vcc->stats->rx_err);
37649+ atomic_inc_unchecked(&vcc->stats->rx_err);
37650 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37651 NS_PRV_IOVCNT(iovb));
37652 vc->rx_iov = NULL;
37653@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37654 /* skb points to a small buffer */
37655 if (!atm_charge(vcc, skb->truesize)) {
37656 push_rxbufs(card, skb);
37657- atomic_inc(&vcc->stats->rx_drop);
37658+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37659 } else {
37660 skb_put(skb, len);
37661 dequeue_sm_buf(card, skb);
37662@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37663 ATM_SKB(skb)->vcc = vcc;
37664 __net_timestamp(skb);
37665 vcc->push(vcc, skb);
37666- atomic_inc(&vcc->stats->rx);
37667+ atomic_inc_unchecked(&vcc->stats->rx);
37668 }
37669 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37670 struct sk_buff *sb;
37671@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37672 if (len <= NS_SMBUFSIZE) {
37673 if (!atm_charge(vcc, sb->truesize)) {
37674 push_rxbufs(card, sb);
37675- atomic_inc(&vcc->stats->rx_drop);
37676+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37677 } else {
37678 skb_put(sb, len);
37679 dequeue_sm_buf(card, sb);
37680@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37681 ATM_SKB(sb)->vcc = vcc;
37682 __net_timestamp(sb);
37683 vcc->push(vcc, sb);
37684- atomic_inc(&vcc->stats->rx);
37685+ atomic_inc_unchecked(&vcc->stats->rx);
37686 }
37687
37688 push_rxbufs(card, skb);
37689@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37690
37691 if (!atm_charge(vcc, skb->truesize)) {
37692 push_rxbufs(card, skb);
37693- atomic_inc(&vcc->stats->rx_drop);
37694+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37695 } else {
37696 dequeue_lg_buf(card, skb);
37697 #ifdef NS_USE_DESTRUCTORS
37698@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37699 ATM_SKB(skb)->vcc = vcc;
37700 __net_timestamp(skb);
37701 vcc->push(vcc, skb);
37702- atomic_inc(&vcc->stats->rx);
37703+ atomic_inc_unchecked(&vcc->stats->rx);
37704 }
37705
37706 push_rxbufs(card, sb);
37707@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37708 printk
37709 ("nicstar%d: Out of huge buffers.\n",
37710 card->index);
37711- atomic_inc(&vcc->stats->rx_drop);
37712+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37713 recycle_iovec_rx_bufs(card,
37714 (struct iovec *)
37715 iovb->data,
37716@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37717 card->hbpool.count++;
37718 } else
37719 dev_kfree_skb_any(hb);
37720- atomic_inc(&vcc->stats->rx_drop);
37721+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37722 } else {
37723 /* Copy the small buffer to the huge buffer */
37724 sb = (struct sk_buff *)iov->iov_base;
37725@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37726 #endif /* NS_USE_DESTRUCTORS */
37727 __net_timestamp(hb);
37728 vcc->push(vcc, hb);
37729- atomic_inc(&vcc->stats->rx);
37730+ atomic_inc_unchecked(&vcc->stats->rx);
37731 }
37732 }
37733
37734diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37735index 74e18b0..f16afa0 100644
37736--- a/drivers/atm/solos-pci.c
37737+++ b/drivers/atm/solos-pci.c
37738@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37739 }
37740 atm_charge(vcc, skb->truesize);
37741 vcc->push(vcc, skb);
37742- atomic_inc(&vcc->stats->rx);
37743+ atomic_inc_unchecked(&vcc->stats->rx);
37744 break;
37745
37746 case PKT_STATUS:
37747@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37748 vcc = SKB_CB(oldskb)->vcc;
37749
37750 if (vcc) {
37751- atomic_inc(&vcc->stats->tx);
37752+ atomic_inc_unchecked(&vcc->stats->tx);
37753 solos_pop(vcc, oldskb);
37754 } else {
37755 dev_kfree_skb_irq(oldskb);
37756diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37757index 0215934..ce9f5b1 100644
37758--- a/drivers/atm/suni.c
37759+++ b/drivers/atm/suni.c
37760@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37761
37762
37763 #define ADD_LIMITED(s,v) \
37764- atomic_add((v),&stats->s); \
37765- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37766+ atomic_add_unchecked((v),&stats->s); \
37767+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37768
37769
37770 static void suni_hz(unsigned long from_timer)
37771diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37772index 5120a96..e2572bd 100644
37773--- a/drivers/atm/uPD98402.c
37774+++ b/drivers/atm/uPD98402.c
37775@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37776 struct sonet_stats tmp;
37777 int error = 0;
37778
37779- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37780+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37781 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37782 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37783 if (zero && !error) {
37784@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37785
37786
37787 #define ADD_LIMITED(s,v) \
37788- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37789- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37790- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37791+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37792+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37793+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37794
37795
37796 static void stat_event(struct atm_dev *dev)
37797@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37798 if (reason & uPD98402_INT_PFM) stat_event(dev);
37799 if (reason & uPD98402_INT_PCO) {
37800 (void) GET(PCOCR); /* clear interrupt cause */
37801- atomic_add(GET(HECCT),
37802+ atomic_add_unchecked(GET(HECCT),
37803 &PRIV(dev)->sonet_stats.uncorr_hcs);
37804 }
37805 if ((reason & uPD98402_INT_RFO) &&
37806@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37807 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37808 uPD98402_INT_LOS),PIMR); /* enable them */
37809 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37810- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37811- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37812- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37813+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37814+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37815+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37816 return 0;
37817 }
37818
37819diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37820index cecfb94..87009ec 100644
37821--- a/drivers/atm/zatm.c
37822+++ b/drivers/atm/zatm.c
37823@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37824 }
37825 if (!size) {
37826 dev_kfree_skb_irq(skb);
37827- if (vcc) atomic_inc(&vcc->stats->rx_err);
37828+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37829 continue;
37830 }
37831 if (!atm_charge(vcc,skb->truesize)) {
37832@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37833 skb->len = size;
37834 ATM_SKB(skb)->vcc = vcc;
37835 vcc->push(vcc,skb);
37836- atomic_inc(&vcc->stats->rx);
37837+ atomic_inc_unchecked(&vcc->stats->rx);
37838 }
37839 zout(pos & 0xffff,MTA(mbx));
37840 #if 0 /* probably a stupid idea */
37841@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37842 skb_queue_head(&zatm_vcc->backlog,skb);
37843 break;
37844 }
37845- atomic_inc(&vcc->stats->tx);
37846+ atomic_inc_unchecked(&vcc->stats->tx);
37847 wake_up(&zatm_vcc->tx_wait);
37848 }
37849
37850diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37851index 79bc203..fa3945b 100644
37852--- a/drivers/base/bus.c
37853+++ b/drivers/base/bus.c
37854@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37855 return -EINVAL;
37856
37857 mutex_lock(&subsys->p->mutex);
37858- list_add_tail(&sif->node, &subsys->p->interfaces);
37859+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37860 if (sif->add_dev) {
37861 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37862 while ((dev = subsys_dev_iter_next(&iter)))
37863@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37864 subsys = sif->subsys;
37865
37866 mutex_lock(&subsys->p->mutex);
37867- list_del_init(&sif->node);
37868+ pax_list_del_init((struct list_head *)&sif->node);
37869 if (sif->remove_dev) {
37870 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37871 while ((dev = subsys_dev_iter_next(&iter)))
37872diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37873index 25798db..15f130e 100644
37874--- a/drivers/base/devtmpfs.c
37875+++ b/drivers/base/devtmpfs.c
37876@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37877 if (!thread)
37878 return 0;
37879
37880- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37881+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37882 if (err)
37883 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37884 else
37885@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37886 *err = sys_unshare(CLONE_NEWNS);
37887 if (*err)
37888 goto out;
37889- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37890+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37891 if (*err)
37892 goto out;
37893- sys_chdir("/.."); /* will traverse into overmounted root */
37894- sys_chroot(".");
37895+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37896+ sys_chroot((char __force_user *)".");
37897 complete(&setup_done);
37898 while (1) {
37899 spin_lock(&req_lock);
37900diff --git a/drivers/base/node.c b/drivers/base/node.c
37901index 36fabe43..8cfc112 100644
37902--- a/drivers/base/node.c
37903+++ b/drivers/base/node.c
37904@@ -615,7 +615,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37905 struct node_attr {
37906 struct device_attribute attr;
37907 enum node_states state;
37908-};
37909+} __do_const;
37910
37911 static ssize_t show_node_state(struct device *dev,
37912 struct device_attribute *attr, char *buf)
37913diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37914index 45937f8..b9a342e 100644
37915--- a/drivers/base/power/domain.c
37916+++ b/drivers/base/power/domain.c
37917@@ -1698,7 +1698,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37918 {
37919 struct cpuidle_driver *cpuidle_drv;
37920 struct gpd_cpuidle_data *cpuidle_data;
37921- struct cpuidle_state *idle_state;
37922+ cpuidle_state_no_const *idle_state;
37923 int ret = 0;
37924
37925 if (IS_ERR_OR_NULL(genpd) || state < 0)
37926@@ -1766,7 +1766,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37927 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37928 {
37929 struct gpd_cpuidle_data *cpuidle_data;
37930- struct cpuidle_state *idle_state;
37931+ cpuidle_state_no_const *idle_state;
37932 int ret = 0;
37933
37934 if (IS_ERR_OR_NULL(genpd))
37935@@ -2195,7 +2195,10 @@ int genpd_dev_pm_attach(struct device *dev)
37936 return ret;
37937 }
37938
37939- dev->pm_domain->detach = genpd_dev_pm_detach;
37940+ pax_open_kernel();
37941+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37942+ pax_close_kernel();
37943+
37944 pm_genpd_poweron(pd);
37945
37946 return 0;
37947diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37948index d2be3f9..0a3167a 100644
37949--- a/drivers/base/power/sysfs.c
37950+++ b/drivers/base/power/sysfs.c
37951@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37952 return -EIO;
37953 }
37954 }
37955- return sprintf(buf, p);
37956+ return sprintf(buf, "%s", p);
37957 }
37958
37959 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37960diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37961index aab7158..b172db2 100644
37962--- a/drivers/base/power/wakeup.c
37963+++ b/drivers/base/power/wakeup.c
37964@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37965 * They need to be modified together atomically, so it's better to use one
37966 * atomic variable to hold them both.
37967 */
37968-static atomic_t combined_event_count = ATOMIC_INIT(0);
37969+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37970
37971 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37972 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37973
37974 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37975 {
37976- unsigned int comb = atomic_read(&combined_event_count);
37977+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37978
37979 *cnt = (comb >> IN_PROGRESS_BITS);
37980 *inpr = comb & MAX_IN_PROGRESS;
37981@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37982 ws->start_prevent_time = ws->last_time;
37983
37984 /* Increment the counter of events in progress. */
37985- cec = atomic_inc_return(&combined_event_count);
37986+ cec = atomic_inc_return_unchecked(&combined_event_count);
37987
37988 trace_wakeup_source_activate(ws->name, cec);
37989 }
37990@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37991 * Increment the counter of registered wakeup events and decrement the
37992 * couter of wakeup events in progress simultaneously.
37993 */
37994- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37995+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37996 trace_wakeup_source_deactivate(ws->name, cec);
37997
37998 split_counters(&cnt, &inpr);
37999diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
38000index 8d98a32..61d3165 100644
38001--- a/drivers/base/syscore.c
38002+++ b/drivers/base/syscore.c
38003@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
38004 void register_syscore_ops(struct syscore_ops *ops)
38005 {
38006 mutex_lock(&syscore_ops_lock);
38007- list_add_tail(&ops->node, &syscore_ops_list);
38008+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
38009 mutex_unlock(&syscore_ops_lock);
38010 }
38011 EXPORT_SYMBOL_GPL(register_syscore_ops);
38012@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
38013 void unregister_syscore_ops(struct syscore_ops *ops)
38014 {
38015 mutex_lock(&syscore_ops_lock);
38016- list_del(&ops->node);
38017+ pax_list_del((struct list_head *)&ops->node);
38018 mutex_unlock(&syscore_ops_lock);
38019 }
38020 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
38021diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
38022index ff20f19..018f1da 100644
38023--- a/drivers/block/cciss.c
38024+++ b/drivers/block/cciss.c
38025@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
38026 while (!list_empty(&h->reqQ)) {
38027 c = list_entry(h->reqQ.next, CommandList_struct, list);
38028 /* can't do anything if fifo is full */
38029- if ((h->access.fifo_full(h))) {
38030+ if ((h->access->fifo_full(h))) {
38031 dev_warn(&h->pdev->dev, "fifo full\n");
38032 break;
38033 }
38034@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
38035 h->Qdepth--;
38036
38037 /* Tell the controller execute command */
38038- h->access.submit_command(h, c);
38039+ h->access->submit_command(h, c);
38040
38041 /* Put job onto the completed Q */
38042 addQ(&h->cmpQ, c);
38043@@ -3444,17 +3444,17 @@ startio:
38044
38045 static inline unsigned long get_next_completion(ctlr_info_t *h)
38046 {
38047- return h->access.command_completed(h);
38048+ return h->access->command_completed(h);
38049 }
38050
38051 static inline int interrupt_pending(ctlr_info_t *h)
38052 {
38053- return h->access.intr_pending(h);
38054+ return h->access->intr_pending(h);
38055 }
38056
38057 static inline long interrupt_not_for_us(ctlr_info_t *h)
38058 {
38059- return ((h->access.intr_pending(h) == 0) ||
38060+ return ((h->access->intr_pending(h) == 0) ||
38061 (h->interrupts_enabled == 0));
38062 }
38063
38064@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
38065 u32 a;
38066
38067 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
38068- return h->access.command_completed(h);
38069+ return h->access->command_completed(h);
38070
38071 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
38072 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
38073@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
38074 trans_support & CFGTBL_Trans_use_short_tags);
38075
38076 /* Change the access methods to the performant access methods */
38077- h->access = SA5_performant_access;
38078+ h->access = &SA5_performant_access;
38079 h->transMethod = CFGTBL_Trans_Performant;
38080
38081 return;
38082@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
38083 if (prod_index < 0)
38084 return -ENODEV;
38085 h->product_name = products[prod_index].product_name;
38086- h->access = *(products[prod_index].access);
38087+ h->access = products[prod_index].access;
38088
38089 if (cciss_board_disabled(h)) {
38090 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
38091@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
38092 }
38093
38094 /* make sure the board interrupts are off */
38095- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38096+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38097 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
38098 if (rc)
38099 goto clean2;
38100@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
38101 * fake ones to scoop up any residual completions.
38102 */
38103 spin_lock_irqsave(&h->lock, flags);
38104- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38105+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38106 spin_unlock_irqrestore(&h->lock, flags);
38107 free_irq(h->intr[h->intr_mode], h);
38108 rc = cciss_request_irq(h, cciss_msix_discard_completions,
38109@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
38110 dev_info(&h->pdev->dev, "Board READY.\n");
38111 dev_info(&h->pdev->dev,
38112 "Waiting for stale completions to drain.\n");
38113- h->access.set_intr_mask(h, CCISS_INTR_ON);
38114+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38115 msleep(10000);
38116- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38117+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38118
38119 rc = controller_reset_failed(h->cfgtable);
38120 if (rc)
38121@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
38122 cciss_scsi_setup(h);
38123
38124 /* Turn the interrupts on so we can service requests */
38125- h->access.set_intr_mask(h, CCISS_INTR_ON);
38126+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38127
38128 /* Get the firmware version */
38129 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
38130@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
38131 kfree(flush_buf);
38132 if (return_code != IO_OK)
38133 dev_warn(&h->pdev->dev, "Error flushing cache\n");
38134- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38135+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38136 free_irq(h->intr[h->intr_mode], h);
38137 }
38138
38139diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
38140index 7fda30e..2f27946 100644
38141--- a/drivers/block/cciss.h
38142+++ b/drivers/block/cciss.h
38143@@ -101,7 +101,7 @@ struct ctlr_info
38144 /* information about each logical volume */
38145 drive_info_struct *drv[CISS_MAX_LUN];
38146
38147- struct access_method access;
38148+ struct access_method *access;
38149
38150 /* queue and queue Info */
38151 struct list_head reqQ;
38152@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
38153 }
38154
38155 static struct access_method SA5_access = {
38156- SA5_submit_command,
38157- SA5_intr_mask,
38158- SA5_fifo_full,
38159- SA5_intr_pending,
38160- SA5_completed,
38161+ .submit_command = SA5_submit_command,
38162+ .set_intr_mask = SA5_intr_mask,
38163+ .fifo_full = SA5_fifo_full,
38164+ .intr_pending = SA5_intr_pending,
38165+ .command_completed = SA5_completed,
38166 };
38167
38168 static struct access_method SA5B_access = {
38169- SA5_submit_command,
38170- SA5B_intr_mask,
38171- SA5_fifo_full,
38172- SA5B_intr_pending,
38173- SA5_completed,
38174+ .submit_command = SA5_submit_command,
38175+ .set_intr_mask = SA5B_intr_mask,
38176+ .fifo_full = SA5_fifo_full,
38177+ .intr_pending = SA5B_intr_pending,
38178+ .command_completed = SA5_completed,
38179 };
38180
38181 static struct access_method SA5_performant_access = {
38182- SA5_submit_command,
38183- SA5_performant_intr_mask,
38184- SA5_fifo_full,
38185- SA5_performant_intr_pending,
38186- SA5_performant_completed,
38187+ .submit_command = SA5_submit_command,
38188+ .set_intr_mask = SA5_performant_intr_mask,
38189+ .fifo_full = SA5_fifo_full,
38190+ .intr_pending = SA5_performant_intr_pending,
38191+ .command_completed = SA5_performant_completed,
38192 };
38193
38194 struct board_type {
38195diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
38196index 2b94403..fd6ad1f 100644
38197--- a/drivers/block/cpqarray.c
38198+++ b/drivers/block/cpqarray.c
38199@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38200 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38201 goto Enomem4;
38202 }
38203- hba[i]->access.set_intr_mask(hba[i], 0);
38204+ hba[i]->access->set_intr_mask(hba[i], 0);
38205 if (request_irq(hba[i]->intr, do_ida_intr,
38206 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
38207 {
38208@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38209 add_timer(&hba[i]->timer);
38210
38211 /* Enable IRQ now that spinlock and rate limit timer are set up */
38212- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38213+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38214
38215 for(j=0; j<NWD; j++) {
38216 struct gendisk *disk = ida_gendisk[i][j];
38217@@ -694,7 +694,7 @@ DBGINFO(
38218 for(i=0; i<NR_PRODUCTS; i++) {
38219 if (board_id == products[i].board_id) {
38220 c->product_name = products[i].product_name;
38221- c->access = *(products[i].access);
38222+ c->access = products[i].access;
38223 break;
38224 }
38225 }
38226@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38227 hba[ctlr]->intr = intr;
38228 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38229 hba[ctlr]->product_name = products[j].product_name;
38230- hba[ctlr]->access = *(products[j].access);
38231+ hba[ctlr]->access = products[j].access;
38232 hba[ctlr]->ctlr = ctlr;
38233 hba[ctlr]->board_id = board_id;
38234 hba[ctlr]->pci_dev = NULL; /* not PCI */
38235@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38236
38237 while((c = h->reqQ) != NULL) {
38238 /* Can't do anything if we're busy */
38239- if (h->access.fifo_full(h) == 0)
38240+ if (h->access->fifo_full(h) == 0)
38241 return;
38242
38243 /* Get the first entry from the request Q */
38244@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38245 h->Qdepth--;
38246
38247 /* Tell the controller to do our bidding */
38248- h->access.submit_command(h, c);
38249+ h->access->submit_command(h, c);
38250
38251 /* Get onto the completion Q */
38252 addQ(&h->cmpQ, c);
38253@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38254 unsigned long flags;
38255 __u32 a,a1;
38256
38257- istat = h->access.intr_pending(h);
38258+ istat = h->access->intr_pending(h);
38259 /* Is this interrupt for us? */
38260 if (istat == 0)
38261 return IRQ_NONE;
38262@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38263 */
38264 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38265 if (istat & FIFO_NOT_EMPTY) {
38266- while((a = h->access.command_completed(h))) {
38267+ while((a = h->access->command_completed(h))) {
38268 a1 = a; a &= ~3;
38269 if ((c = h->cmpQ) == NULL)
38270 {
38271@@ -1448,11 +1448,11 @@ static int sendcmd(
38272 /*
38273 * Disable interrupt
38274 */
38275- info_p->access.set_intr_mask(info_p, 0);
38276+ info_p->access->set_intr_mask(info_p, 0);
38277 /* Make sure there is room in the command FIFO */
38278 /* Actually it should be completely empty at this time. */
38279 for (i = 200000; i > 0; i--) {
38280- temp = info_p->access.fifo_full(info_p);
38281+ temp = info_p->access->fifo_full(info_p);
38282 if (temp != 0) {
38283 break;
38284 }
38285@@ -1465,7 +1465,7 @@ DBG(
38286 /*
38287 * Send the cmd
38288 */
38289- info_p->access.submit_command(info_p, c);
38290+ info_p->access->submit_command(info_p, c);
38291 complete = pollcomplete(ctlr);
38292
38293 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38294@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38295 * we check the new geometry. Then turn interrupts back on when
38296 * we're done.
38297 */
38298- host->access.set_intr_mask(host, 0);
38299+ host->access->set_intr_mask(host, 0);
38300 getgeometry(ctlr);
38301- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38302+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38303
38304 for(i=0; i<NWD; i++) {
38305 struct gendisk *disk = ida_gendisk[ctlr][i];
38306@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38307 /* Wait (up to 2 seconds) for a command to complete */
38308
38309 for (i = 200000; i > 0; i--) {
38310- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38311+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38312 if (done == 0) {
38313 udelay(10); /* a short fixed delay */
38314 } else
38315diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38316index be73e9d..7fbf140 100644
38317--- a/drivers/block/cpqarray.h
38318+++ b/drivers/block/cpqarray.h
38319@@ -99,7 +99,7 @@ struct ctlr_info {
38320 drv_info_t drv[NWD];
38321 struct proc_dir_entry *proc;
38322
38323- struct access_method access;
38324+ struct access_method *access;
38325
38326 cmdlist_t *reqQ;
38327 cmdlist_t *cmpQ;
38328diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38329index 434c77d..6d3219a 100644
38330--- a/drivers/block/drbd/drbd_bitmap.c
38331+++ b/drivers/block/drbd/drbd_bitmap.c
38332@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38333 submit_bio(rw, bio);
38334 /* this should not count as user activity and cause the
38335 * resync to throttle -- see drbd_rs_should_slow_down(). */
38336- atomic_add(len >> 9, &device->rs_sect_ev);
38337+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38338 }
38339 }
38340
38341diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38342index b905e98..0812ed8 100644
38343--- a/drivers/block/drbd/drbd_int.h
38344+++ b/drivers/block/drbd/drbd_int.h
38345@@ -385,7 +385,7 @@ struct drbd_epoch {
38346 struct drbd_connection *connection;
38347 struct list_head list;
38348 unsigned int barrier_nr;
38349- atomic_t epoch_size; /* increased on every request added. */
38350+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38351 atomic_t active; /* increased on every req. added, and dec on every finished. */
38352 unsigned long flags;
38353 };
38354@@ -946,7 +946,7 @@ struct drbd_device {
38355 unsigned int al_tr_number;
38356 int al_tr_cycle;
38357 wait_queue_head_t seq_wait;
38358- atomic_t packet_seq;
38359+ atomic_unchecked_t packet_seq;
38360 unsigned int peer_seq;
38361 spinlock_t peer_seq_lock;
38362 unsigned long comm_bm_set; /* communicated number of set bits. */
38363@@ -955,8 +955,8 @@ struct drbd_device {
38364 struct mutex own_state_mutex;
38365 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38366 char congestion_reason; /* Why we where congested... */
38367- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38368- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38369+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38370+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38371 int rs_last_sect_ev; /* counter to compare with */
38372 int rs_last_events; /* counter of read or write "events" (unit sectors)
38373 * on the lower level device when we last looked. */
38374diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38375index 1fc8342..7e7742b 100644
38376--- a/drivers/block/drbd/drbd_main.c
38377+++ b/drivers/block/drbd/drbd_main.c
38378@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38379 p->sector = sector;
38380 p->block_id = block_id;
38381 p->blksize = blksize;
38382- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38383+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38384 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38385 }
38386
38387@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38388 return -EIO;
38389 p->sector = cpu_to_be64(req->i.sector);
38390 p->block_id = (unsigned long)req;
38391- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38392+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38393 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38394 if (device->state.conn >= C_SYNC_SOURCE &&
38395 device->state.conn <= C_PAUSED_SYNC_T)
38396@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38397 atomic_set(&device->unacked_cnt, 0);
38398 atomic_set(&device->local_cnt, 0);
38399 atomic_set(&device->pp_in_use_by_net, 0);
38400- atomic_set(&device->rs_sect_in, 0);
38401- atomic_set(&device->rs_sect_ev, 0);
38402+ atomic_set_unchecked(&device->rs_sect_in, 0);
38403+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38404 atomic_set(&device->ap_in_flight, 0);
38405 atomic_set(&device->md_io.in_use, 0);
38406
38407@@ -2684,8 +2684,8 @@ void drbd_destroy_connection(struct kref *kref)
38408 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38409 struct drbd_resource *resource = connection->resource;
38410
38411- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38412- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38413+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38414+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38415 kfree(connection->current_epoch);
38416
38417 idr_destroy(&connection->peer_devices);
38418diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38419index 74df8cf..e41fc24 100644
38420--- a/drivers/block/drbd/drbd_nl.c
38421+++ b/drivers/block/drbd/drbd_nl.c
38422@@ -3637,13 +3637,13 @@ finish:
38423
38424 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38425 {
38426- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38427+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38428 struct sk_buff *msg;
38429 struct drbd_genlmsghdr *d_out;
38430 unsigned seq;
38431 int err = -ENOMEM;
38432
38433- seq = atomic_inc_return(&drbd_genl_seq);
38434+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38435 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38436 if (!msg)
38437 goto failed;
38438diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38439index cee2035..22f66bd 100644
38440--- a/drivers/block/drbd/drbd_receiver.c
38441+++ b/drivers/block/drbd/drbd_receiver.c
38442@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38443 struct drbd_device *device = peer_device->device;
38444 int err;
38445
38446- atomic_set(&device->packet_seq, 0);
38447+ atomic_set_unchecked(&device->packet_seq, 0);
38448 device->peer_seq = 0;
38449
38450 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38451@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38452 do {
38453 next_epoch = NULL;
38454
38455- epoch_size = atomic_read(&epoch->epoch_size);
38456+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38457
38458 switch (ev & ~EV_CLEANUP) {
38459 case EV_PUT:
38460@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38461 rv = FE_DESTROYED;
38462 } else {
38463 epoch->flags = 0;
38464- atomic_set(&epoch->epoch_size, 0);
38465+ atomic_set_unchecked(&epoch->epoch_size, 0);
38466 /* atomic_set(&epoch->active, 0); is already zero */
38467 if (rv == FE_STILL_LIVE)
38468 rv = FE_RECYCLED;
38469@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38470 conn_wait_active_ee_empty(connection);
38471 drbd_flush(connection);
38472
38473- if (atomic_read(&connection->current_epoch->epoch_size)) {
38474+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38475 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38476 if (epoch)
38477 break;
38478@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38479 }
38480
38481 epoch->flags = 0;
38482- atomic_set(&epoch->epoch_size, 0);
38483+ atomic_set_unchecked(&epoch->epoch_size, 0);
38484 atomic_set(&epoch->active, 0);
38485
38486 spin_lock(&connection->epoch_lock);
38487- if (atomic_read(&connection->current_epoch->epoch_size)) {
38488+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38489 list_add(&epoch->list, &connection->current_epoch->list);
38490 connection->current_epoch = epoch;
38491 connection->epochs++;
38492@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38493 list_add_tail(&peer_req->w.list, &device->sync_ee);
38494 spin_unlock_irq(&device->resource->req_lock);
38495
38496- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38497+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38498 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38499 return 0;
38500
38501@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38502 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38503 }
38504
38505- atomic_add(pi->size >> 9, &device->rs_sect_in);
38506+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38507
38508 return err;
38509 }
38510@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38511
38512 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38513 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38514- atomic_inc(&connection->current_epoch->epoch_size);
38515+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38516 err2 = drbd_drain_block(peer_device, pi->size);
38517 if (!err)
38518 err = err2;
38519@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38520
38521 spin_lock(&connection->epoch_lock);
38522 peer_req->epoch = connection->current_epoch;
38523- atomic_inc(&peer_req->epoch->epoch_size);
38524+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38525 atomic_inc(&peer_req->epoch->active);
38526 spin_unlock(&connection->epoch_lock);
38527
38528@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38529
38530 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38531 (int)part_stat_read(&disk->part0, sectors[1]) -
38532- atomic_read(&device->rs_sect_ev);
38533+ atomic_read_unchecked(&device->rs_sect_ev);
38534
38535 if (atomic_read(&device->ap_actlog_cnt)
38536 || curr_events - device->rs_last_events > 64) {
38537@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38538 device->use_csums = true;
38539 } else if (pi->cmd == P_OV_REPLY) {
38540 /* track progress, we may need to throttle */
38541- atomic_add(size >> 9, &device->rs_sect_in);
38542+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38543 peer_req->w.cb = w_e_end_ov_reply;
38544 dec_rs_pending(device);
38545 /* drbd_rs_begin_io done when we sent this request,
38546@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38547 goto out_free_e;
38548
38549 submit_for_resync:
38550- atomic_add(size >> 9, &device->rs_sect_ev);
38551+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38552
38553 submit:
38554 update_receiver_timing_details(connection, drbd_submit_peer_request);
38555@@ -4564,7 +4564,7 @@ struct data_cmd {
38556 int expect_payload;
38557 size_t pkt_size;
38558 int (*fn)(struct drbd_connection *, struct packet_info *);
38559-};
38560+} __do_const;
38561
38562 static struct data_cmd drbd_cmd_handler[] = {
38563 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38564@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38565 if (!list_empty(&connection->current_epoch->list))
38566 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38567 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38568- atomic_set(&connection->current_epoch->epoch_size, 0);
38569+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38570 connection->send.seen_any_write_yet = false;
38571
38572 drbd_info(connection, "Connection closed\n");
38573@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38574 put_ldev(device);
38575 }
38576 dec_rs_pending(device);
38577- atomic_add(blksize >> 9, &device->rs_sect_in);
38578+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38579
38580 return 0;
38581 }
38582@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38583 struct asender_cmd {
38584 size_t pkt_size;
38585 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38586-};
38587+} __do_const;
38588
38589 static struct asender_cmd asender_tbl[] = {
38590 [P_PING] = { 0, got_Ping },
38591diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38592index d0fae55..4469096 100644
38593--- a/drivers/block/drbd/drbd_worker.c
38594+++ b/drivers/block/drbd/drbd_worker.c
38595@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38596 list_add_tail(&peer_req->w.list, &device->read_ee);
38597 spin_unlock_irq(&device->resource->req_lock);
38598
38599- atomic_add(size >> 9, &device->rs_sect_ev);
38600+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38601 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38602 return 0;
38603
38604@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38605 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38606 int number, mxb;
38607
38608- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38609+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38610 device->rs_in_flight -= sect_in;
38611
38612 rcu_read_lock();
38613@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38614 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38615 struct fifo_buffer *plan;
38616
38617- atomic_set(&device->rs_sect_in, 0);
38618- atomic_set(&device->rs_sect_ev, 0);
38619+ atomic_set_unchecked(&device->rs_sect_in, 0);
38620+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38621 device->rs_in_flight = 0;
38622 device->rs_last_events =
38623 (int)part_stat_read(&disk->part0, sectors[0]) +
38624diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38625index 773e964..e85af00 100644
38626--- a/drivers/block/loop.c
38627+++ b/drivers/block/loop.c
38628@@ -234,7 +234,7 @@ static int __do_lo_send_write(struct file *file,
38629
38630 file_start_write(file);
38631 set_fs(get_ds());
38632- bw = file->f_op->write(file, buf, len, &pos);
38633+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38634 set_fs(old_fs);
38635 file_end_write(file);
38636 if (likely(bw == len))
38637diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38638index 09e628da..7607aaa 100644
38639--- a/drivers/block/pktcdvd.c
38640+++ b/drivers/block/pktcdvd.c
38641@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38642
38643 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38644 {
38645- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38646+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38647 }
38648
38649 /*
38650@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38651 return -EROFS;
38652 }
38653 pd->settings.fp = ti.fp;
38654- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38655+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38656
38657 if (ti.nwa_v) {
38658 pd->nwa = be32_to_cpu(ti.next_writable);
38659diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38660index b67066d..515b7f4 100644
38661--- a/drivers/block/rbd.c
38662+++ b/drivers/block/rbd.c
38663@@ -64,7 +64,7 @@
38664 * If the counter is already at its maximum value returns
38665 * -EINVAL without updating it.
38666 */
38667-static int atomic_inc_return_safe(atomic_t *v)
38668+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38669 {
38670 unsigned int counter;
38671
38672diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38673index e5565fb..71be10b4 100644
38674--- a/drivers/block/smart1,2.h
38675+++ b/drivers/block/smart1,2.h
38676@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38677 }
38678
38679 static struct access_method smart4_access = {
38680- smart4_submit_command,
38681- smart4_intr_mask,
38682- smart4_fifo_full,
38683- smart4_intr_pending,
38684- smart4_completed,
38685+ .submit_command = smart4_submit_command,
38686+ .set_intr_mask = smart4_intr_mask,
38687+ .fifo_full = smart4_fifo_full,
38688+ .intr_pending = smart4_intr_pending,
38689+ .command_completed = smart4_completed,
38690 };
38691
38692 /*
38693@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38694 }
38695
38696 static struct access_method smart2_access = {
38697- smart2_submit_command,
38698- smart2_intr_mask,
38699- smart2_fifo_full,
38700- smart2_intr_pending,
38701- smart2_completed,
38702+ .submit_command = smart2_submit_command,
38703+ .set_intr_mask = smart2_intr_mask,
38704+ .fifo_full = smart2_fifo_full,
38705+ .intr_pending = smart2_intr_pending,
38706+ .command_completed = smart2_completed,
38707 };
38708
38709 /*
38710@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38711 }
38712
38713 static struct access_method smart2e_access = {
38714- smart2e_submit_command,
38715- smart2e_intr_mask,
38716- smart2e_fifo_full,
38717- smart2e_intr_pending,
38718- smart2e_completed,
38719+ .submit_command = smart2e_submit_command,
38720+ .set_intr_mask = smart2e_intr_mask,
38721+ .fifo_full = smart2e_fifo_full,
38722+ .intr_pending = smart2e_intr_pending,
38723+ .command_completed = smart2e_completed,
38724 };
38725
38726 /*
38727@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38728 }
38729
38730 static struct access_method smart1_access = {
38731- smart1_submit_command,
38732- smart1_intr_mask,
38733- smart1_fifo_full,
38734- smart1_intr_pending,
38735- smart1_completed,
38736+ .submit_command = smart1_submit_command,
38737+ .set_intr_mask = smart1_intr_mask,
38738+ .fifo_full = smart1_fifo_full,
38739+ .intr_pending = smart1_intr_pending,
38740+ .command_completed = smart1_completed,
38741 };
38742diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38743index 55c135b..9f8d60c 100644
38744--- a/drivers/bluetooth/btwilink.c
38745+++ b/drivers/bluetooth/btwilink.c
38746@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38747
38748 static int bt_ti_probe(struct platform_device *pdev)
38749 {
38750- static struct ti_st *hst;
38751+ struct ti_st *hst;
38752 struct hci_dev *hdev;
38753 int err;
38754
38755diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38756index 5d28a45..a538f90 100644
38757--- a/drivers/cdrom/cdrom.c
38758+++ b/drivers/cdrom/cdrom.c
38759@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38760 ENSURE(reset, CDC_RESET);
38761 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38762 cdi->mc_flags = 0;
38763- cdo->n_minors = 0;
38764 cdi->options = CDO_USE_FFLAGS;
38765
38766 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38767@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38768 else
38769 cdi->cdda_method = CDDA_OLD;
38770
38771- if (!cdo->generic_packet)
38772- cdo->generic_packet = cdrom_dummy_generic_packet;
38773+ if (!cdo->generic_packet) {
38774+ pax_open_kernel();
38775+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38776+ pax_close_kernel();
38777+ }
38778
38779 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38780 mutex_lock(&cdrom_mutex);
38781@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38782 if (cdi->exit)
38783 cdi->exit(cdi);
38784
38785- cdi->ops->n_minors--;
38786 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38787 }
38788
38789@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38790 */
38791 nr = nframes;
38792 do {
38793- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38794+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38795 if (cgc.buffer)
38796 break;
38797
38798@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38799 struct cdrom_device_info *cdi;
38800 int ret;
38801
38802- ret = scnprintf(info + *pos, max_size - *pos, header);
38803+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38804 if (!ret)
38805 return 1;
38806
38807diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38808index 584bc31..e64a12c 100644
38809--- a/drivers/cdrom/gdrom.c
38810+++ b/drivers/cdrom/gdrom.c
38811@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38812 .audio_ioctl = gdrom_audio_ioctl,
38813 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38814 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38815- .n_minors = 1,
38816 };
38817
38818 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38819diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38820index a4af822..ed58cd1 100644
38821--- a/drivers/char/Kconfig
38822+++ b/drivers/char/Kconfig
38823@@ -17,7 +17,8 @@ config DEVMEM
38824
38825 config DEVKMEM
38826 bool "/dev/kmem virtual device support"
38827- default y
38828+ default n
38829+ depends on !GRKERNSEC_KMEM
38830 help
38831 Say Y here if you want to support the /dev/kmem device. The
38832 /dev/kmem device is rarely used, but can be used for certain
38833@@ -586,6 +587,7 @@ config DEVPORT
38834 bool
38835 depends on !M68K
38836 depends on ISA || PCI
38837+ depends on !GRKERNSEC_KMEM
38838 default y
38839
38840 source "drivers/s390/char/Kconfig"
38841diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38842index a48e05b..6bac831 100644
38843--- a/drivers/char/agp/compat_ioctl.c
38844+++ b/drivers/char/agp/compat_ioctl.c
38845@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38846 return -ENOMEM;
38847 }
38848
38849- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38850+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38851 sizeof(*usegment) * ureserve.seg_count)) {
38852 kfree(usegment);
38853 kfree(ksegment);
38854diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38855index 09f17eb..8531d2f 100644
38856--- a/drivers/char/agp/frontend.c
38857+++ b/drivers/char/agp/frontend.c
38858@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38859 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38860 return -EFAULT;
38861
38862- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38863+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38864 return -EFAULT;
38865
38866 client = agp_find_client_by_pid(reserve.pid);
38867@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38868 if (segment == NULL)
38869 return -ENOMEM;
38870
38871- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38872+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38873 sizeof(struct agp_segment) * reserve.seg_count)) {
38874 kfree(segment);
38875 return -EFAULT;
38876diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38877index 4f94375..413694e 100644
38878--- a/drivers/char/genrtc.c
38879+++ b/drivers/char/genrtc.c
38880@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38881 switch (cmd) {
38882
38883 case RTC_PLL_GET:
38884+ memset(&pll, 0, sizeof(pll));
38885 if (get_rtc_pll(&pll))
38886 return -EINVAL;
38887 else
38888diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38889index 5c0baa9..44011b1 100644
38890--- a/drivers/char/hpet.c
38891+++ b/drivers/char/hpet.c
38892@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38893 }
38894
38895 static int
38896-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38897+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38898 struct hpet_info *info)
38899 {
38900 struct hpet_timer __iomem *timer;
38901diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
38902index 24cc4ed..f9807cf 100644
38903--- a/drivers/char/i8k.c
38904+++ b/drivers/char/i8k.c
38905@@ -788,7 +788,7 @@ static const struct i8k_config_data i8k_config_data[] = {
38906 },
38907 };
38908
38909-static struct dmi_system_id i8k_dmi_table[] __initdata = {
38910+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
38911 {
38912 .ident = "Dell Inspiron",
38913 .matches = {
38914diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38915index 9bb5928..57a7801 100644
38916--- a/drivers/char/ipmi/ipmi_msghandler.c
38917+++ b/drivers/char/ipmi/ipmi_msghandler.c
38918@@ -436,7 +436,7 @@ struct ipmi_smi {
38919 struct proc_dir_entry *proc_dir;
38920 char proc_dir_name[10];
38921
38922- atomic_t stats[IPMI_NUM_STATS];
38923+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38924
38925 /*
38926 * run_to_completion duplicate of smb_info, smi_info
38927@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
38928 static DEFINE_MUTEX(smi_watchers_mutex);
38929
38930 #define ipmi_inc_stat(intf, stat) \
38931- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38932+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38933 #define ipmi_get_stat(intf, stat) \
38934- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38935+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38936
38937 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
38938 "ACPI", "SMBIOS", "PCI",
38939@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38940 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38941 init_waitqueue_head(&intf->waitq);
38942 for (i = 0; i < IPMI_NUM_STATS; i++)
38943- atomic_set(&intf->stats[i], 0);
38944+ atomic_set_unchecked(&intf->stats[i], 0);
38945
38946 intf->proc_dir = NULL;
38947
38948diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38949index 518585c..6c985cef 100644
38950--- a/drivers/char/ipmi/ipmi_si_intf.c
38951+++ b/drivers/char/ipmi/ipmi_si_intf.c
38952@@ -289,7 +289,7 @@ struct smi_info {
38953 unsigned char slave_addr;
38954
38955 /* Counters and things for the proc filesystem. */
38956- atomic_t stats[SI_NUM_STATS];
38957+ atomic_unchecked_t stats[SI_NUM_STATS];
38958
38959 struct task_struct *thread;
38960
38961@@ -298,9 +298,9 @@ struct smi_info {
38962 };
38963
38964 #define smi_inc_stat(smi, stat) \
38965- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38966+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38967 #define smi_get_stat(smi, stat) \
38968- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38969+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38970
38971 #define SI_MAX_PARMS 4
38972
38973@@ -3498,7 +3498,7 @@ static int try_smi_init(struct smi_info *new_smi)
38974 atomic_set(&new_smi->req_events, 0);
38975 new_smi->run_to_completion = false;
38976 for (i = 0; i < SI_NUM_STATS; i++)
38977- atomic_set(&new_smi->stats[i], 0);
38978+ atomic_set_unchecked(&new_smi->stats[i], 0);
38979
38980 new_smi->interrupt_disabled = true;
38981 atomic_set(&new_smi->need_watch, 0);
38982diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38983index 297110c..3f69b43 100644
38984--- a/drivers/char/mem.c
38985+++ b/drivers/char/mem.c
38986@@ -18,6 +18,7 @@
38987 #include <linux/raw.h>
38988 #include <linux/tty.h>
38989 #include <linux/capability.h>
38990+#include <linux/security.h>
38991 #include <linux/ptrace.h>
38992 #include <linux/device.h>
38993 #include <linux/highmem.h>
38994@@ -36,6 +37,10 @@
38995
38996 #define DEVPORT_MINOR 4
38997
38998+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38999+extern const struct file_operations grsec_fops;
39000+#endif
39001+
39002 static inline unsigned long size_inside_page(unsigned long start,
39003 unsigned long size)
39004 {
39005@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39006
39007 while (cursor < to) {
39008 if (!devmem_is_allowed(pfn)) {
39009+#ifdef CONFIG_GRKERNSEC_KMEM
39010+ gr_handle_mem_readwrite(from, to);
39011+#else
39012 printk(KERN_INFO
39013 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
39014 current->comm, from, to);
39015+#endif
39016 return 0;
39017 }
39018 cursor += PAGE_SIZE;
39019@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39020 }
39021 return 1;
39022 }
39023+#elif defined(CONFIG_GRKERNSEC_KMEM)
39024+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39025+{
39026+ return 0;
39027+}
39028 #else
39029 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39030 {
39031@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39032 #endif
39033
39034 while (count > 0) {
39035- unsigned long remaining;
39036+ unsigned long remaining = 0;
39037+ char *temp;
39038
39039 sz = size_inside_page(p, count);
39040
39041@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39042 if (!ptr)
39043 return -EFAULT;
39044
39045- remaining = copy_to_user(buf, ptr, sz);
39046+#ifdef CONFIG_PAX_USERCOPY
39047+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39048+ if (!temp) {
39049+ unxlate_dev_mem_ptr(p, ptr);
39050+ return -ENOMEM;
39051+ }
39052+ remaining = probe_kernel_read(temp, ptr, sz);
39053+#else
39054+ temp = ptr;
39055+#endif
39056+
39057+ if (!remaining)
39058+ remaining = copy_to_user(buf, temp, sz);
39059+
39060+#ifdef CONFIG_PAX_USERCOPY
39061+ kfree(temp);
39062+#endif
39063+
39064 unxlate_dev_mem_ptr(p, ptr);
39065 if (remaining)
39066 return -EFAULT;
39067@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39068 size_t count, loff_t *ppos)
39069 {
39070 unsigned long p = *ppos;
39071- ssize_t low_count, read, sz;
39072+ ssize_t low_count, read, sz, err = 0;
39073 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
39074- int err = 0;
39075
39076 read = 0;
39077 if (p < (unsigned long) high_memory) {
39078@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39079 }
39080 #endif
39081 while (low_count > 0) {
39082+ char *temp;
39083+
39084 sz = size_inside_page(p, low_count);
39085
39086 /*
39087@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39088 */
39089 kbuf = xlate_dev_kmem_ptr((void *)p);
39090
39091- if (copy_to_user(buf, kbuf, sz))
39092+#ifdef CONFIG_PAX_USERCOPY
39093+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39094+ if (!temp)
39095+ return -ENOMEM;
39096+ err = probe_kernel_read(temp, kbuf, sz);
39097+#else
39098+ temp = kbuf;
39099+#endif
39100+
39101+ if (!err)
39102+ err = copy_to_user(buf, temp, sz);
39103+
39104+#ifdef CONFIG_PAX_USERCOPY
39105+ kfree(temp);
39106+#endif
39107+
39108+ if (err)
39109 return -EFAULT;
39110 buf += sz;
39111 p += sz;
39112@@ -804,6 +853,9 @@ static const struct memdev {
39113 #ifdef CONFIG_PRINTK
39114 [11] = { "kmsg", 0644, &kmsg_fops, 0 },
39115 #endif
39116+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39117+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
39118+#endif
39119 };
39120
39121 static int memory_open(struct inode *inode, struct file *filp)
39122@@ -865,7 +917,7 @@ static int __init chr_dev_init(void)
39123 continue;
39124
39125 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
39126- NULL, devlist[minor].name);
39127+ NULL, "%s", devlist[minor].name);
39128 }
39129
39130 return tty_init();
39131diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
39132index 9df78e2..01ba9ae 100644
39133--- a/drivers/char/nvram.c
39134+++ b/drivers/char/nvram.c
39135@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
39136
39137 spin_unlock_irq(&rtc_lock);
39138
39139- if (copy_to_user(buf, contents, tmp - contents))
39140+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
39141 return -EFAULT;
39142
39143 *ppos = i;
39144diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
39145index 0ea9986..e7b07e4 100644
39146--- a/drivers/char/pcmcia/synclink_cs.c
39147+++ b/drivers/char/pcmcia/synclink_cs.c
39148@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39149
39150 if (debug_level >= DEBUG_LEVEL_INFO)
39151 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
39152- __FILE__, __LINE__, info->device_name, port->count);
39153+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
39154
39155 if (tty_port_close_start(port, tty, filp) == 0)
39156 goto cleanup;
39157@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39158 cleanup:
39159 if (debug_level >= DEBUG_LEVEL_INFO)
39160 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
39161- tty->driver->name, port->count);
39162+ tty->driver->name, atomic_read(&port->count));
39163 }
39164
39165 /* Wait until the transmitter is empty.
39166@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39167
39168 if (debug_level >= DEBUG_LEVEL_INFO)
39169 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
39170- __FILE__, __LINE__, tty->driver->name, port->count);
39171+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
39172
39173 /* If port is closing, signal caller to try again */
39174 if (port->flags & ASYNC_CLOSING){
39175@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39176 goto cleanup;
39177 }
39178 spin_lock(&port->lock);
39179- port->count++;
39180+ atomic_inc(&port->count);
39181 spin_unlock(&port->lock);
39182 spin_unlock_irqrestore(&info->netlock, flags);
39183
39184- if (port->count == 1) {
39185+ if (atomic_read(&port->count) == 1) {
39186 /* 1st open on this device, init hardware */
39187 retval = startup(info, tty);
39188 if (retval < 0)
39189@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39190 unsigned short new_crctype;
39191
39192 /* return error if TTY interface open */
39193- if (info->port.count)
39194+ if (atomic_read(&info->port.count))
39195 return -EBUSY;
39196
39197 switch (encoding)
39198@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
39199
39200 /* arbitrate between network and tty opens */
39201 spin_lock_irqsave(&info->netlock, flags);
39202- if (info->port.count != 0 || info->netcount != 0) {
39203+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39204 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39205 spin_unlock_irqrestore(&info->netlock, flags);
39206 return -EBUSY;
39207@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39208 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
39209
39210 /* return error if TTY interface open */
39211- if (info->port.count)
39212+ if (atomic_read(&info->port.count))
39213 return -EBUSY;
39214
39215 if (cmd != SIOCWANDEV)
39216diff --git a/drivers/char/random.c b/drivers/char/random.c
39217index 9cd6968..6416f00 100644
39218--- a/drivers/char/random.c
39219+++ b/drivers/char/random.c
39220@@ -289,9 +289,6 @@
39221 /*
39222 * To allow fractional bits to be tracked, the entropy_count field is
39223 * denominated in units of 1/8th bits.
39224- *
39225- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39226- * credit_entropy_bits() needs to be 64 bits wide.
39227 */
39228 #define ENTROPY_SHIFT 3
39229 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39230@@ -439,9 +436,9 @@ struct entropy_store {
39231 };
39232
39233 static void push_to_pool(struct work_struct *work);
39234-static __u32 input_pool_data[INPUT_POOL_WORDS];
39235-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39236-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39237+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39238+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39239+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39240
39241 static struct entropy_store input_pool = {
39242 .poolinfo = &poolinfo_table[0],
39243@@ -635,7 +632,7 @@ retry:
39244 /* The +2 corresponds to the /4 in the denominator */
39245
39246 do {
39247- unsigned int anfrac = min(pnfrac, pool_size/2);
39248+ u64 anfrac = min(pnfrac, pool_size/2);
39249 unsigned int add =
39250 ((pool_size - entropy_count)*anfrac*3) >> s;
39251
39252@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39253
39254 extract_buf(r, tmp);
39255 i = min_t(int, nbytes, EXTRACT_SIZE);
39256- if (copy_to_user(buf, tmp, i)) {
39257+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39258 ret = -EFAULT;
39259 break;
39260 }
39261@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39262 static int proc_do_uuid(struct ctl_table *table, int write,
39263 void __user *buffer, size_t *lenp, loff_t *ppos)
39264 {
39265- struct ctl_table fake_table;
39266+ ctl_table_no_const fake_table;
39267 unsigned char buf[64], tmp_uuid[16], *uuid;
39268
39269 uuid = table->data;
39270@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39271 static int proc_do_entropy(struct ctl_table *table, int write,
39272 void __user *buffer, size_t *lenp, loff_t *ppos)
39273 {
39274- struct ctl_table fake_table;
39275+ ctl_table_no_const fake_table;
39276 int entropy_count;
39277
39278 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39279diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39280index e496dae..3db53b6 100644
39281--- a/drivers/char/sonypi.c
39282+++ b/drivers/char/sonypi.c
39283@@ -54,6 +54,7 @@
39284
39285 #include <asm/uaccess.h>
39286 #include <asm/io.h>
39287+#include <asm/local.h>
39288
39289 #include <linux/sonypi.h>
39290
39291@@ -490,7 +491,7 @@ static struct sonypi_device {
39292 spinlock_t fifo_lock;
39293 wait_queue_head_t fifo_proc_list;
39294 struct fasync_struct *fifo_async;
39295- int open_count;
39296+ local_t open_count;
39297 int model;
39298 struct input_dev *input_jog_dev;
39299 struct input_dev *input_key_dev;
39300@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39301 static int sonypi_misc_release(struct inode *inode, struct file *file)
39302 {
39303 mutex_lock(&sonypi_device.lock);
39304- sonypi_device.open_count--;
39305+ local_dec(&sonypi_device.open_count);
39306 mutex_unlock(&sonypi_device.lock);
39307 return 0;
39308 }
39309@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39310 {
39311 mutex_lock(&sonypi_device.lock);
39312 /* Flush input queue on first open */
39313- if (!sonypi_device.open_count)
39314+ if (!local_read(&sonypi_device.open_count))
39315 kfifo_reset(&sonypi_device.fifo);
39316- sonypi_device.open_count++;
39317+ local_inc(&sonypi_device.open_count);
39318 mutex_unlock(&sonypi_device.lock);
39319
39320 return 0;
39321@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39322
39323 static struct platform_device *sonypi_platform_device;
39324
39325-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39326+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39327 {
39328 .ident = "Sony Vaio",
39329 .matches = {
39330diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39331index 565a947..dcdc06e 100644
39332--- a/drivers/char/tpm/tpm_acpi.c
39333+++ b/drivers/char/tpm/tpm_acpi.c
39334@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39335 virt = acpi_os_map_iomem(start, len);
39336 if (!virt) {
39337 kfree(log->bios_event_log);
39338+ log->bios_event_log = NULL;
39339 printk("%s: ERROR - Unable to map memory\n", __func__);
39340 return -EIO;
39341 }
39342
39343- memcpy_fromio(log->bios_event_log, virt, len);
39344+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39345
39346 acpi_os_unmap_iomem(virt, len);
39347 return 0;
39348diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39349index 3a56a13..f8cbd25 100644
39350--- a/drivers/char/tpm/tpm_eventlog.c
39351+++ b/drivers/char/tpm/tpm_eventlog.c
39352@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39353 event = addr;
39354
39355 if ((event->event_type == 0 && event->event_size == 0) ||
39356- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39357+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39358 return NULL;
39359
39360 return addr;
39361@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39362 return NULL;
39363
39364 if ((event->event_type == 0 && event->event_size == 0) ||
39365- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39366+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39367 return NULL;
39368
39369 (*pos)++;
39370@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39371 int i;
39372
39373 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39374- seq_putc(m, data[i]);
39375+ if (!seq_putc(m, data[i]))
39376+ return -EFAULT;
39377
39378 return 0;
39379 }
39380diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39381index 72d7028..1586601 100644
39382--- a/drivers/char/virtio_console.c
39383+++ b/drivers/char/virtio_console.c
39384@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39385 if (to_user) {
39386 ssize_t ret;
39387
39388- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39389+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39390 if (ret)
39391 return -EFAULT;
39392 } else {
39393@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39394 if (!port_has_data(port) && !port->host_connected)
39395 return 0;
39396
39397- return fill_readbuf(port, ubuf, count, true);
39398+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39399 }
39400
39401 static int wait_port_writable(struct port *port, bool nonblock)
39402diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39403index 956b7e5..b655045 100644
39404--- a/drivers/clk/clk-composite.c
39405+++ b/drivers/clk/clk-composite.c
39406@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39407 struct clk *clk;
39408 struct clk_init_data init;
39409 struct clk_composite *composite;
39410- struct clk_ops *clk_composite_ops;
39411+ clk_ops_no_const *clk_composite_ops;
39412
39413 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39414 if (!composite) {
39415diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c
39416index 2e4f6d4..b4cf487 100644
39417--- a/drivers/clk/hisilicon/clk-hi3620.c
39418+++ b/drivers/clk/hisilicon/clk-hi3620.c
39419@@ -38,44 +38,44 @@
39420 #include "clk.h"
39421
39422 /* clock parent list */
39423-static const char *timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
39424-static const char *timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
39425-static const char *timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
39426-static const char *timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
39427-static const char *timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
39428-static const char *timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
39429-static const char *timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
39430-static const char *timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
39431-static const char *timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
39432-static const char *timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
39433-static const char *uart0_mux_p[] __initconst = { "osc26m", "pclk", };
39434-static const char *uart1_mux_p[] __initconst = { "osc26m", "pclk", };
39435-static const char *uart2_mux_p[] __initconst = { "osc26m", "pclk", };
39436-static const char *uart3_mux_p[] __initconst = { "osc26m", "pclk", };
39437-static const char *uart4_mux_p[] __initconst = { "osc26m", "pclk", };
39438-static const char *spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39439-static const char *spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39440-static const char *spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39441+static const char * const timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
39442+static const char * const timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
39443+static const char * const timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
39444+static const char * const timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
39445+static const char * const timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
39446+static const char * const timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
39447+static const char * const timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
39448+static const char * const timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
39449+static const char * const timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
39450+static const char * const timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
39451+static const char * const uart0_mux_p[] __initconst = { "osc26m", "pclk", };
39452+static const char * const uart1_mux_p[] __initconst = { "osc26m", "pclk", };
39453+static const char * const uart2_mux_p[] __initconst = { "osc26m", "pclk", };
39454+static const char * const uart3_mux_p[] __initconst = { "osc26m", "pclk", };
39455+static const char * const uart4_mux_p[] __initconst = { "osc26m", "pclk", };
39456+static const char * const spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39457+static const char * const spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39458+static const char * const spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39459 /* share axi parent */
39460-static const char *saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
39461-static const char *pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
39462-static const char *pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
39463-static const char *sd_mux_p[] __initconst = { "armpll2", "armpll3", };
39464-static const char *mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39465-static const char *mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
39466-static const char *g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
39467-static const char *venc_mux_p[] __initconst = { "armpll2", "armpll3", };
39468-static const char *vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
39469-static const char *vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
39470-static const char *edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
39471-static const char *ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
39472+static const char * const saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
39473+static const char * const pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
39474+static const char * const pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
39475+static const char * const sd_mux_p[] __initconst = { "armpll2", "armpll3", };
39476+static const char * const mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39477+static const char * const mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
39478+static const char * const g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
39479+static const char * const venc_mux_p[] __initconst = { "armpll2", "armpll3", };
39480+static const char * const vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
39481+static const char * const vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
39482+static const char * const edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
39483+static const char * const ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
39484 "armpll3", "armpll5", };
39485-static const char *edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39486-static const char *ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
39487+static const char * const edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39488+static const char * const ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
39489 "armpll3", "armpll5", };
39490-static const char *rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
39491-static const char *mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
39492-static const char *mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
39493+static const char * const rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
39494+static const char * const mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
39495+static const char * const mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
39496
39497
39498 /* fixed rate clocks */
39499diff --git a/drivers/clk/hisilicon/clk-hix5hd2.c b/drivers/clk/hisilicon/clk-hix5hd2.c
39500index 3f369c6..05f9ffd 100644
39501--- a/drivers/clk/hisilicon/clk-hix5hd2.c
39502+++ b/drivers/clk/hisilicon/clk-hix5hd2.c
39503@@ -46,15 +46,15 @@ static struct hisi_fixed_rate_clock hix5hd2_fixed_rate_clks[] __initdata = {
39504 { HIX5HD2_FIXED_83M, "83m", NULL, CLK_IS_ROOT, 83333333, },
39505 };
39506
39507-static const char *sfc_mux_p[] __initconst = {
39508+static const char * const sfc_mux_p[] __initconst = {
39509 "24m", "150m", "200m", "100m", "75m", };
39510 static u32 sfc_mux_table[] = {0, 4, 5, 6, 7};
39511
39512-static const char *sdio_mux_p[] __initconst = {
39513+static const char * const sdio_mux_p[] __initconst = {
39514 "75m", "100m", "50m", "15m", };
39515 static u32 sdio_mux_table[] = {0, 1, 2, 3};
39516
39517-static const char *fephy_mux_p[] __initconst = { "25m", "125m"};
39518+static const char * const fephy_mux_p[] __initconst = { "25m", "125m"};
39519 static u32 fephy_mux_table[] = {0, 1};
39520
39521
39522diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
39523index 7eb684c..147c6fc 100644
39524--- a/drivers/clk/rockchip/clk-rk3188.c
39525+++ b/drivers/clk/rockchip/clk-rk3188.c
39526@@ -704,7 +704,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = {
39527 GATE(ACLK_GPS, "aclk_gps", "aclk_peri", 0, RK2928_CLKGATE_CON(8), 13, GFLAGS),
39528 };
39529
39530-static const char *rk3188_critical_clocks[] __initconst = {
39531+static const char * const rk3188_critical_clocks[] __initconst = {
39532 "aclk_cpu",
39533 "aclk_peri",
39534 "hclk_peri",
39535diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
39536index 05d7a0b..4fc131c 100644
39537--- a/drivers/clk/rockchip/clk-rk3288.c
39538+++ b/drivers/clk/rockchip/clk-rk3288.c
39539@@ -771,7 +771,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
39540 GATE(0, "pclk_isp_in", "ext_isp", 0, RK3288_CLKGATE_CON(16), 3, GFLAGS),
39541 };
39542
39543-static const char *rk3288_critical_clocks[] __initconst = {
39544+static const char * const rk3288_critical_clocks[] __initconst = {
39545 "aclk_cpu",
39546 "aclk_peri",
39547 "hclk_peri",
39548diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
39549index 58d2e3b..0c21b0d 100644
39550--- a/drivers/clk/rockchip/clk.h
39551+++ b/drivers/clk/rockchip/clk.h
39552@@ -182,7 +182,7 @@ struct clk *rockchip_clk_register_mmc(const char *name,
39553 const char **parent_names, u8 num_parents,
39554 void __iomem *reg, int shift);
39555
39556-#define PNAME(x) static const char *x[] __initconst
39557+#define PNAME(x) static const char * const x[] __initconst
39558
39559 enum rockchip_clk_branch_type {
39560 branch_composite,
39561diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
39562index e4c7538..99c50cd 100644
39563--- a/drivers/clk/samsung/clk.h
39564+++ b/drivers/clk/samsung/clk.h
39565@@ -260,7 +260,7 @@ struct samsung_gate_clock {
39566 #define GATE_DA(_id, dname, cname, pname, o, b, f, gf, a) \
39567 __GATE(_id, dname, cname, pname, o, b, f, gf, a)
39568
39569-#define PNAME(x) static const char *x[] __initdata
39570+#define PNAME(x) static const char * const x[] __initconst
39571
39572 /**
39573 * struct samsung_clk_reg_dump: register dump of clock controller registers.
39574diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39575index dd3a78c..386d49c 100644
39576--- a/drivers/clk/socfpga/clk-gate.c
39577+++ b/drivers/clk/socfpga/clk-gate.c
39578@@ -22,6 +22,7 @@
39579 #include <linux/mfd/syscon.h>
39580 #include <linux/of.h>
39581 #include <linux/regmap.h>
39582+#include <asm/pgtable.h>
39583
39584 #include "clk.h"
39585
39586@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39587 return 0;
39588 }
39589
39590-static struct clk_ops gateclk_ops = {
39591+static clk_ops_no_const gateclk_ops __read_only = {
39592 .prepare = socfpga_clk_prepare,
39593 .recalc_rate = socfpga_clk_recalc_rate,
39594 .get_parent = socfpga_clk_get_parent,
39595@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39596 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39597 socfpga_clk->hw.bit_idx = clk_gate[1];
39598
39599- gateclk_ops.enable = clk_gate_ops.enable;
39600- gateclk_ops.disable = clk_gate_ops.disable;
39601+ pax_open_kernel();
39602+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39603+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39604+ pax_close_kernel();
39605 }
39606
39607 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39608diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39609index de6da95..c98278b 100644
39610--- a/drivers/clk/socfpga/clk-pll.c
39611+++ b/drivers/clk/socfpga/clk-pll.c
39612@@ -21,6 +21,7 @@
39613 #include <linux/io.h>
39614 #include <linux/of.h>
39615 #include <linux/of_address.h>
39616+#include <asm/pgtable.h>
39617
39618 #include "clk.h"
39619
39620@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39621 CLK_MGR_PLL_CLK_SRC_MASK;
39622 }
39623
39624-static struct clk_ops clk_pll_ops = {
39625+static clk_ops_no_const clk_pll_ops __read_only = {
39626 .recalc_rate = clk_pll_recalc_rate,
39627 .get_parent = clk_pll_get_parent,
39628 };
39629@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39630 pll_clk->hw.hw.init = &init;
39631
39632 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39633- clk_pll_ops.enable = clk_gate_ops.enable;
39634- clk_pll_ops.disable = clk_gate_ops.disable;
39635+ pax_open_kernel();
39636+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39637+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39638+ pax_close_kernel();
39639
39640 clk = clk_register(NULL, &pll_clk->hw.hw);
39641 if (WARN_ON(IS_ERR(clk))) {
39642diff --git a/drivers/clk/ti/composite.c b/drivers/clk/ti/composite.c
39643index 3654f61..81abe81 100644
39644--- a/drivers/clk/ti/composite.c
39645+++ b/drivers/clk/ti/composite.c
39646@@ -69,7 +69,7 @@ struct component_clk {
39647 struct list_head link;
39648 };
39649
39650-static const char * __initconst component_clk_types[] = {
39651+static const char * const __initconst component_clk_types[] = {
39652 "gate", "divider", "mux"
39653 };
39654
39655diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
39656index f870aad..04ba1e4 100644
39657--- a/drivers/clk/zynq/clkc.c
39658+++ b/drivers/clk/zynq/clkc.c
39659@@ -85,22 +85,22 @@ static DEFINE_SPINLOCK(canmioclk_lock);
39660 static DEFINE_SPINLOCK(dbgclk_lock);
39661 static DEFINE_SPINLOCK(aperclk_lock);
39662
39663-static const char *armpll_parents[] __initconst = {"armpll_int", "ps_clk"};
39664-static const char *ddrpll_parents[] __initconst = {"ddrpll_int", "ps_clk"};
39665-static const char *iopll_parents[] __initconst = {"iopll_int", "ps_clk"};
39666-static const char *gem0_mux_parents[] __initconst = {"gem0_div1", "dummy_name"};
39667-static const char *gem1_mux_parents[] __initconst = {"gem1_div1", "dummy_name"};
39668-static const char *can0_mio_mux2_parents[] __initconst = {"can0_gate",
39669+static const char * const armpll_parents[] __initconst = {"armpll_int", "ps_clk"};
39670+static const char * const ddrpll_parents[] __initconst = {"ddrpll_int", "ps_clk"};
39671+static const char * const iopll_parents[] __initconst = {"iopll_int", "ps_clk"};
39672+static const char * gem0_mux_parents[] __initdata = {"gem0_div1", "dummy_name"};
39673+static const char * gem1_mux_parents[] __initdata = {"gem1_div1", "dummy_name"};
39674+static const char * const can0_mio_mux2_parents[] __initconst = {"can0_gate",
39675 "can0_mio_mux"};
39676-static const char *can1_mio_mux2_parents[] __initconst = {"can1_gate",
39677+static const char * const can1_mio_mux2_parents[] __initconst = {"can1_gate",
39678 "can1_mio_mux"};
39679-static const char *dbg_emio_mux_parents[] __initconst = {"dbg_div",
39680+static const char * dbg_emio_mux_parents[] __initdata = {"dbg_div",
39681 "dummy_name"};
39682
39683-static const char *dbgtrc_emio_input_names[] __initconst = {"trace_emio_clk"};
39684-static const char *gem0_emio_input_names[] __initconst = {"gem0_emio_clk"};
39685-static const char *gem1_emio_input_names[] __initconst = {"gem1_emio_clk"};
39686-static const char *swdt_ext_clk_input_names[] __initconst = {"swdt_ext_clk"};
39687+static const char * const dbgtrc_emio_input_names[] __initconst = {"trace_emio_clk"};
39688+static const char * const gem0_emio_input_names[] __initconst = {"gem0_emio_clk"};
39689+static const char * const gem1_emio_input_names[] __initconst = {"gem1_emio_clk"};
39690+static const char * const swdt_ext_clk_input_names[] __initconst = {"swdt_ext_clk"};
39691
39692 static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
39693 const char *clk_name, void __iomem *fclk_ctrl_reg,
39694diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39695index b0c18ed..1713a80 100644
39696--- a/drivers/cpufreq/acpi-cpufreq.c
39697+++ b/drivers/cpufreq/acpi-cpufreq.c
39698@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39699 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39700 per_cpu(acfreq_data, cpu) = data;
39701
39702- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39703- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39704+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39705+ pax_open_kernel();
39706+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39707+ pax_close_kernel();
39708+ }
39709
39710 result = acpi_processor_register_performance(data->acpi_data, cpu);
39711 if (result)
39712@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39713 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39714 break;
39715 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39716- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39717+ pax_open_kernel();
39718+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39719+ pax_close_kernel();
39720 break;
39721 default:
39722 break;
39723@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39724 if (!msrs)
39725 return;
39726
39727- acpi_cpufreq_driver.boost_supported = true;
39728- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39729+ pax_open_kernel();
39730+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39731+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39732+ pax_close_kernel();
39733
39734 cpu_notifier_register_begin();
39735
39736diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39737index bab67db..91af7e3 100644
39738--- a/drivers/cpufreq/cpufreq-dt.c
39739+++ b/drivers/cpufreq/cpufreq-dt.c
39740@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39741 if (!IS_ERR(cpu_reg))
39742 regulator_put(cpu_reg);
39743
39744- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39745+ pax_open_kernel();
39746+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39747+ pax_close_kernel();
39748
39749 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39750 if (ret)
39751diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39752index 8ae655c..3141442 100644
39753--- a/drivers/cpufreq/cpufreq.c
39754+++ b/drivers/cpufreq/cpufreq.c
39755@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39756 }
39757
39758 mutex_lock(&cpufreq_governor_mutex);
39759- list_del(&governor->governor_list);
39760+ pax_list_del(&governor->governor_list);
39761 mutex_unlock(&cpufreq_governor_mutex);
39762 return;
39763 }
39764@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39765 return NOTIFY_OK;
39766 }
39767
39768-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39769+static struct notifier_block cpufreq_cpu_notifier = {
39770 .notifier_call = cpufreq_cpu_callback,
39771 };
39772
39773@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
39774 return 0;
39775
39776 write_lock_irqsave(&cpufreq_driver_lock, flags);
39777- cpufreq_driver->boost_enabled = state;
39778+ pax_open_kernel();
39779+ *(bool *)&cpufreq_driver->boost_enabled = state;
39780+ pax_close_kernel();
39781 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39782
39783 ret = cpufreq_driver->set_boost(state);
39784 if (ret) {
39785 write_lock_irqsave(&cpufreq_driver_lock, flags);
39786- cpufreq_driver->boost_enabled = !state;
39787+ pax_open_kernel();
39788+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39789+ pax_close_kernel();
39790 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39791
39792 pr_err("%s: Cannot %s BOOST\n",
39793@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39794 cpufreq_driver = driver_data;
39795 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39796
39797- if (driver_data->setpolicy)
39798- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39799+ if (driver_data->setpolicy) {
39800+ pax_open_kernel();
39801+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39802+ pax_close_kernel();
39803+ }
39804
39805 if (cpufreq_boost_supported()) {
39806 /*
39807 * Check if driver provides function to enable boost -
39808 * if not, use cpufreq_boost_set_sw as default
39809 */
39810- if (!cpufreq_driver->set_boost)
39811- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39812+ if (!cpufreq_driver->set_boost) {
39813+ pax_open_kernel();
39814+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39815+ pax_close_kernel();
39816+ }
39817
39818 ret = cpufreq_sysfs_create_file(&boost.attr);
39819 if (ret) {
39820diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39821index 1b44496..b80ff5e 100644
39822--- a/drivers/cpufreq/cpufreq_governor.c
39823+++ b/drivers/cpufreq/cpufreq_governor.c
39824@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39825 struct dbs_data *dbs_data;
39826 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39827 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39828- struct od_ops *od_ops = NULL;
39829+ const struct od_ops *od_ops = NULL;
39830 struct od_dbs_tuners *od_tuners = NULL;
39831 struct cs_dbs_tuners *cs_tuners = NULL;
39832 struct cpu_dbs_common_info *cpu_cdbs;
39833@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39834
39835 if ((cdata->governor == GOV_CONSERVATIVE) &&
39836 (!policy->governor->initialized)) {
39837- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39838+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39839
39840 cpufreq_register_notifier(cs_ops->notifier_block,
39841 CPUFREQ_TRANSITION_NOTIFIER);
39842@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39843
39844 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39845 (policy->governor->initialized == 1)) {
39846- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39847+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39848
39849 cpufreq_unregister_notifier(cs_ops->notifier_block,
39850 CPUFREQ_TRANSITION_NOTIFIER);
39851diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39852index cc401d1..8197340 100644
39853--- a/drivers/cpufreq/cpufreq_governor.h
39854+++ b/drivers/cpufreq/cpufreq_governor.h
39855@@ -212,7 +212,7 @@ struct common_dbs_data {
39856 void (*exit)(struct dbs_data *dbs_data);
39857
39858 /* Governor specific ops, see below */
39859- void *gov_ops;
39860+ const void *gov_ops;
39861 };
39862
39863 /* Governor Per policy data */
39864@@ -232,7 +232,7 @@ struct od_ops {
39865 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39866 unsigned int freq_next, unsigned int relation);
39867 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39868-};
39869+} __no_const;
39870
39871 struct cs_ops {
39872 struct notifier_block *notifier_block;
39873diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39874index ad3f38f..8f086cd 100644
39875--- a/drivers/cpufreq/cpufreq_ondemand.c
39876+++ b/drivers/cpufreq/cpufreq_ondemand.c
39877@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39878
39879 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39880
39881-static struct od_ops od_ops = {
39882+static struct od_ops od_ops __read_only = {
39883 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39884 .powersave_bias_target = generic_powersave_bias_target,
39885 .freq_increase = dbs_freq_increase,
39886@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39887 (struct cpufreq_policy *, unsigned int, unsigned int),
39888 unsigned int powersave_bias)
39889 {
39890- od_ops.powersave_bias_target = f;
39891+ pax_open_kernel();
39892+ *(void **)&od_ops.powersave_bias_target = f;
39893+ pax_close_kernel();
39894 od_set_powersave_bias(powersave_bias);
39895 }
39896 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39897
39898 void od_unregister_powersave_bias_handler(void)
39899 {
39900- od_ops.powersave_bias_target = generic_powersave_bias_target;
39901+ pax_open_kernel();
39902+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39903+ pax_close_kernel();
39904 od_set_powersave_bias(0);
39905 }
39906 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39907diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39908index 872c577..5fb3c20 100644
39909--- a/drivers/cpufreq/intel_pstate.c
39910+++ b/drivers/cpufreq/intel_pstate.c
39911@@ -133,10 +133,10 @@ struct pstate_funcs {
39912 struct cpu_defaults {
39913 struct pstate_adjust_policy pid_policy;
39914 struct pstate_funcs funcs;
39915-};
39916+} __do_const;
39917
39918 static struct pstate_adjust_policy pid_params;
39919-static struct pstate_funcs pstate_funcs;
39920+static struct pstate_funcs *pstate_funcs;
39921 static int hwp_active;
39922
39923 struct perf_limits {
39924@@ -690,18 +690,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39925
39926 cpu->pstate.current_pstate = pstate;
39927
39928- pstate_funcs.set(cpu, pstate);
39929+ pstate_funcs->set(cpu, pstate);
39930 }
39931
39932 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39933 {
39934- cpu->pstate.min_pstate = pstate_funcs.get_min();
39935- cpu->pstate.max_pstate = pstate_funcs.get_max();
39936- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39937- cpu->pstate.scaling = pstate_funcs.get_scaling();
39938+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39939+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39940+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39941+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39942
39943- if (pstate_funcs.get_vid)
39944- pstate_funcs.get_vid(cpu);
39945+ if (pstate_funcs->get_vid)
39946+ pstate_funcs->get_vid(cpu);
39947 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39948 }
39949
39950@@ -1030,9 +1030,9 @@ static int intel_pstate_msrs_not_valid(void)
39951 rdmsrl(MSR_IA32_APERF, aperf);
39952 rdmsrl(MSR_IA32_MPERF, mperf);
39953
39954- if (!pstate_funcs.get_max() ||
39955- !pstate_funcs.get_min() ||
39956- !pstate_funcs.get_turbo())
39957+ if (!pstate_funcs->get_max() ||
39958+ !pstate_funcs->get_min() ||
39959+ !pstate_funcs->get_turbo())
39960 return -ENODEV;
39961
39962 rdmsrl(MSR_IA32_APERF, tmp);
39963@@ -1046,7 +1046,7 @@ static int intel_pstate_msrs_not_valid(void)
39964 return 0;
39965 }
39966
39967-static void copy_pid_params(struct pstate_adjust_policy *policy)
39968+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39969 {
39970 pid_params.sample_rate_ms = policy->sample_rate_ms;
39971 pid_params.p_gain_pct = policy->p_gain_pct;
39972@@ -1058,12 +1058,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39973
39974 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39975 {
39976- pstate_funcs.get_max = funcs->get_max;
39977- pstate_funcs.get_min = funcs->get_min;
39978- pstate_funcs.get_turbo = funcs->get_turbo;
39979- pstate_funcs.get_scaling = funcs->get_scaling;
39980- pstate_funcs.set = funcs->set;
39981- pstate_funcs.get_vid = funcs->get_vid;
39982+ pstate_funcs = funcs;
39983 }
39984
39985 #if IS_ENABLED(CONFIG_ACPI)
39986diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39987index 529cfd9..0e28fff 100644
39988--- a/drivers/cpufreq/p4-clockmod.c
39989+++ b/drivers/cpufreq/p4-clockmod.c
39990@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39991 case 0x0F: /* Core Duo */
39992 case 0x16: /* Celeron Core */
39993 case 0x1C: /* Atom */
39994- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39995+ pax_open_kernel();
39996+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39997+ pax_close_kernel();
39998 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39999 case 0x0D: /* Pentium M (Dothan) */
40000- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40001+ pax_open_kernel();
40002+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40003+ pax_close_kernel();
40004 /* fall through */
40005 case 0x09: /* Pentium M (Banias) */
40006 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
40007@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
40008
40009 /* on P-4s, the TSC runs with constant frequency independent whether
40010 * throttling is active or not. */
40011- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40012+ pax_open_kernel();
40013+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40014+ pax_close_kernel();
40015
40016 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
40017 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
40018diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
40019index 9bb42ba..b01b4a2 100644
40020--- a/drivers/cpufreq/sparc-us3-cpufreq.c
40021+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
40022@@ -18,14 +18,12 @@
40023 #include <asm/head.h>
40024 #include <asm/timer.h>
40025
40026-static struct cpufreq_driver *cpufreq_us3_driver;
40027-
40028 struct us3_freq_percpu_info {
40029 struct cpufreq_frequency_table table[4];
40030 };
40031
40032 /* Indexed by cpu number. */
40033-static struct us3_freq_percpu_info *us3_freq_table;
40034+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
40035
40036 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
40037 * in the Safari config register.
40038@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
40039
40040 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
40041 {
40042- if (cpufreq_us3_driver)
40043- us3_freq_target(policy, 0);
40044+ us3_freq_target(policy, 0);
40045
40046 return 0;
40047 }
40048
40049+static int __init us3_freq_init(void);
40050+static void __exit us3_freq_exit(void);
40051+
40052+static struct cpufreq_driver cpufreq_us3_driver = {
40053+ .init = us3_freq_cpu_init,
40054+ .verify = cpufreq_generic_frequency_table_verify,
40055+ .target_index = us3_freq_target,
40056+ .get = us3_freq_get,
40057+ .exit = us3_freq_cpu_exit,
40058+ .name = "UltraSPARC-III",
40059+
40060+};
40061+
40062 static int __init us3_freq_init(void)
40063 {
40064 unsigned long manuf, impl, ver;
40065- int ret;
40066
40067 if (tlb_type != cheetah && tlb_type != cheetah_plus)
40068 return -ENODEV;
40069@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
40070 (impl == CHEETAH_IMPL ||
40071 impl == CHEETAH_PLUS_IMPL ||
40072 impl == JAGUAR_IMPL ||
40073- impl == PANTHER_IMPL)) {
40074- struct cpufreq_driver *driver;
40075-
40076- ret = -ENOMEM;
40077- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
40078- if (!driver)
40079- goto err_out;
40080-
40081- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
40082- GFP_KERNEL);
40083- if (!us3_freq_table)
40084- goto err_out;
40085-
40086- driver->init = us3_freq_cpu_init;
40087- driver->verify = cpufreq_generic_frequency_table_verify;
40088- driver->target_index = us3_freq_target;
40089- driver->get = us3_freq_get;
40090- driver->exit = us3_freq_cpu_exit;
40091- strcpy(driver->name, "UltraSPARC-III");
40092-
40093- cpufreq_us3_driver = driver;
40094- ret = cpufreq_register_driver(driver);
40095- if (ret)
40096- goto err_out;
40097-
40098- return 0;
40099-
40100-err_out:
40101- if (driver) {
40102- kfree(driver);
40103- cpufreq_us3_driver = NULL;
40104- }
40105- kfree(us3_freq_table);
40106- us3_freq_table = NULL;
40107- return ret;
40108- }
40109+ impl == PANTHER_IMPL))
40110+ return cpufreq_register_driver(&cpufreq_us3_driver);
40111
40112 return -ENODEV;
40113 }
40114
40115 static void __exit us3_freq_exit(void)
40116 {
40117- if (cpufreq_us3_driver) {
40118- cpufreq_unregister_driver(cpufreq_us3_driver);
40119- kfree(cpufreq_us3_driver);
40120- cpufreq_us3_driver = NULL;
40121- kfree(us3_freq_table);
40122- us3_freq_table = NULL;
40123- }
40124+ cpufreq_unregister_driver(&cpufreq_us3_driver);
40125 }
40126
40127 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
40128diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
40129index 7d4a315..21bb886 100644
40130--- a/drivers/cpufreq/speedstep-centrino.c
40131+++ b/drivers/cpufreq/speedstep-centrino.c
40132@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
40133 !cpu_has(cpu, X86_FEATURE_EST))
40134 return -ENODEV;
40135
40136- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
40137- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40138+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
40139+ pax_open_kernel();
40140+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40141+ pax_close_kernel();
40142+ }
40143
40144 if (policy->cpu != 0)
40145 return -ENODEV;
40146diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
40147index 2697e87..c32476c 100644
40148--- a/drivers/cpuidle/driver.c
40149+++ b/drivers/cpuidle/driver.c
40150@@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
40151
40152 static void poll_idle_init(struct cpuidle_driver *drv)
40153 {
40154- struct cpuidle_state *state = &drv->states[0];
40155+ cpuidle_state_no_const *state = &drv->states[0];
40156
40157 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
40158 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
40159diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
40160index fb9f511..213e6cc 100644
40161--- a/drivers/cpuidle/governor.c
40162+++ b/drivers/cpuidle/governor.c
40163@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
40164 mutex_lock(&cpuidle_lock);
40165 if (__cpuidle_find_governor(gov->name) == NULL) {
40166 ret = 0;
40167- list_add_tail(&gov->governor_list, &cpuidle_governors);
40168+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
40169 if (!cpuidle_curr_governor ||
40170 cpuidle_curr_governor->rating < gov->rating)
40171 cpuidle_switch_governor(gov);
40172diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
40173index 832a2c3..1794080 100644
40174--- a/drivers/cpuidle/sysfs.c
40175+++ b/drivers/cpuidle/sysfs.c
40176@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
40177 NULL
40178 };
40179
40180-static struct attribute_group cpuidle_attr_group = {
40181+static attribute_group_no_const cpuidle_attr_group = {
40182 .attrs = cpuidle_default_attrs,
40183 .name = "cpuidle",
40184 };
40185diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
40186index 8d2a772..33826c9 100644
40187--- a/drivers/crypto/hifn_795x.c
40188+++ b/drivers/crypto/hifn_795x.c
40189@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
40190 MODULE_PARM_DESC(hifn_pll_ref,
40191 "PLL reference clock (pci[freq] or ext[freq], default ext)");
40192
40193-static atomic_t hifn_dev_number;
40194+static atomic_unchecked_t hifn_dev_number;
40195
40196 #define ACRYPTO_OP_DECRYPT 0
40197 #define ACRYPTO_OP_ENCRYPT 1
40198@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
40199 goto err_out_disable_pci_device;
40200
40201 snprintf(name, sizeof(name), "hifn%d",
40202- atomic_inc_return(&hifn_dev_number)-1);
40203+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
40204
40205 err = pci_request_regions(pdev, name);
40206 if (err)
40207diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
40208index 30b538d8..1610d75 100644
40209--- a/drivers/devfreq/devfreq.c
40210+++ b/drivers/devfreq/devfreq.c
40211@@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
40212 goto err_out;
40213 }
40214
40215- list_add(&governor->node, &devfreq_governor_list);
40216+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
40217
40218 list_for_each_entry(devfreq, &devfreq_list, node) {
40219 int ret = 0;
40220@@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
40221 }
40222 }
40223
40224- list_del(&governor->node);
40225+ pax_list_del((struct list_head *)&governor->node);
40226 err_out:
40227 mutex_unlock(&devfreq_list_lock);
40228
40229diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
40230index 8ee383d..736b5de 100644
40231--- a/drivers/dma/sh/shdma-base.c
40232+++ b/drivers/dma/sh/shdma-base.c
40233@@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
40234 schan->slave_id = -EINVAL;
40235 }
40236
40237- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
40238- sdev->desc_size, GFP_KERNEL);
40239+ schan->desc = kcalloc(sdev->desc_size,
40240+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
40241 if (!schan->desc) {
40242 ret = -ENOMEM;
40243 goto edescalloc;
40244diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
40245index 9f1d4c7..fceff78 100644
40246--- a/drivers/dma/sh/shdmac.c
40247+++ b/drivers/dma/sh/shdmac.c
40248@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
40249 return ret;
40250 }
40251
40252-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
40253+static struct notifier_block sh_dmae_nmi_notifier = {
40254 .notifier_call = sh_dmae_nmi_handler,
40255
40256 /* Run before NMI debug handler and KGDB */
40257diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
40258index 592af5f..bb1d583 100644
40259--- a/drivers/edac/edac_device.c
40260+++ b/drivers/edac/edac_device.c
40261@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
40262 */
40263 int edac_device_alloc_index(void)
40264 {
40265- static atomic_t device_indexes = ATOMIC_INIT(0);
40266+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
40267
40268- return atomic_inc_return(&device_indexes) - 1;
40269+ return atomic_inc_return_unchecked(&device_indexes) - 1;
40270 }
40271 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
40272
40273diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
40274index c84eecb..4d7381d 100644
40275--- a/drivers/edac/edac_mc_sysfs.c
40276+++ b/drivers/edac/edac_mc_sysfs.c
40277@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
40278 struct dev_ch_attribute {
40279 struct device_attribute attr;
40280 int channel;
40281-};
40282+} __do_const;
40283
40284 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
40285 static struct dev_ch_attribute dev_attr_legacy_##_name = \
40286@@ -1009,15 +1009,17 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
40287 }
40288
40289 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
40290+ pax_open_kernel();
40291 if (mci->get_sdram_scrub_rate) {
40292- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40293- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40294+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40295+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40296 }
40297
40298 if (mci->set_sdram_scrub_rate) {
40299- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40300- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40301+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40302+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40303 }
40304+ pax_close_kernel();
40305
40306 err = device_create_file(&mci->dev, &dev_attr_sdram_scrub_rate);
40307 if (err) {
40308diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
40309index 2cf44b4d..6dd2dc7 100644
40310--- a/drivers/edac/edac_pci.c
40311+++ b/drivers/edac/edac_pci.c
40312@@ -29,7 +29,7 @@
40313
40314 static DEFINE_MUTEX(edac_pci_ctls_mutex);
40315 static LIST_HEAD(edac_pci_list);
40316-static atomic_t pci_indexes = ATOMIC_INIT(0);
40317+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
40318
40319 /*
40320 * edac_pci_alloc_ctl_info
40321@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
40322 */
40323 int edac_pci_alloc_index(void)
40324 {
40325- return atomic_inc_return(&pci_indexes) - 1;
40326+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
40327 }
40328 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
40329
40330diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
40331index 24d877f..4e30133 100644
40332--- a/drivers/edac/edac_pci_sysfs.c
40333+++ b/drivers/edac/edac_pci_sysfs.c
40334@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
40335 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
40336 static int edac_pci_poll_msec = 1000; /* one second workq period */
40337
40338-static atomic_t pci_parity_count = ATOMIC_INIT(0);
40339-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
40340+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
40341+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
40342
40343 static struct kobject *edac_pci_top_main_kobj;
40344 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
40345@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
40346 void *value;
40347 ssize_t(*show) (void *, char *);
40348 ssize_t(*store) (void *, const char *, size_t);
40349-};
40350+} __do_const;
40351
40352 /* Set of show/store abstract level functions for PCI Parity object */
40353 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
40354@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40355 edac_printk(KERN_CRIT, EDAC_PCI,
40356 "Signaled System Error on %s\n",
40357 pci_name(dev));
40358- atomic_inc(&pci_nonparity_count);
40359+ atomic_inc_unchecked(&pci_nonparity_count);
40360 }
40361
40362 if (status & (PCI_STATUS_PARITY)) {
40363@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40364 "Master Data Parity Error on %s\n",
40365 pci_name(dev));
40366
40367- atomic_inc(&pci_parity_count);
40368+ atomic_inc_unchecked(&pci_parity_count);
40369 }
40370
40371 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40372@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40373 "Detected Parity Error on %s\n",
40374 pci_name(dev));
40375
40376- atomic_inc(&pci_parity_count);
40377+ atomic_inc_unchecked(&pci_parity_count);
40378 }
40379 }
40380
40381@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40382 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
40383 "Signaled System Error on %s\n",
40384 pci_name(dev));
40385- atomic_inc(&pci_nonparity_count);
40386+ atomic_inc_unchecked(&pci_nonparity_count);
40387 }
40388
40389 if (status & (PCI_STATUS_PARITY)) {
40390@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40391 "Master Data Parity Error on "
40392 "%s\n", pci_name(dev));
40393
40394- atomic_inc(&pci_parity_count);
40395+ atomic_inc_unchecked(&pci_parity_count);
40396 }
40397
40398 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40399@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40400 "Detected Parity Error on %s\n",
40401 pci_name(dev));
40402
40403- atomic_inc(&pci_parity_count);
40404+ atomic_inc_unchecked(&pci_parity_count);
40405 }
40406 }
40407 }
40408@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40409 if (!check_pci_errors)
40410 return;
40411
40412- before_count = atomic_read(&pci_parity_count);
40413+ before_count = atomic_read_unchecked(&pci_parity_count);
40414
40415 /* scan all PCI devices looking for a Parity Error on devices and
40416 * bridges.
40417@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40418 /* Only if operator has selected panic on PCI Error */
40419 if (edac_pci_get_panic_on_pe()) {
40420 /* If the count is different 'after' from 'before' */
40421- if (before_count != atomic_read(&pci_parity_count))
40422+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40423 panic("EDAC: PCI Parity Error");
40424 }
40425 }
40426diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40427index c2359a1..8bd119d 100644
40428--- a/drivers/edac/mce_amd.h
40429+++ b/drivers/edac/mce_amd.h
40430@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40431 bool (*mc0_mce)(u16, u8);
40432 bool (*mc1_mce)(u16, u8);
40433 bool (*mc2_mce)(u16, u8);
40434-};
40435+} __no_const;
40436
40437 void amd_report_gart_errors(bool);
40438 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40439diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40440index 57ea7f4..af06b76 100644
40441--- a/drivers/firewire/core-card.c
40442+++ b/drivers/firewire/core-card.c
40443@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40444 const struct fw_card_driver *driver,
40445 struct device *device)
40446 {
40447- static atomic_t index = ATOMIC_INIT(-1);
40448+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40449
40450- card->index = atomic_inc_return(&index);
40451+ card->index = atomic_inc_return_unchecked(&index);
40452 card->driver = driver;
40453 card->device = device;
40454 card->current_tlabel = 0;
40455@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40456
40457 void fw_core_remove_card(struct fw_card *card)
40458 {
40459- struct fw_card_driver dummy_driver = dummy_driver_template;
40460+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40461
40462 card->driver->update_phy_reg(card, 4,
40463 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40464diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40465index f9e3aee..269dbdb 100644
40466--- a/drivers/firewire/core-device.c
40467+++ b/drivers/firewire/core-device.c
40468@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40469 struct config_rom_attribute {
40470 struct device_attribute attr;
40471 u32 key;
40472-};
40473+} __do_const;
40474
40475 static ssize_t show_immediate(struct device *dev,
40476 struct device_attribute *dattr, char *buf)
40477diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40478index d6a09b9..18e90dd 100644
40479--- a/drivers/firewire/core-transaction.c
40480+++ b/drivers/firewire/core-transaction.c
40481@@ -38,6 +38,7 @@
40482 #include <linux/timer.h>
40483 #include <linux/types.h>
40484 #include <linux/workqueue.h>
40485+#include <linux/sched.h>
40486
40487 #include <asm/byteorder.h>
40488
40489diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40490index e1480ff6..1a429bd 100644
40491--- a/drivers/firewire/core.h
40492+++ b/drivers/firewire/core.h
40493@@ -111,6 +111,7 @@ struct fw_card_driver {
40494
40495 int (*stop_iso)(struct fw_iso_context *ctx);
40496 };
40497+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40498
40499 void fw_card_initialize(struct fw_card *card,
40500 const struct fw_card_driver *driver, struct device *device);
40501diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40502index f51d376..b118e40 100644
40503--- a/drivers/firewire/ohci.c
40504+++ b/drivers/firewire/ohci.c
40505@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
40506 be32_to_cpu(ohci->next_header));
40507 }
40508
40509+#ifndef CONFIG_GRKERNSEC
40510 if (param_remote_dma) {
40511 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40512 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40513 }
40514+#endif
40515
40516 spin_unlock_irq(&ohci->lock);
40517
40518@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40519 unsigned long flags;
40520 int n, ret = 0;
40521
40522+#ifndef CONFIG_GRKERNSEC
40523 if (param_remote_dma)
40524 return 0;
40525+#endif
40526
40527 /*
40528 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40529diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40530index 94a58a0..f5eba42 100644
40531--- a/drivers/firmware/dmi-id.c
40532+++ b/drivers/firmware/dmi-id.c
40533@@ -16,7 +16,7 @@
40534 struct dmi_device_attribute{
40535 struct device_attribute dev_attr;
40536 int field;
40537-};
40538+} __do_const;
40539 #define to_dmi_dev_attr(_dev_attr) \
40540 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40541
40542diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40543index 4fd9961..52d60ce 100644
40544--- a/drivers/firmware/efi/cper.c
40545+++ b/drivers/firmware/efi/cper.c
40546@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40547 */
40548 u64 cper_next_record_id(void)
40549 {
40550- static atomic64_t seq;
40551+ static atomic64_unchecked_t seq;
40552
40553- if (!atomic64_read(&seq))
40554- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40555+ if (!atomic64_read_unchecked(&seq))
40556+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40557
40558- return atomic64_inc_return(&seq);
40559+ return atomic64_inc_return_unchecked(&seq);
40560 }
40561 EXPORT_SYMBOL_GPL(cper_next_record_id);
40562
40563diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40564index 3061bb8..92b5fcc 100644
40565--- a/drivers/firmware/efi/efi.c
40566+++ b/drivers/firmware/efi/efi.c
40567@@ -160,14 +160,16 @@ static struct attribute_group efi_subsys_attr_group = {
40568 };
40569
40570 static struct efivars generic_efivars;
40571-static struct efivar_operations generic_ops;
40572+static efivar_operations_no_const generic_ops __read_only;
40573
40574 static int generic_ops_register(void)
40575 {
40576- generic_ops.get_variable = efi.get_variable;
40577- generic_ops.set_variable = efi.set_variable;
40578- generic_ops.get_next_variable = efi.get_next_variable;
40579- generic_ops.query_variable_store = efi_query_variable_store;
40580+ pax_open_kernel();
40581+ *(void **)&generic_ops.get_variable = efi.get_variable;
40582+ *(void **)&generic_ops.set_variable = efi.set_variable;
40583+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40584+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40585+ pax_close_kernel();
40586
40587 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40588 }
40589diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40590index 7b2e049..a253334 100644
40591--- a/drivers/firmware/efi/efivars.c
40592+++ b/drivers/firmware/efi/efivars.c
40593@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40594 static int
40595 create_efivars_bin_attributes(void)
40596 {
40597- struct bin_attribute *attr;
40598+ bin_attribute_no_const *attr;
40599 int error;
40600
40601 /* new_var */
40602diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40603index 87b8e3b..c4afb35 100644
40604--- a/drivers/firmware/efi/runtime-map.c
40605+++ b/drivers/firmware/efi/runtime-map.c
40606@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40607 kfree(entry);
40608 }
40609
40610-static struct kobj_type __refdata map_ktype = {
40611+static const struct kobj_type __refconst map_ktype = {
40612 .sysfs_ops = &map_attr_ops,
40613 .default_attrs = def_attrs,
40614 .release = map_release,
40615diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40616index f1ab05e..ab51228 100644
40617--- a/drivers/firmware/google/gsmi.c
40618+++ b/drivers/firmware/google/gsmi.c
40619@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40620 return local_hash_64(input, 32);
40621 }
40622
40623-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40624+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40625 {
40626 .ident = "Google Board",
40627 .matches = {
40628diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40629index 2f569aa..26e4f39 100644
40630--- a/drivers/firmware/google/memconsole.c
40631+++ b/drivers/firmware/google/memconsole.c
40632@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40633 return false;
40634 }
40635
40636-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40637+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40638 {
40639 .ident = "Google Board",
40640 .matches = {
40641@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40642 if (!found_memconsole())
40643 return -ENODEV;
40644
40645- memconsole_bin_attr.size = memconsole_length;
40646+ pax_open_kernel();
40647+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40648+ pax_close_kernel();
40649+
40650 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40651 }
40652
40653diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40654index cc016c61..d35279e 100644
40655--- a/drivers/firmware/memmap.c
40656+++ b/drivers/firmware/memmap.c
40657@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40658 kfree(entry);
40659 }
40660
40661-static struct kobj_type __refdata memmap_ktype = {
40662+static const struct kobj_type __refconst memmap_ktype = {
40663 .release = release_firmware_map_entry,
40664 .sysfs_ops = &memmap_attr_ops,
40665 .default_attrs = def_attrs,
40666diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40667index 3cfcfc6..09d6f117 100644
40668--- a/drivers/gpio/gpio-em.c
40669+++ b/drivers/gpio/gpio-em.c
40670@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40671 struct em_gio_priv *p;
40672 struct resource *io[2], *irq[2];
40673 struct gpio_chip *gpio_chip;
40674- struct irq_chip *irq_chip;
40675+ irq_chip_no_const *irq_chip;
40676 const char *name = dev_name(&pdev->dev);
40677 int ret;
40678
40679diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40680index 7818cd1..1be40e5 100644
40681--- a/drivers/gpio/gpio-ich.c
40682+++ b/drivers/gpio/gpio-ich.c
40683@@ -94,7 +94,7 @@ struct ichx_desc {
40684 * this option allows driver caching written output values
40685 */
40686 bool use_outlvl_cache;
40687-};
40688+} __do_const;
40689
40690 static struct {
40691 spinlock_t lock;
40692diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40693index f476ae2..05e1bdd 100644
40694--- a/drivers/gpio/gpio-omap.c
40695+++ b/drivers/gpio/gpio-omap.c
40696@@ -1188,7 +1188,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40697 const struct omap_gpio_platform_data *pdata;
40698 struct resource *res;
40699 struct gpio_bank *bank;
40700- struct irq_chip *irqc;
40701+ irq_chip_no_const *irqc;
40702 int ret;
40703
40704 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40705diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40706index c49522e..9a7ee54 100644
40707--- a/drivers/gpio/gpio-rcar.c
40708+++ b/drivers/gpio/gpio-rcar.c
40709@@ -348,7 +348,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40710 struct gpio_rcar_priv *p;
40711 struct resource *io, *irq;
40712 struct gpio_chip *gpio_chip;
40713- struct irq_chip *irq_chip;
40714+ irq_chip_no_const *irq_chip;
40715 struct device *dev = &pdev->dev;
40716 const char *name = dev_name(dev);
40717 int ret;
40718diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40719index c1caa45..f0f97d2 100644
40720--- a/drivers/gpio/gpio-vr41xx.c
40721+++ b/drivers/gpio/gpio-vr41xx.c
40722@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40723 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40724 maskl, pendl, maskh, pendh);
40725
40726- atomic_inc(&irq_err_count);
40727+ atomic_inc_unchecked(&irq_err_count);
40728
40729 return -EINVAL;
40730 }
40731diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40732index 1ca9295..9f3d481 100644
40733--- a/drivers/gpio/gpiolib.c
40734+++ b/drivers/gpio/gpiolib.c
40735@@ -554,8 +554,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40736 }
40737
40738 if (gpiochip->irqchip) {
40739- gpiochip->irqchip->irq_request_resources = NULL;
40740- gpiochip->irqchip->irq_release_resources = NULL;
40741+ pax_open_kernel();
40742+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40743+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40744+ pax_close_kernel();
40745 gpiochip->irqchip = NULL;
40746 }
40747 }
40748@@ -621,8 +623,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40749 gpiochip->irqchip = NULL;
40750 return -EINVAL;
40751 }
40752- irqchip->irq_request_resources = gpiochip_irq_reqres;
40753- irqchip->irq_release_resources = gpiochip_irq_relres;
40754+
40755+ pax_open_kernel();
40756+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40757+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40758+ pax_close_kernel();
40759
40760 /*
40761 * Prepare the mapping since the irqchip shall be orthogonal to
40762diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40763index 488f51d..301d462 100644
40764--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40765+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40766@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
40767 enum cache_policy alternate_policy,
40768 void __user *alternate_aperture_base,
40769 uint64_t alternate_aperture_size);
40770-};
40771+} __no_const;
40772
40773 /**
40774 * struct device_queue_manager
40775diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40776index 5940531..a75b0e5 100644
40777--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40778+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40779@@ -62,7 +62,7 @@ struct kernel_queue_ops {
40780
40781 void (*submit_packet)(struct kernel_queue *kq);
40782 void (*rollback_packet)(struct kernel_queue *kq);
40783-};
40784+} __no_const;
40785
40786 struct kernel_queue {
40787 struct kernel_queue_ops ops;
40788diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
40789index 9b23525..65f4110 100644
40790--- a/drivers/gpu/drm/drm_context.c
40791+++ b/drivers/gpu/drm/drm_context.c
40792@@ -53,6 +53,9 @@ struct drm_ctx_list {
40793 */
40794 void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
40795 {
40796+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40797+ return;
40798+
40799 mutex_lock(&dev->struct_mutex);
40800 idr_remove(&dev->ctx_idr, ctx_handle);
40801 mutex_unlock(&dev->struct_mutex);
40802@@ -87,6 +90,9 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev)
40803 */
40804 int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40805 {
40806+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40807+ return -EINVAL;
40808+
40809 idr_init(&dev->ctx_idr);
40810 return 0;
40811 }
40812@@ -101,6 +107,9 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40813 */
40814 void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)
40815 {
40816+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40817+ return;
40818+
40819 mutex_lock(&dev->struct_mutex);
40820 idr_destroy(&dev->ctx_idr);
40821 mutex_unlock(&dev->struct_mutex);
40822@@ -119,11 +128,14 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)
40823 {
40824 struct drm_ctx_list *pos, *tmp;
40825
40826+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40827+ return;
40828+
40829 mutex_lock(&dev->ctxlist_mutex);
40830
40831 list_for_each_entry_safe(pos, tmp, &dev->ctxlist, head) {
40832 if (pos->tag == file &&
40833- pos->handle != DRM_KERNEL_CONTEXT) {
40834+ _DRM_LOCKING_CONTEXT(pos->handle) != DRM_KERNEL_CONTEXT) {
40835 if (dev->driver->context_dtor)
40836 dev->driver->context_dtor(dev, pos->handle);
40837
40838@@ -161,6 +173,9 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data,
40839 struct drm_local_map *map;
40840 struct drm_map_list *_entry;
40841
40842+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40843+ return -EINVAL;
40844+
40845 mutex_lock(&dev->struct_mutex);
40846
40847 map = idr_find(&dev->ctx_idr, request->ctx_id);
40848@@ -205,6 +220,9 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data,
40849 struct drm_local_map *map = NULL;
40850 struct drm_map_list *r_list = NULL;
40851
40852+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40853+ return -EINVAL;
40854+
40855 mutex_lock(&dev->struct_mutex);
40856 list_for_each_entry(r_list, &dev->maplist, head) {
40857 if (r_list->map
40858@@ -277,7 +295,13 @@ static int drm_context_switch_complete(struct drm_device *dev,
40859 {
40860 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */
40861
40862- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40863+ if (file_priv->master->lock.hw_lock == NULL) {
40864+ DRM_ERROR(
40865+ "Device has been unregistered. Hard exit. Process %d\n",
40866+ task_pid_nr(current));
40867+ send_sig(SIGTERM, current, 0);
40868+ return -EPERM;
40869+ } else if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40870 DRM_ERROR("Lock isn't held after context switch\n");
40871 }
40872
40873@@ -305,6 +329,9 @@ int drm_legacy_resctx(struct drm_device *dev, void *data,
40874 struct drm_ctx ctx;
40875 int i;
40876
40877+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40878+ return -EINVAL;
40879+
40880 if (res->count >= DRM_RESERVED_CONTEXTS) {
40881 memset(&ctx, 0, sizeof(ctx));
40882 for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
40883@@ -335,8 +362,11 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
40884 struct drm_ctx_list *ctx_entry;
40885 struct drm_ctx *ctx = data;
40886
40887+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40888+ return -EINVAL;
40889+
40890 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40891- if (ctx->handle == DRM_KERNEL_CONTEXT) {
40892+ if (_DRM_LOCKING_CONTEXT(ctx->handle) == DRM_KERNEL_CONTEXT) {
40893 /* Skip kernel's context and get a new one. */
40894 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40895 }
40896@@ -378,6 +408,9 @@ int drm_legacy_getctx(struct drm_device *dev, void *data,
40897 {
40898 struct drm_ctx *ctx = data;
40899
40900+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40901+ return -EINVAL;
40902+
40903 /* This is 0, because we don't handle any context flags */
40904 ctx->flags = 0;
40905
40906@@ -400,6 +433,9 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data,
40907 {
40908 struct drm_ctx *ctx = data;
40909
40910+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40911+ return -EINVAL;
40912+
40913 DRM_DEBUG("%d\n", ctx->handle);
40914 return drm_context_switch(dev, dev->last_context, ctx->handle);
40915 }
40916@@ -420,6 +456,9 @@ int drm_legacy_newctx(struct drm_device *dev, void *data,
40917 {
40918 struct drm_ctx *ctx = data;
40919
40920+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40921+ return -EINVAL;
40922+
40923 DRM_DEBUG("%d\n", ctx->handle);
40924 drm_context_switch_complete(dev, file_priv, ctx->handle);
40925
40926@@ -442,8 +481,11 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data,
40927 {
40928 struct drm_ctx *ctx = data;
40929
40930+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40931+ return -EINVAL;
40932+
40933 DRM_DEBUG("%d\n", ctx->handle);
40934- if (ctx->handle != DRM_KERNEL_CONTEXT) {
40935+ if (_DRM_LOCKING_CONTEXT(ctx->handle) != DRM_KERNEL_CONTEXT) {
40936 if (dev->driver->context_dtor)
40937 dev->driver->context_dtor(dev, ctx->handle);
40938 drm_legacy_ctxbitmap_free(dev, ctx->handle);
40939diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40940index b6f076b..2918de2 100644
40941--- a/drivers/gpu/drm/drm_crtc.c
40942+++ b/drivers/gpu/drm/drm_crtc.c
40943@@ -4118,7 +4118,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40944 goto done;
40945 }
40946
40947- if (copy_to_user(&enum_ptr[copied].name,
40948+ if (copy_to_user(enum_ptr[copied].name,
40949 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40950 ret = -EFAULT;
40951 goto done;
40952diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40953index d512134..a80a8e4 100644
40954--- a/drivers/gpu/drm/drm_drv.c
40955+++ b/drivers/gpu/drm/drm_drv.c
40956@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
40957
40958 drm_device_set_unplugged(dev);
40959
40960- if (dev->open_count == 0) {
40961+ if (local_read(&dev->open_count) == 0) {
40962 drm_put_dev(dev);
40963 }
40964 mutex_unlock(&drm_global_mutex);
40965@@ -596,10 +596,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
40966 if (drm_ht_create(&dev->map_hash, 12))
40967 goto err_minors;
40968
40969- ret = drm_legacy_ctxbitmap_init(dev);
40970- if (ret) {
40971- DRM_ERROR("Cannot allocate memory for context bitmap.\n");
40972- goto err_ht;
40973+ if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) {
40974+ ret = drm_legacy_ctxbitmap_init(dev);
40975+ if (ret) {
40976+ DRM_ERROR(
40977+ "Cannot allocate memory for context bitmap.\n");
40978+ goto err_ht;
40979+ }
40980 }
40981
40982 if (drm_core_check_feature(dev, DRIVER_GEM)) {
40983diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40984index 076dd60..e4a4ba7 100644
40985--- a/drivers/gpu/drm/drm_fops.c
40986+++ b/drivers/gpu/drm/drm_fops.c
40987@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40988 return PTR_ERR(minor);
40989
40990 dev = minor->dev;
40991- if (!dev->open_count++)
40992+ if (local_inc_return(&dev->open_count) == 1)
40993 need_setup = 1;
40994
40995 /* share address_space across all char-devs of a single device */
40996@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40997 return 0;
40998
40999 err_undo:
41000- dev->open_count--;
41001+ local_dec(&dev->open_count);
41002 drm_minor_release(minor);
41003 return retcode;
41004 }
41005@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
41006
41007 mutex_lock(&drm_global_mutex);
41008
41009- DRM_DEBUG("open_count = %d\n", dev->open_count);
41010+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
41011
41012 mutex_lock(&dev->struct_mutex);
41013 list_del(&file_priv->lhead);
41014@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
41015 * Begin inline drm_release
41016 */
41017
41018- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
41019+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
41020 task_pid_nr(current),
41021 (long)old_encode_dev(file_priv->minor->kdev->devt),
41022- dev->open_count);
41023+ local_read(&dev->open_count));
41024
41025 /* Release any auth tokens that might point to this file_priv,
41026 (do that under the drm_global_mutex) */
41027@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
41028 * End inline drm_release
41029 */
41030
41031- if (!--dev->open_count) {
41032+ if (local_dec_and_test(&dev->open_count)) {
41033 retcode = drm_lastclose(dev);
41034 if (drm_device_is_unplugged(dev))
41035 drm_put_dev(dev);
41036diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
41037index 3d2e91c..d31c4c9 100644
41038--- a/drivers/gpu/drm/drm_global.c
41039+++ b/drivers/gpu/drm/drm_global.c
41040@@ -36,7 +36,7 @@
41041 struct drm_global_item {
41042 struct mutex mutex;
41043 void *object;
41044- int refcount;
41045+ atomic_t refcount;
41046 };
41047
41048 static struct drm_global_item glob[DRM_GLOBAL_NUM];
41049@@ -49,7 +49,7 @@ void drm_global_init(void)
41050 struct drm_global_item *item = &glob[i];
41051 mutex_init(&item->mutex);
41052 item->object = NULL;
41053- item->refcount = 0;
41054+ atomic_set(&item->refcount, 0);
41055 }
41056 }
41057
41058@@ -59,7 +59,7 @@ void drm_global_release(void)
41059 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
41060 struct drm_global_item *item = &glob[i];
41061 BUG_ON(item->object != NULL);
41062- BUG_ON(item->refcount != 0);
41063+ BUG_ON(atomic_read(&item->refcount) != 0);
41064 }
41065 }
41066
41067@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41068 struct drm_global_item *item = &glob[ref->global_type];
41069
41070 mutex_lock(&item->mutex);
41071- if (item->refcount == 0) {
41072+ if (atomic_read(&item->refcount) == 0) {
41073 item->object = kzalloc(ref->size, GFP_KERNEL);
41074 if (unlikely(item->object == NULL)) {
41075 ret = -ENOMEM;
41076@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41077 goto out_err;
41078
41079 }
41080- ++item->refcount;
41081+ atomic_inc(&item->refcount);
41082 ref->object = item->object;
41083 mutex_unlock(&item->mutex);
41084 return 0;
41085@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
41086 struct drm_global_item *item = &glob[ref->global_type];
41087
41088 mutex_lock(&item->mutex);
41089- BUG_ON(item->refcount == 0);
41090+ BUG_ON(atomic_read(&item->refcount) == 0);
41091 BUG_ON(ref->object != item->object);
41092- if (--item->refcount == 0) {
41093+ if (atomic_dec_and_test(&item->refcount)) {
41094 ref->release(ref);
41095 item->object = NULL;
41096 }
41097diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
41098index f1b32f9..394f791 100644
41099--- a/drivers/gpu/drm/drm_info.c
41100+++ b/drivers/gpu/drm/drm_info.c
41101@@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
41102 struct drm_local_map *map;
41103 struct drm_map_list *r_list;
41104
41105- /* Hardcoded from _DRM_FRAME_BUFFER,
41106- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
41107- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
41108- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
41109+ static const char * const types[] = {
41110+ [_DRM_FRAME_BUFFER] = "FB",
41111+ [_DRM_REGISTERS] = "REG",
41112+ [_DRM_SHM] = "SHM",
41113+ [_DRM_AGP] = "AGP",
41114+ [_DRM_SCATTER_GATHER] = "SG",
41115+ [_DRM_CONSISTENT] = "PCI"};
41116 const char *type;
41117 int i;
41118
41119@@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
41120 map = r_list->map;
41121 if (!map)
41122 continue;
41123- if (map->type < 0 || map->type > 5)
41124+ if (map->type >= ARRAY_SIZE(types))
41125 type = "??";
41126 else
41127 type = types[map->type];
41128diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
41129index 2f4c4343..dd12cd2 100644
41130--- a/drivers/gpu/drm/drm_ioc32.c
41131+++ b/drivers/gpu/drm/drm_ioc32.c
41132@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
41133 request = compat_alloc_user_space(nbytes);
41134 if (!access_ok(VERIFY_WRITE, request, nbytes))
41135 return -EFAULT;
41136- list = (struct drm_buf_desc *) (request + 1);
41137+ list = (struct drm_buf_desc __user *) (request + 1);
41138
41139 if (__put_user(count, &request->count)
41140 || __put_user(list, &request->list))
41141@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
41142 request = compat_alloc_user_space(nbytes);
41143 if (!access_ok(VERIFY_WRITE, request, nbytes))
41144 return -EFAULT;
41145- list = (struct drm_buf_pub *) (request + 1);
41146+ list = (struct drm_buf_pub __user *) (request + 1);
41147
41148 if (__put_user(count, &request->count)
41149 || __put_user(list, &request->list))
41150@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
41151 return 0;
41152 }
41153
41154-drm_ioctl_compat_t *drm_compat_ioctls[] = {
41155+drm_ioctl_compat_t drm_compat_ioctls[] = {
41156 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
41157 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
41158 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
41159@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
41160 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41161 {
41162 unsigned int nr = DRM_IOCTL_NR(cmd);
41163- drm_ioctl_compat_t *fn;
41164 int ret;
41165
41166 /* Assume that ioctls without an explicit compat routine will just
41167@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41168 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
41169 return drm_ioctl(filp, cmd, arg);
41170
41171- fn = drm_compat_ioctls[nr];
41172-
41173- if (fn != NULL)
41174- ret = (*fn) (filp, cmd, arg);
41175+ if (drm_compat_ioctls[nr] != NULL)
41176+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
41177 else
41178 ret = drm_ioctl(filp, cmd, arg);
41179
41180diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
41181index 3785d66..1c489ef 100644
41182--- a/drivers/gpu/drm/drm_ioctl.c
41183+++ b/drivers/gpu/drm/drm_ioctl.c
41184@@ -655,7 +655,7 @@ long drm_ioctl(struct file *filp,
41185 struct drm_file *file_priv = filp->private_data;
41186 struct drm_device *dev;
41187 const struct drm_ioctl_desc *ioctl = NULL;
41188- drm_ioctl_t *func;
41189+ drm_ioctl_no_const_t func;
41190 unsigned int nr = DRM_IOCTL_NR(cmd);
41191 int retcode = -EINVAL;
41192 char stack_kdata[128];
41193diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
41194index f861361..b61d4c7 100644
41195--- a/drivers/gpu/drm/drm_lock.c
41196+++ b/drivers/gpu/drm/drm_lock.c
41197@@ -61,9 +61,12 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
41198 struct drm_master *master = file_priv->master;
41199 int ret = 0;
41200
41201+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41202+ return -EINVAL;
41203+
41204 ++file_priv->lock_count;
41205
41206- if (lock->context == DRM_KERNEL_CONTEXT) {
41207+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41208 DRM_ERROR("Process %d using kernel context %d\n",
41209 task_pid_nr(current), lock->context);
41210 return -EINVAL;
41211@@ -153,12 +156,23 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
41212 struct drm_lock *lock = data;
41213 struct drm_master *master = file_priv->master;
41214
41215- if (lock->context == DRM_KERNEL_CONTEXT) {
41216+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41217+ return -EINVAL;
41218+
41219+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41220 DRM_ERROR("Process %d using kernel context %d\n",
41221 task_pid_nr(current), lock->context);
41222 return -EINVAL;
41223 }
41224
41225+ if (!master->lock.hw_lock) {
41226+ DRM_ERROR(
41227+ "Device has been unregistered. Hard exit. Process %d\n",
41228+ task_pid_nr(current));
41229+ send_sig(SIGTERM, current, 0);
41230+ return -EPERM;
41231+ }
41232+
41233 if (drm_legacy_lock_free(&master->lock, lock->context)) {
41234 /* FIXME: Should really bail out here. */
41235 }
41236diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41237index d4813e0..6c1ab4d 100644
41238--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41239+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41240@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
41241 u32 pipeconf_reg = PIPEACONF;
41242 u32 dspcntr_reg = DSPACNTR;
41243
41244- u32 pipeconf = dev_priv->pipeconf[pipe];
41245- u32 dspcntr = dev_priv->dspcntr[pipe];
41246+ u32 pipeconf;
41247+ u32 dspcntr;
41248 u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
41249
41250+ if (pipe == -1)
41251+ return;
41252+
41253+ pipeconf = dev_priv->pipeconf[pipe];
41254+ dspcntr = dev_priv->dspcntr[pipe];
41255+
41256 if (pipe) {
41257 pipeconf_reg = PIPECCONF;
41258 dspcntr_reg = DSPCCNTR;
41259diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
41260index 93ec5dc..82acbaf 100644
41261--- a/drivers/gpu/drm/i810/i810_drv.h
41262+++ b/drivers/gpu/drm/i810/i810_drv.h
41263@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
41264 int page_flipping;
41265
41266 wait_queue_head_t irq_queue;
41267- atomic_t irq_received;
41268- atomic_t irq_emitted;
41269+ atomic_unchecked_t irq_received;
41270+ atomic_unchecked_t irq_emitted;
41271
41272 int front_offset;
41273 } drm_i810_private_t;
41274diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
41275index 1a46787..7fb387c 100644
41276--- a/drivers/gpu/drm/i915/i915_dma.c
41277+++ b/drivers/gpu/drm/i915/i915_dma.c
41278@@ -149,6 +149,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
41279 case I915_PARAM_MMAP_VERSION:
41280 value = 1;
41281 break;
41282+ case I915_PARAM_HAS_LEGACY_CONTEXT:
41283+ value = drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT);
41284+ break;
41285 default:
41286 DRM_DEBUG("Unknown parameter %d\n", param->param);
41287 return -EINVAL;
41288@@ -362,7 +365,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
41289 * locking inversion with the driver load path. And the access here is
41290 * completely racy anyway. So don't bother with locking for now.
41291 */
41292- return dev->open_count == 0;
41293+ return local_read(&dev->open_count) == 0;
41294 }
41295
41296 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
41297diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41298index 38a7425..5322b16 100644
41299--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41300+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41301@@ -872,12 +872,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
41302 static int
41303 validate_exec_list(struct drm_device *dev,
41304 struct drm_i915_gem_exec_object2 *exec,
41305- int count)
41306+ unsigned int count)
41307 {
41308 unsigned relocs_total = 0;
41309 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
41310 unsigned invalid_flags;
41311- int i;
41312+ unsigned int i;
41313
41314 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
41315 if (USES_FULL_PPGTT(dev))
41316diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
41317index 176de63..b50b66a 100644
41318--- a/drivers/gpu/drm/i915/i915_ioc32.c
41319+++ b/drivers/gpu/drm/i915/i915_ioc32.c
41320@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
41321 || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
41322 || __put_user(batchbuffer32.num_cliprects,
41323 &batchbuffer->num_cliprects)
41324- || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
41325+ || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
41326 &batchbuffer->cliprects))
41327 return -EFAULT;
41328
41329@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
41330
41331 cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
41332 if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
41333- || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
41334+ || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
41335 &cmdbuffer->buf)
41336 || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
41337 || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
41338 || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
41339 || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
41340- || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
41341+ || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
41342 &cmdbuffer->cliprects))
41343 return -EFAULT;
41344
41345@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
41346 (unsigned long)request);
41347 }
41348
41349-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41350+static drm_ioctl_compat_t i915_compat_ioctls[] = {
41351 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
41352 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
41353 [DRM_I915_GETPARAM] = compat_i915_getparam,
41354@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41355 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41356 {
41357 unsigned int nr = DRM_IOCTL_NR(cmd);
41358- drm_ioctl_compat_t *fn = NULL;
41359 int ret;
41360
41361 if (nr < DRM_COMMAND_BASE)
41362 return drm_compat_ioctl(filp, cmd, arg);
41363
41364- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
41365- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
41366-
41367- if (fn != NULL)
41368- ret = (*fn) (filp, cmd, arg);
41369+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
41370+ ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
41371 else
41372 ret = drm_ioctl(filp, cmd, arg);
41373
41374diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
41375index f75173c..f283e45 100644
41376--- a/drivers/gpu/drm/i915/intel_display.c
41377+++ b/drivers/gpu/drm/i915/intel_display.c
41378@@ -13056,13 +13056,13 @@ struct intel_quirk {
41379 int subsystem_vendor;
41380 int subsystem_device;
41381 void (*hook)(struct drm_device *dev);
41382-};
41383+} __do_const;
41384
41385 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
41386 struct intel_dmi_quirk {
41387 void (*hook)(struct drm_device *dev);
41388 const struct dmi_system_id (*dmi_id_list)[];
41389-};
41390+} __do_const;
41391
41392 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41393 {
41394@@ -13070,18 +13070,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41395 return 1;
41396 }
41397
41398-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41399+static const struct dmi_system_id intel_dmi_quirks_table[] = {
41400 {
41401- .dmi_id_list = &(const struct dmi_system_id[]) {
41402- {
41403- .callback = intel_dmi_reverse_brightness,
41404- .ident = "NCR Corporation",
41405- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41406- DMI_MATCH(DMI_PRODUCT_NAME, ""),
41407- },
41408- },
41409- { } /* terminating entry */
41410+ .callback = intel_dmi_reverse_brightness,
41411+ .ident = "NCR Corporation",
41412+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41413+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
41414 },
41415+ },
41416+ { } /* terminating entry */
41417+};
41418+
41419+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41420+ {
41421+ .dmi_id_list = &intel_dmi_quirks_table,
41422 .hook = quirk_invert_brightness,
41423 },
41424 };
41425diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
41426index a002f53..0d60514 100644
41427--- a/drivers/gpu/drm/imx/imx-drm-core.c
41428+++ b/drivers/gpu/drm/imx/imx-drm-core.c
41429@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
41430 if (imxdrm->pipes >= MAX_CRTC)
41431 return -EINVAL;
41432
41433- if (imxdrm->drm->open_count)
41434+ if (local_read(&imxdrm->drm->open_count))
41435 return -EBUSY;
41436
41437 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
41438diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
41439index b4a20149..219ab78 100644
41440--- a/drivers/gpu/drm/mga/mga_drv.h
41441+++ b/drivers/gpu/drm/mga/mga_drv.h
41442@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
41443 u32 clear_cmd;
41444 u32 maccess;
41445
41446- atomic_t vbl_received; /**< Number of vblanks received. */
41447+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
41448 wait_queue_head_t fence_queue;
41449- atomic_t last_fence_retired;
41450+ atomic_unchecked_t last_fence_retired;
41451 u32 next_fence_to_post;
41452
41453 unsigned int fb_cpp;
41454diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
41455index 729bfd5..14bae78 100644
41456--- a/drivers/gpu/drm/mga/mga_ioc32.c
41457+++ b/drivers/gpu/drm/mga/mga_ioc32.c
41458@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
41459 return 0;
41460 }
41461
41462-drm_ioctl_compat_t *mga_compat_ioctls[] = {
41463+drm_ioctl_compat_t mga_compat_ioctls[] = {
41464 [DRM_MGA_INIT] = compat_mga_init,
41465 [DRM_MGA_GETPARAM] = compat_mga_getparam,
41466 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
41467@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
41468 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41469 {
41470 unsigned int nr = DRM_IOCTL_NR(cmd);
41471- drm_ioctl_compat_t *fn = NULL;
41472 int ret;
41473
41474 if (nr < DRM_COMMAND_BASE)
41475 return drm_compat_ioctl(filp, cmd, arg);
41476
41477- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
41478- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41479-
41480- if (fn != NULL)
41481- ret = (*fn) (filp, cmd, arg);
41482+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
41483+ ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41484 else
41485 ret = drm_ioctl(filp, cmd, arg);
41486
41487diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
41488index 1b071b8..de8601a 100644
41489--- a/drivers/gpu/drm/mga/mga_irq.c
41490+++ b/drivers/gpu/drm/mga/mga_irq.c
41491@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
41492 if (crtc != 0)
41493 return 0;
41494
41495- return atomic_read(&dev_priv->vbl_received);
41496+ return atomic_read_unchecked(&dev_priv->vbl_received);
41497 }
41498
41499
41500@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41501 /* VBLANK interrupt */
41502 if (status & MGA_VLINEPEN) {
41503 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
41504- atomic_inc(&dev_priv->vbl_received);
41505+ atomic_inc_unchecked(&dev_priv->vbl_received);
41506 drm_handle_vblank(dev, 0);
41507 handled = 1;
41508 }
41509@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41510 if ((prim_start & ~0x03) != (prim_end & ~0x03))
41511 MGA_WRITE(MGA_PRIMEND, prim_end);
41512
41513- atomic_inc(&dev_priv->last_fence_retired);
41514+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
41515 wake_up(&dev_priv->fence_queue);
41516 handled = 1;
41517 }
41518@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41519 * using fences.
41520 */
41521 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41522- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41523+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41524 - *sequence) <= (1 << 23)));
41525
41526 *sequence = cur_fence;
41527diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41528index 0190b69..60c3eaf 100644
41529--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41530+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41531@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41532 struct bit_table {
41533 const char id;
41534 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41535-};
41536+} __no_const;
41537
41538 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41539
41540diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
41541index 8763deb..936b423 100644
41542--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
41543+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
41544@@ -940,7 +940,8 @@ static struct drm_driver
41545 driver_stub = {
41546 .driver_features =
41547 DRIVER_USE_AGP |
41548- DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER,
41549+ DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER |
41550+ DRIVER_KMS_LEGACY_CONTEXT,
41551
41552 .load = nouveau_drm_load,
41553 .unload = nouveau_drm_unload,
41554diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41555index fc68f09..0511d71 100644
41556--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41557+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41558@@ -121,7 +121,6 @@ struct nouveau_drm {
41559 struct drm_global_reference mem_global_ref;
41560 struct ttm_bo_global_ref bo_global_ref;
41561 struct ttm_bo_device bdev;
41562- atomic_t validate_sequence;
41563 int (*move)(struct nouveau_channel *,
41564 struct ttm_buffer_object *,
41565 struct ttm_mem_reg *, struct ttm_mem_reg *);
41566diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41567index 462679a..88e32a7 100644
41568--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41569+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41570@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41571 unsigned long arg)
41572 {
41573 unsigned int nr = DRM_IOCTL_NR(cmd);
41574- drm_ioctl_compat_t *fn = NULL;
41575+ drm_ioctl_compat_t fn = NULL;
41576 int ret;
41577
41578 if (nr < DRM_COMMAND_BASE)
41579diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41580index 273e501..3b6c0a2 100644
41581--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41582+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41583@@ -127,11 +127,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41584 }
41585
41586 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41587- nouveau_vram_manager_init,
41588- nouveau_vram_manager_fini,
41589- nouveau_vram_manager_new,
41590- nouveau_vram_manager_del,
41591- nouveau_vram_manager_debug
41592+ .init = nouveau_vram_manager_init,
41593+ .takedown = nouveau_vram_manager_fini,
41594+ .get_node = nouveau_vram_manager_new,
41595+ .put_node = nouveau_vram_manager_del,
41596+ .debug = nouveau_vram_manager_debug
41597 };
41598
41599 static int
41600@@ -195,11 +195,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41601 }
41602
41603 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41604- nouveau_gart_manager_init,
41605- nouveau_gart_manager_fini,
41606- nouveau_gart_manager_new,
41607- nouveau_gart_manager_del,
41608- nouveau_gart_manager_debug
41609+ .init = nouveau_gart_manager_init,
41610+ .takedown = nouveau_gart_manager_fini,
41611+ .get_node = nouveau_gart_manager_new,
41612+ .put_node = nouveau_gart_manager_del,
41613+ .debug = nouveau_gart_manager_debug
41614 };
41615
41616 /*XXX*/
41617@@ -268,11 +268,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41618 }
41619
41620 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41621- nv04_gart_manager_init,
41622- nv04_gart_manager_fini,
41623- nv04_gart_manager_new,
41624- nv04_gart_manager_del,
41625- nv04_gart_manager_debug
41626+ .init = nv04_gart_manager_init,
41627+ .takedown = nv04_gart_manager_fini,
41628+ .get_node = nv04_gart_manager_new,
41629+ .put_node = nv04_gart_manager_del,
41630+ .debug = nv04_gart_manager_debug
41631 };
41632
41633 int
41634diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41635index c7592ec..dd45ebc 100644
41636--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41637+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41638@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41639 * locking inversion with the driver load path. And the access here is
41640 * completely racy anyway. So don't bother with locking for now.
41641 */
41642- return dev->open_count == 0;
41643+ return local_read(&dev->open_count) == 0;
41644 }
41645
41646 static const struct vga_switcheroo_client_ops
41647diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41648index 9782364..89bd954 100644
41649--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41650+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41651@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41652 int ret;
41653
41654 mutex_lock(&qdev->async_io_mutex);
41655- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41656+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41657 if (qdev->last_sent_io_cmd > irq_num) {
41658 if (intr)
41659 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41660- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41661+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41662 else
41663 ret = wait_event_timeout(qdev->io_cmd_event,
41664- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41665+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41666 /* 0 is timeout, just bail the "hw" has gone away */
41667 if (ret <= 0)
41668 goto out;
41669- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41670+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41671 }
41672 outb(val, addr);
41673 qdev->last_sent_io_cmd = irq_num + 1;
41674 if (intr)
41675 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41676- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41677+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41678 else
41679 ret = wait_event_timeout(qdev->io_cmd_event,
41680- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41681+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41682 out:
41683 if (ret > 0)
41684 ret = 0;
41685diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41686index 6911b8c..89d6867 100644
41687--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41688+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41689@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41690 struct drm_info_node *node = (struct drm_info_node *) m->private;
41691 struct qxl_device *qdev = node->minor->dev->dev_private;
41692
41693- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41694- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41695- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41696- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41697+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41698+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41699+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41700+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41701 seq_printf(m, "%d\n", qdev->irq_received_error);
41702 return 0;
41703 }
41704diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41705index 7c6cafe..460f542 100644
41706--- a/drivers/gpu/drm/qxl/qxl_drv.h
41707+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41708@@ -290,10 +290,10 @@ struct qxl_device {
41709 unsigned int last_sent_io_cmd;
41710
41711 /* interrupt handling */
41712- atomic_t irq_received;
41713- atomic_t irq_received_display;
41714- atomic_t irq_received_cursor;
41715- atomic_t irq_received_io_cmd;
41716+ atomic_unchecked_t irq_received;
41717+ atomic_unchecked_t irq_received_display;
41718+ atomic_unchecked_t irq_received_cursor;
41719+ atomic_unchecked_t irq_received_io_cmd;
41720 unsigned irq_received_error;
41721 wait_queue_head_t display_event;
41722 wait_queue_head_t cursor_event;
41723diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41724index b110883..dd06418 100644
41725--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41726+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41727@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41728
41729 /* TODO copy slow path code from i915 */
41730 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41731- 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);
41732+ 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);
41733
41734 {
41735 struct qxl_drawable *draw = fb_cmd;
41736@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41737 struct drm_qxl_reloc reloc;
41738
41739 if (copy_from_user(&reloc,
41740- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41741+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41742 sizeof(reloc))) {
41743 ret = -EFAULT;
41744 goto out_free_bos;
41745@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41746
41747 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41748
41749- struct drm_qxl_command *commands =
41750- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41751+ struct drm_qxl_command __user *commands =
41752+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41753
41754- if (copy_from_user(&user_cmd, &commands[cmd_num],
41755+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41756 sizeof(user_cmd)))
41757 return -EFAULT;
41758
41759diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41760index 0bf1e20..42a7310 100644
41761--- a/drivers/gpu/drm/qxl/qxl_irq.c
41762+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41763@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41764 if (!pending)
41765 return IRQ_NONE;
41766
41767- atomic_inc(&qdev->irq_received);
41768+ atomic_inc_unchecked(&qdev->irq_received);
41769
41770 if (pending & QXL_INTERRUPT_DISPLAY) {
41771- atomic_inc(&qdev->irq_received_display);
41772+ atomic_inc_unchecked(&qdev->irq_received_display);
41773 wake_up_all(&qdev->display_event);
41774 qxl_queue_garbage_collect(qdev, false);
41775 }
41776 if (pending & QXL_INTERRUPT_CURSOR) {
41777- atomic_inc(&qdev->irq_received_cursor);
41778+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41779 wake_up_all(&qdev->cursor_event);
41780 }
41781 if (pending & QXL_INTERRUPT_IO_CMD) {
41782- atomic_inc(&qdev->irq_received_io_cmd);
41783+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41784 wake_up_all(&qdev->io_cmd_event);
41785 }
41786 if (pending & QXL_INTERRUPT_ERROR) {
41787@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41788 init_waitqueue_head(&qdev->io_cmd_event);
41789 INIT_WORK(&qdev->client_monitors_config_work,
41790 qxl_client_monitors_config_work_func);
41791- atomic_set(&qdev->irq_received, 0);
41792- atomic_set(&qdev->irq_received_display, 0);
41793- atomic_set(&qdev->irq_received_cursor, 0);
41794- atomic_set(&qdev->irq_received_io_cmd, 0);
41795+ atomic_set_unchecked(&qdev->irq_received, 0);
41796+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41797+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41798+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41799 qdev->irq_received_error = 0;
41800 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41801 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41802diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41803index 0cbc4c9..0e46686 100644
41804--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41805+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41806@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41807 }
41808 }
41809
41810-static struct vm_operations_struct qxl_ttm_vm_ops;
41811+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41812 static const struct vm_operations_struct *ttm_vm_ops;
41813
41814 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41815@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41816 return r;
41817 if (unlikely(ttm_vm_ops == NULL)) {
41818 ttm_vm_ops = vma->vm_ops;
41819+ pax_open_kernel();
41820 qxl_ttm_vm_ops = *ttm_vm_ops;
41821 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41822+ pax_close_kernel();
41823 }
41824 vma->vm_ops = &qxl_ttm_vm_ops;
41825 return 0;
41826@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41827 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41828 {
41829 #if defined(CONFIG_DEBUG_FS)
41830- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41831- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41832- unsigned i;
41833+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41834+ {
41835+ .name = "qxl_mem_mm",
41836+ .show = &qxl_mm_dump_table,
41837+ },
41838+ {
41839+ .name = "qxl_surf_mm",
41840+ .show = &qxl_mm_dump_table,
41841+ }
41842+ };
41843
41844- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41845- if (i == 0)
41846- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41847- else
41848- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41849- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41850- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41851- qxl_mem_types_list[i].driver_features = 0;
41852- if (i == 0)
41853- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41854- else
41855- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41856+ pax_open_kernel();
41857+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41858+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41859+ pax_close_kernel();
41860
41861- }
41862- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41863+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41864 #else
41865 return 0;
41866 #endif
41867diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41868index 2c45ac9..5d740f8 100644
41869--- a/drivers/gpu/drm/r128/r128_cce.c
41870+++ b/drivers/gpu/drm/r128/r128_cce.c
41871@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41872
41873 /* GH: Simple idle check.
41874 */
41875- atomic_set(&dev_priv->idle_count, 0);
41876+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41877
41878 /* We don't support anything other than bus-mastering ring mode,
41879 * but the ring can be in either AGP or PCI space for the ring
41880diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41881index 723e5d6..102dbaf 100644
41882--- a/drivers/gpu/drm/r128/r128_drv.h
41883+++ b/drivers/gpu/drm/r128/r128_drv.h
41884@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41885 int is_pci;
41886 unsigned long cce_buffers_offset;
41887
41888- atomic_t idle_count;
41889+ atomic_unchecked_t idle_count;
41890
41891 int page_flipping;
41892 int current_page;
41893 u32 crtc_offset;
41894 u32 crtc_offset_cntl;
41895
41896- atomic_t vbl_received;
41897+ atomic_unchecked_t vbl_received;
41898
41899 u32 color_fmt;
41900 unsigned int front_offset;
41901diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41902index 663f38c..ec159a1 100644
41903--- a/drivers/gpu/drm/r128/r128_ioc32.c
41904+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41905@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41906 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41907 }
41908
41909-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41910+drm_ioctl_compat_t r128_compat_ioctls[] = {
41911 [DRM_R128_INIT] = compat_r128_init,
41912 [DRM_R128_DEPTH] = compat_r128_depth,
41913 [DRM_R128_STIPPLE] = compat_r128_stipple,
41914@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41915 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41916 {
41917 unsigned int nr = DRM_IOCTL_NR(cmd);
41918- drm_ioctl_compat_t *fn = NULL;
41919 int ret;
41920
41921 if (nr < DRM_COMMAND_BASE)
41922 return drm_compat_ioctl(filp, cmd, arg);
41923
41924- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41925- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41926-
41927- if (fn != NULL)
41928- ret = (*fn) (filp, cmd, arg);
41929+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
41930+ ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41931 else
41932 ret = drm_ioctl(filp, cmd, arg);
41933
41934diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41935index c2ae496..30b5993 100644
41936--- a/drivers/gpu/drm/r128/r128_irq.c
41937+++ b/drivers/gpu/drm/r128/r128_irq.c
41938@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41939 if (crtc != 0)
41940 return 0;
41941
41942- return atomic_read(&dev_priv->vbl_received);
41943+ return atomic_read_unchecked(&dev_priv->vbl_received);
41944 }
41945
41946 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41947@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41948 /* VBLANK interrupt */
41949 if (status & R128_CRTC_VBLANK_INT) {
41950 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41951- atomic_inc(&dev_priv->vbl_received);
41952+ atomic_inc_unchecked(&dev_priv->vbl_received);
41953 drm_handle_vblank(dev, 0);
41954 return IRQ_HANDLED;
41955 }
41956diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41957index 8fd2d9f..18c9660 100644
41958--- a/drivers/gpu/drm/r128/r128_state.c
41959+++ b/drivers/gpu/drm/r128/r128_state.c
41960@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41961
41962 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41963 {
41964- if (atomic_read(&dev_priv->idle_count) == 0)
41965+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41966 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41967 else
41968- atomic_set(&dev_priv->idle_count, 0);
41969+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41970 }
41971
41972 #endif
41973diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41974index b928c17..e5d9400 100644
41975--- a/drivers/gpu/drm/radeon/mkregtable.c
41976+++ b/drivers/gpu/drm/radeon/mkregtable.c
41977@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41978 regex_t mask_rex;
41979 regmatch_t match[4];
41980 char buf[1024];
41981- size_t end;
41982+ long end;
41983 int len;
41984 int done = 0;
41985 int r;
41986 unsigned o;
41987 struct offset *offset;
41988 char last_reg_s[10];
41989- int last_reg;
41990+ unsigned long last_reg;
41991
41992 if (regcomp
41993 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41994diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41995index aa232fd..7e5f6e1 100644
41996--- a/drivers/gpu/drm/radeon/radeon_device.c
41997+++ b/drivers/gpu/drm/radeon/radeon_device.c
41998@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41999 * locking inversion with the driver load path. And the access here is
42000 * completely racy anyway. So don't bother with locking for now.
42001 */
42002- return dev->open_count == 0;
42003+ return local_read(&dev->open_count) == 0;
42004 }
42005
42006 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
42007diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
42008index 46bd393..6ae4719 100644
42009--- a/drivers/gpu/drm/radeon/radeon_drv.h
42010+++ b/drivers/gpu/drm/radeon/radeon_drv.h
42011@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
42012
42013 /* SW interrupt */
42014 wait_queue_head_t swi_queue;
42015- atomic_t swi_emitted;
42016+ atomic_unchecked_t swi_emitted;
42017 int vblank_crtc;
42018 uint32_t irq_enable_reg;
42019 uint32_t r500_disp_irq_reg;
42020diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
42021index 0b98ea1..a3c770f 100644
42022--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
42023+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
42024@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42025 request = compat_alloc_user_space(sizeof(*request));
42026 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
42027 || __put_user(req32.param, &request->param)
42028- || __put_user((void __user *)(unsigned long)req32.value,
42029+ || __put_user((unsigned long)req32.value,
42030 &request->value))
42031 return -EFAULT;
42032
42033@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42034 #define compat_radeon_cp_setparam NULL
42035 #endif /* X86_64 || IA64 */
42036
42037-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42038+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
42039 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
42040 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
42041 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
42042@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42043 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
42044 {
42045 unsigned int nr = DRM_IOCTL_NR(cmd);
42046- drm_ioctl_compat_t *fn = NULL;
42047 int ret;
42048
42049 if (nr < DRM_COMMAND_BASE)
42050 return drm_compat_ioctl(filp, cmd, arg);
42051
42052- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
42053- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
42054-
42055- if (fn != NULL)
42056- ret = (*fn) (filp, cmd, arg);
42057+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
42058+ ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
42059 else
42060 ret = drm_ioctl(filp, cmd, arg);
42061
42062diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
42063index 244b19b..c19226d 100644
42064--- a/drivers/gpu/drm/radeon/radeon_irq.c
42065+++ b/drivers/gpu/drm/radeon/radeon_irq.c
42066@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
42067 unsigned int ret;
42068 RING_LOCALS;
42069
42070- atomic_inc(&dev_priv->swi_emitted);
42071- ret = atomic_read(&dev_priv->swi_emitted);
42072+ atomic_inc_unchecked(&dev_priv->swi_emitted);
42073+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
42074
42075 BEGIN_RING(4);
42076 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
42077@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
42078 drm_radeon_private_t *dev_priv =
42079 (drm_radeon_private_t *) dev->dev_private;
42080
42081- atomic_set(&dev_priv->swi_emitted, 0);
42082+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
42083 init_waitqueue_head(&dev_priv->swi_queue);
42084
42085 dev->max_vblank_count = 0x001fffff;
42086diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
42087index 15aee72..cda326e 100644
42088--- a/drivers/gpu/drm/radeon/radeon_state.c
42089+++ b/drivers/gpu/drm/radeon/radeon_state.c
42090@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
42091 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
42092 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
42093
42094- if (copy_from_user(&depth_boxes, clear->depth_boxes,
42095+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
42096 sarea_priv->nbox * sizeof(depth_boxes[0])))
42097 return -EFAULT;
42098
42099@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
42100 {
42101 drm_radeon_private_t *dev_priv = dev->dev_private;
42102 drm_radeon_getparam_t *param = data;
42103- int value;
42104+ int value = 0;
42105
42106 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
42107
42108diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
42109index edafd3c..3af7c9c 100644
42110--- a/drivers/gpu/drm/radeon/radeon_ttm.c
42111+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
42112@@ -961,7 +961,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
42113 man->size = size >> PAGE_SHIFT;
42114 }
42115
42116-static struct vm_operations_struct radeon_ttm_vm_ops;
42117+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
42118 static const struct vm_operations_struct *ttm_vm_ops = NULL;
42119
42120 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
42121@@ -1002,8 +1002,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
42122 }
42123 if (unlikely(ttm_vm_ops == NULL)) {
42124 ttm_vm_ops = vma->vm_ops;
42125+ pax_open_kernel();
42126 radeon_ttm_vm_ops = *ttm_vm_ops;
42127 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
42128+ pax_close_kernel();
42129 }
42130 vma->vm_ops = &radeon_ttm_vm_ops;
42131 return 0;
42132diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
42133index 1a52522..8e78043 100644
42134--- a/drivers/gpu/drm/tegra/dc.c
42135+++ b/drivers/gpu/drm/tegra/dc.c
42136@@ -1585,7 +1585,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
42137 }
42138
42139 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
42140- dc->debugfs_files[i].data = dc;
42141+ *(void **)&dc->debugfs_files[i].data = dc;
42142
42143 err = drm_debugfs_create_files(dc->debugfs_files,
42144 ARRAY_SIZE(debugfs_files),
42145diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
42146index ed970f6..4eeea42 100644
42147--- a/drivers/gpu/drm/tegra/dsi.c
42148+++ b/drivers/gpu/drm/tegra/dsi.c
42149@@ -62,7 +62,7 @@ struct tegra_dsi {
42150 struct clk *clk_lp;
42151 struct clk *clk;
42152
42153- struct drm_info_list *debugfs_files;
42154+ drm_info_list_no_const *debugfs_files;
42155 struct drm_minor *minor;
42156 struct dentry *debugfs;
42157
42158diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
42159index 7eaaee74..cc2bc04 100644
42160--- a/drivers/gpu/drm/tegra/hdmi.c
42161+++ b/drivers/gpu/drm/tegra/hdmi.c
42162@@ -64,7 +64,7 @@ struct tegra_hdmi {
42163 bool stereo;
42164 bool dvi;
42165
42166- struct drm_info_list *debugfs_files;
42167+ drm_info_list_no_const *debugfs_files;
42168 struct drm_minor *minor;
42169 struct dentry *debugfs;
42170 };
42171diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42172index aa0bd054..aea6a01 100644
42173--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
42174+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42175@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
42176 }
42177
42178 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
42179- ttm_bo_man_init,
42180- ttm_bo_man_takedown,
42181- ttm_bo_man_get_node,
42182- ttm_bo_man_put_node,
42183- ttm_bo_man_debug
42184+ .init = ttm_bo_man_init,
42185+ .takedown = ttm_bo_man_takedown,
42186+ .get_node = ttm_bo_man_get_node,
42187+ .put_node = ttm_bo_man_put_node,
42188+ .debug = ttm_bo_man_debug
42189 };
42190 EXPORT_SYMBOL(ttm_bo_manager_func);
42191diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
42192index a1803fb..c53f6b0 100644
42193--- a/drivers/gpu/drm/ttm/ttm_memory.c
42194+++ b/drivers/gpu/drm/ttm/ttm_memory.c
42195@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
42196 zone->glob = glob;
42197 glob->zone_kernel = zone;
42198 ret = kobject_init_and_add(
42199- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42200+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42201 if (unlikely(ret != 0)) {
42202 kobject_put(&zone->kobj);
42203 return ret;
42204@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
42205 zone->glob = glob;
42206 glob->zone_dma32 = zone;
42207 ret = kobject_init_and_add(
42208- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42209+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42210 if (unlikely(ret != 0)) {
42211 kobject_put(&zone->kobj);
42212 return ret;
42213diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42214index 025c429..314062f 100644
42215--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
42216+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42217@@ -54,7 +54,7 @@
42218
42219 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42220 #define SMALL_ALLOCATION 16
42221-#define FREE_ALL_PAGES (~0U)
42222+#define FREE_ALL_PAGES (~0UL)
42223 /* times are in msecs */
42224 #define PAGE_FREE_INTERVAL 1000
42225
42226@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
42227 * @free_all: If set to true will free all pages in pool
42228 * @use_static: Safe to use static buffer
42229 **/
42230-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
42231+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
42232 bool use_static)
42233 {
42234 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42235 unsigned long irq_flags;
42236 struct page *p;
42237 struct page **pages_to_free;
42238- unsigned freed_pages = 0,
42239- npages_to_free = nr_free;
42240+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42241
42242 if (NUM_PAGES_TO_ALLOC < nr_free)
42243 npages_to_free = NUM_PAGES_TO_ALLOC;
42244@@ -371,7 +370,8 @@ restart:
42245 __list_del(&p->lru, &pool->list);
42246
42247 ttm_pool_update_free_locked(pool, freed_pages);
42248- nr_free -= freed_pages;
42249+ if (likely(nr_free != FREE_ALL_PAGES))
42250+ nr_free -= freed_pages;
42251 }
42252
42253 spin_unlock_irqrestore(&pool->lock, irq_flags);
42254@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42255 unsigned i;
42256 unsigned pool_offset;
42257 struct ttm_page_pool *pool;
42258- int shrink_pages = sc->nr_to_scan;
42259+ unsigned long shrink_pages = sc->nr_to_scan;
42260 unsigned long freed = 0;
42261
42262 if (!mutex_trylock(&lock))
42263@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42264 pool_offset = ++start_pool % NUM_POOLS;
42265 /* select start pool in round robin fashion */
42266 for (i = 0; i < NUM_POOLS; ++i) {
42267- unsigned nr_free = shrink_pages;
42268+ unsigned long nr_free = shrink_pages;
42269 if (shrink_pages == 0)
42270 break;
42271 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
42272@@ -673,7 +673,7 @@ out:
42273 }
42274
42275 /* Put all pages in pages list to correct pool to wait for reuse */
42276-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
42277+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
42278 enum ttm_caching_state cstate)
42279 {
42280 unsigned long irq_flags;
42281@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
42282 struct list_head plist;
42283 struct page *p = NULL;
42284 gfp_t gfp_flags = GFP_USER;
42285- unsigned count;
42286+ unsigned long count;
42287 int r;
42288
42289 /* set zero flag for page allocation if required */
42290diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42291index 01e1d27..aaa018a 100644
42292--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42293+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42294@@ -56,7 +56,7 @@
42295
42296 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42297 #define SMALL_ALLOCATION 4
42298-#define FREE_ALL_PAGES (~0U)
42299+#define FREE_ALL_PAGES (~0UL)
42300 /* times are in msecs */
42301 #define IS_UNDEFINED (0)
42302 #define IS_WC (1<<1)
42303@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
42304 * @nr_free: If set to true will free all pages in pool
42305 * @use_static: Safe to use static buffer
42306 **/
42307-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42308+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
42309 bool use_static)
42310 {
42311 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42312@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42313 struct dma_page *dma_p, *tmp;
42314 struct page **pages_to_free;
42315 struct list_head d_pages;
42316- unsigned freed_pages = 0,
42317- npages_to_free = nr_free;
42318+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42319
42320 if (NUM_PAGES_TO_ALLOC < nr_free)
42321 npages_to_free = NUM_PAGES_TO_ALLOC;
42322@@ -499,7 +498,8 @@ restart:
42323 /* remove range of pages from the pool */
42324 if (freed_pages) {
42325 ttm_pool_update_free_locked(pool, freed_pages);
42326- nr_free -= freed_pages;
42327+ if (likely(nr_free != FREE_ALL_PAGES))
42328+ nr_free -= freed_pages;
42329 }
42330
42331 spin_unlock_irqrestore(&pool->lock, irq_flags);
42332@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
42333 struct dma_page *d_page, *next;
42334 enum pool_type type;
42335 bool is_cached = false;
42336- unsigned count = 0, i, npages = 0;
42337+ unsigned long count = 0, i, npages = 0;
42338 unsigned long irq_flags;
42339
42340 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
42341@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42342 static unsigned start_pool;
42343 unsigned idx = 0;
42344 unsigned pool_offset;
42345- unsigned shrink_pages = sc->nr_to_scan;
42346+ unsigned long shrink_pages = sc->nr_to_scan;
42347 struct device_pools *p;
42348 unsigned long freed = 0;
42349
42350@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42351 goto out;
42352 pool_offset = ++start_pool % _manager->npools;
42353 list_for_each_entry(p, &_manager->pools, pools) {
42354- unsigned nr_free;
42355+ unsigned long nr_free;
42356
42357 if (!p->dev)
42358 continue;
42359@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42360 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
42361 freed += nr_free - shrink_pages;
42362
42363- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
42364+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
42365 p->pool->dev_name, p->pool->name, current->pid,
42366 nr_free, shrink_pages);
42367 }
42368diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
42369index 5fc16ce..1bd84ec 100644
42370--- a/drivers/gpu/drm/udl/udl_fb.c
42371+++ b/drivers/gpu/drm/udl/udl_fb.c
42372@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
42373 fb_deferred_io_cleanup(info);
42374 kfree(info->fbdefio);
42375 info->fbdefio = NULL;
42376- info->fbops->fb_mmap = udl_fb_mmap;
42377 }
42378
42379 pr_warn("released /dev/fb%d user=%d count=%d\n",
42380diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
42381index ef8c500..01030c8 100644
42382--- a/drivers/gpu/drm/via/via_drv.h
42383+++ b/drivers/gpu/drm/via/via_drv.h
42384@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
42385 typedef uint32_t maskarray_t[5];
42386
42387 typedef struct drm_via_irq {
42388- atomic_t irq_received;
42389+ atomic_unchecked_t irq_received;
42390 uint32_t pending_mask;
42391 uint32_t enable_mask;
42392 wait_queue_head_t irq_queue;
42393@@ -77,7 +77,7 @@ typedef struct drm_via_private {
42394 struct timeval last_vblank;
42395 int last_vblank_valid;
42396 unsigned usec_per_vblank;
42397- atomic_t vbl_received;
42398+ atomic_unchecked_t vbl_received;
42399 drm_via_state_t hc_state;
42400 char pci_buf[VIA_PCI_BUF_SIZE];
42401 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
42402diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
42403index 1319433..a993b0c 100644
42404--- a/drivers/gpu/drm/via/via_irq.c
42405+++ b/drivers/gpu/drm/via/via_irq.c
42406@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
42407 if (crtc != 0)
42408 return 0;
42409
42410- return atomic_read(&dev_priv->vbl_received);
42411+ return atomic_read_unchecked(&dev_priv->vbl_received);
42412 }
42413
42414 irqreturn_t via_driver_irq_handler(int irq, void *arg)
42415@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42416
42417 status = VIA_READ(VIA_REG_INTERRUPT);
42418 if (status & VIA_IRQ_VBLANK_PENDING) {
42419- atomic_inc(&dev_priv->vbl_received);
42420- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
42421+ atomic_inc_unchecked(&dev_priv->vbl_received);
42422+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
42423 do_gettimeofday(&cur_vblank);
42424 if (dev_priv->last_vblank_valid) {
42425 dev_priv->usec_per_vblank =
42426@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42427 dev_priv->last_vblank = cur_vblank;
42428 dev_priv->last_vblank_valid = 1;
42429 }
42430- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
42431+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
42432 DRM_DEBUG("US per vblank is: %u\n",
42433 dev_priv->usec_per_vblank);
42434 }
42435@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42436
42437 for (i = 0; i < dev_priv->num_irqs; ++i) {
42438 if (status & cur_irq->pending_mask) {
42439- atomic_inc(&cur_irq->irq_received);
42440+ atomic_inc_unchecked(&cur_irq->irq_received);
42441 wake_up(&cur_irq->irq_queue);
42442 handled = 1;
42443 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
42444@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
42445 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42446 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
42447 masks[irq][4]));
42448- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
42449+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
42450 } else {
42451 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42452 (((cur_irq_sequence =
42453- atomic_read(&cur_irq->irq_received)) -
42454+ atomic_read_unchecked(&cur_irq->irq_received)) -
42455 *sequence) <= (1 << 23)));
42456 }
42457 *sequence = cur_irq_sequence;
42458@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
42459 }
42460
42461 for (i = 0; i < dev_priv->num_irqs; ++i) {
42462- atomic_set(&cur_irq->irq_received, 0);
42463+ atomic_set_unchecked(&cur_irq->irq_received, 0);
42464 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
42465 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
42466 init_waitqueue_head(&cur_irq->irq_queue);
42467@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
42468 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
42469 case VIA_IRQ_RELATIVE:
42470 irqwait->request.sequence +=
42471- atomic_read(&cur_irq->irq_received);
42472+ atomic_read_unchecked(&cur_irq->irq_received);
42473 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
42474 case VIA_IRQ_ABSOLUTE:
42475 break;
42476diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42477index d26a6da..5fa41ed 100644
42478--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42479+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42480@@ -447,7 +447,7 @@ struct vmw_private {
42481 * Fencing and IRQs.
42482 */
42483
42484- atomic_t marker_seq;
42485+ atomic_unchecked_t marker_seq;
42486 wait_queue_head_t fence_queue;
42487 wait_queue_head_t fifo_queue;
42488 spinlock_t waiter_lock;
42489diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42490index 39f2b03..d1b0a64 100644
42491--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42492+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42493@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
42494 (unsigned int) min,
42495 (unsigned int) fifo->capabilities);
42496
42497- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42498+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42499 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
42500 vmw_marker_queue_init(&fifo->marker_queue);
42501 return vmw_fifo_send_fence(dev_priv, &dummy);
42502@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
42503 if (reserveable)
42504 iowrite32(bytes, fifo_mem +
42505 SVGA_FIFO_RESERVED);
42506- return fifo_mem + (next_cmd >> 2);
42507+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
42508 } else {
42509 need_bounce = true;
42510 }
42511@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42512
42513 fm = vmw_fifo_reserve(dev_priv, bytes);
42514 if (unlikely(fm == NULL)) {
42515- *seqno = atomic_read(&dev_priv->marker_seq);
42516+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42517 ret = -ENOMEM;
42518 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
42519 false, 3*HZ);
42520@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42521 }
42522
42523 do {
42524- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
42525+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
42526 } while (*seqno == 0);
42527
42528 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
42529diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42530index 170b61b..fec7348 100644
42531--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42532+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42533@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42534 }
42535
42536 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42537- vmw_gmrid_man_init,
42538- vmw_gmrid_man_takedown,
42539- vmw_gmrid_man_get_node,
42540- vmw_gmrid_man_put_node,
42541- vmw_gmrid_man_debug
42542+ .init = vmw_gmrid_man_init,
42543+ .takedown = vmw_gmrid_man_takedown,
42544+ .get_node = vmw_gmrid_man_get_node,
42545+ .put_node = vmw_gmrid_man_put_node,
42546+ .debug = vmw_gmrid_man_debug
42547 };
42548diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42549index 69c8ce2..cacb0ab 100644
42550--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42551+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42552@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42553 int ret;
42554
42555 num_clips = arg->num_clips;
42556- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42557+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42558
42559 if (unlikely(num_clips == 0))
42560 return 0;
42561@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42562 int ret;
42563
42564 num_clips = arg->num_clips;
42565- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42566+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42567
42568 if (unlikely(num_clips == 0))
42569 return 0;
42570diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42571index 9fe9827..0aa2fc0 100644
42572--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42573+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42574@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42575 * emitted. Then the fence is stale and signaled.
42576 */
42577
42578- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42579+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42580 > VMW_FENCE_WRAP);
42581
42582 return ret;
42583@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42584
42585 if (fifo_idle)
42586 down_read(&fifo_state->rwsem);
42587- signal_seq = atomic_read(&dev_priv->marker_seq);
42588+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42589 ret = 0;
42590
42591 for (;;) {
42592diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42593index efd1ffd..0ae13ca 100644
42594--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42595+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42596@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42597 while (!vmw_lag_lt(queue, us)) {
42598 spin_lock(&queue->lock);
42599 if (list_empty(&queue->head))
42600- seqno = atomic_read(&dev_priv->marker_seq);
42601+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42602 else {
42603 marker = list_first_entry(&queue->head,
42604 struct vmw_marker, head);
42605diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42606index 37ac7b5..d52a5c9 100644
42607--- a/drivers/gpu/vga/vga_switcheroo.c
42608+++ b/drivers/gpu/vga/vga_switcheroo.c
42609@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42610
42611 /* this version is for the case where the power switch is separate
42612 to the device being powered down. */
42613-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42614+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42615 {
42616 /* copy over all the bus versions */
42617 if (dev->bus && dev->bus->pm) {
42618@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42619 return ret;
42620 }
42621
42622-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42623+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42624 {
42625 /* copy over all the bus versions */
42626 if (dev->bus && dev->bus->pm) {
42627diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42628index 56ce8c2..32ce524 100644
42629--- a/drivers/hid/hid-core.c
42630+++ b/drivers/hid/hid-core.c
42631@@ -2531,7 +2531,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42632
42633 int hid_add_device(struct hid_device *hdev)
42634 {
42635- static atomic_t id = ATOMIC_INIT(0);
42636+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42637 int ret;
42638
42639 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42640@@ -2574,7 +2574,7 @@ int hid_add_device(struct hid_device *hdev)
42641 /* XXX hack, any other cleaner solution after the driver core
42642 * is converted to allow more than 20 bytes as the device name? */
42643 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42644- hdev->vendor, hdev->product, atomic_inc_return(&id));
42645+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42646
42647 hid_debug_register(hdev, dev_name(&hdev->dev));
42648 ret = device_add(&hdev->dev);
42649diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42650index c13fb5b..55a3802 100644
42651--- a/drivers/hid/hid-wiimote-debug.c
42652+++ b/drivers/hid/hid-wiimote-debug.c
42653@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42654 else if (size == 0)
42655 return -EIO;
42656
42657- if (copy_to_user(u, buf, size))
42658+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42659 return -EFAULT;
42660
42661 *off += size;
42662diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42663index 00bc30e..d8e5097 100644
42664--- a/drivers/hv/channel.c
42665+++ b/drivers/hv/channel.c
42666@@ -370,7 +370,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42667 int ret = 0;
42668
42669 next_gpadl_handle =
42670- (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
42671+ (atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
42672
42673 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42674 if (ret)
42675diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42676index 50e51a5..b0bfd78 100644
42677--- a/drivers/hv/hv.c
42678+++ b/drivers/hv/hv.c
42679@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42680 u64 output_address = (output) ? virt_to_phys(output) : 0;
42681 u32 output_address_hi = output_address >> 32;
42682 u32 output_address_lo = output_address & 0xFFFFFFFF;
42683- void *hypercall_page = hv_context.hypercall_page;
42684+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42685
42686 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42687 "=a"(hv_status_lo) : "d" (control_hi),
42688@@ -164,7 +164,7 @@ int hv_init(void)
42689 /* See if the hypercall page is already set */
42690 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42691
42692- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42693+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42694
42695 if (!virtaddr)
42696 goto cleanup;
42697diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42698index ff16938..e60879c 100644
42699--- a/drivers/hv/hv_balloon.c
42700+++ b/drivers/hv/hv_balloon.c
42701@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42702
42703 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42704 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42705-static atomic_t trans_id = ATOMIC_INIT(0);
42706+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42707
42708 static int dm_ring_size = (5 * PAGE_SIZE);
42709
42710@@ -947,7 +947,7 @@ static void hot_add_req(struct work_struct *dummy)
42711 pr_info("Memory hot add failed\n");
42712
42713 dm->state = DM_INITIALIZED;
42714- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42715+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42716 vmbus_sendpacket(dm->dev->channel, &resp,
42717 sizeof(struct dm_hot_add_response),
42718 (unsigned long)NULL,
42719@@ -1028,7 +1028,7 @@ static void post_status(struct hv_dynmem_device *dm)
42720 memset(&status, 0, sizeof(struct dm_status));
42721 status.hdr.type = DM_STATUS_REPORT;
42722 status.hdr.size = sizeof(struct dm_status);
42723- status.hdr.trans_id = atomic_inc_return(&trans_id);
42724+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42725
42726 /*
42727 * The host expects the guest to report free memory.
42728@@ -1048,7 +1048,7 @@ static void post_status(struct hv_dynmem_device *dm)
42729 * send the status. This can happen if we were interrupted
42730 * after we picked our transaction ID.
42731 */
42732- if (status.hdr.trans_id != atomic_read(&trans_id))
42733+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42734 return;
42735
42736 /*
42737@@ -1188,7 +1188,7 @@ static void balloon_up(struct work_struct *dummy)
42738 */
42739
42740 do {
42741- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42742+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42743 ret = vmbus_sendpacket(dm_device.dev->channel,
42744 bl_resp,
42745 bl_resp->hdr.size,
42746@@ -1234,7 +1234,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42747
42748 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42749 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42750- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42751+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42752 resp.hdr.size = sizeof(struct dm_unballoon_response);
42753
42754 vmbus_sendpacket(dm_device.dev->channel, &resp,
42755@@ -1295,7 +1295,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42756 memset(&version_req, 0, sizeof(struct dm_version_request));
42757 version_req.hdr.type = DM_VERSION_REQUEST;
42758 version_req.hdr.size = sizeof(struct dm_version_request);
42759- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42760+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42761 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42762 version_req.is_last_attempt = 1;
42763
42764@@ -1468,7 +1468,7 @@ static int balloon_probe(struct hv_device *dev,
42765 memset(&version_req, 0, sizeof(struct dm_version_request));
42766 version_req.hdr.type = DM_VERSION_REQUEST;
42767 version_req.hdr.size = sizeof(struct dm_version_request);
42768- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42769+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42770 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42771 version_req.is_last_attempt = 0;
42772
42773@@ -1499,7 +1499,7 @@ static int balloon_probe(struct hv_device *dev,
42774 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42775 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42776 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42777- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42778+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42779
42780 cap_msg.caps.cap_bits.balloon = 1;
42781 cap_msg.caps.cap_bits.hot_add = 1;
42782diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42783index 44b1c94..6dccc2c 100644
42784--- a/drivers/hv/hyperv_vmbus.h
42785+++ b/drivers/hv/hyperv_vmbus.h
42786@@ -632,7 +632,7 @@ enum vmbus_connect_state {
42787 struct vmbus_connection {
42788 enum vmbus_connect_state conn_state;
42789
42790- atomic_t next_gpadl_handle;
42791+ atomic_unchecked_t next_gpadl_handle;
42792
42793 /*
42794 * Represents channel interrupts. Each bit position represents a
42795diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42796index f518b8d7..4bc0b64 100644
42797--- a/drivers/hv/vmbus_drv.c
42798+++ b/drivers/hv/vmbus_drv.c
42799@@ -840,10 +840,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42800 {
42801 int ret = 0;
42802
42803- static atomic_t device_num = ATOMIC_INIT(0);
42804+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42805
42806 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42807- atomic_inc_return(&device_num));
42808+ atomic_inc_return_unchecked(&device_num));
42809
42810 child_device_obj->device.bus = &hv_bus;
42811 child_device_obj->device.parent = &hv_acpi_dev->dev;
42812diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42813index 579bdf9..0dac21d5 100644
42814--- a/drivers/hwmon/acpi_power_meter.c
42815+++ b/drivers/hwmon/acpi_power_meter.c
42816@@ -116,7 +116,7 @@ struct sensor_template {
42817 struct device_attribute *devattr,
42818 const char *buf, size_t count);
42819 int index;
42820-};
42821+} __do_const;
42822
42823 /* Averaging interval */
42824 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42825@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42826 struct sensor_template *attrs)
42827 {
42828 struct device *dev = &resource->acpi_dev->dev;
42829- struct sensor_device_attribute *sensors =
42830+ sensor_device_attribute_no_const *sensors =
42831 &resource->sensors[resource->num_sensors];
42832 int res = 0;
42833
42834@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42835 return 0;
42836 }
42837
42838-static struct dmi_system_id __initdata pm_dmi_table[] = {
42839+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42840 {
42841 enable_cap_knobs, "IBM Active Energy Manager",
42842 {
42843diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42844index 0af63da..05a183a 100644
42845--- a/drivers/hwmon/applesmc.c
42846+++ b/drivers/hwmon/applesmc.c
42847@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42848 {
42849 struct applesmc_node_group *grp;
42850 struct applesmc_dev_attr *node;
42851- struct attribute *attr;
42852+ attribute_no_const *attr;
42853 int ret, i;
42854
42855 for (grp = groups; grp->format; grp++) {
42856diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42857index cccef87..06ce8ec 100644
42858--- a/drivers/hwmon/asus_atk0110.c
42859+++ b/drivers/hwmon/asus_atk0110.c
42860@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42861 struct atk_sensor_data {
42862 struct list_head list;
42863 struct atk_data *data;
42864- struct device_attribute label_attr;
42865- struct device_attribute input_attr;
42866- struct device_attribute limit1_attr;
42867- struct device_attribute limit2_attr;
42868+ device_attribute_no_const label_attr;
42869+ device_attribute_no_const input_attr;
42870+ device_attribute_no_const limit1_attr;
42871+ device_attribute_no_const limit2_attr;
42872 char label_attr_name[ATTR_NAME_SIZE];
42873 char input_attr_name[ATTR_NAME_SIZE];
42874 char limit1_attr_name[ATTR_NAME_SIZE];
42875@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42876 static struct device_attribute atk_name_attr =
42877 __ATTR(name, 0444, atk_name_show, NULL);
42878
42879-static void atk_init_attribute(struct device_attribute *attr, char *name,
42880+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42881 sysfs_show_func show)
42882 {
42883 sysfs_attr_init(&attr->attr);
42884diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42885index 5b7fec8..05c957a 100644
42886--- a/drivers/hwmon/coretemp.c
42887+++ b/drivers/hwmon/coretemp.c
42888@@ -783,7 +783,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42889 return NOTIFY_OK;
42890 }
42891
42892-static struct notifier_block coretemp_cpu_notifier __refdata = {
42893+static struct notifier_block coretemp_cpu_notifier = {
42894 .notifier_call = coretemp_cpu_callback,
42895 };
42896
42897diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42898index 7a8a6fb..015c1fd 100644
42899--- a/drivers/hwmon/ibmaem.c
42900+++ b/drivers/hwmon/ibmaem.c
42901@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42902 struct aem_rw_sensor_template *rw)
42903 {
42904 struct device *dev = &data->pdev->dev;
42905- struct sensor_device_attribute *sensors = data->sensors;
42906+ sensor_device_attribute_no_const *sensors = data->sensors;
42907 int err;
42908
42909 /* Set up read-only sensors */
42910diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42911index 17ae2eb..21b71dd 100644
42912--- a/drivers/hwmon/iio_hwmon.c
42913+++ b/drivers/hwmon/iio_hwmon.c
42914@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42915 {
42916 struct device *dev = &pdev->dev;
42917 struct iio_hwmon_state *st;
42918- struct sensor_device_attribute *a;
42919+ sensor_device_attribute_no_const *a;
42920 int ret, i;
42921 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42922 enum iio_chan_type type;
42923diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42924index 37f0170..414ec2c 100644
42925--- a/drivers/hwmon/nct6683.c
42926+++ b/drivers/hwmon/nct6683.c
42927@@ -397,11 +397,11 @@ static struct attribute_group *
42928 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42929 int repeat)
42930 {
42931- struct sensor_device_attribute_2 *a2;
42932- struct sensor_device_attribute *a;
42933+ sensor_device_attribute_2_no_const *a2;
42934+ sensor_device_attribute_no_const *a;
42935 struct sensor_device_template **t;
42936 struct sensor_device_attr_u *su;
42937- struct attribute_group *group;
42938+ attribute_group_no_const *group;
42939 struct attribute **attrs;
42940 int i, j, count;
42941
42942diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42943index 0773930..6f04305 100644
42944--- a/drivers/hwmon/nct6775.c
42945+++ b/drivers/hwmon/nct6775.c
42946@@ -952,10 +952,10 @@ static struct attribute_group *
42947 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42948 int repeat)
42949 {
42950- struct attribute_group *group;
42951+ attribute_group_no_const *group;
42952 struct sensor_device_attr_u *su;
42953- struct sensor_device_attribute *a;
42954- struct sensor_device_attribute_2 *a2;
42955+ sensor_device_attribute_no_const *a;
42956+ sensor_device_attribute_2_no_const *a2;
42957 struct attribute **attrs;
42958 struct sensor_device_template **t;
42959 int i, count;
42960diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42961index f2e47c7..45d7941 100644
42962--- a/drivers/hwmon/pmbus/pmbus_core.c
42963+++ b/drivers/hwmon/pmbus/pmbus_core.c
42964@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42965 return 0;
42966 }
42967
42968-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42969+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42970 const char *name,
42971 umode_t mode,
42972 ssize_t (*show)(struct device *dev,
42973@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42974 dev_attr->store = store;
42975 }
42976
42977-static void pmbus_attr_init(struct sensor_device_attribute *a,
42978+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42979 const char *name,
42980 umode_t mode,
42981 ssize_t (*show)(struct device *dev,
42982@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42983 u16 reg, u8 mask)
42984 {
42985 struct pmbus_boolean *boolean;
42986- struct sensor_device_attribute *a;
42987+ sensor_device_attribute_no_const *a;
42988
42989 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42990 if (!boolean)
42991@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42992 bool update, bool readonly)
42993 {
42994 struct pmbus_sensor *sensor;
42995- struct device_attribute *a;
42996+ device_attribute_no_const *a;
42997
42998 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42999 if (!sensor)
43000@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
43001 const char *lstring, int index)
43002 {
43003 struct pmbus_label *label;
43004- struct device_attribute *a;
43005+ device_attribute_no_const *a;
43006
43007 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
43008 if (!label)
43009diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
43010index d4f0935..7420593 100644
43011--- a/drivers/hwmon/sht15.c
43012+++ b/drivers/hwmon/sht15.c
43013@@ -169,7 +169,7 @@ struct sht15_data {
43014 int supply_uv;
43015 bool supply_uv_valid;
43016 struct work_struct update_supply_work;
43017- atomic_t interrupt_handled;
43018+ atomic_unchecked_t interrupt_handled;
43019 };
43020
43021 /**
43022@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
43023 ret = gpio_direction_input(data->pdata->gpio_data);
43024 if (ret)
43025 return ret;
43026- atomic_set(&data->interrupt_handled, 0);
43027+ atomic_set_unchecked(&data->interrupt_handled, 0);
43028
43029 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43030 if (gpio_get_value(data->pdata->gpio_data) == 0) {
43031 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
43032 /* Only relevant if the interrupt hasn't occurred. */
43033- if (!atomic_read(&data->interrupt_handled))
43034+ if (!atomic_read_unchecked(&data->interrupt_handled))
43035 schedule_work(&data->read_work);
43036 }
43037 ret = wait_event_timeout(data->wait_queue,
43038@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
43039
43040 /* First disable the interrupt */
43041 disable_irq_nosync(irq);
43042- atomic_inc(&data->interrupt_handled);
43043+ atomic_inc_unchecked(&data->interrupt_handled);
43044 /* Then schedule a reading work struct */
43045 if (data->state != SHT15_READING_NOTHING)
43046 schedule_work(&data->read_work);
43047@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
43048 * If not, then start the interrupt again - care here as could
43049 * have gone low in meantime so verify it hasn't!
43050 */
43051- atomic_set(&data->interrupt_handled, 0);
43052+ atomic_set_unchecked(&data->interrupt_handled, 0);
43053 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43054 /* If still not occurred or another handler was scheduled */
43055 if (gpio_get_value(data->pdata->gpio_data)
43056- || atomic_read(&data->interrupt_handled))
43057+ || atomic_read_unchecked(&data->interrupt_handled))
43058 return;
43059 }
43060
43061diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
43062index ac91c07..8e69663 100644
43063--- a/drivers/hwmon/via-cputemp.c
43064+++ b/drivers/hwmon/via-cputemp.c
43065@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
43066 return NOTIFY_OK;
43067 }
43068
43069-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
43070+static struct notifier_block via_cputemp_cpu_notifier = {
43071 .notifier_call = via_cputemp_cpu_callback,
43072 };
43073
43074diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
43075index 65e3240..e6c511d 100644
43076--- a/drivers/i2c/busses/i2c-amd756-s4882.c
43077+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
43078@@ -39,7 +39,7 @@
43079 extern struct i2c_adapter amd756_smbus;
43080
43081 static struct i2c_adapter *s4882_adapter;
43082-static struct i2c_algorithm *s4882_algo;
43083+static i2c_algorithm_no_const *s4882_algo;
43084
43085 /* Wrapper access functions for multiplexed SMBus */
43086 static DEFINE_MUTEX(amd756_lock);
43087diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
43088index b19a310..d6eece0 100644
43089--- a/drivers/i2c/busses/i2c-diolan-u2c.c
43090+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
43091@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
43092 /* usb layer */
43093
43094 /* Send command to device, and get response. */
43095-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43096+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43097 {
43098 int ret = 0;
43099 int actual;
43100diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
43101index 88eda09..cf40434 100644
43102--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
43103+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
43104@@ -37,7 +37,7 @@
43105 extern struct i2c_adapter *nforce2_smbus;
43106
43107 static struct i2c_adapter *s4985_adapter;
43108-static struct i2c_algorithm *s4985_algo;
43109+static i2c_algorithm_no_const *s4985_algo;
43110
43111 /* Wrapper access functions for multiplexed SMBus */
43112 static DEFINE_MUTEX(nforce2_lock);
43113diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
43114index 71c7a39..71dd3e0 100644
43115--- a/drivers/i2c/i2c-dev.c
43116+++ b/drivers/i2c/i2c-dev.c
43117@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
43118 break;
43119 }
43120
43121- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
43122+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
43123 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
43124 if (IS_ERR(rdwr_pa[i].buf)) {
43125 res = PTR_ERR(rdwr_pa[i].buf);
43126diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
43127index 0b510ba..4fbb5085 100644
43128--- a/drivers/ide/ide-cd.c
43129+++ b/drivers/ide/ide-cd.c
43130@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
43131 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
43132 if ((unsigned long)buf & alignment
43133 || blk_rq_bytes(rq) & q->dma_pad_mask
43134- || object_is_on_stack(buf))
43135+ || object_starts_on_stack(buf))
43136 drive->dma = 0;
43137 }
43138 }
43139diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
43140index 4df97f6..c751151 100644
43141--- a/drivers/iio/industrialio-core.c
43142+++ b/drivers/iio/industrialio-core.c
43143@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
43144 }
43145
43146 static
43147-int __iio_device_attr_init(struct device_attribute *dev_attr,
43148+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
43149 const char *postfix,
43150 struct iio_chan_spec const *chan,
43151 ssize_t (*readfunc)(struct device *dev,
43152diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
43153index e28a494..f7c2671 100644
43154--- a/drivers/infiniband/core/cm.c
43155+++ b/drivers/infiniband/core/cm.c
43156@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
43157
43158 struct cm_counter_group {
43159 struct kobject obj;
43160- atomic_long_t counter[CM_ATTR_COUNT];
43161+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
43162 };
43163
43164 struct cm_counter_attribute {
43165@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
43166 struct ib_mad_send_buf *msg = NULL;
43167 int ret;
43168
43169- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43170+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43171 counter[CM_REQ_COUNTER]);
43172
43173 /* Quick state check to discard duplicate REQs. */
43174@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
43175 if (!cm_id_priv)
43176 return;
43177
43178- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43179+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43180 counter[CM_REP_COUNTER]);
43181 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
43182 if (ret)
43183@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
43184 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
43185 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
43186 spin_unlock_irq(&cm_id_priv->lock);
43187- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43188+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43189 counter[CM_RTU_COUNTER]);
43190 goto out;
43191 }
43192@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
43193 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
43194 dreq_msg->local_comm_id);
43195 if (!cm_id_priv) {
43196- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43197+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43198 counter[CM_DREQ_COUNTER]);
43199 cm_issue_drep(work->port, work->mad_recv_wc);
43200 return -EINVAL;
43201@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
43202 case IB_CM_MRA_REP_RCVD:
43203 break;
43204 case IB_CM_TIMEWAIT:
43205- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43206+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43207 counter[CM_DREQ_COUNTER]);
43208 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43209 goto unlock;
43210@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
43211 cm_free_msg(msg);
43212 goto deref;
43213 case IB_CM_DREQ_RCVD:
43214- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43215+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43216 counter[CM_DREQ_COUNTER]);
43217 goto unlock;
43218 default:
43219@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
43220 ib_modify_mad(cm_id_priv->av.port->mad_agent,
43221 cm_id_priv->msg, timeout)) {
43222 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
43223- atomic_long_inc(&work->port->
43224+ atomic_long_inc_unchecked(&work->port->
43225 counter_group[CM_RECV_DUPLICATES].
43226 counter[CM_MRA_COUNTER]);
43227 goto out;
43228@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
43229 break;
43230 case IB_CM_MRA_REQ_RCVD:
43231 case IB_CM_MRA_REP_RCVD:
43232- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43233+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43234 counter[CM_MRA_COUNTER]);
43235 /* fall through */
43236 default:
43237@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
43238 case IB_CM_LAP_IDLE:
43239 break;
43240 case IB_CM_MRA_LAP_SENT:
43241- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43242+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43243 counter[CM_LAP_COUNTER]);
43244 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43245 goto unlock;
43246@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
43247 cm_free_msg(msg);
43248 goto deref;
43249 case IB_CM_LAP_RCVD:
43250- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43251+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43252 counter[CM_LAP_COUNTER]);
43253 goto unlock;
43254 default:
43255@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
43256 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
43257 if (cur_cm_id_priv) {
43258 spin_unlock_irq(&cm.lock);
43259- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43260+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43261 counter[CM_SIDR_REQ_COUNTER]);
43262 goto out; /* Duplicate message. */
43263 }
43264@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
43265 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
43266 msg->retries = 1;
43267
43268- atomic_long_add(1 + msg->retries,
43269+ atomic_long_add_unchecked(1 + msg->retries,
43270 &port->counter_group[CM_XMIT].counter[attr_index]);
43271 if (msg->retries)
43272- atomic_long_add(msg->retries,
43273+ atomic_long_add_unchecked(msg->retries,
43274 &port->counter_group[CM_XMIT_RETRIES].
43275 counter[attr_index]);
43276
43277@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
43278 }
43279
43280 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
43281- atomic_long_inc(&port->counter_group[CM_RECV].
43282+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
43283 counter[attr_id - CM_ATTR_ID_OFFSET]);
43284
43285 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
43286@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
43287 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
43288
43289 return sprintf(buf, "%ld\n",
43290- atomic_long_read(&group->counter[cm_attr->index]));
43291+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
43292 }
43293
43294 static const struct sysfs_ops cm_counter_ops = {
43295diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
43296index 9f5ad7c..588cd84 100644
43297--- a/drivers/infiniband/core/fmr_pool.c
43298+++ b/drivers/infiniband/core/fmr_pool.c
43299@@ -98,8 +98,8 @@ struct ib_fmr_pool {
43300
43301 struct task_struct *thread;
43302
43303- atomic_t req_ser;
43304- atomic_t flush_ser;
43305+ atomic_unchecked_t req_ser;
43306+ atomic_unchecked_t flush_ser;
43307
43308 wait_queue_head_t force_wait;
43309 };
43310@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43311 struct ib_fmr_pool *pool = pool_ptr;
43312
43313 do {
43314- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
43315+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
43316 ib_fmr_batch_release(pool);
43317
43318- atomic_inc(&pool->flush_ser);
43319+ atomic_inc_unchecked(&pool->flush_ser);
43320 wake_up_interruptible(&pool->force_wait);
43321
43322 if (pool->flush_function)
43323@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43324 }
43325
43326 set_current_state(TASK_INTERRUPTIBLE);
43327- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
43328+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
43329 !kthread_should_stop())
43330 schedule();
43331 __set_current_state(TASK_RUNNING);
43332@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
43333 pool->dirty_watermark = params->dirty_watermark;
43334 pool->dirty_len = 0;
43335 spin_lock_init(&pool->pool_lock);
43336- atomic_set(&pool->req_ser, 0);
43337- atomic_set(&pool->flush_ser, 0);
43338+ atomic_set_unchecked(&pool->req_ser, 0);
43339+ atomic_set_unchecked(&pool->flush_ser, 0);
43340 init_waitqueue_head(&pool->force_wait);
43341
43342 pool->thread = kthread_run(ib_fmr_cleanup_thread,
43343@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
43344 }
43345 spin_unlock_irq(&pool->pool_lock);
43346
43347- serial = atomic_inc_return(&pool->req_ser);
43348+ serial = atomic_inc_return_unchecked(&pool->req_ser);
43349 wake_up_process(pool->thread);
43350
43351 if (wait_event_interruptible(pool->force_wait,
43352- atomic_read(&pool->flush_ser) - serial >= 0))
43353+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
43354 return -EINTR;
43355
43356 return 0;
43357@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
43358 } else {
43359 list_add_tail(&fmr->list, &pool->dirty_list);
43360 if (++pool->dirty_len >= pool->dirty_watermark) {
43361- atomic_inc(&pool->req_ser);
43362+ atomic_inc_unchecked(&pool->req_ser);
43363 wake_up_process(pool->thread);
43364 }
43365 }
43366diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
43367index a9f0489..27a161b 100644
43368--- a/drivers/infiniband/core/uverbs_cmd.c
43369+++ b/drivers/infiniband/core/uverbs_cmd.c
43370@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
43371 if (copy_from_user(&cmd, buf, sizeof cmd))
43372 return -EFAULT;
43373
43374+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
43375+ return -EFAULT;
43376+
43377 INIT_UDATA(&udata, buf + sizeof cmd,
43378 (unsigned long) cmd.response + sizeof resp,
43379 in_len - sizeof cmd, out_len - sizeof resp);
43380diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
43381index 6791fd1..78bdcdf 100644
43382--- a/drivers/infiniband/hw/cxgb4/mem.c
43383+++ b/drivers/infiniband/hw/cxgb4/mem.c
43384@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43385 int err;
43386 struct fw_ri_tpte tpt;
43387 u32 stag_idx;
43388- static atomic_t key;
43389+ static atomic_unchecked_t key;
43390
43391 if (c4iw_fatal_error(rdev))
43392 return -EIO;
43393@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43394 if (rdev->stats.stag.cur > rdev->stats.stag.max)
43395 rdev->stats.stag.max = rdev->stats.stag.cur;
43396 mutex_unlock(&rdev->stats.lock);
43397- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
43398+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
43399 }
43400 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
43401 __func__, stag_state, type, pdid, stag_idx);
43402diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
43403index 79b3dbc..96e5fcc 100644
43404--- a/drivers/infiniband/hw/ipath/ipath_rc.c
43405+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
43406@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43407 struct ib_atomic_eth *ateth;
43408 struct ipath_ack_entry *e;
43409 u64 vaddr;
43410- atomic64_t *maddr;
43411+ atomic64_unchecked_t *maddr;
43412 u64 sdata;
43413 u32 rkey;
43414 u8 next;
43415@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43416 IB_ACCESS_REMOTE_ATOMIC)))
43417 goto nack_acc_unlck;
43418 /* Perform atomic OP and save result. */
43419- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43420+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43421 sdata = be64_to_cpu(ateth->swap_data);
43422 e = &qp->s_ack_queue[qp->r_head_ack_queue];
43423 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
43424- (u64) atomic64_add_return(sdata, maddr) - sdata :
43425+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43426 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43427 be64_to_cpu(ateth->compare_data),
43428 sdata);
43429diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
43430index 1f95bba..9530f87 100644
43431--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
43432+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
43433@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
43434 unsigned long flags;
43435 struct ib_wc wc;
43436 u64 sdata;
43437- atomic64_t *maddr;
43438+ atomic64_unchecked_t *maddr;
43439 enum ib_wc_status send_status;
43440
43441 /*
43442@@ -382,11 +382,11 @@ again:
43443 IB_ACCESS_REMOTE_ATOMIC)))
43444 goto acc_err;
43445 /* Perform atomic OP and save result. */
43446- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43447+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43448 sdata = wqe->wr.wr.atomic.compare_add;
43449 *(u64 *) sqp->s_sge.sge.vaddr =
43450 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
43451- (u64) atomic64_add_return(sdata, maddr) - sdata :
43452+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43453 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43454 sdata, wqe->wr.wr.atomic.swap);
43455 goto send_comp;
43456diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
43457index 5904026..f1c30e5 100644
43458--- a/drivers/infiniband/hw/mlx4/mad.c
43459+++ b/drivers/infiniband/hw/mlx4/mad.c
43460@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
43461
43462 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
43463 {
43464- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
43465+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
43466 cpu_to_be64(0xff00000000000000LL);
43467 }
43468
43469diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
43470index ed327e6..ca1739e0 100644
43471--- a/drivers/infiniband/hw/mlx4/mcg.c
43472+++ b/drivers/infiniband/hw/mlx4/mcg.c
43473@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
43474 {
43475 char name[20];
43476
43477- atomic_set(&ctx->tid, 0);
43478+ atomic_set_unchecked(&ctx->tid, 0);
43479 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
43480 ctx->mcg_wq = create_singlethread_workqueue(name);
43481 if (!ctx->mcg_wq)
43482diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43483index f829fd9..1a8d436 100644
43484--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43485+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43486@@ -439,7 +439,7 @@ struct mlx4_ib_demux_ctx {
43487 struct list_head mcg_mgid0_list;
43488 struct workqueue_struct *mcg_wq;
43489 struct mlx4_ib_demux_pv_ctx **tun;
43490- atomic_t tid;
43491+ atomic_unchecked_t tid;
43492 int flushing; /* flushing the work queue */
43493 };
43494
43495diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43496index 9d3e5c1..6f166df 100644
43497--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43498+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43499@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43500 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43501 }
43502
43503-int mthca_QUERY_FW(struct mthca_dev *dev)
43504+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43505 {
43506 struct mthca_mailbox *mailbox;
43507 u32 *outbox;
43508@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43509 CMD_TIME_CLASS_B);
43510 }
43511
43512-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43513+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43514 int num_mtt)
43515 {
43516 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43517@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43518 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43519 }
43520
43521-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43522+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43523 int eq_num)
43524 {
43525 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43526@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43527 CMD_TIME_CLASS_B);
43528 }
43529
43530-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43531+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43532 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43533 void *in_mad, void *response_mad)
43534 {
43535diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43536index ded76c1..0cf0a08 100644
43537--- a/drivers/infiniband/hw/mthca/mthca_main.c
43538+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43539@@ -692,7 +692,7 @@ err_close:
43540 return err;
43541 }
43542
43543-static int mthca_setup_hca(struct mthca_dev *dev)
43544+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43545 {
43546 int err;
43547
43548diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43549index ed9a989..6aa5dc2 100644
43550--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43551+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43552@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43553 * through the bitmaps)
43554 */
43555
43556-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43557+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43558 {
43559 int o;
43560 int m;
43561@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43562 return key;
43563 }
43564
43565-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43566+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43567 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43568 {
43569 struct mthca_mailbox *mailbox;
43570@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43571 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43572 }
43573
43574-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43575+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43576 u64 *buffer_list, int buffer_size_shift,
43577 int list_len, u64 iova, u64 total_size,
43578 u32 access, struct mthca_mr *mr)
43579diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43580index 415f8e1..e34214e 100644
43581--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43582+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43583@@ -764,7 +764,7 @@ unlock:
43584 return 0;
43585 }
43586
43587-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43588+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43589 {
43590 struct mthca_dev *dev = to_mdev(ibcq->device);
43591 struct mthca_cq *cq = to_mcq(ibcq);
43592diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43593index 3b2a6dc..bce26ff 100644
43594--- a/drivers/infiniband/hw/nes/nes.c
43595+++ b/drivers/infiniband/hw/nes/nes.c
43596@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43597 LIST_HEAD(nes_adapter_list);
43598 static LIST_HEAD(nes_dev_list);
43599
43600-atomic_t qps_destroyed;
43601+atomic_unchecked_t qps_destroyed;
43602
43603 static unsigned int ee_flsh_adapter;
43604 static unsigned int sysfs_nonidx_addr;
43605@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43606 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43607 struct nes_adapter *nesadapter = nesdev->nesadapter;
43608
43609- atomic_inc(&qps_destroyed);
43610+ atomic_inc_unchecked(&qps_destroyed);
43611
43612 /* Free the control structures */
43613
43614diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43615index bd9d132..70d84f4 100644
43616--- a/drivers/infiniband/hw/nes/nes.h
43617+++ b/drivers/infiniband/hw/nes/nes.h
43618@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43619 extern unsigned int wqm_quanta;
43620 extern struct list_head nes_adapter_list;
43621
43622-extern atomic_t cm_connects;
43623-extern atomic_t cm_accepts;
43624-extern atomic_t cm_disconnects;
43625-extern atomic_t cm_closes;
43626-extern atomic_t cm_connecteds;
43627-extern atomic_t cm_connect_reqs;
43628-extern atomic_t cm_rejects;
43629-extern atomic_t mod_qp_timouts;
43630-extern atomic_t qps_created;
43631-extern atomic_t qps_destroyed;
43632-extern atomic_t sw_qps_destroyed;
43633+extern atomic_unchecked_t cm_connects;
43634+extern atomic_unchecked_t cm_accepts;
43635+extern atomic_unchecked_t cm_disconnects;
43636+extern atomic_unchecked_t cm_closes;
43637+extern atomic_unchecked_t cm_connecteds;
43638+extern atomic_unchecked_t cm_connect_reqs;
43639+extern atomic_unchecked_t cm_rejects;
43640+extern atomic_unchecked_t mod_qp_timouts;
43641+extern atomic_unchecked_t qps_created;
43642+extern atomic_unchecked_t qps_destroyed;
43643+extern atomic_unchecked_t sw_qps_destroyed;
43644 extern u32 mh_detected;
43645 extern u32 mh_pauses_sent;
43646 extern u32 cm_packets_sent;
43647@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43648 extern u32 cm_packets_received;
43649 extern u32 cm_packets_dropped;
43650 extern u32 cm_packets_retrans;
43651-extern atomic_t cm_listens_created;
43652-extern atomic_t cm_listens_destroyed;
43653+extern atomic_unchecked_t cm_listens_created;
43654+extern atomic_unchecked_t cm_listens_destroyed;
43655 extern u32 cm_backlog_drops;
43656-extern atomic_t cm_loopbacks;
43657-extern atomic_t cm_nodes_created;
43658-extern atomic_t cm_nodes_destroyed;
43659-extern atomic_t cm_accel_dropped_pkts;
43660-extern atomic_t cm_resets_recvd;
43661-extern atomic_t pau_qps_created;
43662-extern atomic_t pau_qps_destroyed;
43663+extern atomic_unchecked_t cm_loopbacks;
43664+extern atomic_unchecked_t cm_nodes_created;
43665+extern atomic_unchecked_t cm_nodes_destroyed;
43666+extern atomic_unchecked_t cm_accel_dropped_pkts;
43667+extern atomic_unchecked_t cm_resets_recvd;
43668+extern atomic_unchecked_t pau_qps_created;
43669+extern atomic_unchecked_t pau_qps_destroyed;
43670
43671 extern u32 int_mod_timer_init;
43672 extern u32 int_mod_cq_depth_256;
43673diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43674index 6f09a72..cf4399d 100644
43675--- a/drivers/infiniband/hw/nes/nes_cm.c
43676+++ b/drivers/infiniband/hw/nes/nes_cm.c
43677@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43678 u32 cm_packets_retrans;
43679 u32 cm_packets_created;
43680 u32 cm_packets_received;
43681-atomic_t cm_listens_created;
43682-atomic_t cm_listens_destroyed;
43683+atomic_unchecked_t cm_listens_created;
43684+atomic_unchecked_t cm_listens_destroyed;
43685 u32 cm_backlog_drops;
43686-atomic_t cm_loopbacks;
43687-atomic_t cm_nodes_created;
43688-atomic_t cm_nodes_destroyed;
43689-atomic_t cm_accel_dropped_pkts;
43690-atomic_t cm_resets_recvd;
43691+atomic_unchecked_t cm_loopbacks;
43692+atomic_unchecked_t cm_nodes_created;
43693+atomic_unchecked_t cm_nodes_destroyed;
43694+atomic_unchecked_t cm_accel_dropped_pkts;
43695+atomic_unchecked_t cm_resets_recvd;
43696
43697 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43698 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43699@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43700 /* instance of function pointers for client API */
43701 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43702 static struct nes_cm_ops nes_cm_api = {
43703- mini_cm_accelerated,
43704- mini_cm_listen,
43705- mini_cm_del_listen,
43706- mini_cm_connect,
43707- mini_cm_close,
43708- mini_cm_accept,
43709- mini_cm_reject,
43710- mini_cm_recv_pkt,
43711- mini_cm_dealloc_core,
43712- mini_cm_get,
43713- mini_cm_set
43714+ .accelerated = mini_cm_accelerated,
43715+ .listen = mini_cm_listen,
43716+ .stop_listener = mini_cm_del_listen,
43717+ .connect = mini_cm_connect,
43718+ .close = mini_cm_close,
43719+ .accept = mini_cm_accept,
43720+ .reject = mini_cm_reject,
43721+ .recv_pkt = mini_cm_recv_pkt,
43722+ .destroy_cm_core = mini_cm_dealloc_core,
43723+ .get = mini_cm_get,
43724+ .set = mini_cm_set
43725 };
43726
43727 static struct nes_cm_core *g_cm_core;
43728
43729-atomic_t cm_connects;
43730-atomic_t cm_accepts;
43731-atomic_t cm_disconnects;
43732-atomic_t cm_closes;
43733-atomic_t cm_connecteds;
43734-atomic_t cm_connect_reqs;
43735-atomic_t cm_rejects;
43736+atomic_unchecked_t cm_connects;
43737+atomic_unchecked_t cm_accepts;
43738+atomic_unchecked_t cm_disconnects;
43739+atomic_unchecked_t cm_closes;
43740+atomic_unchecked_t cm_connecteds;
43741+atomic_unchecked_t cm_connect_reqs;
43742+atomic_unchecked_t cm_rejects;
43743
43744 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43745 {
43746@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43747 kfree(listener);
43748 listener = NULL;
43749 ret = 0;
43750- atomic_inc(&cm_listens_destroyed);
43751+ atomic_inc_unchecked(&cm_listens_destroyed);
43752 } else {
43753 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43754 }
43755@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43756 cm_node->rem_mac);
43757
43758 add_hte_node(cm_core, cm_node);
43759- atomic_inc(&cm_nodes_created);
43760+ atomic_inc_unchecked(&cm_nodes_created);
43761
43762 return cm_node;
43763 }
43764@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43765 }
43766
43767 atomic_dec(&cm_core->node_cnt);
43768- atomic_inc(&cm_nodes_destroyed);
43769+ atomic_inc_unchecked(&cm_nodes_destroyed);
43770 nesqp = cm_node->nesqp;
43771 if (nesqp) {
43772 nesqp->cm_node = NULL;
43773@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43774
43775 static void drop_packet(struct sk_buff *skb)
43776 {
43777- atomic_inc(&cm_accel_dropped_pkts);
43778+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43779 dev_kfree_skb_any(skb);
43780 }
43781
43782@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43783 {
43784
43785 int reset = 0; /* whether to send reset in case of err.. */
43786- atomic_inc(&cm_resets_recvd);
43787+ atomic_inc_unchecked(&cm_resets_recvd);
43788 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43789 " refcnt=%d\n", cm_node, cm_node->state,
43790 atomic_read(&cm_node->ref_count));
43791@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43792 rem_ref_cm_node(cm_node->cm_core, cm_node);
43793 return NULL;
43794 }
43795- atomic_inc(&cm_loopbacks);
43796+ atomic_inc_unchecked(&cm_loopbacks);
43797 loopbackremotenode->loopbackpartner = cm_node;
43798 loopbackremotenode->tcp_cntxt.rcv_wscale =
43799 NES_CM_DEFAULT_RCV_WND_SCALE;
43800@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43801 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43802 else {
43803 rem_ref_cm_node(cm_core, cm_node);
43804- atomic_inc(&cm_accel_dropped_pkts);
43805+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43806 dev_kfree_skb_any(skb);
43807 }
43808 break;
43809@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43810
43811 if ((cm_id) && (cm_id->event_handler)) {
43812 if (issue_disconn) {
43813- atomic_inc(&cm_disconnects);
43814+ atomic_inc_unchecked(&cm_disconnects);
43815 cm_event.event = IW_CM_EVENT_DISCONNECT;
43816 cm_event.status = disconn_status;
43817 cm_event.local_addr = cm_id->local_addr;
43818@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43819 }
43820
43821 if (issue_close) {
43822- atomic_inc(&cm_closes);
43823+ atomic_inc_unchecked(&cm_closes);
43824 nes_disconnect(nesqp, 1);
43825
43826 cm_id->provider_data = nesqp;
43827@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43828
43829 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43830 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43831- atomic_inc(&cm_accepts);
43832+ atomic_inc_unchecked(&cm_accepts);
43833
43834 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43835 netdev_refcnt_read(nesvnic->netdev));
43836@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43837 struct nes_cm_core *cm_core;
43838 u8 *start_buff;
43839
43840- atomic_inc(&cm_rejects);
43841+ atomic_inc_unchecked(&cm_rejects);
43842 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43843 loopback = cm_node->loopbackpartner;
43844 cm_core = cm_node->cm_core;
43845@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43846 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43847 ntohs(laddr->sin_port));
43848
43849- atomic_inc(&cm_connects);
43850+ atomic_inc_unchecked(&cm_connects);
43851 nesqp->active_conn = 1;
43852
43853 /* cache the cm_id in the qp */
43854@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43855 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43856 return err;
43857 }
43858- atomic_inc(&cm_listens_created);
43859+ atomic_inc_unchecked(&cm_listens_created);
43860 }
43861
43862 cm_id->add_ref(cm_id);
43863@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43864
43865 if (nesqp->destroyed)
43866 return;
43867- atomic_inc(&cm_connecteds);
43868+ atomic_inc_unchecked(&cm_connecteds);
43869 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43870 " local port 0x%04X. jiffies = %lu.\n",
43871 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43872@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43873
43874 cm_id->add_ref(cm_id);
43875 ret = cm_id->event_handler(cm_id, &cm_event);
43876- atomic_inc(&cm_closes);
43877+ atomic_inc_unchecked(&cm_closes);
43878 cm_event.event = IW_CM_EVENT_CLOSE;
43879 cm_event.status = 0;
43880 cm_event.provider_data = cm_id->provider_data;
43881@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43882 return;
43883 cm_id = cm_node->cm_id;
43884
43885- atomic_inc(&cm_connect_reqs);
43886+ atomic_inc_unchecked(&cm_connect_reqs);
43887 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43888 cm_node, cm_id, jiffies);
43889
43890@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43891 return;
43892 cm_id = cm_node->cm_id;
43893
43894- atomic_inc(&cm_connect_reqs);
43895+ atomic_inc_unchecked(&cm_connect_reqs);
43896 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43897 cm_node, cm_id, jiffies);
43898
43899diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43900index 4166452..fc952c3 100644
43901--- a/drivers/infiniband/hw/nes/nes_mgt.c
43902+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43903@@ -40,8 +40,8 @@
43904 #include "nes.h"
43905 #include "nes_mgt.h"
43906
43907-atomic_t pau_qps_created;
43908-atomic_t pau_qps_destroyed;
43909+atomic_unchecked_t pau_qps_created;
43910+atomic_unchecked_t pau_qps_destroyed;
43911
43912 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43913 {
43914@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43915 {
43916 struct sk_buff *skb;
43917 unsigned long flags;
43918- atomic_inc(&pau_qps_destroyed);
43919+ atomic_inc_unchecked(&pau_qps_destroyed);
43920
43921 /* Free packets that have not yet been forwarded */
43922 /* Lock is acquired by skb_dequeue when removing the skb */
43923@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43924 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43925 skb_queue_head_init(&nesqp->pau_list);
43926 spin_lock_init(&nesqp->pau_lock);
43927- atomic_inc(&pau_qps_created);
43928+ atomic_inc_unchecked(&pau_qps_created);
43929 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43930 }
43931
43932diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43933index 70acda9..a96de9d 100644
43934--- a/drivers/infiniband/hw/nes/nes_nic.c
43935+++ b/drivers/infiniband/hw/nes/nes_nic.c
43936@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43937 target_stat_values[++index] = mh_detected;
43938 target_stat_values[++index] = mh_pauses_sent;
43939 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43940- target_stat_values[++index] = atomic_read(&cm_connects);
43941- target_stat_values[++index] = atomic_read(&cm_accepts);
43942- target_stat_values[++index] = atomic_read(&cm_disconnects);
43943- target_stat_values[++index] = atomic_read(&cm_connecteds);
43944- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43945- target_stat_values[++index] = atomic_read(&cm_rejects);
43946- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43947- target_stat_values[++index] = atomic_read(&qps_created);
43948- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43949- target_stat_values[++index] = atomic_read(&qps_destroyed);
43950- target_stat_values[++index] = atomic_read(&cm_closes);
43951+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43952+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43953+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43954+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43955+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43956+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43957+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43958+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43959+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43960+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43961+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43962 target_stat_values[++index] = cm_packets_sent;
43963 target_stat_values[++index] = cm_packets_bounced;
43964 target_stat_values[++index] = cm_packets_created;
43965 target_stat_values[++index] = cm_packets_received;
43966 target_stat_values[++index] = cm_packets_dropped;
43967 target_stat_values[++index] = cm_packets_retrans;
43968- target_stat_values[++index] = atomic_read(&cm_listens_created);
43969- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43970+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43971+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43972 target_stat_values[++index] = cm_backlog_drops;
43973- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43974- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43975- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43976- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43977- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43978+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43979+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43980+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43981+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43982+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43983 target_stat_values[++index] = nesadapter->free_4kpbl;
43984 target_stat_values[++index] = nesadapter->free_256pbl;
43985 target_stat_values[++index] = int_mod_timer_init;
43986 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43987 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43988 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43989- target_stat_values[++index] = atomic_read(&pau_qps_created);
43990- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43991+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43992+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43993 }
43994
43995 /**
43996diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43997index c0d0296..3185f57 100644
43998--- a/drivers/infiniband/hw/nes/nes_verbs.c
43999+++ b/drivers/infiniband/hw/nes/nes_verbs.c
44000@@ -46,9 +46,9 @@
44001
44002 #include <rdma/ib_umem.h>
44003
44004-atomic_t mod_qp_timouts;
44005-atomic_t qps_created;
44006-atomic_t sw_qps_destroyed;
44007+atomic_unchecked_t mod_qp_timouts;
44008+atomic_unchecked_t qps_created;
44009+atomic_unchecked_t sw_qps_destroyed;
44010
44011 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
44012
44013@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
44014 if (init_attr->create_flags)
44015 return ERR_PTR(-EINVAL);
44016
44017- atomic_inc(&qps_created);
44018+ atomic_inc_unchecked(&qps_created);
44019 switch (init_attr->qp_type) {
44020 case IB_QPT_RC:
44021 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
44022@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
44023 struct iw_cm_event cm_event;
44024 int ret = 0;
44025
44026- atomic_inc(&sw_qps_destroyed);
44027+ atomic_inc_unchecked(&sw_qps_destroyed);
44028 nesqp->destroyed = 1;
44029
44030 /* Blow away the connection if it exists. */
44031diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
44032index ffd48bf..83cdb56 100644
44033--- a/drivers/infiniband/hw/qib/qib.h
44034+++ b/drivers/infiniband/hw/qib/qib.h
44035@@ -52,6 +52,7 @@
44036 #include <linux/kref.h>
44037 #include <linux/sched.h>
44038 #include <linux/kthread.h>
44039+#include <linux/slab.h>
44040
44041 #include "qib_common.h"
44042 #include "qib_verbs.h"
44043diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44044index cdc7df4..a2fdfdb 100644
44045--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44046+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44047@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
44048 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
44049 }
44050
44051-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
44052+static struct rtnl_link_ops ipoib_link_ops = {
44053 .kind = "ipoib",
44054 .maxtype = IFLA_IPOIB_MAX,
44055 .policy = ipoib_policy,
44056diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
44057index e853a21..56fc5a8 100644
44058--- a/drivers/input/gameport/gameport.c
44059+++ b/drivers/input/gameport/gameport.c
44060@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
44061 */
44062 static void gameport_init_port(struct gameport *gameport)
44063 {
44064- static atomic_t gameport_no = ATOMIC_INIT(-1);
44065+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
44066
44067 __module_get(THIS_MODULE);
44068
44069 mutex_init(&gameport->drv_mutex);
44070 device_initialize(&gameport->dev);
44071 dev_set_name(&gameport->dev, "gameport%lu",
44072- (unsigned long)atomic_inc_return(&gameport_no));
44073+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
44074 gameport->dev.bus = &gameport_bus;
44075 gameport->dev.release = gameport_release_port;
44076 if (gameport->parent)
44077diff --git a/drivers/input/input.c b/drivers/input/input.c
44078index cc357f1..ee42fbc 100644
44079--- a/drivers/input/input.c
44080+++ b/drivers/input/input.c
44081@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
44082 */
44083 struct input_dev *input_allocate_device(void)
44084 {
44085- static atomic_t input_no = ATOMIC_INIT(-1);
44086+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
44087 struct input_dev *dev;
44088
44089 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
44090@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
44091 INIT_LIST_HEAD(&dev->node);
44092
44093 dev_set_name(&dev->dev, "input%lu",
44094- (unsigned long)atomic_inc_return(&input_no));
44095+ (unsigned long)atomic_inc_return_unchecked(&input_no));
44096
44097 __module_get(THIS_MODULE);
44098 }
44099diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
44100index 4a95b22..874c182 100644
44101--- a/drivers/input/joystick/sidewinder.c
44102+++ b/drivers/input/joystick/sidewinder.c
44103@@ -30,6 +30,7 @@
44104 #include <linux/kernel.h>
44105 #include <linux/module.h>
44106 #include <linux/slab.h>
44107+#include <linux/sched.h>
44108 #include <linux/input.h>
44109 #include <linux/gameport.h>
44110 #include <linux/jiffies.h>
44111diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
44112index 3aa2f3f..53c00ea 100644
44113--- a/drivers/input/joystick/xpad.c
44114+++ b/drivers/input/joystick/xpad.c
44115@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
44116
44117 static int xpad_led_probe(struct usb_xpad *xpad)
44118 {
44119- static atomic_t led_seq = ATOMIC_INIT(-1);
44120+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
44121 unsigned long led_no;
44122 struct xpad_led *led;
44123 struct led_classdev *led_cdev;
44124@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
44125 if (!led)
44126 return -ENOMEM;
44127
44128- led_no = atomic_inc_return(&led_seq);
44129+ led_no = atomic_inc_return_unchecked(&led_seq);
44130
44131 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
44132 led->xpad = xpad;
44133diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
44134index ac1fa5f..5f7502c 100644
44135--- a/drivers/input/misc/ims-pcu.c
44136+++ b/drivers/input/misc/ims-pcu.c
44137@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
44138
44139 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44140 {
44141- static atomic_t device_no = ATOMIC_INIT(-1);
44142+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
44143
44144 const struct ims_pcu_device_info *info;
44145 int error;
44146@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44147 }
44148
44149 /* Device appears to be operable, complete initialization */
44150- pcu->device_no = atomic_inc_return(&device_no);
44151+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
44152
44153 /*
44154 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
44155diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
44156index d02e1bd..d719719 100644
44157--- a/drivers/input/mouse/psmouse.h
44158+++ b/drivers/input/mouse/psmouse.h
44159@@ -124,7 +124,7 @@ struct psmouse_attribute {
44160 ssize_t (*set)(struct psmouse *psmouse, void *data,
44161 const char *buf, size_t count);
44162 bool protect;
44163-};
44164+} __do_const;
44165 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
44166
44167 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
44168diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
44169index b604564..3f14ae4 100644
44170--- a/drivers/input/mousedev.c
44171+++ b/drivers/input/mousedev.c
44172@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
44173
44174 spin_unlock_irq(&client->packet_lock);
44175
44176- if (copy_to_user(buffer, data, count))
44177+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
44178 return -EFAULT;
44179
44180 return count;
44181diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
44182index a05a517..323a2fd 100644
44183--- a/drivers/input/serio/serio.c
44184+++ b/drivers/input/serio/serio.c
44185@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
44186 */
44187 static void serio_init_port(struct serio *serio)
44188 {
44189- static atomic_t serio_no = ATOMIC_INIT(-1);
44190+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
44191
44192 __module_get(THIS_MODULE);
44193
44194@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
44195 mutex_init(&serio->drv_mutex);
44196 device_initialize(&serio->dev);
44197 dev_set_name(&serio->dev, "serio%lu",
44198- (unsigned long)atomic_inc_return(&serio_no));
44199+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
44200 serio->dev.bus = &serio_bus;
44201 serio->dev.release = serio_release_port;
44202 serio->dev.groups = serio_device_attr_groups;
44203diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
44204index 71ef5d6..93380a9 100644
44205--- a/drivers/input/serio/serio_raw.c
44206+++ b/drivers/input/serio/serio_raw.c
44207@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
44208
44209 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44210 {
44211- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
44212+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
44213 struct serio_raw *serio_raw;
44214 int err;
44215
44216@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44217 }
44218
44219 snprintf(serio_raw->name, sizeof(serio_raw->name),
44220- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
44221+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
44222 kref_init(&serio_raw->kref);
44223 INIT_LIST_HEAD(&serio_raw->client_list);
44224 init_waitqueue_head(&serio_raw->wait);
44225diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
44226index 92e2243..8fd9092 100644
44227--- a/drivers/input/touchscreen/htcpen.c
44228+++ b/drivers/input/touchscreen/htcpen.c
44229@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
44230 }
44231 };
44232
44233-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
44234+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
44235 {
44236 .ident = "Shift",
44237 .matches = {
44238diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
44239index 48882c1..93e0987 100644
44240--- a/drivers/iommu/amd_iommu.c
44241+++ b/drivers/iommu/amd_iommu.c
44242@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
44243
44244 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
44245 {
44246+ phys_addr_t physaddr;
44247 WARN_ON(address & 0x7ULL);
44248
44249 memset(cmd, 0, sizeof(*cmd));
44250- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
44251- cmd->data[1] = upper_32_bits(__pa(address));
44252+
44253+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
44254+ if (object_starts_on_stack((void *)address)) {
44255+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
44256+ physaddr = __pa((u64)adjbuf);
44257+ } else
44258+#endif
44259+ physaddr = __pa(address);
44260+
44261+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
44262+ cmd->data[1] = upper_32_bits(physaddr);
44263 cmd->data[2] = 1;
44264 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
44265 }
44266diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
44267index bd6252b..0716605 100644
44268--- a/drivers/iommu/arm-smmu.c
44269+++ b/drivers/iommu/arm-smmu.c
44270@@ -331,7 +331,7 @@ enum arm_smmu_domain_stage {
44271
44272 struct arm_smmu_domain {
44273 struct arm_smmu_device *smmu;
44274- struct io_pgtable_ops *pgtbl_ops;
44275+ struct io_pgtable *pgtbl;
44276 spinlock_t pgtbl_lock;
44277 struct arm_smmu_cfg cfg;
44278 enum arm_smmu_domain_stage stage;
44279@@ -807,7 +807,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44280 {
44281 int irq, start, ret = 0;
44282 unsigned long ias, oas;
44283- struct io_pgtable_ops *pgtbl_ops;
44284+ struct io_pgtable *pgtbl;
44285 struct io_pgtable_cfg pgtbl_cfg;
44286 enum io_pgtable_fmt fmt;
44287 struct arm_smmu_domain *smmu_domain = domain->priv;
44288@@ -892,14 +892,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44289 };
44290
44291 smmu_domain->smmu = smmu;
44292- pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);
44293- if (!pgtbl_ops) {
44294+ pgtbl = alloc_io_pgtable(fmt, &pgtbl_cfg, smmu_domain);
44295+ if (!pgtbl) {
44296 ret = -ENOMEM;
44297 goto out_clear_smmu;
44298 }
44299
44300 /* Update our support page sizes to reflect the page table format */
44301- arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44302+ pax_open_kernel();
44303+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44304+ pax_close_kernel();
44305
44306 /* Initialise the context bank with our page table cfg */
44307 arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);
44308@@ -920,7 +922,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44309 mutex_unlock(&smmu_domain->init_mutex);
44310
44311 /* Publish page table ops for map/unmap */
44312- smmu_domain->pgtbl_ops = pgtbl_ops;
44313+ smmu_domain->pgtbl = pgtbl;
44314 return 0;
44315
44316 out_clear_smmu:
44317@@ -953,8 +955,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
44318 free_irq(irq, domain);
44319 }
44320
44321- if (smmu_domain->pgtbl_ops)
44322- free_io_pgtable_ops(smmu_domain->pgtbl_ops);
44323+ free_io_pgtable(smmu_domain->pgtbl);
44324
44325 __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
44326 }
44327@@ -1178,13 +1179,13 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
44328 int ret;
44329 unsigned long flags;
44330 struct arm_smmu_domain *smmu_domain = domain->priv;
44331- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44332+ struct io_pgtable *iop = smmu_domain->pgtbl;
44333
44334- if (!ops)
44335+ if (!iop)
44336 return -ENODEV;
44337
44338 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44339- ret = ops->map(ops, iova, paddr, size, prot);
44340+ ret = iop->ops->map(iop, iova, paddr, size, prot);
44341 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44342 return ret;
44343 }
44344@@ -1195,13 +1196,13 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
44345 size_t ret;
44346 unsigned long flags;
44347 struct arm_smmu_domain *smmu_domain = domain->priv;
44348- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44349+ struct io_pgtable *iop = smmu_domain->pgtbl;
44350
44351- if (!ops)
44352+ if (!iop)
44353 return 0;
44354
44355 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44356- ret = ops->unmap(ops, iova, size);
44357+ ret = iop->ops->unmap(iop, iova, size);
44358 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44359 return ret;
44360 }
44361@@ -1212,7 +1213,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44362 struct arm_smmu_domain *smmu_domain = domain->priv;
44363 struct arm_smmu_device *smmu = smmu_domain->smmu;
44364 struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
44365- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44366+ struct io_pgtable *iop = smmu_domain->pgtbl;
44367 struct device *dev = smmu->dev;
44368 void __iomem *cb_base;
44369 u32 tmp;
44370@@ -1235,7 +1236,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44371 dev_err(dev,
44372 "iova to phys timed out on 0x%pad. Falling back to software table walk.\n",
44373 &iova);
44374- return ops->iova_to_phys(ops, iova);
44375+ return iop->ops->iova_to_phys(iop, iova);
44376 }
44377
44378 phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO);
44379@@ -1256,9 +1257,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44380 phys_addr_t ret;
44381 unsigned long flags;
44382 struct arm_smmu_domain *smmu_domain = domain->priv;
44383- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44384+ struct io_pgtable *iop = smmu_domain->pgtbl;
44385
44386- if (!ops)
44387+ if (!iop)
44388 return 0;
44389
44390 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44391@@ -1266,7 +1267,7 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44392 smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
44393 ret = arm_smmu_iova_to_phys_hard(domain, iova);
44394 } else {
44395- ret = ops->iova_to_phys(ops, iova);
44396+ ret = iop->ops->iova_to_phys(iop, iova);
44397 }
44398
44399 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44400@@ -1625,7 +1626,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
44401 size |= SZ_64K | SZ_512M;
44402 }
44403
44404- arm_smmu_ops.pgsize_bitmap &= size;
44405+ pax_open_kernel();
44406+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap &= size;
44407+ pax_close_kernel();
44408 dev_notice(smmu->dev, "\tSupported page sizes: 0x%08lx\n", size);
44409
44410 if (smmu->features & ARM_SMMU_FEAT_TRANS_S1)
44411diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
44412index b610a8d..08eb879 100644
44413--- a/drivers/iommu/io-pgtable-arm.c
44414+++ b/drivers/iommu/io-pgtable-arm.c
44415@@ -36,12 +36,6 @@
44416 #define io_pgtable_to_data(x) \
44417 container_of((x), struct arm_lpae_io_pgtable, iop)
44418
44419-#define io_pgtable_ops_to_pgtable(x) \
44420- container_of((x), struct io_pgtable, ops)
44421-
44422-#define io_pgtable_ops_to_data(x) \
44423- io_pgtable_to_data(io_pgtable_ops_to_pgtable(x))
44424-
44425 /*
44426 * For consistency with the architecture, we always consider
44427 * ARM_LPAE_MAX_LEVELS levels, with the walk starting at level n >=0
44428@@ -302,10 +296,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
44429 return pte;
44430 }
44431
44432-static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
44433+static int arm_lpae_map(struct io_pgtable *iop, unsigned long iova,
44434 phys_addr_t paddr, size_t size, int iommu_prot)
44435 {
44436- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44437+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44438 arm_lpae_iopte *ptep = data->pgd;
44439 int lvl = ARM_LPAE_START_LVL(data);
44440 arm_lpae_iopte prot;
44441@@ -445,12 +439,11 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
44442 return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
44443 }
44444
44445-static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44446+static int arm_lpae_unmap(struct io_pgtable *iop, unsigned long iova,
44447 size_t size)
44448 {
44449 size_t unmapped;
44450- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44451- struct io_pgtable *iop = &data->iop;
44452+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44453 arm_lpae_iopte *ptep = data->pgd;
44454 int lvl = ARM_LPAE_START_LVL(data);
44455
44456@@ -461,10 +454,10 @@ static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44457 return unmapped;
44458 }
44459
44460-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
44461+static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable *iop,
44462 unsigned long iova)
44463 {
44464- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44465+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44466 arm_lpae_iopte pte, *ptep = data->pgd;
44467 int lvl = ARM_LPAE_START_LVL(data);
44468
44469@@ -531,6 +524,12 @@ static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg)
44470 }
44471 }
44472
44473+static struct io_pgtable_ops arm_lpae_io_pgtable_ops = {
44474+ .map = arm_lpae_map,
44475+ .unmap = arm_lpae_unmap,
44476+ .iova_to_phys = arm_lpae_iova_to_phys,
44477+};
44478+
44479 static struct arm_lpae_io_pgtable *
44480 arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44481 {
44482@@ -562,11 +561,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44483 pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
44484 data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
44485
44486- data->iop.ops = (struct io_pgtable_ops) {
44487- .map = arm_lpae_map,
44488- .unmap = arm_lpae_unmap,
44489- .iova_to_phys = arm_lpae_iova_to_phys,
44490- };
44491+ data->iop.ops = &arm_lpae_io_pgtable_ops;
44492
44493 return data;
44494 }
44495@@ -825,9 +820,9 @@ static struct iommu_gather_ops dummy_tlb_ops __initdata = {
44496 .flush_pgtable = dummy_flush_pgtable,
44497 };
44498
44499-static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44500+static void __init arm_lpae_dump_ops(struct io_pgtable *iop)
44501 {
44502- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44503+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44504 struct io_pgtable_cfg *cfg = &data->iop.cfg;
44505
44506 pr_err("cfg: pgsize_bitmap 0x%lx, ias %u-bit\n",
44507@@ -837,9 +832,9 @@ static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44508 data->bits_per_level, data->pgd);
44509 }
44510
44511-#define __FAIL(ops, i) ({ \
44512+#define __FAIL(iop, i) ({ \
44513 WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \
44514- arm_lpae_dump_ops(ops); \
44515+ arm_lpae_dump_ops(iop); \
44516 selftest_running = false; \
44517 -EFAULT; \
44518 })
44519@@ -854,30 +849,32 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44520 int i, j;
44521 unsigned long iova;
44522 size_t size;
44523- struct io_pgtable_ops *ops;
44524+ struct io_pgtable *iop;
44525+ const struct io_pgtable_ops *ops;
44526
44527 selftest_running = true;
44528
44529 for (i = 0; i < ARRAY_SIZE(fmts); ++i) {
44530 cfg_cookie = cfg;
44531- ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg);
44532- if (!ops) {
44533+ iop = alloc_io_pgtable(fmts[i], cfg, cfg);
44534+ if (!iop) {
44535 pr_err("selftest: failed to allocate io pgtable ops\n");
44536 return -ENOMEM;
44537 }
44538+ ops = iop->ops;
44539
44540 /*
44541 * Initial sanity checks.
44542 * Empty page tables shouldn't provide any translations.
44543 */
44544- if (ops->iova_to_phys(ops, 42))
44545- return __FAIL(ops, i);
44546+ if (ops->iova_to_phys(iop, 42))
44547+ return __FAIL(iop, i);
44548
44549- if (ops->iova_to_phys(ops, SZ_1G + 42))
44550- return __FAIL(ops, i);
44551+ if (ops->iova_to_phys(iop, SZ_1G + 42))
44552+ return __FAIL(iop, i);
44553
44554- if (ops->iova_to_phys(ops, SZ_2G + 42))
44555- return __FAIL(ops, i);
44556+ if (ops->iova_to_phys(iop, SZ_2G + 42))
44557+ return __FAIL(iop, i);
44558
44559 /*
44560 * Distinct mappings of different granule sizes.
44561@@ -887,19 +884,19 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44562 while (j != BITS_PER_LONG) {
44563 size = 1UL << j;
44564
44565- if (ops->map(ops, iova, iova, size, IOMMU_READ |
44566+ if (ops->map(iop, iova, iova, size, IOMMU_READ |
44567 IOMMU_WRITE |
44568 IOMMU_NOEXEC |
44569 IOMMU_CACHE))
44570- return __FAIL(ops, i);
44571+ return __FAIL(iop, i);
44572
44573 /* Overlapping mappings */
44574- if (!ops->map(ops, iova, iova + size, size,
44575+ if (!ops->map(iop, iova, iova + size, size,
44576 IOMMU_READ | IOMMU_NOEXEC))
44577- return __FAIL(ops, i);
44578+ return __FAIL(iop, i);
44579
44580- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44581- return __FAIL(ops, i);
44582+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44583+ return __FAIL(iop, i);
44584
44585 iova += SZ_1G;
44586 j++;
44587@@ -908,15 +905,15 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44588
44589 /* Partial unmap */
44590 size = 1UL << __ffs(cfg->pgsize_bitmap);
44591- if (ops->unmap(ops, SZ_1G + size, size) != size)
44592- return __FAIL(ops, i);
44593+ if (ops->unmap(iop, SZ_1G + size, size) != size)
44594+ return __FAIL(iop, i);
44595
44596 /* Remap of partial unmap */
44597- if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
44598- return __FAIL(ops, i);
44599+ if (ops->map(iop, SZ_1G + size, size, size, IOMMU_READ))
44600+ return __FAIL(iop, i);
44601
44602- if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
44603- return __FAIL(ops, i);
44604+ if (ops->iova_to_phys(iop, SZ_1G + size + 42) != (size + 42))
44605+ return __FAIL(iop, i);
44606
44607 /* Full unmap */
44608 iova = 0;
44609@@ -924,25 +921,25 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44610 while (j != BITS_PER_LONG) {
44611 size = 1UL << j;
44612
44613- if (ops->unmap(ops, iova, size) != size)
44614- return __FAIL(ops, i);
44615+ if (ops->unmap(iop, iova, size) != size)
44616+ return __FAIL(iop, i);
44617
44618- if (ops->iova_to_phys(ops, iova + 42))
44619- return __FAIL(ops, i);
44620+ if (ops->iova_to_phys(iop, iova + 42))
44621+ return __FAIL(iop, i);
44622
44623 /* Remap full block */
44624- if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
44625- return __FAIL(ops, i);
44626+ if (ops->map(iop, iova, iova, size, IOMMU_WRITE))
44627+ return __FAIL(iop, i);
44628
44629- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44630- return __FAIL(ops, i);
44631+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44632+ return __FAIL(iop, i);
44633
44634 iova += SZ_1G;
44635 j++;
44636 j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
44637 }
44638
44639- free_io_pgtable_ops(ops);
44640+ free_io_pgtable(iop);
44641 }
44642
44643 selftest_running = false;
44644diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
44645index 6436fe2..088c965 100644
44646--- a/drivers/iommu/io-pgtable.c
44647+++ b/drivers/iommu/io-pgtable.c
44648@@ -40,7 +40,7 @@ io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =
44649 #endif
44650 };
44651
44652-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44653+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44654 struct io_pgtable_cfg *cfg,
44655 void *cookie)
44656 {
44657@@ -62,21 +62,18 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44658 iop->cookie = cookie;
44659 iop->cfg = *cfg;
44660
44661- return &iop->ops;
44662+ return iop;
44663 }
44664
44665 /*
44666 * It is the IOMMU driver's responsibility to ensure that the page table
44667 * is no longer accessible to the walker by this point.
44668 */
44669-void free_io_pgtable_ops(struct io_pgtable_ops *ops)
44670+void free_io_pgtable(struct io_pgtable *iop)
44671 {
44672- struct io_pgtable *iop;
44673-
44674- if (!ops)
44675+ if (!iop)
44676 return;
44677
44678- iop = container_of(ops, struct io_pgtable, ops);
44679 iop->cfg.tlb->tlb_flush_all(iop->cookie);
44680 io_pgtable_init_table[iop->fmt]->free(iop);
44681 }
44682diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
44683index 10e32f6..0b276c8 100644
44684--- a/drivers/iommu/io-pgtable.h
44685+++ b/drivers/iommu/io-pgtable.h
44686@@ -75,17 +75,18 @@ struct io_pgtable_cfg {
44687 * These functions map directly onto the iommu_ops member functions with
44688 * the same names.
44689 */
44690+struct io_pgtable;
44691 struct io_pgtable_ops {
44692- int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
44693+ int (*map)(struct io_pgtable *iop, unsigned long iova,
44694 phys_addr_t paddr, size_t size, int prot);
44695- int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
44696+ int (*unmap)(struct io_pgtable *iop, unsigned long iova,
44697 size_t size);
44698- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
44699+ phys_addr_t (*iova_to_phys)(struct io_pgtable *iop,
44700 unsigned long iova);
44701 };
44702
44703 /**
44704- * alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
44705+ * alloc_io_pgtable() - Allocate a page table allocator for use by an IOMMU.
44706 *
44707 * @fmt: The page table format.
44708 * @cfg: The page table configuration. This will be modified to represent
44709@@ -94,9 +95,9 @@ struct io_pgtable_ops {
44710 * @cookie: An opaque token provided by the IOMMU driver and passed back to
44711 * the callback routines in cfg->tlb.
44712 */
44713-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44714- struct io_pgtable_cfg *cfg,
44715- void *cookie);
44716+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44717+ struct io_pgtable_cfg *cfg,
44718+ void *cookie);
44719
44720 /**
44721 * free_io_pgtable_ops() - Free an io_pgtable_ops structure. The caller
44722@@ -105,7 +106,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44723 *
44724 * @ops: The ops returned from alloc_io_pgtable_ops.
44725 */
44726-void free_io_pgtable_ops(struct io_pgtable_ops *ops);
44727+void free_io_pgtable(struct io_pgtable *iop);
44728
44729
44730 /*
44731@@ -125,7 +126,7 @@ struct io_pgtable {
44732 enum io_pgtable_fmt fmt;
44733 void *cookie;
44734 struct io_pgtable_cfg cfg;
44735- struct io_pgtable_ops ops;
44736+ const struct io_pgtable_ops *ops;
44737 };
44738
44739 /**
44740diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
44741index 72e683d..c9db262 100644
44742--- a/drivers/iommu/iommu.c
44743+++ b/drivers/iommu/iommu.c
44744@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
44745 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
44746 {
44747 int err;
44748- struct notifier_block *nb;
44749+ notifier_block_no_const *nb;
44750 struct iommu_callback_data cb = {
44751 .ops = ops,
44752 };
44753diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
44754index bc39bdf..e2de272 100644
44755--- a/drivers/iommu/ipmmu-vmsa.c
44756+++ b/drivers/iommu/ipmmu-vmsa.c
44757@@ -41,7 +41,7 @@ struct ipmmu_vmsa_domain {
44758 struct iommu_domain *io_domain;
44759
44760 struct io_pgtable_cfg cfg;
44761- struct io_pgtable_ops *iop;
44762+ struct io_pgtable *iop;
44763
44764 unsigned int context_id;
44765 spinlock_t lock; /* Protects mappings */
44766@@ -323,8 +323,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
44767 domain->cfg.oas = 40;
44768 domain->cfg.tlb = &ipmmu_gather_ops;
44769
44770- domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
44771- domain);
44772+ domain->iop = alloc_io_pgtable(ARM_32_LPAE_S1, &domain->cfg, domain);
44773 if (!domain->iop)
44774 return -EINVAL;
44775
44776@@ -482,7 +481,7 @@ static void ipmmu_domain_destroy(struct iommu_domain *io_domain)
44777 * been detached.
44778 */
44779 ipmmu_domain_destroy_context(domain);
44780- free_io_pgtable_ops(domain->iop);
44781+ free_io_pgtable(domain->iop);
44782 kfree(domain);
44783 }
44784
44785@@ -551,7 +550,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
44786 if (!domain)
44787 return -ENODEV;
44788
44789- return domain->iop->map(domain->iop, iova, paddr, size, prot);
44790+ return domain->iop->ops->map(domain->iop, iova, paddr, size, prot);
44791 }
44792
44793 static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44794@@ -559,7 +558,7 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44795 {
44796 struct ipmmu_vmsa_domain *domain = io_domain->priv;
44797
44798- return domain->iop->unmap(domain->iop, iova, size);
44799+ return domain->iop->ops->unmap(domain->iop, iova, size);
44800 }
44801
44802 static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44803@@ -569,7 +568,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44804
44805 /* TODO: Is locking needed ? */
44806
44807- return domain->iop->iova_to_phys(domain->iop, iova);
44808+ return domain->iop->ops->iova_to_phys(domain->iop, iova);
44809 }
44810
44811 static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
44812diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
44813index 390079e..1da9d6c 100644
44814--- a/drivers/iommu/irq_remapping.c
44815+++ b/drivers/iommu/irq_remapping.c
44816@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
44817 void panic_if_irq_remap(const char *msg)
44818 {
44819 if (irq_remapping_enabled)
44820- panic(msg);
44821+ panic("%s", msg);
44822 }
44823
44824 static void ir_ack_apic_edge(struct irq_data *data)
44825@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
44826
44827 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
44828 {
44829- chip->irq_print_chip = ir_print_prefix;
44830- chip->irq_ack = ir_ack_apic_edge;
44831- chip->irq_eoi = ir_ack_apic_level;
44832- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44833+ pax_open_kernel();
44834+ *(void **)&chip->irq_print_chip = ir_print_prefix;
44835+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
44836+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
44837+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44838+ pax_close_kernel();
44839 }
44840
44841 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
44842diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
44843index 471e1cd..b53b870 100644
44844--- a/drivers/irqchip/irq-gic.c
44845+++ b/drivers/irqchip/irq-gic.c
44846@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
44847 * Supported arch specific GIC irq extension.
44848 * Default make them NULL.
44849 */
44850-struct irq_chip gic_arch_extn = {
44851+irq_chip_no_const gic_arch_extn = {
44852 .irq_eoi = NULL,
44853 .irq_mask = NULL,
44854 .irq_unmask = NULL,
44855@@ -318,7 +318,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
44856 chained_irq_exit(chip, desc);
44857 }
44858
44859-static struct irq_chip gic_chip = {
44860+static irq_chip_no_const gic_chip __read_only = {
44861 .name = "GIC",
44862 .irq_mask = gic_mask_irq,
44863 .irq_unmask = gic_unmask_irq,
44864diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
44865index 9a0767b..5e5f86f 100644
44866--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
44867+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
44868@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
44869 struct intc_irqpin_iomem *i;
44870 struct resource *io[INTC_IRQPIN_REG_NR];
44871 struct resource *irq;
44872- struct irq_chip *irq_chip;
44873+ irq_chip_no_const *irq_chip;
44874 void (*enable_fn)(struct irq_data *d);
44875 void (*disable_fn)(struct irq_data *d);
44876 const char *name = dev_name(dev);
44877diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
44878index 384e6ed..7a771b2 100644
44879--- a/drivers/irqchip/irq-renesas-irqc.c
44880+++ b/drivers/irqchip/irq-renesas-irqc.c
44881@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
44882 struct irqc_priv *p;
44883 struct resource *io;
44884 struct resource *irq;
44885- struct irq_chip *irq_chip;
44886+ irq_chip_no_const *irq_chip;
44887 const char *name = dev_name(&pdev->dev);
44888 int ret;
44889 int k;
44890diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
44891index 6a2df32..dc962f1 100644
44892--- a/drivers/isdn/capi/capi.c
44893+++ b/drivers/isdn/capi/capi.c
44894@@ -81,8 +81,8 @@ struct capiminor {
44895
44896 struct capi20_appl *ap;
44897 u32 ncci;
44898- atomic_t datahandle;
44899- atomic_t msgid;
44900+ atomic_unchecked_t datahandle;
44901+ atomic_unchecked_t msgid;
44902
44903 struct tty_port port;
44904 int ttyinstop;
44905@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
44906 capimsg_setu16(s, 2, mp->ap->applid);
44907 capimsg_setu8 (s, 4, CAPI_DATA_B3);
44908 capimsg_setu8 (s, 5, CAPI_RESP);
44909- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
44910+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
44911 capimsg_setu32(s, 8, mp->ncci);
44912 capimsg_setu16(s, 12, datahandle);
44913 }
44914@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
44915 mp->outbytes -= len;
44916 spin_unlock_bh(&mp->outlock);
44917
44918- datahandle = atomic_inc_return(&mp->datahandle);
44919+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
44920 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
44921 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44922 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44923 capimsg_setu16(skb->data, 2, mp->ap->applid);
44924 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
44925 capimsg_setu8 (skb->data, 5, CAPI_REQ);
44926- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
44927+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
44928 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
44929 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
44930 capimsg_setu16(skb->data, 16, len); /* Data length */
44931diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
44932index aecec6d..11e13c5 100644
44933--- a/drivers/isdn/gigaset/bas-gigaset.c
44934+++ b/drivers/isdn/gigaset/bas-gigaset.c
44935@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
44936
44937
44938 static const struct gigaset_ops gigops = {
44939- gigaset_write_cmd,
44940- gigaset_write_room,
44941- gigaset_chars_in_buffer,
44942- gigaset_brkchars,
44943- gigaset_init_bchannel,
44944- gigaset_close_bchannel,
44945- gigaset_initbcshw,
44946- gigaset_freebcshw,
44947- gigaset_reinitbcshw,
44948- gigaset_initcshw,
44949- gigaset_freecshw,
44950- gigaset_set_modem_ctrl,
44951- gigaset_baud_rate,
44952- gigaset_set_line_ctrl,
44953- gigaset_isoc_send_skb,
44954- gigaset_isoc_input,
44955+ .write_cmd = gigaset_write_cmd,
44956+ .write_room = gigaset_write_room,
44957+ .chars_in_buffer = gigaset_chars_in_buffer,
44958+ .brkchars = gigaset_brkchars,
44959+ .init_bchannel = gigaset_init_bchannel,
44960+ .close_bchannel = gigaset_close_bchannel,
44961+ .initbcshw = gigaset_initbcshw,
44962+ .freebcshw = gigaset_freebcshw,
44963+ .reinitbcshw = gigaset_reinitbcshw,
44964+ .initcshw = gigaset_initcshw,
44965+ .freecshw = gigaset_freecshw,
44966+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44967+ .baud_rate = gigaset_baud_rate,
44968+ .set_line_ctrl = gigaset_set_line_ctrl,
44969+ .send_skb = gigaset_isoc_send_skb,
44970+ .handle_input = gigaset_isoc_input,
44971 };
44972
44973 /* bas_gigaset_init
44974diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
44975index 600c79b..3752bab 100644
44976--- a/drivers/isdn/gigaset/interface.c
44977+++ b/drivers/isdn/gigaset/interface.c
44978@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
44979 }
44980 tty->driver_data = cs;
44981
44982- ++cs->port.count;
44983+ atomic_inc(&cs->port.count);
44984
44985- if (cs->port.count == 1) {
44986+ if (atomic_read(&cs->port.count) == 1) {
44987 tty_port_tty_set(&cs->port, tty);
44988 cs->port.low_latency = 1;
44989 }
44990@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
44991
44992 if (!cs->connected)
44993 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
44994- else if (!cs->port.count)
44995+ else if (!atomic_read(&cs->port.count))
44996 dev_warn(cs->dev, "%s: device not opened\n", __func__);
44997- else if (!--cs->port.count)
44998+ else if (!atomic_dec_return(&cs->port.count))
44999 tty_port_tty_set(&cs->port, NULL);
45000
45001 mutex_unlock(&cs->mutex);
45002diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
45003index 8c91fd5..14f13ce 100644
45004--- a/drivers/isdn/gigaset/ser-gigaset.c
45005+++ b/drivers/isdn/gigaset/ser-gigaset.c
45006@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
45007 }
45008
45009 static const struct gigaset_ops ops = {
45010- gigaset_write_cmd,
45011- gigaset_write_room,
45012- gigaset_chars_in_buffer,
45013- gigaset_brkchars,
45014- gigaset_init_bchannel,
45015- gigaset_close_bchannel,
45016- gigaset_initbcshw,
45017- gigaset_freebcshw,
45018- gigaset_reinitbcshw,
45019- gigaset_initcshw,
45020- gigaset_freecshw,
45021- gigaset_set_modem_ctrl,
45022- gigaset_baud_rate,
45023- gigaset_set_line_ctrl,
45024- gigaset_m10x_send_skb, /* asyncdata.c */
45025- gigaset_m10x_input, /* asyncdata.c */
45026+ .write_cmd = gigaset_write_cmd,
45027+ .write_room = gigaset_write_room,
45028+ .chars_in_buffer = gigaset_chars_in_buffer,
45029+ .brkchars = gigaset_brkchars,
45030+ .init_bchannel = gigaset_init_bchannel,
45031+ .close_bchannel = gigaset_close_bchannel,
45032+ .initbcshw = gigaset_initbcshw,
45033+ .freebcshw = gigaset_freebcshw,
45034+ .reinitbcshw = gigaset_reinitbcshw,
45035+ .initcshw = gigaset_initcshw,
45036+ .freecshw = gigaset_freecshw,
45037+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45038+ .baud_rate = gigaset_baud_rate,
45039+ .set_line_ctrl = gigaset_set_line_ctrl,
45040+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
45041+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
45042 };
45043
45044
45045diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
45046index 5f306e2..5342f88 100644
45047--- a/drivers/isdn/gigaset/usb-gigaset.c
45048+++ b/drivers/isdn/gigaset/usb-gigaset.c
45049@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
45050 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
45051 memcpy(cs->hw.usb->bchars, buf, 6);
45052 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
45053- 0, 0, &buf, 6, 2000);
45054+ 0, 0, buf, 6, 2000);
45055 }
45056
45057 static void gigaset_freebcshw(struct bc_state *bcs)
45058@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
45059 }
45060
45061 static const struct gigaset_ops ops = {
45062- gigaset_write_cmd,
45063- gigaset_write_room,
45064- gigaset_chars_in_buffer,
45065- gigaset_brkchars,
45066- gigaset_init_bchannel,
45067- gigaset_close_bchannel,
45068- gigaset_initbcshw,
45069- gigaset_freebcshw,
45070- gigaset_reinitbcshw,
45071- gigaset_initcshw,
45072- gigaset_freecshw,
45073- gigaset_set_modem_ctrl,
45074- gigaset_baud_rate,
45075- gigaset_set_line_ctrl,
45076- gigaset_m10x_send_skb,
45077- gigaset_m10x_input,
45078+ .write_cmd = gigaset_write_cmd,
45079+ .write_room = gigaset_write_room,
45080+ .chars_in_buffer = gigaset_chars_in_buffer,
45081+ .brkchars = gigaset_brkchars,
45082+ .init_bchannel = gigaset_init_bchannel,
45083+ .close_bchannel = gigaset_close_bchannel,
45084+ .initbcshw = gigaset_initbcshw,
45085+ .freebcshw = gigaset_freebcshw,
45086+ .reinitbcshw = gigaset_reinitbcshw,
45087+ .initcshw = gigaset_initcshw,
45088+ .freecshw = gigaset_freecshw,
45089+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45090+ .baud_rate = gigaset_baud_rate,
45091+ .set_line_ctrl = gigaset_set_line_ctrl,
45092+ .send_skb = gigaset_m10x_send_skb,
45093+ .handle_input = gigaset_m10x_input,
45094 };
45095
45096 /*
45097diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
45098index 4d9b195..455075c 100644
45099--- a/drivers/isdn/hardware/avm/b1.c
45100+++ b/drivers/isdn/hardware/avm/b1.c
45101@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
45102 }
45103 if (left) {
45104 if (t4file->user) {
45105- if (copy_from_user(buf, dp, left))
45106+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45107 return -EFAULT;
45108 } else {
45109 memcpy(buf, dp, left);
45110@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
45111 }
45112 if (left) {
45113 if (config->user) {
45114- if (copy_from_user(buf, dp, left))
45115+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45116 return -EFAULT;
45117 } else {
45118 memcpy(buf, dp, left);
45119diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
45120index 9b856e1..fa03c92 100644
45121--- a/drivers/isdn/i4l/isdn_common.c
45122+++ b/drivers/isdn/i4l/isdn_common.c
45123@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
45124 } else
45125 return -EINVAL;
45126 case IIOCDBGVAR:
45127+ if (!capable(CAP_SYS_RAWIO))
45128+ return -EPERM;
45129 if (arg) {
45130 if (copy_to_user(argp, &dev, sizeof(ulong)))
45131 return -EFAULT;
45132diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
45133index 91d5730..336523e 100644
45134--- a/drivers/isdn/i4l/isdn_concap.c
45135+++ b/drivers/isdn/i4l/isdn_concap.c
45136@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
45137 }
45138
45139 struct concap_device_ops isdn_concap_reliable_dl_dops = {
45140- &isdn_concap_dl_data_req,
45141- &isdn_concap_dl_connect_req,
45142- &isdn_concap_dl_disconn_req
45143+ .data_req = &isdn_concap_dl_data_req,
45144+ .connect_req = &isdn_concap_dl_connect_req,
45145+ .disconn_req = &isdn_concap_dl_disconn_req
45146 };
45147
45148 /* The following should better go into a dedicated source file such that
45149diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
45150index bc91261..2ef7e36 100644
45151--- a/drivers/isdn/i4l/isdn_tty.c
45152+++ b/drivers/isdn/i4l/isdn_tty.c
45153@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
45154
45155 #ifdef ISDN_DEBUG_MODEM_OPEN
45156 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
45157- port->count);
45158+ atomic_read(&port->count));
45159 #endif
45160- port->count++;
45161+ atomic_inc(&port->count);
45162 port->tty = tty;
45163 /*
45164 * Start up serial port
45165@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45166 #endif
45167 return;
45168 }
45169- if ((tty->count == 1) && (port->count != 1)) {
45170+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
45171 /*
45172 * Uh, oh. tty->count is 1, which means that the tty
45173 * structure will be freed. Info->count should always
45174@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45175 * serial port won't be shutdown.
45176 */
45177 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
45178- "info->count is %d\n", port->count);
45179- port->count = 1;
45180+ "info->count is %d\n", atomic_read(&port->count));
45181+ atomic_set(&port->count, 1);
45182 }
45183- if (--port->count < 0) {
45184+ if (atomic_dec_return(&port->count) < 0) {
45185 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
45186- info->line, port->count);
45187- port->count = 0;
45188+ info->line, atomic_read(&port->count));
45189+ atomic_set(&port->count, 0);
45190 }
45191- if (port->count) {
45192+ if (atomic_read(&port->count)) {
45193 #ifdef ISDN_DEBUG_MODEM_OPEN
45194 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
45195 #endif
45196@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
45197 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
45198 return;
45199 isdn_tty_shutdown(info);
45200- port->count = 0;
45201+ atomic_set(&port->count, 0);
45202 port->flags &= ~ASYNC_NORMAL_ACTIVE;
45203 port->tty = NULL;
45204 wake_up_interruptible(&port->open_wait);
45205@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
45206 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
45207 modem_info *info = &dev->mdm.info[i];
45208
45209- if (info->port.count == 0)
45210+ if (atomic_read(&info->port.count) == 0)
45211 continue;
45212 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
45213 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
45214diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
45215index e2d4e58..40cd045 100644
45216--- a/drivers/isdn/i4l/isdn_x25iface.c
45217+++ b/drivers/isdn/i4l/isdn_x25iface.c
45218@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
45219
45220
45221 static struct concap_proto_ops ix25_pops = {
45222- &isdn_x25iface_proto_new,
45223- &isdn_x25iface_proto_del,
45224- &isdn_x25iface_proto_restart,
45225- &isdn_x25iface_proto_close,
45226- &isdn_x25iface_xmit,
45227- &isdn_x25iface_receive,
45228- &isdn_x25iface_connect_ind,
45229- &isdn_x25iface_disconn_ind
45230+ .proto_new = &isdn_x25iface_proto_new,
45231+ .proto_del = &isdn_x25iface_proto_del,
45232+ .restart = &isdn_x25iface_proto_restart,
45233+ .close = &isdn_x25iface_proto_close,
45234+ .encap_and_xmit = &isdn_x25iface_xmit,
45235+ .data_ind = &isdn_x25iface_receive,
45236+ .connect_ind = &isdn_x25iface_connect_ind,
45237+ .disconn_ind = &isdn_x25iface_disconn_ind
45238 };
45239
45240 /* error message helper function */
45241diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
45242index 358a574..b4987ea 100644
45243--- a/drivers/isdn/icn/icn.c
45244+++ b/drivers/isdn/icn/icn.c
45245@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
45246 if (count > len)
45247 count = len;
45248 if (user) {
45249- if (copy_from_user(msg, buf, count))
45250+ if (count > sizeof msg || copy_from_user(msg, buf, count))
45251 return -EFAULT;
45252 } else
45253 memcpy(msg, buf, count);
45254diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
45255index 87f7dff..7300125 100644
45256--- a/drivers/isdn/mISDN/dsp_cmx.c
45257+++ b/drivers/isdn/mISDN/dsp_cmx.c
45258@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
45259 static u16 dsp_count; /* last sample count */
45260 static int dsp_count_valid; /* if we have last sample count */
45261
45262-void
45263+void __intentional_overflow(-1)
45264 dsp_cmx_send(void *arg)
45265 {
45266 struct dsp_conf *conf;
45267diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
45268index 312ffd3..9263d05 100644
45269--- a/drivers/lguest/core.c
45270+++ b/drivers/lguest/core.c
45271@@ -96,9 +96,17 @@ static __init int map_switcher(void)
45272 * The end address needs +1 because __get_vm_area allocates an
45273 * extra guard page, so we need space for that.
45274 */
45275+
45276+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
45277+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45278+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
45279+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45280+#else
45281 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45282 VM_ALLOC, switcher_addr, switcher_addr
45283 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45284+#endif
45285+
45286 if (!switcher_vma) {
45287 err = -ENOMEM;
45288 printk("lguest: could not map switcher pages high\n");
45289@@ -121,7 +129,7 @@ static __init int map_switcher(void)
45290 * Now the Switcher is mapped at the right address, we can't fail!
45291 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
45292 */
45293- memcpy(switcher_vma->addr, start_switcher_text,
45294+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
45295 end_switcher_text - start_switcher_text);
45296
45297 printk(KERN_INFO "lguest: mapped switcher at %p\n",
45298diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
45299index e3abebc9..6a35328 100644
45300--- a/drivers/lguest/page_tables.c
45301+++ b/drivers/lguest/page_tables.c
45302@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
45303 /*:*/
45304
45305 #ifdef CONFIG_X86_PAE
45306-static void release_pmd(pmd_t *spmd)
45307+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
45308 {
45309 /* If the entry's not present, there's nothing to release. */
45310 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
45311diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
45312index 30f2aef..391c748 100644
45313--- a/drivers/lguest/x86/core.c
45314+++ b/drivers/lguest/x86/core.c
45315@@ -60,7 +60,7 @@ static struct {
45316 /* Offset from where switcher.S was compiled to where we've copied it */
45317 static unsigned long switcher_offset(void)
45318 {
45319- return switcher_addr - (unsigned long)start_switcher_text;
45320+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
45321 }
45322
45323 /* This cpu's struct lguest_pages (after the Switcher text page) */
45324@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
45325 * These copies are pretty cheap, so we do them unconditionally: */
45326 /* Save the current Host top-level page directory.
45327 */
45328+
45329+#ifdef CONFIG_PAX_PER_CPU_PGD
45330+ pages->state.host_cr3 = read_cr3();
45331+#else
45332 pages->state.host_cr3 = __pa(current->mm->pgd);
45333+#endif
45334+
45335 /*
45336 * Set up the Guest's page tables to see this CPU's pages (and no
45337 * other CPU's pages).
45338@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
45339 * compiled-in switcher code and the high-mapped copy we just made.
45340 */
45341 for (i = 0; i < IDT_ENTRIES; i++)
45342- default_idt_entries[i] += switcher_offset();
45343+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
45344
45345 /*
45346 * Set up the Switcher's per-cpu areas.
45347@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
45348 * it will be undisturbed when we switch. To change %cs and jump we
45349 * need this structure to feed to Intel's "lcall" instruction.
45350 */
45351- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
45352+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
45353 lguest_entry.segment = LGUEST_CS;
45354
45355 /*
45356diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
45357index 40634b0..4f5855e 100644
45358--- a/drivers/lguest/x86/switcher_32.S
45359+++ b/drivers/lguest/x86/switcher_32.S
45360@@ -87,6 +87,7 @@
45361 #include <asm/page.h>
45362 #include <asm/segment.h>
45363 #include <asm/lguest.h>
45364+#include <asm/processor-flags.h>
45365
45366 // We mark the start of the code to copy
45367 // It's placed in .text tho it's never run here
45368@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
45369 // Changes type when we load it: damn Intel!
45370 // For after we switch over our page tables
45371 // That entry will be read-only: we'd crash.
45372+
45373+#ifdef CONFIG_PAX_KERNEXEC
45374+ mov %cr0, %edx
45375+ xor $X86_CR0_WP, %edx
45376+ mov %edx, %cr0
45377+#endif
45378+
45379 movl $(GDT_ENTRY_TSS*8), %edx
45380 ltr %dx
45381
45382@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
45383 // Let's clear it again for our return.
45384 // The GDT descriptor of the Host
45385 // Points to the table after two "size" bytes
45386- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
45387+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
45388 // Clear "used" from type field (byte 5, bit 2)
45389- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
45390+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
45391+
45392+#ifdef CONFIG_PAX_KERNEXEC
45393+ mov %cr0, %eax
45394+ xor $X86_CR0_WP, %eax
45395+ mov %eax, %cr0
45396+#endif
45397
45398 // Once our page table's switched, the Guest is live!
45399 // The Host fades as we run this final step.
45400@@ -295,13 +309,12 @@ deliver_to_host:
45401 // I consulted gcc, and it gave
45402 // These instructions, which I gladly credit:
45403 leal (%edx,%ebx,8), %eax
45404- movzwl (%eax),%edx
45405- movl 4(%eax), %eax
45406- xorw %ax, %ax
45407- orl %eax, %edx
45408+ movl 4(%eax), %edx
45409+ movw (%eax), %dx
45410 // Now the address of the handler's in %edx
45411 // We call it now: its "iret" drops us home.
45412- jmp *%edx
45413+ ljmp $__KERNEL_CS, $1f
45414+1: jmp *%edx
45415
45416 // Every interrupt can come to us here
45417 // But we must truly tell each apart.
45418diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
45419index a08e3ee..df8ade2 100644
45420--- a/drivers/md/bcache/closure.h
45421+++ b/drivers/md/bcache/closure.h
45422@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
45423 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
45424 struct workqueue_struct *wq)
45425 {
45426- BUG_ON(object_is_on_stack(cl));
45427+ BUG_ON(object_starts_on_stack(cl));
45428 closure_set_ip(cl);
45429 cl->fn = fn;
45430 cl->wq = wq;
45431diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
45432index 3a57679..c58cdaf 100644
45433--- a/drivers/md/bitmap.c
45434+++ b/drivers/md/bitmap.c
45435@@ -1786,7 +1786,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
45436 chunk_kb ? "KB" : "B");
45437 if (bitmap->storage.file) {
45438 seq_printf(seq, ", file: ");
45439- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
45440+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
45441 }
45442
45443 seq_printf(seq, "\n");
45444diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
45445index c8a18e4..0ab43e5 100644
45446--- a/drivers/md/dm-ioctl.c
45447+++ b/drivers/md/dm-ioctl.c
45448@@ -1772,7 +1772,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
45449 cmd == DM_LIST_VERSIONS_CMD)
45450 return 0;
45451
45452- if ((cmd == DM_DEV_CREATE_CMD)) {
45453+ if (cmd == DM_DEV_CREATE_CMD) {
45454 if (!*param->name) {
45455 DMWARN("name not supplied when creating device");
45456 return -EINVAL;
45457diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
45458index 089d627..ef7352e 100644
45459--- a/drivers/md/dm-raid1.c
45460+++ b/drivers/md/dm-raid1.c
45461@@ -40,7 +40,7 @@ enum dm_raid1_error {
45462
45463 struct mirror {
45464 struct mirror_set *ms;
45465- atomic_t error_count;
45466+ atomic_unchecked_t error_count;
45467 unsigned long error_type;
45468 struct dm_dev *dev;
45469 sector_t offset;
45470@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
45471 struct mirror *m;
45472
45473 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
45474- if (!atomic_read(&m->error_count))
45475+ if (!atomic_read_unchecked(&m->error_count))
45476 return m;
45477
45478 return NULL;
45479@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
45480 * simple way to tell if a device has encountered
45481 * errors.
45482 */
45483- atomic_inc(&m->error_count);
45484+ atomic_inc_unchecked(&m->error_count);
45485
45486 if (test_and_set_bit(error_type, &m->error_type))
45487 return;
45488@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
45489 struct mirror *m = get_default_mirror(ms);
45490
45491 do {
45492- if (likely(!atomic_read(&m->error_count)))
45493+ if (likely(!atomic_read_unchecked(&m->error_count)))
45494 return m;
45495
45496 if (m-- == ms->mirror)
45497@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
45498 {
45499 struct mirror *default_mirror = get_default_mirror(m->ms);
45500
45501- return !atomic_read(&default_mirror->error_count);
45502+ return !atomic_read_unchecked(&default_mirror->error_count);
45503 }
45504
45505 static int mirror_available(struct mirror_set *ms, struct bio *bio)
45506@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
45507 */
45508 if (likely(region_in_sync(ms, region, 1)))
45509 m = choose_mirror(ms, bio->bi_iter.bi_sector);
45510- else if (m && atomic_read(&m->error_count))
45511+ else if (m && atomic_read_unchecked(&m->error_count))
45512 m = NULL;
45513
45514 if (likely(m))
45515@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
45516 }
45517
45518 ms->mirror[mirror].ms = ms;
45519- atomic_set(&(ms->mirror[mirror].error_count), 0);
45520+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
45521 ms->mirror[mirror].error_type = 0;
45522 ms->mirror[mirror].offset = offset;
45523
45524@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
45525 */
45526 static char device_status_char(struct mirror *m)
45527 {
45528- if (!atomic_read(&(m->error_count)))
45529+ if (!atomic_read_unchecked(&(m->error_count)))
45530 return 'A';
45531
45532 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
45533diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
45534index f478a4c..4b8e5ef 100644
45535--- a/drivers/md/dm-stats.c
45536+++ b/drivers/md/dm-stats.c
45537@@ -382,7 +382,7 @@ do_sync_free:
45538 synchronize_rcu_expedited();
45539 dm_stat_free(&s->rcu_head);
45540 } else {
45541- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
45542+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
45543 call_rcu(&s->rcu_head, dm_stat_free);
45544 }
45545 return 0;
45546@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
45547 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
45548 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
45549 ));
45550- ACCESS_ONCE(last->last_sector) = end_sector;
45551- ACCESS_ONCE(last->last_rw) = bi_rw;
45552+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
45553+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
45554 }
45555
45556 rcu_read_lock();
45557diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
45558index f8b37d4..5c5cafd 100644
45559--- a/drivers/md/dm-stripe.c
45560+++ b/drivers/md/dm-stripe.c
45561@@ -21,7 +21,7 @@ struct stripe {
45562 struct dm_dev *dev;
45563 sector_t physical_start;
45564
45565- atomic_t error_count;
45566+ atomic_unchecked_t error_count;
45567 };
45568
45569 struct stripe_c {
45570@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
45571 kfree(sc);
45572 return r;
45573 }
45574- atomic_set(&(sc->stripe[i].error_count), 0);
45575+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
45576 }
45577
45578 ti->private = sc;
45579@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
45580 DMEMIT("%d ", sc->stripes);
45581 for (i = 0; i < sc->stripes; i++) {
45582 DMEMIT("%s ", sc->stripe[i].dev->name);
45583- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
45584+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
45585 'D' : 'A';
45586 }
45587 buffer[i] = '\0';
45588@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
45589 */
45590 for (i = 0; i < sc->stripes; i++)
45591 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
45592- atomic_inc(&(sc->stripe[i].error_count));
45593- if (atomic_read(&(sc->stripe[i].error_count)) <
45594+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
45595+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
45596 DM_IO_ERROR_THRESHOLD)
45597 schedule_work(&sc->trigger_event);
45598 }
45599diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
45600index 757f1ba..bf9ec8f 100644
45601--- a/drivers/md/dm-table.c
45602+++ b/drivers/md/dm-table.c
45603@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
45604 if (!dev_size)
45605 return 0;
45606
45607- if ((start >= dev_size) || (start + len > dev_size)) {
45608+ if ((start >= dev_size) || (len > dev_size - start)) {
45609 DMWARN("%s: %s too small for target: "
45610 "start=%llu, len=%llu, dev_size=%llu",
45611 dm_device_name(ti->table->md), bdevname(bdev, b),
45612diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
45613index 79f6941..b33b4e0 100644
45614--- a/drivers/md/dm-thin-metadata.c
45615+++ b/drivers/md/dm-thin-metadata.c
45616@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45617 {
45618 pmd->info.tm = pmd->tm;
45619 pmd->info.levels = 2;
45620- pmd->info.value_type.context = pmd->data_sm;
45621+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45622 pmd->info.value_type.size = sizeof(__le64);
45623 pmd->info.value_type.inc = data_block_inc;
45624 pmd->info.value_type.dec = data_block_dec;
45625@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45626
45627 pmd->bl_info.tm = pmd->tm;
45628 pmd->bl_info.levels = 1;
45629- pmd->bl_info.value_type.context = pmd->data_sm;
45630+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45631 pmd->bl_info.value_type.size = sizeof(__le64);
45632 pmd->bl_info.value_type.inc = data_block_inc;
45633 pmd->bl_info.value_type.dec = data_block_dec;
45634diff --git a/drivers/md/dm.c b/drivers/md/dm.c
45635index beda011..de57372 100644
45636--- a/drivers/md/dm.c
45637+++ b/drivers/md/dm.c
45638@@ -188,9 +188,9 @@ struct mapped_device {
45639 /*
45640 * Event handling.
45641 */
45642- atomic_t event_nr;
45643+ atomic_unchecked_t event_nr;
45644 wait_queue_head_t eventq;
45645- atomic_t uevent_seq;
45646+ atomic_unchecked_t uevent_seq;
45647 struct list_head uevent_list;
45648 spinlock_t uevent_lock; /* Protect access to uevent_list */
45649
45650@@ -2170,8 +2170,8 @@ static struct mapped_device *alloc_dev(int minor)
45651 spin_lock_init(&md->deferred_lock);
45652 atomic_set(&md->holders, 1);
45653 atomic_set(&md->open_count, 0);
45654- atomic_set(&md->event_nr, 0);
45655- atomic_set(&md->uevent_seq, 0);
45656+ atomic_set_unchecked(&md->event_nr, 0);
45657+ atomic_set_unchecked(&md->uevent_seq, 0);
45658 INIT_LIST_HEAD(&md->uevent_list);
45659 INIT_LIST_HEAD(&md->table_devices);
45660 spin_lock_init(&md->uevent_lock);
45661@@ -2336,7 +2336,7 @@ static void event_callback(void *context)
45662
45663 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
45664
45665- atomic_inc(&md->event_nr);
45666+ atomic_inc_unchecked(&md->event_nr);
45667 wake_up(&md->eventq);
45668 }
45669
45670@@ -3182,18 +3182,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
45671
45672 uint32_t dm_next_uevent_seq(struct mapped_device *md)
45673 {
45674- return atomic_add_return(1, &md->uevent_seq);
45675+ return atomic_add_return_unchecked(1, &md->uevent_seq);
45676 }
45677
45678 uint32_t dm_get_event_nr(struct mapped_device *md)
45679 {
45680- return atomic_read(&md->event_nr);
45681+ return atomic_read_unchecked(&md->event_nr);
45682 }
45683
45684 int dm_wait_event(struct mapped_device *md, int event_nr)
45685 {
45686 return wait_event_interruptible(md->eventq,
45687- (event_nr != atomic_read(&md->event_nr)));
45688+ (event_nr != atomic_read_unchecked(&md->event_nr)));
45689 }
45690
45691 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
45692diff --git a/drivers/md/md.c b/drivers/md/md.c
45693index b7bf8ee..ee17152 100644
45694--- a/drivers/md/md.c
45695+++ b/drivers/md/md.c
45696@@ -191,10 +191,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
45697 * start build, activate spare
45698 */
45699 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
45700-static atomic_t md_event_count;
45701+static atomic_unchecked_t md_event_count;
45702 void md_new_event(struct mddev *mddev)
45703 {
45704- atomic_inc(&md_event_count);
45705+ atomic_inc_unchecked(&md_event_count);
45706 wake_up(&md_event_waiters);
45707 }
45708 EXPORT_SYMBOL_GPL(md_new_event);
45709@@ -204,7 +204,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
45710 */
45711 static void md_new_event_inintr(struct mddev *mddev)
45712 {
45713- atomic_inc(&md_event_count);
45714+ atomic_inc_unchecked(&md_event_count);
45715 wake_up(&md_event_waiters);
45716 }
45717
45718@@ -1442,7 +1442,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
45719 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
45720 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
45721 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
45722- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45723+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45724
45725 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
45726 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
45727@@ -1693,7 +1693,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
45728 else
45729 sb->resync_offset = cpu_to_le64(0);
45730
45731- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
45732+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
45733
45734 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
45735 sb->size = cpu_to_le64(mddev->dev_sectors);
45736@@ -2564,7 +2564,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
45737 static ssize_t
45738 errors_show(struct md_rdev *rdev, char *page)
45739 {
45740- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
45741+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
45742 }
45743
45744 static ssize_t
45745@@ -2573,7 +2573,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
45746 char *e;
45747 unsigned long n = simple_strtoul(buf, &e, 10);
45748 if (*buf && (*e == 0 || *e == '\n')) {
45749- atomic_set(&rdev->corrected_errors, n);
45750+ atomic_set_unchecked(&rdev->corrected_errors, n);
45751 return len;
45752 }
45753 return -EINVAL;
45754@@ -3009,8 +3009,8 @@ int md_rdev_init(struct md_rdev *rdev)
45755 rdev->sb_loaded = 0;
45756 rdev->bb_page = NULL;
45757 atomic_set(&rdev->nr_pending, 0);
45758- atomic_set(&rdev->read_errors, 0);
45759- atomic_set(&rdev->corrected_errors, 0);
45760+ atomic_set_unchecked(&rdev->read_errors, 0);
45761+ atomic_set_unchecked(&rdev->corrected_errors, 0);
45762
45763 INIT_LIST_HEAD(&rdev->same_set);
45764 init_waitqueue_head(&rdev->blocked_wait);
45765@@ -7086,7 +7086,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
45766
45767 spin_unlock(&pers_lock);
45768 seq_printf(seq, "\n");
45769- seq->poll_event = atomic_read(&md_event_count);
45770+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45771 return 0;
45772 }
45773 if (v == (void*)2) {
45774@@ -7189,7 +7189,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
45775 return error;
45776
45777 seq = file->private_data;
45778- seq->poll_event = atomic_read(&md_event_count);
45779+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45780 return error;
45781 }
45782
45783@@ -7206,7 +7206,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
45784 /* always allow read */
45785 mask = POLLIN | POLLRDNORM;
45786
45787- if (seq->poll_event != atomic_read(&md_event_count))
45788+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
45789 mask |= POLLERR | POLLPRI;
45790 return mask;
45791 }
45792@@ -7253,7 +7253,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
45793 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
45794 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
45795 (int)part_stat_read(&disk->part0, sectors[1]) -
45796- atomic_read(&disk->sync_io);
45797+ atomic_read_unchecked(&disk->sync_io);
45798 /* sync IO will cause sync_io to increase before the disk_stats
45799 * as sync_io is counted when a request starts, and
45800 * disk_stats is counted when it completes.
45801diff --git a/drivers/md/md.h b/drivers/md/md.h
45802index 318ca8f..31e4478 100644
45803--- a/drivers/md/md.h
45804+++ b/drivers/md/md.h
45805@@ -94,13 +94,13 @@ struct md_rdev {
45806 * only maintained for arrays that
45807 * support hot removal
45808 */
45809- atomic_t read_errors; /* number of consecutive read errors that
45810+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
45811 * we have tried to ignore.
45812 */
45813 struct timespec last_read_error; /* monotonic time since our
45814 * last read error
45815 */
45816- atomic_t corrected_errors; /* number of corrected read errors,
45817+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
45818 * for reporting to userspace and storing
45819 * in superblock.
45820 */
45821@@ -476,7 +476,7 @@ extern void mddev_unlock(struct mddev *mddev);
45822
45823 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
45824 {
45825- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45826+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45827 }
45828
45829 struct md_personality
45830diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
45831index e8a9042..35bd145 100644
45832--- a/drivers/md/persistent-data/dm-space-map-metadata.c
45833+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
45834@@ -683,7 +683,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
45835 * Flick into a mode where all blocks get allocated in the new area.
45836 */
45837 smm->begin = old_len;
45838- memcpy(sm, &bootstrap_ops, sizeof(*sm));
45839+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
45840
45841 /*
45842 * Extend.
45843@@ -714,7 +714,7 @@ out:
45844 /*
45845 * Switch back to normal behaviour.
45846 */
45847- memcpy(sm, &ops, sizeof(*sm));
45848+ memcpy((void *)sm, &ops, sizeof(*sm));
45849 return r;
45850 }
45851
45852diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
45853index 3e6d115..ffecdeb 100644
45854--- a/drivers/md/persistent-data/dm-space-map.h
45855+++ b/drivers/md/persistent-data/dm-space-map.h
45856@@ -71,6 +71,7 @@ struct dm_space_map {
45857 dm_sm_threshold_fn fn,
45858 void *context);
45859 };
45860+typedef struct dm_space_map __no_const dm_space_map_no_const;
45861
45862 /*----------------------------------------------------------------*/
45863
45864diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
45865index d34e238..34f8d98 100644
45866--- a/drivers/md/raid1.c
45867+++ b/drivers/md/raid1.c
45868@@ -1922,7 +1922,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
45869 if (r1_sync_page_io(rdev, sect, s,
45870 bio->bi_io_vec[idx].bv_page,
45871 READ) != 0)
45872- atomic_add(s, &rdev->corrected_errors);
45873+ atomic_add_unchecked(s, &rdev->corrected_errors);
45874 }
45875 sectors -= s;
45876 sect += s;
45877@@ -2155,7 +2155,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
45878 !test_bit(Faulty, &rdev->flags)) {
45879 if (r1_sync_page_io(rdev, sect, s,
45880 conf->tmppage, READ)) {
45881- atomic_add(s, &rdev->corrected_errors);
45882+ atomic_add_unchecked(s, &rdev->corrected_errors);
45883 printk(KERN_INFO
45884 "md/raid1:%s: read error corrected "
45885 "(%d sectors at %llu on %s)\n",
45886diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
45887index a7196c4..439f012 100644
45888--- a/drivers/md/raid10.c
45889+++ b/drivers/md/raid10.c
45890@@ -1934,7 +1934,7 @@ static void end_sync_read(struct bio *bio, int error)
45891 /* The write handler will notice the lack of
45892 * R10BIO_Uptodate and record any errors etc
45893 */
45894- atomic_add(r10_bio->sectors,
45895+ atomic_add_unchecked(r10_bio->sectors,
45896 &conf->mirrors[d].rdev->corrected_errors);
45897
45898 /* for reconstruct, we always reschedule after a read.
45899@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45900 {
45901 struct timespec cur_time_mon;
45902 unsigned long hours_since_last;
45903- unsigned int read_errors = atomic_read(&rdev->read_errors);
45904+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
45905
45906 ktime_get_ts(&cur_time_mon);
45907
45908@@ -2313,9 +2313,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45909 * overflowing the shift of read_errors by hours_since_last.
45910 */
45911 if (hours_since_last >= 8 * sizeof(read_errors))
45912- atomic_set(&rdev->read_errors, 0);
45913+ atomic_set_unchecked(&rdev->read_errors, 0);
45914 else
45915- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
45916+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
45917 }
45918
45919 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
45920@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45921 return;
45922
45923 check_decay_read_errors(mddev, rdev);
45924- atomic_inc(&rdev->read_errors);
45925- if (atomic_read(&rdev->read_errors) > max_read_errors) {
45926+ atomic_inc_unchecked(&rdev->read_errors);
45927+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
45928 char b[BDEVNAME_SIZE];
45929 bdevname(rdev->bdev, b);
45930
45931@@ -2378,7 +2378,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45932 "md/raid10:%s: %s: Raid device exceeded "
45933 "read_error threshold [cur %d:max %d]\n",
45934 mdname(mddev), b,
45935- atomic_read(&rdev->read_errors), max_read_errors);
45936+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
45937 printk(KERN_NOTICE
45938 "md/raid10:%s: %s: Failing raid device\n",
45939 mdname(mddev), b);
45940@@ -2533,7 +2533,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45941 sect +
45942 choose_data_offset(r10_bio, rdev)),
45943 bdevname(rdev->bdev, b));
45944- atomic_add(s, &rdev->corrected_errors);
45945+ atomic_add_unchecked(s, &rdev->corrected_errors);
45946 }
45947
45948 rdev_dec_pending(rdev, mddev);
45949diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
45950index 007ab86..d11593d 100644
45951--- a/drivers/md/raid5.c
45952+++ b/drivers/md/raid5.c
45953@@ -947,23 +947,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
45954 struct bio_vec bvl;
45955 struct bvec_iter iter;
45956 struct page *bio_page;
45957- int page_offset;
45958+ s64 page_offset;
45959 struct async_submit_ctl submit;
45960 enum async_tx_flags flags = 0;
45961
45962 if (bio->bi_iter.bi_sector >= sector)
45963- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
45964+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
45965 else
45966- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
45967+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
45968
45969 if (frombio)
45970 flags |= ASYNC_TX_FENCE;
45971 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
45972
45973 bio_for_each_segment(bvl, bio, iter) {
45974- int len = bvl.bv_len;
45975- int clen;
45976- int b_offset = 0;
45977+ s64 len = bvl.bv_len;
45978+ s64 clen;
45979+ s64 b_offset = 0;
45980
45981 if (page_offset < 0) {
45982 b_offset = -page_offset;
45983@@ -1727,6 +1727,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
45984 return 1;
45985 }
45986
45987+#ifdef CONFIG_GRKERNSEC_HIDESYM
45988+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
45989+#endif
45990+
45991 static int grow_stripes(struct r5conf *conf, int num)
45992 {
45993 struct kmem_cache *sc;
45994@@ -1738,7 +1742,11 @@ static int grow_stripes(struct r5conf *conf, int num)
45995 "raid%d-%s", conf->level, mdname(conf->mddev));
45996 else
45997 sprintf(conf->cache_name[0],
45998+#ifdef CONFIG_GRKERNSEC_HIDESYM
45999+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
46000+#else
46001 "raid%d-%p", conf->level, conf->mddev);
46002+#endif
46003 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
46004
46005 conf->active_name = 0;
46006@@ -2015,21 +2023,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
46007 mdname(conf->mddev), STRIPE_SECTORS,
46008 (unsigned long long)s,
46009 bdevname(rdev->bdev, b));
46010- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
46011+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
46012 clear_bit(R5_ReadError, &sh->dev[i].flags);
46013 clear_bit(R5_ReWrite, &sh->dev[i].flags);
46014 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
46015 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
46016
46017- if (atomic_read(&rdev->read_errors))
46018- atomic_set(&rdev->read_errors, 0);
46019+ if (atomic_read_unchecked(&rdev->read_errors))
46020+ atomic_set_unchecked(&rdev->read_errors, 0);
46021 } else {
46022 const char *bdn = bdevname(rdev->bdev, b);
46023 int retry = 0;
46024 int set_bad = 0;
46025
46026 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
46027- atomic_inc(&rdev->read_errors);
46028+ atomic_inc_unchecked(&rdev->read_errors);
46029 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
46030 printk_ratelimited(
46031 KERN_WARNING
46032@@ -2057,7 +2065,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
46033 mdname(conf->mddev),
46034 (unsigned long long)s,
46035 bdn);
46036- } else if (atomic_read(&rdev->read_errors)
46037+ } else if (atomic_read_unchecked(&rdev->read_errors)
46038 > conf->max_nr_stripes)
46039 printk(KERN_WARNING
46040 "md/raid:%s: Too many read errors, failing device %s.\n",
46041diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
46042index 983db75..ef9248c 100644
46043--- a/drivers/media/dvb-core/dvbdev.c
46044+++ b/drivers/media/dvb-core/dvbdev.c
46045@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
46046 const struct dvb_device *template, void *priv, int type)
46047 {
46048 struct dvb_device *dvbdev;
46049- struct file_operations *dvbdevfops;
46050+ file_operations_no_const *dvbdevfops;
46051 struct device *clsdev;
46052 int minor;
46053 int id;
46054diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
46055index 6ad22b6..6e90e2a 100644
46056--- a/drivers/media/dvb-frontends/af9033.h
46057+++ b/drivers/media/dvb-frontends/af9033.h
46058@@ -96,6 +96,6 @@ struct af9033_ops {
46059 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
46060 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
46061 int onoff);
46062-};
46063+} __no_const;
46064
46065 #endif /* AF9033_H */
46066diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
46067index 9b6c3bb..baeb5c7 100644
46068--- a/drivers/media/dvb-frontends/dib3000.h
46069+++ b/drivers/media/dvb-frontends/dib3000.h
46070@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
46071 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
46072 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
46073 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
46074-};
46075+} __no_const;
46076
46077 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
46078 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
46079diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
46080index 1fea0e9..321ce8f 100644
46081--- a/drivers/media/dvb-frontends/dib7000p.h
46082+++ b/drivers/media/dvb-frontends/dib7000p.h
46083@@ -64,7 +64,7 @@ struct dib7000p_ops {
46084 int (*get_adc_power)(struct dvb_frontend *fe);
46085 int (*slave_reset)(struct dvb_frontend *fe);
46086 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
46087-};
46088+} __no_const;
46089
46090 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
46091 void *dib7000p_attach(struct dib7000p_ops *ops);
46092diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
46093index 84cc103..5780c54 100644
46094--- a/drivers/media/dvb-frontends/dib8000.h
46095+++ b/drivers/media/dvb-frontends/dib8000.h
46096@@ -61,7 +61,7 @@ struct dib8000_ops {
46097 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
46098 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
46099 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
46100-};
46101+} __no_const;
46102
46103 #if IS_ENABLED(CONFIG_DVB_DIB8000)
46104 void *dib8000_attach(struct dib8000_ops *ops);
46105diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
46106index 860c98fc..497fa25 100644
46107--- a/drivers/media/pci/cx88/cx88-video.c
46108+++ b/drivers/media/pci/cx88/cx88-video.c
46109@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
46110
46111 /* ------------------------------------------------------------------ */
46112
46113-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46114-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46115-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46116+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46117+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46118+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46119
46120 module_param_array(video_nr, int, NULL, 0444);
46121 module_param_array(vbi_nr, int, NULL, 0444);
46122diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
46123index 802642d..5534900 100644
46124--- a/drivers/media/pci/ivtv/ivtv-driver.c
46125+++ b/drivers/media/pci/ivtv/ivtv-driver.c
46126@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
46127 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
46128
46129 /* ivtv instance counter */
46130-static atomic_t ivtv_instance = ATOMIC_INIT(0);
46131+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
46132
46133 /* Parameter declarations */
46134 static int cardtype[IVTV_MAX_CARDS];
46135diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
46136index 570d119..ed25830 100644
46137--- a/drivers/media/pci/solo6x10/solo6x10-core.c
46138+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
46139@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
46140
46141 static int solo_sysfs_init(struct solo_dev *solo_dev)
46142 {
46143- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
46144+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
46145 struct device *dev = &solo_dev->dev;
46146 const char *driver;
46147 int i;
46148diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
46149index 7ddc767..1c24361 100644
46150--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
46151+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
46152@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
46153
46154 int solo_g723_init(struct solo_dev *solo_dev)
46155 {
46156- static struct snd_device_ops ops = { NULL };
46157+ static struct snd_device_ops ops = { };
46158 struct snd_card *card;
46159 struct snd_kcontrol_new kctl;
46160 char name[32];
46161diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46162index 8c84846..27b4f83 100644
46163--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
46164+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46165@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
46166
46167 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
46168 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
46169- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
46170+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
46171 if (p2m_id < 0)
46172 p2m_id = -p2m_id;
46173 }
46174diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
46175index 1ca54b0..7d7cb9a 100644
46176--- a/drivers/media/pci/solo6x10/solo6x10.h
46177+++ b/drivers/media/pci/solo6x10/solo6x10.h
46178@@ -218,7 +218,7 @@ struct solo_dev {
46179
46180 /* P2M DMA Engine */
46181 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
46182- atomic_t p2m_count;
46183+ atomic_unchecked_t p2m_count;
46184 int p2m_jiffies;
46185 unsigned int p2m_timeouts;
46186
46187diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
46188index c135165..dc69499 100644
46189--- a/drivers/media/pci/tw68/tw68-core.c
46190+++ b/drivers/media/pci/tw68/tw68-core.c
46191@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
46192 module_param_array(card, int, NULL, 0444);
46193 MODULE_PARM_DESC(card, "card type");
46194
46195-static atomic_t tw68_instance = ATOMIC_INIT(0);
46196+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
46197
46198 /* ------------------------------------------------------------------ */
46199
46200diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
46201index ba2d8f9..1566684 100644
46202--- a/drivers/media/platform/omap/omap_vout.c
46203+++ b/drivers/media/platform/omap/omap_vout.c
46204@@ -63,7 +63,6 @@ enum omap_vout_channels {
46205 OMAP_VIDEO2,
46206 };
46207
46208-static struct videobuf_queue_ops video_vbq_ops;
46209 /* Variables configurable through module params*/
46210 static u32 video1_numbuffers = 3;
46211 static u32 video2_numbuffers = 3;
46212@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
46213 {
46214 struct videobuf_queue *q;
46215 struct omap_vout_device *vout = NULL;
46216+ static struct videobuf_queue_ops video_vbq_ops = {
46217+ .buf_setup = omap_vout_buffer_setup,
46218+ .buf_prepare = omap_vout_buffer_prepare,
46219+ .buf_release = omap_vout_buffer_release,
46220+ .buf_queue = omap_vout_buffer_queue,
46221+ };
46222
46223 vout = video_drvdata(file);
46224 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
46225@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
46226 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
46227
46228 q = &vout->vbq;
46229- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
46230- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
46231- video_vbq_ops.buf_release = omap_vout_buffer_release;
46232- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
46233 spin_lock_init(&vout->vbq_lock);
46234
46235 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
46236diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
46237index fb2acc5..a2fcbdc4 100644
46238--- a/drivers/media/platform/s5p-tv/mixer.h
46239+++ b/drivers/media/platform/s5p-tv/mixer.h
46240@@ -156,7 +156,7 @@ struct mxr_layer {
46241 /** layer index (unique identifier) */
46242 int idx;
46243 /** callbacks for layer methods */
46244- struct mxr_layer_ops ops;
46245+ struct mxr_layer_ops *ops;
46246 /** format array */
46247 const struct mxr_format **fmt_array;
46248 /** size of format array */
46249diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46250index 74344c7..a39e70e 100644
46251--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46252+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46253@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
46254 {
46255 struct mxr_layer *layer;
46256 int ret;
46257- struct mxr_layer_ops ops = {
46258+ static struct mxr_layer_ops ops = {
46259 .release = mxr_graph_layer_release,
46260 .buffer_set = mxr_graph_buffer_set,
46261 .stream_set = mxr_graph_stream_set,
46262diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
46263index b713403..53cb5ad 100644
46264--- a/drivers/media/platform/s5p-tv/mixer_reg.c
46265+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
46266@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
46267 layer->update_buf = next;
46268 }
46269
46270- layer->ops.buffer_set(layer, layer->update_buf);
46271+ layer->ops->buffer_set(layer, layer->update_buf);
46272
46273 if (done && done != layer->shadow_buf)
46274 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
46275diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
46276index 72d4f2e..4b2ea0d 100644
46277--- a/drivers/media/platform/s5p-tv/mixer_video.c
46278+++ b/drivers/media/platform/s5p-tv/mixer_video.c
46279@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
46280 layer->geo.src.height = layer->geo.src.full_height;
46281
46282 mxr_geometry_dump(mdev, &layer->geo);
46283- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46284+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46285 mxr_geometry_dump(mdev, &layer->geo);
46286 }
46287
46288@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
46289 layer->geo.dst.full_width = mbus_fmt.width;
46290 layer->geo.dst.full_height = mbus_fmt.height;
46291 layer->geo.dst.field = mbus_fmt.field;
46292- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46293+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46294
46295 mxr_geometry_dump(mdev, &layer->geo);
46296 }
46297@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
46298 /* set source size to highest accepted value */
46299 geo->src.full_width = max(geo->dst.full_width, pix->width);
46300 geo->src.full_height = max(geo->dst.full_height, pix->height);
46301- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46302+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46303 mxr_geometry_dump(mdev, &layer->geo);
46304 /* set cropping to total visible screen */
46305 geo->src.width = pix->width;
46306@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
46307 geo->src.x_offset = 0;
46308 geo->src.y_offset = 0;
46309 /* assure consistency of geometry */
46310- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46311+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46312 mxr_geometry_dump(mdev, &layer->geo);
46313 /* set full size to lowest possible value */
46314 geo->src.full_width = 0;
46315 geo->src.full_height = 0;
46316- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46317+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46318 mxr_geometry_dump(mdev, &layer->geo);
46319
46320 /* returning results */
46321@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
46322 target->width = s->r.width;
46323 target->height = s->r.height;
46324
46325- layer->ops.fix_geometry(layer, stage, s->flags);
46326+ layer->ops->fix_geometry(layer, stage, s->flags);
46327
46328 /* retrieve update selection rectangle */
46329 res.left = target->x_offset;
46330@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
46331 mxr_output_get(mdev);
46332
46333 mxr_layer_update_output(layer);
46334- layer->ops.format_set(layer);
46335+ layer->ops->format_set(layer);
46336 /* enabling layer in hardware */
46337 spin_lock_irqsave(&layer->enq_slock, flags);
46338 layer->state = MXR_LAYER_STREAMING;
46339 spin_unlock_irqrestore(&layer->enq_slock, flags);
46340
46341- layer->ops.stream_set(layer, MXR_ENABLE);
46342+ layer->ops->stream_set(layer, MXR_ENABLE);
46343 mxr_streamer_get(mdev);
46344
46345 return 0;
46346@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
46347 spin_unlock_irqrestore(&layer->enq_slock, flags);
46348
46349 /* disabling layer in hardware */
46350- layer->ops.stream_set(layer, MXR_DISABLE);
46351+ layer->ops->stream_set(layer, MXR_DISABLE);
46352 /* remove one streamer */
46353 mxr_streamer_put(mdev);
46354 /* allow changes in output configuration */
46355@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
46356
46357 void mxr_layer_release(struct mxr_layer *layer)
46358 {
46359- if (layer->ops.release)
46360- layer->ops.release(layer);
46361+ if (layer->ops->release)
46362+ layer->ops->release(layer);
46363 }
46364
46365 void mxr_base_layer_release(struct mxr_layer *layer)
46366@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
46367
46368 layer->mdev = mdev;
46369 layer->idx = idx;
46370- layer->ops = *ops;
46371+ layer->ops = ops;
46372
46373 spin_lock_init(&layer->enq_slock);
46374 INIT_LIST_HEAD(&layer->enq_list);
46375diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46376index c9388c4..ce71ece 100644
46377--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46378+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46379@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
46380 {
46381 struct mxr_layer *layer;
46382 int ret;
46383- struct mxr_layer_ops ops = {
46384+ static struct mxr_layer_ops ops = {
46385 .release = mxr_vp_layer_release,
46386 .buffer_set = mxr_vp_buffer_set,
46387 .stream_set = mxr_vp_stream_set,
46388diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
46389index 82affae..42833ec 100644
46390--- a/drivers/media/radio/radio-cadet.c
46391+++ b/drivers/media/radio/radio-cadet.c
46392@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46393 unsigned char readbuf[RDS_BUFFER];
46394 int i = 0;
46395
46396+ if (count > RDS_BUFFER)
46397+ return -EFAULT;
46398 mutex_lock(&dev->lock);
46399 if (dev->rdsstat == 0)
46400 cadet_start_rds(dev);
46401@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46402 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
46403 mutex_unlock(&dev->lock);
46404
46405- if (i && copy_to_user(data, readbuf, i))
46406- return -EFAULT;
46407+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
46408+ i = -EFAULT;
46409+
46410 return i;
46411 }
46412
46413diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
46414index 5236035..c622c74 100644
46415--- a/drivers/media/radio/radio-maxiradio.c
46416+++ b/drivers/media/radio/radio-maxiradio.c
46417@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
46418 /* TEA5757 pin mappings */
46419 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
46420
46421-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
46422+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
46423
46424 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
46425 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
46426diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
46427index 050b3bb..79f62b9 100644
46428--- a/drivers/media/radio/radio-shark.c
46429+++ b/drivers/media/radio/radio-shark.c
46430@@ -79,7 +79,7 @@ struct shark_device {
46431 u32 last_val;
46432 };
46433
46434-static atomic_t shark_instance = ATOMIC_INIT(0);
46435+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46436
46437 static void shark_write_val(struct snd_tea575x *tea, u32 val)
46438 {
46439diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
46440index 8654e0d..0608a64 100644
46441--- a/drivers/media/radio/radio-shark2.c
46442+++ b/drivers/media/radio/radio-shark2.c
46443@@ -74,7 +74,7 @@ struct shark_device {
46444 u8 *transfer_buffer;
46445 };
46446
46447-static atomic_t shark_instance = ATOMIC_INIT(0);
46448+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46449
46450 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
46451 {
46452diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
46453index dccf586..d5db411 100644
46454--- a/drivers/media/radio/radio-si476x.c
46455+++ b/drivers/media/radio/radio-si476x.c
46456@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
46457 struct si476x_radio *radio;
46458 struct v4l2_ctrl *ctrl;
46459
46460- static atomic_t instance = ATOMIC_INIT(0);
46461+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
46462
46463 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
46464 if (!radio)
46465diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
46466index 704397f..4d05977 100644
46467--- a/drivers/media/radio/wl128x/fmdrv_common.c
46468+++ b/drivers/media/radio/wl128x/fmdrv_common.c
46469@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
46470 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
46471
46472 /* Radio Nr */
46473-static u32 radio_nr = -1;
46474+static int radio_nr = -1;
46475 module_param(radio_nr, int, 0444);
46476 MODULE_PARM_DESC(radio_nr, "Radio Nr");
46477
46478diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46479index 9fd1527..8927230 100644
46480--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
46481+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46482@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
46483
46484 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
46485 {
46486- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
46487- char result[64];
46488- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
46489- sizeof(result), 0);
46490+ char *buf;
46491+ char *result;
46492+ int retval;
46493+
46494+ buf = kmalloc(2, GFP_KERNEL);
46495+ if (buf == NULL)
46496+ return -ENOMEM;
46497+ result = kmalloc(64, GFP_KERNEL);
46498+ if (result == NULL) {
46499+ kfree(buf);
46500+ return -ENOMEM;
46501+ }
46502+
46503+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
46504+ buf[1] = enable ? 1 : 0;
46505+
46506+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
46507+
46508+ kfree(buf);
46509+ kfree(result);
46510+ return retval;
46511 }
46512
46513 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
46514 {
46515- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
46516- char state[3];
46517- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
46518+ char *buf;
46519+ char *state;
46520+ int retval;
46521+
46522+ buf = kmalloc(2, GFP_KERNEL);
46523+ if (buf == NULL)
46524+ return -ENOMEM;
46525+ state = kmalloc(3, GFP_KERNEL);
46526+ if (state == NULL) {
46527+ kfree(buf);
46528+ return -ENOMEM;
46529+ }
46530+
46531+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
46532+ buf[1] = enable ? 1 : 0;
46533+
46534+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
46535+
46536+ kfree(buf);
46537+ kfree(state);
46538+ return retval;
46539 }
46540
46541 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46542 {
46543- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
46544- char state[3];
46545+ char *query;
46546+ char *state;
46547 int ret;
46548+ query = kmalloc(1, GFP_KERNEL);
46549+ if (query == NULL)
46550+ return -ENOMEM;
46551+ state = kmalloc(3, GFP_KERNEL);
46552+ if (state == NULL) {
46553+ kfree(query);
46554+ return -ENOMEM;
46555+ }
46556+
46557+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
46558
46559 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
46560
46561- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
46562- sizeof(state), 0);
46563+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
46564 if (ret < 0) {
46565 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
46566 "state info\n");
46567@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46568
46569 /* Copy this pointer as we are gonna need it in the release phase */
46570 cinergyt2_usb_device = adap->dev;
46571-
46572+ kfree(query);
46573+ kfree(state);
46574 return 0;
46575 }
46576
46577@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
46578 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46579 {
46580 struct cinergyt2_state *st = d->priv;
46581- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
46582+ u8 *key, *cmd;
46583 int i;
46584
46585+ cmd = kmalloc(1, GFP_KERNEL);
46586+ if (cmd == NULL)
46587+ return -EINVAL;
46588+ key = kzalloc(5, GFP_KERNEL);
46589+ if (key == NULL) {
46590+ kfree(cmd);
46591+ return -EINVAL;
46592+ }
46593+
46594+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
46595+
46596 *state = REMOTE_NO_KEY_PRESSED;
46597
46598- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
46599+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
46600 if (key[4] == 0xff) {
46601 /* key repeat */
46602 st->rc_counter++;
46603@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46604 *event = d->last_event;
46605 deb_rc("repeat key, event %x\n",
46606 *event);
46607- return 0;
46608+ goto out;
46609 }
46610 }
46611 deb_rc("repeated key (non repeatable)\n");
46612 }
46613- return 0;
46614+ goto out;
46615 }
46616
46617 /* hack to pass checksum on the custom field */
46618@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46619
46620 deb_rc("key: %*ph\n", 5, key);
46621 }
46622+out:
46623+ kfree(cmd);
46624+ kfree(key);
46625 return 0;
46626 }
46627
46628diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46629index c890fe4..f9b2ae6 100644
46630--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46631+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46632@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
46633 fe_status_t *status)
46634 {
46635 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46636- struct dvbt_get_status_msg result;
46637- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46638+ struct dvbt_get_status_msg *result;
46639+ u8 *cmd;
46640 int ret;
46641
46642- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
46643- sizeof(result), 0);
46644+ cmd = kmalloc(1, GFP_KERNEL);
46645+ if (cmd == NULL)
46646+ return -ENOMEM;
46647+ result = kmalloc(sizeof(*result), GFP_KERNEL);
46648+ if (result == NULL) {
46649+ kfree(cmd);
46650+ return -ENOMEM;
46651+ }
46652+
46653+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46654+
46655+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
46656+ sizeof(*result), 0);
46657 if (ret < 0)
46658- return ret;
46659+ goto out;
46660
46661 *status = 0;
46662
46663- if (0xffff - le16_to_cpu(result.gain) > 30)
46664+ if (0xffff - le16_to_cpu(result->gain) > 30)
46665 *status |= FE_HAS_SIGNAL;
46666- if (result.lock_bits & (1 << 6))
46667+ if (result->lock_bits & (1 << 6))
46668 *status |= FE_HAS_LOCK;
46669- if (result.lock_bits & (1 << 5))
46670+ if (result->lock_bits & (1 << 5))
46671 *status |= FE_HAS_SYNC;
46672- if (result.lock_bits & (1 << 4))
46673+ if (result->lock_bits & (1 << 4))
46674 *status |= FE_HAS_CARRIER;
46675- if (result.lock_bits & (1 << 1))
46676+ if (result->lock_bits & (1 << 1))
46677 *status |= FE_HAS_VITERBI;
46678
46679 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
46680 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
46681 *status &= ~FE_HAS_LOCK;
46682
46683- return 0;
46684+out:
46685+ kfree(cmd);
46686+ kfree(result);
46687+ return ret;
46688 }
46689
46690 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
46691 {
46692 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46693- struct dvbt_get_status_msg status;
46694- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46695+ struct dvbt_get_status_msg *status;
46696+ char *cmd;
46697 int ret;
46698
46699- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46700- sizeof(status), 0);
46701+ cmd = kmalloc(1, GFP_KERNEL);
46702+ if (cmd == NULL)
46703+ return -ENOMEM;
46704+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46705+ if (status == NULL) {
46706+ kfree(cmd);
46707+ return -ENOMEM;
46708+ }
46709+
46710+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46711+
46712+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46713+ sizeof(*status), 0);
46714 if (ret < 0)
46715- return ret;
46716+ goto out;
46717
46718- *ber = le32_to_cpu(status.viterbi_error_rate);
46719+ *ber = le32_to_cpu(status->viterbi_error_rate);
46720+out:
46721+ kfree(cmd);
46722+ kfree(status);
46723 return 0;
46724 }
46725
46726 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
46727 {
46728 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46729- struct dvbt_get_status_msg status;
46730- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46731+ struct dvbt_get_status_msg *status;
46732+ u8 *cmd;
46733 int ret;
46734
46735- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
46736- sizeof(status), 0);
46737+ cmd = kmalloc(1, GFP_KERNEL);
46738+ if (cmd == NULL)
46739+ return -ENOMEM;
46740+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46741+ if (status == NULL) {
46742+ kfree(cmd);
46743+ return -ENOMEM;
46744+ }
46745+
46746+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46747+
46748+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
46749+ sizeof(*status), 0);
46750 if (ret < 0) {
46751 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
46752 ret);
46753- return ret;
46754+ goto out;
46755 }
46756- *unc = le32_to_cpu(status.uncorrected_block_count);
46757- return 0;
46758+ *unc = le32_to_cpu(status->uncorrected_block_count);
46759+
46760+out:
46761+ kfree(cmd);
46762+ kfree(status);
46763+ return ret;
46764 }
46765
46766 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
46767 u16 *strength)
46768 {
46769 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46770- struct dvbt_get_status_msg status;
46771- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46772+ struct dvbt_get_status_msg *status;
46773+ char *cmd;
46774 int ret;
46775
46776- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46777- sizeof(status), 0);
46778+ cmd = kmalloc(1, GFP_KERNEL);
46779+ if (cmd == NULL)
46780+ return -ENOMEM;
46781+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46782+ if (status == NULL) {
46783+ kfree(cmd);
46784+ return -ENOMEM;
46785+ }
46786+
46787+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46788+
46789+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46790+ sizeof(*status), 0);
46791 if (ret < 0) {
46792 err("cinergyt2_fe_read_signal_strength() Failed!"
46793 " (Error=%d)\n", ret);
46794- return ret;
46795+ goto out;
46796 }
46797- *strength = (0xffff - le16_to_cpu(status.gain));
46798+ *strength = (0xffff - le16_to_cpu(status->gain));
46799+
46800+out:
46801+ kfree(cmd);
46802+ kfree(status);
46803 return 0;
46804 }
46805
46806 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
46807 {
46808 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46809- struct dvbt_get_status_msg status;
46810- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46811+ struct dvbt_get_status_msg *status;
46812+ char *cmd;
46813 int ret;
46814
46815- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46816- sizeof(status), 0);
46817+ cmd = kmalloc(1, GFP_KERNEL);
46818+ if (cmd == NULL)
46819+ return -ENOMEM;
46820+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46821+ if (status == NULL) {
46822+ kfree(cmd);
46823+ return -ENOMEM;
46824+ }
46825+
46826+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46827+
46828+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46829+ sizeof(*status), 0);
46830 if (ret < 0) {
46831 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
46832- return ret;
46833+ goto out;
46834 }
46835- *snr = (status.snr << 8) | status.snr;
46836- return 0;
46837+ *snr = (status->snr << 8) | status->snr;
46838+
46839+out:
46840+ kfree(cmd);
46841+ kfree(status);
46842+ return ret;
46843 }
46844
46845 static int cinergyt2_fe_init(struct dvb_frontend *fe)
46846@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
46847 {
46848 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
46849 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46850- struct dvbt_set_parameters_msg param;
46851- char result[2];
46852+ struct dvbt_set_parameters_msg *param;
46853+ char *result;
46854 int err;
46855
46856- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46857- param.tps = cpu_to_le16(compute_tps(fep));
46858- param.freq = cpu_to_le32(fep->frequency / 1000);
46859- param.flags = 0;
46860+ result = kmalloc(2, GFP_KERNEL);
46861+ if (result == NULL)
46862+ return -ENOMEM;
46863+ param = kmalloc(sizeof(*param), GFP_KERNEL);
46864+ if (param == NULL) {
46865+ kfree(result);
46866+ return -ENOMEM;
46867+ }
46868+
46869+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46870+ param->tps = cpu_to_le16(compute_tps(fep));
46871+ param->freq = cpu_to_le32(fep->frequency / 1000);
46872+ param->flags = 0;
46873
46874 switch (fep->bandwidth_hz) {
46875 default:
46876 case 8000000:
46877- param.bandwidth = 8;
46878+ param->bandwidth = 8;
46879 break;
46880 case 7000000:
46881- param.bandwidth = 7;
46882+ param->bandwidth = 7;
46883 break;
46884 case 6000000:
46885- param.bandwidth = 6;
46886+ param->bandwidth = 6;
46887 break;
46888 }
46889
46890 err = dvb_usb_generic_rw(state->d,
46891- (char *)&param, sizeof(param),
46892- result, sizeof(result), 0);
46893+ (char *)param, sizeof(*param),
46894+ result, 2, 0);
46895 if (err < 0)
46896 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
46897
46898- return (err < 0) ? err : 0;
46899+ kfree(result);
46900+ kfree(param);
46901+ return err;
46902 }
46903
46904 static void cinergyt2_fe_release(struct dvb_frontend *fe)
46905diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46906index 733a7ff..f8b52e3 100644
46907--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46908+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46909@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
46910
46911 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
46912 {
46913- struct hexline hx;
46914- u8 reset;
46915+ struct hexline *hx;
46916+ u8 *reset;
46917 int ret,pos=0;
46918
46919+ reset = kmalloc(1, GFP_KERNEL);
46920+ if (reset == NULL)
46921+ return -ENOMEM;
46922+
46923+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
46924+ if (hx == NULL) {
46925+ kfree(reset);
46926+ return -ENOMEM;
46927+ }
46928+
46929 /* stop the CPU */
46930- reset = 1;
46931- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
46932+ reset[0] = 1;
46933+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
46934 err("could not stop the USB controller CPU.");
46935
46936- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
46937- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
46938- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
46939+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
46940+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
46941+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
46942
46943- if (ret != hx.len) {
46944+ if (ret != hx->len) {
46945 err("error while transferring firmware "
46946 "(transferred size: %d, block size: %d)",
46947- ret,hx.len);
46948+ ret,hx->len);
46949 ret = -EINVAL;
46950 break;
46951 }
46952 }
46953 if (ret < 0) {
46954 err("firmware download failed at %d with %d",pos,ret);
46955+ kfree(reset);
46956+ kfree(hx);
46957 return ret;
46958 }
46959
46960 if (ret == 0) {
46961 /* restart the CPU */
46962- reset = 0;
46963- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
46964+ reset[0] = 0;
46965+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
46966 err("could not restart the USB controller CPU.");
46967 ret = -EINVAL;
46968 }
46969 } else
46970 ret = -EIO;
46971
46972+ kfree(reset);
46973+ kfree(hx);
46974+
46975 return ret;
46976 }
46977 EXPORT_SYMBOL(usb_cypress_load_firmware);
46978diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
46979index 1a3df10..57997a5 100644
46980--- a/drivers/media/usb/dvb-usb/dw2102.c
46981+++ b/drivers/media/usb/dvb-usb/dw2102.c
46982@@ -118,7 +118,7 @@ struct su3000_state {
46983
46984 struct s6x0_state {
46985 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
46986-};
46987+} __no_const;
46988
46989 /* debug */
46990 static int dvb_usb_dw2102_debug;
46991diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
46992index 5801ae7..83f71fa 100644
46993--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
46994+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
46995@@ -87,8 +87,11 @@ struct technisat_usb2_state {
46996 static int technisat_usb2_i2c_access(struct usb_device *udev,
46997 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
46998 {
46999- u8 b[64];
47000- int ret, actual_length;
47001+ u8 *b = kmalloc(64, GFP_KERNEL);
47002+ int ret, actual_length, error = 0;
47003+
47004+ if (b == NULL)
47005+ return -ENOMEM;
47006
47007 deb_i2c("i2c-access: %02x, tx: ", device_addr);
47008 debug_dump(tx, txlen, deb_i2c);
47009@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47010
47011 if (ret < 0) {
47012 err("i2c-error: out failed %02x = %d", device_addr, ret);
47013- return -ENODEV;
47014+ error = -ENODEV;
47015+ goto out;
47016 }
47017
47018 ret = usb_bulk_msg(udev,
47019@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47020 b, 64, &actual_length, 1000);
47021 if (ret < 0) {
47022 err("i2c-error: in failed %02x = %d", device_addr, ret);
47023- return -ENODEV;
47024+ error = -ENODEV;
47025+ goto out;
47026 }
47027
47028 if (b[0] != I2C_STATUS_OK) {
47029@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47030 /* handle tuner-i2c-nak */
47031 if (!(b[0] == I2C_STATUS_NAK &&
47032 device_addr == 0x60
47033- /* && device_is_technisat_usb2 */))
47034- return -ENODEV;
47035+ /* && device_is_technisat_usb2 */)) {
47036+ error = -ENODEV;
47037+ goto out;
47038+ }
47039 }
47040
47041 deb_i2c("status: %d, ", b[0]);
47042@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47043
47044 deb_i2c("\n");
47045
47046- return 0;
47047+out:
47048+ kfree(b);
47049+ return error;
47050 }
47051
47052 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
47053@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47054 {
47055 int ret;
47056
47057- u8 led[8] = {
47058- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47059- 0
47060- };
47061+ u8 *led = kzalloc(8, GFP_KERNEL);
47062+
47063+ if (led == NULL)
47064+ return -ENOMEM;
47065
47066 if (disable_led_control && state != TECH_LED_OFF)
47067 return 0;
47068
47069+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
47070+
47071 switch (state) {
47072 case TECH_LED_ON:
47073 led[1] = 0x82;
47074@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47075 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47076 USB_TYPE_VENDOR | USB_DIR_OUT,
47077 0, 0,
47078- led, sizeof(led), 500);
47079+ led, 8, 500);
47080
47081 mutex_unlock(&d->i2c_mutex);
47082+
47083+ kfree(led);
47084+
47085 return ret;
47086 }
47087
47088 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
47089 {
47090 int ret;
47091- u8 b = 0;
47092+ u8 *b = kzalloc(1, GFP_KERNEL);
47093+
47094+ if (b == NULL)
47095+ return -ENOMEM;
47096
47097 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
47098 return -EAGAIN;
47099@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
47100 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
47101 USB_TYPE_VENDOR | USB_DIR_OUT,
47102 (red << 8) | green, 0,
47103- &b, 1, 500);
47104+ b, 1, 500);
47105
47106 mutex_unlock(&d->i2c_mutex);
47107
47108+ kfree(b);
47109+
47110 return ret;
47111 }
47112
47113@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47114 struct dvb_usb_device_description **desc, int *cold)
47115 {
47116 int ret;
47117- u8 version[3];
47118+ u8 *version = kmalloc(3, GFP_KERNEL);
47119
47120 /* first select the interface */
47121 if (usb_set_interface(udev, 0, 1) != 0)
47122@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47123
47124 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
47125
47126+ if (version == NULL)
47127+ return 0;
47128+
47129 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
47130 GET_VERSION_INFO_VENDOR_REQUEST,
47131 USB_TYPE_VENDOR | USB_DIR_IN,
47132 0, 0,
47133- version, sizeof(version), 500);
47134+ version, 3, 500);
47135
47136 if (ret < 0)
47137 *cold = 1;
47138@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47139 *cold = 0;
47140 }
47141
47142+ kfree(version);
47143+
47144 return 0;
47145 }
47146
47147@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
47148
47149 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47150 {
47151- u8 buf[62], *b;
47152+ u8 *buf, *b;
47153 int ret;
47154 struct ir_raw_event ev;
47155
47156+ buf = kmalloc(62, GFP_KERNEL);
47157+
47158+ if (buf == NULL)
47159+ return -ENOMEM;
47160+
47161 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
47162 buf[1] = 0x08;
47163 buf[2] = 0x8f;
47164@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47165 GET_IR_DATA_VENDOR_REQUEST,
47166 USB_TYPE_VENDOR | USB_DIR_IN,
47167 0x8080, 0,
47168- buf, sizeof(buf), 500);
47169+ buf, 62, 500);
47170
47171 unlock:
47172 mutex_unlock(&d->i2c_mutex);
47173
47174- if (ret < 0)
47175+ if (ret < 0) {
47176+ kfree(buf);
47177 return ret;
47178+ }
47179
47180- if (ret == 1)
47181+ if (ret == 1) {
47182+ kfree(buf);
47183 return 0; /* no key pressed */
47184+ }
47185
47186 /* decoding */
47187 b = buf+1;
47188@@ -656,6 +689,8 @@ unlock:
47189
47190 ir_raw_event_handle(d->rc_dev);
47191
47192+ kfree(buf);
47193+
47194 return 1;
47195 }
47196
47197diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47198index af63543..0436f20 100644
47199--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47200+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47201@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47202 * by passing a very big num_planes value */
47203 uplane = compat_alloc_user_space(num_planes *
47204 sizeof(struct v4l2_plane));
47205- kp->m.planes = (__force struct v4l2_plane *)uplane;
47206+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
47207
47208 while (--num_planes >= 0) {
47209 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
47210@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47211 if (num_planes == 0)
47212 return 0;
47213
47214- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
47215+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
47216 if (get_user(p, &up->m.planes))
47217 return -EFAULT;
47218 uplane32 = compat_ptr(p);
47219@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
47220 get_user(kp->flags, &up->flags) ||
47221 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
47222 return -EFAULT;
47223- kp->base = (__force void *)compat_ptr(tmp);
47224+ kp->base = (__force_kernel void *)compat_ptr(tmp);
47225 return 0;
47226 }
47227
47228@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47229 n * sizeof(struct v4l2_ext_control32)))
47230 return -EFAULT;
47231 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
47232- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
47233+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
47234 while (--n >= 0) {
47235 u32 id;
47236
47237@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47238 {
47239 struct v4l2_ext_control32 __user *ucontrols;
47240 struct v4l2_ext_control __user *kcontrols =
47241- (__force struct v4l2_ext_control __user *)kp->controls;
47242+ (struct v4l2_ext_control __force_user *)kp->controls;
47243 int n = kp->count;
47244 compat_caddr_t p;
47245
47246@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
47247 get_user(tmp, &up->edid) ||
47248 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
47249 return -EFAULT;
47250- kp->edid = (__force u8 *)compat_ptr(tmp);
47251+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
47252 return 0;
47253 }
47254
47255diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
47256index 015f92a..59e311e 100644
47257--- a/drivers/media/v4l2-core/v4l2-device.c
47258+++ b/drivers/media/v4l2-core/v4l2-device.c
47259@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
47260 EXPORT_SYMBOL_GPL(v4l2_device_put);
47261
47262 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
47263- atomic_t *instance)
47264+ atomic_unchecked_t *instance)
47265 {
47266- int num = atomic_inc_return(instance) - 1;
47267+ int num = atomic_inc_return_unchecked(instance) - 1;
47268 int len = strlen(basename);
47269
47270 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
47271diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
47272index b084072..36706d7 100644
47273--- a/drivers/media/v4l2-core/v4l2-ioctl.c
47274+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
47275@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
47276 struct file *file, void *fh, void *p);
47277 } u;
47278 void (*debug)(const void *arg, bool write_only);
47279-};
47280+} __do_const;
47281+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
47282
47283 /* This control needs a priority check */
47284 #define INFO_FL_PRIO (1 << 0)
47285@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
47286 struct video_device *vfd = video_devdata(file);
47287 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
47288 bool write_only = false;
47289- struct v4l2_ioctl_info default_info;
47290+ v4l2_ioctl_info_no_const default_info;
47291 const struct v4l2_ioctl_info *info;
47292 void *fh = file->private_data;
47293 struct v4l2_fh *vfh = NULL;
47294@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47295 ret = -EINVAL;
47296 break;
47297 }
47298- *user_ptr = (void __user *)buf->m.planes;
47299+ *user_ptr = (void __force_user *)buf->m.planes;
47300 *kernel_ptr = (void **)&buf->m.planes;
47301 *array_size = sizeof(struct v4l2_plane) * buf->length;
47302 ret = 1;
47303@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47304 ret = -EINVAL;
47305 break;
47306 }
47307- *user_ptr = (void __user *)edid->edid;
47308+ *user_ptr = (void __force_user *)edid->edid;
47309 *kernel_ptr = (void **)&edid->edid;
47310 *array_size = edid->blocks * 128;
47311 ret = 1;
47312@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47313 ret = -EINVAL;
47314 break;
47315 }
47316- *user_ptr = (void __user *)ctrls->controls;
47317+ *user_ptr = (void __force_user *)ctrls->controls;
47318 *kernel_ptr = (void **)&ctrls->controls;
47319 *array_size = sizeof(struct v4l2_ext_control)
47320 * ctrls->count;
47321@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
47322 }
47323
47324 if (has_array_args) {
47325- *kernel_ptr = (void __force *)user_ptr;
47326+ *kernel_ptr = (void __force_kernel *)user_ptr;
47327 if (copy_to_user(user_ptr, mbuf, array_size))
47328 err = -EFAULT;
47329 goto out_array_args;
47330diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
47331index 24696f5..3637780 100644
47332--- a/drivers/memory/omap-gpmc.c
47333+++ b/drivers/memory/omap-gpmc.c
47334@@ -211,7 +211,6 @@ struct omap3_gpmc_regs {
47335 };
47336
47337 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
47338-static struct irq_chip gpmc_irq_chip;
47339 static int gpmc_irq_start;
47340
47341 static struct resource gpmc_mem_root;
47342@@ -939,6 +938,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
47343
47344 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
47345
47346+static struct irq_chip gpmc_irq_chip = {
47347+ .name = "gpmc",
47348+ .irq_startup = gpmc_irq_noop_ret,
47349+ .irq_enable = gpmc_irq_enable,
47350+ .irq_disable = gpmc_irq_disable,
47351+ .irq_shutdown = gpmc_irq_noop,
47352+ .irq_ack = gpmc_irq_noop,
47353+ .irq_mask = gpmc_irq_noop,
47354+ .irq_unmask = gpmc_irq_noop,
47355+};
47356+
47357 static int gpmc_setup_irq(void)
47358 {
47359 int i;
47360@@ -953,15 +963,6 @@ static int gpmc_setup_irq(void)
47361 return gpmc_irq_start;
47362 }
47363
47364- gpmc_irq_chip.name = "gpmc";
47365- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
47366- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
47367- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
47368- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
47369- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
47370- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
47371- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
47372-
47373 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
47374 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
47375
47376diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
47377index 187f836..679544b 100644
47378--- a/drivers/message/fusion/mptbase.c
47379+++ b/drivers/message/fusion/mptbase.c
47380@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47381 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
47382 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
47383
47384+#ifdef CONFIG_GRKERNSEC_HIDESYM
47385+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
47386+#else
47387 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
47388 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
47389+#endif
47390+
47391 /*
47392 * Rounding UP to nearest 4-kB boundary here...
47393 */
47394@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47395 ioc->facts.GlobalCredits);
47396
47397 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
47398+#ifdef CONFIG_GRKERNSEC_HIDESYM
47399+ NULL, NULL);
47400+#else
47401 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
47402+#endif
47403 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
47404 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
47405 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
47406diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
47407index 5bdaae1..eced16f 100644
47408--- a/drivers/message/fusion/mptsas.c
47409+++ b/drivers/message/fusion/mptsas.c
47410@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
47411 return 0;
47412 }
47413
47414+static inline void
47415+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47416+{
47417+ if (phy_info->port_details) {
47418+ phy_info->port_details->rphy = rphy;
47419+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47420+ ioc->name, rphy));
47421+ }
47422+
47423+ if (rphy) {
47424+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47425+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47426+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47427+ ioc->name, rphy, rphy->dev.release));
47428+ }
47429+}
47430+
47431 /* no mutex */
47432 static void
47433 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
47434@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
47435 return NULL;
47436 }
47437
47438-static inline void
47439-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47440-{
47441- if (phy_info->port_details) {
47442- phy_info->port_details->rphy = rphy;
47443- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47444- ioc->name, rphy));
47445- }
47446-
47447- if (rphy) {
47448- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47449- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47450- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47451- ioc->name, rphy, rphy->dev.release));
47452- }
47453-}
47454-
47455 static inline struct sas_port *
47456 mptsas_get_port(struct mptsas_phyinfo *phy_info)
47457 {
47458diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
47459index 9a8e185..27ff17d 100644
47460--- a/drivers/mfd/ab8500-debugfs.c
47461+++ b/drivers/mfd/ab8500-debugfs.c
47462@@ -100,7 +100,7 @@ static int irq_last;
47463 static u32 *irq_count;
47464 static int num_irqs;
47465
47466-static struct device_attribute **dev_attr;
47467+static device_attribute_no_const **dev_attr;
47468 static char **event_name;
47469
47470 static u8 avg_sample = SAMPLE_16;
47471diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
47472index 5615522..1eb6f3dc 100644
47473--- a/drivers/mfd/kempld-core.c
47474+++ b/drivers/mfd/kempld-core.c
47475@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
47476 .remove = kempld_remove,
47477 };
47478
47479-static struct dmi_system_id kempld_dmi_table[] __initdata = {
47480+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
47481 {
47482 .ident = "BHL6",
47483 .matches = {
47484diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
47485index c880c89..45a7c68 100644
47486--- a/drivers/mfd/max8925-i2c.c
47487+++ b/drivers/mfd/max8925-i2c.c
47488@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
47489 const struct i2c_device_id *id)
47490 {
47491 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
47492- static struct max8925_chip *chip;
47493+ struct max8925_chip *chip;
47494 struct device_node *node = client->dev.of_node;
47495
47496 if (node && !pdata) {
47497diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
47498index 7612d89..70549c2 100644
47499--- a/drivers/mfd/tps65910.c
47500+++ b/drivers/mfd/tps65910.c
47501@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
47502 struct tps65910_platform_data *pdata)
47503 {
47504 int ret = 0;
47505- static struct regmap_irq_chip *tps6591x_irqs_chip;
47506+ struct regmap_irq_chip *tps6591x_irqs_chip;
47507
47508 if (!irq) {
47509 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
47510diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
47511index 1b772ef..01e77d33 100644
47512--- a/drivers/mfd/twl4030-irq.c
47513+++ b/drivers/mfd/twl4030-irq.c
47514@@ -34,6 +34,7 @@
47515 #include <linux/of.h>
47516 #include <linux/irqdomain.h>
47517 #include <linux/i2c/twl.h>
47518+#include <asm/pgtable.h>
47519
47520 #include "twl-core.h"
47521
47522@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
47523 * Install an irq handler for each of the SIH modules;
47524 * clone dummy irq_chip since PIH can't *do* anything
47525 */
47526- twl4030_irq_chip = dummy_irq_chip;
47527- twl4030_irq_chip.name = "twl4030";
47528+ pax_open_kernel();
47529+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
47530+ *(const char **)&twl4030_irq_chip.name = "twl4030";
47531
47532- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47533+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47534+ pax_close_kernel();
47535
47536 for (i = irq_base; i < irq_end; i++) {
47537 irq_set_chip_and_handler(i, &twl4030_irq_chip,
47538diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
47539index 464419b..64bae8d 100644
47540--- a/drivers/misc/c2port/core.c
47541+++ b/drivers/misc/c2port/core.c
47542@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
47543 goto error_idr_alloc;
47544 c2dev->id = ret;
47545
47546- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47547+ pax_open_kernel();
47548+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47549+ pax_close_kernel();
47550
47551 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
47552 "c2port%d", c2dev->id);
47553diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
47554index 8385177..2f54635 100644
47555--- a/drivers/misc/eeprom/sunxi_sid.c
47556+++ b/drivers/misc/eeprom/sunxi_sid.c
47557@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
47558
47559 platform_set_drvdata(pdev, sid_data);
47560
47561- sid_bin_attr.size = sid_data->keysize;
47562+ pax_open_kernel();
47563+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
47564+ pax_close_kernel();
47565 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
47566 return -ENODEV;
47567
47568diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
47569index 36f5d52..32311c3 100644
47570--- a/drivers/misc/kgdbts.c
47571+++ b/drivers/misc/kgdbts.c
47572@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
47573 char before[BREAK_INSTR_SIZE];
47574 char after[BREAK_INSTR_SIZE];
47575
47576- probe_kernel_read(before, (char *)kgdbts_break_test,
47577+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
47578 BREAK_INSTR_SIZE);
47579 init_simple_test();
47580 ts.tst = plant_and_detach_test;
47581@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
47582 /* Activate test with initial breakpoint */
47583 if (!is_early)
47584 kgdb_breakpoint();
47585- probe_kernel_read(after, (char *)kgdbts_break_test,
47586+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
47587 BREAK_INSTR_SIZE);
47588 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
47589 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
47590diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
47591index 3ef4627..8d00486 100644
47592--- a/drivers/misc/lis3lv02d/lis3lv02d.c
47593+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
47594@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
47595 * the lid is closed. This leads to interrupts as soon as a little move
47596 * is done.
47597 */
47598- atomic_inc(&lis3->count);
47599+ atomic_inc_unchecked(&lis3->count);
47600
47601 wake_up_interruptible(&lis3->misc_wait);
47602 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
47603@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
47604 if (lis3->pm_dev)
47605 pm_runtime_get_sync(lis3->pm_dev);
47606
47607- atomic_set(&lis3->count, 0);
47608+ atomic_set_unchecked(&lis3->count, 0);
47609 return 0;
47610 }
47611
47612@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
47613 add_wait_queue(&lis3->misc_wait, &wait);
47614 while (true) {
47615 set_current_state(TASK_INTERRUPTIBLE);
47616- data = atomic_xchg(&lis3->count, 0);
47617+ data = atomic_xchg_unchecked(&lis3->count, 0);
47618 if (data)
47619 break;
47620
47621@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
47622 struct lis3lv02d, miscdev);
47623
47624 poll_wait(file, &lis3->misc_wait, wait);
47625- if (atomic_read(&lis3->count))
47626+ if (atomic_read_unchecked(&lis3->count))
47627 return POLLIN | POLLRDNORM;
47628 return 0;
47629 }
47630diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
47631index c439c82..1f20f57 100644
47632--- a/drivers/misc/lis3lv02d/lis3lv02d.h
47633+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
47634@@ -297,7 +297,7 @@ struct lis3lv02d {
47635 struct input_polled_dev *idev; /* input device */
47636 struct platform_device *pdev; /* platform device */
47637 struct regulator_bulk_data regulators[2];
47638- atomic_t count; /* interrupt count after last read */
47639+ atomic_unchecked_t count; /* interrupt count after last read */
47640 union axis_conversion ac; /* hw -> logical axis */
47641 int mapped_btns[3];
47642
47643diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
47644index 2f30bad..c4c13d0 100644
47645--- a/drivers/misc/sgi-gru/gruhandles.c
47646+++ b/drivers/misc/sgi-gru/gruhandles.c
47647@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
47648 unsigned long nsec;
47649
47650 nsec = CLKS2NSEC(clks);
47651- atomic_long_inc(&mcs_op_statistics[op].count);
47652- atomic_long_add(nsec, &mcs_op_statistics[op].total);
47653+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
47654+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
47655 if (mcs_op_statistics[op].max < nsec)
47656 mcs_op_statistics[op].max = nsec;
47657 }
47658diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
47659index 4f76359..cdfcb2e 100644
47660--- a/drivers/misc/sgi-gru/gruprocfs.c
47661+++ b/drivers/misc/sgi-gru/gruprocfs.c
47662@@ -32,9 +32,9 @@
47663
47664 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
47665
47666-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
47667+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
47668 {
47669- unsigned long val = atomic_long_read(v);
47670+ unsigned long val = atomic_long_read_unchecked(v);
47671
47672 seq_printf(s, "%16lu %s\n", val, id);
47673 }
47674@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
47675
47676 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
47677 for (op = 0; op < mcsop_last; op++) {
47678- count = atomic_long_read(&mcs_op_statistics[op].count);
47679- total = atomic_long_read(&mcs_op_statistics[op].total);
47680+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
47681+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
47682 max = mcs_op_statistics[op].max;
47683 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
47684 count ? total / count : 0, max);
47685diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
47686index 5c3ce24..4915ccb 100644
47687--- a/drivers/misc/sgi-gru/grutables.h
47688+++ b/drivers/misc/sgi-gru/grutables.h
47689@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
47690 * GRU statistics.
47691 */
47692 struct gru_stats_s {
47693- atomic_long_t vdata_alloc;
47694- atomic_long_t vdata_free;
47695- atomic_long_t gts_alloc;
47696- atomic_long_t gts_free;
47697- atomic_long_t gms_alloc;
47698- atomic_long_t gms_free;
47699- atomic_long_t gts_double_allocate;
47700- atomic_long_t assign_context;
47701- atomic_long_t assign_context_failed;
47702- atomic_long_t free_context;
47703- atomic_long_t load_user_context;
47704- atomic_long_t load_kernel_context;
47705- atomic_long_t lock_kernel_context;
47706- atomic_long_t unlock_kernel_context;
47707- atomic_long_t steal_user_context;
47708- atomic_long_t steal_kernel_context;
47709- atomic_long_t steal_context_failed;
47710- atomic_long_t nopfn;
47711- atomic_long_t asid_new;
47712- atomic_long_t asid_next;
47713- atomic_long_t asid_wrap;
47714- atomic_long_t asid_reuse;
47715- atomic_long_t intr;
47716- atomic_long_t intr_cbr;
47717- atomic_long_t intr_tfh;
47718- atomic_long_t intr_spurious;
47719- atomic_long_t intr_mm_lock_failed;
47720- atomic_long_t call_os;
47721- atomic_long_t call_os_wait_queue;
47722- atomic_long_t user_flush_tlb;
47723- atomic_long_t user_unload_context;
47724- atomic_long_t user_exception;
47725- atomic_long_t set_context_option;
47726- atomic_long_t check_context_retarget_intr;
47727- atomic_long_t check_context_unload;
47728- atomic_long_t tlb_dropin;
47729- atomic_long_t tlb_preload_page;
47730- atomic_long_t tlb_dropin_fail_no_asid;
47731- atomic_long_t tlb_dropin_fail_upm;
47732- atomic_long_t tlb_dropin_fail_invalid;
47733- atomic_long_t tlb_dropin_fail_range_active;
47734- atomic_long_t tlb_dropin_fail_idle;
47735- atomic_long_t tlb_dropin_fail_fmm;
47736- atomic_long_t tlb_dropin_fail_no_exception;
47737- atomic_long_t tfh_stale_on_fault;
47738- atomic_long_t mmu_invalidate_range;
47739- atomic_long_t mmu_invalidate_page;
47740- atomic_long_t flush_tlb;
47741- atomic_long_t flush_tlb_gru;
47742- atomic_long_t flush_tlb_gru_tgh;
47743- atomic_long_t flush_tlb_gru_zero_asid;
47744+ atomic_long_unchecked_t vdata_alloc;
47745+ atomic_long_unchecked_t vdata_free;
47746+ atomic_long_unchecked_t gts_alloc;
47747+ atomic_long_unchecked_t gts_free;
47748+ atomic_long_unchecked_t gms_alloc;
47749+ atomic_long_unchecked_t gms_free;
47750+ atomic_long_unchecked_t gts_double_allocate;
47751+ atomic_long_unchecked_t assign_context;
47752+ atomic_long_unchecked_t assign_context_failed;
47753+ atomic_long_unchecked_t free_context;
47754+ atomic_long_unchecked_t load_user_context;
47755+ atomic_long_unchecked_t load_kernel_context;
47756+ atomic_long_unchecked_t lock_kernel_context;
47757+ atomic_long_unchecked_t unlock_kernel_context;
47758+ atomic_long_unchecked_t steal_user_context;
47759+ atomic_long_unchecked_t steal_kernel_context;
47760+ atomic_long_unchecked_t steal_context_failed;
47761+ atomic_long_unchecked_t nopfn;
47762+ atomic_long_unchecked_t asid_new;
47763+ atomic_long_unchecked_t asid_next;
47764+ atomic_long_unchecked_t asid_wrap;
47765+ atomic_long_unchecked_t asid_reuse;
47766+ atomic_long_unchecked_t intr;
47767+ atomic_long_unchecked_t intr_cbr;
47768+ atomic_long_unchecked_t intr_tfh;
47769+ atomic_long_unchecked_t intr_spurious;
47770+ atomic_long_unchecked_t intr_mm_lock_failed;
47771+ atomic_long_unchecked_t call_os;
47772+ atomic_long_unchecked_t call_os_wait_queue;
47773+ atomic_long_unchecked_t user_flush_tlb;
47774+ atomic_long_unchecked_t user_unload_context;
47775+ atomic_long_unchecked_t user_exception;
47776+ atomic_long_unchecked_t set_context_option;
47777+ atomic_long_unchecked_t check_context_retarget_intr;
47778+ atomic_long_unchecked_t check_context_unload;
47779+ atomic_long_unchecked_t tlb_dropin;
47780+ atomic_long_unchecked_t tlb_preload_page;
47781+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47782+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47783+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47784+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47785+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47786+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47787+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47788+ atomic_long_unchecked_t tfh_stale_on_fault;
47789+ atomic_long_unchecked_t mmu_invalidate_range;
47790+ atomic_long_unchecked_t mmu_invalidate_page;
47791+ atomic_long_unchecked_t flush_tlb;
47792+ atomic_long_unchecked_t flush_tlb_gru;
47793+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47794+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47795
47796- atomic_long_t copy_gpa;
47797- atomic_long_t read_gpa;
47798+ atomic_long_unchecked_t copy_gpa;
47799+ atomic_long_unchecked_t read_gpa;
47800
47801- atomic_long_t mesq_receive;
47802- atomic_long_t mesq_receive_none;
47803- atomic_long_t mesq_send;
47804- atomic_long_t mesq_send_failed;
47805- atomic_long_t mesq_noop;
47806- atomic_long_t mesq_send_unexpected_error;
47807- atomic_long_t mesq_send_lb_overflow;
47808- atomic_long_t mesq_send_qlimit_reached;
47809- atomic_long_t mesq_send_amo_nacked;
47810- atomic_long_t mesq_send_put_nacked;
47811- atomic_long_t mesq_page_overflow;
47812- atomic_long_t mesq_qf_locked;
47813- atomic_long_t mesq_qf_noop_not_full;
47814- atomic_long_t mesq_qf_switch_head_failed;
47815- atomic_long_t mesq_qf_unexpected_error;
47816- atomic_long_t mesq_noop_unexpected_error;
47817- atomic_long_t mesq_noop_lb_overflow;
47818- atomic_long_t mesq_noop_qlimit_reached;
47819- atomic_long_t mesq_noop_amo_nacked;
47820- atomic_long_t mesq_noop_put_nacked;
47821- atomic_long_t mesq_noop_page_overflow;
47822+ atomic_long_unchecked_t mesq_receive;
47823+ atomic_long_unchecked_t mesq_receive_none;
47824+ atomic_long_unchecked_t mesq_send;
47825+ atomic_long_unchecked_t mesq_send_failed;
47826+ atomic_long_unchecked_t mesq_noop;
47827+ atomic_long_unchecked_t mesq_send_unexpected_error;
47828+ atomic_long_unchecked_t mesq_send_lb_overflow;
47829+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47830+ atomic_long_unchecked_t mesq_send_amo_nacked;
47831+ atomic_long_unchecked_t mesq_send_put_nacked;
47832+ atomic_long_unchecked_t mesq_page_overflow;
47833+ atomic_long_unchecked_t mesq_qf_locked;
47834+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47835+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47836+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47837+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47838+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47839+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47840+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47841+ atomic_long_unchecked_t mesq_noop_put_nacked;
47842+ atomic_long_unchecked_t mesq_noop_page_overflow;
47843
47844 };
47845
47846@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47847 tghop_invalidate, mcsop_last};
47848
47849 struct mcs_op_statistic {
47850- atomic_long_t count;
47851- atomic_long_t total;
47852+ atomic_long_unchecked_t count;
47853+ atomic_long_unchecked_t total;
47854 unsigned long max;
47855 };
47856
47857@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47858
47859 #define STAT(id) do { \
47860 if (gru_options & OPT_STATS) \
47861- atomic_long_inc(&gru_stats.id); \
47862+ atomic_long_inc_unchecked(&gru_stats.id); \
47863 } while (0)
47864
47865 #ifdef CONFIG_SGI_GRU_DEBUG
47866diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47867index c862cd4..0d176fe 100644
47868--- a/drivers/misc/sgi-xp/xp.h
47869+++ b/drivers/misc/sgi-xp/xp.h
47870@@ -288,7 +288,7 @@ struct xpc_interface {
47871 xpc_notify_func, void *);
47872 void (*received) (short, int, void *);
47873 enum xp_retval (*partid_to_nasids) (short, void *);
47874-};
47875+} __no_const;
47876
47877 extern struct xpc_interface xpc_interface;
47878
47879diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47880index 01be66d..e3a0c7e 100644
47881--- a/drivers/misc/sgi-xp/xp_main.c
47882+++ b/drivers/misc/sgi-xp/xp_main.c
47883@@ -78,13 +78,13 @@ xpc_notloaded(void)
47884 }
47885
47886 struct xpc_interface xpc_interface = {
47887- (void (*)(int))xpc_notloaded,
47888- (void (*)(int))xpc_notloaded,
47889- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47890- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47891+ .connect = (void (*)(int))xpc_notloaded,
47892+ .disconnect = (void (*)(int))xpc_notloaded,
47893+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47894+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47895 void *))xpc_notloaded,
47896- (void (*)(short, int, void *))xpc_notloaded,
47897- (enum xp_retval(*)(short, void *))xpc_notloaded
47898+ .received = (void (*)(short, int, void *))xpc_notloaded,
47899+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47900 };
47901 EXPORT_SYMBOL_GPL(xpc_interface);
47902
47903diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47904index b94d5f7..7f494c5 100644
47905--- a/drivers/misc/sgi-xp/xpc.h
47906+++ b/drivers/misc/sgi-xp/xpc.h
47907@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47908 void (*received_payload) (struct xpc_channel *, void *);
47909 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47910 };
47911+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47912
47913 /* struct xpc_partition act_state values (for XPC HB) */
47914
47915@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47916 /* found in xpc_main.c */
47917 extern struct device *xpc_part;
47918 extern struct device *xpc_chan;
47919-extern struct xpc_arch_operations xpc_arch_ops;
47920+extern xpc_arch_operations_no_const xpc_arch_ops;
47921 extern int xpc_disengage_timelimit;
47922 extern int xpc_disengage_timedout;
47923 extern int xpc_activate_IRQ_rcvd;
47924diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47925index 82dc574..8539ab2 100644
47926--- a/drivers/misc/sgi-xp/xpc_main.c
47927+++ b/drivers/misc/sgi-xp/xpc_main.c
47928@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47929 .notifier_call = xpc_system_die,
47930 };
47931
47932-struct xpc_arch_operations xpc_arch_ops;
47933+xpc_arch_operations_no_const xpc_arch_ops;
47934
47935 /*
47936 * Timer function to enforce the timelimit on the partition disengage.
47937@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
47938
47939 if (((die_args->trapnr == X86_TRAP_MF) ||
47940 (die_args->trapnr == X86_TRAP_XF)) &&
47941- !user_mode_vm(die_args->regs))
47942+ !user_mode(die_args->regs))
47943 xpc_die_deactivate();
47944
47945 break;
47946diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47947index ed2e71a..54c498e 100644
47948--- a/drivers/mmc/card/block.c
47949+++ b/drivers/mmc/card/block.c
47950@@ -577,7 +577,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47951 if (idata->ic.postsleep_min_us)
47952 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47953
47954- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47955+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47956 err = -EFAULT;
47957 goto cmd_rel_host;
47958 }
47959diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
47960index 18c4afe..43be71e 100644
47961--- a/drivers/mmc/host/dw_mmc.h
47962+++ b/drivers/mmc/host/dw_mmc.h
47963@@ -271,5 +271,5 @@ struct dw_mci_drv_data {
47964 void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
47965 int (*parse_dt)(struct dw_mci *host);
47966 int (*execute_tuning)(struct dw_mci_slot *slot);
47967-};
47968+} __do_const;
47969 #endif /* _DW_MMC_H_ */
47970diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
47971index 7fe1619..ae0781b 100644
47972--- a/drivers/mmc/host/mmci.c
47973+++ b/drivers/mmc/host/mmci.c
47974@@ -1630,7 +1630,9 @@ static int mmci_probe(struct amba_device *dev,
47975 mmc->caps |= MMC_CAP_CMD23;
47976
47977 if (variant->busy_detect) {
47978- mmci_ops.card_busy = mmci_card_busy;
47979+ pax_open_kernel();
47980+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
47981+ pax_close_kernel();
47982 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47983 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47984 mmc->max_busy_timeout = 0;
47985diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47986index f84cfb0..aebe5d6 100644
47987--- a/drivers/mmc/host/omap_hsmmc.c
47988+++ b/drivers/mmc/host/omap_hsmmc.c
47989@@ -2054,7 +2054,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47990
47991 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47992 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47993- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47994+ pax_open_kernel();
47995+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47996+ pax_close_kernel();
47997 }
47998
47999 pm_runtime_enable(host->dev);
48000diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
48001index 10ef824..88461a2 100644
48002--- a/drivers/mmc/host/sdhci-esdhc-imx.c
48003+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
48004@@ -989,9 +989,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
48005 host->mmc->caps |= MMC_CAP_1_8V_DDR;
48006 }
48007
48008- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
48009- sdhci_esdhc_ops.platform_execute_tuning =
48010+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
48011+ pax_open_kernel();
48012+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
48013 esdhc_executing_tuning;
48014+ pax_close_kernel();
48015+ }
48016
48017 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
48018 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
48019diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
48020index c6d2dd7..81b1ca3 100644
48021--- a/drivers/mmc/host/sdhci-s3c.c
48022+++ b/drivers/mmc/host/sdhci-s3c.c
48023@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
48024 * we can use overriding functions instead of default.
48025 */
48026 if (sc->no_divider) {
48027- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48028- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48029- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48030+ pax_open_kernel();
48031+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48032+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48033+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48034+ pax_close_kernel();
48035 }
48036
48037 /* It supports additional host capabilities if needed */
48038diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
48039index 423666b..81ff5eb 100644
48040--- a/drivers/mtd/chips/cfi_cmdset_0020.c
48041+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
48042@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
48043 size_t totlen = 0, thislen;
48044 int ret = 0;
48045 size_t buflen = 0;
48046- static char *buffer;
48047+ char *buffer;
48048
48049 if (!ECCBUF_SIZE) {
48050 /* We should fall back to a general writev implementation.
48051diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
48052index f44c606..aa4e804 100644
48053--- a/drivers/mtd/nand/denali.c
48054+++ b/drivers/mtd/nand/denali.c
48055@@ -24,6 +24,7 @@
48056 #include <linux/slab.h>
48057 #include <linux/mtd/mtd.h>
48058 #include <linux/module.h>
48059+#include <linux/slab.h>
48060
48061 #include "denali.h"
48062
48063diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48064index 33f3c3c..d6bbe6a 100644
48065--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48066+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48067@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
48068
48069 /* first try to map the upper buffer directly */
48070 if (virt_addr_valid(this->upper_buf) &&
48071- !object_is_on_stack(this->upper_buf)) {
48072+ !object_starts_on_stack(this->upper_buf)) {
48073 sg_init_one(sgl, this->upper_buf, this->upper_len);
48074 ret = dma_map_sg(this->dev, sgl, 1, dr);
48075 if (ret == 0)
48076diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
48077index a5dfbfb..8042ab4 100644
48078--- a/drivers/mtd/nftlmount.c
48079+++ b/drivers/mtd/nftlmount.c
48080@@ -24,6 +24,7 @@
48081 #include <asm/errno.h>
48082 #include <linux/delay.h>
48083 #include <linux/slab.h>
48084+#include <linux/sched.h>
48085 #include <linux/mtd/mtd.h>
48086 #include <linux/mtd/nand.h>
48087 #include <linux/mtd/nftl.h>
48088diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
48089index c23184a..4115c41 100644
48090--- a/drivers/mtd/sm_ftl.c
48091+++ b/drivers/mtd/sm_ftl.c
48092@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
48093 #define SM_CIS_VENDOR_OFFSET 0x59
48094 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
48095 {
48096- struct attribute_group *attr_group;
48097+ attribute_group_no_const *attr_group;
48098 struct attribute **attributes;
48099 struct sm_sysfs_attribute *vendor_attribute;
48100 char *vendor;
48101diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
48102index 7b11243..b3278a3 100644
48103--- a/drivers/net/bonding/bond_netlink.c
48104+++ b/drivers/net/bonding/bond_netlink.c
48105@@ -585,7 +585,7 @@ nla_put_failure:
48106 return -EMSGSIZE;
48107 }
48108
48109-struct rtnl_link_ops bond_link_ops __read_mostly = {
48110+struct rtnl_link_ops bond_link_ops = {
48111 .kind = "bond",
48112 .priv_size = sizeof(struct bonding),
48113 .setup = bond_setup,
48114diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
48115index b3b922a..80bba38 100644
48116--- a/drivers/net/caif/caif_hsi.c
48117+++ b/drivers/net/caif/caif_hsi.c
48118@@ -1444,7 +1444,7 @@ err:
48119 return -ENODEV;
48120 }
48121
48122-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
48123+static struct rtnl_link_ops caif_hsi_link_ops = {
48124 .kind = "cfhsi",
48125 .priv_size = sizeof(struct cfhsi),
48126 .setup = cfhsi_setup,
48127diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
48128index 58808f65..0bdc7b3 100644
48129--- a/drivers/net/can/Kconfig
48130+++ b/drivers/net/can/Kconfig
48131@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
48132
48133 config CAN_FLEXCAN
48134 tristate "Support for Freescale FLEXCAN based chips"
48135- depends on ARM || PPC
48136+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
48137 ---help---
48138 Say Y here if you want to support for Freescale FlexCAN.
48139
48140diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
48141index b0f6924..59e9640 100644
48142--- a/drivers/net/can/dev.c
48143+++ b/drivers/net/can/dev.c
48144@@ -959,7 +959,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
48145 return -EOPNOTSUPP;
48146 }
48147
48148-static struct rtnl_link_ops can_link_ops __read_mostly = {
48149+static struct rtnl_link_ops can_link_ops = {
48150 .kind = "can",
48151 .maxtype = IFLA_CAN_MAX,
48152 .policy = can_policy,
48153diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
48154index 674f367..ec3a31f 100644
48155--- a/drivers/net/can/vcan.c
48156+++ b/drivers/net/can/vcan.c
48157@@ -163,7 +163,7 @@ static void vcan_setup(struct net_device *dev)
48158 dev->destructor = free_netdev;
48159 }
48160
48161-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
48162+static struct rtnl_link_ops vcan_link_ops = {
48163 .kind = "vcan",
48164 .setup = vcan_setup,
48165 };
48166diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
48167index 49adbf1..fff7ff8 100644
48168--- a/drivers/net/dummy.c
48169+++ b/drivers/net/dummy.c
48170@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
48171 return 0;
48172 }
48173
48174-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
48175+static struct rtnl_link_ops dummy_link_ops = {
48176 .kind = DRV_NAME,
48177 .setup = dummy_setup,
48178 .validate = dummy_validate,
48179diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
48180index 0443654..4f0aa18 100644
48181--- a/drivers/net/ethernet/8390/ax88796.c
48182+++ b/drivers/net/ethernet/8390/ax88796.c
48183@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
48184 if (ax->plat->reg_offsets)
48185 ei_local->reg_offset = ax->plat->reg_offsets;
48186 else {
48187+ resource_size_t _mem_size = mem_size;
48188+ do_div(_mem_size, 0x18);
48189 ei_local->reg_offset = ax->reg_offsets;
48190 for (ret = 0; ret < 0x18; ret++)
48191- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
48192+ ax->reg_offsets[ret] = _mem_size * ret;
48193 }
48194
48195 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
48196diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
48197index 6725dc0..163549c 100644
48198--- a/drivers/net/ethernet/altera/altera_tse_main.c
48199+++ b/drivers/net/ethernet/altera/altera_tse_main.c
48200@@ -1216,7 +1216,7 @@ static int tse_shutdown(struct net_device *dev)
48201 return 0;
48202 }
48203
48204-static struct net_device_ops altera_tse_netdev_ops = {
48205+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
48206 .ndo_open = tse_open,
48207 .ndo_stop = tse_shutdown,
48208 .ndo_start_xmit = tse_start_xmit,
48209@@ -1453,11 +1453,13 @@ static int altera_tse_probe(struct platform_device *pdev)
48210 ndev->netdev_ops = &altera_tse_netdev_ops;
48211 altera_tse_set_ethtool_ops(ndev);
48212
48213+ pax_open_kernel();
48214 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
48215
48216 if (priv->hash_filter)
48217 altera_tse_netdev_ops.ndo_set_rx_mode =
48218 tse_set_rx_mode_hashfilter;
48219+ pax_close_kernel();
48220
48221 /* Scatter/gather IO is not supported,
48222 * so it is turned off
48223diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48224index 29a0927..5a348e24 100644
48225--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48226+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48227@@ -1122,14 +1122,14 @@ do { \
48228 * operations, everything works on mask values.
48229 */
48230 #define XMDIO_READ(_pdata, _mmd, _reg) \
48231- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
48232+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
48233 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
48234
48235 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
48236 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
48237
48238 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
48239- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
48240+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
48241 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
48242
48243 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
48244diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48245index 8a50b01..39c1ad0 100644
48246--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48247+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48248@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
48249
48250 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
48251
48252- pdata->hw_if.config_dcb_tc(pdata);
48253+ pdata->hw_if->config_dcb_tc(pdata);
48254
48255 return 0;
48256 }
48257@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
48258
48259 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
48260
48261- pdata->hw_if.config_dcb_pfc(pdata);
48262+ pdata->hw_if->config_dcb_pfc(pdata);
48263
48264 return 0;
48265 }
48266diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48267index d81fc6b..6f8ab25 100644
48268--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48269+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48270@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
48271
48272 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48273 {
48274- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48275+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48276 struct xgbe_channel *channel;
48277 struct xgbe_ring *ring;
48278 struct xgbe_ring_data *rdata;
48279@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48280
48281 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
48282 {
48283- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48284+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48285 struct xgbe_channel *channel;
48286 struct xgbe_ring *ring;
48287 struct xgbe_ring_desc *rdesc;
48288@@ -620,17 +620,12 @@ err_out:
48289 return 0;
48290 }
48291
48292-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
48293-{
48294- DBGPR("-->xgbe_init_function_ptrs_desc\n");
48295-
48296- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
48297- desc_if->free_ring_resources = xgbe_free_ring_resources;
48298- desc_if->map_tx_skb = xgbe_map_tx_skb;
48299- desc_if->map_rx_buffer = xgbe_map_rx_buffer;
48300- desc_if->unmap_rdata = xgbe_unmap_rdata;
48301- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
48302- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
48303-
48304- DBGPR("<--xgbe_init_function_ptrs_desc\n");
48305-}
48306+const struct xgbe_desc_if default_xgbe_desc_if = {
48307+ .alloc_ring_resources = xgbe_alloc_ring_resources,
48308+ .free_ring_resources = xgbe_free_ring_resources,
48309+ .map_tx_skb = xgbe_map_tx_skb,
48310+ .map_rx_buffer = xgbe_map_rx_buffer,
48311+ .unmap_rdata = xgbe_unmap_rdata,
48312+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
48313+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
48314+};
48315diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48316index 400757b..d8c53f6 100644
48317--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48318+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48319@@ -2748,7 +2748,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
48320
48321 static int xgbe_init(struct xgbe_prv_data *pdata)
48322 {
48323- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48324+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48325 int ret;
48326
48327 DBGPR("-->xgbe_init\n");
48328@@ -2813,108 +2813,103 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
48329 return 0;
48330 }
48331
48332-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
48333-{
48334- DBGPR("-->xgbe_init_function_ptrs\n");
48335-
48336- hw_if->tx_complete = xgbe_tx_complete;
48337-
48338- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
48339- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
48340- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
48341- hw_if->set_mac_address = xgbe_set_mac_address;
48342-
48343- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
48344- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
48345-
48346- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
48347- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
48348- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
48349- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
48350- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
48351-
48352- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
48353- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
48354-
48355- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
48356- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
48357- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
48358-
48359- hw_if->enable_tx = xgbe_enable_tx;
48360- hw_if->disable_tx = xgbe_disable_tx;
48361- hw_if->enable_rx = xgbe_enable_rx;
48362- hw_if->disable_rx = xgbe_disable_rx;
48363-
48364- hw_if->powerup_tx = xgbe_powerup_tx;
48365- hw_if->powerdown_tx = xgbe_powerdown_tx;
48366- hw_if->powerup_rx = xgbe_powerup_rx;
48367- hw_if->powerdown_rx = xgbe_powerdown_rx;
48368-
48369- hw_if->dev_xmit = xgbe_dev_xmit;
48370- hw_if->dev_read = xgbe_dev_read;
48371- hw_if->enable_int = xgbe_enable_int;
48372- hw_if->disable_int = xgbe_disable_int;
48373- hw_if->init = xgbe_init;
48374- hw_if->exit = xgbe_exit;
48375+const struct xgbe_hw_if default_xgbe_hw_if = {
48376+ .tx_complete = xgbe_tx_complete,
48377+
48378+ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
48379+ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
48380+ .add_mac_addresses = xgbe_add_mac_addresses,
48381+ .set_mac_address = xgbe_set_mac_address,
48382+
48383+ .enable_rx_csum = xgbe_enable_rx_csum,
48384+ .disable_rx_csum = xgbe_disable_rx_csum,
48385+
48386+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
48387+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
48388+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
48389+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
48390+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
48391+
48392+ .read_mmd_regs = xgbe_read_mmd_regs,
48393+ .write_mmd_regs = xgbe_write_mmd_regs,
48394+
48395+ .set_gmii_speed = xgbe_set_gmii_speed,
48396+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
48397+ .set_xgmii_speed = xgbe_set_xgmii_speed,
48398+
48399+ .enable_tx = xgbe_enable_tx,
48400+ .disable_tx = xgbe_disable_tx,
48401+ .enable_rx = xgbe_enable_rx,
48402+ .disable_rx = xgbe_disable_rx,
48403+
48404+ .powerup_tx = xgbe_powerup_tx,
48405+ .powerdown_tx = xgbe_powerdown_tx,
48406+ .powerup_rx = xgbe_powerup_rx,
48407+ .powerdown_rx = xgbe_powerdown_rx,
48408+
48409+ .dev_xmit = xgbe_dev_xmit,
48410+ .dev_read = xgbe_dev_read,
48411+ .enable_int = xgbe_enable_int,
48412+ .disable_int = xgbe_disable_int,
48413+ .init = xgbe_init,
48414+ .exit = xgbe_exit,
48415
48416 /* Descriptor related Sequences have to be initialized here */
48417- hw_if->tx_desc_init = xgbe_tx_desc_init;
48418- hw_if->rx_desc_init = xgbe_rx_desc_init;
48419- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
48420- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
48421- hw_if->is_last_desc = xgbe_is_last_desc;
48422- hw_if->is_context_desc = xgbe_is_context_desc;
48423- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
48424+ .tx_desc_init = xgbe_tx_desc_init,
48425+ .rx_desc_init = xgbe_rx_desc_init,
48426+ .tx_desc_reset = xgbe_tx_desc_reset,
48427+ .rx_desc_reset = xgbe_rx_desc_reset,
48428+ .is_last_desc = xgbe_is_last_desc,
48429+ .is_context_desc = xgbe_is_context_desc,
48430+ .tx_start_xmit = xgbe_tx_start_xmit,
48431
48432 /* For FLOW ctrl */
48433- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
48434- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
48435+ .config_tx_flow_control = xgbe_config_tx_flow_control,
48436+ .config_rx_flow_control = xgbe_config_rx_flow_control,
48437
48438 /* For RX coalescing */
48439- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
48440- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
48441- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
48442- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
48443+ .config_rx_coalesce = xgbe_config_rx_coalesce,
48444+ .config_tx_coalesce = xgbe_config_tx_coalesce,
48445+ .usec_to_riwt = xgbe_usec_to_riwt,
48446+ .riwt_to_usec = xgbe_riwt_to_usec,
48447
48448 /* For RX and TX threshold config */
48449- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
48450- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
48451+ .config_rx_threshold = xgbe_config_rx_threshold,
48452+ .config_tx_threshold = xgbe_config_tx_threshold,
48453
48454 /* For RX and TX Store and Forward Mode config */
48455- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
48456- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
48457+ .config_rsf_mode = xgbe_config_rsf_mode,
48458+ .config_tsf_mode = xgbe_config_tsf_mode,
48459
48460 /* For TX DMA Operating on Second Frame config */
48461- hw_if->config_osp_mode = xgbe_config_osp_mode;
48462+ .config_osp_mode = xgbe_config_osp_mode,
48463
48464 /* For RX and TX PBL config */
48465- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
48466- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
48467- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
48468- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
48469- hw_if->config_pblx8 = xgbe_config_pblx8;
48470+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
48471+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
48472+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
48473+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
48474+ .config_pblx8 = xgbe_config_pblx8,
48475
48476 /* For MMC statistics support */
48477- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
48478- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
48479- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
48480+ .tx_mmc_int = xgbe_tx_mmc_int,
48481+ .rx_mmc_int = xgbe_rx_mmc_int,
48482+ .read_mmc_stats = xgbe_read_mmc_stats,
48483
48484 /* For PTP config */
48485- hw_if->config_tstamp = xgbe_config_tstamp;
48486- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
48487- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
48488- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
48489- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
48490+ .config_tstamp = xgbe_config_tstamp,
48491+ .update_tstamp_addend = xgbe_update_tstamp_addend,
48492+ .set_tstamp_time = xgbe_set_tstamp_time,
48493+ .get_tstamp_time = xgbe_get_tstamp_time,
48494+ .get_tx_tstamp = xgbe_get_tx_tstamp,
48495
48496 /* For Data Center Bridging config */
48497- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
48498- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
48499+ .config_dcb_tc = xgbe_config_dcb_tc,
48500+ .config_dcb_pfc = xgbe_config_dcb_pfc,
48501
48502 /* For Receive Side Scaling */
48503- hw_if->enable_rss = xgbe_enable_rss;
48504- hw_if->disable_rss = xgbe_disable_rss;
48505- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
48506- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
48507-
48508- DBGPR("<--xgbe_init_function_ptrs\n");
48509-}
48510+ .enable_rss = xgbe_enable_rss,
48511+ .disable_rss = xgbe_disable_rss,
48512+ .set_rss_hash_key = xgbe_set_rss_hash_key,
48513+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
48514+};
48515diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48516index 885b02b..4b31a4c 100644
48517--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48518+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48519@@ -244,7 +244,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
48520 * support, tell it now
48521 */
48522 if (ring->tx.xmit_more)
48523- pdata->hw_if.tx_start_xmit(channel, ring);
48524+ pdata->hw_if->tx_start_xmit(channel, ring);
48525
48526 return NETDEV_TX_BUSY;
48527 }
48528@@ -272,7 +272,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
48529
48530 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48531 {
48532- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48533+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48534 struct xgbe_channel *channel;
48535 enum xgbe_int int_id;
48536 unsigned int i;
48537@@ -294,7 +294,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48538
48539 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48540 {
48541- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48542+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48543 struct xgbe_channel *channel;
48544 enum xgbe_int int_id;
48545 unsigned int i;
48546@@ -317,7 +317,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48547 static irqreturn_t xgbe_isr(int irq, void *data)
48548 {
48549 struct xgbe_prv_data *pdata = data;
48550- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48551+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48552 struct xgbe_channel *channel;
48553 unsigned int dma_isr, dma_ch_isr;
48554 unsigned int mac_isr, mac_tssr;
48555@@ -673,7 +673,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
48556
48557 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48558 {
48559- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48560+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48561
48562 DBGPR("-->xgbe_init_tx_coalesce\n");
48563
48564@@ -687,7 +687,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48565
48566 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48567 {
48568- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48569+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48570
48571 DBGPR("-->xgbe_init_rx_coalesce\n");
48572
48573@@ -701,7 +701,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48574
48575 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48576 {
48577- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48578+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48579 struct xgbe_channel *channel;
48580 struct xgbe_ring *ring;
48581 struct xgbe_ring_data *rdata;
48582@@ -726,7 +726,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48583
48584 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48585 {
48586- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48587+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48588 struct xgbe_channel *channel;
48589 struct xgbe_ring *ring;
48590 struct xgbe_ring_data *rdata;
48591@@ -752,7 +752,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48592 static void xgbe_adjust_link(struct net_device *netdev)
48593 {
48594 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48595- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48596+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48597 struct phy_device *phydev = pdata->phydev;
48598 int new_state = 0;
48599
48600@@ -860,7 +860,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
48601 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48602 {
48603 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48604- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48605+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48606 unsigned long flags;
48607
48608 DBGPR("-->xgbe_powerdown\n");
48609@@ -898,7 +898,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48610 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48611 {
48612 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48613- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48614+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48615 unsigned long flags;
48616
48617 DBGPR("-->xgbe_powerup\n");
48618@@ -935,7 +935,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48619
48620 static int xgbe_start(struct xgbe_prv_data *pdata)
48621 {
48622- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48623+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48624 struct net_device *netdev = pdata->netdev;
48625 int ret;
48626
48627@@ -976,7 +976,7 @@ err_napi:
48628
48629 static void xgbe_stop(struct xgbe_prv_data *pdata)
48630 {
48631- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48632+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48633 struct xgbe_channel *channel;
48634 struct net_device *netdev = pdata->netdev;
48635 struct netdev_queue *txq;
48636@@ -1203,7 +1203,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
48637 return -ERANGE;
48638 }
48639
48640- pdata->hw_if.config_tstamp(pdata, mac_tscr);
48641+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
48642
48643 memcpy(&pdata->tstamp_config, &config, sizeof(config));
48644
48645@@ -1352,7 +1352,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
48646 static int xgbe_open(struct net_device *netdev)
48647 {
48648 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48649- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48650+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48651 int ret;
48652
48653 DBGPR("-->xgbe_open\n");
48654@@ -1424,7 +1424,7 @@ err_phy_init:
48655 static int xgbe_close(struct net_device *netdev)
48656 {
48657 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48658- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48659+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48660
48661 DBGPR("-->xgbe_close\n");
48662
48663@@ -1452,8 +1452,8 @@ static int xgbe_close(struct net_device *netdev)
48664 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
48665 {
48666 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48667- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48668- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48669+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48670+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48671 struct xgbe_channel *channel;
48672 struct xgbe_ring *ring;
48673 struct xgbe_packet_data *packet;
48674@@ -1521,7 +1521,7 @@ tx_netdev_return:
48675 static void xgbe_set_rx_mode(struct net_device *netdev)
48676 {
48677 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48678- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48679+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48680 unsigned int pr_mode, am_mode;
48681
48682 DBGPR("-->xgbe_set_rx_mode\n");
48683@@ -1540,7 +1540,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
48684 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
48685 {
48686 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48687- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48688+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48689 struct sockaddr *saddr = addr;
48690
48691 DBGPR("-->xgbe_set_mac_address\n");
48692@@ -1607,7 +1607,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
48693
48694 DBGPR("-->%s\n", __func__);
48695
48696- pdata->hw_if.read_mmc_stats(pdata);
48697+ pdata->hw_if->read_mmc_stats(pdata);
48698
48699 s->rx_packets = pstats->rxframecount_gb;
48700 s->rx_bytes = pstats->rxoctetcount_gb;
48701@@ -1634,7 +1634,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
48702 u16 vid)
48703 {
48704 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48705- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48706+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48707
48708 DBGPR("-->%s\n", __func__);
48709
48710@@ -1650,7 +1650,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
48711 u16 vid)
48712 {
48713 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48714- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48715+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48716
48717 DBGPR("-->%s\n", __func__);
48718
48719@@ -1716,7 +1716,7 @@ static int xgbe_set_features(struct net_device *netdev,
48720 netdev_features_t features)
48721 {
48722 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48723- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48724+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48725 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
48726 int ret = 0;
48727
48728@@ -1781,8 +1781,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
48729 static void xgbe_rx_refresh(struct xgbe_channel *channel)
48730 {
48731 struct xgbe_prv_data *pdata = channel->pdata;
48732- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48733- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48734+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48735+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48736 struct xgbe_ring *ring = channel->rx_ring;
48737 struct xgbe_ring_data *rdata;
48738
48739@@ -1835,8 +1835,8 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata,
48740 static int xgbe_tx_poll(struct xgbe_channel *channel)
48741 {
48742 struct xgbe_prv_data *pdata = channel->pdata;
48743- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48744- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48745+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48746+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48747 struct xgbe_ring *ring = channel->tx_ring;
48748 struct xgbe_ring_data *rdata;
48749 struct xgbe_ring_desc *rdesc;
48750@@ -1901,7 +1901,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
48751 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48752 {
48753 struct xgbe_prv_data *pdata = channel->pdata;
48754- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48755+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48756 struct xgbe_ring *ring = channel->rx_ring;
48757 struct xgbe_ring_data *rdata;
48758 struct xgbe_packet_data *packet;
48759diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48760index ebf4893..a8f51c6 100644
48761--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48762+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48763@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48764
48765 DBGPR("-->%s\n", __func__);
48766
48767- pdata->hw_if.read_mmc_stats(pdata);
48768+ pdata->hw_if->read_mmc_stats(pdata);
48769 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48770 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48771 *data++ = *(u64 *)stat;
48772@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
48773 struct ethtool_coalesce *ec)
48774 {
48775 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48776- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48777+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48778 unsigned int riwt;
48779
48780 DBGPR("-->xgbe_get_coalesce\n");
48781@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48782 struct ethtool_coalesce *ec)
48783 {
48784 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48785- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48786+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48787 unsigned int rx_frames, rx_riwt, rx_usecs;
48788 unsigned int tx_frames, tx_usecs;
48789
48790@@ -536,7 +536,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
48791 const u8 *key, const u8 hfunc)
48792 {
48793 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48794- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48795+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48796 unsigned int ret;
48797
48798 if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
48799diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48800index 32dd651..225cca3 100644
48801--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48802+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48803@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48804 DBGPR("<--xgbe_default_config\n");
48805 }
48806
48807-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48808-{
48809- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48810- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48811-}
48812-
48813 #ifdef CONFIG_ACPI
48814 static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
48815 {
48816@@ -396,9 +390,8 @@ static int xgbe_probe(struct platform_device *pdev)
48817 memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
48818
48819 /* Set all the function pointers */
48820- xgbe_init_all_fptrs(pdata);
48821- hw_if = &pdata->hw_if;
48822- desc_if = &pdata->desc_if;
48823+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48824+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48825
48826 /* Issue software reset to device */
48827 hw_if->exit(pdata);
48828diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48829index 59e267f..0842a88 100644
48830--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48831+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48832@@ -126,7 +126,7 @@
48833 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48834 {
48835 struct xgbe_prv_data *pdata = mii->priv;
48836- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48837+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48838 int mmd_data;
48839
48840 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48841@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48842 u16 mmd_val)
48843 {
48844 struct xgbe_prv_data *pdata = mii->priv;
48845- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48846+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48847 int mmd_data = mmd_val;
48848
48849 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48850diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48851index f326178..8bd7daf 100644
48852--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48853+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48854@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48855 tstamp_cc);
48856 u64 nsec;
48857
48858- nsec = pdata->hw_if.get_tstamp_time(pdata);
48859+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48860
48861 return nsec;
48862 }
48863@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48864
48865 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48866
48867- pdata->hw_if.update_tstamp_addend(pdata, addend);
48868+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48869
48870 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48871
48872diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48873index 13e8f95..1d8beef 100644
48874--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48875+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48876@@ -675,8 +675,8 @@ struct xgbe_prv_data {
48877 int dev_irq;
48878 unsigned int per_channel_irq;
48879
48880- struct xgbe_hw_if hw_if;
48881- struct xgbe_desc_if desc_if;
48882+ struct xgbe_hw_if *hw_if;
48883+ struct xgbe_desc_if *desc_if;
48884
48885 /* AXI DMA settings */
48886 unsigned int coherent;
48887@@ -798,6 +798,9 @@ struct xgbe_prv_data {
48888 #endif
48889 };
48890
48891+extern const struct xgbe_hw_if default_xgbe_hw_if;
48892+extern const struct xgbe_desc_if default_xgbe_desc_if;
48893+
48894 /* Function prototypes*/
48895
48896 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48897diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48898index adcacda..fa6e0ae 100644
48899--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48900+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48901@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48902 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48903 {
48904 /* RX_MODE controlling object */
48905- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48906+ bnx2x_init_rx_mode_obj(bp);
48907
48908 /* multicast configuration controlling object */
48909 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48910diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48911index 07cdf9b..b08ecc7 100644
48912--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48913+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48914@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48915 return rc;
48916 }
48917
48918-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48919- struct bnx2x_rx_mode_obj *o)
48920+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48921 {
48922 if (CHIP_IS_E1x(bp)) {
48923- o->wait_comp = bnx2x_empty_rx_mode_wait;
48924- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48925+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48926+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48927 } else {
48928- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48929- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48930+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48931+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48932 }
48933 }
48934
48935diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48936index 86baecb..ff3bb46 100644
48937--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48938+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48939@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48940
48941 /********************* RX MODE ****************/
48942
48943-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48944- struct bnx2x_rx_mode_obj *o);
48945+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48946
48947 /**
48948 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48949diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48950index 31c9f82..e65e986 100644
48951--- a/drivers/net/ethernet/broadcom/tg3.h
48952+++ b/drivers/net/ethernet/broadcom/tg3.h
48953@@ -150,6 +150,7 @@
48954 #define CHIPREV_ID_5750_A0 0x4000
48955 #define CHIPREV_ID_5750_A1 0x4001
48956 #define CHIPREV_ID_5750_A3 0x4003
48957+#define CHIPREV_ID_5750_C1 0x4201
48958 #define CHIPREV_ID_5750_C2 0x4202
48959 #define CHIPREV_ID_5752_A0_HW 0x5000
48960 #define CHIPREV_ID_5752_A0 0x6000
48961diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
48962index 903466e..b285864 100644
48963--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
48964+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
48965@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
48966 }
48967
48968 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
48969- bna_cb_ioceth_enable,
48970- bna_cb_ioceth_disable,
48971- bna_cb_ioceth_hbfail,
48972- bna_cb_ioceth_reset
48973+ .enable_cbfn = bna_cb_ioceth_enable,
48974+ .disable_cbfn = bna_cb_ioceth_disable,
48975+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
48976+ .reset_cbfn = bna_cb_ioceth_reset
48977 };
48978
48979 static void bna_attr_init(struct bna_ioceth *ioceth)
48980diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48981index 8cffcdf..aadf043 100644
48982--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48983+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48984@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48985 */
48986 struct l2t_skb_cb {
48987 arp_failure_handler_func arp_failure_handler;
48988-};
48989+} __no_const;
48990
48991 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48992
48993diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48994index d929951..a2c23f5 100644
48995--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48996+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48997@@ -2215,7 +2215,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
48998
48999 int i;
49000 struct adapter *ap = netdev2adap(dev);
49001- static const unsigned int *reg_ranges;
49002+ const unsigned int *reg_ranges;
49003 int arr_size = 0, buf_size = 0;
49004
49005 if (is_t4(ap->params.chip)) {
49006diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
49007index badff18..e15c4ec 100644
49008--- a/drivers/net/ethernet/dec/tulip/de4x5.c
49009+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
49010@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
49011 for (i=0; i<ETH_ALEN; i++) {
49012 tmp.addr[i] = dev->dev_addr[i];
49013 }
49014- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
49015+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
49016 break;
49017
49018 case DE4X5_SET_HWADDR: /* Set the hardware address */
49019@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
49020 spin_lock_irqsave(&lp->lock, flags);
49021 memcpy(&statbuf, &lp->pktStats, ioc->len);
49022 spin_unlock_irqrestore(&lp->lock, flags);
49023- if (copy_to_user(ioc->data, &statbuf, ioc->len))
49024+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
49025 return -EFAULT;
49026 break;
49027 }
49028diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
49029index 893753f..3b5d790 100644
49030--- a/drivers/net/ethernet/emulex/benet/be_main.c
49031+++ b/drivers/net/ethernet/emulex/benet/be_main.c
49032@@ -536,7 +536,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
49033
49034 if (wrapped)
49035 newacc += 65536;
49036- ACCESS_ONCE(*acc) = newacc;
49037+ ACCESS_ONCE_RW(*acc) = newacc;
49038 }
49039
49040 static void populate_erx_stats(struct be_adapter *adapter,
49041diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
49042index 6d0c5d5..55be363 100644
49043--- a/drivers/net/ethernet/faraday/ftgmac100.c
49044+++ b/drivers/net/ethernet/faraday/ftgmac100.c
49045@@ -30,6 +30,8 @@
49046 #include <linux/netdevice.h>
49047 #include <linux/phy.h>
49048 #include <linux/platform_device.h>
49049+#include <linux/interrupt.h>
49050+#include <linux/irqreturn.h>
49051 #include <net/ip.h>
49052
49053 #include "ftgmac100.h"
49054diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
49055index dce5f7b..2433466 100644
49056--- a/drivers/net/ethernet/faraday/ftmac100.c
49057+++ b/drivers/net/ethernet/faraday/ftmac100.c
49058@@ -31,6 +31,8 @@
49059 #include <linux/module.h>
49060 #include <linux/netdevice.h>
49061 #include <linux/platform_device.h>
49062+#include <linux/interrupt.h>
49063+#include <linux/irqreturn.h>
49064
49065 #include "ftmac100.h"
49066
49067diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49068index fabcfa1..188fd22 100644
49069--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49070+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49071@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
49072 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
49073
49074 /* Update the base adjustement value. */
49075- ACCESS_ONCE(pf->ptp_base_adj) = incval;
49076+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
49077 smp_mb(); /* Force the above update. */
49078 }
49079
49080diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49081index 79c00f5..8da39f6 100644
49082--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49083+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49084@@ -785,7 +785,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
49085 }
49086
49087 /* update the base incval used to calculate frequency adjustment */
49088- ACCESS_ONCE(adapter->base_incval) = incval;
49089+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
49090 smp_mb();
49091
49092 /* need lock to prevent incorrect read while modifying cyclecounter */
49093diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49094index 8c234ec..757331f 100644
49095--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49096+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49097@@ -468,8 +468,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
49098 wmb();
49099
49100 /* we want to dirty this cache line once */
49101- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
49102- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
49103+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
49104+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
49105
49106 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
49107
49108diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49109index 6223930..975033d 100644
49110--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
49111+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49112@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49113 struct __vxge_hw_fifo *fifo;
49114 struct vxge_hw_fifo_config *config;
49115 u32 txdl_size, txdl_per_memblock;
49116- struct vxge_hw_mempool_cbs fifo_mp_callback;
49117+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
49118+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
49119+ };
49120+
49121 struct __vxge_hw_virtualpath *vpath;
49122
49123 if ((vp == NULL) || (attr == NULL)) {
49124@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49125 goto exit;
49126 }
49127
49128- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
49129-
49130 fifo->mempool =
49131 __vxge_hw_mempool_create(vpath->hldev,
49132 fifo->config->memblock_size,
49133diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49134index 2bb48d5..d1a865d 100644
49135--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49136+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49137@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
49138 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
49139 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
49140 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
49141- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49142+ pax_open_kernel();
49143+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49144+ pax_close_kernel();
49145 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49146 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
49147 max_tx_rings = QLCNIC_MAX_TX_RINGS;
49148diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49149index be7d7a6..a8983f8 100644
49150--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49151+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49152@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
49153 case QLCNIC_NON_PRIV_FUNC:
49154 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
49155 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49156- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49157+ pax_open_kernel();
49158+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49159+ pax_close_kernel();
49160 break;
49161 case QLCNIC_PRIV_FUNC:
49162 ahw->op_mode = QLCNIC_PRIV_FUNC;
49163 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
49164- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49165+ pax_open_kernel();
49166+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49167+ pax_close_kernel();
49168 break;
49169 case QLCNIC_MGMT_FUNC:
49170 ahw->op_mode = QLCNIC_MGMT_FUNC;
49171 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49172- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49173+ pax_open_kernel();
49174+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49175+ pax_close_kernel();
49176 break;
49177 default:
49178 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
49179diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49180index 332bb8a..e6adcd1 100644
49181--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49182+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49183@@ -1285,7 +1285,7 @@ flash_temp:
49184 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
49185 {
49186 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
49187- static const struct qlcnic_dump_operations *fw_dump_ops;
49188+ const struct qlcnic_dump_operations *fw_dump_ops;
49189 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
49190 u32 entry_offset, dump, no_entries, buf_offset = 0;
49191 int i, k, ops_cnt, ops_index, dump_size = 0;
49192diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
49193index c70ab40..00b28e0 100644
49194--- a/drivers/net/ethernet/realtek/r8169.c
49195+++ b/drivers/net/ethernet/realtek/r8169.c
49196@@ -788,22 +788,22 @@ struct rtl8169_private {
49197 struct mdio_ops {
49198 void (*write)(struct rtl8169_private *, int, int);
49199 int (*read)(struct rtl8169_private *, int);
49200- } mdio_ops;
49201+ } __no_const mdio_ops;
49202
49203 struct pll_power_ops {
49204 void (*down)(struct rtl8169_private *);
49205 void (*up)(struct rtl8169_private *);
49206- } pll_power_ops;
49207+ } __no_const pll_power_ops;
49208
49209 struct jumbo_ops {
49210 void (*enable)(struct rtl8169_private *);
49211 void (*disable)(struct rtl8169_private *);
49212- } jumbo_ops;
49213+ } __no_const jumbo_ops;
49214
49215 struct csi_ops {
49216 void (*write)(struct rtl8169_private *, int, int);
49217 u32 (*read)(struct rtl8169_private *, int);
49218- } csi_ops;
49219+ } __no_const csi_ops;
49220
49221 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
49222 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
49223diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
49224index 6b861e3..204ac86 100644
49225--- a/drivers/net/ethernet/sfc/ptp.c
49226+++ b/drivers/net/ethernet/sfc/ptp.c
49227@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
49228 ptp->start.dma_addr);
49229
49230 /* Clear flag that signals MC ready */
49231- ACCESS_ONCE(*start) = 0;
49232+ ACCESS_ONCE_RW(*start) = 0;
49233 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
49234 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
49235 EFX_BUG_ON_PARANOID(rc);
49236diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
49237index 10b6173..b605dfd5 100644
49238--- a/drivers/net/ethernet/sfc/selftest.c
49239+++ b/drivers/net/ethernet/sfc/selftest.c
49240@@ -46,7 +46,7 @@ struct efx_loopback_payload {
49241 struct iphdr ip;
49242 struct udphdr udp;
49243 __be16 iteration;
49244- const char msg[64];
49245+ char msg[64];
49246 } __packed;
49247
49248 /* Loopback test source MAC address */
49249diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49250index 08c483b..2c4a553 100644
49251--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49252+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49253@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
49254
49255 writel(value, ioaddr + MMC_CNTRL);
49256
49257- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49258- MMC_CNTRL, value);
49259+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49260+// MMC_CNTRL, value);
49261 }
49262
49263 /* To mask all all interrupts.*/
49264diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
49265index 17e2766..c332f1e 100644
49266--- a/drivers/net/ethernet/via/via-rhine.c
49267+++ b/drivers/net/ethernet/via/via-rhine.c
49268@@ -2514,7 +2514,7 @@ static struct platform_driver rhine_driver_platform = {
49269 }
49270 };
49271
49272-static struct dmi_system_id rhine_dmi_table[] __initdata = {
49273+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
49274 {
49275 .ident = "EPIA-M",
49276 .matches = {
49277diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
49278index 384ca4f..dd7d4f9 100644
49279--- a/drivers/net/hyperv/hyperv_net.h
49280+++ b/drivers/net/hyperv/hyperv_net.h
49281@@ -171,7 +171,7 @@ struct rndis_device {
49282 enum rndis_device_state state;
49283 bool link_state;
49284 bool link_change;
49285- atomic_t new_req_id;
49286+ atomic_unchecked_t new_req_id;
49287
49288 spinlock_t request_lock;
49289 struct list_head req_list;
49290diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
49291index 7816d98..7890614 100644
49292--- a/drivers/net/hyperv/rndis_filter.c
49293+++ b/drivers/net/hyperv/rndis_filter.c
49294@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
49295 * template
49296 */
49297 set = &rndis_msg->msg.set_req;
49298- set->req_id = atomic_inc_return(&dev->new_req_id);
49299+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49300
49301 /* Add to the request list */
49302 spin_lock_irqsave(&dev->request_lock, flags);
49303@@ -918,7 +918,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
49304
49305 /* Setup the rndis set */
49306 halt = &request->request_msg.msg.halt_req;
49307- halt->req_id = atomic_inc_return(&dev->new_req_id);
49308+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49309
49310 /* Ignore return since this msg is optional. */
49311 rndis_filter_send_request(dev, request);
49312diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
49313index 34f846b..4a0d5b1 100644
49314--- a/drivers/net/ifb.c
49315+++ b/drivers/net/ifb.c
49316@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
49317 return 0;
49318 }
49319
49320-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
49321+static struct rtnl_link_ops ifb_link_ops = {
49322 .kind = "ifb",
49323 .priv_size = sizeof(struct ifb_private),
49324 .setup = ifb_setup,
49325diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
49326index 1df38bd..4bc20b0 100644
49327--- a/drivers/net/macvlan.c
49328+++ b/drivers/net/macvlan.c
49329@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
49330 free_nskb:
49331 kfree_skb(nskb);
49332 err:
49333- atomic_long_inc(&skb->dev->rx_dropped);
49334+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
49335 }
49336
49337 static void macvlan_flush_sources(struct macvlan_port *port,
49338@@ -1459,13 +1459,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
49339 int macvlan_link_register(struct rtnl_link_ops *ops)
49340 {
49341 /* common fields */
49342- ops->priv_size = sizeof(struct macvlan_dev);
49343- ops->validate = macvlan_validate;
49344- ops->maxtype = IFLA_MACVLAN_MAX;
49345- ops->policy = macvlan_policy;
49346- ops->changelink = macvlan_changelink;
49347- ops->get_size = macvlan_get_size;
49348- ops->fill_info = macvlan_fill_info;
49349+ pax_open_kernel();
49350+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
49351+ *(void **)&ops->validate = macvlan_validate;
49352+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
49353+ *(const void **)&ops->policy = macvlan_policy;
49354+ *(void **)&ops->changelink = macvlan_changelink;
49355+ *(void **)&ops->get_size = macvlan_get_size;
49356+ *(void **)&ops->fill_info = macvlan_fill_info;
49357+ pax_close_kernel();
49358
49359 return rtnl_link_register(ops);
49360 };
49361@@ -1551,7 +1553,7 @@ static int macvlan_device_event(struct notifier_block *unused,
49362 return NOTIFY_DONE;
49363 }
49364
49365-static struct notifier_block macvlan_notifier_block __read_mostly = {
49366+static struct notifier_block macvlan_notifier_block = {
49367 .notifier_call = macvlan_device_event,
49368 };
49369
49370diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
49371index 27ecc5c..f636328 100644
49372--- a/drivers/net/macvtap.c
49373+++ b/drivers/net/macvtap.c
49374@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
49375 dev->tx_queue_len = TUN_READQ_SIZE;
49376 }
49377
49378-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
49379+static struct rtnl_link_ops macvtap_link_ops = {
49380 .kind = "macvtap",
49381 .setup = macvtap_setup,
49382 .newlink = macvtap_newlink,
49383@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
49384
49385 ret = 0;
49386 u = q->flags;
49387- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49388+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49389 put_user(u, &ifr->ifr_flags))
49390 ret = -EFAULT;
49391 macvtap_put_vlan(vlan);
49392@@ -1217,7 +1217,7 @@ static int macvtap_device_event(struct notifier_block *unused,
49393 return NOTIFY_DONE;
49394 }
49395
49396-static struct notifier_block macvtap_notifier_block __read_mostly = {
49397+static struct notifier_block macvtap_notifier_block = {
49398 .notifier_call = macvtap_device_event,
49399 };
49400
49401diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
49402index 34924df..a747360 100644
49403--- a/drivers/net/nlmon.c
49404+++ b/drivers/net/nlmon.c
49405@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
49406 return 0;
49407 }
49408
49409-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
49410+static struct rtnl_link_ops nlmon_link_ops = {
49411 .kind = "nlmon",
49412 .priv_size = sizeof(struct nlmon),
49413 .setup = nlmon_setup,
49414diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
49415index bdfe51f..e7845c7 100644
49416--- a/drivers/net/phy/phy_device.c
49417+++ b/drivers/net/phy/phy_device.c
49418@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
49419 * zero on success.
49420 *
49421 */
49422-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49423+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
49424 struct phy_c45_device_ids *c45_ids) {
49425 int phy_reg;
49426 int i, reg_addr;
49427@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49428 * its return value is in turn returned.
49429 *
49430 */
49431-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49432+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
49433 bool is_c45, struct phy_c45_device_ids *c45_ids)
49434 {
49435 int phy_reg;
49436@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49437 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
49438 {
49439 struct phy_c45_device_ids c45_ids = {0};
49440- u32 phy_id = 0;
49441+ int phy_id = 0;
49442 int r;
49443
49444 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
49445diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
49446index 9d15566..5ad4ef6 100644
49447--- a/drivers/net/ppp/ppp_generic.c
49448+++ b/drivers/net/ppp/ppp_generic.c
49449@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49450 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
49451 struct ppp_stats stats;
49452 struct ppp_comp_stats cstats;
49453- char *vers;
49454
49455 switch (cmd) {
49456 case SIOCGPPPSTATS:
49457@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49458 break;
49459
49460 case SIOCGPPPVER:
49461- vers = PPP_VERSION;
49462- if (copy_to_user(addr, vers, strlen(vers) + 1))
49463+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
49464 break;
49465 err = 0;
49466 break;
49467diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
49468index 079f7ad..b2a2bfa7 100644
49469--- a/drivers/net/slip/slhc.c
49470+++ b/drivers/net/slip/slhc.c
49471@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
49472 register struct tcphdr *thp;
49473 register struct iphdr *ip;
49474 register struct cstate *cs;
49475- int len, hdrlen;
49476+ long len, hdrlen;
49477 unsigned char *cp = icp;
49478
49479 /* We've got a compressed packet; read the change byte */
49480diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
49481index 7d39484..d58499d 100644
49482--- a/drivers/net/team/team.c
49483+++ b/drivers/net/team/team.c
49484@@ -2099,7 +2099,7 @@ static unsigned int team_get_num_rx_queues(void)
49485 return TEAM_DEFAULT_NUM_RX_QUEUES;
49486 }
49487
49488-static struct rtnl_link_ops team_link_ops __read_mostly = {
49489+static struct rtnl_link_ops team_link_ops = {
49490 .kind = DRV_NAME,
49491 .priv_size = sizeof(struct team),
49492 .setup = team_setup,
49493@@ -2889,7 +2889,7 @@ static int team_device_event(struct notifier_block *unused,
49494 return NOTIFY_DONE;
49495 }
49496
49497-static struct notifier_block team_notifier_block __read_mostly = {
49498+static struct notifier_block team_notifier_block = {
49499 .notifier_call = team_device_event,
49500 };
49501
49502diff --git a/drivers/net/tun.c b/drivers/net/tun.c
49503index 857dca4..642f532 100644
49504--- a/drivers/net/tun.c
49505+++ b/drivers/net/tun.c
49506@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
49507 return -EINVAL;
49508 }
49509
49510-static struct rtnl_link_ops tun_link_ops __read_mostly = {
49511+static struct rtnl_link_ops tun_link_ops = {
49512 .kind = DRV_NAME,
49513 .priv_size = sizeof(struct tun_struct),
49514 .setup = tun_setup,
49515@@ -1830,7 +1830,7 @@ unlock:
49516 }
49517
49518 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49519- unsigned long arg, int ifreq_len)
49520+ unsigned long arg, size_t ifreq_len)
49521 {
49522 struct tun_file *tfile = file->private_data;
49523 struct tun_struct *tun;
49524@@ -1844,6 +1844,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49525 int le;
49526 int ret;
49527
49528+ if (ifreq_len > sizeof ifr)
49529+ return -EFAULT;
49530+
49531 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
49532 if (copy_from_user(&ifr, argp, ifreq_len))
49533 return -EFAULT;
49534diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
49535index 778e915..58c4d95 100644
49536--- a/drivers/net/usb/hso.c
49537+++ b/drivers/net/usb/hso.c
49538@@ -70,7 +70,7 @@
49539 #include <asm/byteorder.h>
49540 #include <linux/serial_core.h>
49541 #include <linux/serial.h>
49542-
49543+#include <asm/local.h>
49544
49545 #define MOD_AUTHOR "Option Wireless"
49546 #define MOD_DESCRIPTION "USB High Speed Option driver"
49547@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
49548 struct urb *urb;
49549
49550 urb = serial->rx_urb[0];
49551- if (serial->port.count > 0) {
49552+ if (atomic_read(&serial->port.count) > 0) {
49553 count = put_rxbuf_data(urb, serial);
49554 if (count == -1)
49555 return;
49556@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
49557 DUMP1(urb->transfer_buffer, urb->actual_length);
49558
49559 /* Anyone listening? */
49560- if (serial->port.count == 0)
49561+ if (atomic_read(&serial->port.count) == 0)
49562 return;
49563
49564 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
49565@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49566 tty_port_tty_set(&serial->port, tty);
49567
49568 /* check for port already opened, if not set the termios */
49569- serial->port.count++;
49570- if (serial->port.count == 1) {
49571+ if (atomic_inc_return(&serial->port.count) == 1) {
49572 serial->rx_state = RX_IDLE;
49573 /* Force default termio settings */
49574 _hso_serial_set_termios(tty, NULL);
49575@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49576 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
49577 if (result) {
49578 hso_stop_serial_device(serial->parent);
49579- serial->port.count--;
49580+ atomic_dec(&serial->port.count);
49581 } else {
49582 kref_get(&serial->parent->ref);
49583 }
49584@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
49585
49586 /* reset the rts and dtr */
49587 /* do the actual close */
49588- serial->port.count--;
49589+ atomic_dec(&serial->port.count);
49590
49591- if (serial->port.count <= 0) {
49592- serial->port.count = 0;
49593+ if (atomic_read(&serial->port.count) <= 0) {
49594+ atomic_set(&serial->port.count, 0);
49595 tty_port_tty_set(&serial->port, NULL);
49596 if (!usb_gone)
49597 hso_stop_serial_device(serial->parent);
49598@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
49599
49600 /* the actual setup */
49601 spin_lock_irqsave(&serial->serial_lock, flags);
49602- if (serial->port.count)
49603+ if (atomic_read(&serial->port.count))
49604 _hso_serial_set_termios(tty, old);
49605 else
49606 tty->termios = *old;
49607@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
49608 D1("Pending read interrupt on port %d\n", i);
49609 spin_lock(&serial->serial_lock);
49610 if (serial->rx_state == RX_IDLE &&
49611- serial->port.count > 0) {
49612+ atomic_read(&serial->port.count) > 0) {
49613 /* Setup and send a ctrl req read on
49614 * port i */
49615 if (!serial->rx_urb_filled[0]) {
49616@@ -3053,7 +3052,7 @@ static int hso_resume(struct usb_interface *iface)
49617 /* Start all serial ports */
49618 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
49619 if (serial_table[i] && (serial_table[i]->interface == iface)) {
49620- if (dev2ser(serial_table[i])->port.count) {
49621+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
49622 result =
49623 hso_start_serial_device(serial_table[i], GFP_NOIO);
49624 hso_kick_transmit(dev2ser(serial_table[i]));
49625diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
49626index 9f7c0ab..1577b4a 100644
49627--- a/drivers/net/usb/r8152.c
49628+++ b/drivers/net/usb/r8152.c
49629@@ -601,7 +601,7 @@ struct r8152 {
49630 void (*unload)(struct r8152 *);
49631 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
49632 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
49633- } rtl_ops;
49634+ } __no_const rtl_ops;
49635
49636 int intr_interval;
49637 u32 saved_wolopts;
49638diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
49639index a2515887..6d13233 100644
49640--- a/drivers/net/usb/sierra_net.c
49641+++ b/drivers/net/usb/sierra_net.c
49642@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
49643 /* atomic counter partially included in MAC address to make sure 2 devices
49644 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
49645 */
49646-static atomic_t iface_counter = ATOMIC_INIT(0);
49647+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
49648
49649 /*
49650 * SYNC Timer Delay definition used to set the expiry time
49651@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
49652 dev->net->netdev_ops = &sierra_net_device_ops;
49653
49654 /* change MAC addr to include, ifacenum, and to be unique */
49655- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
49656+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
49657 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
49658
49659 /* we will have to manufacture ethernet headers, prepare template */
49660diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
49661index 777757a..395a767 100644
49662--- a/drivers/net/usb/usbnet.c
49663+++ b/drivers/net/usb/usbnet.c
49664@@ -1285,7 +1285,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
49665 struct net_device *net)
49666 {
49667 struct usbnet *dev = netdev_priv(net);
49668- int length;
49669+ unsigned int length;
49670 struct urb *urb = NULL;
49671 struct skb_data *entry;
49672 struct driver_info *info = dev->driver_info;
49673@@ -1413,7 +1413,7 @@ not_drop:
49674 }
49675 } else
49676 netif_dbg(dev, tx_queued, dev->net,
49677- "> tx, len %d, type 0x%x\n", length, skb->protocol);
49678+ "> tx, len %u, type 0x%x\n", length, skb->protocol);
49679 #ifdef CONFIG_PM
49680 deferred:
49681 #endif
49682diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
49683index 59b0e97..a6ed579 100644
49684--- a/drivers/net/virtio_net.c
49685+++ b/drivers/net/virtio_net.c
49686@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
49687 #define RECEIVE_AVG_WEIGHT 64
49688
49689 /* Minimum alignment for mergeable packet buffers. */
49690-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
49691+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
49692
49693 #define VIRTNET_DRIVER_VERSION "1.0.0"
49694
49695diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
49696index fceb637..37c70fd 100644
49697--- a/drivers/net/vxlan.c
49698+++ b/drivers/net/vxlan.c
49699@@ -2935,7 +2935,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
49700 return vxlan->net;
49701 }
49702
49703-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
49704+static struct rtnl_link_ops vxlan_link_ops = {
49705 .kind = "vxlan",
49706 .maxtype = IFLA_VXLAN_MAX,
49707 .policy = vxlan_policy,
49708@@ -2983,7 +2983,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
49709 return NOTIFY_DONE;
49710 }
49711
49712-static struct notifier_block vxlan_notifier_block __read_mostly = {
49713+static struct notifier_block vxlan_notifier_block = {
49714 .notifier_call = vxlan_lowerdev_event,
49715 };
49716
49717diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
49718index 5920c99..ff2e4a5 100644
49719--- a/drivers/net/wan/lmc/lmc_media.c
49720+++ b/drivers/net/wan/lmc/lmc_media.c
49721@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
49722 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
49723
49724 lmc_media_t lmc_ds3_media = {
49725- lmc_ds3_init, /* special media init stuff */
49726- lmc_ds3_default, /* reset to default state */
49727- lmc_ds3_set_status, /* reset status to state provided */
49728- lmc_dummy_set_1, /* set clock source */
49729- lmc_dummy_set2_1, /* set line speed */
49730- lmc_ds3_set_100ft, /* set cable length */
49731- lmc_ds3_set_scram, /* set scrambler */
49732- lmc_ds3_get_link_status, /* get link status */
49733- lmc_dummy_set_1, /* set link status */
49734- lmc_ds3_set_crc_length, /* set CRC length */
49735- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49736- lmc_ds3_watchdog
49737+ .init = lmc_ds3_init, /* special media init stuff */
49738+ .defaults = lmc_ds3_default, /* reset to default state */
49739+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
49740+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
49741+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49742+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
49743+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
49744+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
49745+ .set_link_status = lmc_dummy_set_1, /* set link status */
49746+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
49747+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49748+ .watchdog = lmc_ds3_watchdog
49749 };
49750
49751 lmc_media_t lmc_hssi_media = {
49752- lmc_hssi_init, /* special media init stuff */
49753- lmc_hssi_default, /* reset to default state */
49754- lmc_hssi_set_status, /* reset status to state provided */
49755- lmc_hssi_set_clock, /* set clock source */
49756- lmc_dummy_set2_1, /* set line speed */
49757- lmc_dummy_set_1, /* set cable length */
49758- lmc_dummy_set_1, /* set scrambler */
49759- lmc_hssi_get_link_status, /* get link status */
49760- lmc_hssi_set_link_status, /* set link status */
49761- lmc_hssi_set_crc_length, /* set CRC length */
49762- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49763- lmc_hssi_watchdog
49764+ .init = lmc_hssi_init, /* special media init stuff */
49765+ .defaults = lmc_hssi_default, /* reset to default state */
49766+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
49767+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
49768+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49769+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49770+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49771+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49772+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49773+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49774+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49775+ .watchdog = lmc_hssi_watchdog
49776 };
49777
49778-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49779- lmc_ssi_default, /* reset to default state */
49780- lmc_ssi_set_status, /* reset status to state provided */
49781- lmc_ssi_set_clock, /* set clock source */
49782- lmc_ssi_set_speed, /* set line speed */
49783- lmc_dummy_set_1, /* set cable length */
49784- lmc_dummy_set_1, /* set scrambler */
49785- lmc_ssi_get_link_status, /* get link status */
49786- lmc_ssi_set_link_status, /* set link status */
49787- lmc_ssi_set_crc_length, /* set CRC length */
49788- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49789- lmc_ssi_watchdog
49790+lmc_media_t lmc_ssi_media = {
49791+ .init = lmc_ssi_init, /* special media init stuff */
49792+ .defaults = lmc_ssi_default, /* reset to default state */
49793+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49794+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49795+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49796+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49797+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49798+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49799+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49800+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49801+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49802+ .watchdog = lmc_ssi_watchdog
49803 };
49804
49805 lmc_media_t lmc_t1_media = {
49806- lmc_t1_init, /* special media init stuff */
49807- lmc_t1_default, /* reset to default state */
49808- lmc_t1_set_status, /* reset status to state provided */
49809- lmc_t1_set_clock, /* set clock source */
49810- lmc_dummy_set2_1, /* set line speed */
49811- lmc_dummy_set_1, /* set cable length */
49812- lmc_dummy_set_1, /* set scrambler */
49813- lmc_t1_get_link_status, /* get link status */
49814- lmc_dummy_set_1, /* set link status */
49815- lmc_t1_set_crc_length, /* set CRC length */
49816- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49817- lmc_t1_watchdog
49818+ .init = lmc_t1_init, /* special media init stuff */
49819+ .defaults = lmc_t1_default, /* reset to default state */
49820+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49821+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49822+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49823+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49824+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49825+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49826+ .set_link_status = lmc_dummy_set_1, /* set link status */
49827+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49828+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49829+ .watchdog = lmc_t1_watchdog
49830 };
49831
49832 static void
49833diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49834index feacc3b..5bac0de 100644
49835--- a/drivers/net/wan/z85230.c
49836+++ b/drivers/net/wan/z85230.c
49837@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49838
49839 struct z8530_irqhandler z8530_sync =
49840 {
49841- z8530_rx,
49842- z8530_tx,
49843- z8530_status
49844+ .rx = z8530_rx,
49845+ .tx = z8530_tx,
49846+ .status = z8530_status
49847 };
49848
49849 EXPORT_SYMBOL(z8530_sync);
49850@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49851 }
49852
49853 static struct z8530_irqhandler z8530_dma_sync = {
49854- z8530_dma_rx,
49855- z8530_dma_tx,
49856- z8530_dma_status
49857+ .rx = z8530_dma_rx,
49858+ .tx = z8530_dma_tx,
49859+ .status = z8530_dma_status
49860 };
49861
49862 static struct z8530_irqhandler z8530_txdma_sync = {
49863- z8530_rx,
49864- z8530_dma_tx,
49865- z8530_dma_status
49866+ .rx = z8530_rx,
49867+ .tx = z8530_dma_tx,
49868+ .status = z8530_dma_status
49869 };
49870
49871 /**
49872@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49873
49874 struct z8530_irqhandler z8530_nop=
49875 {
49876- z8530_rx_clear,
49877- z8530_tx_clear,
49878- z8530_status_clear
49879+ .rx = z8530_rx_clear,
49880+ .tx = z8530_tx_clear,
49881+ .status = z8530_status_clear
49882 };
49883
49884
49885diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49886index 0b60295..b8bfa5b 100644
49887--- a/drivers/net/wimax/i2400m/rx.c
49888+++ b/drivers/net/wimax/i2400m/rx.c
49889@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49890 if (i2400m->rx_roq == NULL)
49891 goto error_roq_alloc;
49892
49893- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49894+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49895 GFP_KERNEL);
49896 if (rd == NULL) {
49897 result = -ENOMEM;
49898diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49899index e71a2ce..2268d61 100644
49900--- a/drivers/net/wireless/airo.c
49901+++ b/drivers/net/wireless/airo.c
49902@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49903 struct airo_info *ai = dev->ml_priv;
49904 int ridcode;
49905 int enabled;
49906- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49907+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49908 unsigned char *iobuf;
49909
49910 /* Only super-user can write RIDs */
49911diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
49912index da92bfa..5a9001a 100644
49913--- a/drivers/net/wireless/at76c50x-usb.c
49914+++ b/drivers/net/wireless/at76c50x-usb.c
49915@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
49916 }
49917
49918 /* Convert timeout from the DFU status to jiffies */
49919-static inline unsigned long at76_get_timeout(struct dfu_status *s)
49920+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
49921 {
49922 return msecs_to_jiffies((s->poll_timeout[2] << 16)
49923 | (s->poll_timeout[1] << 8)
49924diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
49925index 2fd9e18..3f55bdd 100644
49926--- a/drivers/net/wireless/ath/ath10k/htc.c
49927+++ b/drivers/net/wireless/ath/ath10k/htc.c
49928@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
49929 /* registered target arrival callback from the HIF layer */
49930 int ath10k_htc_init(struct ath10k *ar)
49931 {
49932- struct ath10k_hif_cb htc_callbacks;
49933+ static struct ath10k_hif_cb htc_callbacks = {
49934+ .rx_completion = ath10k_htc_rx_completion_handler,
49935+ .tx_completion = ath10k_htc_tx_completion_handler,
49936+ };
49937 struct ath10k_htc_ep *ep = NULL;
49938 struct ath10k_htc *htc = &ar->htc;
49939
49940@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
49941 ath10k_htc_reset_endpoint_states(htc);
49942
49943 /* setup HIF layer callbacks */
49944- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
49945- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
49946 htc->ar = ar;
49947
49948 /* Get HIF default pipe for HTC message exchange */
49949diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49950index 527179c..a890150 100644
49951--- a/drivers/net/wireless/ath/ath10k/htc.h
49952+++ b/drivers/net/wireless/ath/ath10k/htc.h
49953@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
49954
49955 struct ath10k_htc_ops {
49956 void (*target_send_suspend_complete)(struct ath10k *ar);
49957-};
49958+} __no_const;
49959
49960 struct ath10k_htc_ep_ops {
49961 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
49962 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
49963 void (*ep_tx_credits)(struct ath10k *);
49964-};
49965+} __no_const;
49966
49967 /* service connection information */
49968 struct ath10k_htc_svc_conn_req {
49969diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49970index f816909..e56cd8b 100644
49971--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49972+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49973@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49974 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
49975 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
49976
49977- ACCESS_ONCE(ads->ds_link) = i->link;
49978- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
49979+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
49980+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
49981
49982 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
49983 ctl6 = SM(i->keytype, AR_EncrType);
49984@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49985
49986 if ((i->is_first || i->is_last) &&
49987 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
49988- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
49989+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
49990 | set11nTries(i->rates, 1)
49991 | set11nTries(i->rates, 2)
49992 | set11nTries(i->rates, 3)
49993 | (i->dur_update ? AR_DurUpdateEna : 0)
49994 | SM(0, AR_BurstDur);
49995
49996- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
49997+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
49998 | set11nRate(i->rates, 1)
49999 | set11nRate(i->rates, 2)
50000 | set11nRate(i->rates, 3);
50001 } else {
50002- ACCESS_ONCE(ads->ds_ctl2) = 0;
50003- ACCESS_ONCE(ads->ds_ctl3) = 0;
50004+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
50005+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
50006 }
50007
50008 if (!i->is_first) {
50009- ACCESS_ONCE(ads->ds_ctl0) = 0;
50010- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50011- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50012+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
50013+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50014+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50015 return;
50016 }
50017
50018@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50019 break;
50020 }
50021
50022- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50023+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50024 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50025 | SM(i->txpower[0], AR_XmitPower0)
50026 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50027@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50028 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
50029 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
50030
50031- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50032- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50033+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50034+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50035
50036 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
50037 return;
50038
50039- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50040+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50041 | set11nPktDurRTSCTS(i->rates, 1);
50042
50043- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50044+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50045 | set11nPktDurRTSCTS(i->rates, 3);
50046
50047- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50048+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50049 | set11nRateFlags(i->rates, 1)
50050 | set11nRateFlags(i->rates, 2)
50051 | set11nRateFlags(i->rates, 3)
50052 | SM(i->rtscts_rate, AR_RTSCTSRate);
50053
50054- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50055- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50056- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50057+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50058+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50059+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50060 }
50061
50062 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
50063diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50064index da84b70..83e4978 100644
50065--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50066+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50067@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50068 (i->qcu << AR_TxQcuNum_S) | desc_len;
50069
50070 checksum += val;
50071- ACCESS_ONCE(ads->info) = val;
50072+ ACCESS_ONCE_RW(ads->info) = val;
50073
50074 checksum += i->link;
50075- ACCESS_ONCE(ads->link) = i->link;
50076+ ACCESS_ONCE_RW(ads->link) = i->link;
50077
50078 checksum += i->buf_addr[0];
50079- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
50080+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
50081 checksum += i->buf_addr[1];
50082- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
50083+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
50084 checksum += i->buf_addr[2];
50085- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
50086+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
50087 checksum += i->buf_addr[3];
50088- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
50089+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
50090
50091 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
50092- ACCESS_ONCE(ads->ctl3) = val;
50093+ ACCESS_ONCE_RW(ads->ctl3) = val;
50094 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
50095- ACCESS_ONCE(ads->ctl5) = val;
50096+ ACCESS_ONCE_RW(ads->ctl5) = val;
50097 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
50098- ACCESS_ONCE(ads->ctl7) = val;
50099+ ACCESS_ONCE_RW(ads->ctl7) = val;
50100 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
50101- ACCESS_ONCE(ads->ctl9) = val;
50102+ ACCESS_ONCE_RW(ads->ctl9) = val;
50103
50104 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
50105- ACCESS_ONCE(ads->ctl10) = checksum;
50106+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
50107
50108 if (i->is_first || i->is_last) {
50109- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
50110+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
50111 | set11nTries(i->rates, 1)
50112 | set11nTries(i->rates, 2)
50113 | set11nTries(i->rates, 3)
50114 | (i->dur_update ? AR_DurUpdateEna : 0)
50115 | SM(0, AR_BurstDur);
50116
50117- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
50118+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
50119 | set11nRate(i->rates, 1)
50120 | set11nRate(i->rates, 2)
50121 | set11nRate(i->rates, 3);
50122 } else {
50123- ACCESS_ONCE(ads->ctl13) = 0;
50124- ACCESS_ONCE(ads->ctl14) = 0;
50125+ ACCESS_ONCE_RW(ads->ctl13) = 0;
50126+ ACCESS_ONCE_RW(ads->ctl14) = 0;
50127 }
50128
50129 ads->ctl20 = 0;
50130@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50131
50132 ctl17 = SM(i->keytype, AR_EncrType);
50133 if (!i->is_first) {
50134- ACCESS_ONCE(ads->ctl11) = 0;
50135- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50136- ACCESS_ONCE(ads->ctl15) = 0;
50137- ACCESS_ONCE(ads->ctl16) = 0;
50138- ACCESS_ONCE(ads->ctl17) = ctl17;
50139- ACCESS_ONCE(ads->ctl18) = 0;
50140- ACCESS_ONCE(ads->ctl19) = 0;
50141+ ACCESS_ONCE_RW(ads->ctl11) = 0;
50142+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50143+ ACCESS_ONCE_RW(ads->ctl15) = 0;
50144+ ACCESS_ONCE_RW(ads->ctl16) = 0;
50145+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50146+ ACCESS_ONCE_RW(ads->ctl18) = 0;
50147+ ACCESS_ONCE_RW(ads->ctl19) = 0;
50148 return;
50149 }
50150
50151- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50152+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50153 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50154 | SM(i->txpower[0], AR_XmitPower0)
50155 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50156@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50157 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
50158 ctl12 |= SM(val, AR_PAPRDChainMask);
50159
50160- ACCESS_ONCE(ads->ctl12) = ctl12;
50161- ACCESS_ONCE(ads->ctl17) = ctl17;
50162+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
50163+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50164
50165- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50166+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50167 | set11nPktDurRTSCTS(i->rates, 1);
50168
50169- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50170+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50171 | set11nPktDurRTSCTS(i->rates, 3);
50172
50173- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
50174+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
50175 | set11nRateFlags(i->rates, 1)
50176 | set11nRateFlags(i->rates, 2)
50177 | set11nRateFlags(i->rates, 3)
50178 | SM(i->rtscts_rate, AR_RTSCTSRate);
50179
50180- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
50181+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
50182
50183- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50184- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50185- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50186+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50187+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50188+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50189 }
50190
50191 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
50192diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
50193index e82e570..8c3cf90 100644
50194--- a/drivers/net/wireless/ath/ath9k/hw.h
50195+++ b/drivers/net/wireless/ath/ath9k/hw.h
50196@@ -646,7 +646,7 @@ struct ath_hw_private_ops {
50197
50198 /* ANI */
50199 void (*ani_cache_ini_regs)(struct ath_hw *ah);
50200-};
50201+} __no_const;
50202
50203 /**
50204 * struct ath_spec_scan - parameters for Atheros spectral scan
50205@@ -722,7 +722,7 @@ struct ath_hw_ops {
50206 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50207 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
50208 #endif
50209-};
50210+} __no_const;
50211
50212 struct ath_nf_limits {
50213 s16 max;
50214diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
50215index 9ede991..a8f08fb 100644
50216--- a/drivers/net/wireless/ath/ath9k/main.c
50217+++ b/drivers/net/wireless/ath/ath9k/main.c
50218@@ -2537,16 +2537,18 @@ void ath9k_fill_chanctx_ops(void)
50219 if (!ath9k_is_chanctx_enabled())
50220 return;
50221
50222- ath9k_ops.hw_scan = ath9k_hw_scan;
50223- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50224- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50225- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50226- ath9k_ops.add_chanctx = ath9k_add_chanctx;
50227- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50228- ath9k_ops.change_chanctx = ath9k_change_chanctx;
50229- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50230- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50231- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50232+ pax_open_kernel();
50233+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
50234+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50235+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50236+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50237+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
50238+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50239+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
50240+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50241+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50242+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50243+ pax_close_kernel();
50244 }
50245
50246 #endif
50247diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
50248index 058a9f2..d5cb1ba 100644
50249--- a/drivers/net/wireless/b43/phy_lp.c
50250+++ b/drivers/net/wireless/b43/phy_lp.c
50251@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
50252 {
50253 struct ssb_bus *bus = dev->dev->sdev->bus;
50254
50255- static const struct b206x_channel *chandata = NULL;
50256+ const struct b206x_channel *chandata = NULL;
50257 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
50258 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
50259 u16 old_comm15, scale;
50260diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
50261index e566580..2c218ca 100644
50262--- a/drivers/net/wireless/iwlegacy/3945-mac.c
50263+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
50264@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
50265 */
50266 if (il3945_mod_params.disable_hw_scan) {
50267 D_INFO("Disabling hw_scan\n");
50268- il3945_mac_ops.hw_scan = NULL;
50269+ pax_open_kernel();
50270+ *(void **)&il3945_mac_ops.hw_scan = NULL;
50271+ pax_close_kernel();
50272 }
50273
50274 D_INFO("*** LOAD DRIVER ***\n");
50275diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50276index 0ffb6ff..c0b7f0e 100644
50277--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50278+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50279@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
50280 {
50281 struct iwl_priv *priv = file->private_data;
50282 char buf[64];
50283- int buf_size;
50284+ size_t buf_size;
50285 u32 offset, len;
50286
50287 memset(buf, 0, sizeof(buf));
50288@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
50289 struct iwl_priv *priv = file->private_data;
50290
50291 char buf[8];
50292- int buf_size;
50293+ size_t buf_size;
50294 u32 reset_flag;
50295
50296 memset(buf, 0, sizeof(buf));
50297@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
50298 {
50299 struct iwl_priv *priv = file->private_data;
50300 char buf[8];
50301- int buf_size;
50302+ size_t buf_size;
50303 int ht40;
50304
50305 memset(buf, 0, sizeof(buf));
50306@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
50307 {
50308 struct iwl_priv *priv = file->private_data;
50309 char buf[8];
50310- int buf_size;
50311+ size_t buf_size;
50312 int value;
50313
50314 memset(buf, 0, sizeof(buf));
50315@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
50316 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
50317 DEBUGFS_READ_FILE_OPS(current_sleep_command);
50318
50319-static const char *fmt_value = " %-30s %10u\n";
50320-static const char *fmt_hex = " %-30s 0x%02X\n";
50321-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
50322-static const char *fmt_header =
50323+static const char fmt_value[] = " %-30s %10u\n";
50324+static const char fmt_hex[] = " %-30s 0x%02X\n";
50325+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
50326+static const char fmt_header[] =
50327 "%-32s current cumulative delta max\n";
50328
50329 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
50330@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
50331 {
50332 struct iwl_priv *priv = file->private_data;
50333 char buf[8];
50334- int buf_size;
50335+ size_t buf_size;
50336 int clear;
50337
50338 memset(buf, 0, sizeof(buf));
50339@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
50340 {
50341 struct iwl_priv *priv = file->private_data;
50342 char buf[8];
50343- int buf_size;
50344+ size_t buf_size;
50345 int trace;
50346
50347 memset(buf, 0, sizeof(buf));
50348@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
50349 {
50350 struct iwl_priv *priv = file->private_data;
50351 char buf[8];
50352- int buf_size;
50353+ size_t buf_size;
50354 int missed;
50355
50356 memset(buf, 0, sizeof(buf));
50357@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
50358
50359 struct iwl_priv *priv = file->private_data;
50360 char buf[8];
50361- int buf_size;
50362+ size_t buf_size;
50363 int plcp;
50364
50365 memset(buf, 0, sizeof(buf));
50366@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
50367
50368 struct iwl_priv *priv = file->private_data;
50369 char buf[8];
50370- int buf_size;
50371+ size_t buf_size;
50372 int flush;
50373
50374 memset(buf, 0, sizeof(buf));
50375@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
50376
50377 struct iwl_priv *priv = file->private_data;
50378 char buf[8];
50379- int buf_size;
50380+ size_t buf_size;
50381 int rts;
50382
50383 if (!priv->cfg->ht_params)
50384@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
50385 {
50386 struct iwl_priv *priv = file->private_data;
50387 char buf[8];
50388- int buf_size;
50389+ size_t buf_size;
50390
50391 memset(buf, 0, sizeof(buf));
50392 buf_size = min(count, sizeof(buf) - 1);
50393@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
50394 struct iwl_priv *priv = file->private_data;
50395 u32 event_log_flag;
50396 char buf[8];
50397- int buf_size;
50398+ size_t buf_size;
50399
50400 /* check that the interface is up */
50401 if (!iwl_is_ready(priv))
50402@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
50403 struct iwl_priv *priv = file->private_data;
50404 char buf[8];
50405 u32 calib_disabled;
50406- int buf_size;
50407+ size_t buf_size;
50408
50409 memset(buf, 0, sizeof(buf));
50410 buf_size = min(count, sizeof(buf) - 1);
50411diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
50412index cb72edb..242b24f 100644
50413--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
50414+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
50415@@ -1837,7 +1837,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
50416 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
50417
50418 char buf[8];
50419- int buf_size;
50420+ size_t buf_size;
50421 u32 reset_flag;
50422
50423 memset(buf, 0, sizeof(buf));
50424@@ -1858,7 +1858,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
50425 {
50426 struct iwl_trans *trans = file->private_data;
50427 char buf[8];
50428- int buf_size;
50429+ size_t buf_size;
50430 int csr;
50431
50432 memset(buf, 0, sizeof(buf));
50433diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
50434index 8908be6..fe97ddd 100644
50435--- a/drivers/net/wireless/mac80211_hwsim.c
50436+++ b/drivers/net/wireless/mac80211_hwsim.c
50437@@ -3070,20 +3070,20 @@ static int __init init_mac80211_hwsim(void)
50438 if (channels < 1)
50439 return -EINVAL;
50440
50441- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
50442- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50443- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50444- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50445- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50446- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50447- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50448- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50449- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50450- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50451- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
50452- mac80211_hwsim_assign_vif_chanctx;
50453- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
50454- mac80211_hwsim_unassign_vif_chanctx;
50455+ pax_open_kernel();
50456+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
50457+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50458+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50459+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50460+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50461+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50462+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50463+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50464+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50465+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50466+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
50467+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
50468+ pax_close_kernel();
50469
50470 spin_lock_init(&hwsim_radio_lock);
50471 INIT_LIST_HEAD(&hwsim_radios);
50472diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
50473index 60d44ce..884dd1c 100644
50474--- a/drivers/net/wireless/rndis_wlan.c
50475+++ b/drivers/net/wireless/rndis_wlan.c
50476@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
50477
50478 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
50479
50480- if (rts_threshold < 0 || rts_threshold > 2347)
50481+ if (rts_threshold > 2347)
50482 rts_threshold = 2347;
50483
50484 tmp = cpu_to_le32(rts_threshold);
50485diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
50486index 9bb398b..b0cc047 100644
50487--- a/drivers/net/wireless/rt2x00/rt2x00.h
50488+++ b/drivers/net/wireless/rt2x00/rt2x00.h
50489@@ -375,7 +375,7 @@ struct rt2x00_intf {
50490 * for hardware which doesn't support hardware
50491 * sequence counting.
50492 */
50493- atomic_t seqno;
50494+ atomic_unchecked_t seqno;
50495 };
50496
50497 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
50498diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
50499index 68b620b..92ecd9e 100644
50500--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
50501+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
50502@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
50503 * sequence counter given by mac80211.
50504 */
50505 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
50506- seqno = atomic_add_return(0x10, &intf->seqno);
50507+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
50508 else
50509- seqno = atomic_read(&intf->seqno);
50510+ seqno = atomic_read_unchecked(&intf->seqno);
50511
50512 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
50513 hdr->seq_ctrl |= cpu_to_le16(seqno);
50514diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
50515index b661f896..ddf7d2b 100644
50516--- a/drivers/net/wireless/ti/wl1251/sdio.c
50517+++ b/drivers/net/wireless/ti/wl1251/sdio.c
50518@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
50519
50520 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
50521
50522- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50523- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50524+ pax_open_kernel();
50525+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50526+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50527+ pax_close_kernel();
50528
50529 wl1251_info("using dedicated interrupt line");
50530 } else {
50531- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50532- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50533+ pax_open_kernel();
50534+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50535+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50536+ pax_close_kernel();
50537
50538 wl1251_info("using SDIO interrupt");
50539 }
50540diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
50541index 144d1f8..7030936 100644
50542--- a/drivers/net/wireless/ti/wl12xx/main.c
50543+++ b/drivers/net/wireless/ti/wl12xx/main.c
50544@@ -657,7 +657,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50545 sizeof(wl->conf.mem));
50546
50547 /* read data preparation is only needed by wl127x */
50548- wl->ops->prepare_read = wl127x_prepare_read;
50549+ pax_open_kernel();
50550+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50551+ pax_close_kernel();
50552
50553 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50554 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50555@@ -682,7 +684,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50556 sizeof(wl->conf.mem));
50557
50558 /* read data preparation is only needed by wl127x */
50559- wl->ops->prepare_read = wl127x_prepare_read;
50560+ pax_open_kernel();
50561+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50562+ pax_close_kernel();
50563
50564 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50565 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50566diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
50567index 717c4f5..a813aeb 100644
50568--- a/drivers/net/wireless/ti/wl18xx/main.c
50569+++ b/drivers/net/wireless/ti/wl18xx/main.c
50570@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
50571 }
50572
50573 if (!checksum_param) {
50574- wl18xx_ops.set_rx_csum = NULL;
50575- wl18xx_ops.init_vif = NULL;
50576+ pax_open_kernel();
50577+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
50578+ *(void **)&wl18xx_ops.init_vif = NULL;
50579+ pax_close_kernel();
50580 }
50581
50582 /* Enable 11a Band only if we have 5G antennas */
50583diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
50584index a912dc0..a8225ba 100644
50585--- a/drivers/net/wireless/zd1211rw/zd_usb.c
50586+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
50587@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
50588 {
50589 struct zd_usb *usb = urb->context;
50590 struct zd_usb_interrupt *intr = &usb->intr;
50591- int len;
50592+ unsigned int len;
50593 u16 int_num;
50594
50595 ZD_ASSERT(in_interrupt());
50596diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
50597index ce2e2cf..f81e500 100644
50598--- a/drivers/nfc/nfcwilink.c
50599+++ b/drivers/nfc/nfcwilink.c
50600@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
50601
50602 static int nfcwilink_probe(struct platform_device *pdev)
50603 {
50604- static struct nfcwilink *drv;
50605+ struct nfcwilink *drv;
50606 int rc;
50607 __u32 protocols;
50608
50609diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
50610index 24d3d24..b662ba0 100644
50611--- a/drivers/nfc/st21nfca/st21nfca.c
50612+++ b/drivers/nfc/st21nfca/st21nfca.c
50613@@ -148,14 +148,14 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50614 ST21NFCA_DEVICE_MGNT_GATE,
50615 ST21NFCA_DEVICE_MGNT_PIPE);
50616 if (r < 0)
50617- goto free_info;
50618+ return r;
50619
50620 /* Get pipe list */
50621 r = nfc_hci_send_cmd(hdev, ST21NFCA_DEVICE_MGNT_GATE,
50622 ST21NFCA_DM_GETINFO, pipe_list, sizeof(pipe_list),
50623 &skb_pipe_list);
50624 if (r < 0)
50625- goto free_info;
50626+ return r;
50627
50628 /* Complete the existing gate_pipe table */
50629 for (i = 0; i < skb_pipe_list->len; i++) {
50630@@ -181,6 +181,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50631 info->src_host_id != ST21NFCA_ESE_HOST_ID) {
50632 pr_err("Unexpected apdu_reader pipe on host %x\n",
50633 info->src_host_id);
50634+ kfree_skb(skb_pipe_info);
50635 continue;
50636 }
50637
50638@@ -200,6 +201,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50639 hdev->pipes[st21nfca_gates[j].pipe].dest_host =
50640 info->src_host_id;
50641 }
50642+ kfree_skb(skb_pipe_info);
50643 }
50644
50645 /*
50646@@ -214,13 +216,12 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50647 st21nfca_gates[i].gate,
50648 st21nfca_gates[i].pipe);
50649 if (r < 0)
50650- goto free_info;
50651+ goto free_list;
50652 }
50653 }
50654
50655 memcpy(hdev->init_data.gates, st21nfca_gates, sizeof(st21nfca_gates));
50656-free_info:
50657- kfree_skb(skb_pipe_info);
50658+free_list:
50659 kfree_skb(skb_pipe_list);
50660 return r;
50661 }
50662@@ -588,7 +589,7 @@ static int st21nfca_get_iso14443_3_uid(struct nfc_hci_dev *hdev, u8 *gate,
50663 goto exit;
50664 }
50665
50666- gate = uid_skb->data;
50667+ memcpy(gate, uid_skb->data, uid_skb->len);
50668 *len = uid_skb->len;
50669 exit:
50670 kfree_skb(uid_skb);
50671diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
50672index 3a896c9..ac7b1c8 100644
50673--- a/drivers/of/fdt.c
50674+++ b/drivers/of/fdt.c
50675@@ -1118,7 +1118,9 @@ static int __init of_fdt_raw_init(void)
50676 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
50677 return 0;
50678 }
50679- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50680+ pax_open_kernel();
50681+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50682+ pax_close_kernel();
50683 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
50684 }
50685 late_initcall(of_fdt_raw_init);
50686diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
50687index d93b2b6..ae50401 100644
50688--- a/drivers/oprofile/buffer_sync.c
50689+++ b/drivers/oprofile/buffer_sync.c
50690@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
50691 if (cookie == NO_COOKIE)
50692 offset = pc;
50693 if (cookie == INVALID_COOKIE) {
50694- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50695+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50696 offset = pc;
50697 }
50698 if (cookie != last_cookie) {
50699@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
50700 /* add userspace sample */
50701
50702 if (!mm) {
50703- atomic_inc(&oprofile_stats.sample_lost_no_mm);
50704+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
50705 return 0;
50706 }
50707
50708 cookie = lookup_dcookie(mm, s->eip, &offset);
50709
50710 if (cookie == INVALID_COOKIE) {
50711- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50712+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50713 return 0;
50714 }
50715
50716@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
50717 /* ignore backtraces if failed to add a sample */
50718 if (state == sb_bt_start) {
50719 state = sb_bt_ignore;
50720- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
50721+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
50722 }
50723 }
50724 release_mm(mm);
50725diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
50726index c0cc4e7..44d4e54 100644
50727--- a/drivers/oprofile/event_buffer.c
50728+++ b/drivers/oprofile/event_buffer.c
50729@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
50730 }
50731
50732 if (buffer_pos == buffer_size) {
50733- atomic_inc(&oprofile_stats.event_lost_overflow);
50734+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
50735 return;
50736 }
50737
50738diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
50739index ed2c3ec..deda85a 100644
50740--- a/drivers/oprofile/oprof.c
50741+++ b/drivers/oprofile/oprof.c
50742@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
50743 if (oprofile_ops.switch_events())
50744 return;
50745
50746- atomic_inc(&oprofile_stats.multiplex_counter);
50747+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
50748 start_switch_worker();
50749 }
50750
50751diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
50752index ee2cfce..7f8f699 100644
50753--- a/drivers/oprofile/oprofile_files.c
50754+++ b/drivers/oprofile/oprofile_files.c
50755@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
50756
50757 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
50758
50759-static ssize_t timeout_read(struct file *file, char __user *buf,
50760+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
50761 size_t count, loff_t *offset)
50762 {
50763 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
50764diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
50765index 59659ce..6c860a0 100644
50766--- a/drivers/oprofile/oprofile_stats.c
50767+++ b/drivers/oprofile/oprofile_stats.c
50768@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
50769 cpu_buf->sample_invalid_eip = 0;
50770 }
50771
50772- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
50773- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
50774- atomic_set(&oprofile_stats.event_lost_overflow, 0);
50775- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
50776- atomic_set(&oprofile_stats.multiplex_counter, 0);
50777+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
50778+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
50779+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
50780+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
50781+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
50782 }
50783
50784
50785diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
50786index 1fc622b..8c48fc3 100644
50787--- a/drivers/oprofile/oprofile_stats.h
50788+++ b/drivers/oprofile/oprofile_stats.h
50789@@ -13,11 +13,11 @@
50790 #include <linux/atomic.h>
50791
50792 struct oprofile_stat_struct {
50793- atomic_t sample_lost_no_mm;
50794- atomic_t sample_lost_no_mapping;
50795- atomic_t bt_lost_no_mapping;
50796- atomic_t event_lost_overflow;
50797- atomic_t multiplex_counter;
50798+ atomic_unchecked_t sample_lost_no_mm;
50799+ atomic_unchecked_t sample_lost_no_mapping;
50800+ atomic_unchecked_t bt_lost_no_mapping;
50801+ atomic_unchecked_t event_lost_overflow;
50802+ atomic_unchecked_t multiplex_counter;
50803 };
50804
50805 extern struct oprofile_stat_struct oprofile_stats;
50806diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
50807index 3f49345..c750d0b 100644
50808--- a/drivers/oprofile/oprofilefs.c
50809+++ b/drivers/oprofile/oprofilefs.c
50810@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
50811
50812 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
50813 {
50814- atomic_t *val = file->private_data;
50815- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
50816+ atomic_unchecked_t *val = file->private_data;
50817+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50818 }
50819
50820
50821@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50822
50823
50824 int oprofilefs_create_ro_atomic(struct dentry *root,
50825- char const *name, atomic_t *val)
50826+ char const *name, atomic_unchecked_t *val)
50827 {
50828 return __oprofilefs_create_file(root, name,
50829 &atomic_ro_fops, 0444, val);
50830diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50831index bdef916..88c7dee 100644
50832--- a/drivers/oprofile/timer_int.c
50833+++ b/drivers/oprofile/timer_int.c
50834@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50835 return NOTIFY_OK;
50836 }
50837
50838-static struct notifier_block __refdata oprofile_cpu_notifier = {
50839+static struct notifier_block oprofile_cpu_notifier = {
50840 .notifier_call = oprofile_cpu_notify,
50841 };
50842
50843diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50844index 3b47080..6cd05dd 100644
50845--- a/drivers/parport/procfs.c
50846+++ b/drivers/parport/procfs.c
50847@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50848
50849 *ppos += len;
50850
50851- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50852+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50853 }
50854
50855 #ifdef CONFIG_PARPORT_1284
50856@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50857
50858 *ppos += len;
50859
50860- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50861+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50862 }
50863 #endif /* IEEE1284.3 support. */
50864
50865diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
50866index ba46e58..90cfc24 100644
50867--- a/drivers/pci/host/pci-host-generic.c
50868+++ b/drivers/pci/host/pci-host-generic.c
50869@@ -26,9 +26,9 @@
50870 #include <linux/platform_device.h>
50871
50872 struct gen_pci_cfg_bus_ops {
50873+ struct pci_ops ops;
50874 u32 bus_shift;
50875- void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
50876-};
50877+} __do_const;
50878
50879 struct gen_pci_cfg_windows {
50880 struct resource res;
50881@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
50882 }
50883
50884 static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
50885+ .ops = {
50886+ .map_bus = gen_pci_map_cfg_bus_cam,
50887+ .read = pci_generic_config_read,
50888+ .write = pci_generic_config_write,
50889+ },
50890 .bus_shift = 16,
50891- .map_bus = gen_pci_map_cfg_bus_cam,
50892 };
50893
50894 static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50895@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50896 }
50897
50898 static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
50899+ .ops = {
50900+ .map_bus = gen_pci_map_cfg_bus_ecam,
50901+ .read = pci_generic_config_read,
50902+ .write = pci_generic_config_write,
50903+ },
50904 .bus_shift = 20,
50905- .map_bus = gen_pci_map_cfg_bus_ecam,
50906-};
50907-
50908-static struct pci_ops gen_pci_ops = {
50909- .read = pci_generic_config_read,
50910- .write = pci_generic_config_write,
50911 };
50912
50913 static const struct of_device_id gen_pci_of_match[] = {
50914@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
50915 .private_data = (void **)&pci,
50916 .setup = gen_pci_setup,
50917 .map_irq = of_irq_parse_and_map_pci,
50918- .ops = &gen_pci_ops,
50919 };
50920
50921 if (!pci)
50922@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
50923
50924 of_id = of_match_node(gen_pci_of_match, np);
50925 pci->cfg.ops = of_id->data;
50926- gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
50927+ hw.ops = &pci->cfg.ops->ops;
50928 pci->host.dev.parent = dev;
50929 INIT_LIST_HEAD(&pci->host.windows);
50930 INIT_LIST_HEAD(&pci->resources);
50931diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50932index 6ca2399..68d866b 100644
50933--- a/drivers/pci/hotplug/acpiphp_ibm.c
50934+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50935@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50936 goto init_cleanup;
50937 }
50938
50939- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50940+ pax_open_kernel();
50941+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50942+ pax_close_kernel();
50943 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
50944
50945 return retval;
50946diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
50947index 66b7bbe..26bee78 100644
50948--- a/drivers/pci/hotplug/cpcihp_generic.c
50949+++ b/drivers/pci/hotplug/cpcihp_generic.c
50950@@ -73,7 +73,6 @@ static u16 port;
50951 static unsigned int enum_bit;
50952 static u8 enum_mask;
50953
50954-static struct cpci_hp_controller_ops generic_hpc_ops;
50955 static struct cpci_hp_controller generic_hpc;
50956
50957 static int __init validate_parameters(void)
50958@@ -139,6 +138,10 @@ static int query_enum(void)
50959 return ((value & enum_mask) == enum_mask);
50960 }
50961
50962+static struct cpci_hp_controller_ops generic_hpc_ops = {
50963+ .query_enum = query_enum,
50964+};
50965+
50966 static int __init cpcihp_generic_init(void)
50967 {
50968 int status;
50969@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
50970 pci_dev_put(dev);
50971
50972 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
50973- generic_hpc_ops.query_enum = query_enum;
50974 generic_hpc.ops = &generic_hpc_ops;
50975
50976 status = cpci_hp_register_controller(&generic_hpc);
50977diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
50978index 7ecf34e..effed62 100644
50979--- a/drivers/pci/hotplug/cpcihp_zt5550.c
50980+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
50981@@ -59,7 +59,6 @@
50982 /* local variables */
50983 static bool debug;
50984 static bool poll;
50985-static struct cpci_hp_controller_ops zt5550_hpc_ops;
50986 static struct cpci_hp_controller zt5550_hpc;
50987
50988 /* Primary cPCI bus bridge device */
50989@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
50990 return 0;
50991 }
50992
50993+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
50994+ .query_enum = zt5550_hc_query_enum,
50995+};
50996+
50997 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
50998 {
50999 int status;
51000@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
51001 dbg("returned from zt5550_hc_config");
51002
51003 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
51004- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
51005 zt5550_hpc.ops = &zt5550_hpc_ops;
51006 if (!poll) {
51007 zt5550_hpc.irq = hc_dev->irq;
51008 zt5550_hpc.irq_flags = IRQF_SHARED;
51009 zt5550_hpc.dev_id = hc_dev;
51010
51011- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
51012- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
51013- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
51014+ pax_open_kernel();
51015+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
51016+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
51017+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
51018+ pax_open_kernel();
51019 } else {
51020 info("using ENUM# polling mode");
51021 }
51022diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
51023index 1e08ff8c..3cd145f 100644
51024--- a/drivers/pci/hotplug/cpqphp_nvram.c
51025+++ b/drivers/pci/hotplug/cpqphp_nvram.c
51026@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
51027
51028 void compaq_nvram_init (void __iomem *rom_start)
51029 {
51030+#ifndef CONFIG_PAX_KERNEXEC
51031 if (rom_start)
51032 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
51033+#endif
51034
51035 dbg("int15 entry = %p\n", compaq_int15_entry_point);
51036
51037diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
51038index 56d8486..f26113f 100644
51039--- a/drivers/pci/hotplug/pci_hotplug_core.c
51040+++ b/drivers/pci/hotplug/pci_hotplug_core.c
51041@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
51042 return -EINVAL;
51043 }
51044
51045- slot->ops->owner = owner;
51046- slot->ops->mod_name = mod_name;
51047+ pax_open_kernel();
51048+ *(struct module **)&slot->ops->owner = owner;
51049+ *(const char **)&slot->ops->mod_name = mod_name;
51050+ pax_close_kernel();
51051
51052 mutex_lock(&pci_hp_mutex);
51053 /*
51054diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
51055index 07aa722..84514b4 100644
51056--- a/drivers/pci/hotplug/pciehp_core.c
51057+++ b/drivers/pci/hotplug/pciehp_core.c
51058@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
51059 struct slot *slot = ctrl->slot;
51060 struct hotplug_slot *hotplug = NULL;
51061 struct hotplug_slot_info *info = NULL;
51062- struct hotplug_slot_ops *ops = NULL;
51063+ hotplug_slot_ops_no_const *ops = NULL;
51064 char name[SLOT_NAME_SIZE];
51065 int retval = -ENOMEM;
51066
51067diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
51068index c3e7dfc..cbd9625 100644
51069--- a/drivers/pci/msi.c
51070+++ b/drivers/pci/msi.c
51071@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
51072 {
51073 struct attribute **msi_attrs;
51074 struct attribute *msi_attr;
51075- struct device_attribute *msi_dev_attr;
51076- struct attribute_group *msi_irq_group;
51077+ device_attribute_no_const *msi_dev_attr;
51078+ attribute_group_no_const *msi_irq_group;
51079 const struct attribute_group **msi_irq_groups;
51080 struct msi_desc *entry;
51081 int ret = -ENOMEM;
51082@@ -573,7 +573,7 @@ error_attrs:
51083 count = 0;
51084 msi_attr = msi_attrs[count];
51085 while (msi_attr) {
51086- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
51087+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
51088 kfree(msi_attr->name);
51089 kfree(msi_dev_attr);
51090 ++count;
51091diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
51092index 312f23a..d21181c 100644
51093--- a/drivers/pci/pci-sysfs.c
51094+++ b/drivers/pci/pci-sysfs.c
51095@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
51096 {
51097 /* allocate attribute structure, piggyback attribute name */
51098 int name_len = write_combine ? 13 : 10;
51099- struct bin_attribute *res_attr;
51100+ bin_attribute_no_const *res_attr;
51101 int retval;
51102
51103 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
51104@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
51105 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
51106 {
51107 int retval;
51108- struct bin_attribute *attr;
51109+ bin_attribute_no_const *attr;
51110
51111 /* If the device has VPD, try to expose it in sysfs. */
51112 if (dev->vpd) {
51113@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
51114 {
51115 int retval;
51116 int rom_size = 0;
51117- struct bin_attribute *attr;
51118+ bin_attribute_no_const *attr;
51119
51120 if (!sysfs_initialized)
51121 return -EACCES;
51122diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
51123index 4091f82..7d98eef 100644
51124--- a/drivers/pci/pci.h
51125+++ b/drivers/pci/pci.h
51126@@ -99,7 +99,7 @@ struct pci_vpd_ops {
51127 struct pci_vpd {
51128 unsigned int len;
51129 const struct pci_vpd_ops *ops;
51130- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
51131+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
51132 };
51133
51134 int pci_vpd_pci22_init(struct pci_dev *dev);
51135diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
51136index 820740a..8b1c673 100644
51137--- a/drivers/pci/pcie/aspm.c
51138+++ b/drivers/pci/pcie/aspm.c
51139@@ -27,9 +27,9 @@
51140 #define MODULE_PARAM_PREFIX "pcie_aspm."
51141
51142 /* Note: those are not register definitions */
51143-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
51144-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
51145-#define ASPM_STATE_L1 (4) /* L1 state */
51146+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
51147+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
51148+#define ASPM_STATE_L1 (4U) /* L1 state */
51149 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
51150 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
51151
51152diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
51153index be35da2..ec16cdb 100644
51154--- a/drivers/pci/pcie/portdrv_pci.c
51155+++ b/drivers/pci/pcie/portdrv_pci.c
51156@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
51157 return 0;
51158 }
51159
51160-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
51161+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
51162 /*
51163 * Boxes that should not use MSI for PCIe PME signaling.
51164 */
51165diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
51166index 8d2f400..c97cc91 100644
51167--- a/drivers/pci/probe.c
51168+++ b/drivers/pci/probe.c
51169@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
51170 u16 orig_cmd;
51171 struct pci_bus_region region, inverted_region;
51172
51173- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
51174+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
51175
51176 /* No printks while decoding is disabled! */
51177 if (!dev->mmio_always_on) {
51178diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
51179index 3f155e7..0f4b1f0 100644
51180--- a/drivers/pci/proc.c
51181+++ b/drivers/pci/proc.c
51182@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
51183 static int __init pci_proc_init(void)
51184 {
51185 struct pci_dev *dev = NULL;
51186+
51187+#ifdef CONFIG_GRKERNSEC_PROC_ADD
51188+#ifdef CONFIG_GRKERNSEC_PROC_USER
51189+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
51190+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
51191+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
51192+#endif
51193+#else
51194 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
51195+#endif
51196 proc_create("devices", 0, proc_bus_pci_dir,
51197 &proc_bus_pci_dev_operations);
51198 proc_initialized = 1;
51199diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
51200index 3474920..acc9581 100644
51201--- a/drivers/platform/chrome/chromeos_pstore.c
51202+++ b/drivers/platform/chrome/chromeos_pstore.c
51203@@ -13,7 +13,7 @@
51204 #include <linux/platform_device.h>
51205 #include <linux/pstore_ram.h>
51206
51207-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
51208+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
51209 {
51210 /*
51211 * Today all Chromebooks/boxes ship with Google_* as version and
51212diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
51213index 1e1e594..8fe59c5 100644
51214--- a/drivers/platform/x86/alienware-wmi.c
51215+++ b/drivers/platform/x86/alienware-wmi.c
51216@@ -150,7 +150,7 @@ struct wmax_led_args {
51217 } __packed;
51218
51219 static struct platform_device *platform_device;
51220-static struct device_attribute *zone_dev_attrs;
51221+static device_attribute_no_const *zone_dev_attrs;
51222 static struct attribute **zone_attrs;
51223 static struct platform_zone *zone_data;
51224
51225@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
51226 }
51227 };
51228
51229-static struct attribute_group zone_attribute_group = {
51230+static attribute_group_no_const zone_attribute_group = {
51231 .name = "rgb_zones",
51232 };
51233
51234diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
51235index 7543a56..367ca8ed 100644
51236--- a/drivers/platform/x86/asus-wmi.c
51237+++ b/drivers/platform/x86/asus-wmi.c
51238@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
51239 int err;
51240 u32 retval = -1;
51241
51242+#ifdef CONFIG_GRKERNSEC_KMEM
51243+ return -EPERM;
51244+#endif
51245+
51246 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
51247
51248 if (err < 0)
51249@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
51250 int err;
51251 u32 retval = -1;
51252
51253+#ifdef CONFIG_GRKERNSEC_KMEM
51254+ return -EPERM;
51255+#endif
51256+
51257 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
51258 &retval);
51259
51260@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
51261 union acpi_object *obj;
51262 acpi_status status;
51263
51264+#ifdef CONFIG_GRKERNSEC_KMEM
51265+ return -EPERM;
51266+#endif
51267+
51268 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
51269 1, asus->debug.method_id,
51270 &input, &output);
51271diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
51272index bceb30b..bf063d4 100644
51273--- a/drivers/platform/x86/compal-laptop.c
51274+++ b/drivers/platform/x86/compal-laptop.c
51275@@ -766,7 +766,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
51276 return 1;
51277 }
51278
51279-static struct dmi_system_id __initdata compal_dmi_table[] = {
51280+static const struct dmi_system_id __initconst compal_dmi_table[] = {
51281 {
51282 .ident = "FL90/IFL90",
51283 .matches = {
51284diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
51285index 458e6c9..089aee7 100644
51286--- a/drivers/platform/x86/hdaps.c
51287+++ b/drivers/platform/x86/hdaps.c
51288@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
51289 "ThinkPad T42p", so the order of the entries matters.
51290 If your ThinkPad is not recognized, please update to latest
51291 BIOS. This is especially the case for some R52 ThinkPads. */
51292-static struct dmi_system_id __initdata hdaps_whitelist[] = {
51293+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
51294 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
51295 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
51296 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
51297diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
51298index 97c2be1..2ee50ce 100644
51299--- a/drivers/platform/x86/ibm_rtl.c
51300+++ b/drivers/platform/x86/ibm_rtl.c
51301@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
51302 }
51303
51304
51305-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
51306+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
51307 { \
51308 .matches = { \
51309 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
51310diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
51311index a4a4258..a58a04c 100644
51312--- a/drivers/platform/x86/intel_oaktrail.c
51313+++ b/drivers/platform/x86/intel_oaktrail.c
51314@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
51315 return 0;
51316 }
51317
51318-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
51319+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
51320 {
51321 .ident = "OakTrail platform",
51322 .matches = {
51323diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
51324index 0859877..59d596d 100644
51325--- a/drivers/platform/x86/msi-laptop.c
51326+++ b/drivers/platform/x86/msi-laptop.c
51327@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
51328 return 1;
51329 }
51330
51331-static struct dmi_system_id __initdata msi_dmi_table[] = {
51332+static const struct dmi_system_id __initconst msi_dmi_table[] = {
51333 {
51334 .ident = "MSI S270",
51335 .matches = {
51336@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
51337
51338 if (!quirks->ec_read_only) {
51339 /* allow userland write sysfs file */
51340- dev_attr_bluetooth.store = store_bluetooth;
51341- dev_attr_wlan.store = store_wlan;
51342- dev_attr_threeg.store = store_threeg;
51343- dev_attr_bluetooth.attr.mode |= S_IWUSR;
51344- dev_attr_wlan.attr.mode |= S_IWUSR;
51345- dev_attr_threeg.attr.mode |= S_IWUSR;
51346+ pax_open_kernel();
51347+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
51348+ *(void **)&dev_attr_wlan.store = store_wlan;
51349+ *(void **)&dev_attr_threeg.store = store_threeg;
51350+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
51351+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
51352+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
51353+ pax_close_kernel();
51354 }
51355
51356 /* disable hardware control by fn key */
51357diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
51358index 6d2bac0..ec2b029 100644
51359--- a/drivers/platform/x86/msi-wmi.c
51360+++ b/drivers/platform/x86/msi-wmi.c
51361@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
51362 static void msi_wmi_notify(u32 value, void *context)
51363 {
51364 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
51365- static struct key_entry *key;
51366+ struct key_entry *key;
51367 union acpi_object *obj;
51368 acpi_status status;
51369
51370diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
51371index 9e701b2..c68a7b5 100644
51372--- a/drivers/platform/x86/samsung-laptop.c
51373+++ b/drivers/platform/x86/samsung-laptop.c
51374@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
51375 return 0;
51376 }
51377
51378-static struct dmi_system_id __initdata samsung_dmi_table[] = {
51379+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
51380 {
51381 .matches = {
51382 DMI_MATCH(DMI_SYS_VENDOR,
51383diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
51384index e6aac72..e11ff24 100644
51385--- a/drivers/platform/x86/samsung-q10.c
51386+++ b/drivers/platform/x86/samsung-q10.c
51387@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
51388 return 1;
51389 }
51390
51391-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
51392+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
51393 {
51394 .ident = "Samsung Q10",
51395 .matches = {
51396diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
51397index e51c1e7..71bb385 100644
51398--- a/drivers/platform/x86/sony-laptop.c
51399+++ b/drivers/platform/x86/sony-laptop.c
51400@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
51401 }
51402
51403 /* High speed charging function */
51404-static struct device_attribute *hsc_handle;
51405+static device_attribute_no_const *hsc_handle;
51406
51407 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
51408 struct device_attribute *attr,
51409@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
51410 }
51411
51412 /* low battery function */
51413-static struct device_attribute *lowbatt_handle;
51414+static device_attribute_no_const *lowbatt_handle;
51415
51416 static ssize_t sony_nc_lowbatt_store(struct device *dev,
51417 struct device_attribute *attr,
51418@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
51419 }
51420
51421 /* fan speed function */
51422-static struct device_attribute *fan_handle, *hsf_handle;
51423+static device_attribute_no_const *fan_handle, *hsf_handle;
51424
51425 static ssize_t sony_nc_hsfan_store(struct device *dev,
51426 struct device_attribute *attr,
51427@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
51428 }
51429
51430 /* USB charge function */
51431-static struct device_attribute *uc_handle;
51432+static device_attribute_no_const *uc_handle;
51433
51434 static ssize_t sony_nc_usb_charge_store(struct device *dev,
51435 struct device_attribute *attr,
51436@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
51437 }
51438
51439 /* Panel ID function */
51440-static struct device_attribute *panel_handle;
51441+static device_attribute_no_const *panel_handle;
51442
51443 static ssize_t sony_nc_panelid_show(struct device *dev,
51444 struct device_attribute *attr, char *buffer)
51445@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
51446 }
51447
51448 /* smart connect function */
51449-static struct device_attribute *sc_handle;
51450+static device_attribute_no_const *sc_handle;
51451
51452 static ssize_t sony_nc_smart_conn_store(struct device *dev,
51453 struct device_attribute *attr,
51454@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
51455 .drv.pm = &sony_pic_pm,
51456 };
51457
51458-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
51459+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
51460 {
51461 .ident = "Sony Vaio",
51462 .matches = {
51463diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
51464index 3b8ceee..e18652c 100644
51465--- a/drivers/platform/x86/thinkpad_acpi.c
51466+++ b/drivers/platform/x86/thinkpad_acpi.c
51467@@ -2093,7 +2093,7 @@ static int hotkey_mask_get(void)
51468 return 0;
51469 }
51470
51471-void static hotkey_mask_warn_incomplete_mask(void)
51472+static void hotkey_mask_warn_incomplete_mask(void)
51473 {
51474 /* log only what the user can fix... */
51475 const u32 wantedmask = hotkey_driver_mask &
51476@@ -2437,10 +2437,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
51477 && !tp_features.bright_unkfw)
51478 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
51479 }
51480+}
51481
51482 #undef TPACPI_COMPARE_KEY
51483 #undef TPACPI_MAY_SEND_KEY
51484-}
51485
51486 /*
51487 * Polling driver
51488diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
51489index 438d4c7..ca8a2fb 100644
51490--- a/drivers/pnp/pnpbios/bioscalls.c
51491+++ b/drivers/pnp/pnpbios/bioscalls.c
51492@@ -59,7 +59,7 @@ do { \
51493 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
51494 } while(0)
51495
51496-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
51497+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
51498 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
51499
51500 /*
51501@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51502
51503 cpu = get_cpu();
51504 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
51505+
51506+ pax_open_kernel();
51507 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
51508+ pax_close_kernel();
51509
51510 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
51511 spin_lock_irqsave(&pnp_bios_lock, flags);
51512@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51513 :"memory");
51514 spin_unlock_irqrestore(&pnp_bios_lock, flags);
51515
51516+ pax_open_kernel();
51517 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
51518+ pax_close_kernel();
51519+
51520 put_cpu();
51521
51522 /* If we get here and this is set then the PnP BIOS faulted on us. */
51523@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
51524 return status;
51525 }
51526
51527-void pnpbios_calls_init(union pnp_bios_install_struct *header)
51528+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
51529 {
51530 int i;
51531
51532@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51533 pnp_bios_callpoint.offset = header->fields.pm16offset;
51534 pnp_bios_callpoint.segment = PNP_CS16;
51535
51536+ pax_open_kernel();
51537+
51538 for_each_possible_cpu(i) {
51539 struct desc_struct *gdt = get_cpu_gdt_table(i);
51540 if (!gdt)
51541@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51542 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
51543 (unsigned long)__va(header->fields.pm16dseg));
51544 }
51545+
51546+ pax_close_kernel();
51547 }
51548diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
51549index facd43b..b291260 100644
51550--- a/drivers/pnp/pnpbios/core.c
51551+++ b/drivers/pnp/pnpbios/core.c
51552@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
51553 return 0;
51554 }
51555
51556-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
51557+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
51558 { /* PnPBIOS GPF on boot */
51559 .callback = exploding_pnp_bios,
51560 .ident = "Higraded P14H",
51561diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
51562index 0c52e2a..3421ab7 100644
51563--- a/drivers/power/pda_power.c
51564+++ b/drivers/power/pda_power.c
51565@@ -37,7 +37,11 @@ static int polling;
51566
51567 #if IS_ENABLED(CONFIG_USB_PHY)
51568 static struct usb_phy *transceiver;
51569-static struct notifier_block otg_nb;
51570+static int otg_handle_notification(struct notifier_block *nb,
51571+ unsigned long event, void *unused);
51572+static struct notifier_block otg_nb = {
51573+ .notifier_call = otg_handle_notification
51574+};
51575 #endif
51576
51577 static struct regulator *ac_draw;
51578@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
51579
51580 #if IS_ENABLED(CONFIG_USB_PHY)
51581 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
51582- otg_nb.notifier_call = otg_handle_notification;
51583 ret = usb_register_notifier(transceiver, &otg_nb);
51584 if (ret) {
51585 dev_err(dev, "failure to register otg notifier\n");
51586diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
51587index cc439fd..8fa30df 100644
51588--- a/drivers/power/power_supply.h
51589+++ b/drivers/power/power_supply.h
51590@@ -16,12 +16,12 @@ struct power_supply;
51591
51592 #ifdef CONFIG_SYSFS
51593
51594-extern void power_supply_init_attrs(struct device_type *dev_type);
51595+extern void power_supply_init_attrs(void);
51596 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
51597
51598 #else
51599
51600-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
51601+static inline void power_supply_init_attrs(void) {}
51602 #define power_supply_uevent NULL
51603
51604 #endif /* CONFIG_SYSFS */
51605diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
51606index 694e8cd..9f03483 100644
51607--- a/drivers/power/power_supply_core.c
51608+++ b/drivers/power/power_supply_core.c
51609@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
51610 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
51611 EXPORT_SYMBOL_GPL(power_supply_notifier);
51612
51613-static struct device_type power_supply_dev_type;
51614+extern const struct attribute_group *power_supply_attr_groups[];
51615+static struct device_type power_supply_dev_type = {
51616+ .groups = power_supply_attr_groups,
51617+};
51618
51619 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
51620 struct power_supply *supply)
51621@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
51622 return PTR_ERR(power_supply_class);
51623
51624 power_supply_class->dev_uevent = power_supply_uevent;
51625- power_supply_init_attrs(&power_supply_dev_type);
51626+ power_supply_init_attrs();
51627
51628 return 0;
51629 }
51630diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
51631index 62653f5..d0bb485 100644
51632--- a/drivers/power/power_supply_sysfs.c
51633+++ b/drivers/power/power_supply_sysfs.c
51634@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
51635 .is_visible = power_supply_attr_is_visible,
51636 };
51637
51638-static const struct attribute_group *power_supply_attr_groups[] = {
51639+const struct attribute_group *power_supply_attr_groups[] = {
51640 &power_supply_attr_group,
51641 NULL,
51642 };
51643
51644-void power_supply_init_attrs(struct device_type *dev_type)
51645+void power_supply_init_attrs(void)
51646 {
51647 int i;
51648
51649- dev_type->groups = power_supply_attr_groups;
51650-
51651 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
51652 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
51653 }
51654diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
51655index 84419af..268ede8 100644
51656--- a/drivers/powercap/powercap_sys.c
51657+++ b/drivers/powercap/powercap_sys.c
51658@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
51659 struct device_attribute name_attr;
51660 };
51661
51662+static ssize_t show_constraint_name(struct device *dev,
51663+ struct device_attribute *dev_attr,
51664+ char *buf);
51665+
51666 static struct powercap_constraint_attr
51667- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
51668+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
51669+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
51670+ .power_limit_attr = {
51671+ .attr = {
51672+ .name = NULL,
51673+ .mode = S_IWUSR | S_IRUGO
51674+ },
51675+ .show = show_constraint_power_limit_uw,
51676+ .store = store_constraint_power_limit_uw
51677+ },
51678+
51679+ .time_window_attr = {
51680+ .attr = {
51681+ .name = NULL,
51682+ .mode = S_IWUSR | S_IRUGO
51683+ },
51684+ .show = show_constraint_time_window_us,
51685+ .store = store_constraint_time_window_us
51686+ },
51687+
51688+ .max_power_attr = {
51689+ .attr = {
51690+ .name = NULL,
51691+ .mode = S_IRUGO
51692+ },
51693+ .show = show_constraint_max_power_uw,
51694+ .store = NULL
51695+ },
51696+
51697+ .min_power_attr = {
51698+ .attr = {
51699+ .name = NULL,
51700+ .mode = S_IRUGO
51701+ },
51702+ .show = show_constraint_min_power_uw,
51703+ .store = NULL
51704+ },
51705+
51706+ .max_time_window_attr = {
51707+ .attr = {
51708+ .name = NULL,
51709+ .mode = S_IRUGO
51710+ },
51711+ .show = show_constraint_max_time_window_us,
51712+ .store = NULL
51713+ },
51714+
51715+ .min_time_window_attr = {
51716+ .attr = {
51717+ .name = NULL,
51718+ .mode = S_IRUGO
51719+ },
51720+ .show = show_constraint_min_time_window_us,
51721+ .store = NULL
51722+ },
51723+
51724+ .name_attr = {
51725+ .attr = {
51726+ .name = NULL,
51727+ .mode = S_IRUGO
51728+ },
51729+ .show = show_constraint_name,
51730+ .store = NULL
51731+ }
51732+ }
51733+};
51734
51735 /* A list of powercap control_types */
51736 static LIST_HEAD(powercap_cntrl_list);
51737@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
51738 }
51739
51740 static int create_constraint_attribute(int id, const char *name,
51741- int mode,
51742- struct device_attribute *dev_attr,
51743- ssize_t (*show)(struct device *,
51744- struct device_attribute *, char *),
51745- ssize_t (*store)(struct device *,
51746- struct device_attribute *,
51747- const char *, size_t)
51748- )
51749+ struct device_attribute *dev_attr)
51750 {
51751+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
51752
51753- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
51754- id, name);
51755- if (!dev_attr->attr.name)
51756+ if (!name)
51757 return -ENOMEM;
51758- dev_attr->attr.mode = mode;
51759- dev_attr->show = show;
51760- dev_attr->store = store;
51761+
51762+ pax_open_kernel();
51763+ *(const char **)&dev_attr->attr.name = name;
51764+ pax_close_kernel();
51765
51766 return 0;
51767 }
51768@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
51769
51770 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
51771 ret = create_constraint_attribute(i, "power_limit_uw",
51772- S_IWUSR | S_IRUGO,
51773- &constraint_attrs[i].power_limit_attr,
51774- show_constraint_power_limit_uw,
51775- store_constraint_power_limit_uw);
51776+ &constraint_attrs[i].power_limit_attr);
51777 if (ret)
51778 goto err_alloc;
51779 ret = create_constraint_attribute(i, "time_window_us",
51780- S_IWUSR | S_IRUGO,
51781- &constraint_attrs[i].time_window_attr,
51782- show_constraint_time_window_us,
51783- store_constraint_time_window_us);
51784+ &constraint_attrs[i].time_window_attr);
51785 if (ret)
51786 goto err_alloc;
51787- ret = create_constraint_attribute(i, "name", S_IRUGO,
51788- &constraint_attrs[i].name_attr,
51789- show_constraint_name,
51790- NULL);
51791+ ret = create_constraint_attribute(i, "name",
51792+ &constraint_attrs[i].name_attr);
51793 if (ret)
51794 goto err_alloc;
51795- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
51796- &constraint_attrs[i].max_power_attr,
51797- show_constraint_max_power_uw,
51798- NULL);
51799+ ret = create_constraint_attribute(i, "max_power_uw",
51800+ &constraint_attrs[i].max_power_attr);
51801 if (ret)
51802 goto err_alloc;
51803- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
51804- &constraint_attrs[i].min_power_attr,
51805- show_constraint_min_power_uw,
51806- NULL);
51807+ ret = create_constraint_attribute(i, "min_power_uw",
51808+ &constraint_attrs[i].min_power_attr);
51809 if (ret)
51810 goto err_alloc;
51811 ret = create_constraint_attribute(i, "max_time_window_us",
51812- S_IRUGO,
51813- &constraint_attrs[i].max_time_window_attr,
51814- show_constraint_max_time_window_us,
51815- NULL);
51816+ &constraint_attrs[i].max_time_window_attr);
51817 if (ret)
51818 goto err_alloc;
51819 ret = create_constraint_attribute(i, "min_time_window_us",
51820- S_IRUGO,
51821- &constraint_attrs[i].min_time_window_attr,
51822- show_constraint_min_time_window_us,
51823- NULL);
51824+ &constraint_attrs[i].min_time_window_attr);
51825 if (ret)
51826 goto err_alloc;
51827
51828@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
51829 power_zone->zone_dev_attrs[count++] =
51830 &dev_attr_max_energy_range_uj.attr;
51831 if (power_zone->ops->get_energy_uj) {
51832+ pax_open_kernel();
51833 if (power_zone->ops->reset_energy_uj)
51834- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51835+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51836 else
51837- dev_attr_energy_uj.attr.mode = S_IRUGO;
51838+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
51839+ pax_close_kernel();
51840 power_zone->zone_dev_attrs[count++] =
51841 &dev_attr_energy_uj.attr;
51842 }
51843diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
51844index 9c5d414..c7900ce 100644
51845--- a/drivers/ptp/ptp_private.h
51846+++ b/drivers/ptp/ptp_private.h
51847@@ -51,7 +51,7 @@ struct ptp_clock {
51848 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
51849 wait_queue_head_t tsev_wq;
51850 int defunct; /* tells readers to go away when clock is being removed */
51851- struct device_attribute *pin_dev_attr;
51852+ device_attribute_no_const *pin_dev_attr;
51853 struct attribute **pin_attr;
51854 struct attribute_group pin_attr_group;
51855 };
51856diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
51857index 302e626..12579af 100644
51858--- a/drivers/ptp/ptp_sysfs.c
51859+++ b/drivers/ptp/ptp_sysfs.c
51860@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
51861 goto no_pin_attr;
51862
51863 for (i = 0; i < n_pins; i++) {
51864- struct device_attribute *da = &ptp->pin_dev_attr[i];
51865+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
51866 sysfs_attr_init(&da->attr);
51867 da->attr.name = info->pin_config[i].name;
51868 da->attr.mode = 0644;
51869diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
51870index a4a8a6d..a3456f4 100644
51871--- a/drivers/regulator/core.c
51872+++ b/drivers/regulator/core.c
51873@@ -3529,7 +3529,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51874 const struct regulation_constraints *constraints = NULL;
51875 const struct regulator_init_data *init_data;
51876 struct regulator_config *config = NULL;
51877- static atomic_t regulator_no = ATOMIC_INIT(-1);
51878+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
51879 struct regulator_dev *rdev;
51880 struct device *dev;
51881 int ret, i;
51882@@ -3613,7 +3613,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51883 rdev->dev.class = &regulator_class;
51884 rdev->dev.parent = dev;
51885 dev_set_name(&rdev->dev, "regulator.%lu",
51886- (unsigned long) atomic_inc_return(&regulator_no));
51887+ (unsigned long) atomic_inc_return_unchecked(&regulator_no));
51888 ret = device_register(&rdev->dev);
51889 if (ret != 0) {
51890 put_device(&rdev->dev);
51891diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51892index 7eee2ca..4024513 100644
51893--- a/drivers/regulator/max8660.c
51894+++ b/drivers/regulator/max8660.c
51895@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
51896 max8660->shadow_regs[MAX8660_OVER1] = 5;
51897 } else {
51898 /* Otherwise devices can be toggled via software */
51899- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51900- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51901+ pax_open_kernel();
51902+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51903+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51904+ pax_close_kernel();
51905 }
51906
51907 /*
51908diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51909index c3d55c2..0dddfe6 100644
51910--- a/drivers/regulator/max8973-regulator.c
51911+++ b/drivers/regulator/max8973-regulator.c
51912@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51913 if (!pdata || !pdata->enable_ext_control) {
51914 max->desc.enable_reg = MAX8973_VOUT;
51915 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51916- max->ops.enable = regulator_enable_regmap;
51917- max->ops.disable = regulator_disable_regmap;
51918- max->ops.is_enabled = regulator_is_enabled_regmap;
51919+ pax_open_kernel();
51920+ *(void **)&max->ops.enable = regulator_enable_regmap;
51921+ *(void **)&max->ops.disable = regulator_disable_regmap;
51922+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51923+ pax_close_kernel();
51924 }
51925
51926 if (pdata) {
51927diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51928index 0d17c92..a29f627 100644
51929--- a/drivers/regulator/mc13892-regulator.c
51930+++ b/drivers/regulator/mc13892-regulator.c
51931@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51932 mc13xxx_unlock(mc13892);
51933
51934 /* update mc13892_vcam ops */
51935- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51936+ pax_open_kernel();
51937+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51938 sizeof(struct regulator_ops));
51939- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51940- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51941+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51942+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51943+ pax_close_kernel();
51944 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51945
51946 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51947diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51948index 5b2e761..c8c8a4a 100644
51949--- a/drivers/rtc/rtc-cmos.c
51950+++ b/drivers/rtc/rtc-cmos.c
51951@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
51952 hpet_rtc_timer_init();
51953
51954 /* export at least the first block of NVRAM */
51955- nvram.size = address_space - NVRAM_OFFSET;
51956+ pax_open_kernel();
51957+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
51958+ pax_close_kernel();
51959 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
51960 if (retval < 0) {
51961 dev_dbg(dev, "can't create nvram file? %d\n", retval);
51962diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
51963index 799c34b..8e9786a 100644
51964--- a/drivers/rtc/rtc-dev.c
51965+++ b/drivers/rtc/rtc-dev.c
51966@@ -16,6 +16,7 @@
51967 #include <linux/module.h>
51968 #include <linux/rtc.h>
51969 #include <linux/sched.h>
51970+#include <linux/grsecurity.h>
51971 #include "rtc-core.h"
51972
51973 static dev_t rtc_devt;
51974@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
51975 if (copy_from_user(&tm, uarg, sizeof(tm)))
51976 return -EFAULT;
51977
51978+ gr_log_timechange();
51979+
51980 return rtc_set_time(rtc, &tm);
51981
51982 case RTC_PIE_ON:
51983diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
51984index 4ffabb3..1f87fca 100644
51985--- a/drivers/rtc/rtc-ds1307.c
51986+++ b/drivers/rtc/rtc-ds1307.c
51987@@ -107,7 +107,7 @@ struct ds1307 {
51988 u8 offset; /* register's offset */
51989 u8 regs[11];
51990 u16 nvram_offset;
51991- struct bin_attribute *nvram;
51992+ bin_attribute_no_const *nvram;
51993 enum ds_type type;
51994 unsigned long flags;
51995 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
51996diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
51997index 90abb5b..e0bf6dd 100644
51998--- a/drivers/rtc/rtc-m48t59.c
51999+++ b/drivers/rtc/rtc-m48t59.c
52000@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
52001 if (IS_ERR(m48t59->rtc))
52002 return PTR_ERR(m48t59->rtc);
52003
52004- m48t59_nvram_attr.size = pdata->offset;
52005+ pax_open_kernel();
52006+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
52007+ pax_close_kernel();
52008
52009 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
52010 if (ret)
52011diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
52012index e693af6..2e525b6 100644
52013--- a/drivers/scsi/bfa/bfa_fcpim.h
52014+++ b/drivers/scsi/bfa/bfa_fcpim.h
52015@@ -36,7 +36,7 @@ struct bfa_iotag_s {
52016
52017 struct bfa_itn_s {
52018 bfa_isr_func_t isr;
52019-};
52020+} __no_const;
52021
52022 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
52023 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
52024diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
52025index 0f19455..ef7adb5 100644
52026--- a/drivers/scsi/bfa/bfa_fcs.c
52027+++ b/drivers/scsi/bfa/bfa_fcs.c
52028@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
52029 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
52030
52031 static struct bfa_fcs_mod_s fcs_modules[] = {
52032- { bfa_fcs_port_attach, NULL, NULL },
52033- { bfa_fcs_uf_attach, NULL, NULL },
52034- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
52035- bfa_fcs_fabric_modexit },
52036+ {
52037+ .attach = bfa_fcs_port_attach,
52038+ .modinit = NULL,
52039+ .modexit = NULL
52040+ },
52041+ {
52042+ .attach = bfa_fcs_uf_attach,
52043+ .modinit = NULL,
52044+ .modexit = NULL
52045+ },
52046+ {
52047+ .attach = bfa_fcs_fabric_attach,
52048+ .modinit = bfa_fcs_fabric_modinit,
52049+ .modexit = bfa_fcs_fabric_modexit
52050+ },
52051 };
52052
52053 /*
52054diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
52055index ff75ef8..2dfe00a 100644
52056--- a/drivers/scsi/bfa/bfa_fcs_lport.c
52057+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
52058@@ -89,15 +89,26 @@ static struct {
52059 void (*offline) (struct bfa_fcs_lport_s *port);
52060 } __port_action[] = {
52061 {
52062- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
52063- bfa_fcs_lport_unknown_offline}, {
52064- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
52065- bfa_fcs_lport_fab_offline}, {
52066- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
52067- bfa_fcs_lport_n2n_offline}, {
52068- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
52069- bfa_fcs_lport_loop_offline},
52070- };
52071+ .init = bfa_fcs_lport_unknown_init,
52072+ .online = bfa_fcs_lport_unknown_online,
52073+ .offline = bfa_fcs_lport_unknown_offline
52074+ },
52075+ {
52076+ .init = bfa_fcs_lport_fab_init,
52077+ .online = bfa_fcs_lport_fab_online,
52078+ .offline = bfa_fcs_lport_fab_offline
52079+ },
52080+ {
52081+ .init = bfa_fcs_lport_n2n_init,
52082+ .online = bfa_fcs_lport_n2n_online,
52083+ .offline = bfa_fcs_lport_n2n_offline
52084+ },
52085+ {
52086+ .init = bfa_fcs_lport_loop_init,
52087+ .online = bfa_fcs_lport_loop_online,
52088+ .offline = bfa_fcs_lport_loop_offline
52089+ },
52090+};
52091
52092 /*
52093 * fcs_port_sm FCS logical port state machine
52094diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
52095index a38aafa0..fe8f03b 100644
52096--- a/drivers/scsi/bfa/bfa_ioc.h
52097+++ b/drivers/scsi/bfa/bfa_ioc.h
52098@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
52099 bfa_ioc_disable_cbfn_t disable_cbfn;
52100 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
52101 bfa_ioc_reset_cbfn_t reset_cbfn;
52102-};
52103+} __no_const;
52104
52105 /*
52106 * IOC event notification mechanism.
52107@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
52108 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
52109 enum bfi_ioc_state fwstate);
52110 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
52111-};
52112+} __no_const;
52113
52114 /*
52115 * Queue element to wait for room in request queue. FIFO order is
52116diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
52117index a14c784..6de6790 100644
52118--- a/drivers/scsi/bfa/bfa_modules.h
52119+++ b/drivers/scsi/bfa/bfa_modules.h
52120@@ -78,12 +78,12 @@ enum {
52121 \
52122 extern struct bfa_module_s hal_mod_ ## __mod; \
52123 struct bfa_module_s hal_mod_ ## __mod = { \
52124- bfa_ ## __mod ## _meminfo, \
52125- bfa_ ## __mod ## _attach, \
52126- bfa_ ## __mod ## _detach, \
52127- bfa_ ## __mod ## _start, \
52128- bfa_ ## __mod ## _stop, \
52129- bfa_ ## __mod ## _iocdisable, \
52130+ .meminfo = bfa_ ## __mod ## _meminfo, \
52131+ .attach = bfa_ ## __mod ## _attach, \
52132+ .detach = bfa_ ## __mod ## _detach, \
52133+ .start = bfa_ ## __mod ## _start, \
52134+ .stop = bfa_ ## __mod ## _stop, \
52135+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
52136 }
52137
52138 #define BFA_CACHELINE_SZ (256)
52139diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
52140index 045c4e1..13de803 100644
52141--- a/drivers/scsi/fcoe/fcoe_sysfs.c
52142+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
52143@@ -33,8 +33,8 @@
52144 */
52145 #include "libfcoe.h"
52146
52147-static atomic_t ctlr_num;
52148-static atomic_t fcf_num;
52149+static atomic_unchecked_t ctlr_num;
52150+static atomic_unchecked_t fcf_num;
52151
52152 /*
52153 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
52154@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
52155 if (!ctlr)
52156 goto out;
52157
52158- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
52159+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
52160 ctlr->f = f;
52161 ctlr->mode = FIP_CONN_TYPE_FABRIC;
52162 INIT_LIST_HEAD(&ctlr->fcfs);
52163@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
52164 fcf->dev.parent = &ctlr->dev;
52165 fcf->dev.bus = &fcoe_bus_type;
52166 fcf->dev.type = &fcoe_fcf_device_type;
52167- fcf->id = atomic_inc_return(&fcf_num) - 1;
52168+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
52169 fcf->state = FCOE_FCF_STATE_UNKNOWN;
52170
52171 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
52172@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
52173 {
52174 int error;
52175
52176- atomic_set(&ctlr_num, 0);
52177- atomic_set(&fcf_num, 0);
52178+ atomic_set_unchecked(&ctlr_num, 0);
52179+ atomic_set_unchecked(&fcf_num, 0);
52180
52181 error = bus_register(&fcoe_bus_type);
52182 if (error)
52183diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
52184index 8bb173e..20236b4 100644
52185--- a/drivers/scsi/hosts.c
52186+++ b/drivers/scsi/hosts.c
52187@@ -42,7 +42,7 @@
52188 #include "scsi_logging.h"
52189
52190
52191-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52192+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52193
52194
52195 static void scsi_host_cls_release(struct device *dev)
52196@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
52197 * subtract one because we increment first then return, but we need to
52198 * know what the next host number was before increment
52199 */
52200- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
52201+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
52202 shost->dma_channel = 0xff;
52203
52204 /* These three are default values which can be overridden */
52205diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
52206index a1cfbd3..d7f8ebc 100644
52207--- a/drivers/scsi/hpsa.c
52208+++ b/drivers/scsi/hpsa.c
52209@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
52210 struct reply_queue_buffer *rq = &h->reply_queue[q];
52211
52212 if (h->transMethod & CFGTBL_Trans_io_accel1)
52213- return h->access.command_completed(h, q);
52214+ return h->access->command_completed(h, q);
52215
52216 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
52217- return h->access.command_completed(h, q);
52218+ return h->access->command_completed(h, q);
52219
52220 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
52221 a = rq->head[rq->current_entry];
52222@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
52223 break;
52224 default:
52225 set_performant_mode(h, c);
52226- h->access.submit_command(h, c);
52227+ h->access->submit_command(h, c);
52228 }
52229 }
52230
52231@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
52232
52233 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
52234 {
52235- return h->access.command_completed(h, q);
52236+ return h->access->command_completed(h, q);
52237 }
52238
52239 static inline bool interrupt_pending(struct ctlr_info *h)
52240 {
52241- return h->access.intr_pending(h);
52242+ return h->access->intr_pending(h);
52243 }
52244
52245 static inline long interrupt_not_for_us(struct ctlr_info *h)
52246 {
52247- return (h->access.intr_pending(h) == 0) ||
52248+ return (h->access->intr_pending(h) == 0) ||
52249 (h->interrupts_enabled == 0);
52250 }
52251
52252@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
52253 if (prod_index < 0)
52254 return prod_index;
52255 h->product_name = products[prod_index].product_name;
52256- h->access = *(products[prod_index].access);
52257+ h->access = products[prod_index].access;
52258
52259 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
52260 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
52261@@ -6649,7 +6649,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
52262 unsigned long flags;
52263 u32 lockup_detected;
52264
52265- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52266+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52267 spin_lock_irqsave(&h->lock, flags);
52268 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
52269 if (!lockup_detected) {
52270@@ -6924,7 +6924,7 @@ reinit_after_soft_reset:
52271 }
52272
52273 /* make sure the board interrupts are off */
52274- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52275+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52276
52277 if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
52278 goto clean2;
52279@@ -6960,7 +6960,7 @@ reinit_after_soft_reset:
52280 * fake ones to scoop up any residual completions.
52281 */
52282 spin_lock_irqsave(&h->lock, flags);
52283- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52284+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52285 spin_unlock_irqrestore(&h->lock, flags);
52286 hpsa_free_irqs(h);
52287 rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
52288@@ -6979,9 +6979,9 @@ reinit_after_soft_reset:
52289 dev_info(&h->pdev->dev, "Board READY.\n");
52290 dev_info(&h->pdev->dev,
52291 "Waiting for stale completions to drain.\n");
52292- h->access.set_intr_mask(h, HPSA_INTR_ON);
52293+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52294 msleep(10000);
52295- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52296+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52297
52298 rc = controller_reset_failed(h->cfgtable);
52299 if (rc)
52300@@ -7006,7 +7006,7 @@ reinit_after_soft_reset:
52301
52302
52303 /* Turn the interrupts on so we can service requests */
52304- h->access.set_intr_mask(h, HPSA_INTR_ON);
52305+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52306
52307 hpsa_hba_inquiry(h);
52308 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
52309@@ -7079,7 +7079,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
52310 * To write all data in the battery backed cache to disks
52311 */
52312 hpsa_flush_cache(h);
52313- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52314+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52315 hpsa_free_irqs_and_disable_msix(h);
52316 }
52317
52318@@ -7200,7 +7200,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52319 CFGTBL_Trans_enable_directed_msix |
52320 (trans_support & (CFGTBL_Trans_io_accel1 |
52321 CFGTBL_Trans_io_accel2));
52322- struct access_method access = SA5_performant_access;
52323+ struct access_method *access = &SA5_performant_access;
52324
52325 /* This is a bit complicated. There are 8 registers on
52326 * the controller which we write to to tell it 8 different
52327@@ -7242,7 +7242,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52328 * perform the superfluous readl() after each command submission.
52329 */
52330 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
52331- access = SA5_performant_access_no_read;
52332+ access = &SA5_performant_access_no_read;
52333
52334 /* Controller spec: zero out this buffer. */
52335 for (i = 0; i < h->nreply_queues; i++)
52336@@ -7272,12 +7272,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52337 * enable outbound interrupt coalescing in accelerator mode;
52338 */
52339 if (trans_support & CFGTBL_Trans_io_accel1) {
52340- access = SA5_ioaccel_mode1_access;
52341+ access = &SA5_ioaccel_mode1_access;
52342 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52343 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52344 } else {
52345 if (trans_support & CFGTBL_Trans_io_accel2) {
52346- access = SA5_ioaccel_mode2_access;
52347+ access = &SA5_ioaccel_mode2_access;
52348 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52349 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52350 }
52351diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
52352index 6577130..955f9a4 100644
52353--- a/drivers/scsi/hpsa.h
52354+++ b/drivers/scsi/hpsa.h
52355@@ -143,7 +143,7 @@ struct ctlr_info {
52356 unsigned int msix_vector;
52357 unsigned int msi_vector;
52358 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
52359- struct access_method access;
52360+ struct access_method *access;
52361 char hba_mode_enabled;
52362
52363 /* queue and queue Info */
52364@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
52365 }
52366
52367 static struct access_method SA5_access = {
52368- SA5_submit_command,
52369- SA5_intr_mask,
52370- SA5_intr_pending,
52371- SA5_completed,
52372+ .submit_command = SA5_submit_command,
52373+ .set_intr_mask = SA5_intr_mask,
52374+ .intr_pending = SA5_intr_pending,
52375+ .command_completed = SA5_completed,
52376 };
52377
52378 static struct access_method SA5_ioaccel_mode1_access = {
52379- SA5_submit_command,
52380- SA5_performant_intr_mask,
52381- SA5_ioaccel_mode1_intr_pending,
52382- SA5_ioaccel_mode1_completed,
52383+ .submit_command = SA5_submit_command,
52384+ .set_intr_mask = SA5_performant_intr_mask,
52385+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
52386+ .command_completed = SA5_ioaccel_mode1_completed,
52387 };
52388
52389 static struct access_method SA5_ioaccel_mode2_access = {
52390- SA5_submit_command_ioaccel2,
52391- SA5_performant_intr_mask,
52392- SA5_performant_intr_pending,
52393- SA5_performant_completed,
52394+ .submit_command = SA5_submit_command_ioaccel2,
52395+ .set_intr_mask = SA5_performant_intr_mask,
52396+ .intr_pending = SA5_performant_intr_pending,
52397+ .command_completed = SA5_performant_completed,
52398 };
52399
52400 static struct access_method SA5_performant_access = {
52401- SA5_submit_command,
52402- SA5_performant_intr_mask,
52403- SA5_performant_intr_pending,
52404- SA5_performant_completed,
52405+ .submit_command = SA5_submit_command,
52406+ .set_intr_mask = SA5_performant_intr_mask,
52407+ .intr_pending = SA5_performant_intr_pending,
52408+ .command_completed = SA5_performant_completed,
52409 };
52410
52411 static struct access_method SA5_performant_access_no_read = {
52412- SA5_submit_command_no_read,
52413- SA5_performant_intr_mask,
52414- SA5_performant_intr_pending,
52415- SA5_performant_completed,
52416+ .submit_command = SA5_submit_command_no_read,
52417+ .set_intr_mask = SA5_performant_intr_mask,
52418+ .intr_pending = SA5_performant_intr_pending,
52419+ .command_completed = SA5_performant_completed,
52420 };
52421
52422 struct board_type {
52423diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
52424index 1b3a094..068e683 100644
52425--- a/drivers/scsi/libfc/fc_exch.c
52426+++ b/drivers/scsi/libfc/fc_exch.c
52427@@ -101,12 +101,12 @@ struct fc_exch_mgr {
52428 u16 pool_max_index;
52429
52430 struct {
52431- atomic_t no_free_exch;
52432- atomic_t no_free_exch_xid;
52433- atomic_t xid_not_found;
52434- atomic_t xid_busy;
52435- atomic_t seq_not_found;
52436- atomic_t non_bls_resp;
52437+ atomic_unchecked_t no_free_exch;
52438+ atomic_unchecked_t no_free_exch_xid;
52439+ atomic_unchecked_t xid_not_found;
52440+ atomic_unchecked_t xid_busy;
52441+ atomic_unchecked_t seq_not_found;
52442+ atomic_unchecked_t non_bls_resp;
52443 } stats;
52444 };
52445
52446@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
52447 /* allocate memory for exchange */
52448 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
52449 if (!ep) {
52450- atomic_inc(&mp->stats.no_free_exch);
52451+ atomic_inc_unchecked(&mp->stats.no_free_exch);
52452 goto out;
52453 }
52454 memset(ep, 0, sizeof(*ep));
52455@@ -874,7 +874,7 @@ out:
52456 return ep;
52457 err:
52458 spin_unlock_bh(&pool->lock);
52459- atomic_inc(&mp->stats.no_free_exch_xid);
52460+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
52461 mempool_free(ep, mp->ep_pool);
52462 return NULL;
52463 }
52464@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52465 xid = ntohs(fh->fh_ox_id); /* we originated exch */
52466 ep = fc_exch_find(mp, xid);
52467 if (!ep) {
52468- atomic_inc(&mp->stats.xid_not_found);
52469+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52470 reject = FC_RJT_OX_ID;
52471 goto out;
52472 }
52473@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52474 ep = fc_exch_find(mp, xid);
52475 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
52476 if (ep) {
52477- atomic_inc(&mp->stats.xid_busy);
52478+ atomic_inc_unchecked(&mp->stats.xid_busy);
52479 reject = FC_RJT_RX_ID;
52480 goto rel;
52481 }
52482@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52483 }
52484 xid = ep->xid; /* get our XID */
52485 } else if (!ep) {
52486- atomic_inc(&mp->stats.xid_not_found);
52487+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52488 reject = FC_RJT_RX_ID; /* XID not found */
52489 goto out;
52490 }
52491@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52492 } else {
52493 sp = &ep->seq;
52494 if (sp->id != fh->fh_seq_id) {
52495- atomic_inc(&mp->stats.seq_not_found);
52496+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52497 if (f_ctl & FC_FC_END_SEQ) {
52498 /*
52499 * Update sequence_id based on incoming last
52500@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52501
52502 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
52503 if (!ep) {
52504- atomic_inc(&mp->stats.xid_not_found);
52505+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52506 goto out;
52507 }
52508 if (ep->esb_stat & ESB_ST_COMPLETE) {
52509- atomic_inc(&mp->stats.xid_not_found);
52510+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52511 goto rel;
52512 }
52513 if (ep->rxid == FC_XID_UNKNOWN)
52514 ep->rxid = ntohs(fh->fh_rx_id);
52515 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
52516- atomic_inc(&mp->stats.xid_not_found);
52517+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52518 goto rel;
52519 }
52520 if (ep->did != ntoh24(fh->fh_s_id) &&
52521 ep->did != FC_FID_FLOGI) {
52522- atomic_inc(&mp->stats.xid_not_found);
52523+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52524 goto rel;
52525 }
52526 sof = fr_sof(fp);
52527@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52528 sp->ssb_stat |= SSB_ST_RESP;
52529 sp->id = fh->fh_seq_id;
52530 } else if (sp->id != fh->fh_seq_id) {
52531- atomic_inc(&mp->stats.seq_not_found);
52532+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52533 goto rel;
52534 }
52535
52536@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52537 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
52538
52539 if (!sp)
52540- atomic_inc(&mp->stats.xid_not_found);
52541+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52542 else
52543- atomic_inc(&mp->stats.non_bls_resp);
52544+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
52545
52546 fc_frame_free(fp);
52547 }
52548@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
52549
52550 list_for_each_entry(ema, &lport->ema_list, ema_list) {
52551 mp = ema->mp;
52552- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
52553+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
52554 st->fc_no_free_exch_xid +=
52555- atomic_read(&mp->stats.no_free_exch_xid);
52556- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
52557- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
52558- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
52559- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
52560+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
52561+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
52562+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
52563+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
52564+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
52565 }
52566 }
52567 EXPORT_SYMBOL(fc_exch_update_stats);
52568diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
52569index 9c706d8..d3e3ed2 100644
52570--- a/drivers/scsi/libsas/sas_ata.c
52571+++ b/drivers/scsi/libsas/sas_ata.c
52572@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
52573 .postreset = ata_std_postreset,
52574 .error_handler = ata_std_error_handler,
52575 .post_internal_cmd = sas_ata_post_internal,
52576- .qc_defer = ata_std_qc_defer,
52577+ .qc_defer = ata_std_qc_defer,
52578 .qc_prep = ata_noop_qc_prep,
52579 .qc_issue = sas_ata_qc_issue,
52580 .qc_fill_rtf = sas_ata_qc_fill_rtf,
52581diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
52582index 434e903..5a4a79b 100644
52583--- a/drivers/scsi/lpfc/lpfc.h
52584+++ b/drivers/scsi/lpfc/lpfc.h
52585@@ -430,7 +430,7 @@ struct lpfc_vport {
52586 struct dentry *debug_nodelist;
52587 struct dentry *vport_debugfs_root;
52588 struct lpfc_debugfs_trc *disc_trc;
52589- atomic_t disc_trc_cnt;
52590+ atomic_unchecked_t disc_trc_cnt;
52591 #endif
52592 uint8_t stat_data_enabled;
52593 uint8_t stat_data_blocked;
52594@@ -880,8 +880,8 @@ struct lpfc_hba {
52595 struct timer_list fabric_block_timer;
52596 unsigned long bit_flags;
52597 #define FABRIC_COMANDS_BLOCKED 0
52598- atomic_t num_rsrc_err;
52599- atomic_t num_cmd_success;
52600+ atomic_unchecked_t num_rsrc_err;
52601+ atomic_unchecked_t num_cmd_success;
52602 unsigned long last_rsrc_error_time;
52603 unsigned long last_ramp_down_time;
52604 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
52605@@ -916,7 +916,7 @@ struct lpfc_hba {
52606
52607 struct dentry *debug_slow_ring_trc;
52608 struct lpfc_debugfs_trc *slow_ring_trc;
52609- atomic_t slow_ring_trc_cnt;
52610+ atomic_unchecked_t slow_ring_trc_cnt;
52611 /* iDiag debugfs sub-directory */
52612 struct dentry *idiag_root;
52613 struct dentry *idiag_pci_cfg;
52614diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
52615index 5633e7d..8272114 100644
52616--- a/drivers/scsi/lpfc/lpfc_debugfs.c
52617+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
52618@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
52619
52620 #include <linux/debugfs.h>
52621
52622-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52623+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52624 static unsigned long lpfc_debugfs_start_time = 0L;
52625
52626 /* iDiag */
52627@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
52628 lpfc_debugfs_enable = 0;
52629
52630 len = 0;
52631- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
52632+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
52633 (lpfc_debugfs_max_disc_trc - 1);
52634 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
52635 dtp = vport->disc_trc + i;
52636@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
52637 lpfc_debugfs_enable = 0;
52638
52639 len = 0;
52640- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
52641+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
52642 (lpfc_debugfs_max_slow_ring_trc - 1);
52643 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
52644 dtp = phba->slow_ring_trc + i;
52645@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
52646 !vport || !vport->disc_trc)
52647 return;
52648
52649- index = atomic_inc_return(&vport->disc_trc_cnt) &
52650+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
52651 (lpfc_debugfs_max_disc_trc - 1);
52652 dtp = vport->disc_trc + index;
52653 dtp->fmt = fmt;
52654 dtp->data1 = data1;
52655 dtp->data2 = data2;
52656 dtp->data3 = data3;
52657- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52658+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52659 dtp->jif = jiffies;
52660 #endif
52661 return;
52662@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
52663 !phba || !phba->slow_ring_trc)
52664 return;
52665
52666- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
52667+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
52668 (lpfc_debugfs_max_slow_ring_trc - 1);
52669 dtp = phba->slow_ring_trc + index;
52670 dtp->fmt = fmt;
52671 dtp->data1 = data1;
52672 dtp->data2 = data2;
52673 dtp->data3 = data3;
52674- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52675+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52676 dtp->jif = jiffies;
52677 #endif
52678 return;
52679@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52680 "slow_ring buffer\n");
52681 goto debug_failed;
52682 }
52683- atomic_set(&phba->slow_ring_trc_cnt, 0);
52684+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
52685 memset(phba->slow_ring_trc, 0,
52686 (sizeof(struct lpfc_debugfs_trc) *
52687 lpfc_debugfs_max_slow_ring_trc));
52688@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52689 "buffer\n");
52690 goto debug_failed;
52691 }
52692- atomic_set(&vport->disc_trc_cnt, 0);
52693+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
52694
52695 snprintf(name, sizeof(name), "discovery_trace");
52696 vport->debug_disc_trc =
52697diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
52698index 0b2c53a..aec2b45 100644
52699--- a/drivers/scsi/lpfc/lpfc_init.c
52700+++ b/drivers/scsi/lpfc/lpfc_init.c
52701@@ -11290,8 +11290,10 @@ lpfc_init(void)
52702 "misc_register returned with status %d", error);
52703
52704 if (lpfc_enable_npiv) {
52705- lpfc_transport_functions.vport_create = lpfc_vport_create;
52706- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52707+ pax_open_kernel();
52708+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
52709+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52710+ pax_close_kernel();
52711 }
52712 lpfc_transport_template =
52713 fc_attach_transport(&lpfc_transport_functions);
52714diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
52715index 4f9222e..f1850e3 100644
52716--- a/drivers/scsi/lpfc/lpfc_scsi.c
52717+++ b/drivers/scsi/lpfc/lpfc_scsi.c
52718@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
52719 unsigned long expires;
52720
52721 spin_lock_irqsave(&phba->hbalock, flags);
52722- atomic_inc(&phba->num_rsrc_err);
52723+ atomic_inc_unchecked(&phba->num_rsrc_err);
52724 phba->last_rsrc_error_time = jiffies;
52725
52726 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
52727@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52728 unsigned long num_rsrc_err, num_cmd_success;
52729 int i;
52730
52731- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
52732- num_cmd_success = atomic_read(&phba->num_cmd_success);
52733+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
52734+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
52735
52736 /*
52737 * The error and success command counters are global per
52738@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52739 }
52740 }
52741 lpfc_destroy_vport_work_array(phba, vports);
52742- atomic_set(&phba->num_rsrc_err, 0);
52743- atomic_set(&phba->num_cmd_success, 0);
52744+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
52745+ atomic_set_unchecked(&phba->num_cmd_success, 0);
52746 }
52747
52748 /**
52749diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52750index 3f26147..ee8efd1 100644
52751--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52752+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52753@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
52754 {
52755 struct scsi_device *sdev = to_scsi_device(dev);
52756 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52757- static struct _raid_device *raid_device;
52758+ struct _raid_device *raid_device;
52759 unsigned long flags;
52760 Mpi2RaidVolPage0_t vol_pg0;
52761 Mpi2ConfigReply_t mpi_reply;
52762@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
52763 {
52764 struct scsi_device *sdev = to_scsi_device(dev);
52765 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52766- static struct _raid_device *raid_device;
52767+ struct _raid_device *raid_device;
52768 unsigned long flags;
52769 Mpi2RaidVolPage0_t vol_pg0;
52770 Mpi2ConfigReply_t mpi_reply;
52771@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
52772 Mpi2EventDataIrOperationStatus_t *event_data =
52773 (Mpi2EventDataIrOperationStatus_t *)
52774 fw_event->event_data;
52775- static struct _raid_device *raid_device;
52776+ struct _raid_device *raid_device;
52777 unsigned long flags;
52778 u16 handle;
52779
52780@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
52781 u64 sas_address;
52782 struct _sas_device *sas_device;
52783 struct _sas_node *expander_device;
52784- static struct _raid_device *raid_device;
52785+ struct _raid_device *raid_device;
52786 u8 retry_count;
52787 unsigned long flags;
52788
52789diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
52790index ed31d8c..ab856b3 100644
52791--- a/drivers/scsi/pmcraid.c
52792+++ b/drivers/scsi/pmcraid.c
52793@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
52794 res->scsi_dev = scsi_dev;
52795 scsi_dev->hostdata = res;
52796 res->change_detected = 0;
52797- atomic_set(&res->read_failures, 0);
52798- atomic_set(&res->write_failures, 0);
52799+ atomic_set_unchecked(&res->read_failures, 0);
52800+ atomic_set_unchecked(&res->write_failures, 0);
52801 rc = 0;
52802 }
52803 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
52804@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
52805
52806 /* If this was a SCSI read/write command keep count of errors */
52807 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
52808- atomic_inc(&res->read_failures);
52809+ atomic_inc_unchecked(&res->read_failures);
52810 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
52811- atomic_inc(&res->write_failures);
52812+ atomic_inc_unchecked(&res->write_failures);
52813
52814 if (!RES_IS_GSCSI(res->cfg_entry) &&
52815 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
52816@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
52817 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52818 * hrrq_id assigned here in queuecommand
52819 */
52820- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52821+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52822 pinstance->num_hrrq;
52823 cmd->cmd_done = pmcraid_io_done;
52824
52825@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
52826 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52827 * hrrq_id assigned here in queuecommand
52828 */
52829- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52830+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52831 pinstance->num_hrrq;
52832
52833 if (request_size) {
52834@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
52835
52836 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
52837 /* add resources only after host is added into system */
52838- if (!atomic_read(&pinstance->expose_resources))
52839+ if (!atomic_read_unchecked(&pinstance->expose_resources))
52840 return;
52841
52842 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
52843@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
52844 init_waitqueue_head(&pinstance->reset_wait_q);
52845
52846 atomic_set(&pinstance->outstanding_cmds, 0);
52847- atomic_set(&pinstance->last_message_id, 0);
52848- atomic_set(&pinstance->expose_resources, 0);
52849+ atomic_set_unchecked(&pinstance->last_message_id, 0);
52850+ atomic_set_unchecked(&pinstance->expose_resources, 0);
52851
52852 INIT_LIST_HEAD(&pinstance->free_res_q);
52853 INIT_LIST_HEAD(&pinstance->used_res_q);
52854@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
52855 /* Schedule worker thread to handle CCN and take care of adding and
52856 * removing devices to OS
52857 */
52858- atomic_set(&pinstance->expose_resources, 1);
52859+ atomic_set_unchecked(&pinstance->expose_resources, 1);
52860 schedule_work(&pinstance->worker_q);
52861 return rc;
52862
52863diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
52864index e1d150f..6c6df44 100644
52865--- a/drivers/scsi/pmcraid.h
52866+++ b/drivers/scsi/pmcraid.h
52867@@ -748,7 +748,7 @@ struct pmcraid_instance {
52868 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52869
52870 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52871- atomic_t last_message_id;
52872+ atomic_unchecked_t last_message_id;
52873
52874 /* configuration table */
52875 struct pmcraid_config_table *cfg_table;
52876@@ -777,7 +777,7 @@ struct pmcraid_instance {
52877 atomic_t outstanding_cmds;
52878
52879 /* should add/delete resources to mid-layer now ?*/
52880- atomic_t expose_resources;
52881+ atomic_unchecked_t expose_resources;
52882
52883
52884
52885@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52886 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52887 };
52888 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52889- atomic_t read_failures; /* count of failed READ commands */
52890- atomic_t write_failures; /* count of failed WRITE commands */
52891+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52892+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52893
52894 /* To indicate add/delete/modify during CCN */
52895 u8 change_detected;
52896diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52897index 82b92c4..3178171 100644
52898--- a/drivers/scsi/qla2xxx/qla_attr.c
52899+++ b/drivers/scsi/qla2xxx/qla_attr.c
52900@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52901 return 0;
52902 }
52903
52904-struct fc_function_template qla2xxx_transport_functions = {
52905+fc_function_template_no_const qla2xxx_transport_functions = {
52906
52907 .show_host_node_name = 1,
52908 .show_host_port_name = 1,
52909@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52910 .bsg_timeout = qla24xx_bsg_timeout,
52911 };
52912
52913-struct fc_function_template qla2xxx_transport_vport_functions = {
52914+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52915
52916 .show_host_node_name = 1,
52917 .show_host_port_name = 1,
52918diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52919index 7686bfe..4710893 100644
52920--- a/drivers/scsi/qla2xxx/qla_gbl.h
52921+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52922@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52923 struct device_attribute;
52924 extern struct device_attribute *qla2x00_host_attrs[];
52925 struct fc_function_template;
52926-extern struct fc_function_template qla2xxx_transport_functions;
52927-extern struct fc_function_template qla2xxx_transport_vport_functions;
52928+extern fc_function_template_no_const qla2xxx_transport_functions;
52929+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52930 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52931 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52932 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
52933diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52934index cce1cbc..5b9f0fe 100644
52935--- a/drivers/scsi/qla2xxx/qla_os.c
52936+++ b/drivers/scsi/qla2xxx/qla_os.c
52937@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
52938 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
52939 /* Ok, a 64bit DMA mask is applicable. */
52940 ha->flags.enable_64bit_addressing = 1;
52941- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52942- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52943+ pax_open_kernel();
52944+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52945+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52946+ pax_close_kernel();
52947 return;
52948 }
52949 }
52950diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
52951index 8f6d0fb..1b21097 100644
52952--- a/drivers/scsi/qla4xxx/ql4_def.h
52953+++ b/drivers/scsi/qla4xxx/ql4_def.h
52954@@ -305,7 +305,7 @@ struct ddb_entry {
52955 * (4000 only) */
52956 atomic_t relogin_timer; /* Max Time to wait for
52957 * relogin to complete */
52958- atomic_t relogin_retry_count; /* Num of times relogin has been
52959+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
52960 * retried */
52961 uint32_t default_time2wait; /* Default Min time between
52962 * relogins (+aens) */
52963diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
52964index 6d25879..3031a9f 100644
52965--- a/drivers/scsi/qla4xxx/ql4_os.c
52966+++ b/drivers/scsi/qla4xxx/ql4_os.c
52967@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
52968 */
52969 if (!iscsi_is_session_online(cls_sess)) {
52970 /* Reset retry relogin timer */
52971- atomic_inc(&ddb_entry->relogin_retry_count);
52972+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
52973 DEBUG2(ql4_printk(KERN_INFO, ha,
52974 "%s: index[%d] relogin timed out-retrying"
52975 " relogin (%d), retry (%d)\n", __func__,
52976 ddb_entry->fw_ddb_index,
52977- atomic_read(&ddb_entry->relogin_retry_count),
52978+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
52979 ddb_entry->default_time2wait + 4));
52980 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
52981 atomic_set(&ddb_entry->retry_relogin_timer,
52982@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
52983
52984 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
52985 atomic_set(&ddb_entry->relogin_timer, 0);
52986- atomic_set(&ddb_entry->relogin_retry_count, 0);
52987+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
52988 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
52989 ddb_entry->default_relogin_timeout =
52990 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
52991diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
52992index c9c3b57..22a8e41 100644
52993--- a/drivers/scsi/scsi.c
52994+++ b/drivers/scsi/scsi.c
52995@@ -637,7 +637,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
52996
52997 good_bytes = scsi_bufflen(cmd);
52998 if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
52999- int old_good_bytes = good_bytes;
53000+ unsigned int old_good_bytes = good_bytes;
53001 drv = scsi_cmd_to_driver(cmd);
53002 if (drv->done)
53003 good_bytes = drv->done(cmd);
53004diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
53005index b1a2631..5bcd9c8 100644
53006--- a/drivers/scsi/scsi_lib.c
53007+++ b/drivers/scsi/scsi_lib.c
53008@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
53009 shost = sdev->host;
53010 scsi_init_cmd_errh(cmd);
53011 cmd->result = DID_NO_CONNECT << 16;
53012- atomic_inc(&cmd->device->iorequest_cnt);
53013+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
53014
53015 /*
53016 * SCSI request completion path will do scsi_device_unbusy(),
53017@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
53018
53019 INIT_LIST_HEAD(&cmd->eh_entry);
53020
53021- atomic_inc(&cmd->device->iodone_cnt);
53022+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
53023 if (cmd->result)
53024- atomic_inc(&cmd->device->ioerr_cnt);
53025+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
53026
53027 disposition = scsi_decide_disposition(cmd);
53028 if (disposition != SUCCESS &&
53029@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
53030 struct Scsi_Host *host = cmd->device->host;
53031 int rtn = 0;
53032
53033- atomic_inc(&cmd->device->iorequest_cnt);
53034+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
53035
53036 /* check if the device is still usable */
53037 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
53038diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
53039index 1ac38e7..6acc656 100644
53040--- a/drivers/scsi/scsi_sysfs.c
53041+++ b/drivers/scsi/scsi_sysfs.c
53042@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
53043 char *buf) \
53044 { \
53045 struct scsi_device *sdev = to_scsi_device(dev); \
53046- unsigned long long count = atomic_read(&sdev->field); \
53047+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
53048 return snprintf(buf, 20, "0x%llx\n", count); \
53049 } \
53050 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
53051diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
53052index 5d6f348..18778a6b 100644
53053--- a/drivers/scsi/scsi_transport_fc.c
53054+++ b/drivers/scsi/scsi_transport_fc.c
53055@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
53056 * Netlink Infrastructure
53057 */
53058
53059-static atomic_t fc_event_seq;
53060+static atomic_unchecked_t fc_event_seq;
53061
53062 /**
53063 * fc_get_event_number - Obtain the next sequential FC event number
53064@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
53065 u32
53066 fc_get_event_number(void)
53067 {
53068- return atomic_add_return(1, &fc_event_seq);
53069+ return atomic_add_return_unchecked(1, &fc_event_seq);
53070 }
53071 EXPORT_SYMBOL(fc_get_event_number);
53072
53073@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
53074 {
53075 int error;
53076
53077- atomic_set(&fc_event_seq, 0);
53078+ atomic_set_unchecked(&fc_event_seq, 0);
53079
53080 error = transport_class_register(&fc_host_class);
53081 if (error)
53082@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
53083 char *cp;
53084
53085 *val = simple_strtoul(buf, &cp, 0);
53086- if ((*cp && (*cp != '\n')) || (*val < 0))
53087+ if (*cp && (*cp != '\n'))
53088 return -EINVAL;
53089 /*
53090 * Check for overflow; dev_loss_tmo is u32
53091diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
53092index 67d43e3..8cee73c 100644
53093--- a/drivers/scsi/scsi_transport_iscsi.c
53094+++ b/drivers/scsi/scsi_transport_iscsi.c
53095@@ -79,7 +79,7 @@ struct iscsi_internal {
53096 struct transport_container session_cont;
53097 };
53098
53099-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
53100+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
53101 static struct workqueue_struct *iscsi_eh_timer_workq;
53102
53103 static DEFINE_IDA(iscsi_sess_ida);
53104@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
53105 int err;
53106
53107 ihost = shost->shost_data;
53108- session->sid = atomic_add_return(1, &iscsi_session_nr);
53109+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
53110
53111 if (target_id == ISCSI_MAX_TARGET) {
53112 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
53113@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
53114 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
53115 ISCSI_TRANSPORT_VERSION);
53116
53117- atomic_set(&iscsi_session_nr, 0);
53118+ atomic_set_unchecked(&iscsi_session_nr, 0);
53119
53120 err = class_register(&iscsi_transport_class);
53121 if (err)
53122diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
53123index ae45bd9..c32a586 100644
53124--- a/drivers/scsi/scsi_transport_srp.c
53125+++ b/drivers/scsi/scsi_transport_srp.c
53126@@ -35,7 +35,7 @@
53127 #include "scsi_priv.h"
53128
53129 struct srp_host_attrs {
53130- atomic_t next_port_id;
53131+ atomic_unchecked_t next_port_id;
53132 };
53133 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
53134
53135@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
53136 struct Scsi_Host *shost = dev_to_shost(dev);
53137 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
53138
53139- atomic_set(&srp_host->next_port_id, 0);
53140+ atomic_set_unchecked(&srp_host->next_port_id, 0);
53141 return 0;
53142 }
53143
53144@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
53145 rport_fast_io_fail_timedout);
53146 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
53147
53148- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
53149+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
53150 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
53151
53152 transport_setup_device(&rport->dev);
53153diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
53154index a661d33..1b233fa 100644
53155--- a/drivers/scsi/sd.c
53156+++ b/drivers/scsi/sd.c
53157@@ -111,7 +111,7 @@ static int sd_resume(struct device *);
53158 static void sd_rescan(struct device *);
53159 static int sd_init_command(struct scsi_cmnd *SCpnt);
53160 static void sd_uninit_command(struct scsi_cmnd *SCpnt);
53161-static int sd_done(struct scsi_cmnd *);
53162+static unsigned int sd_done(struct scsi_cmnd *);
53163 static int sd_eh_action(struct scsi_cmnd *, int);
53164 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
53165 static void scsi_disk_release(struct device *cdev);
53166@@ -1670,7 +1670,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
53167 *
53168 * Note: potentially run from within an ISR. Must not block.
53169 **/
53170-static int sd_done(struct scsi_cmnd *SCpnt)
53171+static unsigned int sd_done(struct scsi_cmnd *SCpnt)
53172 {
53173 int result = SCpnt->result;
53174 unsigned int good_bytes = result ? 0 : scsi_bufflen(SCpnt);
53175@@ -2997,7 +2997,7 @@ static int sd_probe(struct device *dev)
53176 sdkp->disk = gd;
53177 sdkp->index = index;
53178 atomic_set(&sdkp->openers, 0);
53179- atomic_set(&sdkp->device->ioerr_cnt, 0);
53180+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
53181
53182 if (!sdp->request_queue->rq_timeout) {
53183 if (sdp->type != TYPE_MOD)
53184diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
53185index 2270bd5..98408a5 100644
53186--- a/drivers/scsi/sg.c
53187+++ b/drivers/scsi/sg.c
53188@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
53189 sdp->disk->disk_name,
53190 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
53191 NULL,
53192- (char *)arg);
53193+ (char __user *)arg);
53194 case BLKTRACESTART:
53195 return blk_trace_startstop(sdp->device->request_queue, 1);
53196 case BLKTRACESTOP:
53197diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
53198index 8bd54a6..dd037a5 100644
53199--- a/drivers/scsi/sr.c
53200+++ b/drivers/scsi/sr.c
53201@@ -80,7 +80,7 @@ static DEFINE_MUTEX(sr_mutex);
53202 static int sr_probe(struct device *);
53203 static int sr_remove(struct device *);
53204 static int sr_init_command(struct scsi_cmnd *SCpnt);
53205-static int sr_done(struct scsi_cmnd *);
53206+static unsigned int sr_done(struct scsi_cmnd *);
53207 static int sr_runtime_suspend(struct device *dev);
53208
53209 static struct dev_pm_ops sr_pm_ops = {
53210@@ -312,11 +312,11 @@ do_tur:
53211 * It will be notified on the end of a SCSI read / write, and will take one
53212 * of several actions based on success or failure.
53213 */
53214-static int sr_done(struct scsi_cmnd *SCpnt)
53215+static unsigned int sr_done(struct scsi_cmnd *SCpnt)
53216 {
53217 int result = SCpnt->result;
53218- int this_count = scsi_bufflen(SCpnt);
53219- int good_bytes = (result == 0 ? this_count : 0);
53220+ unsigned int this_count = scsi_bufflen(SCpnt);
53221+ unsigned int good_bytes = (result == 0 ? this_count : 0);
53222 int block_sectors = 0;
53223 long error_sector;
53224 struct scsi_cd *cd = scsi_cd(SCpnt->request->rq_disk);
53225diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
53226index c0d660f..24a5854 100644
53227--- a/drivers/soc/tegra/fuse/fuse-tegra.c
53228+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
53229@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
53230 return i;
53231 }
53232
53233-static struct bin_attribute fuse_bin_attr = {
53234+static bin_attribute_no_const fuse_bin_attr = {
53235 .attr = { .name = "fuse", .mode = S_IRUGO, },
53236 .read = fuse_read,
53237 };
53238diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
53239index 57a1950..ae54e21 100644
53240--- a/drivers/spi/spi.c
53241+++ b/drivers/spi/spi.c
53242@@ -2307,7 +2307,7 @@ int spi_bus_unlock(struct spi_master *master)
53243 EXPORT_SYMBOL_GPL(spi_bus_unlock);
53244
53245 /* portable code must never pass more than 32 bytes */
53246-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
53247+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
53248
53249 static u8 *buf;
53250
53251diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
53252index b41429f..2de5373 100644
53253--- a/drivers/staging/android/timed_output.c
53254+++ b/drivers/staging/android/timed_output.c
53255@@ -25,7 +25,7 @@
53256 #include "timed_output.h"
53257
53258 static struct class *timed_output_class;
53259-static atomic_t device_count;
53260+static atomic_unchecked_t device_count;
53261
53262 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
53263 char *buf)
53264@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
53265 timed_output_class = class_create(THIS_MODULE, "timed_output");
53266 if (IS_ERR(timed_output_class))
53267 return PTR_ERR(timed_output_class);
53268- atomic_set(&device_count, 0);
53269+ atomic_set_unchecked(&device_count, 0);
53270 timed_output_class->dev_groups = timed_output_groups;
53271 }
53272
53273@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
53274 if (ret < 0)
53275 return ret;
53276
53277- tdev->index = atomic_inc_return(&device_count);
53278+ tdev->index = atomic_inc_return_unchecked(&device_count);
53279 tdev->dev = device_create(timed_output_class, NULL,
53280 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
53281 if (IS_ERR(tdev->dev))
53282diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
53283index 727640e..55bf61c 100644
53284--- a/drivers/staging/comedi/comedi_fops.c
53285+++ b/drivers/staging/comedi/comedi_fops.c
53286@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
53287 }
53288 cfp->last_attached = dev->attached;
53289 cfp->last_detach_count = dev->detach_count;
53290- ACCESS_ONCE(cfp->read_subdev) = read_s;
53291- ACCESS_ONCE(cfp->write_subdev) = write_s;
53292+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
53293+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
53294 }
53295
53296 static void comedi_file_check(struct file *file)
53297@@ -1924,7 +1924,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53298 !(s_old->async->cmd.flags & CMDF_WRITE))
53299 return -EBUSY;
53300
53301- ACCESS_ONCE(cfp->read_subdev) = s_new;
53302+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
53303 return 0;
53304 }
53305
53306@@ -1966,7 +1966,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53307 (s_old->async->cmd.flags & CMDF_WRITE))
53308 return -EBUSY;
53309
53310- ACCESS_ONCE(cfp->write_subdev) = s_new;
53311+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
53312 return 0;
53313 }
53314
53315diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
53316index 37dcf7e..f3c2016 100644
53317--- a/drivers/staging/fbtft/fbtft-core.c
53318+++ b/drivers/staging/fbtft/fbtft-core.c
53319@@ -689,7 +689,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
53320 {
53321 struct fb_info *info;
53322 struct fbtft_par *par;
53323- struct fb_ops *fbops = NULL;
53324+ fb_ops_no_const *fbops = NULL;
53325 struct fb_deferred_io *fbdefio = NULL;
53326 struct fbtft_platform_data *pdata = dev->platform_data;
53327 u8 *vmem = NULL;
53328diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
53329index 0dbf3f9..fed0063 100644
53330--- a/drivers/staging/fbtft/fbtft.h
53331+++ b/drivers/staging/fbtft/fbtft.h
53332@@ -106,7 +106,7 @@ struct fbtft_ops {
53333
53334 int (*set_var)(struct fbtft_par *par);
53335 int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
53336-};
53337+} __no_const;
53338
53339 /**
53340 * struct fbtft_display - Describes the display properties
53341diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
53342index 001348c..cfaac8a 100644
53343--- a/drivers/staging/gdm724x/gdm_tty.c
53344+++ b/drivers/staging/gdm724x/gdm_tty.c
53345@@ -44,7 +44,7 @@
53346 #define gdm_tty_send_control(n, r, v, d, l) (\
53347 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
53348
53349-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
53350+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
53351
53352 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
53353 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
53354diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
53355index d23c3c2..eb63c81 100644
53356--- a/drivers/staging/i2o/i2o.h
53357+++ b/drivers/staging/i2o/i2o.h
53358@@ -565,7 +565,7 @@ struct i2o_controller {
53359 struct i2o_device *exec; /* Executive */
53360 #if BITS_PER_LONG == 64
53361 spinlock_t context_list_lock; /* lock for context_list */
53362- atomic_t context_list_counter; /* needed for unique contexts */
53363+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
53364 struct list_head context_list; /* list of context id's
53365 and pointers */
53366 #endif
53367diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
53368index ad84f33..c5bdf65 100644
53369--- a/drivers/staging/i2o/i2o_proc.c
53370+++ b/drivers/staging/i2o/i2o_proc.c
53371@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
53372 "Array Controller Device"
53373 };
53374
53375-static char *chtostr(char *tmp, u8 *chars, int n)
53376-{
53377- tmp[0] = 0;
53378- return strncat(tmp, (char *)chars, n);
53379-}
53380-
53381 static int i2o_report_query_status(struct seq_file *seq, int block_status,
53382 char *group)
53383 {
53384@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
53385 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
53386 {
53387 struct i2o_controller *c = (struct i2o_controller *)seq->private;
53388- static u32 work32[5];
53389- static u8 *work8 = (u8 *) work32;
53390- static u16 *work16 = (u16 *) work32;
53391+ u32 work32[5];
53392+ u8 *work8 = (u8 *) work32;
53393+ u16 *work16 = (u16 *) work32;
53394 int token;
53395 u32 hwcap;
53396
53397@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53398 } *result;
53399
53400 i2o_exec_execute_ddm_table ddm_table;
53401- char tmp[28 + 1];
53402
53403 result = kmalloc(sizeof(*result), GFP_KERNEL);
53404 if (!result)
53405@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53406
53407 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
53408 seq_printf(seq, "%-#8x", ddm_table.module_id);
53409- seq_printf(seq, "%-29s",
53410- chtostr(tmp, ddm_table.module_name_version, 28));
53411+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
53412 seq_printf(seq, "%9d ", ddm_table.data_size);
53413 seq_printf(seq, "%8d", ddm_table.code_size);
53414
53415@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53416
53417 i2o_driver_result_table *result;
53418 i2o_driver_store_table *dst;
53419- char tmp[28 + 1];
53420
53421 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
53422 if (result == NULL)
53423@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53424
53425 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
53426 seq_printf(seq, "%-#8x", dst->module_id);
53427- seq_printf(seq, "%-29s",
53428- chtostr(tmp, dst->module_name_version, 28));
53429- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
53430+ seq_printf(seq, "%-.28s", dst->module_name_version);
53431+ seq_printf(seq, "%-.8s", dst->date);
53432 seq_printf(seq, "%8d ", dst->module_size);
53433 seq_printf(seq, "%8d ", dst->mpb_size);
53434 seq_printf(seq, "0x%04x", dst->module_flags);
53435@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
53436 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53437 {
53438 struct i2o_device *d = (struct i2o_device *)seq->private;
53439- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53440+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53441 // == (allow) 512d bytes (max)
53442- static u16 *work16 = (u16 *) work32;
53443+ u16 *work16 = (u16 *) work32;
53444 int token;
53445- char tmp[16 + 1];
53446
53447 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
53448
53449@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53450 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
53451 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
53452 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
53453- seq_printf(seq, "Vendor info : %s\n",
53454- chtostr(tmp, (u8 *) (work32 + 2), 16));
53455- seq_printf(seq, "Product info : %s\n",
53456- chtostr(tmp, (u8 *) (work32 + 6), 16));
53457- seq_printf(seq, "Description : %s\n",
53458- chtostr(tmp, (u8 *) (work32 + 10), 16));
53459- seq_printf(seq, "Product rev. : %s\n",
53460- chtostr(tmp, (u8 *) (work32 + 14), 8));
53461+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
53462+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
53463+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
53464+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
53465
53466 seq_printf(seq, "Serial number : ");
53467 print_serial_number(seq, (u8 *) (work32 + 16),
53468@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53469 u8 pad[256]; // allow up to 256 byte (max) serial number
53470 } result;
53471
53472- char tmp[24 + 1];
53473-
53474 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
53475
53476 if (token < 0) {
53477@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53478 }
53479
53480 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
53481- seq_printf(seq, "Module name : %s\n",
53482- chtostr(tmp, result.module_name, 24));
53483- seq_printf(seq, "Module revision : %s\n",
53484- chtostr(tmp, result.module_rev, 8));
53485+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
53486+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
53487
53488 seq_printf(seq, "Serial number : ");
53489 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
53490@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53491 u8 instance_number[4];
53492 } result;
53493
53494- char tmp[64 + 1];
53495-
53496 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
53497
53498 if (token < 0) {
53499@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53500 return 0;
53501 }
53502
53503- seq_printf(seq, "Device name : %s\n",
53504- chtostr(tmp, result.device_name, 64));
53505- seq_printf(seq, "Service name : %s\n",
53506- chtostr(tmp, result.service_name, 64));
53507- seq_printf(seq, "Physical name : %s\n",
53508- chtostr(tmp, result.physical_location, 64));
53509- seq_printf(seq, "Instance number : %s\n",
53510- chtostr(tmp, result.instance_number, 4));
53511+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
53512+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
53513+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
53514+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
53515
53516 return 0;
53517 }
53518@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53519 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
53520 {
53521 struct i2o_device *d = (struct i2o_device *)seq->private;
53522- static u32 work32[12];
53523- static u16 *work16 = (u16 *) work32;
53524- static u8 *work8 = (u8 *) work32;
53525+ u32 work32[12];
53526+ u16 *work16 = (u16 *) work32;
53527+ u8 *work8 = (u8 *) work32;
53528 int token;
53529
53530 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
53531diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
53532index 52334fc..d7f40b3 100644
53533--- a/drivers/staging/i2o/iop.c
53534+++ b/drivers/staging/i2o/iop.c
53535@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
53536
53537 spin_lock_irqsave(&c->context_list_lock, flags);
53538
53539- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
53540- atomic_inc(&c->context_list_counter);
53541+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
53542+ atomic_inc_unchecked(&c->context_list_counter);
53543
53544- entry->context = atomic_read(&c->context_list_counter);
53545+ entry->context = atomic_read_unchecked(&c->context_list_counter);
53546
53547 list_add(&entry->list, &c->context_list);
53548
53549@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
53550
53551 #if BITS_PER_LONG == 64
53552 spin_lock_init(&c->context_list_lock);
53553- atomic_set(&c->context_list_counter, 0);
53554+ atomic_set_unchecked(&c->context_list_counter, 0);
53555 INIT_LIST_HEAD(&c->context_list);
53556 #endif
53557
53558diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
53559index 463da07..e791ce9 100644
53560--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
53561+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
53562@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
53563 return 0;
53564 }
53565
53566-sfw_test_client_ops_t brw_test_client;
53567-void brw_init_test_client(void)
53568-{
53569- brw_test_client.tso_init = brw_client_init;
53570- brw_test_client.tso_fini = brw_client_fini;
53571- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
53572- brw_test_client.tso_done_rpc = brw_client_done_rpc;
53573+sfw_test_client_ops_t brw_test_client = {
53574+ .tso_init = brw_client_init,
53575+ .tso_fini = brw_client_fini,
53576+ .tso_prep_rpc = brw_client_prep_rpc,
53577+ .tso_done_rpc = brw_client_done_rpc,
53578 };
53579
53580 srpc_service_t brw_test_service;
53581diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
53582index 5709148..ccd9e0d 100644
53583--- a/drivers/staging/lustre/lnet/selftest/framework.c
53584+++ b/drivers/staging/lustre/lnet/selftest/framework.c
53585@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
53586
53587 extern sfw_test_client_ops_t ping_test_client;
53588 extern srpc_service_t ping_test_service;
53589-extern void ping_init_test_client(void);
53590 extern void ping_init_test_service(void);
53591
53592 extern sfw_test_client_ops_t brw_test_client;
53593 extern srpc_service_t brw_test_service;
53594-extern void brw_init_test_client(void);
53595 extern void brw_init_test_service(void);
53596
53597
53598@@ -1675,12 +1673,10 @@ sfw_startup (void)
53599 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
53600 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
53601
53602- brw_init_test_client();
53603 brw_init_test_service();
53604 rc = sfw_register_test(&brw_test_service, &brw_test_client);
53605 LASSERT (rc == 0);
53606
53607- ping_init_test_client();
53608 ping_init_test_service();
53609 rc = sfw_register_test(&ping_test_service, &ping_test_client);
53610 LASSERT (rc == 0);
53611diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
53612index d8c0df6..5041cbb 100644
53613--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
53614+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
53615@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
53616 return 0;
53617 }
53618
53619-sfw_test_client_ops_t ping_test_client;
53620-void ping_init_test_client(void)
53621-{
53622- ping_test_client.tso_init = ping_client_init;
53623- ping_test_client.tso_fini = ping_client_fini;
53624- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
53625- ping_test_client.tso_done_rpc = ping_client_done_rpc;
53626-}
53627+sfw_test_client_ops_t ping_test_client = {
53628+ .tso_init = ping_client_init,
53629+ .tso_fini = ping_client_fini,
53630+ .tso_prep_rpc = ping_client_prep_rpc,
53631+ .tso_done_rpc = ping_client_done_rpc,
53632+};
53633
53634 srpc_service_t ping_test_service;
53635 void ping_init_test_service(void)
53636diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53637index 83bc0a9..12ba00a 100644
53638--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
53639+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53640@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
53641 ldlm_completion_callback lcs_completion;
53642 ldlm_blocking_callback lcs_blocking;
53643 ldlm_glimpse_callback lcs_glimpse;
53644-};
53645+} __no_const;
53646
53647 /* ldlm_lockd.c */
53648 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
53649diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
53650index 2a88b80..62e7e5f 100644
53651--- a/drivers/staging/lustre/lustre/include/obd.h
53652+++ b/drivers/staging/lustre/lustre/include/obd.h
53653@@ -1362,7 +1362,7 @@ struct md_ops {
53654 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
53655 * wrapper function in include/linux/obd_class.h.
53656 */
53657-};
53658+} __no_const;
53659
53660 struct lsm_operations {
53661 void (*lsm_free)(struct lov_stripe_md *);
53662diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53663index a4c252f..b21acac 100644
53664--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53665+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53666@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
53667 int added = (mode == LCK_NL);
53668 int overlaps = 0;
53669 int splitted = 0;
53670- const struct ldlm_callback_suite null_cbs = { NULL };
53671+ const struct ldlm_callback_suite null_cbs = { };
53672
53673 CDEBUG(D_DLMTRACE,
53674 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
53675diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53676index c539e37..743b213 100644
53677--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53678+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53679@@ -237,7 +237,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
53680 loff_t *ppos)
53681 {
53682 int rc, max_delay_cs;
53683- struct ctl_table dummy = *table;
53684+ ctl_table_no_const dummy = *table;
53685 long d;
53686
53687 dummy.data = &max_delay_cs;
53688@@ -270,7 +270,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
53689 loff_t *ppos)
53690 {
53691 int rc, min_delay_cs;
53692- struct ctl_table dummy = *table;
53693+ ctl_table_no_const dummy = *table;
53694 long d;
53695
53696 dummy.data = &min_delay_cs;
53697@@ -302,7 +302,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
53698 void __user *buffer, size_t *lenp, loff_t *ppos)
53699 {
53700 int rc, backoff;
53701- struct ctl_table dummy = *table;
53702+ ctl_table_no_const dummy = *table;
53703
53704 dummy.data = &backoff;
53705 dummy.proc_handler = &proc_dointvec;
53706diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
53707index 7dc77dd..289d03e 100644
53708--- a/drivers/staging/lustre/lustre/libcfs/module.c
53709+++ b/drivers/staging/lustre/lustre/libcfs/module.c
53710@@ -313,11 +313,11 @@ out:
53711
53712
53713 struct cfs_psdev_ops libcfs_psdev_ops = {
53714- libcfs_psdev_open,
53715- libcfs_psdev_release,
53716- NULL,
53717- NULL,
53718- libcfs_ioctl
53719+ .p_open = libcfs_psdev_open,
53720+ .p_close = libcfs_psdev_release,
53721+ .p_read = NULL,
53722+ .p_write = NULL,
53723+ .p_ioctl = libcfs_ioctl
53724 };
53725
53726 extern int insert_proc(void);
53727diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
53728index 22667db..8b703b6 100644
53729--- a/drivers/staging/octeon/ethernet-rx.c
53730+++ b/drivers/staging/octeon/ethernet-rx.c
53731@@ -354,14 +354,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53732 /* Increment RX stats for virtual ports */
53733 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
53734 #ifdef CONFIG_64BIT
53735- atomic64_add(1,
53736+ atomic64_add_unchecked(1,
53737 (atomic64_t *)&priv->stats.rx_packets);
53738- atomic64_add(skb->len,
53739+ atomic64_add_unchecked(skb->len,
53740 (atomic64_t *)&priv->stats.rx_bytes);
53741 #else
53742- atomic_add(1,
53743+ atomic_add_unchecked(1,
53744 (atomic_t *)&priv->stats.rx_packets);
53745- atomic_add(skb->len,
53746+ atomic_add_unchecked(skb->len,
53747 (atomic_t *)&priv->stats.rx_bytes);
53748 #endif
53749 }
53750@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53751 dev->name);
53752 */
53753 #ifdef CONFIG_64BIT
53754- atomic64_add(1,
53755+ atomic64_add_unchecked(1,
53756 (atomic64_t *)&priv->stats.rx_dropped);
53757 #else
53758- atomic_add(1,
53759+ atomic_add_unchecked(1,
53760 (atomic_t *)&priv->stats.rx_dropped);
53761 #endif
53762 dev_kfree_skb_irq(skb);
53763diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
53764index 460e854..f926452 100644
53765--- a/drivers/staging/octeon/ethernet.c
53766+++ b/drivers/staging/octeon/ethernet.c
53767@@ -241,11 +241,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
53768 * since the RX tasklet also increments it.
53769 */
53770 #ifdef CONFIG_64BIT
53771- atomic64_add(rx_status.dropped_packets,
53772- (atomic64_t *)&priv->stats.rx_dropped);
53773+ atomic64_add_unchecked(rx_status.dropped_packets,
53774+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
53775 #else
53776- atomic_add(rx_status.dropped_packets,
53777- (atomic_t *)&priv->stats.rx_dropped);
53778+ atomic_add_unchecked(rx_status.dropped_packets,
53779+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
53780 #endif
53781 }
53782
53783diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
53784index 3b476d8..f522d68 100644
53785--- a/drivers/staging/rtl8188eu/include/hal_intf.h
53786+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
53787@@ -225,7 +225,7 @@ struct hal_ops {
53788
53789 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
53790 void (*hal_reset_security_engine)(struct adapter *adapter);
53791-};
53792+} __no_const;
53793
53794 enum rt_eeprom_type {
53795 EEPROM_93C46,
53796diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
53797index 070cc03..6806e37 100644
53798--- a/drivers/staging/rtl8712/rtl871x_io.h
53799+++ b/drivers/staging/rtl8712/rtl871x_io.h
53800@@ -108,7 +108,7 @@ struct _io_ops {
53801 u8 *pmem);
53802 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
53803 u8 *pmem);
53804-};
53805+} __no_const;
53806
53807 struct io_req {
53808 struct list_head list;
53809diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
53810index 98f3ba4..c6a7fce 100644
53811--- a/drivers/staging/unisys/visorchipset/visorchipset.h
53812+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
53813@@ -171,7 +171,7 @@ struct visorchipset_busdev_notifiers {
53814 void (*device_resume)(ulong bus_no, ulong dev_no);
53815 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
53816 ulong *max_size);
53817-};
53818+} __no_const;
53819
53820 /* These functions live inside visorchipset, and will be called to indicate
53821 * responses to specific events (by code outside of visorchipset).
53822@@ -186,7 +186,7 @@ struct visorchipset_busdev_responders {
53823 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
53824 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
53825 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
53826-};
53827+} __no_const;
53828
53829 /** Register functions (in the bus driver) to get called by visorchipset
53830 * whenever a bus or device appears for which this service partition is
53831diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
53832index 9512af6..045bf5a 100644
53833--- a/drivers/target/sbp/sbp_target.c
53834+++ b/drivers/target/sbp/sbp_target.c
53835@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
53836
53837 #define SESSION_MAINTENANCE_INTERVAL HZ
53838
53839-static atomic_t login_id = ATOMIC_INIT(0);
53840+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
53841
53842 static void session_maintenance_work(struct work_struct *);
53843 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
53844@@ -444,7 +444,7 @@ static void sbp_management_request_login(
53845 login->lun = se_lun;
53846 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
53847 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
53848- login->login_id = atomic_inc_return(&login_id);
53849+ login->login_id = atomic_inc_return_unchecked(&login_id);
53850
53851 login->tgt_agt = sbp_target_agent_register(login);
53852 if (IS_ERR(login->tgt_agt)) {
53853diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
53854index 7faa6ae..ae6c410 100644
53855--- a/drivers/target/target_core_device.c
53856+++ b/drivers/target/target_core_device.c
53857@@ -1495,7 +1495,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
53858 spin_lock_init(&dev->se_tmr_lock);
53859 spin_lock_init(&dev->qf_cmd_lock);
53860 sema_init(&dev->caw_sem, 1);
53861- atomic_set(&dev->dev_ordered_id, 0);
53862+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
53863 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
53864 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
53865 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
53866diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
53867index f786de0..04b643e 100644
53868--- a/drivers/target/target_core_transport.c
53869+++ b/drivers/target/target_core_transport.c
53870@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
53871 * Used to determine when ORDERED commands should go from
53872 * Dormant to Active status.
53873 */
53874- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
53875+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
53876 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
53877 cmd->se_ordered_id, cmd->sam_task_attr,
53878 dev->transport->name);
53879diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
53880index 031018e..90981a1 100644
53881--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
53882+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
53883@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
53884 platform_set_drvdata(pdev, priv);
53885
53886 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
53887- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53888- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53889+ pax_open_kernel();
53890+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53891+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53892+ pax_close_kernel();
53893 }
53894 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
53895 priv, &int3400_thermal_ops,
53896diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
53897index 668fb1b..2737bbe 100644
53898--- a/drivers/thermal/of-thermal.c
53899+++ b/drivers/thermal/of-thermal.c
53900@@ -31,6 +31,7 @@
53901 #include <linux/export.h>
53902 #include <linux/string.h>
53903 #include <linux/thermal.h>
53904+#include <linux/mm.h>
53905
53906 #include "thermal_core.h"
53907
53908@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
53909 tz->ops = ops;
53910 tz->sensor_data = data;
53911
53912- tzd->ops->get_temp = of_thermal_get_temp;
53913- tzd->ops->get_trend = of_thermal_get_trend;
53914- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53915+ pax_open_kernel();
53916+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
53917+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
53918+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53919+ pax_close_kernel();
53920 mutex_unlock(&tzd->lock);
53921
53922 return tzd;
53923@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
53924 return;
53925
53926 mutex_lock(&tzd->lock);
53927- tzd->ops->get_temp = NULL;
53928- tzd->ops->get_trend = NULL;
53929- tzd->ops->set_emul_temp = NULL;
53930+ pax_open_kernel();
53931+ *(void **)&tzd->ops->get_temp = NULL;
53932+ *(void **)&tzd->ops->get_trend = NULL;
53933+ *(void **)&tzd->ops->set_emul_temp = NULL;
53934+ pax_close_kernel();
53935
53936 tz->ops = NULL;
53937 tz->sensor_data = NULL;
53938diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
53939index 9ea3d9d..53e8792 100644
53940--- a/drivers/thermal/x86_pkg_temp_thermal.c
53941+++ b/drivers/thermal/x86_pkg_temp_thermal.c
53942@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
53943 return NOTIFY_OK;
53944 }
53945
53946-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
53947+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
53948 .notifier_call = pkg_temp_thermal_cpu_callback,
53949 };
53950
53951diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
53952index fd66f57..48e6376 100644
53953--- a/drivers/tty/cyclades.c
53954+++ b/drivers/tty/cyclades.c
53955@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
53956 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
53957 info->port.count);
53958 #endif
53959- info->port.count++;
53960+ atomic_inc(&info->port.count);
53961 #ifdef CY_DEBUG_COUNT
53962 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
53963- current->pid, info->port.count);
53964+ current->pid, atomic_read(&info->port.count));
53965 #endif
53966
53967 /*
53968@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
53969 for (j = 0; j < cy_card[i].nports; j++) {
53970 info = &cy_card[i].ports[j];
53971
53972- if (info->port.count) {
53973+ if (atomic_read(&info->port.count)) {
53974 /* XXX is the ldisc num worth this? */
53975 struct tty_struct *tty;
53976 struct tty_ldisc *ld;
53977diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
53978index 4fcec1d..5a036f7 100644
53979--- a/drivers/tty/hvc/hvc_console.c
53980+++ b/drivers/tty/hvc/hvc_console.c
53981@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
53982
53983 spin_lock_irqsave(&hp->port.lock, flags);
53984 /* Check and then increment for fast path open. */
53985- if (hp->port.count++ > 0) {
53986+ if (atomic_inc_return(&hp->port.count) > 1) {
53987 spin_unlock_irqrestore(&hp->port.lock, flags);
53988 hvc_kick();
53989 return 0;
53990@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53991
53992 spin_lock_irqsave(&hp->port.lock, flags);
53993
53994- if (--hp->port.count == 0) {
53995+ if (atomic_dec_return(&hp->port.count) == 0) {
53996 spin_unlock_irqrestore(&hp->port.lock, flags);
53997 /* We are done with the tty pointer now. */
53998 tty_port_tty_set(&hp->port, NULL);
53999@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
54000 */
54001 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
54002 } else {
54003- if (hp->port.count < 0)
54004+ if (atomic_read(&hp->port.count) < 0)
54005 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
54006- hp->vtermno, hp->port.count);
54007+ hp->vtermno, atomic_read(&hp->port.count));
54008 spin_unlock_irqrestore(&hp->port.lock, flags);
54009 }
54010 }
54011@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
54012 * open->hangup case this can be called after the final close so prevent
54013 * that from happening for now.
54014 */
54015- if (hp->port.count <= 0) {
54016+ if (atomic_read(&hp->port.count) <= 0) {
54017 spin_unlock_irqrestore(&hp->port.lock, flags);
54018 return;
54019 }
54020
54021- hp->port.count = 0;
54022+ atomic_set(&hp->port.count, 0);
54023 spin_unlock_irqrestore(&hp->port.lock, flags);
54024 tty_port_tty_set(&hp->port, NULL);
54025
54026@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
54027 return -EPIPE;
54028
54029 /* FIXME what's this (unprotected) check for? */
54030- if (hp->port.count <= 0)
54031+ if (atomic_read(&hp->port.count) <= 0)
54032 return -EIO;
54033
54034 spin_lock_irqsave(&hp->lock, flags);
54035diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
54036index 81ff7e1..dfb7b71 100644
54037--- a/drivers/tty/hvc/hvcs.c
54038+++ b/drivers/tty/hvc/hvcs.c
54039@@ -83,6 +83,7 @@
54040 #include <asm/hvcserver.h>
54041 #include <asm/uaccess.h>
54042 #include <asm/vio.h>
54043+#include <asm/local.h>
54044
54045 /*
54046 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
54047@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
54048
54049 spin_lock_irqsave(&hvcsd->lock, flags);
54050
54051- if (hvcsd->port.count > 0) {
54052+ if (atomic_read(&hvcsd->port.count) > 0) {
54053 spin_unlock_irqrestore(&hvcsd->lock, flags);
54054 printk(KERN_INFO "HVCS: vterm state unchanged. "
54055 "The hvcs device node is still in use.\n");
54056@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
54057 }
54058 }
54059
54060- hvcsd->port.count = 0;
54061+ atomic_set(&hvcsd->port.count, 0);
54062 hvcsd->port.tty = tty;
54063 tty->driver_data = hvcsd;
54064
54065@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
54066 unsigned long flags;
54067
54068 spin_lock_irqsave(&hvcsd->lock, flags);
54069- hvcsd->port.count++;
54070+ atomic_inc(&hvcsd->port.count);
54071 hvcsd->todo_mask |= HVCS_SCHED_READ;
54072 spin_unlock_irqrestore(&hvcsd->lock, flags);
54073
54074@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54075 hvcsd = tty->driver_data;
54076
54077 spin_lock_irqsave(&hvcsd->lock, flags);
54078- if (--hvcsd->port.count == 0) {
54079+ if (atomic_dec_and_test(&hvcsd->port.count)) {
54080
54081 vio_disable_interrupts(hvcsd->vdev);
54082
54083@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54084
54085 free_irq(irq, hvcsd);
54086 return;
54087- } else if (hvcsd->port.count < 0) {
54088+ } else if (atomic_read(&hvcsd->port.count) < 0) {
54089 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
54090 " is missmanaged.\n",
54091- hvcsd->vdev->unit_address, hvcsd->port.count);
54092+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
54093 }
54094
54095 spin_unlock_irqrestore(&hvcsd->lock, flags);
54096@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54097
54098 spin_lock_irqsave(&hvcsd->lock, flags);
54099 /* Preserve this so that we know how many kref refs to put */
54100- temp_open_count = hvcsd->port.count;
54101+ temp_open_count = atomic_read(&hvcsd->port.count);
54102
54103 /*
54104 * Don't kref put inside the spinlock because the destruction
54105@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54106 tty->driver_data = NULL;
54107 hvcsd->port.tty = NULL;
54108
54109- hvcsd->port.count = 0;
54110+ atomic_set(&hvcsd->port.count, 0);
54111
54112 /* This will drop any buffered data on the floor which is OK in a hangup
54113 * scenario. */
54114@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
54115 * the middle of a write operation? This is a crummy place to do this
54116 * but we want to keep it all in the spinlock.
54117 */
54118- if (hvcsd->port.count <= 0) {
54119+ if (atomic_read(&hvcsd->port.count) <= 0) {
54120 spin_unlock_irqrestore(&hvcsd->lock, flags);
54121 return -ENODEV;
54122 }
54123@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
54124 {
54125 struct hvcs_struct *hvcsd = tty->driver_data;
54126
54127- if (!hvcsd || hvcsd->port.count <= 0)
54128+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
54129 return 0;
54130
54131 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
54132diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
54133index 4190199..06d5bfa 100644
54134--- a/drivers/tty/hvc/hvsi.c
54135+++ b/drivers/tty/hvc/hvsi.c
54136@@ -85,7 +85,7 @@ struct hvsi_struct {
54137 int n_outbuf;
54138 uint32_t vtermno;
54139 uint32_t virq;
54140- atomic_t seqno; /* HVSI packet sequence number */
54141+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
54142 uint16_t mctrl;
54143 uint8_t state; /* HVSI protocol state */
54144 uint8_t flags;
54145@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
54146
54147 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
54148 packet.hdr.len = sizeof(struct hvsi_query_response);
54149- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54150+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54151 packet.verb = VSV_SEND_VERSION_NUMBER;
54152 packet.u.version = HVSI_VERSION;
54153 packet.query_seqno = query_seqno+1;
54154@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
54155
54156 packet.hdr.type = VS_QUERY_PACKET_HEADER;
54157 packet.hdr.len = sizeof(struct hvsi_query);
54158- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54159+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54160 packet.verb = verb;
54161
54162 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
54163@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
54164 int wrote;
54165
54166 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
54167- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54168+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54169 packet.hdr.len = sizeof(struct hvsi_control);
54170 packet.verb = VSV_SET_MODEM_CTL;
54171 packet.mask = HVSI_TSDTR;
54172@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
54173 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
54174
54175 packet.hdr.type = VS_DATA_PACKET_HEADER;
54176- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54177+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54178 packet.hdr.len = count + sizeof(struct hvsi_header);
54179 memcpy(&packet.data, buf, count);
54180
54181@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
54182 struct hvsi_control packet __ALIGNED__;
54183
54184 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
54185- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54186+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54187 packet.hdr.len = 6;
54188 packet.verb = VSV_CLOSE_PROTOCOL;
54189
54190@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
54191
54192 tty_port_tty_set(&hp->port, tty);
54193 spin_lock_irqsave(&hp->lock, flags);
54194- hp->port.count++;
54195+ atomic_inc(&hp->port.count);
54196 atomic_set(&hp->seqno, 0);
54197 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
54198 spin_unlock_irqrestore(&hp->lock, flags);
54199@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54200
54201 spin_lock_irqsave(&hp->lock, flags);
54202
54203- if (--hp->port.count == 0) {
54204+ if (atomic_dec_return(&hp->port.count) == 0) {
54205 tty_port_tty_set(&hp->port, NULL);
54206 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
54207
54208@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54209
54210 spin_lock_irqsave(&hp->lock, flags);
54211 }
54212- } else if (hp->port.count < 0)
54213+ } else if (atomic_read(&hp->port.count) < 0)
54214 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
54215- hp - hvsi_ports, hp->port.count);
54216+ hp - hvsi_ports, atomic_read(&hp->port.count));
54217
54218 spin_unlock_irqrestore(&hp->lock, flags);
54219 }
54220@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
54221 tty_port_tty_set(&hp->port, NULL);
54222
54223 spin_lock_irqsave(&hp->lock, flags);
54224- hp->port.count = 0;
54225+ atomic_set(&hp->port.count, 0);
54226 hp->n_outbuf = 0;
54227 spin_unlock_irqrestore(&hp->lock, flags);
54228 }
54229diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
54230index a270f04..7c77b5d 100644
54231--- a/drivers/tty/hvc/hvsi_lib.c
54232+++ b/drivers/tty/hvc/hvsi_lib.c
54233@@ -8,7 +8,7 @@
54234
54235 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
54236 {
54237- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
54238+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
54239
54240 /* Assumes that always succeeds, works in practice */
54241 return pv->put_chars(pv->termno, (char *)packet, packet->len);
54242@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
54243
54244 /* Reset state */
54245 pv->established = 0;
54246- atomic_set(&pv->seqno, 0);
54247+ atomic_set_unchecked(&pv->seqno, 0);
54248
54249 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
54250
54251diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
54252index 345cebb..d5a1e9e 100644
54253--- a/drivers/tty/ipwireless/tty.c
54254+++ b/drivers/tty/ipwireless/tty.c
54255@@ -28,6 +28,7 @@
54256 #include <linux/tty_driver.h>
54257 #include <linux/tty_flip.h>
54258 #include <linux/uaccess.h>
54259+#include <asm/local.h>
54260
54261 #include "tty.h"
54262 #include "network.h"
54263@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54264 return -ENODEV;
54265
54266 mutex_lock(&tty->ipw_tty_mutex);
54267- if (tty->port.count == 0)
54268+ if (atomic_read(&tty->port.count) == 0)
54269 tty->tx_bytes_queued = 0;
54270
54271- tty->port.count++;
54272+ atomic_inc(&tty->port.count);
54273
54274 tty->port.tty = linux_tty;
54275 linux_tty->driver_data = tty;
54276@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54277
54278 static void do_ipw_close(struct ipw_tty *tty)
54279 {
54280- tty->port.count--;
54281-
54282- if (tty->port.count == 0) {
54283+ if (atomic_dec_return(&tty->port.count) == 0) {
54284 struct tty_struct *linux_tty = tty->port.tty;
54285
54286 if (linux_tty != NULL) {
54287@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
54288 return;
54289
54290 mutex_lock(&tty->ipw_tty_mutex);
54291- if (tty->port.count == 0) {
54292+ if (atomic_read(&tty->port.count) == 0) {
54293 mutex_unlock(&tty->ipw_tty_mutex);
54294 return;
54295 }
54296@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
54297
54298 mutex_lock(&tty->ipw_tty_mutex);
54299
54300- if (!tty->port.count) {
54301+ if (!atomic_read(&tty->port.count)) {
54302 mutex_unlock(&tty->ipw_tty_mutex);
54303 return;
54304 }
54305@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
54306 return -ENODEV;
54307
54308 mutex_lock(&tty->ipw_tty_mutex);
54309- if (!tty->port.count) {
54310+ if (!atomic_read(&tty->port.count)) {
54311 mutex_unlock(&tty->ipw_tty_mutex);
54312 return -EINVAL;
54313 }
54314@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
54315 if (!tty)
54316 return -ENODEV;
54317
54318- if (!tty->port.count)
54319+ if (!atomic_read(&tty->port.count))
54320 return -EINVAL;
54321
54322 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
54323@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
54324 if (!tty)
54325 return 0;
54326
54327- if (!tty->port.count)
54328+ if (!atomic_read(&tty->port.count))
54329 return 0;
54330
54331 return tty->tx_bytes_queued;
54332@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
54333 if (!tty)
54334 return -ENODEV;
54335
54336- if (!tty->port.count)
54337+ if (!atomic_read(&tty->port.count))
54338 return -EINVAL;
54339
54340 return get_control_lines(tty);
54341@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
54342 if (!tty)
54343 return -ENODEV;
54344
54345- if (!tty->port.count)
54346+ if (!atomic_read(&tty->port.count))
54347 return -EINVAL;
54348
54349 return set_control_lines(tty, set, clear);
54350@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
54351 if (!tty)
54352 return -ENODEV;
54353
54354- if (!tty->port.count)
54355+ if (!atomic_read(&tty->port.count))
54356 return -EINVAL;
54357
54358 /* FIXME: Exactly how is the tty object locked here .. */
54359@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
54360 * are gone */
54361 mutex_lock(&ttyj->ipw_tty_mutex);
54362 }
54363- while (ttyj->port.count)
54364+ while (atomic_read(&ttyj->port.count))
54365 do_ipw_close(ttyj);
54366 ipwireless_disassociate_network_ttys(network,
54367 ttyj->channel_idx);
54368diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
54369index 14c54e0..1efd4f2 100644
54370--- a/drivers/tty/moxa.c
54371+++ b/drivers/tty/moxa.c
54372@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
54373 }
54374
54375 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
54376- ch->port.count++;
54377+ atomic_inc(&ch->port.count);
54378 tty->driver_data = ch;
54379 tty_port_tty_set(&ch->port, tty);
54380 mutex_lock(&ch->port.mutex);
54381diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
54382index bce16e4..1120a85 100644
54383--- a/drivers/tty/n_gsm.c
54384+++ b/drivers/tty/n_gsm.c
54385@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
54386 spin_lock_init(&dlci->lock);
54387 mutex_init(&dlci->mutex);
54388 dlci->fifo = &dlci->_fifo;
54389- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
54390+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
54391 kfree(dlci);
54392 return NULL;
54393 }
54394@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
54395 struct gsm_dlci *dlci = tty->driver_data;
54396 struct tty_port *port = &dlci->port;
54397
54398- port->count++;
54399+ atomic_inc(&port->count);
54400 tty_port_tty_set(port, tty);
54401
54402 dlci->modem_rx = 0;
54403diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
54404index eee40b5..796fb03 100644
54405--- a/drivers/tty/n_tty.c
54406+++ b/drivers/tty/n_tty.c
54407@@ -116,7 +116,7 @@ struct n_tty_data {
54408 int minimum_to_wake;
54409
54410 /* consumer-published */
54411- size_t read_tail;
54412+ size_t read_tail __intentional_overflow(-1);
54413 size_t line_start;
54414
54415 /* protected by output lock */
54416@@ -2572,6 +2572,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
54417 {
54418 *ops = tty_ldisc_N_TTY;
54419 ops->owner = NULL;
54420- ops->refcount = ops->flags = 0;
54421+ atomic_set(&ops->refcount, 0);
54422+ ops->flags = 0;
54423 }
54424 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
54425diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
54426index 4d5e840..a2340a6 100644
54427--- a/drivers/tty/pty.c
54428+++ b/drivers/tty/pty.c
54429@@ -849,8 +849,10 @@ static void __init unix98_pty_init(void)
54430 panic("Couldn't register Unix98 pts driver");
54431
54432 /* Now create the /dev/ptmx special device */
54433+ pax_open_kernel();
54434 tty_default_fops(&ptmx_fops);
54435- ptmx_fops.open = ptmx_open;
54436+ *(void **)&ptmx_fops.open = ptmx_open;
54437+ pax_close_kernel();
54438
54439 cdev_init(&ptmx_cdev, &ptmx_fops);
54440 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
54441diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
54442index c8dd8dc..dca6cfd 100644
54443--- a/drivers/tty/rocket.c
54444+++ b/drivers/tty/rocket.c
54445@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54446 tty->driver_data = info;
54447 tty_port_tty_set(port, tty);
54448
54449- if (port->count++ == 0) {
54450+ if (atomic_inc_return(&port->count) == 1) {
54451 atomic_inc(&rp_num_ports_open);
54452
54453 #ifdef ROCKET_DEBUG_OPEN
54454@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54455 #endif
54456 }
54457 #ifdef ROCKET_DEBUG_OPEN
54458- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
54459+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
54460 #endif
54461
54462 /*
54463@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
54464 spin_unlock_irqrestore(&info->port.lock, flags);
54465 return;
54466 }
54467- if (info->port.count)
54468+ if (atomic_read(&info->port.count))
54469 atomic_dec(&rp_num_ports_open);
54470 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
54471 spin_unlock_irqrestore(&info->port.lock, flags);
54472diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
54473index aa28209..e08fb85 100644
54474--- a/drivers/tty/serial/ioc4_serial.c
54475+++ b/drivers/tty/serial/ioc4_serial.c
54476@@ -437,7 +437,7 @@ struct ioc4_soft {
54477 } is_intr_info[MAX_IOC4_INTR_ENTS];
54478
54479 /* Number of entries active in the above array */
54480- atomic_t is_num_intrs;
54481+ atomic_unchecked_t is_num_intrs;
54482 } is_intr_type[IOC4_NUM_INTR_TYPES];
54483
54484 /* is_ir_lock must be held while
54485@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
54486 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
54487 || (type == IOC4_OTHER_INTR_TYPE)));
54488
54489- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
54490+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
54491 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
54492
54493 /* Save off the lower level interrupt handler */
54494@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
54495
54496 soft = arg;
54497 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
54498- num_intrs = (int)atomic_read(
54499+ num_intrs = (int)atomic_read_unchecked(
54500 &soft->is_intr_type[intr_type].is_num_intrs);
54501
54502 this_mir = this_ir = pending_intrs(soft, intr_type);
54503diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
54504index 129dc5b..1da5bb8 100644
54505--- a/drivers/tty/serial/kgdb_nmi.c
54506+++ b/drivers/tty/serial/kgdb_nmi.c
54507@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
54508 * I/O utilities that messages sent to the console will automatically
54509 * be displayed on the dbg_io.
54510 */
54511- dbg_io_ops->is_console = true;
54512+ pax_open_kernel();
54513+ *(int *)&dbg_io_ops->is_console = true;
54514+ pax_close_kernel();
54515
54516 return 0;
54517 }
54518diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
54519index a260cde..6b2b5ce 100644
54520--- a/drivers/tty/serial/kgdboc.c
54521+++ b/drivers/tty/serial/kgdboc.c
54522@@ -24,8 +24,9 @@
54523 #define MAX_CONFIG_LEN 40
54524
54525 static struct kgdb_io kgdboc_io_ops;
54526+static struct kgdb_io kgdboc_io_ops_console;
54527
54528-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
54529+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
54530 static int configured = -1;
54531
54532 static char config[MAX_CONFIG_LEN];
54533@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
54534 kgdboc_unregister_kbd();
54535 if (configured == 1)
54536 kgdb_unregister_io_module(&kgdboc_io_ops);
54537+ else if (configured == 2)
54538+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
54539 }
54540
54541 static int configure_kgdboc(void)
54542@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
54543 int err;
54544 char *cptr = config;
54545 struct console *cons;
54546+ int is_console = 0;
54547
54548 err = kgdboc_option_setup(config);
54549 if (err || !strlen(config) || isspace(config[0]))
54550 goto noconfig;
54551
54552 err = -ENODEV;
54553- kgdboc_io_ops.is_console = 0;
54554 kgdb_tty_driver = NULL;
54555
54556 kgdboc_use_kms = 0;
54557@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
54558 int idx;
54559 if (cons->device && cons->device(cons, &idx) == p &&
54560 idx == tty_line) {
54561- kgdboc_io_ops.is_console = 1;
54562+ is_console = 1;
54563 break;
54564 }
54565 cons = cons->next;
54566@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
54567 kgdb_tty_line = tty_line;
54568
54569 do_register:
54570- err = kgdb_register_io_module(&kgdboc_io_ops);
54571+ if (is_console) {
54572+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
54573+ configured = 2;
54574+ } else {
54575+ err = kgdb_register_io_module(&kgdboc_io_ops);
54576+ configured = 1;
54577+ }
54578 if (err)
54579 goto noconfig;
54580
54581@@ -205,8 +214,6 @@ do_register:
54582 if (err)
54583 goto nmi_con_failed;
54584
54585- configured = 1;
54586-
54587 return 0;
54588
54589 nmi_con_failed:
54590@@ -223,7 +230,7 @@ noconfig:
54591 static int __init init_kgdboc(void)
54592 {
54593 /* Already configured? */
54594- if (configured == 1)
54595+ if (configured >= 1)
54596 return 0;
54597
54598 return configure_kgdboc();
54599@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
54600 if (config[len - 1] == '\n')
54601 config[len - 1] = '\0';
54602
54603- if (configured == 1)
54604+ if (configured >= 1)
54605 cleanup_kgdboc();
54606
54607 /* Go and configure with the new params. */
54608@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
54609 .post_exception = kgdboc_post_exp_handler,
54610 };
54611
54612+static struct kgdb_io kgdboc_io_ops_console = {
54613+ .name = "kgdboc",
54614+ .read_char = kgdboc_get_char,
54615+ .write_char = kgdboc_put_char,
54616+ .pre_exception = kgdboc_pre_exp_handler,
54617+ .post_exception = kgdboc_post_exp_handler,
54618+ .is_console = 1
54619+};
54620+
54621 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
54622 /* This is only available if kgdboc is a built in for early debugging */
54623 static int __init kgdboc_early_init(char *opt)
54624diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
54625index b73889c..9f74f0a 100644
54626--- a/drivers/tty/serial/msm_serial.c
54627+++ b/drivers/tty/serial/msm_serial.c
54628@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
54629 .cons = MSM_CONSOLE,
54630 };
54631
54632-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
54633+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
54634
54635 static const struct of_device_id msm_uartdm_table[] = {
54636 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
54637@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
54638 line = pdev->id;
54639
54640 if (line < 0)
54641- line = atomic_inc_return(&msm_uart_next_id) - 1;
54642+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
54643
54644 if (unlikely(line < 0 || line >= UART_NR))
54645 return -ENXIO;
54646diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
54647index cf08876..711e0bf 100644
54648--- a/drivers/tty/serial/samsung.c
54649+++ b/drivers/tty/serial/samsung.c
54650@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
54651 ourport->tx_in_progress = 0;
54652 }
54653
54654+static int s3c64xx_serial_startup(struct uart_port *port);
54655 static int s3c24xx_serial_startup(struct uart_port *port)
54656 {
54657 struct s3c24xx_uart_port *ourport = to_ourport(port);
54658 int ret;
54659
54660+ /* Startup sequence is different for s3c64xx and higher SoC's */
54661+ if (s3c24xx_serial_has_interrupt_mask(port))
54662+ return s3c64xx_serial_startup(port);
54663+
54664 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
54665 port, (unsigned long long)port->mapbase, port->membase);
54666
54667@@ -1697,10 +1702,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
54668 /* setup info for port */
54669 port->dev = &platdev->dev;
54670
54671- /* Startup sequence is different for s3c64xx and higher SoC's */
54672- if (s3c24xx_serial_has_interrupt_mask(port))
54673- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
54674-
54675 port->uartclk = 1;
54676
54677 if (cfg->uart_flags & UPF_CONS_FLOW) {
54678diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
54679index 6a1055a..5ca9ad9 100644
54680--- a/drivers/tty/serial/serial_core.c
54681+++ b/drivers/tty/serial/serial_core.c
54682@@ -1377,7 +1377,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54683 state = drv->state + tty->index;
54684 port = &state->port;
54685 spin_lock_irq(&port->lock);
54686- --port->count;
54687+ atomic_dec(&port->count);
54688 spin_unlock_irq(&port->lock);
54689 return;
54690 }
54691@@ -1387,7 +1387,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54692
54693 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
54694
54695- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
54696+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
54697 return;
54698
54699 /*
54700@@ -1511,7 +1511,7 @@ static void uart_hangup(struct tty_struct *tty)
54701 uart_flush_buffer(tty);
54702 uart_shutdown(tty, state);
54703 spin_lock_irqsave(&port->lock, flags);
54704- port->count = 0;
54705+ atomic_set(&port->count, 0);
54706 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
54707 spin_unlock_irqrestore(&port->lock, flags);
54708 tty_port_tty_set(port, NULL);
54709@@ -1598,7 +1598,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
54710 pr_debug("uart_open(%d) called\n", line);
54711
54712 spin_lock_irq(&port->lock);
54713- ++port->count;
54714+ atomic_inc(&port->count);
54715 spin_unlock_irq(&port->lock);
54716
54717 /*
54718diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
54719index b799170..87dafd5 100644
54720--- a/drivers/tty/synclink.c
54721+++ b/drivers/tty/synclink.c
54722@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54723
54724 if (debug_level >= DEBUG_LEVEL_INFO)
54725 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
54726- __FILE__,__LINE__, info->device_name, info->port.count);
54727+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54728
54729 if (tty_port_close_start(&info->port, tty, filp) == 0)
54730 goto cleanup;
54731@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54732 cleanup:
54733 if (debug_level >= DEBUG_LEVEL_INFO)
54734 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
54735- tty->driver->name, info->port.count);
54736+ tty->driver->name, atomic_read(&info->port.count));
54737
54738 } /* end of mgsl_close() */
54739
54740@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
54741
54742 mgsl_flush_buffer(tty);
54743 shutdown(info);
54744-
54745- info->port.count = 0;
54746+
54747+ atomic_set(&info->port.count, 0);
54748 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54749 info->port.tty = NULL;
54750
54751@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54752
54753 if (debug_level >= DEBUG_LEVEL_INFO)
54754 printk("%s(%d):block_til_ready before block on %s count=%d\n",
54755- __FILE__,__LINE__, tty->driver->name, port->count );
54756+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54757
54758 spin_lock_irqsave(&info->irq_spinlock, flags);
54759- port->count--;
54760+ atomic_dec(&port->count);
54761 spin_unlock_irqrestore(&info->irq_spinlock, flags);
54762 port->blocked_open++;
54763
54764@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54765
54766 if (debug_level >= DEBUG_LEVEL_INFO)
54767 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
54768- __FILE__,__LINE__, tty->driver->name, port->count );
54769+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54770
54771 tty_unlock(tty);
54772 schedule();
54773@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54774
54775 /* FIXME: Racy on hangup during close wait */
54776 if (!tty_hung_up_p(filp))
54777- port->count++;
54778+ atomic_inc(&port->count);
54779 port->blocked_open--;
54780
54781 if (debug_level >= DEBUG_LEVEL_INFO)
54782 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
54783- __FILE__,__LINE__, tty->driver->name, port->count );
54784+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54785
54786 if (!retval)
54787 port->flags |= ASYNC_NORMAL_ACTIVE;
54788@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54789
54790 if (debug_level >= DEBUG_LEVEL_INFO)
54791 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
54792- __FILE__,__LINE__,tty->driver->name, info->port.count);
54793+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54794
54795 /* If port is closing, signal caller to try again */
54796 if (info->port.flags & ASYNC_CLOSING){
54797@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54798 spin_unlock_irqrestore(&info->netlock, flags);
54799 goto cleanup;
54800 }
54801- info->port.count++;
54802+ atomic_inc(&info->port.count);
54803 spin_unlock_irqrestore(&info->netlock, flags);
54804
54805- if (info->port.count == 1) {
54806+ if (atomic_read(&info->port.count) == 1) {
54807 /* 1st open on this device, init hardware */
54808 retval = startup(info);
54809 if (retval < 0)
54810@@ -3442,8 +3442,8 @@ cleanup:
54811 if (retval) {
54812 if (tty->count == 1)
54813 info->port.tty = NULL; /* tty layer will release tty struct */
54814- if(info->port.count)
54815- info->port.count--;
54816+ if (atomic_read(&info->port.count))
54817+ atomic_dec(&info->port.count);
54818 }
54819
54820 return retval;
54821@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54822 unsigned short new_crctype;
54823
54824 /* return error if TTY interface open */
54825- if (info->port.count)
54826+ if (atomic_read(&info->port.count))
54827 return -EBUSY;
54828
54829 switch (encoding)
54830@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
54831
54832 /* arbitrate between network and tty opens */
54833 spin_lock_irqsave(&info->netlock, flags);
54834- if (info->port.count != 0 || info->netcount != 0) {
54835+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54836 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54837 spin_unlock_irqrestore(&info->netlock, flags);
54838 return -EBUSY;
54839@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54840 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54841
54842 /* return error if TTY interface open */
54843- if (info->port.count)
54844+ if (atomic_read(&info->port.count))
54845 return -EBUSY;
54846
54847 if (cmd != SIOCWANDEV)
54848diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
54849index 0e8c39b..e0cb171 100644
54850--- a/drivers/tty/synclink_gt.c
54851+++ b/drivers/tty/synclink_gt.c
54852@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54853 tty->driver_data = info;
54854 info->port.tty = tty;
54855
54856- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
54857+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
54858
54859 /* If port is closing, signal caller to try again */
54860 if (info->port.flags & ASYNC_CLOSING){
54861@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54862 mutex_unlock(&info->port.mutex);
54863 goto cleanup;
54864 }
54865- info->port.count++;
54866+ atomic_inc(&info->port.count);
54867 spin_unlock_irqrestore(&info->netlock, flags);
54868
54869- if (info->port.count == 1) {
54870+ if (atomic_read(&info->port.count) == 1) {
54871 /* 1st open on this device, init hardware */
54872 retval = startup(info);
54873 if (retval < 0) {
54874@@ -715,8 +715,8 @@ cleanup:
54875 if (retval) {
54876 if (tty->count == 1)
54877 info->port.tty = NULL; /* tty layer will release tty struct */
54878- if(info->port.count)
54879- info->port.count--;
54880+ if(atomic_read(&info->port.count))
54881+ atomic_dec(&info->port.count);
54882 }
54883
54884 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
54885@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54886
54887 if (sanity_check(info, tty->name, "close"))
54888 return;
54889- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
54890+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
54891
54892 if (tty_port_close_start(&info->port, tty, filp) == 0)
54893 goto cleanup;
54894@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54895 tty_port_close_end(&info->port, tty);
54896 info->port.tty = NULL;
54897 cleanup:
54898- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
54899+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
54900 }
54901
54902 static void hangup(struct tty_struct *tty)
54903@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
54904 shutdown(info);
54905
54906 spin_lock_irqsave(&info->port.lock, flags);
54907- info->port.count = 0;
54908+ atomic_set(&info->port.count, 0);
54909 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54910 info->port.tty = NULL;
54911 spin_unlock_irqrestore(&info->port.lock, flags);
54912@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54913 unsigned short new_crctype;
54914
54915 /* return error if TTY interface open */
54916- if (info->port.count)
54917+ if (atomic_read(&info->port.count))
54918 return -EBUSY;
54919
54920 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
54921@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
54922
54923 /* arbitrate between network and tty opens */
54924 spin_lock_irqsave(&info->netlock, flags);
54925- if (info->port.count != 0 || info->netcount != 0) {
54926+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54927 DBGINFO(("%s hdlc_open busy\n", dev->name));
54928 spin_unlock_irqrestore(&info->netlock, flags);
54929 return -EBUSY;
54930@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54931 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
54932
54933 /* return error if TTY interface open */
54934- if (info->port.count)
54935+ if (atomic_read(&info->port.count))
54936 return -EBUSY;
54937
54938 if (cmd != SIOCWANDEV)
54939@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
54940 if (port == NULL)
54941 continue;
54942 spin_lock(&port->lock);
54943- if ((port->port.count || port->netcount) &&
54944+ if ((atomic_read(&port->port.count) || port->netcount) &&
54945 port->pending_bh && !port->bh_running &&
54946 !port->bh_requested) {
54947 DBGISR(("%s bh queued\n", port->device_name));
54948@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54949 add_wait_queue(&port->open_wait, &wait);
54950
54951 spin_lock_irqsave(&info->lock, flags);
54952- port->count--;
54953+ atomic_dec(&port->count);
54954 spin_unlock_irqrestore(&info->lock, flags);
54955 port->blocked_open++;
54956
54957@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54958 remove_wait_queue(&port->open_wait, &wait);
54959
54960 if (!tty_hung_up_p(filp))
54961- port->count++;
54962+ atomic_inc(&port->count);
54963 port->blocked_open--;
54964
54965 if (!retval)
54966diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
54967index c3f9091..abe4601 100644
54968--- a/drivers/tty/synclinkmp.c
54969+++ b/drivers/tty/synclinkmp.c
54970@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54971
54972 if (debug_level >= DEBUG_LEVEL_INFO)
54973 printk("%s(%d):%s open(), old ref count = %d\n",
54974- __FILE__,__LINE__,tty->driver->name, info->port.count);
54975+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54976
54977 /* If port is closing, signal caller to try again */
54978 if (info->port.flags & ASYNC_CLOSING){
54979@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54980 spin_unlock_irqrestore(&info->netlock, flags);
54981 goto cleanup;
54982 }
54983- info->port.count++;
54984+ atomic_inc(&info->port.count);
54985 spin_unlock_irqrestore(&info->netlock, flags);
54986
54987- if (info->port.count == 1) {
54988+ if (atomic_read(&info->port.count) == 1) {
54989 /* 1st open on this device, init hardware */
54990 retval = startup(info);
54991 if (retval < 0)
54992@@ -796,8 +796,8 @@ cleanup:
54993 if (retval) {
54994 if (tty->count == 1)
54995 info->port.tty = NULL; /* tty layer will release tty struct */
54996- if(info->port.count)
54997- info->port.count--;
54998+ if(atomic_read(&info->port.count))
54999+ atomic_dec(&info->port.count);
55000 }
55001
55002 return retval;
55003@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55004
55005 if (debug_level >= DEBUG_LEVEL_INFO)
55006 printk("%s(%d):%s close() entry, count=%d\n",
55007- __FILE__,__LINE__, info->device_name, info->port.count);
55008+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
55009
55010 if (tty_port_close_start(&info->port, tty, filp) == 0)
55011 goto cleanup;
55012@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55013 cleanup:
55014 if (debug_level >= DEBUG_LEVEL_INFO)
55015 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
55016- tty->driver->name, info->port.count);
55017+ tty->driver->name, atomic_read(&info->port.count));
55018 }
55019
55020 /* Called by tty_hangup() when a hangup is signaled.
55021@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
55022 shutdown(info);
55023
55024 spin_lock_irqsave(&info->port.lock, flags);
55025- info->port.count = 0;
55026+ atomic_set(&info->port.count, 0);
55027 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
55028 info->port.tty = NULL;
55029 spin_unlock_irqrestore(&info->port.lock, flags);
55030@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55031 unsigned short new_crctype;
55032
55033 /* return error if TTY interface open */
55034- if (info->port.count)
55035+ if (atomic_read(&info->port.count))
55036 return -EBUSY;
55037
55038 switch (encoding)
55039@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
55040
55041 /* arbitrate between network and tty opens */
55042 spin_lock_irqsave(&info->netlock, flags);
55043- if (info->port.count != 0 || info->netcount != 0) {
55044+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55045 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
55046 spin_unlock_irqrestore(&info->netlock, flags);
55047 return -EBUSY;
55048@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55049 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
55050
55051 /* return error if TTY interface open */
55052- if (info->port.count)
55053+ if (atomic_read(&info->port.count))
55054 return -EBUSY;
55055
55056 if (cmd != SIOCWANDEV)
55057@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
55058 * do not request bottom half processing if the
55059 * device is not open in a normal mode.
55060 */
55061- if ( port && (port->port.count || port->netcount) &&
55062+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
55063 port->pending_bh && !port->bh_running &&
55064 !port->bh_requested ) {
55065 if ( debug_level >= DEBUG_LEVEL_ISR )
55066@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55067
55068 if (debug_level >= DEBUG_LEVEL_INFO)
55069 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
55070- __FILE__,__LINE__, tty->driver->name, port->count );
55071+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55072
55073 spin_lock_irqsave(&info->lock, flags);
55074- port->count--;
55075+ atomic_dec(&port->count);
55076 spin_unlock_irqrestore(&info->lock, flags);
55077 port->blocked_open++;
55078
55079@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55080
55081 if (debug_level >= DEBUG_LEVEL_INFO)
55082 printk("%s(%d):%s block_til_ready() count=%d\n",
55083- __FILE__,__LINE__, tty->driver->name, port->count );
55084+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55085
55086 tty_unlock(tty);
55087 schedule();
55088@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55089 set_current_state(TASK_RUNNING);
55090 remove_wait_queue(&port->open_wait, &wait);
55091 if (!tty_hung_up_p(filp))
55092- port->count++;
55093+ atomic_inc(&port->count);
55094 port->blocked_open--;
55095
55096 if (debug_level >= DEBUG_LEVEL_INFO)
55097 printk("%s(%d):%s block_til_ready() after, count=%d\n",
55098- __FILE__,__LINE__, tty->driver->name, port->count );
55099+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55100
55101 if (!retval)
55102 port->flags |= ASYNC_NORMAL_ACTIVE;
55103diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
55104index 259a4d5..9b0c9e7 100644
55105--- a/drivers/tty/sysrq.c
55106+++ b/drivers/tty/sysrq.c
55107@@ -1085,7 +1085,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
55108 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
55109 size_t count, loff_t *ppos)
55110 {
55111- if (count) {
55112+ if (count && capable(CAP_SYS_ADMIN)) {
55113 char c;
55114
55115 if (get_user(c, buf))
55116diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
55117index 2bb4dfc..a7f6e86 100644
55118--- a/drivers/tty/tty_io.c
55119+++ b/drivers/tty/tty_io.c
55120@@ -3503,7 +3503,7 @@ EXPORT_SYMBOL(tty_devnum);
55121
55122 void tty_default_fops(struct file_operations *fops)
55123 {
55124- *fops = tty_fops;
55125+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
55126 }
55127
55128 /*
55129diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
55130index 3737f55..7cef448 100644
55131--- a/drivers/tty/tty_ldisc.c
55132+++ b/drivers/tty/tty_ldisc.c
55133@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
55134 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55135 tty_ldiscs[disc] = new_ldisc;
55136 new_ldisc->num = disc;
55137- new_ldisc->refcount = 0;
55138+ atomic_set(&new_ldisc->refcount, 0);
55139 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55140
55141 return ret;
55142@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
55143 return -EINVAL;
55144
55145 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55146- if (tty_ldiscs[disc]->refcount)
55147+ if (atomic_read(&tty_ldiscs[disc]->refcount))
55148 ret = -EBUSY;
55149 else
55150 tty_ldiscs[disc] = NULL;
55151@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
55152 if (ldops) {
55153 ret = ERR_PTR(-EAGAIN);
55154 if (try_module_get(ldops->owner)) {
55155- ldops->refcount++;
55156+ atomic_inc(&ldops->refcount);
55157 ret = ldops;
55158 }
55159 }
55160@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
55161 unsigned long flags;
55162
55163 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55164- ldops->refcount--;
55165+ atomic_dec(&ldops->refcount);
55166 module_put(ldops->owner);
55167 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55168 }
55169diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
55170index 40b31835..94d92ae 100644
55171--- a/drivers/tty/tty_port.c
55172+++ b/drivers/tty/tty_port.c
55173@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
55174 unsigned long flags;
55175
55176 spin_lock_irqsave(&port->lock, flags);
55177- port->count = 0;
55178+ atomic_set(&port->count, 0);
55179 port->flags &= ~ASYNC_NORMAL_ACTIVE;
55180 tty = port->tty;
55181 if (tty)
55182@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55183
55184 /* The port lock protects the port counts */
55185 spin_lock_irqsave(&port->lock, flags);
55186- port->count--;
55187+ atomic_dec(&port->count);
55188 port->blocked_open++;
55189 spin_unlock_irqrestore(&port->lock, flags);
55190
55191@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55192 we must not mess that up further */
55193 spin_lock_irqsave(&port->lock, flags);
55194 if (!tty_hung_up_p(filp))
55195- port->count++;
55196+ atomic_inc(&port->count);
55197 port->blocked_open--;
55198 if (retval == 0)
55199 port->flags |= ASYNC_NORMAL_ACTIVE;
55200@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
55201 return 0;
55202
55203 spin_lock_irqsave(&port->lock, flags);
55204- if (tty->count == 1 && port->count != 1) {
55205+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
55206 printk(KERN_WARNING
55207 "tty_port_close_start: tty->count = 1 port count = %d.\n",
55208- port->count);
55209- port->count = 1;
55210+ atomic_read(&port->count));
55211+ atomic_set(&port->count, 1);
55212 }
55213- if (--port->count < 0) {
55214+ if (atomic_dec_return(&port->count) < 0) {
55215 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
55216- port->count);
55217- port->count = 0;
55218+ atomic_read(&port->count));
55219+ atomic_set(&port->count, 0);
55220 }
55221
55222- if (port->count) {
55223+ if (atomic_read(&port->count)) {
55224 spin_unlock_irqrestore(&port->lock, flags);
55225 return 0;
55226 }
55227@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
55228 struct file *filp)
55229 {
55230 spin_lock_irq(&port->lock);
55231- ++port->count;
55232+ atomic_inc(&port->count);
55233 spin_unlock_irq(&port->lock);
55234 tty_port_tty_set(port, tty);
55235
55236diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
55237index 8a89f6e..50b32af 100644
55238--- a/drivers/tty/vt/keyboard.c
55239+++ b/drivers/tty/vt/keyboard.c
55240@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
55241 kbd->kbdmode == VC_OFF) &&
55242 value != KVAL(K_SAK))
55243 return; /* SAK is allowed even in raw mode */
55244+
55245+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
55246+ {
55247+ void *func = fn_handler[value];
55248+ if (func == fn_show_state || func == fn_show_ptregs ||
55249+ func == fn_show_mem)
55250+ return;
55251+ }
55252+#endif
55253+
55254 fn_handler[value](vc);
55255 }
55256
55257@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55258 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
55259 return -EFAULT;
55260
55261- if (!capable(CAP_SYS_TTY_CONFIG))
55262- perm = 0;
55263-
55264 switch (cmd) {
55265 case KDGKBENT:
55266 /* Ensure another thread doesn't free it under us */
55267@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55268 spin_unlock_irqrestore(&kbd_event_lock, flags);
55269 return put_user(val, &user_kbe->kb_value);
55270 case KDSKBENT:
55271+ if (!capable(CAP_SYS_TTY_CONFIG))
55272+ perm = 0;
55273+
55274 if (!perm)
55275 return -EPERM;
55276 if (!i && v == K_NOSUCHMAP) {
55277@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55278 int i, j, k;
55279 int ret;
55280
55281- if (!capable(CAP_SYS_TTY_CONFIG))
55282- perm = 0;
55283-
55284 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
55285 if (!kbs) {
55286 ret = -ENOMEM;
55287@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55288 kfree(kbs);
55289 return ((p && *p) ? -EOVERFLOW : 0);
55290 case KDSKBSENT:
55291+ if (!capable(CAP_SYS_TTY_CONFIG))
55292+ perm = 0;
55293+
55294 if (!perm) {
55295 ret = -EPERM;
55296 goto reterr;
55297diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
55298index 6276f13..84f2449 100644
55299--- a/drivers/uio/uio.c
55300+++ b/drivers/uio/uio.c
55301@@ -25,6 +25,7 @@
55302 #include <linux/kobject.h>
55303 #include <linux/cdev.h>
55304 #include <linux/uio_driver.h>
55305+#include <asm/local.h>
55306
55307 #define UIO_MAX_DEVICES (1U << MINORBITS)
55308
55309@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
55310 struct device_attribute *attr, char *buf)
55311 {
55312 struct uio_device *idev = dev_get_drvdata(dev);
55313- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
55314+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
55315 }
55316 static DEVICE_ATTR_RO(event);
55317
55318@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
55319 {
55320 struct uio_device *idev = info->uio_dev;
55321
55322- atomic_inc(&idev->event);
55323+ atomic_inc_unchecked(&idev->event);
55324 wake_up_interruptible(&idev->wait);
55325 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
55326 }
55327@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
55328 }
55329
55330 listener->dev = idev;
55331- listener->event_count = atomic_read(&idev->event);
55332+ listener->event_count = atomic_read_unchecked(&idev->event);
55333 filep->private_data = listener;
55334
55335 if (idev->info->open) {
55336@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
55337 return -EIO;
55338
55339 poll_wait(filep, &idev->wait, wait);
55340- if (listener->event_count != atomic_read(&idev->event))
55341+ if (listener->event_count != atomic_read_unchecked(&idev->event))
55342 return POLLIN | POLLRDNORM;
55343 return 0;
55344 }
55345@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
55346 do {
55347 set_current_state(TASK_INTERRUPTIBLE);
55348
55349- event_count = atomic_read(&idev->event);
55350+ event_count = atomic_read_unchecked(&idev->event);
55351 if (event_count != listener->event_count) {
55352 if (copy_to_user(buf, &event_count, count))
55353 retval = -EFAULT;
55354@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
55355 static int uio_find_mem_index(struct vm_area_struct *vma)
55356 {
55357 struct uio_device *idev = vma->vm_private_data;
55358+ unsigned long size;
55359
55360 if (vma->vm_pgoff < MAX_UIO_MAPS) {
55361- if (idev->info->mem[vma->vm_pgoff].size == 0)
55362+ size = idev->info->mem[vma->vm_pgoff].size;
55363+ if (size == 0)
55364+ return -1;
55365+ if (vma->vm_end - vma->vm_start > size)
55366 return -1;
55367 return (int)vma->vm_pgoff;
55368 }
55369@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
55370 idev->owner = owner;
55371 idev->info = info;
55372 init_waitqueue_head(&idev->wait);
55373- atomic_set(&idev->event, 0);
55374+ atomic_set_unchecked(&idev->event, 0);
55375
55376 ret = uio_get_minor(idev);
55377 if (ret)
55378diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
55379index 813d4d3..a71934f 100644
55380--- a/drivers/usb/atm/cxacru.c
55381+++ b/drivers/usb/atm/cxacru.c
55382@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
55383 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
55384 if (ret < 2)
55385 return -EINVAL;
55386- if (index < 0 || index > 0x7f)
55387+ if (index > 0x7f)
55388 return -EINVAL;
55389 pos += tmp;
55390
55391diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
55392index dada014..1d0d517 100644
55393--- a/drivers/usb/atm/usbatm.c
55394+++ b/drivers/usb/atm/usbatm.c
55395@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55396 if (printk_ratelimit())
55397 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
55398 __func__, vpi, vci);
55399- atomic_inc(&vcc->stats->rx_err);
55400+ atomic_inc_unchecked(&vcc->stats->rx_err);
55401 return;
55402 }
55403
55404@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55405 if (length > ATM_MAX_AAL5_PDU) {
55406 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
55407 __func__, length, vcc);
55408- atomic_inc(&vcc->stats->rx_err);
55409+ atomic_inc_unchecked(&vcc->stats->rx_err);
55410 goto out;
55411 }
55412
55413@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55414 if (sarb->len < pdu_length) {
55415 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
55416 __func__, pdu_length, sarb->len, vcc);
55417- atomic_inc(&vcc->stats->rx_err);
55418+ atomic_inc_unchecked(&vcc->stats->rx_err);
55419 goto out;
55420 }
55421
55422 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
55423 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
55424 __func__, vcc);
55425- atomic_inc(&vcc->stats->rx_err);
55426+ atomic_inc_unchecked(&vcc->stats->rx_err);
55427 goto out;
55428 }
55429
55430@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55431 if (printk_ratelimit())
55432 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
55433 __func__, length);
55434- atomic_inc(&vcc->stats->rx_drop);
55435+ atomic_inc_unchecked(&vcc->stats->rx_drop);
55436 goto out;
55437 }
55438
55439@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55440
55441 vcc->push(vcc, skb);
55442
55443- atomic_inc(&vcc->stats->rx);
55444+ atomic_inc_unchecked(&vcc->stats->rx);
55445 out:
55446 skb_trim(sarb, 0);
55447 }
55448@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
55449 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
55450
55451 usbatm_pop(vcc, skb);
55452- atomic_inc(&vcc->stats->tx);
55453+ atomic_inc_unchecked(&vcc->stats->tx);
55454
55455 skb = skb_dequeue(&instance->sndqueue);
55456 }
55457@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
55458 if (!left--)
55459 return sprintf(page,
55460 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
55461- atomic_read(&atm_dev->stats.aal5.tx),
55462- atomic_read(&atm_dev->stats.aal5.tx_err),
55463- atomic_read(&atm_dev->stats.aal5.rx),
55464- atomic_read(&atm_dev->stats.aal5.rx_err),
55465- atomic_read(&atm_dev->stats.aal5.rx_drop));
55466+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
55467+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
55468+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
55469+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
55470+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
55471
55472 if (!left--) {
55473 if (instance->disconnected)
55474diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
55475index 2a3bbdf..91d72cf 100644
55476--- a/drivers/usb/core/devices.c
55477+++ b/drivers/usb/core/devices.c
55478@@ -126,7 +126,7 @@ static const char format_endpt[] =
55479 * time it gets called.
55480 */
55481 static struct device_connect_event {
55482- atomic_t count;
55483+ atomic_unchecked_t count;
55484 wait_queue_head_t wait;
55485 } device_event = {
55486 .count = ATOMIC_INIT(1),
55487@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
55488
55489 void usbfs_conn_disc_event(void)
55490 {
55491- atomic_add(2, &device_event.count);
55492+ atomic_add_unchecked(2, &device_event.count);
55493 wake_up(&device_event.wait);
55494 }
55495
55496@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
55497
55498 poll_wait(file, &device_event.wait, wait);
55499
55500- event_count = atomic_read(&device_event.count);
55501+ event_count = atomic_read_unchecked(&device_event.count);
55502 if (file->f_version != event_count) {
55503 file->f_version = event_count;
55504 return POLLIN | POLLRDNORM;
55505diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
55506index 1163553..f292679 100644
55507--- a/drivers/usb/core/devio.c
55508+++ b/drivers/usb/core/devio.c
55509@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55510 struct usb_dev_state *ps = file->private_data;
55511 struct usb_device *dev = ps->dev;
55512 ssize_t ret = 0;
55513- unsigned len;
55514+ size_t len;
55515 loff_t pos;
55516 int i;
55517
55518@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55519 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
55520 struct usb_config_descriptor *config =
55521 (struct usb_config_descriptor *)dev->rawdescriptors[i];
55522- unsigned int length = le16_to_cpu(config->wTotalLength);
55523+ size_t length = le16_to_cpu(config->wTotalLength);
55524
55525 if (*ppos < pos + length) {
55526
55527 /* The descriptor may claim to be longer than it
55528 * really is. Here is the actual allocated length. */
55529- unsigned alloclen =
55530+ size_t alloclen =
55531 le16_to_cpu(dev->config[i].desc.wTotalLength);
55532
55533- len = length - (*ppos - pos);
55534+ len = length + pos - *ppos;
55535 if (len > nbytes)
55536 len = nbytes;
55537
55538 /* Simply don't write (skip over) unallocated parts */
55539 if (alloclen > (*ppos - pos)) {
55540- alloclen -= (*ppos - pos);
55541+ alloclen = alloclen + pos - *ppos;
55542 if (copy_to_user(buf,
55543 dev->rawdescriptors[i] + (*ppos - pos),
55544 min(len, alloclen))) {
55545diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
55546index 45a915c..09f9735 100644
55547--- a/drivers/usb/core/hcd.c
55548+++ b/drivers/usb/core/hcd.c
55549@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55550 */
55551 usb_get_urb(urb);
55552 atomic_inc(&urb->use_count);
55553- atomic_inc(&urb->dev->urbnum);
55554+ atomic_inc_unchecked(&urb->dev->urbnum);
55555 usbmon_urb_submit(&hcd->self, urb);
55556
55557 /* NOTE requirements on root-hub callers (usbfs and the hub
55558@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55559 urb->hcpriv = NULL;
55560 INIT_LIST_HEAD(&urb->urb_list);
55561 atomic_dec(&urb->use_count);
55562- atomic_dec(&urb->dev->urbnum);
55563+ atomic_dec_unchecked(&urb->dev->urbnum);
55564 if (atomic_read(&urb->reject))
55565 wake_up(&usb_kill_urb_queue);
55566 usb_put_urb(urb);
55567diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
55568index 3b71516..1f26579 100644
55569--- a/drivers/usb/core/hub.c
55570+++ b/drivers/usb/core/hub.c
55571@@ -26,6 +26,7 @@
55572 #include <linux/mutex.h>
55573 #include <linux/random.h>
55574 #include <linux/pm_qos.h>
55575+#include <linux/grsecurity.h>
55576
55577 #include <asm/uaccess.h>
55578 #include <asm/byteorder.h>
55579@@ -4665,6 +4666,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
55580 goto done;
55581 return;
55582 }
55583+
55584+ if (gr_handle_new_usb())
55585+ goto done;
55586+
55587 if (hub_is_superspeed(hub->hdev))
55588 unit_load = 150;
55589 else
55590diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
55591index f368d20..0c30ac5 100644
55592--- a/drivers/usb/core/message.c
55593+++ b/drivers/usb/core/message.c
55594@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
55595 * Return: If successful, the number of bytes transferred. Otherwise, a negative
55596 * error number.
55597 */
55598-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55599+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55600 __u8 requesttype, __u16 value, __u16 index, void *data,
55601 __u16 size, int timeout)
55602 {
55603@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
55604 * If successful, 0. Otherwise a negative error number. The number of actual
55605 * bytes transferred will be stored in the @actual_length parameter.
55606 */
55607-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55608+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55609 void *data, int len, int *actual_length, int timeout)
55610 {
55611 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
55612@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
55613 * bytes transferred will be stored in the @actual_length parameter.
55614 *
55615 */
55616-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55617+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55618 void *data, int len, int *actual_length, int timeout)
55619 {
55620 struct urb *urb;
55621diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
55622index d269738..7340cd7 100644
55623--- a/drivers/usb/core/sysfs.c
55624+++ b/drivers/usb/core/sysfs.c
55625@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
55626 struct usb_device *udev;
55627
55628 udev = to_usb_device(dev);
55629- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
55630+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
55631 }
55632 static DEVICE_ATTR_RO(urbnum);
55633
55634diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
55635index b1fb9ae..4224885 100644
55636--- a/drivers/usb/core/usb.c
55637+++ b/drivers/usb/core/usb.c
55638@@ -431,7 +431,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
55639 set_dev_node(&dev->dev, dev_to_node(bus->controller));
55640 dev->state = USB_STATE_ATTACHED;
55641 dev->lpm_disable_count = 1;
55642- atomic_set(&dev->urbnum, 0);
55643+ atomic_set_unchecked(&dev->urbnum, 0);
55644
55645 INIT_LIST_HEAD(&dev->ep0.urb_list);
55646 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
55647diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
55648index 8cfc319..4868255 100644
55649--- a/drivers/usb/early/ehci-dbgp.c
55650+++ b/drivers/usb/early/ehci-dbgp.c
55651@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
55652
55653 #ifdef CONFIG_KGDB
55654 static struct kgdb_io kgdbdbgp_io_ops;
55655-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
55656+static struct kgdb_io kgdbdbgp_io_ops_console;
55657+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
55658 #else
55659 #define dbgp_kgdb_mode (0)
55660 #endif
55661@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
55662 .write_char = kgdbdbgp_write_char,
55663 };
55664
55665+static struct kgdb_io kgdbdbgp_io_ops_console = {
55666+ .name = "kgdbdbgp",
55667+ .read_char = kgdbdbgp_read_char,
55668+ .write_char = kgdbdbgp_write_char,
55669+ .is_console = 1
55670+};
55671+
55672 static int kgdbdbgp_wait_time;
55673
55674 static int __init kgdbdbgp_parse_config(char *str)
55675@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
55676 ptr++;
55677 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
55678 }
55679- kgdb_register_io_module(&kgdbdbgp_io_ops);
55680- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
55681+ if (early_dbgp_console.index != -1)
55682+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
55683+ else
55684+ kgdb_register_io_module(&kgdbdbgp_io_ops);
55685
55686 return 0;
55687 }
55688diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
55689index 0495c94..289e201 100644
55690--- a/drivers/usb/gadget/configfs.c
55691+++ b/drivers/usb/gadget/configfs.c
55692@@ -571,7 +571,7 @@ static struct config_group *function_make(
55693 if (IS_ERR(fi))
55694 return ERR_CAST(fi);
55695
55696- ret = config_item_set_name(&fi->group.cg_item, name);
55697+ ret = config_item_set_name(&fi->group.cg_item, "%s", name);
55698 if (ret) {
55699 usb_put_function_instance(fi);
55700 return ERR_PTR(ret);
55701diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
55702index 9719abf..789d5d9 100644
55703--- a/drivers/usb/gadget/function/f_uac1.c
55704+++ b/drivers/usb/gadget/function/f_uac1.c
55705@@ -14,6 +14,7 @@
55706 #include <linux/module.h>
55707 #include <linux/device.h>
55708 #include <linux/atomic.h>
55709+#include <linux/module.h>
55710
55711 #include "u_uac1.h"
55712
55713diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
55714index 491082a..dfd7d17 100644
55715--- a/drivers/usb/gadget/function/u_serial.c
55716+++ b/drivers/usb/gadget/function/u_serial.c
55717@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55718 spin_lock_irq(&port->port_lock);
55719
55720 /* already open? Great. */
55721- if (port->port.count) {
55722+ if (atomic_read(&port->port.count)) {
55723 status = 0;
55724- port->port.count++;
55725+ atomic_inc(&port->port.count);
55726
55727 /* currently opening/closing? wait ... */
55728 } else if (port->openclose) {
55729@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55730 tty->driver_data = port;
55731 port->port.tty = tty;
55732
55733- port->port.count = 1;
55734+ atomic_set(&port->port.count, 1);
55735 port->openclose = false;
55736
55737 /* if connected, start the I/O stream */
55738@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55739
55740 spin_lock_irq(&port->port_lock);
55741
55742- if (port->port.count != 1) {
55743- if (port->port.count == 0)
55744+ if (atomic_read(&port->port.count) != 1) {
55745+ if (atomic_read(&port->port.count) == 0)
55746 WARN_ON(1);
55747 else
55748- --port->port.count;
55749+ atomic_dec(&port->port.count);
55750 goto exit;
55751 }
55752
55753@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55754 * and sleep if necessary
55755 */
55756 port->openclose = true;
55757- port->port.count = 0;
55758+ atomic_set(&port->port.count, 0);
55759
55760 gser = port->port_usb;
55761 if (gser && gser->disconnect)
55762@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
55763 int cond;
55764
55765 spin_lock_irq(&port->port_lock);
55766- cond = (port->port.count == 0) && !port->openclose;
55767+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
55768 spin_unlock_irq(&port->port_lock);
55769 return cond;
55770 }
55771@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
55772 /* if it's already open, start I/O ... and notify the serial
55773 * protocol about open/close status (connect/disconnect).
55774 */
55775- if (port->port.count) {
55776+ if (atomic_read(&port->port.count)) {
55777 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
55778 gs_start_io(port);
55779 if (gser->connect)
55780@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
55781
55782 port->port_usb = NULL;
55783 gser->ioport = NULL;
55784- if (port->port.count > 0 || port->openclose) {
55785+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
55786 wake_up_interruptible(&port->drain_wait);
55787 if (port->port.tty)
55788 tty_hangup(port->port.tty);
55789@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
55790
55791 /* finally, free any unused/unusable I/O buffers */
55792 spin_lock_irqsave(&port->port_lock, flags);
55793- if (port->port.count == 0 && !port->openclose)
55794+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
55795 gs_buf_free(&port->port_write_buf);
55796 gs_free_requests(gser->out, &port->read_pool, NULL);
55797 gs_free_requests(gser->out, &port->read_queue, NULL);
55798diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
55799index c78c841..48fd281 100644
55800--- a/drivers/usb/gadget/function/u_uac1.c
55801+++ b/drivers/usb/gadget/function/u_uac1.c
55802@@ -17,6 +17,7 @@
55803 #include <linux/ctype.h>
55804 #include <linux/random.h>
55805 #include <linux/syscalls.h>
55806+#include <linux/module.h>
55807
55808 #include "u_uac1.h"
55809
55810diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
55811index 7354d01..299478e 100644
55812--- a/drivers/usb/host/ehci-hub.c
55813+++ b/drivers/usb/host/ehci-hub.c
55814@@ -772,7 +772,7 @@ static struct urb *request_single_step_set_feature_urb(
55815 urb->transfer_flags = URB_DIR_IN;
55816 usb_get_urb(urb);
55817 atomic_inc(&urb->use_count);
55818- atomic_inc(&urb->dev->urbnum);
55819+ atomic_inc_unchecked(&urb->dev->urbnum);
55820 urb->setup_dma = dma_map_single(
55821 hcd->self.controller,
55822 urb->setup_packet,
55823@@ -839,7 +839,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
55824 urb->status = -EINPROGRESS;
55825 usb_get_urb(urb);
55826 atomic_inc(&urb->use_count);
55827- atomic_inc(&urb->dev->urbnum);
55828+ atomic_inc_unchecked(&urb->dev->urbnum);
55829 retval = submit_single_step_set_feature(hcd, urb, 0);
55830 if (!retval && !wait_for_completion_timeout(&done,
55831 msecs_to_jiffies(2000))) {
55832diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
55833index 1db0626..4948782 100644
55834--- a/drivers/usb/host/hwa-hc.c
55835+++ b/drivers/usb/host/hwa-hc.c
55836@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55837 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
55838 struct wahc *wa = &hwahc->wa;
55839 struct device *dev = &wa->usb_iface->dev;
55840- u8 mas_le[UWB_NUM_MAS/8];
55841+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
55842+
55843+ if (mas_le == NULL)
55844+ return -ENOMEM;
55845
55846 /* Set the stream index */
55847 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
55848@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55849 WUSB_REQ_SET_WUSB_MAS,
55850 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
55851 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
55852- mas_le, 32, USB_CTRL_SET_TIMEOUT);
55853+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
55854 if (result < 0)
55855 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
55856 out:
55857+ kfree(mas_le);
55858+
55859 return result;
55860 }
55861
55862diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
55863index b3d245e..99549ed 100644
55864--- a/drivers/usb/misc/appledisplay.c
55865+++ b/drivers/usb/misc/appledisplay.c
55866@@ -84,7 +84,7 @@ struct appledisplay {
55867 struct mutex sysfslock; /* concurrent read and write */
55868 };
55869
55870-static atomic_t count_displays = ATOMIC_INIT(0);
55871+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
55872 static struct workqueue_struct *wq;
55873
55874 static void appledisplay_complete(struct urb *urb)
55875@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
55876
55877 /* Register backlight device */
55878 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
55879- atomic_inc_return(&count_displays) - 1);
55880+ atomic_inc_return_unchecked(&count_displays) - 1);
55881 memset(&props, 0, sizeof(struct backlight_properties));
55882 props.type = BACKLIGHT_RAW;
55883 props.max_brightness = 0xff;
55884diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
55885index 3806e70..55c508b 100644
55886--- a/drivers/usb/serial/console.c
55887+++ b/drivers/usb/serial/console.c
55888@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
55889
55890 info->port = port;
55891
55892- ++port->port.count;
55893+ atomic_inc(&port->port.count);
55894 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
55895 if (serial->type->set_termios) {
55896 /*
55897@@ -175,7 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
55898 }
55899 /* Now that any required fake tty operations are completed restore
55900 * the tty port count */
55901- --port->port.count;
55902+ atomic_dec(&port->port.count);
55903 /* The console is special in terms of closing the device so
55904 * indicate this port is now acting as a system console. */
55905 port->port.console = 1;
55906@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
55907 put_tty:
55908 tty_kref_put(tty);
55909 reset_open_count:
55910- port->port.count = 0;
55911+ atomic_set(&port->port.count, 0);
55912 usb_autopm_put_interface(serial->interface);
55913 error_get_interface:
55914 usb_serial_put(serial);
55915@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
55916 static void usb_console_write(struct console *co,
55917 const char *buf, unsigned count)
55918 {
55919- static struct usbcons_info *info = &usbcons_info;
55920+ struct usbcons_info *info = &usbcons_info;
55921 struct usb_serial_port *port = info->port;
55922 struct usb_serial *serial;
55923 int retval = -ENODEV;
55924diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
55925index 307e339..6aa97cb 100644
55926--- a/drivers/usb/storage/usb.h
55927+++ b/drivers/usb/storage/usb.h
55928@@ -63,7 +63,7 @@ struct us_unusual_dev {
55929 __u8 useProtocol;
55930 __u8 useTransport;
55931 int (*initFunction)(struct us_data *);
55932-};
55933+} __do_const;
55934
55935
55936 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
55937diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
55938index a863a98..d272795 100644
55939--- a/drivers/usb/usbip/vhci.h
55940+++ b/drivers/usb/usbip/vhci.h
55941@@ -83,7 +83,7 @@ struct vhci_hcd {
55942 unsigned resuming:1;
55943 unsigned long re_timeout;
55944
55945- atomic_t seqnum;
55946+ atomic_unchecked_t seqnum;
55947
55948 /*
55949 * NOTE:
55950diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
55951index 11f6f61..1087910 100644
55952--- a/drivers/usb/usbip/vhci_hcd.c
55953+++ b/drivers/usb/usbip/vhci_hcd.c
55954@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
55955
55956 spin_lock(&vdev->priv_lock);
55957
55958- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
55959+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55960 if (priv->seqnum == 0xffff)
55961 dev_info(&urb->dev->dev, "seqnum max\n");
55962
55963@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
55964 return -ENOMEM;
55965 }
55966
55967- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
55968+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55969 if (unlink->seqnum == 0xffff)
55970 pr_info("seqnum max\n");
55971
55972@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
55973 vdev->rhport = rhport;
55974 }
55975
55976- atomic_set(&vhci->seqnum, 0);
55977+ atomic_set_unchecked(&vhci->seqnum, 0);
55978 spin_lock_init(&vhci->lock);
55979
55980 hcd->power_budget = 0; /* no limit */
55981diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
55982index 00e4a54..d676f85 100644
55983--- a/drivers/usb/usbip/vhci_rx.c
55984+++ b/drivers/usb/usbip/vhci_rx.c
55985@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
55986 if (!urb) {
55987 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
55988 pr_info("max seqnum %d\n",
55989- atomic_read(&the_controller->seqnum));
55990+ atomic_read_unchecked(&the_controller->seqnum));
55991 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
55992 return;
55993 }
55994diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
55995index edc7267..9f65ce2 100644
55996--- a/drivers/usb/wusbcore/wa-hc.h
55997+++ b/drivers/usb/wusbcore/wa-hc.h
55998@@ -240,7 +240,7 @@ struct wahc {
55999 spinlock_t xfer_list_lock;
56000 struct work_struct xfer_enqueue_work;
56001 struct work_struct xfer_error_work;
56002- atomic_t xfer_id_count;
56003+ atomic_unchecked_t xfer_id_count;
56004
56005 kernel_ulong_t quirks;
56006 };
56007@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
56008 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
56009 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
56010 wa->dto_in_use = 0;
56011- atomic_set(&wa->xfer_id_count, 1);
56012+ atomic_set_unchecked(&wa->xfer_id_count, 1);
56013 /* init the buf in URBs */
56014 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
56015 usb_init_urb(&(wa->buf_in_urbs[index]));
56016diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
56017index 69af4fd..da390d7 100644
56018--- a/drivers/usb/wusbcore/wa-xfer.c
56019+++ b/drivers/usb/wusbcore/wa-xfer.c
56020@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
56021 */
56022 static void wa_xfer_id_init(struct wa_xfer *xfer)
56023 {
56024- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
56025+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
56026 }
56027
56028 /* Return the xfer's ID. */
56029diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
56030index 837d177..170724af 100644
56031--- a/drivers/vfio/vfio.c
56032+++ b/drivers/vfio/vfio.c
56033@@ -518,7 +518,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
56034 return 0;
56035
56036 /* TODO Prevent device auto probing */
56037- WARN("Device %s added to live group %d!\n", dev_name(dev),
56038+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
56039 iommu_group_id(group->iommu_group));
56040
56041 return 0;
56042diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
56043index 3bb02c6..a01ff38 100644
56044--- a/drivers/vhost/vringh.c
56045+++ b/drivers/vhost/vringh.c
56046@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
56047 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
56048 {
56049 __virtio16 v = 0;
56050- int rc = get_user(v, (__force __virtio16 __user *)p);
56051+ int rc = get_user(v, (__force_user __virtio16 *)p);
56052 *val = vringh16_to_cpu(vrh, v);
56053 return rc;
56054 }
56055@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
56056 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
56057 {
56058 __virtio16 v = cpu_to_vringh16(vrh, val);
56059- return put_user(v, (__force __virtio16 __user *)p);
56060+ return put_user(v, (__force_user __virtio16 *)p);
56061 }
56062
56063 static inline int copydesc_user(void *dst, const void *src, size_t len)
56064 {
56065- return copy_from_user(dst, (__force void __user *)src, len) ?
56066+ return copy_from_user(dst, (void __force_user *)src, len) ?
56067 -EFAULT : 0;
56068 }
56069
56070@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
56071 const struct vring_used_elem *src,
56072 unsigned int num)
56073 {
56074- return copy_to_user((__force void __user *)dst, src,
56075+ return copy_to_user((void __force_user *)dst, src,
56076 sizeof(*dst) * num) ? -EFAULT : 0;
56077 }
56078
56079 static inline int xfer_from_user(void *src, void *dst, size_t len)
56080 {
56081- return copy_from_user(dst, (__force void __user *)src, len) ?
56082+ return copy_from_user(dst, (void __force_user *)src, len) ?
56083 -EFAULT : 0;
56084 }
56085
56086 static inline int xfer_to_user(void *dst, void *src, size_t len)
56087 {
56088- return copy_to_user((__force void __user *)dst, src, len) ?
56089+ return copy_to_user((void __force_user *)dst, src, len) ?
56090 -EFAULT : 0;
56091 }
56092
56093@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
56094 vrh->last_used_idx = 0;
56095 vrh->vring.num = num;
56096 /* vring expects kernel addresses, but only used via accessors. */
56097- vrh->vring.desc = (__force struct vring_desc *)desc;
56098- vrh->vring.avail = (__force struct vring_avail *)avail;
56099- vrh->vring.used = (__force struct vring_used *)used;
56100+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
56101+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
56102+ vrh->vring.used = (__force_kernel struct vring_used *)used;
56103 return 0;
56104 }
56105 EXPORT_SYMBOL(vringh_init_user);
56106@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
56107
56108 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
56109 {
56110- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
56111+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
56112 return 0;
56113 }
56114
56115diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
56116index 84a110a..96312c3 100644
56117--- a/drivers/video/backlight/kb3886_bl.c
56118+++ b/drivers/video/backlight/kb3886_bl.c
56119@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
56120 static unsigned long kb3886bl_flags;
56121 #define KB3886BL_SUSPENDED 0x01
56122
56123-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
56124+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
56125 {
56126 .ident = "Sahara Touch-iT",
56127 .matches = {
56128diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
56129index 1b0b233..6f34c2c 100644
56130--- a/drivers/video/fbdev/arcfb.c
56131+++ b/drivers/video/fbdev/arcfb.c
56132@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
56133 return -ENOSPC;
56134
56135 err = 0;
56136- if ((count + p) > fbmemlength) {
56137+ if (count > (fbmemlength - p)) {
56138 count = fbmemlength - p;
56139 err = -ENOSPC;
56140 }
56141diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
56142index aedf2fb..47c9aca 100644
56143--- a/drivers/video/fbdev/aty/aty128fb.c
56144+++ b/drivers/video/fbdev/aty/aty128fb.c
56145@@ -149,7 +149,7 @@ enum {
56146 };
56147
56148 /* Must match above enum */
56149-static char * const r128_family[] = {
56150+static const char * const r128_family[] = {
56151 "AGP",
56152 "PCI",
56153 "PRO AGP",
56154diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
56155index 8789e48..698fe4c 100644
56156--- a/drivers/video/fbdev/aty/atyfb_base.c
56157+++ b/drivers/video/fbdev/aty/atyfb_base.c
56158@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
56159 par->accel_flags = var->accel_flags; /* hack */
56160
56161 if (var->accel_flags) {
56162- info->fbops->fb_sync = atyfb_sync;
56163+ pax_open_kernel();
56164+ *(void **)&info->fbops->fb_sync = atyfb_sync;
56165+ pax_close_kernel();
56166 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56167 } else {
56168- info->fbops->fb_sync = NULL;
56169+ pax_open_kernel();
56170+ *(void **)&info->fbops->fb_sync = NULL;
56171+ pax_close_kernel();
56172 info->flags |= FBINFO_HWACCEL_DISABLED;
56173 }
56174
56175diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
56176index 2fa0317..4983f2a 100644
56177--- a/drivers/video/fbdev/aty/mach64_cursor.c
56178+++ b/drivers/video/fbdev/aty/mach64_cursor.c
56179@@ -8,6 +8,7 @@
56180 #include "../core/fb_draw.h"
56181
56182 #include <asm/io.h>
56183+#include <asm/pgtable.h>
56184
56185 #ifdef __sparc__
56186 #include <asm/fbio.h>
56187@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
56188 info->sprite.buf_align = 16; /* and 64 lines tall. */
56189 info->sprite.flags = FB_PIXMAP_IO;
56190
56191- info->fbops->fb_cursor = atyfb_cursor;
56192+ pax_open_kernel();
56193+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
56194+ pax_close_kernel();
56195
56196 return 0;
56197 }
56198diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
56199index d6cab1f..112f680 100644
56200--- a/drivers/video/fbdev/core/fb_defio.c
56201+++ b/drivers/video/fbdev/core/fb_defio.c
56202@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
56203
56204 BUG_ON(!fbdefio);
56205 mutex_init(&fbdefio->lock);
56206- info->fbops->fb_mmap = fb_deferred_io_mmap;
56207+ pax_open_kernel();
56208+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
56209+ pax_close_kernel();
56210 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
56211 INIT_LIST_HEAD(&fbdefio->pagelist);
56212 if (fbdefio->delay == 0) /* set a default of 1 s */
56213@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
56214 page->mapping = NULL;
56215 }
56216
56217- info->fbops->fb_mmap = NULL;
56218+ *(void **)&info->fbops->fb_mmap = NULL;
56219 mutex_destroy(&fbdefio->lock);
56220 }
56221 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
56222diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
56223index 0705d88..d9429bf 100644
56224--- a/drivers/video/fbdev/core/fbmem.c
56225+++ b/drivers/video/fbdev/core/fbmem.c
56226@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
56227 __u32 data;
56228 int err;
56229
56230- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
56231+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
56232
56233 data = (__u32) (unsigned long) fix->smem_start;
56234 err |= put_user(data, &fix32->smem_start);
56235diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
56236index 4254336..282567e 100644
56237--- a/drivers/video/fbdev/hyperv_fb.c
56238+++ b/drivers/video/fbdev/hyperv_fb.c
56239@@ -240,7 +240,7 @@ static uint screen_fb_size;
56240 static inline int synthvid_send(struct hv_device *hdev,
56241 struct synthvid_msg *msg)
56242 {
56243- static atomic64_t request_id = ATOMIC64_INIT(0);
56244+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
56245 int ret;
56246
56247 msg->pipe_hdr.type = PIPE_MSG_DATA;
56248@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
56249
56250 ret = vmbus_sendpacket(hdev->channel, msg,
56251 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
56252- atomic64_inc_return(&request_id),
56253+ atomic64_inc_return_unchecked(&request_id),
56254 VM_PKT_DATA_INBAND, 0);
56255
56256 if (ret)
56257diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
56258index 7672d2e..b56437f 100644
56259--- a/drivers/video/fbdev/i810/i810_accel.c
56260+++ b/drivers/video/fbdev/i810/i810_accel.c
56261@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
56262 }
56263 }
56264 printk("ringbuffer lockup!!!\n");
56265+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
56266 i810_report_error(mmio);
56267 par->dev_flags |= LOCKUP;
56268 info->pixmap.scan_align = 1;
56269diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56270index a01147f..5d896f8 100644
56271--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56272+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56273@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
56274
56275 #ifdef CONFIG_FB_MATROX_MYSTIQUE
56276 struct matrox_switch matrox_mystique = {
56277- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
56278+ .preinit = MGA1064_preinit,
56279+ .reset = MGA1064_reset,
56280+ .init = MGA1064_init,
56281+ .restore = MGA1064_restore,
56282 };
56283 EXPORT_SYMBOL(matrox_mystique);
56284 #endif
56285
56286 #ifdef CONFIG_FB_MATROX_G
56287 struct matrox_switch matrox_G100 = {
56288- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
56289+ .preinit = MGAG100_preinit,
56290+ .reset = MGAG100_reset,
56291+ .init = MGAG100_init,
56292+ .restore = MGAG100_restore,
56293 };
56294 EXPORT_SYMBOL(matrox_G100);
56295 #endif
56296diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56297index 195ad7c..09743fc 100644
56298--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56299+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56300@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
56301 }
56302
56303 struct matrox_switch matrox_millennium = {
56304- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
56305+ .preinit = Ti3026_preinit,
56306+ .reset = Ti3026_reset,
56307+ .init = Ti3026_init,
56308+ .restore = Ti3026_restore
56309 };
56310 EXPORT_SYMBOL(matrox_millennium);
56311 #endif
56312diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56313index fe92eed..106e085 100644
56314--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56315+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56316@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
56317 struct mb862xxfb_par *par = info->par;
56318
56319 if (info->var.bits_per_pixel == 32) {
56320- info->fbops->fb_fillrect = cfb_fillrect;
56321- info->fbops->fb_copyarea = cfb_copyarea;
56322- info->fbops->fb_imageblit = cfb_imageblit;
56323+ pax_open_kernel();
56324+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56325+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56326+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56327+ pax_close_kernel();
56328 } else {
56329 outreg(disp, GC_L0EM, 3);
56330- info->fbops->fb_fillrect = mb86290fb_fillrect;
56331- info->fbops->fb_copyarea = mb86290fb_copyarea;
56332- info->fbops->fb_imageblit = mb86290fb_imageblit;
56333+ pax_open_kernel();
56334+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
56335+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
56336+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
56337+ pax_close_kernel();
56338 }
56339 outreg(draw, GDC_REG_DRAW_BASE, 0);
56340 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
56341diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
56342index def0412..fed6529 100644
56343--- a/drivers/video/fbdev/nvidia/nvidia.c
56344+++ b/drivers/video/fbdev/nvidia/nvidia.c
56345@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
56346 info->fix.line_length = (info->var.xres_virtual *
56347 info->var.bits_per_pixel) >> 3;
56348 if (info->var.accel_flags) {
56349- info->fbops->fb_imageblit = nvidiafb_imageblit;
56350- info->fbops->fb_fillrect = nvidiafb_fillrect;
56351- info->fbops->fb_copyarea = nvidiafb_copyarea;
56352- info->fbops->fb_sync = nvidiafb_sync;
56353+ pax_open_kernel();
56354+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
56355+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
56356+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
56357+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
56358+ pax_close_kernel();
56359 info->pixmap.scan_align = 4;
56360 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56361 info->flags |= FBINFO_READS_FAST;
56362 NVResetGraphics(info);
56363 } else {
56364- info->fbops->fb_imageblit = cfb_imageblit;
56365- info->fbops->fb_fillrect = cfb_fillrect;
56366- info->fbops->fb_copyarea = cfb_copyarea;
56367- info->fbops->fb_sync = NULL;
56368+ pax_open_kernel();
56369+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56370+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56371+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56372+ *(void **)&info->fbops->fb_sync = NULL;
56373+ pax_close_kernel();
56374 info->pixmap.scan_align = 1;
56375 info->flags |= FBINFO_HWACCEL_DISABLED;
56376 info->flags &= ~FBINFO_READS_FAST;
56377@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
56378 info->pixmap.size = 8 * 1024;
56379 info->pixmap.flags = FB_PIXMAP_SYSTEM;
56380
56381- if (!hwcur)
56382- info->fbops->fb_cursor = NULL;
56383+ if (!hwcur) {
56384+ pax_open_kernel();
56385+ *(void **)&info->fbops->fb_cursor = NULL;
56386+ pax_close_kernel();
56387+ }
56388
56389 info->var.accel_flags = (!noaccel);
56390
56391diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
56392index 2412a0d..294215b 100644
56393--- a/drivers/video/fbdev/omap2/dss/display.c
56394+++ b/drivers/video/fbdev/omap2/dss/display.c
56395@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
56396 if (dssdev->name == NULL)
56397 dssdev->name = dssdev->alias;
56398
56399+ pax_open_kernel();
56400 if (drv && drv->get_resolution == NULL)
56401- drv->get_resolution = omapdss_default_get_resolution;
56402+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
56403 if (drv && drv->get_recommended_bpp == NULL)
56404- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56405+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56406 if (drv && drv->get_timings == NULL)
56407- drv->get_timings = omapdss_default_get_timings;
56408+ *(void **)&drv->get_timings = omapdss_default_get_timings;
56409+ pax_close_kernel();
56410
56411 mutex_lock(&panel_list_mutex);
56412 list_add_tail(&dssdev->panel_list, &panel_list);
56413diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
56414index 83433cb..71e9b98 100644
56415--- a/drivers/video/fbdev/s1d13xxxfb.c
56416+++ b/drivers/video/fbdev/s1d13xxxfb.c
56417@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
56418
56419 switch(prod_id) {
56420 case S1D13506_PROD_ID: /* activate acceleration */
56421- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56422- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56423+ pax_open_kernel();
56424+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56425+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56426+ pax_close_kernel();
56427 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
56428 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
56429 break;
56430diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56431index d3013cd..95b8285 100644
56432--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
56433+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56434@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
56435 }
56436
56437 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
56438- lcdc_sys_write_index,
56439- lcdc_sys_write_data,
56440- lcdc_sys_read_data,
56441+ .write_index = lcdc_sys_write_index,
56442+ .write_data = lcdc_sys_write_data,
56443+ .read_data = lcdc_sys_read_data,
56444 };
56445
56446 static int sh_mobile_lcdc_sginit(struct fb_info *info,
56447diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
56448index 9279e5f..d5f5276 100644
56449--- a/drivers/video/fbdev/smscufx.c
56450+++ b/drivers/video/fbdev/smscufx.c
56451@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
56452 fb_deferred_io_cleanup(info);
56453 kfree(info->fbdefio);
56454 info->fbdefio = NULL;
56455- info->fbops->fb_mmap = ufx_ops_mmap;
56456+ pax_open_kernel();
56457+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
56458+ pax_close_kernel();
56459 }
56460
56461 pr_debug("released /dev/fb%d user=%d count=%d",
56462diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
56463index ff2b873..626a8d5 100644
56464--- a/drivers/video/fbdev/udlfb.c
56465+++ b/drivers/video/fbdev/udlfb.c
56466@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
56467 dlfb_urb_completion(urb);
56468
56469 error:
56470- atomic_add(bytes_sent, &dev->bytes_sent);
56471- atomic_add(bytes_identical, &dev->bytes_identical);
56472- atomic_add(width*height*2, &dev->bytes_rendered);
56473+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56474+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56475+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
56476 end_cycles = get_cycles();
56477- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56478+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56479 >> 10)), /* Kcycles */
56480 &dev->cpu_kcycles_used);
56481
56482@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
56483 dlfb_urb_completion(urb);
56484
56485 error:
56486- atomic_add(bytes_sent, &dev->bytes_sent);
56487- atomic_add(bytes_identical, &dev->bytes_identical);
56488- atomic_add(bytes_rendered, &dev->bytes_rendered);
56489+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56490+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56491+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
56492 end_cycles = get_cycles();
56493- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56494+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56495 >> 10)), /* Kcycles */
56496 &dev->cpu_kcycles_used);
56497 }
56498@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
56499 fb_deferred_io_cleanup(info);
56500 kfree(info->fbdefio);
56501 info->fbdefio = NULL;
56502- info->fbops->fb_mmap = dlfb_ops_mmap;
56503+ pax_open_kernel();
56504+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
56505+ pax_close_kernel();
56506 }
56507
56508 pr_warn("released /dev/fb%d user=%d count=%d\n",
56509@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
56510 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56511 struct dlfb_data *dev = fb_info->par;
56512 return snprintf(buf, PAGE_SIZE, "%u\n",
56513- atomic_read(&dev->bytes_rendered));
56514+ atomic_read_unchecked(&dev->bytes_rendered));
56515 }
56516
56517 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56518@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56519 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56520 struct dlfb_data *dev = fb_info->par;
56521 return snprintf(buf, PAGE_SIZE, "%u\n",
56522- atomic_read(&dev->bytes_identical));
56523+ atomic_read_unchecked(&dev->bytes_identical));
56524 }
56525
56526 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56527@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56528 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56529 struct dlfb_data *dev = fb_info->par;
56530 return snprintf(buf, PAGE_SIZE, "%u\n",
56531- atomic_read(&dev->bytes_sent));
56532+ atomic_read_unchecked(&dev->bytes_sent));
56533 }
56534
56535 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56536@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56537 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56538 struct dlfb_data *dev = fb_info->par;
56539 return snprintf(buf, PAGE_SIZE, "%u\n",
56540- atomic_read(&dev->cpu_kcycles_used));
56541+ atomic_read_unchecked(&dev->cpu_kcycles_used));
56542 }
56543
56544 static ssize_t edid_show(
56545@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
56546 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56547 struct dlfb_data *dev = fb_info->par;
56548
56549- atomic_set(&dev->bytes_rendered, 0);
56550- atomic_set(&dev->bytes_identical, 0);
56551- atomic_set(&dev->bytes_sent, 0);
56552- atomic_set(&dev->cpu_kcycles_used, 0);
56553+ atomic_set_unchecked(&dev->bytes_rendered, 0);
56554+ atomic_set_unchecked(&dev->bytes_identical, 0);
56555+ atomic_set_unchecked(&dev->bytes_sent, 0);
56556+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
56557
56558 return count;
56559 }
56560diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
56561index d32d1c4..46722e6 100644
56562--- a/drivers/video/fbdev/uvesafb.c
56563+++ b/drivers/video/fbdev/uvesafb.c
56564@@ -19,6 +19,7 @@
56565 #include <linux/io.h>
56566 #include <linux/mutex.h>
56567 #include <linux/slab.h>
56568+#include <linux/moduleloader.h>
56569 #include <video/edid.h>
56570 #include <video/uvesafb.h>
56571 #ifdef CONFIG_X86
56572@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
56573 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
56574 par->pmi_setpal = par->ypan = 0;
56575 } else {
56576+
56577+#ifdef CONFIG_PAX_KERNEXEC
56578+#ifdef CONFIG_MODULES
56579+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
56580+#endif
56581+ if (!par->pmi_code) {
56582+ par->pmi_setpal = par->ypan = 0;
56583+ return 0;
56584+ }
56585+#endif
56586+
56587 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
56588 + task->t.regs.edi);
56589+
56590+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56591+ pax_open_kernel();
56592+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
56593+ pax_close_kernel();
56594+
56595+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
56596+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
56597+#else
56598 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
56599 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
56600+#endif
56601+
56602 printk(KERN_INFO "uvesafb: protected mode interface info at "
56603 "%04x:%04x\n",
56604 (u16)task->t.regs.es, (u16)task->t.regs.edi);
56605@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
56606 par->ypan = ypan;
56607
56608 if (par->pmi_setpal || par->ypan) {
56609+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
56610 if (__supported_pte_mask & _PAGE_NX) {
56611 par->pmi_setpal = par->ypan = 0;
56612 printk(KERN_WARNING "uvesafb: NX protection is active, "
56613 "better not use the PMI.\n");
56614- } else {
56615+ } else
56616+#endif
56617 uvesafb_vbe_getpmi(task, par);
56618- }
56619 }
56620 #else
56621 /* The protected mode interface is not available on non-x86. */
56622@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56623 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
56624
56625 /* Disable blanking if the user requested so. */
56626- if (!blank)
56627- info->fbops->fb_blank = NULL;
56628+ if (!blank) {
56629+ pax_open_kernel();
56630+ *(void **)&info->fbops->fb_blank = NULL;
56631+ pax_close_kernel();
56632+ }
56633
56634 /*
56635 * Find out how much IO memory is required for the mode with
56636@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56637 info->flags = FBINFO_FLAG_DEFAULT |
56638 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
56639
56640- if (!par->ypan)
56641- info->fbops->fb_pan_display = NULL;
56642+ if (!par->ypan) {
56643+ pax_open_kernel();
56644+ *(void **)&info->fbops->fb_pan_display = NULL;
56645+ pax_close_kernel();
56646+ }
56647 }
56648
56649 static void uvesafb_init_mtrr(struct fb_info *info)
56650@@ -1786,6 +1816,11 @@ out_mode:
56651 out:
56652 kfree(par->vbe_modes);
56653
56654+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56655+ if (par->pmi_code)
56656+ module_memfree_exec(par->pmi_code);
56657+#endif
56658+
56659 framebuffer_release(info);
56660 return err;
56661 }
56662@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
56663 kfree(par->vbe_state_orig);
56664 kfree(par->vbe_state_saved);
56665
56666+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56667+ if (par->pmi_code)
56668+ module_memfree_exec(par->pmi_code);
56669+#endif
56670+
56671 framebuffer_release(info);
56672 }
56673 return 0;
56674diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
56675index d79a0ac..2d0c3d4 100644
56676--- a/drivers/video/fbdev/vesafb.c
56677+++ b/drivers/video/fbdev/vesafb.c
56678@@ -9,6 +9,7 @@
56679 */
56680
56681 #include <linux/module.h>
56682+#include <linux/moduleloader.h>
56683 #include <linux/kernel.h>
56684 #include <linux/errno.h>
56685 #include <linux/string.h>
56686@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
56687 static int vram_total; /* Set total amount of memory */
56688 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
56689 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56690-static void (*pmi_start)(void) __read_mostly;
56691-static void (*pmi_pal) (void) __read_mostly;
56692+static void (*pmi_start)(void) __read_only;
56693+static void (*pmi_pal) (void) __read_only;
56694 static int depth __read_mostly;
56695 static int vga_compat __read_mostly;
56696 /* --------------------------------------------------------------------- */
56697@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
56698 unsigned int size_remap;
56699 unsigned int size_total;
56700 char *option = NULL;
56701+ void *pmi_code = NULL;
56702
56703 /* ignore error return of fb_get_options */
56704 fb_get_options("vesafb", &option);
56705@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
56706 size_remap = size_total;
56707 vesafb_fix.smem_len = size_remap;
56708
56709-#ifndef __i386__
56710- screen_info.vesapm_seg = 0;
56711-#endif
56712-
56713 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
56714 printk(KERN_WARNING
56715 "vesafb: cannot reserve video memory at 0x%lx\n",
56716@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
56717 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
56718 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
56719
56720+#ifdef __i386__
56721+
56722+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56723+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
56724+ if (!pmi_code)
56725+#elif !defined(CONFIG_PAX_KERNEXEC)
56726+ if (0)
56727+#endif
56728+
56729+#endif
56730+ screen_info.vesapm_seg = 0;
56731+
56732 if (screen_info.vesapm_seg) {
56733- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
56734- screen_info.vesapm_seg,screen_info.vesapm_off);
56735+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
56736+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
56737 }
56738
56739 if (screen_info.vesapm_seg < 0xc000)
56740@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
56741
56742 if (ypan || pmi_setpal) {
56743 unsigned short *pmi_base;
56744+
56745 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
56746- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
56747- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
56748+
56749+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56750+ pax_open_kernel();
56751+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
56752+#else
56753+ pmi_code = pmi_base;
56754+#endif
56755+
56756+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
56757+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
56758+
56759+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56760+ pmi_start = ktva_ktla(pmi_start);
56761+ pmi_pal = ktva_ktla(pmi_pal);
56762+ pax_close_kernel();
56763+#endif
56764+
56765 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
56766 if (pmi_base[3]) {
56767 printk(KERN_INFO "vesafb: pmi: ports = ");
56768@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
56769 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
56770 (ypan ? FBINFO_HWACCEL_YPAN : 0);
56771
56772- if (!ypan)
56773- info->fbops->fb_pan_display = NULL;
56774+ if (!ypan) {
56775+ pax_open_kernel();
56776+ *(void **)&info->fbops->fb_pan_display = NULL;
56777+ pax_close_kernel();
56778+ }
56779
56780 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
56781 err = -ENOMEM;
56782@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
56783 fb_info(info, "%s frame buffer device\n", info->fix.id);
56784 return 0;
56785 err:
56786+
56787+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56788+ module_memfree_exec(pmi_code);
56789+#endif
56790+
56791 if (info->screen_base)
56792 iounmap(info->screen_base);
56793 framebuffer_release(info);
56794diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
56795index 88714ae..16c2e11 100644
56796--- a/drivers/video/fbdev/via/via_clock.h
56797+++ b/drivers/video/fbdev/via/via_clock.h
56798@@ -56,7 +56,7 @@ struct via_clock {
56799
56800 void (*set_engine_pll_state)(u8 state);
56801 void (*set_engine_pll)(struct via_pll_config config);
56802-};
56803+} __no_const;
56804
56805
56806 static inline u32 get_pll_internal_frequency(u32 ref_freq,
56807diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
56808index 3c14e43..2630570 100644
56809--- a/drivers/video/logo/logo_linux_clut224.ppm
56810+++ b/drivers/video/logo/logo_linux_clut224.ppm
56811@@ -2,1603 +2,1123 @@ P3
56812 # Standard 224-color Linux logo
56813 80 80
56814 255
56815- 0 0 0 0 0 0 0 0 0 0 0 0
56816- 0 0 0 0 0 0 0 0 0 0 0 0
56817- 0 0 0 0 0 0 0 0 0 0 0 0
56818- 0 0 0 0 0 0 0 0 0 0 0 0
56819- 0 0 0 0 0 0 0 0 0 0 0 0
56820- 0 0 0 0 0 0 0 0 0 0 0 0
56821- 0 0 0 0 0 0 0 0 0 0 0 0
56822- 0 0 0 0 0 0 0 0 0 0 0 0
56823- 0 0 0 0 0 0 0 0 0 0 0 0
56824- 6 6 6 6 6 6 10 10 10 10 10 10
56825- 10 10 10 6 6 6 6 6 6 6 6 6
56826- 0 0 0 0 0 0 0 0 0 0 0 0
56827- 0 0 0 0 0 0 0 0 0 0 0 0
56828- 0 0 0 0 0 0 0 0 0 0 0 0
56829- 0 0 0 0 0 0 0 0 0 0 0 0
56830- 0 0 0 0 0 0 0 0 0 0 0 0
56831- 0 0 0 0 0 0 0 0 0 0 0 0
56832- 0 0 0 0 0 0 0 0 0 0 0 0
56833- 0 0 0 0 0 0 0 0 0 0 0 0
56834- 0 0 0 0 0 0 0 0 0 0 0 0
56835- 0 0 0 0 0 0 0 0 0 0 0 0
56836- 0 0 0 0 0 0 0 0 0 0 0 0
56837- 0 0 0 0 0 0 0 0 0 0 0 0
56838- 0 0 0 0 0 0 0 0 0 0 0 0
56839- 0 0 0 0 0 0 0 0 0 0 0 0
56840- 0 0 0 0 0 0 0 0 0 0 0 0
56841- 0 0 0 0 0 0 0 0 0 0 0 0
56842- 0 0 0 0 0 0 0 0 0 0 0 0
56843- 0 0 0 6 6 6 10 10 10 14 14 14
56844- 22 22 22 26 26 26 30 30 30 34 34 34
56845- 30 30 30 30 30 30 26 26 26 18 18 18
56846- 14 14 14 10 10 10 6 6 6 0 0 0
56847- 0 0 0 0 0 0 0 0 0 0 0 0
56848- 0 0 0 0 0 0 0 0 0 0 0 0
56849- 0 0 0 0 0 0 0 0 0 0 0 0
56850- 0 0 0 0 0 0 0 0 0 0 0 0
56851- 0 0 0 0 0 0 0 0 0 0 0 0
56852- 0 0 0 0 0 0 0 0 0 0 0 0
56853- 0 0 0 0 0 0 0 0 0 0 0 0
56854- 0 0 0 0 0 0 0 0 0 0 0 0
56855- 0 0 0 0 0 0 0 0 0 0 0 0
56856- 0 0 0 0 0 1 0 0 1 0 0 0
56857- 0 0 0 0 0 0 0 0 0 0 0 0
56858- 0 0 0 0 0 0 0 0 0 0 0 0
56859- 0 0 0 0 0 0 0 0 0 0 0 0
56860- 0 0 0 0 0 0 0 0 0 0 0 0
56861- 0 0 0 0 0 0 0 0 0 0 0 0
56862- 0 0 0 0 0 0 0 0 0 0 0 0
56863- 6 6 6 14 14 14 26 26 26 42 42 42
56864- 54 54 54 66 66 66 78 78 78 78 78 78
56865- 78 78 78 74 74 74 66 66 66 54 54 54
56866- 42 42 42 26 26 26 18 18 18 10 10 10
56867- 6 6 6 0 0 0 0 0 0 0 0 0
56868- 0 0 0 0 0 0 0 0 0 0 0 0
56869- 0 0 0 0 0 0 0 0 0 0 0 0
56870- 0 0 0 0 0 0 0 0 0 0 0 0
56871- 0 0 0 0 0 0 0 0 0 0 0 0
56872- 0 0 0 0 0 0 0 0 0 0 0 0
56873- 0 0 0 0 0 0 0 0 0 0 0 0
56874- 0 0 0 0 0 0 0 0 0 0 0 0
56875- 0 0 0 0 0 0 0 0 0 0 0 0
56876- 0 0 1 0 0 0 0 0 0 0 0 0
56877- 0 0 0 0 0 0 0 0 0 0 0 0
56878- 0 0 0 0 0 0 0 0 0 0 0 0
56879- 0 0 0 0 0 0 0 0 0 0 0 0
56880- 0 0 0 0 0 0 0 0 0 0 0 0
56881- 0 0 0 0 0 0 0 0 0 0 0 0
56882- 0 0 0 0 0 0 0 0 0 10 10 10
56883- 22 22 22 42 42 42 66 66 66 86 86 86
56884- 66 66 66 38 38 38 38 38 38 22 22 22
56885- 26 26 26 34 34 34 54 54 54 66 66 66
56886- 86 86 86 70 70 70 46 46 46 26 26 26
56887- 14 14 14 6 6 6 0 0 0 0 0 0
56888- 0 0 0 0 0 0 0 0 0 0 0 0
56889- 0 0 0 0 0 0 0 0 0 0 0 0
56890- 0 0 0 0 0 0 0 0 0 0 0 0
56891- 0 0 0 0 0 0 0 0 0 0 0 0
56892- 0 0 0 0 0 0 0 0 0 0 0 0
56893- 0 0 0 0 0 0 0 0 0 0 0 0
56894- 0 0 0 0 0 0 0 0 0 0 0 0
56895- 0 0 0 0 0 0 0 0 0 0 0 0
56896- 0 0 1 0 0 1 0 0 1 0 0 0
56897- 0 0 0 0 0 0 0 0 0 0 0 0
56898- 0 0 0 0 0 0 0 0 0 0 0 0
56899- 0 0 0 0 0 0 0 0 0 0 0 0
56900- 0 0 0 0 0 0 0 0 0 0 0 0
56901- 0 0 0 0 0 0 0 0 0 0 0 0
56902- 0 0 0 0 0 0 10 10 10 26 26 26
56903- 50 50 50 82 82 82 58 58 58 6 6 6
56904- 2 2 6 2 2 6 2 2 6 2 2 6
56905- 2 2 6 2 2 6 2 2 6 2 2 6
56906- 6 6 6 54 54 54 86 86 86 66 66 66
56907- 38 38 38 18 18 18 6 6 6 0 0 0
56908- 0 0 0 0 0 0 0 0 0 0 0 0
56909- 0 0 0 0 0 0 0 0 0 0 0 0
56910- 0 0 0 0 0 0 0 0 0 0 0 0
56911- 0 0 0 0 0 0 0 0 0 0 0 0
56912- 0 0 0 0 0 0 0 0 0 0 0 0
56913- 0 0 0 0 0 0 0 0 0 0 0 0
56914- 0 0 0 0 0 0 0 0 0 0 0 0
56915- 0 0 0 0 0 0 0 0 0 0 0 0
56916- 0 0 0 0 0 0 0 0 0 0 0 0
56917- 0 0 0 0 0 0 0 0 0 0 0 0
56918- 0 0 0 0 0 0 0 0 0 0 0 0
56919- 0 0 0 0 0 0 0 0 0 0 0 0
56920- 0 0 0 0 0 0 0 0 0 0 0 0
56921- 0 0 0 0 0 0 0 0 0 0 0 0
56922- 0 0 0 6 6 6 22 22 22 50 50 50
56923- 78 78 78 34 34 34 2 2 6 2 2 6
56924- 2 2 6 2 2 6 2 2 6 2 2 6
56925- 2 2 6 2 2 6 2 2 6 2 2 6
56926- 2 2 6 2 2 6 6 6 6 70 70 70
56927- 78 78 78 46 46 46 22 22 22 6 6 6
56928- 0 0 0 0 0 0 0 0 0 0 0 0
56929- 0 0 0 0 0 0 0 0 0 0 0 0
56930- 0 0 0 0 0 0 0 0 0 0 0 0
56931- 0 0 0 0 0 0 0 0 0 0 0 0
56932- 0 0 0 0 0 0 0 0 0 0 0 0
56933- 0 0 0 0 0 0 0 0 0 0 0 0
56934- 0 0 0 0 0 0 0 0 0 0 0 0
56935- 0 0 0 0 0 0 0 0 0 0 0 0
56936- 0 0 1 0 0 1 0 0 1 0 0 0
56937- 0 0 0 0 0 0 0 0 0 0 0 0
56938- 0 0 0 0 0 0 0 0 0 0 0 0
56939- 0 0 0 0 0 0 0 0 0 0 0 0
56940- 0 0 0 0 0 0 0 0 0 0 0 0
56941- 0 0 0 0 0 0 0 0 0 0 0 0
56942- 6 6 6 18 18 18 42 42 42 82 82 82
56943- 26 26 26 2 2 6 2 2 6 2 2 6
56944- 2 2 6 2 2 6 2 2 6 2 2 6
56945- 2 2 6 2 2 6 2 2 6 14 14 14
56946- 46 46 46 34 34 34 6 6 6 2 2 6
56947- 42 42 42 78 78 78 42 42 42 18 18 18
56948- 6 6 6 0 0 0 0 0 0 0 0 0
56949- 0 0 0 0 0 0 0 0 0 0 0 0
56950- 0 0 0 0 0 0 0 0 0 0 0 0
56951- 0 0 0 0 0 0 0 0 0 0 0 0
56952- 0 0 0 0 0 0 0 0 0 0 0 0
56953- 0 0 0 0 0 0 0 0 0 0 0 0
56954- 0 0 0 0 0 0 0 0 0 0 0 0
56955- 0 0 0 0 0 0 0 0 0 0 0 0
56956- 0 0 1 0 0 0 0 0 1 0 0 0
56957- 0 0 0 0 0 0 0 0 0 0 0 0
56958- 0 0 0 0 0 0 0 0 0 0 0 0
56959- 0 0 0 0 0 0 0 0 0 0 0 0
56960- 0 0 0 0 0 0 0 0 0 0 0 0
56961- 0 0 0 0 0 0 0 0 0 0 0 0
56962- 10 10 10 30 30 30 66 66 66 58 58 58
56963- 2 2 6 2 2 6 2 2 6 2 2 6
56964- 2 2 6 2 2 6 2 2 6 2 2 6
56965- 2 2 6 2 2 6 2 2 6 26 26 26
56966- 86 86 86 101 101 101 46 46 46 10 10 10
56967- 2 2 6 58 58 58 70 70 70 34 34 34
56968- 10 10 10 0 0 0 0 0 0 0 0 0
56969- 0 0 0 0 0 0 0 0 0 0 0 0
56970- 0 0 0 0 0 0 0 0 0 0 0 0
56971- 0 0 0 0 0 0 0 0 0 0 0 0
56972- 0 0 0 0 0 0 0 0 0 0 0 0
56973- 0 0 0 0 0 0 0 0 0 0 0 0
56974- 0 0 0 0 0 0 0 0 0 0 0 0
56975- 0 0 0 0 0 0 0 0 0 0 0 0
56976- 0 0 1 0 0 1 0 0 1 0 0 0
56977- 0 0 0 0 0 0 0 0 0 0 0 0
56978- 0 0 0 0 0 0 0 0 0 0 0 0
56979- 0 0 0 0 0 0 0 0 0 0 0 0
56980- 0 0 0 0 0 0 0 0 0 0 0 0
56981- 0 0 0 0 0 0 0 0 0 0 0 0
56982- 14 14 14 42 42 42 86 86 86 10 10 10
56983- 2 2 6 2 2 6 2 2 6 2 2 6
56984- 2 2 6 2 2 6 2 2 6 2 2 6
56985- 2 2 6 2 2 6 2 2 6 30 30 30
56986- 94 94 94 94 94 94 58 58 58 26 26 26
56987- 2 2 6 6 6 6 78 78 78 54 54 54
56988- 22 22 22 6 6 6 0 0 0 0 0 0
56989- 0 0 0 0 0 0 0 0 0 0 0 0
56990- 0 0 0 0 0 0 0 0 0 0 0 0
56991- 0 0 0 0 0 0 0 0 0 0 0 0
56992- 0 0 0 0 0 0 0 0 0 0 0 0
56993- 0 0 0 0 0 0 0 0 0 0 0 0
56994- 0 0 0 0 0 0 0 0 0 0 0 0
56995- 0 0 0 0 0 0 0 0 0 0 0 0
56996- 0 0 0 0 0 0 0 0 0 0 0 0
56997- 0 0 0 0 0 0 0 0 0 0 0 0
56998- 0 0 0 0 0 0 0 0 0 0 0 0
56999- 0 0 0 0 0 0 0 0 0 0 0 0
57000- 0 0 0 0 0 0 0 0 0 0 0 0
57001- 0 0 0 0 0 0 0 0 0 6 6 6
57002- 22 22 22 62 62 62 62 62 62 2 2 6
57003- 2 2 6 2 2 6 2 2 6 2 2 6
57004- 2 2 6 2 2 6 2 2 6 2 2 6
57005- 2 2 6 2 2 6 2 2 6 26 26 26
57006- 54 54 54 38 38 38 18 18 18 10 10 10
57007- 2 2 6 2 2 6 34 34 34 82 82 82
57008- 38 38 38 14 14 14 0 0 0 0 0 0
57009- 0 0 0 0 0 0 0 0 0 0 0 0
57010- 0 0 0 0 0 0 0 0 0 0 0 0
57011- 0 0 0 0 0 0 0 0 0 0 0 0
57012- 0 0 0 0 0 0 0 0 0 0 0 0
57013- 0 0 0 0 0 0 0 0 0 0 0 0
57014- 0 0 0 0 0 0 0 0 0 0 0 0
57015- 0 0 0 0 0 0 0 0 0 0 0 0
57016- 0 0 0 0 0 1 0 0 1 0 0 0
57017- 0 0 0 0 0 0 0 0 0 0 0 0
57018- 0 0 0 0 0 0 0 0 0 0 0 0
57019- 0 0 0 0 0 0 0 0 0 0 0 0
57020- 0 0 0 0 0 0 0 0 0 0 0 0
57021- 0 0 0 0 0 0 0 0 0 6 6 6
57022- 30 30 30 78 78 78 30 30 30 2 2 6
57023- 2 2 6 2 2 6 2 2 6 2 2 6
57024- 2 2 6 2 2 6 2 2 6 2 2 6
57025- 2 2 6 2 2 6 2 2 6 10 10 10
57026- 10 10 10 2 2 6 2 2 6 2 2 6
57027- 2 2 6 2 2 6 2 2 6 78 78 78
57028- 50 50 50 18 18 18 6 6 6 0 0 0
57029- 0 0 0 0 0 0 0 0 0 0 0 0
57030- 0 0 0 0 0 0 0 0 0 0 0 0
57031- 0 0 0 0 0 0 0 0 0 0 0 0
57032- 0 0 0 0 0 0 0 0 0 0 0 0
57033- 0 0 0 0 0 0 0 0 0 0 0 0
57034- 0 0 0 0 0 0 0 0 0 0 0 0
57035- 0 0 0 0 0 0 0 0 0 0 0 0
57036- 0 0 1 0 0 0 0 0 0 0 0 0
57037- 0 0 0 0 0 0 0 0 0 0 0 0
57038- 0 0 0 0 0 0 0 0 0 0 0 0
57039- 0 0 0 0 0 0 0 0 0 0 0 0
57040- 0 0 0 0 0 0 0 0 0 0 0 0
57041- 0 0 0 0 0 0 0 0 0 10 10 10
57042- 38 38 38 86 86 86 14 14 14 2 2 6
57043- 2 2 6 2 2 6 2 2 6 2 2 6
57044- 2 2 6 2 2 6 2 2 6 2 2 6
57045- 2 2 6 2 2 6 2 2 6 2 2 6
57046- 2 2 6 2 2 6 2 2 6 2 2 6
57047- 2 2 6 2 2 6 2 2 6 54 54 54
57048- 66 66 66 26 26 26 6 6 6 0 0 0
57049- 0 0 0 0 0 0 0 0 0 0 0 0
57050- 0 0 0 0 0 0 0 0 0 0 0 0
57051- 0 0 0 0 0 0 0 0 0 0 0 0
57052- 0 0 0 0 0 0 0 0 0 0 0 0
57053- 0 0 0 0 0 0 0 0 0 0 0 0
57054- 0 0 0 0 0 0 0 0 0 0 0 0
57055- 0 0 0 0 0 0 0 0 0 0 0 0
57056- 0 0 0 0 0 1 0 0 1 0 0 0
57057- 0 0 0 0 0 0 0 0 0 0 0 0
57058- 0 0 0 0 0 0 0 0 0 0 0 0
57059- 0 0 0 0 0 0 0 0 0 0 0 0
57060- 0 0 0 0 0 0 0 0 0 0 0 0
57061- 0 0 0 0 0 0 0 0 0 14 14 14
57062- 42 42 42 82 82 82 2 2 6 2 2 6
57063- 2 2 6 6 6 6 10 10 10 2 2 6
57064- 2 2 6 2 2 6 2 2 6 2 2 6
57065- 2 2 6 2 2 6 2 2 6 6 6 6
57066- 14 14 14 10 10 10 2 2 6 2 2 6
57067- 2 2 6 2 2 6 2 2 6 18 18 18
57068- 82 82 82 34 34 34 10 10 10 0 0 0
57069- 0 0 0 0 0 0 0 0 0 0 0 0
57070- 0 0 0 0 0 0 0 0 0 0 0 0
57071- 0 0 0 0 0 0 0 0 0 0 0 0
57072- 0 0 0 0 0 0 0 0 0 0 0 0
57073- 0 0 0 0 0 0 0 0 0 0 0 0
57074- 0 0 0 0 0 0 0 0 0 0 0 0
57075- 0 0 0 0 0 0 0 0 0 0 0 0
57076- 0 0 1 0 0 0 0 0 0 0 0 0
57077- 0 0 0 0 0 0 0 0 0 0 0 0
57078- 0 0 0 0 0 0 0 0 0 0 0 0
57079- 0 0 0 0 0 0 0 0 0 0 0 0
57080- 0 0 0 0 0 0 0 0 0 0 0 0
57081- 0 0 0 0 0 0 0 0 0 14 14 14
57082- 46 46 46 86 86 86 2 2 6 2 2 6
57083- 6 6 6 6 6 6 22 22 22 34 34 34
57084- 6 6 6 2 2 6 2 2 6 2 2 6
57085- 2 2 6 2 2 6 18 18 18 34 34 34
57086- 10 10 10 50 50 50 22 22 22 2 2 6
57087- 2 2 6 2 2 6 2 2 6 10 10 10
57088- 86 86 86 42 42 42 14 14 14 0 0 0
57089- 0 0 0 0 0 0 0 0 0 0 0 0
57090- 0 0 0 0 0 0 0 0 0 0 0 0
57091- 0 0 0 0 0 0 0 0 0 0 0 0
57092- 0 0 0 0 0 0 0 0 0 0 0 0
57093- 0 0 0 0 0 0 0 0 0 0 0 0
57094- 0 0 0 0 0 0 0 0 0 0 0 0
57095- 0 0 0 0 0 0 0 0 0 0 0 0
57096- 0 0 1 0 0 1 0 0 1 0 0 0
57097- 0 0 0 0 0 0 0 0 0 0 0 0
57098- 0 0 0 0 0 0 0 0 0 0 0 0
57099- 0 0 0 0 0 0 0 0 0 0 0 0
57100- 0 0 0 0 0 0 0 0 0 0 0 0
57101- 0 0 0 0 0 0 0 0 0 14 14 14
57102- 46 46 46 86 86 86 2 2 6 2 2 6
57103- 38 38 38 116 116 116 94 94 94 22 22 22
57104- 22 22 22 2 2 6 2 2 6 2 2 6
57105- 14 14 14 86 86 86 138 138 138 162 162 162
57106-154 154 154 38 38 38 26 26 26 6 6 6
57107- 2 2 6 2 2 6 2 2 6 2 2 6
57108- 86 86 86 46 46 46 14 14 14 0 0 0
57109- 0 0 0 0 0 0 0 0 0 0 0 0
57110- 0 0 0 0 0 0 0 0 0 0 0 0
57111- 0 0 0 0 0 0 0 0 0 0 0 0
57112- 0 0 0 0 0 0 0 0 0 0 0 0
57113- 0 0 0 0 0 0 0 0 0 0 0 0
57114- 0 0 0 0 0 0 0 0 0 0 0 0
57115- 0 0 0 0 0 0 0 0 0 0 0 0
57116- 0 0 0 0 0 0 0 0 0 0 0 0
57117- 0 0 0 0 0 0 0 0 0 0 0 0
57118- 0 0 0 0 0 0 0 0 0 0 0 0
57119- 0 0 0 0 0 0 0 0 0 0 0 0
57120- 0 0 0 0 0 0 0 0 0 0 0 0
57121- 0 0 0 0 0 0 0 0 0 14 14 14
57122- 46 46 46 86 86 86 2 2 6 14 14 14
57123-134 134 134 198 198 198 195 195 195 116 116 116
57124- 10 10 10 2 2 6 2 2 6 6 6 6
57125-101 98 89 187 187 187 210 210 210 218 218 218
57126-214 214 214 134 134 134 14 14 14 6 6 6
57127- 2 2 6 2 2 6 2 2 6 2 2 6
57128- 86 86 86 50 50 50 18 18 18 6 6 6
57129- 0 0 0 0 0 0 0 0 0 0 0 0
57130- 0 0 0 0 0 0 0 0 0 0 0 0
57131- 0 0 0 0 0 0 0 0 0 0 0 0
57132- 0 0 0 0 0 0 0 0 0 0 0 0
57133- 0 0 0 0 0 0 0 0 0 0 0 0
57134- 0 0 0 0 0 0 0 0 0 0 0 0
57135- 0 0 0 0 0 0 0 0 1 0 0 0
57136- 0 0 1 0 0 1 0 0 1 0 0 0
57137- 0 0 0 0 0 0 0 0 0 0 0 0
57138- 0 0 0 0 0 0 0 0 0 0 0 0
57139- 0 0 0 0 0 0 0 0 0 0 0 0
57140- 0 0 0 0 0 0 0 0 0 0 0 0
57141- 0 0 0 0 0 0 0 0 0 14 14 14
57142- 46 46 46 86 86 86 2 2 6 54 54 54
57143-218 218 218 195 195 195 226 226 226 246 246 246
57144- 58 58 58 2 2 6 2 2 6 30 30 30
57145-210 210 210 253 253 253 174 174 174 123 123 123
57146-221 221 221 234 234 234 74 74 74 2 2 6
57147- 2 2 6 2 2 6 2 2 6 2 2 6
57148- 70 70 70 58 58 58 22 22 22 6 6 6
57149- 0 0 0 0 0 0 0 0 0 0 0 0
57150- 0 0 0 0 0 0 0 0 0 0 0 0
57151- 0 0 0 0 0 0 0 0 0 0 0 0
57152- 0 0 0 0 0 0 0 0 0 0 0 0
57153- 0 0 0 0 0 0 0 0 0 0 0 0
57154- 0 0 0 0 0 0 0 0 0 0 0 0
57155- 0 0 0 0 0 0 0 0 0 0 0 0
57156- 0 0 0 0 0 0 0 0 0 0 0 0
57157- 0 0 0 0 0 0 0 0 0 0 0 0
57158- 0 0 0 0 0 0 0 0 0 0 0 0
57159- 0 0 0 0 0 0 0 0 0 0 0 0
57160- 0 0 0 0 0 0 0 0 0 0 0 0
57161- 0 0 0 0 0 0 0 0 0 14 14 14
57162- 46 46 46 82 82 82 2 2 6 106 106 106
57163-170 170 170 26 26 26 86 86 86 226 226 226
57164-123 123 123 10 10 10 14 14 14 46 46 46
57165-231 231 231 190 190 190 6 6 6 70 70 70
57166- 90 90 90 238 238 238 158 158 158 2 2 6
57167- 2 2 6 2 2 6 2 2 6 2 2 6
57168- 70 70 70 58 58 58 22 22 22 6 6 6
57169- 0 0 0 0 0 0 0 0 0 0 0 0
57170- 0 0 0 0 0 0 0 0 0 0 0 0
57171- 0 0 0 0 0 0 0 0 0 0 0 0
57172- 0 0 0 0 0 0 0 0 0 0 0 0
57173- 0 0 0 0 0 0 0 0 0 0 0 0
57174- 0 0 0 0 0 0 0 0 0 0 0 0
57175- 0 0 0 0 0 0 0 0 1 0 0 0
57176- 0 0 1 0 0 1 0 0 1 0 0 0
57177- 0 0 0 0 0 0 0 0 0 0 0 0
57178- 0 0 0 0 0 0 0 0 0 0 0 0
57179- 0 0 0 0 0 0 0 0 0 0 0 0
57180- 0 0 0 0 0 0 0 0 0 0 0 0
57181- 0 0 0 0 0 0 0 0 0 14 14 14
57182- 42 42 42 86 86 86 6 6 6 116 116 116
57183-106 106 106 6 6 6 70 70 70 149 149 149
57184-128 128 128 18 18 18 38 38 38 54 54 54
57185-221 221 221 106 106 106 2 2 6 14 14 14
57186- 46 46 46 190 190 190 198 198 198 2 2 6
57187- 2 2 6 2 2 6 2 2 6 2 2 6
57188- 74 74 74 62 62 62 22 22 22 6 6 6
57189- 0 0 0 0 0 0 0 0 0 0 0 0
57190- 0 0 0 0 0 0 0 0 0 0 0 0
57191- 0 0 0 0 0 0 0 0 0 0 0 0
57192- 0 0 0 0 0 0 0 0 0 0 0 0
57193- 0 0 0 0 0 0 0 0 0 0 0 0
57194- 0 0 0 0 0 0 0 0 0 0 0 0
57195- 0 0 0 0 0 0 0 0 1 0 0 0
57196- 0 0 1 0 0 0 0 0 1 0 0 0
57197- 0 0 0 0 0 0 0 0 0 0 0 0
57198- 0 0 0 0 0 0 0 0 0 0 0 0
57199- 0 0 0 0 0 0 0 0 0 0 0 0
57200- 0 0 0 0 0 0 0 0 0 0 0 0
57201- 0 0 0 0 0 0 0 0 0 14 14 14
57202- 42 42 42 94 94 94 14 14 14 101 101 101
57203-128 128 128 2 2 6 18 18 18 116 116 116
57204-118 98 46 121 92 8 121 92 8 98 78 10
57205-162 162 162 106 106 106 2 2 6 2 2 6
57206- 2 2 6 195 195 195 195 195 195 6 6 6
57207- 2 2 6 2 2 6 2 2 6 2 2 6
57208- 74 74 74 62 62 62 22 22 22 6 6 6
57209- 0 0 0 0 0 0 0 0 0 0 0 0
57210- 0 0 0 0 0 0 0 0 0 0 0 0
57211- 0 0 0 0 0 0 0 0 0 0 0 0
57212- 0 0 0 0 0 0 0 0 0 0 0 0
57213- 0 0 0 0 0 0 0 0 0 0 0 0
57214- 0 0 0 0 0 0 0 0 0 0 0 0
57215- 0 0 0 0 0 0 0 0 1 0 0 1
57216- 0 0 1 0 0 0 0 0 1 0 0 0
57217- 0 0 0 0 0 0 0 0 0 0 0 0
57218- 0 0 0 0 0 0 0 0 0 0 0 0
57219- 0 0 0 0 0 0 0 0 0 0 0 0
57220- 0 0 0 0 0 0 0 0 0 0 0 0
57221- 0 0 0 0 0 0 0 0 0 10 10 10
57222- 38 38 38 90 90 90 14 14 14 58 58 58
57223-210 210 210 26 26 26 54 38 6 154 114 10
57224-226 170 11 236 186 11 225 175 15 184 144 12
57225-215 174 15 175 146 61 37 26 9 2 2 6
57226- 70 70 70 246 246 246 138 138 138 2 2 6
57227- 2 2 6 2 2 6 2 2 6 2 2 6
57228- 70 70 70 66 66 66 26 26 26 6 6 6
57229- 0 0 0 0 0 0 0 0 0 0 0 0
57230- 0 0 0 0 0 0 0 0 0 0 0 0
57231- 0 0 0 0 0 0 0 0 0 0 0 0
57232- 0 0 0 0 0 0 0 0 0 0 0 0
57233- 0 0 0 0 0 0 0 0 0 0 0 0
57234- 0 0 0 0 0 0 0 0 0 0 0 0
57235- 0 0 0 0 0 0 0 0 0 0 0 0
57236- 0 0 0 0 0 0 0 0 0 0 0 0
57237- 0 0 0 0 0 0 0 0 0 0 0 0
57238- 0 0 0 0 0 0 0 0 0 0 0 0
57239- 0 0 0 0 0 0 0 0 0 0 0 0
57240- 0 0 0 0 0 0 0 0 0 0 0 0
57241- 0 0 0 0 0 0 0 0 0 10 10 10
57242- 38 38 38 86 86 86 14 14 14 10 10 10
57243-195 195 195 188 164 115 192 133 9 225 175 15
57244-239 182 13 234 190 10 232 195 16 232 200 30
57245-245 207 45 241 208 19 232 195 16 184 144 12
57246-218 194 134 211 206 186 42 42 42 2 2 6
57247- 2 2 6 2 2 6 2 2 6 2 2 6
57248- 50 50 50 74 74 74 30 30 30 6 6 6
57249- 0 0 0 0 0 0 0 0 0 0 0 0
57250- 0 0 0 0 0 0 0 0 0 0 0 0
57251- 0 0 0 0 0 0 0 0 0 0 0 0
57252- 0 0 0 0 0 0 0 0 0 0 0 0
57253- 0 0 0 0 0 0 0 0 0 0 0 0
57254- 0 0 0 0 0 0 0 0 0 0 0 0
57255- 0 0 0 0 0 0 0 0 0 0 0 0
57256- 0 0 0 0 0 0 0 0 0 0 0 0
57257- 0 0 0 0 0 0 0 0 0 0 0 0
57258- 0 0 0 0 0 0 0 0 0 0 0 0
57259- 0 0 0 0 0 0 0 0 0 0 0 0
57260- 0 0 0 0 0 0 0 0 0 0 0 0
57261- 0 0 0 0 0 0 0 0 0 10 10 10
57262- 34 34 34 86 86 86 14 14 14 2 2 6
57263-121 87 25 192 133 9 219 162 10 239 182 13
57264-236 186 11 232 195 16 241 208 19 244 214 54
57265-246 218 60 246 218 38 246 215 20 241 208 19
57266-241 208 19 226 184 13 121 87 25 2 2 6
57267- 2 2 6 2 2 6 2 2 6 2 2 6
57268- 50 50 50 82 82 82 34 34 34 10 10 10
57269- 0 0 0 0 0 0 0 0 0 0 0 0
57270- 0 0 0 0 0 0 0 0 0 0 0 0
57271- 0 0 0 0 0 0 0 0 0 0 0 0
57272- 0 0 0 0 0 0 0 0 0 0 0 0
57273- 0 0 0 0 0 0 0 0 0 0 0 0
57274- 0 0 0 0 0 0 0 0 0 0 0 0
57275- 0 0 0 0 0 0 0 0 0 0 0 0
57276- 0 0 0 0 0 0 0 0 0 0 0 0
57277- 0 0 0 0 0 0 0 0 0 0 0 0
57278- 0 0 0 0 0 0 0 0 0 0 0 0
57279- 0 0 0 0 0 0 0 0 0 0 0 0
57280- 0 0 0 0 0 0 0 0 0 0 0 0
57281- 0 0 0 0 0 0 0 0 0 10 10 10
57282- 34 34 34 82 82 82 30 30 30 61 42 6
57283-180 123 7 206 145 10 230 174 11 239 182 13
57284-234 190 10 238 202 15 241 208 19 246 218 74
57285-246 218 38 246 215 20 246 215 20 246 215 20
57286-226 184 13 215 174 15 184 144 12 6 6 6
57287- 2 2 6 2 2 6 2 2 6 2 2 6
57288- 26 26 26 94 94 94 42 42 42 14 14 14
57289- 0 0 0 0 0 0 0 0 0 0 0 0
57290- 0 0 0 0 0 0 0 0 0 0 0 0
57291- 0 0 0 0 0 0 0 0 0 0 0 0
57292- 0 0 0 0 0 0 0 0 0 0 0 0
57293- 0 0 0 0 0 0 0 0 0 0 0 0
57294- 0 0 0 0 0 0 0 0 0 0 0 0
57295- 0 0 0 0 0 0 0 0 0 0 0 0
57296- 0 0 0 0 0 0 0 0 0 0 0 0
57297- 0 0 0 0 0 0 0 0 0 0 0 0
57298- 0 0 0 0 0 0 0 0 0 0 0 0
57299- 0 0 0 0 0 0 0 0 0 0 0 0
57300- 0 0 0 0 0 0 0 0 0 0 0 0
57301- 0 0 0 0 0 0 0 0 0 10 10 10
57302- 30 30 30 78 78 78 50 50 50 104 69 6
57303-192 133 9 216 158 10 236 178 12 236 186 11
57304-232 195 16 241 208 19 244 214 54 245 215 43
57305-246 215 20 246 215 20 241 208 19 198 155 10
57306-200 144 11 216 158 10 156 118 10 2 2 6
57307- 2 2 6 2 2 6 2 2 6 2 2 6
57308- 6 6 6 90 90 90 54 54 54 18 18 18
57309- 6 6 6 0 0 0 0 0 0 0 0 0
57310- 0 0 0 0 0 0 0 0 0 0 0 0
57311- 0 0 0 0 0 0 0 0 0 0 0 0
57312- 0 0 0 0 0 0 0 0 0 0 0 0
57313- 0 0 0 0 0 0 0 0 0 0 0 0
57314- 0 0 0 0 0 0 0 0 0 0 0 0
57315- 0 0 0 0 0 0 0 0 0 0 0 0
57316- 0 0 0 0 0 0 0 0 0 0 0 0
57317- 0 0 0 0 0 0 0 0 0 0 0 0
57318- 0 0 0 0 0 0 0 0 0 0 0 0
57319- 0 0 0 0 0 0 0 0 0 0 0 0
57320- 0 0 0 0 0 0 0 0 0 0 0 0
57321- 0 0 0 0 0 0 0 0 0 10 10 10
57322- 30 30 30 78 78 78 46 46 46 22 22 22
57323-137 92 6 210 162 10 239 182 13 238 190 10
57324-238 202 15 241 208 19 246 215 20 246 215 20
57325-241 208 19 203 166 17 185 133 11 210 150 10
57326-216 158 10 210 150 10 102 78 10 2 2 6
57327- 6 6 6 54 54 54 14 14 14 2 2 6
57328- 2 2 6 62 62 62 74 74 74 30 30 30
57329- 10 10 10 0 0 0 0 0 0 0 0 0
57330- 0 0 0 0 0 0 0 0 0 0 0 0
57331- 0 0 0 0 0 0 0 0 0 0 0 0
57332- 0 0 0 0 0 0 0 0 0 0 0 0
57333- 0 0 0 0 0 0 0 0 0 0 0 0
57334- 0 0 0 0 0 0 0 0 0 0 0 0
57335- 0 0 0 0 0 0 0 0 0 0 0 0
57336- 0 0 0 0 0 0 0 0 0 0 0 0
57337- 0 0 0 0 0 0 0 0 0 0 0 0
57338- 0 0 0 0 0 0 0 0 0 0 0 0
57339- 0 0 0 0 0 0 0 0 0 0 0 0
57340- 0 0 0 0 0 0 0 0 0 0 0 0
57341- 0 0 0 0 0 0 0 0 0 10 10 10
57342- 34 34 34 78 78 78 50 50 50 6 6 6
57343- 94 70 30 139 102 15 190 146 13 226 184 13
57344-232 200 30 232 195 16 215 174 15 190 146 13
57345-168 122 10 192 133 9 210 150 10 213 154 11
57346-202 150 34 182 157 106 101 98 89 2 2 6
57347- 2 2 6 78 78 78 116 116 116 58 58 58
57348- 2 2 6 22 22 22 90 90 90 46 46 46
57349- 18 18 18 6 6 6 0 0 0 0 0 0
57350- 0 0 0 0 0 0 0 0 0 0 0 0
57351- 0 0 0 0 0 0 0 0 0 0 0 0
57352- 0 0 0 0 0 0 0 0 0 0 0 0
57353- 0 0 0 0 0 0 0 0 0 0 0 0
57354- 0 0 0 0 0 0 0 0 0 0 0 0
57355- 0 0 0 0 0 0 0 0 0 0 0 0
57356- 0 0 0 0 0 0 0 0 0 0 0 0
57357- 0 0 0 0 0 0 0 0 0 0 0 0
57358- 0 0 0 0 0 0 0 0 0 0 0 0
57359- 0 0 0 0 0 0 0 0 0 0 0 0
57360- 0 0 0 0 0 0 0 0 0 0 0 0
57361- 0 0 0 0 0 0 0 0 0 10 10 10
57362- 38 38 38 86 86 86 50 50 50 6 6 6
57363-128 128 128 174 154 114 156 107 11 168 122 10
57364-198 155 10 184 144 12 197 138 11 200 144 11
57365-206 145 10 206 145 10 197 138 11 188 164 115
57366-195 195 195 198 198 198 174 174 174 14 14 14
57367- 2 2 6 22 22 22 116 116 116 116 116 116
57368- 22 22 22 2 2 6 74 74 74 70 70 70
57369- 30 30 30 10 10 10 0 0 0 0 0 0
57370- 0 0 0 0 0 0 0 0 0 0 0 0
57371- 0 0 0 0 0 0 0 0 0 0 0 0
57372- 0 0 0 0 0 0 0 0 0 0 0 0
57373- 0 0 0 0 0 0 0 0 0 0 0 0
57374- 0 0 0 0 0 0 0 0 0 0 0 0
57375- 0 0 0 0 0 0 0 0 0 0 0 0
57376- 0 0 0 0 0 0 0 0 0 0 0 0
57377- 0 0 0 0 0 0 0 0 0 0 0 0
57378- 0 0 0 0 0 0 0 0 0 0 0 0
57379- 0 0 0 0 0 0 0 0 0 0 0 0
57380- 0 0 0 0 0 0 0 0 0 0 0 0
57381- 0 0 0 0 0 0 6 6 6 18 18 18
57382- 50 50 50 101 101 101 26 26 26 10 10 10
57383-138 138 138 190 190 190 174 154 114 156 107 11
57384-197 138 11 200 144 11 197 138 11 192 133 9
57385-180 123 7 190 142 34 190 178 144 187 187 187
57386-202 202 202 221 221 221 214 214 214 66 66 66
57387- 2 2 6 2 2 6 50 50 50 62 62 62
57388- 6 6 6 2 2 6 10 10 10 90 90 90
57389- 50 50 50 18 18 18 6 6 6 0 0 0
57390- 0 0 0 0 0 0 0 0 0 0 0 0
57391- 0 0 0 0 0 0 0 0 0 0 0 0
57392- 0 0 0 0 0 0 0 0 0 0 0 0
57393- 0 0 0 0 0 0 0 0 0 0 0 0
57394- 0 0 0 0 0 0 0 0 0 0 0 0
57395- 0 0 0 0 0 0 0 0 0 0 0 0
57396- 0 0 0 0 0 0 0 0 0 0 0 0
57397- 0 0 0 0 0 0 0 0 0 0 0 0
57398- 0 0 0 0 0 0 0 0 0 0 0 0
57399- 0 0 0 0 0 0 0 0 0 0 0 0
57400- 0 0 0 0 0 0 0 0 0 0 0 0
57401- 0 0 0 0 0 0 10 10 10 34 34 34
57402- 74 74 74 74 74 74 2 2 6 6 6 6
57403-144 144 144 198 198 198 190 190 190 178 166 146
57404-154 121 60 156 107 11 156 107 11 168 124 44
57405-174 154 114 187 187 187 190 190 190 210 210 210
57406-246 246 246 253 253 253 253 253 253 182 182 182
57407- 6 6 6 2 2 6 2 2 6 2 2 6
57408- 2 2 6 2 2 6 2 2 6 62 62 62
57409- 74 74 74 34 34 34 14 14 14 0 0 0
57410- 0 0 0 0 0 0 0 0 0 0 0 0
57411- 0 0 0 0 0 0 0 0 0 0 0 0
57412- 0 0 0 0 0 0 0 0 0 0 0 0
57413- 0 0 0 0 0 0 0 0 0 0 0 0
57414- 0 0 0 0 0 0 0 0 0 0 0 0
57415- 0 0 0 0 0 0 0 0 0 0 0 0
57416- 0 0 0 0 0 0 0 0 0 0 0 0
57417- 0 0 0 0 0 0 0 0 0 0 0 0
57418- 0 0 0 0 0 0 0 0 0 0 0 0
57419- 0 0 0 0 0 0 0 0 0 0 0 0
57420- 0 0 0 0 0 0 0 0 0 0 0 0
57421- 0 0 0 10 10 10 22 22 22 54 54 54
57422- 94 94 94 18 18 18 2 2 6 46 46 46
57423-234 234 234 221 221 221 190 190 190 190 190 190
57424-190 190 190 187 187 187 187 187 187 190 190 190
57425-190 190 190 195 195 195 214 214 214 242 242 242
57426-253 253 253 253 253 253 253 253 253 253 253 253
57427- 82 82 82 2 2 6 2 2 6 2 2 6
57428- 2 2 6 2 2 6 2 2 6 14 14 14
57429- 86 86 86 54 54 54 22 22 22 6 6 6
57430- 0 0 0 0 0 0 0 0 0 0 0 0
57431- 0 0 0 0 0 0 0 0 0 0 0 0
57432- 0 0 0 0 0 0 0 0 0 0 0 0
57433- 0 0 0 0 0 0 0 0 0 0 0 0
57434- 0 0 0 0 0 0 0 0 0 0 0 0
57435- 0 0 0 0 0 0 0 0 0 0 0 0
57436- 0 0 0 0 0 0 0 0 0 0 0 0
57437- 0 0 0 0 0 0 0 0 0 0 0 0
57438- 0 0 0 0 0 0 0 0 0 0 0 0
57439- 0 0 0 0 0 0 0 0 0 0 0 0
57440- 0 0 0 0 0 0 0 0 0 0 0 0
57441- 6 6 6 18 18 18 46 46 46 90 90 90
57442- 46 46 46 18 18 18 6 6 6 182 182 182
57443-253 253 253 246 246 246 206 206 206 190 190 190
57444-190 190 190 190 190 190 190 190 190 190 190 190
57445-206 206 206 231 231 231 250 250 250 253 253 253
57446-253 253 253 253 253 253 253 253 253 253 253 253
57447-202 202 202 14 14 14 2 2 6 2 2 6
57448- 2 2 6 2 2 6 2 2 6 2 2 6
57449- 42 42 42 86 86 86 42 42 42 18 18 18
57450- 6 6 6 0 0 0 0 0 0 0 0 0
57451- 0 0 0 0 0 0 0 0 0 0 0 0
57452- 0 0 0 0 0 0 0 0 0 0 0 0
57453- 0 0 0 0 0 0 0 0 0 0 0 0
57454- 0 0 0 0 0 0 0 0 0 0 0 0
57455- 0 0 0 0 0 0 0 0 0 0 0 0
57456- 0 0 0 0 0 0 0 0 0 0 0 0
57457- 0 0 0 0 0 0 0 0 0 0 0 0
57458- 0 0 0 0 0 0 0 0 0 0 0 0
57459- 0 0 0 0 0 0 0 0 0 0 0 0
57460- 0 0 0 0 0 0 0 0 0 6 6 6
57461- 14 14 14 38 38 38 74 74 74 66 66 66
57462- 2 2 6 6 6 6 90 90 90 250 250 250
57463-253 253 253 253 253 253 238 238 238 198 198 198
57464-190 190 190 190 190 190 195 195 195 221 221 221
57465-246 246 246 253 253 253 253 253 253 253 253 253
57466-253 253 253 253 253 253 253 253 253 253 253 253
57467-253 253 253 82 82 82 2 2 6 2 2 6
57468- 2 2 6 2 2 6 2 2 6 2 2 6
57469- 2 2 6 78 78 78 70 70 70 34 34 34
57470- 14 14 14 6 6 6 0 0 0 0 0 0
57471- 0 0 0 0 0 0 0 0 0 0 0 0
57472- 0 0 0 0 0 0 0 0 0 0 0 0
57473- 0 0 0 0 0 0 0 0 0 0 0 0
57474- 0 0 0 0 0 0 0 0 0 0 0 0
57475- 0 0 0 0 0 0 0 0 0 0 0 0
57476- 0 0 0 0 0 0 0 0 0 0 0 0
57477- 0 0 0 0 0 0 0 0 0 0 0 0
57478- 0 0 0 0 0 0 0 0 0 0 0 0
57479- 0 0 0 0 0 0 0 0 0 0 0 0
57480- 0 0 0 0 0 0 0 0 0 14 14 14
57481- 34 34 34 66 66 66 78 78 78 6 6 6
57482- 2 2 6 18 18 18 218 218 218 253 253 253
57483-253 253 253 253 253 253 253 253 253 246 246 246
57484-226 226 226 231 231 231 246 246 246 253 253 253
57485-253 253 253 253 253 253 253 253 253 253 253 253
57486-253 253 253 253 253 253 253 253 253 253 253 253
57487-253 253 253 178 178 178 2 2 6 2 2 6
57488- 2 2 6 2 2 6 2 2 6 2 2 6
57489- 2 2 6 18 18 18 90 90 90 62 62 62
57490- 30 30 30 10 10 10 0 0 0 0 0 0
57491- 0 0 0 0 0 0 0 0 0 0 0 0
57492- 0 0 0 0 0 0 0 0 0 0 0 0
57493- 0 0 0 0 0 0 0 0 0 0 0 0
57494- 0 0 0 0 0 0 0 0 0 0 0 0
57495- 0 0 0 0 0 0 0 0 0 0 0 0
57496- 0 0 0 0 0 0 0 0 0 0 0 0
57497- 0 0 0 0 0 0 0 0 0 0 0 0
57498- 0 0 0 0 0 0 0 0 0 0 0 0
57499- 0 0 0 0 0 0 0 0 0 0 0 0
57500- 0 0 0 0 0 0 10 10 10 26 26 26
57501- 58 58 58 90 90 90 18 18 18 2 2 6
57502- 2 2 6 110 110 110 253 253 253 253 253 253
57503-253 253 253 253 253 253 253 253 253 253 253 253
57504-250 250 250 253 253 253 253 253 253 253 253 253
57505-253 253 253 253 253 253 253 253 253 253 253 253
57506-253 253 253 253 253 253 253 253 253 253 253 253
57507-253 253 253 231 231 231 18 18 18 2 2 6
57508- 2 2 6 2 2 6 2 2 6 2 2 6
57509- 2 2 6 2 2 6 18 18 18 94 94 94
57510- 54 54 54 26 26 26 10 10 10 0 0 0
57511- 0 0 0 0 0 0 0 0 0 0 0 0
57512- 0 0 0 0 0 0 0 0 0 0 0 0
57513- 0 0 0 0 0 0 0 0 0 0 0 0
57514- 0 0 0 0 0 0 0 0 0 0 0 0
57515- 0 0 0 0 0 0 0 0 0 0 0 0
57516- 0 0 0 0 0 0 0 0 0 0 0 0
57517- 0 0 0 0 0 0 0 0 0 0 0 0
57518- 0 0 0 0 0 0 0 0 0 0 0 0
57519- 0 0 0 0 0 0 0 0 0 0 0 0
57520- 0 0 0 6 6 6 22 22 22 50 50 50
57521- 90 90 90 26 26 26 2 2 6 2 2 6
57522- 14 14 14 195 195 195 250 250 250 253 253 253
57523-253 253 253 253 253 253 253 253 253 253 253 253
57524-253 253 253 253 253 253 253 253 253 253 253 253
57525-253 253 253 253 253 253 253 253 253 253 253 253
57526-253 253 253 253 253 253 253 253 253 253 253 253
57527-250 250 250 242 242 242 54 54 54 2 2 6
57528- 2 2 6 2 2 6 2 2 6 2 2 6
57529- 2 2 6 2 2 6 2 2 6 38 38 38
57530- 86 86 86 50 50 50 22 22 22 6 6 6
57531- 0 0 0 0 0 0 0 0 0 0 0 0
57532- 0 0 0 0 0 0 0 0 0 0 0 0
57533- 0 0 0 0 0 0 0 0 0 0 0 0
57534- 0 0 0 0 0 0 0 0 0 0 0 0
57535- 0 0 0 0 0 0 0 0 0 0 0 0
57536- 0 0 0 0 0 0 0 0 0 0 0 0
57537- 0 0 0 0 0 0 0 0 0 0 0 0
57538- 0 0 0 0 0 0 0 0 0 0 0 0
57539- 0 0 0 0 0 0 0 0 0 0 0 0
57540- 6 6 6 14 14 14 38 38 38 82 82 82
57541- 34 34 34 2 2 6 2 2 6 2 2 6
57542- 42 42 42 195 195 195 246 246 246 253 253 253
57543-253 253 253 253 253 253 253 253 253 250 250 250
57544-242 242 242 242 242 242 250 250 250 253 253 253
57545-253 253 253 253 253 253 253 253 253 253 253 253
57546-253 253 253 250 250 250 246 246 246 238 238 238
57547-226 226 226 231 231 231 101 101 101 6 6 6
57548- 2 2 6 2 2 6 2 2 6 2 2 6
57549- 2 2 6 2 2 6 2 2 6 2 2 6
57550- 38 38 38 82 82 82 42 42 42 14 14 14
57551- 6 6 6 0 0 0 0 0 0 0 0 0
57552- 0 0 0 0 0 0 0 0 0 0 0 0
57553- 0 0 0 0 0 0 0 0 0 0 0 0
57554- 0 0 0 0 0 0 0 0 0 0 0 0
57555- 0 0 0 0 0 0 0 0 0 0 0 0
57556- 0 0 0 0 0 0 0 0 0 0 0 0
57557- 0 0 0 0 0 0 0 0 0 0 0 0
57558- 0 0 0 0 0 0 0 0 0 0 0 0
57559- 0 0 0 0 0 0 0 0 0 0 0 0
57560- 10 10 10 26 26 26 62 62 62 66 66 66
57561- 2 2 6 2 2 6 2 2 6 6 6 6
57562- 70 70 70 170 170 170 206 206 206 234 234 234
57563-246 246 246 250 250 250 250 250 250 238 238 238
57564-226 226 226 231 231 231 238 238 238 250 250 250
57565-250 250 250 250 250 250 246 246 246 231 231 231
57566-214 214 214 206 206 206 202 202 202 202 202 202
57567-198 198 198 202 202 202 182 182 182 18 18 18
57568- 2 2 6 2 2 6 2 2 6 2 2 6
57569- 2 2 6 2 2 6 2 2 6 2 2 6
57570- 2 2 6 62 62 62 66 66 66 30 30 30
57571- 10 10 10 0 0 0 0 0 0 0 0 0
57572- 0 0 0 0 0 0 0 0 0 0 0 0
57573- 0 0 0 0 0 0 0 0 0 0 0 0
57574- 0 0 0 0 0 0 0 0 0 0 0 0
57575- 0 0 0 0 0 0 0 0 0 0 0 0
57576- 0 0 0 0 0 0 0 0 0 0 0 0
57577- 0 0 0 0 0 0 0 0 0 0 0 0
57578- 0 0 0 0 0 0 0 0 0 0 0 0
57579- 0 0 0 0 0 0 0 0 0 0 0 0
57580- 14 14 14 42 42 42 82 82 82 18 18 18
57581- 2 2 6 2 2 6 2 2 6 10 10 10
57582- 94 94 94 182 182 182 218 218 218 242 242 242
57583-250 250 250 253 253 253 253 253 253 250 250 250
57584-234 234 234 253 253 253 253 253 253 253 253 253
57585-253 253 253 253 253 253 253 253 253 246 246 246
57586-238 238 238 226 226 226 210 210 210 202 202 202
57587-195 195 195 195 195 195 210 210 210 158 158 158
57588- 6 6 6 14 14 14 50 50 50 14 14 14
57589- 2 2 6 2 2 6 2 2 6 2 2 6
57590- 2 2 6 6 6 6 86 86 86 46 46 46
57591- 18 18 18 6 6 6 0 0 0 0 0 0
57592- 0 0 0 0 0 0 0 0 0 0 0 0
57593- 0 0 0 0 0 0 0 0 0 0 0 0
57594- 0 0 0 0 0 0 0 0 0 0 0 0
57595- 0 0 0 0 0 0 0 0 0 0 0 0
57596- 0 0 0 0 0 0 0 0 0 0 0 0
57597- 0 0 0 0 0 0 0 0 0 0 0 0
57598- 0 0 0 0 0 0 0 0 0 0 0 0
57599- 0 0 0 0 0 0 0 0 0 6 6 6
57600- 22 22 22 54 54 54 70 70 70 2 2 6
57601- 2 2 6 10 10 10 2 2 6 22 22 22
57602-166 166 166 231 231 231 250 250 250 253 253 253
57603-253 253 253 253 253 253 253 253 253 250 250 250
57604-242 242 242 253 253 253 253 253 253 253 253 253
57605-253 253 253 253 253 253 253 253 253 253 253 253
57606-253 253 253 253 253 253 253 253 253 246 246 246
57607-231 231 231 206 206 206 198 198 198 226 226 226
57608- 94 94 94 2 2 6 6 6 6 38 38 38
57609- 30 30 30 2 2 6 2 2 6 2 2 6
57610- 2 2 6 2 2 6 62 62 62 66 66 66
57611- 26 26 26 10 10 10 0 0 0 0 0 0
57612- 0 0 0 0 0 0 0 0 0 0 0 0
57613- 0 0 0 0 0 0 0 0 0 0 0 0
57614- 0 0 0 0 0 0 0 0 0 0 0 0
57615- 0 0 0 0 0 0 0 0 0 0 0 0
57616- 0 0 0 0 0 0 0 0 0 0 0 0
57617- 0 0 0 0 0 0 0 0 0 0 0 0
57618- 0 0 0 0 0 0 0 0 0 0 0 0
57619- 0 0 0 0 0 0 0 0 0 10 10 10
57620- 30 30 30 74 74 74 50 50 50 2 2 6
57621- 26 26 26 26 26 26 2 2 6 106 106 106
57622-238 238 238 253 253 253 253 253 253 253 253 253
57623-253 253 253 253 253 253 253 253 253 253 253 253
57624-253 253 253 253 253 253 253 253 253 253 253 253
57625-253 253 253 253 253 253 253 253 253 253 253 253
57626-253 253 253 253 253 253 253 253 253 253 253 253
57627-253 253 253 246 246 246 218 218 218 202 202 202
57628-210 210 210 14 14 14 2 2 6 2 2 6
57629- 30 30 30 22 22 22 2 2 6 2 2 6
57630- 2 2 6 2 2 6 18 18 18 86 86 86
57631- 42 42 42 14 14 14 0 0 0 0 0 0
57632- 0 0 0 0 0 0 0 0 0 0 0 0
57633- 0 0 0 0 0 0 0 0 0 0 0 0
57634- 0 0 0 0 0 0 0 0 0 0 0 0
57635- 0 0 0 0 0 0 0 0 0 0 0 0
57636- 0 0 0 0 0 0 0 0 0 0 0 0
57637- 0 0 0 0 0 0 0 0 0 0 0 0
57638- 0 0 0 0 0 0 0 0 0 0 0 0
57639- 0 0 0 0 0 0 0 0 0 14 14 14
57640- 42 42 42 90 90 90 22 22 22 2 2 6
57641- 42 42 42 2 2 6 18 18 18 218 218 218
57642-253 253 253 253 253 253 253 253 253 253 253 253
57643-253 253 253 253 253 253 253 253 253 253 253 253
57644-253 253 253 253 253 253 253 253 253 253 253 253
57645-253 253 253 253 253 253 253 253 253 253 253 253
57646-253 253 253 253 253 253 253 253 253 253 253 253
57647-253 253 253 253 253 253 250 250 250 221 221 221
57648-218 218 218 101 101 101 2 2 6 14 14 14
57649- 18 18 18 38 38 38 10 10 10 2 2 6
57650- 2 2 6 2 2 6 2 2 6 78 78 78
57651- 58 58 58 22 22 22 6 6 6 0 0 0
57652- 0 0 0 0 0 0 0 0 0 0 0 0
57653- 0 0 0 0 0 0 0 0 0 0 0 0
57654- 0 0 0 0 0 0 0 0 0 0 0 0
57655- 0 0 0 0 0 0 0 0 0 0 0 0
57656- 0 0 0 0 0 0 0 0 0 0 0 0
57657- 0 0 0 0 0 0 0 0 0 0 0 0
57658- 0 0 0 0 0 0 0 0 0 0 0 0
57659- 0 0 0 0 0 0 6 6 6 18 18 18
57660- 54 54 54 82 82 82 2 2 6 26 26 26
57661- 22 22 22 2 2 6 123 123 123 253 253 253
57662-253 253 253 253 253 253 253 253 253 253 253 253
57663-253 253 253 253 253 253 253 253 253 253 253 253
57664-253 253 253 253 253 253 253 253 253 253 253 253
57665-253 253 253 253 253 253 253 253 253 253 253 253
57666-253 253 253 253 253 253 253 253 253 253 253 253
57667-253 253 253 253 253 253 253 253 253 250 250 250
57668-238 238 238 198 198 198 6 6 6 38 38 38
57669- 58 58 58 26 26 26 38 38 38 2 2 6
57670- 2 2 6 2 2 6 2 2 6 46 46 46
57671- 78 78 78 30 30 30 10 10 10 0 0 0
57672- 0 0 0 0 0 0 0 0 0 0 0 0
57673- 0 0 0 0 0 0 0 0 0 0 0 0
57674- 0 0 0 0 0 0 0 0 0 0 0 0
57675- 0 0 0 0 0 0 0 0 0 0 0 0
57676- 0 0 0 0 0 0 0 0 0 0 0 0
57677- 0 0 0 0 0 0 0 0 0 0 0 0
57678- 0 0 0 0 0 0 0 0 0 0 0 0
57679- 0 0 0 0 0 0 10 10 10 30 30 30
57680- 74 74 74 58 58 58 2 2 6 42 42 42
57681- 2 2 6 22 22 22 231 231 231 253 253 253
57682-253 253 253 253 253 253 253 253 253 253 253 253
57683-253 253 253 253 253 253 253 253 253 250 250 250
57684-253 253 253 253 253 253 253 253 253 253 253 253
57685-253 253 253 253 253 253 253 253 253 253 253 253
57686-253 253 253 253 253 253 253 253 253 253 253 253
57687-253 253 253 253 253 253 253 253 253 253 253 253
57688-253 253 253 246 246 246 46 46 46 38 38 38
57689- 42 42 42 14 14 14 38 38 38 14 14 14
57690- 2 2 6 2 2 6 2 2 6 6 6 6
57691- 86 86 86 46 46 46 14 14 14 0 0 0
57692- 0 0 0 0 0 0 0 0 0 0 0 0
57693- 0 0 0 0 0 0 0 0 0 0 0 0
57694- 0 0 0 0 0 0 0 0 0 0 0 0
57695- 0 0 0 0 0 0 0 0 0 0 0 0
57696- 0 0 0 0 0 0 0 0 0 0 0 0
57697- 0 0 0 0 0 0 0 0 0 0 0 0
57698- 0 0 0 0 0 0 0 0 0 0 0 0
57699- 0 0 0 6 6 6 14 14 14 42 42 42
57700- 90 90 90 18 18 18 18 18 18 26 26 26
57701- 2 2 6 116 116 116 253 253 253 253 253 253
57702-253 253 253 253 253 253 253 253 253 253 253 253
57703-253 253 253 253 253 253 250 250 250 238 238 238
57704-253 253 253 253 253 253 253 253 253 253 253 253
57705-253 253 253 253 253 253 253 253 253 253 253 253
57706-253 253 253 253 253 253 253 253 253 253 253 253
57707-253 253 253 253 253 253 253 253 253 253 253 253
57708-253 253 253 253 253 253 94 94 94 6 6 6
57709- 2 2 6 2 2 6 10 10 10 34 34 34
57710- 2 2 6 2 2 6 2 2 6 2 2 6
57711- 74 74 74 58 58 58 22 22 22 6 6 6
57712- 0 0 0 0 0 0 0 0 0 0 0 0
57713- 0 0 0 0 0 0 0 0 0 0 0 0
57714- 0 0 0 0 0 0 0 0 0 0 0 0
57715- 0 0 0 0 0 0 0 0 0 0 0 0
57716- 0 0 0 0 0 0 0 0 0 0 0 0
57717- 0 0 0 0 0 0 0 0 0 0 0 0
57718- 0 0 0 0 0 0 0 0 0 0 0 0
57719- 0 0 0 10 10 10 26 26 26 66 66 66
57720- 82 82 82 2 2 6 38 38 38 6 6 6
57721- 14 14 14 210 210 210 253 253 253 253 253 253
57722-253 253 253 253 253 253 253 253 253 253 253 253
57723-253 253 253 253 253 253 246 246 246 242 242 242
57724-253 253 253 253 253 253 253 253 253 253 253 253
57725-253 253 253 253 253 253 253 253 253 253 253 253
57726-253 253 253 253 253 253 253 253 253 253 253 253
57727-253 253 253 253 253 253 253 253 253 253 253 253
57728-253 253 253 253 253 253 144 144 144 2 2 6
57729- 2 2 6 2 2 6 2 2 6 46 46 46
57730- 2 2 6 2 2 6 2 2 6 2 2 6
57731- 42 42 42 74 74 74 30 30 30 10 10 10
57732- 0 0 0 0 0 0 0 0 0 0 0 0
57733- 0 0 0 0 0 0 0 0 0 0 0 0
57734- 0 0 0 0 0 0 0 0 0 0 0 0
57735- 0 0 0 0 0 0 0 0 0 0 0 0
57736- 0 0 0 0 0 0 0 0 0 0 0 0
57737- 0 0 0 0 0 0 0 0 0 0 0 0
57738- 0 0 0 0 0 0 0 0 0 0 0 0
57739- 6 6 6 14 14 14 42 42 42 90 90 90
57740- 26 26 26 6 6 6 42 42 42 2 2 6
57741- 74 74 74 250 250 250 253 253 253 253 253 253
57742-253 253 253 253 253 253 253 253 253 253 253 253
57743-253 253 253 253 253 253 242 242 242 242 242 242
57744-253 253 253 253 253 253 253 253 253 253 253 253
57745-253 253 253 253 253 253 253 253 253 253 253 253
57746-253 253 253 253 253 253 253 253 253 253 253 253
57747-253 253 253 253 253 253 253 253 253 253 253 253
57748-253 253 253 253 253 253 182 182 182 2 2 6
57749- 2 2 6 2 2 6 2 2 6 46 46 46
57750- 2 2 6 2 2 6 2 2 6 2 2 6
57751- 10 10 10 86 86 86 38 38 38 10 10 10
57752- 0 0 0 0 0 0 0 0 0 0 0 0
57753- 0 0 0 0 0 0 0 0 0 0 0 0
57754- 0 0 0 0 0 0 0 0 0 0 0 0
57755- 0 0 0 0 0 0 0 0 0 0 0 0
57756- 0 0 0 0 0 0 0 0 0 0 0 0
57757- 0 0 0 0 0 0 0 0 0 0 0 0
57758- 0 0 0 0 0 0 0 0 0 0 0 0
57759- 10 10 10 26 26 26 66 66 66 82 82 82
57760- 2 2 6 22 22 22 18 18 18 2 2 6
57761-149 149 149 253 253 253 253 253 253 253 253 253
57762-253 253 253 253 253 253 253 253 253 253 253 253
57763-253 253 253 253 253 253 234 234 234 242 242 242
57764-253 253 253 253 253 253 253 253 253 253 253 253
57765-253 253 253 253 253 253 253 253 253 253 253 253
57766-253 253 253 253 253 253 253 253 253 253 253 253
57767-253 253 253 253 253 253 253 253 253 253 253 253
57768-253 253 253 253 253 253 206 206 206 2 2 6
57769- 2 2 6 2 2 6 2 2 6 38 38 38
57770- 2 2 6 2 2 6 2 2 6 2 2 6
57771- 6 6 6 86 86 86 46 46 46 14 14 14
57772- 0 0 0 0 0 0 0 0 0 0 0 0
57773- 0 0 0 0 0 0 0 0 0 0 0 0
57774- 0 0 0 0 0 0 0 0 0 0 0 0
57775- 0 0 0 0 0 0 0 0 0 0 0 0
57776- 0 0 0 0 0 0 0 0 0 0 0 0
57777- 0 0 0 0 0 0 0 0 0 0 0 0
57778- 0 0 0 0 0 0 0 0 0 6 6 6
57779- 18 18 18 46 46 46 86 86 86 18 18 18
57780- 2 2 6 34 34 34 10 10 10 6 6 6
57781-210 210 210 253 253 253 253 253 253 253 253 253
57782-253 253 253 253 253 253 253 253 253 253 253 253
57783-253 253 253 253 253 253 234 234 234 242 242 242
57784-253 253 253 253 253 253 253 253 253 253 253 253
57785-253 253 253 253 253 253 253 253 253 253 253 253
57786-253 253 253 253 253 253 253 253 253 253 253 253
57787-253 253 253 253 253 253 253 253 253 253 253 253
57788-253 253 253 253 253 253 221 221 221 6 6 6
57789- 2 2 6 2 2 6 6 6 6 30 30 30
57790- 2 2 6 2 2 6 2 2 6 2 2 6
57791- 2 2 6 82 82 82 54 54 54 18 18 18
57792- 6 6 6 0 0 0 0 0 0 0 0 0
57793- 0 0 0 0 0 0 0 0 0 0 0 0
57794- 0 0 0 0 0 0 0 0 0 0 0 0
57795- 0 0 0 0 0 0 0 0 0 0 0 0
57796- 0 0 0 0 0 0 0 0 0 0 0 0
57797- 0 0 0 0 0 0 0 0 0 0 0 0
57798- 0 0 0 0 0 0 0 0 0 10 10 10
57799- 26 26 26 66 66 66 62 62 62 2 2 6
57800- 2 2 6 38 38 38 10 10 10 26 26 26
57801-238 238 238 253 253 253 253 253 253 253 253 253
57802-253 253 253 253 253 253 253 253 253 253 253 253
57803-253 253 253 253 253 253 231 231 231 238 238 238
57804-253 253 253 253 253 253 253 253 253 253 253 253
57805-253 253 253 253 253 253 253 253 253 253 253 253
57806-253 253 253 253 253 253 253 253 253 253 253 253
57807-253 253 253 253 253 253 253 253 253 253 253 253
57808-253 253 253 253 253 253 231 231 231 6 6 6
57809- 2 2 6 2 2 6 10 10 10 30 30 30
57810- 2 2 6 2 2 6 2 2 6 2 2 6
57811- 2 2 6 66 66 66 58 58 58 22 22 22
57812- 6 6 6 0 0 0 0 0 0 0 0 0
57813- 0 0 0 0 0 0 0 0 0 0 0 0
57814- 0 0 0 0 0 0 0 0 0 0 0 0
57815- 0 0 0 0 0 0 0 0 0 0 0 0
57816- 0 0 0 0 0 0 0 0 0 0 0 0
57817- 0 0 0 0 0 0 0 0 0 0 0 0
57818- 0 0 0 0 0 0 0 0 0 10 10 10
57819- 38 38 38 78 78 78 6 6 6 2 2 6
57820- 2 2 6 46 46 46 14 14 14 42 42 42
57821-246 246 246 253 253 253 253 253 253 253 253 253
57822-253 253 253 253 253 253 253 253 253 253 253 253
57823-253 253 253 253 253 253 231 231 231 242 242 242
57824-253 253 253 253 253 253 253 253 253 253 253 253
57825-253 253 253 253 253 253 253 253 253 253 253 253
57826-253 253 253 253 253 253 253 253 253 253 253 253
57827-253 253 253 253 253 253 253 253 253 253 253 253
57828-253 253 253 253 253 253 234 234 234 10 10 10
57829- 2 2 6 2 2 6 22 22 22 14 14 14
57830- 2 2 6 2 2 6 2 2 6 2 2 6
57831- 2 2 6 66 66 66 62 62 62 22 22 22
57832- 6 6 6 0 0 0 0 0 0 0 0 0
57833- 0 0 0 0 0 0 0 0 0 0 0 0
57834- 0 0 0 0 0 0 0 0 0 0 0 0
57835- 0 0 0 0 0 0 0 0 0 0 0 0
57836- 0 0 0 0 0 0 0 0 0 0 0 0
57837- 0 0 0 0 0 0 0 0 0 0 0 0
57838- 0 0 0 0 0 0 6 6 6 18 18 18
57839- 50 50 50 74 74 74 2 2 6 2 2 6
57840- 14 14 14 70 70 70 34 34 34 62 62 62
57841-250 250 250 253 253 253 253 253 253 253 253 253
57842-253 253 253 253 253 253 253 253 253 253 253 253
57843-253 253 253 253 253 253 231 231 231 246 246 246
57844-253 253 253 253 253 253 253 253 253 253 253 253
57845-253 253 253 253 253 253 253 253 253 253 253 253
57846-253 253 253 253 253 253 253 253 253 253 253 253
57847-253 253 253 253 253 253 253 253 253 253 253 253
57848-253 253 253 253 253 253 234 234 234 14 14 14
57849- 2 2 6 2 2 6 30 30 30 2 2 6
57850- 2 2 6 2 2 6 2 2 6 2 2 6
57851- 2 2 6 66 66 66 62 62 62 22 22 22
57852- 6 6 6 0 0 0 0 0 0 0 0 0
57853- 0 0 0 0 0 0 0 0 0 0 0 0
57854- 0 0 0 0 0 0 0 0 0 0 0 0
57855- 0 0 0 0 0 0 0 0 0 0 0 0
57856- 0 0 0 0 0 0 0 0 0 0 0 0
57857- 0 0 0 0 0 0 0 0 0 0 0 0
57858- 0 0 0 0 0 0 6 6 6 18 18 18
57859- 54 54 54 62 62 62 2 2 6 2 2 6
57860- 2 2 6 30 30 30 46 46 46 70 70 70
57861-250 250 250 253 253 253 253 253 253 253 253 253
57862-253 253 253 253 253 253 253 253 253 253 253 253
57863-253 253 253 253 253 253 231 231 231 246 246 246
57864-253 253 253 253 253 253 253 253 253 253 253 253
57865-253 253 253 253 253 253 253 253 253 253 253 253
57866-253 253 253 253 253 253 253 253 253 253 253 253
57867-253 253 253 253 253 253 253 253 253 253 253 253
57868-253 253 253 253 253 253 226 226 226 10 10 10
57869- 2 2 6 6 6 6 30 30 30 2 2 6
57870- 2 2 6 2 2 6 2 2 6 2 2 6
57871- 2 2 6 66 66 66 58 58 58 22 22 22
57872- 6 6 6 0 0 0 0 0 0 0 0 0
57873- 0 0 0 0 0 0 0 0 0 0 0 0
57874- 0 0 0 0 0 0 0 0 0 0 0 0
57875- 0 0 0 0 0 0 0 0 0 0 0 0
57876- 0 0 0 0 0 0 0 0 0 0 0 0
57877- 0 0 0 0 0 0 0 0 0 0 0 0
57878- 0 0 0 0 0 0 6 6 6 22 22 22
57879- 58 58 58 62 62 62 2 2 6 2 2 6
57880- 2 2 6 2 2 6 30 30 30 78 78 78
57881-250 250 250 253 253 253 253 253 253 253 253 253
57882-253 253 253 253 253 253 253 253 253 253 253 253
57883-253 253 253 253 253 253 231 231 231 246 246 246
57884-253 253 253 253 253 253 253 253 253 253 253 253
57885-253 253 253 253 253 253 253 253 253 253 253 253
57886-253 253 253 253 253 253 253 253 253 253 253 253
57887-253 253 253 253 253 253 253 253 253 253 253 253
57888-253 253 253 253 253 253 206 206 206 2 2 6
57889- 22 22 22 34 34 34 18 14 6 22 22 22
57890- 26 26 26 18 18 18 6 6 6 2 2 6
57891- 2 2 6 82 82 82 54 54 54 18 18 18
57892- 6 6 6 0 0 0 0 0 0 0 0 0
57893- 0 0 0 0 0 0 0 0 0 0 0 0
57894- 0 0 0 0 0 0 0 0 0 0 0 0
57895- 0 0 0 0 0 0 0 0 0 0 0 0
57896- 0 0 0 0 0 0 0 0 0 0 0 0
57897- 0 0 0 0 0 0 0 0 0 0 0 0
57898- 0 0 0 0 0 0 6 6 6 26 26 26
57899- 62 62 62 106 106 106 74 54 14 185 133 11
57900-210 162 10 121 92 8 6 6 6 62 62 62
57901-238 238 238 253 253 253 253 253 253 253 253 253
57902-253 253 253 253 253 253 253 253 253 253 253 253
57903-253 253 253 253 253 253 231 231 231 246 246 246
57904-253 253 253 253 253 253 253 253 253 253 253 253
57905-253 253 253 253 253 253 253 253 253 253 253 253
57906-253 253 253 253 253 253 253 253 253 253 253 253
57907-253 253 253 253 253 253 253 253 253 253 253 253
57908-253 253 253 253 253 253 158 158 158 18 18 18
57909- 14 14 14 2 2 6 2 2 6 2 2 6
57910- 6 6 6 18 18 18 66 66 66 38 38 38
57911- 6 6 6 94 94 94 50 50 50 18 18 18
57912- 6 6 6 0 0 0 0 0 0 0 0 0
57913- 0 0 0 0 0 0 0 0 0 0 0 0
57914- 0 0 0 0 0 0 0 0 0 0 0 0
57915- 0 0 0 0 0 0 0 0 0 0 0 0
57916- 0 0 0 0 0 0 0 0 0 0 0 0
57917- 0 0 0 0 0 0 0 0 0 6 6 6
57918- 10 10 10 10 10 10 18 18 18 38 38 38
57919- 78 78 78 142 134 106 216 158 10 242 186 14
57920-246 190 14 246 190 14 156 118 10 10 10 10
57921- 90 90 90 238 238 238 253 253 253 253 253 253
57922-253 253 253 253 253 253 253 253 253 253 253 253
57923-253 253 253 253 253 253 231 231 231 250 250 250
57924-253 253 253 253 253 253 253 253 253 253 253 253
57925-253 253 253 253 253 253 253 253 253 253 253 253
57926-253 253 253 253 253 253 253 253 253 253 253 253
57927-253 253 253 253 253 253 253 253 253 246 230 190
57928-238 204 91 238 204 91 181 142 44 37 26 9
57929- 2 2 6 2 2 6 2 2 6 2 2 6
57930- 2 2 6 2 2 6 38 38 38 46 46 46
57931- 26 26 26 106 106 106 54 54 54 18 18 18
57932- 6 6 6 0 0 0 0 0 0 0 0 0
57933- 0 0 0 0 0 0 0 0 0 0 0 0
57934- 0 0 0 0 0 0 0 0 0 0 0 0
57935- 0 0 0 0 0 0 0 0 0 0 0 0
57936- 0 0 0 0 0 0 0 0 0 0 0 0
57937- 0 0 0 6 6 6 14 14 14 22 22 22
57938- 30 30 30 38 38 38 50 50 50 70 70 70
57939-106 106 106 190 142 34 226 170 11 242 186 14
57940-246 190 14 246 190 14 246 190 14 154 114 10
57941- 6 6 6 74 74 74 226 226 226 253 253 253
57942-253 253 253 253 253 253 253 253 253 253 253 253
57943-253 253 253 253 253 253 231 231 231 250 250 250
57944-253 253 253 253 253 253 253 253 253 253 253 253
57945-253 253 253 253 253 253 253 253 253 253 253 253
57946-253 253 253 253 253 253 253 253 253 253 253 253
57947-253 253 253 253 253 253 253 253 253 228 184 62
57948-241 196 14 241 208 19 232 195 16 38 30 10
57949- 2 2 6 2 2 6 2 2 6 2 2 6
57950- 2 2 6 6 6 6 30 30 30 26 26 26
57951-203 166 17 154 142 90 66 66 66 26 26 26
57952- 6 6 6 0 0 0 0 0 0 0 0 0
57953- 0 0 0 0 0 0 0 0 0 0 0 0
57954- 0 0 0 0 0 0 0 0 0 0 0 0
57955- 0 0 0 0 0 0 0 0 0 0 0 0
57956- 0 0 0 0 0 0 0 0 0 0 0 0
57957- 6 6 6 18 18 18 38 38 38 58 58 58
57958- 78 78 78 86 86 86 101 101 101 123 123 123
57959-175 146 61 210 150 10 234 174 13 246 186 14
57960-246 190 14 246 190 14 246 190 14 238 190 10
57961-102 78 10 2 2 6 46 46 46 198 198 198
57962-253 253 253 253 253 253 253 253 253 253 253 253
57963-253 253 253 253 253 253 234 234 234 242 242 242
57964-253 253 253 253 253 253 253 253 253 253 253 253
57965-253 253 253 253 253 253 253 253 253 253 253 253
57966-253 253 253 253 253 253 253 253 253 253 253 253
57967-253 253 253 253 253 253 253 253 253 224 178 62
57968-242 186 14 241 196 14 210 166 10 22 18 6
57969- 2 2 6 2 2 6 2 2 6 2 2 6
57970- 2 2 6 2 2 6 6 6 6 121 92 8
57971-238 202 15 232 195 16 82 82 82 34 34 34
57972- 10 10 10 0 0 0 0 0 0 0 0 0
57973- 0 0 0 0 0 0 0 0 0 0 0 0
57974- 0 0 0 0 0 0 0 0 0 0 0 0
57975- 0 0 0 0 0 0 0 0 0 0 0 0
57976- 0 0 0 0 0 0 0 0 0 0 0 0
57977- 14 14 14 38 38 38 70 70 70 154 122 46
57978-190 142 34 200 144 11 197 138 11 197 138 11
57979-213 154 11 226 170 11 242 186 14 246 190 14
57980-246 190 14 246 190 14 246 190 14 246 190 14
57981-225 175 15 46 32 6 2 2 6 22 22 22
57982-158 158 158 250 250 250 253 253 253 253 253 253
57983-253 253 253 253 253 253 253 253 253 253 253 253
57984-253 253 253 253 253 253 253 253 253 253 253 253
57985-253 253 253 253 253 253 253 253 253 253 253 253
57986-253 253 253 253 253 253 253 253 253 253 253 253
57987-253 253 253 250 250 250 242 242 242 224 178 62
57988-239 182 13 236 186 11 213 154 11 46 32 6
57989- 2 2 6 2 2 6 2 2 6 2 2 6
57990- 2 2 6 2 2 6 61 42 6 225 175 15
57991-238 190 10 236 186 11 112 100 78 42 42 42
57992- 14 14 14 0 0 0 0 0 0 0 0 0
57993- 0 0 0 0 0 0 0 0 0 0 0 0
57994- 0 0 0 0 0 0 0 0 0 0 0 0
57995- 0 0 0 0 0 0 0 0 0 0 0 0
57996- 0 0 0 0 0 0 0 0 0 6 6 6
57997- 22 22 22 54 54 54 154 122 46 213 154 11
57998-226 170 11 230 174 11 226 170 11 226 170 11
57999-236 178 12 242 186 14 246 190 14 246 190 14
58000-246 190 14 246 190 14 246 190 14 246 190 14
58001-241 196 14 184 144 12 10 10 10 2 2 6
58002- 6 6 6 116 116 116 242 242 242 253 253 253
58003-253 253 253 253 253 253 253 253 253 253 253 253
58004-253 253 253 253 253 253 253 253 253 253 253 253
58005-253 253 253 253 253 253 253 253 253 253 253 253
58006-253 253 253 253 253 253 253 253 253 253 253 253
58007-253 253 253 231 231 231 198 198 198 214 170 54
58008-236 178 12 236 178 12 210 150 10 137 92 6
58009- 18 14 6 2 2 6 2 2 6 2 2 6
58010- 6 6 6 70 47 6 200 144 11 236 178 12
58011-239 182 13 239 182 13 124 112 88 58 58 58
58012- 22 22 22 6 6 6 0 0 0 0 0 0
58013- 0 0 0 0 0 0 0 0 0 0 0 0
58014- 0 0 0 0 0 0 0 0 0 0 0 0
58015- 0 0 0 0 0 0 0 0 0 0 0 0
58016- 0 0 0 0 0 0 0 0 0 10 10 10
58017- 30 30 30 70 70 70 180 133 36 226 170 11
58018-239 182 13 242 186 14 242 186 14 246 186 14
58019-246 190 14 246 190 14 246 190 14 246 190 14
58020-246 190 14 246 190 14 246 190 14 246 190 14
58021-246 190 14 232 195 16 98 70 6 2 2 6
58022- 2 2 6 2 2 6 66 66 66 221 221 221
58023-253 253 253 253 253 253 253 253 253 253 253 253
58024-253 253 253 253 253 253 253 253 253 253 253 253
58025-253 253 253 253 253 253 253 253 253 253 253 253
58026-253 253 253 253 253 253 253 253 253 253 253 253
58027-253 253 253 206 206 206 198 198 198 214 166 58
58028-230 174 11 230 174 11 216 158 10 192 133 9
58029-163 110 8 116 81 8 102 78 10 116 81 8
58030-167 114 7 197 138 11 226 170 11 239 182 13
58031-242 186 14 242 186 14 162 146 94 78 78 78
58032- 34 34 34 14 14 14 6 6 6 0 0 0
58033- 0 0 0 0 0 0 0 0 0 0 0 0
58034- 0 0 0 0 0 0 0 0 0 0 0 0
58035- 0 0 0 0 0 0 0 0 0 0 0 0
58036- 0 0 0 0 0 0 0 0 0 6 6 6
58037- 30 30 30 78 78 78 190 142 34 226 170 11
58038-239 182 13 246 190 14 246 190 14 246 190 14
58039-246 190 14 246 190 14 246 190 14 246 190 14
58040-246 190 14 246 190 14 246 190 14 246 190 14
58041-246 190 14 241 196 14 203 166 17 22 18 6
58042- 2 2 6 2 2 6 2 2 6 38 38 38
58043-218 218 218 253 253 253 253 253 253 253 253 253
58044-253 253 253 253 253 253 253 253 253 253 253 253
58045-253 253 253 253 253 253 253 253 253 253 253 253
58046-253 253 253 253 253 253 253 253 253 253 253 253
58047-250 250 250 206 206 206 198 198 198 202 162 69
58048-226 170 11 236 178 12 224 166 10 210 150 10
58049-200 144 11 197 138 11 192 133 9 197 138 11
58050-210 150 10 226 170 11 242 186 14 246 190 14
58051-246 190 14 246 186 14 225 175 15 124 112 88
58052- 62 62 62 30 30 30 14 14 14 6 6 6
58053- 0 0 0 0 0 0 0 0 0 0 0 0
58054- 0 0 0 0 0 0 0 0 0 0 0 0
58055- 0 0 0 0 0 0 0 0 0 0 0 0
58056- 0 0 0 0 0 0 0 0 0 10 10 10
58057- 30 30 30 78 78 78 174 135 50 224 166 10
58058-239 182 13 246 190 14 246 190 14 246 190 14
58059-246 190 14 246 190 14 246 190 14 246 190 14
58060-246 190 14 246 190 14 246 190 14 246 190 14
58061-246 190 14 246 190 14 241 196 14 139 102 15
58062- 2 2 6 2 2 6 2 2 6 2 2 6
58063- 78 78 78 250 250 250 253 253 253 253 253 253
58064-253 253 253 253 253 253 253 253 253 253 253 253
58065-253 253 253 253 253 253 253 253 253 253 253 253
58066-253 253 253 253 253 253 253 253 253 253 253 253
58067-250 250 250 214 214 214 198 198 198 190 150 46
58068-219 162 10 236 178 12 234 174 13 224 166 10
58069-216 158 10 213 154 11 213 154 11 216 158 10
58070-226 170 11 239 182 13 246 190 14 246 190 14
58071-246 190 14 246 190 14 242 186 14 206 162 42
58072-101 101 101 58 58 58 30 30 30 14 14 14
58073- 6 6 6 0 0 0 0 0 0 0 0 0
58074- 0 0 0 0 0 0 0 0 0 0 0 0
58075- 0 0 0 0 0 0 0 0 0 0 0 0
58076- 0 0 0 0 0 0 0 0 0 10 10 10
58077- 30 30 30 74 74 74 174 135 50 216 158 10
58078-236 178 12 246 190 14 246 190 14 246 190 14
58079-246 190 14 246 190 14 246 190 14 246 190 14
58080-246 190 14 246 190 14 246 190 14 246 190 14
58081-246 190 14 246 190 14 241 196 14 226 184 13
58082- 61 42 6 2 2 6 2 2 6 2 2 6
58083- 22 22 22 238 238 238 253 253 253 253 253 253
58084-253 253 253 253 253 253 253 253 253 253 253 253
58085-253 253 253 253 253 253 253 253 253 253 253 253
58086-253 253 253 253 253 253 253 253 253 253 253 253
58087-253 253 253 226 226 226 187 187 187 180 133 36
58088-216 158 10 236 178 12 239 182 13 236 178 12
58089-230 174 11 226 170 11 226 170 11 230 174 11
58090-236 178 12 242 186 14 246 190 14 246 190 14
58091-246 190 14 246 190 14 246 186 14 239 182 13
58092-206 162 42 106 106 106 66 66 66 34 34 34
58093- 14 14 14 6 6 6 0 0 0 0 0 0
58094- 0 0 0 0 0 0 0 0 0 0 0 0
58095- 0 0 0 0 0 0 0 0 0 0 0 0
58096- 0 0 0 0 0 0 0 0 0 6 6 6
58097- 26 26 26 70 70 70 163 133 67 213 154 11
58098-236 178 12 246 190 14 246 190 14 246 190 14
58099-246 190 14 246 190 14 246 190 14 246 190 14
58100-246 190 14 246 190 14 246 190 14 246 190 14
58101-246 190 14 246 190 14 246 190 14 241 196 14
58102-190 146 13 18 14 6 2 2 6 2 2 6
58103- 46 46 46 246 246 246 253 253 253 253 253 253
58104-253 253 253 253 253 253 253 253 253 253 253 253
58105-253 253 253 253 253 253 253 253 253 253 253 253
58106-253 253 253 253 253 253 253 253 253 253 253 253
58107-253 253 253 221 221 221 86 86 86 156 107 11
58108-216 158 10 236 178 12 242 186 14 246 186 14
58109-242 186 14 239 182 13 239 182 13 242 186 14
58110-242 186 14 246 186 14 246 190 14 246 190 14
58111-246 190 14 246 190 14 246 190 14 246 190 14
58112-242 186 14 225 175 15 142 122 72 66 66 66
58113- 30 30 30 10 10 10 0 0 0 0 0 0
58114- 0 0 0 0 0 0 0 0 0 0 0 0
58115- 0 0 0 0 0 0 0 0 0 0 0 0
58116- 0 0 0 0 0 0 0 0 0 6 6 6
58117- 26 26 26 70 70 70 163 133 67 210 150 10
58118-236 178 12 246 190 14 246 190 14 246 190 14
58119-246 190 14 246 190 14 246 190 14 246 190 14
58120-246 190 14 246 190 14 246 190 14 246 190 14
58121-246 190 14 246 190 14 246 190 14 246 190 14
58122-232 195 16 121 92 8 34 34 34 106 106 106
58123-221 221 221 253 253 253 253 253 253 253 253 253
58124-253 253 253 253 253 253 253 253 253 253 253 253
58125-253 253 253 253 253 253 253 253 253 253 253 253
58126-253 253 253 253 253 253 253 253 253 253 253 253
58127-242 242 242 82 82 82 18 14 6 163 110 8
58128-216 158 10 236 178 12 242 186 14 246 190 14
58129-246 190 14 246 190 14 246 190 14 246 190 14
58130-246 190 14 246 190 14 246 190 14 246 190 14
58131-246 190 14 246 190 14 246 190 14 246 190 14
58132-246 190 14 246 190 14 242 186 14 163 133 67
58133- 46 46 46 18 18 18 6 6 6 0 0 0
58134- 0 0 0 0 0 0 0 0 0 0 0 0
58135- 0 0 0 0 0 0 0 0 0 0 0 0
58136- 0 0 0 0 0 0 0 0 0 10 10 10
58137- 30 30 30 78 78 78 163 133 67 210 150 10
58138-236 178 12 246 186 14 246 190 14 246 190 14
58139-246 190 14 246 190 14 246 190 14 246 190 14
58140-246 190 14 246 190 14 246 190 14 246 190 14
58141-246 190 14 246 190 14 246 190 14 246 190 14
58142-241 196 14 215 174 15 190 178 144 253 253 253
58143-253 253 253 253 253 253 253 253 253 253 253 253
58144-253 253 253 253 253 253 253 253 253 253 253 253
58145-253 253 253 253 253 253 253 253 253 253 253 253
58146-253 253 253 253 253 253 253 253 253 218 218 218
58147- 58 58 58 2 2 6 22 18 6 167 114 7
58148-216 158 10 236 178 12 246 186 14 246 190 14
58149-246 190 14 246 190 14 246 190 14 246 190 14
58150-246 190 14 246 190 14 246 190 14 246 190 14
58151-246 190 14 246 190 14 246 190 14 246 190 14
58152-246 190 14 246 186 14 242 186 14 190 150 46
58153- 54 54 54 22 22 22 6 6 6 0 0 0
58154- 0 0 0 0 0 0 0 0 0 0 0 0
58155- 0 0 0 0 0 0 0 0 0 0 0 0
58156- 0 0 0 0 0 0 0 0 0 14 14 14
58157- 38 38 38 86 86 86 180 133 36 213 154 11
58158-236 178 12 246 186 14 246 190 14 246 190 14
58159-246 190 14 246 190 14 246 190 14 246 190 14
58160-246 190 14 246 190 14 246 190 14 246 190 14
58161-246 190 14 246 190 14 246 190 14 246 190 14
58162-246 190 14 232 195 16 190 146 13 214 214 214
58163-253 253 253 253 253 253 253 253 253 253 253 253
58164-253 253 253 253 253 253 253 253 253 253 253 253
58165-253 253 253 253 253 253 253 253 253 253 253 253
58166-253 253 253 250 250 250 170 170 170 26 26 26
58167- 2 2 6 2 2 6 37 26 9 163 110 8
58168-219 162 10 239 182 13 246 186 14 246 190 14
58169-246 190 14 246 190 14 246 190 14 246 190 14
58170-246 190 14 246 190 14 246 190 14 246 190 14
58171-246 190 14 246 190 14 246 190 14 246 190 14
58172-246 186 14 236 178 12 224 166 10 142 122 72
58173- 46 46 46 18 18 18 6 6 6 0 0 0
58174- 0 0 0 0 0 0 0 0 0 0 0 0
58175- 0 0 0 0 0 0 0 0 0 0 0 0
58176- 0 0 0 0 0 0 6 6 6 18 18 18
58177- 50 50 50 109 106 95 192 133 9 224 166 10
58178-242 186 14 246 190 14 246 190 14 246 190 14
58179-246 190 14 246 190 14 246 190 14 246 190 14
58180-246 190 14 246 190 14 246 190 14 246 190 14
58181-246 190 14 246 190 14 246 190 14 246 190 14
58182-242 186 14 226 184 13 210 162 10 142 110 46
58183-226 226 226 253 253 253 253 253 253 253 253 253
58184-253 253 253 253 253 253 253 253 253 253 253 253
58185-253 253 253 253 253 253 253 253 253 253 253 253
58186-198 198 198 66 66 66 2 2 6 2 2 6
58187- 2 2 6 2 2 6 50 34 6 156 107 11
58188-219 162 10 239 182 13 246 186 14 246 190 14
58189-246 190 14 246 190 14 246 190 14 246 190 14
58190-246 190 14 246 190 14 246 190 14 246 190 14
58191-246 190 14 246 190 14 246 190 14 242 186 14
58192-234 174 13 213 154 11 154 122 46 66 66 66
58193- 30 30 30 10 10 10 0 0 0 0 0 0
58194- 0 0 0 0 0 0 0 0 0 0 0 0
58195- 0 0 0 0 0 0 0 0 0 0 0 0
58196- 0 0 0 0 0 0 6 6 6 22 22 22
58197- 58 58 58 154 121 60 206 145 10 234 174 13
58198-242 186 14 246 186 14 246 190 14 246 190 14
58199-246 190 14 246 190 14 246 190 14 246 190 14
58200-246 190 14 246 190 14 246 190 14 246 190 14
58201-246 190 14 246 190 14 246 190 14 246 190 14
58202-246 186 14 236 178 12 210 162 10 163 110 8
58203- 61 42 6 138 138 138 218 218 218 250 250 250
58204-253 253 253 253 253 253 253 253 253 250 250 250
58205-242 242 242 210 210 210 144 144 144 66 66 66
58206- 6 6 6 2 2 6 2 2 6 2 2 6
58207- 2 2 6 2 2 6 61 42 6 163 110 8
58208-216 158 10 236 178 12 246 190 14 246 190 14
58209-246 190 14 246 190 14 246 190 14 246 190 14
58210-246 190 14 246 190 14 246 190 14 246 190 14
58211-246 190 14 239 182 13 230 174 11 216 158 10
58212-190 142 34 124 112 88 70 70 70 38 38 38
58213- 18 18 18 6 6 6 0 0 0 0 0 0
58214- 0 0 0 0 0 0 0 0 0 0 0 0
58215- 0 0 0 0 0 0 0 0 0 0 0 0
58216- 0 0 0 0 0 0 6 6 6 22 22 22
58217- 62 62 62 168 124 44 206 145 10 224 166 10
58218-236 178 12 239 182 13 242 186 14 242 186 14
58219-246 186 14 246 190 14 246 190 14 246 190 14
58220-246 190 14 246 190 14 246 190 14 246 190 14
58221-246 190 14 246 190 14 246 190 14 246 190 14
58222-246 190 14 236 178 12 216 158 10 175 118 6
58223- 80 54 7 2 2 6 6 6 6 30 30 30
58224- 54 54 54 62 62 62 50 50 50 38 38 38
58225- 14 14 14 2 2 6 2 2 6 2 2 6
58226- 2 2 6 2 2 6 2 2 6 2 2 6
58227- 2 2 6 6 6 6 80 54 7 167 114 7
58228-213 154 11 236 178 12 246 190 14 246 190 14
58229-246 190 14 246 190 14 246 190 14 246 190 14
58230-246 190 14 242 186 14 239 182 13 239 182 13
58231-230 174 11 210 150 10 174 135 50 124 112 88
58232- 82 82 82 54 54 54 34 34 34 18 18 18
58233- 6 6 6 0 0 0 0 0 0 0 0 0
58234- 0 0 0 0 0 0 0 0 0 0 0 0
58235- 0 0 0 0 0 0 0 0 0 0 0 0
58236- 0 0 0 0 0 0 6 6 6 18 18 18
58237- 50 50 50 158 118 36 192 133 9 200 144 11
58238-216 158 10 219 162 10 224 166 10 226 170 11
58239-230 174 11 236 178 12 239 182 13 239 182 13
58240-242 186 14 246 186 14 246 190 14 246 190 14
58241-246 190 14 246 190 14 246 190 14 246 190 14
58242-246 186 14 230 174 11 210 150 10 163 110 8
58243-104 69 6 10 10 10 2 2 6 2 2 6
58244- 2 2 6 2 2 6 2 2 6 2 2 6
58245- 2 2 6 2 2 6 2 2 6 2 2 6
58246- 2 2 6 2 2 6 2 2 6 2 2 6
58247- 2 2 6 6 6 6 91 60 6 167 114 7
58248-206 145 10 230 174 11 242 186 14 246 190 14
58249-246 190 14 246 190 14 246 186 14 242 186 14
58250-239 182 13 230 174 11 224 166 10 213 154 11
58251-180 133 36 124 112 88 86 86 86 58 58 58
58252- 38 38 38 22 22 22 10 10 10 6 6 6
58253- 0 0 0 0 0 0 0 0 0 0 0 0
58254- 0 0 0 0 0 0 0 0 0 0 0 0
58255- 0 0 0 0 0 0 0 0 0 0 0 0
58256- 0 0 0 0 0 0 0 0 0 14 14 14
58257- 34 34 34 70 70 70 138 110 50 158 118 36
58258-167 114 7 180 123 7 192 133 9 197 138 11
58259-200 144 11 206 145 10 213 154 11 219 162 10
58260-224 166 10 230 174 11 239 182 13 242 186 14
58261-246 186 14 246 186 14 246 186 14 246 186 14
58262-239 182 13 216 158 10 185 133 11 152 99 6
58263-104 69 6 18 14 6 2 2 6 2 2 6
58264- 2 2 6 2 2 6 2 2 6 2 2 6
58265- 2 2 6 2 2 6 2 2 6 2 2 6
58266- 2 2 6 2 2 6 2 2 6 2 2 6
58267- 2 2 6 6 6 6 80 54 7 152 99 6
58268-192 133 9 219 162 10 236 178 12 239 182 13
58269-246 186 14 242 186 14 239 182 13 236 178 12
58270-224 166 10 206 145 10 192 133 9 154 121 60
58271- 94 94 94 62 62 62 42 42 42 22 22 22
58272- 14 14 14 6 6 6 0 0 0 0 0 0
58273- 0 0 0 0 0 0 0 0 0 0 0 0
58274- 0 0 0 0 0 0 0 0 0 0 0 0
58275- 0 0 0 0 0 0 0 0 0 0 0 0
58276- 0 0 0 0 0 0 0 0 0 6 6 6
58277- 18 18 18 34 34 34 58 58 58 78 78 78
58278-101 98 89 124 112 88 142 110 46 156 107 11
58279-163 110 8 167 114 7 175 118 6 180 123 7
58280-185 133 11 197 138 11 210 150 10 219 162 10
58281-226 170 11 236 178 12 236 178 12 234 174 13
58282-219 162 10 197 138 11 163 110 8 130 83 6
58283- 91 60 6 10 10 10 2 2 6 2 2 6
58284- 18 18 18 38 38 38 38 38 38 38 38 38
58285- 38 38 38 38 38 38 38 38 38 38 38 38
58286- 38 38 38 38 38 38 26 26 26 2 2 6
58287- 2 2 6 6 6 6 70 47 6 137 92 6
58288-175 118 6 200 144 11 219 162 10 230 174 11
58289-234 174 13 230 174 11 219 162 10 210 150 10
58290-192 133 9 163 110 8 124 112 88 82 82 82
58291- 50 50 50 30 30 30 14 14 14 6 6 6
58292- 0 0 0 0 0 0 0 0 0 0 0 0
58293- 0 0 0 0 0 0 0 0 0 0 0 0
58294- 0 0 0 0 0 0 0 0 0 0 0 0
58295- 0 0 0 0 0 0 0 0 0 0 0 0
58296- 0 0 0 0 0 0 0 0 0 0 0 0
58297- 6 6 6 14 14 14 22 22 22 34 34 34
58298- 42 42 42 58 58 58 74 74 74 86 86 86
58299-101 98 89 122 102 70 130 98 46 121 87 25
58300-137 92 6 152 99 6 163 110 8 180 123 7
58301-185 133 11 197 138 11 206 145 10 200 144 11
58302-180 123 7 156 107 11 130 83 6 104 69 6
58303- 50 34 6 54 54 54 110 110 110 101 98 89
58304- 86 86 86 82 82 82 78 78 78 78 78 78
58305- 78 78 78 78 78 78 78 78 78 78 78 78
58306- 78 78 78 82 82 82 86 86 86 94 94 94
58307-106 106 106 101 101 101 86 66 34 124 80 6
58308-156 107 11 180 123 7 192 133 9 200 144 11
58309-206 145 10 200 144 11 192 133 9 175 118 6
58310-139 102 15 109 106 95 70 70 70 42 42 42
58311- 22 22 22 10 10 10 0 0 0 0 0 0
58312- 0 0 0 0 0 0 0 0 0 0 0 0
58313- 0 0 0 0 0 0 0 0 0 0 0 0
58314- 0 0 0 0 0 0 0 0 0 0 0 0
58315- 0 0 0 0 0 0 0 0 0 0 0 0
58316- 0 0 0 0 0 0 0 0 0 0 0 0
58317- 0 0 0 0 0 0 6 6 6 10 10 10
58318- 14 14 14 22 22 22 30 30 30 38 38 38
58319- 50 50 50 62 62 62 74 74 74 90 90 90
58320-101 98 89 112 100 78 121 87 25 124 80 6
58321-137 92 6 152 99 6 152 99 6 152 99 6
58322-138 86 6 124 80 6 98 70 6 86 66 30
58323-101 98 89 82 82 82 58 58 58 46 46 46
58324- 38 38 38 34 34 34 34 34 34 34 34 34
58325- 34 34 34 34 34 34 34 34 34 34 34 34
58326- 34 34 34 34 34 34 38 38 38 42 42 42
58327- 54 54 54 82 82 82 94 86 76 91 60 6
58328-134 86 6 156 107 11 167 114 7 175 118 6
58329-175 118 6 167 114 7 152 99 6 121 87 25
58330-101 98 89 62 62 62 34 34 34 18 18 18
58331- 6 6 6 0 0 0 0 0 0 0 0 0
58332- 0 0 0 0 0 0 0 0 0 0 0 0
58333- 0 0 0 0 0 0 0 0 0 0 0 0
58334- 0 0 0 0 0 0 0 0 0 0 0 0
58335- 0 0 0 0 0 0 0 0 0 0 0 0
58336- 0 0 0 0 0 0 0 0 0 0 0 0
58337- 0 0 0 0 0 0 0 0 0 0 0 0
58338- 0 0 0 6 6 6 6 6 6 10 10 10
58339- 18 18 18 22 22 22 30 30 30 42 42 42
58340- 50 50 50 66 66 66 86 86 86 101 98 89
58341-106 86 58 98 70 6 104 69 6 104 69 6
58342-104 69 6 91 60 6 82 62 34 90 90 90
58343- 62 62 62 38 38 38 22 22 22 14 14 14
58344- 10 10 10 10 10 10 10 10 10 10 10 10
58345- 10 10 10 10 10 10 6 6 6 10 10 10
58346- 10 10 10 10 10 10 10 10 10 14 14 14
58347- 22 22 22 42 42 42 70 70 70 89 81 66
58348- 80 54 7 104 69 6 124 80 6 137 92 6
58349-134 86 6 116 81 8 100 82 52 86 86 86
58350- 58 58 58 30 30 30 14 14 14 6 6 6
58351- 0 0 0 0 0 0 0 0 0 0 0 0
58352- 0 0 0 0 0 0 0 0 0 0 0 0
58353- 0 0 0 0 0 0 0 0 0 0 0 0
58354- 0 0 0 0 0 0 0 0 0 0 0 0
58355- 0 0 0 0 0 0 0 0 0 0 0 0
58356- 0 0 0 0 0 0 0 0 0 0 0 0
58357- 0 0 0 0 0 0 0 0 0 0 0 0
58358- 0 0 0 0 0 0 0 0 0 0 0 0
58359- 0 0 0 6 6 6 10 10 10 14 14 14
58360- 18 18 18 26 26 26 38 38 38 54 54 54
58361- 70 70 70 86 86 86 94 86 76 89 81 66
58362- 89 81 66 86 86 86 74 74 74 50 50 50
58363- 30 30 30 14 14 14 6 6 6 0 0 0
58364- 0 0 0 0 0 0 0 0 0 0 0 0
58365- 0 0 0 0 0 0 0 0 0 0 0 0
58366- 0 0 0 0 0 0 0 0 0 0 0 0
58367- 6 6 6 18 18 18 34 34 34 58 58 58
58368- 82 82 82 89 81 66 89 81 66 89 81 66
58369- 94 86 66 94 86 76 74 74 74 50 50 50
58370- 26 26 26 14 14 14 6 6 6 0 0 0
58371- 0 0 0 0 0 0 0 0 0 0 0 0
58372- 0 0 0 0 0 0 0 0 0 0 0 0
58373- 0 0 0 0 0 0 0 0 0 0 0 0
58374- 0 0 0 0 0 0 0 0 0 0 0 0
58375- 0 0 0 0 0 0 0 0 0 0 0 0
58376- 0 0 0 0 0 0 0 0 0 0 0 0
58377- 0 0 0 0 0 0 0 0 0 0 0 0
58378- 0 0 0 0 0 0 0 0 0 0 0 0
58379- 0 0 0 0 0 0 0 0 0 0 0 0
58380- 6 6 6 6 6 6 14 14 14 18 18 18
58381- 30 30 30 38 38 38 46 46 46 54 54 54
58382- 50 50 50 42 42 42 30 30 30 18 18 18
58383- 10 10 10 0 0 0 0 0 0 0 0 0
58384- 0 0 0 0 0 0 0 0 0 0 0 0
58385- 0 0 0 0 0 0 0 0 0 0 0 0
58386- 0 0 0 0 0 0 0 0 0 0 0 0
58387- 0 0 0 6 6 6 14 14 14 26 26 26
58388- 38 38 38 50 50 50 58 58 58 58 58 58
58389- 54 54 54 42 42 42 30 30 30 18 18 18
58390- 10 10 10 0 0 0 0 0 0 0 0 0
58391- 0 0 0 0 0 0 0 0 0 0 0 0
58392- 0 0 0 0 0 0 0 0 0 0 0 0
58393- 0 0 0 0 0 0 0 0 0 0 0 0
58394- 0 0 0 0 0 0 0 0 0 0 0 0
58395- 0 0 0 0 0 0 0 0 0 0 0 0
58396- 0 0 0 0 0 0 0 0 0 0 0 0
58397- 0 0 0 0 0 0 0 0 0 0 0 0
58398- 0 0 0 0 0 0 0 0 0 0 0 0
58399- 0 0 0 0 0 0 0 0 0 0 0 0
58400- 0 0 0 0 0 0 0 0 0 6 6 6
58401- 6 6 6 10 10 10 14 14 14 18 18 18
58402- 18 18 18 14 14 14 10 10 10 6 6 6
58403- 0 0 0 0 0 0 0 0 0 0 0 0
58404- 0 0 0 0 0 0 0 0 0 0 0 0
58405- 0 0 0 0 0 0 0 0 0 0 0 0
58406- 0 0 0 0 0 0 0 0 0 0 0 0
58407- 0 0 0 0 0 0 0 0 0 6 6 6
58408- 14 14 14 18 18 18 22 22 22 22 22 22
58409- 18 18 18 14 14 14 10 10 10 6 6 6
58410- 0 0 0 0 0 0 0 0 0 0 0 0
58411- 0 0 0 0 0 0 0 0 0 0 0 0
58412- 0 0 0 0 0 0 0 0 0 0 0 0
58413- 0 0 0 0 0 0 0 0 0 0 0 0
58414- 0 0 0 0 0 0 0 0 0 0 0 0
58415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58418+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58419+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58423+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58426+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58427+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58428+4 4 4 4 4 4
58429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58432+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58433+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58437+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58440+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58442+4 4 4 4 4 4
58443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58451+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58455+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58456+4 4 4 4 4 4
58457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58460+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58461+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58469+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58470+4 4 4 4 4 4
58471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58472+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58474+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58475+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58483+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58484+4 4 4 4 4 4
58485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58487+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58488+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58489+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58496+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58497+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58498+4 4 4 4 4 4
58499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58500+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58501+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58502+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58503+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
58504+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
58505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58508+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
58509+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58510+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
58511+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58512+4 4 4 4 4 4
58513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58514+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58517+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
58518+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
58519+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58522+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
58523+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
58524+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
58525+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58526+4 4 4 4 4 4
58527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58528+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58531+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
58532+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
58533+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58534+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58535+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58536+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
58537+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
58538+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
58539+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
58540+4 4 4 4 4 4
58541+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58542+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58543+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58544+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
58545+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
58546+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
58547+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
58548+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58549+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58550+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
58551+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
58552+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
58553+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
58554+4 4 4 4 4 4
58555+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58556+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58557+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58558+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
58559+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
58560+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
58561+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
58562+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58563+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
58564+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
58565+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
58566+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
58567+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
58568+4 4 4 4 4 4
58569+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58570+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58571+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58572+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
58573+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
58574+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
58575+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
58576+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58577+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
58578+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
58579+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
58580+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
58581+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
58582+4 4 4 4 4 4
58583+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58584+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58585+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
58586+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
58587+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
58588+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
58589+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
58590+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
58591+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
58592+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
58593+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
58594+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
58595+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
58596+4 4 4 4 4 4
58597+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58598+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58599+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
58600+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
58601+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
58602+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
58603+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
58604+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
58605+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
58606+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
58607+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
58608+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
58609+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
58610+4 4 4 4 4 4
58611+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58612+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58613+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
58614+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
58615+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
58616+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
58617+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
58618+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
58619+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
58620+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
58621+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
58622+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
58623+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58624+4 4 4 4 4 4
58625+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58626+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58627+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
58628+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
58629+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
58630+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
58631+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
58632+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
58633+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
58634+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
58635+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
58636+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
58637+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
58638+4 4 4 4 4 4
58639+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58640+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
58641+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
58642+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
58643+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
58644+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
58645+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
58646+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
58647+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
58648+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
58649+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
58650+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
58651+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
58652+4 4 4 4 4 4
58653+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58654+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
58655+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
58656+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
58657+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58658+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
58659+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
58660+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
58661+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
58662+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
58663+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
58664+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
58665+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
58666+0 0 0 4 4 4
58667+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58668+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
58669+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
58670+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
58671+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
58672+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
58673+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
58674+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
58675+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
58676+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
58677+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
58678+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
58679+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
58680+2 0 0 0 0 0
58681+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
58682+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
58683+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
58684+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
58685+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
58686+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
58687+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
58688+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
58689+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
58690+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
58691+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
58692+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
58693+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
58694+37 38 37 0 0 0
58695+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58696+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
58697+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
58698+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
58699+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
58700+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
58701+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
58702+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
58703+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
58704+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
58705+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
58706+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
58707+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
58708+85 115 134 4 0 0
58709+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
58710+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
58711+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
58712+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
58713+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
58714+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
58715+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
58716+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
58717+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
58718+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
58719+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
58720+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
58721+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
58722+60 73 81 4 0 0
58723+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
58724+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
58725+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
58726+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
58727+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
58728+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
58729+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
58730+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
58731+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
58732+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
58733+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
58734+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
58735+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
58736+16 19 21 4 0 0
58737+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
58738+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
58739+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
58740+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
58741+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
58742+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
58743+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
58744+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
58745+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
58746+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
58747+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
58748+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
58749+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
58750+4 0 0 4 3 3
58751+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
58752+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
58753+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
58754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
58755+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
58756+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
58757+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
58758+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
58759+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
58760+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
58761+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
58762+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
58763+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
58764+3 2 2 4 4 4
58765+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
58766+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
58767+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
58768+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58769+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
58770+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
58771+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
58772+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
58773+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
58774+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
58775+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
58776+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
58777+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
58778+4 4 4 4 4 4
58779+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
58780+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
58781+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
58782+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
58783+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
58784+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
58785+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
58786+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
58787+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
58788+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
58789+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
58790+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
58791+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
58792+4 4 4 4 4 4
58793+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
58794+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
58795+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
58796+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
58797+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
58798+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58799+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
58800+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
58801+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
58802+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
58803+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
58804+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
58805+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
58806+5 5 5 5 5 5
58807+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
58808+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
58809+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
58810+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
58811+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
58812+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58813+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
58814+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
58815+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
58816+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
58817+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
58818+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
58819+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58820+5 5 5 4 4 4
58821+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
58822+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
58823+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
58824+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
58825+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58826+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
58827+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
58828+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
58829+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
58830+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
58831+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
58832+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
58833+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58834+4 4 4 4 4 4
58835+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
58836+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
58837+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
58838+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
58839+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
58840+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58841+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58842+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
58843+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
58844+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
58845+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
58846+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
58847+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58848+4 4 4 4 4 4
58849+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
58850+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
58851+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
58852+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
58853+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58854+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
58855+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
58856+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
58857+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
58858+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
58859+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
58860+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58861+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58862+4 4 4 4 4 4
58863+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
58864+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
58865+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
58866+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
58867+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58868+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58869+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58870+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
58871+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
58872+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
58873+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
58874+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58875+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58876+4 4 4 4 4 4
58877+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
58878+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
58879+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
58880+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
58881+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58882+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
58883+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58884+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
58885+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
58886+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
58887+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58888+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58889+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58890+4 4 4 4 4 4
58891+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
58892+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
58893+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
58894+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
58895+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58896+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
58897+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
58898+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
58899+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
58900+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
58901+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
58902+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58903+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58904+4 4 4 4 4 4
58905+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
58906+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
58907+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
58908+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
58909+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58910+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
58911+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
58912+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
58913+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
58914+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
58915+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
58916+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58917+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58918+4 4 4 4 4 4
58919+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
58920+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
58921+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
58922+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58923+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
58924+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
58925+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
58926+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
58927+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
58928+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
58929+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58930+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58931+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58932+4 4 4 4 4 4
58933+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
58934+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
58935+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
58936+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58937+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58938+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
58939+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
58940+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
58941+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
58942+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
58943+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58944+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58945+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58946+4 4 4 4 4 4
58947+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
58948+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
58949+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58950+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58951+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58952+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
58953+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
58954+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
58955+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
58956+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
58957+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58958+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58959+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58960+4 4 4 4 4 4
58961+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
58962+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
58963+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58964+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58965+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58966+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
58967+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
58968+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
58969+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58970+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58971+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58972+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58973+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58974+4 4 4 4 4 4
58975+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58976+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
58977+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58978+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
58979+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
58980+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
58981+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
58982+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
58983+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58984+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58985+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58986+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58987+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58988+4 4 4 4 4 4
58989+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58990+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
58991+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58992+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
58993+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58994+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
58995+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
58996+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
58997+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58998+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58999+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59000+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59001+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59002+4 4 4 4 4 4
59003+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
59004+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
59005+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59006+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
59007+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
59008+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
59009+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
59010+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
59011+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59012+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59013+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59014+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59015+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59016+4 4 4 4 4 4
59017+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
59018+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
59019+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59020+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
59021+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
59022+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
59023+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
59024+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
59025+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
59026+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59027+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59028+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59029+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59030+4 4 4 4 4 4
59031+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59032+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
59033+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59034+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
59035+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
59036+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
59037+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
59038+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
59039+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59040+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59041+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59042+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59043+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59044+4 4 4 4 4 4
59045+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
59046+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
59047+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59048+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
59049+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
59050+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
59051+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
59052+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
59053+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
59054+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59055+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59056+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59057+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59058+4 4 4 4 4 4
59059+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59060+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
59061+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
59062+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
59063+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
59064+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
59065+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
59066+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
59067+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59068+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59069+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59070+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59071+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59072+4 4 4 4 4 4
59073+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59074+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
59075+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59076+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
59077+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
59078+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
59079+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
59080+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
59081+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59082+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59083+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59084+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59085+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59086+4 4 4 4 4 4
59087+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59088+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
59089+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
59090+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
59091+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
59092+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
59093+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59094+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
59095+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59096+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59097+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59098+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59099+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59100+4 4 4 4 4 4
59101+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59102+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
59103+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
59104+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59105+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
59106+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
59107+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59108+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
59109+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59110+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59111+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59112+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59113+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59114+4 4 4 4 4 4
59115+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59116+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
59117+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
59118+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
59119+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
59120+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
59121+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
59122+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
59123+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
59124+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59125+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59126+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59127+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59128+4 4 4 4 4 4
59129+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59130+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
59131+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
59132+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
59133+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
59134+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
59135+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
59136+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
59137+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
59138+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59139+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59140+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59141+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59142+4 4 4 4 4 4
59143+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
59144+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
59145+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
59146+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
59147+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59148+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
59149+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
59150+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
59151+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
59152+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59153+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59154+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59155+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59156+4 4 4 4 4 4
59157+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59158+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
59159+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
59160+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
59161+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
59162+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
59163+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
59164+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
59165+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
59166+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59167+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59168+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59169+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59170+4 4 4 4 4 4
59171+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
59172+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
59173+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
59174+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
59175+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
59176+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
59177+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
59178+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
59179+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
59180+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
59181+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59182+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59183+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59184+4 4 4 4 4 4
59185+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
59186+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59187+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
59188+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
59189+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
59190+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
59191+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
59192+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
59193+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
59194+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
59195+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59196+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59197+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59198+4 4 4 4 4 4
59199+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
59200+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59201+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
59202+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
59203+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
59204+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
59205+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59206+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
59207+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
59208+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
59209+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59210+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59211+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59212+4 4 4 4 4 4
59213+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
59214+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
59215+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
59216+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
59217+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
59218+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
59219+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
59220+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
59221+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
59222+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
59223+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59224+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59225+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59226+4 4 4 4 4 4
59227+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
59228+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
59229+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59230+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
59231+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
59232+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
59233+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
59234+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
59235+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
59236+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
59237+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59238+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59239+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59240+4 4 4 4 4 4
59241+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59242+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
59243+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
59244+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
59245+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
59246+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
59247+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
59248+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
59249+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
59250+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59251+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59252+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59253+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59254+4 4 4 4 4 4
59255+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
59256+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
59257+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
59258+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
59259+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
59260+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
59261+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
59262+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
59263+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
59264+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
59265+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59266+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59267+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59268+4 4 4 4 4 4
59269+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
59270+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
59271+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
59272+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
59273+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
59274+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
59275+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
59276+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
59277+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
59278+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59279+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59280+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59281+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59282+4 4 4 4 4 4
59283+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
59284+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59285+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
59286+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59287+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
59288+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
59289+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
59290+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
59291+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
59292+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59293+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59294+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59295+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59296+4 4 4 4 4 4
59297+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
59298+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
59299+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
59300+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
59301+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
59302+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
59303+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
59304+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
59305+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
59306+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59307+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59308+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59309+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59310+4 4 4 4 4 4
59311+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59312+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
59313+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
59314+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
59315+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
59316+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
59317+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
59318+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
59319+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59320+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59321+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59322+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59323+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59324+4 4 4 4 4 4
59325+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
59326+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
59327+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59328+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
59329+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
59330+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
59331+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
59332+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
59333+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59334+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59335+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59336+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59337+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59338+4 4 4 4 4 4
59339+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59340+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
59341+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
59342+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
59343+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
59344+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
59345+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
59346+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59347+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59348+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59349+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59350+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59351+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59352+4 4 4 4 4 4
59353+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59354+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
59355+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59356+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
59357+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
59358+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
59359+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
59360+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
59361+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59362+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59363+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59364+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59365+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59366+4 4 4 4 4 4
59367+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59368+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
59369+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
59370+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
59371+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
59372+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
59373+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
59374+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
59375+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59376+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59377+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59378+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59379+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59380+4 4 4 4 4 4
59381+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59382+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
59383+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
59384+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59385+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
59386+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
59387+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
59388+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59390+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59391+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59392+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59394+4 4 4 4 4 4
59395+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59396+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59397+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59398+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
59399+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
59400+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
59401+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
59402+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59403+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59404+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59405+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59406+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59407+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59408+4 4 4 4 4 4
59409+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59410+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59411+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59412+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59413+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
59414+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
59415+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
59416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59418+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59419+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59422+4 4 4 4 4 4
59423+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59426+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59427+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59428+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
59429+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
59430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59432+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59433+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59436+4 4 4 4 4 4
59437+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59440+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59441+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59442+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59443+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
59444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59450+4 4 4 4 4 4
59451+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59454+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
59455+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
59456+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
59457+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
59458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59460+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59461+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59464+4 4 4 4 4 4
59465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59469+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
59470+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59471+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59472+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59474+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59475+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59478+4 4 4 4 4 4
59479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59483+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
59484+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
59485+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
59486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59487+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59488+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59489+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59492+4 4 4 4 4 4
59493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59496+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59497+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
59498+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
59499+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59500+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59501+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59502+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59503+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59506+4 4 4 4 4 4
59507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59508+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59511+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
59512+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
59513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59514+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59520+4 4 4 4 4 4
59521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59522+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59525+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59526+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
59527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59528+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59534+4 4 4 4 4 4
59535diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
59536index 3838795..0d48d61 100644
59537--- a/drivers/xen/events/events_base.c
59538+++ b/drivers/xen/events/events_base.c
59539@@ -1568,7 +1568,7 @@ void xen_irq_resume(void)
59540 restore_pirqs();
59541 }
59542
59543-static struct irq_chip xen_dynamic_chip __read_mostly = {
59544+static struct irq_chip xen_dynamic_chip = {
59545 .name = "xen-dyn",
59546
59547 .irq_disable = disable_dynirq,
59548@@ -1582,7 +1582,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
59549 .irq_retrigger = retrigger_dynirq,
59550 };
59551
59552-static struct irq_chip xen_pirq_chip __read_mostly = {
59553+static struct irq_chip xen_pirq_chip = {
59554 .name = "xen-pirq",
59555
59556 .irq_startup = startup_pirq,
59557@@ -1602,7 +1602,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
59558 .irq_retrigger = retrigger_dynirq,
59559 };
59560
59561-static struct irq_chip xen_percpu_chip __read_mostly = {
59562+static struct irq_chip xen_percpu_chip = {
59563 .name = "xen-percpu",
59564
59565 .irq_disable = disable_dynirq,
59566diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
59567index fef20db..d28b1ab 100644
59568--- a/drivers/xen/xenfs/xenstored.c
59569+++ b/drivers/xen/xenfs/xenstored.c
59570@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
59571 static int xsd_kva_open(struct inode *inode, struct file *file)
59572 {
59573 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
59574+#ifdef CONFIG_GRKERNSEC_HIDESYM
59575+ NULL);
59576+#else
59577 xen_store_interface);
59578+#endif
59579+
59580 if (!file->private_data)
59581 return -ENOMEM;
59582 return 0;
59583diff --git a/firmware/Makefile b/firmware/Makefile
59584index e297e1b..6900c31 100644
59585--- a/firmware/Makefile
59586+++ b/firmware/Makefile
59587@@ -35,6 +35,7 @@ fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.9.0.fw \
59588 bnx2x/bnx2x-e1h-6.2.9.0.fw \
59589 bnx2x/bnx2x-e2-6.2.9.0.fw
59590 fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \
59591+ bnx2/bnx2-mips-09-6.2.1b.fw \
59592 bnx2/bnx2-rv2p-09-6.0.17.fw \
59593 bnx2/bnx2-rv2p-09ax-6.0.17.fw \
59594 bnx2/bnx2-mips-06-6.2.1.fw \
59595diff --git a/firmware/WHENCE b/firmware/WHENCE
59596index 0c4d96d..7563083 100644
59597--- a/firmware/WHENCE
59598+++ b/firmware/WHENCE
59599@@ -655,19 +655,20 @@ Driver: BNX2 - Broadcom NetXtremeII
59600 File: bnx2/bnx2-mips-06-6.2.1.fw
59601 File: bnx2/bnx2-rv2p-06-6.0.15.fw
59602 File: bnx2/bnx2-mips-09-6.2.1a.fw
59603+File: bnx2/bnx2-mips-09-6.2.1b.fw
59604 File: bnx2/bnx2-rv2p-09-6.0.17.fw
59605 File: bnx2/bnx2-rv2p-09ax-6.0.17.fw
59606
59607 Licence:
59608-
59609- This file contains firmware data derived from proprietary unpublished
59610- source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59611-
59612- Permission is hereby granted for the distribution of this firmware data
59613- in hexadecimal or equivalent format, provided this copyright notice is
59614- accompanying it.
59615-
59616-Found in hex form in kernel source.
59617+
59618+ This file contains firmware data derived from proprietary unpublished
59619+ source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59620+
59621+ Permission is hereby granted for the distribution of this firmware data
59622+ in hexadecimal or equivalent format, provided this copyright notice is
59623+ accompanying it.
59624+
59625+Found in hex form in kernel source.
59626
59627 --------------------------------------------------------------------------
59628
59629diff --git a/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
59630new file mode 100644
59631index 0000000..43d7c4f
59632--- /dev/null
59633+++ b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
59634@@ -0,0 +1,6496 @@
59635+:10000000080001180800000000005594000000C816
59636+:1000100000000000000000000000000008005594EF
59637+:10002000000000380000565C080000A00800000036
59638+:100030000000574400005694080059200000008436
59639+:100040000000ADD808005744000001C00000AE5CBD
59640+:100050000800321008000000000092580000B01C98
59641+:10006000000000000000000000000000080092589E
59642+:100070000000033C000142740800049008000400E2
59643+:10008000000012FC000145B000000000000000006C
59644+:1000900000000000080016FC00000004000158AC3D
59645+:1000A000080000A80800000000003D00000158B052
59646+:1000B00000000000000000000000000008003D00FB
59647+:1000C00000000030000195B00A000046000000006A
59648+:1000D000000000000000000D636F6D362E322E31DF
59649+:1000E00062000000060201020000000000000003A0
59650+:1000F000000000C800000032000000030000000003
59651+:1001000000000000000000000000000000000000EF
59652+:1001100000000010000001360000EA600000000549
59653+:1001200000000000000000000000000000000008C7
59654+:1001300000000000000000000000000000000000BF
59655+:1001400000000000000000000000000000000000AF
59656+:10015000000000000000000000000000000000009F
59657+:10016000000000020000000000000000000000008D
59658+:10017000000000000000000000000000000000007F
59659+:10018000000000000000000000000010000000005F
59660+:10019000000000000000000000000000000000005F
59661+:1001A000000000000000000000000000000000004F
59662+:1001B000000000000000000000000000000000003F
59663+:1001C000000000000000000000000000000000002F
59664+:1001D000000000000000000000000000000000001F
59665+:1001E0000000000010000003000000000000000DEF
59666+:1001F0000000000D3C020800244256083C030800A1
59667+:1002000024635754AC4000000043202B1480FFFDB2
59668+:10021000244200043C1D080037BD9FFC03A0F021D0
59669+:100220003C100800261001183C1C0800279C5608AA
59670+:100230000E000256000000000000000D27BDFFB4B4
59671+:10024000AFA10000AFA20004AFA30008AFA4000C50
59672+:10025000AFA50010AFA60014AFA70018AFA8001CF0
59673+:10026000AFA90020AFAA0024AFAB0028AFAC002C90
59674+:10027000AFAD0030AFAE0034AFAF0038AFB8003C28
59675+:10028000AFB90040AFBC0044AFBF00480E001544FA
59676+:10029000000000008FBF00488FBC00448FB90040B1
59677+:1002A0008FB8003C8FAF00388FAE00348FAD003078
59678+:1002B0008FAC002C8FAB00288FAA00248FA90020C0
59679+:1002C0008FA8001C8FA700188FA600148FA5001000
59680+:1002D0008FA4000C8FA300088FA200048FA1000040
59681+:1002E00027BD004C3C1B60108F7A5030377B502864
59682+:1002F00003400008AF7A00008F82002427BDFFE092
59683+:10030000AFB00010AFBF0018AFB100148C42000CAA
59684+:100310003C1080008E110100104000348FBF001887
59685+:100320000E000D84000000008F85002024047FFF54
59686+:100330000091202BACB100008E030104960201084D
59687+:1003400000031C003042FFFF00621825ACA300042C
59688+:100350009202010A96030114304200FF3063FFFF4E
59689+:100360000002140000431025ACA200089603010C03
59690+:100370009602010E00031C003042FFFF00621825A8
59691+:10038000ACA3000C960301109602011200031C009E
59692+:100390003042FFFF00621825ACA300108E02011846
59693+:1003A000ACA200148E02011CACA20018148000083C
59694+:1003B0008F820024978200003C0420050044182509
59695+:1003C00024420001ACA3001C0A0000C6A782000062
59696+:1003D0003C0340189442001E00431025ACA2001CB0
59697+:1003E0000E000DB8240400018FBF00188FB1001457
59698+:1003F0008FB000100000102103E0000827BD00208E
59699+:100400003C0780008CE202B834E50100044100089A
59700+:10041000240300013C0208008C42006024420001D9
59701+:100420003C010800AC22006003E0000800601021DD
59702+:100430003C0208008C42005C8CA4002094A30016AF
59703+:100440008CA6000494A5000E24420001ACE40280B6
59704+:100450002463FFFC3C010800AC22005C3C0210005D
59705+:10046000A4E30284A4E5028600001821ACE6028819
59706+:10047000ACE202B803E000080060102127BDFFE0F5
59707+:100480003C028000AFB0001034420100AFBF001C3E
59708+:10049000AFB20018AFB100148C43000094450008BF
59709+:1004A0002462FE002C42038110400003000381C23D
59710+:1004B0000A00010226100004240201001462000553
59711+:1004C0003C1180003C02800890420004305000FF44
59712+:1004D0003C11800036320100964300143202000FB6
59713+:1004E00000021500004310253C0308008C63004403
59714+:1004F00030A40004AE220080246300013C01080007
59715+:10050000AC2300441080000730A200028FBF001C03
59716+:100510008FB200188FB100148FB000100A0000CE07
59717+:1005200027BD00201040002D0000182130A20080BF
59718+:1005300010400005362200708E44001C0E000C672F
59719+:10054000240500A0362200708C4400008F82000C2D
59720+:10055000008210232C43012C10600004AF82001095
59721+:10056000240300010A000145AF84000C8E42000400
59722+:100570003C036020AF84000CAC6200143C02080015
59723+:100580008C42005850400015000018218C62000475
59724+:10059000240301FE304203FF144300100000182121
59725+:1005A0002E020004104000032E0200080A00014041
59726+:1005B0000000802114400003000000000A000140F8
59727+:1005C0002610FFF90000000D2402000202021004B0
59728+:1005D0003C036000AC626914000018218FBF001C4E
59729+:1005E0008FB200188FB100148FB00010006010217E
59730+:1005F00003E0000827BD00203C0480008C8301003C
59731+:1006000024020100506200033C0280080000000D3B
59732+:100610003C02800890430004000010213063000F6A
59733+:1006200000031D0003E00008AC8300800004188074
59734+:100630002782FF9C00621821000410C00044102390
59735+:100640008C640000000210C03C030800246356E4E0
59736+:10065000004310213C038000AC64009003E00008DC
59737+:10066000AF8200243C0208008C42011410400019A3
59738+:100670003084400030A2007F000231C03C02020002
59739+:100680001080001400A218253C026020AC43001426
59740+:100690003C0408008C8456B83C0308008C630110AD
59741+:1006A0003C02800024050900AC4500200086202182
59742+:1006B000246300013C028008AC4400643C01080053
59743+:1006C000AC2301103C010800AC2456B803E000083C
59744+:1006D000000000003C02602003E00008AC4500146C
59745+:1006E00003E000080000102103E0000800001021D2
59746+:1006F00030A2000810400008240201003C0208005B
59747+:100700008C42010C244200013C010800AC22010C87
59748+:1007100003E0000800000000148200080000000050
59749+:100720003C0208008C4200FC244200013C0108000D
59750+:10073000AC2200FC0A0001A330A200203C02080009
59751+:100740008C420084244200013C010800AC22008459
59752+:1007500030A200201040000830A200103C02080027
59753+:100760008C420108244200013C010800AC2201082F
59754+:1007700003E0000800000000104000080000000036
59755+:100780003C0208008C420104244200013C010800A4
59756+:10079000AC22010403E00008000000003C02080055
59757+:1007A0008C420100244200013C010800AC220100FF
59758+:1007B00003E000080000000027BDFFE0AFB1001417
59759+:1007C0003C118000AFB20018AFBF001CAFB00010EA
59760+:1007D0003632010096500008320200041040000733
59761+:1007E000320300028FBF001C8FB200188FB10014BB
59762+:1007F0008FB000100A0000CE27BD00201060000B53
59763+:10080000020028218E2401000E00018A0000000051
59764+:100810003202008010400003240500A10E000C6786
59765+:100820008E44001C0A0001E3240200018E2301040F
59766+:100830008F82000810430006020028218E24010048
59767+:100840000E00018A000000008E220104AF82000821
59768+:10085000000010218FBF001C8FB200188FB1001450
59769+:100860008FB0001003E0000827BD00202C82000498
59770+:1008700014400002000018212483FFFD240200021E
59771+:10088000006210043C03600003E00008AC626914DD
59772+:1008900027BDFFE0AFBF001CAFB20018AFB100141E
59773+:1008A000AFB000103C048000948201083043700017
59774+:1008B000240220001062000A2862200154400052E5
59775+:1008C0008FBF001C24024000106200482402600018
59776+:1008D0001062004A8FBF001C0A0002518FB200183C
59777+:1008E00034820100904300098C5000189451000C90
59778+:1008F000240200091062001C0000902128620009F7
59779+:10090000144000218F8200242402000A5062001249
59780+:10091000323100FF2402000B1062000F00000000C3
59781+:100920002402000C146200188F8200243C0208008C
59782+:100930008C4256B824030900AC83002000501021DB
59783+:100940003C038008AC6200643C010800AC2256B84D
59784+:100950000A0002508FBF001C0E0001E900102602A1
59785+:100960000A0002308F8200240E0001E900102602E6
59786+:100970003C0380089462001A8C72000C3042FFFF26
59787+:10098000020280258F8200248C42000C5040001E01
59788+:100990008FBF001C0E000D84000000003C02800090
59789+:1009A00034420100944300088F82002400031C009D
59790+:1009B0009444001E8F82002000641825AC50000073
59791+:1009C00024040001AC510004AC520008AC40000CFF
59792+:1009D000AC400010AC400014AC4000180E000DB844
59793+:1009E000AC43001C0A0002508FBF001C0E000440E4
59794+:1009F000000000000A0002508FBF001C0E000C9F78
59795+:100A0000000000008FBF001C8FB200188FB10014CF
59796+:100A10008FB000100000102103E0000827BD002067
59797+:100A200027BDFFD8AFB400203C036010AFBF002447
59798+:100A3000AFB3001CAFB20018AFB10014AFB00010DC
59799+:100A40008C6450002402FF7F3C1408002694563822
59800+:100A5000008220243484380CAC6450003C028000B6
59801+:100A6000240300370E0014B0AC4300083C07080014
59802+:100A700024E70618028010212404001D2484FFFFAF
59803+:100A8000AC4700000481FFFD244200043C02080042
59804+:100A9000244207C83C010800AC2256403C02080032
59805+:100AA000244202303C030800246306203C04080072
59806+:100AB000248403B43C05080024A506F03C06080085
59807+:100AC00024C62C9C3C010800AC2256803C02080045
59808+:100AD000244205303C010800AC2756843C01080044
59809+:100AE000AC2656943C010800AC23569C3C010800FF
59810+:100AF000AC2456A03C010800AC2556A43C010800DB
59811+:100B0000AC2256A83C010800AC23563C3C0108002E
59812+:100B1000AC2456443C010800AC2056603C0108005F
59813+:100B2000AC2556643C010800AC2056703C0108001E
59814+:100B3000AC27567C3C010800AC2656903C010800CE
59815+:100B4000AC2356980E00056E00000000AF80000C2C
59816+:100B50003C0280008C5300008F8300043C0208009C
59817+:100B60008C420020106200213262000700008821C0
59818+:100B70002792FF9C3C100800261056E43C02080017
59819+:100B80008C42002024050001022518040043202483
59820+:100B90008F820004004310245044000C26310001D1
59821+:100BA00010800008AF9000248E4300003C028000BB
59822+:100BB000AC4300900E000D4BAE05000C0A0002C1C4
59823+:100BC00026310001AE00000C263100012E22000269
59824+:100BD000261000381440FFE9265200043C020800A9
59825+:100BE0008C420020AF820004326200071040FFD91F
59826+:100BF0003C028000326200011040002D326200028F
59827+:100C00003C0580008CA2010000002021ACA2002045
59828+:100C10008CA301042C42078110400008ACA300A85B
59829+:100C200094A2010824032000304270001443000302
59830+:100C30003C02800890420005304400FF0E0001593C
59831+:100C4000000000003C0280009042010B304300FF96
59832+:100C50002C62001E54400004000310800E00018628
59833+:100C60000A0002EC00000000005410218C42000039
59834+:100C70000040F80900000000104000043C02800021
59835+:100C80008C4301043C026020AC4300143C02080089
59836+:100C90008C4200343C0440003C03800024420001AC
59837+:100CA000AC6401383C010800AC220034326200021E
59838+:100CB00010400010326200043C1080008E0201409F
59839+:100CC000000020210E000159AE0200200E00038317
59840+:100CD000000000003C024000AE0201783C02080027
59841+:100CE0008C420038244200013C010800AC2200384C
59842+:100CF000326200041040FF973C0280003C108000EC
59843+:100D00008E020180000020210E000159AE02002059
59844+:100D10008E03018024020F00546200073C02800809
59845+:100D20008E0201883C0300E03042FFFF00431025A3
59846+:100D30000A000328AE020080344200809042000086
59847+:100D400024030050304200FF14430007000000005D
59848+:100D50000E000362000000001440000300000000C9
59849+:100D60000E000971000000003C0208008C42003CAB
59850+:100D70003C0440003C03800024420001AC6401B804
59851+:100D80003C010800AC22003C0A0002A33C028000A7
59852+:100D90003C02900034420001008220253C02800089
59853+:100DA000AC4400203C0380008C6200200440FFFE25
59854+:100DB0000000000003E00008000000003C0280008A
59855+:100DC000344300010083202503E00008AC440020E8
59856+:100DD00027BDFFE0AFB10014AFB000100080882144
59857+:100DE000AFBF00180E00033230B000FF8F83FF94B6
59858+:100DF000022020219062002502028025A07000259B
59859+:100E00008C7000183C0280000E00033D020280241A
59860+:100E10001600000B8FBF00183C0480008C8201F884
59861+:100E20000440FFFE348201C024030002AC510000E4
59862+:100E3000A04300043C021000AC8201F88FBF0018F0
59863+:100E40008FB100148FB0001003E0000827BD002010
59864+:100E500027BDFFE83C028000AFBF00103442018094
59865+:100E6000944300048C4400083063020010600005C5
59866+:100E7000000028210E00100C000000000A0003787A
59867+:100E8000240500013C02FF000480000700821824B2
59868+:100E90003C02040014620004240500018F82FF94C8
59869+:100EA00090420008240500018FBF001000A010210F
59870+:100EB00003E0000827BD00188F82FF982405000179
59871+:100EC000A040001A3C028000344201400A00034264
59872+:100ED0008C4400008F85FF9427BDFFE0AFBF001C4E
59873+:100EE000AFB20018AFB10014AFB0001090A2000074
59874+:100EF000304400FF38830020388200300003182B74
59875+:100F00000002102B0062182410600003240200501D
59876+:100F1000148200A88FBF001C90A20005304200017F
59877+:100F2000104000A48FBF001C3C02800034420140EE
59878+:100F3000904200082443FFFF2C6200051040009EF1
59879+:100F40008FB20018000310803C030800246355ACE6
59880+:100F5000004310218C420000004000080000000007
59881+:100F60003C028000345101400E0003328E24000008
59882+:100F70008F92FF948E2200048E50000C1602000205
59883+:100F800024020001AE42000C0E00033D8E2400003E
59884+:100F90008E220004145000068FBF001C8FB2001870
59885+:100FA0008FB100148FB000100A000F7827BD002009
59886+:100FB0008E42000C0A000419000000003C0480006E
59887+:100FC0003482014094A300108C4200043063FFFF80
59888+:100FD0001443001C0000000024020001A4A2001021
59889+:100FE0008C8202380441000F3C0380003C02003F29
59890+:100FF0003448F0003C0760003C06FFC08CE22BBC8C
59891+:1010000000461824004810240002130200031D8229
59892+:10101000106200583C0280008C8202380440FFF7C6
59893+:101020003C038000346201408C44000034620200C2
59894+:10103000AC4400003C021000AC6202380A00043BE1
59895+:101040008FBF001C94A200100A00041900000000C9
59896+:10105000240200201482000F3C0280003C03800028
59897+:1010600094A20012346301408C6300043042FFFFFD
59898+:10107000146200050000000024020001A4A2001276
59899+:101080000A0004028FBF001C94A200120A00041977
59900+:1010900000000000345101400E0003328E24000095
59901+:1010A0008F92FF948E230004964200123050FFFF6F
59902+:1010B0001603000224020001A64200120E00033DA6
59903+:1010C0008E2400008E220004160200068FBF001C32
59904+:1010D0008FB200188FB100148FB000100A00037C8B
59905+:1010E00027BD0020964200120A00041900000000EB
59906+:1010F0003C03800094A20014346301408C6300041C
59907+:101100003042FFFF14620008240200018FBF001C60
59908+:101110008FB200188FB100148FB00010A4A2001479
59909+:101120000A00146327BD002094A20014144000217B
59910+:101130008FBF001C0A000435000000003C03800043
59911+:1011400094A20016346301408C6300043042FFFF18
59912+:101150001462000D240200018FBF001C8FB2001822
59913+:101160008FB100148FB00010A4A200160A000B1457
59914+:1011700027BD00209442007824420004A4A200105D
59915+:101180000A00043B8FBF001C94A200162403000138
59916+:101190003042FFFF144300078FBF001C3C020800D1
59917+:1011A0008C420070244200013C010800AC22007017
59918+:1011B0008FBF001C8FB200188FB100148FB00010C9
59919+:1011C00003E0000827BD002027BDFFD8AFB20018FC
59920+:1011D0008F92FF94AFB10014AFBF0020AFB3001CDB
59921+:1011E000AFB000103C028000345101008C5001006F
59922+:1011F0009242000092230009304400FF2402001FA5
59923+:10120000106200AB28620020104000192402003850
59924+:101210002862000A1040000D2402000B286200081A
59925+:101220001040002E8F820024046001042862000216
59926+:101230001440002A8F820024240200061062002637
59927+:101240008FBF00200A00055F8FB3001C1062006092
59928+:101250002862000B144000FA8FBF00202402000E09
59929+:10126000106200788F8200240A00055F8FB3001C93
59930+:10127000106200D2286200391040000A2402008067
59931+:1012800024020036106200E528620037104000C3D7
59932+:1012900024020035106200D98FBF00200A00055FCC
59933+:1012A0008FB3001C1062002D2862008110400006E0
59934+:1012B000240200C824020039106200C98FBF002038
59935+:1012C0000A00055F8FB3001C106200A28FBF0020D0
59936+:1012D0000A00055F8FB3001C8F8200248C42000C33
59937+:1012E000104000D78FBF00200E000D8400000000CA
59938+:1012F0003C038000346301008C6200008F85002075
59939+:10130000946700089466000CACA200008C64000492
59940+:101310008F82002400063400ACA400049448001E10
59941+:101320008C62001800073C0000E83825ACA20008D9
59942+:101330008C62001C24040001ACA2000C9062000A24
59943+:1013400000C23025ACA60010ACA00014ACA0001860
59944+:10135000ACA7001C0A00051D8FBF00208F8200244F
59945+:101360008C42000C104000B68FBF00200E000D8490
59946+:10137000000000008F820024962400089625000CAF
59947+:101380009443001E000422029626000E8F82002045
59948+:10139000000426000083202500052C003C0300806B
59949+:1013A00000A6282500832025AC400000AC400004A6
59950+:1013B000AC400008AC40000CAC450010AC40001440
59951+:1013C000AC400018AC44001C0A00051C24040001B9
59952+:1013D0009622000C14400018000000009242000504
59953+:1013E0003042001014400014000000000E000332D0
59954+:1013F0000200202192420005020020213442001008
59955+:101400000E00033DA242000592420000240300208A
59956+:10141000304200FF10430089020020218FBF0020CE
59957+:101420008FB3001C8FB200188FB100148FB0001062
59958+:101430000A00107527BD00280000000D0A00055E97
59959+:101440008FBF00208C42000C1040007D8FBF002019
59960+:101450000E000D84000000008E2200048F84002006
59961+:101460009623000CAC8200003C0280089445002CBE
59962+:101470008F82002400031C0030A5FFFF9446001E4D
59963+:101480003C02400E0065182500C23025AC830004E4
59964+:10149000AC800008AC80000CAC800010AC80001464
59965+:1014A000AC800018AC86001C0A00051C2404000156
59966+:1014B0000E000332020020218F93FF9802002021AA
59967+:1014C0000E00033DA660000C020020210E00034226
59968+:1014D000240500018F8200248C42000C104000582B
59969+:1014E0008FBF00200E000D84000000009622000C2B
59970+:1014F0008F83002000021400AC700000AC62000476
59971+:10150000AC6000088E4400388F820024AC64000C6C
59972+:101510008E46003C9445001E3C02401FAC66001005
59973+:1015200000A228258E62000424040001AC6200148D
59974+:10153000AC600018AC65001C8FBF00208FB3001C8E
59975+:101540008FB200188FB100148FB000100A000DB8D0
59976+:1015500027BD0028240200201082003A8FB3001C0F
59977+:101560000E000F5E00000000104000358FBF00200D
59978+:101570003C0480008C8201F80440FFFE348201C0EC
59979+:1015800024030002AC500000A04300043C02100001
59980+:10159000AC8201F80A00055E8FBF00200200202106
59981+:1015A0008FBF00208FB3001C8FB200188FB10014C2
59982+:1015B0008FB000100A000EA727BD00289625000C4A
59983+:1015C000020020218FBF00208FB3001C8FB20018B3
59984+:1015D0008FB100148FB000100A000ECC27BD002878
59985+:1015E000020020218FB3001C8FB200188FB10014AD
59986+:1015F0008FB000100A000EF727BD00289225000DBD
59987+:10160000020020218FB3001C8FB200188FB100148C
59988+:101610008FB000100A000F4827BD002802002021CB
59989+:101620008FBF00208FB3001C8FB200188FB1001441
59990+:101630008FB000100A000F1F27BD00288FBF0020A9
59991+:101640008FB3001C8FB200188FB100148FB0001040
59992+:1016500003E0000827BD00283C0580008CA202782A
59993+:101660000440FFFE34A2024024030002AC44000008
59994+:10167000A04300043C02100003E00008ACA2027882
59995+:10168000A380001803E00008A38000193C03800039
59996+:101690008C6202780440FFFE8F82001CAC62024024
59997+:1016A00024020002A06202443C02100003E0000891
59998+:1016B000AC6202783C02600003E000088C425404F3
59999+:1016C0009083003024020005008040213063003FF9
60000+:1016D0000000482114620005000050219082004C57
60001+:1016E0009483004E304900FF306AFFFFAD00000CCC
60002+:1016F000AD000010AD000024950200148D05001C03
60003+:101700008D0400183042FFFF004910230002110031
60004+:10171000000237C3004038210086202300A2102B8E
60005+:101720000082202300A72823AD05001CAD0400186B
60006+:10173000A5090014A5090020A50A001603E0000869
60007+:10174000A50A002203E000080000000027BDFFD822
60008+:10175000AFB200183C128008AFB40020AFB3001C39
60009+:10176000AFB10014AFBF0024AFB00010365101007C
60010+:101770003C0260008C4254049222000C3C1408008D
60011+:10178000929400F7304300FF2402000110620032FF
60012+:101790000080982124020002146200353650008037
60013+:1017A0000E00143D000000009202004C2403FF8054
60014+:1017B0003C0480003042007F000211C024420240FD
60015+:1017C0000262102100431824AC8300949245000863
60016+:1017D0009204004C3042007F3C03800614850007D1
60017+:1017E000004380212402FFFFA22200112402FFFFF8
60018+:1017F000A62200120A0005D22402FFFF9602002052
60019+:10180000A222001196020022A62200128E020024BB
60020+:101810003C048008AE2200143485008090A2004C65
60021+:1018200034830100A06200108CA2003CAC6200185E
60022+:101830008C820068AC6200F48C820064AC6200F0C0
60023+:101840008C82006CAC6200F824020001A0A2006847
60024+:101850000A0005EE3C0480080E001456000000004B
60025+:1018600036420080A04000680A0005EE3C04800873
60026+:10187000A2000068A20000690A0006293C02800854
60027+:10188000348300808C62003834850100AC62006CC7
60028+:1018900024020001A062006990A200D59083000894
60029+:1018A000305100FF3072007F12320019001111C058
60030+:1018B00024420240026210212403FF8000431824C6
60031+:1018C0003C048000AC8300943042007F3C038006DF
60032+:1018D000004380218E02000C1040000D02002021E8
60033+:1018E0000E00057E0000000026220001305100FF9E
60034+:1018F0009203003C023410260002102B0002102339
60035+:101900003063007F022288240A0005F8A203003C0D
60036+:101910003C088008350401008C8200E03507008017
60037+:10192000ACE2003C8C8200E0AD02000090E5004C8F
60038+:10193000908600D590E3004C908400D52402FF806F
60039+:1019400000A228243063007F308400FF00A62825F1
60040+:101950000064182A1060000230A500FF38A500803E
60041+:10196000A0E5004CA10500093C0280089043000E50
60042+:10197000344400803C058000A043000A8C8300189A
60043+:101980003C027FFF3442FFFF00621824AC83001842
60044+:101990008CA201F80440FFFE00000000ACB301C0BF
60045+:1019A0008FBF00248FB400208FB3001C8FB20018AB
60046+:1019B0008FB100148FB0001024020002A0A201C455
60047+:1019C00027BD00283C02100003E00008ACA201F88B
60048+:1019D00090A2000024420001A0A200003C030800E5
60049+:1019E0008C6300F4304200FF144300020080302179
60050+:1019F000A0A0000090A200008F84001C000211C073
60051+:101A00002442024024830040008220212402FF80DF
60052+:101A1000008220243063007F3C02800A006218218B
60053+:101A20003C028000AC44002403E00008ACC300008A
60054+:101A300094820006908300058C85000C8C86001033
60055+:101A40008C8700188C88001C8C8400203C010800C6
60056+:101A5000A42256C63C010800A02356C53C0108003C
60057+:101A6000AC2556CC3C010800AC2656D03C01080001
60058+:101A7000AC2756D83C010800AC2856DC3C010800D5
60059+:101A8000AC2456E003E00008000000003C0280089F
60060+:101A9000344201008C4400343C038000346504006F
60061+:101AA000AC6400388C420038AF850028AC62003C42
60062+:101AB0003C020005AC6200300000000000000000A5
60063+:101AC00003E00008000000003C020006308400FF34
60064+:101AD000008220253C028000AC4400300000000061
60065+:101AE00000000000000000003C0380008C62000049
60066+:101AF000304200101040FFFD3462040003E0000893
60067+:101B0000AF82002894C200003C080800950800CA73
60068+:101B100030E7FFFF0080482101021021A4C200002D
60069+:101B200094C200003042FFFF00E2102B544000013D
60070+:101B3000A4C7000094A200003C0308008C6300CC02
60071+:101B400024420001A4A2000094A200003042FFFF42
60072+:101B5000144300073C0280080107102BA4A00000DA
60073+:101B60005440000101003821A4C700003C02800855
60074+:101B7000344601008CC3002894A200003C0480007D
60075+:101B80003042FFFE000210C000621021AC82003C17
60076+:101B90008C82003C006218231860000400000000E2
60077+:101BA0008CC200240A0006BA244200018CC2002420
60078+:101BB000AC8200383C020050344200103C038000EC
60079+:101BC000AC620030000000000000000000000000D7
60080+:101BD0008C620000304200201040FFFD0000000039
60081+:101BE00094A200003C04800030420001000210C0BA
60082+:101BF000004410218C430400AD2300008C420404F7
60083+:101C0000AD2200043C02002003E00008AC8200305A
60084+:101C100027BDFFE0AFB20018AFB10014AFB00010A5
60085+:101C2000AFBF001C94C2000000C080213C1208001D
60086+:101C3000965200C624420001A6020000960300004E
60087+:101C400094E2000000E03021144300058FB1003021
60088+:101C50000E00068F024038210A0006F10000000045
60089+:101C60008C8300048C82000424420040046100073D
60090+:101C7000AC8200048C8200040440000400000000D8
60091+:101C80008C82000024420001AC8200009602000019
60092+:101C90003042FFFF50520001A600000096220000D3
60093+:101CA00024420001A62200003C02800834420100C8
60094+:101CB000962300009442003C144300048FBF001C94
60095+:101CC00024020001A62200008FBF001C8FB2001862
60096+:101CD0008FB100148FB0001003E0000827BD002072
60097+:101CE00027BDFFE03C028008AFBF0018344201006E
60098+:101CF0008C4800343C03800034690400AC68003830
60099+:101D00008C42003830E700FFAF890028AC62003C0D
60100+:101D10003C020005AC620030000000000000000042
60101+:101D200000000000000000000000000000000000B3
60102+:101D30008C82000C8C82000C97830016AD22000070
60103+:101D40008C82001000604021AD2200048C820018BB
60104+:101D5000AD2200088C82001CAD22000C8CA2001465
60105+:101D6000AD2200108C820020AD220014908200056C
60106+:101D7000304200FF00021200AD2200188CA20018B1
60107+:101D8000AD22001C8CA2000CAD2200208CA2001001
60108+:101D9000AD2200248CA2001CAD2200288CA20020C1
60109+:101DA000AD22002C3402FFFFAD260030AD20003400
60110+:101DB000506200013408FFFFAD28003850E00011E8
60111+:101DC0003C0280083C048008348401009482005066
60112+:101DD0003042FFFFAD22003C9483004494850044D0
60113+:101DE000240200013063FFFF000318C200641821C1
60114+:101DF0009064006430A5000700A210040A00075C8C
60115+:101E00000044102534420100AD20003C94430044BE
60116+:101E1000944400443063FFFF000318C2006218219D
60117+:101E200030840007906500642402000100821004E1
60118+:101E30000002102700451024A0620064000000008A
60119+:101E400000000000000000003C0200063442004098
60120+:101E50003C038000AC620030000000000000000085
60121+:101E6000000000008C620000304200101040FFFDB6
60122+:101E70003C06800834C201503463040034C7014A70
60123+:101E800034C4013434C5014034C60144AFA200104B
60124+:101E90000E0006D2AF8300288FBF001803E00008B1
60125+:101EA00027BD00208F8300143C0608008CC600E884
60126+:101EB0008F82001C30633FFF000319800046102111
60127+:101EC000004310212403FF80004318243C068000B7
60128+:101ED000ACC300283042007F3C03800C004330211B
60129+:101EE00090C2000D30A500FF0000382134420010E0
60130+:101EF000A0C2000D8F8900143C028008344201000A
60131+:101F00009443004400091382304800032402000176
60132+:101F1000A4C3000E1102000B2902000210400005AC
60133+:101F2000240200021100000C240300010A0007A48F
60134+:101F30000000182111020006000000000A0007A49A
60135+:101F4000000018218CC2002C0A0007A424430001C1
60136+:101F50008CC20014244300018CC200180043102BD3
60137+:101F60005040000A240700012402002714A20003A5
60138+:101F70003C0380080A0007B1240700013463010014
60139+:101F80009462004C24420001A462004C00091382B8
60140+:101F9000304300032C620002104000090080282119
60141+:101FA000146000040000000094C200340A0007C15D
60142+:101FB0003046FFFF8CC600380A0007C10080282188
60143+:101FC000000030213C040800248456C00A000706A3
60144+:101FD0000000000027BDFF90AFB60068AFB50064F9
60145+:101FE000AFB40060AFB3005CAFB20058AFB1005403
60146+:101FF000AFBF006CAFB000508C9000000080B021EB
60147+:102000003C0208008C4200E8960400328F83001CDA
60148+:102010002414FF8030843FFF0062182100042180D7
60149+:1020200000641821007410243C13800000A090214B
60150+:1020300090A50000AE620028920400323C02800CA1
60151+:102040003063007F00628821308400C02402004099
60152+:10205000148200320000A8218E3500388E2200182C
60153+:102060001440000224020001AE2200189202003C3B
60154+:10207000304200201440000E8F83001C000511C068
60155+:102080002442024000621821306400783C02008043
60156+:102090000082202500741824AE630800AE64081086
60157+:1020A0008E2200188E03000800431021AE22001873
60158+:1020B0008E22002C8E230018244200010062182B6F
60159+:1020C0001060004300000000924200002442000122
60160+:1020D000A24200003C0308008C6300F4304200FF81
60161+:1020E00050430001A2400000924200008F84001C77
60162+:1020F000000211C024420240248300403063007F6C
60163+:10210000008220213C02800A0094202400621821D1
60164+:10211000AE6400240A0008D2AEC30000920300326D
60165+:102120002402FFC000431024304200FF1440000589
60166+:1021300024020001AE220018962200340A00084250
60167+:102140003055FFFF8E22001424420001AE220018F9
60168+:102150009202003000021600000216030441001C27
60169+:10216000000000009602003227A400100080282101
60170+:10217000A7A20016960200320000302124070001B9
60171+:102180003042FFFFAF8200140E000706AFA0001C14
60172+:10219000960200328F83001C3C0408008C8400E807
60173+:1021A00030423FFF000211800064182100621821B4
60174+:1021B00000741024AE62002C3063007F3C02800E5D
60175+:1021C000006218219062000D3042007FA062000D75
60176+:1021D0009222000D304200105040007892420000E0
60177+:1021E0003C028008344401009482004C8EC30000FD
60178+:1021F0003C130800967300C62442FFFFA482004CE3
60179+:10220000946200329623000E3054FFFF3070FFFFBF
60180+:102210003C0308008C6300D000701807A7A30038A7
60181+:102220009482003E3063FFFF3042FFFF14620007DC
60182+:10223000000000008C8200303C038000244200300B
60183+:10224000AC62003C0A00086A8C82002C9482004038
60184+:102250003042FFFF5462000927A400408C820038FE
60185+:102260003C03800024420030AC62003C8C8200348D
60186+:10227000AC6200380A0008793C03800027A50038CA
60187+:1022800027A60048026038210E00068FA7A000484C
60188+:102290008FA300403C02800024630030AC43003830
60189+:1022A0008FA30044AC43003C3C0380003C0200058B
60190+:1022B000AC6200303C028008344401009482004249
60191+:1022C000346304003042FFFF0202102B1440000769
60192+:1022D000AF8300289482004E9483004202021021B2
60193+:1022E000004310230A00088F3043FFFF9483004E01
60194+:1022F00094820042026318210050102300621823C8
60195+:102300003063FFFF3C028008344401009482003CAB
60196+:102310003042FFFF14430003000000000A00089F42
60197+:10232000240300019482003C3042FFFF0062102B26
60198+:10233000144000058F8200289482003C0062102324
60199+:102340003043FFFF8F820028AC550000AC400004F2
60200+:10235000AC540008AC43000C3C02000634420010B0
60201+:102360003C038000AC620030000000000000000070
60202+:10237000000000008C620000304200101040FFFDA1
60203+:102380003C04800834840100001018C20064182145
60204+:102390009065006432020007240600010046100424
60205+:1023A00000451025A0620064948300429622000E2E
60206+:1023B00050430001A386001892420000244200010D
60207+:1023C000A24200003C0308008C6300F4304200FF8E
60208+:1023D00050430001A2400000924200008F84001C84
60209+:1023E000000211C0244202402483004000822021C8
60210+:1023F0002402FF80008220243063007F3C02800A98
60211+:10240000006218213C028000AC440024AEC30000EE
60212+:102410008FBF006C8FB600688FB500648FB400600A
60213+:102420008FB3005C8FB200588FB100548FB0005052
60214+:1024300003E0000827BD007027BDFFD8AFB3001C24
60215+:10244000AFB20018AFB10014AFB00010AFBF0020A2
60216+:102450000080982100E0802130B1FFFF0E000D8444
60217+:1024600030D200FF0000000000000000000000006B
60218+:102470008F8200208F830024AC510000AC520004F6
60219+:10248000AC530008AC40000CAC400010AC40001451
60220+:10249000AC4000189463001E02038025AC50001C61
60221+:1024A0000000000000000000000000002404000103
60222+:1024B0008FBF00208FB3001C8FB200188FB10014A3
60223+:1024C0008FB000100A000DB827BD002830A5FFFF0F
60224+:1024D0000A0008DC30C600FF3C02800834430100DB
60225+:1024E0009462000E3C080800950800C63046FFFFC5
60226+:1024F00014C000043402FFFF946500EA0A000929B1
60227+:102500008F84001C10C20027000000009462004E5F
60228+:102510009464003C3045FFFF00A6102300A6182B52
60229+:102520003087FFFF106000043044FFFF00C5102318
60230+:1025300000E210233044FFFF0088102B1040000EF3
60231+:1025400000E810233C028008344401002403000109
60232+:1025500034420080A44300162402FFFFA482000E30
60233+:10256000948500EA8F84001C0000302130A5FFFF15
60234+:102570000A0009013C0760200044102A10400009AD
60235+:102580003C0280083443008094620016304200010F
60236+:10259000104000043C0280009442007E244200145B
60237+:1025A000A462001603E000080000000027BDFFE061
60238+:1025B0003C028008AFBF001CAFB0001834420100DD
60239+:1025C000944300429442004C104000193068FFFFD1
60240+:1025D0009383001824020001146200298FBF001C9D
60241+:1025E0003C06800834D00100000810C200501021C1
60242+:1025F000904200643103000734C70148304200FFB5
60243+:10260000006210073042000134C9014E34C4012C6D
60244+:1026100034C5013E1040001634C601420E0006D2F9
60245+:10262000AFA90010960200420A0009463048FFFF99
60246+:102630003C028008344401009483004494820042A8
60247+:102640001043000F8FBF001C94820044A4820042FC
60248+:1026500094820050A482004E8C820038AC820030FC
60249+:1026600094820040A482003E9482004AA4820048E2
60250+:102670008FBF001C8FB000180A00090427BD00207E
60251+:102680008FB0001803E0000827BD002027BDFFA081
60252+:10269000AFB1004C3C118000AFBF0058AFB3005445
60253+:1026A000AFB20050AFB000483626018890C2000398
60254+:1026B0003044007FA3A400108E32018090C200003D
60255+:1026C0003043007F240200031062003BAF92001CE5
60256+:1026D00028620004104000062402000424020002C4
60257+:1026E000106200098FBF00580A000B0F8FB300540F
60258+:1026F0001062004D240200051062014E8FBF005889
60259+:102700000A000B0F8FB30054000411C002421021C5
60260+:102710002404FF8024420240004410242643004049
60261+:10272000AE2200243063007F3C02800A0062182140
60262+:102730009062003CAFA3003C00441025A062003C26
60263+:102740008FA3003C9062003C304200401040016C7E
60264+:102750008FBF00583C108008A3800018361001007D
60265+:102760008E0200E08C63003427A4003C27A50010F3
60266+:10277000004310210E0007C3AE0200E093A2001038
60267+:102780003C038000A20200D58C6202780440FFFE68
60268+:102790008F82001CAC62024024020002A06202444C
60269+:1027A0003C021000AC6202780E0009390000000003
60270+:1027B0000A000B0E8FBF00583C05800890C3000133
60271+:1027C00090A2000B1443014E8FBF005834A4008028
60272+:1027D0008C8200189082004C90A200083C0260009D
60273+:1027E0008C4254048C8300183C027FFF3442FFFF6C
60274+:1027F000006218243C0208008C4200B4AC8300182C
60275+:102800003C038000244200013C010800AC2200B4DB
60276+:102810008C6201F80440FFFE8F82001CAC6201C094
60277+:102820000A000AD6240200023C10800890C300016E
60278+:102830009202000B144301328FBF005827A40018E6
60279+:1028400036050110240600033C0260008C4254044B
60280+:102850000E000E470000000027A40028360501F0F6
60281+:102860000E000E47240600038FA200283603010045
60282+:10287000AE0200648FA2002CAE0200688FA200306E
60283+:10288000AE02006C93A40018906300D52402FF8070
60284+:102890000082102400431025304900FF3084007F5F
60285+:1028A0003122007F0082102A544000013929008023
60286+:1028B000000411C0244202402403FF800242102180
60287+:1028C00000431024AE220094264200403042007F94
60288+:1028D0003C038006004340218FA3001C2402FFFF1D
60289+:1028E000AFA800403C130800927300F71062003359
60290+:1028F00093A2001995030014304400FF3063FFFFDA
60291+:102900000064182B106000100000000095040014F3
60292+:102910008D07001C8D0600183084FFFF0044202323
60293+:102920000004210000E438210000102100E4202BE5
60294+:1029300000C2302100C43021AD07001CAD060018D4
60295+:102940000A000A2F93A20019950400148D07001C99
60296+:102950008D0600183084FFFF008220230004210030
60297+:10296000000010210080182100C2302300E4202B39
60298+:1029700000C4302300E33823AD07001CAD06001867
60299+:1029800093A200198FA30040A462001497A2001A1A
60300+:10299000A46200168FA2001CAC6200108FA2001C63
60301+:1029A000AC62000C93A20019A462002097A2001A46
60302+:1029B000A46200228FA2001CAC6200243C048008A8
60303+:1029C000348300808C6200388FA20020012088218F
60304+:1029D000AC62003C8FA20020AC82000093A20018E1
60305+:1029E000A062004C93A20018A0820009A0600068B9
60306+:1029F00093A20018105100512407FF803229007F54
60307+:102A0000000911C024420240024210213046007FDA
60308+:102A10003C03800000471024AC6200943C02800616
60309+:102A200000C2302190C2003CAFA60040000020212F
60310+:102A300000471025A0C2003C8FA80040950200026C
60311+:102A4000950300148D07001C3042FFFF3063FFFF29
60312+:102A50008D060018004310230002110000E2382107
60313+:102A600000E2102B00C4302100C23021AD07001C51
60314+:102A7000AD06001895020002A5020014A50000167C
60315+:102A80008D020008AD0200108D020008AD02000C9E
60316+:102A900095020002A5020020A50000228D02000878
60317+:102AA000AD0200249102003C304200401040001A68
60318+:102AB000262200013C108008A3A90038A38000183A
60319+:102AC000361001008E0200E08D03003427A4004080
60320+:102AD00027A50038004310210E0007C3AE0200E016
60321+:102AE00093A200383C038000A20200D58C620278D9
60322+:102AF0000440FFFE8F82001CAC62024024020002F0
60323+:102B0000A06202443C021000AC6202780E00093957
60324+:102B100000000000262200013043007F14730004EF
60325+:102B2000004020212403FF8002231024004320269C
60326+:102B300093A200180A000A4B309100FF93A40018DA
60327+:102B40008FA3001C2402FFFF1062000A308900FFDF
60328+:102B500024820001248300013042007F14530005C9
60329+:102B6000306900FF2403FF800083102400431026F7
60330+:102B7000304900FF3C028008904200080120882173
60331+:102B8000305000FF123000193222007F000211C0C5
60332+:102B900002421021244202402403FF8000431824F3
60333+:102BA0003C048000AC8300943042007F3C038006EC
60334+:102BB000004310218C43000C004020211060000BCA
60335+:102BC000AFA200400E00057E000000002623000199
60336+:102BD0002405FF803062007F145300020225202468
60337+:102BE000008518260A000AAF307100FF3C048008F7
60338+:102BF000348400808C8300183C027FFF3442FFFF46
60339+:102C000000621824AC8300183C0380008C6201F839
60340+:102C10000440FFFE00000000AC7201C0240200026C
60341+:102C2000A06201C43C021000AC6201F80A000B0E65
60342+:102C30008FBF00583C04800890C300019082000BB5
60343+:102C40001443002F8FBF0058349000809202000878
60344+:102C500030420040104000200000000092020008B6
60345+:102C60000002160000021603044100050240202164
60346+:102C70000E000ECC240500930A000B0E8FBF0058E7
60347+:102C80009202000924030018304200FF1443000D93
60348+:102C900002402021240500390E000E64000030217E
60349+:102CA0000E0003328F84001C8F82FF9424030012D5
60350+:102CB000A04300090E00033D8F84001C0A000B0E88
60351+:102CC0008FBF0058240500360E000E64000030212E
60352+:102CD0000A000B0E8FBF00580E0003320240202165
60353+:102CE000920200058F84001C344200200E00033D38
60354+:102CF000A20200050E0010758F84001C8FBF0058C3
60355+:102D00008FB300548FB200508FB1004C8FB0004889
60356+:102D100003E0000827BD00603C0280083445010044
60357+:102D20003C0280008C42014094A3000E0000302140
60358+:102D300000402021AF82001C3063FFFF3402FFFF00
60359+:102D4000106200063C0760202402FFFFA4A2000ED0
60360+:102D500094A500EA0A00090130A5FFFF03E000087E
60361+:102D60000000000027BDFFC83C0280003C06800830
60362+:102D7000AFB5002CAFB1001CAFBF0030AFB400281E
60363+:102D8000AFB30024AFB20020AFB00018345101003F
60364+:102D900034C501008C4301008E2200148CA400E491
60365+:102DA0000000A821AF83001C0044102318400052EB
60366+:102DB000A38000188E22001400005021ACA200E471
60367+:102DC00090C3000890A200D53073007FA3A200102A
60368+:102DD0008CB200E08CB400E4304200FF1053003BA2
60369+:102DE00093A200108F83001C2407FF80000211C0F3
60370+:102DF0000062102124420240246300400047102456
60371+:102E00003063007F3C0980003C08800A006818217C
60372+:102E1000AD2200248C62003427A4001427A50010E2
60373+:102E2000024280210290102304400028AFA3001426
60374+:102E30009062003C00E21024304200FF1440001970
60375+:102E4000020090219062003C34420040A062003CAD
60376+:102E50008F86001C93A3001024C200403042007FE4
60377+:102E6000004828213C0208008C4200F42463000141
60378+:102E7000306400FF14820002A3A30010A3A000107E
60379+:102E800093A20010AFA50014000211C0244202401A
60380+:102E900000C2102100471024AD2200240A000B4577
60381+:102EA00093A200100E0007C3000000003C0280083F
60382+:102EB00034420100AC5000E093A30010240A00014A
60383+:102EC000A04300D50A000B4593A200102402000184
60384+:102ED000154200093C0380008C6202780440FFFE2A
60385+:102EE0008F82001CAC62024024020002A0620244F5
60386+:102EF0003C021000AC6202789222000B2403000214
60387+:102F0000304200FF144300720000000096220008C7
60388+:102F1000304300FF24020082146200402402008437
60389+:102F20003C028000344901008D22000C95230006EC
60390+:102F3000000216023063FFFF3045003F24020027E5
60391+:102F400010A2000FAF83001428A200281040000830
60392+:102F5000240200312402002110A2000924020025CD
60393+:102F600010A20007938200190A000BBD00000000A8
60394+:102F700010A20007938200190A000BBD0000000098
60395+:102F80000E000777012020210A000C3D0000000000
60396+:102F90003C0380008C6202780440FFFE8F82001C9C
60397+:102FA000AC62024024020002A06202443C02100013
60398+:102FB000AC6202780A000C3D000000009523000678
60399+:102FC000912400058D25000C8D2600108D270018FA
60400+:102FD0008D28001C8D290020244200013C0108009E
60401+:102FE000A42356C63C010800A02456C53C01080095
60402+:102FF000AC2556CC3C010800AC2656D03C0108005C
60403+:10300000AC2756D83C010800AC2856DC3C0108002F
60404+:10301000AC2956E00A000C3DA38200191462000A94
60405+:10302000240200813C02800834420100944500EAF9
60406+:10303000922600058F84001C30A5FFFF30C600FFDC
60407+:103040000A000BFE3C0760211462005C00000000D7
60408+:103050009222000A304300FF306200201040000737
60409+:10306000306200403C02800834420100944500EA8E
60410+:103070008F84001C0A000BFC24060040104000074F
60411+:10308000000316003C02800834420100944500EA27
60412+:103090008F84001C0A000BFC24060041000216036A
60413+:1030A000044100463C02800834420100944500EA95
60414+:1030B0008F84001C2406004230A5FFFF3C076019E6
60415+:1030C0000E000901000000000A000C3D0000000095
60416+:1030D0009222000B24040016304200FF1044000628
60417+:1030E0003C0680009222000B24030017304200FFB0
60418+:1030F000144300320000000034C5010090A2000B10
60419+:10310000304200FF1444000B000080218CA20020FC
60420+:103110008CA400202403FF800043102400021140EF
60421+:103120003084007F004410253C032000004310251C
60422+:10313000ACC2083094A2000800021400000214037C
60423+:10314000044200012410000194A2000830420080D3
60424+:103150005040001A0200A82194A20008304220002A
60425+:10316000504000160200A8218CA300183C021C2D20
60426+:10317000344219ED106200110200A8213C0208003F
60427+:103180008C4200D4104000053C0280082403000457
60428+:1031900034420100A04300FC3C028008344201009C
60429+:1031A000944500EA8F84001C2406000630A5FFFF2A
60430+:1031B0000E0009013C0760210200A8210E00093918
60431+:1031C000000000009222000A304200081040000473
60432+:1031D00002A010210E0013790000000002A01021AF
60433+:1031E0008FBF00308FB5002C8FB400288FB3002420
60434+:1031F0008FB200208FB1001C8FB0001803E00008D0
60435+:1032000027BD00382402FF80008220243C02900069
60436+:1032100034420007008220253C028000AC4400209C
60437+:103220003C0380008C6200200440FFFE0000000090
60438+:1032300003E00008000000003C0380002402FF803F
60439+:10324000008220243462000700822025AC64002024
60440+:103250008C6200200440FFFE0000000003E0000834
60441+:103260000000000027BDFFD8AFB3001CAFB10014B1
60442+:10327000AFB00010AFBF0020AFB200183C1180000B
60443+:103280003C0280088E32002034530100AE2400201E
60444+:10329000966300EA000514003C074000004738250B
60445+:1032A00000A08021000030210E0009013065FFFFE1
60446+:1032B000240200A1160200022402FFFFA2620009FC
60447+:1032C000AE3200208FBF00208FB3001C8FB20018D9
60448+:1032D0008FB100148FB0001003E0000827BD002854
60449+:1032E0003C0280082403000527BDFFE834420100AA
60450+:1032F000A04300FCAFBF00103C0280008C420100E4
60451+:10330000240500A1004020210E000C67AF82001CA4
60452+:103310003C0380008C6202780440FFFE8F82001C18
60453+:103320008FBF001027BD0018AC62024024020002CB
60454+:10333000A06202443C021000AC62027803E0000884
60455+:103340000000000027BDFFE83C068000AFBF001072
60456+:1033500034C7010094E20008304400FF3883008243
60457+:10336000388200842C6300012C4200010062182581
60458+:103370001060002D24020083938200195040003B0E
60459+:103380008FBF00103C020800904256CC8CC4010054
60460+:103390003C06080094C656C63045003F38A30032AC
60461+:1033A00038A2003F2C6300012C4200010062182566
60462+:1033B000AF84001CAF860014A380001914600007BE
60463+:1033C00000E020212402002014A2001200000000CE
60464+:1033D0003402FFFF14C2000F00000000240200208E
60465+:1033E00014A2000500E028218CE300142402FFFF52
60466+:1033F0005062000B8FBF00103C040800248456C0AC
60467+:10340000000030210E000706240700010A000CD638
60468+:103410008FBF00100E000777000000008FBF001064
60469+:103420000A00093927BD001814820004240200850F
60470+:103430008CC501040A000CE1000020211482000662
60471+:103440002482FF808CC50104240440008FBF00103B
60472+:103450000A00016727BD0018304200FF2C4200021D
60473+:1034600010400004240200228FBF00100A000B2726
60474+:1034700027BD0018148200048F8200248FBF001023
60475+:103480000A000C8627BD00188C42000C1040001E5C
60476+:1034900000E0282190E300092402001814620003D0
60477+:1034A000240200160A000CFC240300081462000722
60478+:1034B00024020017240300123C02800834420080DA
60479+:1034C000A04300090A000D0994A7000854620007F0
60480+:1034D00094A700088F82FF942404FFFE9043000508
60481+:1034E00000641824A043000594A7000890A6001BC0
60482+:1034F0008CA4000094A500068FBF001000073C00BC
60483+:103500000A0008DC27BD00188FBF001003E0000888
60484+:1035100027BD00188F8500243C04800094A2002A57
60485+:103520008CA30034000230C02402FFF000C210243B
60486+:1035300000621821AC83003C8CA200303C03800068
60487+:10354000AC8200383C02005034420010AC620030C3
60488+:103550000000000000000000000000008C6200007D
60489+:10356000304200201040FFFD30C20008104000062D
60490+:103570003C0280008C620408ACA200208C62040C27
60491+:103580000A000D34ACA200248C430400ACA300203C
60492+:103590008C420404ACA200243C0300203C028000C6
60493+:1035A000AC4300303C0480008C8200300043102487
60494+:1035B0001440FFFD8F8600243C020040AC820030A6
60495+:1035C00094C3002A94C2002894C4002C94C5002EF1
60496+:1035D00024630001004410213064FFFFA4C20028CE
60497+:1035E00014850002A4C3002AA4C0002A03E0000836
60498+:1035F000000000008F84002427BDFFE83C05800404
60499+:1036000024840010AFBF00100E000E472406000AED
60500+:103610008F840024948200129483002E3042000F85
60501+:10362000244200030043180424027FFF0043102BB0
60502+:1036300010400002AC8300000000000D0E000D13CE
60503+:10364000000000008F8300248FBF001027BD0018EA
60504+:10365000946200149463001A3042000F00021500B7
60505+:10366000006218253C02800003E00008AC4300A083
60506+:103670008F8300243C028004944400069462001A64
60507+:103680008C650000A4640016004410233042FFFF44
60508+:103690000045102B03E00008384200018F8400240D
60509+:1036A0003C0780049486001A8C85000094E2000692
60510+:1036B000A482001694E3000600C310233042FFFFEB
60511+:1036C0000045102B384200011440FFF8A483001677
60512+:1036D00003E00008000000008F8400243C02800406
60513+:1036E000944200069483001A8C850000A482001680
60514+:1036F000006210233042FFFF0045102B38420001CA
60515+:103700005040000D8F850024006030213C0780046C
60516+:1037100094E20006A482001694E3000600C310237E
60517+:103720003042FFFF0045102B384200011440FFF8E3
60518+:10373000A48300168F8500243C03800034620400BB
60519+:103740008CA40020AF820020AC6400388CA200243E
60520+:10375000AC62003C3C020005AC62003003E00008B3
60521+:10376000ACA000048F8400243C0300068C8200047B
60522+:1037700000021140004310253C038000AC62003081
60523+:103780000000000000000000000000008C6200004B
60524+:10379000304200101040FFFD34620400AC80000491
60525+:1037A00003E00008AF8200208F86002427BDFFE0E1
60526+:1037B000AFB10014AFB00010AFBF00188CC300044D
60527+:1037C0008CC500248F820020309000FF94C4001A22
60528+:1037D00024630001244200202484000124A7002047
60529+:1037E000ACC30004AF820020A4C4001AACC70024FC
60530+:1037F00004A100060000882104E2000594C2001A1A
60531+:103800008CC2002024420001ACC2002094C2001AE5
60532+:1038100094C300282E040001004310262C4200010E
60533+:10382000004410245040000594C2001A24020001F4
60534+:10383000ACC2000894C2001A94C300280010202BC8
60535+:10384000004310262C4200010044102514400007BC
60536+:10385000000000008CC20008144000042402001084
60537+:103860008CC300041462000F8F8500240E000DA786
60538+:10387000241100018F820024944300289442001AEE
60539+:1038800014430003000000000E000D1300000000B0
60540+:10389000160000048F8500240E000D840000000037
60541+:1038A0008F85002494A2001E94A4001C24420001D1
60542+:1038B0003043FFFF14640002A4A2001EA4A0001E57
60543+:1038C0001200000A3C02800494A2001494A3001A7F
60544+:1038D0003042000F00021500006218253C028000F3
60545+:1038E000AC4300A00A000E1EACA0000894420006E3
60546+:1038F00094A3001A8CA40000A4A200160062102356
60547+:103900003042FFFF0044102B384200011040000DF0
60548+:1039100002201021006030213C07800494E2000660
60549+:10392000A4A2001694E3000600C310233042FFFF58
60550+:103930000044102B384200011440FFF8A4A30016E5
60551+:10394000022010218FBF00188FB100148FB000101B
60552+:1039500003E0000827BD002003E00008000000008D
60553+:103960008F82002C3C03000600021140004310250A
60554+:103970003C038000AC62003000000000000000004A
60555+:10398000000000008C620000304200101040FFFD7B
60556+:1039900034620400AF82002803E00008AF80002CEE
60557+:1039A00003E000080000102103E000080000000010
60558+:1039B0003084FFFF30A5FFFF0000182110800007B2
60559+:1039C000000000003082000110400002000420428C
60560+:1039D000006518210A000E3D0005284003E000089C
60561+:1039E0000060102110C0000624C6FFFF8CA200005A
60562+:1039F00024A50004AC8200000A000E4724840004C1
60563+:103A000003E000080000000010A0000824A3FFFF4E
60564+:103A1000AC86000000000000000000002402FFFF50
60565+:103A20002463FFFF1462FFFA2484000403E000080B
60566+:103A3000000000003C0280083442008024030001A2
60567+:103A4000AC43000CA4430010A4430012A443001490
60568+:103A500003E00008A44300168F82002427BDFFD88E
60569+:103A6000AFB3001CAFB20018AFB10014AFB000107C
60570+:103A7000AFBF00208C47000C248200802409FF8007
60571+:103A80003C08800E3043007F008080213C0A80008B
60572+:103A9000004920240068182130B100FF30D200FF17
60573+:103AA00010E000290000982126020100AD44002CFE
60574+:103AB000004928243042007F004820219062000005
60575+:103AC00024030050304200FF1443000400000000B3
60576+:103AD000AD45002C948200EA3053FFFF0E000D84A8
60577+:103AE000000000008F8200248F83002000112C0032
60578+:103AF0009442001E001224003484000100A22825F4
60579+:103B00003C02400000A22825AC7000008FBF0020BE
60580+:103B1000AC6000048FB20018AC7300088FB10014C1
60581+:103B2000AC60000C8FB3001CAC6400108FB00010B0
60582+:103B3000AC60001424040001AC60001827BD00280C
60583+:103B40000A000DB8AC65001C8FBF00208FB3001CAD
60584+:103B50008FB200188FB100148FB0001003E000087E
60585+:103B600027BD00283C06800034C201009043000FAE
60586+:103B7000240200101062000E2865001110A000073A
60587+:103B800024020012240200082405003A10620006F4
60588+:103B90000000302103E0000800000000240500358B
60589+:103BA0001462FFFC000030210A000E6400000000D7
60590+:103BB0008CC200748F83FF9424420FA003E000089E
60591+:103BC000AC62000C27BDFFE8AFBF00100E0003423F
60592+:103BD000240500013C0480088FBF0010240200016E
60593+:103BE00034830080A462001227BD00182402000163
60594+:103BF00003E00008A080001A27BDFFE0AFB2001864
60595+:103C0000AFB10014AFB00010AFBF001C30B2FFFF67
60596+:103C10000E000332008088213C028008345000806E
60597+:103C20009202000924030004304200FF1443000CF8
60598+:103C30003C028008124000082402000A0E000E5BBD
60599+:103C400000000000920200052403FFFE0043102440
60600+:103C5000A202000524020012A20200093C02800810
60601+:103C600034420080022020210E00033DA0400027A6
60602+:103C700016400003022020210E000EBF00000000AD
60603+:103C800002202021324600FF8FBF001C8FB2001897
60604+:103C90008FB100148FB00010240500380A000E64A4
60605+:103CA00027BD002027BDFFE0AFBF001CAFB200184A
60606+:103CB000AFB10014AFB000100E00033200808021BD
60607+:103CC0000E000E5B000000003C02800834450080BE
60608+:103CD00090A2000924120018305100FF1232000394
60609+:103CE0000200202124020012A0A2000990A20005D7
60610+:103CF0002403FFFE004310240E00033DA0A2000594
60611+:103D00000200202124050020163200070000302187
60612+:103D10008FBF001C8FB200188FB100148FB000103D
60613+:103D20000A00034227BD00208FBF001C8FB200187D
60614+:103D30008FB100148FB00010240500390A000E6402
60615+:103D400027BD002027BDFFE83C028000AFB0001077
60616+:103D5000AFBF0014344201009442000C2405003629
60617+:103D60000080802114400012304600FF0E00033214
60618+:103D7000000000003C02800834420080240300124E
60619+:103D8000A043000990430005346300100E000E5B51
60620+:103D9000A04300050E00033D020020210200202167
60621+:103DA0000E000342240500200A000F3C0000000022
60622+:103DB0000E000E64000000000E00033202002021FD
60623+:103DC0003C0280089043001B2405FF9F0200202135
60624+:103DD000006518248FBF00148FB00010A043001B93
60625+:103DE0000A00033D27BD001827BDFFE0AFBF001844
60626+:103DF000AFB10014AFB0001030B100FF0E000332BD
60627+:103E0000008080213C02800824030012344200809C
60628+:103E10000E000E5BA04300090E00033D02002021AE
60629+:103E200002002021022030218FBF00188FB1001422
60630+:103E30008FB00010240500350A000E6427BD002055
60631+:103E40003C0480089083000E9082000A1443000B0B
60632+:103E5000000028218F82FF942403005024050001D4
60633+:103E600090420000304200FF1443000400000000B4
60634+:103E70009082000E24420001A082000E03E00008A0
60635+:103E800000A010213C0380008C6201F80440FFFE7A
60636+:103E900024020002AC6401C0A06201C43C02100014
60637+:103EA00003E00008AC6201F827BDFFE0AFB20018E4
60638+:103EB0003C128008AFB10014AFBF001CAFB00010BF
60639+:103EC00036510080922200092403000A304200FF8C
60640+:103ED0001443003E000000008E4300048E22003890
60641+:103EE000506200808FBF001C92220000240300500B
60642+:103EF000304200FF144300253C0280008C42014008
60643+:103F00008E4300043642010002202821AC43001CED
60644+:103F10009622005C8E2300383042FFFF00021040E2
60645+:103F200000621821AE23001C8E4300048E2400384A
60646+:103F30009622005C006418233042FFFF0003184300
60647+:103F4000000210400043102A10400006000000004C
60648+:103F50008E4200048E230038004310230A000FAA6B
60649+:103F6000000220439622005C3042FFFF0002204006
60650+:103F70003C0280083443010034420080ACA4002C91
60651+:103F8000A040002424020001A062000C0E000F5E7D
60652+:103F900000000000104000538FBF001C3C02800056
60653+:103FA0008C4401403C0380008C6201F80440FFFE19
60654+:103FB00024020002AC6401C0A06201C43C021000F3
60655+:103FC000AC6201F80A0010078FBF001C92220009A2
60656+:103FD00024030010304200FF144300043C02800020
60657+:103FE0008C4401400A000FEE0000282192220009B3
60658+:103FF00024030016304200FF14430006240200147C
60659+:10400000A22200093C0280008C4401400A001001F9
60660+:104010008FBF001C8E2200388E23003C00431023EB
60661+:10402000044100308FBF001C92220027244200016F
60662+:10403000A2220027922200272C42000414400016DE
60663+:104040003C1080009222000924030004304200FF4B
60664+:10405000144300093C0280008C4401408FBF001CC7
60665+:104060008FB200188FB100148FB000102405009398
60666+:104070000A000ECC27BD00208C440140240500938B
60667+:104080008FBF001C8FB200188FB100148FB00010CA
60668+:104090000A000F4827BD00208E0401400E000332A5
60669+:1040A000000000008E4200042442FFFFAE420004E4
60670+:1040B0008E22003C2442FFFFAE22003C0E00033D56
60671+:1040C0008E0401408E0401408FBF001C8FB2001887
60672+:1040D0008FB100148FB00010240500040A000342C1
60673+:1040E00027BD00208FB200188FB100148FB00010D0
60674+:1040F00003E0000827BD00203C0680008CC2018838
60675+:104100003C038008346500809063000E00021402B6
60676+:10411000304400FF306300FF1464000E3C0280084E
60677+:1041200090A20026304200FF104400098F82FF94C5
60678+:10413000A0A400262403005090420000304200FF5B
60679+:1041400014430006000000000A0005A18CC4018091
60680+:104150003C02800834420080A044002603E00008AE
60681+:104160000000000027BDFFE030E700FFAFB20018FD
60682+:10417000AFBF001CAFB10014AFB0001000809021A1
60683+:1041800014E0000630C600FF000000000000000D33
60684+:10419000000000000A001060240001163C038008A3
60685+:1041A0009062000E304200FF14460023346200800B
60686+:1041B00090420026304200FF1446001F000000001D
60687+:1041C0009062000F304200FF1446001B0000000008
60688+:1041D0009062000A304200FF144600038F90FF9463
60689+:1041E0000000000D8F90FF948F82FF983C1180009B
60690+:1041F000AE05003CAC450000A066000A0E0003328C
60691+:104200008E240100A20000240E00033D8E24010034
60692+:104210003C0380008C6201F80440FFFE240200028F
60693+:10422000AC7201C0A06201C43C021000AC6201F893
60694+:104230000A0010618FBF001C000000000000000D8C
60695+:10424000000000002400013F8FBF001C8FB2001847
60696+:104250008FB100148FB0001003E0000827BD0020CC
60697+:104260008F83FF943C0280008C44010034420100A3
60698+:104270008C65003C9046001B0A00102724070001B3
60699+:104280003C0280089043000E9042000A0043102632
60700+:10429000304200FF03E000080002102B27BDFFE0C2
60701+:1042A0003C028008AFB10014AFB00010AFBF0018DF
60702+:1042B0003450008092020005240300303042003068
60703+:1042C00014430085008088218F8200248C42000CDA
60704+:1042D000104000828FBF00180E000D840000000007
60705+:1042E0008F860020ACD100009202000892030009E2
60706+:1042F000304200FF00021200306300FF004310252F
60707+:10430000ACC200049202004D000216000002160327
60708+:1043100004410005000000003C0308008C630048D5
60709+:104320000A00109F3C1080089202000830420040B2
60710+:10433000144000030000182192020027304300FFC0
60711+:104340003C108008361100809222004D00031E00B0
60712+:10435000304200FF0002140000621825ACC30008C0
60713+:104360008E2400308F820024ACC4000C8E250034D3
60714+:104370009443001E3C02C00BACC50010006218251F
60715+:104380008E22003800002021ACC200148E22003C96
60716+:10439000ACC200180E000DB8ACC3001C8E020004A5
60717+:1043A0008F8400203C058000AC8200008E2200201B
60718+:1043B000AC8200048E22001CAC8200088E220058C1
60719+:1043C0008CA3007400431021AC82000C8E22002CC0
60720+:1043D000AC8200108E2200408E23004400021400A4
60721+:1043E00000431025AC8200149222004D240300806B
60722+:1043F000304200FF1443000400000000AC800018AD
60723+:104400000A0010E38F8200248E23000C2402000196
60724+:104410001062000E2402FFFF92220008304200408A
60725+:104420001440000A2402FFFF8E23000C8CA20074AB
60726+:10443000006218233C0208000062102414400002AD
60727+:10444000000028210060282100051043AC820018DC
60728+:104450008F820024000020219443001E3C02C00CE7
60729+:10446000006218258F8200200E000DB8AC43001C9E
60730+:104470003C038008346201008C4200008F850020DC
60731+:10448000346300808FBF0018ACA20000ACA0000411
60732+:104490008C6400488F8200248FB10014ACA4000803
60733+:1044A000ACA0000CACA00010906300059446001E68
60734+:1044B0003C02400D00031E0000C23025ACA30014D6
60735+:1044C0008FB00010ACA0001824040001ACA6001CA2
60736+:1044D0000A000DB827BD00208FBF00188FB100144F
60737+:1044E0008FB0001003E0000827BD00203C028000D0
60738+:1044F0009443007C3C02800834460100308400FF75
60739+:104500003065FFFF2402000524A34650A0C4000C20
60740+:104510005482000C3065FFFF90C2000D2C42000752
60741+:104520001040000724A30A0090C3000D24020014C9
60742+:104530000062100400A210210A00111F3045FFFF85
60743+:104540003065FFFF3C0280083442008003E0000831
60744+:10455000A44500143C03800834680080AD05003891
60745+:10456000346701008CE2001C308400FF00A210239D
60746+:104570001840000330C600FF24A2FFFCACE2001C80
60747+:1045800030820001504000083C0380088D02003C4E
60748+:1045900000A2102304410012240400058C620004D0
60749+:1045A00010A2000F3C0380088C62000414A2001EBD
60750+:1045B000000000003C0208008C4200D8304200207D
60751+:1045C000104000093C0280083462008090630008BB
60752+:1045D0009042004C144300043C0280082404000470
60753+:1045E0000A00110900000000344300803442010039
60754+:1045F000A040000C24020001A462001410C0000AB4
60755+:104600003C0280008C4401003C0380008C6201F875
60756+:104610000440FFFE24020002AC6401C0A06201C499
60757+:104620003C021000AC6201F803E00008000000004A
60758+:1046300027BDFFE800A61823AFBF00101860008058
60759+:10464000308800FF3C02800834470080A0E000244E
60760+:1046500034440100A0E000278C82001C00A210233B
60761+:1046600004400056000000008CE2003C94E3005C33
60762+:104670008CE4002C004530233063FFFF00C3182179
60763+:104680000083202B1080000400E018218CE2002C15
60764+:104690000A00117800A2102194E2005C3042FFFF72
60765+:1046A00000C2102100A21021AC62001C3C02800854
60766+:1046B000344400809482005C8C83001C3042FFFFF5
60767+:1046C0000002104000A210210043102B10400004F3
60768+:1046D000000000008C82001C0A00118B3C06800840
60769+:1046E0009482005C3042FFFF0002104000A21021C3
60770+:1046F0003C06800834C3010034C70080AC82001C33
60771+:10470000A060000CACE500388C62001C00A21023F5
60772+:104710001840000224A2FFFCAC62001C3102000120
60773+:10472000104000083C0380088CE2003C00A21023EB
60774+:1047300004410012240400058CC2000410A20010E1
60775+:104740008FBF00108C62000414A2004F8FBF0010B6
60776+:104750003C0208008C4200D8304200201040000A81
60777+:104760003C02800834620080906300089042004C54
60778+:10477000144300053C028008240400048FBF00108D
60779+:104780000A00110927BD001834430080344201009B
60780+:10479000A040000C24020001A46200143C0280002E
60781+:1047A0008C4401003C0380008C6201F80440FFFE51
60782+:1047B000240200020A0011D8000000008CE2001C54
60783+:1047C000004610230043102B54400001ACE5001CB0
60784+:1047D00094E2005C3042FFFF0062102B144000079F
60785+:1047E0002402000294E2005C8CE3001C3042FFFFD4
60786+:1047F00000621821ACE3001C24020002ACE5003882
60787+:104800000E000F5EA082000C1040001F8FBF001032
60788+:104810003C0280008C4401003C0380008C6201F863
60789+:104820000440FFFE24020002AC6401C0A06201C487
60790+:104830003C021000AC6201F80A0011F08FBF0010BA
60791+:1048400031020010104000108FBF00103C028008A1
60792+:10485000344500808CA3001C94A2005C00661823E1
60793+:104860003042FFFF006218213C023FFF3444FFFF4B
60794+:104870000083102B544000010080182100C3102138
60795+:10488000ACA2001C8FBF001003E0000827BD001879
60796+:1048900027BDFFE800C0402100A63023AFBF0010B5
60797+:1048A00018C00026308A00FF3C028008344900808E
60798+:1048B0008D24001C8D23002C008820230064182BDD
60799+:1048C0001060000F344701008CE2002000461021E8
60800+:1048D000ACE200208CE200200044102B1440000BBE
60801+:1048E0003C023FFF8CE2002000441023ACE2002099
60802+:1048F0009522005C3042FFFF0A0012100082202146
60803+:10490000ACE00020008620213C023FFF3443FFFF43
60804+:104910000064102B54400001006020213C028008FC
60805+:104920003442008000851821AC43001CA0400024C4
60806+:10493000A04000270A0012623C03800831420010A8
60807+:10494000104000433C0380083C06800834C40080CB
60808+:104950008C82003C004810235840003E34660080A2
60809+:104960009082002424420001A0820024908200242E
60810+:104970003C0308008C630024304200FF0043102BEE
60811+:10498000144000688FBF001034C201008C42001C2C
60812+:1049900000A2102318400063000000008CC3000434
60813+:1049A0009482005C006818233042FFFF0003184324
60814+:1049B000000210400043102A1040000500000000D3
60815+:1049C0008CC20004004810230A0012450002104364
60816+:1049D0009482005C3042FFFF000210403C068008D9
60817+:1049E000AC82002C34C5008094A2005C8CA4002C06
60818+:1049F00094A3005C3042FFFF00021040008220219F
60819+:104A00003063FFFF0083202101041021ACA2001CB1
60820+:104A10008CC2000434C60100ACC2001C2402000297
60821+:104A20000E000F5EA0C2000C1040003E8FBF0010B1
60822+:104A30003C0280008C4401003C0380008C6201F841
60823+:104A40000440FFFE240200020A001292000000004F
60824+:104A500034660080ACC50038346401008C82001CD0
60825+:104A600000A210231840000224A2FFFCAC82001C0C
60826+:104A7000314200015040000A3C0380088CC2003CD7
60827+:104A800000A2102304430014240400058C620004D7
60828+:104A900014A200033C0380080A00128424040005C9
60829+:104AA0008C62000414A2001F8FBF00103C0208009B
60830+:104AB0008C4200D8304200201040000A3C0280089E
60831+:104AC00034620080906300089042004C144300055B
60832+:104AD0003C028008240400048FBF00100A00110962
60833+:104AE00027BD00183443008034420100A040000C70
60834+:104AF00024020001A46200143C0280008C440100E6
60835+:104B00003C0380008C6201F80440FFFE2402000296
60836+:104B1000AC6401C0A06201C43C021000AC6201F8A8
60837+:104B20008FBF001003E0000827BD001827BDFFE875
60838+:104B30003C0A8008AFBF0010354900808D22003C40
60839+:104B400000C04021308400FF004610231840009D23
60840+:104B500030E700FF354701002402000100A63023A2
60841+:104B6000A0E0000CA0E0000DA522001418C0002455
60842+:104B7000308200108D23001C8D22002C0068182329
60843+:104B80000043102B1040000F000000008CE20020BA
60844+:104B900000461021ACE200208CE200200043102BE4
60845+:104BA0001440000B3C023FFF8CE200200043102326
60846+:104BB000ACE200209522005C3042FFFF0A0012C1E7
60847+:104BC00000621821ACE00020006618213C023FFF83
60848+:104BD0003446FFFF00C3102B5440000100C01821D1
60849+:104BE0003C0280083442008000651821AC43001C60
60850+:104BF000A0400024A04000270A00130F3C038008B7
60851+:104C0000104000403C0380088D22003C00481023E7
60852+:104C10005840003D34670080912200242442000166
60853+:104C2000A1220024912200243C0308008C6300246C
60854+:104C3000304200FF0043102B1440009A8FBF001039
60855+:104C40008CE2001C00A21023184000960000000017
60856+:104C50008D4300049522005C006818233042FFFF5A
60857+:104C600000031843000210400043102A10400005C2
60858+:104C7000012020218D420004004810230A0012F276
60859+:104C8000000210439522005C3042FFFF00021040FA
60860+:104C90003C068008AC82002C34C5008094A2005CE5
60861+:104CA0008CA4002C94A3005C3042FFFF0002104053
60862+:104CB000008220213063FFFF0083182101031021AF
60863+:104CC000ACA2001C8CC2000434C60100ACC2001CA3
60864+:104CD000240200020E000F5EA0C2000C1040007102
60865+:104CE0008FBF00103C0280008C4401003C03800018
60866+:104CF0008C6201F80440FFFE240200020A0013390E
60867+:104D00000000000034670080ACE500383466010024
60868+:104D10008CC2001C00A210231840000224A2FFFC39
60869+:104D2000ACC2001C30820001504000083C038008E7
60870+:104D30008CE2003C00A2102304430051240400052F
60871+:104D40008C62000410A2003E3C0380088C620004C8
60872+:104D500054A200548FBF00103C0208008C4200D8BF
60873+:104D600030420020104000063C028008346200807F
60874+:104D7000906300089042004C104300403C028008C1
60875+:104D80003443008034420100A040000C24020001A2
60876+:104D9000A46200143C0280008C4401003C038000AB
60877+:104DA0008C6201F80440FFFE24020002AC6401C0E2
60878+:104DB000A06201C43C021000AC6201F80A00137743
60879+:104DC0008FBF001024020005A120002714E2000A72
60880+:104DD0003C038008354301009062000D2C42000620
60881+:104DE000504000053C0380089062000D2442000101
60882+:104DF000A062000D3C03800834670080ACE50038F9
60883+:104E0000346601008CC2001C00A21023184000026E
60884+:104E100024A2FFFCACC2001C308200015040000AFA
60885+:104E20003C0380088CE2003C00A2102304410014E3
60886+:104E3000240400058C62000414A200033C038008D3
60887+:104E40000A00136E240400058C62000414A20015ED
60888+:104E50008FBF00103C0208008C4200D83042002076
60889+:104E60001040000A3C028008346200809063000811
60890+:104E70009042004C144300053C02800824040004C6
60891+:104E80008FBF00100A00110927BD001834430080AD
60892+:104E900034420100A040000C24020001A46200146E
60893+:104EA0008FBF001003E0000827BD00183C0B8008EE
60894+:104EB00027BDFFE83C028000AFBF00103442010074
60895+:104EC000356A00809044000A356901008C45001461
60896+:104ED0008D4800389123000C308400FF0105102319
60897+:104EE0001C4000B3306700FF2CE20006504000B1C8
60898+:104EF0008FBF00102402000100E2300430C2000322
60899+:104F00005440000800A8302330C2000C144000A117
60900+:104F100030C20030144000A38FBF00100A00143BC1
60901+:104F20000000000018C00024308200108D43001CD7
60902+:104F30008D42002C006818230043102B1040000FF6
60903+:104F4000000000008D22002000461021AD2200202C
60904+:104F50008D2200200043102B1440000B3C023FFF29
60905+:104F60008D22002000431023AD2200209542005CDA
60906+:104F70003042FFFF0A0013AF00621821AD2000206D
60907+:104F8000006618213C023FFF3446FFFF00C3102B90
60908+:104F90005440000100C018213C02800834420080C7
60909+:104FA00000651821AC43001CA0400024A04000274D
60910+:104FB0000A0013FD3C038008104000403C038008B9
60911+:104FC0008D42003C004810231840003D34670080AB
60912+:104FD0009142002424420001A14200249142002475
60913+:104FE0003C0308008C630024304200FF0043102B78
60914+:104FF000144000708FBF00108D22001C00A21023EF
60915+:105000001840006C000000008D6300049542005CB5
60916+:10501000006818233042FFFF0003184300021040CD
60917+:105020000043102A10400005014020218D62000439
60918+:10503000004810230A0013E0000210439542005C70
60919+:105040003042FFFF000210403C068008AC82002C7A
60920+:1050500034C5008094A2005C8CA4002C94A3005C56
60921+:105060003042FFFF00021040008220213063FFFF2A
60922+:105070000083182101031021ACA2001C8CC2000483
60923+:1050800034C60100ACC2001C240200020E000F5EF8
60924+:10509000A0C2000C104000478FBF00103C028000EF
60925+:1050A0008C4401003C0380008C6201F80440FFFE48
60926+:1050B000240200020A00142D000000003467008062
60927+:1050C000ACE50038346601008CC2001C00A210233D
60928+:1050D0001840000224A2FFFCACC2001C3082000178
60929+:1050E0005040000A3C0380088CE2003C00A21023E0
60930+:1050F00004430014240400058C62000414A200037D
60931+:105100003C0380080A00141F240400058C6200047C
60932+:1051100014A200288FBF00103C0208008C4200D867
60933+:10512000304200201040000A3C02800834620080B7
60934+:10513000906300089042004C144300053C02800834
60935+:10514000240400048FBF00100A00110927BD0018B5
60936+:105150003443008034420100A040000C24020001CE
60937+:10516000A46200143C0280008C4401003C038000D7
60938+:105170008C6201F80440FFFE24020002AC6401C00E
60939+:10518000A06201C43C021000AC6201F80A00143BAA
60940+:105190008FBF00108FBF0010010030210A00115A8C
60941+:1051A00027BD0018010030210A00129927BD001800
60942+:1051B0008FBF001003E0000827BD00183C038008E3
60943+:1051C0003464010024020003A082000C8C620004FD
60944+:1051D00003E00008AC82001C3C05800834A300807A
60945+:1051E0009062002734A501002406004324420001F8
60946+:1051F000A0620027906300273C0208008C42004810
60947+:10520000306300FF146200043C07602194A500EAAB
60948+:105210000A00090130A5FFFF03E0000800000000BC
60949+:1052200027BDFFE8AFBF00103C0280000E00144411
60950+:105230008C4401803C02800834430100A060000CD3
60951+:105240008C4200048FBF001027BD001803E0000847
60952+:10525000AC62001C27BDFFE03C028008AFBF001815
60953+:10526000AFB10014AFB000103445008034460100E7
60954+:105270003C0880008D09014090C3000C8CA4003CC8
60955+:105280008CA200381482003B306700FF9502007C3E
60956+:1052900090A30027146000093045FFFF2402000599
60957+:1052A00054E200083C04800890C2000D2442000132
60958+:1052B000A0C2000D0A00147F3C048008A0C0000DAD
60959+:1052C0003C048008348201009042000C2403000555
60960+:1052D000304200FF1443000A24A205DC348300801E
60961+:1052E000906200272C4200075040000524A20A00CB
60962+:1052F00090630027240200140062100400A2102111
60963+:105300003C108008361000803045FFFF012020212E
60964+:105310000E001444A60500149602005C8E030038AB
60965+:105320003C1180003042FFFF000210400062182153
60966+:10533000AE03001C0E0003328E24014092020025B1
60967+:1053400034420040A20200250E00033D8E2401409D
60968+:105350008E2401403C0380008C6201F80440FFFE73
60969+:1053600024020002AC6401C0A06201C43C0210002F
60970+:10537000AC6201F88FBF00188FB100148FB000101D
60971+:1053800003E0000827BD00203C0360103C02080039
60972+:1053900024420174AC62502C8C6250003C048000AA
60973+:1053A00034420080AC6250003C0208002442547C2D
60974+:1053B0003C010800AC2256003C020800244254384C
60975+:1053C0003C010800AC2256043C020002AC840008F8
60976+:1053D000AC82000C03E000082402000100A0302190
60977+:1053E0003C1C0800279C56083C0200023C050400B7
60978+:1053F00000852826008220260004102B2CA5000101
60979+:105400002C840001000210803C0308002463560035
60980+:105410000085202500431821108000030000102182
60981+:10542000AC6600002402000103E000080000000058
60982+:105430003C1C0800279C56083C0200023C05040066
60983+:1054400000852826008220260004102B2CA50001B0
60984+:105450002C840001000210803C03080024635600E5
60985+:105460000085202500431821108000050000102130
60986+:105470003C02080024425438AC62000024020001BF
60987+:1054800003E00008000000003C0200023C030400AE
60988+:1054900000821026008318262C4200012C63000194
60989+:1054A000004310251040000B000028213C1C080080
60990+:1054B000279C56083C0380008C62000824050001EC
60991+:1054C00000431025AC6200088C62000C00441025DB
60992+:1054D000AC62000C03E0000800A010213C1C080096
60993+:1054E000279C56083C0580008CA3000C0004202754
60994+:1054F000240200010064182403E00008ACA3000C9F
60995+:105500003C020002148200063C0560008CA208D018
60996+:105510002403FFFE0043102403E00008ACA208D0DF
60997+:105520003C02040014820005000000008CA208D098
60998+:105530002403FFFD00431024ACA208D003E00008C0
60999+:10554000000000003C02601A344200108C430080CE
61000+:1055500027BDFFF88C440084AFA3000093A3000094
61001+:10556000240200041462001AAFA4000493A20001F4
61002+:105570001040000797A300023062FFFC3C0380004C
61003+:10558000004310218C4200000A001536AFA200042F
61004+:105590003062FFFC3C03800000431021AC4400005B
61005+:1055A000A3A000003C0560008CA208D02403FFFEED
61006+:1055B0003C04601A00431024ACA208D08FA300045E
61007+:1055C0008FA2000034840010AC830084AC82008081
61008+:1055D00003E0000827BD000827BDFFE8AFBF0010AB
61009+:1055E0003C1C0800279C56083C0280008C43000CA1
61010+:1055F0008C420004004318243C0200021060001496
61011+:10560000006228243C0204003C04000210A00005B3
61012+:10561000006210243C0208008C4256000A00155B10
61013+:1056200000000000104000073C0404003C02080099
61014+:105630008C4256040040F809000000000A00156082
61015+:10564000000000000000000D3C1C0800279C5608CC
61016+:105650008FBF001003E0000827BD0018800802403B
61017+:1056600080080100800800808008000000000C8095
61018+:105670000000320008000E9808000EF408000F88A1
61019+:1056800008001028080010748008010080080080BD
61020+:10569000800800000A000028000000000000000050
61021+:1056A0000000000D6370362E322E316200000000C3
61022+:1056B00006020104000000000000000000000000DD
61023+:1056C000000000000000000038003C000000000066
61024+:1056D00000000000000000000000000000000020AA
61025+:1056E00000000000000000000000000000000000BA
61026+:1056F00000000000000000000000000000000000AA
61027+:10570000000000000000000021003800000000013F
61028+:105710000000002B000000000000000400030D400A
61029+:105720000000000000000000000000000000000079
61030+:105730000000000000000000100000030000000056
61031+:105740000000000D0000000D3C020800244259AC8E
61032+:105750003C03080024635BF4AC4000000043202BB2
61033+:105760001480FFFD244200043C1D080037BD9FFC4F
61034+:1057700003A0F0213C100800261000A03C1C0800EB
61035+:10578000279C59AC0E0002F6000000000000000D3E
61036+:1057900027BDFFB4AFA10000AFA20004AFA3000873
61037+:1057A000AFA4000CAFA50010AFA60014AFA700185F
61038+:1057B000AFA8001CAFA90020AFAA0024AFAB0028FF
61039+:1057C000AFAC002CAFAD0030AFAE0034AFAF00389F
61040+:1057D000AFB8003CAFB90040AFBC0044AFBF004819
61041+:1057E0000E000820000000008FBF00488FBC00445E
61042+:1057F0008FB900408FB8003C8FAF00388FAE0034B7
61043+:105800008FAD00308FAC002C8FAB00288FAA002406
61044+:105810008FA900208FA8001C8FA700188FA6001446
61045+:105820008FA500108FA4000C8FA300088FA2000486
61046+:105830008FA1000027BD004C3C1B60188F7A5030B0
61047+:10584000377B502803400008AF7A000000A01821E1
61048+:1058500000801021008028213C0460003C0760008B
61049+:105860002406000810600006348420788C42000072
61050+:10587000ACE220088C63000003E00008ACE3200CDD
61051+:105880000A000F8100000000240300403C02600079
61052+:1058900003E00008AC4320003C0760008F86000452
61053+:1058A0008CE520740086102100A2182B14600007DC
61054+:1058B000000028218F8AFDA024050001A1440013C7
61055+:1058C0008F89000401244021AF88000403E0000810
61056+:1058D00000A010218F84FDA08F8500049086001306
61057+:1058E00030C300FF00A31023AF82000403E00008D0
61058+:1058F000A08000138F84FDA027BDFFE8AFB000108B
61059+:10590000AFBF001490890011908700112402002875
61060+:10591000312800FF3906002830E300FF2485002CE1
61061+:105920002CD00001106200162484001C0E00006EB2
61062+:10593000000000008F8FFDA03C05600024020204DF
61063+:1059400095EE003E95ED003C000E5C0031ACFFFF93
61064+:10595000016C5025ACAA2010520000012402000462
61065+:10596000ACA22000000000000000000000000000C9
61066+:105970008FBF00148FB0001003E0000827BD00188F
61067+:105980000A0000A6000028218F85FDA027BDFFD8B2
61068+:10599000AFBF0020AFB3001CAFB20018AFB100140E
61069+:1059A000AFB000100080982190A4001124B0001C1A
61070+:1059B00024B1002C308300FF386200280E000090D4
61071+:1059C0002C5200010E00009800000000020020216F
61072+:1059D0001240000202202821000028210E00006E43
61073+:1059E000000000008F8DFDA03C0880003C05600099
61074+:1059F00095AC003E95AB003C02683025000C4C0095
61075+:105A0000316AFFFF012A3825ACA7201024020202C8
61076+:105A1000ACA6201452400001240200028FBF0020D7
61077+:105A20008FB3001C8FB200188FB100148FB000101C
61078+:105A300027BD002803E00008ACA2200027BDFFE03E
61079+:105A4000AFB20018AFB10014AFB00010AFBF001C70
61080+:105A50003C1160008E2320748F82000430D0FFFF41
61081+:105A600030F2FFFF1062000C2406008F0E00006E63
61082+:105A7000000000003C06801F0010440034C5FF00F9
61083+:105A80000112382524040002AE2720100000302126
61084+:105A9000AE252014AE2420008FBF001C8FB200184A
61085+:105AA0008FB100148FB0001000C0102103E0000877
61086+:105AB00027BD002027BDFFE0AFB0001030D0FFFFB2
61087+:105AC000AFBF0018AFB100140E00006E30F1FFFF41
61088+:105AD00000102400009180253C036000AC70201071
61089+:105AE0008FBF00188FB100148FB000102402000483
61090+:105AF000AC62200027BD002003E000080000102158
61091+:105B000027BDFFE03C046018AFBF0018AFB1001420
61092+:105B1000AFB000108C8850002403FF7F34028071E6
61093+:105B20000103382434E5380C241F00313C1980006F
61094+:105B3000AC8550003C11800AAC8253BCAF3F0008DA
61095+:105B40000E00054CAF9100400E00050A3C116000AC
61096+:105B50000E00007D000000008E3008083C0F570941
61097+:105B60002418FFF00218602435EEE00035EDF00057
61098+:105B7000018E5026018D58262D4600012D69000109
61099+:105B8000AF86004C0E000D09AF8900503C06601630
61100+:105B90008CC700003C0860148D0500A03C03FFFF8B
61101+:105BA00000E320243C02535300052FC2108200550D
61102+:105BB00034D07C00960201F2A780006C10400003F4
61103+:105BC000A780007C384B1E1EA78B006C960201F844
61104+:105BD000104000048F8D0050384C1E1EA78C007C96
61105+:105BE0008F8D005011A000058F83004C240E0020E3
61106+:105BF000A78E007CA78E006C8F83004C1060000580
61107+:105C00009785007C240F0020A78F007CA78F006C55
61108+:105C10009785007C2CB8008153000001240500808A
61109+:105C20009784006C2C91040152200001240404008C
61110+:105C30001060000B3C0260008FBF00188FB1001491
61111+:105C40008FB0001027BD0020A784006CA785007CC2
61112+:105C5000A380007EA780007403E00008A780009264
61113+:105C60008C4704382419103C30FFFFFF13F9000360
61114+:105C700030A8FFFF1100004624030050A380007EDF
61115+:105C80009386007E50C00024A785007CA780007CFE
61116+:105C90009798007CA780006CA7800074A780009272
61117+:105CA0003C010800AC3800800E00078700000000AF
61118+:105CB0003C0F60008DED0808240EFFF03C0B600ED9
61119+:105CC000260C0388356A00100000482100002821B6
61120+:105CD00001AE20243C105709AF8C0010AF8A004859
61121+:105CE000AF89001810900023AF8500148FBF0018F3
61122+:105CF0008FB100148FB0001027BD002003E0000812
61123+:105D0000AF80005400055080014648218D260004D4
61124+:105D10000A00014800D180219798007CA784006C7C
61125+:105D2000A7800074A78000923C010800AC38008076
61126+:105D30000E000787000000003C0F60008DED080892
61127+:105D4000240EFFF03C0B600E260C0388356A001011
61128+:105D5000000048210000282101AE20243C105709F2
61129+:105D6000AF8C0010AF8A0048AF8900181490FFDF95
61130+:105D7000AF85001424110001AF9100548FBF0018AB
61131+:105D80008FB100148FB0001003E0000827BD002081
61132+:105D90000A00017BA383007E3083FFFF8F880040D1
61133+:105DA0008F87003C000321403C0580003C020050EE
61134+:105DB000008248253C0660003C0A010034AC040027
61135+:105DC0008CCD08E001AA58241160000500000000F5
61136+:105DD0008CCF08E024E7000101EA7025ACCE08E092
61137+:105DE0008D19001001805821ACB900388D180014AD
61138+:105DF000ACB8003CACA9003000000000000000007E
61139+:105E00000000000000000000000000000000000092
61140+:105E100000000000000000003C0380008C640000D3
61141+:105E2000308200201040FFFD3C0F60008DED08E047
61142+:105E30003C0E010001AE18241460FFE100000000D8
61143+:105E4000AF87003C03E00008AF8B00588F8500400F
61144+:105E5000240BFFF03C06800094A7001A8CA90024B4
61145+:105E600030ECFFFF000C38C000EB5024012A402129
61146+:105E7000ACC8003C8CA400248CC3003C00831023DD
61147+:105E800018400033000000008CAD002025A2000166
61148+:105E90003C0F0050ACC2003835EE00103C068000CC
61149+:105EA000ACCE003000000000000000000000000048
61150+:105EB00000000000000000000000000000000000E2
61151+:105EC000000000003C0480008C9900003338002062
61152+:105ED0001300FFFD30E20008104000173C0980006D
61153+:105EE0008C880408ACA800108C83040CACA30014AC
61154+:105EF0003C1900203C188000AF19003094AE001807
61155+:105F000094AF001C01CF3021A4A6001894AD001A54
61156+:105F100025A70001A4A7001A94AB001A94AC001E98
61157+:105F2000118B00030000000003E0000800000000E7
61158+:105F300003E00008A4A0001A8D2A0400ACAA0010F7
61159+:105F40008D240404ACA400140A0002183C1900209B
61160+:105F50008CA200200A0002003C0F00500A0001EE53
61161+:105F60000000000027BDFFE8AFBF00100E000232A6
61162+:105F7000000000008F8900408FBF00103C038000AC
61163+:105F8000A520000A9528000A9527000427BD0018BF
61164+:105F90003105FFFF30E6000F0006150000A22025A6
61165+:105FA00003E00008AC6400803C0508008CA50020DC
61166+:105FB0008F83000C27BDFFE8AFB00010AFBF001407
61167+:105FC00010A300100000802124040001020430040A
61168+:105FD00000A6202400C3102450440006261000010F
61169+:105FE000001018802787FDA41480000A006718217C
61170+:105FF000261000012E0900025520FFF38F83000CAC
61171+:10600000AF85000C8FBF00148FB0001003E00008B4
61172+:1060100027BD00188C6800003C058000ACA8002457
61173+:106020000E000234261000013C0508008CA500205B
61174+:106030000A0002592E0900022405000100851804F7
61175+:106040003C0408008C84002027BDFFC8AFBF00348B
61176+:1060500000831024AFBE0030AFB7002CAFB60028CD
61177+:10606000AFB50024AFB40020AFB3001CAFB200182E
61178+:10607000AFB1001410400051AFB000108F84004049
61179+:10608000948700069488000A00E8302330D5FFFF8B
61180+:1060900012A0004B8FBF0034948B0018948C000A20
61181+:1060A000016C50233142FFFF02A2482B1520000251
61182+:1060B00002A02021004020212C8F000515E00002C5
61183+:1060C00000809821241300040E0001C102602021E9
61184+:1060D0008F87004002609021AF80004494F4000A52
61185+:1060E000026080211260004E3291FFFF3C1670006A
61186+:1060F0003C1440003C1E20003C1760008F99005863
61187+:106100008F380000031618241074004F0283F82BF8
61188+:1061100017E0003600000000107E00478F86004424
61189+:1061200014C0003A2403000102031023022320219B
61190+:106130003050FFFF1600FFF13091FFFF8F870040C6
61191+:106140003C1100203C108000AE11003094EB000A9E
61192+:106150003C178000024B5021A4EA000A94E9000A8F
61193+:1061600094E800043123FFFF3106000F00062D00E4
61194+:106170000065F025AEFE008094F3000A94F6001846
61195+:1061800012D30036001221408CFF00148CF4001052
61196+:1061900003E468210000C02101A4782B029870213B
61197+:1061A00001CF6021ACED0014ACEC001002B238233A
61198+:1061B00030F5FFFF16A0FFB88F8400408FBF00347A
61199+:1061C0008FBE00308FB7002C8FB600288FB500240B
61200+:1061D0008FB400208FB3001C8FB200188FB1001451
61201+:1061E0008FB0001003E0000827BD00381477FFCC03
61202+:1061F0008F8600440E000EE202002021004018218C
61203+:106200008F86004410C0FFC9020310230270702360
61204+:106210008F87004001C368210A0002E431B2FFFF0A
61205+:106220008F86004414C0FFC93C1100203C10800040
61206+:106230000A0002AEAE1100300E00046602002021FA
61207+:106240000A0002DB00401821020020210E0009395B
61208+:10625000022028210A0002DB004018210E0001EE76
61209+:10626000000000000A0002C702B2382327BDFFC8A1
61210+:10627000AFB7002CAFB60028AFB50024AFB40020F4
61211+:10628000AFB3001CAFB20018AFB10014AFB0001034
61212+:10629000AFBF00300E00011B241300013C047FFF40
61213+:1062A0003C0380083C0220003C010800AC20007048
61214+:1062B0003496FFFF34770080345200033C1512C03F
61215+:1062C000241400013C1080002411FF800E000245C0
61216+:1062D000000000008F8700488F8B00188F89001402
61217+:1062E0008CEA00EC8CE800E8014B302B01092823F4
61218+:1062F00000A6102314400006014B18231440000E82
61219+:106300003C05800002A3602B1180000B0000000000
61220+:106310003C0560008CEE00EC8CED00E88CA4180CC1
61221+:10632000AF8E001804800053AF8D00148F8F0010C3
61222+:10633000ADF400003C0580008CBF00003BF900017B
61223+:10634000333800011700FFE13C0380008C6201003C
61224+:1063500024060C0010460009000000008C680100B3
61225+:106360002D043080548000103C0480008C690100B2
61226+:106370002D2331811060000C3C0480008CAA0100A8
61227+:1063800011460004000020218CA6010024C5FF81D5
61228+:1063900030A400FF8E0B01000E000269AE0B00243A
61229+:1063A0000A00034F3C0480008C8D01002DAC3300AB
61230+:1063B00011800022000000003C0708008CE70098D4
61231+:1063C00024EE00013C010800AC2E00983C04800043
61232+:1063D0008C8201001440000300000000566000148D
61233+:1063E0003C0440008C9F01008C9801000000982123
61234+:1063F00003F1C82400193940330F007F00EF7025E6
61235+:1064000001D26825AC8D08308C8C01008C85010090
61236+:10641000258B0100017130240006514030A3007F1C
61237+:106420000143482501324025AC8808303C04400037
61238+:10643000AE0401380A00030E000000008C99010030
61239+:10644000240F0020AC99002092F80000330300FFD5
61240+:10645000106F000C241F0050547FFFDD3C048000AF
61241+:106460008C8401000E00154E000000000A00034F4E
61242+:106470003C04800000963824ACA7180C0A000327BF
61243+:106480008F8F00108C8501000E0008F72404008017
61244+:106490000A00034F3C04800000A4102B24030001D9
61245+:1064A00010400009000030210005284000A4102BF6
61246+:1064B00004A00003000318405440FFFC00052840DE
61247+:1064C0005060000A0004182B0085382B54E00004AB
61248+:1064D0000003184200C33025008520230003184222
61249+:1064E0001460FFF9000528420004182B03E000089F
61250+:1064F00000C310213084FFFF30C600FF3C0780003E
61251+:106500008CE201B80440FFFE00064C000124302557
61252+:106510003C08200000C820253C031000ACE00180AE
61253+:10652000ACE50184ACE4018803E00008ACE301B809
61254+:106530003C0660008CC5201C2402FFF03083020062
61255+:10654000308601001060000E00A2282434A500014E
61256+:106550003087300010E0000530830C0034A50004C3
61257+:106560003C04600003E00008AC85201C1060FFFDC7
61258+:106570003C04600034A5000803E00008AC85201C42
61259+:1065800054C0FFF334A500020A0003B03087300086
61260+:1065900027BDFFE8AFB00010AFBF00143C0760009C
61261+:1065A000240600021080001100A080218F83005873
61262+:1065B0000E0003A78C6400188F8200580000202171
61263+:1065C000240600018C45000C0E000398000000001A
61264+:1065D0001600000224020003000010218FBF0014E7
61265+:1065E0008FB0001003E0000827BD00188CE8201CC5
61266+:1065F0002409FFF001092824ACE5201C8F870058EE
61267+:106600000A0003CD8CE5000C3C02600E00804021A6
61268+:1066100034460100240900180000000000000000BA
61269+:10662000000000003C0A00503C0380003547020097
61270+:10663000AC68003834640400AC65003CAC670030E2
61271+:106640008C6C0000318B00201160FFFD2407FFFFE0
61272+:106650002403007F8C8D00002463FFFF248400044A
61273+:10666000ACCD00001467FFFB24C60004000000004E
61274+:10667000000000000000000024A402000085282B78
61275+:106680003C0300203C0E80002529FFFF010540212E
61276+:10669000ADC300301520FFE00080282103E0000892
61277+:1066A000000000008F82005827BDFFD8AFB3001C48
61278+:1066B000AFBF0020AFB20018AFB10014AFB00010F0
61279+:1066C00094460002008098218C5200182CC300814F
61280+:1066D0008C4800048C4700088C51000C8C49001039
61281+:1066E000106000078C4A00142CC4000414800013AE
61282+:1066F00030EB000730C5000310A0001000000000C0
61283+:106700002410008B02002021022028210E00039873
61284+:10671000240600031660000224020003000010217A
61285+:106720008FBF00208FB3001C8FB200188FB10014F0
61286+:106730008FB0001003E0000827BD00281560FFF1AE
61287+:106740002410008B3C0C80003C030020241F00011F
61288+:10675000AD830030AF9F0044000000000000000047
61289+:10676000000000002419FFF024D8000F031978243A
61290+:106770003C1000D0AD88003801F0702524CD000316
61291+:106780003C08600EAD87003C35850400AD8E0030BE
61292+:10679000000D38823504003C3C0380008C6B000007
61293+:1067A000316200201040FFFD0000000010E00008F2
61294+:1067B00024E3FFFF2407FFFF8CA800002463FFFFF2
61295+:1067C00024A50004AC8800001467FFFB24840004A7
61296+:1067D0003C05600EACA60038000000000000000080
61297+:1067E000000000008F8600543C0400203C0780001D
61298+:1067F000ACE4003054C000060120202102402021DA
61299+:106800000E0003A7000080210A00041D02002021C1
61300+:106810000E0003DD01402821024020210E0003A7C5
61301+:10682000000080210A00041D0200202127BDFFE096
61302+:10683000AFB200183092FFFFAFB10014AFBF001C21
61303+:10684000AFB000101640000D000088210A0004932C
61304+:106850000220102124050003508500278CE5000C40
61305+:106860000000000D262800013111FFFF24E2002066
61306+:106870000232802B12000019AF8200588F82004430
61307+:10688000144000168F8700583C0670003C0320001F
61308+:106890008CE5000000A62024148300108F84006083
61309+:1068A000000544023C09800000A980241480FFE90F
61310+:1068B000310600FF2CCA000B5140FFEB26280001D7
61311+:1068C000000668803C0E080025CE575801AE6021B6
61312+:1068D0008D8B0000016000080000000002201021E4
61313+:1068E0008FBF001C8FB200188FB100148FB0001042
61314+:1068F00003E0000827BD00200E0003982404008454
61315+:106900001600FFD88F8700580A000474AF8000601B
61316+:10691000020028210E0003BF240400018F870058C5
61317+:106920000A000474AF820060020028210E0003BF39
61318+:10693000000020210A0004A38F8700580E000404E1
61319+:10694000020020218F8700580A000474AF82006083
61320+:1069500030AFFFFF000F19C03C0480008C9001B8DD
61321+:106960000600FFFE3C1920043C181000AC83018097
61322+:10697000AC800184AC990188AC9801B80A00047518
61323+:106980002628000190E2000390E30002000020218D
61324+:106990000002FE0000033A0000FF2825240600083C
61325+:1069A0000E000398000000001600FFDC2402000324
61326+:1069B0008F870058000010210A000474AF82006025
61327+:1069C00090E8000200002021240600090A0004C308
61328+:1069D00000082E0090E4000C240900FF308500FF21
61329+:1069E00010A900150000302190F9000290F8000372
61330+:1069F000308F00FF94EB000400196E000018740043
61331+:106A0000000F62000186202501AE5025014B28258C
61332+:106A10003084FF8B0A0004C32406000A90E30002BE
61333+:106A200090FF0004000020210003360000DF28252D
61334+:106A30000A0004C32406000B0A0004D52406008BB8
61335+:106A4000000449C23127003F000443423C02800059
61336+:106A500000082040240316802CE60020AC43002CC4
61337+:106A600024EAFFE02482000114C0000330A900FFE3
61338+:106A700000801021314700FF000260803C0D800043
61339+:106A8000240A0001018D20213C0B000E00EA28049D
61340+:106A9000008B302111200005000538278CCE000026
61341+:106AA00001C5382503E00008ACC700008CD8000001
61342+:106AB0000307782403E00008ACCF000027BDFFE007
61343+:106AC000AFB10014AFB00010AFBF00183C076000BA
61344+:106AD0008CE408083402F0003C1160003083F000C0
61345+:106AE000240501C03C04800E000030211062000625
61346+:106AF000241000018CEA08083149F0003928E00030
61347+:106B00000008382B000780403C0D0200AE2D081411
61348+:106B1000240C16803C0B80008E2744000E000F8B47
61349+:106B2000AD6C002C120000043C02169124050001FB
61350+:106B3000120500103C023D2C345800E0AE384408E9
61351+:106B40003C1108008E31007C8FBF00183C066000AD
61352+:106B500000118540360F16808FB100148FB00010E1
61353+:106B60003C0E020027BD0020ACCF442003E000080B
61354+:106B7000ACCE08103C0218DA345800E0AE384408B5
61355+:106B80003C1108008E31007C8FBF00183C0660006D
61356+:106B900000118540360F16808FB100148FB00010A1
61357+:106BA0003C0E020027BD0020ACCF442003E00008CB
61358+:106BB000ACCE08100A0004EB240500010A0004EB27
61359+:106BC0000000282124020400A7820024A780001CC2
61360+:106BD000000020213C06080024C65A582405FFFF67
61361+:106BE00024890001000440803124FFFF01061821A0
61362+:106BF0002C87002014E0FFFAAC6500002404040098
61363+:106C0000A7840026A780001E000020213C06080063
61364+:106C100024C65AD82405FFFF248D0001000460809B
61365+:106C200031A4FFFF018658212C8A00201540FFFA6D
61366+:106C3000AD650000A7800028A7800020A780002263
61367+:106C4000000020213C06080024C65B582405FFFFF5
61368+:106C5000249900010004C0803324FFFF030678213B
61369+:106C60002C8E000415C0FFFAADE500003C05600065
61370+:106C70008CA73D002403E08F00E31024344601403C
61371+:106C800003E00008ACA63D002487007F000731C266
61372+:106C900024C5FFFF000518C2246400013082FFFFF5
61373+:106CA000000238C0A78400303C010800AC27003047
61374+:106CB000AF80002C0000282100002021000030219E
61375+:106CC0002489000100A728213124FFFF2CA81701E7
61376+:106CD000110000032C8300801460FFF924C600011A
61377+:106CE00000C02821AF86002C10C0001DA786002AF6
61378+:106CF00024CAFFFF000A11423C08080025085B581F
61379+:106D00001040000A00002021004030212407FFFF2E
61380+:106D1000248E00010004688031C4FFFF01A86021B7
61381+:106D20000086582B1560FFFAAD87000030A2001FC7
61382+:106D30005040000800043080240300010043C804D0
61383+:106D400000041080004878212738FFFF03E0000886
61384+:106D5000ADF8000000C820212405FFFFAC8500002D
61385+:106D600003E000080000000030A5FFFF30C6FFFF71
61386+:106D700030A8001F0080602130E700FF0005294295
61387+:106D80000000502110C0001D24090001240B000147
61388+:106D900025180001010B2004330800FF0126782686
61389+:106DA000390E00202DED00012DC2000101A2182591
61390+:106DB0001060000D014450250005C880032C4021BF
61391+:106DC0000100182110E0000F000A20278D040000A8
61392+:106DD000008A1825AD03000024AD00010000402109
61393+:106DE0000000502131A5FFFF252E000131C9FFFF12
61394+:106DF00000C9102B1040FFE72518000103E0000830
61395+:106E0000000000008D0A0000014440240A0005D162
61396+:106E1000AC68000027BDFFE830A5FFFF30C6FFFFCC
61397+:106E2000AFB00010AFBF001430E7FFFF00005021EB
61398+:106E30003410FFFF0000602124AF001F00C0482174
61399+:106E4000241800012419002005E0001601E010219B
61400+:106E50000002F943019F682A0009702B01AE40240B
61401+:106E600011000017000C18800064102110E00005CC
61402+:106E70008C4B000000F840040008382301675824B8
61403+:106E800000003821154000410000402155600016E7
61404+:106E90003169FFFF258B0001316CFFFF05E1FFEC3D
61405+:106EA00001E0102124A2003E0002F943019F682A5C
61406+:106EB0000009702B01AE40241500FFEB000C188078
61407+:106EC000154600053402FFFF020028210E0005B51B
61408+:106ED00000003821020010218FBF00148FB0001075
61409+:106EE00003E0000827BD00181520000301601821E9
61410+:106EF000000B1C0224080010306A00FF154000053A
61411+:106F0000306E000F250D000800031A0231A800FFA3
61412+:106F1000306E000F15C00005307F000325100004FF
61413+:106F200000031902320800FF307F000317E000055C
61414+:106F3000386900012502000200031882304800FF72
61415+:106F4000386900013123000110600004310300FFA3
61416+:106F5000250A0001314800FF310300FF000C6940A1
61417+:106F600001A34021240A000110CAFFD53110FFFF00
61418+:106F7000246E000131C800FF1119FFC638C9000195
61419+:106F80002D1F002053E0001C258B0001240D000163
61420+:106F90000A000648240E002051460017258B0001E8
61421+:106FA00025090001312800FF2D0900205120001281
61422+:106FB000258B000125430001010D5004014B1024D5
61423+:106FC000250900011440FFF4306AFFFF3127FFFF5D
61424+:106FD00010EE000C2582FFFF304CFFFF0000502117
61425+:106FE0003410FFFF312800FF2D0900205520FFF24B
61426+:106FF00025430001258B0001014648260A000602B0
61427+:10700000316CFFFF00003821000050210A000654B7
61428+:107010003410FFFF27BDFFD8AFB0001030F0FFFFE6
61429+:10702000AFB10014001039423211FFE000071080A8
61430+:10703000AFB3001C00B1282330D3FFFFAFB200185C
61431+:1070400030A5FFFF00809021026030210044202104
61432+:10705000AFBF00200E0005E03207001F022288218A
61433+:107060003403FFFF0240202102002821026030216A
61434+:1070700000003821104300093231FFFF02201021A7
61435+:107080008FBF00208FB3001C8FB200188FB1001487
61436+:107090008FB0001003E0000827BD00280E0005E0B7
61437+:1070A0000000000000408821022010218FBF002036
61438+:1070B0008FB3001C8FB200188FB100148FB0001076
61439+:1070C00003E0000827BD0028000424003C03600002
61440+:1070D000AC603D0810A00002348210063482101605
61441+:1070E00003E00008AC623D0427BDFFE0AFB0001034
61442+:1070F000309000FF2E020006AFBF001810400008BD
61443+:10710000AFB10014001030803C03080024635784A2
61444+:1071100000C328218CA400000080000800000000AB
61445+:10712000000020218FBF00188FB100148FB0001015
61446+:107130000080102103E0000827BD00209791002A5D
61447+:1071400016200051000020213C020800904200332C
61448+:107150000A0006BB00000000978D002615A0003134
61449+:10716000000020210A0006BB2402000897870024A3
61450+:1071700014E0001A00001821006020212402000100
61451+:107180001080FFE98FBF0018000429C2004530219C
61452+:1071900000A6582B1160FFE43C0880003C0720004B
61453+:1071A000000569C001A76025AD0C00203C038008E4
61454+:1071B0002402001F2442FFFFAC6000000441FFFDD9
61455+:1071C0002463000424A5000100A6702B15C0FFF560
61456+:1071D000000569C00A0006A58FBF00189787001C2C
61457+:1071E0003C04080024845A58240504000E0006605C
61458+:1071F00024060001978B002424440001308AFFFFFD
61459+:107200002569FFFF2D48040000402821150000409B
61460+:10721000A789002424AC3800000C19C00A0006B964
61461+:10722000A780001C9787001E3C04080024845AD8BD
61462+:10723000240504000E00066024060001979900262C
61463+:10724000244400013098FFFF272FFFFF2F0E04007A
61464+:107250000040882115C0002CA78F0026A780001EA3
61465+:107260003A020003262401003084FFFF0E00068D41
61466+:107270002C4500010011F8C027F00100001021C0CA
61467+:107280000A0006BB240200089785002E978700227B
61468+:107290003C04080024845B580E00066024060001AC
61469+:1072A0009787002A8F89002C2445000130A8FFFF12
61470+:1072B00024E3FFFF0109302B0040802114C0001897
61471+:1072C000A783002AA7800022978500300E000F7543
61472+:1072D00002002021244A05003144FFFF0E00068DE4
61473+:1072E000240500013C05080094A500320E000F752E
61474+:1072F00002002021244521003C0208009042003376
61475+:107300000A0006BB000521C00A0006F3A784001E80
61476+:1073100024AC3800000C19C00A0006B9A784001C70
61477+:107320000A00070DA7850022308400FF27BDFFE873
61478+:107330002C820006AFBF0014AFB000101040001543
61479+:1073400000A03821000440803C0308002463579CBF
61480+:10735000010328218CA40000008000080000000028
61481+:1073600024CC007F000751C2000C59C23170FFFFCE
61482+:107370002547C40030E5FFFF2784001C02003021B0
61483+:107380000E0005B52407000197860028020620217B
61484+:10739000A78400288FBF00148FB0001003E00008FE
61485+:1073A00027BD00183C0508008CA50030000779C2F5
61486+:1073B0000E00038125E4DF003045FFFF3C04080098
61487+:1073C00024845B58240600010E0005B52407000143
61488+:1073D000978E002A8FBF00148FB0001025CD0001BA
61489+:1073E00027BD001803E00008A78D002A0007C9C2C6
61490+:1073F0002738FF00001878C231F0FFFF3C04080076
61491+:1074000024845AD802002821240600010E0005B564
61492+:1074100024070001978D0026260E0100000E84002F
61493+:1074200025AC00013C0B6000A78C0026AD603D0838
61494+:1074300036040006000030213C0760008CE23D0469
61495+:10744000305F000617E0FFFD24C9000100061B00A5
61496+:10745000312600FF006440252CC50004ACE83D0443
61497+:1074600014A0FFF68FBF00148FB0001003E00008D7
61498+:1074700027BD0018000751C22549C8002406000195
61499+:10748000240700013C04080024845A580E0005B566
61500+:107490003125FFFF978700248FBF00148FB00010A5
61501+:1074A00024E6000127BD001803E00008A786002499
61502+:1074B0003C0660183C090800252900FCACC9502C8A
61503+:1074C0008CC850003C0580003C020002350700805B
61504+:1074D000ACC750003C04080024841FE03C030800B3
61505+:1074E00024631F98ACA50008ACA2000C3C01080066
61506+:1074F000AC2459A43C010800AC2359A803E00008BF
61507+:107500002402000100A030213C1C0800279C59AC3B
61508+:107510003C0C04003C0B0002008B3826008C4026FB
61509+:107520002CE200010007502B2D050001000A4880C5
61510+:107530003C030800246359A4004520250123182199
61511+:107540001080000300001021AC660000240200013E
61512+:1075500003E00008000000003C1C0800279C59AC18
61513+:107560003C0B04003C0A0002008A3026008B3826BF
61514+:107570002CC200010006482B2CE5000100094080C8
61515+:107580003C030800246359A4004520250103182169
61516+:1075900010800005000010213C0C0800258C1F986D
61517+:1075A000AC6C00002402000103E0000800000000B1
61518+:1075B0003C0900023C080400008830260089382677
61519+:1075C0002CC30001008028212CE400010083102539
61520+:1075D0001040000B000030213C1C0800279C59ACD7
61521+:1075E0003C0A80008D4E00082406000101CA68256F
61522+:1075F000AD4D00088D4C000C01855825AD4B000C9D
61523+:1076000003E0000800C010213C1C0800279C59AC76
61524+:107610003C0580008CA6000C0004202724020001F9
61525+:1076200000C4182403E00008ACA3000C3C020002D4
61526+:107630001082000B3C0560003C070400108700032B
61527+:107640000000000003E00008000000008CA908D042
61528+:10765000240AFFFD012A402403E00008ACA808D05A
61529+:107660008CA408D02406FFFE0086182403E000083E
61530+:10767000ACA308D03C05601A34A600108CC300806F
61531+:1076800027BDFFF88CC50084AFA3000093A40000C1
61532+:107690002402001010820003AFA5000403E00008DC
61533+:1076A00027BD000893A7000114E0001497AC000266
61534+:1076B00097B800023C0F8000330EFFFC01CF682119
61535+:1076C000ADA50000A3A000003C0660008CC708D058
61536+:1076D0002408FFFE3C04601A00E82824ACC508D04A
61537+:1076E0008FA300048FA200003499001027BD00086A
61538+:1076F000AF22008003E00008AF2300843C0B800031
61539+:10770000318AFFFC014B48218D2800000A00080C3B
61540+:10771000AFA8000427BDFFE8AFBF00103C1C080065
61541+:10772000279C59AC3C0580008CA4000C8CA2000462
61542+:107730003C0300020044282410A0000A00A31824DF
61543+:107740003C0604003C0400021460000900A610245A
61544+:107750001440000F3C0404000000000D3C1C080015
61545+:10776000279C59AC8FBF001003E0000827BD00180C
61546+:107770003C0208008C4259A40040F80900000000B7
61547+:107780003C1C0800279C59AC0A0008358FBF00102C
61548+:107790003C0208008C4259A80040F8090000000093
61549+:1077A0000A00083B000000003C0880008D0201B880
61550+:1077B0000440FFFE35090180AD2400003C031000A9
61551+:1077C00024040040AD250004A1240008A1260009DE
61552+:1077D000A527000A03E00008AD0301B83084FFFFCD
61553+:1077E0000080382130A5FFFF000020210A00084555
61554+:1077F000240600803087FFFF8CA400002406003898
61555+:107800000A000845000028218F8300788F860070C9
61556+:107810001066000B008040213C07080024E75B68ED
61557+:10782000000328C000A710218C440000246300013D
61558+:10783000108800053063000F5466FFFA000328C06B
61559+:1078400003E00008000010213C07080024E75B6CFF
61560+:1078500000A7302103E000088CC200003C03900028
61561+:1078600034620001008220253C038000AC640020CB
61562+:107870008C65002004A0FFFE0000000003E000086B
61563+:10788000000000003C0280003443000100832025FA
61564+:1078900003E00008AC44002027BDFFE0AFB10014B6
61565+:1078A0003091FFFFAFB00010AFBF001812200013DF
61566+:1078B00000A080218CA20000240400022406020003
61567+:1078C0001040000F004028210E0007250000000096
61568+:1078D00000001021AE000000022038218FBF0018E8
61569+:1078E0008FB100148FB0001000402021000028212B
61570+:1078F000000030210A00084527BD00208CA20000AE
61571+:10790000022038218FBF00188FB100148FB00010F3
61572+:107910000040202100002821000030210A000845F5
61573+:1079200027BD002000A010213087FFFF8CA5000498
61574+:107930008C4400000A000845240600068F83FD9C45
61575+:1079400027BDFFE8AFBF0014AFB00010906700087C
61576+:10795000008010210080282130E600400000202116
61577+:1079600010C000088C5000000E0000BD0200202155
61578+:10797000020020218FBF00148FB000100A000548BC
61579+:1079800027BD00180E0008A4000000000E0000BD76
61580+:1079900002002021020020218FBF00148FB00010B0
61581+:1079A0000A00054827BD001827BDFFE0AFB0001052
61582+:1079B0008F90FD9CAFBF001CAFB20018AFB1001498
61583+:1079C00092060001008088210E00087230D2000467
61584+:1079D00092040005001129C2A6050000348300406E
61585+:1079E000A20300050E00087C022020210E00054A9B
61586+:1079F0000220202124020001AE02000C02202821D6
61587+:107A0000A602001024040002A602001224060200AE
61588+:107A1000A60200140E000725A60200161640000F4D
61589+:107A20008FBF001C978C00743C0B08008D6B007896
61590+:107A30002588FFFF3109FFFF256A0001012A382B45
61591+:107A400010E00006A78800743C0F6006240E0016A4
61592+:107A500035ED0010ADAE00508FBF001C8FB2001886
61593+:107A60008FB100148FB0001003E0000827BD002084
61594+:107A700027BDFFE0AFB10014AFBF0018AFB00010DA
61595+:107A80001080000400A088212402008010820007DA
61596+:107A9000000000000000000D8FBF00188FB100141F
61597+:107AA0008FB0001003E0000827BD00200E00087210
61598+:107AB00000A020218F86FD9C0220202190C500057A
61599+:107AC0000E00087C30B000FF2403003E1603FFF1D7
61600+:107AD0003C0680008CC401780480FFFE34C801405D
61601+:107AE000240900073C071000AD11000002202021EE
61602+:107AF000A10900048FBF00188FB100148FB00010CF
61603+:107B0000ACC701780A0008C527BD002027BDFFE0EB
61604+:107B1000AFB00010AFBF0018AFB100143C10800030
61605+:107B20008E110020000000000E00054AAE04002067
61606+:107B3000AE1100208FBF00188FB100148FB000105D
61607+:107B400003E0000827BD00203084FFFF00803821BB
61608+:107B50002406003500A020210A0008450000282145
61609+:107B60003084FFFF008038212406003600A0202149
61610+:107B70000A0008450000282127BDFFD0AFB500242A
61611+:107B80003095FFFFAFB60028AFB40020AFBF002C88
61612+:107B9000AFB3001CAFB20018AFB10014AFB000100B
61613+:107BA00030B6FFFF12A000270000A0218F920058DE
61614+:107BB0008E4300003C0680002402004000033E0289
61615+:107BC00000032C0230E4007F006698241482001D1C
61616+:107BD00030A500FF8F8300682C68000A1100001098
61617+:107BE0008F8D0044000358803C0C0800258C57B84A
61618+:107BF000016C50218D4900000120000800000000A8
61619+:107C000002D4302130C5FFFF0E0008522404008446
61620+:107C1000166000028F920058AF8000688F8D00447C
61621+:107C20002659002026980001032090213314FFFFDD
61622+:107C300015A00004AF9900580295202B1480FFDC9A
61623+:107C400000000000028010218FBF002C8FB600289A
61624+:107C50008FB500248FB400208FB3001C8FB20018A2
61625+:107C60008FB100148FB0001003E0000827BD003072
61626+:107C70002407003414A70149000000009247000EB9
61627+:107C80008F9FFDA08F90FD9C24181600A3E700197C
61628+:107C90009242000D3C0880003C07800CA3E20018D3
61629+:107CA000964A00123C0D60003C117FFFA60A005C62
61630+:107CB000964400103623FFFF240200053099FFFF91
61631+:107CC000AE1900548E46001CAD1800288CEF000041
61632+:107CD0008DAE444801E6482601C93021AE06003881
61633+:107CE0008E05003824CB00013C0E7F00AE05003C21
61634+:107CF0008E0C003CAFEC0004AE0B00208E13002075
61635+:107D0000AE13001CA3E0001BAE03002CA3E2001284
61636+:107D10008E4A001424130050AE0A00348E0400343E
61637+:107D2000AFE400148E590018AE1900489258000CA8
61638+:107D3000A218004E920D000835AF0020A20F0008D7
61639+:107D40008E090018012E282434AC4000AE0C001817
61640+:107D5000920B0000317200FF1253027F2403FF8058
61641+:107D60003C04080024845BE80E0008AA0000000020
61642+:107D70003C1108008E315BE80E00087202202021C1
61643+:107D80002405000424080001A2050025022020216A
61644+:107D90000E00087CA20800053C0580008CB001782C
61645+:107DA0000600FFFE8F92005834AE0140240F0002FF
61646+:107DB0003C091000ADD10000A1CF0004ACA90178AE
61647+:107DC0000A000962AF8000682CAD003751A0FF9413
61648+:107DD0008F8D0044000580803C110800263157E05B
61649+:107DE000021178218DEE000001C0000800000000A3
61650+:107DF0002411000414B1008C3C0780003C080800EA
61651+:107E00008D085BE88F86FD9CACE800208E4500085D
61652+:107E10008F99FDA0240D0050ACC500308E4C000899
61653+:107E2000ACCC00508E4B000CACCB00348E43001019
61654+:107E3000ACC300388E4A0010ACCA00548E42001405
61655+:107E4000ACC2003C8E5F0018AF3F00048E50001C97
61656+:107E5000ACD0002090C40000309800FF130D024AFF
61657+:107E6000000000008CC400348CD00030009030231F
61658+:107E700004C000F12404008C126000EE2402000310
61659+:107E80000A000962AF8200682419000514B900666F
61660+:107E90003C0580003C0808008D085BE88F86FD9C4F
61661+:107EA000ACA800208E4C00048F8AFDA0240720007F
61662+:107EB000ACCC001C924B000824120008A14B001906
61663+:107EC0008F82005890430009A14300188F85005805
61664+:107ED00090BF000A33E400FF1092001028890009C7
61665+:107EE000152000BA240E0002240D0020108D000B76
61666+:107EF000340780002898002117000008240740005C
61667+:107F000024100040109000053C0700012419008057
61668+:107F1000109900023C070002240740008CC20018A0
61669+:107F20003C03FF00004350240147F825ACDF001854
61670+:107F300090B2000BA0D200278F8300589464000CED
61671+:107F4000108001FE000000009467000C3C1F8000C0
61672+:107F50002405FFBFA4C7005C9063000E2407000443
61673+:107F6000A0C300088F820058904A000FA0CA0009E1
61674+:107F70008F8900588D3200108FE400740244C823AA
61675+:107F8000ACD900588D300014ACD0002C95380018B6
61676+:107F9000330DFFFFACCD00409531001A322FFFFFAB
61677+:107FA000ACCF00448D2E001CACCE00489128000EB2
61678+:107FB000A0C8000890CC000801855824126001B6C2
61679+:107FC000A0CB00088F9200580A000962AF870068B2
61680+:107FD0002406000614A600143C0E80003C0F080086
61681+:107FE0008DEF5BE88F85FD98ADCF00208E4900189E
61682+:107FF0008F86FD9C8F8BFDA0ACA900008CC800383B
61683+:1080000024040005ACA800048CCC003C1260008164
61684+:10801000AD6C00000A000962AF84006824110007FB
61685+:1080200010B1004B240400063C05080024A55BE8C1
61686+:108030000E000881240400818F9200580013102B39
61687+:108040000A000962AF820068241F002314BFFFF6F4
61688+:108050003C0C80003C0508008CA55BE88F8BFDA0E4
61689+:10806000AD8500208F91FD9C8E4600042564002084
61690+:1080700026450014AE260028240600030E000F81BA
61691+:10808000257000308F87005802002021240600034D
61692+:108090000E000F8124E500083C04080024845BE8FE
61693+:1080A0000E0008AA0000000092230000240A0050DD
61694+:1080B000306200FF544AFFE18F9200580E000F6CAF
61695+:1080C000000000000A000A6A8F920058240800335A
61696+:1080D00014A800323C0380003C1108008E315BE89C
61697+:1080E0008F8FFDA0AC7100208E420008240D002867
61698+:1080F0008F89FD9CADE200308E4A000C24060009F9
61699+:10810000ADEA00348E5F0010ADFF00388E440014DD
61700+:10811000ADE400208E590018ADF900248E58001CE3
61701+:10812000ADF80028A1ED00118E4E00041260003160
61702+:10813000AD2E00288F9200580A000962AF860068B1
61703+:10814000240D002214ADFFB8000000002404000735
61704+:108150003C1008008E105BE83C188000AF10002037
61705+:108160005660FEAEAF8400683C04080024845BE8DF
61706+:108170000E0008AA241300508F84FD9C90920000EA
61707+:10818000325900FF1333014B000000008F9200585A
61708+:10819000000020210A000962AF8400683C05080045
61709+:1081A00024A55BE80E000858240400810A000A6A2E
61710+:1081B0008F92005802D498213265FFFF0E000852BA
61711+:1081C000240400840A0009628F920058108EFF5325
61712+:1081D000240704002887000310E00179241100041B
61713+:1081E000240F0001548FFF4D240740000A000A228B
61714+:1081F000240701003C05080024A55BE80E0008A444
61715+:10820000240400828F920058000030210A00096285
61716+:10821000AF8600683C04080024845BE88CC2003808
61717+:108220000E0008AA8CC3003C8F9200580A000AC0B6
61718+:1082300000002021240400823C05080024A55BE8FE
61719+:108240000E0008A4000000008F92005800001021CA
61720+:108250000A000962AF8200688E5000048F91FD9C75
61721+:108260003C078000ACF00020922C00050200282181
61722+:10827000318B0002156001562404008A8F92FDA004
61723+:108280002404008D9245001B30A6002014C001502C
61724+:1082900002002821922E00092408001231C900FF93
61725+:1082A0001128014B240400810E00087202002021D5
61726+:1082B0009258001B240F000402002021370D0042B9
61727+:1082C000A24D001B0E00087CA22F00253C0580005B
61728+:1082D0008CA401780480FFFE34B90140241F000201
61729+:1082E000AF300000A33F00048F9200583C101000F4
61730+:1082F000ACB001780A000A6B0013102B8E500004FA
61731+:108300008F91FD9C3C038000AC700020922A0005F8
61732+:108310000200282131420002144000172404008A80
61733+:10832000922C00092412000402002821318B00FF46
61734+:1083300011720011240400810E0008720200202135
61735+:108340008F89FDA0240800122405FFFE912F001B39
61736+:108350000200202135EE0020A12E001BA2280009DA
61737+:108360009226000500C538240E00087CA2270005CF
61738+:1083700002002821000020210E0009330000000027
61739+:108380000A000A6A8F9200588E4C00043C07800055
61740+:108390003C10080026105BE8ACEC00203C01080013
61741+:1083A000AC2C5BE8924B0003317100041220013BBE
61742+:1083B0008F84FD9C24020006A0820009924F001BBE
61743+:1083C000240EFFC031E9003F012E4025A08800089F
61744+:1083D0009245000330A6000114C0013200000000E5
61745+:1083E0008E420008AE0200083C0208008C425BF09E
61746+:1083F000104001318F90FDA0000219C28F8DFD9CAD
61747+:10840000A603000C8E4A000C24180001240400145A
61748+:10841000AE0A002C8E420010AE02001C965F0016C1
61749+:10842000A61F003C96590014A619003EADB8000CDA
61750+:10843000A5B80010A5B80012A5B80014A5B800167C
61751+:1084400012600144A2040011925100033232000272
61752+:108450002E5300018F920058266200080A0009621C
61753+:10846000AF8200688E4400043C1980003C068008FE
61754+:10847000AF2400208E45000890D80000240D005045
61755+:10848000331100FF122D009C2407008824060009E8
61756+:108490000E000845000000000A000A6A8F9200588A
61757+:1084A0008E5000043C0980003C118008AD30002053
61758+:1084B0009228000024050050310400FF10850110AF
61759+:1084C0002407008802002021000028210E00084512
61760+:1084D0002406000E922D00002418FF80020028219F
61761+:1084E00001B8802524040004240600300E0007256E
61762+:1084F000A23000000A000A6A8F9200588E500004D1
61763+:108500008F91FDA03C028000AC500020923F001BE8
61764+:1085100033F900101320006C240700810200202191
61765+:10852000000028212406001F0E000845000000005E
61766+:108530000A000A6A8F9200588E44001C0E00085DE3
61767+:1085400000000000104000E3004048218F880058E0
61768+:1085500024070089012020218D05001C240600012C
61769+:108560000E000845000000000A000A6A8F920058B9
61770+:10857000964900023C10080026105BE831280004F0
61771+:10858000110000973C0460008E4E001C3C0F8000E0
61772+:10859000ADEE00203C010800AC2E5BE896470002DF
61773+:1085A00030E40001148000E6000000008E42000468
61774+:1085B000AE0200083C1008008E105BF0120000ECC8
61775+:1085C0003C0F80008F92FD9C241000018E4E0018FD
61776+:1085D0008F8DFDA08F9FFD9801CF4825AE490018D3
61777+:1085E000A2400005AE50000C3C0808008D085BF06E
61778+:1085F0008F840058A6500010000839C2A6500012FF
61779+:10860000A6500014A6500016A5A7000C8C8C0008DC
61780+:108610008F8B00588F8A0058ADAC002C8D63000CF6
61781+:1086200024070002ADA3001C91460010A1A6001172
61782+:108630008F82005890450011A3E500088F990058DB
61783+:1086400093380012A258004E8F910058922F0013B9
61784+:10865000A1AF00128F920058964E0014A5AE003CB8
61785+:1086600096490016A5A9003E8E480018ADA8001432
61786+:108670005660FD6AAF8700683C05080024A55BE8EA
61787+:108680000E000881000020218F9200580000382140
61788+:108690000A000962AF8700683C05080024A55BE872
61789+:1086A0000E0008A4240400828F9200580A000A4D8C
61790+:1086B000000038210E000F6C000000008F9200585F
61791+:1086C0000A000AC0000020210E00087202002021CA
61792+:1086D0009223001B02002021346A00100E00087C47
61793+:1086E000A22A001B000038210200202100002821BE
61794+:1086F0000A000BA52406001F9242000C305F000107
61795+:1087000013E0000300000000964A000EA4CA002CEB
61796+:10871000924B000C316300025060000600003821CB
61797+:108720008E470014964C0012ACC7001CA4CC001A53
61798+:10873000000038210A000B7F240600093C050800D0
61799+:1087400024A55BE80E0008A42404008B8F92005837
61800+:108750000A000A4D0013382B3C0C08008D8C5BE896
61801+:1087600024DFFFFE25930100326B007F016790211B
61802+:1087700002638824AD110028AE4600E0AE4000E45C
61803+:108780000A0009B3AE5F001CACC000543C0D0800E9
61804+:108790008DAD5BE83C18800C37090100ACED00287A
61805+:1087A0008E510014AD3100E08E4F0014AD2F00E467
61806+:1087B0008E4E001025C7FFFE0A0009F4AD27001CED
61807+:1087C0005491FDD6240740000A000A222407100015
61808+:1087D0000E00092D000000000A000A6A8F9200585E
61809+:1087E0008C83442C3C12DEAD3651BEEF3C010800B8
61810+:1087F000AC205BE810710062000000003C196C6264
61811+:1088000037387970147800082404000297850074C2
61812+:108810009782006C2404009200A2F82B13E0001948
61813+:1088200002002821240400020E00069524050200FF
61814+:108830003C068000ACC200203C010800AC225BE892
61815+:108840001040000D8F8C0058240A002824040003D7
61816+:10885000918B0010316300FF546A00012404000171
61817+:108860000E0000810000000010400004240400837A
61818+:108870000A000BC28F920058240400833C050800B4
61819+:1088800024A55BE80E000881000000008F920058CC
61820+:108890000013382B0A000962AF8700680A000B49F1
61821+:1088A000240200128E4400080E00085D0000000043
61822+:1088B0000A000B55AE0200083C05080024A55BE841
61823+:1088C0000E000858240400878F9200580A000B728B
61824+:1088D0000013102B240400040E000695240500301C
61825+:1088E0001440002A004048218F8800582407008344
61826+:1088F000012020218D05001C0A000BB32406000175
61827+:108900008F8300788F8600701066FEEE000038219D
61828+:108910003C07080024E75B6C000320C00087282187
61829+:108920008CAE000011D0005D246F000131E3000F18
61830+:108930005466FFFA000320C00A000B8C00003821A7
61831+:108940008E4400040E00085D000000000A000BC801
61832+:10895000AE0200083C05080024A55BE80E0008A450
61833+:10896000240400828F9200580A000B72000010212C
61834+:108970003C05080024A55BE80A000C7C2404008761
61835+:108980008C83442C0A000C5B3C196C628F88005865
61836+:108990003C0780083C0C8000240B0050240A000196
61837+:1089A000AD820020A0EB0000A0EA000191030004CA
61838+:1089B000A0E3001891040005A0E400199106000648
61839+:1089C0003C04080024845B6CA0E6001A91020007B6
61840+:1089D0003C06080024C65B68A0E2001B9105000865
61841+:1089E000A0E5001C911F0009A0FF001D9119000ABD
61842+:1089F000A0F9001E9118000BA0F8001F9112000CA6
61843+:108A0000A0F200209111000DA0F100219110000EA4
61844+:108A1000A0F00022910F000FA0EF0023910E001094
61845+:108A2000A0EE0024910D0011A0ED0025950C00147E
61846+:108A3000A4EC0028950B00168F8A00708F920078A6
61847+:108A4000A4EB002A95030018000A10C02545000178
61848+:108A5000A4E3002C8D1F001C0044C0210046C82147
61849+:108A600030A5000FAF3F0000AF09000010B20006B4
61850+:108A7000AF850070000038218D05001C01202021E9
61851+:108A80000A000BB32406000124AD000131A7000F3A
61852+:108A9000AF8700780A000CF9000038213C06080076
61853+:108AA00024C65B680086902100003821ACA000003D
61854+:108AB0000A000B8CAE4000003C0482013C036000C5
61855+:108AC00034820E02AC603D68AF80009803E000087D
61856+:108AD000AC623D6C27BDFFE8AFB000103090FFFFE7
61857+:108AE000001018422C620041AFBF00141440000275
61858+:108AF00024040080240300403C010800AC300060E6
61859+:108B00003C010800AC2300640E000F7500602821B2
61860+:108B1000244802BF2409FF8001092824001039805D
61861+:108B2000001030408FBF00148FB0001000A720212C
61862+:108B300000861821AF8300803C010800AC25005856
61863+:108B40003C010800AC24005C03E0000827BD0018CD
61864+:108B5000308300FF30C6FFFF30E400FF3C08800098
61865+:108B60008D0201B80440FFFE000354000144382583
61866+:108B70003C09600000E920253C031000AD050180A0
61867+:108B8000AD060184AD04018803E00008AD0301B81F
61868+:108B90008F8500583C0A6012354800108CAC0004E8
61869+:108BA0003C0D600E35A60010318B00062D690001CA
61870+:108BB000AD0900C48CA70004ACC731808CA20008AA
61871+:108BC00094A40002ACC231848CA3001C0460000396
61872+:108BD000A784009003E00008000000008CAF00189C
61873+:108BE000ACCF31D08CAE001C03E00008ACCE31D449
61874+:108BF0008F8500588F87FF288F86FF308CAE00044A
61875+:108C00003C0F601235E80010ACEE00788CAD000827
61876+:108C1000ACED007C8CAC0010ACCC004C8CAB000CF0
61877+:108C2000ACCB004894CA00543C0208008C4200447B
61878+:108C300025490001A4C9005494C400543083FFFFA7
61879+:108C400010620017000000003C0208008C42004047
61880+:108C5000A4C200528CA30018ACE300308CA2001414
61881+:108C6000ACE2002C8CB90018ACF900388CB80014B8
61882+:108C700024050001ACF800348D0600BC50C5001975
61883+:108C80008D0200B48D0200B8A4E2004894E40048CC
61884+:108C9000A4E4004A94E800EA03E000083102FFFF80
61885+:108CA0003C0208008C420024A4C00054A4C200521C
61886+:108CB0008CA30018ACE300308CA20014ACE2002CB2
61887+:108CC0008CB90018ACF900388CB8001424050001E8
61888+:108CD000ACF800348D0600BC54C5FFEB8D0200B823
61889+:108CE0008D0200B4A4E2004894E40048A4E4004AE1
61890+:108CF00094E800EA03E000083102FFFF8F86005885
61891+:108D00003C0480008CC900088CC80008000929C0F8
61892+:108D1000000839C0AC87002090C30007306200040F
61893+:108D20001040003EAF85009490CB0007316A0008E8
61894+:108D30001140003D8F87FF2C8CCD000C8CCE001491
61895+:108D400001AE602B11800036000000008CC2000CC8
61896+:108D5000ACE200708CCB00188F85FF288F88FF3025
61897+:108D6000ACEB00748CCA00102402FFF8ACAA00D847
61898+:108D70008CC9000CAD0900608CC4001CACA400D0F0
61899+:108D800090E3007C0062C824A0F9007C90D8000722
61900+:108D9000330F000811E000040000000090ED007C9B
61901+:108DA00035AC0001A0EC007C90CF000731EE000153
61902+:108DB00011C000060000000090E3007C241800347D
61903+:108DC00034790002A0F9007CACB800DC90C2000746
61904+:108DD0003046000210C000040000000090E8007C53
61905+:108DE00035040004A0E4007C90ED007D3C0B600E97
61906+:108DF000356A001031AC003FA0EC007D8D4931D4C4
61907+:108E00003127000110E00002240E0001A0AE00098D
61908+:108E100094AF00EA03E0000831E2FFFF8F87FF2CE8
61909+:108E20000A000DAF8CC200140A000DB0ACE0007057
61910+:108E30008F8C005827BDFFD8AFB3001CAFB200180D
61911+:108E4000AFB00010AFBF0020AFB10014918F00157C
61912+:108E50003C13600E3673001031EB000FA38B009CA7
61913+:108E60008D8F00048D8B0008959F0012959900103E
61914+:108E70009584001A9598001E958E001C33EDFFFF17
61915+:108E8000332AFFFF3089FFFF3308FFFF31C7FFFFA1
61916+:108E90003C010800AC2D00243C010800AC29004432
61917+:108EA0003C010800AC2A0040AE683178AE67317CE6
61918+:108EB00091850015959100163C12601236520010F3
61919+:108EC00030A200FF3230FFFFAE623188AE5000B4F6
61920+:108ED00091830014959F0018240600010066C804C1
61921+:108EE00033F8FFFFAE5900B8AE5800BC918E0014A5
61922+:108EF000AF8F00843C08600631CD00FFAE4D00C04E
61923+:108F0000918A00159584000E3C07600A314900FFE4
61924+:108F1000AF8B00883084FFFFAE4900C835110010C8
61925+:108F20000E000D1034F004103C0208008C4200606A
61926+:108F30003C0308008C6300643C0608008CC60058A3
61927+:108F40003C0508008CA5005C8F8400808FBF00204A
61928+:108F5000AE23004CAE65319CAE030054AE4500DC40
61929+:108F6000AE6231A0AE6331A4AE663198AE22004845
61930+:108F70008FB3001CAE0200508FB10014AE4200E06F
61931+:108F8000AE4300E4AE4600D88FB000108FB2001898
61932+:108F90000A00057D27BD0028978500929783007CF5
61933+:108FA00027BDFFE8AFB0001000A3102BAFBF001427
61934+:108FB000240400058F900058104000552409000239
61935+:108FC0000E0006958F850080AF8200942404000374
61936+:108FD0001040004F240900023C0680000E00008172
61937+:108FE000ACC2002024070001240820001040004DDE
61938+:108FF00024040005978E00928F8AFF2C24090050CC
61939+:1090000025C50001A7850092A14900003C0D08007C
61940+:109010008DAD0064240380008F84FF28000D66005E
61941+:10902000AD4C0018A5400006954B000A8F85FF3017
61942+:109030002402FF8001633024A546000A915F000AE4
61943+:109040000000482103E2C825A159000AA0A0000899
61944+:10905000A140004CA08000D5961800029783009094
61945+:109060003C020004A49800EA960F00022418FFBFF7
61946+:1090700025EE2401A48E00BE8E0D0004ACAD00448C
61947+:109080008E0C0008ACAC0040A4A00050A4A000547A
61948+:109090008E0B000C240C0030AC8B00288E060010C8
61949+:1090A000AC860024A480003EA487004EA487005014
61950+:1090B000A483003CAD420074AC8800D8ACA800602A
61951+:1090C000A08700FC909F00D433F9007FA09900D4C2
61952+:1090D000909000D402187824A08F00D4914E007C88
61953+:1090E00035CD0001A14D007C938B009CAD480070F4
61954+:1090F000AC8C00DCA08B00D68F8800888F87008422
61955+:10910000AC8800C4AC8700C8A5400078A540007AB0
61956+:109110008FBF00148FB000100120102103E0000861
61957+:1091200027BD00188F8500940E0007258F860080CC
61958+:109130000A000E9F2409000227BDFFE0AFB0001017
61959+:109140008F900058AFB10014AFBF00188E09000413
61960+:109150000E00054A000921C08E0800048F84FF28F4
61961+:109160008F82FF30000839C03C068000ACC7002069
61962+:10917000948500EA904300131460001C30B1FFFF97
61963+:109180008F8CFF2C918B0008316A00401540000B3A
61964+:10919000000000008E0D0004022030218FBF001857
61965+:1091A0008FB100148FB00010240400220000382179
61966+:1091B000000D29C00A000D2F27BD00200E000098C9
61967+:1091C000000000008E0D0004022030218FBF001827
61968+:1091D0008FB100148FB00010240400220000382149
61969+:1091E000000D29C00A000D2F27BD00200E000090A1
61970+:1091F000000000008E0D0004022030218FBF0018F7
61971+:109200008FB100148FB00010240400220000382118
61972+:10921000000D29C00A000D2F27BD002027BDFFE04B
61973+:10922000AFB200183092FFFFAFB00010AFBF001C0C
61974+:10923000AFB100141240001E000080218F8600583C
61975+:109240008CC500002403000600053F02000514023F
61976+:1092500030E4000714830016304500FF2CA80006F8
61977+:1092600011000040000558803C0C0800258C58BCBB
61978+:10927000016C50218D490000012000080000000011
61979+:109280008F8E0098240D000111CD005024020002A1
61980+:10929000AF820098260900013130FFFF24C800206A
61981+:1092A0000212202B010030211480FFE5AF88005806
61982+:1092B000020010218FBF001C8FB200188FB1001464
61983+:1092C0008FB0001003E0000827BD00209387007EC8
61984+:1092D00054E00034000030210E000DE700000000D3
61985+:1092E0008F8600580A000EFF240200018F87009825
61986+:1092F0002405000210E50031240400130000282199
61987+:1093000000003021240700010E000D2F0000000096
61988+:109310000A000F008F8600588F83009824020002F5
61989+:109320001462FFF6240400120E000D9A00000000E3
61990+:109330008F85009400403021240400120E000D2F70
61991+:10934000000038210A000F008F8600588F83009894
61992+:109350002411000310710029241F0002107FFFCE8A
61993+:1093600026090001240400100000282100003021FB
61994+:109370000A000F1D240700018F91009824060002A7
61995+:109380001626FFF9240400100E000E410000000014
61996+:10939000144000238F9800588F8600580A000EFF53
61997+:1093A00024020003240400140E000D2F00002821C5
61998+:1093B0008F8600580A000EFF240200020E000EA93C
61999+:1093C000000000000A000F008F8600580E000D3FBD
62000+:1093D00000000000241900022404001400002821C9
62001+:1093E0000000302100003821AF9900980E000D2FA9
62002+:1093F000000000000A000F008F8600580E000D5775
62003+:10940000000000008F8500942419000200403021E4
62004+:1094100024040010000038210A000F56AF9900986C
62005+:109420000040382124040010970F0002000028217A
62006+:109430000E000D2F31E6FFFF8F8600580A000F0047
62007+:10944000AF9100988F84FF2C3C077FFF34E6FFFF2D
62008+:109450008C8500182402000100A61824AC83001893
62009+:1094600003E00008A08200053084FFFF30A5FFFF65
62010+:109470001080000700001821308200011040000217
62011+:1094800000042042006518211480FFFB00052840DD
62012+:1094900003E000080060102110C000070000000079
62013+:1094A0008CA2000024C6FFFF24A50004AC820000AB
62014+:1094B00014C0FFFB2484000403E000080000000047
62015+:1094C00010A0000824A3FFFFAC86000000000000ED
62016+:1094D000000000002402FFFF2463FFFF1462FFFA74
62017+:1094E0002484000403E0000800000000000411C010
62018+:1094F00003E000082442024027BDFFE8AFB000109F
62019+:1095000000808021AFBF00140E000F9600A0202124
62020+:1095100000504821240AFF808FBF00148FB0001034
62021+:10952000012A30243127007F3C08800A3C042100B6
62022+:1095300000E8102100C428253C03800027BD001846
62023+:10954000AC650024AF820038AC400000AC6500245C
62024+:1095500003E00008AC4000403C0D08008DAD005811
62025+:1095600000056180240AFF8001A45821016C482174
62026+:10957000012A30243127007F3C08800C3C04210064
62027+:1095800000E8102100C428253C038000AC650028B9
62028+:10959000AF82003403E00008AC40002430A5FFFF98
62029+:1095A0003C0680008CC201B80440FFFE3C086015F8
62030+:1095B00000A838253C031000ACC40180ACC0018475
62031+:1095C000ACC7018803E00008ACC301B83C0D08003B
62032+:1095D0008DAD005800056180240AFF8001A4582148
62033+:1095E000016C4021010A4824000931403107007F05
62034+:1095F00000C728253C04200000A418253C02800058
62035+:10960000AC43083003E00008AF80003427BDFFE81A
62036+:10961000AFB0001000808021AFBF00140E000F9685
62037+:1096200000A0202100504821240BFF80012B502452
62038+:10963000000A39403128007F3C0620008FBF00140B
62039+:109640008FB0001000E8282534C2000100A21825C0
62040+:109650003C04800027BD0018AC83083003E00008FC
62041+:10966000AF8000383C0580088CA700603C0680086D
62042+:109670000087102B144000112C8340008CA8006040
62043+:109680002D0340001060000F240340008CC90060CF
62044+:109690000089282B14A00002008018218CC30060D0
62045+:1096A00000035A42000B30803C0A0800254A59202A
62046+:1096B00000CA202103E000088C8200001460FFF340
62047+:1096C0002403400000035A42000B30803C0A08008B
62048+:1096D000254A592000CA202103E000088C8200009E
62049+:1096E0003C05800890A60008938400AB24C20001CA
62050+:1096F000304200FF3043007F1064000C0002382726
62051+:10970000A0A200083C0480008C85017804A0FFFE24
62052+:109710008F8A00A0240900023C081000AC8A014096
62053+:10972000A089014403E00008AC8801780A00101BFE
62054+:1097300030E2008027BDFFD8AFB200188F9200A49E
62055+:10974000AFBF0020AFB3001CAFB00010AFB100142A
62056+:109750008F9300348E5900283C1000803C0EFFEFA0
62057+:10976000AE7900008E580024A260000A35CDFFFFBC
62058+:10977000AE7800049251002C3C0BFF9F356AFFFF2E
62059+:10978000A271000C8E6F000C3C080040A271000B0F
62060+:1097900001F06025018D4824012A382400E8302595
62061+:1097A000AE66000C8E450004AE6000183C0400FF5D
62062+:1097B000AE6500148E43002C3482FFFFA6600008C3
62063+:1097C0000062F824AE7F00108E5900088F9000A030
62064+:1097D000964E0012AE7900208E51000C31D83FFF1A
62065+:1097E00000187980AE7100248E4D001401F06021C4
62066+:1097F00031CB0001AE6D00288E4A0018000C41C22A
62067+:10980000000B4B80AE6A002C8E46001C01093821EB
62068+:10981000A667001CAE660030964500028E4400200C
62069+:10982000A665001EAE64003492430033306200042B
62070+:1098300054400006924700003C0280083443010077
62071+:109840008C7F00D0AE7F0030924700008F860038BA
62072+:10985000A0C700309245003330A4000250800007BA
62073+:10986000925100018F880038240BFF80910A00304C
62074+:10987000014B4825A1090030925100018F9000381A
62075+:10988000240CFFBF2404FFDFA21100318F8D0038AC
62076+:109890003C1880083711008091AF003C31EE007F0A
62077+:1098A000A1AE003C8F890038912B003C016C502404
62078+:1098B000A12A003C8F9F00388E68001493E6003C7C
62079+:1098C0002D0700010007114000C4282400A218251C
62080+:1098D000A3E3003C8F87003896590012A4F90032A8
62081+:1098E0008E450004922E007C30B0000300107823D7
62082+:1098F00031ED000300AD102131CC000215800002D3
62083+:1099000024460034244600303C0280083443008062
62084+:10991000907F007C00BFC824333800041700000289
62085+:1099200024C2000400C010218F98003824190002BE
62086+:10993000ACE20034A3190000924F003F8F8E003834
62087+:109940003C0C8008358B0080A1CF00018F9100383E
62088+:10995000924D003F8E440004A62D0002956A005CE3
62089+:109960000E000FF43150FFFF00024B800209382532
62090+:109970003C08420000E82825AE2500048E4400384B
62091+:109980008F850038ACA400188E460034ACA6001CAD
62092+:10999000ACA0000CACA00010A4A00014A4A0001661
62093+:1099A000A4A00020A4A00022ACA000248E62001479
62094+:1099B00050400001240200018FBF00208FB3001C23
62095+:1099C0008FB200188FB100148FB00010ACA2000845
62096+:1099D0000A00101327BD002827BDFFC83C058008DA
62097+:1099E00034A40080AFBF0034AFBE0030AFB7002C4E
62098+:1099F000AFB60028AFB50024AFB40020AFB3001C51
62099+:109A0000AFB20018AFB10014AFB00010948300786B
62100+:109A10009482007A104300512405FFFF0080F0215A
62101+:109A20000A0011230080B821108B004D8FBF003435
62102+:109A30008F8600A03C1808008F18005C2411FF805E
62103+:109A40003C1680000306782101F18024AED0002C62
62104+:109A500096EE007A31EC007F3C0D800E31CB7FFF1B
62105+:109A6000018D5021000B4840012AA82196A4000036
62106+:109A70003C0808008D0800582405FF8030953FFF02
62107+:109A800001061821001539800067C8210325F82434
62108+:109A90003C02010003E290253338007F3C11800C2A
62109+:109AA000AED20028031190219250000D320F000415
62110+:109AB00011E0003702E0982196E3007A96E8007AF8
62111+:109AC00096E5007A2404800031077FFF24E300013B
62112+:109AD00030627FFF00A4F82403E2C825A6F9007ACB
62113+:109AE00096E6007A3C1408008E94006030D67FFF22
62114+:109AF00012D400C1000000008E5800188F8400A00E
62115+:109B000002A028212713FFFF0E000FCEAE53002C1A
62116+:109B100097D5007897D4007A12950010000028217C
62117+:109B20003C098008352401003C0A8008914800085F
62118+:109B3000908700D53114007F30E400FF0284302B81
62119+:109B400014C0FFB9268B0001938E00AB268C000158
62120+:109B5000008E682115ACFFB78F8600A08FBF003440
62121+:109B60008FBE00308FB7002C8FB600288FB5002431
62122+:109B70008FB400208FB3001C8FB200188FB1001477
62123+:109B80008FB0001000A0102103E0000827BD0038AE
62124+:109B900000C020210E000F99028028218E4B00105A
62125+:109BA0008E4C00308F84003824090002016C502351
62126+:109BB000AE4A0010A089000096E3005C8E4400309D
62127+:109BC0008F9100380E000FF43070FFFF00024380C9
62128+:109BD000020838253C02420000E22825AE25000498
62129+:109BE0008E5F00048F8A00388E590000240B000815
62130+:109BF000AD5F001CAD590018AD40000CAD40001029
62131+:109C00009246000A240400052408C00030D000FF5A
62132+:109C1000A550001496580008A55800169251000A45
62133+:109C20003C188008322F00FFA54F0020964E0008F8
62134+:109C300037110100A54E0022AD400024924D000BCB
62135+:109C400031AC00FFA54C0002A14B00018E49003051
62136+:109C50008F830038240BFFBFAC690008A06400307C
62137+:109C60008F9000382403FFDF9607003200E8282495
62138+:109C700000B51025A6020032921F003233F9003FD2
62139+:109C800037260040A20600328F8C0038AD800034A9
62140+:109C90008E2F00D0AD8F0038918E003C3C0F7FFF9F
62141+:109CA00031CD007FA18D003C8F84003835EEFFFF61
62142+:109CB000908A003C014B4824A089003C8F850038E5
62143+:109CC00090A8003C01033824A0A7003C8E42003439
62144+:109CD0008F9100383C038008AE2200408E59002C42
62145+:109CE0008E5F0030033F3023AE26004492300048A0
62146+:109CF0003218007FA23800488F8800388E4D00301F
62147+:109D00008D0C004801AE582401965024014B482583
62148+:109D1000AD0900489244000AA104004C964700088F
62149+:109D20008F850038A4A7004E8E5000308E4400303E
62150+:109D30000E0003818C65006092F9007C0002F940FE
62151+:109D4000004028210002110003E2302133360002D6
62152+:109D500012C00003020680210005B0800216802197
62153+:109D6000926D007C31B30004126000020005708027
62154+:109D7000020E80218E4B00308F8800382405800031
62155+:109D8000316A0003000A4823312400030204182129
62156+:109D9000AD03003496E4007A96F0007A96F1007AEA
62157+:109DA00032027FFF2447000130FF7FFF0225C824D5
62158+:109DB000033F3025A6E6007A96F8007A3C120800A8
62159+:109DC0008E520060330F7FFF11F200180000000078
62160+:109DD0008F8400A00E000FCE02A028218F8400A047
62161+:109DE0000E000FDE028028210E001013000000007C
62162+:109DF0000A00111F0000000096F1007A022480245E
62163+:109E0000A6F0007A92EF007A92EB007A31EE00FF32
62164+:109E1000000E69C2000D6027000C51C03169007F3F
62165+:109E2000012A20250A001119A2E4007A96E6007A98
62166+:109E300000C5C024A6F8007A92EF007A92F3007A67
62167+:109E400031F200FF001271C2000E6827000DB1C090
62168+:109E5000326C007F01962825A2E5007A0A0011D015
62169+:109E60008F8400A03C0380003084FFFF30A5FFFFFB
62170+:109E7000AC640018AC65001C03E000088C620014A0
62171+:109E800027BDFFA03C068008AFBF005CAFBE0058F6
62172+:109E9000AFB70054AFB60050AFB5004CAFB40048F8
62173+:109EA000AFB30044AFB20040AFB1003CAFB0003838
62174+:109EB00034C80100910500D590C700083084FFFF29
62175+:109EC00030A500FF30E2007F0045182AAFA4001043
62176+:109ED000A7A00018A7A0002610600055AFA000148E
62177+:109EE00090CA00083149007F00A9302324D3FFFF26
62178+:109EF0000013802B8FB400100014902B02128824C2
62179+:109F0000522000888FB300143C03800894790052DB
62180+:109F1000947E00508FB60010033EC0230018BC0092
62181+:109F2000001714030016FC0002C2A82A16A00002A3
62182+:109F3000001F2C030040282100133C0000072403CD
62183+:109F400000A4102A5440000100A020212885000907
62184+:109F500014A000020080A021241400083C0C8008FA
62185+:109F60008D860048001459808D88004C3C03800089
62186+:109F70003169FFFF3C0A0010012A202534710400DA
62187+:109F8000AC660038AF9100A4AC68003CAC64003013
62188+:109F900000000000000000000000000000000000C1
62189+:109FA00000000000000000000000000000000000B1
62190+:109FB0008C6E000031CD002011A0FFFD0014782A26
62191+:109FC00001F01024104000390000A8213C16800840
62192+:109FD00092D700083C1280008E44010032F6007FC8
62193+:109FE0000E000F9902C028218E3900108E44010006
62194+:109FF0000000902133373FFF0E000FB102E028210F
62195+:10A00000923800003302003F2C500008520000102C
62196+:10A0100000008821000210803C030800246358E4FB
62197+:10A020000043F8218FFE000003C00008000000007C
62198+:10A0300090CF0008938C00AB31EE007F00AE682318
62199+:10A04000018D58210A0012172573FFFF0000882197
62200+:10A050003C1E80008FC401000E000FCE02E02821BC
62201+:10A060008FC401000E000FDE02C028211220000F55
62202+:10A070000013802B8F8B00A426A400010004AC00E9
62203+:10A08000027298230015AC032578004002B4B02A70
62204+:10A090000013802B241700010300882102D0102414
62205+:10A0A000AF9800A41440FFC9AFB700143C07800864
62206+:10A0B00094E200508FAE00103C05800002A288217F
62207+:10A0C0003C060020A4F10050ACA6003094F40050EF
62208+:10A0D00094EF005201D51823306CFFFF11F4001EDD
62209+:10A0E000AFAC00108CEF004C001561808CF500487F
62210+:10A0F00001EC28210000202100AC582B02A4C02133
62211+:10A10000030BB021ACE5004CACF600488FB4001056
62212+:10A110000014902B021288241620FF7C3C03800838
62213+:10A120008FB300148FBF005C8FBE00583A620001ED
62214+:10A130008FB700548FB600508FB5004C8FB40048D5
62215+:10A140008FB300448FB200408FB1003C8FB0003815
62216+:10A1500003E0000827BD006094FE00548CF2004428
62217+:10A1600033C9FFFE0009C8C00259F821ACBF003C4A
62218+:10A170008CE800448CAD003C010D50231940003B9D
62219+:10A18000000000008CF7004026E20001ACA200387D
62220+:10A190003C05005034A700103C038000AC67003041
62221+:10A1A00000000000000000000000000000000000AF
62222+:10A1B000000000000000000000000000000000009F
62223+:10A1C0008C7800003316002012C0FFFD3C1180087F
62224+:10A1D000962200543C1580003C068008304E000159
62225+:10A1E000000E18C0007578218DEC04003C070800B3
62226+:10A1F0008CE700443C040020ACCC00488DF40404FF
62227+:10A20000240B0001ACD4004C10EB0260AEA4003073
62228+:10A21000963900523C0508008CA5004000B99021F9
62229+:10A22000A6320052963F005427ED0001A62D00549F
62230+:10A230009626005430C4FFFF5487FF2F8FB40010C0
62231+:10A2400030A5FFFF0E0011F4A62000543C070800C3
62232+:10A250008CE70024963E00520047B82303D74823DA
62233+:10A26000A62900520A0012198FB400108CE2004097
62234+:10A270000A0012BE00000000922400012407000121
62235+:10A280003085007F14A7001C97AD00268E2B00148C
62236+:10A29000240CC000316A3FFF01AC48243C06080092
62237+:10A2A0008CC60060012A402531043FFF0086882BC0
62238+:10A2B00012200011A7A800263C0508008CA5005814
62239+:10A2C0008F9100A0000439802402FF8000B1182182
62240+:10A2D0000067F82103E2F02433F8007F3C1280008D
62241+:10A2E0003C19800EAE5E002C0319702191D0000D38
62242+:10A2F000360F0004A1CF000D0E001028241200011B
62243+:10A30000241100013C1E80008FC401000E000FCEFE
62244+:10A3100002E028218FC401000E000FDE02C02821B8
62245+:10A320001620FF558F8B00A40A0012860013802B85
62246+:10A330008F8600A490C80001310400201080019194
62247+:10A34000241000013C048008348B0080916A007C5A
62248+:10A350008F9E0034AFA0002C314900011120000F66
62249+:10A36000AFB000288CCD00148C8E006001AE602B45
62250+:10A370001580000201A038218C8700603C188008FD
62251+:10A38000370300808C70007000F0782B15E000021D
62252+:10A3900000E020218C640070AFA4002C3C028008F7
62253+:10A3A000344500808CD200148CBF0070025FC82B33
62254+:10A3B00017200002024020218CA400708FA7002CDF
62255+:10A3C0000087182310600003AFA3003024050002AB
62256+:10A3D000AFA500288FA400280264882B162000BA9D
62257+:10A3E000000018218CD000388FCE000C3C0F00806C
62258+:10A3F000AFD000008CCD00343C0CFF9F01CF58251E
62259+:10A40000AFCD000490CA003F3586FFFF01662024CF
62260+:10A410003C0900203C08FFEFA3CA000B0089382547
62261+:10A420003511FFFF00F118243C0500088F8700A4B8
62262+:10A430000065C825AFD9000C8CE20014AFC000182D
62263+:10A440008FA60030AFC200148CF800188FB0002C1B
62264+:10A450003C1FFFFBAFD8001C8CEF000837F2FFFF5A
62265+:10A4600003326824AFCF00248CEC000C020670216C
62266+:10A47000AFCD000CA7C00038A7C0003AAFCE002C6B
62267+:10A48000AFCC0020AFC000288CEA00148FAB002CAA
62268+:10A49000014B48230126402311000011AFC80010D2
62269+:10A4A00090EB003D8FC900048FC80000000B5100E5
62270+:10A4B000012A28210000102100AA882B010218215E
62271+:10A4C0000071F821AFC50004AFDF000090F2003D3D
62272+:10A4D000A3D2000A8F9900A497380006A7D80008D5
62273+:10A4E0008F910038240800023C038008A228000055
62274+:10A4F0003465008094BF005C8FA4002C33F0FFFF14
62275+:10A500000E000FF48F9200380002CB808F8500A4DC
62276+:10A51000021978253C18420001F87025AE4E00045F
62277+:10A520008F8400388CAD0038AC8D00188CAC0034B2
62278+:10A53000AC8C001CAC80000CAC800010A48000141B
62279+:10A54000A4800016A4800020A4800022AC800024F7
62280+:10A5500090A6003F8FA7002CA486000250E0019235
62281+:10A56000240700018FA200305040000290A2003D5D
62282+:10A5700090A2003E244A0001A08A00018F84003886
62283+:10A580008FA9002CAC8900083C128008364D008051
62284+:10A5900091AC007C3186000214C000022407003414
62285+:10A5A000240700308F8500A43C198008373F0080C5
62286+:10A5B00090B0000093F9007C240E0004A0900030BD
62287+:10A5C0008F8F00A48FB8002C8F8D003891F200017E
62288+:10A5D0003304000301C46023A1B200318F8E003820
62289+:10A5E0008F8600A42402C00095CA003294C90012CC
62290+:10A5F0008FAB002C0142402431233FFF010388250B
62291+:10A60000A5D1003291D000323185000300EBF82152
62292+:10A610003218003F370F0040A1CF00328FA4002C2A
62293+:10A6200003E5382133280004108000028F850038AC
62294+:10A6300000E838213C0A8008ACA700343549010005
62295+:10A640008D2800D08FA3002C2419FFBFACA80038A0
62296+:10A6500090B1003C2C640001240FFFDF3227007F03
62297+:10A66000A0A7003C8F98003800049140931F003C45
62298+:10A6700003F98024A310003C8F8C0038918E003C9D
62299+:10A6800001CF682401B23025A186003C8F8900A447
62300+:10A690008F8800388D2B0020AD0B00408D220024C8
62301+:10A6A000AD0200448D2A0028AD0A00488D23002CFD
62302+:10A6B0000E001013AD03004C8FB1002824070002D8
62303+:10A6C000122700118FA300280003282B00058023E8
62304+:10A6D0000270982400608021006090210A00126FAF
62305+:10A6E0000010882B962900128F8400A00000902172
62306+:10A6F0003125FFFFA7A900180E000FC22411000189
62307+:10A700000A00131D3C1E80003C0B80003C12800898
62308+:10A710008D640100924900088F92FF340E000F995A
62309+:10A720003125007F8F9900388FA700288FA4003033
62310+:10A73000A3270000965F005C33F0FFFF0E000FF4CC
62311+:10A740008F91003800026B80020D80253C0842008A
62312+:10A750008F8D00A402085025AE2A00048DA5003874
62313+:10A760008F8A003800007821000F1100AD450018D5
62314+:10A770008DB800343C047FFF3488FFFFAD58001CC7
62315+:10A7800091A6003E8D4C001C8D4900180006190052
62316+:10A79000000677020183C821004E58250323882B29
62317+:10A7A000012B382100F1F821AD59001CAD5F0018D4
62318+:10A7B000AD40000CAD40001091B0003E8FA40030C1
62319+:10A7C00024090005A550001495A500042419C00013
62320+:10A7D00000884024A545001691B8003EA5580020E9
62321+:10A7E00095AF0004A54F0022AD40002491AE003F7C
62322+:10A7F000A54E000291A6003E91AC003D01861023BB
62323+:10A80000244B0001A14B00018F9100388FA3003031
62324+:10A810003C028008344B0100AE230008A22900301E
62325+:10A820008F8C00388F8700A4959F003294F000121F
62326+:10A830002407FFBF033FC02432053FFF03057825EF
62327+:10A84000A58F0032918E00322418FFDF31CD003FFA
62328+:10A8500035A60040A18600328F910038240DFFFFFD
62329+:10A86000240CFF80AE2000348D6A00D0AE2A003860
62330+:10A870009223003C3069007FA229003C8F90003871
62331+:10A880003C0380009219003C0327F824A21F003CDF
62332+:10A890008F8E003891C5003C00B87824A1CF003CD1
62333+:10A8A0008F8A00383C0E8008AD4D00408FA6002CEA
62334+:10A8B000AD46004491420048004C5825A14B004849
62335+:10A8C0008F9000388F9900A48E09004801238824B6
62336+:10A8D00002283825AE070048933F003EA21F004CD7
62337+:10A8E0008F9800A48F8F003897050004A5E5004ECF
62338+:10A8F0000E0003818DC500609246007C8FAC003055
62339+:10A9000000026940000291000040282130CB000283
62340+:10A9100001B21021156000AA018230213C0E80088E
62341+:10A9200035C20080904C007C31830004106000032D
62342+:10A930008FB900300005788000CF3021241F00043B
62343+:10A940008F910038332D000303ED8023320800037C
62344+:10A9500000C85021AE2A00343C188000A7C500383A
62345+:10A960003C0680088F04010090DE00080E000FDE18
62346+:10A9700033C5007F0E001013000000000A00140D04
62347+:10A980008FA300288F9800348CC90038241F00033F
62348+:10A99000A7000008AF0900008CC50034A300000A1E
62349+:10A9A0008F9900A4AF0500043C080080932D003F60
62350+:10A9B000A31F000C8F0A000C3C02FF9FA30D000B8D
62351+:10A9C0000148F0253451FFFF3C12FFEF8F9900A49E
62352+:10A9D00003D170243646FFFF01C61824AF03000CD4
62353+:10A9E0008F2C0014972900128F8400A0AF0C001048
62354+:10A9F0008F2F0014AF000018AF000020AF0F00141D
62355+:10AA0000AF0000248F270018312F3FFF000F59801F
62356+:10AA1000AF0700288F2500080164F821312D0001BF
62357+:10AA2000AF0500308F31000C8F920038001F51C2EB
62358+:10AA3000000D438001481021241E00023C068008BE
62359+:10AA4000A702001CA7000034AF11002CA25E00007A
62360+:10AA500034D20080964E005C8F9900383C0342004F
62361+:10AA600031CCFFFF01833825AF2700048F8B00A472
62362+:10AA7000240500012402C0008D640038240700343E
62363+:10AA8000AF2400188D690034AF29001CAF20000CE2
62364+:10AA9000AF200010A7200014A7200016A720002038
62365+:10AAA000A7200022AF200024A7300002A325000128
62366+:10AAB0008F8800388F9F00A4AD10000893ED000030
62367+:10AAC000A10D00308F8A00A48F98003891510001A9
62368+:10AAD000A31100318F8B0038957E003203C27024A1
62369+:10AAE00001CF6025A56C0032916300323064003FD5
62370+:10AAF000A16400329249007C3125000214A00002BA
62371+:10AB00008F840038240700303C198008AC8700345B
62372+:10AB1000373201008E5F00D0240AFFBF020090216F
62373+:10AB2000AC9F0038908D003C31A8007FA088003C8D
62374+:10AB30008F9E003893C2003C004A8824A3D1003C79
62375+:10AB40008F8300380010882B9066003C34CE0020A4
62376+:10AB5000A06E003C8F8400A48F9800388C8C00205D
62377+:10AB6000AF0C00408C8F0024AF0F00448C8700286E
62378+:10AB7000AF0700488C8B002CAF0B004C0E0010135D
62379+:10AB80003C1E80000A0012700000000094C80052B1
62380+:10AB90003C0A08008D4A002401488821A4D10052B3
62381+:10ABA0000A0012198FB40010A08700018F840038AA
62382+:10ABB000240B0001AC8B00080A0013BE3C12800875
62383+:10ABC000000520800A0014A200C4302127BDFFE048
62384+:10ABD0003C0D8008AFB20018AFB00010AFBF001C32
62385+:10ABE000AFB1001435B200808E4C001835A80100BA
62386+:10ABF000964B000695A70050910900FC000C5602E8
62387+:10AC0000016728233143007F312600FF240200031F
62388+:10AC1000AF8300A8AF8400A010C2001B30B0FFFFBC
62389+:10AC2000910600FC2412000530C200FF10520033D0
62390+:10AC300000000000160000098FBF001C8FB2001832
62391+:10AC40008FB100148FB00010240D0C003C0C80005C
62392+:10AC500027BD002003E00008AD8D00240E0011FB8D
62393+:10AC6000020020218FBF001C8FB200188FB100148A
62394+:10AC70008FB00010240D0C003C0C800027BD00207C
62395+:10AC800003E00008AD8D0024965800789651007AB4
62396+:10AC9000924E007D0238782631E8FFFF31C400C0B3
62397+:10ACA000148000092D11000116000037000000007B
62398+:10ACB0005620FFE28FBF001C0E0010D100000000E4
62399+:10ACC0000A00156A8FBF001C1620FFDA0000000082
62400+:10ACD0000E0010D1000000001440FFD88FBF001CF0
62401+:10ACE0001600002200000000925F007D33E2003F6A
62402+:10ACF000A242007D0A00156A8FBF001C950900EA78
62403+:10AD00008F86008000802821240400050E0007257E
62404+:10AD10003130FFFF978300923C0480002465FFFFE1
62405+:10AD2000A78500928C8A01B80540FFFE0000000054
62406+:10AD3000AC8001808FBF001CAC9001848FB20018E2
62407+:10AD40008FB100148FB000103C0760133C0B100053
62408+:10AD5000240D0C003C0C800027BD0020AC8701882E
62409+:10AD6000AC8B01B803E00008AD8D00240E0011FB90
62410+:10AD7000020020215040FFB18FBF001C925F007D78
62411+:10AD80000A00159733E2003F0E0011FB020020215C
62412+:10AD90001440FFAA8FBF001C122000070000000013
62413+:10ADA0009259007D3330003F36020040A242007DC0
62414+:10ADB0000A00156A8FBF001C0E0010D100000000B1
62415+:10ADC0005040FF9E8FBF001C9259007D3330003FE2
62416+:10ADD0000A0015C636020040000000000000001BFB
62417+:10ADE0000000000F0000000A00000008000000063C
62418+:10ADF0000000000500000005000000040000000441
62419+:10AE00000000000300000003000000030000000336
62420+:10AE10000000000300000002000000020000000229
62421+:10AE2000000000020000000200000002000000021A
62422+:10AE3000000000020000000200000002000000020A
62423+:10AE400000000002000000020000000200000002FA
62424+:10AE50000000000100000001000000018008010066
62425+:10AE6000800800808008000000000C000000308096
62426+:10AE7000080011D00800127C08001294080012A8E3
62427+:10AE8000080012BC080011D0080011D0080012F010
62428+:10AE90000800132C080013400800138808001A8CBF
62429+:10AEA00008001A8C08001AC408001AC408001AD82E
62430+:10AEB00008001AA808001D0008001CCC08001D5836
62431+:10AEC00008001D5808001DE008001D108008024001
62432+:10AED000080027340800256C0800275C080027F4C8
62433+:10AEE0000800293C0800298808002AAC080029B479
62434+:10AEF00008002A38080025DC08002EDC08002EA4F3
62435+:10AF000008002588080025880800258808002B20CF
62436+:10AF100008002B20080025880800258808002DD06F
62437+:10AF2000080025880800258808002588080025884D
62438+:10AF300008002E0C080025880800258808002588B0
62439+:10AF4000080025880800258808002588080025882D
62440+:10AF5000080025880800258808002588080025881D
62441+:10AF6000080025880800258808002588080029A8E9
62442+:10AF7000080025880800258808002E680800258814
62443+:10AF800008002588080025880800258808002588ED
62444+:10AF900008002588080025880800258808002588DD
62445+:10AFA00008002588080025880800258808002588CD
62446+:10AFB00008002588080025880800258808002588BD
62447+:10AFC00008002CF4080025880800258808002C6853
62448+:10AFD00008002BC408003CE408003CB808003C848E
62449+:10AFE00008003C5808003C3808003BEC8008010091
62450+:10AFF00080080080800800008008008008004C6401
62451+:10B0000008004C9C08004BE408004C6408004C64A9
62452+:10B01000080049B808004C64080050500A000C842D
62453+:10B0200000000000000000000000000D7278703683
62454+:10B030002E322E31620000000602010300000000E3
62455+:10B0400000000001000000000000000000000000FF
62456+:10B0500000000000000000000000000000000000F0
62457+:10B0600000000000000000000000000000000000E0
62458+:10B0700000000000000000000000000000000000D0
62459+:10B0800000000000000000000000000000000000C0
62460+:10B0900000000000000000000000000000000000B0
62461+:10B0A00000000000000000000000000000000000A0
62462+:10B0B0000000000000000000000000000000000090
62463+:10B0C0000000000000000000000000000000000080
62464+:10B0D0000000000000000000000000000000000070
62465+:10B0E0000000000000000000000000000000000060
62466+:10B0F0000000000000000000000000000000000050
62467+:10B10000000000000000000000000000000000003F
62468+:10B11000000000000000000000000000000000002F
62469+:10B12000000000000000000000000000000000001F
62470+:10B13000000000000000000000000000000000000F
62471+:10B1400000000000000000000000000000000000FF
62472+:10B1500000000000000000000000000000000000EF
62473+:10B1600000000000000000000000000000000000DF
62474+:10B1700000000000000000000000000000000000CF
62475+:10B1800000000000000000000000000000000000BF
62476+:10B1900000000000000000000000000000000000AF
62477+:10B1A000000000000000000000000000000000009F
62478+:10B1B000000000000000000000000000000000008F
62479+:10B1C000000000000000000000000000000000007F
62480+:10B1D000000000000000000000000000000000006F
62481+:10B1E000000000000000000000000000000000005F
62482+:10B1F000000000000000000000000000000000004F
62483+:10B20000000000000000000000000000000000003E
62484+:10B21000000000000000000000000000000000002E
62485+:10B22000000000000000000000000000000000001E
62486+:10B23000000000000000000000000000000000000E
62487+:10B2400000000000000000000000000000000000FE
62488+:10B2500000000000000000000000000000000000EE
62489+:10B2600000000000000000000000000000000000DE
62490+:10B2700000000000000000000000000000000000CE
62491+:10B2800000000000000000000000000000000000BE
62492+:10B2900000000000000000000000000000000000AE
62493+:10B2A000000000000000000000000000000000009E
62494+:10B2B000000000000000000000000000000000008E
62495+:10B2C000000000000000000000000000000000007E
62496+:10B2D000000000000000000000000000000000006E
62497+:10B2E000000000000000000000000000000000005E
62498+:10B2F000000000000000000000000000000000004E
62499+:10B30000000000000000000000000000000000003D
62500+:10B31000000000000000000000000000000000002D
62501+:10B32000000000000000000000000000000000001D
62502+:10B33000000000000000000000000000000000000D
62503+:10B3400000000000000000000000000000000000FD
62504+:10B3500000000000000000000000000000000000ED
62505+:10B3600000000000000000000000000000000000DD
62506+:10B3700000000000000000000000000000000000CD
62507+:10B3800000000000000000000000000000000000BD
62508+:10B3900000000000000000000000000000000000AD
62509+:10B3A000000000000000000000000000000000009D
62510+:10B3B000000000000000000000000000000000008D
62511+:10B3C000000000000000000000000000000000007D
62512+:10B3D000000000000000000000000000000000006D
62513+:10B3E000000000000000000000000000000000005D
62514+:10B3F000000000000000000000000000000000004D
62515+:10B40000000000000000000000000000000000003C
62516+:10B41000000000000000000000000000000000002C
62517+:10B42000000000000000000000000000000000001C
62518+:10B43000000000000000000000000000000000000C
62519+:10B4400000000000000000000000000000000000FC
62520+:10B4500000000000000000000000000000000000EC
62521+:10B4600000000000000000000000000000000000DC
62522+:10B4700000000000000000000000000000000000CC
62523+:10B4800000000000000000000000000000000000BC
62524+:10B4900000000000000000000000000000000000AC
62525+:10B4A000000000000000000000000000000000009C
62526+:10B4B000000000000000000000000000000000008C
62527+:10B4C000000000000000000000000000000000007C
62528+:10B4D000000000000000000000000000000000006C
62529+:10B4E000000000000000000000000000000000005C
62530+:10B4F000000000000000000000000000000000004C
62531+:10B50000000000000000000000000000000000003B
62532+:10B51000000000000000000000000000000000002B
62533+:10B52000000000000000000000000000000000001B
62534+:10B53000000000000000000000000000000000000B
62535+:10B5400000000000000000000000000000000000FB
62536+:10B5500000000000000000000000000000000000EB
62537+:10B5600000000000000000000000000000000000DB
62538+:10B5700000000000000000000000000000000000CB
62539+:10B5800000000000000000000000000000000000BB
62540+:10B5900000000000000000000000000000000000AB
62541+:10B5A000000000000000000000000000000000009B
62542+:10B5B000000000000000000000000000000000008B
62543+:10B5C000000000000000000000000000000000007B
62544+:10B5D000000000000000000000000000000000006B
62545+:10B5E000000000000000000000000000000000005B
62546+:10B5F000000000000000000000000000000000004B
62547+:10B60000000000000000000000000000000000003A
62548+:10B61000000000000000000000000000000000002A
62549+:10B62000000000000000000000000000000000001A
62550+:10B63000000000000000000000000000000000000A
62551+:10B6400000000000000000000000000000000000FA
62552+:10B6500000000000000000000000000000000000EA
62553+:10B6600000000000000000000000000000000000DA
62554+:10B6700000000000000000000000000000000000CA
62555+:10B6800000000000000000000000000000000000BA
62556+:10B6900000000000000000000000000000000000AA
62557+:10B6A000000000000000000000000000000000009A
62558+:10B6B000000000000000000000000000000000008A
62559+:10B6C000000000000000000000000000000000007A
62560+:10B6D000000000000000000000000000000000006A
62561+:10B6E000000000000000000000000000000000005A
62562+:10B6F000000000000000000000000000000000004A
62563+:10B700000000000000000000000000000000000039
62564+:10B710000000000000000000000000000000000029
62565+:10B720000000000000000000000000000000000019
62566+:10B730000000000000000000000000000000000009
62567+:10B7400000000000000000000000000000000000F9
62568+:10B7500000000000000000000000000000000000E9
62569+:10B7600000000000000000000000000000000000D9
62570+:10B7700000000000000000000000000000000000C9
62571+:10B7800000000000000000000000000000000000B9
62572+:10B7900000000000000000000000000000000000A9
62573+:10B7A0000000000000000000000000000000000099
62574+:10B7B0000000000000000000000000000000000089
62575+:10B7C0000000000000000000000000000000000079
62576+:10B7D0000000000000000000000000000000000069
62577+:10B7E0000000000000000000000000000000000059
62578+:10B7F0000000000000000000000000000000000049
62579+:10B800000000000000000000000000000000000038
62580+:10B810000000000000000000000000000000000028
62581+:10B820000000000000000000000000000000000018
62582+:10B830000000000000000000000000000000000008
62583+:10B8400000000000000000000000000000000000F8
62584+:10B8500000000000000000000000000000000000E8
62585+:10B8600000000000000000000000000000000000D8
62586+:10B8700000000000000000000000000000000000C8
62587+:10B8800000000000000000000000000000000000B8
62588+:10B8900000000000000000000000000000000000A8
62589+:10B8A0000000000000000000000000000000000098
62590+:10B8B0000000000000000000000000000000000088
62591+:10B8C0000000000000000000000000000000000078
62592+:10B8D0000000000000000000000000000000000068
62593+:10B8E0000000000000000000000000000000000058
62594+:10B8F0000000000000000000000000000000000048
62595+:10B900000000000000000000000000000000000037
62596+:10B910000000000000000000000000000000000027
62597+:10B920000000000000000000000000000000000017
62598+:10B930000000000000000000000000000000000007
62599+:10B9400000000000000000000000000000000000F7
62600+:10B9500000000000000000000000000000000000E7
62601+:10B9600000000000000000000000000000000000D7
62602+:10B9700000000000000000000000000000000000C7
62603+:10B9800000000000000000000000000000000000B7
62604+:10B9900000000000000000000000000000000000A7
62605+:10B9A0000000000000000000000000000000000097
62606+:10B9B0000000000000000000000000000000000087
62607+:10B9C0000000000000000000000000000000000077
62608+:10B9D0000000000000000000000000000000000067
62609+:10B9E0000000000000000000000000000000000057
62610+:10B9F0000000000000000000000000000000000047
62611+:10BA00000000000000000000000000000000000036
62612+:10BA10000000000000000000000000000000000026
62613+:10BA20000000000000000000000000000000000016
62614+:10BA30000000000000000000000000000000000006
62615+:10BA400000000000000000000000000000000000F6
62616+:10BA500000000000000000000000000000000000E6
62617+:10BA600000000000000000000000000000000000D6
62618+:10BA700000000000000000000000000000000000C6
62619+:10BA800000000000000000000000000000000000B6
62620+:10BA900000000000000000000000000000000000A6
62621+:10BAA0000000000000000000000000000000000096
62622+:10BAB0000000000000000000000000000000000086
62623+:10BAC0000000000000000000000000000000000076
62624+:10BAD0000000000000000000000000000000000066
62625+:10BAE0000000000000000000000000000000000056
62626+:10BAF0000000000000000000000000000000000046
62627+:10BB00000000000000000000000000000000000035
62628+:10BB10000000000000000000000000000000000025
62629+:10BB20000000000000000000000000000000000015
62630+:10BB30000000000000000000000000000000000005
62631+:10BB400000000000000000000000000000000000F5
62632+:10BB500000000000000000000000000000000000E5
62633+:10BB600000000000000000000000000000000000D5
62634+:10BB700000000000000000000000000000000000C5
62635+:10BB800000000000000000000000000000000000B5
62636+:10BB900000000000000000000000000000000000A5
62637+:10BBA0000000000000000000000000000000000095
62638+:10BBB0000000000000000000000000000000000085
62639+:10BBC0000000000000000000000000000000000075
62640+:10BBD0000000000000000000000000000000000065
62641+:10BBE0000000000000000000000000000000000055
62642+:10BBF0000000000000000000000000000000000045
62643+:10BC00000000000000000000000000000000000034
62644+:10BC10000000000000000000000000000000000024
62645+:10BC20000000000000000000000000000000000014
62646+:10BC30000000000000000000000000000000000004
62647+:10BC400000000000000000000000000000000000F4
62648+:10BC500000000000000000000000000000000000E4
62649+:10BC600000000000000000000000000000000000D4
62650+:10BC700000000000000000000000000000000000C4
62651+:10BC800000000000000000000000000000000000B4
62652+:10BC900000000000000000000000000000000000A4
62653+:10BCA0000000000000000000000000000000000094
62654+:10BCB0000000000000000000000000000000000084
62655+:10BCC0000000000000000000000000000000000074
62656+:10BCD0000000000000000000000000000000000064
62657+:10BCE0000000000000000000000000000000000054
62658+:10BCF0000000000000000000000000000000000044
62659+:10BD00000000000000000000000000000000000033
62660+:10BD10000000000000000000000000000000000023
62661+:10BD20000000000000000000000000000000000013
62662+:10BD30000000000000000000000000000000000003
62663+:10BD400000000000000000000000000000000000F3
62664+:10BD500000000000000000000000000000000000E3
62665+:10BD600000000000000000000000000000000000D3
62666+:10BD700000000000000000000000000000000000C3
62667+:10BD800000000000000000000000000000000000B3
62668+:10BD900000000000000000000000000000000000A3
62669+:10BDA0000000000000000000000000000000000093
62670+:10BDB0000000000000000000000000000000000083
62671+:10BDC0000000000000000000000000000000000073
62672+:10BDD0000000000000000000000000000000000063
62673+:10BDE0000000000000000000000000000000000053
62674+:10BDF0000000000000000000000000000000000043
62675+:10BE00000000000000000000000000000000000032
62676+:10BE10000000000000000000000000000000000022
62677+:10BE20000000000000000000000000000000000012
62678+:10BE30000000000000000000000000000000000002
62679+:10BE400000000000000000000000000000000000F2
62680+:10BE500000000000000000000000000000000000E2
62681+:10BE600000000000000000000000000000000000D2
62682+:10BE700000000000000000000000000000000000C2
62683+:10BE800000000000000000000000000000000000B2
62684+:10BE900000000000000000000000000000000000A2
62685+:10BEA0000000000000000000000000000000000092
62686+:10BEB0000000000000000000000000000000000082
62687+:10BEC0000000000000000000000000000000000072
62688+:10BED0000000000000000000000000000000000062
62689+:10BEE0000000000000000000000000000000000052
62690+:10BEF0000000000000000000000000000000000042
62691+:10BF00000000000000000000000000000000000031
62692+:10BF10000000000000000000000000000000000021
62693+:10BF20000000000000000000000000000000000011
62694+:10BF30000000000000000000000000000000000001
62695+:10BF400000000000000000000000000000000000F1
62696+:10BF500000000000000000000000000000000000E1
62697+:10BF600000000000000000000000000000000000D1
62698+:10BF700000000000000000000000000000000000C1
62699+:10BF800000000000000000000000000000000000B1
62700+:10BF900000000000000000000000000000000000A1
62701+:10BFA0000000000000000000000000000000000091
62702+:10BFB0000000000000000000000000000000000081
62703+:10BFC0000000000000000000000000000000000071
62704+:10BFD0000000000000000000000000000000000061
62705+:10BFE0000000000000000000000000000000000051
62706+:10BFF0000000000000000000000000000000000041
62707+:10C000000000000000000000000000000000000030
62708+:10C010000000000000000000000000000000000020
62709+:10C020000000000000000000000000000000000010
62710+:10C030000000000000000000000000000000000000
62711+:10C0400000000000000000000000000000000000F0
62712+:10C0500000000000000000000000000000000000E0
62713+:10C0600000000000000000000000000000000000D0
62714+:10C0700000000000000000000000000000000000C0
62715+:10C0800000000000000000000000000000000000B0
62716+:10C0900000000000000000000000000000000000A0
62717+:10C0A0000000000000000000000000000000000090
62718+:10C0B0000000000000000000000000000000000080
62719+:10C0C0000000000000000000000000000000000070
62720+:10C0D0000000000000000000000000000000000060
62721+:10C0E0000000000000000000000000000000000050
62722+:10C0F0000000000000000000000000000000000040
62723+:10C10000000000000000000000000000000000002F
62724+:10C11000000000000000000000000000000000001F
62725+:10C12000000000000000000000000000000000000F
62726+:10C1300000000000000000000000000000000000FF
62727+:10C1400000000000000000000000000000000000EF
62728+:10C1500000000000000000000000000000000000DF
62729+:10C1600000000000000000000000000000000000CF
62730+:10C1700000000000000000000000000000000000BF
62731+:10C1800000000000000000000000000000000000AF
62732+:10C19000000000000000000000000000000000009F
62733+:10C1A000000000000000000000000000000000008F
62734+:10C1B000000000000000000000000000000000007F
62735+:10C1C000000000000000000000000000000000006F
62736+:10C1D000000000000000000000000000000000005F
62737+:10C1E000000000000000000000000000000000004F
62738+:10C1F000000000000000000000000000000000003F
62739+:10C20000000000000000000000000000000000002E
62740+:10C21000000000000000000000000000000000001E
62741+:10C22000000000000000000000000000000000000E
62742+:10C2300000000000000000000000000000000000FE
62743+:10C2400000000000000000000000000000000000EE
62744+:10C2500000000000000000000000000000000000DE
62745+:10C2600000000000000000000000000000000000CE
62746+:10C2700000000000000000000000000000000000BE
62747+:10C2800000000000000000000000000000000000AE
62748+:10C29000000000000000000000000000000000009E
62749+:10C2A000000000000000000000000000000000008E
62750+:10C2B000000000000000000000000000000000007E
62751+:10C2C000000000000000000000000000000000006E
62752+:10C2D000000000000000000000000000000000005E
62753+:10C2E000000000000000000000000000000000004E
62754+:10C2F000000000000000000000000000000000003E
62755+:10C30000000000000000000000000000000000002D
62756+:10C31000000000000000000000000000000000001D
62757+:10C32000000000000000000000000000000000000D
62758+:10C3300000000000000000000000000000000000FD
62759+:10C3400000000000000000000000000000000000ED
62760+:10C3500000000000000000000000000000000000DD
62761+:10C3600000000000000000000000000000000000CD
62762+:10C3700000000000000000000000000000000000BD
62763+:10C3800000000000000000000000000000000000AD
62764+:10C39000000000000000000000000000000000009D
62765+:10C3A000000000000000000000000000000000008D
62766+:10C3B000000000000000000000000000000000007D
62767+:10C3C000000000000000000000000000000000006D
62768+:10C3D000000000000000000000000000000000005D
62769+:10C3E000000000000000000000000000000000004D
62770+:10C3F000000000000000000000000000000000003D
62771+:10C40000000000000000000000000000000000002C
62772+:10C41000000000000000000000000000000000001C
62773+:10C42000000000000000000000000000000000000C
62774+:10C4300000000000000000000000000000000000FC
62775+:10C4400000000000000000000000000000000000EC
62776+:10C4500000000000000000000000000000000000DC
62777+:10C4600000000000000000000000000000000000CC
62778+:10C4700000000000000000000000000000000000BC
62779+:10C4800000000000000000000000000000000000AC
62780+:10C49000000000000000000000000000000000009C
62781+:10C4A000000000000000000000000000000000008C
62782+:10C4B000000000000000000000000000000000007C
62783+:10C4C000000000000000000000000000000000006C
62784+:10C4D000000000000000000000000000000000005C
62785+:10C4E000000000000000000000000000000000004C
62786+:10C4F000000000000000000000000000000000003C
62787+:10C50000000000000000000000000000000000002B
62788+:10C51000000000000000000000000000000000001B
62789+:10C52000000000000000000000000000000000000B
62790+:10C5300000000000000000000000000000000000FB
62791+:10C5400000000000000000000000000000000000EB
62792+:10C5500000000000000000000000000000000000DB
62793+:10C5600000000000000000000000000000000000CB
62794+:10C5700000000000000000000000000000000000BB
62795+:10C5800000000000000000000000000000000000AB
62796+:10C59000000000000000000000000000000000009B
62797+:10C5A000000000000000000000000000000000008B
62798+:10C5B000000000000000000000000000000000007B
62799+:10C5C000000000000000000000000000000000006B
62800+:10C5D000000000000000000000000000000000005B
62801+:10C5E000000000000000000000000000000000004B
62802+:10C5F000000000000000000000000000000000003B
62803+:10C60000000000000000000000000000000000002A
62804+:10C61000000000000000000000000000000000001A
62805+:10C62000000000000000000000000000000000000A
62806+:10C6300000000000000000000000000000000000FA
62807+:10C6400000000000000000000000000000000000EA
62808+:10C6500000000000000000000000000000000000DA
62809+:10C6600000000000000000000000000000000000CA
62810+:10C6700000000000000000000000000000000000BA
62811+:10C6800000000000000000000000000000000000AA
62812+:10C69000000000000000000000000000000000009A
62813+:10C6A000000000000000000000000000000000008A
62814+:10C6B000000000000000000000000000000000007A
62815+:10C6C000000000000000000000000000000000006A
62816+:10C6D000000000000000000000000000000000005A
62817+:10C6E000000000000000000000000000000000004A
62818+:10C6F000000000000000000000000000000000003A
62819+:10C700000000000000000000000000000000000029
62820+:10C710000000000000000000000000000000000019
62821+:10C720000000000000000000000000000000000009
62822+:10C7300000000000000000000000000000000000F9
62823+:10C7400000000000000000000000000000000000E9
62824+:10C7500000000000000000000000000000000000D9
62825+:10C7600000000000000000000000000000000000C9
62826+:10C7700000000000000000000000000000000000B9
62827+:10C7800000000000000000000000000000000000A9
62828+:10C790000000000000000000000000000000000099
62829+:10C7A0000000000000000000000000000000000089
62830+:10C7B0000000000000000000000000000000000079
62831+:10C7C0000000000000000000000000000000000069
62832+:10C7D0000000000000000000000000000000000059
62833+:10C7E0000000000000000000000000000000000049
62834+:10C7F0000000000000000000000000000000000039
62835+:10C800000000000000000000000000000000000028
62836+:10C810000000000000000000000000000000000018
62837+:10C820000000000000000000000000000000000008
62838+:10C8300000000000000000000000000000000000F8
62839+:10C8400000000000000000000000000000000000E8
62840+:10C8500000000000000000000000000000000000D8
62841+:10C8600000000000000000000000000000000000C8
62842+:10C8700000000000000000000000000000000000B8
62843+:10C8800000000000000000000000000000000000A8
62844+:10C890000000000000000000000000000000000098
62845+:10C8A0000000000000000000000000000000000088
62846+:10C8B0000000000000000000000000000000000078
62847+:10C8C0000000000000000000000000000000000068
62848+:10C8D0000000000000000000000000000000000058
62849+:10C8E0000000000000000000000000000000000048
62850+:10C8F0000000000000000000000000000000000038
62851+:10C900000000000000000000000000000000000027
62852+:10C910000000000000000000000000000000000017
62853+:10C920000000000000000000000000000000000007
62854+:10C9300000000000000000000000000000000000F7
62855+:10C9400000000000000000000000000000000000E7
62856+:10C9500000000000000000000000000000000000D7
62857+:10C9600000000000000000000000000000000000C7
62858+:10C9700000000000000000000000000000000000B7
62859+:10C9800000000000000000000000000000000000A7
62860+:10C990000000000000000000000000000000000097
62861+:10C9A0000000000000000000000000000000000087
62862+:10C9B0000000000000000000000000000000000077
62863+:10C9C0000000000000000000000000000000000067
62864+:10C9D0000000000000000000000000000000000057
62865+:10C9E0000000000000000000000000000000000047
62866+:10C9F0000000000000000000000000000000000037
62867+:10CA00000000000000000000000000000000000026
62868+:10CA10000000000000000000000000000000000016
62869+:10CA20000000000000000000000000000000000006
62870+:10CA300000000000000000000000000000000000F6
62871+:10CA400000000000000000000000000000000000E6
62872+:10CA500000000000000000000000000000000000D6
62873+:10CA600000000000000000000000000000000000C6
62874+:10CA700000000000000000000000000000000000B6
62875+:10CA800000000000000000000000000000000000A6
62876+:10CA90000000000000000000000000000000000096
62877+:10CAA0000000000000000000000000000000000086
62878+:10CAB0000000000000000000000000000000000076
62879+:10CAC0000000000000000000000000000000000066
62880+:10CAD0000000000000000000000000000000000056
62881+:10CAE0000000000000000000000000000000000046
62882+:10CAF0000000000000000000000000000000000036
62883+:10CB00000000000000000000000000000000000025
62884+:10CB10000000000000000000000000000000000015
62885+:10CB20000000000000000000000000000000000005
62886+:10CB300000000000000000000000000000000000F5
62887+:10CB400000000000000000000000000000000000E5
62888+:10CB500000000000000000000000000000000000D5
62889+:10CB600000000000000000000000000000000000C5
62890+:10CB700000000000000000000000000000000000B5
62891+:10CB800000000000000000000000000000000000A5
62892+:10CB90000000000000000000000000000000000095
62893+:10CBA0000000000000000000000000000000000085
62894+:10CBB0000000000000000000000000000000000075
62895+:10CBC0000000000000000000000000000000000065
62896+:10CBD0000000000000000000000000000000000055
62897+:10CBE0000000000000000000000000000000000045
62898+:10CBF0000000000000000000000000000000000035
62899+:10CC00000000000000000000000000000000000024
62900+:10CC10000000000000000000000000000000000014
62901+:10CC20000000000000000000000000000000000004
62902+:10CC300000000000000000000000000000000000F4
62903+:10CC400000000000000000000000000000000000E4
62904+:10CC500000000000000000000000000000000000D4
62905+:10CC600000000000000000000000000000000000C4
62906+:10CC700000000000000000000000000000000000B4
62907+:10CC800000000000000000000000000000000000A4
62908+:10CC90000000000000000000000000000000000094
62909+:10CCA0000000000000000000000000000000000084
62910+:10CCB0000000000000000000000000000000000074
62911+:10CCC0000000000000000000000000000000000064
62912+:10CCD0000000000000000000000000000000000054
62913+:10CCE0000000000000000000000000000000000044
62914+:10CCF0000000000000000000000000000000000034
62915+:10CD00000000000000000000000000000000000023
62916+:10CD10000000000000000000000000000000000013
62917+:10CD20000000000000000000000000000000000003
62918+:10CD300000000000000000000000000000000000F3
62919+:10CD400000000000000000000000000000000000E3
62920+:10CD500000000000000000000000000000000000D3
62921+:10CD600000000000000000000000000000000000C3
62922+:10CD700000000000000000000000000000000000B3
62923+:10CD800000000000000000000000000000000000A3
62924+:10CD90000000000000000000000000000000000093
62925+:10CDA0000000000000000000000000000000000083
62926+:10CDB0000000000000000000000000000000000073
62927+:10CDC0000000000000000000000000000000000063
62928+:10CDD0000000000000000000000000000000000053
62929+:10CDE0000000000000000000000000000000000043
62930+:10CDF0000000000000000000000000000000000033
62931+:10CE00000000000000000000000000000000000022
62932+:10CE10000000000000000000000000000000000012
62933+:10CE20000000000000000000000000000000000002
62934+:10CE300000000000000000000000000000000000F2
62935+:10CE400000000000000000000000000000000000E2
62936+:10CE500000000000000000000000000000000000D2
62937+:10CE600000000000000000000000000000000000C2
62938+:10CE700000000000000000000000000000000000B2
62939+:10CE800000000000000000000000000000000000A2
62940+:10CE90000000000000000000000000000000000092
62941+:10CEA0000000000000000000000000000000000082
62942+:10CEB0000000000000000000000000000000000072
62943+:10CEC0000000000000000000000000000000000062
62944+:10CED0000000000000000000000000000000000052
62945+:10CEE0000000000000000000000000000000000042
62946+:10CEF0000000000000000000000000000000000032
62947+:10CF00000000000000000000000000000000000021
62948+:10CF10000000000000000000000000000000000011
62949+:10CF20000000000000000000000000000000000001
62950+:10CF300000000000000000000000000000000000F1
62951+:10CF400000000000000000000000000000000000E1
62952+:10CF500000000000000000000000000000000000D1
62953+:10CF600000000000000000000000000000000000C1
62954+:10CF700000000000000000000000000000000000B1
62955+:10CF800000000000000000000000000000000000A1
62956+:10CF90000000000000000000000000000000000091
62957+:10CFA0000000000000000000000000000000000081
62958+:10CFB0000000000000000000000000000000000071
62959+:10CFC0000000000000000000000000000000000061
62960+:10CFD0000000000000000000000000000000000051
62961+:10CFE0000000000000000000000000000000000041
62962+:10CFF0000000000000000000000000000000000031
62963+:10D000000000000000000000000000000000000020
62964+:10D010000000000000000000000000000000000010
62965+:10D020000000000000000000000000000000000000
62966+:10D0300000000000000000000000000000000000F0
62967+:10D0400000000000000000000000000000000000E0
62968+:10D0500000000000000000000000000000000000D0
62969+:10D0600000000000000000000000000000000000C0
62970+:10D0700000000000000000000000000000000000B0
62971+:10D0800000000000000000000000000000000000A0
62972+:10D090000000000000000000000000000000000090
62973+:10D0A0000000000000000000000000000000000080
62974+:10D0B0000000000000000000000000000000000070
62975+:10D0C0000000000000000000000000000000000060
62976+:10D0D0000000000000000000000000000000000050
62977+:10D0E0000000000000000000000000000000000040
62978+:10D0F0000000000000000000000000000000000030
62979+:10D10000000000000000000000000000000000001F
62980+:10D11000000000000000000000000000000000000F
62981+:10D1200000000000000000000000000000000000FF
62982+:10D1300000000000000000000000000000000000EF
62983+:10D1400000000000000000000000000000000000DF
62984+:10D1500000000000000000000000000000000000CF
62985+:10D1600000000000000000000000000000000000BF
62986+:10D1700000000000000000000000000000000000AF
62987+:10D18000000000000000000000000000000000009F
62988+:10D19000000000000000000000000000000000008F
62989+:10D1A000000000000000000000000000000000007F
62990+:10D1B000000000000000000000000000000000006F
62991+:10D1C000000000000000000000000000000000005F
62992+:10D1D000000000000000000000000000000000004F
62993+:10D1E000000000000000000000000000000000003F
62994+:10D1F000000000000000000000000000000000002F
62995+:10D20000000000000000000000000000000000001E
62996+:10D21000000000000000000000000000000000000E
62997+:10D2200000000000000000000000000000000000FE
62998+:10D2300000000000000000000000000000000000EE
62999+:10D2400000000000000000000000000000000000DE
63000+:10D2500000000000000000000000000000000000CE
63001+:10D2600000000000000000000000000000000000BE
63002+:10D2700000000000000000000000000000000000AE
63003+:10D28000000000000000000000000000000000009E
63004+:10D29000000000000000000000000000000000008E
63005+:10D2A000000000000000000000000000000000007E
63006+:10D2B000000000000000000000000000000000006E
63007+:10D2C000000000000000000000000000000000005E
63008+:10D2D000000000000000000000000000000000004E
63009+:10D2E000000000000000000000000000000000003E
63010+:10D2F000000000000000000000000000000000002E
63011+:10D30000000000000000000000000000000000001D
63012+:10D31000000000000000000000000000000000000D
63013+:10D3200000000000000000000000000000000000FD
63014+:10D3300000000000000000000000000000000000ED
63015+:10D3400000000000000000000000000000000000DD
63016+:10D3500000000000000000000000000000000000CD
63017+:10D3600000000000000000000000000000000000BD
63018+:10D3700000000000000000000000000000000000AD
63019+:10D38000000000000000000000000000000000009D
63020+:10D39000000000000000000000000000000000008D
63021+:10D3A000000000000000000000000000000000007D
63022+:10D3B000000000000000000000000000000000006D
63023+:10D3C000000000000000000000000000000000005D
63024+:10D3D000000000000000000000000000000000004D
63025+:10D3E000000000000000000000000000000000003D
63026+:10D3F000000000000000000000000000000000002D
63027+:10D40000000000000000000000000000000000001C
63028+:10D41000000000000000000000000000000000000C
63029+:10D4200000000000000000000000000000000000FC
63030+:10D4300000000000000000000000000000000000EC
63031+:10D4400000000000000000000000000000000000DC
63032+:10D4500000000000000000000000000000000000CC
63033+:10D4600000000000000000000000000000000000BC
63034+:10D4700000000000000000000000000000000000AC
63035+:10D48000000000000000000000000000000000009C
63036+:10D49000000000000000000000000000000000008C
63037+:10D4A000000000000000000000000000000000007C
63038+:10D4B000000000000000000000000000000000006C
63039+:10D4C000000000000000000000000000000000005C
63040+:10D4D000000000000000000000000000000000004C
63041+:10D4E000000000000000000000000000000000003C
63042+:10D4F000000000000000000000000000000000002C
63043+:10D50000000000000000000000000000000000001B
63044+:10D51000000000000000000000000000000000000B
63045+:10D5200000000000000000000000000000000000FB
63046+:10D5300000000000000000000000000000000000EB
63047+:10D5400000000000000000000000000000000000DB
63048+:10D5500000000000000000000000000000000000CB
63049+:10D5600000000000000000000000000000000000BB
63050+:10D5700000000000000000000000000000000000AB
63051+:10D58000000000000000000000000000000000009B
63052+:10D59000000000000000000000000000000000008B
63053+:10D5A000000000000000000000000000000000007B
63054+:10D5B000000000000000000000000000000000006B
63055+:10D5C000000000000000000000000000000000005B
63056+:10D5D000000000000000000000000000000000004B
63057+:10D5E000000000000000000000000000000000003B
63058+:10D5F000000000000000000000000000000000002B
63059+:10D60000000000000000000000000000000000001A
63060+:10D61000000000000000000000000000000000000A
63061+:10D6200000000000000000000000000000000000FA
63062+:10D6300000000000000000000000000000000000EA
63063+:10D6400000000000000000000000000000000000DA
63064+:10D6500000000000000000000000000000000000CA
63065+:10D6600000000000000000000000000000000000BA
63066+:10D6700000000000000000000000000000000000AA
63067+:10D68000000000000000000000000000000000009A
63068+:10D69000000000000000000000000000000000008A
63069+:10D6A000000000000000000000000000000000007A
63070+:10D6B000000000000000000000000000000000006A
63071+:10D6C000000000000000000000000000000000005A
63072+:10D6D000000000000000000000000000000000004A
63073+:10D6E000000000000000000000000000000000003A
63074+:10D6F000000000000000000000000000000000002A
63075+:10D700000000000000000000000000000000000019
63076+:10D710000000000000000000000000000000000009
63077+:10D7200000000000000000000000000000000000F9
63078+:10D7300000000000000000000000000000000000E9
63079+:10D7400000000000000000000000000000000000D9
63080+:10D7500000000000000000000000000000000000C9
63081+:10D7600000000000000000000000000000000000B9
63082+:10D7700000000000000000000000000000000000A9
63083+:10D780000000000000000000000000000000000099
63084+:10D790000000000000000000000000000000000089
63085+:10D7A0000000000000000000000000000000000079
63086+:10D7B0000000000000000000000000000000000069
63087+:10D7C0000000000000000000000000000000000059
63088+:10D7D0000000000000000000000000000000000049
63089+:10D7E0000000000000000000000000000000000039
63090+:10D7F0000000000000000000000000000000000029
63091+:10D800000000000000000000000000000000000018
63092+:10D810000000000000000000000000000000000008
63093+:10D8200000000000000000000000000000000000F8
63094+:10D8300000000000000000000000000000000000E8
63095+:10D8400000000000000000000000000000000000D8
63096+:10D8500000000000000000000000000000000000C8
63097+:10D8600000000000000000000000000000000000B8
63098+:10D8700000000000000000000000000000000000A8
63099+:10D880000000000000000000000000000000000098
63100+:10D890000000000000000000000000000000000088
63101+:10D8A0000000000000000000000000000000000078
63102+:10D8B0000000000000000000000000000000000068
63103+:10D8C0000000000000000000000000000000000058
63104+:10D8D0000000000000000000000000000000000048
63105+:10D8E0000000000000000000000000000000000038
63106+:10D8F0000000000000000000000000000000000028
63107+:10D900000000000000000000000000000000000017
63108+:10D910000000000000000000000000000000000007
63109+:10D9200000000000000000000000000000000000F7
63110+:10D9300000000000000000000000000000000000E7
63111+:10D9400000000000000000000000000000000000D7
63112+:10D9500000000000000000000000000000000000C7
63113+:10D9600000000000000000000000000000000000B7
63114+:10D9700000000000000000000000000000000000A7
63115+:10D980000000000000000000000000000000000097
63116+:10D990000000000000000000000000000000000087
63117+:10D9A0000000000000000000000000000000000077
63118+:10D9B0000000000000000000000000000000000067
63119+:10D9C0000000000000000000000000000000000057
63120+:10D9D0000000000000000000000000000000000047
63121+:10D9E0000000000000000000000000000000000037
63122+:10D9F0000000000000000000000000000000000027
63123+:10DA00000000000000000000000000000000000016
63124+:10DA10000000000000000000000000000000000006
63125+:10DA200000000000000000000000000000000000F6
63126+:10DA300000000000000000000000000000000000E6
63127+:10DA400000000000000000000000000000000000D6
63128+:10DA500000000000000000000000000000000000C6
63129+:10DA600000000000000000000000000000000000B6
63130+:10DA700000000000000000000000000000000000A6
63131+:10DA80000000000000000000000000000000000096
63132+:10DA90000000000000000000000000000000000086
63133+:10DAA0000000000000000000000000000000000076
63134+:10DAB0000000000000000000000000000000000066
63135+:10DAC0000000000000000000000000000000000056
63136+:10DAD0000000000000000000000000000000000046
63137+:10DAE0000000000000000000000000000000000036
63138+:10DAF0000000000000000000000000000000000026
63139+:10DB00000000000000000000000000000000000015
63140+:10DB10000000000000000000000000000000000005
63141+:10DB200000000000000000000000000000000000F5
63142+:10DB300000000000000000000000000000000000E5
63143+:10DB400000000000000000000000000000000000D5
63144+:10DB500000000000000000000000000000000000C5
63145+:10DB600000000000000000000000000000000000B5
63146+:10DB700000000000000000000000000000000000A5
63147+:10DB80000000000000000000000000000000000095
63148+:10DB90000000000000000000000000000000000085
63149+:10DBA0000000000000000000000000000000000075
63150+:10DBB0000000000000000000000000000000000065
63151+:10DBC0000000000000000000000000000000000055
63152+:10DBD0000000000000000000000000000000000045
63153+:10DBE0000000000000000000000000000000000035
63154+:10DBF0000000000000000000000000000000000025
63155+:10DC00000000000000000000000000000000000014
63156+:10DC10000000000000000000000000000000000004
63157+:10DC200000000000000000000000000000000000F4
63158+:10DC300000000000000000000000000000000000E4
63159+:10DC400000000000000000000000000000000000D4
63160+:10DC500000000000000000000000000000000000C4
63161+:10DC600000000000000000000000000000000000B4
63162+:10DC700000000000000000000000000000000000A4
63163+:10DC80000000000000000000000000000000000094
63164+:10DC90000000000000000000000000000000000084
63165+:10DCA0000000000000000000000000000000000074
63166+:10DCB0000000000000000000000000000000000064
63167+:10DCC0000000000000000000000000000000000054
63168+:10DCD0000000000000000000000000000000000044
63169+:10DCE0000000000000000000000000000000000034
63170+:10DCF0000000000000000000000000000000000024
63171+:10DD00000000000000000000000000000000000013
63172+:10DD10000000000000000000000000000000000003
63173+:10DD200000000000000000000000000000000000F3
63174+:10DD300000000000000000000000000000000000E3
63175+:10DD400000000000000000000000000000000000D3
63176+:10DD500000000000000000000000000000000000C3
63177+:10DD600000000000000000000000000000000000B3
63178+:10DD700000000000000000000000000000000000A3
63179+:10DD80000000000000000000000000000000000093
63180+:10DD90000000000000000000000000000000000083
63181+:10DDA0000000000000000000000000000000000073
63182+:10DDB0000000000000000000000000000000000063
63183+:10DDC0000000000000000000000000000000000053
63184+:10DDD0000000000000000000000000000000000043
63185+:10DDE0000000000000000000000000000000000033
63186+:10DDF0000000000000000000000000000000000023
63187+:10DE00000000000000000000000000000000000012
63188+:10DE10000000000000000000000000000000000002
63189+:10DE200000000000000000000000000000000000F2
63190+:10DE300000000000000000000000000000000000E2
63191+:10DE400000000000000000000000000000000000D2
63192+:10DE500000000000000000000000000000000000C2
63193+:10DE600000000000000000000000000000000000B2
63194+:10DE700000000000000000000000000000000000A2
63195+:10DE80000000000000000000000000000000000092
63196+:10DE90000000000000000000000000000000000082
63197+:10DEA0000000000000000000000000000000000072
63198+:10DEB0000000000000000000000000000000000062
63199+:10DEC0000000000000000000000000000000000052
63200+:10DED0000000000000000000000000000000000042
63201+:10DEE0000000000000000000000000000000000032
63202+:10DEF0000000000000000000000000000000000022
63203+:10DF00000000000000000000000000000000000011
63204+:10DF10000000000000000000000000000000000001
63205+:10DF200000000000000000000000000000000000F1
63206+:10DF300000000000000000000000000000000000E1
63207+:10DF400000000000000000000000000000000000D1
63208+:10DF500000000000000000000000000000000000C1
63209+:10DF600000000000000000000000000000000000B1
63210+:10DF700000000000000000000000000000000000A1
63211+:10DF80000000000000000000000000000000000091
63212+:10DF90000000000000000000000000000000000081
63213+:10DFA0000000000000000000000000000000000071
63214+:10DFB0000000000000000000000000000000000061
63215+:10DFC0000000000000000000000000000000000051
63216+:10DFD0000000000000000000000000000000000041
63217+:10DFE0000000000000000000000000000000000031
63218+:10DFF0000000000000000000000000000000000021
63219+:10E000000000000000000000000000000000000010
63220+:10E010000000000000000000000000000000000000
63221+:10E0200000000000000000000000000000000000F0
63222+:10E0300000000000000000000000000000000000E0
63223+:10E0400000000000000000000000000000000000D0
63224+:10E0500000000000000000000000000000000000C0
63225+:10E0600000000000000000000000000000000000B0
63226+:10E0700000000000000000000000000000000000A0
63227+:10E080000000000000000000000000000000000090
63228+:10E090000000000000000000000000000000000080
63229+:10E0A0000000000000000000000000000000000070
63230+:10E0B0000000000000000000000000000000000060
63231+:10E0C0000000000000000000000000000000000050
63232+:10E0D0000000000000000000000000000000000040
63233+:10E0E0000000000000000000000000000000000030
63234+:10E0F0000000000000000000000000000000000020
63235+:10E10000000000000000000000000000000000000F
63236+:10E1100000000000000000000000000000000000FF
63237+:10E1200000000000000000000000000000000000EF
63238+:10E1300000000000000000000000000000000000DF
63239+:10E1400000000000000000000000000000000000CF
63240+:10E1500000000000000000000000000000000000BF
63241+:10E1600000000000000000000000000000000000AF
63242+:10E17000000000000000000000000000000000009F
63243+:10E18000000000000000000000000000000000008F
63244+:10E19000000000000000000000000000000000007F
63245+:10E1A000000000000000000000000000000000006F
63246+:10E1B000000000000000000000000000000000005F
63247+:10E1C000000000000000000000000000000000004F
63248+:10E1D000000000000000000000000000000000003F
63249+:10E1E000000000000000000000000000000000002F
63250+:10E1F000000000000000000000000000000000809F
63251+:10E20000000000000000000000000000000000000E
63252+:10E2100000000000000000000000000000000000FE
63253+:10E220000000000A000000000000000000000000E4
63254+:10E2300010000003000000000000000D0000000DB1
63255+:10E240003C020801244295C03C030801246397FC6A
63256+:10E25000AC4000000043202B1480FFFD244200044A
63257+:10E260003C1D080037BD9FFC03A0F0213C100800B6
63258+:10E27000261032103C1C0801279C95C00E0012BECF
63259+:10E28000000000000000000D3C02800030A5FFFFF0
63260+:10E2900030C600FF344301803C0880008D0901B87E
63261+:10E2A0000520FFFE00000000AC6400002404000212
63262+:10E2B000A4650008A066000AA064000BAC67001803
63263+:10E2C0003C03100003E00008AD0301B83C0560000A
63264+:10E2D0008CA24FF80440FFFE00000000ACA44FC029
63265+:10E2E0003C0310003C040200ACA44FC403E000084F
63266+:10E2F000ACA34FF89486000C00A050212488001491
63267+:10E3000000062B0200051080004448210109182B4B
63268+:10E310001060001100000000910300002C6400094F
63269+:10E320005080000991190001000360803C0D080134
63270+:10E3300025AD9258018D58218D67000000E000083E
63271+:10E340000000000091190001011940210109302B42
63272+:10E3500054C0FFF29103000003E000080000102108
63273+:10E360000A000CCC25080001910F0001240E000AC0
63274+:10E3700015EE00400128C8232F38000A1700003D81
63275+:10E38000250D00028D580000250F0006370E0100F4
63276+:10E39000AD4E0000910C000291AB000191A400026F
63277+:10E3A00091A60003000C2E00000B3C0000A71025D6
63278+:10E3B00000041A000043C8250326C025AD580004F8
63279+:10E3C000910E000691ED000191E7000291E5000336
63280+:10E3D000000E5E00000D6400016C30250007220075
63281+:10E3E00000C41025004518252508000A0A000CCC99
63282+:10E3F000AD430008910F000125040002240800022B
63283+:10E4000055E80001012020210A000CCC00804021A9
63284+:10E41000910C0001240B0003158B00160000000076
63285+:10E420008D580000910E000225080003370D0008EA
63286+:10E43000A14E00100A000CCCAD4D00009119000156
63287+:10E44000240F0004172F000B0000000091070002AA
63288+:10E45000910400038D43000000072A0000A410254A
63289+:10E460003466000425080004AD42000C0A000CCC00
63290+:10E47000AD46000003E000082402000127BDFFE8CC
63291+:10E48000AFBF0014AFB000100E00164E0080802108
63292+:10E490003C0480083485008090A600052403FFFE1C
63293+:10E4A0000200202100C310248FBF00148FB0001081
63294+:10E4B000A0A200050A00165827BD001827BDFFE8D6
63295+:10E4C000AFB00010AFBF00140E000FD40080802149
63296+:10E4D0003C06800834C5008090A40000240200504F
63297+:10E4E000308300FF106200073C09800002002021F9
63298+:10E4F0008FBF00148FB00010AD2001800A00108F74
63299+:10E5000027BD0018240801003C07800002002021DC
63300+:10E510008FBF00148FB00010ACE801800A00108F8C
63301+:10E5200027BD001827BDFF783C058008AFBE0080DE
63302+:10E53000AFB7007CAFB3006CAFB10064AFBF008475
63303+:10E54000AFB60078AFB50074AFB40070AFB200687A
63304+:10E55000AFB0006034A600803C0580008CB201287A
63305+:10E5600090C400098CA701043C020001309100FF17
63306+:10E5700000E218240000B8210000F021106000071C
63307+:10E58000000098213C0908008D2931F02413000176
63308+:10E59000252800013C010800AC2831F0ACA0008423
63309+:10E5A00090CC0005000C5827316A0001154000721C
63310+:10E5B000AFA0005090CD00002406002031A400FF41
63311+:10E5C00010860018240E0050108E009300000000EA
63312+:10E5D0003C1008008E1000DC260F00013C010800F2
63313+:10E5E000AC2F00DC0E0016C7000000000040182110
63314+:10E5F0008FBF00848FBE00808FB7007C8FB60078FD
63315+:10E600008FB500748FB400708FB3006C8FB2006848
63316+:10E610008FB100648FB000600060102103E000083B
63317+:10E6200027BD00880000000D3C1F8000AFA0003017
63318+:10E6300097E501168FE201043C04002030B9FFFF8A
63319+:10E64000004438240007182B00033140AFA60030E7
63320+:10E650008FF5010437F80C003C1600400338802188
63321+:10E6600002B6A02434C40040128000479215000D69
63322+:10E6700032A800201500000234860080008030217E
63323+:10E6800014C0009FAFA600303C0D800835A6008066
63324+:10E6900090CC0008318B0040516000063C06800899
63325+:10E6A000240E0004122E00A8240F0012122F003294
63326+:10E6B0003C06800834C401003C0280009447011AE3
63327+:10E6C0009619000E909F00088E18000830E3FFFF97
63328+:10E6D00003F9B00432B40004AFB6005CAFA3005835
63329+:10E6E0008E1600041280002EAFB8005434C3008090
63330+:10E6F000906800083105004014A0002500000000CB
63331+:10E700008C70005002D090230640000500000000ED
63332+:10E710008C71003402D1A82306A201678EE20008A2
63333+:10E72000126000063C1280003C1508008EB531F4E2
63334+:10E7300026B600013C010800AC3631F4AE4000447E
63335+:10E74000240300018FBF00848FBE00808FB7007C40
63336+:10E750008FB600788FB500748FB400708FB3006CE3
63337+:10E760008FB200688FB100648FB00060006010212C
63338+:10E7700003E0000827BD00880E000D2800002021BE
63339+:10E780000A000D75004018210A000D9500C02021D7
63340+:10E790000E00171702C020211440FFE10000000006
63341+:10E7A0003C0B8008356400808C8A003402CA482300
63342+:10E7B0000520001D000000003C1E08008FDE310017
63343+:10E7C00027D700013C010800AC3731001260000679
63344+:10E7D000024020213C1408008E9431F42690000160
63345+:10E7E0003C010800AC3031F40E00164E3C1E80088F
63346+:10E7F00037CD008091B700250240202136EE00047D
63347+:10E800000E001658A1AE00250E000CAC02402021CF
63348+:10E810000A000DCA240300013C17080126F796C020
63349+:10E820000A000D843C1F80008C86003002C66023E5
63350+:10E830001980000C2419000C908F004F3C14080024
63351+:10E840008E94310032B500FC35ED0001268E0001BA
63352+:10E850003C010800AC2E3100A08D004FAFA0005845
63353+:10E860002419000CAFB900308C9800300316A02397
63354+:10E870001A80010B8FA300580074F82A17E0FFD309
63355+:10E88000000000001074002A8FA5005802D4B021A7
63356+:10E8900000B410233044FFFFAFA4005832A8000298
63357+:10E8A0001100002E32AB00103C15800836B00080FD
63358+:10E8B0009216000832D30040526000FB8EE200083E
63359+:10E8C0000E00164E02402021240A0018A20A000958
63360+:10E8D000921100052409FFFE024020210229902404
63361+:10E8E0000E001658A2120005240400390000282149
63362+:10E8F0000E0016F2240600180A000DCA24030001B7
63363+:10E9000092FE000C3C0A800835490080001EBB00C6
63364+:10E910008D27003836F10081024020213225F08118
63365+:10E920000E000C9B30C600FF0A000DC10000000065
63366+:10E930003AA7000130E300011460FFA402D4B02123
63367+:10E940000A000E1D00000000024020210E001734B6
63368+:10E95000020028210A000D75004018211160FF7087
63369+:10E960003C0F80083C0D800835EE00808DC40038D7
63370+:10E970008FA300548DA60004006660231D80FF68ED
63371+:10E98000000000000064C02307020001AFA400548F
63372+:10E990003C1F08008FFF31E433F9000113200015FC
63373+:10E9A0008FAC00583C07800094E3011A10600012FD
63374+:10E9B0003C0680080E00216A024020213C03080129
63375+:10E9C000906396F13064000214800145000000005D
63376+:10E9D000306C0004118000078FAC0058306600FBDB
63377+:10E9E0003C010801A02696F132B500FCAFA000580A
63378+:10E9F0008FAC00583C06800834D30080AFB40018B8
63379+:10EA0000AFB60010AFAC00143C088000950B01209D
63380+:10EA10008E6F0030966A005C8FA3005C8FBF003061
63381+:10EA20003169FFFF3144FFFF8FAE005401341021E4
63382+:10EA3000350540000064382B0045C82103E7C02598
63383+:10EA4000AFB90020AFAF0028AFB80030AFAF00249F
63384+:10EA5000AFA0002CAFAE0034926D000831B40008B6
63385+:10EA6000168000BB020020218EE200040040F8095D
63386+:10EA700027A400108FAF003031F300025660000170
63387+:10EA800032B500FE3C048008349F008093F90008F2
63388+:10EA900033380040530000138FA400248C850004F9
63389+:10EAA0008FA7005410A700D52404001432B0000131
63390+:10EAB0001200000C8FA400242414000C1234011A3C
63391+:10EAC0002A2D000D11A001022413000E240E000AAD
63392+:10EAD000522E0001241E00088FAF002425E40001FF
63393+:10EAE000AFA400248FAA00143C0B80083565008079
63394+:10EAF000008A48218CB10030ACA9003090A4004EAF
63395+:10EB00008CA700303408FFFF0088180400E3F821C8
63396+:10EB1000ACBF00348FA600308FB900548FB8005CB2
63397+:10EB200030C200081040000B033898218CAC002044
63398+:10EB3000119300D330C600FF92EE000C8FA7003473
63399+:10EB400002402021000E6B0035B400800E000C9BAB
63400+:10EB50003285F0803C028008345000808E0F0030F7
63401+:10EB600001F1302318C00097264800803C070800B8
63402+:10EB70008CE731E42404FF80010418243118007F5D
63403+:10EB80003C1F80003C19800430F10001AFE300908D
63404+:10EB900012200006031928213C030801906396F116
63405+:10EBA00030690008152000C6306A00F73C10800864
63406+:10EBB00036040080908C004F318B000115600042BC
63407+:10EBC000000000003C0608008CC6319830CE0010D2
63408+:10EBD00051C0004230F9000190AF006B55E0003F9A
63409+:10EBE00030F9000124180001A0B8006B3C1180002E
63410+:10EBF0009622007A24470064A48700123C0D800806
63411+:10EC000035A5008090B40008329000401600000442
63412+:10EC10003C03800832AE000115C0008B00000000EC
63413+:10EC2000346400808C86002010D3000A3463010015
63414+:10EC30008C67000002C7782319E000978FBF00544B
63415+:10EC4000AC93002024130001AC760000AFB3005059
63416+:10EC5000AC7F000417C0004E000000008FA90050D8
63417+:10EC60001520000B000000003C030801906396F1A2
63418+:10EC7000306A00011140002E8FAB0058306400FE56
63419+:10EC80003C010801A02496F10A000D75000018212E
63420+:10EC90000E000CAC024020210A000F1300000000FF
63421+:10ECA0000A000E200000A0210040F80924040017EB
63422+:10ECB0000A000DCA240300010040F80924040016CC
63423+:10ECC0000A000DCA240300019094004F240DFFFE9A
63424+:10ECD000028D2824A085004F30F900011320000682
63425+:10ECE0003C0480083C030801906396F1307F0010DB
63426+:10ECF00017E00051306800EF34900080240A0001D2
63427+:10ED0000024020210E00164EA60A00129203002592
63428+:10ED100024090001AFA90050346200010240202103
63429+:10ED20000E001658A20200250A000EF93C0D8008BC
63430+:10ED30001160FE83000018218FA5003030AC000464
63431+:10ED40001180FE2C8FBF00840A000DCB240300012C
63432+:10ED500027A500380E000CB6AFA000385440FF4382
63433+:10ED60008EE200048FB40038329001005200FF3F61
63434+:10ED70008EE200048FA3003C8E6E0058006E682364
63435+:10ED800005A3FF39AE6300580A000E948EE200041A
63436+:10ED90000E00164E024020213C038008346800809B
63437+:10EDA000024020210E001658A11E000903C0302188
63438+:10EDB000240400370E0016F2000028210A000F116B
63439+:10EDC0008FA900508FAB00185960FF8D3C0D800853
63440+:10EDD0000E00164E02402021920C00252405000151
63441+:10EDE000AFA5005035820004024020210E001658C5
63442+:10EDF000A20200250A000EF93C0D800812240059D9
63443+:10EE00002A2300151060004D240900162408000C68
63444+:10EE10005628FF2732B000013C0A8008914C001BA5
63445+:10EE20002406FFBD241E000E01865824A14B001BA2
63446+:10EE30000A000EA532B000013C010801A02896F19D
63447+:10EE40000A000EF93C0D80088CB500308EFE0008DB
63448+:10EE50002404001826B6000103C0F809ACB600303F
63449+:10EE60003C030801906396F13077000116E0FF81C2
63450+:10EE7000306A00018FB200300A000D753243000481
63451+:10EE80003C1080009605011A50A0FF2B34C60010DC
63452+:10EE90000A000EC892EE000C8C6200001456FF6D42
63453+:10EEA000000000008C7800048FB9005403388823D8
63454+:10EEB0000621FF638FBF00540A000F0E0000000000
63455+:10EEC0003C010801A02A96F10A000F3030F9000138
63456+:10EED0001633FF028FAF00240A000EB0241E00106C
63457+:10EEE0000E00164E024020213C0B80083568008041
63458+:10EEF00091090025240A0001AFAA0050353300040F
63459+:10EF0000024020210E001658A11300253C050801DF
63460+:10EF100090A596F130A200FD3C010801A02296F1D7
63461+:10EF20000A000E6D004018212411000E53D1FEEA94
63462+:10EF3000241E00100A000EAF241E00165629FEDC07
63463+:10EF400032B000013C0A8008914C001B2406FFBD32
63464+:10EF5000241E001001865824A14B001B0A000EA598
63465+:10EF600032B000010A000EA4241E00123C038000EF
63466+:10EF70008C6201B80440FFFE24040800AC6401B8B0
63467+:10EF800003E000080000000030A5FFFF30C6FFFFCF
63468+:10EF90003C0780008CE201B80440FFFE34EA0180A7
63469+:10EFA000AD440000ACE400203C0480089483004899
63470+:10EFB0003068FFFF11000016AF88000824AB001274
63471+:10EFC000010B482B512000133C04800034EF01005A
63472+:10EFD00095EE00208F890000240D001A31CCFFFF30
63473+:10EFE00031274000A14D000B10E000362583FFFEC5
63474+:10EFF0000103C02B170000348F9900048F88000490
63475+:10F00000A5430014350700010A001003AF87000470
63476+:10F010003C04800024030003348201808F890000B7
63477+:10F020008F870004A043000B3C088000350C018052
63478+:10F03000A585000EA585001A8F85000C30EB800099
63479+:10F04000A5890010AD850028A58600081160000F75
63480+:10F050008F85001435190100972A00163158FFFCDE
63481+:10F06000270F000401E870218DCD400031A6FFFF7D
63482+:10F0700014C000072403BFFF3C02FFFF34487FFF9A
63483+:10F0800000E83824AF8700048F8500142403BFFFF5
63484+:10F090003C04800000E3582434830180A46B0026E4
63485+:10F0A000AC69002C10A0000300054C02A465001000
63486+:10F0B000A46900263C071000AC8701B803E00008F3
63487+:10F0C000000000008F990004240AFFFE032A382460
63488+:10F0D0000A001003AF87000427BDFFE88FA20028B5
63489+:10F0E00030A5FFFF30C6FFFFAFBF0010AF87000C99
63490+:10F0F000AF820014AF8000040E000FDBAF80000071
63491+:10F100008FBF001027BD001803E00008AF80001477
63492+:10F110003C06800034C4007034C701008C8A0000B3
63493+:10F1200090E500128F84000027BDFFF030A300FFA0
63494+:10F13000000318823082400010400037246500032D
63495+:10F140000005C8800326C0218F0E4000246F0004F4
63496+:10F15000000F6880AFAE000001A660218D8B4000DB
63497+:10F16000AFAB000494E900163128FFFC01063821FA
63498+:10F170008CE64000AFA600088FA9000800003021EF
63499+:10F18000000028213C07080024E701000A0010675E
63500+:10F19000240800089059000024A500012CAC000CA4
63501+:10F1A0000079C0210018788001E770218DCD000022
63502+:10F1B0001180000600CD302603A5102114A8FFF50C
63503+:10F1C00000051A005520FFF4905900003C0480000F
63504+:10F1D000348700703C0508008CA531048CE30000E6
63505+:10F1E0002CA2002010400009006A38230005488046
63506+:10F1F0003C0B0800256B3108012B402124AA00019B
63507+:10F20000AD0700003C010800AC2A310400C0102109
63508+:10F2100003E0000827BD0010308220001040000BE2
63509+:10F2200000055880016648218D24400024680004B0
63510+:10F2300000083880AFA4000000E618218C6540006B
63511+:10F24000AFA000080A001057AFA500040000000D91
63512+:10F250000A0010588FA9000827BDFFE03C07800076
63513+:10F2600034E60100AFBF001CAFB20018AFB100140C
63514+:10F27000AFB0001094C5000E8F87000030A4FFFFD0
63515+:10F280002483000430E2400010400010AF830028C7
63516+:10F290003C09002000E940241100000D30EC800002
63517+:10F2A0008F8A0004240BBFFF00EB38243543100085
63518+:10F2B000AF87000030F220001640000B3C1900041C
63519+:10F2C000241FFFBF0A0010B7007F102430EC80001D
63520+:10F2D000158000423C0E002030F220001240FFF862
63521+:10F2E0008F8300043C19000400F9C0241300FFF5CB
63522+:10F2F000241FFFBF34620040AF82000430E20100EF
63523+:10F300001040001130F010008F83002C10600006B8
63524+:10F310003C0F80003C05002000E52024148000C044
63525+:10F320003C0800043C0F800035EE010095CD001E26
63526+:10F3300095CC001C31AAFFFF000C5C00014B482556
63527+:10F34000AF89000C30F010001200000824110001F9
63528+:10F3500030F100201620008B3C18100000F890249B
63529+:10F36000164000823C040C002411000130E801002A
63530+:10F370001500000B3C0900018F85000430A94000F6
63531+:10F38000152000073C0900013C0C1F0100EC58242B
63532+:10F390003C0A1000116A01183C1080003C09000171
63533+:10F3A00000E9302410C000173C0B10003C18080086
63534+:10F3B0008F1800243307000214E0014024030001E9
63535+:10F3C0008FBF001C8FB200188FB100148FB00010D7
63536+:10F3D0000060102103E0000827BD002000EE682433
63537+:10F3E00011A0FFBE30F220008F8F00043C11FFFF00
63538+:10F3F00036307FFF00F0382435E380000A0010A685
63539+:10F40000AF87000000EB102450400065AF8000245F
63540+:10F410008F8C002C3C0D0F0000ED18241580008807
63541+:10F42000AF83001030E8010011000086938F0010B8
63542+:10F430003C0A0200106A00833C1280003650010032
63543+:10F44000920500139789002A3626000230AF00FF8C
63544+:10F4500025EE0004000E19C03C0480008C9801B811
63545+:10F460000700FFFE34880180AD0300003C198008CE
63546+:10F47000AC830020973100483225FFFF10A0015CCB
63547+:10F48000AF8500082523001200A3F82B53E0015993
63548+:10F490008F850004348D010095AC00202402001AF1
63549+:10F4A00030E44000318BFFFFA102000B108001927D
63550+:10F4B0002563FFFE00A3502B154001908F8F0004A1
63551+:10F4C000A50300148F88000435050001AF850004F2
63552+:10F4D0003C08800035190180A729000EA729001AD1
63553+:10F4E0008F89000C30B18000A7270010AF290028B9
63554+:10F4F000A72600081220000E3C04800035020100FF
63555+:10F50000944C0016318BFFFC256400040088182100
63556+:10F510008C7F400033E6FFFF14C000053C048000F0
63557+:10F520003C0AFFFF354D7FFF00AD2824AF85000466
63558+:10F53000240EBFFF00AE402434850180A4A800261D
63559+:10F54000ACA7002C3C071000AC8701B800001821C4
63560+:10F550008FBF001C8FB200188FB100148FB0001045
63561+:10F560000060102103E0000827BD00203C020BFFD3
63562+:10F5700000E41824345FFFFF03E3C82B5320FF7B14
63563+:10F58000241100013C0608008CC6002C24C5000193
63564+:10F590003C010800AC25002C0A0010D42411000501
63565+:10F5A0008F85002410A0002FAF80001090A30000D2
63566+:10F5B000146000792419000310A0002A30E601002D
63567+:10F5C00010C000CC8F860010241F000210DF00C97D
63568+:10F5D0008F8B000C3C0708008CE7003824E4FFFF09
63569+:10F5E00014E0000201641824000018213C0D0800FA
63570+:10F5F00025AD0038006D1021904C00048F85002847
63571+:10F6000025830004000321C030A5FFFF3626000239
63572+:10F610000E000FDB000000000A00114D0000182151
63573+:10F6200000E8302414C0FF403C0F80000E00103D65
63574+:10F63000000000008F8700000A0010CAAF82000C93
63575+:10F64000938F00103C18080127189640000F90C0B7
63576+:10F6500002588021AF9000248F85002414A0FFD38E
63577+:10F66000AF8F00103C0480008C86400030C5010044
63578+:10F6700010A000BC322300043C0C08008D8C002438
63579+:10F6800024120004106000C23190000D3C04800080
63580+:10F690008C8D40003402FFFF11A201003231FFFBCC
63581+:10F6A0008C884000310A01005540000124110010EF
63582+:10F6B00030EE080011C000BE2419FFFB8F9800280F
63583+:10F6C0002F0F03EF51E000010219802430E90100FF
63584+:10F6D00011200014320800018F87002C14E000FB79
63585+:10F6E0008F8C000C3C05800034AB0100917F00132F
63586+:10F6F00033E300FF246A00042403FFFE0203802496
63587+:10F70000000A21C012000002023230253226FFFF1B
63588+:10F710000E000FDB9785002A1200FF290000182138
63589+:10F72000320800011100000D32180004240E0001FF
63590+:10F73000120E0002023230253226FFFF9785002A82
63591+:10F740000E000FDB00002021240FFFFE020F80249B
63592+:10F750001200FF1B00001821321800045300FF188C
63593+:10F760002403000102323025241200045612000145
63594+:10F770003226FFFF9785002A0E000FDB24040100CC
63595+:10F780002419FFFB021988241220FF0D0000182104
63596+:10F790000A0010E9240300011079009C00003021C8
63597+:10F7A00090AD00012402000211A200BE30EA004028
63598+:10F7B00090B90001241800011338007F30E900409F
63599+:10F7C0008CA600049785002A00C020210E000FDBC4
63600+:10F7D0003626000200004021010018218FBF001CC6
63601+:10F7E0008FB200188FB100148FB00010006010218C
63602+:10F7F00003E0000827BD0020360F010095EE000C45
63603+:10F8000031CD020015A0FEE63C0900013C1880083D
63604+:10F81000971200489789002A362600023248FFFFD7
63605+:10F82000AF8800083C0380008C7101B80620FFFE01
63606+:10F83000346A0180AD4000001100008E3C0F800052
63607+:10F84000253F0012011FC82B1320008B240E00033C
63608+:10F85000346C0100958B00202402001A30E4400033
63609+:10F860003163FFFFA142000B108000A72463FFFE5D
63610+:10F870000103682B15A000A52408FFFE34A5000194
63611+:10F88000A5430014AF8500043C0480002412BFFF90
63612+:10F8900000B2802434850180A4A9000EA4A9001A16
63613+:10F8A000A4A60008A4B00026A4A700103C071000DE
63614+:10F8B000AC8701B80A00114D000018213C038000FC
63615+:10F8C00034640100949F000E3C1908008F3900D861
63616+:10F8D0002404008033E5FFFF273100013C010800CC
63617+:10F8E000AC3100D80E000FDB240600030A00114DD6
63618+:10F8F00000001821240A000210CA00598F85002830
63619+:10F900003C0308008C6300D0240E0001106E005EE2
63620+:10F910002CCF000C24D2FFFC2E5000041600002136
63621+:10F9200000002021241800021078001B2CD9000CA4
63622+:10F9300024DFFFF82FE900041520FF330000202109
63623+:10F9400030EB020051600004000621C054C00022C8
63624+:10F9500030A5FFFF000621C030A5FFFF0A00117D82
63625+:10F96000362600023C0908008D29002431300001B0
63626+:10F970005200FEF7000018219785002A3626000263
63627+:10F980000E000FDB000020210A00114D000018219D
63628+:10F990000A00119C241200021320FFE624DFFFF866
63629+:10F9A0000000202130A5FFFF0A00117D362600024D
63630+:10F9B0000A0011AC021980245120FF828CA6000499
63631+:10F9C0003C05080190A5964110A0FF7E2408000187
63632+:10F9D0000A0011F0010018210E000FDB3226000191
63633+:10F9E0008F8600108F8500280A00124F000621C064
63634+:10F9F0008F8500043C18800024120003371001801A
63635+:10FA0000A212000B0A00112E3C08800090A30001F6
63636+:10FA1000241100011071FF70240800012409000264
63637+:10FA20005069000430E60040240800010A0011F08B
63638+:10FA30000100182150C0FFFD240800013C0C80008B
63639+:10FA4000358B01009563001094A40002307FFFFF06
63640+:10FA5000509FFF62010018210A001284240800014F
63641+:10FA60002CA803EF1100FE56240300010A001239EE
63642+:10FA700000000000240E000335EA0180A14E000BB7
63643+:10FA80000A00121C3C04800011E0FFA2000621C005
63644+:10FA900030A5FFFF0A00117D362600020A0011A5DD
63645+:10FAA000241100201140FFC63C1280003650010096
63646+:10FAB000960F001094AE000231E80FFF15C8FFC08A
63647+:10FAC000000000000A0011E690B900013C060800A1
63648+:10FAD0008CC6003824C4FFFF14C00002018418241F
63649+:10FAE000000018213C0D080025AD0038006D1021E4
63650+:10FAF0000A0011B6904300048F8F0004240EFFFE0D
63651+:10FB00000A00112C01EE28242408FFFE0A00121A14
63652+:10FB100000A8282427BDFFC8AFB00010AFBF003435
63653+:10FB20003C10600CAFBE0030AFB7002CAFB6002861
63654+:10FB3000AFB50024AFB40020AFB3001CAFB20018C3
63655+:10FB4000AFB100148E0E5000240FFF7F3C068000E2
63656+:10FB500001CF682435AC380C240B0003AE0C5000E8
63657+:10FB6000ACCB00083C010800AC2000200E001819A6
63658+:10FB7000000000003C0A0010354980513C06601628
63659+:10FB8000AE09537C8CC700003C0860148D0500A0B2
63660+:10FB90003C03FFFF00E320243C02535300051FC237
63661+:10FBA0001482000634C57C000003A08002869821E0
63662+:10FBB0008E7200043C116000025128218CBF007C31
63663+:10FBC0008CA200783C1E600037C420203C05080150
63664+:10FBD00024A59288AF820018AF9F001C0E0016DD8E
63665+:10FBE0002406000A3C190001273996403C01080010
63666+:10FBF000AC3931DC0E0020DDAF8000148FD708084F
63667+:10FC00002418FFF03C15570902F8B02412D502F56C
63668+:10FC100024040001AF80002C3C1480003697018042
63669+:10FC20003C1E080127DE9644369301008E900000AA
63670+:10FC30003205000310A0FFFD3207000110E000882C
63671+:10FC4000320600028E7100283C048000AE91002034
63672+:10FC50008E6500048E66000000A0382100C040219F
63673+:10FC60008C8301B80460FFFE3C0B0010240A0800DE
63674+:10FC700000AB4824AC8A01B8552000E0240BBFFF3C
63675+:10FC80009675000E3C1208008E52002030AC4000E9
63676+:10FC900032AFFFFF264E000125ED00043C010800B5
63677+:10FCA000AC2E0020118000E8AF8D00283C18002009
63678+:10FCB00000B8B02412C000E530B980002408BFFFAE
63679+:10FCC00000A8382434C81000AF87000030E62000B8
63680+:10FCD00010C000E92409FFBF3C03000400E328240E
63681+:10FCE00010A00002010910243502004030EA010092
63682+:10FCF00011400010AF8200048F8B002C11600007B0
63683+:10FD00003C0D002000ED6024118000043C0F000435
63684+:10FD100000EF702411C00239000000009668001E38
63685+:10FD20009678001C3115FFFF0018B40002B690252C
63686+:10FD3000AF92000C30F910001320001324150001BD
63687+:10FD400030FF002017E0000A3C04100000E41024FB
63688+:10FD50001040000D3C0A0C003C090BFF00EA18247F
63689+:10FD60003525FFFF00A3302B10C0000830ED010047
63690+:10FD70003C0C08008D8C002C24150005258B0001FF
63691+:10FD80003C010800AC2B002C30ED010015A0000B4D
63692+:10FD90003C0500018F85000430AE400055C00007CF
63693+:10FDA0003C0500013C161F0100F690243C0F10009A
63694+:10FDB000124F01CE000000003C05000100E5302498
63695+:10FDC00010C000AF3C0C10003C1F08008FFF002447
63696+:10FDD00033E90002152000712403000100601021A6
63697+:10FDE000104000083C0680003C08800035180100E7
63698+:10FDF0008F0F00243C056020ACAF00140000000011
63699+:10FE00003C0680003C194000ACD9013800000000DD
63700+:10FE10005220001332060002262B0140262C0080BF
63701+:10FE2000240EFF80016E2024018E6824000D1940ED
63702+:10FE3000318A007F0004A9403172007F3C16200007
63703+:10FE400036C20002006A482502B2382500E2882541
63704+:10FE50000122F825ACDF0830ACD1083032060002B0
63705+:10FE600010C0FF723C188000370501408CA80000CC
63706+:10FE700024100040AF08002090AF000831E300706C
63707+:10FE8000107000D428790041532000082405006038
63708+:10FE9000241100201071000E3C0A40003C09800033
63709+:10FEA000AD2A01780A001304000000001465FFFB6E
63710+:10FEB0003C0A40000E001FFA000000003C0A40000F
63711+:10FEC0003C098000AD2A01780A00130400000000FC
63712+:10FED00090A90009241F00048CA70000312800FF0E
63713+:10FEE000111F01B22503FFFA2C7200061240001404
63714+:10FEF0003C0680008CA9000494A4000A310500FF90
63715+:10FF000000095E022D6A00083086FFFF15400002DE
63716+:10FF10002567000424070003240C000910AC01FA33
63717+:10FF200028AD000A11A001DE2410000A240E0008EA
63718+:10FF300010AE0028000731C000C038213C06800008
63719+:10FF40008CD501B806A0FFFE34D20180AE47000078
63720+:10FF500034CB0140916E0008240300023C0A4000AB
63721+:10FF600031C400FF00046A0001A86025A64C000807
63722+:10FF7000A243000B9562000A3C0810003C09800077
63723+:10FF8000A64200108D670004AE470024ACC801B83B
63724+:10FF9000AD2A01780A001304000000003C0A80002A
63725+:10FFA000354401009483000E3C0208008C4200D8C6
63726+:10FFB000240400803065FFFF245500013C01080047
63727+:10FFC000AC3500D80E000FDB240600030A001370C6
63728+:10FFD000000018210009320230D900FF2418000166
63729+:10FFE0001738FFD5000731C08F910020262200016D
63730+:10FFF000AF8200200A0013C800C0382100CB2024A3
63731+:020000021000EC
63732+:10000000AF85000010800008AF860004240D87FF34
63733+:1000100000CD6024158000083C0E006000AE302446
63734+:1000200010C00005000000000E000D42000000009E
63735+:100030000A001371000000000E0016050000000009
63736+:100040000A0013710000000030B980005320FF1F28
63737+:10005000AF8500003C02002000A2F82453E0FF1B03
63738+:10006000AF8500003C07FFFF34E47FFF00A4382485
63739+:100070000A00132B34C880000A001334010910242D
63740+:1000800000EC58245160005AAF8000248F8D002C62
63741+:100090003C0E0F0000EE182415A00075AF83001071
63742+:1000A00030EF010011E00073939800103C12020041
63743+:1000B000107200703C06800034D9010093280013B0
63744+:1000C0009789002A36A60002311800FF271600047F
63745+:1000D000001619C03C0480008C8501B804A0FFFE06
63746+:1000E00034880180AD0300003C158008AC830020FB
63747+:1000F00096BF004833E5FFFF10A001BCAF850008A4
63748+:100100002523001200A3102B504001B98F85000455
63749+:10011000348D010095AC0020240B001A30E440001F
63750+:10012000318AFFFFA10B000B108001BA2543FFFEAF
63751+:1001300000A3702B15C001B88F9600048F8F0004A8
63752+:10014000A503001435E50001AF8500043C088000DC
63753+:1001500035150180A6A9000EA6A9001A8F89000CEA
63754+:1001600030BF8000A6A70010AEA90028A6A60008F0
63755+:1001700013E0000F3C0F8000350C0100958B00163A
63756+:10018000316AFFFC25440004008818218C6240007D
63757+:100190003046FFFF14C000072416BFFF3C0EFFFFD0
63758+:1001A00035CD7FFF00AD2824AF8500043C0F8000D3
63759+:1001B0002416BFFF00B6902435E50180A4B20026C6
63760+:1001C000ACA7002C3C071000ADE701B80A00137083
63761+:1001D000000018210E00165D000000003C0A4000DF
63762+:1001E0003C098000AD2A01780A00130400000000D9
63763+:1001F0008F85002410A00027AF80001090A300007E
63764+:10020000106000742409000310690101000030210E
63765+:1002100090AE0001240D000211CD014230EF0040EC
63766+:1002200090A90001241F0001113F000930E20040A5
63767+:100230008CA600049785002A00C020210E000FDB49
63768+:1002400036A60002000040210A00137001001821A8
63769+:100250005040FFF88CA600043C07080190E7964147
63770+:1002600010E0FFF4240800010A00137001001821B7
63771+:10027000939800103C1F080127FF96400018C8C043
63772+:10028000033F4021AF8800248F85002414A0FFDBAA
63773+:10029000AF9800103C0480008C86400030C50100FF
63774+:1002A00010A0008732AB00043C0C08008D8C0024A9
63775+:1002B00024160004156000033192000D241600027C
63776+:1002C0003C0480008C8E4000340DFFFF11CD0113E3
63777+:1002D00032B5FFFB8C984000330F010055E0000160
63778+:1002E0002415001030E80800110000382409FFFB35
63779+:1002F0008F9F00282FF903EF53200001024990241B
63780+:1003000030E2010010400014325F00018F87002CA2
63781+:1003100014E0010E8F8C000C3C0480003486010038
63782+:1003200090C5001330AA00FF25430004000321C03C
63783+:100330002419FFFE025990241240000202B6302513
63784+:1003400032A6FFFF0E000FDB9785002A1240FEA3A6
63785+:1003500000001821325F000113E0000D3247000455
63786+:10036000240900011249000202B6302532A6FFFF1F
63787+:100370009785002A0E000FDB000020212402FFFEDB
63788+:10038000024290241240FE950000182132470004DA
63789+:1003900050E0FE922403000102B63025241600042A
63790+:1003A0005656000132A6FFFF9785002A0E000FDB8C
63791+:1003B000240401002403FFFB0243A82412A0FE87AB
63792+:1003C000000018210A001370240300010A0014B968
63793+:1003D0000249902410A0FFAF30E5010010A00017E3
63794+:1003E0008F8600102403000210C300148F84000CB9
63795+:1003F0003C0608008CC6003824CAFFFF14C0000267
63796+:10040000008A1024000010213C0E080025CE003880
63797+:10041000004E682191AC00048F850028258B0004D4
63798+:10042000000B21C030A5FFFF36A600020E000FDB37
63799+:10043000000000000A00137000001821240F0002C1
63800+:1004400010CF0088241600013C0308008C6300D004
63801+:100450001076008D8F85002824D9FFFC2F280004FA
63802+:100460001500006300002021241F0002107F005DA2
63803+:100470002CC9000C24C3FFF82C6200041440FFE9CF
63804+:100480000000202130EA020051400004000621C093
63805+:1004900054C0000530A5FFFF000621C030A5FFFFB6
63806+:1004A0000A00150436A600020E000FDB32A600017A
63807+:1004B0008F8600108F8500280A001520000621C0B5
63808+:1004C0003C0A08008D4A0024315200015240FE438C
63809+:1004D000000018219785002A36A600020E000FDBC7
63810+:1004E000000020210A001370000018219668000CFB
63811+:1004F000311802005700FE313C0500013C1F800806
63812+:1005000097F900489789002A36A600023328FFFF92
63813+:10051000AF8800083C0380008C7501B806A0FFFE80
63814+:100520003C04800034820180AC400000110000B621
63815+:1005300024180003252A0012010A182B106000B2AB
63816+:1005400000000000966F00203C0E8000240D001A71
63817+:1005500031ECFFFF35CA018030EB4000A14D000BAC
63818+:10056000116000B02583FFFE0103902B164000AE02
63819+:100570002416FFFE34A50001A5430014AF85000436
63820+:100580002419BFFF00B94024A6E9000EA6E9001A0D
63821+:10059000A6E60008A6E80026A6E700103C07100023
63822+:1005A000AE8701B80A001370000018213C048000D7
63823+:1005B0008C8201B80440FFFE349601802415001C93
63824+:1005C000AEC70000A2D5000B3C071000AC8701B8F5
63825+:1005D0003C0A40003C098000AD2A01780A0013045F
63826+:1005E000000000005120FFA424C3FFF800002021D8
63827+:1005F00030A5FFFF0A00150436A600020E00103DCC
63828+:10060000000000008F8700000A001346AF82000C34
63829+:1006100090A30001241500011075FF0B24080001B0
63830+:10062000240600021066000430E2004024080001A5
63831+:100630000A001370010018215040FFFD240800013A
63832+:100640003C0C8000358B0100956A001094A40002D8
63833+:100650003143FFFF5083FDE1010018210A00158599
63834+:10066000240800018F8500282CB203EF1240FDDB27
63835+:10067000240300013C0308008C6300D02416000111
63836+:100680001476FF7624D9FFFC2CD8000C1300FF72DF
63837+:10069000000621C030A5FFFF0A00150436A600029F
63838+:1006A00010B00037240F000B14AFFE23000731C039
63839+:1006B000312600FF00065600000A4E0305220047BF
63840+:1006C00030C6007F0006F8C03C16080126D69640CA
63841+:1006D00003F68021A2000001A20000003C0F600090
63842+:1006E0008DF918202405000100C588040011302769
63843+:1006F0000326C024000731C000C03821ADF81820FF
63844+:100700000A0013C8A60000028F850020000731C030
63845+:1007100024A2FFFF0A0013F6AF8200200A0014B2E1
63846+:100720002415002011E0FECC3C1980003728010080
63847+:100730009518001094B6000233120FFF16D2FEC6B1
63848+:10074000000000000A00148290A900013C0B080080
63849+:100750008D6B0038256DFFFF15600002018D1024A0
63850+:10076000000010213C080800250800380048C0217E
63851+:10077000930F000425EE00040A0014C5000E21C0EA
63852+:1007800000065202241F00FF115FFDEB000731C07D
63853+:10079000000A20C03C0E080125CE9640008EA821FC
63854+:1007A000009E602100095C02240D00013C076000EE
63855+:1007B000A2AD0000AD860000A2AB00018CF21820B3
63856+:1007C00024030001014310040242B025ACF61820B6
63857+:1007D00000C038210A0013C8A6A900020A0015AA01
63858+:1007E000AF8000200A0012FFAF84002C8F85000428
63859+:1007F0003C1980002408000337380180A308000B4F
63860+:100800000A00144D3C088000A2F8000B0A00155A9B
63861+:100810002419BFFF8F9600042412FFFE0A00144B18
63862+:1008200002D228242416FFFE0A00155800B62824F8
63863+:100830003C038000346401008C85000030A2003E3F
63864+:100840001440000800000000AC6000488C870000E5
63865+:1008500030E607C010C0000500000000AC60004C8E
63866+:10086000AC60005003E0000824020001AC600054BA
63867+:10087000AC6000408C880000310438001080FFF923
63868+:10088000000000002402000103E00008AC60004406
63869+:100890003C0380008C6201B80440FFFE3467018095
63870+:1008A000ACE4000024080001ACE00004A4E500086A
63871+:1008B00024050002A0E8000A34640140A0E5000B12
63872+:1008C0009483000A14C00008A4E30010ACE00024E4
63873+:1008D0003C07800034E901803C041000AD20002872
63874+:1008E00003E00008ACE401B88C8600043C0410006E
63875+:1008F000ACE600243C07800034E90180AD200028EC
63876+:1009000003E00008ACE401B83C0680008CC201B8EA
63877+:100910000440FFFE34C7018024090002ACE400005B
63878+:10092000ACE40004A4E50008A0E9000A34C50140D5
63879+:10093000A0E9000B94A8000A3C041000A4E80010F1
63880+:10094000ACE000248CA30004ACE3002803E0000822
63881+:10095000ACC401B83C039000346200010082202541
63882+:100960003C038000AC6400208C65002004A0FFFEE6
63883+:100970000000000003E00008000000003C028000CE
63884+:10098000344300010083202503E00008AC4400202C
63885+:1009900027BDFFE03C098000AFBF0018AFB10014D5
63886+:1009A000AFB00010352801408D10000091040009FF
63887+:1009B0009107000891050008308400FF30E600FF31
63888+:1009C00000061A002C820081008330251040002A86
63889+:1009D00030A50080000460803C0D080125AD92B078
63890+:1009E000018D58218D6A00000140000800000000C0
63891+:1009F0003C038000346201409445000A14A0001EAC
63892+:100A00008F91FCC09227000530E6000414C0001A44
63893+:100A1000000000000E00164E02002021922A000560
63894+:100A200002002021354900040E001658A2290005B5
63895+:100A30009228000531040004148000020000000028
63896+:100A40000000000D922D0000240B002031AC00FFAF
63897+:100A5000158B00093C0580008CAE01B805C0FFFE77
63898+:100A600034B10180AE3000003C0F100024100005AE
63899+:100A7000A230000BACAF01B80000000D8FBF001812
63900+:100A80008FB100148FB0001003E0000827BD0020D4
63901+:100A90000200202100C028218FBF00188FB1001450
63902+:100AA0008FB00010240600010A00161D27BD00208B
63903+:100AB0000000000D0200202100C028218FBF001877
63904+:100AC0008FB100148FB00010000030210A00161DF5
63905+:100AD00027BD002014A0FFE8000000000200202134
63906+:100AE0008FBF00188FB100148FB0001000C02821F4
63907+:100AF0000A00163B27BD00203C0780008CEE01B8A1
63908+:100B000005C0FFFE34F00180241F0002A21F000B6D
63909+:100B100034F80140A60600089719000A3C0F10009F
63910+:100B2000A61900108F110004A6110012ACEF01B835
63911+:100B30000A0016998FBF001827BDFFE8AFBF00104D
63912+:100B40000E000FD4000000003C0280008FBF001098
63913+:100B500000002021AC4001800A00108F27BD001842
63914+:100B60003084FFFF30A5FFFF108000070000182130
63915+:100B7000308200011040000200042042006518216C
63916+:100B80001480FFFB0005284003E0000800601021EE
63917+:100B900010C00007000000008CA2000024C6FFFF68
63918+:100BA00024A50004AC82000014C0FFFB24840004D0
63919+:100BB00003E000080000000010A0000824A3FFFFCD
63920+:100BC000AC86000000000000000000002402FFFFCF
63921+:100BD0002463FFFF1462FFFA2484000403E000088A
63922+:100BE000000000003C03800027BDFFF83462018054
63923+:100BF000AFA20000308C00FF30AD00FF30CE00FF10
63924+:100C00003C0B80008D6401B80480FFFE00000000F2
63925+:100C10008FA900008D6801288FAA00008FA700000F
63926+:100C20008FA400002405000124020002A085000A10
63927+:100C30008FA30000359940003C051000A062000B16
63928+:100C40008FB800008FAC00008FA600008FAF0000AF
63929+:100C500027BD0008AD280000AD400004AD80002491
63930+:100C6000ACC00028A4F90008A70D0010A5EE0012E2
63931+:100C700003E00008AD6501B83C06800827BDFFE829
63932+:100C800034C50080AFBF001090A7000924020012F5
63933+:100C900030E300FF1062000B008030218CA8005070
63934+:100CA00000882023048000088FBF00108CAA003425
63935+:100CB000240400390000282100CA4823052000052B
63936+:100CC000240600128FBF00102402000103E0000878
63937+:100CD00027BD00180E0016F2000000008FBF0010A4
63938+:100CE0002402000103E0000827BD001827BDFFC84B
63939+:100CF000AFB20030AFB00028AFBF0034AFB1002CAE
63940+:100D000000A0802190A5000D30A6001010C000109A
63941+:100D1000008090213C0280088C4400048E0300086F
63942+:100D20001064000C30A7000530A6000510C0009329
63943+:100D3000240400018FBF00348FB200308FB1002C2B
63944+:100D40008FB000280080102103E0000827BD003884
63945+:100D500030A7000510E0000F30AB001210C00006F5
63946+:100D6000240400013C0980088E0800088D25000439
63947+:100D70005105009C240400388FBF00348FB200302E
63948+:100D80008FB1002C8FB000280080102103E00008F4
63949+:100D900027BD0038240A0012156AFFE6240400016A
63950+:100DA0000200202127A500100E000CB6AFA00010F5
63951+:100DB0001440007C3C19800837240080909800087B
63952+:100DC000331100081220000A8FA7001030FF010025
63953+:100DD00013E000A48FA300148C8600580066102333
63954+:100DE000044000043C0A8008AC8300588FA7001020
63955+:100DF0003C0A800835480080910900083124000829
63956+:100E00001480000224080003000040213C1F8008D9
63957+:100E100093F1001193F9001237E600808CCC005456
63958+:100E2000333800FF03087821322D00FF000F708057
63959+:100E300001AE282100AC582B1160006F00000000AB
63960+:100E400094CA005C8CC900543144FFFF0125102373
63961+:100E50000082182B14600068000000008CCB005446
63962+:100E60000165182330EC00041180006C000830800C
63963+:100E70008FA8001C0068102B1040006230ED0004A9
63964+:100E8000006610232C46008010C00002004088211C
63965+:100E9000241100800E00164E024020213C0D8008D7
63966+:100EA00035A6008024070001ACC7000C90C80008DC
63967+:100EB0000011484035A70100310C007FA0CC00088C
63968+:100EC0008E05000424AB0001ACCB0030A4D1005C43
63969+:100ED0008CCA003C9602000E01422021ACC40020C6
63970+:100EE0008CC3003C0069F821ACDF001C8E190004A3
63971+:100EF000ACF900008E180008ACF800048FB10010A7
63972+:100F0000322F000855E0004793A60020A0C0004EF5
63973+:100F100090D8004E2411FFDFA0F8000890CF000801
63974+:100F200001F17024A0CE00088E0500083C0B80085B
63975+:100F300035690080AD2500388D6A00148D2200309F
63976+:100F40002419005001422021AD24003491230000D7
63977+:100F5000307F00FF13F90036264F01000E001658AF
63978+:100F60000240202124040038000028210E0016F23F
63979+:100F70002406000A0A001757240400010E000D2859
63980+:100F8000000020218FBF00348FB200308FB1002CC1
63981+:100F90008FB00028004020210080102103E00008CD
63982+:100FA00027BD00388E0E00083C0F800835F0008009
63983+:100FB000AE0E005402402021AE0000300E00164E4E
63984+:100FC00000000000920D00250240202135AC0020D9
63985+:100FD0000E001658A20C00250E000CAC0240202179
63986+:100FE000240400382405008D0E0016F22406001299
63987+:100FF0000A0017572404000194C5005C0A001792E8
63988+:1010000030A3FFFF2407021811A0FF9E00E6102363
63989+:101010008FAE001C0A00179A01C610230A0017970A
63990+:101020002C620218A0E600080A0017C48E0500080A
63991+:101030002406FF8001E6C0243C118000AE38002861
63992+:101040008E0D000831E7007F3C0E800C00EE602121
63993+:10105000AD8D00E08E080008AF8C00380A0017D074
63994+:10106000AD8800E4AC800058908500082403FFF7A9
63995+:1010700000A33824A08700080A0017758FA7001066
63996+:101080003C05080024A560A83C04080024846FF4F3
63997+:101090003C020800244260B0240300063C01080121
63998+:1010A000AC2596C03C010801AC2496C43C01080163
63999+:1010B000AC2296C83C010801A02396CC03E00008AE
64000+:1010C0000000000003E00008240200013C02800050
64001+:1010D000308800FF344701803C0680008CC301B893
64002+:1010E0000460FFFE000000008CC501282418FF806A
64003+:1010F0003C0D800A24AF010001F8702431EC007F20
64004+:10110000ACCE0024018D2021ACE50000948B00EAD8
64005+:101110003509600024080002316AFFFFACEA0004D0
64006+:1011200024020001A4E90008A0E8000BACE00024C0
64007+:101130003C071000ACC701B8AF84003803E00008DA
64008+:10114000AF85006C938800488F8900608F820038DB
64009+:1011500030C600FF0109382330E900FF01221821C1
64010+:1011600030A500FF2468008810C000020124382147
64011+:101170000080382130E400031480000330AA00030B
64012+:101180001140000D312B000310A0000900001021B8
64013+:1011900090ED0000244E000131C200FF0045602B9D
64014+:1011A000A10D000024E700011580FFF925080001CA
64015+:1011B00003E00008000000001560FFF300000000DD
64016+:1011C00010A0FFFB000010218CF80000245900043F
64017+:1011D000332200FF0045782BAD18000024E70004FF
64018+:1011E00015E0FFF92508000403E0000800000000F6
64019+:1011F00093850048938800588F8700600004320070
64020+:101200003103007F00E5102B30C47F001040000F39
64021+:10121000006428258F8400383C0980008C8A00EC0B
64022+:10122000AD2A00A43C03800000A35825AC6B00A0AD
64023+:101230008C6C00A00580FFFE000000008C6D00ACEF
64024+:10124000AC8D00EC03E000088C6200A80A00188254
64025+:101250008F840038938800593C0280000080502120
64026+:10126000310300FEA383005930ABFFFF30CC00FFF9
64027+:1012700030E7FFFF344801803C0980008D2401B82D
64028+:101280000480FFFE8F8D006C24180016AD0D000049
64029+:101290008D2201248F8D0038AD0200048D5900206D
64030+:1012A000A5070008240201C4A119000AA118000B17
64031+:1012B000952F01208D4E00088D4700049783005C18
64032+:1012C0008D59002401CF302100C7282100A32023FD
64033+:1012D0002418FFFFA504000CA50B000EA5020010AA
64034+:1012E000A50C0012AD190018AD18002495AF00E848
64035+:1012F0003C0B10002407FFF731EEFFFFAD0E002876
64036+:101300008DAC0084AD0C002CAD2B01B88D460020B7
64037+:1013100000C7282403E00008AD4500208F8800386E
64038+:101320000080582130E7FFFF910900D63C02800081
64039+:1013300030A5FFFF312400FF00041A00006750258C
64040+:1013400030C600FF344701803C0980008D2C01B875
64041+:101350000580FFFE8F82006C240F0017ACE20000B6
64042+:101360008D390124ACF900048D780020A4EA00082E
64043+:10137000241901C4A0F8000AA0EF000B9523012056
64044+:101380008D6E00088D6D00049784005C01C35021B0
64045+:10139000014D602101841023A4E2000CA4E5000E9D
64046+:1013A000A4F90010A4E60012ACE000148D7800242B
64047+:1013B000240DFFFFACF800188D0F007CACEF001C73
64048+:1013C0008D0E00783C0F1000ACEE0020ACED002438
64049+:1013D000950A00BE240DFFF73146FFFFACE600285A
64050+:1013E000950C00809504008231837FFF0003CA00C2
64051+:1013F0003082FFFF0322C021ACF8002CAD2F01B8D2
64052+:10140000950E00828D6A002000AE3021014D282407
64053+:10141000A506008203E00008AD6500203C028000C4
64054+:10142000344501803C0480008C8301B80460FFFED9
64055+:101430008F8A0044240600199549001C3128FFFFBB
64056+:10144000000839C0ACA70000A0A6000B3C051000A6
64057+:1014500003E00008AC8501B88F87004C0080402174
64058+:1014600030C400FF3C0680008CC201B80440FFFE7F
64059+:101470008F89006C9383006834996000ACA90000E8
64060+:10148000A0A300058CE20010240F00022403FFF744
64061+:10149000A4A20006A4B900088D180020A0B8000A74
64062+:1014A000A0AF000B8CEE0000ACAE00108CED000481
64063+:1014B000ACAD00148CEC001CACAC00248CEB002018
64064+:1014C000ACAB00288CEA002C3C071000ACAA002C26
64065+:1014D0008D090024ACA90018ACC701B88D05002007
64066+:1014E00000A3202403E00008AD0400208F8600380C
64067+:1014F00027BDFFE0AFB10014AFBF0018AFB00010C0
64068+:1015000090C300D430A500FF3062002010400008D6
64069+:10151000008088218CCB00D02409FFDF256A0001E0
64070+:10152000ACCA00D090C800D401093824A0C700D4A8
64071+:1015300014A000403C0C80008F840038908700D4B9
64072+:101540002418FFBF2406FFEF30E3007FA08300D400
64073+:10155000979F005C8F8200608F8D003803E2C82364
64074+:10156000A799005CA5A000BC91AF00D401F870243D
64075+:10157000A1AE00D48F8C0038A18000D78F8A0038AC
64076+:10158000A5400082AD4000EC914500D400A658244F
64077+:10159000A14B00D48F9000348F8400609786005C4C
64078+:1015A0000204282110C0000FAF850034A38000582A
64079+:1015B0003C0780008E2C000894ED01208E2B000447
64080+:1015C000018D5021014B8021020620233086FFFF30
64081+:1015D00030C8000F3909000131310001162000091F
64082+:1015E000A3880058938600488FBF00188FB100145D
64083+:1015F0008FB0001027BD0020AF85006403E0000815
64084+:10160000AF86006000C870238FBF00189386004823
64085+:101610008FB100148FB0001034EF0C00010F28219F
64086+:1016200027BD0020ACEE0084AF85006403E0000815
64087+:10163000AF86006035900180020028210E00190F4E
64088+:10164000240600828F840038908600D430C5004084
64089+:1016500050A0FFBAA38000688F85004C3C06800034
64090+:101660008CCD01B805A0FFFE8F89006C2408608234
64091+:1016700024070002AE090000A6080008A207000B1C
64092+:101680008CA300083C0E1000AE0300108CA2000CCE
64093+:10169000AE0200148CBF0014AE1F00188CB90018E5
64094+:1016A000AE1900248CB80024AE1800288CAF002896
64095+:1016B000AE0F002CACCE01B80A001948A380006818
64096+:1016C0008F8A003827BDFFE0AFB10014AFB0001023
64097+:1016D0008F880060AFBF00189389003C954200BC22
64098+:1016E00030D100FF0109182B0080802130AC00FFB1
64099+:1016F0003047FFFF0000582114600003310600FF4F
64100+:1017000001203021010958239783005C0068202BB9
64101+:101710001480002700000000106800562419000102
64102+:101720001199006334E708803165FFFF0E0018C08F
64103+:10173000020020218F83006C3C07800034E601808A
64104+:101740003C0580008CAB01B80560FFFE240A001840
64105+:101750008F840038ACC30000A0CA000B948900BE7F
64106+:101760003C081000A4C90010ACC00030ACA801B8FF
64107+:101770009482008024430001A4830080949F008011
64108+:101780003C0608008CC6318833EC7FFF1186005E72
64109+:101790000000000002002021022028218FBF001835
64110+:1017A0008FB100148FB000100A00193427BD00203B
64111+:1017B000914400D42403FF8000838825A15100D4E4
64112+:1017C0009784005C3088FFFF51000023938C003C1D
64113+:1017D0008F8500382402EFFF008B782394AE00BC85
64114+:1017E0000168502B31E900FF01C26824A4AD00BCA0
64115+:1017F00051400039010058213C1F800037E60100AC
64116+:101800008CD800043C190001031940245500000144
64117+:1018100034E740008E0A00202403FFFB241100015E
64118+:1018200001432024AE0400201191002D34E78000F4
64119+:1018300002002021012030210E0018C03165FFFF79
64120+:101840009787005C8F890060A780005C0127802358
64121+:10185000AF900060938C003C8F8B00388FBF0018D6
64122+:101860008FB100148FB0001027BD002003E00008E6
64123+:10187000A16C00D73C0D800035AA01008D48000402
64124+:101880003C0900010109282454A0000134E740006C
64125+:101890008E0F00202418FFFB34E7800001F870242D
64126+:1018A00024190001AE0E00201599FF9F34E708802F
64127+:1018B000020020210E00188E3165FFFF020020215A
64128+:1018C000022028218FBF00188FB100148FB00010A4
64129+:1018D0000A00193427BD00200A0019F7000048212A
64130+:1018E00002002021012030210E00188E3165FFFFFB
64131+:1018F0009787005C8F890060A780005C01278023A8
64132+:101900000A001A0EAF900060948C0080241F8000A3
64133+:10191000019F3024A4860080908B0080908F0080EF
64134+:10192000316700FF0007C9C20019C027001871C045
64135+:1019300031ED007F01AE2825A08500800A0019DF67
64136+:1019400002002021938500682403000127BDFFE8E1
64137+:1019500000A330042CA20020AFB00010AFBF0014D1
64138+:1019600000C01821104000132410FFFE3C0708009F
64139+:101970008CE7319000E610243C088000350501809A
64140+:1019800014400005240600848F890038240A0004CE
64141+:101990002410FFFFA12A00FC0E00190F0000000018
64142+:1019A000020010218FBF00148FB0001003E0000868
64143+:1019B00027BD00183C0608008CC631940A001A574F
64144+:1019C00000C310248F87004427BDFFE0AFB200188A
64145+:1019D000AFB10014AFB00010AFBF001C30D000FF9B
64146+:1019E00090E6000D00A088210080902130C5007F86
64147+:1019F000A0E5000D8F8500388E2300188CA200D042
64148+:101A00001062002E240A000E0E001A4AA38A0068F3
64149+:101A10002409FFFF104900222404FFFF5200002088
64150+:101A2000000020218E2600003C0C001000CC582421
64151+:101A3000156000393C0E000800CE682455A0003F18
64152+:101A4000024020213C18000200D880241200001F10
64153+:101A50003C0A00048F8700448CE200148CE30010E1
64154+:101A60008CE500140043F82303E5C82B1320000580
64155+:101A7000024020218E24002C8CF1001010910031A6
64156+:101A80000240202124020012A38200680E001A4A9C
64157+:101A90002412FFFF105200022404FFFF0000202147
64158+:101AA0008FBF001C8FB200188FB100148FB00010D0
64159+:101AB0000080102103E0000827BD002090A800D47A
64160+:101AC000350400200A001A80A0A400D400CA4824CB
64161+:101AD0001520000B8F8B00448F8D00448DAC0010BF
64162+:101AE0001580000B024020218E2E002C51C0FFECEF
64163+:101AF00000002021024020210A001A9B2402001726
64164+:101B00008D66001050C0FFE6000020210240202119
64165+:101B10000A001A9B24020011024020212402001511
64166+:101B20000E001A4AA3820068240FFFFF104FFFDC4B
64167+:101B30002404FFFF0A001A8A8E2600000A001AC138
64168+:101B4000240200143C08000400C8382450E0FFD4EC
64169+:101B500000002021024020210A001A9B24020013C9
64170+:101B60008F85003827BDFFD8AFB3001CAFB2001877
64171+:101B7000AFB10014AFB00010AFBF002090A700D4E9
64172+:101B80008F90004C2412FFFF34E2004092060000C8
64173+:101B9000A0A200D48E0300100080982110720006CD
64174+:101BA00030D1003F2408000D0E001A4AA3880068B7
64175+:101BB000105200252404FFFF8F8A00388E09001878
64176+:101BC0008D4400D01124000702602021240C000E57
64177+:101BD0000E001A4AA38C0068240BFFFF104B001A5A
64178+:101BE0002404FFFF24040020122400048F8D0038F9
64179+:101BF00091AF00D435EE0020A1AE00D48F85005403
64180+:101C000010A00019000000001224004A8F9800382C
64181+:101C10008F92FCC0971000809651000A5230004805
64182+:101C20008F9300403C1F08008FFF318C03E5C82BC9
64183+:101C30001720001E02602021000028210E0019A993
64184+:101C400024060001000020218FBF00208FB3001C5C
64185+:101C50008FB200188FB100148FB0001000801021D7
64186+:101C600003E0000827BD00285224002A8E05001436
64187+:101C70008F840038948A008025490001A48900805F
64188+:101C8000948800803C0208008C42318831077FFF35
64189+:101C900010E2000E00000000026020210E00193446
64190+:101CA000240500010A001B0B000020212402002D46
64191+:101CB0000E001A4AA38200682403FFFF1443FFE1C9
64192+:101CC0002404FFFF0A001B0C8FBF002094990080A2
64193+:101CD000241F800024050001033FC024A498008035
64194+:101CE00090920080908E0080325100FF001181C2DE
64195+:101CF00000107827000F69C031CC007F018D582576
64196+:101D0000A08B00800E001934026020210A001B0BFA
64197+:101D1000000020212406FFFF54A6FFD68F84003840
64198+:101D2000026020210E001934240500010A001B0B5B
64199+:101D300000002021026020210A001B252402000A45
64200+:101D40002404FFFD0A001B0BAF9300608F8800384E
64201+:101D500027BDFFE8AFB00010AFBF0014910A00D458
64202+:101D60008F87004C00808021354900408CE60010B0
64203+:101D7000A10900D43C0208008C4231B030C53FFFBD
64204+:101D800000A2182B106000078F850050240DFF80E3
64205+:101D900090AE000D01AE6024318B00FF156000088D
64206+:101DA0000006C382020020212403000D8FBF00140F
64207+:101DB0008FB0001027BD00180A001A4AA3830068DC
64208+:101DC00033060003240F000254CFFFF70200202146
64209+:101DD00094A2001C8F85003824190023A4A200E8D7
64210+:101DE0008CE8000000081E02307F003F13F9003528
64211+:101DF0003C0A00838CE800188CA600D0110600086D
64212+:101E0000000000002405000E0E001A4AA385006899
64213+:101E10002407FFFF104700182404FFFF8F850038B8
64214+:101E200090A900D435240020A0A400D48F8C0044B5
64215+:101E3000918E000D31CD007FA18D000D8F83005458
64216+:101E40001060001C020020218F8400508C9800102C
64217+:101E50000303782B11E0000D241900180200202143
64218+:101E6000A39900680E001A4A2410FFFF10500002C8
64219+:101E70002404FFFF000020218FBF00148FB000104A
64220+:101E80000080102103E0000827BD00188C86001098
64221+:101E90008F9F00440200202100C31023AFE20010F6
64222+:101EA000240500010E0019A9240600010A001B9751
64223+:101EB000000020210E001934240500010A001B97A0
64224+:101EC00000002021010A5824156AFFD98F8C004494
64225+:101ED000A0A600FC0A001B84A386005A30A500FFC0
64226+:101EE0002406000124A9000100C9102B1040000C99
64227+:101EF00000004021240A000100A61823308B0001B5
64228+:101F000024C60001006A3804000420421160000267
64229+:101F100000C9182B010740251460FFF800A61823FC
64230+:101F200003E000080100102127BDFFD8AFB0001862
64231+:101F30008F90004CAFB1001CAFBF00202403FFFF07
64232+:101F40002411002FAFA30010920600002405000802
64233+:101F500026100001006620260E001BB0308400FF12
64234+:101F600000021E003C021EDC34466F410A001BD8F2
64235+:101F70000000102110A00009008018212445000154
64236+:101F800030A2FFFF2C4500080461FFFA0003204047
64237+:101F90000086202614A0FFF9008018210E001BB037
64238+:101FA000240500208FA300102629FFFF313100FFF8
64239+:101FB00000034202240700FF1627FFE20102182651
64240+:101FC00000035027AFAA0014AFAA00100000302170
64241+:101FD00027A8001027A7001400E6782391ED00033E
64242+:101FE00024CE000100C8602131C600FF2CCB0004C4
64243+:101FF0001560FFF9A18D00008FA200108FBF002097
64244+:102000008FB1001C8FB0001803E0000827BD002826
64245+:1020100027BDFFD0AFB3001CAFB00010AFBF00288A
64246+:10202000AFB50024AFB40020AFB20018AFB10014B8
64247+:102030003C0C80008D880128240FFF803C06800A1C
64248+:1020400025100100250B0080020F68243205007F57
64249+:10205000016F7024AD8E009000A62821AD8D002464
64250+:1020600090A600FC3169007F3C0A8004012A1821F7
64251+:10207000A386005A9067007C00809821AF830030CF
64252+:1020800030E20002AF88006CAF85003800A0182154
64253+:10209000144000022404003424040030A3840048C7
64254+:1020A0008C7200DC30D100FF24040004AF92006089
64255+:1020B00012240004A38000688E7400041680001EA1
64256+:1020C0003C0880009386005930C7000110E0000FE3
64257+:1020D0008F9300608CB000848CA800842404FF805F
64258+:1020E000020410240002F940310A007F03EA482567
64259+:1020F0003C0C2000012C902530CD00FE3C038000DC
64260+:10210000AC720830A38D00598F9300608FBF0028F8
64261+:102110008FB50024ACB300DC8FB400208FB3001C5B
64262+:102120008FB200188FB100148FB00010240200018C
64263+:1021300003E0000827BD00308E7F000895020120D3
64264+:102140008E67001003E2C8213326FFFF30D8000F4E
64265+:1021500033150001AF87003416A00058A39800582B
64266+:1021600035090C000309382100D81823AD03008479
64267+:10217000AF8700648E6A00043148FFFF1100007EC3
64268+:10218000A78A005C90AC00D42407FF8000EC3024C8
64269+:1021900030CB00FF1560004B9786005C938E005A91
64270+:1021A000240D000230D5FFFF11CD02A20000A021B6
64271+:1021B0008F85006002A5802B160000BC9388004824
64272+:1021C0003C11800096240120310400FF1485008812
64273+:1021D0008F8400648F9800343312000356400085CA
64274+:1021E00030A500FF8F900064310C00FF24060034FE
64275+:1021F00011860095AF90004C9204000414800118E1
64276+:102200008F8E0038A380003C8E0D00048DC800D84E
64277+:102210003C0600FF34CCFFFF01AC30240106182B34
64278+:1022200014600120AF8600548F8700609798005C8F
64279+:10223000AF8700400307402310C000C7A788005C99
64280+:102240008F91003030C3000300035823922A007C92
64281+:102250003171000302261021000A20823092000111
64282+:102260000012488000492821311FFFFF03E5C82BD9
64283+:10227000132001208F8800388F8500348F880064F8
64284+:102280001105025A3C0E3F018E0600003C0C250051
64285+:1022900000CE682411AC01638F84004C30E500FF50
64286+:1022A0000E00184A000030218F8800388F870060A8
64287+:1022B0008F8500340A001DB78F8600540A001C5613
64288+:1022C000AF87006490A400D400E48024320200FFB1
64289+:1022D000104000169386005990A6008890AE00D753
64290+:1022E00024A8008830D4003F2686FFE02CD10020AF
64291+:1022F000A38E003C1220000CAF88004C240B000180
64292+:1023000000CB20043095001916A0012B3C0680005C
64293+:1023100034CF0002008FC0241700022E3099002015
64294+:1023200017200234000000009386005930CB0001D2
64295+:102330001160000F9788005C8CBF00848CA900841A
64296+:10234000240AFF8003EA6024000C19403132007F28
64297+:10235000007238253C0D200000EDC82530D800FE65
64298+:102360003C0F8000ADF90830A39800599788005CB5
64299+:102370001500FF84000000008E630020306200041E
64300+:102380001040FF51938600592404FFFB0064802411
64301+:102390003C038000AE700020346601808C7301B86D
64302+:1023A0000660FFFE8F98006C347501003C1400013C
64303+:1023B000ACD800008C6B012424076085ACCB0004F2
64304+:1023C0008EAE000401D488245220000124076083CB
64305+:1023D00024190002A4C700083C0F1000A0D9000B6C
64306+:1023E0003C068000ACCF01B80A001C2B9386005934
64307+:1023F00030A500FF0E00184A240600018F88006CEB
64308+:102400003C05800034A90900250201889388004812
64309+:10241000304A0007304B00783C0340802407FF809F
64310+:102420000163C825014980210047F824310C00FFD1
64311+:1024300024060034ACBF0800AF90004CACB90810C3
64312+:102440005586FF6E920400048F8400388E11003090
64313+:10245000908E00D431CD001015A000108F83006045
64314+:102460002C6F000515E000E400000000909800D4F7
64315+:102470002465FFFC331200101640000830A400FF52
64316+:102480008F9F00648F99003413F90004388700018E
64317+:1024900030E20001144001C8000000000E001BC320
64318+:1024A000000000000A001DF8000000008F84006496
64319+:1024B00030C500FF0E00184A24060001939800481A
64320+:1024C000240B0034130B00A08F8500388F8600602A
64321+:1024D0009783005C306EFFFF00CE8823AF910060D1
64322+:1024E000A780005C1280FF90028018212414FFFD59
64323+:1024F0005474FFA28E6300208E6A00042403FFBF81
64324+:102500002408FFEF0155F823AE7F000490AC00D4FF
64325+:102510003189007FA0A900D48E7200208F8F0038EF
64326+:10252000A780005C364D0002AE6D0020A5E000BC27
64327+:1025300091E500D400A3C824A1F900D48F950038F8
64328+:10254000AEA000EC92B800D403085824A2AB00D48B
64329+:102550000A001CD78F8500388F910034AF8000604F
64330+:1025600002275821AF8B0034000020212403FFFFF5
64331+:10257000108301B48F8500388E0C00103C0D0800CC
64332+:102580008DAD31B09208000031843FFF008D802B6B
64333+:1025900012000023310D003F3C1908008F3931A88B
64334+:1025A0008F9F006C000479802408FF80033F202166
64335+:1025B000008FC821938500590328F8243C06008029
64336+:1025C0003C0F800034D80001001F91403331007F60
64337+:1025D0008F8600380251502535EE0940332B0078A4
64338+:1025E000333000073C0310003C02800C017890253A
64339+:1025F000020E48210143C0250222382134AE0001D9
64340+:10260000ADFF0804AF890050ADF20814AF87004455
64341+:10261000ADFF0028ACD90084ADF80830A38E005976
64342+:102620009383005A24070003106700272407000142
64343+:102630001467FFAC8F8500382411002311B1008589
64344+:1026400000000000240E000B026020210E001A4A38
64345+:10265000A38E00680040A0210A001D328F8500383B
64346+:1026600002602021240B000C0E001A4AA38B006884
64347+:10267000240AFFFF104AFFBD2404FFFF8F8E00389D
64348+:10268000A380003C8E0D00048DC800D83C0600FFDE
64349+:1026900034CCFFFF01AC30240106182B1060FEE2A1
64350+:1026A000AF86005402602021241200190E001A4A3D
64351+:1026B000A3920068240FFFFF104FFFAC2404FFFF1C
64352+:1026C0000A001C838F86005425A3FFE02C74002091
64353+:1026D0001280FFDD240E000B000328803C1108014E
64354+:1026E000263194B400B148218D2D000001A00008CE
64355+:1026F000000000008F85003400A710219385003C66
64356+:10270000AF82003402251821A383003C951F00BC32
64357+:102710000226282137F91000A51900BC5240FF926B
64358+:10272000AF850060246A0004A38A003C950900BCC0
64359+:1027300024A40004AF84006035322000A51200BC40
64360+:102740000A001D54000020218F8600602CC800055F
64361+:102750001500FF609783005C3065FFFF00C5C8234C
64362+:102760002F2F000511E00003306400FF24CDFFFC93
64363+:1027700031A400FF8F8900648F920034113200046D
64364+:10278000389F000133EC0001158001380000000083
64365+:102790008F840038908700D434E60010A08600D4DF
64366+:1027A0008F8500388F8600609783005CACA000ECBA
64367+:1027B0000A001D2F306EFFFF8CB500848CB400849E
64368+:1027C0003C04100002A7302400068940328E007FAE
64369+:1027D000022E8025020410253C08800024050001FB
64370+:1027E00002602021240600010E0019A9AD02083064
64371+:1027F0000A001CC38F8500388C8200EC1222FE7EFA
64372+:102800000260202124090005A38900680E001A4AED
64373+:102810002411FFFF1451FE782404FFFF0A001D5508
64374+:102820002403FFFF8F8F004C8F8800388DF8000045
64375+:10283000AD1800888DE70010AD0700988F87006005
64376+:102840000A001DB78F8600542406FFFF118600057D
64377+:10285000000000000E001B4C026020210A001D8FAA
64378+:102860000040A0210E001AD1026020210A001D8F15
64379+:102870000040A0218F90004C3C0208008C4231B0F7
64380+:102880008E110010322C3FFF0182282B10A0000C6B
64381+:10289000240BFF808F85005090A3000D01637024EE
64382+:1028A00031CA00FF1140000702602021001143825D
64383+:1028B000310600032418000110D8010600000000B2
64384+:1028C000026020212403000D0E001A4AA383006831
64385+:1028D000004020218F8500380A001D320080A02191
64386+:1028E0008F90004C3C0A08008D4A31B08F85005013
64387+:1028F0008E0400100000A0218CB1001430823FFF34
64388+:10290000004A602B8CB200205180FFEE0260202133
64389+:1029100090B8000D240BFF800178702431C300FFB4
64390+:102920005060FFE80260202100044382310600036A
64391+:1029300014C0FFE40260202194BF001C8F9900386E
64392+:102940008E060028A73F00E88CAF0010022F20233E
64393+:1029500014C4013A026020218F83005400C368210F
64394+:10296000022D382B14E00136240200188F8A00440F
64395+:102970008F820030024390218D4B00100163702341
64396+:10298000AD4E0010AD5200208C4C00740192282BEB
64397+:1029900014A0015F026020218F8400508E08002463
64398+:1029A0008C86002411060007026020212419001CD7
64399+:1029B0000E001A4AA3990068240FFFFF104FFFC5AD
64400+:1029C0002404FFFF8F8400448C87002424FF00012F
64401+:1029D000AC9F00241251012F8F8D00308DB10074F7
64402+:1029E0001232012C3C0B00808E0E000001CB5024D3
64403+:1029F00015400075000000008E0300142411FFFF35
64404+:102A0000107100073C0808003C0608008CC6319095
64405+:102A100000C8C0241300015202602021A380006876
64406+:102A20008E0300003C19000100792024108000135F
64407+:102A30003C1F0080007FA02416800009020028218E
64408+:102A4000026020212411001A0E001A4AA391006886
64409+:102A50002407FFFF1047FF9F2404FFFF02002821E7
64410+:102A6000026020210E001A6A240600012410FFFFD4
64411+:102A70001050FF982404FFFF241400018F8D0044A0
64412+:102A8000026020210280302195A900342405000134
64413+:102A9000253200010E0019A9A5B200340000202142
64414+:102AA0008F8500380A001D320080A0218F90004CD5
64415+:102AB0003C1408008E9431B08E07001030E53FFFC3
64416+:102AC00000B4C82B132000618F8600502412FF80B1
64417+:102AD00090C9000D0249682431A400FF5080005CB9
64418+:102AE000026020218F8C00541180000700078B8228
64419+:102AF0008F8500388F82FCC094BF0080944A000A02
64420+:102B0000515F00F78F8600403227000314E0006415
64421+:102B100000000000920E000211C000D8000000006A
64422+:102B20008E0B0024156000D902602021920400035E
64423+:102B300024190002308500FF14B90005308900FF18
64424+:102B40008F940054128000EA240D002C308900FF7D
64425+:102B5000392C00102D8400012D3200010244302553
64426+:102B6000020028210E001A6A026020212410FFFFB3
64427+:102B7000105000BF8F8500388F830054106000D341
64428+:102B8000240500013C0A08008D4A318C0143F82BD2
64429+:102B900017E000B22402002D02602021000028214D
64430+:102BA0000E0019A9240600018F85003800001821A5
64431+:102BB0000A001D320060A0210E0018750000000000
64432+:102BC0000A001DF800000000AC8000200A001E78FA
64433+:102BD0008E03001400002821026020210E0019A994
64434+:102BE000240600010A001CC38F8500380A001DB7A7
64435+:102BF0008F8800388CAA00848CAC00843C031000C1
64436+:102C00000147F824001F91403189007F024968255F
64437+:102C100001A32825ACC50830910700012405000157
64438+:102C2000026020210E0019A930E600010A001CC331
64439+:102C30008F850038938F00482403FFFD0A001D3460
64440+:102C4000AF8F00600A001D342403FFFF02602021C3
64441+:102C50002410000D0E001A4AA390006800401821AD
64442+:102C60008F8500380A001D320060A0210E00187503
64443+:102C7000000000009783005C8F86006000402021E8
64444+:102C80003070FFFF00D010232C4A00051140FE11C8
64445+:102C90008F850038ACA400EC0A001D2F306EFFFFBA
64446+:102CA00090CF000D31E300085460FFA192040003AF
64447+:102CB00002602021240200100E001A4AA38200683C
64448+:102CC0002403FFFF5443FF9A920400030A001F12DB
64449+:102CD0008F85003890A4000D308F000811E000951A
64450+:102CE0008F990054572000A6026020218E1F000CEF
64451+:102CF0008CB4002057F40005026020218E0D0008DE
64452+:102D00008CA7002411A7003A026020212402002091
64453+:102D1000A38200680E001A4A2412FFFF1052FEED33
64454+:102D20002404FFFF8F9F00442402FFF73C14800E11
64455+:102D300093EA000D2419FF803C03800001423824EF
64456+:102D4000A3E7000D8F9F00303C0908008D2931ACAE
64457+:102D50008F8C006C97F200788F870044012C302113
64458+:102D6000324D7FFF000D204000C4782131E5007F07
64459+:102D700000B4C02101F94024AC68002CA711000068
64460+:102D80008CEB0028256E0001ACEE00288CEA002CAC
64461+:102D90008E02002C01426021ACEC002C8E09002C2C
64462+:102DA000ACE900308E120014ACF2003494ED003A1D
64463+:102DB00025A40001A4E4003A97E600783C1108003D
64464+:102DC0008E3131B024C3000130707FFF1211005CDE
64465+:102DD000006030218F8F0030026020212405000127
64466+:102DE0000E001934A5E600780A001EA1000020217B
64467+:102DF0008E0900142412FFFF1132006B8F8A0038F5
64468+:102E00008E0200188D4C00D0144C00650260202109
64469+:102E10008E0B00248CAE0028116E005B2402002172
64470+:102E20000E001A4AA38200681452FFBE2404FFFF5A
64471+:102E30008F8500380A001D320080A0212402001F67
64472+:102E40000E001A4AA38200682409FFFF1049FEA160
64473+:102E50002404FFFF0A001E548F83005402602021C7
64474+:102E60000E001A4AA38200681450FF508F85003864
64475+:102E70002403FFFF0A001D320060A0218CD800242B
64476+:102E80008E0800241118FF29026020210A001F2744
64477+:102E90002402000F8E0900003C05008001259024CB
64478+:102EA0001640FF492402001A026020210E001A4A2F
64479+:102EB000A3820068240CFFFF144CFECF2404FFFF04
64480+:102EC0008F8500380A001D320080A0210E001934C1
64481+:102ED000026020218F8500380A001EE500001821BD
64482+:102EE0002403FFFD0060A0210A001D32AF860060B0
64483+:102EF000026020210E001A4AA38D00682403FFFF00
64484+:102F00001043FF588F8500380A001ECC920400033E
64485+:102F10002418001D0E001A4AA39800682403FFFF1E
64486+:102F20001443FE9D2404FFFF8F8500380A001D32E4
64487+:102F30000080A021026020210A001F3D24020024FD
64488+:102F4000240880000068C024330BFFFF000B73C20D
64489+:102F500031D000FF001088270A001F6E001133C017
64490+:102F6000240F001B0E001A4AA38F00681451FEACF8
64491+:102F70002404FFFF8F8500380A001D320080A02145
64492+:102F80000A001F3D240200278E0600288CA3002C77
64493+:102F900010C30008026020210A001F812402001FC4
64494+:102FA0000A001F812402000E026020210A001F81F6
64495+:102FB000240200258E04002C1080000D8F8F00301D
64496+:102FC0008DE800740104C02B5700000C0260202122
64497+:102FD0008CB900140086A0210334282B10A0FF52C6
64498+:102FE0008F9F0044026020210A001F8124020022DA
64499+:102FF000026020210A001F81240200230A001F8191
64500+:103000002402002627BDFFD8AFB3001CAFB10014C7
64501+:10301000AFBF0020AFB20018AFB000103C0280007C
64502+:103020008C5201408C4B01483C048000000B8C0208
64503+:10303000322300FF317300FF8C8501B804A0FFFE2E
64504+:1030400034900180AE1200008C8701442464FFF0AC
64505+:10305000240600022C830013AE070004A61100080A
64506+:10306000A206000BAE1300241060004F8FBF00209B
64507+:10307000000448803C0A0801254A9534012A402171
64508+:103080008D04000000800008000000003C030800E0
64509+:103090008C6331A831693FFF00099980007280215B
64510+:1030A000021370212405FF80264D0100264C00806C
64511+:1030B0003C02800031B1007F3198007F31CA007F2F
64512+:1030C0003C1F800A3C1980043C0F800C01C5202461
64513+:1030D00001A5302401853824014F1821AC46002475
64514+:1030E000023F402103194821AC470090AC4400281E
64515+:1030F000AF830044AF880038AF8900300E0019005C
64516+:10310000016080213C0380008C6B01B80560FFFEEC
64517+:103110008F8700448F8600383465018090E8000D69
64518+:10312000ACB20000A4B0000600082600000416039C
64519+:1031300000029027001227C21080008124C200885C
64520+:10314000241F6082A4BF0008A0A000052402000282
64521+:10315000A0A2000B8F8B0030000424003C08270045
64522+:1031600000889025ACB20010ACA00014ACA00024E4
64523+:10317000ACA00028ACA0002C8D6900382413FF807F
64524+:10318000ACA9001890E3000D02638024320500FF13
64525+:1031900010A000058FBF002090ED000D31AC007F26
64526+:1031A000A0EC000D8FBF00208FB3001C8FB2001861
64527+:1031B0008FB100148FB000103C0A10003C0E80004C
64528+:1031C00027BD002803E00008ADCA01B8265F010052
64529+:1031D0002405FF8033F8007F3C06800003E5782457
64530+:1031E0003C19800A03192021ACCF0024908E00D412
64531+:1031F00000AE682431AC00FF11800024AF84003899
64532+:10320000248E008895CD00123C0C08008D8C31A8CE
64533+:1032100031AB3FFF01924821000B5180012A402130
64534+:1032200001052024ACC400283107007F3C06800C37
64535+:1032300000E620219083000D00A31024304500FFFC
64536+:1032400010A0FFD8AF8400449098000D330F0010F9
64537+:1032500015E0FFD58FBF00200E0019000000000010
64538+:103260003C0380008C7901B80720FFFE00000000BD
64539+:10327000AE1200008C7F0144AE1F0004A6110008AE
64540+:1032800024110002A211000BAE1300243C1308010C
64541+:10329000927396F0327000015200FFC38FBF00207E
64542+:1032A0000E002146024020210A0020638FBF00202B
64543+:1032B0003C1260008E452C083C03F0033462FFFF93
64544+:1032C00000A2F824AE5F2C088E582C083C1901C0CF
64545+:1032D00003199825AE532C080A0020638FBF0020E5
64546+:1032E000264D010031AF007F3C10800A240EFF8084
64547+:1032F00001F0282101AE60243C0B8000AD6C00245D
64548+:103300001660FFA8AF85003824110003A0B100FCAF
64549+:103310000A0020638FBF002026480100310A007F89
64550+:103320003C0B800A2409FF80014B30210109202435
64551+:103330003C078000ACE400240A002062AF8600381D
64552+:10334000944E0012320C3FFF31CD3FFF15ACFF7D94
64553+:10335000241F608290D900D42418FF800319782498
64554+:1033600031EA00FF1140FF7700000000240700044D
64555+:10337000A0C700FC8F870044241160842406000D40
64556+:10338000A4B10008A0A600050A00204D24020002F6
64557+:103390003C040001248496DC24030014240200FE73
64558+:1033A0003C010800AC2431EC3C010800AC2331E8BE
64559+:1033B0003C010801A42296F83C040801248496F8F4
64560+:1033C0000000182100643021A0C300042463000120
64561+:1033D0002C6500FF54A0FFFC006430213C0708006E
64562+:1033E00024E7010003E00008AF87007800A058211F
64563+:1033F000008048210000102114A00012000050217C
64564+:103400000A002142000000003C010801A42096F8B7
64565+:103410003C05080194A596F88F8200783C0C0801C1
64566+:10342000258C96F800E2182100AC2021014B302BAE
64567+:10343000A089000400001021A460000810C0003919
64568+:10344000010048218F8600780009384000E94021BA
64569+:103450000008388000E6282190A8000B90B9000AE7
64570+:103460000008204000881021000218800066C0215A
64571+:10347000A319000A8F85007800E5782191EE000AF3
64572+:1034800091E6000B000E684001AE6021000C208028
64573+:1034900000851021A046000B3C030801906396F2C2
64574+:1034A000106000222462FFFF8F8300383C01080176
64575+:1034B000A02296F2906C00FF118000040000000032
64576+:1034C000906E00FF25CDFFFFA06D00FF3C190801A5
64577+:1034D000973996F8272300013078FFFF2F0F00FF60
64578+:1034E00011E0FFC9254A00013C010801A42396F818
64579+:1034F0003C05080194A596F88F8200783C0C0801E1
64580+:10350000258C96F800E2182100AC2021014B302BCD
64581+:10351000A089000400001021A460000814C0FFC9A5
64582+:103520000100482103E000080000000003E000085B
64583+:103530002402000227BDFFE0248501002407FF804C
64584+:10354000AFB00010AFBF0018AFB1001400A718242F
64585+:103550003C10800030A4007F3C06800A00862821B1
64586+:103560008E110024AE03002490A200FF1440000836
64587+:10357000AF850038A0A000098FBF0018AE1100244D
64588+:103580008FB100148FB0001003E0000827BD0020A9
64589+:1035900090A900FD90A800FF312400FF0E0020F448
64590+:1035A000310500FF8F8500388FBF0018A0A00009EB
64591+:1035B000AE1100248FB100148FB0001003E000089A
64592+:1035C00027BD002027BDFFD0AFB20020AFB1001C47
64593+:1035D000AFB00018AFBF002CAFB40028AFB30024C9
64594+:1035E0003C0980009533011635320C00952F011AE5
64595+:1035F0003271FFFF023280218E08000431EEFFFF9E
64596+:10360000248B0100010E6821240CFF8025A5FFFFFB
64597+:10361000016C50243166007F3C07800AAD2A0024EB
64598+:1036200000C73021AF850074AF8800703C010801ED
64599+:10363000A02096F190C300090200D02100809821BB
64600+:10364000306300FF2862000510400048AF86003854
64601+:10365000286400021480008E24140001240D00054B
64602+:103660003C010801A02D96D590CC00FD3C0108013D
64603+:10367000A02096D63C010801A02096D790CB000A46
64604+:10368000240AFF80318500FF014B4824312700FFC9
64605+:1036900010E0000C000058213C12800836510080D8
64606+:1036A0008E2F00308CD0005C01F0702305C0018E9D
64607+:1036B0008F87007090D4000A3284007FA0C4000A73
64608+:1036C0008F8600383C118008363000808E0F003025
64609+:1036D0008F87007000EF702319C000EE000000001B
64610+:1036E00090D4000924120002328400FF1092024795
64611+:1036F000000000008CC2005800E2F82327F9FFFF09
64612+:103700001B2001300000000090C5000924080004BF
64613+:1037100030A300FF10680057240A00013C01080193
64614+:10372000A02A96D590C900FF252700013C01080179
64615+:10373000A02796D43C030801906396D52406000583
64616+:103740001066006A2C780005130000C40000902168
64617+:103750000003F8803C0408012484958003E4C82118
64618+:103760008F25000000A0000800000000241800FFC2
64619+:103770001078005C0000000090CC000A90CA00099C
64620+:103780003C080801910896F13187008000EA48253D
64621+:103790003C010801A02996DC90C500FD3C140801FD
64622+:1037A000929496F2311100013C010801A02596DDAA
64623+:1037B00090DF00FE3C010801A03F96DE90D200FFA2
64624+:1037C0003C010801A03296DF8CD900543C0108016D
64625+:1037D000AC3996E08CD000583C010801AC3096E43E
64626+:1037E0008CC3005C3C010801AC3496EC3C01080140
64627+:1037F000AC2396E8162000088FBF002C8FB4002859
64628+:103800008FB300248FB200208FB1001C8FB000183E
64629+:1038100003E0000827BD00303C1180009624010E13
64630+:103820000E000FD43094FFFF3C0B08018D6B96F413
64631+:103830000260382102802821AE2B01803C13080150
64632+:103840008E7396D401602021240600830E00102F71
64633+:10385000AFB300108FBF002C8FB400288FB30024AB
64634+:103860008FB200208FB1001C8FB0001803E0000859
64635+:1038700027BD00303C1808008F1831FC270F0001CD
64636+:103880003C010800AC2F31FC0A0021D700000000E9
64637+:103890001474FFB900000000A0C000FF3C05080040
64638+:1038A0008CA531E43C0308008C6331E03C02080045
64639+:1038B0008C4232048F99003834A80001241F000282
64640+:1038C0003C010801AC2396F43C010801A02896F0C5
64641+:1038D0003C010801A02296F3A33F00090A002190B1
64642+:1038E0008F8600380E002146000000000A0021D714
64643+:1038F0008F8600383C1F080193FF96D424190001DD
64644+:1039000013F902298F8700703C100801921096D895
64645+:103910003C06080190C696D610C000050200A02102
64646+:103920003C040801908496D9109001E48F870078B8
64647+:10393000001088408F9F0078023048210009C8801D
64648+:10394000033F702195D80008270F0001A5CF00087C
64649+:103950003C040801908496D93C05080190A596D6B0
64650+:103960000E0020F4000000008F8700780230202134
64651+:103970000004308000C720218C8500048F820074F1
64652+:1039800000A2402305020006AC8200048C8A0000DD
64653+:103990008F830070014310235C400001AC83000062
64654+:1039A0008F86003890CB00FF2D6C00025580002DD3
64655+:1039B000241400010230F821001F40800107282153
64656+:1039C00090B9000B8CAE00040019C0400319782197
64657+:1039D000000F1880006710218C4D000001AE882375
64658+:1039E0002630FFFF5E00001F241400018C440004F9
64659+:1039F0008CAA0000008A482319200019240E000414
64660+:103A00003C010801A02E96D590AD000B8CAB0004B4
64661+:103A1000000D8840022D80210010108000471021E9
64662+:103A20008C44000401646023058202009443000872
64663+:103A300090DF00FE90B9000B33E500FF54B900049D
64664+:103A40000107A021A0D400FE8F8700780107A021E4
64665+:103A50009284000B0E0020F4240500018F860038AC
64666+:103A600024140001125400962E500001160000424A
64667+:103A70003C08FFFF241900021659FF3F0000000018
64668+:103A8000A0C000FF8F860038A0D200090A0021D70D
64669+:103A90008F86003890C700092404000230E300FF3D
64670+:103AA0001064016F24090004106901528F880074AA
64671+:103AB0008CCE0054010E682325B10001062001754B
64672+:103AC000241800043C010801A03896D53C010801E7
64673+:103AD000A02096D490D400FD90D200FF2E4F00027B
64674+:103AE00015E0FF14328400FF000438408F8900780D
64675+:103AF00090DF00FF00E41021000220800089C8212F
64676+:103B00002FE500029324000B14A0FF0A24070002F3
64677+:103B100000041840006480210010588001692821A9
64678+:103B20008CAC0004010C50230540FF020000000093
64679+:103B30003C030801906396D614600005246F0001D1
64680+:103B40003C010801A02496D93C010801A02796D782
64681+:103B50003C010801A02F96D690CE00FF24E700017B
64682+:103B600031CD00FF01A7882B1220FFE990A4000BA4
64683+:103B70000A0021C6000000003C0508018CA596D46F
64684+:103B80003C12000400A8F82413F2000624020005E9
64685+:103B90003C090801912996D5152000022402000352
64686+:103BA000240200053C010801A02296F190C700FF05
64687+:103BB00014E0012024020002A0C200090A0021D75B
64688+:103BC0008F86003890CC00FF1180FEDA240A0001B5
64689+:103BD0008F8C00748F890078240F00030180682186
64690+:103BE0001160001E240E0002000540400105A021C6
64691+:103BF00000142080008990218E51000401918023BF
64692+:103C00000600FECC000000003C020801904296D65F
64693+:103C100014400005245800013C010801A02A96D751
64694+:103C20003C010801A02596D93C010801A03896D690
64695+:103C300090DF00FF010510210002C88033E500FF7E
64696+:103C4000254A00010329202100AA402B1500FEB9B6
64697+:103C50009085000B1560FFE50005404000054040E1
64698+:103C600001051821000310803C010801A02A96D408
64699+:103C70003C010801A02596D8004918218C64000455
64700+:103C800000E4F82327F9FFFF1F20FFE900000000F0
64701+:103C90008C63000000E358230560013A01A38823E8
64702+:103CA00010E301170184C0231B00FEA200000000E6
64703+:103CB0003C010801A02E96D50A002305240B000123
64704+:103CC000240E0004A0CE00093C0D08008DAD31F893
64705+:103CD0008F86003825A200013C010800AC2231F893
64706+:103CE0000A0021D7000000008CD9005C00F9C02335
64707+:103CF0001F00FE7B000000008CDF005C10FFFF65F2
64708+:103D00008F8400748CC3005C008340232502000173
64709+:103D10001C40FF60000000008CC9005C248700018B
64710+:103D200000E9282B10A0FE943C0D80008DAB01040F
64711+:103D30003C0C0001016C50241140FE8F2402001045
64712+:103D40003C010801A02296F10A0021D700000000E2
64713+:103D50008F9100748F86003826220001ACC2005C6F
64714+:103D60000A002292241400018F8700382404FF8067
64715+:103D70000000882190E9000A241400010124302564
64716+:103D8000A0E6000A3C05080190A596D63C0408016F
64717+:103D9000908496D90E0020F4000000008F86003831
64718+:103DA0008F85007890C800FD310700FF0007404074
64719+:103DB0000107F821001FC0800305C8219323000BD1
64720+:103DC000A0C300FD8F8500788F8600380305602131
64721+:103DD000918F000B000F704001CF6821000D808093
64722+:103DE000020510218C4B0000ACCB00548D840004E4
64723+:103DF0008F83007400645023194000022482000164
64724+:103E00002462000101074821ACC2005C0009308037
64725+:103E100000C5402100E02021240500010E0020F40F
64726+:103E20009110000B8F86003890C500FF10A0FF0C8A
64727+:103E3000001070408F85007801D06821000D10803F
64728+:103E4000004558218D6400008F8C0074018450233C
64729+:103E50002547000104E0FF02263100013C03080170
64730+:103E6000906396D62E2F0002247800013C010801B1
64731+:103E7000A03896D63C010801A03496D711E0FEF890
64732+:103E8000020038210A002365000740408F84003873
64733+:103E90008F8300748C85005800A340230502FE9A8E
64734+:103EA000AC8300580A00223B000000003C070801D8
64735+:103EB00090E796F2240200FF10E200BE8F860038E1
64736+:103EC0003C110801963196FA3C030801246396F8E8
64737+:103ED000262500013230FFFF30ABFFFF02036021D7
64738+:103EE0002D6A00FF1540008D918700043C010801F8
64739+:103EF000A42096FA8F88003800074840012728211F
64740+:103F0000911800FF000530802405000127140001EE
64741+:103F1000A11400FF3C120801925296F28F8800789B
64742+:103F20008F8E0070264F000100C820213C0108013F
64743+:103F3000A02F96F2AC8E00008F8D0074A48500082F
64744+:103F4000AC8D00043C030801906396D414600077A4
64745+:103F5000000090213C010801A02596D4A087000B09
64746+:103F60008F8C007800CC5021A147000A8F82003846
64747+:103F7000A04700FD8F840038A08700FE8F860038A0
64748+:103F80008F9F0070ACDF00548F990074ACD900583B
64749+:103F90008F8D00780127C02100185880016DA02165
64750+:103FA000928F000A000F704001CF18210003888013
64751+:103FB000022D8021A207000B8F8600780166602108
64752+:103FC000918A000B000A1040004A2021000428803A
64753+:103FD00000A64021A107000A3C07800834E90080C0
64754+:103FE0008D2200308F860038ACC2005C0A0022921D
64755+:103FF0002414000190CA00FF1540FEAD8F880074A4
64756+:10400000A0C400090A0021D78F860038A0C000FD97
64757+:104010008F98003824060001A30000FE3C0108012F
64758+:10402000A02696D53C010801A02096D40A0021C6FE
64759+:104030000000000090CB00FF3C040801908496F340
64760+:10404000316C00FF0184502B1540000F2402000347
64761+:1040500024020004A0C200090A0021D78F8600387C
64762+:1040600090C3000A2410FF8002035824316C00FF23
64763+:104070001180FDC1000000003C010801A02096D580
64764+:104080000A0021C600000000A0C200090A0021D7D2
64765+:104090008F86003890D4000A2412FF8002544824EE
64766+:1040A000312800FF1500FFF4240200083C0108013C
64767+:1040B000A02296F10A0021D70000000000108840DD
64768+:1040C0008F8B0070023018210003688001A7202127
64769+:1040D000AC8B00008F8A0074240C0001A48C0008B3
64770+:1040E000AC8A00043C05080190A596D62402000184
64771+:1040F00010A2FE1E24A5FFFF0A0022519084000B8F
64772+:104100000184A0231A80FD8B000000003C010801FF
64773+:10411000A02E96D50A002305240B00013C010801BE
64774+:10412000A42596FA0A0023B78F880038240B0001D3
64775+:10413000106B00228F9800388F85003890BF00FFE9
64776+:1041400033F900FF1079002B000000003C1F08012C
64777+:1041500093FF96D8001FC840033FC0210018A080DD
64778+:104160000288782191EE000AA08E000A8F8D0078D7
64779+:104170003C030801906396D800CD88210A0023DD16
64780+:10418000A223000B263000010600003101A4902379
64781+:104190000640002B240200033C010801A02F96D505
64782+:1041A0000A002305240B00018F8900380A00223BF6
64783+:1041B000AD2700540A00229124120001931400FD3F
64784+:1041C000A094000B8F8800388F8F0078910E00FE2E
64785+:1041D00000CF6821A1AE000A8F910038A22700FD10
64786+:1041E0008F8300708F900038AE0300540A0023DEE6
64787+:1041F0008F8D007890B000FEA090000A8F8B003861
64788+:104200008F8C0078916A00FD00CC1021A04A000B31
64789+:104210008F840038A08700FE8F8600748F85003859
64790+:10422000ACA600580A0023DE8F8D007894B80008F1
64791+:10423000ACA40004030378210A002285A4AF00087F
64792+:104240003C010801A02296D50A0021C6000000000A
64793+:1042500090CF0009240D000431EE00FF11CDFD8543
64794+:10426000240200013C010801A02296D50A0021C6C3
64795+:1042700000000000080033440800334408003420E4
64796+:10428000080033F4080033D8080033280800332826
64797+:10429000080033280800334C8008010080080080A3
64798+:1042A000800800005F865437E4AC62CC50103A4579
64799+:1042B00036621985BF14C0E81BC27A1E84F4B55655
64800+:1042C000094EA6FE7DDA01E7C04D748108005A74DC
64801+:1042D00008005AB808005A5C08005A5C08005A5C8A
64802+:1042E00008005A5C08005A7408005A5C08005A5CBE
64803+:1042F00008005AC008005A5C080059D408005A5CEB
64804+:1043000008005A5C08005AC008005A5C08005A5C51
64805+:1043100008005A5C08005A5C08005A5C08005A5CA5
64806+:1043200008005A5C08005A5C08005A5C08005A5C95
64807+:1043300008005A9408005A5C08005A9408005A5C15
64808+:1043400008005A5C08005A5C08005A9808005A9401
64809+:1043500008005A5C08005A5C08005A5C08005A5C65
64810+:1043600008005A5C08005A5C08005A5C08005A5C55
64811+:1043700008005A5C08005A5C08005A5C08005A5C45
64812+:1043800008005A5C08005A5C08005A5C08005A5C35
64813+:1043900008005A5C08005A5C08005A5C08005A5C25
64814+:1043A00008005A9808005A9808005A5C08005A9861
64815+:1043B00008005A5C08005A5C08005A5C08005A5C05
64816+:1043C00008005A5C08005A5C08005A5C08005A5CF5
64817+:1043D00008005A5C08005A5C08005A5C08005A5CE5
64818+:1043E00008005A5C08005A5C08005A5C08005A5CD5
64819+:1043F00008005A5C08005A5C08005A5C08005A5CC5
64820+:1044000008005A5C08005A5C08005A5C08005A5CB4
64821+:1044100008005A5C08005A5C08005A5C08005A5CA4
64822+:1044200008005A5C08005A5C08005A5C08005A5C94
64823+:1044300008005A5C08005A5C08005A5C08005A5C84
64824+:1044400008005A5C08005A5C08005A5C08005A5C74
64825+:1044500008005A5C08005A5C08005A5C08005A5C64
64826+:1044600008005A5C08005A5C08005A5C08005A5C54
64827+:1044700008005A5C08005A5C08005A5C08005A5C44
64828+:1044800008005A5C08005A5C08005A5C08005A5C34
64829+:1044900008005A5C08005A5C08005A5C08005A5C24
64830+:1044A00008005A5C08005A5C08005A5C08005A5C14
64831+:1044B00008005A5C08005A5C08005A5C08005A5C04
64832+:1044C00008005A5C08005A5C08005A5C08005ADC74
64833+:1044D0000800782C08007A900800783808007628C0
64834+:1044E00008007838080078C4080078380800762872
64835+:1044F0000800762808007628080076280800762824
64836+:104500000800762808007628080076280800762813
64837+:1045100008007628080078580800784808007628AF
64838+:1045200008007628080076280800762808007628F3
64839+:1045300008007628080076280800762808007628E3
64840+:1045400008007628080076280800762808007848B1
64841+:10455000080082FC08008188080082C40800818865
64842+:104560000800829408008070080081880800818813
64843+:1045700008008188080081880800818808008188F7
64844+:1045800008008188080081880800818808008188E7
64845+:104590000800818808008188080081B008008D34F7
64846+:1045A00008008E9008008E70080088D808008D4C96
64847+:1045B0000A00012400000000000000000000000DBF
64848+:1045C000747061362E322E31620000000602010145
64849+:1045D00000000000000000000000000000000000DB
64850+:1045E00000000000000000000000000000000000CB
64851+:1045F00000000000000000000000000000000000BB
64852+:1046000000000000000000000000000000000000AA
64853+:10461000000000000000000000000000000000009A
64854+:10462000000000000000000000000000000000008A
64855+:10463000000000000000000000000000000000007A
64856+:104640000000000010000003000000000000000D4A
64857+:104650000000000D3C020800244217203C03080023
64858+:1046600024632A10AC4000000043202B1480FFFD7F
64859+:10467000244200043C1D080037BD2FFC03A0F0219C
64860+:104680003C100800261004903C1C0800279C1720B2
64861+:104690000E000262000000000000000D2402FF80F6
64862+:1046A00027BDFFE000821024AFB00010AF42002011
64863+:1046B000AFBF0018AFB10014936500043084007FD1
64864+:1046C000034418213C0200080062182130A5002094
64865+:1046D000036080213C080111277B000814A0000220
64866+:1046E0002466005C2466005892020004974301048B
64867+:1046F000920400043047000F3063FFFF3084004015
64868+:10470000006728231080000900004821920200055C
64869+:1047100030420004104000050000000010A000031B
64870+:104720000000000024A5FFFC2409000492020005FB
64871+:1047300030420004104000120000000010A00010E1
64872+:10474000000000009602000200A72021010440257D
64873+:104750002442FFFEA7421016920300042402FF80A9
64874+:1047600000431024304200FF104000033C020400CC
64875+:104770000A000174010240258CC20000AF421018EB
64876+:104780008F4201780440FFFE2402000AA742014044
64877+:1047900096020002240400093042000700021023A0
64878+:1047A00030420007A7420142960200022442FFFE67
64879+:1047B000A7420144A740014697420104A74201488D
64880+:1047C0008F420108304200205040000124040001C3
64881+:1047D00092020004304200101440000234830010A2
64882+:1047E00000801821A743014A0000000000000000DB
64883+:1047F0000000000000000000AF48100000000000B2
64884+:104800000000000000000000000000008F421000C7
64885+:104810000441FFFE3102FFFF1040000700000000CE
64886+:1048200092020004304200401440000300000000E7
64887+:104830008F421018ACC20000960200063042FFFF03
64888+:10484000244200020002104300021040036288214B
64889+:10485000962200001120000D3044FFFF00A7102118
64890+:104860008F8300388F45101C0002108200021080D8
64891+:1048700000431021AC45000030A6FFFF0E00058D5F
64892+:1048800000052C0200402021A62200009203000413
64893+:104890002402FF8000431024304200FF1040001F1C
64894+:1048A0000000000092020005304200021040001B90
64895+:1048B000000000009742100C2442FFFEA742101691
64896+:1048C000000000003C02040034420030AF421000FF
64897+:1048D00000000000000000000000000000000000D8
64898+:1048E0008F4210000441FFFE000000009742100CB0
64899+:1048F0008F45101C3042FFFF24420030000210821E
64900+:1049000000021080005B1021AC45000030A6FFFFC4
64901+:104910000E00058D00052C02A62200009604000260
64902+:10492000248400080E0001E93084FFFF974401044D
64903+:104930000E0001F73084FFFF8FBF00188FB1001405
64904+:104940008FB000103C02100027BD002003E00008DB
64905+:10495000AF4201783084FFFF308200078F8500244A
64906+:1049600010400002248300073064FFF800A41021E7
64907+:1049700030421FFF03421821247B4000AF850028EE
64908+:10498000AF82002403E00008AF4200843084FFFFC0
64909+:104990003082000F8F85002C8F860034104000027B
64910+:1049A0002483000F3064FFF000A410210046182B70
64911+:1049B000AF8500300046202314600002AF82002C37
64912+:1049C000AF84002C8F82002C340480000342182115
64913+:1049D00000641821AF83003803E00008AF42008074
64914+:1049E0008F820014104000088F8200048F82FFDC49
64915+:1049F000144000058F8200043C02FFBF3442FFFFD9
64916+:104A0000008220248F82000430430006240200022A
64917+:104A10001062000F3C0201012C62000350400005AF
64918+:104A2000240200041060000F3C0200010A00023062
64919+:104A30000000000010620005240200061462000C51
64920+:104A40003C0201110A000229008210253C020011DB
64921+:104A500000821025AF421000240200010A0002303B
64922+:104A6000AF82000C00821025AF421000AF80000C16
64923+:104A700000000000000000000000000003E000084B
64924+:104A8000000000008F82000C1040000400000000B5
64925+:104A90008F4210000441FFFE0000000003E0000808
64926+:104AA000000000008F8200102443F800000231C291
64927+:104AB00024C2FFF02C6303011060000300021042C7
64928+:104AC0000A000257AC8200008F85001800C5102B29
64929+:104AD0001440000B0000182100C5102324470001DA
64930+:104AE0008F82001C00A210212442FFFF0046102BE1
64931+:104AF000544000042402FFFF0A000257AC87000064
64932+:104B00002402FFFF0A000260AC8200008C820000D9
64933+:104B10000002194000621821000318800062182169
64934+:104B2000000318803C0208002442175C0062182130
64935+:104B300003E000080060102127BDFFD8AFBF0020B0
64936+:104B4000AFB1001CAFB000183C0460088C8250006C
64937+:104B50002403FF7F3C066000004310243442380CDD
64938+:104B6000AC8250008CC24C1C3C1A80000002160221
64939+:104B70003042000F10400007AF82001C8CC34C1C59
64940+:104B80003C02001F3442FC0000621824000319C2DA
64941+:104B9000AF8300188F420008275B400034420001B9
64942+:104BA000AF420008AF8000243C02601CAF40008090
64943+:104BB000AF4000848C4500088CC308083402800094
64944+:104BC000034220212402FFF0006218243C020080EE
64945+:104BD0003C010800AC2204203C025709AF84003895
64946+:104BE00014620004AF850034240200010A0002921E
64947+:104BF000AF820014AF8000148F42000038420001E1
64948+:104C0000304200011440FFFC8F8200141040001657
64949+:104C10000000000097420104104000058F8300004F
64950+:104C2000146000072462FFFF0A0002A72C62000A3A
64951+:104C30002C620010504000048F83000024620001A9
64952+:104C4000AF8200008F8300002C62000A1440000332
64953+:104C50002C6200070A0002AEAF80FFDC10400002A9
64954+:104C600024020001AF82FFDC8F4301088F44010062
64955+:104C700030622000AF83000410400008AF840010B1
64956+:104C80003C0208008C42042C244200013C01080034
64957+:104C9000AC22042C0A00058A3C0240003065020068
64958+:104CA00014A0000324020F001482026024020D00ED
64959+:104CB00097420104104002C83C02400030624000AC
64960+:104CC000144000AD8F8200388C4400088F42017878
64961+:104CD0000440FFFE24020800AF42017824020008CD
64962+:104CE000A7420140A7400142974201048F8400047B
64963+:104CF0003051FFFF30820001104000070220802168
64964+:104D00002623FFFE240200023070FFFFA742014667
64965+:104D10000A0002DBA7430148A74001463C02080005
64966+:104D20008C42043C1440000D8F8300103082002020
64967+:104D30001440000224030009240300010060202124
64968+:104D40008F830010240209005062000134840004A3
64969+:104D5000A744014A0A0002F60000000024020F00E6
64970+:104D60001462000530820020144000062403000D68
64971+:104D70000A0002F524030005144000022403000980
64972+:104D800024030001A743014A3C0208008C4204208E
64973+:104D90003C0400480E00020C004420250E000235A1
64974+:104DA000000000008F82000C1040003E0000000058
64975+:104DB0008F4210003C0300200043102410400039B3
64976+:104DC0008F820004304200021040003600000000D4
64977+:104DD000974210141440003300000000974210085E
64978+:104DE0008F8800383042FFFF2442000600021882FC
64979+:104DF0000003388000E83021304300018CC40000FB
64980+:104E000010600004304200030000000D0A00033768
64981+:104E100000E81021544000103084FFFF3C05FFFFE4
64982+:104E200000852024008518260003182B0004102B71
64983+:104E300000431024104000050000000000000000A6
64984+:104E40000000000D00000000240002228CC20000BF
64985+:104E50000A000336004520253883FFFF0003182B86
64986+:104E60000004102B00431024104000050000000037
64987+:104E7000000000000000000D000000002400022BD4
64988+:104E80008CC200003444FFFF00E81021AC44000055
64989+:104E90003C0208008C420430244200013C0108001E
64990+:104EA000AC2204308F6200008F840038AF8200088B
64991+:104EB0008C8300003402FFFF1462000F00001021F9
64992+:104EC0003C0508008CA504543C0408008C84045064
64993+:104ED00000B0282100B0302B008220210086202144
64994+:104EE0003C010800AC2504543C010800AC240450EB
64995+:104EF0000A000580240400088C8200003042010072
64996+:104F00001040000F000010213C0508008CA5044C47
64997+:104F10003C0408008C84044800B0282100B0302BE9
64998+:104F200000822021008620213C010800AC25044C91
64999+:104F30003C010800AC2404480A0005802404000851
65000+:104F40003C0508008CA504443C0408008C84044003
65001+:104F500000B0282100B0302B0082202100862021C3
65002+:104F60003C010800AC2504443C010800AC2404408A
65003+:104F70000A000580240400088F6200088F62000088
65004+:104F800000021602304300F02402003010620005D7
65005+:104F900024020040106200E08F8200200A00058891
65006+:104FA0002442000114A000050000000000000000E1
65007+:104FB0000000000D00000000240002568F4201781E
65008+:104FC0000440FFFE000000000E00023D27A4001078
65009+:104FD0001440000500408021000000000000000D8A
65010+:104FE000000000002400025D8E0200001040000559
65011+:104FF00000000000000000000000000D00000000A4
65012+:10500000240002608F62000C0443000324020001AC
65013+:105010000A00042EAE000000AE0200008F820038AD
65014+:105020008C480008A20000078F65000C8F64000404
65015+:1050300030A3FFFF0004240200852023308200FFFC
65016+:105040000043102124420005000230832CC200815D
65017+:10505000A605000A14400005A20400040000000098
65018+:105060000000000D00000000240002788F85003849
65019+:105070000E0005AB260400148F6200048F43010864
65020+:10508000A60200083C02100000621824106000080C
65021+:105090000000000097420104920300072442FFEC45
65022+:1050A000346300023045FFFF0A0003C3A203000778
65023+:1050B000974201042442FFF03045FFFF96060008A6
65024+:1050C0002CC200135440000592030007920200070F
65025+:1050D00034420001A20200079203000724020001EB
65026+:1050E00010620005240200031062000B8F8200385A
65027+:1050F0000A0003E030C6FFFF8F8200383C04FFFF48
65028+:105100008C43000C0064182400651825AC43000C87
65029+:105110000A0003E030C6FFFF3C04FFFF8C43001091
65030+:105120000064182400651825AC43001030C6FFFF4A
65031+:1051300024C2000200021083A20200058F830038FF
65032+:10514000304200FF00021080004328218CA800009C
65033+:105150008CA2000024030004000217021443001272
65034+:1051600000000000974201043C03FFFF01031824E4
65035+:105170003042FFFF004610232442FFFE006240251C
65036+:10518000ACA8000092030005306200FF000210800E
65037+:1051900000501021904200143042000F00431021B3
65038+:1051A0000A000415A20200068CA400049742010420
65039+:1051B0009603000A3088FFFF3042FFFF00461023AD
65040+:1051C0002442FFD60002140001024025ACA80004CE
65041+:1051D000920200079204000524630028000318834C
65042+:1051E0000064182134420004A2030006A202000752
65043+:1051F0008F8200042403FFFB34420002004310248A
65044+:10520000AF820004920300068F87003800031880E5
65045+:10521000007010218C4400203C02FFF63442FFFF56
65046+:105220000082402400671821AE04000CAC68000C1A
65047+:10523000920500063C03FF7F8E02000C00052880CB
65048+:1052400000B020213463FFFF01033024948800263E
65049+:1052500000A7282100431024AE02000CAC860020D9
65050+:10526000AC880024ACA8001024020010A742014022
65051+:1052700024020002A7400142A7400144A742014680
65052+:10528000974201043C0400082442FFFEA742014863
65053+:10529000240200010E00020CA742014A9603000AF4
65054+:1052A0009202000400431021244200023042000711
65055+:1052B00000021023304200070E000235AE0200103B
65056+:1052C0008F6200003C0308008C6304442404001037
65057+:1052D000AF820008974201043042FFFF2442FFFEE4
65058+:1052E00000403821000237C33C0208008C420440D1
65059+:1052F000006718210067282B004610210045102167
65060+:105300003C010800AC2304443C010800AC220440EA
65061+:105310000A0005150000000014A0000500000000B0
65062+:10532000000000000000000D000000002400030A3F
65063+:105330008F4201780440FFFE000000000E00023D95
65064+:1053400027A4001414400005004080210000000044
65065+:105350000000000D00000000240003118E02000078
65066+:105360005440000692020007000000000000000DFB
65067+:10537000000000002400031C9202000730420004D9
65068+:10538000104000058F8200042403FFFB344200021A
65069+:1053900000431024AF8200048F620004044300081D
65070+:1053A00092020007920200068E03000CAE0000007D
65071+:1053B0000002108000501021AC4300209202000730
65072+:1053C00030420004544000099602000A920200058F
65073+:1053D0003C03000100021080005010218C46001890
65074+:1053E00000C33021AC4600189602000A9206000461
65075+:1053F000277100080220202100C2302124C60005A8
65076+:10540000260500140E0005AB00063082920400064B
65077+:105410008F6500043C027FFF000420800091202162
65078+:105420008C8300043442FFFF00A228240065182169
65079+:10543000AC8300049202000792040005920300046A
65080+:10544000304200041040001496070008308400FF2A
65081+:1054500000042080009120218C86000497420104E2
65082+:105460009605000A306300FF3042FFFF0043102121
65083+:105470000045102130E3FFFF004310232442FFD8F2
65084+:1054800030C6FFFF0002140000C23025AC860004C5
65085+:105490000A0004C992030007308500FF0005288038
65086+:1054A00000B128218CA4000097420104306300FF62
65087+:1054B0003042FFFF00431021004710233C03FFFF51
65088+:1054C000008320243042FFFF00822025ACA400008E
65089+:1054D0009203000724020001106200060000000091
65090+:1054E0002402000310620011000000000A0004EC16
65091+:1054F0008E03001097420104920300049605000AEF
65092+:105500008E24000C00431021004510212442FFF29C
65093+:105510003C03FFFF008320243042FFFF0082202550
65094+:10552000AE24000C0A0004EC8E0300109742010424
65095+:10553000920300049605000A8E24001000431021F7
65096+:10554000004510212442FFEE3C03FFFF008320248E
65097+:105550003042FFFF00822025AE2400108E03001091
65098+:105560002402000AA7420140A74301429603000A11
65099+:10557000920200043C04004000431021A742014471
65100+:10558000A740014697420104A742014824020001B6
65101+:105590000E00020CA742014A0E0002350000000076
65102+:1055A0008F6200009203000400002021AF820008F7
65103+:1055B000974201049606000A3042FFFF006218215C
65104+:1055C000006028213C0308008C6304443C0208006E
65105+:1055D0008C42044000651821004410210065382BDE
65106+:1055E000004710213C010800AC2304443C010800A2
65107+:1055F000AC22044092040004008620212484000A86
65108+:105600003084FFFF0E0001E9000000009744010410
65109+:105610003084FFFF0E0001F7000000003C02100084
65110+:10562000AF4201780A0005878F820020148200278C
65111+:105630003062000697420104104000673C024000BF
65112+:105640003062400010400005000000000000000033
65113+:105650000000000D00000000240004208F420178AB
65114+:105660000440FFFE24020800AF4201782402000833
65115+:10567000A7420140A74001428F82000497430104E2
65116+:1056800030420001104000073070FFFF2603FFFE8C
65117+:1056900024020002A7420146A74301480A00053F31
65118+:1056A0002402000DA74001462402000DA742014A32
65119+:1056B0008F62000024040008AF8200080E0001E998
65120+:1056C000000000000A0005190200202110400042DD
65121+:1056D0003C02400093620000304300F024020010BE
65122+:1056E0001062000524020070106200358F820020D5
65123+:1056F0000A000588244200018F62000097430104DC
65124+:105700003050FFFF3071FFFF8F4201780440FFFEF1
65125+:105710003202000700021023304200072403000A6F
65126+:105720002604FFFEA7430140A7420142A7440144CB
65127+:10573000A7400146A75101488F420108304200208E
65128+:10574000144000022403000924030001A743014A76
65129+:105750000E00020C3C0400400E0002350000000068
65130+:105760003C0708008CE70444021110212442FFFE8C
65131+:105770003C0608008CC604400040182100E3382194
65132+:10578000000010218F65000000E3402B00C2302193
65133+:105790002604000800C830213084FFFFAF850008D0
65134+:1057A0003C010800AC2704443C010800AC2604403E
65135+:1057B0000E0001E9000000000A0005190220202166
65136+:1057C0000E00013B000000008F82002024420001F7
65137+:1057D000AF8200203C024000AF4201380A00029232
65138+:1057E000000000003084FFFF30C6FFFF00052C00E2
65139+:1057F00000A628253882FFFF004510210045282BF0
65140+:105800000045102100021C023042FFFF004310211E
65141+:1058100000021C023042FFFF004310213842FFFF0C
65142+:1058200003E000083042FFFF3084FFFF30A5FFFF98
65143+:1058300000001821108000070000000030820001E5
65144+:105840001040000200042042006518210A0005A152
65145+:105850000005284003E000080060102110C0000689
65146+:1058600024C6FFFF8CA2000024A50004AC82000027
65147+:105870000A0005AB2484000403E0000800000000D7
65148+:1058800010A0000824A3FFFFAC8600000000000069
65149+:10589000000000002402FFFF2463FFFF1462FFFAF0
65150+:1058A0002484000403E00008000000000000000160
65151+:1058B0000A00002A00000000000000000000000DA7
65152+:1058C000747870362E322E3162000000060201001C
65153+:1058D00000000000000001360000EA600000000047
65154+:1058E00000000000000000000000000000000000B8
65155+:1058F00000000000000000000000000000000000A8
65156+:105900000000000000000000000000000000000097
65157+:105910000000001600000000000000000000000071
65158+:105920000000000000000000000000000000000077
65159+:105930000000000000000000000000000000000067
65160+:1059400000000000000000000000138800000000BC
65161+:10595000000005DC00000000000000001000000353
65162+:10596000000000000000000D0000000D3C020800D7
65163+:1059700024423D683C0308002463401CAC40000006
65164+:105980000043202B1480FFFD244200043C1D08002E
65165+:1059900037BD7FFC03A0F0213C100800261000A8B2
65166+:1059A0003C1C0800279C3D680E00044E00000000CF
65167+:1059B0000000000D27BDFFB4AFA10000AFA200049E
65168+:1059C000AFA30008AFA4000CAFA50010AFA6001451
65169+:1059D000AFA70018AFA8001CAFA90020AFAA0024F1
65170+:1059E000AFAB0028AFAC002CAFAD0030AFAE003491
65171+:1059F000AFAF0038AFB8003CAFB90040AFBC004417
65172+:105A0000AFBF00480E000591000000008FBF0048A6
65173+:105A10008FBC00448FB900408FB8003C8FAF003876
65174+:105A20008FAE00348FAD00308FAC002C8FAB0028D0
65175+:105A30008FAA00248FA900208FA8001C8FA7001810
65176+:105A40008FA600148FA500108FA4000C8FA3000850
65177+:105A50008FA200048FA1000027BD004C3C1B6004F6
65178+:105A60008F7A5030377B502803400008AF7A00000F
65179+:105A70008F86003C3C0390003C0280000086282575
65180+:105A800000A32025AC4400203C0380008C6700204C
65181+:105A900004E0FFFE0000000003E00008000000003A
65182+:105AA0000A000070240400018F85003C3C04800043
65183+:105AB0003483000100A3102503E00008AC8200201D
65184+:105AC00003E00008000010213084FFFF30A5FFFF35
65185+:105AD00010800007000018213082000110400002F1
65186+:105AE00000042042006518211480FFFB00052840B7
65187+:105AF00003E000080060102110C000070000000053
65188+:105B00008CA2000024C6FFFF24A50004AC82000084
65189+:105B100014C0FFFB2484000403E000080000000020
65190+:105B200010A0000824A3FFFFAC86000000000000C6
65191+:105B3000000000002402FFFF2463FFFF1462FFFA4D
65192+:105B40002484000403E000080000000090AA003153
65193+:105B50008FAB00108CAC00403C0300FF8D6800044C
65194+:105B6000AD6C00208CAD004400E060213462FFFF8A
65195+:105B7000AD6D00248CA700483C09FF000109C0243A
65196+:105B8000AD6700288CAE004C0182C824031978252B
65197+:105B9000AD6F0004AD6E002C8CAD0038314A00FFB3
65198+:105BA000AD6D001C94A900323128FFFFAD680010D4
65199+:105BB00090A70030A5600002A1600004A16700006A
65200+:105BC00090A30032306200FF0002198210600005CD
65201+:105BD000240500011065000E0000000003E000082D
65202+:105BE000A16A00018CD80028354A0080AD780018E1
65203+:105BF0008CCF0014AD6F00148CCE0030AD6E000859
65204+:105C00008CC4002CA16A000103E00008AD64000C04
65205+:105C10008CCD001CAD6D00188CC90014AD6900144A
65206+:105C20008CC80024AD6800088CC70020AD67000C4C
65207+:105C30008CC200148C8300700043C82B1320000713
65208+:105C4000000000008CC20014144CFFE400000000AF
65209+:105C5000354A008003E00008A16A00018C820070D0
65210+:105C60000A0000E6000000009089003027BDFFF820
65211+:105C70008FA8001CA3A900008FA300003C0DFF808B
65212+:105C800035A2FFFF8CAC002C00625824AFAB0000A3
65213+:105C9000A100000400C05821A7A000028D06000446
65214+:105CA00000A048210167C8218FA500000080502175
65215+:105CB0003C18FF7F032C20263C0E00FF2C8C00019B
65216+:105CC000370FFFFF35CDFFFF3C02FF0000AFC824B8
65217+:105CD00000EDC02400C27824000C1DC003236825F9
65218+:105CE00001F87025AD0D0000AD0E00048D240024D8
65219+:105CF000AFAD0000AD0400088D2C00202404FFFF90
65220+:105D0000AD0C000C9547003230E6FFFFAD060010E9
65221+:105D10009145004830A200FF000219C25060000106
65222+:105D20008D240034AD0400148D4700388FAA00186C
65223+:105D300027BD0008AD0B0028AD0A0024AD07001CEC
65224+:105D4000AD00002CAD00001803E00008AD000020FD
65225+:105D500027BDFFE0AFB20018AFB10014AFB0001024
65226+:105D6000AFBF001C9098003000C088213C0D00FFA0
65227+:105D7000330F007FA0CF0000908E003135ACFFFFC5
65228+:105D80003C0AFF00A0CE000194A6001EA220000441
65229+:105D90008CAB00148E29000400A08021016C282403
65230+:105DA000012A40240080902101052025A62600021A
65231+:105DB000AE24000426050020262400080E000092D0
65232+:105DC00024060002924700302605002826240014ED
65233+:105DD00000071E000003160324060004044000030D
65234+:105DE0002403FFFF965900323323FFFF0E00009279
65235+:105DF000AE230010262400248FBF001C8FB2001891
65236+:105E00008FB100148FB00010240500030000302172
65237+:105E10000A00009C27BD002027BDFFD8AFB1001CA1
65238+:105E2000AFB00018AFBF002090A9003024020001DD
65239+:105E300000E050213123003F00A040218FB00040FE
65240+:105E40000080882100C04821106200148FA700380C
65241+:105E5000240B000500A0202100C02821106B001396
65242+:105E6000020030210E000128000000009225007C75
65243+:105E700030A400021080000326030030AE00003082
65244+:105E8000260300348FBF00208FB1001C8FB0001894
65245+:105E90000060102103E0000827BD00280E0000A7C5
65246+:105EA000AFB000100A00016F000000008FA3003C9B
65247+:105EB000010020210120282101403021AFA3001042
65248+:105EC0000E0000EEAFB000140A00016F00000000E9
65249+:105ED0003C06800034C20E008C4400108F850044C4
65250+:105EE000ACA400208C43001803E00008ACA30024FD
65251+:105EF0003C06800034C20E008C4400148F850044A0
65252+:105F0000ACA400208C43001C03E00008ACA30024D8
65253+:105F10009382000C1040001B2483000F2404FFF028
65254+:105F20000064382410E00019978B00109784000E4D
65255+:105F30009389000D3C0A601C0A0001AC01644023F7
65256+:105F400001037021006428231126000231C2FFFFE3
65257+:105F500030A2FFFF0047302B50C0000E00E4482164
65258+:105F60008D4D000C31A3FFFF00036400000C2C03D7
65259+:105F700004A1FFF30000302130637FFF0A0001A479
65260+:105F80002406000103E00008000000009784000ED2
65261+:105F900000E448213123FFFF3168FFFF0068382B00
65262+:105FA00054E0FFF8A783000E938A000D114000050E
65263+:105FB000240F0001006BC023A380000D03E0000844
65264+:105FC000A798000E006BC023A38F000D03E000080C
65265+:105FD000A798000E03E000080000000027BDFFE8BE
65266+:105FE000AFB000103C10800036030140308BFFFF43
65267+:105FF00093AA002BAFBF0014A46B000436040E005C
65268+:106000009488001630C600FF8FA90030A4680006EF
65269+:10601000AC650008A0660012A46A001AAC670020F4
65270+:106020008FA5002CA4690018012020210E000198E2
65271+:10603000AC6500143C021000AE0201788FBF001462
65272+:106040008FB0001003E0000827BD00188F85000006
65273+:106050002484000727BDFFF83084FFF83C06800049
65274+:1060600094CB008A316AFFFFAFAA00008FA900001D
65275+:10607000012540232507FFFF30E31FFF0064102B9D
65276+:106080001440FFF700056882000D288034CC4000E2
65277+:1060900000AC102103E0000827BD00088F8200003B
65278+:1060A0002486000730C5FFF800A2182130641FFFC6
65279+:1060B00003E00008AF8400008F87003C8F84004419
65280+:1060C00027BDFFB0AFB70044AFB40038AFB1002C6C
65281+:1060D000AFBF0048AFB60040AFB5003CAFB300342F
65282+:1060E000AFB20030AFB000283C0B80008C8600249B
65283+:1060F000AD6700808C8A002035670E00356901008D
65284+:10610000ACEA00108C8800248D2500040000B82122
65285+:10611000ACE800188CE3001000A688230000A02142
65286+:10612000ACE300148CE20018ACE2001C122000FE6C
65287+:1061300000E0B021936C0008118000F40000000022
65288+:10614000976F001031EEFFFF022E682B15A000EFB5
65289+:1061500000000000977200103250FFFFAED0000028
65290+:106160003C0380008C740000329300081260FFFD35
65291+:106170000000000096D800088EC700043305FFFF1A
65292+:1061800030B5000112A000E4000000000000000D86
65293+:1061900030BFA0402419004013F9011B30B4A00007
65294+:1061A000128000DF000000009373000812600008F6
65295+:1061B00000000000976D001031ACFFFF00EC202BB9
65296+:1061C0001080000330AE004011C000D50000000078
65297+:1061D000A7850040AF87003893630008022028217C
65298+:1061E000AFB10020146000F527B40020AF60000CB0
65299+:1061F000978F004031F14000162000022403001662
65300+:106200002403000E24054007A363000AAF650014B1
65301+:10621000938A00428F70001431550001001512401E
65302+:1062200002024825AF690014979F00408F78001440
65303+:1062300033F9001003194025AF680014979200400D
65304+:106240003247000810E0016E000000008F67001464
65305+:106250003C1210003C11800000F27825AF6F001452
65306+:1062600036230E00946E000A3C0D81002406000EB9
65307+:1062700031CCFFFF018D2025AF640004A36600022E
65308+:106280009373000A3406FFFC266B0004A36B000A1C
65309+:1062900097980040330820001100015F00000000C3
65310+:1062A0003C05800034A90E00979900409538000CF9
65311+:1062B00097870040001940423312C00031030003A9
65312+:1062C00000127B0330F11000006F6825001172038B
65313+:1062D00001AE6025000C20C0A76400129793004017
65314+:1062E000936A000A001359823175003C02AA1021FA
65315+:1062F0002450003CA3700009953F000C33F93FFF88
65316+:10630000A779001097700012936900090130F821F5
65317+:1063100027E5000230B900070019C0233308000741
65318+:10632000A368000B9371000997720012976F001019
65319+:10633000322700FF8F910038978D004000F218211E
65320+:10634000006F702101C6602131A6004010C0000519
65321+:106350003185FFFF00B1102B3C1280001040001768
65322+:10636000000098210225A82B56A0013E8FA50020F1
65323+:106370003C048000348A0E008D5300143C068000DB
65324+:10638000AD5300108D4B001CAD4B0018AD45000007
65325+:106390008CCD000031AC00081180FFFD34CE0E0022
65326+:1063A00095C3000800A0882100009021A783004029
65327+:1063B0008DC6000424130001AF860038976F0010CB
65328+:1063C00031F5FFFF8E9F000003F1282310A0011F6D
65329+:1063D000AE85000093620008144000DD000000005C
65330+:1063E0000E0001E7240400108F900048004028218F
65331+:1063F0003C023200320600FF000654000142F8253C
65332+:1064000026090001AF890048ACBF0000937900095C
65333+:1064100097780012936F000A332800FF3303FFFFC1
65334+:106420000103382100076C0031EE00FF01AE60254A
65335+:10643000ACAC00048F840048978B0040316A200088
65336+:106440001140010AACA4000897640012308BFFFFD2
65337+:1064500006400108ACAB000C978E004031C5000827
65338+:1064600014A0000226280006262800023C1F8000F7
65339+:1064700037E70E0094F900148CE5001C8F670004C8
65340+:10648000937800023324FFFF330300FFAFA3001013
65341+:106490008F6F0014AFA800180E0001CBAFAF00142F
65342+:1064A000240400100E0001FB000000008E9200008A
65343+:1064B00016400005000000008F7800142403FFBF81
65344+:1064C0000303A024AF7400148F67000C00F5C821EB
65345+:1064D000AF79000C9375000816A0000800000000BA
65346+:1064E00012600006000000008F6800143C0AEFFFF5
65347+:1064F0003549FFFE0109F824AF7F0014A37300089B
65348+:106500008FA500200A00034F02202021AED10000F9
65349+:106510000A00022D3C03800014E0FF1E30BFA040A3
65350+:106520000E0001900000A0212E9100010237B0253D
65351+:1065300012C000188FBF00488F87003C24170F003F
65352+:1065400010F700D43C0680008CD901780720FFFEAC
65353+:10655000241F0F0010FF00F634CA0E008D560014E1
65354+:1065600034C7014024080240ACF600048D49001CE9
65355+:106570003C141000ACE90008A0E00012A4E0001AEE
65356+:10658000ACE00020A4E00018ACE80014ACD4017822
65357+:106590008FBF00488FB700448FB600408FB5003CD6
65358+:1065A0008FB400388FB300348FB200308FB1002C1D
65359+:1065B0008FB0002803E0000827BD00508F910038FD
65360+:1065C000978800403C1280000220A821310700403B
65361+:1065D00014E0FF7C00009821977900108F9200381A
65362+:1065E0003338FFFF131200A8000020210080A021F3
65363+:1065F000108000F300A088211620FECE00000000CD
65364+:106600000A00031F2E9100013C0380008C62017878
65365+:106610000440FFFE240808008F860000AC68017863
65366+:106620003C038000946D008A31ACFFFF0186582343
65367+:10663000256AFFFF31441FFF2C8900081520FFF950
65368+:10664000000000008F8F0048347040008F83003CB2
65369+:1066500000E0A021240E0F0025E70001AF870048CD
65370+:1066600000D03021023488233C08800031F500FF3F
65371+:10667000106E0005240700019398004233130001B7
65372+:106680000013924036470001001524003C0A010027
65373+:10669000008A4825ACC900008F82004830BF003610
65374+:1066A00030B90008ACC200041320009900FF9825FF
65375+:1066B00035120E009650000A8F8700003C0F8100B3
65376+:1066C0003203FFFF24ED000835060140006F60250E
65377+:1066D0003C0E100031AB1FFF269200062405000E71
65378+:1066E000ACCC0020026E9825A4C5001AAF8B000028
65379+:1066F000A4D20018162000083C1080008F89003CAE
65380+:1067000024020F00512200022417000136730040BA
65381+:106710000E0001883C10800036060E008CCB001461
65382+:10672000360A014002402021AD4B00048CC5001CFC
65383+:10673000AD450008A1550012AD5300140E0001989C
65384+:106740003C151000AE1501780A000352000000004D
65385+:10675000936F0009976E0012936D000B31E500FFF7
65386+:1067600000AE202131AC00FF008C80212602000AFF
65387+:106770003050FFFF0E0001E7020020218F86004805
65388+:106780003C0341003C05800024CB0001AF8B004856
65389+:10679000936A00099769001230C600FF315F00FF5D
65390+:1067A0003128FFFF03E8382124F900020006C40065
65391+:1067B0000319782501E37025AC4E00008F6D000CA5
65392+:1067C00034A40E00948B001401B26025AC4C00047C
65393+:1067D0008C85001C8F670004936A00023164FFFF00
65394+:1067E000314900FFAFA900108F680014AFB1001845
65395+:1067F0000E0001CBAFA800140A0002FD0200202108
65396+:10680000AF600004A36000029798004033082000A6
65397+:106810001500FEA300003021A760001297840040FD
65398+:10682000936B000A3C10800030931F0000135183CB
65399+:10683000014BA82126A20028A362000936090E00F8
65400+:10684000953F000C0A000295A77F00108F7000147E
65401+:10685000360900400E000188AF6900140A0002C921
65402+:10686000000000000A00034F000020210641FEFA4C
65403+:10687000ACA0000C8CAC000C3C0D8000018D902570
65404+:106880000A0002EAACB2000C000090210A0002C526
65405+:1068900024130001128000073C028000344B0E00DC
65406+:1068A0009566000830D300401260004900000000E7
65407+:1068B0003C0680008CD001780600FFFE34C50E0037
65408+:1068C00094B500103C03050034CC014032B8FFFF02
65409+:1068D00003039025AD92000C8CAF0014240D200012
65410+:1068E0003C041000AD8F00048CAE001CAD8E00087F
65411+:1068F000A1800012A580001AAD800020A58000189C
65412+:10690000AD8D0014ACC401780A0003263C0680005B
65413+:106910008F9F0000351801402692000227F90008D9
65414+:1069200033281FFFA71200180A000391AF88000048
65415+:106930003C02800034450140ACA0000C1280001BDA
65416+:1069400034530E0034510E008E370010ACB70004E3
65417+:106950008E2400183C0B8000ACA400083570014068
65418+:1069600024040040A20000128FBF0048A600001AB5
65419+:106970008FB70044AE0000208FB60040A60000187C
65420+:106980008FB5003CAE0400148FB400388FB30034D0
65421+:106990008FB200308FB1002C8FB000283C02100065
65422+:1069A00027BD005003E00008AD6201788E66001438
65423+:1069B000ACA600048E64001C0A00042A3C0B800074
65424+:1069C0000E0001902E9100010A0003200237B0252D
65425+:1069D000000000000000000D00000000240003691A
65426+:1069E0000A0004013C06800027BDFFD8AFBF00208D
65427+:1069F0003C0980003C1F20FFAFB200183C0760003C
65428+:106A000035320E002402001037F9FFFDACE23008E9
65429+:106A1000AFB3001CAFB10014AFB00010AE5900000E
65430+:106A20000000000000000000000000000000000066
65431+:106A3000000000003C1800FF3713FFFDAE530000BC
65432+:106A40003C0B60048D7050002411FF7F3C0E00024F
65433+:106A50000211782435EC380C35CD0109ACED4C1819
65434+:106A6000240A0009AD6C50008CE80438AD2A0008F7
65435+:106A7000AD2000148CE54C1C3106FFFF38C42F718B
65436+:106A800000051E023062000F2486C0B310400007CC
65437+:106A9000AF8200088CE54C1C3C09001F3528FC0027
65438+:106AA00000A81824000321C2AF8400048CF1080858
65439+:106AB0003C0F57092412F0000232702435F0001008
65440+:106AC00001D0602601CF68262DAA00012D8B000180
65441+:106AD000014B382550E00009A380000C3C1F601CCE
65442+:106AE0008FF8000824190001A399000C33137C00CF
65443+:106AF000A7930010A780000EA380000DAF80004870
65444+:106B000014C00003AF8000003C066000ACC0442C01
65445+:106B10000E0005B93C1080000E000F1A361101005E
65446+:106B20003C12080026523DD03C13080026733E500C
65447+:106B30008E03000038640001308200011440FFFC25
65448+:106B40003C0B800A8E2600002407FF8024C90240E7
65449+:106B5000312A007F014B402101272824AE06002066
65450+:106B6000AF880044AE0500243C048000AF86003CA2
65451+:106B70008C8C01780580FFFE24180800922F0008F5
65452+:106B8000AC980178A38F0042938E004231CD000172
65453+:106B900011A0000F24050D0024DFF8002FF90301D8
65454+:106BA0001320001C000629C224A4FFF00004104298
65455+:106BB000000231400E00020200D2D8213C02400007
65456+:106BC0003C068000ACC201380A0004A000000000AE
65457+:106BD00010C50023240D0F0010CD00273C1F800896
65458+:106BE00037F9008093380000240E0050330F00FF67
65459+:106BF00015EEFFF33C0240000E000A3600000000D4
65460+:106C00003C0240003C068000ACC201380A0004A0EF
65461+:106C1000000000008F83000400A3402B1500000B30
65462+:106C20008F8B0008006B50212547FFFF00E5482BA4
65463+:106C30001520000600A36023000C19400E0002027C
65464+:106C40000073D8210A0004C43C0240000000000D7B
65465+:106C50000E000202000000000A0004C43C024000D2
65466+:106C60003C1B0800277B3F500E0002020000000082
65467+:106C70000A0004C43C0240003C1B0800277B3F7014
65468+:106C80000E000202000000000A0004C43C024000A2
65469+:106C90003C0660043C09080025290104ACC9502CBD
65470+:106CA0008CC850003C0580003C0200023507008083
65471+:106CB000ACC750003C040800248415A43C03080021
65472+:106CC0002463155CACA50008ACA2000C3C010800D4
65473+:106CD000AC243D603C010800AC233D6403E00008A7
65474+:106CE0002402000100A030213C1C0800279C3D68C4
65475+:106CF0003C0C04003C0B0002008B3826008C402624
65476+:106D00002CE200010007502B2D050001000A4880ED
65477+:106D10003C03080024633D60004520250123182121
65478+:106D20001080000300001021AC6600002402000166
65479+:106D300003E00008000000003C1C0800279C3D68A0
65480+:106D40003C0B04003C0A0002008A3026008B3826E7
65481+:106D50002CC200010006482B2CE5000100094080F0
65482+:106D60003C03080024633D600045202501031821F1
65483+:106D700010800005000010213C0C0800258C155CDB
65484+:106D8000AC6C00002402000103E0000800000000D9
65485+:106D90003C0900023C08040000883026008938269F
65486+:106DA0002CC30001008028212CE400010083102561
65487+:106DB0001040000B000030213C1C0800279C3D685F
65488+:106DC0003C0A80008D4E00082406000101CA682597
65489+:106DD000AD4D00088D4C000C01855825AD4B000CC5
65490+:106DE00003E0000800C010213C1C0800279C3D68FF
65491+:106DF0003C0580008CA6000C000420272402000122
65492+:106E000000C4182403E00008ACA3000C3C020002FC
65493+:106E10001082000B3C0560003C0704001087000353
65494+:106E20000000000003E00008000000008CA908D06A
65495+:106E3000240AFFFD012A402403E00008ACA808D082
65496+:106E40008CA408D02406FFFE0086182403E0000866
65497+:106E5000ACA308D03C05601A34A600108CC3008097
65498+:106E600027BDFFF88CC50084AFA3000093A40000E9
65499+:106E70002402000110820003AFA5000403E0000813
65500+:106E800027BD000893A7000114E0001497AC00028E
65501+:106E900097B800023C0F8000330EFFFC01CF682141
65502+:106EA000ADA50000A3A000003C0660008CC708D080
65503+:106EB0002408FFFE3C04601A00E82824ACC508D072
65504+:106EC0008FA300048FA200003499001027BD000892
65505+:106ED000AF22008003E00008AF2300843C0B800059
65506+:106EE000318AFFFC014B48218D2800000A00057DF6
65507+:106EF000AFA8000427BDFFE8AFBF00103C1C08008E
65508+:106F0000279C3D683C0580008CA4000C8CA20004EA
65509+:106F10003C0300020044282410A0000A00A3182407
65510+:106F20003C0604003C0400021460000900A6102482
65511+:106F30001440000F3C0404000000000D3C1C08003D
65512+:106F4000279C3D688FBF001003E0000827BD001894
65513+:106F50003C0208008C423D600040F809000000003F
65514+:106F60003C1C0800279C3D680A0005A68FBF001046
65515+:106F70003C0208008C423D640040F809000000001B
65516+:106F80000A0005AC00000000000411C003E0000886
65517+:106F9000244202403C04080024843FB42405001A23
65518+:106FA0000A00009C0000302127BDFFE0AFB00010B8
65519+:106FB0003C108000AFBF0018AFB1001436110100C3
65520+:106FC000922200090E0005B63044007F8E3F00007B
65521+:106FD0008F89003C3C0F008003E26021258800403F
65522+:106FE0000049F821240DFF80310E00783198007897
65523+:106FF00035F9000135F100020319382501D1482582
65524+:10700000010D302403ED5824018D2824240A00406A
65525+:1070100024040080240300C0AE0B0024AE0008103E
65526+:10702000AE0A0814AE040818AE03081CAE05080426
65527+:10703000AE070820AE060808AE0908243609090084
65528+:107040009539000C3605098033ED007F3338FFFF9A
65529+:10705000001889C0AE110800AE0F0828952C000C4E
65530+:107060008FBF00188FB10014318BFFFF000B51C090
65531+:10707000AE0A002C8CA400508FB000108CA3003CF2
65532+:107080008D2700048CA8001C8CA600383C0E800ABA
65533+:1070900001AE102127BD0020AF820044AF84005014
65534+:1070A000AF830054AF87004CAF88005C03E000085A
65535+:1070B000AF8600603C09080091293FD924A800024E
65536+:1070C0003C05110000093C0000E8302500C51825EA
65537+:1070D00024820008AC83000003E00008AC800004B8
65538+:1070E0003C098000352309009128010B906A0011AA
65539+:1070F0002402002800804821314700FF00A07021B1
65540+:1071000000C068213108004010E20002340C86DD26
65541+:10711000240C08003C0A800035420A9A944700007B
65542+:10712000354B0A9C35460AA030F9FFFFAD39000007
65543+:107130008D780000354B0A8024040001AD3800042E
65544+:107140008CCF0000AD2F00089165001930A300031B
65545+:107150001064009028640002148000AF240500022F
65546+:107160001065009E240F0003106F00B435450AA47B
65547+:10717000240A0800118A0048000000005100003D68
65548+:107180003C0B80003C0480003483090090670012AF
65549+:1071900030E200FF004D7821000FC8802724000155
65550+:1071A0003C0A8000354F090091E50019354C0980F3
65551+:1071B0008D87002830A300FF0003150000475825E5
65552+:1071C0000004C4003C19600001793025370806FF2F
65553+:1071D000AD260000AD2800048DEA002C25280028EB
65554+:1071E000AD2A00088DEC0030AD2C000C8DE500348C
65555+:1071F000AD2500108DE400383C05800034AC093C1E
65556+:10720000AD2400148DE3001CAD2300188DE7002091
65557+:10721000AD27001C8DE20024AD2200208DF900284E
65558+:1072200034A20100AD3900248D830000AD0E0004AE
65559+:1072300034B90900AD0300008C47000C250200148E
65560+:10724000AD070008932B00123C04080090843FD83F
65561+:10725000AD000010317800FF030D302100064F0013
65562+:1072600000047C00012F702535CDFFFC03E00008F1
65563+:10727000AD0D000C35780900930600123C0508009E
65564+:1072800094A53FC830C800FF010D5021000A60805E
65565+:107290000A00063C018520211500005B000000006B
65566+:1072A0003C08080095083FCE3C06080094C63FC83D
65567+:1072B000010610213C0B800035790900933800113C
65568+:1072C000932A001935660A80330800FF94CF002AFC
65569+:1072D00000086082314500FF978A0058000C1E00AC
65570+:1072E000000524003047FFFF006410250047C0253B
65571+:1072F00001EA30213C0B4000030B402500066400EE
65572+:10730000AD280000AD2C0004932500183C030006B6
65573+:107310002528001400053E0000E31025AD220008DA
65574+:107320008F24002C3C05800034AC093CAD24000CBB
65575+:107330008F38001C34A20100254F0001AD38001029
65576+:107340008D830000AD0E000431EB7FFFAD03000024
65577+:107350008C47000C34B90900A78B0058AD07000812
65578+:10736000932B00123C04080090843FD8250200149F
65579+:10737000317800FF030D302100064F0000047C002F
65580+:10738000012F702535CDFFFCAD00001003E0000893
65581+:10739000AD0D000C3C02080094423FD23C050800B1
65582+:1073A00094A53FC835440AA43C07080094E73FC4AD
65583+:1073B000948B00000045C8210327C023000B1C004C
65584+:1073C0002706FFF200665025AD2A000CAD20001004
65585+:1073D000AD2C00140A00063025290018354F0AA4E8
65586+:1073E00095E50000956400280005140000043C00A9
65587+:1073F0003459810000EC5825AD39000CAD2B00103C
65588+:107400000A000630252900143C0C0800958C3FCE5C
65589+:107410000A000681258200015460FF56240A0800F4
65590+:1074200035580AA49706000000061C00006C502581
65591+:10743000AD2A000C0A000630252900103C03080084
65592+:1074400094633FD23C07080094E73FC83C0F080014
65593+:1074500095EF3FC494A4000095790028006710219F
65594+:10746000004F582300041C00001934002578FFEE5B
65595+:1074700000D87825346A8100AD2A000CAD2F0010A9
65596+:10748000AD200014AD2C00180A0006302529001C80
65597+:1074900003E00008240207D027BDFFE0AFB20018C8
65598+:1074A000AFB10014AFB00010AFBF001C0E00007CE5
65599+:1074B000008088218F8800548F87004C3C0580080D
65600+:1074C00034B20080011128213C1080002402008089
65601+:1074D000240300C000A72023AE0208183C06800841
65602+:1074E000AE03081C18800004AF850054ACC500042E
65603+:1074F0008CC90004AF89004C1220000936040980B1
65604+:107500000E0006F800000000924C00278E0B00745D
65605+:1075100001825004014B3021AE46000C3604098034
65606+:107520008C8E001C8F8F005C01CF682319A0000493
65607+:107530008FBF001C8C90001CAF90005C8FBF001CA4
65608+:107540008FB200188FB100148FB000100A00007EB7
65609+:1075500027BD00208F8600508F8300548F82004CFF
65610+:107560003C05800834A40080AC860050AC83003C0D
65611+:1075700003E00008ACA200043C0308008C63005444
65612+:1075800027BDFFF8308400FF2462000130A500FF12
65613+:107590003C010800AC22005430C600FF3C078000CC
65614+:1075A0008CE801780500FFFE3C0C7FFFA3A40003DC
65615+:1075B0008FAA0000358BFFFF014B4824000627C02F
65616+:1075C00001244025AFA8000034E201009043000AE6
65617+:1075D000A3A000023C1980FFA3A300018FAF00000D
65618+:1075E00030AE007F3738FFFF01F86024000E6E00D8
65619+:1075F0003C0A002034E50140018D58253549200022
65620+:107600002406FF803C04100027BD0008ACAB000C32
65621+:10761000ACA90014A4A00018A0A6001203E0000862
65622+:10762000ACE40178308800FF30A700FF3C03800005
65623+:107630008C6201780440FFFE3C0C8000358A0A0011
65624+:107640008D4B00203584014035850980AC8B0004CA
65625+:107650008D4900240007302B00061540AC89000836
65626+:10766000A088001090A3004CA083002D03E0000828
65627+:10767000A480001827BDFFE8308400FFAFBF0010D2
65628+:107680000E00075D30A500FF8F8300548FBF0010F0
65629+:107690003C06800034C50140344700402404FF907C
65630+:1076A0003C02100027BD0018ACA3000CA0A40012DF
65631+:1076B000ACA7001403E00008ACC2017827BDFFE0CE
65632+:1076C0003C088008AFBF001CAFB20018AFB1001477
65633+:1076D000AFB00010351000808E0600183C07800007
65634+:1076E000309200FF00C72025AE0400180E00007C79
65635+:1076F00030B100FF92030005346200080E00007EE6
65636+:10770000A2020005024020210E000771022028215C
65637+:10771000024020218FBF001C8FB200188FB10014CF
65638+:107720008FB0001024050005240600010A0007326E
65639+:1077300027BD00203C05800034A309809066000826
65640+:1077400030C200081040000F3C0A01013549080A08
65641+:10775000AC8900008CA80074AC8800043C070800C9
65642+:1077600090E73FD830E5001050A00008AC8000083A
65643+:107770003C0D800835AC00808D8B0058AC8B000828
65644+:107780002484000C03E00008008010210A0007B5E3
65645+:107790002484000C27BDFFE83C098000AFB0001036
65646+:1077A000AFBF00143526098090C8000924020006E6
65647+:1077B00000A05821310300FF3527090000808021F7
65648+:1077C000240500041062007B2408000294CF005CB2
65649+:1077D0003C0E020431EDFFFF01AE6025AE0C00004F
65650+:1077E00090CA00083144002010800008000000000A
65651+:1077F00090C2004E3C1F010337F90300305800FFD0
65652+:107800000319302524050008AE06000490F9001184
65653+:1078100090E6001290E40011333800FF00187082E7
65654+:1078200030CF00FF01CF5021014B6821308900FF8C
65655+:1078300031AAFFFF39230028000A60801460002C61
65656+:10784000020C482390E400123C198000372F0100FD
65657+:10785000308C00FF018B1821000310800045F821B7
65658+:10786000001F8400360706FFAD270004373F0900DC
65659+:1078700093EC001193EE0012372609800005C082B8
65660+:107880008DE4000C8CC5003431CD00FF01AB10211C
65661+:107890000058182100A4F8230008840000033F00CA
65662+:1078A00000F0302533F9FFFF318F00FC00D970253F
65663+:1078B0000158202101E9682100045080ADAE000C80
65664+:1078C0000E00007C012A80213C088008240B000463
65665+:1078D000350500800E00007EA0AB000902001021DB
65666+:1078E0008FBF00148FB0001003E0000827BD001800
65667+:1078F00090EC001190E300193C18080097183FCE57
65668+:10790000318200FF0002F882307000FF001FCE00BD
65669+:1079100000103C000327302500D870253C0F4000A4
65670+:1079200001CF68253C198000AD2D0000373F0900CC
65671+:1079300093EC001193EE0012372F010037260980D7
65672+:107940000005C0828DE4000C8CC5003431CD00FFF1
65673+:1079500001AB10210058182100A4F823000884006E
65674+:1079600000033F0000F0302533F9FFFF318F00FCAA
65675+:1079700000D970250158202101E9682100045080B8
65676+:10798000ADAE000C0E00007C012A80213C0880086E
65677+:10799000240B0004350500800E00007EA0AB00091A
65678+:1079A000020010218FBF00148FB0001003E0000808
65679+:1079B00027BD00180A0007C72408001227BDFFD002
65680+:1079C0003C038000AFB60028AFB50024AFB4002060
65681+:1079D000AFB10014AFBF002CAFB3001CAFB20018A2
65682+:1079E000AFB000103467010090E6000B309400FF48
65683+:1079F00030B500FF30C200300000B02110400099C7
65684+:107A000000008821346409809088000800082E0056
65685+:107A100000051E03046000C0240400048F86005487
65686+:107A20003C010800A0243FD83C0C8000AD800048F9
65687+:107A30003C048000348E010091CD000B31A5002064
65688+:107A400010A000073C078000349309809272000860
65689+:107A50000012860000107E0305E000C43C1F800871
65690+:107A600034EC0100918A000B34EB09809169000825
65691+:107A7000314400400004402B3123000800C8982303
65692+:107A80001460000224120003000090213C108000CA
65693+:107A900036180A8036040900970E002C90830011D6
65694+:107AA0009089001293050018307F00FF312800FFF5
65695+:107AB000024810210002C880930D0018033F78216E
65696+:107AC00001F1302130B100FF00D11821A78E0058FC
65697+:107AD0003C010800A4263FCE3C010800A4233FD06F
65698+:107AE00015A00002000000000000000D920B010B29
65699+:107AF0003065FFFF3C010800A4233FD2316A0040FB
65700+:107B00003C010800A4203FC83C010800A4203FC459
65701+:107B10001140000224A4000A24A4000B3091FFFFAE
65702+:107B20000E0001E7022020219206010B3C0C080008
65703+:107B3000958C3FD2004020210006698231A70001C8
65704+:107B40000E00060101872821004020210260282123
65705+:107B50000E00060C024030210E0007A1004020213B
65706+:107B600016C00069004020219212010B32560040DD
65707+:107B700012C000053C0500FF8C93000034AEFFFFEF
65708+:107B8000026E8024AC9000000E0001FB0220202138
65709+:107B90003C0F080091EF3FD831F10003122000168E
65710+:107BA0003C1380088F8200543C09800835280080EF
65711+:107BB000245F0001AD1F003C3C0580088CB9000427
65712+:107BC00003E02021033FC0231B000002AF9F0054AD
65713+:107BD0008CA400040E0006F8ACA400043C0780004E
65714+:107BE0008CEB00743C04800834830080004B5021EF
65715+:107BF000AC6A000C3C1380083670008002802021A3
65716+:107C000002A02821A200006B0E00075D3C1480003A
65717+:107C10008F920054368C0140AD92000C8F86004844
65718+:107C20003C151000344D000624D60001AF960048E4
65719+:107C30008FBF002CA18600128FB60028AD8D0014D6
65720+:107C40008FB3001CAE9501788FB200188FB5002459
65721+:107C50008FB400208FB100148FB0001003E0000833
65722+:107C600027BD003034640980908F0008000F760033
65723+:107C7000000E6E0305A00033347F090093F8001B4B
65724+:107C8000241900103C010800A0393FD8331300022A
65725+:107C90001260FF678F8600548F8200601446FF6574
65726+:107CA0003C0480000E00007C000000003C048008C2
65727+:107CB0003485008090A8000924060016310300FFD7
65728+:107CC0001066000D0000000090AB00093C070800A2
65729+:107CD00090E73FD824090008316400FF34EA00012E
65730+:107CE0003C010800A02A3FD81089002F240C000A6C
65731+:107CF000108C00282402000C0E00007E0000000002
65732+:107D00000A0008608F8600540E0007B9024028213F
65733+:107D10000A0008AE004020213C0B8008356A008034
65734+:107D20008D4600548CE9000C1120FF3DAF860054B5
65735+:107D3000240700143C010800A0273FD80A00085F70
65736+:107D40003C0C800090910008241200023C010800C5
65737+:107D5000A0323FD8323000201200000B2416000160
65738+:107D60008F8600540A0008602411000837F800804C
65739+:107D70008F020038AFE200048FF90004AF19003C15
65740+:107D80000A00086C3C0780008F8600540A000860D7
65741+:107D900024110004A0A200090E00007E00000000D3
65742+:107DA0000A0008608F860054240200140A00093A71
65743+:107DB000A0A2000927BDFFE8AFB000103C10800072
65744+:107DC000AFBF001436020100904400090E00075DA9
65745+:107DD000240500013C0480089099000E3483008043
65746+:107DE000909F000F906F00269089000A33F800FFE3
65747+:107DF00000196E000018740031EC00FF01AE502530
65748+:107E0000000C5A00014B3825312800FF3603014091
65749+:107E10003445600000E830252402FF813C04100056
65750+:107E2000AC66000C8FBF0014AC650014A062001299
65751+:107E3000AE0401788FB0001003E0000827BD0018E1
65752+:107E400027BDFFE8308400FFAFBF00100E00075DC4
65753+:107E500030A500FF3C05800034A4014034470040B9
65754+:107E60002406FF92AC870014A08600128F83005472
65755+:107E70008FBF00103C02100027BD0018AC83000C1F
65756+:107E800003E00008ACA2017827BDFFD8AFB0001016
65757+:107E9000308400FF30B000FF3C058000AFB100141B
65758+:107EA000AFBF0020AFB3001CAFB20018000410C277
65759+:107EB00034A60100320300023051000114600007B3
65760+:107EC00090D200093C098008353300809268000593
65761+:107ED0003107000810E0000C308A00100240202119
65762+:107EE0000E00078302202821240200018FBF0020FA
65763+:107EF0008FB3001C8FB200188FB100148FB0001028
65764+:107F000003E0000827BD00281540003434A50A000E
65765+:107F10008CB800248CAF0008130F004B00003821F0
65766+:107F20003C0D800835B30080926C00682406000286
65767+:107F3000318B00FF116600843C06800034C20100D2
65768+:107F40009263004C90590009307F00FF53F9000400
65769+:107F50003213007C10E00069000000003213007C46
65770+:107F60005660005C0240202116200009320D0001FD
65771+:107F70003C0C800035840100358B0A008D6500249F
65772+:107F80008C86000414A6FFD900001021320D0001D8
65773+:107F900011A0000E024020213C1880003710010083
65774+:107FA0008E0F000C8F8E005011EE000800000000B4
65775+:107FB0000E000843022028218E19000C3C1F800867
65776+:107FC00037F00080AE190050024020210E000771EA
65777+:107FD000022028210A00098F240200013C05080024
65778+:107FE0008CA5006424A400013C010800AC240064BA
65779+:107FF0001600000D00000000022028210E0007716D
65780+:1080000002402021926E0068240C000231CD00FF56
65781+:1080100011AC0022024020210E00094100000000A6
65782+:108020000A00098F240200010E00007024040001E0
65783+:10803000926B0025020B30250E00007EA266002503
65784+:108040000A0009D3022028218E6200188CDF000468
65785+:108050008CB9002400021E0217F9FFB13065007FC1
65786+:108060009268004C264400013093007F1265004066
65787+:10807000310300FF1464FFAB3C0D8008264700016C
65788+:1080800030F1007F30E200FF1225000B24070001D1
65789+:10809000004090210A00099C2411000124050004DD
65790+:1080A0000E000732240600010E0009410000000006
65791+:1080B0000A00098F240200012405FF8002452024C4
65792+:1080C00000859026324200FF004090210A00099C62
65793+:1080D000241100010E00084302202821320700303D
65794+:1080E00010E0FFA132100082024020210E00078321
65795+:1080F000022028210A00098F240200018E6900183D
65796+:108100000240202102202821012640250E0009647A
65797+:10811000AE6800189264004C240500032406000198
65798+:108120000E000732308400FF0E00007024040001AE
65799+:1081300092710025021150250E00007EA26A0025D2
65800+:108140000A00098F240200018E6F00183C1880007D
65801+:108150000240202101F87025022028210E0007711D
65802+:10816000AE6E00189264004C0A000A1B240500043D
65803+:10817000324A0080394900801469FF6A3C0D80084A
65804+:108180000A0009F42647000127BDFFC0AFB0001860
65805+:108190003C108000AFBF0038AFB70034AFB600303E
65806+:1081A000AFB5002CAFB40028AFB30024AFB20020AD
65807+:1081B0000E0005BEAFB1001C360201009045000B59
65808+:1081C0000E00097690440008144000E78FBF003885
65809+:1081D0003C08800835070080A0E0006B3606098067
65810+:1081E00090C50000240300503C17080026F73F907C
65811+:1081F00030A400FF3C13080026733FA01083000347
65812+:108200003C1080000000B82100009821241F0010BD
65813+:108210003611010036120A00361509808E580024E6
65814+:108220008E3400048EAF00208F8C00543C01080077
65815+:10823000A03F3FD836190A80972B002C8EF60000FD
65816+:10824000932A00180298702301EC68233C0108006F
65817+:10825000AC2E3FB43C010800AC2D3FB83C010800F7
65818+:10826000AC2C3FDCA78B005802C0F809315400FF4A
65819+:1082700030490002152000E930420001504000C49E
65820+:108280009227000992A90008312800081500000271
65821+:10829000241500030000A8213C0A80003543090092
65822+:1082A00035440A008C8D00249072001190700012E9
65823+:1082B000907F0011325900FF321100FF02B11021EE
65824+:1082C0000002C08033EF00FF0319B021028F70213C
65825+:1082D00002D4602125CB00103C010800A4363FCE1B
65826+:1082E0003C010800AC2D3FE03C010800A42C3FD02D
65827+:1082F0003C010800A42B3FCC3556010035540980C1
65828+:1083000035510E008F8700548F89005C8E850020C8
65829+:1083100024080006012730233C010800AC283FD484
65830+:1083200000A7282304C000B50000902104A000B3DA
65831+:1083300000C5502B114000B5000000003C010800B2
65832+:10834000AC263FB88E6200000040F8090000000033
65833+:108350003046000214C0007400408021304B000100
65834+:10836000556000118E6200043C0D08008DAD3FBCCD
65835+:108370003C0EC0003C04800001AE6025AE2C000025
65836+:108380008C980000330F000811E0FFFD0000000092
65837+:10839000963F000824120001A79F00408E39000478
65838+:1083A000AF9900388E6200040040F8090000000018
65839+:1083B0000202802532030002146000B300000000B6
65840+:1083C0003C09080095293FC43C06080094C63FD0EC
65841+:1083D0003C0A0800954A3FC63C0708008CE73FBCB2
65842+:1083E000012670213C0308008C633FE03C08080034
65843+:1083F00095083FDA01CA20218ED9000C00E9282116
65844+:10840000249F000200A878210067C02133E4FFFF09
65845+:10841000AF9900503C010800AC383FE03C01080037
65846+:10842000A42F3FC83C010800A42E3FD20E0001E754
65847+:10843000000000008F8D0048004020213C01080012
65848+:10844000A02D3FD98E62000825AC0001AF8C0048FA
65849+:108450000040F809000000008F85005402A0302180
65850+:108460000E00060C004020210E0007A10040202134
65851+:108470008E6B000C0160F809004020213C0A0800C6
65852+:10848000954A3FD23C06080094C63FC601464821A3
65853+:10849000252800020E0001FB3104FFFF3C05080007
65854+:1084A0008CA53FB43C0708008CE73FBC00A7202305
65855+:1084B0003C010800AC243FB414800006000000001A
65856+:1084C0003C0208008C423FD4344B00403C01080081
65857+:1084D000AC2B3FD4124000438F8E00448E2D0010F1
65858+:1084E0008F920044AE4D00208E2C0018AE4C00241C
65859+:1084F0003C04080094843FC80E0006FA0000000007
65860+:108500008F9F00548E6700103C010800AC3F3FDC99
65861+:1085100000E0F809000000003C1908008F393FB462
65862+:108520001720FF798F870054979300583C11800ED5
65863+:10853000321601000E000729A633002C16C0004594
65864+:10854000320300105460004C8EE5000432080040F5
65865+:108550005500001D8EF000088EE4000C0080F80924
65866+:10856000000000008FBF00388FB700348FB6003096
65867+:108570008FB5002C8FB400288FB300248FB2002059
65868+:108580008FB1001C8FB0001803E0000827BD004029
65869+:108590008F86003C36110E0000072E0000A6202515
65870+:1085A000AE0400808E4300208E500024AFA3001044
65871+:1085B000AE2300148FB20010AE320010AE30001C9B
65872+:1085C0000A000A75AE3000180200F8090000000029
65873+:1085D0008EE4000C0080F809000000000A000B2E59
65874+:1085E0008FBF003824180001240F0001A5C000200F
65875+:1085F000A5D800220A000B10ADCF00243C010800D2
65876+:10860000AC203FB80A000AA68E6200003C010800B8
65877+:10861000AC253FB80A000AA68E6200009224000929
65878+:108620000E000771000028218FBF00388FB700347B
65879+:108630008FB600308FB5002C8FB400288FB3002484
65880+:108640008FB200208FB1001C8FB0001803E000082B
65881+:1086500027BD00403C1480009295010900002821AC
65882+:108660000E00084332A400FF320300105060FFB830
65883+:10867000320800408EE5000400A0F8090000000068
65884+:108680000A000B28320800405240FFA89793005878
65885+:108690008E3400148F930044AE7400208E35001C7D
65886+:1086A000AE7500240A000B1F979300588F820014A8
65887+:1086B0000004218003E00008008210213C078008AC
65888+:1086C00034E200809043006900804021106000097E
65889+:1086D0003C0401003C0708008CE73FDC8F8300303E
65890+:1086E00000E32023048000089389001C14E30003A6
65891+:1086F0000100202103E00008008010213C0401005B
65892+:1087000003E00008008010211120000B00673823CF
65893+:108710003C0D800035AC0980918B007C316A0002F1
65894+:10872000114000202409003400E9702B15C0FFF12E
65895+:108730000100202100E938232403FFFC00A3C82402
65896+:1087400000E3C02400F9782B15E0FFEA030820219C
65897+:1087500030C400030004102314C000143049000387
65898+:108760000000302100A9782101E6702100EE682B7D
65899+:1087700011A0FFE03C0401002D3800010006C82BC9
65900+:10878000010548210319382414E0FFDA2524FFFCF1
65901+:108790002402FFFC00A218240068202103E0000846
65902+:1087A000008010210A000B9E240900303C0C800040
65903+:1087B0003586098090CB007C316A00041540FFE9C2
65904+:1087C000240600040A000BAD000030213C03080021
65905+:1087D0008C63005C8F82001827BDFFE0AFBF0018DC
65906+:1087E000AFB1001410620005AFB00010000329C043
65907+:1087F00024A40280AF840014AF8300183C108000D2
65908+:1088000036020A0094450032361101000E000B7F3B
65909+:1088100030A43FFF8E240000241FFF803C11008005
65910+:108820000082C021031F60243309007F000CC9406F
65911+:1088300003294025330E0078362F00033C0D10002D
65912+:10884000010D502501CF5825AE0C002836080980AF
65913+:10885000AE0C080CAE0B082CAE0A08309103006970
65914+:108860003C06800C0126382110600006AF870034DA
65915+:108870008D09003C8D03006C0123382318E0008231
65916+:10888000000000003C0B8008356A00803C1080002E
65917+:10889000A1400069360609808CC200383C06800081
65918+:1088A00034C50A0090A8003C310C00201180001A49
65919+:1088B000AF820030240D00013C0E800035D10A004B
65920+:1088C000A38D001CAF8000248E2400248F850024FB
65921+:1088D000240D0008AF800020AF8000283C01080074
65922+:1088E000A42D3FC63C010800A4203FDA0E000B83F4
65923+:1088F000000030219228003C8FBF00188FB1001477
65924+:108900008FB0001000086142AF82002C27BD00200C
65925+:1089100003E000083182000190B80032240E00010B
65926+:10892000330F00FF000F2182108E00412419000236
65927+:108930001099006434C40AC03C03800034640A0007
65928+:108940008C8F002415E0001E34660900909F0030D3
65929+:108950002418000533F9003F1338004E24030001AA
65930+:108960008F860020A383001CAF860028AF860024DA
65931+:108970003C0E800035D10A008E2400248F8500240F
65932+:10898000240D00083C010800A42D3FC63C0108004E
65933+:10899000A4203FDA0E000B83000000009228003C68
65934+:1089A0008FBF00188FB100148FB000100008614213
65935+:1089B000AF82002C27BD002003E0000831820001B7
65936+:1089C0008C8A00088C8B00248CD000643C0E8000C4
65937+:1089D00035D10A00014B2823AF900024A380001C4E
65938+:1089E000AF8500288E2400248F8600208F850024E8
65939+:1089F000240D00083C010800A42D3FC63C010800DE
65940+:108A0000A4203FDA0E000B83000000009228003CF7
65941+:108A10008FBF00188FB100148FB0001000086142A2
65942+:108A2000AF82002C27BD002003E000083182000146
65943+:108A300090A200303051003F5224002834C50AC0B3
65944+:108A40008CB000241600002234CB09008CA600480C
65945+:108A50003C0A7FFF3545FFFF00C510243C0E800017
65946+:108A6000AF82002035C509008F8800208CAD0060E2
65947+:108A7000010D602B15800002010020218CA40060F4
65948+:108A80000A000C22AF8400208D02006C0A000BFC4F
65949+:108A90003C0680008C8200488F8600203C097FFFC6
65950+:108AA0003527FFFF004788243C0480082403000189
65951+:108AB000AF910028AC80006CA383001C0A000C302E
65952+:108AC000AF8600248C9F00140A000C22AF9F002068
65953+:108AD0008D6200680A000C6C3C0E800034C4098072
65954+:108AE0008C8900708CA300140123382B10E0000443
65955+:108AF000000000008C8200700A000C6C3C0E8000AC
65956+:108B00008CA200140A000C6C3C0E80008F8500249F
65957+:108B100027BDFFE0AFBF0018AFB1001414A00008DC
65958+:108B2000AFB000103C04800034870A0090E60030AB
65959+:108B30002402000530C3003F106200B934840900EC
65960+:108B40008F91002000A080213C048000348E0A0018
65961+:108B50008DCD00043C0608008CC63FB831A73FFF0E
65962+:108B600000E6602B5580000100E03021938F001C4F
65963+:108B700011E0007800D0282B349F098093F9007C05
65964+:108B800033380002130000792403003400C3102B93
65965+:108B9000144000D90000000000C3302300D0282B6F
65966+:108BA0003C010800A4233FC414A0006E0200182159
65967+:108BB0003C0408008C843FB40064402B5500000145
65968+:108BC000006020213C05800034A90A00912A003C65
65969+:108BD0003C010800AC243FBC31430020146000037A
65970+:108BE0000000482134AB0E008D6900188F88002CDE
65971+:108BF0000128202B1080005F000000003C050800C9
65972+:108C00008CA53FBC00A96821010D602B1180005C80
65973+:108C100000B0702B0109382300E028213C01080036
65974+:108C2000AC273FBC12000003240AFFFC10B0008DEB
65975+:108C30003224000300AA18243C010800A4203FDAD3
65976+:108C40003C010800AC233FBC006028218F84002435
65977+:108C5000120400063C0B80088D6C006C0200202181
65978+:108C6000AF91002025900001AD70006C8F8D002821
65979+:108C700000858823AF91002401A52023AF8400281C
65980+:108C80001220000224070018240700103C18800856
65981+:108C90003706008090CF00683C010800A0273FD82D
65982+:108CA0002407000131EE00FF11C70047000000005B
65983+:108CB00014800018000028213C06800034D109806F
65984+:108CC00034CD010091A600098E2C001824C40001A7
65985+:108CD000000C86023205007F308B007F1165007F1B
65986+:108CE0002407FF803C19800837290080A124004C0C
65987+:108CF0003C0808008D083FD4241800023C010800FD
65988+:108D0000A0384019350F00083C010800AC2F3FD4B3
65989+:108D1000240500103C02800034440A009083003C8B
65990+:108D2000307F002013E0000500A02021240A00016C
65991+:108D30003C010800AC2A3FBC34A400018FBF0018DE
65992+:108D40008FB100148FB000100080102103E00008E4
65993+:108D500027BD00203C010800A4203FC410A0FF94C0
65994+:108D6000020018210A000CC000C018210A000CB72C
65995+:108D7000240300303C0508008CA53FBC00B0702BDC
65996+:108D800011C0FFA8000000003C19080097393FC43B
65997+:108D90000325C0210307782B11E000072CAA00044B
65998+:108DA0003C0360008C625404305F003F17E0FFE337
65999+:108DB000240400422CAA00041140FF9A240400421B
66000+:108DC0000A000D248FBF00181528FFB9000000000D
66001+:108DD0008CCA00183C1F800024020002015F182585
66002+:108DE000ACC3001837F90A00A0C200689329003C00
66003+:108DF0002404000400A01021312800203C010800B8
66004+:108E0000A0244019110000022405001024020001D2
66005+:108E10003C010800AC223FB40A000D1A3C0280005D
66006+:108E20008F8800288C8900600109282B14A000027B
66007+:108E3000010088218C9100603C048000348B0E007E
66008+:108E40008D640018240A000102202821022030210C
66009+:108E5000A38A001C0E000B83022080210A000CA6AE
66010+:108E6000AF82002C00045823122000073164000355
66011+:108E70003C0E800035C7098090ED007C31AC0004C9
66012+:108E800015800019248F00043C010800A4243FDA57
66013+:108E90003C1F080097FF3FDA03E5C82100D9C02B2B
66014+:108EA0001300FF6B8F8400242CA6000514C0FFA3C1
66015+:108EB0002404004230A200031440000200A2182340
66016+:108EC00024A3FFFC3C010800AC233FBC3C0108008C
66017+:108ED000A4203FDA0A000CE70060282100C77024B4
66018+:108EE0000A000D0D01C720263C010800A42F3FDA1F
66019+:108EF0000A000D78000000003C010800AC203FBCD7
66020+:108F00000A000D23240400428F8300283C058000C2
66021+:108F100034AA0A00146000060000102191470030B6
66022+:108F20002406000530E400FF108600030000000066
66023+:108F300003E0000800000000914B0048316900FF89
66024+:108F4000000941C21500FFFA3C0680083C040800F5
66025+:108F500094843FC43C0308008C633FDC3C19080048
66026+:108F60008F393FBC3C0F080095EF3FDA0064C02109
66027+:108F70008CCD00040319702101CF602134AB0E00A9
66028+:108F8000018D282318A0001D00000000914F004C07
66029+:108F90008F8C0034956D001031EE00FF8D89000438
66030+:108FA00001AE30238D8A000030CEFFFF000E290075
66031+:108FB0000125C82100003821014720210325182B55
66032+:108FC0000083C021AD990004AD980000918F000A84
66033+:108FD00001CF6821A18D000A956500128F8A0034A7
66034+:108FE000A5450008954B003825690001A5490038C2
66035+:108FF0009148000D35070008A147000D03E0000867
66036+:109000000000000027BDFFD8AFB000189388001CF7
66037+:109010008FB000143C0A80003C197FFF8F8700242A
66038+:109020003738FFFFAFBF0020AFB1001C355F0A002B
66039+:109030000218182493EB003C00087FC03C02BFFFDD
66040+:10904000006F60252CF000013449FFFF3C1F080031
66041+:109050008FFF3FDC8F9900303C18080097183FD2F3
66042+:1090600001897824001047803C07EFFF3C05F0FFA2
66043+:1090700001E818253C1180003169002034E2FFFF2F
66044+:1090800034ADFFFF362E098027A50010240600020C
66045+:1090900003F96023270B0002354A0E0000621824F2
66046+:1090A0000080802115200002000040218D48001C16
66047+:1090B000A7AB0012058000392407000030E800FF4C
66048+:1090C00000083F00006758253C028008AFAB001441
66049+:1090D000344F008091EA00683C08080091083FD9AD
66050+:1090E0003C09DFFF352CFFFF000AF82B3C0208008B
66051+:1090F00094423FCCA3A80011016CC024001FCF40B4
66052+:10910000031918258FA70010AFA300143C0C08000A
66053+:10911000918C3FDBA7A200168FAB001400ED482412
66054+:109120003C0F01003C0A0FFF012FC82531980003B6
66055+:10913000355FFFFF016D40243C027000033F38247F
66056+:1091400000181E0000E2482501037825AFAF001487
66057+:10915000AFA9001091CC007C0E000092A3AC0015CA
66058+:10916000362D0A0091A6003C30C400201080000675
66059+:10917000260200083C11080096313FC8262EFFFF4A
66060+:109180003C010800A42E3FC88FBF00208FB1001CF7
66061+:109190008FB0001803E0000827BD00288F8B002C3B
66062+:1091A000010B502B5540FFC5240700010A000E0497
66063+:1091B00030E800FF9383001C3C02800027BDFFD8ED
66064+:1091C00034480A0000805021AFBF002034460AC056
66065+:1091D000010028211060000E3444098091070030FE
66066+:1091E000240B00058F89002030EC003F118B000B11
66067+:1091F00000003821AFA900103C0B80088D69006C7D
66068+:10920000AFAA00180E00015AAFA90014A380001CD9
66069+:109210008FBF002003E0000827BD00288D1F0048F5
66070+:109220003C1808008F183FBC8F9900283C027FFF34
66071+:109230008D0800443443FFFFAFA900103C0B8008A9
66072+:109240008D69006C03E370240319782101CF682332
66073+:1092500001A83821AFAA00180E00015AAFA90014C6
66074+:109260000A000E58A380001C3C05800034A60A00AA
66075+:1092700090C7003C3C06080094C63FDA3C02080058
66076+:109280008C423FD430E30020000624001060001E12
66077+:10929000004438253C0880083505008090A300680C
66078+:1092A00000004821240800010000282124040001B6
66079+:1092B0003C0680008CCD017805A0FFFE34CF014034
66080+:1092C000ADE800083C0208008C423FDCA5E5000444
66081+:1092D000A5E40006ADE2000C3C04080090843FD9F0
66082+:1092E0003C03800834790080A1E40012ADE700144B
66083+:1092F000A5E900189338004C3C0E1000A1F8002D91
66084+:1093000003E00008ACCE017834A90E008D28001CC3
66085+:109310003C0C08008D8C3FBC952B0016952A001440
66086+:10932000018648213164FFFF0A000E803145FFFFAE
66087+:109330003C04800034830A009065003C30A2002089
66088+:109340001040001934870E00000040210000382131
66089+:10935000000020213C0680008CC901780520FFFE1A
66090+:1093600034CA014034CF010091EB0009AD48000838
66091+:109370003C0E08008DCE3FDC240DFF91240C0040F4
66092+:109380003C081000A5440004A5470006AD4E000CA3
66093+:10939000A14D0012AD4C0014A5400018A14B002DAA
66094+:1093A00003E00008ACC801788CE8001894E60012CD
66095+:1093B00094E4001030C7FFFF0A000EA93084FFFFBD
66096+:1093C0003C04800034830A009065003C30A20020F9
66097+:1093D0001040002727BDFFF82409000100003821B4
66098+:1093E000240800013C0680008CCA01780540FFFE7D
66099+:1093F0003C0280FF34C40100908D00093C0C080041
66100+:10940000918C4019A3AD00038FAB00003185007F24
66101+:109410003459FFFF01665025AFAA00009083000A6F
66102+:10942000A3A0000200057E00A3A300018FB80000E6
66103+:1094300034CB0140240C30000319702401CF68257F
66104+:10944000AD6D000C27BD0008AD6C0014A5600018C0
66105+:10945000AD690008A56700042409FF80A56800061F
66106+:109460003C081000A169001203E00008ACC80178B4
66107+:1094700034870E008CE9001894E6001294E4001082
66108+:1094800030C8FFFF0A000ECD3087FFFF27BDFFE089
66109+:10949000AFB100143C118000AFB00010AFBF001896
66110+:1094A00036380A00970F0032363001000E000B7F6D
66111+:1094B00031E43FFF8E0E0000240DFF803C042000AD
66112+:1094C00001C25821016D6024000C4940316A007FBF
66113+:1094D000012A4025010438253C048008AE270830C5
66114+:1094E0003486008090C500682403000230A200FF8B
66115+:1094F000104300048F9F00208F990024AC9F0068C8
66116+:10950000AC9900648FBF00188FB100148FB00010A9
66117+:1095100003E0000827BD00203C0A0800254A3A80E5
66118+:109520003C09080025293B103C08080025082F1C91
66119+:109530003C07080024E73BDC3C06080024C639044D
66120+:109540003C05080024A536583C0408002484325CFD
66121+:109550003C030800246339B83C0208002442375415
66122+:109560003C010800AC2A3F983C010800AC293F941C
66123+:109570003C010800AC283F903C010800AC273F9C10
66124+:109580003C010800AC263FAC3C010800AC253FA4E0
66125+:109590003C010800AC243FA03C010800AC233FB0D4
66126+:1095A0003C010800AC223FA803E0000800000000D6
66127+:1095B00080000940800009008008010080080080C8
66128+:1095C00080080000800E00008008008080080000F5
66129+:1095D00080000A8080000A00800009808000090065
66130+:00000001FF
66131diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
66132index eb14e05..5156de7 100644
66133--- a/fs/9p/vfs_addr.c
66134+++ b/fs/9p/vfs_addr.c
66135@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
66136
66137 retval = v9fs_file_write_internal(inode,
66138 v9inode->writeback_fid,
66139- (__force const char __user *)buffer,
66140+ (const char __force_user *)buffer,
66141 len, &offset, 0);
66142 if (retval > 0)
66143 retval = 0;
66144diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
66145index 3662f1d..90558b5 100644
66146--- a/fs/9p/vfs_inode.c
66147+++ b/fs/9p/vfs_inode.c
66148@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
66149 void
66150 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
66151 {
66152- char *s = nd_get_link(nd);
66153+ const char *s = nd_get_link(nd);
66154
66155 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
66156 dentry, IS_ERR(s) ? "<error>" : s);
66157diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
66158index 270c481..0d8a962 100644
66159--- a/fs/Kconfig.binfmt
66160+++ b/fs/Kconfig.binfmt
66161@@ -106,7 +106,7 @@ config HAVE_AOUT
66162
66163 config BINFMT_AOUT
66164 tristate "Kernel support for a.out and ECOFF binaries"
66165- depends on HAVE_AOUT
66166+ depends on HAVE_AOUT && BROKEN
66167 ---help---
66168 A.out (Assembler.OUTput) is a set of formats for libraries and
66169 executables used in the earliest versions of UNIX. Linux used
66170diff --git a/fs/afs/inode.c b/fs/afs/inode.c
66171index 8a1d38e..300a14e 100644
66172--- a/fs/afs/inode.c
66173+++ b/fs/afs/inode.c
66174@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
66175 struct afs_vnode *vnode;
66176 struct super_block *sb;
66177 struct inode *inode;
66178- static atomic_t afs_autocell_ino;
66179+ static atomic_unchecked_t afs_autocell_ino;
66180
66181 _enter("{%x:%u},%*.*s,",
66182 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
66183@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
66184 data.fid.unique = 0;
66185 data.fid.vnode = 0;
66186
66187- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
66188+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
66189 afs_iget5_autocell_test, afs_iget5_set,
66190 &data);
66191 if (!inode) {
66192diff --git a/fs/aio.c b/fs/aio.c
66193index a1736e9..c80a8ac 100644
66194--- a/fs/aio.c
66195+++ b/fs/aio.c
66196@@ -409,7 +409,7 @@ static int aio_setup_ring(struct kioctx *ctx)
66197 size += sizeof(struct io_event) * nr_events;
66198
66199 nr_pages = PFN_UP(size);
66200- if (nr_pages < 0)
66201+ if (nr_pages <= 0)
66202 return -EINVAL;
66203
66204 file = aio_private_file(ctx, nr_pages);
66205diff --git a/fs/attr.c b/fs/attr.c
66206index 6530ced..4a827e2 100644
66207--- a/fs/attr.c
66208+++ b/fs/attr.c
66209@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
66210 unsigned long limit;
66211
66212 limit = rlimit(RLIMIT_FSIZE);
66213+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
66214 if (limit != RLIM_INFINITY && offset > limit)
66215 goto out_sig;
66216 if (offset > inode->i_sb->s_maxbytes)
66217diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
66218index 116fd38..c04182da 100644
66219--- a/fs/autofs4/waitq.c
66220+++ b/fs/autofs4/waitq.c
66221@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
66222 {
66223 unsigned long sigpipe, flags;
66224 mm_segment_t fs;
66225- const char *data = (const char *)addr;
66226+ const char __user *data = (const char __force_user *)addr;
66227 ssize_t wr = 0;
66228
66229 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
66230@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
66231 return 1;
66232 }
66233
66234+#ifdef CONFIG_GRKERNSEC_HIDESYM
66235+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
66236+#endif
66237+
66238 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
66239 enum autofs_notify notify)
66240 {
66241@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
66242
66243 /* If this is a direct mount request create a dummy name */
66244 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
66245+#ifdef CONFIG_GRKERNSEC_HIDESYM
66246+ /* this name does get written to userland via autofs4_write() */
66247+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
66248+#else
66249 qstr.len = sprintf(name, "%p", dentry);
66250+#endif
66251 else {
66252 qstr.len = autofs4_getpath(sbi, dentry, &name);
66253 if (!qstr.len) {
66254diff --git a/fs/befs/endian.h b/fs/befs/endian.h
66255index 2722387..56059b5 100644
66256--- a/fs/befs/endian.h
66257+++ b/fs/befs/endian.h
66258@@ -11,7 +11,7 @@
66259
66260 #include <asm/byteorder.h>
66261
66262-static inline u64
66263+static inline u64 __intentional_overflow(-1)
66264 fs64_to_cpu(const struct super_block *sb, fs64 n)
66265 {
66266 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66267@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
66268 return (__force fs64)cpu_to_be64(n);
66269 }
66270
66271-static inline u32
66272+static inline u32 __intentional_overflow(-1)
66273 fs32_to_cpu(const struct super_block *sb, fs32 n)
66274 {
66275 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66276@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
66277 return (__force fs32)cpu_to_be32(n);
66278 }
66279
66280-static inline u16
66281+static inline u16 __intentional_overflow(-1)
66282 fs16_to_cpu(const struct super_block *sb, fs16 n)
66283 {
66284 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66285diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
66286index 4c55668..eeae150 100644
66287--- a/fs/binfmt_aout.c
66288+++ b/fs/binfmt_aout.c
66289@@ -16,6 +16,7 @@
66290 #include <linux/string.h>
66291 #include <linux/fs.h>
66292 #include <linux/file.h>
66293+#include <linux/security.h>
66294 #include <linux/stat.h>
66295 #include <linux/fcntl.h>
66296 #include <linux/ptrace.h>
66297@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
66298 #endif
66299 # define START_STACK(u) ((void __user *)u.start_stack)
66300
66301+ memset(&dump, 0, sizeof(dump));
66302+
66303 fs = get_fs();
66304 set_fs(KERNEL_DS);
66305 has_dumped = 1;
66306@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
66307
66308 /* If the size of the dump file exceeds the rlimit, then see what would happen
66309 if we wrote the stack, but not the data area. */
66310+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
66311 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
66312 dump.u_dsize = 0;
66313
66314 /* Make sure we have enough room to write the stack and data areas. */
66315+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
66316 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
66317 dump.u_ssize = 0;
66318
66319@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
66320 rlim = rlimit(RLIMIT_DATA);
66321 if (rlim >= RLIM_INFINITY)
66322 rlim = ~0;
66323+
66324+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
66325 if (ex.a_data + ex.a_bss > rlim)
66326 return -ENOMEM;
66327
66328@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
66329
66330 install_exec_creds(bprm);
66331
66332+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66333+ current->mm->pax_flags = 0UL;
66334+#endif
66335+
66336+#ifdef CONFIG_PAX_PAGEEXEC
66337+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
66338+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
66339+
66340+#ifdef CONFIG_PAX_EMUTRAMP
66341+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
66342+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
66343+#endif
66344+
66345+#ifdef CONFIG_PAX_MPROTECT
66346+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
66347+ current->mm->pax_flags |= MF_PAX_MPROTECT;
66348+#endif
66349+
66350+ }
66351+#endif
66352+
66353 if (N_MAGIC(ex) == OMAGIC) {
66354 unsigned long text_addr, map_size;
66355 loff_t pos;
66356@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
66357 return error;
66358
66359 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
66360- PROT_READ | PROT_WRITE | PROT_EXEC,
66361+ PROT_READ | PROT_WRITE,
66362 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
66363 fd_offset + ex.a_text);
66364 if (error != N_DATADDR(ex))
66365diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
66366index 8081aba..90a7bdd 100644
66367--- a/fs/binfmt_elf.c
66368+++ b/fs/binfmt_elf.c
66369@@ -34,6 +34,7 @@
66370 #include <linux/utsname.h>
66371 #include <linux/coredump.h>
66372 #include <linux/sched.h>
66373+#include <linux/xattr.h>
66374 #include <asm/uaccess.h>
66375 #include <asm/param.h>
66376 #include <asm/page.h>
66377@@ -47,7 +48,7 @@
66378
66379 static int load_elf_binary(struct linux_binprm *bprm);
66380 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
66381- int, int, unsigned long);
66382+ int, int, unsigned long) __intentional_overflow(-1);
66383
66384 #ifdef CONFIG_USELIB
66385 static int load_elf_library(struct file *);
66386@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
66387 #define elf_core_dump NULL
66388 #endif
66389
66390+#ifdef CONFIG_PAX_MPROTECT
66391+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
66392+#endif
66393+
66394+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
66395+static void elf_handle_mmap(struct file *file);
66396+#endif
66397+
66398 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
66399 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
66400 #else
66401@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
66402 .load_binary = load_elf_binary,
66403 .load_shlib = load_elf_library,
66404 .core_dump = elf_core_dump,
66405+
66406+#ifdef CONFIG_PAX_MPROTECT
66407+ .handle_mprotect= elf_handle_mprotect,
66408+#endif
66409+
66410+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
66411+ .handle_mmap = elf_handle_mmap,
66412+#endif
66413+
66414 .min_coredump = ELF_EXEC_PAGESIZE,
66415 };
66416
66417@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
66418
66419 static int set_brk(unsigned long start, unsigned long end)
66420 {
66421+ unsigned long e = end;
66422+
66423 start = ELF_PAGEALIGN(start);
66424 end = ELF_PAGEALIGN(end);
66425 if (end > start) {
66426@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
66427 if (BAD_ADDR(addr))
66428 return addr;
66429 }
66430- current->mm->start_brk = current->mm->brk = end;
66431+ current->mm->start_brk = current->mm->brk = e;
66432 return 0;
66433 }
66434
66435@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66436 elf_addr_t __user *u_rand_bytes;
66437 const char *k_platform = ELF_PLATFORM;
66438 const char *k_base_platform = ELF_BASE_PLATFORM;
66439- unsigned char k_rand_bytes[16];
66440+ u32 k_rand_bytes[4];
66441 int items;
66442 elf_addr_t *elf_info;
66443 int ei_index = 0;
66444 const struct cred *cred = current_cred();
66445 struct vm_area_struct *vma;
66446+ unsigned long saved_auxv[AT_VECTOR_SIZE];
66447
66448 /*
66449 * In some cases (e.g. Hyper-Threading), we want to avoid L1
66450@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66451 * Generate 16 random bytes for userspace PRNG seeding.
66452 */
66453 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
66454- u_rand_bytes = (elf_addr_t __user *)
66455- STACK_ALLOC(p, sizeof(k_rand_bytes));
66456+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
66457+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
66458+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
66459+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
66460+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
66461+ u_rand_bytes = (elf_addr_t __user *) p;
66462 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
66463 return -EFAULT;
66464
66465@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66466 return -EFAULT;
66467 current->mm->env_end = p;
66468
66469+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
66470+
66471 /* Put the elf_info on the stack in the right place. */
66472 sp = (elf_addr_t __user *)envp + 1;
66473- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
66474+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
66475 return -EFAULT;
66476 return 0;
66477 }
66478@@ -514,14 +541,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
66479 an ELF header */
66480
66481 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66482- struct file *interpreter, unsigned long *interp_map_addr,
66483+ struct file *interpreter,
66484 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
66485 {
66486 struct elf_phdr *eppnt;
66487- unsigned long load_addr = 0;
66488+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
66489 int load_addr_set = 0;
66490 unsigned long last_bss = 0, elf_bss = 0;
66491- unsigned long error = ~0UL;
66492+ unsigned long error = -EINVAL;
66493 unsigned long total_size;
66494 int i;
66495
66496@@ -541,6 +568,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66497 goto out;
66498 }
66499
66500+#ifdef CONFIG_PAX_SEGMEXEC
66501+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
66502+ pax_task_size = SEGMEXEC_TASK_SIZE;
66503+#endif
66504+
66505 eppnt = interp_elf_phdata;
66506 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
66507 if (eppnt->p_type == PT_LOAD) {
66508@@ -564,8 +596,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66509 map_addr = elf_map(interpreter, load_addr + vaddr,
66510 eppnt, elf_prot, elf_type, total_size);
66511 total_size = 0;
66512- if (!*interp_map_addr)
66513- *interp_map_addr = map_addr;
66514 error = map_addr;
66515 if (BAD_ADDR(map_addr))
66516 goto out;
66517@@ -584,8 +614,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66518 k = load_addr + eppnt->p_vaddr;
66519 if (BAD_ADDR(k) ||
66520 eppnt->p_filesz > eppnt->p_memsz ||
66521- eppnt->p_memsz > TASK_SIZE ||
66522- TASK_SIZE - eppnt->p_memsz < k) {
66523+ eppnt->p_memsz > pax_task_size ||
66524+ pax_task_size - eppnt->p_memsz < k) {
66525 error = -ENOMEM;
66526 goto out;
66527 }
66528@@ -624,9 +654,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66529 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
66530
66531 /* Map the last of the bss segment */
66532- error = vm_brk(elf_bss, last_bss - elf_bss);
66533- if (BAD_ADDR(error))
66534- goto out;
66535+ if (last_bss > elf_bss) {
66536+ error = vm_brk(elf_bss, last_bss - elf_bss);
66537+ if (BAD_ADDR(error))
66538+ goto out;
66539+ }
66540 }
66541
66542 error = load_addr;
66543@@ -634,6 +666,336 @@ out:
66544 return error;
66545 }
66546
66547+#ifdef CONFIG_PAX_PT_PAX_FLAGS
66548+#ifdef CONFIG_PAX_SOFTMODE
66549+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
66550+{
66551+ unsigned long pax_flags = 0UL;
66552+
66553+#ifdef CONFIG_PAX_PAGEEXEC
66554+ if (elf_phdata->p_flags & PF_PAGEEXEC)
66555+ pax_flags |= MF_PAX_PAGEEXEC;
66556+#endif
66557+
66558+#ifdef CONFIG_PAX_SEGMEXEC
66559+ if (elf_phdata->p_flags & PF_SEGMEXEC)
66560+ pax_flags |= MF_PAX_SEGMEXEC;
66561+#endif
66562+
66563+#ifdef CONFIG_PAX_EMUTRAMP
66564+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
66565+ pax_flags |= MF_PAX_EMUTRAMP;
66566+#endif
66567+
66568+#ifdef CONFIG_PAX_MPROTECT
66569+ if (elf_phdata->p_flags & PF_MPROTECT)
66570+ pax_flags |= MF_PAX_MPROTECT;
66571+#endif
66572+
66573+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66574+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
66575+ pax_flags |= MF_PAX_RANDMMAP;
66576+#endif
66577+
66578+ return pax_flags;
66579+}
66580+#endif
66581+
66582+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
66583+{
66584+ unsigned long pax_flags = 0UL;
66585+
66586+#ifdef CONFIG_PAX_PAGEEXEC
66587+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
66588+ pax_flags |= MF_PAX_PAGEEXEC;
66589+#endif
66590+
66591+#ifdef CONFIG_PAX_SEGMEXEC
66592+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
66593+ pax_flags |= MF_PAX_SEGMEXEC;
66594+#endif
66595+
66596+#ifdef CONFIG_PAX_EMUTRAMP
66597+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
66598+ pax_flags |= MF_PAX_EMUTRAMP;
66599+#endif
66600+
66601+#ifdef CONFIG_PAX_MPROTECT
66602+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
66603+ pax_flags |= MF_PAX_MPROTECT;
66604+#endif
66605+
66606+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66607+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
66608+ pax_flags |= MF_PAX_RANDMMAP;
66609+#endif
66610+
66611+ return pax_flags;
66612+}
66613+#endif
66614+
66615+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
66616+#ifdef CONFIG_PAX_SOFTMODE
66617+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
66618+{
66619+ unsigned long pax_flags = 0UL;
66620+
66621+#ifdef CONFIG_PAX_PAGEEXEC
66622+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
66623+ pax_flags |= MF_PAX_PAGEEXEC;
66624+#endif
66625+
66626+#ifdef CONFIG_PAX_SEGMEXEC
66627+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
66628+ pax_flags |= MF_PAX_SEGMEXEC;
66629+#endif
66630+
66631+#ifdef CONFIG_PAX_EMUTRAMP
66632+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
66633+ pax_flags |= MF_PAX_EMUTRAMP;
66634+#endif
66635+
66636+#ifdef CONFIG_PAX_MPROTECT
66637+ if (pax_flags_softmode & MF_PAX_MPROTECT)
66638+ pax_flags |= MF_PAX_MPROTECT;
66639+#endif
66640+
66641+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66642+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
66643+ pax_flags |= MF_PAX_RANDMMAP;
66644+#endif
66645+
66646+ return pax_flags;
66647+}
66648+#endif
66649+
66650+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
66651+{
66652+ unsigned long pax_flags = 0UL;
66653+
66654+#ifdef CONFIG_PAX_PAGEEXEC
66655+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
66656+ pax_flags |= MF_PAX_PAGEEXEC;
66657+#endif
66658+
66659+#ifdef CONFIG_PAX_SEGMEXEC
66660+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
66661+ pax_flags |= MF_PAX_SEGMEXEC;
66662+#endif
66663+
66664+#ifdef CONFIG_PAX_EMUTRAMP
66665+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
66666+ pax_flags |= MF_PAX_EMUTRAMP;
66667+#endif
66668+
66669+#ifdef CONFIG_PAX_MPROTECT
66670+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
66671+ pax_flags |= MF_PAX_MPROTECT;
66672+#endif
66673+
66674+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66675+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
66676+ pax_flags |= MF_PAX_RANDMMAP;
66677+#endif
66678+
66679+ return pax_flags;
66680+}
66681+#endif
66682+
66683+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66684+static unsigned long pax_parse_defaults(void)
66685+{
66686+ unsigned long pax_flags = 0UL;
66687+
66688+#ifdef CONFIG_PAX_SOFTMODE
66689+ if (pax_softmode)
66690+ return pax_flags;
66691+#endif
66692+
66693+#ifdef CONFIG_PAX_PAGEEXEC
66694+ pax_flags |= MF_PAX_PAGEEXEC;
66695+#endif
66696+
66697+#ifdef CONFIG_PAX_SEGMEXEC
66698+ pax_flags |= MF_PAX_SEGMEXEC;
66699+#endif
66700+
66701+#ifdef CONFIG_PAX_MPROTECT
66702+ pax_flags |= MF_PAX_MPROTECT;
66703+#endif
66704+
66705+#ifdef CONFIG_PAX_RANDMMAP
66706+ if (randomize_va_space)
66707+ pax_flags |= MF_PAX_RANDMMAP;
66708+#endif
66709+
66710+ return pax_flags;
66711+}
66712+
66713+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
66714+{
66715+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
66716+
66717+#ifdef CONFIG_PAX_EI_PAX
66718+
66719+#ifdef CONFIG_PAX_SOFTMODE
66720+ if (pax_softmode)
66721+ return pax_flags;
66722+#endif
66723+
66724+ pax_flags = 0UL;
66725+
66726+#ifdef CONFIG_PAX_PAGEEXEC
66727+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
66728+ pax_flags |= MF_PAX_PAGEEXEC;
66729+#endif
66730+
66731+#ifdef CONFIG_PAX_SEGMEXEC
66732+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
66733+ pax_flags |= MF_PAX_SEGMEXEC;
66734+#endif
66735+
66736+#ifdef CONFIG_PAX_EMUTRAMP
66737+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
66738+ pax_flags |= MF_PAX_EMUTRAMP;
66739+#endif
66740+
66741+#ifdef CONFIG_PAX_MPROTECT
66742+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
66743+ pax_flags |= MF_PAX_MPROTECT;
66744+#endif
66745+
66746+#ifdef CONFIG_PAX_ASLR
66747+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
66748+ pax_flags |= MF_PAX_RANDMMAP;
66749+#endif
66750+
66751+#endif
66752+
66753+ return pax_flags;
66754+
66755+}
66756+
66757+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
66758+{
66759+
66760+#ifdef CONFIG_PAX_PT_PAX_FLAGS
66761+ unsigned long i;
66762+
66763+ for (i = 0UL; i < elf_ex->e_phnum; i++)
66764+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
66765+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
66766+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
66767+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
66768+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
66769+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
66770+ return PAX_PARSE_FLAGS_FALLBACK;
66771+
66772+#ifdef CONFIG_PAX_SOFTMODE
66773+ if (pax_softmode)
66774+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
66775+ else
66776+#endif
66777+
66778+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
66779+ break;
66780+ }
66781+#endif
66782+
66783+ return PAX_PARSE_FLAGS_FALLBACK;
66784+}
66785+
66786+static unsigned long pax_parse_xattr_pax(struct file * const file)
66787+{
66788+
66789+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
66790+ ssize_t xattr_size, i;
66791+ unsigned char xattr_value[sizeof("pemrs") - 1];
66792+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
66793+
66794+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
66795+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
66796+ return PAX_PARSE_FLAGS_FALLBACK;
66797+
66798+ for (i = 0; i < xattr_size; i++)
66799+ switch (xattr_value[i]) {
66800+ default:
66801+ return PAX_PARSE_FLAGS_FALLBACK;
66802+
66803+#define parse_flag(option1, option2, flag) \
66804+ case option1: \
66805+ if (pax_flags_hardmode & MF_PAX_##flag) \
66806+ return PAX_PARSE_FLAGS_FALLBACK;\
66807+ pax_flags_hardmode |= MF_PAX_##flag; \
66808+ break; \
66809+ case option2: \
66810+ if (pax_flags_softmode & MF_PAX_##flag) \
66811+ return PAX_PARSE_FLAGS_FALLBACK;\
66812+ pax_flags_softmode |= MF_PAX_##flag; \
66813+ break;
66814+
66815+ parse_flag('p', 'P', PAGEEXEC);
66816+ parse_flag('e', 'E', EMUTRAMP);
66817+ parse_flag('m', 'M', MPROTECT);
66818+ parse_flag('r', 'R', RANDMMAP);
66819+ parse_flag('s', 'S', SEGMEXEC);
66820+
66821+#undef parse_flag
66822+ }
66823+
66824+ if (pax_flags_hardmode & pax_flags_softmode)
66825+ return PAX_PARSE_FLAGS_FALLBACK;
66826+
66827+#ifdef CONFIG_PAX_SOFTMODE
66828+ if (pax_softmode)
66829+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
66830+ else
66831+#endif
66832+
66833+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
66834+#else
66835+ return PAX_PARSE_FLAGS_FALLBACK;
66836+#endif
66837+
66838+}
66839+
66840+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
66841+{
66842+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
66843+
66844+ pax_flags = pax_parse_defaults();
66845+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
66846+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
66847+ xattr_pax_flags = pax_parse_xattr_pax(file);
66848+
66849+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
66850+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
66851+ pt_pax_flags != xattr_pax_flags)
66852+ return -EINVAL;
66853+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66854+ pax_flags = xattr_pax_flags;
66855+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66856+ pax_flags = pt_pax_flags;
66857+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66858+ pax_flags = ei_pax_flags;
66859+
66860+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
66861+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66862+ if ((__supported_pte_mask & _PAGE_NX))
66863+ pax_flags &= ~MF_PAX_SEGMEXEC;
66864+ else
66865+ pax_flags &= ~MF_PAX_PAGEEXEC;
66866+ }
66867+#endif
66868+
66869+ if (0 > pax_check_flags(&pax_flags))
66870+ return -EINVAL;
66871+
66872+ current->mm->pax_flags = pax_flags;
66873+ return 0;
66874+}
66875+#endif
66876+
66877 /*
66878 * These are the functions used to load ELF style executables and shared
66879 * libraries. There is no binary dependent code anywhere else.
66880@@ -647,6 +1009,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
66881 {
66882 unsigned long random_variable = 0;
66883
66884+#ifdef CONFIG_PAX_RANDUSTACK
66885+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
66886+ return stack_top - current->mm->delta_stack;
66887+#endif
66888+
66889 if ((current->flags & PF_RANDOMIZE) &&
66890 !(current->personality & ADDR_NO_RANDOMIZE)) {
66891 random_variable = (unsigned long) get_random_int();
66892@@ -666,7 +1033,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
66893 unsigned long load_addr = 0, load_bias = 0;
66894 int load_addr_set = 0;
66895 char * elf_interpreter = NULL;
66896- unsigned long error;
66897+ unsigned long error = 0;
66898 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
66899 unsigned long elf_bss, elf_brk;
66900 int retval, i;
66901@@ -681,6 +1048,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
66902 struct elfhdr interp_elf_ex;
66903 } *loc;
66904 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
66905+ unsigned long pax_task_size;
66906
66907 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
66908 if (!loc) {
66909@@ -839,6 +1207,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
66910 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
66911 may depend on the personality. */
66912 SET_PERSONALITY2(loc->elf_ex, &arch_state);
66913+
66914+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66915+ current->mm->pax_flags = 0UL;
66916+#endif
66917+
66918+#ifdef CONFIG_PAX_DLRESOLVE
66919+ current->mm->call_dl_resolve = 0UL;
66920+#endif
66921+
66922+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
66923+ current->mm->call_syscall = 0UL;
66924+#endif
66925+
66926+#ifdef CONFIG_PAX_ASLR
66927+ current->mm->delta_mmap = 0UL;
66928+ current->mm->delta_stack = 0UL;
66929+#endif
66930+
66931+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66932+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
66933+ send_sig(SIGKILL, current, 0);
66934+ goto out_free_dentry;
66935+ }
66936+#endif
66937+
66938+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
66939+ pax_set_initial_flags(bprm);
66940+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
66941+ if (pax_set_initial_flags_func)
66942+ (pax_set_initial_flags_func)(bprm);
66943+#endif
66944+
66945+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66946+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
66947+ current->mm->context.user_cs_limit = PAGE_SIZE;
66948+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
66949+ }
66950+#endif
66951+
66952+#ifdef CONFIG_PAX_SEGMEXEC
66953+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
66954+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
66955+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
66956+ pax_task_size = SEGMEXEC_TASK_SIZE;
66957+ current->mm->def_flags |= VM_NOHUGEPAGE;
66958+ } else
66959+#endif
66960+
66961+ pax_task_size = TASK_SIZE;
66962+
66963+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
66964+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66965+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
66966+ put_cpu();
66967+ }
66968+#endif
66969+
66970+#ifdef CONFIG_PAX_ASLR
66971+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
66972+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
66973+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
66974+ }
66975+#endif
66976+
66977+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
66978+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66979+ executable_stack = EXSTACK_DISABLE_X;
66980+ current->personality &= ~READ_IMPLIES_EXEC;
66981+ } else
66982+#endif
66983+
66984 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
66985 current->personality |= READ_IMPLIES_EXEC;
66986
66987@@ -925,8 +1364,21 @@ static int load_elf_binary(struct linux_binprm *bprm)
66988 #else
66989 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
66990 #endif
66991- total_size = total_mapping_size(elf_phdata,
66992- loc->elf_ex.e_phnum);
66993+
66994+#ifdef CONFIG_PAX_RANDMMAP
66995+ /* PaX: randomize base address at the default exe base if requested */
66996+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
66997+#ifdef CONFIG_SPARC64
66998+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
66999+#else
67000+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
67001+#endif
67002+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
67003+ elf_flags |= MAP_FIXED;
67004+ }
67005+#endif
67006+
67007+ total_size = total_mapping_size(elf_phdata, loc->elf_ex.e_phnum);
67008 if (!total_size) {
67009 retval = -EINVAL;
67010 goto out_free_dentry;
67011@@ -962,9 +1414,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
67012 * allowed task size. Note that p_filesz must always be
67013 * <= p_memsz so it is only necessary to check p_memsz.
67014 */
67015- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
67016- elf_ppnt->p_memsz > TASK_SIZE ||
67017- TASK_SIZE - elf_ppnt->p_memsz < k) {
67018+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
67019+ elf_ppnt->p_memsz > pax_task_size ||
67020+ pax_task_size - elf_ppnt->p_memsz < k) {
67021 /* set_brk can never work. Avoid overflows. */
67022 retval = -EINVAL;
67023 goto out_free_dentry;
67024@@ -1000,16 +1452,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
67025 if (retval)
67026 goto out_free_dentry;
67027 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
67028- retval = -EFAULT; /* Nobody gets to see this, but.. */
67029- goto out_free_dentry;
67030+ /*
67031+ * This bss-zeroing can fail if the ELF
67032+ * file specifies odd protections. So
67033+ * we don't check the return value
67034+ */
67035 }
67036
67037+#ifdef CONFIG_PAX_RANDMMAP
67038+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
67039+ unsigned long start, size, flags;
67040+ vm_flags_t vm_flags;
67041+
67042+ start = ELF_PAGEALIGN(elf_brk);
67043+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
67044+ flags = MAP_FIXED | MAP_PRIVATE;
67045+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
67046+
67047+ down_write(&current->mm->mmap_sem);
67048+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
67049+ retval = -ENOMEM;
67050+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
67051+// if (current->personality & ADDR_NO_RANDOMIZE)
67052+// vm_flags |= VM_READ | VM_MAYREAD;
67053+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
67054+ retval = IS_ERR_VALUE(start) ? start : 0;
67055+ }
67056+ up_write(&current->mm->mmap_sem);
67057+ if (retval == 0)
67058+ retval = set_brk(start + size, start + size + PAGE_SIZE);
67059+ if (retval < 0)
67060+ goto out_free_dentry;
67061+ }
67062+#endif
67063+
67064 if (elf_interpreter) {
67065- unsigned long interp_map_addr = 0;
67066-
67067 elf_entry = load_elf_interp(&loc->interp_elf_ex,
67068 interpreter,
67069- &interp_map_addr,
67070 load_bias, interp_elf_phdata);
67071 if (!IS_ERR((void *)elf_entry)) {
67072 /*
67073@@ -1237,7 +1716,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
67074 * Decide what to dump of a segment, part, all or none.
67075 */
67076 static unsigned long vma_dump_size(struct vm_area_struct *vma,
67077- unsigned long mm_flags)
67078+ unsigned long mm_flags, long signr)
67079 {
67080 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
67081
67082@@ -1275,7 +1754,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
67083 if (vma->vm_file == NULL)
67084 return 0;
67085
67086- if (FILTER(MAPPED_PRIVATE))
67087+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
67088 goto whole;
67089
67090 /*
67091@@ -1482,9 +1961,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
67092 {
67093 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
67094 int i = 0;
67095- do
67096+ do {
67097 i += 2;
67098- while (auxv[i - 2] != AT_NULL);
67099+ } while (auxv[i - 2] != AT_NULL);
67100 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
67101 }
67102
67103@@ -1493,7 +1972,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
67104 {
67105 mm_segment_t old_fs = get_fs();
67106 set_fs(KERNEL_DS);
67107- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
67108+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
67109 set_fs(old_fs);
67110 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
67111 }
67112@@ -2213,7 +2692,7 @@ static int elf_core_dump(struct coredump_params *cprm)
67113 vma = next_vma(vma, gate_vma)) {
67114 unsigned long dump_size;
67115
67116- dump_size = vma_dump_size(vma, cprm->mm_flags);
67117+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
67118 vma_filesz[i++] = dump_size;
67119 vma_data_size += dump_size;
67120 }
67121@@ -2321,6 +2800,167 @@ out:
67122
67123 #endif /* CONFIG_ELF_CORE */
67124
67125+#ifdef CONFIG_PAX_MPROTECT
67126+/* PaX: non-PIC ELF libraries need relocations on their executable segments
67127+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
67128+ * we'll remove VM_MAYWRITE for good on RELRO segments.
67129+ *
67130+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
67131+ * basis because we want to allow the common case and not the special ones.
67132+ */
67133+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
67134+{
67135+ struct elfhdr elf_h;
67136+ struct elf_phdr elf_p;
67137+ unsigned long i;
67138+ unsigned long oldflags;
67139+ bool is_textrel_rw, is_textrel_rx, is_relro;
67140+
67141+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
67142+ return;
67143+
67144+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
67145+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
67146+
67147+#ifdef CONFIG_PAX_ELFRELOCS
67148+ /* possible TEXTREL */
67149+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
67150+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
67151+#else
67152+ is_textrel_rw = false;
67153+ is_textrel_rx = false;
67154+#endif
67155+
67156+ /* possible RELRO */
67157+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
67158+
67159+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
67160+ return;
67161+
67162+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
67163+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
67164+
67165+#ifdef CONFIG_PAX_ETEXECRELOCS
67166+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
67167+#else
67168+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
67169+#endif
67170+
67171+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
67172+ !elf_check_arch(&elf_h) ||
67173+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
67174+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
67175+ return;
67176+
67177+ for (i = 0UL; i < elf_h.e_phnum; i++) {
67178+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
67179+ return;
67180+ switch (elf_p.p_type) {
67181+ case PT_DYNAMIC:
67182+ if (!is_textrel_rw && !is_textrel_rx)
67183+ continue;
67184+ i = 0UL;
67185+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
67186+ elf_dyn dyn;
67187+
67188+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
67189+ break;
67190+ if (dyn.d_tag == DT_NULL)
67191+ break;
67192+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
67193+ gr_log_textrel(vma);
67194+ if (is_textrel_rw)
67195+ vma->vm_flags |= VM_MAYWRITE;
67196+ else
67197+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
67198+ vma->vm_flags &= ~VM_MAYWRITE;
67199+ break;
67200+ }
67201+ i++;
67202+ }
67203+ is_textrel_rw = false;
67204+ is_textrel_rx = false;
67205+ continue;
67206+
67207+ case PT_GNU_RELRO:
67208+ if (!is_relro)
67209+ continue;
67210+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
67211+ vma->vm_flags &= ~VM_MAYWRITE;
67212+ is_relro = false;
67213+ continue;
67214+
67215+#ifdef CONFIG_PAX_PT_PAX_FLAGS
67216+ case PT_PAX_FLAGS: {
67217+ const char *msg_mprotect = "", *msg_emutramp = "";
67218+ char *buffer_lib, *buffer_exe;
67219+
67220+ if (elf_p.p_flags & PF_NOMPROTECT)
67221+ msg_mprotect = "MPROTECT disabled";
67222+
67223+#ifdef CONFIG_PAX_EMUTRAMP
67224+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
67225+ msg_emutramp = "EMUTRAMP enabled";
67226+#endif
67227+
67228+ if (!msg_mprotect[0] && !msg_emutramp[0])
67229+ continue;
67230+
67231+ if (!printk_ratelimit())
67232+ continue;
67233+
67234+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
67235+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
67236+ if (buffer_lib && buffer_exe) {
67237+ char *path_lib, *path_exe;
67238+
67239+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
67240+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
67241+
67242+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
67243+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
67244+
67245+ }
67246+ free_page((unsigned long)buffer_exe);
67247+ free_page((unsigned long)buffer_lib);
67248+ continue;
67249+ }
67250+#endif
67251+
67252+ }
67253+ }
67254+}
67255+#endif
67256+
67257+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
67258+
67259+extern int grsec_enable_log_rwxmaps;
67260+
67261+static void elf_handle_mmap(struct file *file)
67262+{
67263+ struct elfhdr elf_h;
67264+ struct elf_phdr elf_p;
67265+ unsigned long i;
67266+
67267+ if (!grsec_enable_log_rwxmaps)
67268+ return;
67269+
67270+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
67271+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
67272+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
67273+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
67274+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
67275+ return;
67276+
67277+ for (i = 0UL; i < elf_h.e_phnum; i++) {
67278+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
67279+ return;
67280+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
67281+ gr_log_ptgnustack(file);
67282+ }
67283+}
67284+#endif
67285+
67286 static int __init init_elf_binfmt(void)
67287 {
67288 register_binfmt(&elf_format);
67289diff --git a/fs/block_dev.c b/fs/block_dev.c
67290index 975266b..c3d1856 100644
67291--- a/fs/block_dev.c
67292+++ b/fs/block_dev.c
67293@@ -734,7 +734,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
67294 else if (bdev->bd_contains == bdev)
67295 return true; /* is a whole device which isn't held */
67296
67297- else if (whole->bd_holder == bd_may_claim)
67298+ else if (whole->bd_holder == (void *)bd_may_claim)
67299 return true; /* is a partition of a device that is being partitioned */
67300 else if (whole->bd_holder != NULL)
67301 return false; /* is a partition of a held device */
67302diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
67303index 6d67f32..8f33187 100644
67304--- a/fs/btrfs/ctree.c
67305+++ b/fs/btrfs/ctree.c
67306@@ -1181,9 +1181,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
67307 free_extent_buffer(buf);
67308 add_root_to_dirty_list(root);
67309 } else {
67310- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
67311- parent_start = parent->start;
67312- else
67313+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
67314+ if (parent)
67315+ parent_start = parent->start;
67316+ else
67317+ parent_start = 0;
67318+ } else
67319 parent_start = 0;
67320
67321 WARN_ON(trans->transid != btrfs_header_generation(parent));
67322diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
67323index 82f0c7c..dff78a8 100644
67324--- a/fs/btrfs/delayed-inode.c
67325+++ b/fs/btrfs/delayed-inode.c
67326@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
67327
67328 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
67329 {
67330- int seq = atomic_inc_return(&delayed_root->items_seq);
67331+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
67332 if ((atomic_dec_return(&delayed_root->items) <
67333 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
67334 waitqueue_active(&delayed_root->wait))
67335@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
67336
67337 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
67338 {
67339- int val = atomic_read(&delayed_root->items_seq);
67340+ int val = atomic_read_unchecked(&delayed_root->items_seq);
67341
67342 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
67343 return 1;
67344@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
67345 int seq;
67346 int ret;
67347
67348- seq = atomic_read(&delayed_root->items_seq);
67349+ seq = atomic_read_unchecked(&delayed_root->items_seq);
67350
67351 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
67352 if (ret)
67353diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
67354index f70119f..ab5894d 100644
67355--- a/fs/btrfs/delayed-inode.h
67356+++ b/fs/btrfs/delayed-inode.h
67357@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
67358 */
67359 struct list_head prepare_list;
67360 atomic_t items; /* for delayed items */
67361- atomic_t items_seq; /* for delayed items */
67362+ atomic_unchecked_t items_seq; /* for delayed items */
67363 int nodes; /* for delayed nodes */
67364 wait_queue_head_t wait;
67365 };
67366@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
67367 struct btrfs_delayed_root *delayed_root)
67368 {
67369 atomic_set(&delayed_root->items, 0);
67370- atomic_set(&delayed_root->items_seq, 0);
67371+ atomic_set_unchecked(&delayed_root->items_seq, 0);
67372 delayed_root->nodes = 0;
67373 spin_lock_init(&delayed_root->lock);
67374 init_waitqueue_head(&delayed_root->wait);
67375diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
67376index e477ed6..480c0db 100644
67377--- a/fs/btrfs/super.c
67378+++ b/fs/btrfs/super.c
67379@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
67380 function, line, errstr);
67381 return;
67382 }
67383- ACCESS_ONCE(trans->transaction->aborted) = errno;
67384+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
67385 /* Wake up anybody who may be waiting on this transaction */
67386 wake_up(&root->fs_info->transaction_wait);
67387 wake_up(&root->fs_info->transaction_blocked_wait);
67388diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
67389index 94edb0a..e94dc93 100644
67390--- a/fs/btrfs/sysfs.c
67391+++ b/fs/btrfs/sysfs.c
67392@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
67393 for (set = 0; set < FEAT_MAX; set++) {
67394 int i;
67395 struct attribute *attrs[2];
67396- struct attribute_group agroup = {
67397+ attribute_group_no_const agroup = {
67398 .name = "features",
67399 .attrs = attrs,
67400 };
67401diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
67402index 2299bfd..4098e72 100644
67403--- a/fs/btrfs/tests/free-space-tests.c
67404+++ b/fs/btrfs/tests/free-space-tests.c
67405@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
67406 * extent entry.
67407 */
67408 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
67409- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
67410+ pax_open_kernel();
67411+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
67412+ pax_close_kernel();
67413
67414 /*
67415 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
67416@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
67417 if (ret)
67418 return ret;
67419
67420- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
67421+ pax_open_kernel();
67422+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
67423+ pax_close_kernel();
67424 __btrfs_remove_free_space_cache(cache->free_space_ctl);
67425
67426 return 0;
67427diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
67428index 154990c..d0cf699 100644
67429--- a/fs/btrfs/tree-log.h
67430+++ b/fs/btrfs/tree-log.h
67431@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
67432 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
67433 struct btrfs_trans_handle *trans)
67434 {
67435- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
67436+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
67437 }
67438
67439 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
67440diff --git a/fs/buffer.c b/fs/buffer.c
67441index 20805db..2e8fc69 100644
67442--- a/fs/buffer.c
67443+++ b/fs/buffer.c
67444@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
67445 bh_cachep = kmem_cache_create("buffer_head",
67446 sizeof(struct buffer_head), 0,
67447 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
67448- SLAB_MEM_SPREAD),
67449+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
67450 NULL);
67451
67452 /*
67453diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
67454index fbb08e9..0fda764 100644
67455--- a/fs/cachefiles/bind.c
67456+++ b/fs/cachefiles/bind.c
67457@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
67458 args);
67459
67460 /* start by checking things over */
67461- ASSERT(cache->fstop_percent >= 0 &&
67462- cache->fstop_percent < cache->fcull_percent &&
67463+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
67464 cache->fcull_percent < cache->frun_percent &&
67465 cache->frun_percent < 100);
67466
67467- ASSERT(cache->bstop_percent >= 0 &&
67468- cache->bstop_percent < cache->bcull_percent &&
67469+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
67470 cache->bcull_percent < cache->brun_percent &&
67471 cache->brun_percent < 100);
67472
67473diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
67474index f601def..b2cf704 100644
67475--- a/fs/cachefiles/daemon.c
67476+++ b/fs/cachefiles/daemon.c
67477@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
67478 if (n > buflen)
67479 return -EMSGSIZE;
67480
67481- if (copy_to_user(_buffer, buffer, n) != 0)
67482+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
67483 return -EFAULT;
67484
67485 return n;
67486@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
67487 if (test_bit(CACHEFILES_DEAD, &cache->flags))
67488 return -EIO;
67489
67490- if (datalen < 0 || datalen > PAGE_SIZE - 1)
67491+ if (datalen > PAGE_SIZE - 1)
67492 return -EOPNOTSUPP;
67493
67494 /* drag the command string into the kernel so we can parse it */
67495@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
67496 if (args[0] != '%' || args[1] != '\0')
67497 return -EINVAL;
67498
67499- if (fstop < 0 || fstop >= cache->fcull_percent)
67500+ if (fstop >= cache->fcull_percent)
67501 return cachefiles_daemon_range_error(cache, args);
67502
67503 cache->fstop_percent = fstop;
67504@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
67505 if (args[0] != '%' || args[1] != '\0')
67506 return -EINVAL;
67507
67508- if (bstop < 0 || bstop >= cache->bcull_percent)
67509+ if (bstop >= cache->bcull_percent)
67510 return cachefiles_daemon_range_error(cache, args);
67511
67512 cache->bstop_percent = bstop;
67513diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
67514index 8c52472..c4e3a69 100644
67515--- a/fs/cachefiles/internal.h
67516+++ b/fs/cachefiles/internal.h
67517@@ -66,7 +66,7 @@ struct cachefiles_cache {
67518 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
67519 struct rb_root active_nodes; /* active nodes (can't be culled) */
67520 rwlock_t active_lock; /* lock for active_nodes */
67521- atomic_t gravecounter; /* graveyard uniquifier */
67522+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
67523 unsigned frun_percent; /* when to stop culling (% files) */
67524 unsigned fcull_percent; /* when to start culling (% files) */
67525 unsigned fstop_percent; /* when to stop allocating (% files) */
67526@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
67527 * proc.c
67528 */
67529 #ifdef CONFIG_CACHEFILES_HISTOGRAM
67530-extern atomic_t cachefiles_lookup_histogram[HZ];
67531-extern atomic_t cachefiles_mkdir_histogram[HZ];
67532-extern atomic_t cachefiles_create_histogram[HZ];
67533+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
67534+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
67535+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
67536
67537 extern int __init cachefiles_proc_init(void);
67538 extern void cachefiles_proc_cleanup(void);
67539 static inline
67540-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
67541+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
67542 {
67543 unsigned long jif = jiffies - start_jif;
67544 if (jif >= HZ)
67545 jif = HZ - 1;
67546- atomic_inc(&histogram[jif]);
67547+ atomic_inc_unchecked(&histogram[jif]);
67548 }
67549
67550 #else
67551diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
67552index 1e51714e..411eded 100644
67553--- a/fs/cachefiles/namei.c
67554+++ b/fs/cachefiles/namei.c
67555@@ -309,7 +309,7 @@ try_again:
67556 /* first step is to make up a grave dentry in the graveyard */
67557 sprintf(nbuffer, "%08x%08x",
67558 (uint32_t) get_seconds(),
67559- (uint32_t) atomic_inc_return(&cache->gravecounter));
67560+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
67561
67562 /* do the multiway lock magic */
67563 trap = lock_rename(cache->graveyard, dir);
67564diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
67565index eccd339..4c1d995 100644
67566--- a/fs/cachefiles/proc.c
67567+++ b/fs/cachefiles/proc.c
67568@@ -14,9 +14,9 @@
67569 #include <linux/seq_file.h>
67570 #include "internal.h"
67571
67572-atomic_t cachefiles_lookup_histogram[HZ];
67573-atomic_t cachefiles_mkdir_histogram[HZ];
67574-atomic_t cachefiles_create_histogram[HZ];
67575+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
67576+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
67577+atomic_unchecked_t cachefiles_create_histogram[HZ];
67578
67579 /*
67580 * display the latency histogram
67581@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
67582 return 0;
67583 default:
67584 index = (unsigned long) v - 3;
67585- x = atomic_read(&cachefiles_lookup_histogram[index]);
67586- y = atomic_read(&cachefiles_mkdir_histogram[index]);
67587- z = atomic_read(&cachefiles_create_histogram[index]);
67588+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
67589+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
67590+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
67591 if (x == 0 && y == 0 && z == 0)
67592 return 0;
67593
67594diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
67595index 83e9976..bfd1eee 100644
67596--- a/fs/ceph/dir.c
67597+++ b/fs/ceph/dir.c
67598@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
67599 struct dentry *dentry, *last;
67600 struct ceph_dentry_info *di;
67601 int err = 0;
67602+ char d_name[DNAME_INLINE_LEN];
67603+ const unsigned char *name;
67604
67605 /* claim ref on last dentry we returned */
67606 last = fi->dentry;
67607@@ -190,7 +192,12 @@ more:
67608
67609 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
67610 dentry, dentry, dentry->d_inode);
67611- if (!dir_emit(ctx, dentry->d_name.name,
67612+ name = dentry->d_name.name;
67613+ if (name == dentry->d_iname) {
67614+ memcpy(d_name, name, dentry->d_name.len);
67615+ name = d_name;
67616+ }
67617+ if (!dir_emit(ctx, name,
67618 dentry->d_name.len,
67619 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
67620 dentry->d_inode->i_mode >> 12)) {
67621@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
67622 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
67623 struct ceph_mds_client *mdsc = fsc->mdsc;
67624 unsigned frag = fpos_frag(ctx->pos);
67625- int off = fpos_off(ctx->pos);
67626+ unsigned int off = fpos_off(ctx->pos);
67627 int err;
67628 u32 ftype;
67629 struct ceph_mds_reply_info_parsed *rinfo;
67630diff --git a/fs/ceph/super.c b/fs/ceph/super.c
67631index a63997b..ddc0577 100644
67632--- a/fs/ceph/super.c
67633+++ b/fs/ceph/super.c
67634@@ -889,7 +889,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
67635 /*
67636 * construct our own bdi so we can control readahead, etc.
67637 */
67638-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
67639+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
67640
67641 static int ceph_register_bdi(struct super_block *sb,
67642 struct ceph_fs_client *fsc)
67643@@ -906,7 +906,7 @@ static int ceph_register_bdi(struct super_block *sb,
67644 VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
67645
67646 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
67647- atomic_long_inc_return(&bdi_seq));
67648+ atomic_long_inc_return_unchecked(&bdi_seq));
67649 if (!err)
67650 sb->s_bdi = &fsc->backing_dev_info;
67651 return err;
67652diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
67653index 7febcf2..62a5721 100644
67654--- a/fs/cifs/cifs_debug.c
67655+++ b/fs/cifs/cifs_debug.c
67656@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
67657
67658 if (strtobool(&c, &bv) == 0) {
67659 #ifdef CONFIG_CIFS_STATS2
67660- atomic_set(&totBufAllocCount, 0);
67661- atomic_set(&totSmBufAllocCount, 0);
67662+ atomic_set_unchecked(&totBufAllocCount, 0);
67663+ atomic_set_unchecked(&totSmBufAllocCount, 0);
67664 #endif /* CONFIG_CIFS_STATS2 */
67665 spin_lock(&cifs_tcp_ses_lock);
67666 list_for_each(tmp1, &cifs_tcp_ses_list) {
67667@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
67668 tcon = list_entry(tmp3,
67669 struct cifs_tcon,
67670 tcon_list);
67671- atomic_set(&tcon->num_smbs_sent, 0);
67672+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
67673 if (server->ops->clear_stats)
67674 server->ops->clear_stats(tcon);
67675 }
67676@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
67677 smBufAllocCount.counter, cifs_min_small);
67678 #ifdef CONFIG_CIFS_STATS2
67679 seq_printf(m, "Total Large %d Small %d Allocations\n",
67680- atomic_read(&totBufAllocCount),
67681- atomic_read(&totSmBufAllocCount));
67682+ atomic_read_unchecked(&totBufAllocCount),
67683+ atomic_read_unchecked(&totSmBufAllocCount));
67684 #endif /* CONFIG_CIFS_STATS2 */
67685
67686 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
67687@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
67688 if (tcon->need_reconnect)
67689 seq_puts(m, "\tDISCONNECTED ");
67690 seq_printf(m, "\nSMBs: %d",
67691- atomic_read(&tcon->num_smbs_sent));
67692+ atomic_read_unchecked(&tcon->num_smbs_sent));
67693 if (server->ops->print_stats)
67694 server->ops->print_stats(m, tcon);
67695 }
67696diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
67697index d72fe37..ded5511 100644
67698--- a/fs/cifs/cifsfs.c
67699+++ b/fs/cifs/cifsfs.c
67700@@ -1092,7 +1092,7 @@ cifs_init_request_bufs(void)
67701 */
67702 cifs_req_cachep = kmem_cache_create("cifs_request",
67703 CIFSMaxBufSize + max_hdr_size, 0,
67704- SLAB_HWCACHE_ALIGN, NULL);
67705+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
67706 if (cifs_req_cachep == NULL)
67707 return -ENOMEM;
67708
67709@@ -1119,7 +1119,7 @@ cifs_init_request_bufs(void)
67710 efficient to alloc 1 per page off the slab compared to 17K (5page)
67711 alloc of large cifs buffers even when page debugging is on */
67712 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
67713- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
67714+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
67715 NULL);
67716 if (cifs_sm_req_cachep == NULL) {
67717 mempool_destroy(cifs_req_poolp);
67718@@ -1204,8 +1204,8 @@ init_cifs(void)
67719 atomic_set(&bufAllocCount, 0);
67720 atomic_set(&smBufAllocCount, 0);
67721 #ifdef CONFIG_CIFS_STATS2
67722- atomic_set(&totBufAllocCount, 0);
67723- atomic_set(&totSmBufAllocCount, 0);
67724+ atomic_set_unchecked(&totBufAllocCount, 0);
67725+ atomic_set_unchecked(&totSmBufAllocCount, 0);
67726 #endif /* CONFIG_CIFS_STATS2 */
67727
67728 atomic_set(&midCount, 0);
67729diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
67730index 22b289a..bbbba082 100644
67731--- a/fs/cifs/cifsglob.h
67732+++ b/fs/cifs/cifsglob.h
67733@@ -823,35 +823,35 @@ struct cifs_tcon {
67734 __u16 Flags; /* optional support bits */
67735 enum statusEnum tidStatus;
67736 #ifdef CONFIG_CIFS_STATS
67737- atomic_t num_smbs_sent;
67738+ atomic_unchecked_t num_smbs_sent;
67739 union {
67740 struct {
67741- atomic_t num_writes;
67742- atomic_t num_reads;
67743- atomic_t num_flushes;
67744- atomic_t num_oplock_brks;
67745- atomic_t num_opens;
67746- atomic_t num_closes;
67747- atomic_t num_deletes;
67748- atomic_t num_mkdirs;
67749- atomic_t num_posixopens;
67750- atomic_t num_posixmkdirs;
67751- atomic_t num_rmdirs;
67752- atomic_t num_renames;
67753- atomic_t num_t2renames;
67754- atomic_t num_ffirst;
67755- atomic_t num_fnext;
67756- atomic_t num_fclose;
67757- atomic_t num_hardlinks;
67758- atomic_t num_symlinks;
67759- atomic_t num_locks;
67760- atomic_t num_acl_get;
67761- atomic_t num_acl_set;
67762+ atomic_unchecked_t num_writes;
67763+ atomic_unchecked_t num_reads;
67764+ atomic_unchecked_t num_flushes;
67765+ atomic_unchecked_t num_oplock_brks;
67766+ atomic_unchecked_t num_opens;
67767+ atomic_unchecked_t num_closes;
67768+ atomic_unchecked_t num_deletes;
67769+ atomic_unchecked_t num_mkdirs;
67770+ atomic_unchecked_t num_posixopens;
67771+ atomic_unchecked_t num_posixmkdirs;
67772+ atomic_unchecked_t num_rmdirs;
67773+ atomic_unchecked_t num_renames;
67774+ atomic_unchecked_t num_t2renames;
67775+ atomic_unchecked_t num_ffirst;
67776+ atomic_unchecked_t num_fnext;
67777+ atomic_unchecked_t num_fclose;
67778+ atomic_unchecked_t num_hardlinks;
67779+ atomic_unchecked_t num_symlinks;
67780+ atomic_unchecked_t num_locks;
67781+ atomic_unchecked_t num_acl_get;
67782+ atomic_unchecked_t num_acl_set;
67783 } cifs_stats;
67784 #ifdef CONFIG_CIFS_SMB2
67785 struct {
67786- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
67787- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
67788+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
67789+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
67790 } smb2_stats;
67791 #endif /* CONFIG_CIFS_SMB2 */
67792 } stats;
67793@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
67794 }
67795
67796 #ifdef CONFIG_CIFS_STATS
67797-#define cifs_stats_inc atomic_inc
67798+#define cifs_stats_inc atomic_inc_unchecked
67799
67800 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
67801 unsigned int bytes)
67802@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
67803 /* Various Debug counters */
67804 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
67805 #ifdef CONFIG_CIFS_STATS2
67806-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
67807-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
67808+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
67809+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
67810 #endif
67811 GLOBAL_EXTERN atomic_t smBufAllocCount;
67812 GLOBAL_EXTERN atomic_t midCount;
67813diff --git a/fs/cifs/file.c b/fs/cifs/file.c
67814index ca30c39..570fb94 100644
67815--- a/fs/cifs/file.c
67816+++ b/fs/cifs/file.c
67817@@ -2055,10 +2055,14 @@ static int cifs_writepages(struct address_space *mapping,
67818 index = mapping->writeback_index; /* Start from prev offset */
67819 end = -1;
67820 } else {
67821- index = wbc->range_start >> PAGE_CACHE_SHIFT;
67822- end = wbc->range_end >> PAGE_CACHE_SHIFT;
67823- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
67824+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
67825 range_whole = true;
67826+ index = 0;
67827+ end = ULONG_MAX;
67828+ } else {
67829+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
67830+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
67831+ }
67832 scanned = true;
67833 }
67834 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
67835diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
67836index 3379463..3af418a 100644
67837--- a/fs/cifs/misc.c
67838+++ b/fs/cifs/misc.c
67839@@ -170,7 +170,7 @@ cifs_buf_get(void)
67840 memset(ret_buf, 0, buf_size + 3);
67841 atomic_inc(&bufAllocCount);
67842 #ifdef CONFIG_CIFS_STATS2
67843- atomic_inc(&totBufAllocCount);
67844+ atomic_inc_unchecked(&totBufAllocCount);
67845 #endif /* CONFIG_CIFS_STATS2 */
67846 }
67847
67848@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
67849 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
67850 atomic_inc(&smBufAllocCount);
67851 #ifdef CONFIG_CIFS_STATS2
67852- atomic_inc(&totSmBufAllocCount);
67853+ atomic_inc_unchecked(&totSmBufAllocCount);
67854 #endif /* CONFIG_CIFS_STATS2 */
67855
67856 }
67857diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
67858index d297903..1cb7516 100644
67859--- a/fs/cifs/smb1ops.c
67860+++ b/fs/cifs/smb1ops.c
67861@@ -622,27 +622,27 @@ static void
67862 cifs_clear_stats(struct cifs_tcon *tcon)
67863 {
67864 #ifdef CONFIG_CIFS_STATS
67865- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
67866- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
67867- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
67868- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
67869- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
67870- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
67871- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
67872- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
67873- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
67874- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
67875- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
67876- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
67877- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
67878- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
67879- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
67880- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
67881- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
67882- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
67883- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
67884- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
67885- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
67886+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
67887+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
67888+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
67889+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
67890+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
67891+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
67892+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
67893+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
67894+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
67895+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
67896+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
67897+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
67898+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
67899+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
67900+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
67901+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
67902+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
67903+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
67904+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
67905+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
67906+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
67907 #endif
67908 }
67909
67910@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
67911 {
67912 #ifdef CONFIG_CIFS_STATS
67913 seq_printf(m, " Oplocks breaks: %d",
67914- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
67915+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
67916 seq_printf(m, "\nReads: %d Bytes: %llu",
67917- atomic_read(&tcon->stats.cifs_stats.num_reads),
67918+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
67919 (long long)(tcon->bytes_read));
67920 seq_printf(m, "\nWrites: %d Bytes: %llu",
67921- atomic_read(&tcon->stats.cifs_stats.num_writes),
67922+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
67923 (long long)(tcon->bytes_written));
67924 seq_printf(m, "\nFlushes: %d",
67925- atomic_read(&tcon->stats.cifs_stats.num_flushes));
67926+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
67927 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
67928- atomic_read(&tcon->stats.cifs_stats.num_locks),
67929- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
67930- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
67931+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
67932+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
67933+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
67934 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
67935- atomic_read(&tcon->stats.cifs_stats.num_opens),
67936- atomic_read(&tcon->stats.cifs_stats.num_closes),
67937- atomic_read(&tcon->stats.cifs_stats.num_deletes));
67938+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
67939+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
67940+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
67941 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
67942- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
67943- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
67944+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
67945+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
67946 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
67947- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
67948- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
67949+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
67950+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
67951 seq_printf(m, "\nRenames: %d T2 Renames %d",
67952- atomic_read(&tcon->stats.cifs_stats.num_renames),
67953- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
67954+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
67955+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
67956 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
67957- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
67958- atomic_read(&tcon->stats.cifs_stats.num_fnext),
67959- atomic_read(&tcon->stats.cifs_stats.num_fclose));
67960+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
67961+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
67962+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
67963 #endif
67964 }
67965
67966diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
67967index eab05e1..ffe5ea4 100644
67968--- a/fs/cifs/smb2ops.c
67969+++ b/fs/cifs/smb2ops.c
67970@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
67971 #ifdef CONFIG_CIFS_STATS
67972 int i;
67973 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
67974- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
67975- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
67976+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
67977+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
67978 }
67979 #endif
67980 }
67981@@ -459,65 +459,65 @@ static void
67982 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
67983 {
67984 #ifdef CONFIG_CIFS_STATS
67985- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
67986- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
67987+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
67988+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
67989 seq_printf(m, "\nNegotiates: %d sent %d failed",
67990- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
67991- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
67992+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
67993+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
67994 seq_printf(m, "\nSessionSetups: %d sent %d failed",
67995- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
67996- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
67997+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
67998+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
67999 seq_printf(m, "\nLogoffs: %d sent %d failed",
68000- atomic_read(&sent[SMB2_LOGOFF_HE]),
68001- atomic_read(&failed[SMB2_LOGOFF_HE]));
68002+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
68003+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
68004 seq_printf(m, "\nTreeConnects: %d sent %d failed",
68005- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
68006- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
68007+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
68008+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
68009 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
68010- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
68011- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
68012+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
68013+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
68014 seq_printf(m, "\nCreates: %d sent %d failed",
68015- atomic_read(&sent[SMB2_CREATE_HE]),
68016- atomic_read(&failed[SMB2_CREATE_HE]));
68017+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
68018+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
68019 seq_printf(m, "\nCloses: %d sent %d failed",
68020- atomic_read(&sent[SMB2_CLOSE_HE]),
68021- atomic_read(&failed[SMB2_CLOSE_HE]));
68022+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
68023+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
68024 seq_printf(m, "\nFlushes: %d sent %d failed",
68025- atomic_read(&sent[SMB2_FLUSH_HE]),
68026- atomic_read(&failed[SMB2_FLUSH_HE]));
68027+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
68028+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
68029 seq_printf(m, "\nReads: %d sent %d failed",
68030- atomic_read(&sent[SMB2_READ_HE]),
68031- atomic_read(&failed[SMB2_READ_HE]));
68032+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
68033+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
68034 seq_printf(m, "\nWrites: %d sent %d failed",
68035- atomic_read(&sent[SMB2_WRITE_HE]),
68036- atomic_read(&failed[SMB2_WRITE_HE]));
68037+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
68038+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
68039 seq_printf(m, "\nLocks: %d sent %d failed",
68040- atomic_read(&sent[SMB2_LOCK_HE]),
68041- atomic_read(&failed[SMB2_LOCK_HE]));
68042+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
68043+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
68044 seq_printf(m, "\nIOCTLs: %d sent %d failed",
68045- atomic_read(&sent[SMB2_IOCTL_HE]),
68046- atomic_read(&failed[SMB2_IOCTL_HE]));
68047+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
68048+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
68049 seq_printf(m, "\nCancels: %d sent %d failed",
68050- atomic_read(&sent[SMB2_CANCEL_HE]),
68051- atomic_read(&failed[SMB2_CANCEL_HE]));
68052+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
68053+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
68054 seq_printf(m, "\nEchos: %d sent %d failed",
68055- atomic_read(&sent[SMB2_ECHO_HE]),
68056- atomic_read(&failed[SMB2_ECHO_HE]));
68057+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
68058+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
68059 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
68060- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
68061- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
68062+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
68063+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
68064 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
68065- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
68066- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
68067+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
68068+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
68069 seq_printf(m, "\nQueryInfos: %d sent %d failed",
68070- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
68071- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
68072+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
68073+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
68074 seq_printf(m, "\nSetInfos: %d sent %d failed",
68075- atomic_read(&sent[SMB2_SET_INFO_HE]),
68076- atomic_read(&failed[SMB2_SET_INFO_HE]));
68077+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
68078+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
68079 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
68080- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
68081- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
68082+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
68083+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
68084 #endif
68085 }
68086
68087diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
68088index 65cd7a8..3518676 100644
68089--- a/fs/cifs/smb2pdu.c
68090+++ b/fs/cifs/smb2pdu.c
68091@@ -2147,8 +2147,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
68092 default:
68093 cifs_dbg(VFS, "info level %u isn't supported\n",
68094 srch_inf->info_level);
68095- rc = -EINVAL;
68096- goto qdir_exit;
68097+ return -EINVAL;
68098 }
68099
68100 req->FileIndex = cpu_to_le32(index);
68101diff --git a/fs/coda/cache.c b/fs/coda/cache.c
68102index 46ee6f2..89a9e7f 100644
68103--- a/fs/coda/cache.c
68104+++ b/fs/coda/cache.c
68105@@ -24,7 +24,7 @@
68106 #include "coda_linux.h"
68107 #include "coda_cache.h"
68108
68109-static atomic_t permission_epoch = ATOMIC_INIT(0);
68110+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
68111
68112 /* replace or extend an acl cache hit */
68113 void coda_cache_enter(struct inode *inode, int mask)
68114@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
68115 struct coda_inode_info *cii = ITOC(inode);
68116
68117 spin_lock(&cii->c_lock);
68118- cii->c_cached_epoch = atomic_read(&permission_epoch);
68119+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
68120 if (!uid_eq(cii->c_uid, current_fsuid())) {
68121 cii->c_uid = current_fsuid();
68122 cii->c_cached_perm = mask;
68123@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
68124 {
68125 struct coda_inode_info *cii = ITOC(inode);
68126 spin_lock(&cii->c_lock);
68127- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
68128+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
68129 spin_unlock(&cii->c_lock);
68130 }
68131
68132 /* remove all acl caches */
68133 void coda_cache_clear_all(struct super_block *sb)
68134 {
68135- atomic_inc(&permission_epoch);
68136+ atomic_inc_unchecked(&permission_epoch);
68137 }
68138
68139
68140@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
68141 spin_lock(&cii->c_lock);
68142 hit = (mask & cii->c_cached_perm) == mask &&
68143 uid_eq(cii->c_uid, current_fsuid()) &&
68144- cii->c_cached_epoch == atomic_read(&permission_epoch);
68145+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
68146 spin_unlock(&cii->c_lock);
68147
68148 return hit;
68149diff --git a/fs/compat.c b/fs/compat.c
68150index 6fd272d..dd34ba2 100644
68151--- a/fs/compat.c
68152+++ b/fs/compat.c
68153@@ -54,7 +54,7 @@
68154 #include <asm/ioctls.h>
68155 #include "internal.h"
68156
68157-int compat_log = 1;
68158+int compat_log = 0;
68159
68160 int compat_printk(const char *fmt, ...)
68161 {
68162@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
68163
68164 set_fs(KERNEL_DS);
68165 /* The __user pointer cast is valid because of the set_fs() */
68166- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
68167+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
68168 set_fs(oldfs);
68169 /* truncating is ok because it's a user address */
68170 if (!ret)
68171@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
68172 goto out;
68173
68174 ret = -EINVAL;
68175- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
68176+ if (nr_segs > UIO_MAXIOV)
68177 goto out;
68178 if (nr_segs > fast_segs) {
68179 ret = -ENOMEM;
68180@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
68181 struct compat_readdir_callback {
68182 struct dir_context ctx;
68183 struct compat_old_linux_dirent __user *dirent;
68184+ struct file * file;
68185 int result;
68186 };
68187
68188@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
68189 buf->result = -EOVERFLOW;
68190 return -EOVERFLOW;
68191 }
68192+
68193+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68194+ return 0;
68195+
68196 buf->result++;
68197 dirent = buf->dirent;
68198 if (!access_ok(VERIFY_WRITE, dirent,
68199@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
68200 if (!f.file)
68201 return -EBADF;
68202
68203+ buf.file = f.file;
68204 error = iterate_dir(f.file, &buf.ctx);
68205 if (buf.result)
68206 error = buf.result;
68207@@ -913,6 +919,7 @@ struct compat_getdents_callback {
68208 struct dir_context ctx;
68209 struct compat_linux_dirent __user *current_dir;
68210 struct compat_linux_dirent __user *previous;
68211+ struct file * file;
68212 int count;
68213 int error;
68214 };
68215@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
68216 buf->error = -EOVERFLOW;
68217 return -EOVERFLOW;
68218 }
68219+
68220+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68221+ return 0;
68222+
68223 dirent = buf->previous;
68224 if (dirent) {
68225 if (__put_user(offset, &dirent->d_off))
68226@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
68227 if (!f.file)
68228 return -EBADF;
68229
68230+ buf.file = f.file;
68231 error = iterate_dir(f.file, &buf.ctx);
68232 if (error >= 0)
68233 error = buf.error;
68234@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
68235 struct dir_context ctx;
68236 struct linux_dirent64 __user *current_dir;
68237 struct linux_dirent64 __user *previous;
68238+ struct file * file;
68239 int count;
68240 int error;
68241 };
68242@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
68243 buf->error = -EINVAL; /* only used if we fail.. */
68244 if (reclen > buf->count)
68245 return -EINVAL;
68246+
68247+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68248+ return 0;
68249+
68250 dirent = buf->previous;
68251
68252 if (dirent) {
68253@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
68254 if (!f.file)
68255 return -EBADF;
68256
68257+ buf.file = f.file;
68258 error = iterate_dir(f.file, &buf.ctx);
68259 if (error >= 0)
68260 error = buf.error;
68261diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
68262index 4d24d17..4f8c09e 100644
68263--- a/fs/compat_binfmt_elf.c
68264+++ b/fs/compat_binfmt_elf.c
68265@@ -30,11 +30,13 @@
68266 #undef elf_phdr
68267 #undef elf_shdr
68268 #undef elf_note
68269+#undef elf_dyn
68270 #undef elf_addr_t
68271 #define elfhdr elf32_hdr
68272 #define elf_phdr elf32_phdr
68273 #define elf_shdr elf32_shdr
68274 #define elf_note elf32_note
68275+#define elf_dyn Elf32_Dyn
68276 #define elf_addr_t Elf32_Addr
68277
68278 /*
68279diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
68280index afec645..9c65620 100644
68281--- a/fs/compat_ioctl.c
68282+++ b/fs/compat_ioctl.c
68283@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
68284 return -EFAULT;
68285 if (__get_user(udata, &ss32->iomem_base))
68286 return -EFAULT;
68287- ss.iomem_base = compat_ptr(udata);
68288+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
68289 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
68290 __get_user(ss.port_high, &ss32->port_high))
68291 return -EFAULT;
68292@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
68293 for (i = 0; i < nmsgs; i++) {
68294 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
68295 return -EFAULT;
68296- if (get_user(datap, &umsgs[i].buf) ||
68297- put_user(compat_ptr(datap), &tmsgs[i].buf))
68298+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
68299+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
68300 return -EFAULT;
68301 }
68302 return sys_ioctl(fd, cmd, (unsigned long)tdata);
68303@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
68304 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
68305 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
68306 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
68307- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
68308+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
68309 return -EFAULT;
68310
68311 return ioctl_preallocate(file, p);
68312@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
68313 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
68314 {
68315 unsigned int a, b;
68316- a = *(unsigned int *)p;
68317- b = *(unsigned int *)q;
68318+ a = *(const unsigned int *)p;
68319+ b = *(const unsigned int *)q;
68320 if (a > b)
68321 return 1;
68322 if (a < b)
68323diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
68324index cf0db00..c7f70e8 100644
68325--- a/fs/configfs/dir.c
68326+++ b/fs/configfs/dir.c
68327@@ -1540,7 +1540,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
68328 }
68329 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
68330 struct configfs_dirent *next;
68331- const char *name;
68332+ const unsigned char * name;
68333+ char d_name[sizeof(next->s_dentry->d_iname)];
68334 int len;
68335 struct inode *inode = NULL;
68336
68337@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
68338 continue;
68339
68340 name = configfs_get_name(next);
68341- len = strlen(name);
68342+ if (next->s_dentry && name == next->s_dentry->d_iname) {
68343+ len = next->s_dentry->d_name.len;
68344+ memcpy(d_name, name, len);
68345+ name = d_name;
68346+ } else
68347+ len = strlen(name);
68348
68349 /*
68350 * We'll have a dentry and an inode for
68351diff --git a/fs/configfs/item.c b/fs/configfs/item.c
68352index e65f9ff..3ed264d 100644
68353--- a/fs/configfs/item.c
68354+++ b/fs/configfs/item.c
68355@@ -116,7 +116,7 @@ void config_item_init_type_name(struct config_item *item,
68356 const char *name,
68357 struct config_item_type *type)
68358 {
68359- config_item_set_name(item, name);
68360+ config_item_set_name(item, "%s", name);
68361 item->ci_type = type;
68362 config_item_init(item);
68363 }
68364@@ -125,7 +125,7 @@ EXPORT_SYMBOL(config_item_init_type_name);
68365 void config_group_init_type_name(struct config_group *group, const char *name,
68366 struct config_item_type *type)
68367 {
68368- config_item_set_name(&group->cg_item, name);
68369+ config_item_set_name(&group->cg_item, "%s", name);
68370 group->cg_item.ci_type = type;
68371 config_group_init(group);
68372 }
68373diff --git a/fs/coredump.c b/fs/coredump.c
68374index bbbe139..b76fae5 100644
68375--- a/fs/coredump.c
68376+++ b/fs/coredump.c
68377@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
68378 struct pipe_inode_info *pipe = file->private_data;
68379
68380 pipe_lock(pipe);
68381- pipe->readers++;
68382- pipe->writers--;
68383+ atomic_inc(&pipe->readers);
68384+ atomic_dec(&pipe->writers);
68385 wake_up_interruptible_sync(&pipe->wait);
68386 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
68387 pipe_unlock(pipe);
68388@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
68389 * We actually want wait_event_freezable() but then we need
68390 * to clear TIF_SIGPENDING and improve dump_interrupted().
68391 */
68392- wait_event_interruptible(pipe->wait, pipe->readers == 1);
68393+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
68394
68395 pipe_lock(pipe);
68396- pipe->readers--;
68397- pipe->writers++;
68398+ atomic_dec(&pipe->readers);
68399+ atomic_inc(&pipe->writers);
68400 pipe_unlock(pipe);
68401 }
68402
68403@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
68404 struct files_struct *displaced;
68405 bool need_nonrelative = false;
68406 bool core_dumped = false;
68407- static atomic_t core_dump_count = ATOMIC_INIT(0);
68408+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
68409+ long signr = siginfo->si_signo;
68410+ int dumpable;
68411 struct coredump_params cprm = {
68412 .siginfo = siginfo,
68413 .regs = signal_pt_regs(),
68414@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
68415 .mm_flags = mm->flags,
68416 };
68417
68418- audit_core_dumps(siginfo->si_signo);
68419+ audit_core_dumps(signr);
68420+
68421+ dumpable = __get_dumpable(cprm.mm_flags);
68422+
68423+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
68424+ gr_handle_brute_attach(dumpable);
68425
68426 binfmt = mm->binfmt;
68427 if (!binfmt || !binfmt->core_dump)
68428 goto fail;
68429- if (!__get_dumpable(cprm.mm_flags))
68430+ if (!dumpable)
68431 goto fail;
68432
68433 cred = prepare_creds();
68434@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
68435 need_nonrelative = true;
68436 }
68437
68438- retval = coredump_wait(siginfo->si_signo, &core_state);
68439+ retval = coredump_wait(signr, &core_state);
68440 if (retval < 0)
68441 goto fail_creds;
68442
68443@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
68444 }
68445 cprm.limit = RLIM_INFINITY;
68446
68447- dump_count = atomic_inc_return(&core_dump_count);
68448+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
68449 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
68450 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
68451 task_tgid_vnr(current), current->comm);
68452@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
68453 } else {
68454 struct inode *inode;
68455
68456+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
68457+
68458 if (cprm.limit < binfmt->min_coredump)
68459 goto fail_unlock;
68460
68461@@ -681,7 +690,7 @@ close_fail:
68462 filp_close(cprm.file, NULL);
68463 fail_dropcount:
68464 if (ispipe)
68465- atomic_dec(&core_dump_count);
68466+ atomic_dec_unchecked(&core_dump_count);
68467 fail_unlock:
68468 kfree(cn.corename);
68469 coredump_finish(mm, core_dumped);
68470@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
68471 struct file *file = cprm->file;
68472 loff_t pos = file->f_pos;
68473 ssize_t n;
68474+
68475+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
68476 if (cprm->written + nr > cprm->limit)
68477 return 0;
68478 while (nr) {
68479diff --git a/fs/dcache.c b/fs/dcache.c
68480index 922f23e..05e38ae 100644
68481--- a/fs/dcache.c
68482+++ b/fs/dcache.c
68483@@ -511,7 +511,7 @@ static void __dentry_kill(struct dentry *dentry)
68484 * dentry_iput drops the locks, at which point nobody (except
68485 * transient RCU lookups) can reach this dentry.
68486 */
68487- BUG_ON(dentry->d_lockref.count > 0);
68488+ BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
68489 this_cpu_dec(nr_dentry);
68490 if (dentry->d_op && dentry->d_op->d_release)
68491 dentry->d_op->d_release(dentry);
68492@@ -564,7 +564,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
68493 struct dentry *parent = dentry->d_parent;
68494 if (IS_ROOT(dentry))
68495 return NULL;
68496- if (unlikely(dentry->d_lockref.count < 0))
68497+ if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
68498 return NULL;
68499 if (likely(spin_trylock(&parent->d_lock)))
68500 return parent;
68501@@ -626,8 +626,8 @@ static inline bool fast_dput(struct dentry *dentry)
68502 */
68503 if (unlikely(ret < 0)) {
68504 spin_lock(&dentry->d_lock);
68505- if (dentry->d_lockref.count > 1) {
68506- dentry->d_lockref.count--;
68507+ if (__lockref_read(&dentry->d_lockref) > 1) {
68508+ __lockref_dec(&dentry->d_lockref);
68509 spin_unlock(&dentry->d_lock);
68510 return 1;
68511 }
68512@@ -682,7 +682,7 @@ static inline bool fast_dput(struct dentry *dentry)
68513 * else could have killed it and marked it dead. Either way, we
68514 * don't need to do anything else.
68515 */
68516- if (dentry->d_lockref.count) {
68517+ if (__lockref_read(&dentry->d_lockref)) {
68518 spin_unlock(&dentry->d_lock);
68519 return 1;
68520 }
68521@@ -692,7 +692,7 @@ static inline bool fast_dput(struct dentry *dentry)
68522 * lock, and we just tested that it was zero, so we can just
68523 * set it to 1.
68524 */
68525- dentry->d_lockref.count = 1;
68526+ __lockref_set(&dentry->d_lockref, 1);
68527 return 0;
68528 }
68529
68530@@ -751,7 +751,7 @@ repeat:
68531 dentry->d_flags |= DCACHE_REFERENCED;
68532 dentry_lru_add(dentry);
68533
68534- dentry->d_lockref.count--;
68535+ __lockref_dec(&dentry->d_lockref);
68536 spin_unlock(&dentry->d_lock);
68537 return;
68538
68539@@ -766,7 +766,7 @@ EXPORT_SYMBOL(dput);
68540 /* This must be called with d_lock held */
68541 static inline void __dget_dlock(struct dentry *dentry)
68542 {
68543- dentry->d_lockref.count++;
68544+ __lockref_inc(&dentry->d_lockref);
68545 }
68546
68547 static inline void __dget(struct dentry *dentry)
68548@@ -807,8 +807,8 @@ repeat:
68549 goto repeat;
68550 }
68551 rcu_read_unlock();
68552- BUG_ON(!ret->d_lockref.count);
68553- ret->d_lockref.count++;
68554+ BUG_ON(!__lockref_read(&ret->d_lockref));
68555+ __lockref_inc(&ret->d_lockref);
68556 spin_unlock(&ret->d_lock);
68557 return ret;
68558 }
68559@@ -886,9 +886,9 @@ restart:
68560 spin_lock(&inode->i_lock);
68561 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
68562 spin_lock(&dentry->d_lock);
68563- if (!dentry->d_lockref.count) {
68564+ if (!__lockref_read(&dentry->d_lockref)) {
68565 struct dentry *parent = lock_parent(dentry);
68566- if (likely(!dentry->d_lockref.count)) {
68567+ if (likely(!__lockref_read(&dentry->d_lockref))) {
68568 __dentry_kill(dentry);
68569 dput(parent);
68570 goto restart;
68571@@ -923,7 +923,7 @@ static void shrink_dentry_list(struct list_head *list)
68572 * We found an inuse dentry which was not removed from
68573 * the LRU because of laziness during lookup. Do not free it.
68574 */
68575- if (dentry->d_lockref.count > 0) {
68576+ if (__lockref_read(&dentry->d_lockref) > 0) {
68577 spin_unlock(&dentry->d_lock);
68578 if (parent)
68579 spin_unlock(&parent->d_lock);
68580@@ -961,8 +961,8 @@ static void shrink_dentry_list(struct list_head *list)
68581 dentry = parent;
68582 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
68583 parent = lock_parent(dentry);
68584- if (dentry->d_lockref.count != 1) {
68585- dentry->d_lockref.count--;
68586+ if (__lockref_read(&dentry->d_lockref) != 1) {
68587+ __lockref_inc(&dentry->d_lockref);
68588 spin_unlock(&dentry->d_lock);
68589 if (parent)
68590 spin_unlock(&parent->d_lock);
68591@@ -1002,7 +1002,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
68592 * counts, just remove them from the LRU. Otherwise give them
68593 * another pass through the LRU.
68594 */
68595- if (dentry->d_lockref.count) {
68596+ if (__lockref_read(&dentry->d_lockref)) {
68597 d_lru_isolate(lru, dentry);
68598 spin_unlock(&dentry->d_lock);
68599 return LRU_REMOVED;
68600@@ -1336,7 +1336,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
68601 } else {
68602 if (dentry->d_flags & DCACHE_LRU_LIST)
68603 d_lru_del(dentry);
68604- if (!dentry->d_lockref.count) {
68605+ if (!__lockref_read(&dentry->d_lockref)) {
68606 d_shrink_add(dentry, &data->dispose);
68607 data->found++;
68608 }
68609@@ -1384,7 +1384,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
68610 return D_WALK_CONTINUE;
68611
68612 /* root with refcount 1 is fine */
68613- if (dentry == _data && dentry->d_lockref.count == 1)
68614+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
68615 return D_WALK_CONTINUE;
68616
68617 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
68618@@ -1393,7 +1393,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
68619 dentry->d_inode ?
68620 dentry->d_inode->i_ino : 0UL,
68621 dentry,
68622- dentry->d_lockref.count,
68623+ __lockref_read(&dentry->d_lockref),
68624 dentry->d_sb->s_type->name,
68625 dentry->d_sb->s_id);
68626 WARN_ON(1);
68627@@ -1534,7 +1534,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68628 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
68629 if (name->len > DNAME_INLINE_LEN-1) {
68630 size_t size = offsetof(struct external_name, name[1]);
68631- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
68632+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
68633 if (!p) {
68634 kmem_cache_free(dentry_cache, dentry);
68635 return NULL;
68636@@ -1557,7 +1557,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68637 smp_wmb();
68638 dentry->d_name.name = dname;
68639
68640- dentry->d_lockref.count = 1;
68641+ __lockref_set(&dentry->d_lockref, 1);
68642 dentry->d_flags = 0;
68643 spin_lock_init(&dentry->d_lock);
68644 seqcount_init(&dentry->d_seq);
68645@@ -1566,6 +1566,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68646 dentry->d_sb = sb;
68647 dentry->d_op = NULL;
68648 dentry->d_fsdata = NULL;
68649+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
68650+ atomic_set(&dentry->chroot_refcnt, 0);
68651+#endif
68652 INIT_HLIST_BL_NODE(&dentry->d_hash);
68653 INIT_LIST_HEAD(&dentry->d_lru);
68654 INIT_LIST_HEAD(&dentry->d_subdirs);
68655@@ -2290,7 +2293,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
68656 goto next;
68657 }
68658
68659- dentry->d_lockref.count++;
68660+ __lockref_inc(&dentry->d_lockref);
68661 found = dentry;
68662 spin_unlock(&dentry->d_lock);
68663 break;
68664@@ -2358,7 +2361,7 @@ again:
68665 spin_lock(&dentry->d_lock);
68666 inode = dentry->d_inode;
68667 isdir = S_ISDIR(inode->i_mode);
68668- if (dentry->d_lockref.count == 1) {
68669+ if (__lockref_read(&dentry->d_lockref) == 1) {
68670 if (!spin_trylock(&inode->i_lock)) {
68671 spin_unlock(&dentry->d_lock);
68672 cpu_relax();
68673@@ -3311,7 +3314,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
68674
68675 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
68676 dentry->d_flags |= DCACHE_GENOCIDE;
68677- dentry->d_lockref.count--;
68678+ __lockref_dec(&dentry->d_lockref);
68679 }
68680 }
68681 return D_WALK_CONTINUE;
68682@@ -3427,7 +3430,8 @@ void __init vfs_caches_init(unsigned long mempages)
68683 mempages -= reserve;
68684
68685 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
68686- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
68687+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
68688+ SLAB_NO_SANITIZE, NULL);
68689
68690 dcache_init();
68691 inode_init();
68692diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
68693index 96400ab..906103d 100644
68694--- a/fs/debugfs/inode.c
68695+++ b/fs/debugfs/inode.c
68696@@ -386,6 +386,10 @@ struct dentry *debugfs_create_file_size(const char *name, umode_t mode,
68697 }
68698 EXPORT_SYMBOL_GPL(debugfs_create_file_size);
68699
68700+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68701+extern int grsec_enable_sysfs_restrict;
68702+#endif
68703+
68704 /**
68705 * debugfs_create_dir - create a directory in the debugfs filesystem
68706 * @name: a pointer to a string containing the name of the directory to
68707@@ -404,6 +408,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
68708 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
68709 * returned.
68710 */
68711+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68712+extern int grsec_enable_sysfs_restrict;
68713+#endif
68714+
68715 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
68716 {
68717 struct dentry *dentry = start_creating(name, parent);
68718@@ -416,7 +424,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
68719 if (unlikely(!inode))
68720 return failed_creating(dentry);
68721
68722- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
68723+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68724+ if (grsec_enable_sysfs_restrict)
68725+ inode->i_mode = S_IFDIR | S_IRWXU;
68726+ else
68727+#endif
68728+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
68729 inode->i_op = &simple_dir_inode_operations;
68730 inode->i_fop = &simple_dir_operations;
68731
68732diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
68733index b08b518..d6acffa 100644
68734--- a/fs/ecryptfs/inode.c
68735+++ b/fs/ecryptfs/inode.c
68736@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
68737 old_fs = get_fs();
68738 set_fs(get_ds());
68739 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
68740- (char __user *)lower_buf,
68741+ (char __force_user *)lower_buf,
68742 PATH_MAX);
68743 set_fs(old_fs);
68744 if (rc < 0)
68745diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
68746index e4141f2..d8263e8 100644
68747--- a/fs/ecryptfs/miscdev.c
68748+++ b/fs/ecryptfs/miscdev.c
68749@@ -304,7 +304,7 @@ check_list:
68750 goto out_unlock_msg_ctx;
68751 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
68752 if (msg_ctx->msg) {
68753- if (copy_to_user(&buf[i], packet_length, packet_length_size))
68754+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
68755 goto out_unlock_msg_ctx;
68756 i += packet_length_size;
68757 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
68758diff --git a/fs/exec.c b/fs/exec.c
68759index 1202445..620c98e 100644
68760--- a/fs/exec.c
68761+++ b/fs/exec.c
68762@@ -56,8 +56,20 @@
68763 #include <linux/pipe_fs_i.h>
68764 #include <linux/oom.h>
68765 #include <linux/compat.h>
68766+#include <linux/random.h>
68767+#include <linux/seq_file.h>
68768+#include <linux/coredump.h>
68769+#include <linux/mman.h>
68770+
68771+#ifdef CONFIG_PAX_REFCOUNT
68772+#include <linux/kallsyms.h>
68773+#include <linux/kdebug.h>
68774+#endif
68775+
68776+#include <trace/events/fs.h>
68777
68778 #include <asm/uaccess.h>
68779+#include <asm/sections.h>
68780 #include <asm/mmu_context.h>
68781 #include <asm/tlb.h>
68782
68783@@ -66,19 +78,34 @@
68784
68785 #include <trace/events/sched.h>
68786
68787+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
68788+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
68789+{
68790+ 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");
68791+}
68792+#endif
68793+
68794+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
68795+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
68796+EXPORT_SYMBOL(pax_set_initial_flags_func);
68797+#endif
68798+
68799 int suid_dumpable = 0;
68800
68801 static LIST_HEAD(formats);
68802 static DEFINE_RWLOCK(binfmt_lock);
68803
68804+extern int gr_process_kernel_exec_ban(void);
68805+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
68806+
68807 void __register_binfmt(struct linux_binfmt * fmt, int insert)
68808 {
68809 BUG_ON(!fmt);
68810 if (WARN_ON(!fmt->load_binary))
68811 return;
68812 write_lock(&binfmt_lock);
68813- insert ? list_add(&fmt->lh, &formats) :
68814- list_add_tail(&fmt->lh, &formats);
68815+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
68816+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
68817 write_unlock(&binfmt_lock);
68818 }
68819
68820@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
68821 void unregister_binfmt(struct linux_binfmt * fmt)
68822 {
68823 write_lock(&binfmt_lock);
68824- list_del(&fmt->lh);
68825+ pax_list_del((struct list_head *)&fmt->lh);
68826 write_unlock(&binfmt_lock);
68827 }
68828
68829@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
68830 int write)
68831 {
68832 struct page *page;
68833- int ret;
68834
68835-#ifdef CONFIG_STACK_GROWSUP
68836- if (write) {
68837- ret = expand_downwards(bprm->vma, pos);
68838- if (ret < 0)
68839- return NULL;
68840- }
68841-#endif
68842- ret = get_user_pages(current, bprm->mm, pos,
68843- 1, write, 1, &page, NULL);
68844- if (ret <= 0)
68845+ if (0 > expand_downwards(bprm->vma, pos))
68846+ return NULL;
68847+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
68848 return NULL;
68849
68850 if (write) {
68851@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
68852 if (size <= ARG_MAX)
68853 return page;
68854
68855+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68856+ // only allow 512KB for argv+env on suid/sgid binaries
68857+ // to prevent easy ASLR exhaustion
68858+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
68859+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
68860+ (size > (512 * 1024))) {
68861+ put_page(page);
68862+ return NULL;
68863+ }
68864+#endif
68865+
68866 /*
68867 * Limit to 1/4-th the stack size for the argv+env strings.
68868 * This ensures that:
68869@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
68870 vma->vm_end = STACK_TOP_MAX;
68871 vma->vm_start = vma->vm_end - PAGE_SIZE;
68872 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
68873+
68874+#ifdef CONFIG_PAX_SEGMEXEC
68875+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
68876+#endif
68877+
68878 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
68879 INIT_LIST_HEAD(&vma->anon_vma_chain);
68880
68881@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
68882 arch_bprm_mm_init(mm, vma);
68883 up_write(&mm->mmap_sem);
68884 bprm->p = vma->vm_end - sizeof(void *);
68885+
68886+#ifdef CONFIG_PAX_RANDUSTACK
68887+ if (randomize_va_space)
68888+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
68889+#endif
68890+
68891 return 0;
68892 err:
68893 up_write(&mm->mmap_sem);
68894@@ -396,7 +437,7 @@ struct user_arg_ptr {
68895 } ptr;
68896 };
68897
68898-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68899+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68900 {
68901 const char __user *native;
68902
68903@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68904 compat_uptr_t compat;
68905
68906 if (get_user(compat, argv.ptr.compat + nr))
68907- return ERR_PTR(-EFAULT);
68908+ return (const char __force_user *)ERR_PTR(-EFAULT);
68909
68910 return compat_ptr(compat);
68911 }
68912 #endif
68913
68914 if (get_user(native, argv.ptr.native + nr))
68915- return ERR_PTR(-EFAULT);
68916+ return (const char __force_user *)ERR_PTR(-EFAULT);
68917
68918 return native;
68919 }
68920@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
68921 if (!p)
68922 break;
68923
68924- if (IS_ERR(p))
68925+ if (IS_ERR((const char __force_kernel *)p))
68926 return -EFAULT;
68927
68928 if (i >= max)
68929@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
68930
68931 ret = -EFAULT;
68932 str = get_user_arg_ptr(argv, argc);
68933- if (IS_ERR(str))
68934+ if (IS_ERR((const char __force_kernel *)str))
68935 goto out;
68936
68937 len = strnlen_user(str, MAX_ARG_STRLEN);
68938@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
68939 int r;
68940 mm_segment_t oldfs = get_fs();
68941 struct user_arg_ptr argv = {
68942- .ptr.native = (const char __user *const __user *)__argv,
68943+ .ptr.native = (const char __user * const __force_user *)__argv,
68944 };
68945
68946 set_fs(KERNEL_DS);
68947@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
68948 unsigned long new_end = old_end - shift;
68949 struct mmu_gather tlb;
68950
68951- BUG_ON(new_start > new_end);
68952+ if (new_start >= new_end || new_start < mmap_min_addr)
68953+ return -ENOMEM;
68954
68955 /*
68956 * ensure there are no vmas between where we want to go
68957@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
68958 if (vma != find_vma(mm, new_start))
68959 return -EFAULT;
68960
68961+#ifdef CONFIG_PAX_SEGMEXEC
68962+ BUG_ON(pax_find_mirror_vma(vma));
68963+#endif
68964+
68965 /*
68966 * cover the whole range: [new_start, old_end)
68967 */
68968@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
68969 stack_top = arch_align_stack(stack_top);
68970 stack_top = PAGE_ALIGN(stack_top);
68971
68972- if (unlikely(stack_top < mmap_min_addr) ||
68973- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
68974- return -ENOMEM;
68975-
68976 stack_shift = vma->vm_end - stack_top;
68977
68978 bprm->p -= stack_shift;
68979@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
68980 bprm->exec -= stack_shift;
68981
68982 down_write(&mm->mmap_sem);
68983+
68984+ /* Move stack pages down in memory. */
68985+ if (stack_shift) {
68986+ ret = shift_arg_pages(vma, stack_shift);
68987+ if (ret)
68988+ goto out_unlock;
68989+ }
68990+
68991 vm_flags = VM_STACK_FLAGS;
68992
68993+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
68994+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
68995+ vm_flags &= ~VM_EXEC;
68996+
68997+#ifdef CONFIG_PAX_MPROTECT
68998+ if (mm->pax_flags & MF_PAX_MPROTECT)
68999+ vm_flags &= ~VM_MAYEXEC;
69000+#endif
69001+
69002+ }
69003+#endif
69004+
69005 /*
69006 * Adjust stack execute permissions; explicitly enable for
69007 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
69008@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
69009 goto out_unlock;
69010 BUG_ON(prev != vma);
69011
69012- /* Move stack pages down in memory. */
69013- if (stack_shift) {
69014- ret = shift_arg_pages(vma, stack_shift);
69015- if (ret)
69016- goto out_unlock;
69017- }
69018-
69019 /* mprotect_fixup is overkill to remove the temporary stack flags */
69020 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
69021
69022@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
69023 #endif
69024 current->mm->start_stack = bprm->p;
69025 ret = expand_stack(vma, stack_base);
69026+
69027+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
69028+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
69029+ unsigned long size;
69030+ vm_flags_t vm_flags;
69031+
69032+ size = STACK_TOP - vma->vm_end;
69033+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
69034+
69035+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
69036+
69037+#ifdef CONFIG_X86
69038+ if (!ret) {
69039+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
69040+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
69041+ }
69042+#endif
69043+
69044+ }
69045+#endif
69046+
69047 if (ret)
69048 ret = -EFAULT;
69049
69050@@ -784,8 +860,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
69051 if (err)
69052 goto exit;
69053
69054- if (name->name[0] != '\0')
69055+ if (name->name[0] != '\0') {
69056 fsnotify_open(file);
69057+ trace_open_exec(name->name);
69058+ }
69059
69060 out:
69061 return file;
69062@@ -818,7 +896,7 @@ int kernel_read(struct file *file, loff_t offset,
69063 old_fs = get_fs();
69064 set_fs(get_ds());
69065 /* The cast to a user pointer is valid due to the set_fs() */
69066- result = vfs_read(file, (void __user *)addr, count, &pos);
69067+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
69068 set_fs(old_fs);
69069 return result;
69070 }
69071@@ -863,6 +941,7 @@ static int exec_mmap(struct mm_struct *mm)
69072 tsk->mm = mm;
69073 tsk->active_mm = mm;
69074 activate_mm(active_mm, mm);
69075+ populate_stack();
69076 tsk->mm->vmacache_seqnum = 0;
69077 vmacache_flush(tsk);
69078 task_unlock(tsk);
69079@@ -929,10 +1008,14 @@ static int de_thread(struct task_struct *tsk)
69080 if (!thread_group_leader(tsk)) {
69081 struct task_struct *leader = tsk->group_leader;
69082
69083- sig->notify_count = -1; /* for exit_notify() */
69084 for (;;) {
69085 threadgroup_change_begin(tsk);
69086 write_lock_irq(&tasklist_lock);
69087+ /*
69088+ * Do this under tasklist_lock to ensure that
69089+ * exit_notify() can't miss ->group_exit_task
69090+ */
69091+ sig->notify_count = -1;
69092 if (likely(leader->exit_state))
69093 break;
69094 __set_current_state(TASK_KILLABLE);
69095@@ -1261,7 +1344,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
69096 }
69097 rcu_read_unlock();
69098
69099- if (p->fs->users > n_fs)
69100+ if (atomic_read(&p->fs->users) > n_fs)
69101 bprm->unsafe |= LSM_UNSAFE_SHARE;
69102 else
69103 p->fs->in_exec = 1;
69104@@ -1462,6 +1545,31 @@ static int exec_binprm(struct linux_binprm *bprm)
69105 return ret;
69106 }
69107
69108+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
69109+static DEFINE_PER_CPU(u64, exec_counter);
69110+static int __init init_exec_counters(void)
69111+{
69112+ unsigned int cpu;
69113+
69114+ for_each_possible_cpu(cpu) {
69115+ per_cpu(exec_counter, cpu) = (u64)cpu;
69116+ }
69117+
69118+ return 0;
69119+}
69120+early_initcall(init_exec_counters);
69121+static inline void increment_exec_counter(void)
69122+{
69123+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
69124+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
69125+}
69126+#else
69127+static inline void increment_exec_counter(void) {}
69128+#endif
69129+
69130+extern void gr_handle_exec_args(struct linux_binprm *bprm,
69131+ struct user_arg_ptr argv);
69132+
69133 /*
69134 * sys_execve() executes a new program.
69135 */
69136@@ -1470,6 +1578,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69137 struct user_arg_ptr envp,
69138 int flags)
69139 {
69140+#ifdef CONFIG_GRKERNSEC
69141+ struct file *old_exec_file;
69142+ struct acl_subject_label *old_acl;
69143+ struct rlimit old_rlim[RLIM_NLIMITS];
69144+#endif
69145 char *pathbuf = NULL;
69146 struct linux_binprm *bprm;
69147 struct file *file;
69148@@ -1479,6 +1592,8 @@ static int do_execveat_common(int fd, struct filename *filename,
69149 if (IS_ERR(filename))
69150 return PTR_ERR(filename);
69151
69152+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
69153+
69154 /*
69155 * We move the actual failure in case of RLIMIT_NPROC excess from
69156 * set*uid() to execve() because too many poorly written programs
69157@@ -1516,6 +1631,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69158 if (IS_ERR(file))
69159 goto out_unmark;
69160
69161+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
69162+ retval = -EPERM;
69163+ goto out_unmark;
69164+ }
69165+
69166 sched_exec();
69167
69168 bprm->file = file;
69169@@ -1542,6 +1662,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69170 }
69171 bprm->interp = bprm->filename;
69172
69173+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
69174+ retval = -EACCES;
69175+ goto out_unmark;
69176+ }
69177+
69178 retval = bprm_mm_init(bprm);
69179 if (retval)
69180 goto out_unmark;
69181@@ -1558,24 +1683,70 @@ static int do_execveat_common(int fd, struct filename *filename,
69182 if (retval < 0)
69183 goto out;
69184
69185+#ifdef CONFIG_GRKERNSEC
69186+ old_acl = current->acl;
69187+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
69188+ old_exec_file = current->exec_file;
69189+ get_file(file);
69190+ current->exec_file = file;
69191+#endif
69192+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
69193+ /* limit suid stack to 8MB
69194+ * we saved the old limits above and will restore them if this exec fails
69195+ */
69196+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
69197+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
69198+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
69199+#endif
69200+
69201+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
69202+ retval = -EPERM;
69203+ goto out_fail;
69204+ }
69205+
69206+ if (!gr_tpe_allow(file)) {
69207+ retval = -EACCES;
69208+ goto out_fail;
69209+ }
69210+
69211+ if (gr_check_crash_exec(file)) {
69212+ retval = -EACCES;
69213+ goto out_fail;
69214+ }
69215+
69216+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
69217+ bprm->unsafe);
69218+ if (retval < 0)
69219+ goto out_fail;
69220+
69221 retval = copy_strings_kernel(1, &bprm->filename, bprm);
69222 if (retval < 0)
69223- goto out;
69224+ goto out_fail;
69225
69226 bprm->exec = bprm->p;
69227 retval = copy_strings(bprm->envc, envp, bprm);
69228 if (retval < 0)
69229- goto out;
69230+ goto out_fail;
69231
69232 retval = copy_strings(bprm->argc, argv, bprm);
69233 if (retval < 0)
69234- goto out;
69235+ goto out_fail;
69236+
69237+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
69238+
69239+ gr_handle_exec_args(bprm, argv);
69240
69241 retval = exec_binprm(bprm);
69242 if (retval < 0)
69243- goto out;
69244+ goto out_fail;
69245+#ifdef CONFIG_GRKERNSEC
69246+ if (old_exec_file)
69247+ fput(old_exec_file);
69248+#endif
69249
69250 /* execve succeeded */
69251+
69252+ increment_exec_counter();
69253 current->fs->in_exec = 0;
69254 current->in_execve = 0;
69255 acct_update_integrals(current);
69256@@ -1587,6 +1758,14 @@ static int do_execveat_common(int fd, struct filename *filename,
69257 put_files_struct(displaced);
69258 return retval;
69259
69260+out_fail:
69261+#ifdef CONFIG_GRKERNSEC
69262+ current->acl = old_acl;
69263+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
69264+ fput(current->exec_file);
69265+ current->exec_file = old_exec_file;
69266+#endif
69267+
69268 out:
69269 if (bprm->mm) {
69270 acct_arg_size(bprm, 0);
69271@@ -1733,3 +1912,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
69272 argv, envp, flags);
69273 }
69274 #endif
69275+
69276+int pax_check_flags(unsigned long *flags)
69277+{
69278+ int retval = 0;
69279+
69280+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
69281+ if (*flags & MF_PAX_SEGMEXEC)
69282+ {
69283+ *flags &= ~MF_PAX_SEGMEXEC;
69284+ retval = -EINVAL;
69285+ }
69286+#endif
69287+
69288+ if ((*flags & MF_PAX_PAGEEXEC)
69289+
69290+#ifdef CONFIG_PAX_PAGEEXEC
69291+ && (*flags & MF_PAX_SEGMEXEC)
69292+#endif
69293+
69294+ )
69295+ {
69296+ *flags &= ~MF_PAX_PAGEEXEC;
69297+ retval = -EINVAL;
69298+ }
69299+
69300+ if ((*flags & MF_PAX_MPROTECT)
69301+
69302+#ifdef CONFIG_PAX_MPROTECT
69303+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
69304+#endif
69305+
69306+ )
69307+ {
69308+ *flags &= ~MF_PAX_MPROTECT;
69309+ retval = -EINVAL;
69310+ }
69311+
69312+ if ((*flags & MF_PAX_EMUTRAMP)
69313+
69314+#ifdef CONFIG_PAX_EMUTRAMP
69315+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
69316+#endif
69317+
69318+ )
69319+ {
69320+ *flags &= ~MF_PAX_EMUTRAMP;
69321+ retval = -EINVAL;
69322+ }
69323+
69324+ return retval;
69325+}
69326+
69327+EXPORT_SYMBOL(pax_check_flags);
69328+
69329+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
69330+char *pax_get_path(const struct path *path, char *buf, int buflen)
69331+{
69332+ char *pathname = d_path(path, buf, buflen);
69333+
69334+ if (IS_ERR(pathname))
69335+ goto toolong;
69336+
69337+ pathname = mangle_path(buf, pathname, "\t\n\\");
69338+ if (!pathname)
69339+ goto toolong;
69340+
69341+ *pathname = 0;
69342+ return buf;
69343+
69344+toolong:
69345+ return "<path too long>";
69346+}
69347+EXPORT_SYMBOL(pax_get_path);
69348+
69349+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
69350+{
69351+ struct task_struct *tsk = current;
69352+ struct mm_struct *mm = current->mm;
69353+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
69354+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
69355+ char *path_exec = NULL;
69356+ char *path_fault = NULL;
69357+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
69358+ siginfo_t info = { };
69359+
69360+ if (buffer_exec && buffer_fault) {
69361+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
69362+
69363+ down_read(&mm->mmap_sem);
69364+ vma = mm->mmap;
69365+ while (vma && (!vma_exec || !vma_fault)) {
69366+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
69367+ vma_exec = vma;
69368+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
69369+ vma_fault = vma;
69370+ vma = vma->vm_next;
69371+ }
69372+ if (vma_exec)
69373+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
69374+ if (vma_fault) {
69375+ start = vma_fault->vm_start;
69376+ end = vma_fault->vm_end;
69377+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
69378+ if (vma_fault->vm_file)
69379+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
69380+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
69381+ path_fault = "<heap>";
69382+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
69383+ path_fault = "<stack>";
69384+ else
69385+ path_fault = "<anonymous mapping>";
69386+ }
69387+ up_read(&mm->mmap_sem);
69388+ }
69389+ if (tsk->signal->curr_ip)
69390+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
69391+ else
69392+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
69393+ 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),
69394+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
69395+ free_page((unsigned long)buffer_exec);
69396+ free_page((unsigned long)buffer_fault);
69397+ pax_report_insns(regs, pc, sp);
69398+ info.si_signo = SIGKILL;
69399+ info.si_errno = 0;
69400+ info.si_code = SI_KERNEL;
69401+ info.si_pid = 0;
69402+ info.si_uid = 0;
69403+ do_coredump(&info);
69404+}
69405+#endif
69406+
69407+#ifdef CONFIG_PAX_REFCOUNT
69408+void pax_report_refcount_overflow(struct pt_regs *regs)
69409+{
69410+ if (current->signal->curr_ip)
69411+ printk(KERN_EMERG "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
69412+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
69413+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
69414+ else
69415+ printk(KERN_EMERG "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
69416+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
69417+ print_symbol(KERN_EMERG "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
69418+ preempt_disable();
69419+ show_regs(regs);
69420+ preempt_enable();
69421+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
69422+}
69423+#endif
69424+
69425+#ifdef CONFIG_PAX_USERCOPY
69426+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
69427+static noinline int check_stack_object(const void *obj, unsigned long len)
69428+{
69429+ const void * const stack = task_stack_page(current);
69430+ const void * const stackend = stack + THREAD_SIZE;
69431+
69432+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
69433+ const void *frame = NULL;
69434+ const void *oldframe;
69435+#endif
69436+
69437+ if (obj + len < obj)
69438+ return -1;
69439+
69440+ if (obj + len <= stack || stackend <= obj)
69441+ return 0;
69442+
69443+ if (obj < stack || stackend < obj + len)
69444+ return -1;
69445+
69446+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
69447+ oldframe = __builtin_frame_address(1);
69448+ if (oldframe)
69449+ frame = __builtin_frame_address(2);
69450+ /*
69451+ low ----------------------------------------------> high
69452+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
69453+ ^----------------^
69454+ allow copies only within here
69455+ */
69456+ while (stack <= frame && frame < stackend) {
69457+ /* if obj + len extends past the last frame, this
69458+ check won't pass and the next frame will be 0,
69459+ causing us to bail out and correctly report
69460+ the copy as invalid
69461+ */
69462+ if (obj + len <= frame)
69463+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
69464+ oldframe = frame;
69465+ frame = *(const void * const *)frame;
69466+ }
69467+ return -1;
69468+#else
69469+ return 1;
69470+#endif
69471+}
69472+
69473+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
69474+{
69475+ if (current->signal->curr_ip)
69476+ printk(KERN_EMERG "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
69477+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
69478+ else
69479+ printk(KERN_EMERG "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
69480+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
69481+ dump_stack();
69482+ gr_handle_kernel_exploit();
69483+ do_group_exit(SIGKILL);
69484+}
69485+#endif
69486+
69487+#ifdef CONFIG_PAX_USERCOPY
69488+
69489+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
69490+{
69491+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
69492+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
69493+#ifdef CONFIG_MODULES
69494+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
69495+#else
69496+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
69497+#endif
69498+
69499+#else
69500+ unsigned long textlow = (unsigned long)_stext;
69501+ unsigned long texthigh = (unsigned long)_etext;
69502+
69503+#ifdef CONFIG_X86_64
69504+ /* check against linear mapping as well */
69505+ if (high > (unsigned long)__va(__pa(textlow)) &&
69506+ low < (unsigned long)__va(__pa(texthigh)))
69507+ return true;
69508+#endif
69509+
69510+#endif
69511+
69512+ if (high <= textlow || low >= texthigh)
69513+ return false;
69514+ else
69515+ return true;
69516+}
69517+#endif
69518+
69519+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
69520+{
69521+#ifdef CONFIG_PAX_USERCOPY
69522+ const char *type;
69523+#endif
69524+
69525+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
69526+ unsigned long stackstart = (unsigned long)task_stack_page(current);
69527+ unsigned long currentsp = (unsigned long)&stackstart;
69528+ if (unlikely((currentsp < stackstart + 512 ||
69529+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
69530+ BUG();
69531+#endif
69532+
69533+#ifndef CONFIG_PAX_USERCOPY_DEBUG
69534+ if (const_size)
69535+ return;
69536+#endif
69537+
69538+#ifdef CONFIG_PAX_USERCOPY
69539+ if (!n)
69540+ return;
69541+
69542+ type = check_heap_object(ptr, n);
69543+ if (!type) {
69544+ int ret = check_stack_object(ptr, n);
69545+ if (ret == 1 || ret == 2)
69546+ return;
69547+ if (ret == 0) {
69548+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
69549+ type = "<kernel text>";
69550+ else
69551+ return;
69552+ } else
69553+ type = "<process stack>";
69554+ }
69555+
69556+ pax_report_usercopy(ptr, n, to_user, type);
69557+#endif
69558+
69559+}
69560+EXPORT_SYMBOL(__check_object_size);
69561+
69562+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
69563+void __used pax_track_stack(void)
69564+{
69565+ unsigned long sp = (unsigned long)&sp;
69566+ if (sp < current_thread_info()->lowest_stack &&
69567+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
69568+ current_thread_info()->lowest_stack = sp;
69569+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
69570+ BUG();
69571+}
69572+EXPORT_SYMBOL(pax_track_stack);
69573+#endif
69574+
69575+#ifdef CONFIG_PAX_SIZE_OVERFLOW
69576+void __nocapture(1, 3, 4) __used report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
69577+{
69578+ printk(KERN_EMERG "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
69579+ dump_stack();
69580+ do_group_exit(SIGKILL);
69581+}
69582+EXPORT_SYMBOL(report_size_overflow);
69583+#endif
69584diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
69585index 9f9992b..8b59411 100644
69586--- a/fs/ext2/balloc.c
69587+++ b/fs/ext2/balloc.c
69588@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
69589
69590 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
69591 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
69592- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
69593+ if (free_blocks < root_blocks + 1 &&
69594 !uid_eq(sbi->s_resuid, current_fsuid()) &&
69595 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
69596- !in_group_p (sbi->s_resgid))) {
69597+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
69598 return 0;
69599 }
69600 return 1;
69601diff --git a/fs/ext2/super.c b/fs/ext2/super.c
69602index d0e746e..82e06f0 100644
69603--- a/fs/ext2/super.c
69604+++ b/fs/ext2/super.c
69605@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
69606 #ifdef CONFIG_EXT2_FS_XATTR
69607 if (test_opt(sb, XATTR_USER))
69608 seq_puts(seq, ",user_xattr");
69609- if (!test_opt(sb, XATTR_USER) &&
69610- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
69611+ if (!test_opt(sb, XATTR_USER))
69612 seq_puts(seq, ",nouser_xattr");
69613- }
69614 #endif
69615
69616 #ifdef CONFIG_EXT2_FS_POSIX_ACL
69617@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
69618 if (def_mount_opts & EXT2_DEFM_UID16)
69619 set_opt(sbi->s_mount_opt, NO_UID32);
69620 #ifdef CONFIG_EXT2_FS_XATTR
69621- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
69622- set_opt(sbi->s_mount_opt, XATTR_USER);
69623+ /* always enable user xattrs */
69624+ set_opt(sbi->s_mount_opt, XATTR_USER);
69625 #endif
69626 #ifdef CONFIG_EXT2_FS_POSIX_ACL
69627 if (def_mount_opts & EXT2_DEFM_ACL)
69628diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
69629index 9142614..97484fa 100644
69630--- a/fs/ext2/xattr.c
69631+++ b/fs/ext2/xattr.c
69632@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
69633 struct buffer_head *bh = NULL;
69634 struct ext2_xattr_entry *entry;
69635 char *end;
69636- size_t rest = buffer_size;
69637+ size_t rest = buffer_size, total_size = 0;
69638 int error;
69639
69640 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
69641@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
69642 buffer += size;
69643 }
69644 rest -= size;
69645+ total_size += size;
69646 }
69647 }
69648- error = buffer_size - rest; /* total size */
69649+ error = total_size;
69650
69651 cleanup:
69652 brelse(bh);
69653diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
69654index 158b5d4..2432610 100644
69655--- a/fs/ext3/balloc.c
69656+++ b/fs/ext3/balloc.c
69657@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
69658
69659 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
69660 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
69661- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
69662+ if (free_blocks < root_blocks + 1 &&
69663 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
69664 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
69665- !in_group_p (sbi->s_resgid))) {
69666+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
69667 return 0;
69668 }
69669 return 1;
69670diff --git a/fs/ext3/super.c b/fs/ext3/super.c
69671index d4dbf3c..906a6fb 100644
69672--- a/fs/ext3/super.c
69673+++ b/fs/ext3/super.c
69674@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
69675 #ifdef CONFIG_EXT3_FS_XATTR
69676 if (test_opt(sb, XATTR_USER))
69677 seq_puts(seq, ",user_xattr");
69678- if (!test_opt(sb, XATTR_USER) &&
69679- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
69680+ if (!test_opt(sb, XATTR_USER))
69681 seq_puts(seq, ",nouser_xattr");
69682- }
69683 #endif
69684 #ifdef CONFIG_EXT3_FS_POSIX_ACL
69685 if (test_opt(sb, POSIX_ACL))
69686@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
69687 if (def_mount_opts & EXT3_DEFM_UID16)
69688 set_opt(sbi->s_mount_opt, NO_UID32);
69689 #ifdef CONFIG_EXT3_FS_XATTR
69690- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
69691- set_opt(sbi->s_mount_opt, XATTR_USER);
69692+ /* always enable user xattrs */
69693+ set_opt(sbi->s_mount_opt, XATTR_USER);
69694 #endif
69695 #ifdef CONFIG_EXT3_FS_POSIX_ACL
69696 if (def_mount_opts & EXT3_DEFM_ACL)
69697diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
69698index c6874be..f8a6ae8 100644
69699--- a/fs/ext3/xattr.c
69700+++ b/fs/ext3/xattr.c
69701@@ -330,7 +330,7 @@ static int
69702 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
69703 char *buffer, size_t buffer_size)
69704 {
69705- size_t rest = buffer_size;
69706+ size_t rest = buffer_size, total_size = 0;
69707
69708 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
69709 const struct xattr_handler *handler =
69710@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
69711 buffer += size;
69712 }
69713 rest -= size;
69714+ total_size += size;
69715 }
69716 }
69717- return buffer_size - rest;
69718+ return total_size;
69719 }
69720
69721 static int
69722diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
69723index 83a6f49..d4e4d03 100644
69724--- a/fs/ext4/balloc.c
69725+++ b/fs/ext4/balloc.c
69726@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
69727 /* Hm, nope. Are (enough) root reserved clusters available? */
69728 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
69729 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
69730- capable(CAP_SYS_RESOURCE) ||
69731- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
69732+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
69733+ capable_nolog(CAP_SYS_RESOURCE)) {
69734
69735 if (free_clusters >= (nclusters + dirty_clusters +
69736 resv_clusters))
69737diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
69738index f63c3d5..3c1a033 100644
69739--- a/fs/ext4/ext4.h
69740+++ b/fs/ext4/ext4.h
69741@@ -1287,19 +1287,19 @@ struct ext4_sb_info {
69742 unsigned long s_mb_last_start;
69743
69744 /* stats for buddy allocator */
69745- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
69746- atomic_t s_bal_success; /* we found long enough chunks */
69747- atomic_t s_bal_allocated; /* in blocks */
69748- atomic_t s_bal_ex_scanned; /* total extents scanned */
69749- atomic_t s_bal_goals; /* goal hits */
69750- atomic_t s_bal_breaks; /* too long searches */
69751- atomic_t s_bal_2orders; /* 2^order hits */
69752+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
69753+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
69754+ atomic_unchecked_t s_bal_allocated; /* in blocks */
69755+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
69756+ atomic_unchecked_t s_bal_goals; /* goal hits */
69757+ atomic_unchecked_t s_bal_breaks; /* too long searches */
69758+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
69759 spinlock_t s_bal_lock;
69760 unsigned long s_mb_buddies_generated;
69761 unsigned long long s_mb_generation_time;
69762- atomic_t s_mb_lost_chunks;
69763- atomic_t s_mb_preallocated;
69764- atomic_t s_mb_discarded;
69765+ atomic_unchecked_t s_mb_lost_chunks;
69766+ atomic_unchecked_t s_mb_preallocated;
69767+ atomic_unchecked_t s_mb_discarded;
69768 atomic_t s_lock_busy;
69769
69770 /* locality groups */
69771diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
69772index 8d1e602..abf497b 100644
69773--- a/fs/ext4/mballoc.c
69774+++ b/fs/ext4/mballoc.c
69775@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
69776 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
69777
69778 if (EXT4_SB(sb)->s_mb_stats)
69779- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
69780+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
69781
69782 break;
69783 }
69784@@ -2211,7 +2211,7 @@ repeat:
69785 ac->ac_status = AC_STATUS_CONTINUE;
69786 ac->ac_flags |= EXT4_MB_HINT_FIRST;
69787 cr = 3;
69788- atomic_inc(&sbi->s_mb_lost_chunks);
69789+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
69790 goto repeat;
69791 }
69792 }
69793@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
69794 if (sbi->s_mb_stats) {
69795 ext4_msg(sb, KERN_INFO,
69796 "mballoc: %u blocks %u reqs (%u success)",
69797- atomic_read(&sbi->s_bal_allocated),
69798- atomic_read(&sbi->s_bal_reqs),
69799- atomic_read(&sbi->s_bal_success));
69800+ atomic_read_unchecked(&sbi->s_bal_allocated),
69801+ atomic_read_unchecked(&sbi->s_bal_reqs),
69802+ atomic_read_unchecked(&sbi->s_bal_success));
69803 ext4_msg(sb, KERN_INFO,
69804 "mballoc: %u extents scanned, %u goal hits, "
69805 "%u 2^N hits, %u breaks, %u lost",
69806- atomic_read(&sbi->s_bal_ex_scanned),
69807- atomic_read(&sbi->s_bal_goals),
69808- atomic_read(&sbi->s_bal_2orders),
69809- atomic_read(&sbi->s_bal_breaks),
69810- atomic_read(&sbi->s_mb_lost_chunks));
69811+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
69812+ atomic_read_unchecked(&sbi->s_bal_goals),
69813+ atomic_read_unchecked(&sbi->s_bal_2orders),
69814+ atomic_read_unchecked(&sbi->s_bal_breaks),
69815+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
69816 ext4_msg(sb, KERN_INFO,
69817 "mballoc: %lu generated and it took %Lu",
69818 sbi->s_mb_buddies_generated,
69819 sbi->s_mb_generation_time);
69820 ext4_msg(sb, KERN_INFO,
69821 "mballoc: %u preallocated, %u discarded",
69822- atomic_read(&sbi->s_mb_preallocated),
69823- atomic_read(&sbi->s_mb_discarded));
69824+ atomic_read_unchecked(&sbi->s_mb_preallocated),
69825+ atomic_read_unchecked(&sbi->s_mb_discarded));
69826 }
69827
69828 free_percpu(sbi->s_locality_groups);
69829@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
69830 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
69831
69832 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
69833- atomic_inc(&sbi->s_bal_reqs);
69834- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
69835+ atomic_inc_unchecked(&sbi->s_bal_reqs);
69836+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
69837 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
69838- atomic_inc(&sbi->s_bal_success);
69839- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
69840+ atomic_inc_unchecked(&sbi->s_bal_success);
69841+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
69842 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
69843 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
69844- atomic_inc(&sbi->s_bal_goals);
69845+ atomic_inc_unchecked(&sbi->s_bal_goals);
69846 if (ac->ac_found > sbi->s_mb_max_to_scan)
69847- atomic_inc(&sbi->s_bal_breaks);
69848+ atomic_inc_unchecked(&sbi->s_bal_breaks);
69849 }
69850
69851 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
69852@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
69853 trace_ext4_mb_new_inode_pa(ac, pa);
69854
69855 ext4_mb_use_inode_pa(ac, pa);
69856- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
69857+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
69858
69859 ei = EXT4_I(ac->ac_inode);
69860 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
69861@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
69862 trace_ext4_mb_new_group_pa(ac, pa);
69863
69864 ext4_mb_use_group_pa(ac, pa);
69865- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
69866+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
69867
69868 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
69869 lg = ac->ac_lg;
69870@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
69871 * from the bitmap and continue.
69872 */
69873 }
69874- atomic_add(free, &sbi->s_mb_discarded);
69875+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
69876
69877 return err;
69878 }
69879@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
69880 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
69881 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
69882 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
69883- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
69884+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
69885 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
69886
69887 return 0;
69888diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
69889index 8313ca3..8a37d08 100644
69890--- a/fs/ext4/mmp.c
69891+++ b/fs/ext4/mmp.c
69892@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
69893 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
69894 const char *function, unsigned int line, const char *msg)
69895 {
69896- __ext4_warning(sb, function, line, msg);
69897+ __ext4_warning(sb, function, line, "%s", msg);
69898 __ext4_warning(sb, function, line,
69899 "MMP failure info: last update time: %llu, last update "
69900 "node: %s, last update device: %s\n",
69901diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
69902index 8a8ec62..1b02de5 100644
69903--- a/fs/ext4/resize.c
69904+++ b/fs/ext4/resize.c
69905@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69906
69907 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
69908 for (count2 = count; count > 0; count -= count2, block += count2) {
69909- ext4_fsblk_t start;
69910+ ext4_fsblk_t start, diff;
69911 struct buffer_head *bh;
69912 ext4_group_t group;
69913 int err;
69914@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69915 start = ext4_group_first_block_no(sb, group);
69916 group -= flex_gd->groups[0].group;
69917
69918- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
69919- if (count2 > count)
69920- count2 = count;
69921-
69922 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
69923 BUG_ON(flex_gd->count > 1);
69924 continue;
69925@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69926 err = ext4_journal_get_write_access(handle, bh);
69927 if (err)
69928 return err;
69929+
69930+ diff = block - start;
69931+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
69932+ if (count2 > count)
69933+ count2 = count;
69934+
69935 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
69936- block - start, count2);
69937- ext4_set_bits(bh->b_data, block - start, count2);
69938+ diff, count2);
69939+ ext4_set_bits(bh->b_data, diff, count2);
69940
69941 err = ext4_handle_dirty_metadata(handle, NULL, bh);
69942 if (unlikely(err))
69943diff --git a/fs/ext4/super.c b/fs/ext4/super.c
69944index e061e66..87bc092 100644
69945--- a/fs/ext4/super.c
69946+++ b/fs/ext4/super.c
69947@@ -1243,7 +1243,7 @@ static ext4_fsblk_t get_sb_block(void **data)
69948 }
69949
69950 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
69951-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
69952+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
69953 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
69954
69955 #ifdef CONFIG_QUOTA
69956@@ -2443,7 +2443,7 @@ struct ext4_attr {
69957 int offset;
69958 int deprecated_val;
69959 } u;
69960-};
69961+} __do_const;
69962
69963 static int parse_strtoull(const char *buf,
69964 unsigned long long max, unsigned long long *value)
69965diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
69966index 1e09fc7..0400dd4 100644
69967--- a/fs/ext4/xattr.c
69968+++ b/fs/ext4/xattr.c
69969@@ -399,7 +399,7 @@ static int
69970 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
69971 char *buffer, size_t buffer_size)
69972 {
69973- size_t rest = buffer_size;
69974+ size_t rest = buffer_size, total_size = 0;
69975
69976 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
69977 const struct xattr_handler *handler =
69978@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
69979 buffer += size;
69980 }
69981 rest -= size;
69982+ total_size += size;
69983 }
69984 }
69985- return buffer_size - rest;
69986+ return total_size;
69987 }
69988
69989 static int
69990diff --git a/fs/fcntl.c b/fs/fcntl.c
69991index ee85cd4..9dd0d20 100644
69992--- a/fs/fcntl.c
69993+++ b/fs/fcntl.c
69994@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
69995 int force)
69996 {
69997 security_file_set_fowner(filp);
69998+ if (gr_handle_chroot_fowner(pid, type))
69999+ return;
70000+ if (gr_check_protected_task_fowner(pid, type))
70001+ return;
70002 f_modown(filp, pid, type, force);
70003 }
70004 EXPORT_SYMBOL(__f_setown);
70005diff --git a/fs/fhandle.c b/fs/fhandle.c
70006index d59712d..2281df9 100644
70007--- a/fs/fhandle.c
70008+++ b/fs/fhandle.c
70009@@ -8,6 +8,7 @@
70010 #include <linux/fs_struct.h>
70011 #include <linux/fsnotify.h>
70012 #include <linux/personality.h>
70013+#include <linux/grsecurity.h>
70014 #include <asm/uaccess.h>
70015 #include "internal.h"
70016 #include "mount.h"
70017@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
70018 } else
70019 retval = 0;
70020 /* copy the mount id */
70021- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
70022- sizeof(*mnt_id)) ||
70023+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
70024 copy_to_user(ufh, handle,
70025 sizeof(struct file_handle) + handle_bytes))
70026 retval = -EFAULT;
70027@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
70028 * the directory. Ideally we would like CAP_DAC_SEARCH.
70029 * But we don't have that
70030 */
70031- if (!capable(CAP_DAC_READ_SEARCH)) {
70032+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
70033 retval = -EPERM;
70034 goto out_err;
70035 }
70036diff --git a/fs/file.c b/fs/file.c
70037index ee738ea..f6c15629 100644
70038--- a/fs/file.c
70039+++ b/fs/file.c
70040@@ -16,6 +16,7 @@
70041 #include <linux/slab.h>
70042 #include <linux/vmalloc.h>
70043 #include <linux/file.h>
70044+#include <linux/security.h>
70045 #include <linux/fdtable.h>
70046 #include <linux/bitops.h>
70047 #include <linux/interrupt.h>
70048@@ -139,7 +140,7 @@ out:
70049 * Return <0 error code on error; 1 on successful completion.
70050 * The files->file_lock should be held on entry, and will be held on exit.
70051 */
70052-static int expand_fdtable(struct files_struct *files, int nr)
70053+static int expand_fdtable(struct files_struct *files, unsigned int nr)
70054 __releases(files->file_lock)
70055 __acquires(files->file_lock)
70056 {
70057@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
70058 * expanded and execution may have blocked.
70059 * The files->file_lock should be held on entry, and will be held on exit.
70060 */
70061-static int expand_files(struct files_struct *files, int nr)
70062+static int expand_files(struct files_struct *files, unsigned int nr)
70063 {
70064 struct fdtable *fdt;
70065
70066@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
70067 if (!file)
70068 return __close_fd(files, fd);
70069
70070+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
70071 if (fd >= rlimit(RLIMIT_NOFILE))
70072 return -EBADF;
70073
70074@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
70075 if (unlikely(oldfd == newfd))
70076 return -EINVAL;
70077
70078+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
70079 if (newfd >= rlimit(RLIMIT_NOFILE))
70080 return -EBADF;
70081
70082@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
70083 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
70084 {
70085 int err;
70086+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
70087 if (from >= rlimit(RLIMIT_NOFILE))
70088 return -EINVAL;
70089 err = alloc_fd(from, flags);
70090diff --git a/fs/filesystems.c b/fs/filesystems.c
70091index 5797d45..7d7d79a 100644
70092--- a/fs/filesystems.c
70093+++ b/fs/filesystems.c
70094@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
70095 int len = dot ? dot - name : strlen(name);
70096
70097 fs = __get_fs_type(name, len);
70098+#ifdef CONFIG_GRKERNSEC_MODHARDEN
70099+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
70100+#else
70101 if (!fs && (request_module("fs-%.*s", len, name) == 0))
70102+#endif
70103 fs = __get_fs_type(name, len);
70104
70105 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
70106diff --git a/fs/fs_struct.c b/fs/fs_struct.c
70107index 7dca743..1ff87ae 100644
70108--- a/fs/fs_struct.c
70109+++ b/fs/fs_struct.c
70110@@ -4,6 +4,7 @@
70111 #include <linux/path.h>
70112 #include <linux/slab.h>
70113 #include <linux/fs_struct.h>
70114+#include <linux/grsecurity.h>
70115 #include "internal.h"
70116
70117 /*
70118@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
70119 struct path old_root;
70120
70121 path_get(path);
70122+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
70123 spin_lock(&fs->lock);
70124 write_seqcount_begin(&fs->seq);
70125 old_root = fs->root;
70126 fs->root = *path;
70127+ gr_set_chroot_entries(current, path);
70128 write_seqcount_end(&fs->seq);
70129 spin_unlock(&fs->lock);
70130- if (old_root.dentry)
70131+ if (old_root.dentry) {
70132+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
70133 path_put(&old_root);
70134+ }
70135 }
70136
70137 /*
70138@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
70139 int hits = 0;
70140 spin_lock(&fs->lock);
70141 write_seqcount_begin(&fs->seq);
70142+ /* this root replacement is only done by pivot_root,
70143+ leave grsec's chroot tagging alone for this task
70144+ so that a pivoted root isn't treated as a chroot
70145+ */
70146 hits += replace_path(&fs->root, old_root, new_root);
70147 hits += replace_path(&fs->pwd, old_root, new_root);
70148 write_seqcount_end(&fs->seq);
70149@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
70150
70151 void free_fs_struct(struct fs_struct *fs)
70152 {
70153+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
70154 path_put(&fs->root);
70155 path_put(&fs->pwd);
70156 kmem_cache_free(fs_cachep, fs);
70157@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
70158 task_lock(tsk);
70159 spin_lock(&fs->lock);
70160 tsk->fs = NULL;
70161- kill = !--fs->users;
70162+ gr_clear_chroot_entries(tsk);
70163+ kill = !atomic_dec_return(&fs->users);
70164 spin_unlock(&fs->lock);
70165 task_unlock(tsk);
70166 if (kill)
70167@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
70168 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
70169 /* We don't need to lock fs - think why ;-) */
70170 if (fs) {
70171- fs->users = 1;
70172+ atomic_set(&fs->users, 1);
70173 fs->in_exec = 0;
70174 spin_lock_init(&fs->lock);
70175 seqcount_init(&fs->seq);
70176@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
70177 spin_lock(&old->lock);
70178 fs->root = old->root;
70179 path_get(&fs->root);
70180+ /* instead of calling gr_set_chroot_entries here,
70181+ we call it from every caller of this function
70182+ */
70183 fs->pwd = old->pwd;
70184 path_get(&fs->pwd);
70185 spin_unlock(&old->lock);
70186+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
70187 }
70188 return fs;
70189 }
70190@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
70191
70192 task_lock(current);
70193 spin_lock(&fs->lock);
70194- kill = !--fs->users;
70195+ kill = !atomic_dec_return(&fs->users);
70196 current->fs = new_fs;
70197+ gr_set_chroot_entries(current, &new_fs->root);
70198 spin_unlock(&fs->lock);
70199 task_unlock(current);
70200
70201@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
70202
70203 int current_umask(void)
70204 {
70205- return current->fs->umask;
70206+ return current->fs->umask | gr_acl_umask();
70207 }
70208 EXPORT_SYMBOL(current_umask);
70209
70210 /* to be mentioned only in INIT_TASK */
70211 struct fs_struct init_fs = {
70212- .users = 1,
70213+ .users = ATOMIC_INIT(1),
70214 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
70215 .seq = SEQCNT_ZERO(init_fs.seq),
70216 .umask = 0022,
70217diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
70218index 89acec7..a575262 100644
70219--- a/fs/fscache/cookie.c
70220+++ b/fs/fscache/cookie.c
70221@@ -19,7 +19,7 @@
70222
70223 struct kmem_cache *fscache_cookie_jar;
70224
70225-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
70226+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
70227
70228 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
70229 static int fscache_alloc_object(struct fscache_cache *cache,
70230@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
70231 parent ? (char *) parent->def->name : "<no-parent>",
70232 def->name, netfs_data, enable);
70233
70234- fscache_stat(&fscache_n_acquires);
70235+ fscache_stat_unchecked(&fscache_n_acquires);
70236
70237 /* if there's no parent cookie, then we don't create one here either */
70238 if (!parent) {
70239- fscache_stat(&fscache_n_acquires_null);
70240+ fscache_stat_unchecked(&fscache_n_acquires_null);
70241 _leave(" [no parent]");
70242 return NULL;
70243 }
70244@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70245 /* allocate and initialise a cookie */
70246 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
70247 if (!cookie) {
70248- fscache_stat(&fscache_n_acquires_oom);
70249+ fscache_stat_unchecked(&fscache_n_acquires_oom);
70250 _leave(" [ENOMEM]");
70251 return NULL;
70252 }
70253@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
70254
70255 switch (cookie->def->type) {
70256 case FSCACHE_COOKIE_TYPE_INDEX:
70257- fscache_stat(&fscache_n_cookie_index);
70258+ fscache_stat_unchecked(&fscache_n_cookie_index);
70259 break;
70260 case FSCACHE_COOKIE_TYPE_DATAFILE:
70261- fscache_stat(&fscache_n_cookie_data);
70262+ fscache_stat_unchecked(&fscache_n_cookie_data);
70263 break;
70264 default:
70265- fscache_stat(&fscache_n_cookie_special);
70266+ fscache_stat_unchecked(&fscache_n_cookie_special);
70267 break;
70268 }
70269
70270@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70271 } else {
70272 atomic_dec(&parent->n_children);
70273 __fscache_cookie_put(cookie);
70274- fscache_stat(&fscache_n_acquires_nobufs);
70275+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
70276 _leave(" = NULL");
70277 return NULL;
70278 }
70279@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70280 }
70281 }
70282
70283- fscache_stat(&fscache_n_acquires_ok);
70284+ fscache_stat_unchecked(&fscache_n_acquires_ok);
70285 _leave(" = %p", cookie);
70286 return cookie;
70287 }
70288@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
70289 cache = fscache_select_cache_for_object(cookie->parent);
70290 if (!cache) {
70291 up_read(&fscache_addremove_sem);
70292- fscache_stat(&fscache_n_acquires_no_cache);
70293+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
70294 _leave(" = -ENOMEDIUM [no cache]");
70295 return -ENOMEDIUM;
70296 }
70297@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
70298 object = cache->ops->alloc_object(cache, cookie);
70299 fscache_stat_d(&fscache_n_cop_alloc_object);
70300 if (IS_ERR(object)) {
70301- fscache_stat(&fscache_n_object_no_alloc);
70302+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
70303 ret = PTR_ERR(object);
70304 goto error;
70305 }
70306
70307- fscache_stat(&fscache_n_object_alloc);
70308+ fscache_stat_unchecked(&fscache_n_object_alloc);
70309
70310- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
70311+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
70312
70313 _debug("ALLOC OBJ%x: %s {%lx}",
70314 object->debug_id, cookie->def->name, object->events);
70315@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
70316
70317 _enter("{%s}", cookie->def->name);
70318
70319- fscache_stat(&fscache_n_invalidates);
70320+ fscache_stat_unchecked(&fscache_n_invalidates);
70321
70322 /* Only permit invalidation of data files. Invalidating an index will
70323 * require the caller to release all its attachments to the tree rooted
70324@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
70325 {
70326 struct fscache_object *object;
70327
70328- fscache_stat(&fscache_n_updates);
70329+ fscache_stat_unchecked(&fscache_n_updates);
70330
70331 if (!cookie) {
70332- fscache_stat(&fscache_n_updates_null);
70333+ fscache_stat_unchecked(&fscache_n_updates_null);
70334 _leave(" [no cookie]");
70335 return;
70336 }
70337@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
70338 */
70339 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
70340 {
70341- fscache_stat(&fscache_n_relinquishes);
70342+ fscache_stat_unchecked(&fscache_n_relinquishes);
70343 if (retire)
70344- fscache_stat(&fscache_n_relinquishes_retire);
70345+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
70346
70347 if (!cookie) {
70348- fscache_stat(&fscache_n_relinquishes_null);
70349+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
70350 _leave(" [no cookie]");
70351 return;
70352 }
70353@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
70354 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
70355 goto inconsistent;
70356
70357- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
70358+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
70359
70360 __fscache_use_cookie(cookie);
70361 if (fscache_submit_op(object, op) < 0)
70362diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
70363index 7872a62..d91b19f 100644
70364--- a/fs/fscache/internal.h
70365+++ b/fs/fscache/internal.h
70366@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
70367 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
70368 extern int fscache_wait_for_operation_activation(struct fscache_object *,
70369 struct fscache_operation *,
70370- atomic_t *,
70371- atomic_t *,
70372+ atomic_unchecked_t *,
70373+ atomic_unchecked_t *,
70374 void (*)(struct fscache_operation *));
70375 extern void fscache_invalidate_writes(struct fscache_cookie *);
70376
70377@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
70378 * stats.c
70379 */
70380 #ifdef CONFIG_FSCACHE_STATS
70381-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
70382-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
70383+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
70384+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
70385
70386-extern atomic_t fscache_n_op_pend;
70387-extern atomic_t fscache_n_op_run;
70388-extern atomic_t fscache_n_op_enqueue;
70389-extern atomic_t fscache_n_op_deferred_release;
70390-extern atomic_t fscache_n_op_release;
70391-extern atomic_t fscache_n_op_gc;
70392-extern atomic_t fscache_n_op_cancelled;
70393-extern atomic_t fscache_n_op_rejected;
70394+extern atomic_unchecked_t fscache_n_op_pend;
70395+extern atomic_unchecked_t fscache_n_op_run;
70396+extern atomic_unchecked_t fscache_n_op_enqueue;
70397+extern atomic_unchecked_t fscache_n_op_deferred_release;
70398+extern atomic_unchecked_t fscache_n_op_release;
70399+extern atomic_unchecked_t fscache_n_op_gc;
70400+extern atomic_unchecked_t fscache_n_op_cancelled;
70401+extern atomic_unchecked_t fscache_n_op_rejected;
70402
70403-extern atomic_t fscache_n_attr_changed;
70404-extern atomic_t fscache_n_attr_changed_ok;
70405-extern atomic_t fscache_n_attr_changed_nobufs;
70406-extern atomic_t fscache_n_attr_changed_nomem;
70407-extern atomic_t fscache_n_attr_changed_calls;
70408+extern atomic_unchecked_t fscache_n_attr_changed;
70409+extern atomic_unchecked_t fscache_n_attr_changed_ok;
70410+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
70411+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
70412+extern atomic_unchecked_t fscache_n_attr_changed_calls;
70413
70414-extern atomic_t fscache_n_allocs;
70415-extern atomic_t fscache_n_allocs_ok;
70416-extern atomic_t fscache_n_allocs_wait;
70417-extern atomic_t fscache_n_allocs_nobufs;
70418-extern atomic_t fscache_n_allocs_intr;
70419-extern atomic_t fscache_n_allocs_object_dead;
70420-extern atomic_t fscache_n_alloc_ops;
70421-extern atomic_t fscache_n_alloc_op_waits;
70422+extern atomic_unchecked_t fscache_n_allocs;
70423+extern atomic_unchecked_t fscache_n_allocs_ok;
70424+extern atomic_unchecked_t fscache_n_allocs_wait;
70425+extern atomic_unchecked_t fscache_n_allocs_nobufs;
70426+extern atomic_unchecked_t fscache_n_allocs_intr;
70427+extern atomic_unchecked_t fscache_n_allocs_object_dead;
70428+extern atomic_unchecked_t fscache_n_alloc_ops;
70429+extern atomic_unchecked_t fscache_n_alloc_op_waits;
70430
70431-extern atomic_t fscache_n_retrievals;
70432-extern atomic_t fscache_n_retrievals_ok;
70433-extern atomic_t fscache_n_retrievals_wait;
70434-extern atomic_t fscache_n_retrievals_nodata;
70435-extern atomic_t fscache_n_retrievals_nobufs;
70436-extern atomic_t fscache_n_retrievals_intr;
70437-extern atomic_t fscache_n_retrievals_nomem;
70438-extern atomic_t fscache_n_retrievals_object_dead;
70439-extern atomic_t fscache_n_retrieval_ops;
70440-extern atomic_t fscache_n_retrieval_op_waits;
70441+extern atomic_unchecked_t fscache_n_retrievals;
70442+extern atomic_unchecked_t fscache_n_retrievals_ok;
70443+extern atomic_unchecked_t fscache_n_retrievals_wait;
70444+extern atomic_unchecked_t fscache_n_retrievals_nodata;
70445+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
70446+extern atomic_unchecked_t fscache_n_retrievals_intr;
70447+extern atomic_unchecked_t fscache_n_retrievals_nomem;
70448+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
70449+extern atomic_unchecked_t fscache_n_retrieval_ops;
70450+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
70451
70452-extern atomic_t fscache_n_stores;
70453-extern atomic_t fscache_n_stores_ok;
70454-extern atomic_t fscache_n_stores_again;
70455-extern atomic_t fscache_n_stores_nobufs;
70456-extern atomic_t fscache_n_stores_oom;
70457-extern atomic_t fscache_n_store_ops;
70458-extern atomic_t fscache_n_store_calls;
70459-extern atomic_t fscache_n_store_pages;
70460-extern atomic_t fscache_n_store_radix_deletes;
70461-extern atomic_t fscache_n_store_pages_over_limit;
70462+extern atomic_unchecked_t fscache_n_stores;
70463+extern atomic_unchecked_t fscache_n_stores_ok;
70464+extern atomic_unchecked_t fscache_n_stores_again;
70465+extern atomic_unchecked_t fscache_n_stores_nobufs;
70466+extern atomic_unchecked_t fscache_n_stores_oom;
70467+extern atomic_unchecked_t fscache_n_store_ops;
70468+extern atomic_unchecked_t fscache_n_store_calls;
70469+extern atomic_unchecked_t fscache_n_store_pages;
70470+extern atomic_unchecked_t fscache_n_store_radix_deletes;
70471+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
70472
70473-extern atomic_t fscache_n_store_vmscan_not_storing;
70474-extern atomic_t fscache_n_store_vmscan_gone;
70475-extern atomic_t fscache_n_store_vmscan_busy;
70476-extern atomic_t fscache_n_store_vmscan_cancelled;
70477-extern atomic_t fscache_n_store_vmscan_wait;
70478+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
70479+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
70480+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
70481+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
70482+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
70483
70484-extern atomic_t fscache_n_marks;
70485-extern atomic_t fscache_n_uncaches;
70486+extern atomic_unchecked_t fscache_n_marks;
70487+extern atomic_unchecked_t fscache_n_uncaches;
70488
70489-extern atomic_t fscache_n_acquires;
70490-extern atomic_t fscache_n_acquires_null;
70491-extern atomic_t fscache_n_acquires_no_cache;
70492-extern atomic_t fscache_n_acquires_ok;
70493-extern atomic_t fscache_n_acquires_nobufs;
70494-extern atomic_t fscache_n_acquires_oom;
70495+extern atomic_unchecked_t fscache_n_acquires;
70496+extern atomic_unchecked_t fscache_n_acquires_null;
70497+extern atomic_unchecked_t fscache_n_acquires_no_cache;
70498+extern atomic_unchecked_t fscache_n_acquires_ok;
70499+extern atomic_unchecked_t fscache_n_acquires_nobufs;
70500+extern atomic_unchecked_t fscache_n_acquires_oom;
70501
70502-extern atomic_t fscache_n_invalidates;
70503-extern atomic_t fscache_n_invalidates_run;
70504+extern atomic_unchecked_t fscache_n_invalidates;
70505+extern atomic_unchecked_t fscache_n_invalidates_run;
70506
70507-extern atomic_t fscache_n_updates;
70508-extern atomic_t fscache_n_updates_null;
70509-extern atomic_t fscache_n_updates_run;
70510+extern atomic_unchecked_t fscache_n_updates;
70511+extern atomic_unchecked_t fscache_n_updates_null;
70512+extern atomic_unchecked_t fscache_n_updates_run;
70513
70514-extern atomic_t fscache_n_relinquishes;
70515-extern atomic_t fscache_n_relinquishes_null;
70516-extern atomic_t fscache_n_relinquishes_waitcrt;
70517-extern atomic_t fscache_n_relinquishes_retire;
70518+extern atomic_unchecked_t fscache_n_relinquishes;
70519+extern atomic_unchecked_t fscache_n_relinquishes_null;
70520+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
70521+extern atomic_unchecked_t fscache_n_relinquishes_retire;
70522
70523-extern atomic_t fscache_n_cookie_index;
70524-extern atomic_t fscache_n_cookie_data;
70525-extern atomic_t fscache_n_cookie_special;
70526+extern atomic_unchecked_t fscache_n_cookie_index;
70527+extern atomic_unchecked_t fscache_n_cookie_data;
70528+extern atomic_unchecked_t fscache_n_cookie_special;
70529
70530-extern atomic_t fscache_n_object_alloc;
70531-extern atomic_t fscache_n_object_no_alloc;
70532-extern atomic_t fscache_n_object_lookups;
70533-extern atomic_t fscache_n_object_lookups_negative;
70534-extern atomic_t fscache_n_object_lookups_positive;
70535-extern atomic_t fscache_n_object_lookups_timed_out;
70536-extern atomic_t fscache_n_object_created;
70537-extern atomic_t fscache_n_object_avail;
70538-extern atomic_t fscache_n_object_dead;
70539+extern atomic_unchecked_t fscache_n_object_alloc;
70540+extern atomic_unchecked_t fscache_n_object_no_alloc;
70541+extern atomic_unchecked_t fscache_n_object_lookups;
70542+extern atomic_unchecked_t fscache_n_object_lookups_negative;
70543+extern atomic_unchecked_t fscache_n_object_lookups_positive;
70544+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
70545+extern atomic_unchecked_t fscache_n_object_created;
70546+extern atomic_unchecked_t fscache_n_object_avail;
70547+extern atomic_unchecked_t fscache_n_object_dead;
70548
70549-extern atomic_t fscache_n_checkaux_none;
70550-extern atomic_t fscache_n_checkaux_okay;
70551-extern atomic_t fscache_n_checkaux_update;
70552-extern atomic_t fscache_n_checkaux_obsolete;
70553+extern atomic_unchecked_t fscache_n_checkaux_none;
70554+extern atomic_unchecked_t fscache_n_checkaux_okay;
70555+extern atomic_unchecked_t fscache_n_checkaux_update;
70556+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
70557
70558 extern atomic_t fscache_n_cop_alloc_object;
70559 extern atomic_t fscache_n_cop_lookup_object;
70560@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
70561 atomic_inc(stat);
70562 }
70563
70564+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
70565+{
70566+ atomic_inc_unchecked(stat);
70567+}
70568+
70569 static inline void fscache_stat_d(atomic_t *stat)
70570 {
70571 atomic_dec(stat);
70572@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
70573
70574 #define __fscache_stat(stat) (NULL)
70575 #define fscache_stat(stat) do {} while (0)
70576+#define fscache_stat_unchecked(stat) do {} while (0)
70577 #define fscache_stat_d(stat) do {} while (0)
70578 #endif
70579
70580diff --git a/fs/fscache/object.c b/fs/fscache/object.c
70581index da032da..0076ce7 100644
70582--- a/fs/fscache/object.c
70583+++ b/fs/fscache/object.c
70584@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
70585 _debug("LOOKUP \"%s\" in \"%s\"",
70586 cookie->def->name, object->cache->tag->name);
70587
70588- fscache_stat(&fscache_n_object_lookups);
70589+ fscache_stat_unchecked(&fscache_n_object_lookups);
70590 fscache_stat(&fscache_n_cop_lookup_object);
70591 ret = object->cache->ops->lookup_object(object);
70592 fscache_stat_d(&fscache_n_cop_lookup_object);
70593@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
70594 if (ret == -ETIMEDOUT) {
70595 /* probably stuck behind another object, so move this one to
70596 * the back of the queue */
70597- fscache_stat(&fscache_n_object_lookups_timed_out);
70598+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
70599 _leave(" [timeout]");
70600 return NO_TRANSIT;
70601 }
70602@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
70603 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
70604
70605 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
70606- fscache_stat(&fscache_n_object_lookups_negative);
70607+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
70608
70609 /* Allow write requests to begin stacking up and read requests to begin
70610 * returning ENODATA.
70611@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
70612 /* if we were still looking up, then we must have a positive lookup
70613 * result, in which case there may be data available */
70614 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
70615- fscache_stat(&fscache_n_object_lookups_positive);
70616+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
70617
70618 /* We do (presumably) have data */
70619 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
70620@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
70621 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
70622 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
70623 } else {
70624- fscache_stat(&fscache_n_object_created);
70625+ fscache_stat_unchecked(&fscache_n_object_created);
70626 }
70627
70628 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
70629@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
70630 fscache_stat_d(&fscache_n_cop_lookup_complete);
70631
70632 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
70633- fscache_stat(&fscache_n_object_avail);
70634+ fscache_stat_unchecked(&fscache_n_object_avail);
70635
70636 _leave("");
70637 return transit_to(JUMPSTART_DEPS);
70638@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
70639
70640 /* this just shifts the object release to the work processor */
70641 fscache_put_object(object);
70642- fscache_stat(&fscache_n_object_dead);
70643+ fscache_stat_unchecked(&fscache_n_object_dead);
70644
70645 _leave("");
70646 return transit_to(OBJECT_DEAD);
70647@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
70648 enum fscache_checkaux result;
70649
70650 if (!object->cookie->def->check_aux) {
70651- fscache_stat(&fscache_n_checkaux_none);
70652+ fscache_stat_unchecked(&fscache_n_checkaux_none);
70653 return FSCACHE_CHECKAUX_OKAY;
70654 }
70655
70656@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
70657 switch (result) {
70658 /* entry okay as is */
70659 case FSCACHE_CHECKAUX_OKAY:
70660- fscache_stat(&fscache_n_checkaux_okay);
70661+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
70662 break;
70663
70664 /* entry requires update */
70665 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
70666- fscache_stat(&fscache_n_checkaux_update);
70667+ fscache_stat_unchecked(&fscache_n_checkaux_update);
70668 break;
70669
70670 /* entry requires deletion */
70671 case FSCACHE_CHECKAUX_OBSOLETE:
70672- fscache_stat(&fscache_n_checkaux_obsolete);
70673+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
70674 break;
70675
70676 default:
70677@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
70678 {
70679 const struct fscache_state *s;
70680
70681- fscache_stat(&fscache_n_invalidates_run);
70682+ fscache_stat_unchecked(&fscache_n_invalidates_run);
70683 fscache_stat(&fscache_n_cop_invalidate_object);
70684 s = _fscache_invalidate_object(object, event);
70685 fscache_stat_d(&fscache_n_cop_invalidate_object);
70686@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
70687 {
70688 _enter("{OBJ%x},%d", object->debug_id, event);
70689
70690- fscache_stat(&fscache_n_updates_run);
70691+ fscache_stat_unchecked(&fscache_n_updates_run);
70692 fscache_stat(&fscache_n_cop_update_object);
70693 object->cache->ops->update_object(object);
70694 fscache_stat_d(&fscache_n_cop_update_object);
70695diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
70696index e7b87a0..a85d47a 100644
70697--- a/fs/fscache/operation.c
70698+++ b/fs/fscache/operation.c
70699@@ -17,7 +17,7 @@
70700 #include <linux/slab.h>
70701 #include "internal.h"
70702
70703-atomic_t fscache_op_debug_id;
70704+atomic_unchecked_t fscache_op_debug_id;
70705 EXPORT_SYMBOL(fscache_op_debug_id);
70706
70707 /**
70708@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
70709 ASSERTCMP(atomic_read(&op->usage), >, 0);
70710 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
70711
70712- fscache_stat(&fscache_n_op_enqueue);
70713+ fscache_stat_unchecked(&fscache_n_op_enqueue);
70714 switch (op->flags & FSCACHE_OP_TYPE) {
70715 case FSCACHE_OP_ASYNC:
70716 _debug("queue async");
70717@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
70718 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
70719 if (op->processor)
70720 fscache_enqueue_operation(op);
70721- fscache_stat(&fscache_n_op_run);
70722+ fscache_stat_unchecked(&fscache_n_op_run);
70723 }
70724
70725 /*
70726@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
70727 if (object->n_in_progress > 0) {
70728 atomic_inc(&op->usage);
70729 list_add_tail(&op->pend_link, &object->pending_ops);
70730- fscache_stat(&fscache_n_op_pend);
70731+ fscache_stat_unchecked(&fscache_n_op_pend);
70732 } else if (!list_empty(&object->pending_ops)) {
70733 atomic_inc(&op->usage);
70734 list_add_tail(&op->pend_link, &object->pending_ops);
70735- fscache_stat(&fscache_n_op_pend);
70736+ fscache_stat_unchecked(&fscache_n_op_pend);
70737 fscache_start_operations(object);
70738 } else {
70739 ASSERTCMP(object->n_in_progress, ==, 0);
70740@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
70741 object->n_exclusive++; /* reads and writes must wait */
70742 atomic_inc(&op->usage);
70743 list_add_tail(&op->pend_link, &object->pending_ops);
70744- fscache_stat(&fscache_n_op_pend);
70745+ fscache_stat_unchecked(&fscache_n_op_pend);
70746 ret = 0;
70747 } else {
70748 /* If we're in any other state, there must have been an I/O
70749@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
70750 if (object->n_exclusive > 0) {
70751 atomic_inc(&op->usage);
70752 list_add_tail(&op->pend_link, &object->pending_ops);
70753- fscache_stat(&fscache_n_op_pend);
70754+ fscache_stat_unchecked(&fscache_n_op_pend);
70755 } else if (!list_empty(&object->pending_ops)) {
70756 atomic_inc(&op->usage);
70757 list_add_tail(&op->pend_link, &object->pending_ops);
70758- fscache_stat(&fscache_n_op_pend);
70759+ fscache_stat_unchecked(&fscache_n_op_pend);
70760 fscache_start_operations(object);
70761 } else {
70762 ASSERTCMP(object->n_exclusive, ==, 0);
70763@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
70764 object->n_ops++;
70765 atomic_inc(&op->usage);
70766 list_add_tail(&op->pend_link, &object->pending_ops);
70767- fscache_stat(&fscache_n_op_pend);
70768+ fscache_stat_unchecked(&fscache_n_op_pend);
70769 ret = 0;
70770 } else if (fscache_object_is_dying(object)) {
70771- fscache_stat(&fscache_n_op_rejected);
70772+ fscache_stat_unchecked(&fscache_n_op_rejected);
70773 op->state = FSCACHE_OP_ST_CANCELLED;
70774 ret = -ENOBUFS;
70775 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
70776@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
70777 ret = -EBUSY;
70778 if (op->state == FSCACHE_OP_ST_PENDING) {
70779 ASSERT(!list_empty(&op->pend_link));
70780- fscache_stat(&fscache_n_op_cancelled);
70781+ fscache_stat_unchecked(&fscache_n_op_cancelled);
70782 list_del_init(&op->pend_link);
70783 if (do_cancel)
70784 do_cancel(op);
70785@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
70786 while (!list_empty(&object->pending_ops)) {
70787 op = list_entry(object->pending_ops.next,
70788 struct fscache_operation, pend_link);
70789- fscache_stat(&fscache_n_op_cancelled);
70790+ fscache_stat_unchecked(&fscache_n_op_cancelled);
70791 list_del_init(&op->pend_link);
70792
70793 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
70794@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
70795 op->state, ==, FSCACHE_OP_ST_CANCELLED);
70796 op->state = FSCACHE_OP_ST_DEAD;
70797
70798- fscache_stat(&fscache_n_op_release);
70799+ fscache_stat_unchecked(&fscache_n_op_release);
70800
70801 if (op->release) {
70802 op->release(op);
70803@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
70804 * lock, and defer it otherwise */
70805 if (!spin_trylock(&object->lock)) {
70806 _debug("defer put");
70807- fscache_stat(&fscache_n_op_deferred_release);
70808+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
70809
70810 cache = object->cache;
70811 spin_lock(&cache->op_gc_list_lock);
70812@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
70813
70814 _debug("GC DEFERRED REL OBJ%x OP%x",
70815 object->debug_id, op->debug_id);
70816- fscache_stat(&fscache_n_op_gc);
70817+ fscache_stat_unchecked(&fscache_n_op_gc);
70818
70819 ASSERTCMP(atomic_read(&op->usage), ==, 0);
70820 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
70821diff --git a/fs/fscache/page.c b/fs/fscache/page.c
70822index de33b3f..8be4d29 100644
70823--- a/fs/fscache/page.c
70824+++ b/fs/fscache/page.c
70825@@ -74,7 +74,7 @@ try_again:
70826 val = radix_tree_lookup(&cookie->stores, page->index);
70827 if (!val) {
70828 rcu_read_unlock();
70829- fscache_stat(&fscache_n_store_vmscan_not_storing);
70830+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
70831 __fscache_uncache_page(cookie, page);
70832 return true;
70833 }
70834@@ -104,11 +104,11 @@ try_again:
70835 spin_unlock(&cookie->stores_lock);
70836
70837 if (xpage) {
70838- fscache_stat(&fscache_n_store_vmscan_cancelled);
70839- fscache_stat(&fscache_n_store_radix_deletes);
70840+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
70841+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
70842 ASSERTCMP(xpage, ==, page);
70843 } else {
70844- fscache_stat(&fscache_n_store_vmscan_gone);
70845+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
70846 }
70847
70848 wake_up_bit(&cookie->flags, 0);
70849@@ -123,11 +123,11 @@ page_busy:
70850 * sleeping on memory allocation, so we may need to impose a timeout
70851 * too. */
70852 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
70853- fscache_stat(&fscache_n_store_vmscan_busy);
70854+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
70855 return false;
70856 }
70857
70858- fscache_stat(&fscache_n_store_vmscan_wait);
70859+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
70860 if (!release_page_wait_timeout(cookie, page))
70861 _debug("fscache writeout timeout page: %p{%lx}",
70862 page, page->index);
70863@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
70864 FSCACHE_COOKIE_STORING_TAG);
70865 if (!radix_tree_tag_get(&cookie->stores, page->index,
70866 FSCACHE_COOKIE_PENDING_TAG)) {
70867- fscache_stat(&fscache_n_store_radix_deletes);
70868+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
70869 xpage = radix_tree_delete(&cookie->stores, page->index);
70870 }
70871 spin_unlock(&cookie->stores_lock);
70872@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
70873
70874 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
70875
70876- fscache_stat(&fscache_n_attr_changed_calls);
70877+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
70878
70879 if (fscache_object_is_active(object)) {
70880 fscache_stat(&fscache_n_cop_attr_changed);
70881@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
70882
70883 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
70884
70885- fscache_stat(&fscache_n_attr_changed);
70886+ fscache_stat_unchecked(&fscache_n_attr_changed);
70887
70888 op = kzalloc(sizeof(*op), GFP_KERNEL);
70889 if (!op) {
70890- fscache_stat(&fscache_n_attr_changed_nomem);
70891+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
70892 _leave(" = -ENOMEM");
70893 return -ENOMEM;
70894 }
70895@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
70896 if (fscache_submit_exclusive_op(object, op) < 0)
70897 goto nobufs_dec;
70898 spin_unlock(&cookie->lock);
70899- fscache_stat(&fscache_n_attr_changed_ok);
70900+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
70901 fscache_put_operation(op);
70902 _leave(" = 0");
70903 return 0;
70904@@ -242,7 +242,7 @@ nobufs:
70905 kfree(op);
70906 if (wake_cookie)
70907 __fscache_wake_unused_cookie(cookie);
70908- fscache_stat(&fscache_n_attr_changed_nobufs);
70909+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
70910 _leave(" = %d", -ENOBUFS);
70911 return -ENOBUFS;
70912 }
70913@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
70914 /* allocate a retrieval operation and attempt to submit it */
70915 op = kzalloc(sizeof(*op), GFP_NOIO);
70916 if (!op) {
70917- fscache_stat(&fscache_n_retrievals_nomem);
70918+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70919 return NULL;
70920 }
70921
70922@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
70923 return 0;
70924 }
70925
70926- fscache_stat(&fscache_n_retrievals_wait);
70927+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
70928
70929 jif = jiffies;
70930 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
70931 TASK_INTERRUPTIBLE) != 0) {
70932- fscache_stat(&fscache_n_retrievals_intr);
70933+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
70934 _leave(" = -ERESTARTSYS");
70935 return -ERESTARTSYS;
70936 }
70937@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
70938 */
70939 int fscache_wait_for_operation_activation(struct fscache_object *object,
70940 struct fscache_operation *op,
70941- atomic_t *stat_op_waits,
70942- atomic_t *stat_object_dead,
70943+ atomic_unchecked_t *stat_op_waits,
70944+ atomic_unchecked_t *stat_object_dead,
70945 void (*do_cancel)(struct fscache_operation *))
70946 {
70947 int ret;
70948@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
70949
70950 _debug(">>> WT");
70951 if (stat_op_waits)
70952- fscache_stat(stat_op_waits);
70953+ fscache_stat_unchecked(stat_op_waits);
70954 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
70955 TASK_INTERRUPTIBLE) != 0) {
70956 ret = fscache_cancel_op(op, do_cancel);
70957@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
70958 check_if_dead:
70959 if (op->state == FSCACHE_OP_ST_CANCELLED) {
70960 if (stat_object_dead)
70961- fscache_stat(stat_object_dead);
70962+ fscache_stat_unchecked(stat_object_dead);
70963 _leave(" = -ENOBUFS [cancelled]");
70964 return -ENOBUFS;
70965 }
70966@@ -381,7 +381,7 @@ check_if_dead:
70967 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
70968 fscache_cancel_op(op, do_cancel);
70969 if (stat_object_dead)
70970- fscache_stat(stat_object_dead);
70971+ fscache_stat_unchecked(stat_object_dead);
70972 return -ENOBUFS;
70973 }
70974 return 0;
70975@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70976
70977 _enter("%p,%p,,,", cookie, page);
70978
70979- fscache_stat(&fscache_n_retrievals);
70980+ fscache_stat_unchecked(&fscache_n_retrievals);
70981
70982 if (hlist_empty(&cookie->backing_objects))
70983 goto nobufs;
70984@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70985 goto nobufs_unlock_dec;
70986 spin_unlock(&cookie->lock);
70987
70988- fscache_stat(&fscache_n_retrieval_ops);
70989+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
70990
70991 /* pin the netfs read context in case we need to do the actual netfs
70992 * read because we've encountered a cache read failure */
70993@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70994
70995 error:
70996 if (ret == -ENOMEM)
70997- fscache_stat(&fscache_n_retrievals_nomem);
70998+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70999 else if (ret == -ERESTARTSYS)
71000- fscache_stat(&fscache_n_retrievals_intr);
71001+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
71002 else if (ret == -ENODATA)
71003- fscache_stat(&fscache_n_retrievals_nodata);
71004+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
71005 else if (ret < 0)
71006- fscache_stat(&fscache_n_retrievals_nobufs);
71007+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
71008 else
71009- fscache_stat(&fscache_n_retrievals_ok);
71010+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
71011
71012 fscache_put_retrieval(op);
71013 _leave(" = %d", ret);
71014@@ -505,7 +505,7 @@ nobufs_unlock:
71015 __fscache_wake_unused_cookie(cookie);
71016 kfree(op);
71017 nobufs:
71018- fscache_stat(&fscache_n_retrievals_nobufs);
71019+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
71020 _leave(" = -ENOBUFS");
71021 return -ENOBUFS;
71022 }
71023@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
71024
71025 _enter("%p,,%d,,,", cookie, *nr_pages);
71026
71027- fscache_stat(&fscache_n_retrievals);
71028+ fscache_stat_unchecked(&fscache_n_retrievals);
71029
71030 if (hlist_empty(&cookie->backing_objects))
71031 goto nobufs;
71032@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
71033 goto nobufs_unlock_dec;
71034 spin_unlock(&cookie->lock);
71035
71036- fscache_stat(&fscache_n_retrieval_ops);
71037+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
71038
71039 /* pin the netfs read context in case we need to do the actual netfs
71040 * read because we've encountered a cache read failure */
71041@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
71042
71043 error:
71044 if (ret == -ENOMEM)
71045- fscache_stat(&fscache_n_retrievals_nomem);
71046+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
71047 else if (ret == -ERESTARTSYS)
71048- fscache_stat(&fscache_n_retrievals_intr);
71049+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
71050 else if (ret == -ENODATA)
71051- fscache_stat(&fscache_n_retrievals_nodata);
71052+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
71053 else if (ret < 0)
71054- fscache_stat(&fscache_n_retrievals_nobufs);
71055+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
71056 else
71057- fscache_stat(&fscache_n_retrievals_ok);
71058+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
71059
71060 fscache_put_retrieval(op);
71061 _leave(" = %d", ret);
71062@@ -636,7 +636,7 @@ nobufs_unlock:
71063 if (wake_cookie)
71064 __fscache_wake_unused_cookie(cookie);
71065 nobufs:
71066- fscache_stat(&fscache_n_retrievals_nobufs);
71067+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
71068 _leave(" = -ENOBUFS");
71069 return -ENOBUFS;
71070 }
71071@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
71072
71073 _enter("%p,%p,,,", cookie, page);
71074
71075- fscache_stat(&fscache_n_allocs);
71076+ fscache_stat_unchecked(&fscache_n_allocs);
71077
71078 if (hlist_empty(&cookie->backing_objects))
71079 goto nobufs;
71080@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
71081 goto nobufs_unlock_dec;
71082 spin_unlock(&cookie->lock);
71083
71084- fscache_stat(&fscache_n_alloc_ops);
71085+ fscache_stat_unchecked(&fscache_n_alloc_ops);
71086
71087 ret = fscache_wait_for_operation_activation(
71088 object, &op->op,
71089@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
71090
71091 error:
71092 if (ret == -ERESTARTSYS)
71093- fscache_stat(&fscache_n_allocs_intr);
71094+ fscache_stat_unchecked(&fscache_n_allocs_intr);
71095 else if (ret < 0)
71096- fscache_stat(&fscache_n_allocs_nobufs);
71097+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
71098 else
71099- fscache_stat(&fscache_n_allocs_ok);
71100+ fscache_stat_unchecked(&fscache_n_allocs_ok);
71101
71102 fscache_put_retrieval(op);
71103 _leave(" = %d", ret);
71104@@ -730,7 +730,7 @@ nobufs_unlock:
71105 if (wake_cookie)
71106 __fscache_wake_unused_cookie(cookie);
71107 nobufs:
71108- fscache_stat(&fscache_n_allocs_nobufs);
71109+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
71110 _leave(" = -ENOBUFS");
71111 return -ENOBUFS;
71112 }
71113@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
71114
71115 spin_lock(&cookie->stores_lock);
71116
71117- fscache_stat(&fscache_n_store_calls);
71118+ fscache_stat_unchecked(&fscache_n_store_calls);
71119
71120 /* find a page to store */
71121 page = NULL;
71122@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
71123 page = results[0];
71124 _debug("gang %d [%lx]", n, page->index);
71125 if (page->index > op->store_limit) {
71126- fscache_stat(&fscache_n_store_pages_over_limit);
71127+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
71128 goto superseded;
71129 }
71130
71131@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
71132 spin_unlock(&cookie->stores_lock);
71133 spin_unlock(&object->lock);
71134
71135- fscache_stat(&fscache_n_store_pages);
71136+ fscache_stat_unchecked(&fscache_n_store_pages);
71137 fscache_stat(&fscache_n_cop_write_page);
71138 ret = object->cache->ops->write_page(op, page);
71139 fscache_stat_d(&fscache_n_cop_write_page);
71140@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71141 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
71142 ASSERT(PageFsCache(page));
71143
71144- fscache_stat(&fscache_n_stores);
71145+ fscache_stat_unchecked(&fscache_n_stores);
71146
71147 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
71148 _leave(" = -ENOBUFS [invalidating]");
71149@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71150 spin_unlock(&cookie->stores_lock);
71151 spin_unlock(&object->lock);
71152
71153- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
71154+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
71155 op->store_limit = object->store_limit;
71156
71157 __fscache_use_cookie(cookie);
71158@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71159
71160 spin_unlock(&cookie->lock);
71161 radix_tree_preload_end();
71162- fscache_stat(&fscache_n_store_ops);
71163- fscache_stat(&fscache_n_stores_ok);
71164+ fscache_stat_unchecked(&fscache_n_store_ops);
71165+ fscache_stat_unchecked(&fscache_n_stores_ok);
71166
71167 /* the work queue now carries its own ref on the object */
71168 fscache_put_operation(&op->op);
71169@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71170 return 0;
71171
71172 already_queued:
71173- fscache_stat(&fscache_n_stores_again);
71174+ fscache_stat_unchecked(&fscache_n_stores_again);
71175 already_pending:
71176 spin_unlock(&cookie->stores_lock);
71177 spin_unlock(&object->lock);
71178 spin_unlock(&cookie->lock);
71179 radix_tree_preload_end();
71180 kfree(op);
71181- fscache_stat(&fscache_n_stores_ok);
71182+ fscache_stat_unchecked(&fscache_n_stores_ok);
71183 _leave(" = 0");
71184 return 0;
71185
71186@@ -1039,14 +1039,14 @@ nobufs:
71187 kfree(op);
71188 if (wake_cookie)
71189 __fscache_wake_unused_cookie(cookie);
71190- fscache_stat(&fscache_n_stores_nobufs);
71191+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
71192 _leave(" = -ENOBUFS");
71193 return -ENOBUFS;
71194
71195 nomem_free:
71196 kfree(op);
71197 nomem:
71198- fscache_stat(&fscache_n_stores_oom);
71199+ fscache_stat_unchecked(&fscache_n_stores_oom);
71200 _leave(" = -ENOMEM");
71201 return -ENOMEM;
71202 }
71203@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
71204 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
71205 ASSERTCMP(page, !=, NULL);
71206
71207- fscache_stat(&fscache_n_uncaches);
71208+ fscache_stat_unchecked(&fscache_n_uncaches);
71209
71210 /* cache withdrawal may beat us to it */
71211 if (!PageFsCache(page))
71212@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
71213 struct fscache_cookie *cookie = op->op.object->cookie;
71214
71215 #ifdef CONFIG_FSCACHE_STATS
71216- atomic_inc(&fscache_n_marks);
71217+ atomic_inc_unchecked(&fscache_n_marks);
71218 #endif
71219
71220 _debug("- mark %p{%lx}", page, page->index);
71221diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
71222index 40d13c7..ddf52b9 100644
71223--- a/fs/fscache/stats.c
71224+++ b/fs/fscache/stats.c
71225@@ -18,99 +18,99 @@
71226 /*
71227 * operation counters
71228 */
71229-atomic_t fscache_n_op_pend;
71230-atomic_t fscache_n_op_run;
71231-atomic_t fscache_n_op_enqueue;
71232-atomic_t fscache_n_op_requeue;
71233-atomic_t fscache_n_op_deferred_release;
71234-atomic_t fscache_n_op_release;
71235-atomic_t fscache_n_op_gc;
71236-atomic_t fscache_n_op_cancelled;
71237-atomic_t fscache_n_op_rejected;
71238+atomic_unchecked_t fscache_n_op_pend;
71239+atomic_unchecked_t fscache_n_op_run;
71240+atomic_unchecked_t fscache_n_op_enqueue;
71241+atomic_unchecked_t fscache_n_op_requeue;
71242+atomic_unchecked_t fscache_n_op_deferred_release;
71243+atomic_unchecked_t fscache_n_op_release;
71244+atomic_unchecked_t fscache_n_op_gc;
71245+atomic_unchecked_t fscache_n_op_cancelled;
71246+atomic_unchecked_t fscache_n_op_rejected;
71247
71248-atomic_t fscache_n_attr_changed;
71249-atomic_t fscache_n_attr_changed_ok;
71250-atomic_t fscache_n_attr_changed_nobufs;
71251-atomic_t fscache_n_attr_changed_nomem;
71252-atomic_t fscache_n_attr_changed_calls;
71253+atomic_unchecked_t fscache_n_attr_changed;
71254+atomic_unchecked_t fscache_n_attr_changed_ok;
71255+atomic_unchecked_t fscache_n_attr_changed_nobufs;
71256+atomic_unchecked_t fscache_n_attr_changed_nomem;
71257+atomic_unchecked_t fscache_n_attr_changed_calls;
71258
71259-atomic_t fscache_n_allocs;
71260-atomic_t fscache_n_allocs_ok;
71261-atomic_t fscache_n_allocs_wait;
71262-atomic_t fscache_n_allocs_nobufs;
71263-atomic_t fscache_n_allocs_intr;
71264-atomic_t fscache_n_allocs_object_dead;
71265-atomic_t fscache_n_alloc_ops;
71266-atomic_t fscache_n_alloc_op_waits;
71267+atomic_unchecked_t fscache_n_allocs;
71268+atomic_unchecked_t fscache_n_allocs_ok;
71269+atomic_unchecked_t fscache_n_allocs_wait;
71270+atomic_unchecked_t fscache_n_allocs_nobufs;
71271+atomic_unchecked_t fscache_n_allocs_intr;
71272+atomic_unchecked_t fscache_n_allocs_object_dead;
71273+atomic_unchecked_t fscache_n_alloc_ops;
71274+atomic_unchecked_t fscache_n_alloc_op_waits;
71275
71276-atomic_t fscache_n_retrievals;
71277-atomic_t fscache_n_retrievals_ok;
71278-atomic_t fscache_n_retrievals_wait;
71279-atomic_t fscache_n_retrievals_nodata;
71280-atomic_t fscache_n_retrievals_nobufs;
71281-atomic_t fscache_n_retrievals_intr;
71282-atomic_t fscache_n_retrievals_nomem;
71283-atomic_t fscache_n_retrievals_object_dead;
71284-atomic_t fscache_n_retrieval_ops;
71285-atomic_t fscache_n_retrieval_op_waits;
71286+atomic_unchecked_t fscache_n_retrievals;
71287+atomic_unchecked_t fscache_n_retrievals_ok;
71288+atomic_unchecked_t fscache_n_retrievals_wait;
71289+atomic_unchecked_t fscache_n_retrievals_nodata;
71290+atomic_unchecked_t fscache_n_retrievals_nobufs;
71291+atomic_unchecked_t fscache_n_retrievals_intr;
71292+atomic_unchecked_t fscache_n_retrievals_nomem;
71293+atomic_unchecked_t fscache_n_retrievals_object_dead;
71294+atomic_unchecked_t fscache_n_retrieval_ops;
71295+atomic_unchecked_t fscache_n_retrieval_op_waits;
71296
71297-atomic_t fscache_n_stores;
71298-atomic_t fscache_n_stores_ok;
71299-atomic_t fscache_n_stores_again;
71300-atomic_t fscache_n_stores_nobufs;
71301-atomic_t fscache_n_stores_oom;
71302-atomic_t fscache_n_store_ops;
71303-atomic_t fscache_n_store_calls;
71304-atomic_t fscache_n_store_pages;
71305-atomic_t fscache_n_store_radix_deletes;
71306-atomic_t fscache_n_store_pages_over_limit;
71307+atomic_unchecked_t fscache_n_stores;
71308+atomic_unchecked_t fscache_n_stores_ok;
71309+atomic_unchecked_t fscache_n_stores_again;
71310+atomic_unchecked_t fscache_n_stores_nobufs;
71311+atomic_unchecked_t fscache_n_stores_oom;
71312+atomic_unchecked_t fscache_n_store_ops;
71313+atomic_unchecked_t fscache_n_store_calls;
71314+atomic_unchecked_t fscache_n_store_pages;
71315+atomic_unchecked_t fscache_n_store_radix_deletes;
71316+atomic_unchecked_t fscache_n_store_pages_over_limit;
71317
71318-atomic_t fscache_n_store_vmscan_not_storing;
71319-atomic_t fscache_n_store_vmscan_gone;
71320-atomic_t fscache_n_store_vmscan_busy;
71321-atomic_t fscache_n_store_vmscan_cancelled;
71322-atomic_t fscache_n_store_vmscan_wait;
71323+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
71324+atomic_unchecked_t fscache_n_store_vmscan_gone;
71325+atomic_unchecked_t fscache_n_store_vmscan_busy;
71326+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
71327+atomic_unchecked_t fscache_n_store_vmscan_wait;
71328
71329-atomic_t fscache_n_marks;
71330-atomic_t fscache_n_uncaches;
71331+atomic_unchecked_t fscache_n_marks;
71332+atomic_unchecked_t fscache_n_uncaches;
71333
71334-atomic_t fscache_n_acquires;
71335-atomic_t fscache_n_acquires_null;
71336-atomic_t fscache_n_acquires_no_cache;
71337-atomic_t fscache_n_acquires_ok;
71338-atomic_t fscache_n_acquires_nobufs;
71339-atomic_t fscache_n_acquires_oom;
71340+atomic_unchecked_t fscache_n_acquires;
71341+atomic_unchecked_t fscache_n_acquires_null;
71342+atomic_unchecked_t fscache_n_acquires_no_cache;
71343+atomic_unchecked_t fscache_n_acquires_ok;
71344+atomic_unchecked_t fscache_n_acquires_nobufs;
71345+atomic_unchecked_t fscache_n_acquires_oom;
71346
71347-atomic_t fscache_n_invalidates;
71348-atomic_t fscache_n_invalidates_run;
71349+atomic_unchecked_t fscache_n_invalidates;
71350+atomic_unchecked_t fscache_n_invalidates_run;
71351
71352-atomic_t fscache_n_updates;
71353-atomic_t fscache_n_updates_null;
71354-atomic_t fscache_n_updates_run;
71355+atomic_unchecked_t fscache_n_updates;
71356+atomic_unchecked_t fscache_n_updates_null;
71357+atomic_unchecked_t fscache_n_updates_run;
71358
71359-atomic_t fscache_n_relinquishes;
71360-atomic_t fscache_n_relinquishes_null;
71361-atomic_t fscache_n_relinquishes_waitcrt;
71362-atomic_t fscache_n_relinquishes_retire;
71363+atomic_unchecked_t fscache_n_relinquishes;
71364+atomic_unchecked_t fscache_n_relinquishes_null;
71365+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
71366+atomic_unchecked_t fscache_n_relinquishes_retire;
71367
71368-atomic_t fscache_n_cookie_index;
71369-atomic_t fscache_n_cookie_data;
71370-atomic_t fscache_n_cookie_special;
71371+atomic_unchecked_t fscache_n_cookie_index;
71372+atomic_unchecked_t fscache_n_cookie_data;
71373+atomic_unchecked_t fscache_n_cookie_special;
71374
71375-atomic_t fscache_n_object_alloc;
71376-atomic_t fscache_n_object_no_alloc;
71377-atomic_t fscache_n_object_lookups;
71378-atomic_t fscache_n_object_lookups_negative;
71379-atomic_t fscache_n_object_lookups_positive;
71380-atomic_t fscache_n_object_lookups_timed_out;
71381-atomic_t fscache_n_object_created;
71382-atomic_t fscache_n_object_avail;
71383-atomic_t fscache_n_object_dead;
71384+atomic_unchecked_t fscache_n_object_alloc;
71385+atomic_unchecked_t fscache_n_object_no_alloc;
71386+atomic_unchecked_t fscache_n_object_lookups;
71387+atomic_unchecked_t fscache_n_object_lookups_negative;
71388+atomic_unchecked_t fscache_n_object_lookups_positive;
71389+atomic_unchecked_t fscache_n_object_lookups_timed_out;
71390+atomic_unchecked_t fscache_n_object_created;
71391+atomic_unchecked_t fscache_n_object_avail;
71392+atomic_unchecked_t fscache_n_object_dead;
71393
71394-atomic_t fscache_n_checkaux_none;
71395-atomic_t fscache_n_checkaux_okay;
71396-atomic_t fscache_n_checkaux_update;
71397-atomic_t fscache_n_checkaux_obsolete;
71398+atomic_unchecked_t fscache_n_checkaux_none;
71399+atomic_unchecked_t fscache_n_checkaux_okay;
71400+atomic_unchecked_t fscache_n_checkaux_update;
71401+atomic_unchecked_t fscache_n_checkaux_obsolete;
71402
71403 atomic_t fscache_n_cop_alloc_object;
71404 atomic_t fscache_n_cop_lookup_object;
71405@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
71406 seq_puts(m, "FS-Cache statistics\n");
71407
71408 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
71409- atomic_read(&fscache_n_cookie_index),
71410- atomic_read(&fscache_n_cookie_data),
71411- atomic_read(&fscache_n_cookie_special));
71412+ atomic_read_unchecked(&fscache_n_cookie_index),
71413+ atomic_read_unchecked(&fscache_n_cookie_data),
71414+ atomic_read_unchecked(&fscache_n_cookie_special));
71415
71416 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
71417- atomic_read(&fscache_n_object_alloc),
71418- atomic_read(&fscache_n_object_no_alloc),
71419- atomic_read(&fscache_n_object_avail),
71420- atomic_read(&fscache_n_object_dead));
71421+ atomic_read_unchecked(&fscache_n_object_alloc),
71422+ atomic_read_unchecked(&fscache_n_object_no_alloc),
71423+ atomic_read_unchecked(&fscache_n_object_avail),
71424+ atomic_read_unchecked(&fscache_n_object_dead));
71425 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
71426- atomic_read(&fscache_n_checkaux_none),
71427- atomic_read(&fscache_n_checkaux_okay),
71428- atomic_read(&fscache_n_checkaux_update),
71429- atomic_read(&fscache_n_checkaux_obsolete));
71430+ atomic_read_unchecked(&fscache_n_checkaux_none),
71431+ atomic_read_unchecked(&fscache_n_checkaux_okay),
71432+ atomic_read_unchecked(&fscache_n_checkaux_update),
71433+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
71434
71435 seq_printf(m, "Pages : mrk=%u unc=%u\n",
71436- atomic_read(&fscache_n_marks),
71437- atomic_read(&fscache_n_uncaches));
71438+ atomic_read_unchecked(&fscache_n_marks),
71439+ atomic_read_unchecked(&fscache_n_uncaches));
71440
71441 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
71442 " oom=%u\n",
71443- atomic_read(&fscache_n_acquires),
71444- atomic_read(&fscache_n_acquires_null),
71445- atomic_read(&fscache_n_acquires_no_cache),
71446- atomic_read(&fscache_n_acquires_ok),
71447- atomic_read(&fscache_n_acquires_nobufs),
71448- atomic_read(&fscache_n_acquires_oom));
71449+ atomic_read_unchecked(&fscache_n_acquires),
71450+ atomic_read_unchecked(&fscache_n_acquires_null),
71451+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
71452+ atomic_read_unchecked(&fscache_n_acquires_ok),
71453+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
71454+ atomic_read_unchecked(&fscache_n_acquires_oom));
71455
71456 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
71457- atomic_read(&fscache_n_object_lookups),
71458- atomic_read(&fscache_n_object_lookups_negative),
71459- atomic_read(&fscache_n_object_lookups_positive),
71460- atomic_read(&fscache_n_object_created),
71461- atomic_read(&fscache_n_object_lookups_timed_out));
71462+ atomic_read_unchecked(&fscache_n_object_lookups),
71463+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
71464+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
71465+ atomic_read_unchecked(&fscache_n_object_created),
71466+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
71467
71468 seq_printf(m, "Invals : n=%u run=%u\n",
71469- atomic_read(&fscache_n_invalidates),
71470- atomic_read(&fscache_n_invalidates_run));
71471+ atomic_read_unchecked(&fscache_n_invalidates),
71472+ atomic_read_unchecked(&fscache_n_invalidates_run));
71473
71474 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
71475- atomic_read(&fscache_n_updates),
71476- atomic_read(&fscache_n_updates_null),
71477- atomic_read(&fscache_n_updates_run));
71478+ atomic_read_unchecked(&fscache_n_updates),
71479+ atomic_read_unchecked(&fscache_n_updates_null),
71480+ atomic_read_unchecked(&fscache_n_updates_run));
71481
71482 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
71483- atomic_read(&fscache_n_relinquishes),
71484- atomic_read(&fscache_n_relinquishes_null),
71485- atomic_read(&fscache_n_relinquishes_waitcrt),
71486- atomic_read(&fscache_n_relinquishes_retire));
71487+ atomic_read_unchecked(&fscache_n_relinquishes),
71488+ atomic_read_unchecked(&fscache_n_relinquishes_null),
71489+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
71490+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
71491
71492 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
71493- atomic_read(&fscache_n_attr_changed),
71494- atomic_read(&fscache_n_attr_changed_ok),
71495- atomic_read(&fscache_n_attr_changed_nobufs),
71496- atomic_read(&fscache_n_attr_changed_nomem),
71497- atomic_read(&fscache_n_attr_changed_calls));
71498+ atomic_read_unchecked(&fscache_n_attr_changed),
71499+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
71500+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
71501+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
71502+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
71503
71504 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
71505- atomic_read(&fscache_n_allocs),
71506- atomic_read(&fscache_n_allocs_ok),
71507- atomic_read(&fscache_n_allocs_wait),
71508- atomic_read(&fscache_n_allocs_nobufs),
71509- atomic_read(&fscache_n_allocs_intr));
71510+ atomic_read_unchecked(&fscache_n_allocs),
71511+ atomic_read_unchecked(&fscache_n_allocs_ok),
71512+ atomic_read_unchecked(&fscache_n_allocs_wait),
71513+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
71514+ atomic_read_unchecked(&fscache_n_allocs_intr));
71515 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
71516- atomic_read(&fscache_n_alloc_ops),
71517- atomic_read(&fscache_n_alloc_op_waits),
71518- atomic_read(&fscache_n_allocs_object_dead));
71519+ atomic_read_unchecked(&fscache_n_alloc_ops),
71520+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
71521+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
71522
71523 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
71524 " int=%u oom=%u\n",
71525- atomic_read(&fscache_n_retrievals),
71526- atomic_read(&fscache_n_retrievals_ok),
71527- atomic_read(&fscache_n_retrievals_wait),
71528- atomic_read(&fscache_n_retrievals_nodata),
71529- atomic_read(&fscache_n_retrievals_nobufs),
71530- atomic_read(&fscache_n_retrievals_intr),
71531- atomic_read(&fscache_n_retrievals_nomem));
71532+ atomic_read_unchecked(&fscache_n_retrievals),
71533+ atomic_read_unchecked(&fscache_n_retrievals_ok),
71534+ atomic_read_unchecked(&fscache_n_retrievals_wait),
71535+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
71536+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
71537+ atomic_read_unchecked(&fscache_n_retrievals_intr),
71538+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
71539 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
71540- atomic_read(&fscache_n_retrieval_ops),
71541- atomic_read(&fscache_n_retrieval_op_waits),
71542- atomic_read(&fscache_n_retrievals_object_dead));
71543+ atomic_read_unchecked(&fscache_n_retrieval_ops),
71544+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
71545+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
71546
71547 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
71548- atomic_read(&fscache_n_stores),
71549- atomic_read(&fscache_n_stores_ok),
71550- atomic_read(&fscache_n_stores_again),
71551- atomic_read(&fscache_n_stores_nobufs),
71552- atomic_read(&fscache_n_stores_oom));
71553+ atomic_read_unchecked(&fscache_n_stores),
71554+ atomic_read_unchecked(&fscache_n_stores_ok),
71555+ atomic_read_unchecked(&fscache_n_stores_again),
71556+ atomic_read_unchecked(&fscache_n_stores_nobufs),
71557+ atomic_read_unchecked(&fscache_n_stores_oom));
71558 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
71559- atomic_read(&fscache_n_store_ops),
71560- atomic_read(&fscache_n_store_calls),
71561- atomic_read(&fscache_n_store_pages),
71562- atomic_read(&fscache_n_store_radix_deletes),
71563- atomic_read(&fscache_n_store_pages_over_limit));
71564+ atomic_read_unchecked(&fscache_n_store_ops),
71565+ atomic_read_unchecked(&fscache_n_store_calls),
71566+ atomic_read_unchecked(&fscache_n_store_pages),
71567+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
71568+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
71569
71570 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
71571- atomic_read(&fscache_n_store_vmscan_not_storing),
71572- atomic_read(&fscache_n_store_vmscan_gone),
71573- atomic_read(&fscache_n_store_vmscan_busy),
71574- atomic_read(&fscache_n_store_vmscan_cancelled),
71575- atomic_read(&fscache_n_store_vmscan_wait));
71576+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
71577+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
71578+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
71579+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
71580+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
71581
71582 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
71583- atomic_read(&fscache_n_op_pend),
71584- atomic_read(&fscache_n_op_run),
71585- atomic_read(&fscache_n_op_enqueue),
71586- atomic_read(&fscache_n_op_cancelled),
71587- atomic_read(&fscache_n_op_rejected));
71588+ atomic_read_unchecked(&fscache_n_op_pend),
71589+ atomic_read_unchecked(&fscache_n_op_run),
71590+ atomic_read_unchecked(&fscache_n_op_enqueue),
71591+ atomic_read_unchecked(&fscache_n_op_cancelled),
71592+ atomic_read_unchecked(&fscache_n_op_rejected));
71593 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
71594- atomic_read(&fscache_n_op_deferred_release),
71595- atomic_read(&fscache_n_op_release),
71596- atomic_read(&fscache_n_op_gc));
71597+ atomic_read_unchecked(&fscache_n_op_deferred_release),
71598+ atomic_read_unchecked(&fscache_n_op_release),
71599+ atomic_read_unchecked(&fscache_n_op_gc));
71600
71601 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
71602 atomic_read(&fscache_n_cop_alloc_object),
71603diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
71604index 28d0c7a..04816b7 100644
71605--- a/fs/fuse/cuse.c
71606+++ b/fs/fuse/cuse.c
71607@@ -611,10 +611,12 @@ static int __init cuse_init(void)
71608 INIT_LIST_HEAD(&cuse_conntbl[i]);
71609
71610 /* inherit and extend fuse_dev_operations */
71611- cuse_channel_fops = fuse_dev_operations;
71612- cuse_channel_fops.owner = THIS_MODULE;
71613- cuse_channel_fops.open = cuse_channel_open;
71614- cuse_channel_fops.release = cuse_channel_release;
71615+ pax_open_kernel();
71616+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
71617+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
71618+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
71619+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
71620+ pax_close_kernel();
71621
71622 cuse_class = class_create(THIS_MODULE, "cuse");
71623 if (IS_ERR(cuse_class))
71624diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
71625index 39706c5..a803c71 100644
71626--- a/fs/fuse/dev.c
71627+++ b/fs/fuse/dev.c
71628@@ -1405,7 +1405,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
71629 ret = 0;
71630 pipe_lock(pipe);
71631
71632- if (!pipe->readers) {
71633+ if (!atomic_read(&pipe->readers)) {
71634 send_sig(SIGPIPE, current, 0);
71635 if (!ret)
71636 ret = -EPIPE;
71637@@ -1434,7 +1434,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
71638 page_nr++;
71639 ret += buf->len;
71640
71641- if (pipe->files)
71642+ if (atomic_read(&pipe->files))
71643 do_wakeup = 1;
71644 }
71645
71646diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
71647index 1545b71..7fabe47 100644
71648--- a/fs/fuse/dir.c
71649+++ b/fs/fuse/dir.c
71650@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
71651 return link;
71652 }
71653
71654-static void free_link(char *link)
71655+static void free_link(const char *link)
71656 {
71657 if (!IS_ERR(link))
71658 free_page((unsigned long) link);
71659diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
71660index f42dffb..4a4c435 100644
71661--- a/fs/gfs2/glock.c
71662+++ b/fs/gfs2/glock.c
71663@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
71664 if (held1 != held2) {
71665 GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
71666 if (held2)
71667- gl->gl_lockref.count++;
71668+ __lockref_inc(&gl->gl_lockref);
71669 else
71670- gl->gl_lockref.count--;
71671+ __lockref_dec(&gl->gl_lockref);
71672 }
71673 if (held1 && held2 && list_empty(&gl->gl_holders))
71674 clear_bit(GLF_QUEUED, &gl->gl_flags);
71675@@ -614,9 +614,9 @@ out:
71676 out_sched:
71677 clear_bit(GLF_LOCK, &gl->gl_flags);
71678 smp_mb__after_atomic();
71679- gl->gl_lockref.count++;
71680+ __lockref_inc(&gl->gl_lockref);
71681 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71682- gl->gl_lockref.count--;
71683+ __lockref_dec(&gl->gl_lockref);
71684 return;
71685
71686 out_unlock:
71687@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
71688 gl->gl_sbd = sdp;
71689 gl->gl_flags = 0;
71690 gl->gl_name = name;
71691- gl->gl_lockref.count = 1;
71692+ __lockref_set(&gl->gl_lockref, 1);
71693 gl->gl_state = LM_ST_UNLOCKED;
71694 gl->gl_target = LM_ST_UNLOCKED;
71695 gl->gl_demote_state = LM_ST_EXCLUSIVE;
71696@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
71697 if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
71698 test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
71699 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
71700- gl->gl_lockref.count++;
71701+ __lockref_inc(&gl->gl_lockref);
71702 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71703- gl->gl_lockref.count--;
71704+ __lockref_dec(&gl->gl_lockref);
71705 }
71706 run_queue(gl, 1);
71707 spin_unlock(&gl->gl_spin);
71708@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
71709 }
71710 }
71711
71712- gl->gl_lockref.count++;
71713+ __lockref_inc(&gl->gl_lockref);
71714 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
71715 spin_unlock(&gl->gl_spin);
71716
71717@@ -1384,12 +1384,12 @@ add_back_to_lru:
71718 goto add_back_to_lru;
71719 }
71720 clear_bit(GLF_LRU, &gl->gl_flags);
71721- gl->gl_lockref.count++;
71722+ __lockref_inc(&gl->gl_lockref);
71723 if (demote_ok(gl))
71724 handle_callback(gl, LM_ST_UNLOCKED, 0, false);
71725 WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
71726 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71727- gl->gl_lockref.count--;
71728+ __lockref_dec(&gl->gl_lockref);
71729 spin_unlock(&gl->gl_spin);
71730 cond_resched_lock(&lru_lock);
71731 }
71732@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
71733 state2str(gl->gl_demote_state), dtime,
71734 atomic_read(&gl->gl_ail_count),
71735 atomic_read(&gl->gl_revokes),
71736- (int)gl->gl_lockref.count, gl->gl_hold_time);
71737+ __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
71738
71739 list_for_each_entry(gh, &gl->gl_holders, gh_list)
71740 dump_holder(seq, gh);
71741diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
71742index fe91951..ce38a6e 100644
71743--- a/fs/gfs2/glops.c
71744+++ b/fs/gfs2/glops.c
71745@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
71746
71747 if (gl->gl_demote_state == LM_ST_UNLOCKED &&
71748 gl->gl_state == LM_ST_SHARED && ip) {
71749- gl->gl_lockref.count++;
71750+ __lockref_inc(&gl->gl_lockref);
71751 if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
71752- gl->gl_lockref.count--;
71753+ __lockref_dec(&gl->gl_lockref);
71754 }
71755 }
71756
71757diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
71758index 3aa17d4..b338075 100644
71759--- a/fs/gfs2/quota.c
71760+++ b/fs/gfs2/quota.c
71761@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
71762 if (!spin_trylock(&qd->qd_lockref.lock))
71763 return LRU_SKIP;
71764
71765- if (qd->qd_lockref.count == 0) {
71766+ if (__lockref_read(&qd->qd_lockref) == 0) {
71767 lockref_mark_dead(&qd->qd_lockref);
71768 list_lru_isolate_move(lru, &qd->qd_lru, dispose);
71769 }
71770@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
71771 return NULL;
71772
71773 qd->qd_sbd = sdp;
71774- qd->qd_lockref.count = 1;
71775+ __lockref_set(&qd->qd_lockref, 1);
71776 spin_lock_init(&qd->qd_lockref.lock);
71777 qd->qd_id = qid;
71778 qd->qd_slot = -1;
71779@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
71780 if (lockref_put_or_lock(&qd->qd_lockref))
71781 return;
71782
71783- qd->qd_lockref.count = 0;
71784+ __lockref_set(&qd->qd_lockref, 0);
71785 list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
71786 spin_unlock(&qd->qd_lockref.lock);
71787
71788diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
71789index fd62cae..3494dfa 100644
71790--- a/fs/hostfs/hostfs_kern.c
71791+++ b/fs/hostfs/hostfs_kern.c
71792@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
71793
71794 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
71795 {
71796- char *s = nd_get_link(nd);
71797+ const char *s = nd_get_link(nd);
71798 if (!IS_ERR(s))
71799 __putname(s);
71800 }
71801diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
71802index c274aca..772fa5e 100644
71803--- a/fs/hugetlbfs/inode.c
71804+++ b/fs/hugetlbfs/inode.c
71805@@ -148,6 +148,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
71806 struct mm_struct *mm = current->mm;
71807 struct vm_area_struct *vma;
71808 struct hstate *h = hstate_file(file);
71809+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
71810 struct vm_unmapped_area_info info;
71811
71812 if (len & ~huge_page_mask(h))
71813@@ -161,17 +162,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
71814 return addr;
71815 }
71816
71817+#ifdef CONFIG_PAX_RANDMMAP
71818+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
71819+#endif
71820+
71821 if (addr) {
71822 addr = ALIGN(addr, huge_page_size(h));
71823 vma = find_vma(mm, addr);
71824- if (TASK_SIZE - len >= addr &&
71825- (!vma || addr + len <= vma->vm_start))
71826+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
71827 return addr;
71828 }
71829
71830 info.flags = 0;
71831 info.length = len;
71832 info.low_limit = TASK_UNMAPPED_BASE;
71833+
71834+#ifdef CONFIG_PAX_RANDMMAP
71835+ if (mm->pax_flags & MF_PAX_RANDMMAP)
71836+ info.low_limit += mm->delta_mmap;
71837+#endif
71838+
71839 info.high_limit = TASK_SIZE;
71840 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
71841 info.align_offset = 0;
71842@@ -912,7 +922,7 @@ static struct file_system_type hugetlbfs_fs_type = {
71843 };
71844 MODULE_ALIAS_FS("hugetlbfs");
71845
71846-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
71847+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
71848
71849 static int can_do_hugetlb_shm(void)
71850 {
71851diff --git a/fs/inode.c b/fs/inode.c
71852index f00b16f..b653fea 100644
71853--- a/fs/inode.c
71854+++ b/fs/inode.c
71855@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
71856 unsigned int *p = &get_cpu_var(last_ino);
71857 unsigned int res = *p;
71858
71859+start:
71860+
71861 #ifdef CONFIG_SMP
71862 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
71863- static atomic_t shared_last_ino;
71864- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
71865+ static atomic_unchecked_t shared_last_ino;
71866+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
71867
71868 res = next - LAST_INO_BATCH;
71869 }
71870 #endif
71871
71872- *p = ++res;
71873+ if (unlikely(!++res))
71874+ goto start; /* never zero */
71875+ *p = res;
71876 put_cpu_var(last_ino);
71877 return res;
71878 }
71879diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
71880index 4a6cf28..d3a29d3 100644
71881--- a/fs/jffs2/erase.c
71882+++ b/fs/jffs2/erase.c
71883@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
71884 struct jffs2_unknown_node marker = {
71885 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
71886 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
71887- .totlen = cpu_to_je32(c->cleanmarker_size)
71888+ .totlen = cpu_to_je32(c->cleanmarker_size),
71889+ .hdr_crc = cpu_to_je32(0)
71890 };
71891
71892 jffs2_prealloc_raw_node_refs(c, jeb, 1);
71893diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
71894index 09ed551..45684f8 100644
71895--- a/fs/jffs2/wbuf.c
71896+++ b/fs/jffs2/wbuf.c
71897@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
71898 {
71899 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
71900 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
71901- .totlen = constant_cpu_to_je32(8)
71902+ .totlen = constant_cpu_to_je32(8),
71903+ .hdr_crc = constant_cpu_to_je32(0)
71904 };
71905
71906 /*
71907diff --git a/fs/jfs/super.c b/fs/jfs/super.c
71908index 5d30c56..8c45372 100644
71909--- a/fs/jfs/super.c
71910+++ b/fs/jfs/super.c
71911@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
71912
71913 jfs_inode_cachep =
71914 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
71915- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
71916+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
71917 init_once);
71918 if (jfs_inode_cachep == NULL)
71919 return -ENOMEM;
71920diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
71921index 345b35f..da7e0da 100644
71922--- a/fs/kernfs/dir.c
71923+++ b/fs/kernfs/dir.c
71924@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
71925 *
71926 * Returns 31 bit hash of ns + name (so it fits in an off_t )
71927 */
71928-static unsigned int kernfs_name_hash(const char *name, const void *ns)
71929+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
71930 {
71931 unsigned long hash = init_name_hash();
71932 unsigned int len = strlen(name);
71933@@ -838,6 +838,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
71934 ret = scops->mkdir(parent, dentry->d_name.name, mode);
71935
71936 kernfs_put_active(parent);
71937+
71938+ if (!ret) {
71939+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
71940+ ret = PTR_ERR_OR_ZERO(dentry_ret);
71941+ }
71942+
71943 return ret;
71944 }
71945
71946diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
71947index 2bacb99..f745182 100644
71948--- a/fs/kernfs/file.c
71949+++ b/fs/kernfs/file.c
71950@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
71951
71952 struct kernfs_open_node {
71953 atomic_t refcnt;
71954- atomic_t event;
71955+ atomic_unchecked_t event;
71956 wait_queue_head_t poll;
71957 struct list_head files; /* goes through kernfs_open_file.list */
71958 };
71959@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
71960 {
71961 struct kernfs_open_file *of = sf->private;
71962
71963- of->event = atomic_read(&of->kn->attr.open->event);
71964+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
71965
71966 return of->kn->attr.ops->seq_show(sf, v);
71967 }
71968@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
71969 goto out_free;
71970 }
71971
71972- of->event = atomic_read(&of->kn->attr.open->event);
71973+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
71974 ops = kernfs_ops(of->kn);
71975 if (ops->read)
71976 len = ops->read(of, buf, len, *ppos);
71977@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
71978 {
71979 struct kernfs_open_file *of = kernfs_of(file);
71980 const struct kernfs_ops *ops;
71981- size_t len;
71982+ ssize_t len;
71983 char *buf;
71984
71985 if (of->atomic_write_len) {
71986@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
71987 return ret;
71988 }
71989
71990-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
71991- void *buf, int len, int write)
71992+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
71993+ void *buf, size_t len, int write)
71994 {
71995 struct file *file = vma->vm_file;
71996 struct kernfs_open_file *of = kernfs_of(file);
71997- int ret;
71998+ ssize_t ret;
71999
72000 if (!of->vm_ops)
72001 return -EINVAL;
72002@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
72003 return -ENOMEM;
72004
72005 atomic_set(&new_on->refcnt, 0);
72006- atomic_set(&new_on->event, 1);
72007+ atomic_set_unchecked(&new_on->event, 1);
72008 init_waitqueue_head(&new_on->poll);
72009 INIT_LIST_HEAD(&new_on->files);
72010 goto retry;
72011@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
72012
72013 kernfs_put_active(kn);
72014
72015- if (of->event != atomic_read(&on->event))
72016+ if (of->event != atomic_read_unchecked(&on->event))
72017 goto trigger;
72018
72019 return DEFAULT_POLLMASK;
72020@@ -824,7 +824,7 @@ repeat:
72021
72022 on = kn->attr.open;
72023 if (on) {
72024- atomic_inc(&on->event);
72025+ atomic_inc_unchecked(&on->event);
72026 wake_up_interruptible(&on->poll);
72027 }
72028
72029diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
72030index 8a19889..4c3069a 100644
72031--- a/fs/kernfs/symlink.c
72032+++ b/fs/kernfs/symlink.c
72033@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
72034 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
72035 void *cookie)
72036 {
72037- char *page = nd_get_link(nd);
72038+ const char *page = nd_get_link(nd);
72039 if (!IS_ERR(page))
72040 free_page((unsigned long)page);
72041 }
72042diff --git a/fs/libfs.c b/fs/libfs.c
72043index 0ab6512..cd9982d 100644
72044--- a/fs/libfs.c
72045+++ b/fs/libfs.c
72046@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
72047
72048 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
72049 struct dentry *next = list_entry(p, struct dentry, d_child);
72050+ char d_name[sizeof(next->d_iname)];
72051+ const unsigned char *name;
72052+
72053 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
72054 if (!simple_positive(next)) {
72055 spin_unlock(&next->d_lock);
72056@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
72057
72058 spin_unlock(&next->d_lock);
72059 spin_unlock(&dentry->d_lock);
72060- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
72061+ name = next->d_name.name;
72062+ if (name == next->d_iname) {
72063+ memcpy(d_name, name, next->d_name.len);
72064+ name = d_name;
72065+ }
72066+ if (!dir_emit(ctx, name, next->d_name.len,
72067 next->d_inode->i_ino, dt_type(next->d_inode)))
72068 return 0;
72069 spin_lock(&dentry->d_lock);
72070@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
72071 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
72072 void *cookie)
72073 {
72074- char *s = nd_get_link(nd);
72075+ const char *s = nd_get_link(nd);
72076 if (!IS_ERR(s))
72077 kfree(s);
72078 }
72079diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
72080index acd3947..1f896e2 100644
72081--- a/fs/lockd/clntproc.c
72082+++ b/fs/lockd/clntproc.c
72083@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
72084 /*
72085 * Cookie counter for NLM requests
72086 */
72087-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
72088+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
72089
72090 void nlmclnt_next_cookie(struct nlm_cookie *c)
72091 {
72092- u32 cookie = atomic_inc_return(&nlm_cookie);
72093+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
72094
72095 memcpy(c->data, &cookie, 4);
72096 c->len=4;
72097diff --git a/fs/mount.h b/fs/mount.h
72098index 6a61c2b..bd79179 100644
72099--- a/fs/mount.h
72100+++ b/fs/mount.h
72101@@ -13,7 +13,7 @@ struct mnt_namespace {
72102 u64 seq; /* Sequence number to prevent loops */
72103 wait_queue_head_t poll;
72104 u64 event;
72105-};
72106+} __randomize_layout;
72107
72108 struct mnt_pcp {
72109 int mnt_count;
72110@@ -65,7 +65,7 @@ struct mount {
72111 struct hlist_head mnt_pins;
72112 struct fs_pin mnt_umount;
72113 struct dentry *mnt_ex_mountpoint;
72114-};
72115+} __randomize_layout;
72116
72117 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
72118
72119diff --git a/fs/namei.c b/fs/namei.c
72120index 50a8583..44c470a 100644
72121--- a/fs/namei.c
72122+++ b/fs/namei.c
72123@@ -337,17 +337,32 @@ int generic_permission(struct inode *inode, int mask)
72124 if (ret != -EACCES)
72125 return ret;
72126
72127+#ifdef CONFIG_GRKERNSEC
72128+ /* we'll block if we have to log due to a denied capability use */
72129+ if (mask & MAY_NOT_BLOCK)
72130+ return -ECHILD;
72131+#endif
72132+
72133 if (S_ISDIR(inode->i_mode)) {
72134 /* DACs are overridable for directories */
72135- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72136- return 0;
72137 if (!(mask & MAY_WRITE))
72138- if (capable_wrt_inode_uidgid(inode,
72139- CAP_DAC_READ_SEARCH))
72140+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
72141+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72142 return 0;
72143+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72144+ return 0;
72145 return -EACCES;
72146 }
72147 /*
72148+ * Searching includes executable on directories, else just read.
72149+ */
72150+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
72151+ if (mask == MAY_READ)
72152+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
72153+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72154+ return 0;
72155+
72156+ /*
72157 * Read/write DACs are always overridable.
72158 * Executable DACs are overridable when there is
72159 * at least one exec bit set.
72160@@ -356,14 +371,6 @@ int generic_permission(struct inode *inode, int mask)
72161 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72162 return 0;
72163
72164- /*
72165- * Searching includes executable on directories, else just read.
72166- */
72167- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
72168- if (mask == MAY_READ)
72169- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72170- return 0;
72171-
72172 return -EACCES;
72173 }
72174 EXPORT_SYMBOL(generic_permission);
72175@@ -503,7 +510,7 @@ struct nameidata {
72176 int last_type;
72177 unsigned depth;
72178 struct file *base;
72179- char *saved_names[MAX_NESTED_LINKS + 1];
72180+ const char *saved_names[MAX_NESTED_LINKS + 1];
72181 };
72182
72183 /*
72184@@ -714,13 +721,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
72185 nd->flags |= LOOKUP_JUMPED;
72186 }
72187
72188-void nd_set_link(struct nameidata *nd, char *path)
72189+void nd_set_link(struct nameidata *nd, const char *path)
72190 {
72191 nd->saved_names[nd->depth] = path;
72192 }
72193 EXPORT_SYMBOL(nd_set_link);
72194
72195-char *nd_get_link(struct nameidata *nd)
72196+const char *nd_get_link(const struct nameidata *nd)
72197 {
72198 return nd->saved_names[nd->depth];
72199 }
72200@@ -855,7 +862,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
72201 {
72202 struct dentry *dentry = link->dentry;
72203 int error;
72204- char *s;
72205+ const char *s;
72206
72207 BUG_ON(nd->flags & LOOKUP_RCU);
72208
72209@@ -876,6 +883,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
72210 if (error)
72211 goto out_put_nd_path;
72212
72213+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
72214+ dentry->d_inode, dentry, nd->path.mnt)) {
72215+ error = -EACCES;
72216+ goto out_put_nd_path;
72217+ }
72218+
72219 nd->last_type = LAST_BIND;
72220 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
72221 error = PTR_ERR(*p);
72222@@ -1640,6 +1653,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
72223 if (res)
72224 break;
72225 res = walk_component(nd, path, LOOKUP_FOLLOW);
72226+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
72227+ res = -EACCES;
72228 put_link(nd, &link, cookie);
72229 } while (res > 0);
72230
72231@@ -1712,7 +1727,7 @@ EXPORT_SYMBOL(full_name_hash);
72232 static inline u64 hash_name(const char *name)
72233 {
72234 unsigned long a, b, adata, bdata, mask, hash, len;
72235- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
72236+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
72237
72238 hash = a = 0;
72239 len = -sizeof(unsigned long);
72240@@ -2007,6 +2022,8 @@ static int path_lookupat(int dfd, const char *name,
72241 if (err)
72242 break;
72243 err = lookup_last(nd, &path);
72244+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
72245+ err = -EACCES;
72246 put_link(nd, &link, cookie);
72247 }
72248 }
72249@@ -2014,6 +2031,13 @@ static int path_lookupat(int dfd, const char *name,
72250 if (!err)
72251 err = complete_walk(nd);
72252
72253+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
72254+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
72255+ path_put(&nd->path);
72256+ err = -ENOENT;
72257+ }
72258+ }
72259+
72260 if (!err && nd->flags & LOOKUP_DIRECTORY) {
72261 if (!d_can_lookup(nd->path.dentry)) {
72262 path_put(&nd->path);
72263@@ -2035,8 +2059,15 @@ static int filename_lookup(int dfd, struct filename *name,
72264 retval = path_lookupat(dfd, name->name,
72265 flags | LOOKUP_REVAL, nd);
72266
72267- if (likely(!retval))
72268+ if (likely(!retval)) {
72269 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
72270+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
72271+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
72272+ path_put(&nd->path);
72273+ return -ENOENT;
72274+ }
72275+ }
72276+ }
72277 return retval;
72278 }
72279
72280@@ -2615,6 +2646,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
72281 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
72282 return -EPERM;
72283
72284+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
72285+ return -EPERM;
72286+ if (gr_handle_rawio(inode))
72287+ return -EPERM;
72288+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
72289+ return -EACCES;
72290+
72291 return 0;
72292 }
72293
72294@@ -2846,7 +2884,7 @@ looked_up:
72295 * cleared otherwise prior to returning.
72296 */
72297 static int lookup_open(struct nameidata *nd, struct path *path,
72298- struct file *file,
72299+ struct path *link, struct file *file,
72300 const struct open_flags *op,
72301 bool got_write, int *opened)
72302 {
72303@@ -2881,6 +2919,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
72304 /* Negative dentry, just create the file */
72305 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
72306 umode_t mode = op->mode;
72307+
72308+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
72309+ error = -EACCES;
72310+ goto out_dput;
72311+ }
72312+
72313+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
72314+ error = -EACCES;
72315+ goto out_dput;
72316+ }
72317+
72318 if (!IS_POSIXACL(dir->d_inode))
72319 mode &= ~current_umask();
72320 /*
72321@@ -2902,6 +2951,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
72322 nd->flags & LOOKUP_EXCL);
72323 if (error)
72324 goto out_dput;
72325+ else
72326+ gr_handle_create(dentry, nd->path.mnt);
72327 }
72328 out_no_open:
72329 path->dentry = dentry;
72330@@ -2916,7 +2967,7 @@ out_dput:
72331 /*
72332 * Handle the last step of open()
72333 */
72334-static int do_last(struct nameidata *nd, struct path *path,
72335+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
72336 struct file *file, const struct open_flags *op,
72337 int *opened, struct filename *name)
72338 {
72339@@ -2966,6 +3017,15 @@ static int do_last(struct nameidata *nd, struct path *path,
72340 if (error)
72341 return error;
72342
72343+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
72344+ error = -ENOENT;
72345+ goto out;
72346+ }
72347+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
72348+ error = -EACCES;
72349+ goto out;
72350+ }
72351+
72352 audit_inode(name, dir, LOOKUP_PARENT);
72353 error = -EISDIR;
72354 /* trailing slashes? */
72355@@ -2985,7 +3045,7 @@ retry_lookup:
72356 */
72357 }
72358 mutex_lock(&dir->d_inode->i_mutex);
72359- error = lookup_open(nd, path, file, op, got_write, opened);
72360+ error = lookup_open(nd, path, link, file, op, got_write, opened);
72361 mutex_unlock(&dir->d_inode->i_mutex);
72362
72363 if (error <= 0) {
72364@@ -3009,11 +3069,28 @@ retry_lookup:
72365 goto finish_open_created;
72366 }
72367
72368+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
72369+ error = -ENOENT;
72370+ goto exit_dput;
72371+ }
72372+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
72373+ error = -EACCES;
72374+ goto exit_dput;
72375+ }
72376+
72377 /*
72378 * create/update audit record if it already exists.
72379 */
72380- if (d_is_positive(path->dentry))
72381+ if (d_is_positive(path->dentry)) {
72382+ /* only check if O_CREAT is specified, all other checks need to go
72383+ into may_open */
72384+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
72385+ error = -EACCES;
72386+ goto exit_dput;
72387+ }
72388+
72389 audit_inode(name, path->dentry, 0);
72390+ }
72391
72392 /*
72393 * If atomic_open() acquired write access it is dropped now due to
72394@@ -3055,6 +3132,11 @@ finish_lookup:
72395 }
72396 }
72397 BUG_ON(inode != path->dentry->d_inode);
72398+ /* if we're resolving a symlink to another symlink */
72399+ if (link && gr_handle_symlink_owner(link, inode)) {
72400+ error = -EACCES;
72401+ goto out;
72402+ }
72403 return 1;
72404 }
72405
72406@@ -3074,7 +3156,18 @@ finish_open:
72407 path_put(&save_parent);
72408 return error;
72409 }
72410+
72411+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
72412+ error = -ENOENT;
72413+ goto out;
72414+ }
72415+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
72416+ error = -EACCES;
72417+ goto out;
72418+ }
72419+
72420 audit_inode(name, nd->path.dentry, 0);
72421+
72422 error = -EISDIR;
72423 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
72424 goto out;
72425@@ -3235,7 +3328,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
72426 if (unlikely(error))
72427 goto out;
72428
72429- error = do_last(nd, &path, file, op, &opened, pathname);
72430+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
72431 while (unlikely(error > 0)) { /* trailing symlink */
72432 struct path link = path;
72433 void *cookie;
72434@@ -3253,7 +3346,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
72435 error = follow_link(&link, nd, &cookie);
72436 if (unlikely(error))
72437 break;
72438- error = do_last(nd, &path, file, op, &opened, pathname);
72439+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
72440 put_link(nd, &link, cookie);
72441 }
72442 out:
72443@@ -3356,9 +3449,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
72444 goto unlock;
72445
72446 error = -EEXIST;
72447- if (d_is_positive(dentry))
72448+ if (d_is_positive(dentry)) {
72449+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
72450+ error = -ENOENT;
72451 goto fail;
72452-
72453+ }
72454 /*
72455 * Special case - lookup gave negative, but... we had foo/bar/
72456 * From the vfs_mknod() POV we just have a negative dentry -
72457@@ -3423,6 +3518,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
72458 }
72459 EXPORT_SYMBOL(user_path_create);
72460
72461+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
72462+{
72463+ struct filename *tmp = getname(pathname);
72464+ struct dentry *res;
72465+ if (IS_ERR(tmp))
72466+ return ERR_CAST(tmp);
72467+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
72468+ if (IS_ERR(res))
72469+ putname(tmp);
72470+ else
72471+ *to = tmp;
72472+ return res;
72473+}
72474+
72475 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
72476 {
72477 int error = may_create(dir, dentry);
72478@@ -3486,6 +3595,17 @@ retry:
72479
72480 if (!IS_POSIXACL(path.dentry->d_inode))
72481 mode &= ~current_umask();
72482+
72483+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
72484+ error = -EPERM;
72485+ goto out;
72486+ }
72487+
72488+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
72489+ error = -EACCES;
72490+ goto out;
72491+ }
72492+
72493 error = security_path_mknod(&path, dentry, mode, dev);
72494 if (error)
72495 goto out;
72496@@ -3501,6 +3621,8 @@ retry:
72497 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
72498 break;
72499 }
72500+ if (!error)
72501+ gr_handle_create(dentry, path.mnt);
72502 out:
72503 done_path_create(&path, dentry);
72504 if (retry_estale(error, lookup_flags)) {
72505@@ -3555,9 +3677,16 @@ retry:
72506
72507 if (!IS_POSIXACL(path.dentry->d_inode))
72508 mode &= ~current_umask();
72509+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
72510+ error = -EACCES;
72511+ goto out;
72512+ }
72513 error = security_path_mkdir(&path, dentry, mode);
72514 if (!error)
72515 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
72516+ if (!error)
72517+ gr_handle_create(dentry, path.mnt);
72518+out:
72519 done_path_create(&path, dentry);
72520 if (retry_estale(error, lookup_flags)) {
72521 lookup_flags |= LOOKUP_REVAL;
72522@@ -3590,7 +3719,7 @@ void dentry_unhash(struct dentry *dentry)
72523 {
72524 shrink_dcache_parent(dentry);
72525 spin_lock(&dentry->d_lock);
72526- if (dentry->d_lockref.count == 1)
72527+ if (__lockref_read(&dentry->d_lockref) == 1)
72528 __d_drop(dentry);
72529 spin_unlock(&dentry->d_lock);
72530 }
72531@@ -3641,6 +3770,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
72532 struct filename *name;
72533 struct dentry *dentry;
72534 struct nameidata nd;
72535+ u64 saved_ino = 0;
72536+ dev_t saved_dev = 0;
72537 unsigned int lookup_flags = 0;
72538 retry:
72539 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
72540@@ -3673,10 +3804,21 @@ retry:
72541 error = -ENOENT;
72542 goto exit3;
72543 }
72544+
72545+ saved_ino = gr_get_ino_from_dentry(dentry);
72546+ saved_dev = gr_get_dev_from_dentry(dentry);
72547+
72548+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
72549+ error = -EACCES;
72550+ goto exit3;
72551+ }
72552+
72553 error = security_path_rmdir(&nd.path, dentry);
72554 if (error)
72555 goto exit3;
72556 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
72557+ if (!error && (saved_dev || saved_ino))
72558+ gr_handle_delete(saved_ino, saved_dev);
72559 exit3:
72560 dput(dentry);
72561 exit2:
72562@@ -3769,6 +3911,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
72563 struct nameidata nd;
72564 struct inode *inode = NULL;
72565 struct inode *delegated_inode = NULL;
72566+ u64 saved_ino = 0;
72567+ dev_t saved_dev = 0;
72568 unsigned int lookup_flags = 0;
72569 retry:
72570 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
72571@@ -3795,10 +3939,22 @@ retry_deleg:
72572 if (d_is_negative(dentry))
72573 goto slashes;
72574 ihold(inode);
72575+
72576+ if (inode->i_nlink <= 1) {
72577+ saved_ino = gr_get_ino_from_dentry(dentry);
72578+ saved_dev = gr_get_dev_from_dentry(dentry);
72579+ }
72580+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
72581+ error = -EACCES;
72582+ goto exit2;
72583+ }
72584+
72585 error = security_path_unlink(&nd.path, dentry);
72586 if (error)
72587 goto exit2;
72588 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
72589+ if (!error && (saved_ino || saved_dev))
72590+ gr_handle_delete(saved_ino, saved_dev);
72591 exit2:
72592 dput(dentry);
72593 }
72594@@ -3887,9 +4043,17 @@ retry:
72595 if (IS_ERR(dentry))
72596 goto out_putname;
72597
72598+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
72599+ error = -EACCES;
72600+ goto out;
72601+ }
72602+
72603 error = security_path_symlink(&path, dentry, from->name);
72604 if (!error)
72605 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
72606+ if (!error)
72607+ gr_handle_create(dentry, path.mnt);
72608+out:
72609 done_path_create(&path, dentry);
72610 if (retry_estale(error, lookup_flags)) {
72611 lookup_flags |= LOOKUP_REVAL;
72612@@ -3993,6 +4157,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
72613 struct dentry *new_dentry;
72614 struct path old_path, new_path;
72615 struct inode *delegated_inode = NULL;
72616+ struct filename *to = NULL;
72617 int how = 0;
72618 int error;
72619
72620@@ -4016,7 +4181,7 @@ retry:
72621 if (error)
72622 return error;
72623
72624- new_dentry = user_path_create(newdfd, newname, &new_path,
72625+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
72626 (how & LOOKUP_REVAL));
72627 error = PTR_ERR(new_dentry);
72628 if (IS_ERR(new_dentry))
72629@@ -4028,11 +4193,28 @@ retry:
72630 error = may_linkat(&old_path);
72631 if (unlikely(error))
72632 goto out_dput;
72633+
72634+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
72635+ old_path.dentry->d_inode,
72636+ old_path.dentry->d_inode->i_mode, to)) {
72637+ error = -EACCES;
72638+ goto out_dput;
72639+ }
72640+
72641+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
72642+ old_path.dentry, old_path.mnt, to)) {
72643+ error = -EACCES;
72644+ goto out_dput;
72645+ }
72646+
72647 error = security_path_link(old_path.dentry, &new_path, new_dentry);
72648 if (error)
72649 goto out_dput;
72650 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
72651+ if (!error)
72652+ gr_handle_create(new_dentry, new_path.mnt);
72653 out_dput:
72654+ putname(to);
72655 done_path_create(&new_path, new_dentry);
72656 if (delegated_inode) {
72657 error = break_deleg_wait(&delegated_inode);
72658@@ -4348,6 +4530,20 @@ retry_deleg:
72659 if (new_dentry == trap)
72660 goto exit5;
72661
72662+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
72663+ /* use EXDEV error to cause 'mv' to switch to an alternative
72664+ * method for usability
72665+ */
72666+ error = -EXDEV;
72667+ goto exit5;
72668+ }
72669+
72670+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
72671+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
72672+ to, flags);
72673+ if (error)
72674+ goto exit5;
72675+
72676 error = security_path_rename(&oldnd.path, old_dentry,
72677 &newnd.path, new_dentry, flags);
72678 if (error)
72679@@ -4355,6 +4551,9 @@ retry_deleg:
72680 error = vfs_rename(old_dir->d_inode, old_dentry,
72681 new_dir->d_inode, new_dentry,
72682 &delegated_inode, flags);
72683+ if (!error)
72684+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
72685+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
72686 exit5:
72687 dput(new_dentry);
72688 exit4:
72689@@ -4411,14 +4610,24 @@ EXPORT_SYMBOL(vfs_whiteout);
72690
72691 int readlink_copy(char __user *buffer, int buflen, const char *link)
72692 {
72693+ char tmpbuf[64];
72694+ const char *newlink;
72695 int len = PTR_ERR(link);
72696+
72697 if (IS_ERR(link))
72698 goto out;
72699
72700 len = strlen(link);
72701 if (len > (unsigned) buflen)
72702 len = buflen;
72703- if (copy_to_user(buffer, link, len))
72704+
72705+ if (len < sizeof(tmpbuf)) {
72706+ memcpy(tmpbuf, link, len);
72707+ newlink = tmpbuf;
72708+ } else
72709+ newlink = link;
72710+
72711+ if (copy_to_user(buffer, newlink, len))
72712 len = -EFAULT;
72713 out:
72714 return len;
72715diff --git a/fs/namespace.c b/fs/namespace.c
72716index 13b0f7b..1ee96e7 100644
72717--- a/fs/namespace.c
72718+++ b/fs/namespace.c
72719@@ -1480,6 +1480,9 @@ static int do_umount(struct mount *mnt, int flags)
72720 if (!(sb->s_flags & MS_RDONLY))
72721 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
72722 up_write(&sb->s_umount);
72723+
72724+ gr_log_remount(mnt->mnt_devname, retval);
72725+
72726 return retval;
72727 }
72728
72729@@ -1502,6 +1505,9 @@ static int do_umount(struct mount *mnt, int flags)
72730 }
72731 unlock_mount_hash();
72732 namespace_unlock();
72733+
72734+ gr_log_unmount(mnt->mnt_devname, retval);
72735+
72736 return retval;
72737 }
72738
72739@@ -1559,7 +1565,7 @@ static inline bool may_mount(void)
72740 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
72741 */
72742
72743-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
72744+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
72745 {
72746 struct path path;
72747 struct mount *mnt;
72748@@ -1604,7 +1610,7 @@ out:
72749 /*
72750 * The 2.0 compatible umount. No flags.
72751 */
72752-SYSCALL_DEFINE1(oldumount, char __user *, name)
72753+SYSCALL_DEFINE1(oldumount, const char __user *, name)
72754 {
72755 return sys_umount(name, 0);
72756 }
72757@@ -2673,6 +2679,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
72758 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
72759 MS_STRICTATIME);
72760
72761+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
72762+ retval = -EPERM;
72763+ goto dput_out;
72764+ }
72765+
72766+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
72767+ retval = -EPERM;
72768+ goto dput_out;
72769+ }
72770+
72771 if (flags & MS_REMOUNT)
72772 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
72773 data_page);
72774@@ -2686,7 +2702,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
72775 retval = do_new_mount(&path, type_page, flags, mnt_flags,
72776 dev_name, data_page);
72777 dput_out:
72778+ gr_log_mount(dev_name, &path, retval);
72779+
72780 path_put(&path);
72781+
72782 return retval;
72783 }
72784
72785@@ -2704,7 +2723,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
72786 * number incrementing at 10Ghz will take 12,427 years to wrap which
72787 * is effectively never, so we can ignore the possibility.
72788 */
72789-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
72790+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
72791
72792 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72793 {
72794@@ -2720,7 +2739,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72795 return ERR_PTR(ret);
72796 }
72797 new_ns->ns.ops = &mntns_operations;
72798- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
72799+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
72800 atomic_set(&new_ns->count, 1);
72801 new_ns->root = NULL;
72802 INIT_LIST_HEAD(&new_ns->list);
72803@@ -2730,7 +2749,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72804 return new_ns;
72805 }
72806
72807-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
72808+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
72809 struct user_namespace *user_ns, struct fs_struct *new_fs)
72810 {
72811 struct mnt_namespace *new_ns;
72812@@ -2851,8 +2870,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
72813 }
72814 EXPORT_SYMBOL(mount_subtree);
72815
72816-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
72817- char __user *, type, unsigned long, flags, void __user *, data)
72818+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
72819+ const char __user *, type, unsigned long, flags, void __user *, data)
72820 {
72821 int ret;
72822 char *kernel_type;
72823@@ -2958,6 +2977,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
72824 if (error)
72825 goto out2;
72826
72827+ if (gr_handle_chroot_pivot()) {
72828+ error = -EPERM;
72829+ goto out2;
72830+ }
72831+
72832 get_fs_root(current->fs, &root);
72833 old_mp = lock_mount(&old);
72834 error = PTR_ERR(old_mp);
72835@@ -3238,7 +3262,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
72836 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
72837 return -EPERM;
72838
72839- if (fs->users != 1)
72840+ if (atomic_read(&fs->users) != 1)
72841 return -EINVAL;
72842
72843 get_mnt_ns(mnt_ns);
72844diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
72845index 19ca95c..b28702c 100644
72846--- a/fs/nfs/callback_xdr.c
72847+++ b/fs/nfs/callback_xdr.c
72848@@ -51,7 +51,7 @@ struct callback_op {
72849 callback_decode_arg_t decode_args;
72850 callback_encode_res_t encode_res;
72851 long res_maxsize;
72852-};
72853+} __do_const;
72854
72855 static struct callback_op callback_ops[];
72856
72857diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
72858index d42dff6..ecbdf42 100644
72859--- a/fs/nfs/inode.c
72860+++ b/fs/nfs/inode.c
72861@@ -1270,16 +1270,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
72862 return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
72863 }
72864
72865-static atomic_long_t nfs_attr_generation_counter;
72866+static atomic_long_unchecked_t nfs_attr_generation_counter;
72867
72868 static unsigned long nfs_read_attr_generation_counter(void)
72869 {
72870- return atomic_long_read(&nfs_attr_generation_counter);
72871+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
72872 }
72873
72874 unsigned long nfs_inc_attr_generation_counter(void)
72875 {
72876- return atomic_long_inc_return(&nfs_attr_generation_counter);
72877+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
72878 }
72879 EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
72880
72881diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
72882index 5416968..0942042 100644
72883--- a/fs/nfsd/nfs4proc.c
72884+++ b/fs/nfsd/nfs4proc.c
72885@@ -1496,7 +1496,7 @@ struct nfsd4_operation {
72886 nfsd4op_rsize op_rsize_bop;
72887 stateid_getter op_get_currentstateid;
72888 stateid_setter op_set_currentstateid;
72889-};
72890+} __do_const;
72891
72892 static struct nfsd4_operation nfsd4_ops[];
72893
72894diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
72895index 5b33ce1..c2a92aa 100644
72896--- a/fs/nfsd/nfs4xdr.c
72897+++ b/fs/nfsd/nfs4xdr.c
72898@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
72899
72900 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
72901
72902-static nfsd4_dec nfsd4_dec_ops[] = {
72903+static const nfsd4_dec nfsd4_dec_ops[] = {
72904 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
72905 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
72906 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
72907diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
72908index 46ec934..f384e41 100644
72909--- a/fs/nfsd/nfscache.c
72910+++ b/fs/nfsd/nfscache.c
72911@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72912 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
72913 u32 hash;
72914 struct nfsd_drc_bucket *b;
72915- int len;
72916+ long len;
72917 size_t bufsize = 0;
72918
72919 if (!rp)
72920@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72921 hash = nfsd_cache_hash(rp->c_xid);
72922 b = &drc_hashtbl[hash];
72923
72924- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
72925- len >>= 2;
72926+ if (statp) {
72927+ len = (char*)statp - (char*)resv->iov_base;
72928+ len = resv->iov_len - len;
72929+ len >>= 2;
72930+ }
72931
72932 /* Don't cache excessive amounts of data and XDR failures */
72933- if (!statp || len > (256 >> 2)) {
72934+ if (!statp || len > (256 >> 2) || len < 0) {
72935 nfsd_reply_cache_free(b, rp);
72936 return;
72937 }
72938@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72939 switch (cachetype) {
72940 case RC_REPLSTAT:
72941 if (len != 1)
72942- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
72943+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
72944 rp->c_replstat = *statp;
72945 break;
72946 case RC_REPLBUFF:
72947diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
72948index 3685265..e77261e 100644
72949--- a/fs/nfsd/vfs.c
72950+++ b/fs/nfsd/vfs.c
72951@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
72952
72953 oldfs = get_fs();
72954 set_fs(KERNEL_DS);
72955- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
72956+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
72957 set_fs(oldfs);
72958 return nfsd_finish_read(file, count, host_err);
72959 }
72960@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
72961
72962 /* Write the data. */
72963 oldfs = get_fs(); set_fs(KERNEL_DS);
72964- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
72965+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
72966 set_fs(oldfs);
72967 if (host_err < 0)
72968 goto out_nfserr;
72969@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
72970 */
72971
72972 oldfs = get_fs(); set_fs(KERNEL_DS);
72973- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
72974+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
72975 set_fs(oldfs);
72976
72977 if (host_err < 0)
72978diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
72979index 52ccd34..7a6b202 100644
72980--- a/fs/nls/nls_base.c
72981+++ b/fs/nls/nls_base.c
72982@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
72983
72984 int __register_nls(struct nls_table *nls, struct module *owner)
72985 {
72986- struct nls_table ** tmp = &tables;
72987+ struct nls_table *tmp = tables;
72988
72989 if (nls->next)
72990 return -EBUSY;
72991
72992- nls->owner = owner;
72993+ pax_open_kernel();
72994+ *(void **)&nls->owner = owner;
72995+ pax_close_kernel();
72996 spin_lock(&nls_lock);
72997- while (*tmp) {
72998- if (nls == *tmp) {
72999+ while (tmp) {
73000+ if (nls == tmp) {
73001 spin_unlock(&nls_lock);
73002 return -EBUSY;
73003 }
73004- tmp = &(*tmp)->next;
73005+ tmp = tmp->next;
73006 }
73007- nls->next = tables;
73008+ pax_open_kernel();
73009+ *(struct nls_table **)&nls->next = tables;
73010+ pax_close_kernel();
73011 tables = nls;
73012 spin_unlock(&nls_lock);
73013 return 0;
73014@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
73015
73016 int unregister_nls(struct nls_table * nls)
73017 {
73018- struct nls_table ** tmp = &tables;
73019+ struct nls_table * const * tmp = &tables;
73020
73021 spin_lock(&nls_lock);
73022 while (*tmp) {
73023 if (nls == *tmp) {
73024- *tmp = nls->next;
73025+ pax_open_kernel();
73026+ *(struct nls_table **)tmp = nls->next;
73027+ pax_close_kernel();
73028 spin_unlock(&nls_lock);
73029 return 0;
73030 }
73031@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
73032 return -EINVAL;
73033 }
73034
73035-static struct nls_table *find_nls(char *charset)
73036+static struct nls_table *find_nls(const char *charset)
73037 {
73038 struct nls_table *nls;
73039 spin_lock(&nls_lock);
73040@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
73041 return nls;
73042 }
73043
73044-struct nls_table *load_nls(char *charset)
73045+struct nls_table *load_nls(const char *charset)
73046 {
73047 return try_then_request_module(find_nls(charset), "nls_%s", charset);
73048 }
73049diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
73050index 162b3f1..6076a7c 100644
73051--- a/fs/nls/nls_euc-jp.c
73052+++ b/fs/nls/nls_euc-jp.c
73053@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
73054 p_nls = load_nls("cp932");
73055
73056 if (p_nls) {
73057- table.charset2upper = p_nls->charset2upper;
73058- table.charset2lower = p_nls->charset2lower;
73059+ pax_open_kernel();
73060+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
73061+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
73062+ pax_close_kernel();
73063 return register_nls(&table);
73064 }
73065
73066diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
73067index a80a741..7b96e1b 100644
73068--- a/fs/nls/nls_koi8-ru.c
73069+++ b/fs/nls/nls_koi8-ru.c
73070@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
73071 p_nls = load_nls("koi8-u");
73072
73073 if (p_nls) {
73074- table.charset2upper = p_nls->charset2upper;
73075- table.charset2lower = p_nls->charset2lower;
73076+ pax_open_kernel();
73077+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
73078+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
73079+ pax_close_kernel();
73080 return register_nls(&table);
73081 }
73082
73083diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
73084index cf27550..6c70f29d 100644
73085--- a/fs/notify/fanotify/fanotify_user.c
73086+++ b/fs/notify/fanotify/fanotify_user.c
73087@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
73088
73089 fd = fanotify_event_metadata.fd;
73090 ret = -EFAULT;
73091- if (copy_to_user(buf, &fanotify_event_metadata,
73092- fanotify_event_metadata.event_len))
73093+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
73094+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
73095 goto out_close_fd;
73096
73097 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
73098diff --git a/fs/notify/notification.c b/fs/notify/notification.c
73099index a95d8e0..a91a5fd 100644
73100--- a/fs/notify/notification.c
73101+++ b/fs/notify/notification.c
73102@@ -48,7 +48,7 @@
73103 #include <linux/fsnotify_backend.h>
73104 #include "fsnotify.h"
73105
73106-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
73107+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
73108
73109 /**
73110 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
73111@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
73112 */
73113 u32 fsnotify_get_cookie(void)
73114 {
73115- return atomic_inc_return(&fsnotify_sync_cookie);
73116+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
73117 }
73118 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
73119
73120diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
73121index 9e38daf..5727cae 100644
73122--- a/fs/ntfs/dir.c
73123+++ b/fs/ntfs/dir.c
73124@@ -1310,7 +1310,7 @@ find_next_index_buffer:
73125 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
73126 ~(s64)(ndir->itype.index.block_size - 1)));
73127 /* Bounds checks. */
73128- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
73129+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
73130 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
73131 "inode 0x%lx or driver bug.", vdir->i_ino);
73132 goto err_out;
73133diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
73134index 1da9b2d..9cca092a 100644
73135--- a/fs/ntfs/file.c
73136+++ b/fs/ntfs/file.c
73137@@ -1281,7 +1281,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
73138 char *addr;
73139 size_t total = 0;
73140 unsigned len;
73141- int left;
73142+ unsigned left;
73143
73144 do {
73145 len = PAGE_CACHE_SIZE - ofs;
73146diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
73147index 9e1e112..241a52a 100644
73148--- a/fs/ntfs/super.c
73149+++ b/fs/ntfs/super.c
73150@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73151 if (!silent)
73152 ntfs_error(sb, "Primary boot sector is invalid.");
73153 } else if (!silent)
73154- ntfs_error(sb, read_err_str, "primary");
73155+ ntfs_error(sb, read_err_str, "%s", "primary");
73156 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
73157 if (bh_primary)
73158 brelse(bh_primary);
73159@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73160 goto hotfix_primary_boot_sector;
73161 brelse(bh_backup);
73162 } else if (!silent)
73163- ntfs_error(sb, read_err_str, "backup");
73164+ ntfs_error(sb, read_err_str, "%s", "backup");
73165 /* Try to read NT3.51- backup boot sector. */
73166 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
73167 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
73168@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73169 "sector.");
73170 brelse(bh_backup);
73171 } else if (!silent)
73172- ntfs_error(sb, read_err_str, "backup");
73173+ ntfs_error(sb, read_err_str, "%s", "backup");
73174 /* We failed. Cleanup and return. */
73175 if (bh_primary)
73176 brelse(bh_primary);
73177diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
73178index 0440134..d52c93a 100644
73179--- a/fs/ocfs2/localalloc.c
73180+++ b/fs/ocfs2/localalloc.c
73181@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
73182 goto bail;
73183 }
73184
73185- atomic_inc(&osb->alloc_stats.moves);
73186+ atomic_inc_unchecked(&osb->alloc_stats.moves);
73187
73188 bail:
73189 if (handle)
73190diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
73191index 460c6c3..b4ef513 100644
73192--- a/fs/ocfs2/ocfs2.h
73193+++ b/fs/ocfs2/ocfs2.h
73194@@ -247,11 +247,11 @@ enum ocfs2_vol_state
73195
73196 struct ocfs2_alloc_stats
73197 {
73198- atomic_t moves;
73199- atomic_t local_data;
73200- atomic_t bitmap_data;
73201- atomic_t bg_allocs;
73202- atomic_t bg_extends;
73203+ atomic_unchecked_t moves;
73204+ atomic_unchecked_t local_data;
73205+ atomic_unchecked_t bitmap_data;
73206+ atomic_unchecked_t bg_allocs;
73207+ atomic_unchecked_t bg_extends;
73208 };
73209
73210 enum ocfs2_local_alloc_state
73211diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
73212index ee541f9..df3a500 100644
73213--- a/fs/ocfs2/refcounttree.c
73214+++ b/fs/ocfs2/refcounttree.c
73215@@ -4276,7 +4276,7 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
73216 error = posix_acl_create(dir, &mode, &default_acl, &acl);
73217 if (error) {
73218 mlog_errno(error);
73219- goto out;
73220+ return error;
73221 }
73222
73223 error = ocfs2_create_inode_in_orphan(dir, mode,
73224diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
73225index 0cb889a..6a26b24 100644
73226--- a/fs/ocfs2/suballoc.c
73227+++ b/fs/ocfs2/suballoc.c
73228@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
73229 mlog_errno(status);
73230 goto bail;
73231 }
73232- atomic_inc(&osb->alloc_stats.bg_extends);
73233+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
73234
73235 /* You should never ask for this much metadata */
73236 BUG_ON(bits_wanted >
73237@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
73238 mlog_errno(status);
73239 goto bail;
73240 }
73241- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73242+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73243
73244 *suballoc_loc = res.sr_bg_blkno;
73245 *suballoc_bit_start = res.sr_bit_offset;
73246@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
73247 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
73248 res->sr_bits);
73249
73250- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73251+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73252
73253 BUG_ON(res->sr_bits != 1);
73254
73255@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
73256 mlog_errno(status);
73257 goto bail;
73258 }
73259- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73260+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73261
73262 BUG_ON(res.sr_bits != 1);
73263
73264@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
73265 cluster_start,
73266 num_clusters);
73267 if (!status)
73268- atomic_inc(&osb->alloc_stats.local_data);
73269+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
73270 } else {
73271 if (min_clusters > (osb->bitmap_cpg - 1)) {
73272 /* The only paths asking for contiguousness
73273@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
73274 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
73275 res.sr_bg_blkno,
73276 res.sr_bit_offset);
73277- atomic_inc(&osb->alloc_stats.bitmap_data);
73278+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
73279 *num_clusters = res.sr_bits;
73280 }
73281 }
73282diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
73283index 2667518..24bcf79 100644
73284--- a/fs/ocfs2/super.c
73285+++ b/fs/ocfs2/super.c
73286@@ -308,11 +308,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
73287 "%10s => GlobalAllocs: %d LocalAllocs: %d "
73288 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
73289 "Stats",
73290- atomic_read(&osb->alloc_stats.bitmap_data),
73291- atomic_read(&osb->alloc_stats.local_data),
73292- atomic_read(&osb->alloc_stats.bg_allocs),
73293- atomic_read(&osb->alloc_stats.moves),
73294- atomic_read(&osb->alloc_stats.bg_extends));
73295+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
73296+ atomic_read_unchecked(&osb->alloc_stats.local_data),
73297+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
73298+ atomic_read_unchecked(&osb->alloc_stats.moves),
73299+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
73300
73301 out += snprintf(buf + out, len - out,
73302 "%10s => State: %u Descriptor: %llu Size: %u bits "
73303@@ -2093,11 +2093,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
73304
73305 mutex_init(&osb->system_file_mutex);
73306
73307- atomic_set(&osb->alloc_stats.moves, 0);
73308- atomic_set(&osb->alloc_stats.local_data, 0);
73309- atomic_set(&osb->alloc_stats.bitmap_data, 0);
73310- atomic_set(&osb->alloc_stats.bg_allocs, 0);
73311- atomic_set(&osb->alloc_stats.bg_extends, 0);
73312+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
73313+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
73314+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
73315+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
73316+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
73317
73318 /* Copy the blockcheck stats from the superblock probe */
73319 osb->osb_ecc_stats = *stats;
73320diff --git a/fs/open.c b/fs/open.c
73321index 44a3be1..5e97aa1 100644
73322--- a/fs/open.c
73323+++ b/fs/open.c
73324@@ -32,6 +32,8 @@
73325 #include <linux/dnotify.h>
73326 #include <linux/compat.h>
73327
73328+#define CREATE_TRACE_POINTS
73329+#include <trace/events/fs.h>
73330 #include "internal.h"
73331
73332 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
73333@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
73334 error = locks_verify_truncate(inode, NULL, length);
73335 if (!error)
73336 error = security_path_truncate(path);
73337+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
73338+ error = -EACCES;
73339 if (!error)
73340 error = do_truncate(path->dentry, length, 0, NULL);
73341
73342@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
73343 error = locks_verify_truncate(inode, f.file, length);
73344 if (!error)
73345 error = security_path_truncate(&f.file->f_path);
73346+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
73347+ error = -EACCES;
73348 if (!error)
73349 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
73350 sb_end_write(inode->i_sb);
73351@@ -392,6 +398,9 @@ retry:
73352 if (__mnt_is_readonly(path.mnt))
73353 res = -EROFS;
73354
73355+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
73356+ res = -EACCES;
73357+
73358 out_path_release:
73359 path_put(&path);
73360 if (retry_estale(res, lookup_flags)) {
73361@@ -423,6 +432,8 @@ retry:
73362 if (error)
73363 goto dput_and_out;
73364
73365+ gr_log_chdir(path.dentry, path.mnt);
73366+
73367 set_fs_pwd(current->fs, &path);
73368
73369 dput_and_out:
73370@@ -452,6 +463,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
73371 goto out_putf;
73372
73373 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
73374+
73375+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
73376+ error = -EPERM;
73377+
73378+ if (!error)
73379+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
73380+
73381 if (!error)
73382 set_fs_pwd(current->fs, &f.file->f_path);
73383 out_putf:
73384@@ -481,7 +499,13 @@ retry:
73385 if (error)
73386 goto dput_and_out;
73387
73388+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
73389+ goto dput_and_out;
73390+
73391 set_fs_root(current->fs, &path);
73392+
73393+ gr_handle_chroot_chdir(&path);
73394+
73395 error = 0;
73396 dput_and_out:
73397 path_put(&path);
73398@@ -505,6 +529,16 @@ static int chmod_common(struct path *path, umode_t mode)
73399 return error;
73400 retry_deleg:
73401 mutex_lock(&inode->i_mutex);
73402+
73403+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
73404+ error = -EACCES;
73405+ goto out_unlock;
73406+ }
73407+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
73408+ error = -EACCES;
73409+ goto out_unlock;
73410+ }
73411+
73412 error = security_path_chmod(path, mode);
73413 if (error)
73414 goto out_unlock;
73415@@ -570,6 +604,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
73416 uid = make_kuid(current_user_ns(), user);
73417 gid = make_kgid(current_user_ns(), group);
73418
73419+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
73420+ return -EACCES;
73421+
73422 retry_deleg:
73423 newattrs.ia_valid = ATTR_CTIME;
73424 if (user != (uid_t) -1) {
73425@@ -1017,6 +1054,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
73426 } else {
73427 fsnotify_open(f);
73428 fd_install(fd, f);
73429+ trace_do_sys_open(tmp->name, flags, mode);
73430 }
73431 }
73432 putname(tmp);
73433diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
73434index bf8537c..c16ef7d 100644
73435--- a/fs/overlayfs/super.c
73436+++ b/fs/overlayfs/super.c
73437@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
73438 {
73439 struct ovl_entry *oe = dentry->d_fsdata;
73440
73441- *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
73442+ *path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
73443 }
73444
73445 int ovl_want_write(struct dentry *dentry)
73446@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
73447
73448 static int ovl_fill_super(struct super_block *sb, void *data, int silent)
73449 {
73450- struct path upperpath = { NULL, NULL };
73451- struct path workpath = { NULL, NULL };
73452+ struct path upperpath = { .dentry = NULL, .mnt = NULL };
73453+ struct path workpath = { .dentry = NULL, .mnt = NULL };
73454 struct dentry *root_dentry;
73455 struct ovl_entry *oe;
73456 struct ovl_fs *ufs;
73457diff --git a/fs/pipe.c b/fs/pipe.c
73458index 21981e5..2c0bffb 100644
73459--- a/fs/pipe.c
73460+++ b/fs/pipe.c
73461@@ -37,7 +37,7 @@ unsigned int pipe_max_size = 1048576;
73462 /*
73463 * Minimum pipe size, as required by POSIX
73464 */
73465-unsigned int pipe_min_size = PAGE_SIZE;
73466+unsigned int pipe_min_size __read_only = PAGE_SIZE;
73467
73468 /*
73469 * We use a start+len construction, which provides full use of the
73470@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
73471
73472 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
73473 {
73474- if (pipe->files)
73475+ if (atomic_read(&pipe->files))
73476 mutex_lock_nested(&pipe->mutex, subclass);
73477 }
73478
73479@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
73480
73481 void pipe_unlock(struct pipe_inode_info *pipe)
73482 {
73483- if (pipe->files)
73484+ if (atomic_read(&pipe->files))
73485 mutex_unlock(&pipe->mutex);
73486 }
73487 EXPORT_SYMBOL(pipe_unlock);
73488@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
73489 }
73490 if (bufs) /* More to do? */
73491 continue;
73492- if (!pipe->writers)
73493+ if (!atomic_read(&pipe->writers))
73494 break;
73495- if (!pipe->waiting_writers) {
73496+ if (!atomic_read(&pipe->waiting_writers)) {
73497 /* syscall merging: Usually we must not sleep
73498 * if O_NONBLOCK is set, or if we got some data.
73499 * But if a writer sleeps in kernel space, then
73500@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73501
73502 __pipe_lock(pipe);
73503
73504- if (!pipe->readers) {
73505+ if (!atomic_read(&pipe->readers)) {
73506 send_sig(SIGPIPE, current, 0);
73507 ret = -EPIPE;
73508 goto out;
73509@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73510 for (;;) {
73511 int bufs;
73512
73513- if (!pipe->readers) {
73514+ if (!atomic_read(&pipe->readers)) {
73515 send_sig(SIGPIPE, current, 0);
73516 if (!ret)
73517 ret = -EPIPE;
73518@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73519 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
73520 do_wakeup = 0;
73521 }
73522- pipe->waiting_writers++;
73523+ atomic_inc(&pipe->waiting_writers);
73524 pipe_wait(pipe);
73525- pipe->waiting_writers--;
73526+ atomic_dec(&pipe->waiting_writers);
73527 }
73528 out:
73529 __pipe_unlock(pipe);
73530@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
73531 mask = 0;
73532 if (filp->f_mode & FMODE_READ) {
73533 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
73534- if (!pipe->writers && filp->f_version != pipe->w_counter)
73535+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
73536 mask |= POLLHUP;
73537 }
73538
73539@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
73540 * Most Unices do not set POLLERR for FIFOs but on Linux they
73541 * behave exactly like pipes for poll().
73542 */
73543- if (!pipe->readers)
73544+ if (!atomic_read(&pipe->readers))
73545 mask |= POLLERR;
73546 }
73547
73548@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
73549 int kill = 0;
73550
73551 spin_lock(&inode->i_lock);
73552- if (!--pipe->files) {
73553+ if (atomic_dec_and_test(&pipe->files)) {
73554 inode->i_pipe = NULL;
73555 kill = 1;
73556 }
73557@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
73558
73559 __pipe_lock(pipe);
73560 if (file->f_mode & FMODE_READ)
73561- pipe->readers--;
73562+ atomic_dec(&pipe->readers);
73563 if (file->f_mode & FMODE_WRITE)
73564- pipe->writers--;
73565+ atomic_dec(&pipe->writers);
73566
73567- if (pipe->readers || pipe->writers) {
73568+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
73569 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
73570 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
73571 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
73572@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
73573 kfree(pipe);
73574 }
73575
73576-static struct vfsmount *pipe_mnt __read_mostly;
73577+struct vfsmount *pipe_mnt __read_mostly;
73578
73579 /*
73580 * pipefs_dname() is called from d_path().
73581@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
73582 goto fail_iput;
73583
73584 inode->i_pipe = pipe;
73585- pipe->files = 2;
73586- pipe->readers = pipe->writers = 1;
73587+ atomic_set(&pipe->files, 2);
73588+ atomic_set(&pipe->readers, 1);
73589+ atomic_set(&pipe->writers, 1);
73590 inode->i_fop = &pipefifo_fops;
73591
73592 /*
73593@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
73594 spin_lock(&inode->i_lock);
73595 if (inode->i_pipe) {
73596 pipe = inode->i_pipe;
73597- pipe->files++;
73598+ atomic_inc(&pipe->files);
73599 spin_unlock(&inode->i_lock);
73600 } else {
73601 spin_unlock(&inode->i_lock);
73602 pipe = alloc_pipe_info();
73603 if (!pipe)
73604 return -ENOMEM;
73605- pipe->files = 1;
73606+ atomic_set(&pipe->files, 1);
73607 spin_lock(&inode->i_lock);
73608 if (unlikely(inode->i_pipe)) {
73609- inode->i_pipe->files++;
73610+ atomic_inc(&inode->i_pipe->files);
73611 spin_unlock(&inode->i_lock);
73612 free_pipe_info(pipe);
73613 pipe = inode->i_pipe;
73614@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
73615 * opened, even when there is no process writing the FIFO.
73616 */
73617 pipe->r_counter++;
73618- if (pipe->readers++ == 0)
73619+ if (atomic_inc_return(&pipe->readers) == 1)
73620 wake_up_partner(pipe);
73621
73622- if (!is_pipe && !pipe->writers) {
73623+ if (!is_pipe && !atomic_read(&pipe->writers)) {
73624 if ((filp->f_flags & O_NONBLOCK)) {
73625 /* suppress POLLHUP until we have
73626 * seen a writer */
73627@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
73628 * errno=ENXIO when there is no process reading the FIFO.
73629 */
73630 ret = -ENXIO;
73631- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
73632+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
73633 goto err;
73634
73635 pipe->w_counter++;
73636- if (!pipe->writers++)
73637+ if (atomic_inc_return(&pipe->writers) == 1)
73638 wake_up_partner(pipe);
73639
73640- if (!is_pipe && !pipe->readers) {
73641+ if (!is_pipe && !atomic_read(&pipe->readers)) {
73642 if (wait_for_partner(pipe, &pipe->r_counter))
73643 goto err_wr;
73644 }
73645@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
73646 * the process can at least talk to itself.
73647 */
73648
73649- pipe->readers++;
73650- pipe->writers++;
73651+ atomic_inc(&pipe->readers);
73652+ atomic_inc(&pipe->writers);
73653 pipe->r_counter++;
73654 pipe->w_counter++;
73655- if (pipe->readers == 1 || pipe->writers == 1)
73656+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
73657 wake_up_partner(pipe);
73658 break;
73659
73660@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
73661 return 0;
73662
73663 err_rd:
73664- if (!--pipe->readers)
73665+ if (atomic_dec_and_test(&pipe->readers))
73666 wake_up_interruptible(&pipe->wait);
73667 ret = -ERESTARTSYS;
73668 goto err;
73669
73670 err_wr:
73671- if (!--pipe->writers)
73672+ if (atomic_dec_and_test(&pipe->writers))
73673 wake_up_interruptible(&pipe->wait);
73674 ret = -ERESTARTSYS;
73675 goto err;
73676@@ -1010,7 +1011,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
73677 * Currently we rely on the pipe array holding a power-of-2 number
73678 * of pages.
73679 */
73680-static inline unsigned int round_pipe_size(unsigned int size)
73681+static inline unsigned long round_pipe_size(unsigned long size)
73682 {
73683 unsigned long nr_pages;
73684
73685@@ -1058,13 +1059,16 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
73686
73687 switch (cmd) {
73688 case F_SETPIPE_SZ: {
73689- unsigned int size, nr_pages;
73690+ unsigned long size, nr_pages;
73691+
73692+ ret = -EINVAL;
73693+ if (arg < pipe_min_size)
73694+ goto out;
73695
73696 size = round_pipe_size(arg);
73697 nr_pages = size >> PAGE_SHIFT;
73698
73699- ret = -EINVAL;
73700- if (!nr_pages)
73701+ if (size < pipe_min_size)
73702 goto out;
73703
73704 if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
73705diff --git a/fs/posix_acl.c b/fs/posix_acl.c
73706index 3a48bb7..403067b 100644
73707--- a/fs/posix_acl.c
73708+++ b/fs/posix_acl.c
73709@@ -20,6 +20,7 @@
73710 #include <linux/xattr.h>
73711 #include <linux/export.h>
73712 #include <linux/user_namespace.h>
73713+#include <linux/grsecurity.h>
73714
73715 struct posix_acl **acl_by_type(struct inode *inode, int type)
73716 {
73717@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
73718 }
73719 }
73720 if (mode_p)
73721- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
73722+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
73723 return not_equiv;
73724 }
73725 EXPORT_SYMBOL(posix_acl_equiv_mode);
73726@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
73727 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
73728 }
73729
73730- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
73731+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
73732 return not_equiv;
73733 }
73734
73735@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
73736 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
73737 int err = -ENOMEM;
73738 if (clone) {
73739+ *mode_p &= ~gr_acl_umask();
73740+
73741 err = posix_acl_create_masq(clone, mode_p);
73742 if (err < 0) {
73743 posix_acl_release(clone);
73744@@ -663,11 +666,12 @@ struct posix_acl *
73745 posix_acl_from_xattr(struct user_namespace *user_ns,
73746 const void *value, size_t size)
73747 {
73748- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
73749- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
73750+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
73751+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
73752 int count;
73753 struct posix_acl *acl;
73754 struct posix_acl_entry *acl_e;
73755+ umode_t umask = gr_acl_umask();
73756
73757 if (!value)
73758 return NULL;
73759@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
73760
73761 switch(acl_e->e_tag) {
73762 case ACL_USER_OBJ:
73763+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
73764+ break;
73765 case ACL_GROUP_OBJ:
73766 case ACL_MASK:
73767+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
73768+ break;
73769 case ACL_OTHER:
73770+ acl_e->e_perm &= ~(umask & S_IRWXO);
73771 break;
73772
73773 case ACL_USER:
73774+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
73775 acl_e->e_uid =
73776 make_kuid(user_ns,
73777 le32_to_cpu(entry->e_id));
73778@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
73779 goto fail;
73780 break;
73781 case ACL_GROUP:
73782+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
73783 acl_e->e_gid =
73784 make_kgid(user_ns,
73785 le32_to_cpu(entry->e_id));
73786diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
73787index 2183fcf..3c32a98 100644
73788--- a/fs/proc/Kconfig
73789+++ b/fs/proc/Kconfig
73790@@ -30,7 +30,7 @@ config PROC_FS
73791
73792 config PROC_KCORE
73793 bool "/proc/kcore support" if !ARM
73794- depends on PROC_FS && MMU
73795+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
73796 help
73797 Provides a virtual ELF core file of the live kernel. This can
73798 be read with gdb and other ELF tools. No modifications can be
73799@@ -38,8 +38,8 @@ config PROC_KCORE
73800
73801 config PROC_VMCORE
73802 bool "/proc/vmcore support"
73803- depends on PROC_FS && CRASH_DUMP
73804- default y
73805+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
73806+ default n
73807 help
73808 Exports the dump image of crashed kernel in ELF format.
73809
73810@@ -63,8 +63,8 @@ config PROC_SYSCTL
73811 limited in memory.
73812
73813 config PROC_PAGE_MONITOR
73814- default y
73815- depends on PROC_FS && MMU
73816+ default n
73817+ depends on PROC_FS && MMU && !GRKERNSEC
73818 bool "Enable /proc page monitoring" if EXPERT
73819 help
73820 Various /proc files exist to monitor process memory utilization:
73821diff --git a/fs/proc/array.c b/fs/proc/array.c
73822index 1295a00..4c91a6b 100644
73823--- a/fs/proc/array.c
73824+++ b/fs/proc/array.c
73825@@ -60,6 +60,7 @@
73826 #include <linux/tty.h>
73827 #include <linux/string.h>
73828 #include <linux/mman.h>
73829+#include <linux/grsecurity.h>
73830 #include <linux/proc_fs.h>
73831 #include <linux/ioport.h>
73832 #include <linux/uaccess.h>
73833@@ -322,6 +323,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
73834 cpumask_pr_args(&task->cpus_allowed));
73835 }
73836
73837+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73838+static inline void task_pax(struct seq_file *m, struct task_struct *p)
73839+{
73840+ if (p->mm)
73841+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
73842+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
73843+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
73844+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
73845+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
73846+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
73847+ else
73848+ seq_printf(m, "PaX:\t-----\n");
73849+}
73850+#endif
73851+
73852 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
73853 struct pid *pid, struct task_struct *task)
73854 {
73855@@ -340,9 +356,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
73856 task_cpus_allowed(m, task);
73857 cpuset_task_status_allowed(m, task);
73858 task_context_switch_counts(m, task);
73859+
73860+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73861+ task_pax(m, task);
73862+#endif
73863+
73864+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
73865+ task_grsec_rbac(m, task);
73866+#endif
73867+
73868 return 0;
73869 }
73870
73871+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73872+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
73873+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
73874+ _mm->pax_flags & MF_PAX_SEGMEXEC))
73875+#endif
73876+
73877 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73878 struct pid *pid, struct task_struct *task, int whole)
73879 {
73880@@ -364,6 +395,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73881 char tcomm[sizeof(task->comm)];
73882 unsigned long flags;
73883
73884+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73885+ if (current->exec_id != m->exec_id) {
73886+ gr_log_badprocpid("stat");
73887+ return 0;
73888+ }
73889+#endif
73890+
73891 state = *get_task_state(task);
73892 vsize = eip = esp = 0;
73893 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
73894@@ -434,6 +472,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73895 gtime = task_gtime(task);
73896 }
73897
73898+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73899+ if (PAX_RAND_FLAGS(mm)) {
73900+ eip = 0;
73901+ esp = 0;
73902+ wchan = 0;
73903+ }
73904+#endif
73905+#ifdef CONFIG_GRKERNSEC_HIDESYM
73906+ wchan = 0;
73907+ eip =0;
73908+ esp =0;
73909+#endif
73910+
73911 /* scale priority and nice values from timeslices to -20..20 */
73912 /* to make it look like a "normal" Unix priority/nice value */
73913 priority = task_prio(task);
73914@@ -465,9 +516,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73915 seq_put_decimal_ull(m, ' ', vsize);
73916 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
73917 seq_put_decimal_ull(m, ' ', rsslim);
73918+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73919+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
73920+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
73921+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
73922+#else
73923 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
73924 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
73925 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
73926+#endif
73927 seq_put_decimal_ull(m, ' ', esp);
73928 seq_put_decimal_ull(m, ' ', eip);
73929 /* The signal information here is obsolete.
73930@@ -489,7 +546,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73931 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
73932 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
73933
73934- if (mm && permitted) {
73935+ if (mm && permitted
73936+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73937+ && !PAX_RAND_FLAGS(mm)
73938+#endif
73939+ ) {
73940 seq_put_decimal_ull(m, ' ', mm->start_data);
73941 seq_put_decimal_ull(m, ' ', mm->end_data);
73942 seq_put_decimal_ull(m, ' ', mm->start_brk);
73943@@ -527,8 +588,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
73944 struct pid *pid, struct task_struct *task)
73945 {
73946 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
73947- struct mm_struct *mm = get_task_mm(task);
73948+ struct mm_struct *mm;
73949
73950+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73951+ if (current->exec_id != m->exec_id) {
73952+ gr_log_badprocpid("statm");
73953+ return 0;
73954+ }
73955+#endif
73956+ mm = get_task_mm(task);
73957 if (mm) {
73958 size = task_statm(mm, &shared, &text, &data, &resident);
73959 mmput(mm);
73960@@ -551,6 +619,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
73961 return 0;
73962 }
73963
73964+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
73965+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
73966+{
73967+ unsigned long flags;
73968+ u32 curr_ip = 0;
73969+
73970+ if (lock_task_sighand(task, &flags)) {
73971+ curr_ip = task->signal->curr_ip;
73972+ unlock_task_sighand(task, &flags);
73973+ }
73974+ return seq_printf(m, "%pI4\n", &curr_ip);
73975+}
73976+#endif
73977+
73978 #ifdef CONFIG_CHECKPOINT_RESTORE
73979 static struct pid *
73980 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
73981diff --git a/fs/proc/base.c b/fs/proc/base.c
73982index 3f3d7ae..68de109 100644
73983--- a/fs/proc/base.c
73984+++ b/fs/proc/base.c
73985@@ -113,6 +113,14 @@ struct pid_entry {
73986 union proc_op op;
73987 };
73988
73989+struct getdents_callback {
73990+ struct linux_dirent __user * current_dir;
73991+ struct linux_dirent __user * previous;
73992+ struct file * file;
73993+ int count;
73994+ int error;
73995+};
73996+
73997 #define NOD(NAME, MODE, IOP, FOP, OP) { \
73998 .name = (NAME), \
73999 .len = sizeof(NAME) - 1, \
74000@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
74001 return 0;
74002 }
74003
74004+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74005+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
74006+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
74007+ _mm->pax_flags & MF_PAX_SEGMEXEC))
74008+#endif
74009+
74010 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
74011 struct pid *pid, struct task_struct *task)
74012 {
74013 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
74014 if (mm && !IS_ERR(mm)) {
74015 unsigned int nwords = 0;
74016+
74017+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74018+ /* allow if we're currently ptracing this task */
74019+ if (PAX_RAND_FLAGS(mm) &&
74020+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
74021+ mmput(mm);
74022+ return 0;
74023+ }
74024+#endif
74025+
74026 do {
74027 nwords += 2;
74028 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
74029@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
74030 }
74031
74032
74033-#ifdef CONFIG_KALLSYMS
74034+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74035 /*
74036 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
74037 * Returns the resolved symbol. If that fails, simply return the address.
74038@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
74039 mutex_unlock(&task->signal->cred_guard_mutex);
74040 }
74041
74042-#ifdef CONFIG_STACKTRACE
74043+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74044
74045 #define MAX_STACK_TRACE_DEPTH 64
74046
74047@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
74048 return 0;
74049 }
74050
74051-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74052+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74053 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
74054 struct pid *pid, struct task_struct *task)
74055 {
74056@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
74057 /************************************************************************/
74058
74059 /* permission checks */
74060-static int proc_fd_access_allowed(struct inode *inode)
74061+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
74062 {
74063 struct task_struct *task;
74064 int allowed = 0;
74065@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
74066 */
74067 task = get_proc_task(inode);
74068 if (task) {
74069- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
74070+ if (log)
74071+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
74072+ else
74073+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
74074 put_task_struct(task);
74075 }
74076 return allowed;
74077@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
74078 struct task_struct *task,
74079 int hide_pid_min)
74080 {
74081+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74082+ return false;
74083+
74084+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74085+ rcu_read_lock();
74086+ {
74087+ const struct cred *tmpcred = current_cred();
74088+ const struct cred *cred = __task_cred(task);
74089+
74090+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
74091+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74092+ || in_group_p(grsec_proc_gid)
74093+#endif
74094+ ) {
74095+ rcu_read_unlock();
74096+ return true;
74097+ }
74098+ }
74099+ rcu_read_unlock();
74100+
74101+ if (!pid->hide_pid)
74102+ return false;
74103+#endif
74104+
74105 if (pid->hide_pid < hide_pid_min)
74106 return true;
74107 if (in_group_p(pid->pid_gid))
74108 return true;
74109+
74110 return ptrace_may_access(task, PTRACE_MODE_READ);
74111 }
74112
74113@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
74114 put_task_struct(task);
74115
74116 if (!has_perms) {
74117+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74118+ {
74119+#else
74120 if (pid->hide_pid == 2) {
74121+#endif
74122 /*
74123 * Let's make getdents(), stat(), and open()
74124 * consistent with each other. If a process
74125@@ -609,6 +665,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
74126
74127 if (task) {
74128 mm = mm_access(task, mode);
74129+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
74130+ mmput(mm);
74131+ mm = ERR_PTR(-EPERM);
74132+ }
74133 put_task_struct(task);
74134
74135 if (!IS_ERR_OR_NULL(mm)) {
74136@@ -630,6 +690,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
74137 return PTR_ERR(mm);
74138
74139 file->private_data = mm;
74140+
74141+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74142+ file->f_version = current->exec_id;
74143+#endif
74144+
74145 return 0;
74146 }
74147
74148@@ -651,6 +716,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
74149 ssize_t copied;
74150 char *page;
74151
74152+#ifdef CONFIG_GRKERNSEC
74153+ if (write)
74154+ return -EPERM;
74155+#endif
74156+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74157+ if (file->f_version != current->exec_id) {
74158+ gr_log_badprocpid("mem");
74159+ return 0;
74160+ }
74161+#endif
74162+
74163 if (!mm)
74164 return 0;
74165
74166@@ -663,7 +739,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
74167 goto free;
74168
74169 while (count > 0) {
74170- int this_len = min_t(int, count, PAGE_SIZE);
74171+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
74172
74173 if (write && copy_from_user(page, buf, this_len)) {
74174 copied = -EFAULT;
74175@@ -755,6 +831,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
74176 if (!mm)
74177 return 0;
74178
74179+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74180+ if (file->f_version != current->exec_id) {
74181+ gr_log_badprocpid("environ");
74182+ return 0;
74183+ }
74184+#endif
74185+
74186 page = (char *)__get_free_page(GFP_TEMPORARY);
74187 if (!page)
74188 return -ENOMEM;
74189@@ -764,7 +847,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
74190 goto free;
74191 while (count > 0) {
74192 size_t this_len, max_len;
74193- int retval;
74194+ ssize_t retval;
74195
74196 if (src >= (mm->env_end - mm->env_start))
74197 break;
74198@@ -1378,7 +1461,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
74199 int error = -EACCES;
74200
74201 /* Are we allowed to snoop on the tasks file descriptors? */
74202- if (!proc_fd_access_allowed(inode))
74203+ if (!proc_fd_access_allowed(inode, 0))
74204 goto out;
74205
74206 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
74207@@ -1422,8 +1505,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
74208 struct path path;
74209
74210 /* Are we allowed to snoop on the tasks file descriptors? */
74211- if (!proc_fd_access_allowed(inode))
74212- goto out;
74213+ /* logging this is needed for learning on chromium to work properly,
74214+ but we don't want to flood the logs from 'ps' which does a readlink
74215+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
74216+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
74217+ */
74218+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
74219+ if (!proc_fd_access_allowed(inode,0))
74220+ goto out;
74221+ } else {
74222+ if (!proc_fd_access_allowed(inode,1))
74223+ goto out;
74224+ }
74225
74226 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
74227 if (error)
74228@@ -1473,7 +1566,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
74229 rcu_read_lock();
74230 cred = __task_cred(task);
74231 inode->i_uid = cred->euid;
74232+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74233+ inode->i_gid = grsec_proc_gid;
74234+#else
74235 inode->i_gid = cred->egid;
74236+#endif
74237 rcu_read_unlock();
74238 }
74239 security_task_to_inode(task, inode);
74240@@ -1509,10 +1606,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
74241 return -ENOENT;
74242 }
74243 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
74244+#ifdef CONFIG_GRKERNSEC_PROC_USER
74245+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
74246+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74247+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
74248+#endif
74249 task_dumpable(task)) {
74250 cred = __task_cred(task);
74251 stat->uid = cred->euid;
74252+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74253+ stat->gid = grsec_proc_gid;
74254+#else
74255 stat->gid = cred->egid;
74256+#endif
74257 }
74258 }
74259 rcu_read_unlock();
74260@@ -1550,11 +1656,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
74261
74262 if (task) {
74263 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
74264+#ifdef CONFIG_GRKERNSEC_PROC_USER
74265+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
74266+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74267+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
74268+#endif
74269 task_dumpable(task)) {
74270 rcu_read_lock();
74271 cred = __task_cred(task);
74272 inode->i_uid = cred->euid;
74273+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74274+ inode->i_gid = grsec_proc_gid;
74275+#else
74276 inode->i_gid = cred->egid;
74277+#endif
74278 rcu_read_unlock();
74279 } else {
74280 inode->i_uid = GLOBAL_ROOT_UID;
74281@@ -2085,6 +2200,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
74282 if (!task)
74283 goto out_no_task;
74284
74285+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74286+ goto out;
74287+
74288 /*
74289 * Yes, it does not scale. And it should not. Don't add
74290 * new entries into /proc/<tgid>/ without very good reasons.
74291@@ -2115,6 +2233,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
74292 if (!task)
74293 return -ENOENT;
74294
74295+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74296+ goto out;
74297+
74298 if (!dir_emit_dots(file, ctx))
74299 goto out;
74300
74301@@ -2557,7 +2678,7 @@ static const struct pid_entry tgid_base_stuff[] = {
74302 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
74303 #endif
74304 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
74305-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74306+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74307 ONE("syscall", S_IRUSR, proc_pid_syscall),
74308 #endif
74309 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
74310@@ -2582,10 +2703,10 @@ static const struct pid_entry tgid_base_stuff[] = {
74311 #ifdef CONFIG_SECURITY
74312 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
74313 #endif
74314-#ifdef CONFIG_KALLSYMS
74315+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74316 ONE("wchan", S_IRUGO, proc_pid_wchan),
74317 #endif
74318-#ifdef CONFIG_STACKTRACE
74319+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74320 ONE("stack", S_IRUSR, proc_pid_stack),
74321 #endif
74322 #ifdef CONFIG_SCHEDSTATS
74323@@ -2619,6 +2740,9 @@ static const struct pid_entry tgid_base_stuff[] = {
74324 #ifdef CONFIG_HARDWALL
74325 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
74326 #endif
74327+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
74328+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
74329+#endif
74330 #ifdef CONFIG_USER_NS
74331 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
74332 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
74333@@ -2751,7 +2875,14 @@ static int proc_pid_instantiate(struct inode *dir,
74334 if (!inode)
74335 goto out;
74336
74337+#ifdef CONFIG_GRKERNSEC_PROC_USER
74338+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
74339+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74340+ inode->i_gid = grsec_proc_gid;
74341+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
74342+#else
74343 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
74344+#endif
74345 inode->i_op = &proc_tgid_base_inode_operations;
74346 inode->i_fop = &proc_tgid_base_operations;
74347 inode->i_flags|=S_IMMUTABLE;
74348@@ -2789,7 +2920,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
74349 if (!task)
74350 goto out;
74351
74352+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74353+ goto out_put_task;
74354+
74355 result = proc_pid_instantiate(dir, dentry, task, NULL);
74356+out_put_task:
74357 put_task_struct(task);
74358 out:
74359 return ERR_PTR(result);
74360@@ -2903,7 +3038,7 @@ static const struct pid_entry tid_base_stuff[] = {
74361 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
74362 #endif
74363 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
74364-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74365+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74366 ONE("syscall", S_IRUSR, proc_pid_syscall),
74367 #endif
74368 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
74369@@ -2930,10 +3065,10 @@ static const struct pid_entry tid_base_stuff[] = {
74370 #ifdef CONFIG_SECURITY
74371 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
74372 #endif
74373-#ifdef CONFIG_KALLSYMS
74374+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74375 ONE("wchan", S_IRUGO, proc_pid_wchan),
74376 #endif
74377-#ifdef CONFIG_STACKTRACE
74378+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74379 ONE("stack", S_IRUSR, proc_pid_stack),
74380 #endif
74381 #ifdef CONFIG_SCHEDSTATS
74382diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
74383index cbd82df..c0407d2 100644
74384--- a/fs/proc/cmdline.c
74385+++ b/fs/proc/cmdline.c
74386@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
74387
74388 static int __init proc_cmdline_init(void)
74389 {
74390+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74391+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
74392+#else
74393 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
74394+#endif
74395 return 0;
74396 }
74397 fs_initcall(proc_cmdline_init);
74398diff --git a/fs/proc/devices.c b/fs/proc/devices.c
74399index 50493ed..248166b 100644
74400--- a/fs/proc/devices.c
74401+++ b/fs/proc/devices.c
74402@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
74403
74404 static int __init proc_devices_init(void)
74405 {
74406+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74407+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
74408+#else
74409 proc_create("devices", 0, NULL, &proc_devinfo_operations);
74410+#endif
74411 return 0;
74412 }
74413 fs_initcall(proc_devices_init);
74414diff --git a/fs/proc/fd.c b/fs/proc/fd.c
74415index 8e5ad83..1f07a8c 100644
74416--- a/fs/proc/fd.c
74417+++ b/fs/proc/fd.c
74418@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
74419 if (!task)
74420 return -ENOENT;
74421
74422- files = get_files_struct(task);
74423+ if (!gr_acl_handle_procpidmem(task))
74424+ files = get_files_struct(task);
74425 put_task_struct(task);
74426
74427 if (files) {
74428@@ -284,11 +285,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
74429 */
74430 int proc_fd_permission(struct inode *inode, int mask)
74431 {
74432+ struct task_struct *task;
74433 int rv = generic_permission(inode, mask);
74434- if (rv == 0)
74435- return 0;
74436+
74437 if (task_tgid(current) == proc_pid(inode))
74438 rv = 0;
74439+
74440+ task = get_proc_task(inode);
74441+ if (task == NULL)
74442+ return rv;
74443+
74444+ if (gr_acl_handle_procpidmem(task))
74445+ rv = -EACCES;
74446+
74447+ put_task_struct(task);
74448+
74449 return rv;
74450 }
74451
74452diff --git a/fs/proc/generic.c b/fs/proc/generic.c
74453index be65b20..2998ba8 100644
74454--- a/fs/proc/generic.c
74455+++ b/fs/proc/generic.c
74456@@ -22,6 +22,7 @@
74457 #include <linux/bitops.h>
74458 #include <linux/spinlock.h>
74459 #include <linux/completion.h>
74460+#include <linux/grsecurity.h>
74461 #include <asm/uaccess.h>
74462
74463 #include "internal.h"
74464@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
74465 return proc_lookup_de(PDE(dir), dir, dentry);
74466 }
74467
74468+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
74469+ unsigned int flags)
74470+{
74471+ if (gr_proc_is_restricted())
74472+ return ERR_PTR(-EACCES);
74473+
74474+ return proc_lookup_de(PDE(dir), dir, dentry);
74475+}
74476+
74477 /*
74478 * This returns non-zero if at EOF, so that the /proc
74479 * root directory can use this and check if it should
74480@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
74481 return proc_readdir_de(PDE(inode), file, ctx);
74482 }
74483
74484+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
74485+{
74486+ struct inode *inode = file_inode(file);
74487+
74488+ if (gr_proc_is_restricted())
74489+ return -EACCES;
74490+
74491+ return proc_readdir_de(PDE(inode), file, ctx);
74492+}
74493+
74494 /*
74495 * These are the generic /proc directory operations. They
74496 * use the in-memory "struct proc_dir_entry" tree to parse
74497@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
74498 .iterate = proc_readdir,
74499 };
74500
74501+static const struct file_operations proc_dir_restricted_operations = {
74502+ .llseek = generic_file_llseek,
74503+ .read = generic_read_dir,
74504+ .iterate = proc_readdir_restrict,
74505+};
74506+
74507 /*
74508 * proc directories can do almost nothing..
74509 */
74510@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
74511 .setattr = proc_notify_change,
74512 };
74513
74514+static const struct inode_operations proc_dir_restricted_inode_operations = {
74515+ .lookup = proc_lookup_restrict,
74516+ .getattr = proc_getattr,
74517+ .setattr = proc_notify_change,
74518+};
74519+
74520 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
74521 {
74522 int ret;
74523@@ -441,6 +473,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
74524 }
74525 EXPORT_SYMBOL_GPL(proc_mkdir_data);
74526
74527+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
74528+ struct proc_dir_entry *parent, void *data)
74529+{
74530+ struct proc_dir_entry *ent;
74531+
74532+ if (mode == 0)
74533+ mode = S_IRUGO | S_IXUGO;
74534+
74535+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
74536+ if (ent) {
74537+ ent->data = data;
74538+ ent->restricted = 1;
74539+ ent->proc_fops = &proc_dir_restricted_operations;
74540+ ent->proc_iops = &proc_dir_restricted_inode_operations;
74541+ parent->nlink++;
74542+ if (proc_register(parent, ent) < 0) {
74543+ kfree(ent);
74544+ parent->nlink--;
74545+ ent = NULL;
74546+ }
74547+ }
74548+ return ent;
74549+}
74550+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
74551+
74552 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
74553 struct proc_dir_entry *parent)
74554 {
74555@@ -455,6 +512,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
74556 }
74557 EXPORT_SYMBOL(proc_mkdir);
74558
74559+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
74560+ struct proc_dir_entry *parent)
74561+{
74562+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
74563+}
74564+EXPORT_SYMBOL(proc_mkdir_restrict);
74565+
74566 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
74567 struct proc_dir_entry *parent,
74568 const struct file_operations *proc_fops,
74569diff --git a/fs/proc/inode.c b/fs/proc/inode.c
74570index 7697b66..8d8e541 100644
74571--- a/fs/proc/inode.c
74572+++ b/fs/proc/inode.c
74573@@ -24,11 +24,17 @@
74574 #include <linux/mount.h>
74575 #include <linux/magic.h>
74576 #include <linux/namei.h>
74577+#include <linux/grsecurity.h>
74578
74579 #include <asm/uaccess.h>
74580
74581 #include "internal.h"
74582
74583+#ifdef CONFIG_PROC_SYSCTL
74584+extern const struct inode_operations proc_sys_inode_operations;
74585+extern const struct inode_operations proc_sys_dir_operations;
74586+#endif
74587+
74588 static void proc_evict_inode(struct inode *inode)
74589 {
74590 struct proc_dir_entry *de;
74591@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
74592 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
74593 sysctl_head_put(head);
74594 }
74595+
74596+#ifdef CONFIG_PROC_SYSCTL
74597+ if (inode->i_op == &proc_sys_inode_operations ||
74598+ inode->i_op == &proc_sys_dir_operations)
74599+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
74600+#endif
74601+
74602 }
74603
74604 static struct kmem_cache * proc_inode_cachep;
74605@@ -426,7 +439,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
74606 if (de->mode) {
74607 inode->i_mode = de->mode;
74608 inode->i_uid = de->uid;
74609+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74610+ inode->i_gid = grsec_proc_gid;
74611+#else
74612 inode->i_gid = de->gid;
74613+#endif
74614 }
74615 if (de->size)
74616 inode->i_size = de->size;
74617diff --git a/fs/proc/internal.h b/fs/proc/internal.h
74618index c835b94..c9e01a3 100644
74619--- a/fs/proc/internal.h
74620+++ b/fs/proc/internal.h
74621@@ -47,9 +47,10 @@ struct proc_dir_entry {
74622 struct completion *pde_unload_completion;
74623 struct list_head pde_openers; /* who did ->open, but not ->release */
74624 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
74625+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
74626 u8 namelen;
74627 char name[];
74628-};
74629+} __randomize_layout;
74630
74631 union proc_op {
74632 int (*proc_get_link)(struct dentry *, struct path *);
74633@@ -67,7 +68,7 @@ struct proc_inode {
74634 struct ctl_table *sysctl_entry;
74635 const struct proc_ns_operations *ns_ops;
74636 struct inode vfs_inode;
74637-};
74638+} __randomize_layout;
74639
74640 /*
74641 * General functions
74642@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
74643 struct pid *, struct task_struct *);
74644 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
74645 struct pid *, struct task_struct *);
74646+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
74647+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
74648+ struct pid *, struct task_struct *);
74649+#endif
74650
74651 /*
74652 * base.c
74653@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
74654 * generic.c
74655 */
74656 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
74657+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
74658 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
74659 struct dentry *);
74660 extern int proc_readdir(struct file *, struct dir_context *);
74661+extern int proc_readdir_restrict(struct file *, struct dir_context *);
74662 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
74663
74664 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
74665diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
74666index a352d57..cb94a5c 100644
74667--- a/fs/proc/interrupts.c
74668+++ b/fs/proc/interrupts.c
74669@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
74670
74671 static int __init proc_interrupts_init(void)
74672 {
74673+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74674+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
74675+#else
74676 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
74677+#endif
74678 return 0;
74679 }
74680 fs_initcall(proc_interrupts_init);
74681diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
74682index 91a4e64..14bf8fa 100644
74683--- a/fs/proc/kcore.c
74684+++ b/fs/proc/kcore.c
74685@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74686 * the addresses in the elf_phdr on our list.
74687 */
74688 start = kc_offset_to_vaddr(*fpos - elf_buflen);
74689- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
74690+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
74691+ if (tsz > buflen)
74692 tsz = buflen;
74693-
74694+
74695 while (buflen) {
74696 struct kcore_list *m;
74697
74698@@ -515,19 +516,20 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74699 } else {
74700 if (kern_addr_valid(start)) {
74701 unsigned long n;
74702+ char *elf_buf;
74703+ mm_segment_t oldfs;
74704
74705- n = copy_to_user(buffer, (char *)start, tsz);
74706- /*
74707- * We cannot distinguish between fault on source
74708- * and fault on destination. When this happens
74709- * we clear too and hope it will trigger the
74710- * EFAULT again.
74711- */
74712- if (n) {
74713- if (clear_user(buffer + tsz - n,
74714- n))
74715- return -EFAULT;
74716- }
74717+ elf_buf = kzalloc(tsz, GFP_KERNEL);
74718+ if (!elf_buf)
74719+ return -ENOMEM;
74720+ oldfs = get_fs();
74721+ set_fs(KERNEL_DS);
74722+ n = __copy_from_user(elf_buf, (const void __user *)start, tsz);
74723+ set_fs(oldfs);
74724+ n = copy_to_user(buffer, elf_buf, tsz);
74725+ kfree(elf_buf);
74726+ if (n)
74727+ return -EFAULT;
74728 } else {
74729 if (clear_user(buffer, tsz))
74730 return -EFAULT;
74731@@ -547,6 +549,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74732
74733 static int open_kcore(struct inode *inode, struct file *filp)
74734 {
74735+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
74736+ return -EPERM;
74737+#endif
74738 if (!capable(CAP_SYS_RAWIO))
74739 return -EPERM;
74740 if (kcore_need_update)
74741@@ -580,7 +585,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
74742 return NOTIFY_OK;
74743 }
74744
74745-static struct notifier_block kcore_callback_nb __meminitdata = {
74746+static struct notifier_block kcore_callback_nb __meminitconst = {
74747 .notifier_call = kcore_callback,
74748 .priority = 0,
74749 };
74750diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
74751index d3ebf2e..6ad42d1 100644
74752--- a/fs/proc/meminfo.c
74753+++ b/fs/proc/meminfo.c
74754@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
74755 vmi.used >> 10,
74756 vmi.largest_chunk >> 10
74757 #ifdef CONFIG_MEMORY_FAILURE
74758- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
74759+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
74760 #endif
74761 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
74762 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
74763diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
74764index d4a3574..b421ce9 100644
74765--- a/fs/proc/nommu.c
74766+++ b/fs/proc/nommu.c
74767@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
74768
74769 if (file) {
74770 seq_pad(m, ' ');
74771- seq_path(m, &file->f_path, "");
74772+ seq_path(m, &file->f_path, "\n\\");
74773 }
74774
74775 seq_putc(m, '\n');
74776diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
74777index 1bde894..22ac7eb 100644
74778--- a/fs/proc/proc_net.c
74779+++ b/fs/proc/proc_net.c
74780@@ -23,9 +23,27 @@
74781 #include <linux/nsproxy.h>
74782 #include <net/net_namespace.h>
74783 #include <linux/seq_file.h>
74784+#include <linux/grsecurity.h>
74785
74786 #include "internal.h"
74787
74788+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
74789+static struct seq_operations *ipv6_seq_ops_addr;
74790+
74791+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
74792+{
74793+ ipv6_seq_ops_addr = addr;
74794+}
74795+
74796+void unregister_ipv6_seq_ops_addr(void)
74797+{
74798+ ipv6_seq_ops_addr = NULL;
74799+}
74800+
74801+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
74802+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
74803+#endif
74804+
74805 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
74806 {
74807 return pde->parent->data;
74808@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
74809 return maybe_get_net(PDE_NET(PDE(inode)));
74810 }
74811
74812+extern const struct seq_operations dev_seq_ops;
74813+
74814 int seq_open_net(struct inode *ino, struct file *f,
74815 const struct seq_operations *ops, int size)
74816 {
74817@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
74818
74819 BUG_ON(size < sizeof(*p));
74820
74821+ /* only permit access to /proc/net/dev */
74822+ if (
74823+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
74824+ ops != ipv6_seq_ops_addr &&
74825+#endif
74826+ ops != &dev_seq_ops && gr_proc_is_restricted())
74827+ return -EACCES;
74828+
74829 net = get_proc_net(ino);
74830 if (net == NULL)
74831 return -ENXIO;
74832@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
74833 int err;
74834 struct net *net;
74835
74836+ if (gr_proc_is_restricted())
74837+ return -EACCES;
74838+
74839 err = -ENXIO;
74840 net = get_proc_net(inode);
74841 if (net == NULL)
74842diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
74843index f92d5dd..26398ac 100644
74844--- a/fs/proc/proc_sysctl.c
74845+++ b/fs/proc/proc_sysctl.c
74846@@ -11,13 +11,21 @@
74847 #include <linux/namei.h>
74848 #include <linux/mm.h>
74849 #include <linux/module.h>
74850+#include <linux/nsproxy.h>
74851+#ifdef CONFIG_GRKERNSEC
74852+#include <net/net_namespace.h>
74853+#endif
74854 #include "internal.h"
74855
74856+extern int gr_handle_chroot_sysctl(const int op);
74857+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
74858+ const int op);
74859+
74860 static const struct dentry_operations proc_sys_dentry_operations;
74861 static const struct file_operations proc_sys_file_operations;
74862-static const struct inode_operations proc_sys_inode_operations;
74863+const struct inode_operations proc_sys_inode_operations;
74864 static const struct file_operations proc_sys_dir_file_operations;
74865-static const struct inode_operations proc_sys_dir_operations;
74866+const struct inode_operations proc_sys_dir_operations;
74867
74868 void proc_sys_poll_notify(struct ctl_table_poll *poll)
74869 {
74870@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
74871
74872 err = NULL;
74873 d_set_d_op(dentry, &proc_sys_dentry_operations);
74874+
74875+ gr_handle_proc_create(dentry, inode);
74876+
74877 d_add(dentry, inode);
74878
74879 out:
74880@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74881 struct inode *inode = file_inode(filp);
74882 struct ctl_table_header *head = grab_header(inode);
74883 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
74884+ int op = write ? MAY_WRITE : MAY_READ;
74885 ssize_t error;
74886 size_t res;
74887
74888@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74889 * and won't be until we finish.
74890 */
74891 error = -EPERM;
74892- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
74893+ if (sysctl_perm(head, table, op))
74894 goto out;
74895
74896 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
74897@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74898 if (!table->proc_handler)
74899 goto out;
74900
74901+#ifdef CONFIG_GRKERNSEC
74902+ error = -EPERM;
74903+ if (gr_handle_chroot_sysctl(op))
74904+ goto out;
74905+ dget(filp->f_path.dentry);
74906+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
74907+ dput(filp->f_path.dentry);
74908+ goto out;
74909+ }
74910+ dput(filp->f_path.dentry);
74911+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
74912+ goto out;
74913+ if (write) {
74914+ if (current->nsproxy->net_ns != table->extra2) {
74915+ if (!capable(CAP_SYS_ADMIN))
74916+ goto out;
74917+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
74918+ goto out;
74919+ }
74920+#endif
74921+
74922 /* careful: calling conventions are nasty here */
74923 res = count;
74924 error = table->proc_handler(table, write, buf, &res, ppos);
74925@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
74926 return false;
74927 } else {
74928 d_set_d_op(child, &proc_sys_dentry_operations);
74929+
74930+ gr_handle_proc_create(child, inode);
74931+
74932 d_add(child, inode);
74933 }
74934 } else {
74935@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
74936 if ((*pos)++ < ctx->pos)
74937 return true;
74938
74939+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
74940+ return 0;
74941+
74942 if (unlikely(S_ISLNK(table->mode)))
74943 res = proc_sys_link_fill_cache(file, ctx, head, table);
74944 else
74945@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
74946 if (IS_ERR(head))
74947 return PTR_ERR(head);
74948
74949+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
74950+ return -ENOENT;
74951+
74952 generic_fillattr(inode, stat);
74953 if (table)
74954 stat->mode = (stat->mode & S_IFMT) | table->mode;
74955@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
74956 .llseek = generic_file_llseek,
74957 };
74958
74959-static const struct inode_operations proc_sys_inode_operations = {
74960+const struct inode_operations proc_sys_inode_operations = {
74961 .permission = proc_sys_permission,
74962 .setattr = proc_sys_setattr,
74963 .getattr = proc_sys_getattr,
74964 };
74965
74966-static const struct inode_operations proc_sys_dir_operations = {
74967+const struct inode_operations proc_sys_dir_operations = {
74968 .lookup = proc_sys_lookup,
74969 .permission = proc_sys_permission,
74970 .setattr = proc_sys_setattr,
74971@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
74972 static struct ctl_dir *new_dir(struct ctl_table_set *set,
74973 const char *name, int namelen)
74974 {
74975- struct ctl_table *table;
74976+ ctl_table_no_const *table;
74977 struct ctl_dir *new;
74978 struct ctl_node *node;
74979 char *new_name;
74980@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
74981 return NULL;
74982
74983 node = (struct ctl_node *)(new + 1);
74984- table = (struct ctl_table *)(node + 1);
74985+ table = (ctl_table_no_const *)(node + 1);
74986 new_name = (char *)(table + 2);
74987 memcpy(new_name, name, namelen);
74988 new_name[namelen] = '\0';
74989@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
74990 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
74991 struct ctl_table_root *link_root)
74992 {
74993- struct ctl_table *link_table, *entry, *link;
74994+ ctl_table_no_const *link_table, *link;
74995+ struct ctl_table *entry;
74996 struct ctl_table_header *links;
74997 struct ctl_node *node;
74998 char *link_name;
74999@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
75000 return NULL;
75001
75002 node = (struct ctl_node *)(links + 1);
75003- link_table = (struct ctl_table *)(node + nr_entries);
75004+ link_table = (ctl_table_no_const *)(node + nr_entries);
75005 link_name = (char *)&link_table[nr_entries + 1];
75006
75007 for (link = link_table, entry = table; entry->procname; link++, entry++) {
75008@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
75009 struct ctl_table_header ***subheader, struct ctl_table_set *set,
75010 struct ctl_table *table)
75011 {
75012- struct ctl_table *ctl_table_arg = NULL;
75013- struct ctl_table *entry, *files;
75014+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
75015+ struct ctl_table *entry;
75016 int nr_files = 0;
75017 int nr_dirs = 0;
75018 int err = -ENOMEM;
75019@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
75020 nr_files++;
75021 }
75022
75023- files = table;
75024 /* If there are mixed files and directories we need a new table */
75025 if (nr_dirs && nr_files) {
75026- struct ctl_table *new;
75027+ ctl_table_no_const *new;
75028 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
75029 GFP_KERNEL);
75030 if (!files)
75031@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
75032 /* Register everything except a directory full of subdirectories */
75033 if (nr_files || !nr_dirs) {
75034 struct ctl_table_header *header;
75035- header = __register_sysctl_table(set, path, files);
75036+ header = __register_sysctl_table(set, path, files ? files : table);
75037 if (!header) {
75038 kfree(ctl_table_arg);
75039 goto out;
75040diff --git a/fs/proc/root.c b/fs/proc/root.c
75041index e74ac9f..35e89f4 100644
75042--- a/fs/proc/root.c
75043+++ b/fs/proc/root.c
75044@@ -188,7 +188,15 @@ void __init proc_root_init(void)
75045 proc_mkdir("openprom", NULL);
75046 #endif
75047 proc_tty_init();
75048+#ifdef CONFIG_GRKERNSEC_PROC_ADD
75049+#ifdef CONFIG_GRKERNSEC_PROC_USER
75050+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
75051+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
75052+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
75053+#endif
75054+#else
75055 proc_mkdir("bus", NULL);
75056+#endif
75057 proc_sys_init();
75058 }
75059
75060diff --git a/fs/proc/stat.c b/fs/proc/stat.c
75061index 510413eb..34d9a8c 100644
75062--- a/fs/proc/stat.c
75063+++ b/fs/proc/stat.c
75064@@ -11,6 +11,7 @@
75065 #include <linux/irqnr.h>
75066 #include <linux/cputime.h>
75067 #include <linux/tick.h>
75068+#include <linux/grsecurity.h>
75069
75070 #ifndef arch_irq_stat_cpu
75071 #define arch_irq_stat_cpu(cpu) 0
75072@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
75073 u64 sum_softirq = 0;
75074 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
75075 struct timespec boottime;
75076+ int unrestricted = 1;
75077+
75078+#ifdef CONFIG_GRKERNSEC_PROC_ADD
75079+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
75080+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
75081+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
75082+ && !in_group_p(grsec_proc_gid)
75083+#endif
75084+ )
75085+ unrestricted = 0;
75086+#endif
75087+#endif
75088
75089 user = nice = system = idle = iowait =
75090 irq = softirq = steal = 0;
75091@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
75092 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
75093 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
75094 idle += get_idle_time(i);
75095- iowait += get_iowait_time(i);
75096- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75097- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75098- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75099- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75100- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75101- sum += kstat_cpu_irqs_sum(i);
75102- sum += arch_irq_stat_cpu(i);
75103+ if (unrestricted) {
75104+ iowait += get_iowait_time(i);
75105+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75106+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75107+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75108+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75109+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75110+ sum += kstat_cpu_irqs_sum(i);
75111+ sum += arch_irq_stat_cpu(i);
75112+ for (j = 0; j < NR_SOFTIRQS; j++) {
75113+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
75114
75115- for (j = 0; j < NR_SOFTIRQS; j++) {
75116- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
75117-
75118- per_softirq_sums[j] += softirq_stat;
75119- sum_softirq += softirq_stat;
75120+ per_softirq_sums[j] += softirq_stat;
75121+ sum_softirq += softirq_stat;
75122+ }
75123 }
75124 }
75125- sum += arch_irq_stat();
75126+ if (unrestricted)
75127+ sum += arch_irq_stat();
75128
75129 seq_puts(p, "cpu ");
75130 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
75131@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
75132 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
75133 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
75134 idle = get_idle_time(i);
75135- iowait = get_iowait_time(i);
75136- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75137- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75138- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75139- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75140- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75141+ if (unrestricted) {
75142+ iowait = get_iowait_time(i);
75143+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75144+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75145+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75146+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75147+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75148+ }
75149 seq_printf(p, "cpu%d", i);
75150 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
75151 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
75152@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
75153
75154 /* sum again ? it could be updated? */
75155 for_each_irq_nr(j)
75156- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
75157+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
75158
75159 seq_printf(p,
75160 "\nctxt %llu\n"
75161@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
75162 "processes %lu\n"
75163 "procs_running %lu\n"
75164 "procs_blocked %lu\n",
75165- nr_context_switches(),
75166+ unrestricted ? nr_context_switches() : 0ULL,
75167 (unsigned long)jif,
75168- total_forks,
75169- nr_running(),
75170- nr_iowait());
75171+ unrestricted ? total_forks : 0UL,
75172+ unrestricted ? nr_running() : 0UL,
75173+ unrestricted ? nr_iowait() : 0UL);
75174
75175 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
75176
75177diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
75178index 6dee68d..1b4add0 100644
75179--- a/fs/proc/task_mmu.c
75180+++ b/fs/proc/task_mmu.c
75181@@ -13,12 +13,19 @@
75182 #include <linux/swap.h>
75183 #include <linux/swapops.h>
75184 #include <linux/mmu_notifier.h>
75185+#include <linux/grsecurity.h>
75186
75187 #include <asm/elf.h>
75188 #include <asm/uaccess.h>
75189 #include <asm/tlbflush.h>
75190 #include "internal.h"
75191
75192+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75193+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
75194+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
75195+ _mm->pax_flags & MF_PAX_SEGMEXEC))
75196+#endif
75197+
75198 void task_mem(struct seq_file *m, struct mm_struct *mm)
75199 {
75200 unsigned long data, text, lib, swap, ptes, pmds;
75201@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75202 "VmLib:\t%8lu kB\n"
75203 "VmPTE:\t%8lu kB\n"
75204 "VmPMD:\t%8lu kB\n"
75205- "VmSwap:\t%8lu kB\n",
75206- hiwater_vm << (PAGE_SHIFT-10),
75207+ "VmSwap:\t%8lu kB\n"
75208+
75209+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
75210+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
75211+#endif
75212+
75213+ ,hiwater_vm << (PAGE_SHIFT-10),
75214 total_vm << (PAGE_SHIFT-10),
75215 mm->locked_vm << (PAGE_SHIFT-10),
75216 mm->pinned_vm << (PAGE_SHIFT-10),
75217@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75218 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
75219 ptes >> 10,
75220 pmds >> 10,
75221- swap << (PAGE_SHIFT-10));
75222+ swap << (PAGE_SHIFT-10)
75223+
75224+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
75225+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75226+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
75227+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
75228+#else
75229+ , mm->context.user_cs_base
75230+ , mm->context.user_cs_limit
75231+#endif
75232+#endif
75233+
75234+ );
75235 }
75236
75237 unsigned long task_vsize(struct mm_struct *mm)
75238@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75239 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
75240 }
75241
75242- /* We don't show the stack guard page in /proc/maps */
75243+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75244+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
75245+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
75246+#else
75247 start = vma->vm_start;
75248- if (stack_guard_page_start(vma, start))
75249- start += PAGE_SIZE;
75250 end = vma->vm_end;
75251- if (stack_guard_page_end(vma, end))
75252- end -= PAGE_SIZE;
75253+#endif
75254
75255 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
75256 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
75257@@ -301,7 +325,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75258 flags & VM_WRITE ? 'w' : '-',
75259 flags & VM_EXEC ? 'x' : '-',
75260 flags & VM_MAYSHARE ? 's' : 'p',
75261+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75262+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
75263+#else
75264 pgoff,
75265+#endif
75266 MAJOR(dev), MINOR(dev), ino);
75267
75268 /*
75269@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75270 */
75271 if (file) {
75272 seq_pad(m, ' ');
75273- seq_path(m, &file->f_path, "\n");
75274+ seq_path(m, &file->f_path, "\n\\");
75275 goto done;
75276 }
75277
75278@@ -341,8 +369,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75279 * Thread stack in /proc/PID/task/TID/maps or
75280 * the main process stack.
75281 */
75282- if (!is_pid || (vma->vm_start <= mm->start_stack &&
75283- vma->vm_end >= mm->start_stack)) {
75284+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
75285+ (vma->vm_start <= mm->start_stack &&
75286+ vma->vm_end >= mm->start_stack)) {
75287 name = "[stack]";
75288 } else {
75289 /* Thread stack in /proc/PID/maps */
75290@@ -362,6 +391,12 @@ done:
75291
75292 static int show_map(struct seq_file *m, void *v, int is_pid)
75293 {
75294+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75295+ if (current->exec_id != m->exec_id) {
75296+ gr_log_badprocpid("maps");
75297+ return 0;
75298+ }
75299+#endif
75300 show_map_vma(m, v, is_pid);
75301 m_cache_vma(m, v);
75302 return 0;
75303@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
75304 .private = &mss,
75305 };
75306
75307+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75308+ if (current->exec_id != m->exec_id) {
75309+ gr_log_badprocpid("smaps");
75310+ return 0;
75311+ }
75312+#endif
75313 memset(&mss, 0, sizeof mss);
75314- /* mmap_sem is held in m_start */
75315- walk_page_vma(vma, &smaps_walk);
75316+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75317+ if (!PAX_RAND_FLAGS(vma->vm_mm))
75318+#endif
75319+ /* mmap_sem is held in m_start */
75320+ walk_page_vma(vma, &smaps_walk);
75321
75322 show_map_vma(m, vma, is_pid);
75323
75324@@ -641,7 +685,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
75325 "KernelPageSize: %8lu kB\n"
75326 "MMUPageSize: %8lu kB\n"
75327 "Locked: %8lu kB\n",
75328+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75329+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
75330+#else
75331 (vma->vm_end - vma->vm_start) >> 10,
75332+#endif
75333 mss.resident >> 10,
75334 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
75335 mss.shared_clean >> 10,
75336@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
75337 char buffer[64];
75338 int nid;
75339
75340+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75341+ if (current->exec_id != m->exec_id) {
75342+ gr_log_badprocpid("numa_maps");
75343+ return 0;
75344+ }
75345+#endif
75346+
75347 if (!mm)
75348 return 0;
75349
75350@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
75351 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
75352 }
75353
75354+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75355+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
75356+#else
75357 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
75358+#endif
75359
75360 if (file) {
75361 seq_puts(m, " file=");
75362- seq_path(m, &file->f_path, "\n\t= ");
75363+ seq_path(m, &file->f_path, "\n\t\\= ");
75364 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
75365 seq_puts(m, " heap");
75366 } else {
75367diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
75368index 599ec2e..f1413ae 100644
75369--- a/fs/proc/task_nommu.c
75370+++ b/fs/proc/task_nommu.c
75371@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75372 else
75373 bytes += kobjsize(mm);
75374
75375- if (current->fs && current->fs->users > 1)
75376+ if (current->fs && atomic_read(&current->fs->users) > 1)
75377 sbytes += kobjsize(current->fs);
75378 else
75379 bytes += kobjsize(current->fs);
75380@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
75381
75382 if (file) {
75383 seq_pad(m, ' ');
75384- seq_path(m, &file->f_path, "");
75385+ seq_path(m, &file->f_path, "\n\\");
75386 } else if (mm) {
75387 pid_t tid = pid_of_stack(priv, vma, is_pid);
75388
75389diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
75390index 4e61388..1a2523d 100644
75391--- a/fs/proc/vmcore.c
75392+++ b/fs/proc/vmcore.c
75393@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
75394 nr_bytes = count;
75395
75396 /* If pfn is not ram, return zeros for sparse dump files */
75397- if (pfn_is_ram(pfn) == 0)
75398- memset(buf, 0, nr_bytes);
75399- else {
75400+ if (pfn_is_ram(pfn) == 0) {
75401+ if (userbuf) {
75402+ if (clear_user((char __force_user *)buf, nr_bytes))
75403+ return -EFAULT;
75404+ } else
75405+ memset(buf, 0, nr_bytes);
75406+ } else {
75407 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
75408 offset, userbuf);
75409 if (tmp < 0)
75410@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
75411 static int copy_to(void *target, void *src, size_t size, int userbuf)
75412 {
75413 if (userbuf) {
75414- if (copy_to_user((char __user *) target, src, size))
75415+ if (copy_to_user((char __force_user *) target, src, size))
75416 return -EFAULT;
75417 } else {
75418 memcpy(target, src, size);
75419@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
75420 if (*fpos < m->offset + m->size) {
75421 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
75422 start = m->paddr + *fpos - m->offset;
75423- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
75424+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
75425 if (tmp < 0)
75426 return tmp;
75427 buflen -= tsz;
75428@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
75429 static ssize_t read_vmcore(struct file *file, char __user *buffer,
75430 size_t buflen, loff_t *fpos)
75431 {
75432- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
75433+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
75434 }
75435
75436 /*
75437diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
75438index d3fb2b6..43a8140 100644
75439--- a/fs/qnx6/qnx6.h
75440+++ b/fs/qnx6/qnx6.h
75441@@ -74,7 +74,7 @@ enum {
75442 BYTESEX_BE,
75443 };
75444
75445-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
75446+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
75447 {
75448 if (sbi->s_bytesex == BYTESEX_LE)
75449 return le64_to_cpu((__force __le64)n);
75450@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
75451 return (__force __fs64)cpu_to_be64(n);
75452 }
75453
75454-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
75455+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
75456 {
75457 if (sbi->s_bytesex == BYTESEX_LE)
75458 return le32_to_cpu((__force __le32)n);
75459diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
75460index bb2869f..d34ada8 100644
75461--- a/fs/quota/netlink.c
75462+++ b/fs/quota/netlink.c
75463@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
75464 void quota_send_warning(struct kqid qid, dev_t dev,
75465 const char warntype)
75466 {
75467- static atomic_t seq;
75468+ static atomic_unchecked_t seq;
75469 struct sk_buff *skb;
75470 void *msg_head;
75471 int ret;
75472@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
75473 "VFS: Not enough memory to send quota warning.\n");
75474 return;
75475 }
75476- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
75477+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
75478 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
75479 if (!msg_head) {
75480 printk(KERN_ERR
75481diff --git a/fs/read_write.c b/fs/read_write.c
75482index 8e1b687..bad2eec 100644
75483--- a/fs/read_write.c
75484+++ b/fs/read_write.c
75485@@ -553,7 +553,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
75486
75487 old_fs = get_fs();
75488 set_fs(get_ds());
75489- p = (__force const char __user *)buf;
75490+ p = (const char __force_user *)buf;
75491 if (count > MAX_RW_COUNT)
75492 count = MAX_RW_COUNT;
75493 if (file->f_op->write)
75494diff --git a/fs/readdir.c b/fs/readdir.c
75495index ced6791..936687b 100644
75496--- a/fs/readdir.c
75497+++ b/fs/readdir.c
75498@@ -18,6 +18,7 @@
75499 #include <linux/security.h>
75500 #include <linux/syscalls.h>
75501 #include <linux/unistd.h>
75502+#include <linux/namei.h>
75503
75504 #include <asm/uaccess.h>
75505
75506@@ -71,6 +72,7 @@ struct old_linux_dirent {
75507 struct readdir_callback {
75508 struct dir_context ctx;
75509 struct old_linux_dirent __user * dirent;
75510+ struct file * file;
75511 int result;
75512 };
75513
75514@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
75515 buf->result = -EOVERFLOW;
75516 return -EOVERFLOW;
75517 }
75518+
75519+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75520+ return 0;
75521+
75522 buf->result++;
75523 dirent = buf->dirent;
75524 if (!access_ok(VERIFY_WRITE, dirent,
75525@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
75526 if (!f.file)
75527 return -EBADF;
75528
75529+ buf.file = f.file;
75530 error = iterate_dir(f.file, &buf.ctx);
75531 if (buf.result)
75532 error = buf.result;
75533@@ -145,6 +152,7 @@ struct getdents_callback {
75534 struct dir_context ctx;
75535 struct linux_dirent __user * current_dir;
75536 struct linux_dirent __user * previous;
75537+ struct file * file;
75538 int count;
75539 int error;
75540 };
75541@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
75542 buf->error = -EOVERFLOW;
75543 return -EOVERFLOW;
75544 }
75545+
75546+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75547+ return 0;
75548+
75549 dirent = buf->previous;
75550 if (dirent) {
75551 if (__put_user(offset, &dirent->d_off))
75552@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
75553 if (!f.file)
75554 return -EBADF;
75555
75556+ buf.file = f.file;
75557 error = iterate_dir(f.file, &buf.ctx);
75558 if (error >= 0)
75559 error = buf.error;
75560@@ -230,6 +243,7 @@ struct getdents_callback64 {
75561 struct dir_context ctx;
75562 struct linux_dirent64 __user * current_dir;
75563 struct linux_dirent64 __user * previous;
75564+ struct file *file;
75565 int count;
75566 int error;
75567 };
75568@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
75569 buf->error = -EINVAL; /* only used if we fail.. */
75570 if (reclen > buf->count)
75571 return -EINVAL;
75572+
75573+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75574+ return 0;
75575+
75576 dirent = buf->previous;
75577 if (dirent) {
75578 if (__put_user(offset, &dirent->d_off))
75579@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
75580 if (!f.file)
75581 return -EBADF;
75582
75583+ buf.file = f.file;
75584 error = iterate_dir(f.file, &buf.ctx);
75585 if (error >= 0)
75586 error = buf.error;
75587diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
75588index 9c02d96..6562c10 100644
75589--- a/fs/reiserfs/do_balan.c
75590+++ b/fs/reiserfs/do_balan.c
75591@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
75592 return;
75593 }
75594
75595- atomic_inc(&fs_generation(tb->tb_sb));
75596+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
75597 do_balance_starts(tb);
75598
75599 /*
75600diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
75601index aca73dd..e3c558d 100644
75602--- a/fs/reiserfs/item_ops.c
75603+++ b/fs/reiserfs/item_ops.c
75604@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
75605 }
75606
75607 static struct item_operations errcatch_ops = {
75608- errcatch_bytes_number,
75609- errcatch_decrement_key,
75610- errcatch_is_left_mergeable,
75611- errcatch_print_item,
75612- errcatch_check_item,
75613+ .bytes_number = errcatch_bytes_number,
75614+ .decrement_key = errcatch_decrement_key,
75615+ .is_left_mergeable = errcatch_is_left_mergeable,
75616+ .print_item = errcatch_print_item,
75617+ .check_item = errcatch_check_item,
75618
75619- errcatch_create_vi,
75620- errcatch_check_left,
75621- errcatch_check_right,
75622- errcatch_part_size,
75623- errcatch_unit_num,
75624- errcatch_print_vi
75625+ .create_vi = errcatch_create_vi,
75626+ .check_left = errcatch_check_left,
75627+ .check_right = errcatch_check_right,
75628+ .part_size = errcatch_part_size,
75629+ .unit_num = errcatch_unit_num,
75630+ .print_vi = errcatch_print_vi
75631 };
75632
75633 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
75634diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
75635index 621b9f3..af527fd 100644
75636--- a/fs/reiserfs/procfs.c
75637+++ b/fs/reiserfs/procfs.c
75638@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
75639 "SMALL_TAILS " : "NO_TAILS ",
75640 replay_only(sb) ? "REPLAY_ONLY " : "",
75641 convert_reiserfs(sb) ? "CONV " : "",
75642- atomic_read(&r->s_generation_counter),
75643+ atomic_read_unchecked(&r->s_generation_counter),
75644 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
75645 SF(s_do_balance), SF(s_unneeded_left_neighbor),
75646 SF(s_good_search_by_key_reada), SF(s_bmaps),
75647diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
75648index bb79cdd..fcf49ef 100644
75649--- a/fs/reiserfs/reiserfs.h
75650+++ b/fs/reiserfs/reiserfs.h
75651@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
75652 /* Comment? -Hans */
75653 wait_queue_head_t s_wait;
75654 /* increased by one every time the tree gets re-balanced */
75655- atomic_t s_generation_counter;
75656+ atomic_unchecked_t s_generation_counter;
75657
75658 /* File system properties. Currently holds on-disk FS format */
75659 unsigned long s_properties;
75660@@ -2301,7 +2301,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
75661 #define REISERFS_USER_MEM 1 /* user memory mode */
75662
75663 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
75664-#define get_generation(s) atomic_read (&fs_generation(s))
75665+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
75666 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
75667 #define __fs_changed(gen,s) (gen != get_generation (s))
75668 #define fs_changed(gen,s) \
75669diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
75670index 71fbbe3..eff29ba 100644
75671--- a/fs/reiserfs/super.c
75672+++ b/fs/reiserfs/super.c
75673@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
75674 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
75675 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
75676 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
75677+#ifdef CONFIG_REISERFS_FS_XATTR
75678+ /* turn on user xattrs by default */
75679+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
75680+#endif
75681 /* no preallocation minimum, be smart in reiserfs_file_write instead */
75682 sbi->s_alloc_options.preallocmin = 0;
75683 /* Preallocate by 16 blocks (17-1) at once */
75684diff --git a/fs/select.c b/fs/select.c
75685index f684c75..4117611 100644
75686--- a/fs/select.c
75687+++ b/fs/select.c
75688@@ -20,6 +20,7 @@
75689 #include <linux/export.h>
75690 #include <linux/slab.h>
75691 #include <linux/poll.h>
75692+#include <linux/security.h>
75693 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
75694 #include <linux/file.h>
75695 #include <linux/fdtable.h>
75696@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
75697 struct poll_list *walk = head;
75698 unsigned long todo = nfds;
75699
75700+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
75701 if (nfds > rlimit(RLIMIT_NOFILE))
75702 return -EINVAL;
75703
75704diff --git a/fs/seq_file.c b/fs/seq_file.c
75705index 555f821..34684d7 100644
75706--- a/fs/seq_file.c
75707+++ b/fs/seq_file.c
75708@@ -12,6 +12,8 @@
75709 #include <linux/slab.h>
75710 #include <linux/cred.h>
75711 #include <linux/mm.h>
75712+#include <linux/sched.h>
75713+#include <linux/grsecurity.h>
75714
75715 #include <asm/uaccess.h>
75716 #include <asm/page.h>
75717@@ -23,16 +25,7 @@ static void seq_set_overflow(struct seq_file *m)
75718
75719 static void *seq_buf_alloc(unsigned long size)
75720 {
75721- void *buf;
75722-
75723- /*
75724- * __GFP_NORETRY to avoid oom-killings with high-order allocations -
75725- * it's better to fall back to vmalloc() than to kill things.
75726- */
75727- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
75728- if (!buf && size > PAGE_SIZE)
75729- buf = vmalloc(size);
75730- return buf;
75731+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
75732 }
75733
75734 /**
75735@@ -65,6 +58,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
75736 #ifdef CONFIG_USER_NS
75737 p->user_ns = file->f_cred->user_ns;
75738 #endif
75739+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75740+ p->exec_id = current->exec_id;
75741+#endif
75742
75743 /*
75744 * Wrappers around seq_open(e.g. swaps_open) need to be
75745@@ -87,6 +83,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
75746 }
75747 EXPORT_SYMBOL(seq_open);
75748
75749+
75750+int seq_open_restrict(struct file *file, const struct seq_operations *op)
75751+{
75752+ if (gr_proc_is_restricted())
75753+ return -EACCES;
75754+
75755+ return seq_open(file, op);
75756+}
75757+EXPORT_SYMBOL(seq_open_restrict);
75758+
75759 static int traverse(struct seq_file *m, loff_t offset)
75760 {
75761 loff_t pos = 0, index;
75762@@ -158,7 +164,7 @@ Eoverflow:
75763 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
75764 {
75765 struct seq_file *m = file->private_data;
75766- size_t copied = 0;
75767+ ssize_t copied = 0;
75768 loff_t pos;
75769 size_t n;
75770 void *p;
75771@@ -557,7 +563,7 @@ static void single_stop(struct seq_file *p, void *v)
75772 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
75773 void *data)
75774 {
75775- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
75776+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
75777 int res = -ENOMEM;
75778
75779 if (op) {
75780@@ -593,6 +599,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
75781 }
75782 EXPORT_SYMBOL(single_open_size);
75783
75784+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
75785+ void *data)
75786+{
75787+ if (gr_proc_is_restricted())
75788+ return -EACCES;
75789+
75790+ return single_open(file, show, data);
75791+}
75792+EXPORT_SYMBOL(single_open_restrict);
75793+
75794+
75795 int single_release(struct inode *inode, struct file *file)
75796 {
75797 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
75798diff --git a/fs/splice.c b/fs/splice.c
75799index 7968da9..4ce985b 100644
75800--- a/fs/splice.c
75801+++ b/fs/splice.c
75802@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75803 pipe_lock(pipe);
75804
75805 for (;;) {
75806- if (!pipe->readers) {
75807+ if (!atomic_read(&pipe->readers)) {
75808 send_sig(SIGPIPE, current, 0);
75809 if (!ret)
75810 ret = -EPIPE;
75811@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75812 page_nr++;
75813 ret += buf->len;
75814
75815- if (pipe->files)
75816+ if (atomic_read(&pipe->files))
75817 do_wakeup = 1;
75818
75819 if (!--spd->nr_pages)
75820@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75821 do_wakeup = 0;
75822 }
75823
75824- pipe->waiting_writers++;
75825+ atomic_inc(&pipe->waiting_writers);
75826 pipe_wait(pipe);
75827- pipe->waiting_writers--;
75828+ atomic_dec(&pipe->waiting_writers);
75829 }
75830
75831 pipe_unlock(pipe);
75832@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
75833 old_fs = get_fs();
75834 set_fs(get_ds());
75835 /* The cast to a user pointer is valid due to the set_fs() */
75836- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
75837+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
75838 set_fs(old_fs);
75839
75840 return res;
75841@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
75842 old_fs = get_fs();
75843 set_fs(get_ds());
75844 /* The cast to a user pointer is valid due to the set_fs() */
75845- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
75846+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
75847 set_fs(old_fs);
75848
75849 return res;
75850@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
75851 goto err;
75852
75853 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
75854- vec[i].iov_base = (void __user *) page_address(page);
75855+ vec[i].iov_base = (void __force_user *) page_address(page);
75856 vec[i].iov_len = this_len;
75857 spd.pages[i] = page;
75858 spd.nr_pages++;
75859@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
75860 ops->release(pipe, buf);
75861 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
75862 pipe->nrbufs--;
75863- if (pipe->files)
75864+ if (atomic_read(&pipe->files))
75865 sd->need_wakeup = true;
75866 }
75867
75868@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
75869 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
75870 {
75871 while (!pipe->nrbufs) {
75872- if (!pipe->writers)
75873+ if (!atomic_read(&pipe->writers))
75874 return 0;
75875
75876- if (!pipe->waiting_writers && sd->num_spliced)
75877+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
75878 return 0;
75879
75880 if (sd->flags & SPLICE_F_NONBLOCK)
75881@@ -1025,7 +1025,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
75882 ops->release(pipe, buf);
75883 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
75884 pipe->nrbufs--;
75885- if (pipe->files)
75886+ if (atomic_read(&pipe->files))
75887 sd.need_wakeup = true;
75888 } else {
75889 buf->offset += ret;
75890@@ -1159,7 +1159,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75891 long ret, bytes;
75892 umode_t i_mode;
75893 size_t len;
75894- int i, flags;
75895+ int i, flags, more;
75896
75897 /*
75898 * We require the input being a regular file, as we don't want to
75899@@ -1185,7 +1185,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75900 * out of the pipe right after the splice_to_pipe(). So set
75901 * PIPE_READERS appropriately.
75902 */
75903- pipe->readers = 1;
75904+ atomic_set(&pipe->readers, 1);
75905
75906 current->splice_pipe = pipe;
75907 }
75908@@ -1202,6 +1202,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75909 * Don't block on output, we have to drain the direct pipe.
75910 */
75911 sd->flags &= ~SPLICE_F_NONBLOCK;
75912+ more = sd->flags & SPLICE_F_MORE;
75913
75914 while (len) {
75915 size_t read_len;
75916@@ -1215,6 +1216,15 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75917 sd->total_len = read_len;
75918
75919 /*
75920+ * If more data is pending, set SPLICE_F_MORE
75921+ * If this is the last data and SPLICE_F_MORE was not set
75922+ * initially, clears it.
75923+ */
75924+ if (read_len < len)
75925+ sd->flags |= SPLICE_F_MORE;
75926+ else if (!more)
75927+ sd->flags &= ~SPLICE_F_MORE;
75928+ /*
75929 * NOTE: nonblocking mode only applies to the input. We
75930 * must not do the output in nonblocking mode as then we
75931 * could get stuck data in the internal pipe:
75932@@ -1482,6 +1492,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
75933
75934 partial[buffers].offset = off;
75935 partial[buffers].len = plen;
75936+ partial[buffers].private = 0;
75937
75938 off = 0;
75939 len -= plen;
75940@@ -1718,9 +1729,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75941 ret = -ERESTARTSYS;
75942 break;
75943 }
75944- if (!pipe->writers)
75945+ if (!atomic_read(&pipe->writers))
75946 break;
75947- if (!pipe->waiting_writers) {
75948+ if (!atomic_read(&pipe->waiting_writers)) {
75949 if (flags & SPLICE_F_NONBLOCK) {
75950 ret = -EAGAIN;
75951 break;
75952@@ -1752,7 +1763,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75953 pipe_lock(pipe);
75954
75955 while (pipe->nrbufs >= pipe->buffers) {
75956- if (!pipe->readers) {
75957+ if (!atomic_read(&pipe->readers)) {
75958 send_sig(SIGPIPE, current, 0);
75959 ret = -EPIPE;
75960 break;
75961@@ -1765,9 +1776,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75962 ret = -ERESTARTSYS;
75963 break;
75964 }
75965- pipe->waiting_writers++;
75966+ atomic_inc(&pipe->waiting_writers);
75967 pipe_wait(pipe);
75968- pipe->waiting_writers--;
75969+ atomic_dec(&pipe->waiting_writers);
75970 }
75971
75972 pipe_unlock(pipe);
75973@@ -1803,14 +1814,14 @@ retry:
75974 pipe_double_lock(ipipe, opipe);
75975
75976 do {
75977- if (!opipe->readers) {
75978+ if (!atomic_read(&opipe->readers)) {
75979 send_sig(SIGPIPE, current, 0);
75980 if (!ret)
75981 ret = -EPIPE;
75982 break;
75983 }
75984
75985- if (!ipipe->nrbufs && !ipipe->writers)
75986+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
75987 break;
75988
75989 /*
75990@@ -1907,7 +1918,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
75991 pipe_double_lock(ipipe, opipe);
75992
75993 do {
75994- if (!opipe->readers) {
75995+ if (!atomic_read(&opipe->readers)) {
75996 send_sig(SIGPIPE, current, 0);
75997 if (!ret)
75998 ret = -EPIPE;
75999@@ -1952,7 +1963,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
76000 * return EAGAIN if we have the potential of some data in the
76001 * future, otherwise just return 0
76002 */
76003- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
76004+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
76005 ret = -EAGAIN;
76006
76007 pipe_unlock(ipipe);
76008diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
76009index 92fcde7..1687329 100644
76010--- a/fs/squashfs/xattr.c
76011+++ b/fs/squashfs/xattr.c
76012@@ -46,8 +46,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
76013 + msblk->xattr_table;
76014 int offset = SQUASHFS_XATTR_OFFSET(squashfs_i(inode)->xattr);
76015 int count = squashfs_i(inode)->xattr_count;
76016- size_t rest = buffer_size;
76017- int err;
76018+ size_t used = 0;
76019+ ssize_t err;
76020
76021 /* check that the file system has xattrs */
76022 if (msblk->xattr_id_table == NULL)
76023@@ -68,11 +68,11 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
76024 name_size = le16_to_cpu(entry.size);
76025 handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
76026 if (handler)
76027- prefix_size = handler->list(d, buffer, rest, NULL,
76028+ prefix_size = handler->list(d, buffer, buffer ? buffer_size - used : 0, NULL,
76029 name_size, handler->flags);
76030 if (prefix_size) {
76031 if (buffer) {
76032- if (prefix_size + name_size + 1 > rest) {
76033+ if (prefix_size + name_size + 1 > buffer_size - used) {
76034 err = -ERANGE;
76035 goto failed;
76036 }
76037@@ -86,7 +86,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
76038 buffer[name_size] = '\0';
76039 buffer += name_size + 1;
76040 }
76041- rest -= prefix_size + name_size + 1;
76042+ used += prefix_size + name_size + 1;
76043 } else {
76044 /* no handler or insuffficient privileges, so skip */
76045 err = squashfs_read_metadata(sb, NULL, &start,
76046@@ -107,7 +107,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
76047 if (err < 0)
76048 goto failed;
76049 }
76050- err = buffer_size - rest;
76051+ err = used;
76052
76053 failed:
76054 return err;
76055diff --git a/fs/stat.c b/fs/stat.c
76056index ae0c3ce..9ee641c 100644
76057--- a/fs/stat.c
76058+++ b/fs/stat.c
76059@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
76060 stat->gid = inode->i_gid;
76061 stat->rdev = inode->i_rdev;
76062 stat->size = i_size_read(inode);
76063- stat->atime = inode->i_atime;
76064- stat->mtime = inode->i_mtime;
76065+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
76066+ stat->atime = inode->i_ctime;
76067+ stat->mtime = inode->i_ctime;
76068+ } else {
76069+ stat->atime = inode->i_atime;
76070+ stat->mtime = inode->i_mtime;
76071+ }
76072 stat->ctime = inode->i_ctime;
76073 stat->blksize = (1 << inode->i_blkbits);
76074 stat->blocks = inode->i_blocks;
76075@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
76076 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
76077 {
76078 struct inode *inode = path->dentry->d_inode;
76079+ int retval;
76080
76081- if (inode->i_op->getattr)
76082- return inode->i_op->getattr(path->mnt, path->dentry, stat);
76083+ if (inode->i_op->getattr) {
76084+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
76085+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
76086+ stat->atime = stat->ctime;
76087+ stat->mtime = stat->ctime;
76088+ }
76089+ return retval;
76090+ }
76091
76092 generic_fillattr(inode, stat);
76093 return 0;
76094diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
76095index 0b45ff4..edf9d3a 100644
76096--- a/fs/sysfs/dir.c
76097+++ b/fs/sysfs/dir.c
76098@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
76099 kfree(buf);
76100 }
76101
76102+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
76103+extern int grsec_enable_sysfs_restrict;
76104+#endif
76105+
76106 /**
76107 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
76108 * @kobj: object we're creating directory for
76109@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
76110 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
76111 {
76112 struct kernfs_node *parent, *kn;
76113+ const char *name;
76114+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
76115+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
76116+ const char *parent_name;
76117+#endif
76118
76119 BUG_ON(!kobj);
76120
76121+ name = kobject_name(kobj);
76122+
76123 if (kobj->parent)
76124 parent = kobj->parent->sd;
76125 else
76126@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
76127 if (!parent)
76128 return -ENOENT;
76129
76130- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
76131- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
76132+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
76133+ parent_name = parent->name;
76134+ mode = S_IRWXU;
76135+
76136+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
76137+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
76138+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
76139+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
76140+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
76141+ if (!grsec_enable_sysfs_restrict)
76142+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
76143+#endif
76144+
76145+ kn = kernfs_create_dir_ns(parent, name,
76146+ mode, kobj, ns);
76147 if (IS_ERR(kn)) {
76148 if (PTR_ERR(kn) == -EEXIST)
76149- sysfs_warn_dup(parent, kobject_name(kobj));
76150+ sysfs_warn_dup(parent, name);
76151 return PTR_ERR(kn);
76152 }
76153
76154diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
76155index 69d4889..a810bd4 100644
76156--- a/fs/sysv/sysv.h
76157+++ b/fs/sysv/sysv.h
76158@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
76159 #endif
76160 }
76161
76162-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
76163+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
76164 {
76165 if (sbi->s_bytesex == BYTESEX_PDP)
76166 return PDP_swab((__force __u32)n);
76167diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
76168index fb08b0c..65fcc7e 100644
76169--- a/fs/ubifs/io.c
76170+++ b/fs/ubifs/io.c
76171@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
76172 return err;
76173 }
76174
76175-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
76176+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
76177 {
76178 int err;
76179
76180diff --git a/fs/udf/misc.c b/fs/udf/misc.c
76181index c175b4d..8f36a16 100644
76182--- a/fs/udf/misc.c
76183+++ b/fs/udf/misc.c
76184@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
76185
76186 u8 udf_tag_checksum(const struct tag *t)
76187 {
76188- u8 *data = (u8 *)t;
76189+ const u8 *data = (const u8 *)t;
76190 u8 checksum = 0;
76191 int i;
76192 for (i = 0; i < sizeof(struct tag); ++i)
76193diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
76194index 8d974c4..b82f6ec 100644
76195--- a/fs/ufs/swab.h
76196+++ b/fs/ufs/swab.h
76197@@ -22,7 +22,7 @@ enum {
76198 BYTESEX_BE
76199 };
76200
76201-static inline u64
76202+static inline u64 __intentional_overflow(-1)
76203 fs64_to_cpu(struct super_block *sbp, __fs64 n)
76204 {
76205 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
76206@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
76207 return (__force __fs64)cpu_to_be64(n);
76208 }
76209
76210-static inline u32
76211+static inline u32 __intentional_overflow(-1)
76212 fs32_to_cpu(struct super_block *sbp, __fs32 n)
76213 {
76214 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
76215diff --git a/fs/utimes.c b/fs/utimes.c
76216index aa138d6..5f3a811 100644
76217--- a/fs/utimes.c
76218+++ b/fs/utimes.c
76219@@ -1,6 +1,7 @@
76220 #include <linux/compiler.h>
76221 #include <linux/file.h>
76222 #include <linux/fs.h>
76223+#include <linux/security.h>
76224 #include <linux/linkage.h>
76225 #include <linux/mount.h>
76226 #include <linux/namei.h>
76227@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
76228 }
76229 }
76230 retry_deleg:
76231+
76232+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
76233+ error = -EACCES;
76234+ goto mnt_drop_write_and_out;
76235+ }
76236+
76237 mutex_lock(&inode->i_mutex);
76238 error = notify_change(path->dentry, &newattrs, &delegated_inode);
76239 mutex_unlock(&inode->i_mutex);
76240diff --git a/fs/xattr.c b/fs/xattr.c
76241index 4ef6985..a6cd6567 100644
76242--- a/fs/xattr.c
76243+++ b/fs/xattr.c
76244@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
76245 return rc;
76246 }
76247
76248+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
76249+ssize_t
76250+pax_getxattr(struct dentry *dentry, void *value, size_t size)
76251+{
76252+ struct inode *inode = dentry->d_inode;
76253+ ssize_t error;
76254+
76255+ error = inode_permission(inode, MAY_EXEC);
76256+ if (error)
76257+ return error;
76258+
76259+ if (inode->i_op->getxattr)
76260+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
76261+ else
76262+ error = -EOPNOTSUPP;
76263+
76264+ return error;
76265+}
76266+EXPORT_SYMBOL(pax_getxattr);
76267+#endif
76268+
76269 ssize_t
76270 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
76271 {
76272@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
76273 * Extended attribute SET operations
76274 */
76275 static long
76276-setxattr(struct dentry *d, const char __user *name, const void __user *value,
76277+setxattr(struct path *path, const char __user *name, const void __user *value,
76278 size_t size, int flags)
76279 {
76280 int error;
76281@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
76282 posix_acl_fix_xattr_from_user(kvalue, size);
76283 }
76284
76285- error = vfs_setxattr(d, kname, kvalue, size, flags);
76286+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
76287+ error = -EACCES;
76288+ goto out;
76289+ }
76290+
76291+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
76292 out:
76293 if (vvalue)
76294 vfree(vvalue);
76295@@ -376,7 +402,7 @@ retry:
76296 return error;
76297 error = mnt_want_write(path.mnt);
76298 if (!error) {
76299- error = setxattr(path.dentry, name, value, size, flags);
76300+ error = setxattr(&path, name, value, size, flags);
76301 mnt_drop_write(path.mnt);
76302 }
76303 path_put(&path);
76304@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
76305 audit_file(f.file);
76306 error = mnt_want_write_file(f.file);
76307 if (!error) {
76308- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
76309+ error = setxattr(&f.file->f_path, name, value, size, flags);
76310 mnt_drop_write_file(f.file);
76311 }
76312 fdput(f);
76313@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
76314 * Extended attribute REMOVE operations
76315 */
76316 static long
76317-removexattr(struct dentry *d, const char __user *name)
76318+removexattr(struct path *path, const char __user *name)
76319 {
76320 int error;
76321 char kname[XATTR_NAME_MAX + 1];
76322@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
76323 if (error < 0)
76324 return error;
76325
76326- return vfs_removexattr(d, kname);
76327+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
76328+ return -EACCES;
76329+
76330+ return vfs_removexattr(path->dentry, kname);
76331 }
76332
76333 static int path_removexattr(const char __user *pathname,
76334@@ -623,7 +652,7 @@ retry:
76335 return error;
76336 error = mnt_want_write(path.mnt);
76337 if (!error) {
76338- error = removexattr(path.dentry, name);
76339+ error = removexattr(&path, name);
76340 mnt_drop_write(path.mnt);
76341 }
76342 path_put(&path);
76343@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
76344 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
76345 {
76346 struct fd f = fdget(fd);
76347+ struct path *path;
76348 int error = -EBADF;
76349
76350 if (!f.file)
76351 return error;
76352+ path = &f.file->f_path;
76353 audit_file(f.file);
76354 error = mnt_want_write_file(f.file);
76355 if (!error) {
76356- error = removexattr(f.file->f_path.dentry, name);
76357+ error = removexattr(path, name);
76358 mnt_drop_write_file(f.file);
76359 }
76360 fdput(f);
76361diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
76362index 61ec015..7c18807 100644
76363--- a/fs/xfs/libxfs/xfs_bmap.c
76364+++ b/fs/xfs/libxfs/xfs_bmap.c
76365@@ -580,7 +580,7 @@ xfs_bmap_validate_ret(
76366
76367 #else
76368 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
76369-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
76370+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
76371 #endif /* DEBUG */
76372
76373 /*
76374diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
76375index 098cd78..724d3f8 100644
76376--- a/fs/xfs/xfs_dir2_readdir.c
76377+++ b/fs/xfs/xfs_dir2_readdir.c
76378@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
76379 ino = dp->d_ops->sf_get_ino(sfp, sfep);
76380 filetype = dp->d_ops->sf_get_ftype(sfep);
76381 ctx->pos = off & 0x7fffffff;
76382- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
76383+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
76384+ char name[sfep->namelen];
76385+ memcpy(name, sfep->name, sfep->namelen);
76386+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
76387+ return 0;
76388+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
76389 xfs_dir3_get_dtype(dp->i_mount, filetype)))
76390 return 0;
76391 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
76392diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
76393index ac4feae..386d551 100644
76394--- a/fs/xfs/xfs_ioctl.c
76395+++ b/fs/xfs/xfs_ioctl.c
76396@@ -120,7 +120,7 @@ xfs_find_handle(
76397 }
76398
76399 error = -EFAULT;
76400- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
76401+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
76402 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
76403 goto out_put;
76404
76405diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
76406index c31d2c2..6ec8f62 100644
76407--- a/fs/xfs/xfs_linux.h
76408+++ b/fs/xfs/xfs_linux.h
76409@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
76410 * of the compiler which do not like us using do_div in the middle
76411 * of large functions.
76412 */
76413-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
76414+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
76415 {
76416 __u32 mod;
76417
76418@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
76419 return 0;
76420 }
76421 #else
76422-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
76423+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
76424 {
76425 __u32 mod;
76426
76427diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
76428new file mode 100644
76429index 0000000..31f8fe4
76430--- /dev/null
76431+++ b/grsecurity/Kconfig
76432@@ -0,0 +1,1182 @@
76433+#
76434+# grecurity configuration
76435+#
76436+menu "Memory Protections"
76437+depends on GRKERNSEC
76438+
76439+config GRKERNSEC_KMEM
76440+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
76441+ default y if GRKERNSEC_CONFIG_AUTO
76442+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
76443+ help
76444+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
76445+ be written to or read from to modify or leak the contents of the running
76446+ kernel. /dev/port will also not be allowed to be opened, writing to
76447+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
76448+ If you have module support disabled, enabling this will close up several
76449+ ways that are currently used to insert malicious code into the running
76450+ kernel.
76451+
76452+ Even with this feature enabled, we still highly recommend that
76453+ you use the RBAC system, as it is still possible for an attacker to
76454+ modify the running kernel through other more obscure methods.
76455+
76456+ It is highly recommended that you say Y here if you meet all the
76457+ conditions above.
76458+
76459+config GRKERNSEC_VM86
76460+ bool "Restrict VM86 mode"
76461+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76462+ depends on X86_32
76463+
76464+ help
76465+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
76466+ make use of a special execution mode on 32bit x86 processors called
76467+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
76468+ video cards and will still work with this option enabled. The purpose
76469+ of the option is to prevent exploitation of emulation errors in
76470+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
76471+ Nearly all users should be able to enable this option.
76472+
76473+config GRKERNSEC_IO
76474+ bool "Disable privileged I/O"
76475+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76476+ depends on X86
76477+ select RTC_CLASS
76478+ select RTC_INTF_DEV
76479+ select RTC_DRV_CMOS
76480+
76481+ help
76482+ If you say Y here, all ioperm and iopl calls will return an error.
76483+ Ioperm and iopl can be used to modify the running kernel.
76484+ Unfortunately, some programs need this access to operate properly,
76485+ the most notable of which are XFree86 and hwclock. hwclock can be
76486+ remedied by having RTC support in the kernel, so real-time
76487+ clock support is enabled if this option is enabled, to ensure
76488+ that hwclock operates correctly. If hwclock still does not work,
76489+ either update udev or symlink /dev/rtc to /dev/rtc0.
76490+
76491+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
76492+ you may not be able to boot into a graphical environment with this
76493+ option enabled. In this case, you should use the RBAC system instead.
76494+
76495+config GRKERNSEC_BPF_HARDEN
76496+ bool "Harden BPF interpreter"
76497+ default y if GRKERNSEC_CONFIG_AUTO
76498+ help
76499+ Unlike previous versions of grsecurity that hardened both the BPF
76500+ interpreted code against corruption at rest as well as the JIT code
76501+ against JIT-spray attacks and attacker-controlled immediate values
76502+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
76503+ and will ensure the interpreted code is read-only at rest. This feature
76504+ may be removed at a later time when eBPF stabilizes to entirely revert
76505+ back to the more secure pre-3.16 BPF interpreter/JIT.
76506+
76507+ If you're using KERNEXEC, it's recommended that you enable this option
76508+ to supplement the hardening of the kernel.
76509+
76510+config GRKERNSEC_PERF_HARDEN
76511+ bool "Disable unprivileged PERF_EVENTS usage by default"
76512+ default y if GRKERNSEC_CONFIG_AUTO
76513+ depends on PERF_EVENTS
76514+ help
76515+ If you say Y here, the range of acceptable values for the
76516+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
76517+ default to a new value: 3. When the sysctl is set to this value, no
76518+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
76519+
76520+ Though PERF_EVENTS can be used legitimately for performance monitoring
76521+ and low-level application profiling, it is forced on regardless of
76522+ configuration, has been at fault for several vulnerabilities, and
76523+ creates new opportunities for side channels and other information leaks.
76524+
76525+ This feature puts PERF_EVENTS into a secure default state and permits
76526+ the administrator to change out of it temporarily if unprivileged
76527+ application profiling is needed.
76528+
76529+config GRKERNSEC_RAND_THREADSTACK
76530+ bool "Insert random gaps between thread stacks"
76531+ default y if GRKERNSEC_CONFIG_AUTO
76532+ depends on PAX_RANDMMAP && !PPC
76533+ help
76534+ If you say Y here, a random-sized gap will be enforced between allocated
76535+ thread stacks. Glibc's NPTL and other threading libraries that
76536+ pass MAP_STACK to the kernel for thread stack allocation are supported.
76537+ The implementation currently provides 8 bits of entropy for the gap.
76538+
76539+ Many distributions do not compile threaded remote services with the
76540+ -fstack-check argument to GCC, causing the variable-sized stack-based
76541+ allocator, alloca(), to not probe the stack on allocation. This
76542+ permits an unbounded alloca() to skip over any guard page and potentially
76543+ modify another thread's stack reliably. An enforced random gap
76544+ reduces the reliability of such an attack and increases the chance
76545+ that such a read/write to another thread's stack instead lands in
76546+ an unmapped area, causing a crash and triggering grsecurity's
76547+ anti-bruteforcing logic.
76548+
76549+config GRKERNSEC_PROC_MEMMAP
76550+ bool "Harden ASLR against information leaks and entropy reduction"
76551+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
76552+ depends on PAX_NOEXEC || PAX_ASLR
76553+ help
76554+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
76555+ give no information about the addresses of its mappings if
76556+ PaX features that rely on random addresses are enabled on the task.
76557+ In addition to sanitizing this information and disabling other
76558+ dangerous sources of information, this option causes reads of sensitive
76559+ /proc/<pid> entries where the file descriptor was opened in a different
76560+ task than the one performing the read. Such attempts are logged.
76561+ This option also limits argv/env strings for suid/sgid binaries
76562+ to 512KB to prevent a complete exhaustion of the stack entropy provided
76563+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
76564+ binaries to prevent alternative mmap layouts from being abused.
76565+
76566+ If you use PaX it is essential that you say Y here as it closes up
76567+ several holes that make full ASLR useless locally.
76568+
76569+
76570+config GRKERNSEC_KSTACKOVERFLOW
76571+ bool "Prevent kernel stack overflows"
76572+ default y if GRKERNSEC_CONFIG_AUTO
76573+ depends on !IA64 && 64BIT
76574+ help
76575+ If you say Y here, the kernel's process stacks will be allocated
76576+ with vmalloc instead of the kernel's default allocator. This
76577+ introduces guard pages that in combination with the alloca checking
76578+ of the STACKLEAK feature prevents all forms of kernel process stack
76579+ overflow abuse. Note that this is different from kernel stack
76580+ buffer overflows.
76581+
76582+config GRKERNSEC_BRUTE
76583+ bool "Deter exploit bruteforcing"
76584+ default y if GRKERNSEC_CONFIG_AUTO
76585+ help
76586+ If you say Y here, attempts to bruteforce exploits against forking
76587+ daemons such as apache or sshd, as well as against suid/sgid binaries
76588+ will be deterred. When a child of a forking daemon is killed by PaX
76589+ or crashes due to an illegal instruction or other suspicious signal,
76590+ the parent process will be delayed 30 seconds upon every subsequent
76591+ fork until the administrator is able to assess the situation and
76592+ restart the daemon.
76593+ In the suid/sgid case, the attempt is logged, the user has all their
76594+ existing instances of the suid/sgid binary terminated and will
76595+ be unable to execute any suid/sgid binaries for 15 minutes.
76596+
76597+ It is recommended that you also enable signal logging in the auditing
76598+ section so that logs are generated when a process triggers a suspicious
76599+ signal.
76600+ If the sysctl option is enabled, a sysctl option with name
76601+ "deter_bruteforce" is created.
76602+
76603+config GRKERNSEC_MODHARDEN
76604+ bool "Harden module auto-loading"
76605+ default y if GRKERNSEC_CONFIG_AUTO
76606+ depends on MODULES
76607+ help
76608+ If you say Y here, module auto-loading in response to use of some
76609+ feature implemented by an unloaded module will be restricted to
76610+ root users. Enabling this option helps defend against attacks
76611+ by unprivileged users who abuse the auto-loading behavior to
76612+ cause a vulnerable module to load that is then exploited.
76613+
76614+ If this option prevents a legitimate use of auto-loading for a
76615+ non-root user, the administrator can execute modprobe manually
76616+ with the exact name of the module mentioned in the alert log.
76617+ Alternatively, the administrator can add the module to the list
76618+ of modules loaded at boot by modifying init scripts.
76619+
76620+ Modification of init scripts will most likely be needed on
76621+ Ubuntu servers with encrypted home directory support enabled,
76622+ as the first non-root user logging in will cause the ecb(aes),
76623+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
76624+
76625+config GRKERNSEC_HIDESYM
76626+ bool "Hide kernel symbols"
76627+ default y if GRKERNSEC_CONFIG_AUTO
76628+ select PAX_USERCOPY_SLABS
76629+ help
76630+ If you say Y here, getting information on loaded modules, and
76631+ displaying all kernel symbols through a syscall will be restricted
76632+ to users with CAP_SYS_MODULE. For software compatibility reasons,
76633+ /proc/kallsyms will be restricted to the root user. The RBAC
76634+ system can hide that entry even from root.
76635+
76636+ This option also prevents leaking of kernel addresses through
76637+ several /proc entries.
76638+
76639+ Note that this option is only effective provided the following
76640+ conditions are met:
76641+ 1) The kernel using grsecurity is not precompiled by some distribution
76642+ 2) You have also enabled GRKERNSEC_DMESG
76643+ 3) You are using the RBAC system and hiding other files such as your
76644+ kernel image and System.map. Alternatively, enabling this option
76645+ causes the permissions on /boot, /lib/modules, and the kernel
76646+ source directory to change at compile time to prevent
76647+ reading by non-root users.
76648+ If the above conditions are met, this option will aid in providing a
76649+ useful protection against local kernel exploitation of overflows
76650+ and arbitrary read/write vulnerabilities.
76651+
76652+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
76653+ in addition to this feature.
76654+
76655+config GRKERNSEC_RANDSTRUCT
76656+ bool "Randomize layout of sensitive kernel structures"
76657+ default y if GRKERNSEC_CONFIG_AUTO
76658+ select GRKERNSEC_HIDESYM
76659+ select MODVERSIONS if MODULES
76660+ help
76661+ If you say Y here, the layouts of a number of sensitive kernel
76662+ structures (task, fs, cred, etc) and all structures composed entirely
76663+ of function pointers (aka "ops" structs) will be randomized at compile-time.
76664+ This can introduce the requirement of an additional infoleak
76665+ vulnerability for exploits targeting these structure types.
76666+
76667+ Enabling this feature will introduce some performance impact, slightly
76668+ increase memory usage, and prevent the use of forensic tools like
76669+ Volatility against the system (unless the kernel source tree isn't
76670+ cleaned after kernel installation).
76671+
76672+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
76673+ It remains after a make clean to allow for external modules to be compiled
76674+ with the existing seed and will be removed by a make mrproper or
76675+ make distclean.
76676+
76677+ Note that the implementation requires gcc 4.6.4. or newer. You may need
76678+ to install the supporting headers explicitly in addition to the normal
76679+ gcc package.
76680+
76681+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
76682+ bool "Use cacheline-aware structure randomization"
76683+ depends on GRKERNSEC_RANDSTRUCT
76684+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
76685+ help
76686+ If you say Y here, the RANDSTRUCT randomization will make a best effort
76687+ at restricting randomization to cacheline-sized groups of elements. It
76688+ will further not randomize bitfields in structures. This reduces the
76689+ performance hit of RANDSTRUCT at the cost of weakened randomization.
76690+
76691+config GRKERNSEC_KERN_LOCKOUT
76692+ bool "Active kernel exploit response"
76693+ default y if GRKERNSEC_CONFIG_AUTO
76694+ depends on X86 || ARM || PPC || SPARC
76695+ help
76696+ If you say Y here, when a PaX alert is triggered due to suspicious
76697+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
76698+ or an OOPS occurs due to bad memory accesses, instead of just
76699+ terminating the offending process (and potentially allowing
76700+ a subsequent exploit from the same user), we will take one of two
76701+ actions:
76702+ If the user was root, we will panic the system
76703+ If the user was non-root, we will log the attempt, terminate
76704+ all processes owned by the user, then prevent them from creating
76705+ any new processes until the system is restarted
76706+ This deters repeated kernel exploitation/bruteforcing attempts
76707+ and is useful for later forensics.
76708+
76709+config GRKERNSEC_OLD_ARM_USERLAND
76710+ bool "Old ARM userland compatibility"
76711+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
76712+ help
76713+ If you say Y here, stubs of executable code to perform such operations
76714+ as "compare-exchange" will be placed at fixed locations in the ARM vector
76715+ table. This is unfortunately needed for old ARM userland meant to run
76716+ across a wide range of processors. Without this option enabled,
76717+ the get_tls and data memory barrier stubs will be emulated by the kernel,
76718+ which is enough for Linaro userlands or other userlands designed for v6
76719+ and newer ARM CPUs. It's recommended that you try without this option enabled
76720+ first, and only enable it if your userland does not boot (it will likely fail
76721+ at init time).
76722+
76723+endmenu
76724+menu "Role Based Access Control Options"
76725+depends on GRKERNSEC
76726+
76727+config GRKERNSEC_RBAC_DEBUG
76728+ bool
76729+
76730+config GRKERNSEC_NO_RBAC
76731+ bool "Disable RBAC system"
76732+ help
76733+ If you say Y here, the /dev/grsec device will be removed from the kernel,
76734+ preventing the RBAC system from being enabled. You should only say Y
76735+ here if you have no intention of using the RBAC system, so as to prevent
76736+ an attacker with root access from misusing the RBAC system to hide files
76737+ and processes when loadable module support and /dev/[k]mem have been
76738+ locked down.
76739+
76740+config GRKERNSEC_ACL_HIDEKERN
76741+ bool "Hide kernel processes"
76742+ help
76743+ If you say Y here, all kernel threads will be hidden to all
76744+ processes but those whose subject has the "view hidden processes"
76745+ flag.
76746+
76747+config GRKERNSEC_ACL_MAXTRIES
76748+ int "Maximum tries before password lockout"
76749+ default 3
76750+ help
76751+ This option enforces the maximum number of times a user can attempt
76752+ to authorize themselves with the grsecurity RBAC system before being
76753+ denied the ability to attempt authorization again for a specified time.
76754+ The lower the number, the harder it will be to brute-force a password.
76755+
76756+config GRKERNSEC_ACL_TIMEOUT
76757+ int "Time to wait after max password tries, in seconds"
76758+ default 30
76759+ help
76760+ This option specifies the time the user must wait after attempting to
76761+ authorize to the RBAC system with the maximum number of invalid
76762+ passwords. The higher the number, the harder it will be to brute-force
76763+ a password.
76764+
76765+endmenu
76766+menu "Filesystem Protections"
76767+depends on GRKERNSEC
76768+
76769+config GRKERNSEC_PROC
76770+ bool "Proc restrictions"
76771+ default y if GRKERNSEC_CONFIG_AUTO
76772+ help
76773+ If you say Y here, the permissions of the /proc filesystem
76774+ will be altered to enhance system security and privacy. You MUST
76775+ choose either a user only restriction or a user and group restriction.
76776+ Depending upon the option you choose, you can either restrict users to
76777+ see only the processes they themselves run, or choose a group that can
76778+ view all processes and files normally restricted to root if you choose
76779+ the "restrict to user only" option. NOTE: If you're running identd or
76780+ ntpd as a non-root user, you will have to run it as the group you
76781+ specify here.
76782+
76783+config GRKERNSEC_PROC_USER
76784+ bool "Restrict /proc to user only"
76785+ depends on GRKERNSEC_PROC
76786+ help
76787+ If you say Y here, non-root users will only be able to view their own
76788+ processes, and restricts them from viewing network-related information,
76789+ and viewing kernel symbol and module information.
76790+
76791+config GRKERNSEC_PROC_USERGROUP
76792+ bool "Allow special group"
76793+ default y if GRKERNSEC_CONFIG_AUTO
76794+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
76795+ help
76796+ If you say Y here, you will be able to select a group that will be
76797+ able to view all processes and network-related information. If you've
76798+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
76799+ remain hidden. This option is useful if you want to run identd as
76800+ a non-root user. The group you select may also be chosen at boot time
76801+ via "grsec_proc_gid=" on the kernel commandline.
76802+
76803+config GRKERNSEC_PROC_GID
76804+ int "GID for special group"
76805+ depends on GRKERNSEC_PROC_USERGROUP
76806+ default 1001
76807+
76808+config GRKERNSEC_PROC_ADD
76809+ bool "Additional restrictions"
76810+ default y if GRKERNSEC_CONFIG_AUTO
76811+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
76812+ help
76813+ If you say Y here, additional restrictions will be placed on
76814+ /proc that keep normal users from viewing device information and
76815+ slabinfo information that could be useful for exploits.
76816+
76817+config GRKERNSEC_LINK
76818+ bool "Linking restrictions"
76819+ default y if GRKERNSEC_CONFIG_AUTO
76820+ help
76821+ If you say Y here, /tmp race exploits will be prevented, since users
76822+ will no longer be able to follow symlinks owned by other users in
76823+ world-writable +t directories (e.g. /tmp), unless the owner of the
76824+ symlink is the owner of the directory. users will also not be
76825+ able to hardlink to files they do not own. If the sysctl option is
76826+ enabled, a sysctl option with name "linking_restrictions" is created.
76827+
76828+config GRKERNSEC_SYMLINKOWN
76829+ bool "Kernel-enforced SymlinksIfOwnerMatch"
76830+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
76831+ help
76832+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
76833+ that prevents it from being used as a security feature. As Apache
76834+ verifies the symlink by performing a stat() against the target of
76835+ the symlink before it is followed, an attacker can setup a symlink
76836+ to point to a same-owned file, then replace the symlink with one
76837+ that targets another user's file just after Apache "validates" the
76838+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
76839+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
76840+ will be in place for the group you specify. If the sysctl option
76841+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
76842+ created.
76843+
76844+config GRKERNSEC_SYMLINKOWN_GID
76845+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
76846+ depends on GRKERNSEC_SYMLINKOWN
76847+ default 1006
76848+ help
76849+ Setting this GID determines what group kernel-enforced
76850+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
76851+ is enabled, a sysctl option with name "symlinkown_gid" is created.
76852+
76853+config GRKERNSEC_FIFO
76854+ bool "FIFO restrictions"
76855+ default y if GRKERNSEC_CONFIG_AUTO
76856+ help
76857+ If you say Y here, users will not be able to write to FIFOs they don't
76858+ own in world-writable +t directories (e.g. /tmp), unless the owner of
76859+ the FIFO is the same owner of the directory it's held in. If the sysctl
76860+ option is enabled, a sysctl option with name "fifo_restrictions" is
76861+ created.
76862+
76863+config GRKERNSEC_SYSFS_RESTRICT
76864+ bool "Sysfs/debugfs restriction"
76865+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76866+ depends on SYSFS
76867+ help
76868+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
76869+ any filesystem normally mounted under it (e.g. debugfs) will be
76870+ mostly accessible only by root. These filesystems generally provide access
76871+ to hardware and debug information that isn't appropriate for unprivileged
76872+ users of the system. Sysfs and debugfs have also become a large source
76873+ of new vulnerabilities, ranging from infoleaks to local compromise.
76874+ There has been very little oversight with an eye toward security involved
76875+ in adding new exporters of information to these filesystems, so their
76876+ use is discouraged.
76877+ For reasons of compatibility, a few directories have been whitelisted
76878+ for access by non-root users:
76879+ /sys/fs/selinux
76880+ /sys/fs/fuse
76881+ /sys/devices/system/cpu
76882+
76883+config GRKERNSEC_ROFS
76884+ bool "Runtime read-only mount protection"
76885+ depends on SYSCTL
76886+ help
76887+ If you say Y here, a sysctl option with name "romount_protect" will
76888+ be created. By setting this option to 1 at runtime, filesystems
76889+ will be protected in the following ways:
76890+ * No new writable mounts will be allowed
76891+ * Existing read-only mounts won't be able to be remounted read/write
76892+ * Write operations will be denied on all block devices
76893+ This option acts independently of grsec_lock: once it is set to 1,
76894+ it cannot be turned off. Therefore, please be mindful of the resulting
76895+ behavior if this option is enabled in an init script on a read-only
76896+ filesystem.
76897+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
76898+ and GRKERNSEC_IO should be enabled and module loading disabled via
76899+ config or at runtime.
76900+ This feature is mainly intended for secure embedded systems.
76901+
76902+
76903+config GRKERNSEC_DEVICE_SIDECHANNEL
76904+ bool "Eliminate stat/notify-based device sidechannels"
76905+ default y if GRKERNSEC_CONFIG_AUTO
76906+ help
76907+ If you say Y here, timing analyses on block or character
76908+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
76909+ will be thwarted for unprivileged users. If a process without
76910+ CAP_MKNOD stats such a device, the last access and last modify times
76911+ will match the device's create time. No access or modify events
76912+ will be triggered through inotify/dnotify/fanotify for such devices.
76913+ This feature will prevent attacks that may at a minimum
76914+ allow an attacker to determine the administrator's password length.
76915+
76916+config GRKERNSEC_CHROOT
76917+ bool "Chroot jail restrictions"
76918+ default y if GRKERNSEC_CONFIG_AUTO
76919+ help
76920+ If you say Y here, you will be able to choose several options that will
76921+ make breaking out of a chrooted jail much more difficult. If you
76922+ encounter no software incompatibilities with the following options, it
76923+ is recommended that you enable each one.
76924+
76925+ Note that the chroot restrictions are not intended to apply to "chroots"
76926+ to directories that are simple bind mounts of the global root filesystem.
76927+ For several other reasons, a user shouldn't expect any significant
76928+ security by performing such a chroot.
76929+
76930+config GRKERNSEC_CHROOT_MOUNT
76931+ bool "Deny mounts"
76932+ default y if GRKERNSEC_CONFIG_AUTO
76933+ depends on GRKERNSEC_CHROOT
76934+ help
76935+ If you say Y here, processes inside a chroot will not be able to
76936+ mount or remount filesystems. If the sysctl option is enabled, a
76937+ sysctl option with name "chroot_deny_mount" is created.
76938+
76939+config GRKERNSEC_CHROOT_DOUBLE
76940+ bool "Deny double-chroots"
76941+ default y if GRKERNSEC_CONFIG_AUTO
76942+ depends on GRKERNSEC_CHROOT
76943+ help
76944+ If you say Y here, processes inside a chroot will not be able to chroot
76945+ again outside the chroot. This is a widely used method of breaking
76946+ out of a chroot jail and should not be allowed. If the sysctl
76947+ option is enabled, a sysctl option with name
76948+ "chroot_deny_chroot" is created.
76949+
76950+config GRKERNSEC_CHROOT_PIVOT
76951+ bool "Deny pivot_root in chroot"
76952+ default y if GRKERNSEC_CONFIG_AUTO
76953+ depends on GRKERNSEC_CHROOT
76954+ help
76955+ If you say Y here, processes inside a chroot will not be able to use
76956+ a function called pivot_root() that was introduced in Linux 2.3.41. It
76957+ works similar to chroot in that it changes the root filesystem. This
76958+ function could be misused in a chrooted process to attempt to break out
76959+ of the chroot, and therefore should not be allowed. If the sysctl
76960+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
76961+ created.
76962+
76963+config GRKERNSEC_CHROOT_CHDIR
76964+ bool "Enforce chdir(\"/\") on all chroots"
76965+ default y if GRKERNSEC_CONFIG_AUTO
76966+ depends on GRKERNSEC_CHROOT
76967+ help
76968+ If you say Y here, the current working directory of all newly-chrooted
76969+ applications will be set to the the root directory of the chroot.
76970+ The man page on chroot(2) states:
76971+ Note that this call does not change the current working
76972+ directory, so that `.' can be outside the tree rooted at
76973+ `/'. In particular, the super-user can escape from a
76974+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
76975+
76976+ It is recommended that you say Y here, since it's not known to break
76977+ any software. If the sysctl option is enabled, a sysctl option with
76978+ name "chroot_enforce_chdir" is created.
76979+
76980+config GRKERNSEC_CHROOT_CHMOD
76981+ bool "Deny (f)chmod +s"
76982+ default y if GRKERNSEC_CONFIG_AUTO
76983+ depends on GRKERNSEC_CHROOT
76984+ help
76985+ If you say Y here, processes inside a chroot will not be able to chmod
76986+ or fchmod files to make them have suid or sgid bits. This protects
76987+ against another published method of breaking a chroot. If the sysctl
76988+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
76989+ created.
76990+
76991+config GRKERNSEC_CHROOT_FCHDIR
76992+ bool "Deny fchdir and fhandle out of chroot"
76993+ default y if GRKERNSEC_CONFIG_AUTO
76994+ depends on GRKERNSEC_CHROOT
76995+ help
76996+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
76997+ to a file descriptor of the chrooting process that points to a directory
76998+ outside the filesystem will be stopped. Additionally, this option prevents
76999+ use of the recently-created syscall for opening files by a guessable "file
77000+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
77001+ with name "chroot_deny_fchdir" is created.
77002+
77003+config GRKERNSEC_CHROOT_MKNOD
77004+ bool "Deny mknod"
77005+ default y if GRKERNSEC_CONFIG_AUTO
77006+ depends on GRKERNSEC_CHROOT
77007+ help
77008+ If you say Y here, processes inside a chroot will not be allowed to
77009+ mknod. The problem with using mknod inside a chroot is that it
77010+ would allow an attacker to create a device entry that is the same
77011+ as one on the physical root of your system, which could range from
77012+ anything from the console device to a device for your harddrive (which
77013+ they could then use to wipe the drive or steal data). It is recommended
77014+ that you say Y here, unless you run into software incompatibilities.
77015+ If the sysctl option is enabled, a sysctl option with name
77016+ "chroot_deny_mknod" is created.
77017+
77018+config GRKERNSEC_CHROOT_SHMAT
77019+ bool "Deny shmat() out of chroot"
77020+ default y if GRKERNSEC_CONFIG_AUTO
77021+ depends on GRKERNSEC_CHROOT
77022+ help
77023+ If you say Y here, processes inside a chroot will not be able to attach
77024+ to shared memory segments that were created outside of the chroot jail.
77025+ It is recommended that you say Y here. If the sysctl option is enabled,
77026+ a sysctl option with name "chroot_deny_shmat" is created.
77027+
77028+config GRKERNSEC_CHROOT_UNIX
77029+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
77030+ default y if GRKERNSEC_CONFIG_AUTO
77031+ depends on GRKERNSEC_CHROOT
77032+ help
77033+ If you say Y here, processes inside a chroot will not be able to
77034+ connect to abstract (meaning not belonging to a filesystem) Unix
77035+ domain sockets that were bound outside of a chroot. It is recommended
77036+ that you say Y here. If the sysctl option is enabled, a sysctl option
77037+ with name "chroot_deny_unix" is created.
77038+
77039+config GRKERNSEC_CHROOT_FINDTASK
77040+ bool "Protect outside processes"
77041+ default y if GRKERNSEC_CONFIG_AUTO
77042+ depends on GRKERNSEC_CHROOT
77043+ help
77044+ If you say Y here, processes inside a chroot will not be able to
77045+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
77046+ getsid, or view any process outside of the chroot. If the sysctl
77047+ option is enabled, a sysctl option with name "chroot_findtask" is
77048+ created.
77049+
77050+config GRKERNSEC_CHROOT_NICE
77051+ bool "Restrict priority changes"
77052+ default y if GRKERNSEC_CONFIG_AUTO
77053+ depends on GRKERNSEC_CHROOT
77054+ help
77055+ If you say Y here, processes inside a chroot will not be able to raise
77056+ the priority of processes in the chroot, or alter the priority of
77057+ processes outside the chroot. This provides more security than simply
77058+ removing CAP_SYS_NICE from the process' capability set. If the
77059+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
77060+ is created.
77061+
77062+config GRKERNSEC_CHROOT_SYSCTL
77063+ bool "Deny sysctl writes"
77064+ default y if GRKERNSEC_CONFIG_AUTO
77065+ depends on GRKERNSEC_CHROOT
77066+ help
77067+ If you say Y here, an attacker in a chroot will not be able to
77068+ write to sysctl entries, either by sysctl(2) or through a /proc
77069+ interface. It is strongly recommended that you say Y here. If the
77070+ sysctl option is enabled, a sysctl option with name
77071+ "chroot_deny_sysctl" is created.
77072+
77073+config GRKERNSEC_CHROOT_RENAME
77074+ bool "Deny bad renames"
77075+ default y if GRKERNSEC_CONFIG_AUTO
77076+ depends on GRKERNSEC_CHROOT
77077+ help
77078+ If you say Y here, an attacker in a chroot will not be able to
77079+ abuse the ability to create double chroots to break out of the
77080+ chroot by exploiting a race condition between a rename of a directory
77081+ within a chroot against an open of a symlink with relative path
77082+ components. This feature will likewise prevent an accomplice outside
77083+ a chroot from enabling a user inside the chroot to break out and make
77084+ use of their credentials on the global filesystem. Enabling this
77085+ feature is essential to prevent root users from breaking out of a
77086+ chroot. If the sysctl option is enabled, a sysctl option with name
77087+ "chroot_deny_bad_rename" is created.
77088+
77089+config GRKERNSEC_CHROOT_CAPS
77090+ bool "Capability restrictions"
77091+ default y if GRKERNSEC_CONFIG_AUTO
77092+ depends on GRKERNSEC_CHROOT
77093+ help
77094+ If you say Y here, the capabilities on all processes within a
77095+ chroot jail will be lowered to stop module insertion, raw i/o,
77096+ system and net admin tasks, rebooting the system, modifying immutable
77097+ files, modifying IPC owned by another, and changing the system time.
77098+ This is left an option because it can break some apps. Disable this
77099+ if your chrooted apps are having problems performing those kinds of
77100+ tasks. If the sysctl option is enabled, a sysctl option with
77101+ name "chroot_caps" is created.
77102+
77103+config GRKERNSEC_CHROOT_INITRD
77104+ bool "Exempt initrd tasks from restrictions"
77105+ default y if GRKERNSEC_CONFIG_AUTO
77106+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
77107+ help
77108+ If you say Y here, tasks started prior to init will be exempted from
77109+ grsecurity's chroot restrictions. This option is mainly meant to
77110+ resolve Plymouth's performing privileged operations unnecessarily
77111+ in a chroot.
77112+
77113+endmenu
77114+menu "Kernel Auditing"
77115+depends on GRKERNSEC
77116+
77117+config GRKERNSEC_AUDIT_GROUP
77118+ bool "Single group for auditing"
77119+ help
77120+ If you say Y here, the exec and chdir logging features will only operate
77121+ on a group you specify. This option is recommended if you only want to
77122+ watch certain users instead of having a large amount of logs from the
77123+ entire system. If the sysctl option is enabled, a sysctl option with
77124+ name "audit_group" is created.
77125+
77126+config GRKERNSEC_AUDIT_GID
77127+ int "GID for auditing"
77128+ depends on GRKERNSEC_AUDIT_GROUP
77129+ default 1007
77130+
77131+config GRKERNSEC_EXECLOG
77132+ bool "Exec logging"
77133+ help
77134+ If you say Y here, all execve() calls will be logged (since the
77135+ other exec*() calls are frontends to execve(), all execution
77136+ will be logged). Useful for shell-servers that like to keep track
77137+ of their users. If the sysctl option is enabled, a sysctl option with
77138+ name "exec_logging" is created.
77139+ WARNING: This option when enabled will produce a LOT of logs, especially
77140+ on an active system.
77141+
77142+config GRKERNSEC_RESLOG
77143+ bool "Resource logging"
77144+ default y if GRKERNSEC_CONFIG_AUTO
77145+ help
77146+ If you say Y here, all attempts to overstep resource limits will
77147+ be logged with the resource name, the requested size, and the current
77148+ limit. It is highly recommended that you say Y here. If the sysctl
77149+ option is enabled, a sysctl option with name "resource_logging" is
77150+ created. If the RBAC system is enabled, the sysctl value is ignored.
77151+
77152+config GRKERNSEC_CHROOT_EXECLOG
77153+ bool "Log execs within chroot"
77154+ help
77155+ If you say Y here, all executions inside a chroot jail will be logged
77156+ to syslog. This can cause a large amount of logs if certain
77157+ applications (eg. djb's daemontools) are installed on the system, and
77158+ is therefore left as an option. If the sysctl option is enabled, a
77159+ sysctl option with name "chroot_execlog" is created.
77160+
77161+config GRKERNSEC_AUDIT_PTRACE
77162+ bool "Ptrace logging"
77163+ help
77164+ If you say Y here, all attempts to attach to a process via ptrace
77165+ will be logged. If the sysctl option is enabled, a sysctl option
77166+ with name "audit_ptrace" is created.
77167+
77168+config GRKERNSEC_AUDIT_CHDIR
77169+ bool "Chdir logging"
77170+ help
77171+ If you say Y here, all chdir() calls will be logged. If the sysctl
77172+ option is enabled, a sysctl option with name "audit_chdir" is created.
77173+
77174+config GRKERNSEC_AUDIT_MOUNT
77175+ bool "(Un)Mount logging"
77176+ help
77177+ If you say Y here, all mounts and unmounts will be logged. If the
77178+ sysctl option is enabled, a sysctl option with name "audit_mount" is
77179+ created.
77180+
77181+config GRKERNSEC_SIGNAL
77182+ bool "Signal logging"
77183+ default y if GRKERNSEC_CONFIG_AUTO
77184+ help
77185+ If you say Y here, certain important signals will be logged, such as
77186+ SIGSEGV, which will as a result inform you of when a error in a program
77187+ occurred, which in some cases could mean a possible exploit attempt.
77188+ If the sysctl option is enabled, a sysctl option with name
77189+ "signal_logging" is created.
77190+
77191+config GRKERNSEC_FORKFAIL
77192+ bool "Fork failure logging"
77193+ help
77194+ If you say Y here, all failed fork() attempts will be logged.
77195+ This could suggest a fork bomb, or someone attempting to overstep
77196+ their process limit. If the sysctl option is enabled, a sysctl option
77197+ with name "forkfail_logging" is created.
77198+
77199+config GRKERNSEC_TIME
77200+ bool "Time change logging"
77201+ default y if GRKERNSEC_CONFIG_AUTO
77202+ help
77203+ If you say Y here, any changes of the system clock will be logged.
77204+ If the sysctl option is enabled, a sysctl option with name
77205+ "timechange_logging" is created.
77206+
77207+config GRKERNSEC_PROC_IPADDR
77208+ bool "/proc/<pid>/ipaddr support"
77209+ default y if GRKERNSEC_CONFIG_AUTO
77210+ help
77211+ If you say Y here, a new entry will be added to each /proc/<pid>
77212+ directory that contains the IP address of the person using the task.
77213+ The IP is carried across local TCP and AF_UNIX stream sockets.
77214+ This information can be useful for IDS/IPSes to perform remote response
77215+ to a local attack. The entry is readable by only the owner of the
77216+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
77217+ the RBAC system), and thus does not create privacy concerns.
77218+
77219+config GRKERNSEC_RWXMAP_LOG
77220+ bool 'Denied RWX mmap/mprotect logging'
77221+ default y if GRKERNSEC_CONFIG_AUTO
77222+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
77223+ help
77224+ If you say Y here, calls to mmap() and mprotect() with explicit
77225+ usage of PROT_WRITE and PROT_EXEC together will be logged when
77226+ denied by the PAX_MPROTECT feature. This feature will also
77227+ log other problematic scenarios that can occur when PAX_MPROTECT
77228+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
77229+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
77230+ is created.
77231+
77232+endmenu
77233+
77234+menu "Executable Protections"
77235+depends on GRKERNSEC
77236+
77237+config GRKERNSEC_DMESG
77238+ bool "Dmesg(8) restriction"
77239+ default y if GRKERNSEC_CONFIG_AUTO
77240+ help
77241+ If you say Y here, non-root users will not be able to use dmesg(8)
77242+ to view the contents of the kernel's circular log buffer.
77243+ The kernel's log buffer often contains kernel addresses and other
77244+ identifying information useful to an attacker in fingerprinting a
77245+ system for a targeted exploit.
77246+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
77247+ created.
77248+
77249+config GRKERNSEC_HARDEN_PTRACE
77250+ bool "Deter ptrace-based process snooping"
77251+ default y if GRKERNSEC_CONFIG_AUTO
77252+ help
77253+ If you say Y here, TTY sniffers and other malicious monitoring
77254+ programs implemented through ptrace will be defeated. If you
77255+ have been using the RBAC system, this option has already been
77256+ enabled for several years for all users, with the ability to make
77257+ fine-grained exceptions.
77258+
77259+ This option only affects the ability of non-root users to ptrace
77260+ processes that are not a descendent of the ptracing process.
77261+ This means that strace ./binary and gdb ./binary will still work,
77262+ but attaching to arbitrary processes will not. If the sysctl
77263+ option is enabled, a sysctl option with name "harden_ptrace" is
77264+ created.
77265+
77266+config GRKERNSEC_PTRACE_READEXEC
77267+ bool "Require read access to ptrace sensitive binaries"
77268+ default y if GRKERNSEC_CONFIG_AUTO
77269+ help
77270+ If you say Y here, unprivileged users will not be able to ptrace unreadable
77271+ binaries. This option is useful in environments that
77272+ remove the read bits (e.g. file mode 4711) from suid binaries to
77273+ prevent infoleaking of their contents. This option adds
77274+ consistency to the use of that file mode, as the binary could normally
77275+ be read out when run without privileges while ptracing.
77276+
77277+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
77278+ is created.
77279+
77280+config GRKERNSEC_SETXID
77281+ bool "Enforce consistent multithreaded privileges"
77282+ default y if GRKERNSEC_CONFIG_AUTO
77283+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
77284+ help
77285+ If you say Y here, a change from a root uid to a non-root uid
77286+ in a multithreaded application will cause the resulting uids,
77287+ gids, supplementary groups, and capabilities in that thread
77288+ to be propagated to the other threads of the process. In most
77289+ cases this is unnecessary, as glibc will emulate this behavior
77290+ on behalf of the application. Other libcs do not act in the
77291+ same way, allowing the other threads of the process to continue
77292+ running with root privileges. If the sysctl option is enabled,
77293+ a sysctl option with name "consistent_setxid" is created.
77294+
77295+config GRKERNSEC_HARDEN_IPC
77296+ bool "Disallow access to overly-permissive IPC objects"
77297+ default y if GRKERNSEC_CONFIG_AUTO
77298+ depends on SYSVIPC
77299+ help
77300+ If you say Y here, access to overly-permissive IPC objects (shared
77301+ memory, message queues, and semaphores) will be denied for processes
77302+ given the following criteria beyond normal permission checks:
77303+ 1) If the IPC object is world-accessible and the euid doesn't match
77304+ that of the creator or current uid for the IPC object
77305+ 2) If the IPC object is group-accessible and the egid doesn't
77306+ match that of the creator or current gid for the IPC object
77307+ It's a common error to grant too much permission to these objects,
77308+ with impact ranging from denial of service and information leaking to
77309+ privilege escalation. This feature was developed in response to
77310+ research by Tim Brown:
77311+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
77312+ who found hundreds of such insecure usages. Processes with
77313+ CAP_IPC_OWNER are still permitted to access these IPC objects.
77314+ If the sysctl option is enabled, a sysctl option with name
77315+ "harden_ipc" is created.
77316+
77317+config GRKERNSEC_TPE
77318+ bool "Trusted Path Execution (TPE)"
77319+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
77320+ help
77321+ If you say Y here, you will be able to choose a gid to add to the
77322+ supplementary groups of users you want to mark as "untrusted."
77323+ These users will not be able to execute any files that are not in
77324+ root-owned directories writable only by root. If the sysctl option
77325+ is enabled, a sysctl option with name "tpe" is created.
77326+
77327+config GRKERNSEC_TPE_ALL
77328+ bool "Partially restrict all non-root users"
77329+ depends on GRKERNSEC_TPE
77330+ help
77331+ If you say Y here, all non-root users will be covered under
77332+ a weaker TPE restriction. This is separate from, and in addition to,
77333+ the main TPE options that you have selected elsewhere. Thus, if a
77334+ "trusted" GID is chosen, this restriction applies to even that GID.
77335+ Under this restriction, all non-root users will only be allowed to
77336+ execute files in directories they own that are not group or
77337+ world-writable, or in directories owned by root and writable only by
77338+ root. If the sysctl option is enabled, a sysctl option with name
77339+ "tpe_restrict_all" is created.
77340+
77341+config GRKERNSEC_TPE_INVERT
77342+ bool "Invert GID option"
77343+ depends on GRKERNSEC_TPE
77344+ help
77345+ If you say Y here, the group you specify in the TPE configuration will
77346+ decide what group TPE restrictions will be *disabled* for. This
77347+ option is useful if you want TPE restrictions to be applied to most
77348+ users on the system. If the sysctl option is enabled, a sysctl option
77349+ with name "tpe_invert" is created. Unlike other sysctl options, this
77350+ entry will default to on for backward-compatibility.
77351+
77352+config GRKERNSEC_TPE_GID
77353+ int
77354+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
77355+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
77356+
77357+config GRKERNSEC_TPE_UNTRUSTED_GID
77358+ int "GID for TPE-untrusted users"
77359+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
77360+ default 1005
77361+ help
77362+ Setting this GID determines what group TPE restrictions will be
77363+ *enabled* for. If the sysctl option is enabled, a sysctl option
77364+ with name "tpe_gid" is created.
77365+
77366+config GRKERNSEC_TPE_TRUSTED_GID
77367+ int "GID for TPE-trusted users"
77368+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
77369+ default 1005
77370+ help
77371+ Setting this GID determines what group TPE restrictions will be
77372+ *disabled* for. If the sysctl option is enabled, a sysctl option
77373+ with name "tpe_gid" is created.
77374+
77375+endmenu
77376+menu "Network Protections"
77377+depends on GRKERNSEC
77378+
77379+config GRKERNSEC_BLACKHOLE
77380+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
77381+ default y if GRKERNSEC_CONFIG_AUTO
77382+ depends on NET
77383+ help
77384+ If you say Y here, neither TCP resets nor ICMP
77385+ destination-unreachable packets will be sent in response to packets
77386+ sent to ports for which no associated listening process exists.
77387+ It will also prevent the sending of ICMP protocol unreachable packets
77388+ in response to packets with unknown protocols.
77389+ This feature supports both IPV4 and IPV6 and exempts the
77390+ loopback interface from blackholing. Enabling this feature
77391+ makes a host more resilient to DoS attacks and reduces network
77392+ visibility against scanners.
77393+
77394+ The blackhole feature as-implemented is equivalent to the FreeBSD
77395+ blackhole feature, as it prevents RST responses to all packets, not
77396+ just SYNs. Under most application behavior this causes no
77397+ problems, but applications (like haproxy) may not close certain
77398+ connections in a way that cleanly terminates them on the remote
77399+ end, leaving the remote host in LAST_ACK state. Because of this
77400+ side-effect and to prevent intentional LAST_ACK DoSes, this
77401+ feature also adds automatic mitigation against such attacks.
77402+ The mitigation drastically reduces the amount of time a socket
77403+ can spend in LAST_ACK state. If you're using haproxy and not
77404+ all servers it connects to have this option enabled, consider
77405+ disabling this feature on the haproxy host.
77406+
77407+ If the sysctl option is enabled, two sysctl options with names
77408+ "ip_blackhole" and "lastack_retries" will be created.
77409+ While "ip_blackhole" takes the standard zero/non-zero on/off
77410+ toggle, "lastack_retries" uses the same kinds of values as
77411+ "tcp_retries1" and "tcp_retries2". The default value of 4
77412+ prevents a socket from lasting more than 45 seconds in LAST_ACK
77413+ state.
77414+
77415+config GRKERNSEC_NO_SIMULT_CONNECT
77416+ bool "Disable TCP Simultaneous Connect"
77417+ default y if GRKERNSEC_CONFIG_AUTO
77418+ depends on NET
77419+ help
77420+ If you say Y here, a feature by Willy Tarreau will be enabled that
77421+ removes a weakness in Linux's strict implementation of TCP that
77422+ allows two clients to connect to each other without either entering
77423+ a listening state. The weakness allows an attacker to easily prevent
77424+ a client from connecting to a known server provided the source port
77425+ for the connection is guessed correctly.
77426+
77427+ As the weakness could be used to prevent an antivirus or IPS from
77428+ fetching updates, or prevent an SSL gateway from fetching a CRL,
77429+ it should be eliminated by enabling this option. Though Linux is
77430+ one of few operating systems supporting simultaneous connect, it
77431+ has no legitimate use in practice and is rarely supported by firewalls.
77432+
77433+config GRKERNSEC_SOCKET
77434+ bool "Socket restrictions"
77435+ depends on NET
77436+ help
77437+ If you say Y here, you will be able to choose from several options.
77438+ If you assign a GID on your system and add it to the supplementary
77439+ groups of users you want to restrict socket access to, this patch
77440+ will perform up to three things, based on the option(s) you choose.
77441+
77442+config GRKERNSEC_SOCKET_ALL
77443+ bool "Deny any sockets to group"
77444+ depends on GRKERNSEC_SOCKET
77445+ help
77446+ If you say Y here, you will be able to choose a GID of whose users will
77447+ be unable to connect to other hosts from your machine or run server
77448+ applications from your machine. If the sysctl option is enabled, a
77449+ sysctl option with name "socket_all" is created.
77450+
77451+config GRKERNSEC_SOCKET_ALL_GID
77452+ int "GID to deny all sockets for"
77453+ depends on GRKERNSEC_SOCKET_ALL
77454+ default 1004
77455+ help
77456+ Here you can choose the GID to disable socket access for. Remember to
77457+ add the users you want socket access disabled for to the GID
77458+ specified here. If the sysctl option is enabled, a sysctl option
77459+ with name "socket_all_gid" is created.
77460+
77461+config GRKERNSEC_SOCKET_CLIENT
77462+ bool "Deny client sockets to group"
77463+ depends on GRKERNSEC_SOCKET
77464+ help
77465+ If you say Y here, you will be able to choose a GID of whose users will
77466+ be unable to connect to other hosts from your machine, but will be
77467+ able to run servers. If this option is enabled, all users in the group
77468+ you specify will have to use passive mode when initiating ftp transfers
77469+ from the shell on your machine. If the sysctl option is enabled, a
77470+ sysctl option with name "socket_client" is created.
77471+
77472+config GRKERNSEC_SOCKET_CLIENT_GID
77473+ int "GID to deny client sockets for"
77474+ depends on GRKERNSEC_SOCKET_CLIENT
77475+ default 1003
77476+ help
77477+ Here you can choose the GID to disable client socket access for.
77478+ Remember to add the users you want client socket access disabled for to
77479+ the GID specified here. If the sysctl option is enabled, a sysctl
77480+ option with name "socket_client_gid" is created.
77481+
77482+config GRKERNSEC_SOCKET_SERVER
77483+ bool "Deny server sockets to group"
77484+ depends on GRKERNSEC_SOCKET
77485+ help
77486+ If you say Y here, you will be able to choose a GID of whose users will
77487+ be unable to run server applications from your machine. If the sysctl
77488+ option is enabled, a sysctl option with name "socket_server" is created.
77489+
77490+config GRKERNSEC_SOCKET_SERVER_GID
77491+ int "GID to deny server sockets for"
77492+ depends on GRKERNSEC_SOCKET_SERVER
77493+ default 1002
77494+ help
77495+ Here you can choose the GID to disable server socket access for.
77496+ Remember to add the users you want server socket access disabled for to
77497+ the GID specified here. If the sysctl option is enabled, a sysctl
77498+ option with name "socket_server_gid" is created.
77499+
77500+endmenu
77501+
77502+menu "Physical Protections"
77503+depends on GRKERNSEC
77504+
77505+config GRKERNSEC_DENYUSB
77506+ bool "Deny new USB connections after toggle"
77507+ default y if GRKERNSEC_CONFIG_AUTO
77508+ depends on SYSCTL && USB_SUPPORT
77509+ help
77510+ If you say Y here, a new sysctl option with name "deny_new_usb"
77511+ will be created. Setting its value to 1 will prevent any new
77512+ USB devices from being recognized by the OS. Any attempted USB
77513+ device insertion will be logged. This option is intended to be
77514+ used against custom USB devices designed to exploit vulnerabilities
77515+ in various USB device drivers.
77516+
77517+ For greatest effectiveness, this sysctl should be set after any
77518+ relevant init scripts. This option is safe to enable in distros
77519+ as each user can choose whether or not to toggle the sysctl.
77520+
77521+config GRKERNSEC_DENYUSB_FORCE
77522+ bool "Reject all USB devices not connected at boot"
77523+ select USB
77524+ depends on GRKERNSEC_DENYUSB
77525+ help
77526+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
77527+ that doesn't involve a sysctl entry. This option should only be
77528+ enabled if you're sure you want to deny all new USB connections
77529+ at runtime and don't want to modify init scripts. This should not
77530+ be enabled by distros. It forces the core USB code to be built
77531+ into the kernel image so that all devices connected at boot time
77532+ can be recognized and new USB device connections can be prevented
77533+ prior to init running.
77534+
77535+endmenu
77536+
77537+menu "Sysctl Support"
77538+depends on GRKERNSEC && SYSCTL
77539+
77540+config GRKERNSEC_SYSCTL
77541+ bool "Sysctl support"
77542+ default y if GRKERNSEC_CONFIG_AUTO
77543+ help
77544+ If you say Y here, you will be able to change the options that
77545+ grsecurity runs with at bootup, without having to recompile your
77546+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
77547+ to enable (1) or disable (0) various features. All the sysctl entries
77548+ are mutable until the "grsec_lock" entry is set to a non-zero value.
77549+ All features enabled in the kernel configuration are disabled at boot
77550+ if you do not say Y to the "Turn on features by default" option.
77551+ All options should be set at startup, and the grsec_lock entry should
77552+ be set to a non-zero value after all the options are set.
77553+ *THIS IS EXTREMELY IMPORTANT*
77554+
77555+config GRKERNSEC_SYSCTL_DISTRO
77556+ bool "Extra sysctl support for distro makers (READ HELP)"
77557+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
77558+ help
77559+ If you say Y here, additional sysctl options will be created
77560+ for features that affect processes running as root. Therefore,
77561+ it is critical when using this option that the grsec_lock entry be
77562+ enabled after boot. Only distros with prebuilt kernel packages
77563+ with this option enabled that can ensure grsec_lock is enabled
77564+ after boot should use this option.
77565+ *Failure to set grsec_lock after boot makes all grsec features
77566+ this option covers useless*
77567+
77568+ Currently this option creates the following sysctl entries:
77569+ "Disable Privileged I/O": "disable_priv_io"
77570+
77571+config GRKERNSEC_SYSCTL_ON
77572+ bool "Turn on features by default"
77573+ default y if GRKERNSEC_CONFIG_AUTO
77574+ depends on GRKERNSEC_SYSCTL
77575+ help
77576+ If you say Y here, instead of having all features enabled in the
77577+ kernel configuration disabled at boot time, the features will be
77578+ enabled at boot time. It is recommended you say Y here unless
77579+ there is some reason you would want all sysctl-tunable features to
77580+ be disabled by default. As mentioned elsewhere, it is important
77581+ to enable the grsec_lock entry once you have finished modifying
77582+ the sysctl entries.
77583+
77584+endmenu
77585+menu "Logging Options"
77586+depends on GRKERNSEC
77587+
77588+config GRKERNSEC_FLOODTIME
77589+ int "Seconds in between log messages (minimum)"
77590+ default 10
77591+ help
77592+ This option allows you to enforce the number of seconds between
77593+ grsecurity log messages. The default should be suitable for most
77594+ people, however, if you choose to change it, choose a value small enough
77595+ to allow informative logs to be produced, but large enough to
77596+ prevent flooding.
77597+
77598+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
77599+ any rate limiting on grsecurity log messages.
77600+
77601+config GRKERNSEC_FLOODBURST
77602+ int "Number of messages in a burst (maximum)"
77603+ default 6
77604+ help
77605+ This option allows you to choose the maximum number of messages allowed
77606+ within the flood time interval you chose in a separate option. The
77607+ default should be suitable for most people, however if you find that
77608+ many of your logs are being interpreted as flooding, you may want to
77609+ raise this value.
77610+
77611+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
77612+ any rate limiting on grsecurity log messages.
77613+
77614+endmenu
77615diff --git a/grsecurity/Makefile b/grsecurity/Makefile
77616new file mode 100644
77617index 0000000..30ababb
77618--- /dev/null
77619+++ b/grsecurity/Makefile
77620@@ -0,0 +1,54 @@
77621+# grsecurity – access control and security hardening for Linux
77622+# All code in this directory and various hooks located throughout the Linux kernel are
77623+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
77624+# http://www.grsecurity.net spender@grsecurity.net
77625+#
77626+# This program is free software; you can redistribute it and/or
77627+# modify it under the terms of the GNU General Public License version 2
77628+# as published by the Free Software Foundation.
77629+#
77630+# This program is distributed in the hope that it will be useful,
77631+# but WITHOUT ANY WARRANTY; without even the implied warranty of
77632+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
77633+# GNU General Public License for more details.
77634+#
77635+# You should have received a copy of the GNU General Public License
77636+# along with this program; if not, write to the Free Software
77637+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
77638+
77639+KBUILD_CFLAGS += -Werror
77640+
77641+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
77642+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
77643+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
77644+ grsec_usb.o grsec_ipc.o grsec_proc.o
77645+
77646+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
77647+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
77648+ gracl_learn.o grsec_log.o gracl_policy.o
77649+ifdef CONFIG_COMPAT
77650+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
77651+endif
77652+
77653+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
77654+
77655+ifdef CONFIG_NET
77656+obj-y += grsec_sock.o
77657+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
77658+endif
77659+
77660+ifndef CONFIG_GRKERNSEC
77661+obj-y += grsec_disabled.o
77662+endif
77663+
77664+ifdef CONFIG_GRKERNSEC_HIDESYM
77665+extra-y := grsec_hidesym.o
77666+$(obj)/grsec_hidesym.o:
77667+ @-chmod -f 500 /boot
77668+ @-chmod -f 500 /lib/modules
77669+ @-chmod -f 500 /lib64/modules
77670+ @-chmod -f 500 /lib32/modules
77671+ @-chmod -f 700 .
77672+ @-chmod -f 700 $(objtree)
77673+ @echo ' grsec: protected kernel image paths'
77674+endif
77675diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
77676new file mode 100644
77677index 0000000..811af1f
77678--- /dev/null
77679+++ b/grsecurity/gracl.c
77680@@ -0,0 +1,2749 @@
77681+#include <linux/kernel.h>
77682+#include <linux/module.h>
77683+#include <linux/sched.h>
77684+#include <linux/mm.h>
77685+#include <linux/file.h>
77686+#include <linux/fs.h>
77687+#include <linux/namei.h>
77688+#include <linux/mount.h>
77689+#include <linux/tty.h>
77690+#include <linux/proc_fs.h>
77691+#include <linux/lglock.h>
77692+#include <linux/slab.h>
77693+#include <linux/vmalloc.h>
77694+#include <linux/types.h>
77695+#include <linux/sysctl.h>
77696+#include <linux/netdevice.h>
77697+#include <linux/ptrace.h>
77698+#include <linux/gracl.h>
77699+#include <linux/gralloc.h>
77700+#include <linux/security.h>
77701+#include <linux/grinternal.h>
77702+#include <linux/pid_namespace.h>
77703+#include <linux/stop_machine.h>
77704+#include <linux/fdtable.h>
77705+#include <linux/percpu.h>
77706+#include <linux/lglock.h>
77707+#include <linux/hugetlb.h>
77708+#include <linux/posix-timers.h>
77709+#include <linux/prefetch.h>
77710+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77711+#include <linux/magic.h>
77712+#include <linux/pagemap.h>
77713+#include "../fs/btrfs/async-thread.h"
77714+#include "../fs/btrfs/ctree.h"
77715+#include "../fs/btrfs/btrfs_inode.h"
77716+#endif
77717+#include "../fs/mount.h"
77718+
77719+#include <asm/uaccess.h>
77720+#include <asm/errno.h>
77721+#include <asm/mman.h>
77722+
77723+#define FOR_EACH_ROLE_START(role) \
77724+ role = running_polstate.role_list; \
77725+ while (role) {
77726+
77727+#define FOR_EACH_ROLE_END(role) \
77728+ role = role->prev; \
77729+ }
77730+
77731+extern struct path gr_real_root;
77732+
77733+static struct gr_policy_state running_polstate;
77734+struct gr_policy_state *polstate = &running_polstate;
77735+extern struct gr_alloc_state *current_alloc_state;
77736+
77737+extern char *gr_shared_page[4];
77738+DEFINE_RWLOCK(gr_inode_lock);
77739+
77740+static unsigned int gr_status __read_only = GR_STATUS_INIT;
77741+
77742+#ifdef CONFIG_NET
77743+extern struct vfsmount *sock_mnt;
77744+#endif
77745+
77746+extern struct vfsmount *pipe_mnt;
77747+extern struct vfsmount *shm_mnt;
77748+
77749+#ifdef CONFIG_HUGETLBFS
77750+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77751+#endif
77752+
77753+extern u16 acl_sp_role_value;
77754+extern struct acl_object_label *fakefs_obj_rw;
77755+extern struct acl_object_label *fakefs_obj_rwx;
77756+
77757+int gr_acl_is_enabled(void)
77758+{
77759+ return (gr_status & GR_READY);
77760+}
77761+
77762+void gr_enable_rbac_system(void)
77763+{
77764+ pax_open_kernel();
77765+ gr_status |= GR_READY;
77766+ pax_close_kernel();
77767+}
77768+
77769+int gr_rbac_disable(void *unused)
77770+{
77771+ pax_open_kernel();
77772+ gr_status &= ~GR_READY;
77773+ pax_close_kernel();
77774+
77775+ return 0;
77776+}
77777+
77778+static inline dev_t __get_dev(const struct dentry *dentry)
77779+{
77780+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77781+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
77782+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
77783+ else
77784+#endif
77785+ return dentry->d_sb->s_dev;
77786+}
77787+
77788+static inline u64 __get_ino(const struct dentry *dentry)
77789+{
77790+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77791+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
77792+ return btrfs_ino(dentry->d_inode);
77793+ else
77794+#endif
77795+ return dentry->d_inode->i_ino;
77796+}
77797+
77798+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
77799+{
77800+ return __get_dev(dentry);
77801+}
77802+
77803+u64 gr_get_ino_from_dentry(struct dentry *dentry)
77804+{
77805+ return __get_ino(dentry);
77806+}
77807+
77808+static char gr_task_roletype_to_char(struct task_struct *task)
77809+{
77810+ switch (task->role->roletype &
77811+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
77812+ GR_ROLE_SPECIAL)) {
77813+ case GR_ROLE_DEFAULT:
77814+ return 'D';
77815+ case GR_ROLE_USER:
77816+ return 'U';
77817+ case GR_ROLE_GROUP:
77818+ return 'G';
77819+ case GR_ROLE_SPECIAL:
77820+ return 'S';
77821+ }
77822+
77823+ return 'X';
77824+}
77825+
77826+char gr_roletype_to_char(void)
77827+{
77828+ return gr_task_roletype_to_char(current);
77829+}
77830+
77831+int
77832+gr_acl_tpe_check(void)
77833+{
77834+ if (unlikely(!(gr_status & GR_READY)))
77835+ return 0;
77836+ if (current->role->roletype & GR_ROLE_TPE)
77837+ return 1;
77838+ else
77839+ return 0;
77840+}
77841+
77842+int
77843+gr_handle_rawio(const struct inode *inode)
77844+{
77845+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77846+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
77847+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
77848+ !capable(CAP_SYS_RAWIO))
77849+ return 1;
77850+#endif
77851+ return 0;
77852+}
77853+
77854+int
77855+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
77856+{
77857+ if (likely(lena != lenb))
77858+ return 0;
77859+
77860+ return !memcmp(a, b, lena);
77861+}
77862+
77863+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
77864+{
77865+ *buflen -= namelen;
77866+ if (*buflen < 0)
77867+ return -ENAMETOOLONG;
77868+ *buffer -= namelen;
77869+ memcpy(*buffer, str, namelen);
77870+ return 0;
77871+}
77872+
77873+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
77874+{
77875+ return prepend(buffer, buflen, name->name, name->len);
77876+}
77877+
77878+static int prepend_path(const struct path *path, struct path *root,
77879+ char **buffer, int *buflen)
77880+{
77881+ struct dentry *dentry = path->dentry;
77882+ struct vfsmount *vfsmnt = path->mnt;
77883+ struct mount *mnt = real_mount(vfsmnt);
77884+ bool slash = false;
77885+ int error = 0;
77886+
77887+ while (dentry != root->dentry || vfsmnt != root->mnt) {
77888+ struct dentry * parent;
77889+
77890+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
77891+ /* Global root? */
77892+ if (!mnt_has_parent(mnt)) {
77893+ goto out;
77894+ }
77895+ dentry = mnt->mnt_mountpoint;
77896+ mnt = mnt->mnt_parent;
77897+ vfsmnt = &mnt->mnt;
77898+ continue;
77899+ }
77900+ parent = dentry->d_parent;
77901+ prefetch(parent);
77902+ spin_lock(&dentry->d_lock);
77903+ error = prepend_name(buffer, buflen, &dentry->d_name);
77904+ spin_unlock(&dentry->d_lock);
77905+ if (!error)
77906+ error = prepend(buffer, buflen, "/", 1);
77907+ if (error)
77908+ break;
77909+
77910+ slash = true;
77911+ dentry = parent;
77912+ }
77913+
77914+out:
77915+ if (!error && !slash)
77916+ error = prepend(buffer, buflen, "/", 1);
77917+
77918+ return error;
77919+}
77920+
77921+/* this must be called with mount_lock and rename_lock held */
77922+
77923+static char *__our_d_path(const struct path *path, struct path *root,
77924+ char *buf, int buflen)
77925+{
77926+ char *res = buf + buflen;
77927+ int error;
77928+
77929+ prepend(&res, &buflen, "\0", 1);
77930+ error = prepend_path(path, root, &res, &buflen);
77931+ if (error)
77932+ return ERR_PTR(error);
77933+
77934+ return res;
77935+}
77936+
77937+static char *
77938+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
77939+{
77940+ char *retval;
77941+
77942+ retval = __our_d_path(path, root, buf, buflen);
77943+ if (unlikely(IS_ERR(retval)))
77944+ retval = strcpy(buf, "<path too long>");
77945+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
77946+ retval[1] = '\0';
77947+
77948+ return retval;
77949+}
77950+
77951+static char *
77952+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
77953+ char *buf, int buflen)
77954+{
77955+ struct path path;
77956+ char *res;
77957+
77958+ path.dentry = (struct dentry *)dentry;
77959+ path.mnt = (struct vfsmount *)vfsmnt;
77960+
77961+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
77962+ by the RBAC system */
77963+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
77964+
77965+ return res;
77966+}
77967+
77968+static char *
77969+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
77970+ char *buf, int buflen)
77971+{
77972+ char *res;
77973+ struct path path;
77974+ struct path root;
77975+ struct task_struct *reaper = init_pid_ns.child_reaper;
77976+
77977+ path.dentry = (struct dentry *)dentry;
77978+ path.mnt = (struct vfsmount *)vfsmnt;
77979+
77980+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
77981+ get_fs_root(reaper->fs, &root);
77982+
77983+ read_seqlock_excl(&mount_lock);
77984+ write_seqlock(&rename_lock);
77985+ res = gen_full_path(&path, &root, buf, buflen);
77986+ write_sequnlock(&rename_lock);
77987+ read_sequnlock_excl(&mount_lock);
77988+
77989+ path_put(&root);
77990+ return res;
77991+}
77992+
77993+char *
77994+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
77995+{
77996+ char *ret;
77997+ read_seqlock_excl(&mount_lock);
77998+ write_seqlock(&rename_lock);
77999+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
78000+ PAGE_SIZE);
78001+ write_sequnlock(&rename_lock);
78002+ read_sequnlock_excl(&mount_lock);
78003+ return ret;
78004+}
78005+
78006+static char *
78007+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
78008+{
78009+ char *ret;
78010+ char *buf;
78011+ int buflen;
78012+
78013+ read_seqlock_excl(&mount_lock);
78014+ write_seqlock(&rename_lock);
78015+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
78016+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
78017+ buflen = (int)(ret - buf);
78018+ if (buflen >= 5)
78019+ prepend(&ret, &buflen, "/proc", 5);
78020+ else
78021+ ret = strcpy(buf, "<path too long>");
78022+ write_sequnlock(&rename_lock);
78023+ read_sequnlock_excl(&mount_lock);
78024+ return ret;
78025+}
78026+
78027+char *
78028+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
78029+{
78030+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
78031+ PAGE_SIZE);
78032+}
78033+
78034+char *
78035+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
78036+{
78037+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
78038+ PAGE_SIZE);
78039+}
78040+
78041+char *
78042+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
78043+{
78044+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
78045+ PAGE_SIZE);
78046+}
78047+
78048+char *
78049+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
78050+{
78051+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
78052+ PAGE_SIZE);
78053+}
78054+
78055+char *
78056+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
78057+{
78058+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
78059+ PAGE_SIZE);
78060+}
78061+
78062+__u32
78063+to_gr_audit(const __u32 reqmode)
78064+{
78065+ /* masks off auditable permission flags, then shifts them to create
78066+ auditing flags, and adds the special case of append auditing if
78067+ we're requesting write */
78068+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
78069+}
78070+
78071+struct acl_role_label *
78072+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
78073+ const gid_t gid)
78074+{
78075+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
78076+ struct acl_role_label *match;
78077+ struct role_allowed_ip *ipp;
78078+ unsigned int x;
78079+ u32 curr_ip = task->signal->saved_ip;
78080+
78081+ match = state->acl_role_set.r_hash[index];
78082+
78083+ while (match) {
78084+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
78085+ for (x = 0; x < match->domain_child_num; x++) {
78086+ if (match->domain_children[x] == uid)
78087+ goto found;
78088+ }
78089+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
78090+ break;
78091+ match = match->next;
78092+ }
78093+found:
78094+ if (match == NULL) {
78095+ try_group:
78096+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
78097+ match = state->acl_role_set.r_hash[index];
78098+
78099+ while (match) {
78100+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
78101+ for (x = 0; x < match->domain_child_num; x++) {
78102+ if (match->domain_children[x] == gid)
78103+ goto found2;
78104+ }
78105+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
78106+ break;
78107+ match = match->next;
78108+ }
78109+found2:
78110+ if (match == NULL)
78111+ match = state->default_role;
78112+ if (match->allowed_ips == NULL)
78113+ return match;
78114+ else {
78115+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
78116+ if (likely
78117+ ((ntohl(curr_ip) & ipp->netmask) ==
78118+ (ntohl(ipp->addr) & ipp->netmask)))
78119+ return match;
78120+ }
78121+ match = state->default_role;
78122+ }
78123+ } else if (match->allowed_ips == NULL) {
78124+ return match;
78125+ } else {
78126+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
78127+ if (likely
78128+ ((ntohl(curr_ip) & ipp->netmask) ==
78129+ (ntohl(ipp->addr) & ipp->netmask)))
78130+ return match;
78131+ }
78132+ goto try_group;
78133+ }
78134+
78135+ return match;
78136+}
78137+
78138+static struct acl_role_label *
78139+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
78140+ const gid_t gid)
78141+{
78142+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
78143+}
78144+
78145+struct acl_subject_label *
78146+lookup_acl_subj_label(const u64 ino, const dev_t dev,
78147+ const struct acl_role_label *role)
78148+{
78149+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
78150+ struct acl_subject_label *match;
78151+
78152+ match = role->subj_hash[index];
78153+
78154+ while (match && (match->inode != ino || match->device != dev ||
78155+ (match->mode & GR_DELETED))) {
78156+ match = match->next;
78157+ }
78158+
78159+ if (match && !(match->mode & GR_DELETED))
78160+ return match;
78161+ else
78162+ return NULL;
78163+}
78164+
78165+struct acl_subject_label *
78166+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
78167+ const struct acl_role_label *role)
78168+{
78169+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
78170+ struct acl_subject_label *match;
78171+
78172+ match = role->subj_hash[index];
78173+
78174+ while (match && (match->inode != ino || match->device != dev ||
78175+ !(match->mode & GR_DELETED))) {
78176+ match = match->next;
78177+ }
78178+
78179+ if (match && (match->mode & GR_DELETED))
78180+ return match;
78181+ else
78182+ return NULL;
78183+}
78184+
78185+static struct acl_object_label *
78186+lookup_acl_obj_label(const u64 ino, const dev_t dev,
78187+ const struct acl_subject_label *subj)
78188+{
78189+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
78190+ struct acl_object_label *match;
78191+
78192+ match = subj->obj_hash[index];
78193+
78194+ while (match && (match->inode != ino || match->device != dev ||
78195+ (match->mode & GR_DELETED))) {
78196+ match = match->next;
78197+ }
78198+
78199+ if (match && !(match->mode & GR_DELETED))
78200+ return match;
78201+ else
78202+ return NULL;
78203+}
78204+
78205+static struct acl_object_label *
78206+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
78207+ const struct acl_subject_label *subj)
78208+{
78209+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
78210+ struct acl_object_label *match;
78211+
78212+ match = subj->obj_hash[index];
78213+
78214+ while (match && (match->inode != ino || match->device != dev ||
78215+ !(match->mode & GR_DELETED))) {
78216+ match = match->next;
78217+ }
78218+
78219+ if (match && (match->mode & GR_DELETED))
78220+ return match;
78221+
78222+ match = subj->obj_hash[index];
78223+
78224+ while (match && (match->inode != ino || match->device != dev ||
78225+ (match->mode & GR_DELETED))) {
78226+ match = match->next;
78227+ }
78228+
78229+ if (match && !(match->mode & GR_DELETED))
78230+ return match;
78231+ else
78232+ return NULL;
78233+}
78234+
78235+struct name_entry *
78236+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
78237+{
78238+ unsigned int len = strlen(name);
78239+ unsigned int key = full_name_hash(name, len);
78240+ unsigned int index = key % state->name_set.n_size;
78241+ struct name_entry *match;
78242+
78243+ match = state->name_set.n_hash[index];
78244+
78245+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
78246+ match = match->next;
78247+
78248+ return match;
78249+}
78250+
78251+static struct name_entry *
78252+lookup_name_entry(const char *name)
78253+{
78254+ return __lookup_name_entry(&running_polstate, name);
78255+}
78256+
78257+static struct name_entry *
78258+lookup_name_entry_create(const char *name)
78259+{
78260+ unsigned int len = strlen(name);
78261+ unsigned int key = full_name_hash(name, len);
78262+ unsigned int index = key % running_polstate.name_set.n_size;
78263+ struct name_entry *match;
78264+
78265+ match = running_polstate.name_set.n_hash[index];
78266+
78267+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
78268+ !match->deleted))
78269+ match = match->next;
78270+
78271+ if (match && match->deleted)
78272+ return match;
78273+
78274+ match = running_polstate.name_set.n_hash[index];
78275+
78276+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
78277+ match->deleted))
78278+ match = match->next;
78279+
78280+ if (match && !match->deleted)
78281+ return match;
78282+ else
78283+ return NULL;
78284+}
78285+
78286+static struct inodev_entry *
78287+lookup_inodev_entry(const u64 ino, const dev_t dev)
78288+{
78289+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
78290+ struct inodev_entry *match;
78291+
78292+ match = running_polstate.inodev_set.i_hash[index];
78293+
78294+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
78295+ match = match->next;
78296+
78297+ return match;
78298+}
78299+
78300+void
78301+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
78302+{
78303+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
78304+ state->inodev_set.i_size);
78305+ struct inodev_entry **curr;
78306+
78307+ entry->prev = NULL;
78308+
78309+ curr = &state->inodev_set.i_hash[index];
78310+ if (*curr != NULL)
78311+ (*curr)->prev = entry;
78312+
78313+ entry->next = *curr;
78314+ *curr = entry;
78315+
78316+ return;
78317+}
78318+
78319+static void
78320+insert_inodev_entry(struct inodev_entry *entry)
78321+{
78322+ __insert_inodev_entry(&running_polstate, entry);
78323+}
78324+
78325+void
78326+insert_acl_obj_label(struct acl_object_label *obj,
78327+ struct acl_subject_label *subj)
78328+{
78329+ unsigned int index =
78330+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
78331+ struct acl_object_label **curr;
78332+
78333+ obj->prev = NULL;
78334+
78335+ curr = &subj->obj_hash[index];
78336+ if (*curr != NULL)
78337+ (*curr)->prev = obj;
78338+
78339+ obj->next = *curr;
78340+ *curr = obj;
78341+
78342+ return;
78343+}
78344+
78345+void
78346+insert_acl_subj_label(struct acl_subject_label *obj,
78347+ struct acl_role_label *role)
78348+{
78349+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
78350+ struct acl_subject_label **curr;
78351+
78352+ obj->prev = NULL;
78353+
78354+ curr = &role->subj_hash[index];
78355+ if (*curr != NULL)
78356+ (*curr)->prev = obj;
78357+
78358+ obj->next = *curr;
78359+ *curr = obj;
78360+
78361+ return;
78362+}
78363+
78364+/* derived from glibc fnmatch() 0: match, 1: no match*/
78365+
78366+static int
78367+glob_match(const char *p, const char *n)
78368+{
78369+ char c;
78370+
78371+ while ((c = *p++) != '\0') {
78372+ switch (c) {
78373+ case '?':
78374+ if (*n == '\0')
78375+ return 1;
78376+ else if (*n == '/')
78377+ return 1;
78378+ break;
78379+ case '\\':
78380+ if (*n != c)
78381+ return 1;
78382+ break;
78383+ case '*':
78384+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
78385+ if (*n == '/')
78386+ return 1;
78387+ else if (c == '?') {
78388+ if (*n == '\0')
78389+ return 1;
78390+ else
78391+ ++n;
78392+ }
78393+ }
78394+ if (c == '\0') {
78395+ return 0;
78396+ } else {
78397+ const char *endp;
78398+
78399+ if ((endp = strchr(n, '/')) == NULL)
78400+ endp = n + strlen(n);
78401+
78402+ if (c == '[') {
78403+ for (--p; n < endp; ++n)
78404+ if (!glob_match(p, n))
78405+ return 0;
78406+ } else if (c == '/') {
78407+ while (*n != '\0' && *n != '/')
78408+ ++n;
78409+ if (*n == '/' && !glob_match(p, n + 1))
78410+ return 0;
78411+ } else {
78412+ for (--p; n < endp; ++n)
78413+ if (*n == c && !glob_match(p, n))
78414+ return 0;
78415+ }
78416+
78417+ return 1;
78418+ }
78419+ case '[':
78420+ {
78421+ int not;
78422+ char cold;
78423+
78424+ if (*n == '\0' || *n == '/')
78425+ return 1;
78426+
78427+ not = (*p == '!' || *p == '^');
78428+ if (not)
78429+ ++p;
78430+
78431+ c = *p++;
78432+ for (;;) {
78433+ unsigned char fn = (unsigned char)*n;
78434+
78435+ if (c == '\0')
78436+ return 1;
78437+ else {
78438+ if (c == fn)
78439+ goto matched;
78440+ cold = c;
78441+ c = *p++;
78442+
78443+ if (c == '-' && *p != ']') {
78444+ unsigned char cend = *p++;
78445+
78446+ if (cend == '\0')
78447+ return 1;
78448+
78449+ if (cold <= fn && fn <= cend)
78450+ goto matched;
78451+
78452+ c = *p++;
78453+ }
78454+ }
78455+
78456+ if (c == ']')
78457+ break;
78458+ }
78459+ if (!not)
78460+ return 1;
78461+ break;
78462+ matched:
78463+ while (c != ']') {
78464+ if (c == '\0')
78465+ return 1;
78466+
78467+ c = *p++;
78468+ }
78469+ if (not)
78470+ return 1;
78471+ }
78472+ break;
78473+ default:
78474+ if (c != *n)
78475+ return 1;
78476+ }
78477+
78478+ ++n;
78479+ }
78480+
78481+ if (*n == '\0')
78482+ return 0;
78483+
78484+ if (*n == '/')
78485+ return 0;
78486+
78487+ return 1;
78488+}
78489+
78490+static struct acl_object_label *
78491+chk_glob_label(struct acl_object_label *globbed,
78492+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
78493+{
78494+ struct acl_object_label *tmp;
78495+
78496+ if (*path == NULL)
78497+ *path = gr_to_filename_nolock(dentry, mnt);
78498+
78499+ tmp = globbed;
78500+
78501+ while (tmp) {
78502+ if (!glob_match(tmp->filename, *path))
78503+ return tmp;
78504+ tmp = tmp->next;
78505+ }
78506+
78507+ return NULL;
78508+}
78509+
78510+static struct acl_object_label *
78511+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
78512+ const u64 curr_ino, const dev_t curr_dev,
78513+ const struct acl_subject_label *subj, char **path, const int checkglob)
78514+{
78515+ struct acl_subject_label *tmpsubj;
78516+ struct acl_object_label *retval;
78517+ struct acl_object_label *retval2;
78518+
78519+ tmpsubj = (struct acl_subject_label *) subj;
78520+ read_lock(&gr_inode_lock);
78521+ do {
78522+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
78523+ if (retval) {
78524+ if (checkglob && retval->globbed) {
78525+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
78526+ if (retval2)
78527+ retval = retval2;
78528+ }
78529+ break;
78530+ }
78531+ } while ((tmpsubj = tmpsubj->parent_subject));
78532+ read_unlock(&gr_inode_lock);
78533+
78534+ return retval;
78535+}
78536+
78537+static struct acl_object_label *
78538+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
78539+ struct dentry *curr_dentry,
78540+ const struct acl_subject_label *subj, char **path, const int checkglob)
78541+{
78542+ int newglob = checkglob;
78543+ u64 inode;
78544+ dev_t device;
78545+
78546+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
78547+ as we don't want a / * rule to match instead of the / object
78548+ don't do this for create lookups that call this function though, since they're looking up
78549+ on the parent and thus need globbing checks on all paths
78550+ */
78551+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
78552+ newglob = GR_NO_GLOB;
78553+
78554+ spin_lock(&curr_dentry->d_lock);
78555+ inode = __get_ino(curr_dentry);
78556+ device = __get_dev(curr_dentry);
78557+ spin_unlock(&curr_dentry->d_lock);
78558+
78559+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
78560+}
78561+
78562+#ifdef CONFIG_HUGETLBFS
78563+static inline bool
78564+is_hugetlbfs_mnt(const struct vfsmount *mnt)
78565+{
78566+ int i;
78567+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
78568+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
78569+ return true;
78570+ }
78571+
78572+ return false;
78573+}
78574+#endif
78575+
78576+static struct acl_object_label *
78577+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78578+ const struct acl_subject_label *subj, char *path, const int checkglob)
78579+{
78580+ struct dentry *dentry = (struct dentry *) l_dentry;
78581+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
78582+ struct mount *real_mnt = real_mount(mnt);
78583+ struct acl_object_label *retval;
78584+ struct dentry *parent;
78585+
78586+ read_seqlock_excl(&mount_lock);
78587+ write_seqlock(&rename_lock);
78588+
78589+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
78590+#ifdef CONFIG_NET
78591+ mnt == sock_mnt ||
78592+#endif
78593+#ifdef CONFIG_HUGETLBFS
78594+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
78595+#endif
78596+ /* ignore Eric Biederman */
78597+ IS_PRIVATE(l_dentry->d_inode))) {
78598+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
78599+ goto out;
78600+ }
78601+
78602+ for (;;) {
78603+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
78604+ break;
78605+
78606+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
78607+ if (!mnt_has_parent(real_mnt))
78608+ break;
78609+
78610+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78611+ if (retval != NULL)
78612+ goto out;
78613+
78614+ dentry = real_mnt->mnt_mountpoint;
78615+ real_mnt = real_mnt->mnt_parent;
78616+ mnt = &real_mnt->mnt;
78617+ continue;
78618+ }
78619+
78620+ parent = dentry->d_parent;
78621+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78622+ if (retval != NULL)
78623+ goto out;
78624+
78625+ dentry = parent;
78626+ }
78627+
78628+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78629+
78630+ /* gr_real_root is pinned so we don't have to hold a reference */
78631+ if (retval == NULL)
78632+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
78633+out:
78634+ write_sequnlock(&rename_lock);
78635+ read_sequnlock_excl(&mount_lock);
78636+
78637+ BUG_ON(retval == NULL);
78638+
78639+ return retval;
78640+}
78641+
78642+static struct acl_object_label *
78643+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78644+ const struct acl_subject_label *subj)
78645+{
78646+ char *path = NULL;
78647+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
78648+}
78649+
78650+static struct acl_object_label *
78651+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78652+ const struct acl_subject_label *subj)
78653+{
78654+ char *path = NULL;
78655+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
78656+}
78657+
78658+static struct acl_object_label *
78659+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78660+ const struct acl_subject_label *subj, char *path)
78661+{
78662+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
78663+}
78664+
78665+struct acl_subject_label *
78666+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78667+ const struct acl_role_label *role)
78668+{
78669+ struct dentry *dentry = (struct dentry *) l_dentry;
78670+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
78671+ struct mount *real_mnt = real_mount(mnt);
78672+ struct acl_subject_label *retval;
78673+ struct dentry *parent;
78674+
78675+ read_seqlock_excl(&mount_lock);
78676+ write_seqlock(&rename_lock);
78677+
78678+ for (;;) {
78679+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
78680+ break;
78681+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
78682+ if (!mnt_has_parent(real_mnt))
78683+ break;
78684+
78685+ spin_lock(&dentry->d_lock);
78686+ read_lock(&gr_inode_lock);
78687+ retval =
78688+ lookup_acl_subj_label(__get_ino(dentry),
78689+ __get_dev(dentry), role);
78690+ read_unlock(&gr_inode_lock);
78691+ spin_unlock(&dentry->d_lock);
78692+ if (retval != NULL)
78693+ goto out;
78694+
78695+ dentry = real_mnt->mnt_mountpoint;
78696+ real_mnt = real_mnt->mnt_parent;
78697+ mnt = &real_mnt->mnt;
78698+ continue;
78699+ }
78700+
78701+ spin_lock(&dentry->d_lock);
78702+ read_lock(&gr_inode_lock);
78703+ retval = lookup_acl_subj_label(__get_ino(dentry),
78704+ __get_dev(dentry), role);
78705+ read_unlock(&gr_inode_lock);
78706+ parent = dentry->d_parent;
78707+ spin_unlock(&dentry->d_lock);
78708+
78709+ if (retval != NULL)
78710+ goto out;
78711+
78712+ dentry = parent;
78713+ }
78714+
78715+ spin_lock(&dentry->d_lock);
78716+ read_lock(&gr_inode_lock);
78717+ retval = lookup_acl_subj_label(__get_ino(dentry),
78718+ __get_dev(dentry), role);
78719+ read_unlock(&gr_inode_lock);
78720+ spin_unlock(&dentry->d_lock);
78721+
78722+ if (unlikely(retval == NULL)) {
78723+ /* gr_real_root is pinned, we don't need to hold a reference */
78724+ read_lock(&gr_inode_lock);
78725+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
78726+ __get_dev(gr_real_root.dentry), role);
78727+ read_unlock(&gr_inode_lock);
78728+ }
78729+out:
78730+ write_sequnlock(&rename_lock);
78731+ read_sequnlock_excl(&mount_lock);
78732+
78733+ BUG_ON(retval == NULL);
78734+
78735+ return retval;
78736+}
78737+
78738+void
78739+assign_special_role(const char *rolename)
78740+{
78741+ struct acl_object_label *obj;
78742+ struct acl_role_label *r;
78743+ struct acl_role_label *assigned = NULL;
78744+ struct task_struct *tsk;
78745+ struct file *filp;
78746+
78747+ FOR_EACH_ROLE_START(r)
78748+ if (!strcmp(rolename, r->rolename) &&
78749+ (r->roletype & GR_ROLE_SPECIAL)) {
78750+ assigned = r;
78751+ break;
78752+ }
78753+ FOR_EACH_ROLE_END(r)
78754+
78755+ if (!assigned)
78756+ return;
78757+
78758+ read_lock(&tasklist_lock);
78759+ read_lock(&grsec_exec_file_lock);
78760+
78761+ tsk = current->real_parent;
78762+ if (tsk == NULL)
78763+ goto out_unlock;
78764+
78765+ filp = tsk->exec_file;
78766+ if (filp == NULL)
78767+ goto out_unlock;
78768+
78769+ tsk->is_writable = 0;
78770+ tsk->inherited = 0;
78771+
78772+ tsk->acl_sp_role = 1;
78773+ tsk->acl_role_id = ++acl_sp_role_value;
78774+ tsk->role = assigned;
78775+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
78776+
78777+ /* ignore additional mmap checks for processes that are writable
78778+ by the default ACL */
78779+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
78780+ if (unlikely(obj->mode & GR_WRITE))
78781+ tsk->is_writable = 1;
78782+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
78783+ if (unlikely(obj->mode & GR_WRITE))
78784+ tsk->is_writable = 1;
78785+
78786+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
78787+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
78788+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
78789+#endif
78790+
78791+out_unlock:
78792+ read_unlock(&grsec_exec_file_lock);
78793+ read_unlock(&tasklist_lock);
78794+ return;
78795+}
78796+
78797+
78798+static void
78799+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
78800+{
78801+ struct task_struct *task = current;
78802+ const struct cred *cred = current_cred();
78803+
78804+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
78805+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78806+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78807+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
78808+
78809+ return;
78810+}
78811+
78812+static void
78813+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
78814+{
78815+ struct task_struct *task = current;
78816+ const struct cred *cred = current_cred();
78817+
78818+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
78819+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78820+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78821+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
78822+
78823+ return;
78824+}
78825+
78826+static void
78827+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
78828+{
78829+ struct task_struct *task = current;
78830+ const struct cred *cred = current_cred();
78831+
78832+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
78833+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78834+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78835+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
78836+
78837+ return;
78838+}
78839+
78840+static void
78841+gr_set_proc_res(struct task_struct *task)
78842+{
78843+ struct acl_subject_label *proc;
78844+ unsigned short i;
78845+
78846+ proc = task->acl;
78847+
78848+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
78849+ return;
78850+
78851+ for (i = 0; i < RLIM_NLIMITS; i++) {
78852+ unsigned long rlim_cur, rlim_max;
78853+
78854+ if (!(proc->resmask & (1U << i)))
78855+ continue;
78856+
78857+ rlim_cur = proc->res[i].rlim_cur;
78858+ rlim_max = proc->res[i].rlim_max;
78859+
78860+ if (i == RLIMIT_NOFILE) {
78861+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
78862+ if (rlim_cur > saved_sysctl_nr_open)
78863+ rlim_cur = saved_sysctl_nr_open;
78864+ if (rlim_max > saved_sysctl_nr_open)
78865+ rlim_max = saved_sysctl_nr_open;
78866+ }
78867+
78868+ task->signal->rlim[i].rlim_cur = rlim_cur;
78869+ task->signal->rlim[i].rlim_max = rlim_max;
78870+
78871+ if (i == RLIMIT_CPU)
78872+ update_rlimit_cpu(task, rlim_cur);
78873+ }
78874+
78875+ return;
78876+}
78877+
78878+/* both of the below must be called with
78879+ rcu_read_lock();
78880+ read_lock(&tasklist_lock);
78881+ read_lock(&grsec_exec_file_lock);
78882+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
78883+*/
78884+
78885+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
78886+{
78887+ char *tmpname;
78888+ struct acl_subject_label *tmpsubj;
78889+ struct file *filp;
78890+ struct name_entry *nmatch;
78891+
78892+ filp = task->exec_file;
78893+ if (filp == NULL)
78894+ return NULL;
78895+
78896+ /* the following is to apply the correct subject
78897+ on binaries running when the RBAC system
78898+ is enabled, when the binaries have been
78899+ replaced or deleted since their execution
78900+ -----
78901+ when the RBAC system starts, the inode/dev
78902+ from exec_file will be one the RBAC system
78903+ is unaware of. It only knows the inode/dev
78904+ of the present file on disk, or the absence
78905+ of it.
78906+ */
78907+
78908+ if (filename)
78909+ nmatch = __lookup_name_entry(state, filename);
78910+ else {
78911+ preempt_disable();
78912+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
78913+
78914+ nmatch = __lookup_name_entry(state, tmpname);
78915+ preempt_enable();
78916+ }
78917+ tmpsubj = NULL;
78918+ if (nmatch) {
78919+ if (nmatch->deleted)
78920+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
78921+ else
78922+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
78923+ }
78924+ /* this also works for the reload case -- if we don't match a potentially inherited subject
78925+ then we fall back to a normal lookup based on the binary's ino/dev
78926+ */
78927+ if (tmpsubj == NULL && fallback)
78928+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
78929+
78930+ return tmpsubj;
78931+}
78932+
78933+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
78934+{
78935+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
78936+}
78937+
78938+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
78939+{
78940+ struct acl_object_label *obj;
78941+ struct file *filp;
78942+
78943+ filp = task->exec_file;
78944+
78945+ task->acl = subj;
78946+ task->is_writable = 0;
78947+ /* ignore additional mmap checks for processes that are writable
78948+ by the default ACL */
78949+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
78950+ if (unlikely(obj->mode & GR_WRITE))
78951+ task->is_writable = 1;
78952+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
78953+ if (unlikely(obj->mode & GR_WRITE))
78954+ task->is_writable = 1;
78955+
78956+ gr_set_proc_res(task);
78957+
78958+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
78959+ 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);
78960+#endif
78961+}
78962+
78963+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
78964+{
78965+ __gr_apply_subject_to_task(&running_polstate, task, subj);
78966+}
78967+
78968+__u32
78969+gr_search_file(const struct dentry * dentry, const __u32 mode,
78970+ const struct vfsmount * mnt)
78971+{
78972+ __u32 retval = mode;
78973+ struct acl_subject_label *curracl;
78974+ struct acl_object_label *currobj;
78975+
78976+ if (unlikely(!(gr_status & GR_READY)))
78977+ return (mode & ~GR_AUDITS);
78978+
78979+ curracl = current->acl;
78980+
78981+ currobj = chk_obj_label(dentry, mnt, curracl);
78982+ retval = currobj->mode & mode;
78983+
78984+ /* if we're opening a specified transfer file for writing
78985+ (e.g. /dev/initctl), then transfer our role to init
78986+ */
78987+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
78988+ current->role->roletype & GR_ROLE_PERSIST)) {
78989+ struct task_struct *task = init_pid_ns.child_reaper;
78990+
78991+ if (task->role != current->role) {
78992+ struct acl_subject_label *subj;
78993+
78994+ task->acl_sp_role = 0;
78995+ task->acl_role_id = current->acl_role_id;
78996+ task->role = current->role;
78997+ rcu_read_lock();
78998+ read_lock(&grsec_exec_file_lock);
78999+ subj = gr_get_subject_for_task(task, NULL, 1);
79000+ gr_apply_subject_to_task(task, subj);
79001+ read_unlock(&grsec_exec_file_lock);
79002+ rcu_read_unlock();
79003+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
79004+ }
79005+ }
79006+
79007+ if (unlikely
79008+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
79009+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
79010+ __u32 new_mode = mode;
79011+
79012+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
79013+
79014+ retval = new_mode;
79015+
79016+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
79017+ new_mode |= GR_INHERIT;
79018+
79019+ if (!(mode & GR_NOLEARN))
79020+ gr_log_learn(dentry, mnt, new_mode);
79021+ }
79022+
79023+ return retval;
79024+}
79025+
79026+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
79027+ const struct dentry *parent,
79028+ const struct vfsmount *mnt)
79029+{
79030+ struct name_entry *match;
79031+ struct acl_object_label *matchpo;
79032+ struct acl_subject_label *curracl;
79033+ char *path;
79034+
79035+ if (unlikely(!(gr_status & GR_READY)))
79036+ return NULL;
79037+
79038+ preempt_disable();
79039+ path = gr_to_filename_rbac(new_dentry, mnt);
79040+ match = lookup_name_entry_create(path);
79041+
79042+ curracl = current->acl;
79043+
79044+ if (match) {
79045+ read_lock(&gr_inode_lock);
79046+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
79047+ read_unlock(&gr_inode_lock);
79048+
79049+ if (matchpo) {
79050+ preempt_enable();
79051+ return matchpo;
79052+ }
79053+ }
79054+
79055+ // lookup parent
79056+
79057+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
79058+
79059+ preempt_enable();
79060+ return matchpo;
79061+}
79062+
79063+__u32
79064+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
79065+ const struct vfsmount * mnt, const __u32 mode)
79066+{
79067+ struct acl_object_label *matchpo;
79068+ __u32 retval;
79069+
79070+ if (unlikely(!(gr_status & GR_READY)))
79071+ return (mode & ~GR_AUDITS);
79072+
79073+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
79074+
79075+ retval = matchpo->mode & mode;
79076+
79077+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
79078+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
79079+ __u32 new_mode = mode;
79080+
79081+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
79082+
79083+ gr_log_learn(new_dentry, mnt, new_mode);
79084+ return new_mode;
79085+ }
79086+
79087+ return retval;
79088+}
79089+
79090+__u32
79091+gr_check_link(const struct dentry * new_dentry,
79092+ const struct dentry * parent_dentry,
79093+ const struct vfsmount * parent_mnt,
79094+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
79095+{
79096+ struct acl_object_label *obj;
79097+ __u32 oldmode, newmode;
79098+ __u32 needmode;
79099+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
79100+ GR_DELETE | GR_INHERIT;
79101+
79102+ if (unlikely(!(gr_status & GR_READY)))
79103+ return (GR_CREATE | GR_LINK);
79104+
79105+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
79106+ oldmode = obj->mode;
79107+
79108+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
79109+ newmode = obj->mode;
79110+
79111+ needmode = newmode & checkmodes;
79112+
79113+ // old name for hardlink must have at least the permissions of the new name
79114+ if ((oldmode & needmode) != needmode)
79115+ goto bad;
79116+
79117+ // if old name had restrictions/auditing, make sure the new name does as well
79118+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
79119+
79120+ // don't allow hardlinking of suid/sgid/fcapped files without permission
79121+ if (is_privileged_binary(old_dentry))
79122+ needmode |= GR_SETID;
79123+
79124+ if ((newmode & needmode) != needmode)
79125+ goto bad;
79126+
79127+ // enforce minimum permissions
79128+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
79129+ return newmode;
79130+bad:
79131+ needmode = oldmode;
79132+ if (is_privileged_binary(old_dentry))
79133+ needmode |= GR_SETID;
79134+
79135+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
79136+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
79137+ return (GR_CREATE | GR_LINK);
79138+ } else if (newmode & GR_SUPPRESS)
79139+ return GR_SUPPRESS;
79140+ else
79141+ return 0;
79142+}
79143+
79144+int
79145+gr_check_hidden_task(const struct task_struct *task)
79146+{
79147+ if (unlikely(!(gr_status & GR_READY)))
79148+ return 0;
79149+
79150+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
79151+ return 1;
79152+
79153+ return 0;
79154+}
79155+
79156+int
79157+gr_check_protected_task(const struct task_struct *task)
79158+{
79159+ if (unlikely(!(gr_status & GR_READY) || !task))
79160+ return 0;
79161+
79162+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
79163+ task->acl != current->acl)
79164+ return 1;
79165+
79166+ return 0;
79167+}
79168+
79169+int
79170+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
79171+{
79172+ struct task_struct *p;
79173+ int ret = 0;
79174+
79175+ if (unlikely(!(gr_status & GR_READY) || !pid))
79176+ return ret;
79177+
79178+ read_lock(&tasklist_lock);
79179+ do_each_pid_task(pid, type, p) {
79180+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
79181+ p->acl != current->acl) {
79182+ ret = 1;
79183+ goto out;
79184+ }
79185+ } while_each_pid_task(pid, type, p);
79186+out:
79187+ read_unlock(&tasklist_lock);
79188+
79189+ return ret;
79190+}
79191+
79192+void
79193+gr_copy_label(struct task_struct *tsk)
79194+{
79195+ struct task_struct *p = current;
79196+
79197+ tsk->inherited = p->inherited;
79198+ tsk->acl_sp_role = 0;
79199+ tsk->acl_role_id = p->acl_role_id;
79200+ tsk->acl = p->acl;
79201+ tsk->role = p->role;
79202+ tsk->signal->used_accept = 0;
79203+ tsk->signal->curr_ip = p->signal->curr_ip;
79204+ tsk->signal->saved_ip = p->signal->saved_ip;
79205+ if (p->exec_file)
79206+ get_file(p->exec_file);
79207+ tsk->exec_file = p->exec_file;
79208+ tsk->is_writable = p->is_writable;
79209+ if (unlikely(p->signal->used_accept)) {
79210+ p->signal->curr_ip = 0;
79211+ p->signal->saved_ip = 0;
79212+ }
79213+
79214+ return;
79215+}
79216+
79217+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
79218+
79219+int
79220+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
79221+{
79222+ unsigned int i;
79223+ __u16 num;
79224+ uid_t *uidlist;
79225+ uid_t curuid;
79226+ int realok = 0;
79227+ int effectiveok = 0;
79228+ int fsok = 0;
79229+ uid_t globalreal, globaleffective, globalfs;
79230+
79231+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
79232+ struct user_struct *user;
79233+
79234+ if (!uid_valid(real))
79235+ goto skipit;
79236+
79237+ /* find user based on global namespace */
79238+
79239+ globalreal = GR_GLOBAL_UID(real);
79240+
79241+ user = find_user(make_kuid(&init_user_ns, globalreal));
79242+ if (user == NULL)
79243+ goto skipit;
79244+
79245+ if (gr_process_kernel_setuid_ban(user)) {
79246+ /* for find_user */
79247+ free_uid(user);
79248+ return 1;
79249+ }
79250+
79251+ /* for find_user */
79252+ free_uid(user);
79253+
79254+skipit:
79255+#endif
79256+
79257+ if (unlikely(!(gr_status & GR_READY)))
79258+ return 0;
79259+
79260+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
79261+ gr_log_learn_uid_change(real, effective, fs);
79262+
79263+ num = current->acl->user_trans_num;
79264+ uidlist = current->acl->user_transitions;
79265+
79266+ if (uidlist == NULL)
79267+ return 0;
79268+
79269+ if (!uid_valid(real)) {
79270+ realok = 1;
79271+ globalreal = (uid_t)-1;
79272+ } else {
79273+ globalreal = GR_GLOBAL_UID(real);
79274+ }
79275+ if (!uid_valid(effective)) {
79276+ effectiveok = 1;
79277+ globaleffective = (uid_t)-1;
79278+ } else {
79279+ globaleffective = GR_GLOBAL_UID(effective);
79280+ }
79281+ if (!uid_valid(fs)) {
79282+ fsok = 1;
79283+ globalfs = (uid_t)-1;
79284+ } else {
79285+ globalfs = GR_GLOBAL_UID(fs);
79286+ }
79287+
79288+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
79289+ for (i = 0; i < num; i++) {
79290+ curuid = uidlist[i];
79291+ if (globalreal == curuid)
79292+ realok = 1;
79293+ if (globaleffective == curuid)
79294+ effectiveok = 1;
79295+ if (globalfs == curuid)
79296+ fsok = 1;
79297+ }
79298+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
79299+ for (i = 0; i < num; i++) {
79300+ curuid = uidlist[i];
79301+ if (globalreal == curuid)
79302+ break;
79303+ if (globaleffective == curuid)
79304+ break;
79305+ if (globalfs == curuid)
79306+ break;
79307+ }
79308+ /* not in deny list */
79309+ if (i == num) {
79310+ realok = 1;
79311+ effectiveok = 1;
79312+ fsok = 1;
79313+ }
79314+ }
79315+
79316+ if (realok && effectiveok && fsok)
79317+ return 0;
79318+ else {
79319+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
79320+ return 1;
79321+ }
79322+}
79323+
79324+int
79325+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
79326+{
79327+ unsigned int i;
79328+ __u16 num;
79329+ gid_t *gidlist;
79330+ gid_t curgid;
79331+ int realok = 0;
79332+ int effectiveok = 0;
79333+ int fsok = 0;
79334+ gid_t globalreal, globaleffective, globalfs;
79335+
79336+ if (unlikely(!(gr_status & GR_READY)))
79337+ return 0;
79338+
79339+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
79340+ gr_log_learn_gid_change(real, effective, fs);
79341+
79342+ num = current->acl->group_trans_num;
79343+ gidlist = current->acl->group_transitions;
79344+
79345+ if (gidlist == NULL)
79346+ return 0;
79347+
79348+ if (!gid_valid(real)) {
79349+ realok = 1;
79350+ globalreal = (gid_t)-1;
79351+ } else {
79352+ globalreal = GR_GLOBAL_GID(real);
79353+ }
79354+ if (!gid_valid(effective)) {
79355+ effectiveok = 1;
79356+ globaleffective = (gid_t)-1;
79357+ } else {
79358+ globaleffective = GR_GLOBAL_GID(effective);
79359+ }
79360+ if (!gid_valid(fs)) {
79361+ fsok = 1;
79362+ globalfs = (gid_t)-1;
79363+ } else {
79364+ globalfs = GR_GLOBAL_GID(fs);
79365+ }
79366+
79367+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
79368+ for (i = 0; i < num; i++) {
79369+ curgid = gidlist[i];
79370+ if (globalreal == curgid)
79371+ realok = 1;
79372+ if (globaleffective == curgid)
79373+ effectiveok = 1;
79374+ if (globalfs == curgid)
79375+ fsok = 1;
79376+ }
79377+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
79378+ for (i = 0; i < num; i++) {
79379+ curgid = gidlist[i];
79380+ if (globalreal == curgid)
79381+ break;
79382+ if (globaleffective == curgid)
79383+ break;
79384+ if (globalfs == curgid)
79385+ break;
79386+ }
79387+ /* not in deny list */
79388+ if (i == num) {
79389+ realok = 1;
79390+ effectiveok = 1;
79391+ fsok = 1;
79392+ }
79393+ }
79394+
79395+ if (realok && effectiveok && fsok)
79396+ return 0;
79397+ else {
79398+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
79399+ return 1;
79400+ }
79401+}
79402+
79403+extern int gr_acl_is_capable(const int cap);
79404+
79405+void
79406+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
79407+{
79408+ struct acl_role_label *role = task->role;
79409+ struct acl_role_label *origrole = role;
79410+ struct acl_subject_label *subj = NULL;
79411+ struct acl_object_label *obj;
79412+ struct file *filp;
79413+ uid_t uid;
79414+ gid_t gid;
79415+
79416+ if (unlikely(!(gr_status & GR_READY)))
79417+ return;
79418+
79419+ uid = GR_GLOBAL_UID(kuid);
79420+ gid = GR_GLOBAL_GID(kgid);
79421+
79422+ filp = task->exec_file;
79423+
79424+ /* kernel process, we'll give them the kernel role */
79425+ if (unlikely(!filp)) {
79426+ task->role = running_polstate.kernel_role;
79427+ task->acl = running_polstate.kernel_role->root_label;
79428+ return;
79429+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
79430+ /* save the current ip at time of role lookup so that the proper
79431+ IP will be learned for role_allowed_ip */
79432+ task->signal->saved_ip = task->signal->curr_ip;
79433+ role = lookup_acl_role_label(task, uid, gid);
79434+ }
79435+
79436+ /* don't change the role if we're not a privileged process */
79437+ if (role && task->role != role &&
79438+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
79439+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
79440+ return;
79441+
79442+ task->role = role;
79443+
79444+ if (task->inherited) {
79445+ /* if we reached our subject through inheritance, then first see
79446+ if there's a subject of the same name in the new role that has
79447+ an object that would result in the same inherited subject
79448+ */
79449+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
79450+ if (subj) {
79451+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
79452+ if (!(obj->mode & GR_INHERIT))
79453+ subj = NULL;
79454+ }
79455+
79456+ }
79457+ if (subj == NULL) {
79458+ /* otherwise:
79459+ perform subject lookup in possibly new role
79460+ we can use this result below in the case where role == task->role
79461+ */
79462+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
79463+ }
79464+
79465+ /* if we changed uid/gid, but result in the same role
79466+ and are using inheritance, don't lose the inherited subject
79467+ if current subject is other than what normal lookup
79468+ would result in, we arrived via inheritance, don't
79469+ lose subject
79470+ */
79471+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
79472+ (subj == task->acl)))
79473+ task->acl = subj;
79474+
79475+ /* leave task->inherited unaffected */
79476+
79477+ task->is_writable = 0;
79478+
79479+ /* ignore additional mmap checks for processes that are writable
79480+ by the default ACL */
79481+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
79482+ if (unlikely(obj->mode & GR_WRITE))
79483+ task->is_writable = 1;
79484+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
79485+ if (unlikely(obj->mode & GR_WRITE))
79486+ task->is_writable = 1;
79487+
79488+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
79489+ 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);
79490+#endif
79491+
79492+ gr_set_proc_res(task);
79493+
79494+ return;
79495+}
79496+
79497+int
79498+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
79499+ const int unsafe_flags)
79500+{
79501+ struct task_struct *task = current;
79502+ struct acl_subject_label *newacl;
79503+ struct acl_object_label *obj;
79504+ __u32 retmode;
79505+
79506+ if (unlikely(!(gr_status & GR_READY)))
79507+ return 0;
79508+
79509+ newacl = chk_subj_label(dentry, mnt, task->role);
79510+
79511+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
79512+ did an exec
79513+ */
79514+ rcu_read_lock();
79515+ read_lock(&tasklist_lock);
79516+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
79517+ (task->parent->acl->mode & GR_POVERRIDE))) {
79518+ read_unlock(&tasklist_lock);
79519+ rcu_read_unlock();
79520+ goto skip_check;
79521+ }
79522+ read_unlock(&tasklist_lock);
79523+ rcu_read_unlock();
79524+
79525+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
79526+ !(task->role->roletype & GR_ROLE_GOD) &&
79527+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
79528+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
79529+ if (unsafe_flags & LSM_UNSAFE_SHARE)
79530+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
79531+ else
79532+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
79533+ return -EACCES;
79534+ }
79535+
79536+skip_check:
79537+
79538+ obj = chk_obj_label(dentry, mnt, task->acl);
79539+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
79540+
79541+ if (!(task->acl->mode & GR_INHERITLEARN) &&
79542+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
79543+ if (obj->nested)
79544+ task->acl = obj->nested;
79545+ else
79546+ task->acl = newacl;
79547+ task->inherited = 0;
79548+ } else {
79549+ task->inherited = 1;
79550+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
79551+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
79552+ }
79553+
79554+ task->is_writable = 0;
79555+
79556+ /* ignore additional mmap checks for processes that are writable
79557+ by the default ACL */
79558+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
79559+ if (unlikely(obj->mode & GR_WRITE))
79560+ task->is_writable = 1;
79561+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
79562+ if (unlikely(obj->mode & GR_WRITE))
79563+ task->is_writable = 1;
79564+
79565+ gr_set_proc_res(task);
79566+
79567+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
79568+ 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);
79569+#endif
79570+ return 0;
79571+}
79572+
79573+/* always called with valid inodev ptr */
79574+static void
79575+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
79576+{
79577+ struct acl_object_label *matchpo;
79578+ struct acl_subject_label *matchps;
79579+ struct acl_subject_label *subj;
79580+ struct acl_role_label *role;
79581+ unsigned int x;
79582+
79583+ FOR_EACH_ROLE_START(role)
79584+ FOR_EACH_SUBJECT_START(role, subj, x)
79585+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
79586+ matchpo->mode |= GR_DELETED;
79587+ FOR_EACH_SUBJECT_END(subj,x)
79588+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
79589+ /* nested subjects aren't in the role's subj_hash table */
79590+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
79591+ matchpo->mode |= GR_DELETED;
79592+ FOR_EACH_NESTED_SUBJECT_END(subj)
79593+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
79594+ matchps->mode |= GR_DELETED;
79595+ FOR_EACH_ROLE_END(role)
79596+
79597+ inodev->nentry->deleted = 1;
79598+
79599+ return;
79600+}
79601+
79602+void
79603+gr_handle_delete(const u64 ino, const dev_t dev)
79604+{
79605+ struct inodev_entry *inodev;
79606+
79607+ if (unlikely(!(gr_status & GR_READY)))
79608+ return;
79609+
79610+ write_lock(&gr_inode_lock);
79611+ inodev = lookup_inodev_entry(ino, dev);
79612+ if (inodev != NULL)
79613+ do_handle_delete(inodev, ino, dev);
79614+ write_unlock(&gr_inode_lock);
79615+
79616+ return;
79617+}
79618+
79619+static void
79620+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
79621+ const u64 newinode, const dev_t newdevice,
79622+ struct acl_subject_label *subj)
79623+{
79624+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
79625+ struct acl_object_label *match;
79626+
79627+ match = subj->obj_hash[index];
79628+
79629+ while (match && (match->inode != oldinode ||
79630+ match->device != olddevice ||
79631+ !(match->mode & GR_DELETED)))
79632+ match = match->next;
79633+
79634+ if (match && (match->inode == oldinode)
79635+ && (match->device == olddevice)
79636+ && (match->mode & GR_DELETED)) {
79637+ if (match->prev == NULL) {
79638+ subj->obj_hash[index] = match->next;
79639+ if (match->next != NULL)
79640+ match->next->prev = NULL;
79641+ } else {
79642+ match->prev->next = match->next;
79643+ if (match->next != NULL)
79644+ match->next->prev = match->prev;
79645+ }
79646+ match->prev = NULL;
79647+ match->next = NULL;
79648+ match->inode = newinode;
79649+ match->device = newdevice;
79650+ match->mode &= ~GR_DELETED;
79651+
79652+ insert_acl_obj_label(match, subj);
79653+ }
79654+
79655+ return;
79656+}
79657+
79658+static void
79659+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
79660+ const u64 newinode, const dev_t newdevice,
79661+ struct acl_role_label *role)
79662+{
79663+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
79664+ struct acl_subject_label *match;
79665+
79666+ match = role->subj_hash[index];
79667+
79668+ while (match && (match->inode != oldinode ||
79669+ match->device != olddevice ||
79670+ !(match->mode & GR_DELETED)))
79671+ match = match->next;
79672+
79673+ if (match && (match->inode == oldinode)
79674+ && (match->device == olddevice)
79675+ && (match->mode & GR_DELETED)) {
79676+ if (match->prev == NULL) {
79677+ role->subj_hash[index] = match->next;
79678+ if (match->next != NULL)
79679+ match->next->prev = NULL;
79680+ } else {
79681+ match->prev->next = match->next;
79682+ if (match->next != NULL)
79683+ match->next->prev = match->prev;
79684+ }
79685+ match->prev = NULL;
79686+ match->next = NULL;
79687+ match->inode = newinode;
79688+ match->device = newdevice;
79689+ match->mode &= ~GR_DELETED;
79690+
79691+ insert_acl_subj_label(match, role);
79692+ }
79693+
79694+ return;
79695+}
79696+
79697+static void
79698+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
79699+ const u64 newinode, const dev_t newdevice)
79700+{
79701+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
79702+ struct inodev_entry *match;
79703+
79704+ match = running_polstate.inodev_set.i_hash[index];
79705+
79706+ while (match && (match->nentry->inode != oldinode ||
79707+ match->nentry->device != olddevice || !match->nentry->deleted))
79708+ match = match->next;
79709+
79710+ if (match && (match->nentry->inode == oldinode)
79711+ && (match->nentry->device == olddevice) &&
79712+ match->nentry->deleted) {
79713+ if (match->prev == NULL) {
79714+ running_polstate.inodev_set.i_hash[index] = match->next;
79715+ if (match->next != NULL)
79716+ match->next->prev = NULL;
79717+ } else {
79718+ match->prev->next = match->next;
79719+ if (match->next != NULL)
79720+ match->next->prev = match->prev;
79721+ }
79722+ match->prev = NULL;
79723+ match->next = NULL;
79724+ match->nentry->inode = newinode;
79725+ match->nentry->device = newdevice;
79726+ match->nentry->deleted = 0;
79727+
79728+ insert_inodev_entry(match);
79729+ }
79730+
79731+ return;
79732+}
79733+
79734+static void
79735+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
79736+{
79737+ struct acl_subject_label *subj;
79738+ struct acl_role_label *role;
79739+ unsigned int x;
79740+
79741+ FOR_EACH_ROLE_START(role)
79742+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
79743+
79744+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
79745+ if ((subj->inode == ino) && (subj->device == dev)) {
79746+ subj->inode = ino;
79747+ subj->device = dev;
79748+ }
79749+ /* nested subjects aren't in the role's subj_hash table */
79750+ update_acl_obj_label(matchn->inode, matchn->device,
79751+ ino, dev, subj);
79752+ FOR_EACH_NESTED_SUBJECT_END(subj)
79753+ FOR_EACH_SUBJECT_START(role, subj, x)
79754+ update_acl_obj_label(matchn->inode, matchn->device,
79755+ ino, dev, subj);
79756+ FOR_EACH_SUBJECT_END(subj,x)
79757+ FOR_EACH_ROLE_END(role)
79758+
79759+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
79760+
79761+ return;
79762+}
79763+
79764+static void
79765+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
79766+ const struct vfsmount *mnt)
79767+{
79768+ u64 ino = __get_ino(dentry);
79769+ dev_t dev = __get_dev(dentry);
79770+
79771+ __do_handle_create(matchn, ino, dev);
79772+
79773+ return;
79774+}
79775+
79776+void
79777+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
79778+{
79779+ struct name_entry *matchn;
79780+
79781+ if (unlikely(!(gr_status & GR_READY)))
79782+ return;
79783+
79784+ preempt_disable();
79785+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
79786+
79787+ if (unlikely((unsigned long)matchn)) {
79788+ write_lock(&gr_inode_lock);
79789+ do_handle_create(matchn, dentry, mnt);
79790+ write_unlock(&gr_inode_lock);
79791+ }
79792+ preempt_enable();
79793+
79794+ return;
79795+}
79796+
79797+void
79798+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
79799+{
79800+ struct name_entry *matchn;
79801+
79802+ if (unlikely(!(gr_status & GR_READY)))
79803+ return;
79804+
79805+ preempt_disable();
79806+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
79807+
79808+ if (unlikely((unsigned long)matchn)) {
79809+ write_lock(&gr_inode_lock);
79810+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
79811+ write_unlock(&gr_inode_lock);
79812+ }
79813+ preempt_enable();
79814+
79815+ return;
79816+}
79817+
79818+void
79819+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
79820+ struct dentry *old_dentry,
79821+ struct dentry *new_dentry,
79822+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
79823+{
79824+ struct name_entry *matchn;
79825+ struct name_entry *matchn2 = NULL;
79826+ struct inodev_entry *inodev;
79827+ struct inode *inode = new_dentry->d_inode;
79828+ u64 old_ino = __get_ino(old_dentry);
79829+ dev_t old_dev = __get_dev(old_dentry);
79830+ unsigned int exchange = flags & RENAME_EXCHANGE;
79831+
79832+ /* vfs_rename swaps the name and parent link for old_dentry and
79833+ new_dentry
79834+ at this point, old_dentry has the new name, parent link, and inode
79835+ for the renamed file
79836+ if a file is being replaced by a rename, new_dentry has the inode
79837+ and name for the replaced file
79838+ */
79839+
79840+ if (unlikely(!(gr_status & GR_READY)))
79841+ return;
79842+
79843+ preempt_disable();
79844+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
79845+
79846+ /* exchange cases:
79847+ a filename exists for the source, but not dest
79848+ do a recreate on source
79849+ a filename exists for the dest, but not source
79850+ do a recreate on dest
79851+ a filename exists for both source and dest
79852+ delete source and dest, then create source and dest
79853+ a filename exists for neither source nor dest
79854+ no updates needed
79855+
79856+ the name entry lookups get us the old inode/dev associated with
79857+ each name, so do the deletes first (if possible) so that when
79858+ we do the create, we pick up on the right entries
79859+ */
79860+
79861+ if (exchange)
79862+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
79863+
79864+ /* we wouldn't have to check d_inode if it weren't for
79865+ NFS silly-renaming
79866+ */
79867+
79868+ write_lock(&gr_inode_lock);
79869+ if (unlikely((replace || exchange) && inode)) {
79870+ u64 new_ino = __get_ino(new_dentry);
79871+ dev_t new_dev = __get_dev(new_dentry);
79872+
79873+ inodev = lookup_inodev_entry(new_ino, new_dev);
79874+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
79875+ do_handle_delete(inodev, new_ino, new_dev);
79876+ }
79877+
79878+ inodev = lookup_inodev_entry(old_ino, old_dev);
79879+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
79880+ do_handle_delete(inodev, old_ino, old_dev);
79881+
79882+ if (unlikely(matchn != NULL))
79883+ do_handle_create(matchn, old_dentry, mnt);
79884+
79885+ if (unlikely(matchn2 != NULL))
79886+ do_handle_create(matchn2, new_dentry, mnt);
79887+
79888+ write_unlock(&gr_inode_lock);
79889+ preempt_enable();
79890+
79891+ return;
79892+}
79893+
79894+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
79895+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
79896+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
79897+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
79898+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
79899+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
79900+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
79901+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
79902+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
79903+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
79904+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
79905+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
79906+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
79907+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
79908+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
79909+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
79910+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
79911+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
79912+};
79913+
79914+void
79915+gr_learn_resource(const struct task_struct *task,
79916+ const int res, const unsigned long wanted, const int gt)
79917+{
79918+ struct acl_subject_label *acl;
79919+ const struct cred *cred;
79920+
79921+ if (unlikely((gr_status & GR_READY) &&
79922+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
79923+ goto skip_reslog;
79924+
79925+ gr_log_resource(task, res, wanted, gt);
79926+skip_reslog:
79927+
79928+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
79929+ return;
79930+
79931+ acl = task->acl;
79932+
79933+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
79934+ !(acl->resmask & (1U << (unsigned short) res))))
79935+ return;
79936+
79937+ if (wanted >= acl->res[res].rlim_cur) {
79938+ unsigned long res_add;
79939+
79940+ res_add = wanted + res_learn_bumps[res];
79941+
79942+ acl->res[res].rlim_cur = res_add;
79943+
79944+ if (wanted > acl->res[res].rlim_max)
79945+ acl->res[res].rlim_max = res_add;
79946+
79947+ /* only log the subject filename, since resource logging is supported for
79948+ single-subject learning only */
79949+ rcu_read_lock();
79950+ cred = __task_cred(task);
79951+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
79952+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
79953+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
79954+ "", (unsigned long) res, &task->signal->saved_ip);
79955+ rcu_read_unlock();
79956+ }
79957+
79958+ return;
79959+}
79960+EXPORT_SYMBOL_GPL(gr_learn_resource);
79961+#endif
79962+
79963+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
79964+void
79965+pax_set_initial_flags(struct linux_binprm *bprm)
79966+{
79967+ struct task_struct *task = current;
79968+ struct acl_subject_label *proc;
79969+ unsigned long flags;
79970+
79971+ if (unlikely(!(gr_status & GR_READY)))
79972+ return;
79973+
79974+ flags = pax_get_flags(task);
79975+
79976+ proc = task->acl;
79977+
79978+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
79979+ flags &= ~MF_PAX_PAGEEXEC;
79980+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
79981+ flags &= ~MF_PAX_SEGMEXEC;
79982+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
79983+ flags &= ~MF_PAX_RANDMMAP;
79984+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
79985+ flags &= ~MF_PAX_EMUTRAMP;
79986+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
79987+ flags &= ~MF_PAX_MPROTECT;
79988+
79989+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
79990+ flags |= MF_PAX_PAGEEXEC;
79991+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
79992+ flags |= MF_PAX_SEGMEXEC;
79993+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
79994+ flags |= MF_PAX_RANDMMAP;
79995+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
79996+ flags |= MF_PAX_EMUTRAMP;
79997+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
79998+ flags |= MF_PAX_MPROTECT;
79999+
80000+ pax_set_flags(task, flags);
80001+
80002+ return;
80003+}
80004+#endif
80005+
80006+int
80007+gr_handle_proc_ptrace(struct task_struct *task)
80008+{
80009+ struct file *filp;
80010+ struct task_struct *tmp = task;
80011+ struct task_struct *curtemp = current;
80012+ __u32 retmode;
80013+
80014+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
80015+ if (unlikely(!(gr_status & GR_READY)))
80016+ return 0;
80017+#endif
80018+
80019+ read_lock(&tasklist_lock);
80020+ read_lock(&grsec_exec_file_lock);
80021+ filp = task->exec_file;
80022+
80023+ while (task_pid_nr(tmp) > 0) {
80024+ if (tmp == curtemp)
80025+ break;
80026+ tmp = tmp->real_parent;
80027+ }
80028+
80029+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
80030+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
80031+ read_unlock(&grsec_exec_file_lock);
80032+ read_unlock(&tasklist_lock);
80033+ return 1;
80034+ }
80035+
80036+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
80037+ if (!(gr_status & GR_READY)) {
80038+ read_unlock(&grsec_exec_file_lock);
80039+ read_unlock(&tasklist_lock);
80040+ return 0;
80041+ }
80042+#endif
80043+
80044+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
80045+ read_unlock(&grsec_exec_file_lock);
80046+ read_unlock(&tasklist_lock);
80047+
80048+ if (retmode & GR_NOPTRACE)
80049+ return 1;
80050+
80051+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
80052+ && (current->acl != task->acl || (current->acl != current->role->root_label
80053+ && task_pid_nr(current) != task_pid_nr(task))))
80054+ return 1;
80055+
80056+ return 0;
80057+}
80058+
80059+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
80060+{
80061+ if (unlikely(!(gr_status & GR_READY)))
80062+ return;
80063+
80064+ if (!(current->role->roletype & GR_ROLE_GOD))
80065+ return;
80066+
80067+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
80068+ p->role->rolename, gr_task_roletype_to_char(p),
80069+ p->acl->filename);
80070+}
80071+
80072+int
80073+gr_handle_ptrace(struct task_struct *task, const long request)
80074+{
80075+ struct task_struct *tmp = task;
80076+ struct task_struct *curtemp = current;
80077+ __u32 retmode;
80078+
80079+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
80080+ if (unlikely(!(gr_status & GR_READY)))
80081+ return 0;
80082+#endif
80083+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
80084+ read_lock(&tasklist_lock);
80085+ while (task_pid_nr(tmp) > 0) {
80086+ if (tmp == curtemp)
80087+ break;
80088+ tmp = tmp->real_parent;
80089+ }
80090+
80091+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
80092+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
80093+ read_unlock(&tasklist_lock);
80094+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
80095+ return 1;
80096+ }
80097+ read_unlock(&tasklist_lock);
80098+ }
80099+
80100+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
80101+ if (!(gr_status & GR_READY))
80102+ return 0;
80103+#endif
80104+
80105+ read_lock(&grsec_exec_file_lock);
80106+ if (unlikely(!task->exec_file)) {
80107+ read_unlock(&grsec_exec_file_lock);
80108+ return 0;
80109+ }
80110+
80111+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
80112+ read_unlock(&grsec_exec_file_lock);
80113+
80114+ if (retmode & GR_NOPTRACE) {
80115+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
80116+ return 1;
80117+ }
80118+
80119+ if (retmode & GR_PTRACERD) {
80120+ switch (request) {
80121+ case PTRACE_SEIZE:
80122+ case PTRACE_POKETEXT:
80123+ case PTRACE_POKEDATA:
80124+ case PTRACE_POKEUSR:
80125+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
80126+ case PTRACE_SETREGS:
80127+ case PTRACE_SETFPREGS:
80128+#endif
80129+#ifdef CONFIG_X86
80130+ case PTRACE_SETFPXREGS:
80131+#endif
80132+#ifdef CONFIG_ALTIVEC
80133+ case PTRACE_SETVRREGS:
80134+#endif
80135+ return 1;
80136+ default:
80137+ return 0;
80138+ }
80139+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
80140+ !(current->role->roletype & GR_ROLE_GOD) &&
80141+ (current->acl != task->acl)) {
80142+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
80143+ return 1;
80144+ }
80145+
80146+ return 0;
80147+}
80148+
80149+static int is_writable_mmap(const struct file *filp)
80150+{
80151+ struct task_struct *task = current;
80152+ struct acl_object_label *obj, *obj2;
80153+
80154+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
80155+ !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))) {
80156+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
80157+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
80158+ task->role->root_label);
80159+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
80160+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
80161+ return 1;
80162+ }
80163+ }
80164+ return 0;
80165+}
80166+
80167+int
80168+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
80169+{
80170+ __u32 mode;
80171+
80172+ if (unlikely(!file || !(prot & PROT_EXEC)))
80173+ return 1;
80174+
80175+ if (is_writable_mmap(file))
80176+ return 0;
80177+
80178+ mode =
80179+ gr_search_file(file->f_path.dentry,
80180+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
80181+ file->f_path.mnt);
80182+
80183+ if (!gr_tpe_allow(file))
80184+ return 0;
80185+
80186+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
80187+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80188+ return 0;
80189+ } else if (unlikely(!(mode & GR_EXEC))) {
80190+ return 0;
80191+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
80192+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80193+ return 1;
80194+ }
80195+
80196+ return 1;
80197+}
80198+
80199+int
80200+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
80201+{
80202+ __u32 mode;
80203+
80204+ if (unlikely(!file || !(prot & PROT_EXEC)))
80205+ return 1;
80206+
80207+ if (is_writable_mmap(file))
80208+ return 0;
80209+
80210+ mode =
80211+ gr_search_file(file->f_path.dentry,
80212+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
80213+ file->f_path.mnt);
80214+
80215+ if (!gr_tpe_allow(file))
80216+ return 0;
80217+
80218+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
80219+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80220+ return 0;
80221+ } else if (unlikely(!(mode & GR_EXEC))) {
80222+ return 0;
80223+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
80224+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80225+ return 1;
80226+ }
80227+
80228+ return 1;
80229+}
80230+
80231+void
80232+gr_acl_handle_psacct(struct task_struct *task, const long code)
80233+{
80234+ unsigned long runtime, cputime;
80235+ cputime_t utime, stime;
80236+ unsigned int wday, cday;
80237+ __u8 whr, chr;
80238+ __u8 wmin, cmin;
80239+ __u8 wsec, csec;
80240+ struct timespec curtime, starttime;
80241+
80242+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
80243+ !(task->acl->mode & GR_PROCACCT)))
80244+ return;
80245+
80246+ curtime = ns_to_timespec(ktime_get_ns());
80247+ starttime = ns_to_timespec(task->start_time);
80248+ runtime = curtime.tv_sec - starttime.tv_sec;
80249+ wday = runtime / (60 * 60 * 24);
80250+ runtime -= wday * (60 * 60 * 24);
80251+ whr = runtime / (60 * 60);
80252+ runtime -= whr * (60 * 60);
80253+ wmin = runtime / 60;
80254+ runtime -= wmin * 60;
80255+ wsec = runtime;
80256+
80257+ task_cputime(task, &utime, &stime);
80258+ cputime = cputime_to_secs(utime + stime);
80259+ cday = cputime / (60 * 60 * 24);
80260+ cputime -= cday * (60 * 60 * 24);
80261+ chr = cputime / (60 * 60);
80262+ cputime -= chr * (60 * 60);
80263+ cmin = cputime / 60;
80264+ cputime -= cmin * 60;
80265+ csec = cputime;
80266+
80267+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
80268+
80269+ return;
80270+}
80271+
80272+#ifdef CONFIG_TASKSTATS
80273+int gr_is_taskstats_denied(int pid)
80274+{
80275+ struct task_struct *task;
80276+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80277+ const struct cred *cred;
80278+#endif
80279+ int ret = 0;
80280+
80281+ /* restrict taskstats viewing to un-chrooted root users
80282+ who have the 'view' subject flag if the RBAC system is enabled
80283+ */
80284+
80285+ rcu_read_lock();
80286+ read_lock(&tasklist_lock);
80287+ task = find_task_by_vpid(pid);
80288+ if (task) {
80289+#ifdef CONFIG_GRKERNSEC_CHROOT
80290+ if (proc_is_chrooted(task))
80291+ ret = -EACCES;
80292+#endif
80293+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80294+ cred = __task_cred(task);
80295+#ifdef CONFIG_GRKERNSEC_PROC_USER
80296+ if (gr_is_global_nonroot(cred->uid))
80297+ ret = -EACCES;
80298+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80299+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
80300+ ret = -EACCES;
80301+#endif
80302+#endif
80303+ if (gr_status & GR_READY) {
80304+ if (!(task->acl->mode & GR_VIEW))
80305+ ret = -EACCES;
80306+ }
80307+ } else
80308+ ret = -ENOENT;
80309+
80310+ read_unlock(&tasklist_lock);
80311+ rcu_read_unlock();
80312+
80313+ return ret;
80314+}
80315+#endif
80316+
80317+/* AUXV entries are filled via a descendant of search_binary_handler
80318+ after we've already applied the subject for the target
80319+*/
80320+int gr_acl_enable_at_secure(void)
80321+{
80322+ if (unlikely(!(gr_status & GR_READY)))
80323+ return 0;
80324+
80325+ if (current->acl->mode & GR_ATSECURE)
80326+ return 1;
80327+
80328+ return 0;
80329+}
80330+
80331+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
80332+{
80333+ struct task_struct *task = current;
80334+ struct dentry *dentry = file->f_path.dentry;
80335+ struct vfsmount *mnt = file->f_path.mnt;
80336+ struct acl_object_label *obj, *tmp;
80337+ struct acl_subject_label *subj;
80338+ unsigned int bufsize;
80339+ int is_not_root;
80340+ char *path;
80341+ dev_t dev = __get_dev(dentry);
80342+
80343+ if (unlikely(!(gr_status & GR_READY)))
80344+ return 1;
80345+
80346+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
80347+ return 1;
80348+
80349+ /* ignore Eric Biederman */
80350+ if (IS_PRIVATE(dentry->d_inode))
80351+ return 1;
80352+
80353+ subj = task->acl;
80354+ read_lock(&gr_inode_lock);
80355+ do {
80356+ obj = lookup_acl_obj_label(ino, dev, subj);
80357+ if (obj != NULL) {
80358+ read_unlock(&gr_inode_lock);
80359+ return (obj->mode & GR_FIND) ? 1 : 0;
80360+ }
80361+ } while ((subj = subj->parent_subject));
80362+ read_unlock(&gr_inode_lock);
80363+
80364+ /* this is purely an optimization since we're looking for an object
80365+ for the directory we're doing a readdir on
80366+ if it's possible for any globbed object to match the entry we're
80367+ filling into the directory, then the object we find here will be
80368+ an anchor point with attached globbed objects
80369+ */
80370+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
80371+ if (obj->globbed == NULL)
80372+ return (obj->mode & GR_FIND) ? 1 : 0;
80373+
80374+ is_not_root = ((obj->filename[0] == '/') &&
80375+ (obj->filename[1] == '\0')) ? 0 : 1;
80376+ bufsize = PAGE_SIZE - namelen - is_not_root;
80377+
80378+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
80379+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
80380+ return 1;
80381+
80382+ preempt_disable();
80383+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
80384+ bufsize);
80385+
80386+ bufsize = strlen(path);
80387+
80388+ /* if base is "/", don't append an additional slash */
80389+ if (is_not_root)
80390+ *(path + bufsize) = '/';
80391+ memcpy(path + bufsize + is_not_root, name, namelen);
80392+ *(path + bufsize + namelen + is_not_root) = '\0';
80393+
80394+ tmp = obj->globbed;
80395+ while (tmp) {
80396+ if (!glob_match(tmp->filename, path)) {
80397+ preempt_enable();
80398+ return (tmp->mode & GR_FIND) ? 1 : 0;
80399+ }
80400+ tmp = tmp->next;
80401+ }
80402+ preempt_enable();
80403+ return (obj->mode & GR_FIND) ? 1 : 0;
80404+}
80405+
80406+void gr_put_exec_file(struct task_struct *task)
80407+{
80408+ struct file *filp;
80409+
80410+ write_lock(&grsec_exec_file_lock);
80411+ filp = task->exec_file;
80412+ task->exec_file = NULL;
80413+ write_unlock(&grsec_exec_file_lock);
80414+
80415+ if (filp)
80416+ fput(filp);
80417+
80418+ return;
80419+}
80420+
80421+
80422+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
80423+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
80424+#endif
80425+#ifdef CONFIG_SECURITY
80426+EXPORT_SYMBOL_GPL(gr_check_user_change);
80427+EXPORT_SYMBOL_GPL(gr_check_group_change);
80428+#endif
80429+
80430diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
80431new file mode 100644
80432index 0000000..9adc75c
80433--- /dev/null
80434+++ b/grsecurity/gracl_alloc.c
80435@@ -0,0 +1,105 @@
80436+#include <linux/kernel.h>
80437+#include <linux/mm.h>
80438+#include <linux/slab.h>
80439+#include <linux/vmalloc.h>
80440+#include <linux/gracl.h>
80441+#include <linux/grsecurity.h>
80442+
80443+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
80444+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
80445+
80446+static int
80447+alloc_pop(void)
80448+{
80449+ if (current_alloc_state->alloc_stack_next == 1)
80450+ return 0;
80451+
80452+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
80453+
80454+ current_alloc_state->alloc_stack_next--;
80455+
80456+ return 1;
80457+}
80458+
80459+static int
80460+alloc_push(void *buf)
80461+{
80462+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
80463+ return 1;
80464+
80465+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
80466+
80467+ current_alloc_state->alloc_stack_next++;
80468+
80469+ return 0;
80470+}
80471+
80472+void *
80473+acl_alloc(unsigned long len)
80474+{
80475+ void *ret = NULL;
80476+
80477+ if (!len || len > PAGE_SIZE)
80478+ goto out;
80479+
80480+ ret = kmalloc(len, GFP_KERNEL);
80481+
80482+ if (ret) {
80483+ if (alloc_push(ret)) {
80484+ kfree(ret);
80485+ ret = NULL;
80486+ }
80487+ }
80488+
80489+out:
80490+ return ret;
80491+}
80492+
80493+void *
80494+acl_alloc_num(unsigned long num, unsigned long len)
80495+{
80496+ if (!len || (num > (PAGE_SIZE / len)))
80497+ return NULL;
80498+
80499+ return acl_alloc(num * len);
80500+}
80501+
80502+void
80503+acl_free_all(void)
80504+{
80505+ if (!current_alloc_state->alloc_stack)
80506+ return;
80507+
80508+ while (alloc_pop()) ;
80509+
80510+ if (current_alloc_state->alloc_stack) {
80511+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
80512+ kfree(current_alloc_state->alloc_stack);
80513+ else
80514+ vfree(current_alloc_state->alloc_stack);
80515+ }
80516+
80517+ current_alloc_state->alloc_stack = NULL;
80518+ current_alloc_state->alloc_stack_size = 1;
80519+ current_alloc_state->alloc_stack_next = 1;
80520+
80521+ return;
80522+}
80523+
80524+int
80525+acl_alloc_stack_init(unsigned long size)
80526+{
80527+ if ((size * sizeof (void *)) <= PAGE_SIZE)
80528+ current_alloc_state->alloc_stack =
80529+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
80530+ else
80531+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
80532+
80533+ current_alloc_state->alloc_stack_size = size;
80534+ current_alloc_state->alloc_stack_next = 1;
80535+
80536+ if (!current_alloc_state->alloc_stack)
80537+ return 0;
80538+ else
80539+ return 1;
80540+}
80541diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
80542new file mode 100644
80543index 0000000..1a94c11
80544--- /dev/null
80545+++ b/grsecurity/gracl_cap.c
80546@@ -0,0 +1,127 @@
80547+#include <linux/kernel.h>
80548+#include <linux/module.h>
80549+#include <linux/sched.h>
80550+#include <linux/gracl.h>
80551+#include <linux/grsecurity.h>
80552+#include <linux/grinternal.h>
80553+
80554+extern const char *captab_log[];
80555+extern int captab_log_entries;
80556+
80557+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
80558+{
80559+ struct acl_subject_label *curracl;
80560+
80561+ if (!gr_acl_is_enabled())
80562+ return 1;
80563+
80564+ curracl = task->acl;
80565+
80566+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
80567+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
80568+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
80569+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
80570+ gr_to_filename(task->exec_file->f_path.dentry,
80571+ task->exec_file->f_path.mnt) : curracl->filename,
80572+ curracl->filename, 0UL,
80573+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
80574+ return 1;
80575+ }
80576+
80577+ return 0;
80578+}
80579+
80580+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
80581+{
80582+ struct acl_subject_label *curracl;
80583+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
80584+ kernel_cap_t cap_audit = __cap_empty_set;
80585+
80586+ if (!gr_acl_is_enabled())
80587+ return 1;
80588+
80589+ curracl = task->acl;
80590+
80591+ cap_drop = curracl->cap_lower;
80592+ cap_mask = curracl->cap_mask;
80593+ cap_audit = curracl->cap_invert_audit;
80594+
80595+ while ((curracl = curracl->parent_subject)) {
80596+ /* if the cap isn't specified in the current computed mask but is specified in the
80597+ current level subject, and is lowered in the current level subject, then add
80598+ it to the set of dropped capabilities
80599+ otherwise, add the current level subject's mask to the current computed mask
80600+ */
80601+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
80602+ cap_raise(cap_mask, cap);
80603+ if (cap_raised(curracl->cap_lower, cap))
80604+ cap_raise(cap_drop, cap);
80605+ if (cap_raised(curracl->cap_invert_audit, cap))
80606+ cap_raise(cap_audit, cap);
80607+ }
80608+ }
80609+
80610+ if (!cap_raised(cap_drop, cap)) {
80611+ if (cap_raised(cap_audit, cap))
80612+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
80613+ return 1;
80614+ }
80615+
80616+ /* only learn the capability use if the process has the capability in the
80617+ general case, the two uses in sys.c of gr_learn_cap are an exception
80618+ to this rule to ensure any role transition involves what the full-learned
80619+ policy believes in a privileged process
80620+ */
80621+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
80622+ return 1;
80623+
80624+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
80625+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
80626+
80627+ return 0;
80628+}
80629+
80630+int
80631+gr_acl_is_capable(const int cap)
80632+{
80633+ return gr_task_acl_is_capable(current, current_cred(), cap);
80634+}
80635+
80636+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
80637+{
80638+ struct acl_subject_label *curracl;
80639+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
80640+
80641+ if (!gr_acl_is_enabled())
80642+ return 1;
80643+
80644+ curracl = task->acl;
80645+
80646+ cap_drop = curracl->cap_lower;
80647+ cap_mask = curracl->cap_mask;
80648+
80649+ while ((curracl = curracl->parent_subject)) {
80650+ /* if the cap isn't specified in the current computed mask but is specified in the
80651+ current level subject, and is lowered in the current level subject, then add
80652+ it to the set of dropped capabilities
80653+ otherwise, add the current level subject's mask to the current computed mask
80654+ */
80655+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
80656+ cap_raise(cap_mask, cap);
80657+ if (cap_raised(curracl->cap_lower, cap))
80658+ cap_raise(cap_drop, cap);
80659+ }
80660+ }
80661+
80662+ if (!cap_raised(cap_drop, cap))
80663+ return 1;
80664+
80665+ return 0;
80666+}
80667+
80668+int
80669+gr_acl_is_capable_nolog(const int cap)
80670+{
80671+ return gr_task_acl_is_capable_nolog(current, cap);
80672+}
80673+
80674diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
80675new file mode 100644
80676index 0000000..a43dd06
80677--- /dev/null
80678+++ b/grsecurity/gracl_compat.c
80679@@ -0,0 +1,269 @@
80680+#include <linux/kernel.h>
80681+#include <linux/gracl.h>
80682+#include <linux/compat.h>
80683+#include <linux/gracl_compat.h>
80684+
80685+#include <asm/uaccess.h>
80686+
80687+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
80688+{
80689+ struct gr_arg_wrapper_compat uwrapcompat;
80690+
80691+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
80692+ return -EFAULT;
80693+
80694+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
80695+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
80696+ return -EINVAL;
80697+
80698+ uwrap->arg = compat_ptr(uwrapcompat.arg);
80699+ uwrap->version = uwrapcompat.version;
80700+ uwrap->size = sizeof(struct gr_arg);
80701+
80702+ return 0;
80703+}
80704+
80705+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
80706+{
80707+ struct gr_arg_compat argcompat;
80708+
80709+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
80710+ return -EFAULT;
80711+
80712+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
80713+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
80714+ arg->role_db.num_roles = argcompat.role_db.num_roles;
80715+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
80716+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
80717+ arg->role_db.num_objects = argcompat.role_db.num_objects;
80718+
80719+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
80720+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
80721+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
80722+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
80723+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
80724+ arg->segv_device = argcompat.segv_device;
80725+ arg->segv_inode = argcompat.segv_inode;
80726+ arg->segv_uid = argcompat.segv_uid;
80727+ arg->num_sprole_pws = argcompat.num_sprole_pws;
80728+ arg->mode = argcompat.mode;
80729+
80730+ return 0;
80731+}
80732+
80733+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
80734+{
80735+ struct acl_object_label_compat objcompat;
80736+
80737+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
80738+ return -EFAULT;
80739+
80740+ obj->filename = compat_ptr(objcompat.filename);
80741+ obj->inode = objcompat.inode;
80742+ obj->device = objcompat.device;
80743+ obj->mode = objcompat.mode;
80744+
80745+ obj->nested = compat_ptr(objcompat.nested);
80746+ obj->globbed = compat_ptr(objcompat.globbed);
80747+
80748+ obj->prev = compat_ptr(objcompat.prev);
80749+ obj->next = compat_ptr(objcompat.next);
80750+
80751+ return 0;
80752+}
80753+
80754+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
80755+{
80756+ unsigned int i;
80757+ struct acl_subject_label_compat subjcompat;
80758+
80759+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
80760+ return -EFAULT;
80761+
80762+ subj->filename = compat_ptr(subjcompat.filename);
80763+ subj->inode = subjcompat.inode;
80764+ subj->device = subjcompat.device;
80765+ subj->mode = subjcompat.mode;
80766+ subj->cap_mask = subjcompat.cap_mask;
80767+ subj->cap_lower = subjcompat.cap_lower;
80768+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
80769+
80770+ for (i = 0; i < GR_NLIMITS; i++) {
80771+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
80772+ subj->res[i].rlim_cur = RLIM_INFINITY;
80773+ else
80774+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
80775+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
80776+ subj->res[i].rlim_max = RLIM_INFINITY;
80777+ else
80778+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
80779+ }
80780+ subj->resmask = subjcompat.resmask;
80781+
80782+ subj->user_trans_type = subjcompat.user_trans_type;
80783+ subj->group_trans_type = subjcompat.group_trans_type;
80784+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
80785+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
80786+ subj->user_trans_num = subjcompat.user_trans_num;
80787+ subj->group_trans_num = subjcompat.group_trans_num;
80788+
80789+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
80790+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
80791+ subj->ip_type = subjcompat.ip_type;
80792+ subj->ips = compat_ptr(subjcompat.ips);
80793+ subj->ip_num = subjcompat.ip_num;
80794+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
80795+
80796+ subj->crashes = subjcompat.crashes;
80797+ subj->expires = subjcompat.expires;
80798+
80799+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
80800+ subj->hash = compat_ptr(subjcompat.hash);
80801+ subj->prev = compat_ptr(subjcompat.prev);
80802+ subj->next = compat_ptr(subjcompat.next);
80803+
80804+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
80805+ subj->obj_hash_size = subjcompat.obj_hash_size;
80806+ subj->pax_flags = subjcompat.pax_flags;
80807+
80808+ return 0;
80809+}
80810+
80811+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
80812+{
80813+ struct acl_role_label_compat rolecompat;
80814+
80815+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
80816+ return -EFAULT;
80817+
80818+ role->rolename = compat_ptr(rolecompat.rolename);
80819+ role->uidgid = rolecompat.uidgid;
80820+ role->roletype = rolecompat.roletype;
80821+
80822+ role->auth_attempts = rolecompat.auth_attempts;
80823+ role->expires = rolecompat.expires;
80824+
80825+ role->root_label = compat_ptr(rolecompat.root_label);
80826+ role->hash = compat_ptr(rolecompat.hash);
80827+
80828+ role->prev = compat_ptr(rolecompat.prev);
80829+ role->next = compat_ptr(rolecompat.next);
80830+
80831+ role->transitions = compat_ptr(rolecompat.transitions);
80832+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
80833+ role->domain_children = compat_ptr(rolecompat.domain_children);
80834+ role->domain_child_num = rolecompat.domain_child_num;
80835+
80836+ role->umask = rolecompat.umask;
80837+
80838+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
80839+ role->subj_hash_size = rolecompat.subj_hash_size;
80840+
80841+ return 0;
80842+}
80843+
80844+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
80845+{
80846+ struct role_allowed_ip_compat roleip_compat;
80847+
80848+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
80849+ return -EFAULT;
80850+
80851+ roleip->addr = roleip_compat.addr;
80852+ roleip->netmask = roleip_compat.netmask;
80853+
80854+ roleip->prev = compat_ptr(roleip_compat.prev);
80855+ roleip->next = compat_ptr(roleip_compat.next);
80856+
80857+ return 0;
80858+}
80859+
80860+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
80861+{
80862+ struct role_transition_compat trans_compat;
80863+
80864+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
80865+ return -EFAULT;
80866+
80867+ trans->rolename = compat_ptr(trans_compat.rolename);
80868+
80869+ trans->prev = compat_ptr(trans_compat.prev);
80870+ trans->next = compat_ptr(trans_compat.next);
80871+
80872+ return 0;
80873+
80874+}
80875+
80876+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
80877+{
80878+ struct gr_hash_struct_compat hash_compat;
80879+
80880+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
80881+ return -EFAULT;
80882+
80883+ hash->table = compat_ptr(hash_compat.table);
80884+ hash->nametable = compat_ptr(hash_compat.nametable);
80885+ hash->first = compat_ptr(hash_compat.first);
80886+
80887+ hash->table_size = hash_compat.table_size;
80888+ hash->used_size = hash_compat.used_size;
80889+
80890+ hash->type = hash_compat.type;
80891+
80892+ return 0;
80893+}
80894+
80895+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
80896+{
80897+ compat_uptr_t ptrcompat;
80898+
80899+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
80900+ return -EFAULT;
80901+
80902+ *(void **)ptr = compat_ptr(ptrcompat);
80903+
80904+ return 0;
80905+}
80906+
80907+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
80908+{
80909+ struct acl_ip_label_compat ip_compat;
80910+
80911+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
80912+ return -EFAULT;
80913+
80914+ ip->iface = compat_ptr(ip_compat.iface);
80915+ ip->addr = ip_compat.addr;
80916+ ip->netmask = ip_compat.netmask;
80917+ ip->low = ip_compat.low;
80918+ ip->high = ip_compat.high;
80919+ ip->mode = ip_compat.mode;
80920+ ip->type = ip_compat.type;
80921+
80922+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
80923+
80924+ ip->prev = compat_ptr(ip_compat.prev);
80925+ ip->next = compat_ptr(ip_compat.next);
80926+
80927+ return 0;
80928+}
80929+
80930+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
80931+{
80932+ struct sprole_pw_compat pw_compat;
80933+
80934+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
80935+ return -EFAULT;
80936+
80937+ pw->rolename = compat_ptr(pw_compat.rolename);
80938+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
80939+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
80940+
80941+ return 0;
80942+}
80943+
80944+size_t get_gr_arg_wrapper_size_compat(void)
80945+{
80946+ return sizeof(struct gr_arg_wrapper_compat);
80947+}
80948+
80949diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
80950new file mode 100644
80951index 0000000..8ee8e4f
80952--- /dev/null
80953+++ b/grsecurity/gracl_fs.c
80954@@ -0,0 +1,447 @@
80955+#include <linux/kernel.h>
80956+#include <linux/sched.h>
80957+#include <linux/types.h>
80958+#include <linux/fs.h>
80959+#include <linux/file.h>
80960+#include <linux/stat.h>
80961+#include <linux/grsecurity.h>
80962+#include <linux/grinternal.h>
80963+#include <linux/gracl.h>
80964+
80965+umode_t
80966+gr_acl_umask(void)
80967+{
80968+ if (unlikely(!gr_acl_is_enabled()))
80969+ return 0;
80970+
80971+ return current->role->umask;
80972+}
80973+
80974+__u32
80975+gr_acl_handle_hidden_file(const struct dentry * dentry,
80976+ const struct vfsmount * mnt)
80977+{
80978+ __u32 mode;
80979+
80980+ if (unlikely(d_is_negative(dentry)))
80981+ return GR_FIND;
80982+
80983+ mode =
80984+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
80985+
80986+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
80987+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
80988+ return mode;
80989+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
80990+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
80991+ return 0;
80992+ } else if (unlikely(!(mode & GR_FIND)))
80993+ return 0;
80994+
80995+ return GR_FIND;
80996+}
80997+
80998+__u32
80999+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
81000+ int acc_mode)
81001+{
81002+ __u32 reqmode = GR_FIND;
81003+ __u32 mode;
81004+
81005+ if (unlikely(d_is_negative(dentry)))
81006+ return reqmode;
81007+
81008+ if (acc_mode & MAY_APPEND)
81009+ reqmode |= GR_APPEND;
81010+ else if (acc_mode & MAY_WRITE)
81011+ reqmode |= GR_WRITE;
81012+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
81013+ reqmode |= GR_READ;
81014+
81015+ mode =
81016+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
81017+ mnt);
81018+
81019+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
81020+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
81021+ reqmode & GR_READ ? " reading" : "",
81022+ reqmode & GR_WRITE ? " writing" : reqmode &
81023+ GR_APPEND ? " appending" : "");
81024+ return reqmode;
81025+ } else
81026+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
81027+ {
81028+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
81029+ reqmode & GR_READ ? " reading" : "",
81030+ reqmode & GR_WRITE ? " writing" : reqmode &
81031+ GR_APPEND ? " appending" : "");
81032+ return 0;
81033+ } else if (unlikely((mode & reqmode) != reqmode))
81034+ return 0;
81035+
81036+ return reqmode;
81037+}
81038+
81039+__u32
81040+gr_acl_handle_creat(const struct dentry * dentry,
81041+ const struct dentry * p_dentry,
81042+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
81043+ const int imode)
81044+{
81045+ __u32 reqmode = GR_WRITE | GR_CREATE;
81046+ __u32 mode;
81047+
81048+ if (acc_mode & MAY_APPEND)
81049+ reqmode |= GR_APPEND;
81050+ // if a directory was required or the directory already exists, then
81051+ // don't count this open as a read
81052+ if ((acc_mode & MAY_READ) &&
81053+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
81054+ reqmode |= GR_READ;
81055+ if ((open_flags & O_CREAT) &&
81056+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
81057+ reqmode |= GR_SETID;
81058+
81059+ mode =
81060+ gr_check_create(dentry, p_dentry, p_mnt,
81061+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
81062+
81063+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
81064+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
81065+ reqmode & GR_READ ? " reading" : "",
81066+ reqmode & GR_WRITE ? " writing" : reqmode &
81067+ GR_APPEND ? " appending" : "");
81068+ return reqmode;
81069+ } else
81070+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
81071+ {
81072+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
81073+ reqmode & GR_READ ? " reading" : "",
81074+ reqmode & GR_WRITE ? " writing" : reqmode &
81075+ GR_APPEND ? " appending" : "");
81076+ return 0;
81077+ } else if (unlikely((mode & reqmode) != reqmode))
81078+ return 0;
81079+
81080+ return reqmode;
81081+}
81082+
81083+__u32
81084+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
81085+ const int fmode)
81086+{
81087+ __u32 mode, reqmode = GR_FIND;
81088+
81089+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
81090+ reqmode |= GR_EXEC;
81091+ if (fmode & S_IWOTH)
81092+ reqmode |= GR_WRITE;
81093+ if (fmode & S_IROTH)
81094+ reqmode |= GR_READ;
81095+
81096+ mode =
81097+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
81098+ mnt);
81099+
81100+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
81101+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
81102+ reqmode & GR_READ ? " reading" : "",
81103+ reqmode & GR_WRITE ? " writing" : "",
81104+ reqmode & GR_EXEC ? " executing" : "");
81105+ return reqmode;
81106+ } else
81107+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
81108+ {
81109+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
81110+ reqmode & GR_READ ? " reading" : "",
81111+ reqmode & GR_WRITE ? " writing" : "",
81112+ reqmode & GR_EXEC ? " executing" : "");
81113+ return 0;
81114+ } else if (unlikely((mode & reqmode) != reqmode))
81115+ return 0;
81116+
81117+ return reqmode;
81118+}
81119+
81120+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
81121+{
81122+ __u32 mode;
81123+
81124+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
81125+
81126+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
81127+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
81128+ return mode;
81129+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
81130+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
81131+ return 0;
81132+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
81133+ return 0;
81134+
81135+ return (reqmode);
81136+}
81137+
81138+__u32
81139+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
81140+{
81141+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
81142+}
81143+
81144+__u32
81145+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
81146+{
81147+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
81148+}
81149+
81150+__u32
81151+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
81152+{
81153+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
81154+}
81155+
81156+__u32
81157+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
81158+{
81159+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
81160+}
81161+
81162+__u32
81163+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
81164+ umode_t *modeptr)
81165+{
81166+ umode_t mode;
81167+
81168+ *modeptr &= ~gr_acl_umask();
81169+ mode = *modeptr;
81170+
81171+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
81172+ return 1;
81173+
81174+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
81175+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
81176+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
81177+ GR_CHMOD_ACL_MSG);
81178+ } else {
81179+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
81180+ }
81181+}
81182+
81183+__u32
81184+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
81185+{
81186+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
81187+}
81188+
81189+__u32
81190+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
81191+{
81192+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
81193+}
81194+
81195+__u32
81196+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
81197+{
81198+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
81199+}
81200+
81201+__u32
81202+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
81203+{
81204+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
81205+}
81206+
81207+__u32
81208+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
81209+{
81210+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
81211+ GR_UNIXCONNECT_ACL_MSG);
81212+}
81213+
81214+/* hardlinks require at minimum create and link permission,
81215+ any additional privilege required is based on the
81216+ privilege of the file being linked to
81217+*/
81218+__u32
81219+gr_acl_handle_link(const struct dentry * new_dentry,
81220+ const struct dentry * parent_dentry,
81221+ const struct vfsmount * parent_mnt,
81222+ const struct dentry * old_dentry,
81223+ const struct vfsmount * old_mnt, const struct filename *to)
81224+{
81225+ __u32 mode;
81226+ __u32 needmode = GR_CREATE | GR_LINK;
81227+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
81228+
81229+ mode =
81230+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
81231+ old_mnt);
81232+
81233+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
81234+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
81235+ return mode;
81236+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
81237+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
81238+ return 0;
81239+ } else if (unlikely((mode & needmode) != needmode))
81240+ return 0;
81241+
81242+ return 1;
81243+}
81244+
81245+__u32
81246+gr_acl_handle_symlink(const struct dentry * new_dentry,
81247+ const struct dentry * parent_dentry,
81248+ const struct vfsmount * parent_mnt, const struct filename *from)
81249+{
81250+ __u32 needmode = GR_WRITE | GR_CREATE;
81251+ __u32 mode;
81252+
81253+ mode =
81254+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
81255+ GR_CREATE | GR_AUDIT_CREATE |
81256+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
81257+
81258+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
81259+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
81260+ return mode;
81261+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
81262+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
81263+ return 0;
81264+ } else if (unlikely((mode & needmode) != needmode))
81265+ return 0;
81266+
81267+ return (GR_WRITE | GR_CREATE);
81268+}
81269+
81270+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)
81271+{
81272+ __u32 mode;
81273+
81274+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
81275+
81276+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
81277+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
81278+ return mode;
81279+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
81280+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
81281+ return 0;
81282+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
81283+ return 0;
81284+
81285+ return (reqmode);
81286+}
81287+
81288+__u32
81289+gr_acl_handle_mknod(const struct dentry * new_dentry,
81290+ const struct dentry * parent_dentry,
81291+ const struct vfsmount * parent_mnt,
81292+ const int mode)
81293+{
81294+ __u32 reqmode = GR_WRITE | GR_CREATE;
81295+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
81296+ reqmode |= GR_SETID;
81297+
81298+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
81299+ reqmode, GR_MKNOD_ACL_MSG);
81300+}
81301+
81302+__u32
81303+gr_acl_handle_mkdir(const struct dentry *new_dentry,
81304+ const struct dentry *parent_dentry,
81305+ const struct vfsmount *parent_mnt)
81306+{
81307+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
81308+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
81309+}
81310+
81311+#define RENAME_CHECK_SUCCESS(old, new) \
81312+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
81313+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
81314+
81315+int
81316+gr_acl_handle_rename(struct dentry *new_dentry,
81317+ struct dentry *parent_dentry,
81318+ const struct vfsmount *parent_mnt,
81319+ struct dentry *old_dentry,
81320+ struct inode *old_parent_inode,
81321+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
81322+{
81323+ __u32 comp1, comp2;
81324+ int error = 0;
81325+
81326+ if (unlikely(!gr_acl_is_enabled()))
81327+ return 0;
81328+
81329+ if (flags & RENAME_EXCHANGE) {
81330+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
81331+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81332+ GR_SUPPRESS, parent_mnt);
81333+ comp2 =
81334+ gr_search_file(old_dentry,
81335+ GR_READ | GR_WRITE | GR_AUDIT_READ |
81336+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
81337+ } else if (d_is_negative(new_dentry)) {
81338+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
81339+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
81340+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
81341+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
81342+ GR_DELETE | GR_AUDIT_DELETE |
81343+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81344+ GR_SUPPRESS, old_mnt);
81345+ } else {
81346+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
81347+ GR_CREATE | GR_DELETE |
81348+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
81349+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81350+ GR_SUPPRESS, parent_mnt);
81351+ comp2 =
81352+ gr_search_file(old_dentry,
81353+ GR_READ | GR_WRITE | GR_AUDIT_READ |
81354+ GR_DELETE | GR_AUDIT_DELETE |
81355+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
81356+ }
81357+
81358+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
81359+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
81360+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
81361+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
81362+ && !(comp2 & GR_SUPPRESS)) {
81363+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
81364+ error = -EACCES;
81365+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
81366+ error = -EACCES;
81367+
81368+ return error;
81369+}
81370+
81371+void
81372+gr_acl_handle_exit(void)
81373+{
81374+ u16 id;
81375+ char *rolename;
81376+
81377+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
81378+ !(current->role->roletype & GR_ROLE_PERSIST))) {
81379+ id = current->acl_role_id;
81380+ rolename = current->role->rolename;
81381+ gr_set_acls(1);
81382+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
81383+ }
81384+
81385+ gr_put_exec_file(current);
81386+ return;
81387+}
81388+
81389+int
81390+gr_acl_handle_procpidmem(const struct task_struct *task)
81391+{
81392+ if (unlikely(!gr_acl_is_enabled()))
81393+ return 0;
81394+
81395+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
81396+ !(current->acl->mode & GR_POVERRIDE) &&
81397+ !(current->role->roletype & GR_ROLE_GOD))
81398+ return -EACCES;
81399+
81400+ return 0;
81401+}
81402diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
81403new file mode 100644
81404index 0000000..ed6ee43
81405--- /dev/null
81406+++ b/grsecurity/gracl_ip.c
81407@@ -0,0 +1,386 @@
81408+#include <linux/kernel.h>
81409+#include <asm/uaccess.h>
81410+#include <asm/errno.h>
81411+#include <net/sock.h>
81412+#include <linux/file.h>
81413+#include <linux/fs.h>
81414+#include <linux/net.h>
81415+#include <linux/in.h>
81416+#include <linux/skbuff.h>
81417+#include <linux/ip.h>
81418+#include <linux/udp.h>
81419+#include <linux/types.h>
81420+#include <linux/sched.h>
81421+#include <linux/netdevice.h>
81422+#include <linux/inetdevice.h>
81423+#include <linux/gracl.h>
81424+#include <linux/grsecurity.h>
81425+#include <linux/grinternal.h>
81426+
81427+#define GR_BIND 0x01
81428+#define GR_CONNECT 0x02
81429+#define GR_INVERT 0x04
81430+#define GR_BINDOVERRIDE 0x08
81431+#define GR_CONNECTOVERRIDE 0x10
81432+#define GR_SOCK_FAMILY 0x20
81433+
81434+static const char * gr_protocols[IPPROTO_MAX] = {
81435+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
81436+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
81437+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
81438+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
81439+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
81440+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
81441+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
81442+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
81443+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
81444+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
81445+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
81446+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
81447+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
81448+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
81449+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
81450+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
81451+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
81452+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
81453+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
81454+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
81455+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
81456+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
81457+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
81458+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
81459+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
81460+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
81461+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
81462+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
81463+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
81464+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
81465+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
81466+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
81467+ };
81468+
81469+static const char * gr_socktypes[SOCK_MAX] = {
81470+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
81471+ "unknown:7", "unknown:8", "unknown:9", "packet"
81472+ };
81473+
81474+static const char * gr_sockfamilies[AF_MAX+1] = {
81475+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
81476+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
81477+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
81478+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf", "alg", "nfc", "vsock"
81479+ };
81480+
81481+const char *
81482+gr_proto_to_name(unsigned char proto)
81483+{
81484+ return gr_protocols[proto];
81485+}
81486+
81487+const char *
81488+gr_socktype_to_name(unsigned char type)
81489+{
81490+ return gr_socktypes[type];
81491+}
81492+
81493+const char *
81494+gr_sockfamily_to_name(unsigned char family)
81495+{
81496+ return gr_sockfamilies[family];
81497+}
81498+
81499+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
81500+
81501+int
81502+gr_search_socket(const int domain, const int type, const int protocol)
81503+{
81504+ struct acl_subject_label *curr;
81505+ const struct cred *cred = current_cred();
81506+
81507+ if (unlikely(!gr_acl_is_enabled()))
81508+ goto exit;
81509+
81510+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
81511+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
81512+ goto exit; // let the kernel handle it
81513+
81514+ curr = current->acl;
81515+
81516+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
81517+ /* the family is allowed, if this is PF_INET allow it only if
81518+ the extra sock type/protocol checks pass */
81519+ if (domain == PF_INET)
81520+ goto inet_check;
81521+ goto exit;
81522+ } else {
81523+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81524+ __u32 fakeip = 0;
81525+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81526+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81527+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81528+ gr_to_filename(current->exec_file->f_path.dentry,
81529+ current->exec_file->f_path.mnt) :
81530+ curr->filename, curr->filename,
81531+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
81532+ &current->signal->saved_ip);
81533+ goto exit;
81534+ }
81535+ goto exit_fail;
81536+ }
81537+
81538+inet_check:
81539+ /* the rest of this checking is for IPv4 only */
81540+ if (!curr->ips)
81541+ goto exit;
81542+
81543+ if ((curr->ip_type & (1U << type)) &&
81544+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
81545+ goto exit;
81546+
81547+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81548+ /* we don't place acls on raw sockets , and sometimes
81549+ dgram/ip sockets are opened for ioctl and not
81550+ bind/connect, so we'll fake a bind learn log */
81551+ if (type == SOCK_RAW || type == SOCK_PACKET) {
81552+ __u32 fakeip = 0;
81553+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81554+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81555+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81556+ gr_to_filename(current->exec_file->f_path.dentry,
81557+ current->exec_file->f_path.mnt) :
81558+ curr->filename, curr->filename,
81559+ &fakeip, 0, type,
81560+ protocol, GR_CONNECT, &current->signal->saved_ip);
81561+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
81562+ __u32 fakeip = 0;
81563+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81564+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81565+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81566+ gr_to_filename(current->exec_file->f_path.dentry,
81567+ current->exec_file->f_path.mnt) :
81568+ curr->filename, curr->filename,
81569+ &fakeip, 0, type,
81570+ protocol, GR_BIND, &current->signal->saved_ip);
81571+ }
81572+ /* we'll log when they use connect or bind */
81573+ goto exit;
81574+ }
81575+
81576+exit_fail:
81577+ if (domain == PF_INET)
81578+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
81579+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
81580+ else if (rcu_access_pointer(net_families[domain]) != NULL)
81581+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
81582+ gr_socktype_to_name(type), protocol);
81583+
81584+ return 0;
81585+exit:
81586+ return 1;
81587+}
81588+
81589+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)
81590+{
81591+ if ((ip->mode & mode) &&
81592+ (ip_port >= ip->low) &&
81593+ (ip_port <= ip->high) &&
81594+ ((ntohl(ip_addr) & our_netmask) ==
81595+ (ntohl(our_addr) & our_netmask))
81596+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
81597+ && (ip->type & (1U << type))) {
81598+ if (ip->mode & GR_INVERT)
81599+ return 2; // specifically denied
81600+ else
81601+ return 1; // allowed
81602+ }
81603+
81604+ return 0; // not specifically allowed, may continue parsing
81605+}
81606+
81607+static int
81608+gr_search_connectbind(const int full_mode, struct sock *sk,
81609+ struct sockaddr_in *addr, const int type)
81610+{
81611+ char iface[IFNAMSIZ] = {0};
81612+ struct acl_subject_label *curr;
81613+ struct acl_ip_label *ip;
81614+ struct inet_sock *isk;
81615+ struct net_device *dev;
81616+ struct in_device *idev;
81617+ unsigned long i;
81618+ int ret;
81619+ int mode = full_mode & (GR_BIND | GR_CONNECT);
81620+ __u32 ip_addr = 0;
81621+ __u32 our_addr;
81622+ __u32 our_netmask;
81623+ char *p;
81624+ __u16 ip_port = 0;
81625+ const struct cred *cred = current_cred();
81626+
81627+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
81628+ return 0;
81629+
81630+ curr = current->acl;
81631+ isk = inet_sk(sk);
81632+
81633+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
81634+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
81635+ addr->sin_addr.s_addr = curr->inaddr_any_override;
81636+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
81637+ struct sockaddr_in saddr;
81638+ int err;
81639+
81640+ saddr.sin_family = AF_INET;
81641+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
81642+ saddr.sin_port = isk->inet_sport;
81643+
81644+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
81645+ if (err)
81646+ return err;
81647+
81648+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
81649+ if (err)
81650+ return err;
81651+ }
81652+
81653+ if (!curr->ips)
81654+ return 0;
81655+
81656+ ip_addr = addr->sin_addr.s_addr;
81657+ ip_port = ntohs(addr->sin_port);
81658+
81659+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81660+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81661+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81662+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81663+ gr_to_filename(current->exec_file->f_path.dentry,
81664+ current->exec_file->f_path.mnt) :
81665+ curr->filename, curr->filename,
81666+ &ip_addr, ip_port, type,
81667+ sk->sk_protocol, mode, &current->signal->saved_ip);
81668+ return 0;
81669+ }
81670+
81671+ for (i = 0; i < curr->ip_num; i++) {
81672+ ip = *(curr->ips + i);
81673+ if (ip->iface != NULL) {
81674+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
81675+ p = strchr(iface, ':');
81676+ if (p != NULL)
81677+ *p = '\0';
81678+ dev = dev_get_by_name(sock_net(sk), iface);
81679+ if (dev == NULL)
81680+ continue;
81681+ idev = in_dev_get(dev);
81682+ if (idev == NULL) {
81683+ dev_put(dev);
81684+ continue;
81685+ }
81686+ rcu_read_lock();
81687+ for_ifa(idev) {
81688+ if (!strcmp(ip->iface, ifa->ifa_label)) {
81689+ our_addr = ifa->ifa_address;
81690+ our_netmask = 0xffffffff;
81691+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
81692+ if (ret == 1) {
81693+ rcu_read_unlock();
81694+ in_dev_put(idev);
81695+ dev_put(dev);
81696+ return 0;
81697+ } else if (ret == 2) {
81698+ rcu_read_unlock();
81699+ in_dev_put(idev);
81700+ dev_put(dev);
81701+ goto denied;
81702+ }
81703+ }
81704+ } endfor_ifa(idev);
81705+ rcu_read_unlock();
81706+ in_dev_put(idev);
81707+ dev_put(dev);
81708+ } else {
81709+ our_addr = ip->addr;
81710+ our_netmask = ip->netmask;
81711+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
81712+ if (ret == 1)
81713+ return 0;
81714+ else if (ret == 2)
81715+ goto denied;
81716+ }
81717+ }
81718+
81719+denied:
81720+ if (mode == GR_BIND)
81721+ 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));
81722+ else if (mode == GR_CONNECT)
81723+ 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));
81724+
81725+ return -EACCES;
81726+}
81727+
81728+int
81729+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
81730+{
81731+ /* always allow disconnection of dgram sockets with connect */
81732+ if (addr->sin_family == AF_UNSPEC)
81733+ return 0;
81734+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
81735+}
81736+
81737+int
81738+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
81739+{
81740+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
81741+}
81742+
81743+int gr_search_listen(struct socket *sock)
81744+{
81745+ struct sock *sk = sock->sk;
81746+ struct sockaddr_in addr;
81747+
81748+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
81749+ addr.sin_port = inet_sk(sk)->inet_sport;
81750+
81751+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
81752+}
81753+
81754+int gr_search_accept(struct socket *sock)
81755+{
81756+ struct sock *sk = sock->sk;
81757+ struct sockaddr_in addr;
81758+
81759+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
81760+ addr.sin_port = inet_sk(sk)->inet_sport;
81761+
81762+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
81763+}
81764+
81765+int
81766+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
81767+{
81768+ if (addr)
81769+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
81770+ else {
81771+ struct sockaddr_in sin;
81772+ const struct inet_sock *inet = inet_sk(sk);
81773+
81774+ sin.sin_addr.s_addr = inet->inet_daddr;
81775+ sin.sin_port = inet->inet_dport;
81776+
81777+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
81778+ }
81779+}
81780+
81781+int
81782+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
81783+{
81784+ struct sockaddr_in sin;
81785+
81786+ if (unlikely(skb->len < sizeof (struct udphdr)))
81787+ return 0; // skip this packet
81788+
81789+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
81790+ sin.sin_port = udp_hdr(skb)->source;
81791+
81792+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
81793+}
81794diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
81795new file mode 100644
81796index 0000000..25f54ef
81797--- /dev/null
81798+++ b/grsecurity/gracl_learn.c
81799@@ -0,0 +1,207 @@
81800+#include <linux/kernel.h>
81801+#include <linux/mm.h>
81802+#include <linux/sched.h>
81803+#include <linux/poll.h>
81804+#include <linux/string.h>
81805+#include <linux/file.h>
81806+#include <linux/types.h>
81807+#include <linux/vmalloc.h>
81808+#include <linux/grinternal.h>
81809+
81810+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
81811+ size_t count, loff_t *ppos);
81812+extern int gr_acl_is_enabled(void);
81813+
81814+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
81815+static int gr_learn_attached;
81816+
81817+/* use a 512k buffer */
81818+#define LEARN_BUFFER_SIZE (512 * 1024)
81819+
81820+static DEFINE_SPINLOCK(gr_learn_lock);
81821+static DEFINE_MUTEX(gr_learn_user_mutex);
81822+
81823+/* we need to maintain two buffers, so that the kernel context of grlearn
81824+ uses a semaphore around the userspace copying, and the other kernel contexts
81825+ use a spinlock when copying into the buffer, since they cannot sleep
81826+*/
81827+static char *learn_buffer;
81828+static char *learn_buffer_user;
81829+static int learn_buffer_len;
81830+static int learn_buffer_user_len;
81831+
81832+static ssize_t
81833+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
81834+{
81835+ DECLARE_WAITQUEUE(wait, current);
81836+ ssize_t retval = 0;
81837+
81838+ add_wait_queue(&learn_wait, &wait);
81839+ set_current_state(TASK_INTERRUPTIBLE);
81840+ do {
81841+ mutex_lock(&gr_learn_user_mutex);
81842+ spin_lock(&gr_learn_lock);
81843+ if (learn_buffer_len)
81844+ break;
81845+ spin_unlock(&gr_learn_lock);
81846+ mutex_unlock(&gr_learn_user_mutex);
81847+ if (file->f_flags & O_NONBLOCK) {
81848+ retval = -EAGAIN;
81849+ goto out;
81850+ }
81851+ if (signal_pending(current)) {
81852+ retval = -ERESTARTSYS;
81853+ goto out;
81854+ }
81855+
81856+ schedule();
81857+ } while (1);
81858+
81859+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
81860+ learn_buffer_user_len = learn_buffer_len;
81861+ retval = learn_buffer_len;
81862+ learn_buffer_len = 0;
81863+
81864+ spin_unlock(&gr_learn_lock);
81865+
81866+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
81867+ retval = -EFAULT;
81868+
81869+ mutex_unlock(&gr_learn_user_mutex);
81870+out:
81871+ set_current_state(TASK_RUNNING);
81872+ remove_wait_queue(&learn_wait, &wait);
81873+ return retval;
81874+}
81875+
81876+static unsigned int
81877+poll_learn(struct file * file, poll_table * wait)
81878+{
81879+ poll_wait(file, &learn_wait, wait);
81880+
81881+ if (learn_buffer_len)
81882+ return (POLLIN | POLLRDNORM);
81883+
81884+ return 0;
81885+}
81886+
81887+void
81888+gr_clear_learn_entries(void)
81889+{
81890+ char *tmp;
81891+
81892+ mutex_lock(&gr_learn_user_mutex);
81893+ spin_lock(&gr_learn_lock);
81894+ tmp = learn_buffer;
81895+ learn_buffer = NULL;
81896+ spin_unlock(&gr_learn_lock);
81897+ if (tmp)
81898+ vfree(tmp);
81899+ if (learn_buffer_user != NULL) {
81900+ vfree(learn_buffer_user);
81901+ learn_buffer_user = NULL;
81902+ }
81903+ learn_buffer_len = 0;
81904+ mutex_unlock(&gr_learn_user_mutex);
81905+
81906+ return;
81907+}
81908+
81909+void
81910+gr_add_learn_entry(const char *fmt, ...)
81911+{
81912+ va_list args;
81913+ unsigned int len;
81914+
81915+ if (!gr_learn_attached)
81916+ return;
81917+
81918+ spin_lock(&gr_learn_lock);
81919+
81920+ /* leave a gap at the end so we know when it's "full" but don't have to
81921+ compute the exact length of the string we're trying to append
81922+ */
81923+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
81924+ spin_unlock(&gr_learn_lock);
81925+ wake_up_interruptible(&learn_wait);
81926+ return;
81927+ }
81928+ if (learn_buffer == NULL) {
81929+ spin_unlock(&gr_learn_lock);
81930+ return;
81931+ }
81932+
81933+ va_start(args, fmt);
81934+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
81935+ va_end(args);
81936+
81937+ learn_buffer_len += len + 1;
81938+
81939+ spin_unlock(&gr_learn_lock);
81940+ wake_up_interruptible(&learn_wait);
81941+
81942+ return;
81943+}
81944+
81945+static int
81946+open_learn(struct inode *inode, struct file *file)
81947+{
81948+ if (file->f_mode & FMODE_READ && gr_learn_attached)
81949+ return -EBUSY;
81950+ if (file->f_mode & FMODE_READ) {
81951+ int retval = 0;
81952+ mutex_lock(&gr_learn_user_mutex);
81953+ if (learn_buffer == NULL)
81954+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
81955+ if (learn_buffer_user == NULL)
81956+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
81957+ if (learn_buffer == NULL) {
81958+ retval = -ENOMEM;
81959+ goto out_error;
81960+ }
81961+ if (learn_buffer_user == NULL) {
81962+ retval = -ENOMEM;
81963+ goto out_error;
81964+ }
81965+ learn_buffer_len = 0;
81966+ learn_buffer_user_len = 0;
81967+ gr_learn_attached = 1;
81968+out_error:
81969+ mutex_unlock(&gr_learn_user_mutex);
81970+ return retval;
81971+ }
81972+ return 0;
81973+}
81974+
81975+static int
81976+close_learn(struct inode *inode, struct file *file)
81977+{
81978+ if (file->f_mode & FMODE_READ) {
81979+ char *tmp = NULL;
81980+ mutex_lock(&gr_learn_user_mutex);
81981+ spin_lock(&gr_learn_lock);
81982+ tmp = learn_buffer;
81983+ learn_buffer = NULL;
81984+ spin_unlock(&gr_learn_lock);
81985+ if (tmp)
81986+ vfree(tmp);
81987+ if (learn_buffer_user != NULL) {
81988+ vfree(learn_buffer_user);
81989+ learn_buffer_user = NULL;
81990+ }
81991+ learn_buffer_len = 0;
81992+ learn_buffer_user_len = 0;
81993+ gr_learn_attached = 0;
81994+ mutex_unlock(&gr_learn_user_mutex);
81995+ }
81996+
81997+ return 0;
81998+}
81999+
82000+const struct file_operations grsec_fops = {
82001+ .read = read_learn,
82002+ .write = write_grsec_handler,
82003+ .open = open_learn,
82004+ .release = close_learn,
82005+ .poll = poll_learn,
82006+};
82007diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
82008new file mode 100644
82009index 0000000..fd26052
82010--- /dev/null
82011+++ b/grsecurity/gracl_policy.c
82012@@ -0,0 +1,1781 @@
82013+#include <linux/kernel.h>
82014+#include <linux/module.h>
82015+#include <linux/sched.h>
82016+#include <linux/mm.h>
82017+#include <linux/file.h>
82018+#include <linux/fs.h>
82019+#include <linux/namei.h>
82020+#include <linux/mount.h>
82021+#include <linux/tty.h>
82022+#include <linux/proc_fs.h>
82023+#include <linux/lglock.h>
82024+#include <linux/slab.h>
82025+#include <linux/vmalloc.h>
82026+#include <linux/types.h>
82027+#include <linux/sysctl.h>
82028+#include <linux/netdevice.h>
82029+#include <linux/ptrace.h>
82030+#include <linux/gracl.h>
82031+#include <linux/gralloc.h>
82032+#include <linux/security.h>
82033+#include <linux/grinternal.h>
82034+#include <linux/pid_namespace.h>
82035+#include <linux/stop_machine.h>
82036+#include <linux/fdtable.h>
82037+#include <linux/percpu.h>
82038+#include <linux/lglock.h>
82039+#include <linux/hugetlb.h>
82040+#include <linux/posix-timers.h>
82041+#include "../fs/mount.h"
82042+
82043+#include <asm/uaccess.h>
82044+#include <asm/errno.h>
82045+#include <asm/mman.h>
82046+
82047+extern struct gr_policy_state *polstate;
82048+
82049+#define FOR_EACH_ROLE_START(role) \
82050+ role = polstate->role_list; \
82051+ while (role) {
82052+
82053+#define FOR_EACH_ROLE_END(role) \
82054+ role = role->prev; \
82055+ }
82056+
82057+struct path gr_real_root;
82058+
82059+extern struct gr_alloc_state *current_alloc_state;
82060+
82061+u16 acl_sp_role_value;
82062+
82063+static DEFINE_MUTEX(gr_dev_mutex);
82064+
82065+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
82066+extern void gr_clear_learn_entries(void);
82067+
82068+struct gr_arg *gr_usermode __read_only;
82069+unsigned char *gr_system_salt __read_only;
82070+unsigned char *gr_system_sum __read_only;
82071+
82072+static unsigned int gr_auth_attempts = 0;
82073+static unsigned long gr_auth_expires = 0UL;
82074+
82075+struct acl_object_label *fakefs_obj_rw;
82076+struct acl_object_label *fakefs_obj_rwx;
82077+
82078+extern int gr_init_uidset(void);
82079+extern void gr_free_uidset(void);
82080+extern void gr_remove_uid(uid_t uid);
82081+extern int gr_find_uid(uid_t uid);
82082+
82083+extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback);
82084+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
82085+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
82086+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
82087+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);
82088+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
82089+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
82090+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
82091+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
82092+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
82093+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
82094+extern void assign_special_role(const char *rolename);
82095+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
82096+extern int gr_rbac_disable(void *unused);
82097+extern void gr_enable_rbac_system(void);
82098+
82099+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
82100+{
82101+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
82102+ return -EFAULT;
82103+
82104+ return 0;
82105+}
82106+
82107+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
82108+{
82109+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
82110+ return -EFAULT;
82111+
82112+ return 0;
82113+}
82114+
82115+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
82116+{
82117+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
82118+ return -EFAULT;
82119+
82120+ return 0;
82121+}
82122+
82123+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
82124+{
82125+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
82126+ return -EFAULT;
82127+
82128+ return 0;
82129+}
82130+
82131+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
82132+{
82133+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
82134+ return -EFAULT;
82135+
82136+ return 0;
82137+}
82138+
82139+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
82140+{
82141+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
82142+ return -EFAULT;
82143+
82144+ return 0;
82145+}
82146+
82147+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
82148+{
82149+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
82150+ return -EFAULT;
82151+
82152+ return 0;
82153+}
82154+
82155+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
82156+{
82157+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
82158+ return -EFAULT;
82159+
82160+ return 0;
82161+}
82162+
82163+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
82164+{
82165+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
82166+ return -EFAULT;
82167+
82168+ return 0;
82169+}
82170+
82171+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
82172+{
82173+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
82174+ return -EFAULT;
82175+
82176+ if ((uwrap->version != GRSECURITY_VERSION) ||
82177+ (uwrap->size != sizeof(struct gr_arg)))
82178+ return -EINVAL;
82179+
82180+ return 0;
82181+}
82182+
82183+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
82184+{
82185+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
82186+ return -EFAULT;
82187+
82188+ return 0;
82189+}
82190+
82191+static size_t get_gr_arg_wrapper_size_normal(void)
82192+{
82193+ return sizeof(struct gr_arg_wrapper);
82194+}
82195+
82196+#ifdef CONFIG_COMPAT
82197+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
82198+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
82199+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
82200+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
82201+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
82202+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
82203+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
82204+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
82205+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
82206+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
82207+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
82208+extern size_t get_gr_arg_wrapper_size_compat(void);
82209+
82210+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
82211+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
82212+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
82213+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
82214+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
82215+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
82216+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
82217+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
82218+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
82219+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
82220+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
82221+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
82222+
82223+#else
82224+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
82225+#define copy_gr_arg copy_gr_arg_normal
82226+#define copy_gr_hash_struct copy_gr_hash_struct_normal
82227+#define copy_acl_object_label copy_acl_object_label_normal
82228+#define copy_acl_subject_label copy_acl_subject_label_normal
82229+#define copy_acl_role_label copy_acl_role_label_normal
82230+#define copy_acl_ip_label copy_acl_ip_label_normal
82231+#define copy_pointer_from_array copy_pointer_from_array_normal
82232+#define copy_sprole_pw copy_sprole_pw_normal
82233+#define copy_role_transition copy_role_transition_normal
82234+#define copy_role_allowed_ip copy_role_allowed_ip_normal
82235+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
82236+#endif
82237+
82238+static struct acl_subject_label *
82239+lookup_subject_map(const struct acl_subject_label *userp)
82240+{
82241+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
82242+ struct subject_map *match;
82243+
82244+ match = polstate->subj_map_set.s_hash[index];
82245+
82246+ while (match && match->user != userp)
82247+ match = match->next;
82248+
82249+ if (match != NULL)
82250+ return match->kernel;
82251+ else
82252+ return NULL;
82253+}
82254+
82255+static void
82256+insert_subj_map_entry(struct subject_map *subjmap)
82257+{
82258+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
82259+ struct subject_map **curr;
82260+
82261+ subjmap->prev = NULL;
82262+
82263+ curr = &polstate->subj_map_set.s_hash[index];
82264+ if (*curr != NULL)
82265+ (*curr)->prev = subjmap;
82266+
82267+ subjmap->next = *curr;
82268+ *curr = subjmap;
82269+
82270+ return;
82271+}
82272+
82273+static void
82274+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
82275+{
82276+ unsigned int index =
82277+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
82278+ struct acl_role_label **curr;
82279+ struct acl_role_label *tmp, *tmp2;
82280+
82281+ curr = &polstate->acl_role_set.r_hash[index];
82282+
82283+ /* simple case, slot is empty, just set it to our role */
82284+ if (*curr == NULL) {
82285+ *curr = role;
82286+ } else {
82287+ /* example:
82288+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
82289+ 2 -> 3
82290+ */
82291+ /* first check to see if we can already be reached via this slot */
82292+ tmp = *curr;
82293+ while (tmp && tmp != role)
82294+ tmp = tmp->next;
82295+ if (tmp == role) {
82296+ /* we don't need to add ourselves to this slot's chain */
82297+ return;
82298+ }
82299+ /* we need to add ourselves to this chain, two cases */
82300+ if (role->next == NULL) {
82301+ /* simple case, append the current chain to our role */
82302+ role->next = *curr;
82303+ *curr = role;
82304+ } else {
82305+ /* 1 -> 2 -> 3 -> 4
82306+ 2 -> 3 -> 4
82307+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
82308+ */
82309+ /* trickier case: walk our role's chain until we find
82310+ the role for the start of the current slot's chain */
82311+ tmp = role;
82312+ tmp2 = *curr;
82313+ while (tmp->next && tmp->next != tmp2)
82314+ tmp = tmp->next;
82315+ if (tmp->next == tmp2) {
82316+ /* from example above, we found 3, so just
82317+ replace this slot's chain with ours */
82318+ *curr = role;
82319+ } else {
82320+ /* we didn't find a subset of our role's chain
82321+ in the current slot's chain, so append their
82322+ chain to ours, and set us as the first role in
82323+ the slot's chain
82324+
82325+ we could fold this case with the case above,
82326+ but making it explicit for clarity
82327+ */
82328+ tmp->next = tmp2;
82329+ *curr = role;
82330+ }
82331+ }
82332+ }
82333+
82334+ return;
82335+}
82336+
82337+static void
82338+insert_acl_role_label(struct acl_role_label *role)
82339+{
82340+ int i;
82341+
82342+ if (polstate->role_list == NULL) {
82343+ polstate->role_list = role;
82344+ role->prev = NULL;
82345+ } else {
82346+ role->prev = polstate->role_list;
82347+ polstate->role_list = role;
82348+ }
82349+
82350+ /* used for hash chains */
82351+ role->next = NULL;
82352+
82353+ if (role->roletype & GR_ROLE_DOMAIN) {
82354+ for (i = 0; i < role->domain_child_num; i++)
82355+ __insert_acl_role_label(role, role->domain_children[i]);
82356+ } else
82357+ __insert_acl_role_label(role, role->uidgid);
82358+}
82359+
82360+static int
82361+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
82362+{
82363+ struct name_entry **curr, *nentry;
82364+ struct inodev_entry *ientry;
82365+ unsigned int len = strlen(name);
82366+ unsigned int key = full_name_hash(name, len);
82367+ unsigned int index = key % polstate->name_set.n_size;
82368+
82369+ curr = &polstate->name_set.n_hash[index];
82370+
82371+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
82372+ curr = &((*curr)->next);
82373+
82374+ if (*curr != NULL)
82375+ return 1;
82376+
82377+ nentry = acl_alloc(sizeof (struct name_entry));
82378+ if (nentry == NULL)
82379+ return 0;
82380+ ientry = acl_alloc(sizeof (struct inodev_entry));
82381+ if (ientry == NULL)
82382+ return 0;
82383+ ientry->nentry = nentry;
82384+
82385+ nentry->key = key;
82386+ nentry->name = name;
82387+ nentry->inode = inode;
82388+ nentry->device = device;
82389+ nentry->len = len;
82390+ nentry->deleted = deleted;
82391+
82392+ nentry->prev = NULL;
82393+ curr = &polstate->name_set.n_hash[index];
82394+ if (*curr != NULL)
82395+ (*curr)->prev = nentry;
82396+ nentry->next = *curr;
82397+ *curr = nentry;
82398+
82399+ /* insert us into the table searchable by inode/dev */
82400+ __insert_inodev_entry(polstate, ientry);
82401+
82402+ return 1;
82403+}
82404+
82405+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
82406+
82407+static void *
82408+create_table(__u32 * len, int elementsize)
82409+{
82410+ unsigned int table_sizes[] = {
82411+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
82412+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
82413+ 4194301, 8388593, 16777213, 33554393, 67108859
82414+ };
82415+ void *newtable = NULL;
82416+ unsigned int pwr = 0;
82417+
82418+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
82419+ table_sizes[pwr] <= *len)
82420+ pwr++;
82421+
82422+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
82423+ return newtable;
82424+
82425+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
82426+ newtable =
82427+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
82428+ else
82429+ newtable = vmalloc(table_sizes[pwr] * elementsize);
82430+
82431+ *len = table_sizes[pwr];
82432+
82433+ return newtable;
82434+}
82435+
82436+static int
82437+init_variables(const struct gr_arg *arg, bool reload)
82438+{
82439+ struct task_struct *reaper = init_pid_ns.child_reaper;
82440+ unsigned int stacksize;
82441+
82442+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
82443+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
82444+ polstate->name_set.n_size = arg->role_db.num_objects;
82445+ polstate->inodev_set.i_size = arg->role_db.num_objects;
82446+
82447+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
82448+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
82449+ return 1;
82450+
82451+ if (!reload) {
82452+ if (!gr_init_uidset())
82453+ return 1;
82454+ }
82455+
82456+ /* set up the stack that holds allocation info */
82457+
82458+ stacksize = arg->role_db.num_pointers + 5;
82459+
82460+ if (!acl_alloc_stack_init(stacksize))
82461+ return 1;
82462+
82463+ if (!reload) {
82464+ /* grab reference for the real root dentry and vfsmount */
82465+ get_fs_root(reaper->fs, &gr_real_root);
82466+
82467+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
82468+ 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);
82469+#endif
82470+
82471+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
82472+ if (fakefs_obj_rw == NULL)
82473+ return 1;
82474+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
82475+
82476+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
82477+ if (fakefs_obj_rwx == NULL)
82478+ return 1;
82479+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
82480+ }
82481+
82482+ polstate->subj_map_set.s_hash =
82483+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
82484+ polstate->acl_role_set.r_hash =
82485+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
82486+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
82487+ polstate->inodev_set.i_hash =
82488+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
82489+
82490+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
82491+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
82492+ return 1;
82493+
82494+ memset(polstate->subj_map_set.s_hash, 0,
82495+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
82496+ memset(polstate->acl_role_set.r_hash, 0,
82497+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
82498+ memset(polstate->name_set.n_hash, 0,
82499+ sizeof (struct name_entry *) * polstate->name_set.n_size);
82500+ memset(polstate->inodev_set.i_hash, 0,
82501+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
82502+
82503+ return 0;
82504+}
82505+
82506+/* free information not needed after startup
82507+ currently contains user->kernel pointer mappings for subjects
82508+*/
82509+
82510+static void
82511+free_init_variables(void)
82512+{
82513+ __u32 i;
82514+
82515+ if (polstate->subj_map_set.s_hash) {
82516+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
82517+ if (polstate->subj_map_set.s_hash[i]) {
82518+ kfree(polstate->subj_map_set.s_hash[i]);
82519+ polstate->subj_map_set.s_hash[i] = NULL;
82520+ }
82521+ }
82522+
82523+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
82524+ PAGE_SIZE)
82525+ kfree(polstate->subj_map_set.s_hash);
82526+ else
82527+ vfree(polstate->subj_map_set.s_hash);
82528+ }
82529+
82530+ return;
82531+}
82532+
82533+static void
82534+free_variables(bool reload)
82535+{
82536+ struct acl_subject_label *s;
82537+ struct acl_role_label *r;
82538+ struct task_struct *task, *task2;
82539+ unsigned int x;
82540+
82541+ if (!reload) {
82542+ gr_clear_learn_entries();
82543+
82544+ read_lock(&tasklist_lock);
82545+ do_each_thread(task2, task) {
82546+ task->acl_sp_role = 0;
82547+ task->acl_role_id = 0;
82548+ task->inherited = 0;
82549+ task->acl = NULL;
82550+ task->role = NULL;
82551+ } while_each_thread(task2, task);
82552+ read_unlock(&tasklist_lock);
82553+
82554+ kfree(fakefs_obj_rw);
82555+ fakefs_obj_rw = NULL;
82556+ kfree(fakefs_obj_rwx);
82557+ fakefs_obj_rwx = NULL;
82558+
82559+ /* release the reference to the real root dentry and vfsmount */
82560+ path_put(&gr_real_root);
82561+ memset(&gr_real_root, 0, sizeof(gr_real_root));
82562+ }
82563+
82564+ /* free all object hash tables */
82565+
82566+ FOR_EACH_ROLE_START(r)
82567+ if (r->subj_hash == NULL)
82568+ goto next_role;
82569+ FOR_EACH_SUBJECT_START(r, s, x)
82570+ if (s->obj_hash == NULL)
82571+ break;
82572+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
82573+ kfree(s->obj_hash);
82574+ else
82575+ vfree(s->obj_hash);
82576+ FOR_EACH_SUBJECT_END(s, x)
82577+ FOR_EACH_NESTED_SUBJECT_START(r, s)
82578+ if (s->obj_hash == NULL)
82579+ break;
82580+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
82581+ kfree(s->obj_hash);
82582+ else
82583+ vfree(s->obj_hash);
82584+ FOR_EACH_NESTED_SUBJECT_END(s)
82585+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
82586+ kfree(r->subj_hash);
82587+ else
82588+ vfree(r->subj_hash);
82589+ r->subj_hash = NULL;
82590+next_role:
82591+ FOR_EACH_ROLE_END(r)
82592+
82593+ acl_free_all();
82594+
82595+ if (polstate->acl_role_set.r_hash) {
82596+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
82597+ PAGE_SIZE)
82598+ kfree(polstate->acl_role_set.r_hash);
82599+ else
82600+ vfree(polstate->acl_role_set.r_hash);
82601+ }
82602+ if (polstate->name_set.n_hash) {
82603+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
82604+ PAGE_SIZE)
82605+ kfree(polstate->name_set.n_hash);
82606+ else
82607+ vfree(polstate->name_set.n_hash);
82608+ }
82609+
82610+ if (polstate->inodev_set.i_hash) {
82611+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
82612+ PAGE_SIZE)
82613+ kfree(polstate->inodev_set.i_hash);
82614+ else
82615+ vfree(polstate->inodev_set.i_hash);
82616+ }
82617+
82618+ if (!reload)
82619+ gr_free_uidset();
82620+
82621+ memset(&polstate->name_set, 0, sizeof (struct name_db));
82622+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
82623+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
82624+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
82625+
82626+ polstate->default_role = NULL;
82627+ polstate->kernel_role = NULL;
82628+ polstate->role_list = NULL;
82629+
82630+ return;
82631+}
82632+
82633+static struct acl_subject_label *
82634+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
82635+
82636+static int alloc_and_copy_string(char **name, unsigned int maxlen)
82637+{
82638+ unsigned int len = strnlen_user(*name, maxlen);
82639+ char *tmp;
82640+
82641+ if (!len || len >= maxlen)
82642+ return -EINVAL;
82643+
82644+ if ((tmp = (char *) acl_alloc(len)) == NULL)
82645+ return -ENOMEM;
82646+
82647+ if (copy_from_user(tmp, *name, len))
82648+ return -EFAULT;
82649+
82650+ tmp[len-1] = '\0';
82651+ *name = tmp;
82652+
82653+ return 0;
82654+}
82655+
82656+static int
82657+copy_user_glob(struct acl_object_label *obj)
82658+{
82659+ struct acl_object_label *g_tmp, **guser;
82660+ int error;
82661+
82662+ if (obj->globbed == NULL)
82663+ return 0;
82664+
82665+ guser = &obj->globbed;
82666+ while (*guser) {
82667+ g_tmp = (struct acl_object_label *)
82668+ acl_alloc(sizeof (struct acl_object_label));
82669+ if (g_tmp == NULL)
82670+ return -ENOMEM;
82671+
82672+ if (copy_acl_object_label(g_tmp, *guser))
82673+ return -EFAULT;
82674+
82675+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
82676+ if (error)
82677+ return error;
82678+
82679+ *guser = g_tmp;
82680+ guser = &(g_tmp->next);
82681+ }
82682+
82683+ return 0;
82684+}
82685+
82686+static int
82687+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
82688+ struct acl_role_label *role)
82689+{
82690+ struct acl_object_label *o_tmp;
82691+ int ret;
82692+
82693+ while (userp) {
82694+ if ((o_tmp = (struct acl_object_label *)
82695+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
82696+ return -ENOMEM;
82697+
82698+ if (copy_acl_object_label(o_tmp, userp))
82699+ return -EFAULT;
82700+
82701+ userp = o_tmp->prev;
82702+
82703+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
82704+ if (ret)
82705+ return ret;
82706+
82707+ insert_acl_obj_label(o_tmp, subj);
82708+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
82709+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
82710+ return -ENOMEM;
82711+
82712+ ret = copy_user_glob(o_tmp);
82713+ if (ret)
82714+ return ret;
82715+
82716+ if (o_tmp->nested) {
82717+ int already_copied;
82718+
82719+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
82720+ if (IS_ERR(o_tmp->nested))
82721+ return PTR_ERR(o_tmp->nested);
82722+
82723+ /* insert into nested subject list if we haven't copied this one yet
82724+ to prevent duplicate entries */
82725+ if (!already_copied) {
82726+ o_tmp->nested->next = role->hash->first;
82727+ role->hash->first = o_tmp->nested;
82728+ }
82729+ }
82730+ }
82731+
82732+ return 0;
82733+}
82734+
82735+static __u32
82736+count_user_subjs(struct acl_subject_label *userp)
82737+{
82738+ struct acl_subject_label s_tmp;
82739+ __u32 num = 0;
82740+
82741+ while (userp) {
82742+ if (copy_acl_subject_label(&s_tmp, userp))
82743+ break;
82744+
82745+ userp = s_tmp.prev;
82746+ }
82747+
82748+ return num;
82749+}
82750+
82751+static int
82752+copy_user_allowedips(struct acl_role_label *rolep)
82753+{
82754+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
82755+
82756+ ruserip = rolep->allowed_ips;
82757+
82758+ while (ruserip) {
82759+ rlast = rtmp;
82760+
82761+ if ((rtmp = (struct role_allowed_ip *)
82762+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
82763+ return -ENOMEM;
82764+
82765+ if (copy_role_allowed_ip(rtmp, ruserip))
82766+ return -EFAULT;
82767+
82768+ ruserip = rtmp->prev;
82769+
82770+ if (!rlast) {
82771+ rtmp->prev = NULL;
82772+ rolep->allowed_ips = rtmp;
82773+ } else {
82774+ rlast->next = rtmp;
82775+ rtmp->prev = rlast;
82776+ }
82777+
82778+ if (!ruserip)
82779+ rtmp->next = NULL;
82780+ }
82781+
82782+ return 0;
82783+}
82784+
82785+static int
82786+copy_user_transitions(struct acl_role_label *rolep)
82787+{
82788+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
82789+ int error;
82790+
82791+ rusertp = rolep->transitions;
82792+
82793+ while (rusertp) {
82794+ rlast = rtmp;
82795+
82796+ if ((rtmp = (struct role_transition *)
82797+ acl_alloc(sizeof (struct role_transition))) == NULL)
82798+ return -ENOMEM;
82799+
82800+ if (copy_role_transition(rtmp, rusertp))
82801+ return -EFAULT;
82802+
82803+ rusertp = rtmp->prev;
82804+
82805+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
82806+ if (error)
82807+ return error;
82808+
82809+ if (!rlast) {
82810+ rtmp->prev = NULL;
82811+ rolep->transitions = rtmp;
82812+ } else {
82813+ rlast->next = rtmp;
82814+ rtmp->prev = rlast;
82815+ }
82816+
82817+ if (!rusertp)
82818+ rtmp->next = NULL;
82819+ }
82820+
82821+ return 0;
82822+}
82823+
82824+static __u32 count_user_objs(const struct acl_object_label __user *userp)
82825+{
82826+ struct acl_object_label o_tmp;
82827+ __u32 num = 0;
82828+
82829+ while (userp) {
82830+ if (copy_acl_object_label(&o_tmp, userp))
82831+ break;
82832+
82833+ userp = o_tmp.prev;
82834+ num++;
82835+ }
82836+
82837+ return num;
82838+}
82839+
82840+static struct acl_subject_label *
82841+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
82842+{
82843+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
82844+ __u32 num_objs;
82845+ struct acl_ip_label **i_tmp, *i_utmp2;
82846+ struct gr_hash_struct ghash;
82847+ struct subject_map *subjmap;
82848+ unsigned int i_num;
82849+ int err;
82850+
82851+ if (already_copied != NULL)
82852+ *already_copied = 0;
82853+
82854+ s_tmp = lookup_subject_map(userp);
82855+
82856+ /* we've already copied this subject into the kernel, just return
82857+ the reference to it, and don't copy it over again
82858+ */
82859+ if (s_tmp) {
82860+ if (already_copied != NULL)
82861+ *already_copied = 1;
82862+ return(s_tmp);
82863+ }
82864+
82865+ if ((s_tmp = (struct acl_subject_label *)
82866+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
82867+ return ERR_PTR(-ENOMEM);
82868+
82869+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
82870+ if (subjmap == NULL)
82871+ return ERR_PTR(-ENOMEM);
82872+
82873+ subjmap->user = userp;
82874+ subjmap->kernel = s_tmp;
82875+ insert_subj_map_entry(subjmap);
82876+
82877+ if (copy_acl_subject_label(s_tmp, userp))
82878+ return ERR_PTR(-EFAULT);
82879+
82880+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
82881+ if (err)
82882+ return ERR_PTR(err);
82883+
82884+ if (!strcmp(s_tmp->filename, "/"))
82885+ role->root_label = s_tmp;
82886+
82887+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
82888+ return ERR_PTR(-EFAULT);
82889+
82890+ /* copy user and group transition tables */
82891+
82892+ if (s_tmp->user_trans_num) {
82893+ uid_t *uidlist;
82894+
82895+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
82896+ if (uidlist == NULL)
82897+ return ERR_PTR(-ENOMEM);
82898+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
82899+ return ERR_PTR(-EFAULT);
82900+
82901+ s_tmp->user_transitions = uidlist;
82902+ }
82903+
82904+ if (s_tmp->group_trans_num) {
82905+ gid_t *gidlist;
82906+
82907+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
82908+ if (gidlist == NULL)
82909+ return ERR_PTR(-ENOMEM);
82910+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
82911+ return ERR_PTR(-EFAULT);
82912+
82913+ s_tmp->group_transitions = gidlist;
82914+ }
82915+
82916+ /* set up object hash table */
82917+ num_objs = count_user_objs(ghash.first);
82918+
82919+ s_tmp->obj_hash_size = num_objs;
82920+ s_tmp->obj_hash =
82921+ (struct acl_object_label **)
82922+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
82923+
82924+ if (!s_tmp->obj_hash)
82925+ return ERR_PTR(-ENOMEM);
82926+
82927+ memset(s_tmp->obj_hash, 0,
82928+ s_tmp->obj_hash_size *
82929+ sizeof (struct acl_object_label *));
82930+
82931+ /* add in objects */
82932+ err = copy_user_objs(ghash.first, s_tmp, role);
82933+
82934+ if (err)
82935+ return ERR_PTR(err);
82936+
82937+ /* set pointer for parent subject */
82938+ if (s_tmp->parent_subject) {
82939+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
82940+
82941+ if (IS_ERR(s_tmp2))
82942+ return s_tmp2;
82943+
82944+ s_tmp->parent_subject = s_tmp2;
82945+ }
82946+
82947+ /* add in ip acls */
82948+
82949+ if (!s_tmp->ip_num) {
82950+ s_tmp->ips = NULL;
82951+ goto insert;
82952+ }
82953+
82954+ i_tmp =
82955+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
82956+ sizeof (struct acl_ip_label *));
82957+
82958+ if (!i_tmp)
82959+ return ERR_PTR(-ENOMEM);
82960+
82961+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
82962+ *(i_tmp + i_num) =
82963+ (struct acl_ip_label *)
82964+ acl_alloc(sizeof (struct acl_ip_label));
82965+ if (!*(i_tmp + i_num))
82966+ return ERR_PTR(-ENOMEM);
82967+
82968+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
82969+ return ERR_PTR(-EFAULT);
82970+
82971+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
82972+ return ERR_PTR(-EFAULT);
82973+
82974+ if ((*(i_tmp + i_num))->iface == NULL)
82975+ continue;
82976+
82977+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
82978+ if (err)
82979+ return ERR_PTR(err);
82980+ }
82981+
82982+ s_tmp->ips = i_tmp;
82983+
82984+insert:
82985+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
82986+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
82987+ return ERR_PTR(-ENOMEM);
82988+
82989+ return s_tmp;
82990+}
82991+
82992+static int
82993+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
82994+{
82995+ struct acl_subject_label s_pre;
82996+ struct acl_subject_label * ret;
82997+ int err;
82998+
82999+ while (userp) {
83000+ if (copy_acl_subject_label(&s_pre, userp))
83001+ return -EFAULT;
83002+
83003+ ret = do_copy_user_subj(userp, role, NULL);
83004+
83005+ err = PTR_ERR(ret);
83006+ if (IS_ERR(ret))
83007+ return err;
83008+
83009+ insert_acl_subj_label(ret, role);
83010+
83011+ userp = s_pre.prev;
83012+ }
83013+
83014+ return 0;
83015+}
83016+
83017+static int
83018+copy_user_acl(struct gr_arg *arg)
83019+{
83020+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
83021+ struct acl_subject_label *subj_list;
83022+ struct sprole_pw *sptmp;
83023+ struct gr_hash_struct *ghash;
83024+ uid_t *domainlist;
83025+ unsigned int r_num;
83026+ int err = 0;
83027+ __u16 i;
83028+ __u32 num_subjs;
83029+
83030+ /* we need a default and kernel role */
83031+ if (arg->role_db.num_roles < 2)
83032+ return -EINVAL;
83033+
83034+ /* copy special role authentication info from userspace */
83035+
83036+ polstate->num_sprole_pws = arg->num_sprole_pws;
83037+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
83038+
83039+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
83040+ return -ENOMEM;
83041+
83042+ for (i = 0; i < polstate->num_sprole_pws; i++) {
83043+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
83044+ if (!sptmp)
83045+ return -ENOMEM;
83046+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
83047+ return -EFAULT;
83048+
83049+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
83050+ if (err)
83051+ return err;
83052+
83053+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
83054+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
83055+#endif
83056+
83057+ polstate->acl_special_roles[i] = sptmp;
83058+ }
83059+
83060+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
83061+
83062+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
83063+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
83064+
83065+ if (!r_tmp)
83066+ return -ENOMEM;
83067+
83068+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
83069+ return -EFAULT;
83070+
83071+ if (copy_acl_role_label(r_tmp, r_utmp2))
83072+ return -EFAULT;
83073+
83074+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
83075+ if (err)
83076+ return err;
83077+
83078+ if (!strcmp(r_tmp->rolename, "default")
83079+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
83080+ polstate->default_role = r_tmp;
83081+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
83082+ polstate->kernel_role = r_tmp;
83083+ }
83084+
83085+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
83086+ return -ENOMEM;
83087+
83088+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
83089+ return -EFAULT;
83090+
83091+ r_tmp->hash = ghash;
83092+
83093+ num_subjs = count_user_subjs(r_tmp->hash->first);
83094+
83095+ r_tmp->subj_hash_size = num_subjs;
83096+ r_tmp->subj_hash =
83097+ (struct acl_subject_label **)
83098+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
83099+
83100+ if (!r_tmp->subj_hash)
83101+ return -ENOMEM;
83102+
83103+ err = copy_user_allowedips(r_tmp);
83104+ if (err)
83105+ return err;
83106+
83107+ /* copy domain info */
83108+ if (r_tmp->domain_children != NULL) {
83109+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
83110+ if (domainlist == NULL)
83111+ return -ENOMEM;
83112+
83113+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
83114+ return -EFAULT;
83115+
83116+ r_tmp->domain_children = domainlist;
83117+ }
83118+
83119+ err = copy_user_transitions(r_tmp);
83120+ if (err)
83121+ return err;
83122+
83123+ memset(r_tmp->subj_hash, 0,
83124+ r_tmp->subj_hash_size *
83125+ sizeof (struct acl_subject_label *));
83126+
83127+ /* acquire the list of subjects, then NULL out
83128+ the list prior to parsing the subjects for this role,
83129+ as during this parsing the list is replaced with a list
83130+ of *nested* subjects for the role
83131+ */
83132+ subj_list = r_tmp->hash->first;
83133+
83134+ /* set nested subject list to null */
83135+ r_tmp->hash->first = NULL;
83136+
83137+ err = copy_user_subjs(subj_list, r_tmp);
83138+
83139+ if (err)
83140+ return err;
83141+
83142+ insert_acl_role_label(r_tmp);
83143+ }
83144+
83145+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
83146+ return -EINVAL;
83147+
83148+ return err;
83149+}
83150+
83151+static int gracl_reload_apply_policies(void *reload)
83152+{
83153+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
83154+ struct task_struct *task, *task2;
83155+ struct acl_role_label *role, *rtmp;
83156+ struct acl_subject_label *subj;
83157+ const struct cred *cred;
83158+ int role_applied;
83159+ int ret = 0;
83160+
83161+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
83162+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
83163+
83164+ /* first make sure we'll be able to apply the new policy cleanly */
83165+ do_each_thread(task2, task) {
83166+ if (task->exec_file == NULL)
83167+ continue;
83168+ role_applied = 0;
83169+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
83170+ /* preserve special roles */
83171+ FOR_EACH_ROLE_START(role)
83172+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
83173+ rtmp = task->role;
83174+ task->role = role;
83175+ role_applied = 1;
83176+ break;
83177+ }
83178+ FOR_EACH_ROLE_END(role)
83179+ }
83180+ if (!role_applied) {
83181+ cred = __task_cred(task);
83182+ rtmp = task->role;
83183+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83184+ }
83185+ /* this handles non-nested inherited subjects, nested subjects will still
83186+ be dropped currently */
83187+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
83188+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
83189+ /* change the role back so that we've made no modifications to the policy */
83190+ task->role = rtmp;
83191+
83192+ if (subj == NULL || task->tmpacl == NULL) {
83193+ ret = -EINVAL;
83194+ goto out;
83195+ }
83196+ } while_each_thread(task2, task);
83197+
83198+ /* now actually apply the policy */
83199+
83200+ do_each_thread(task2, task) {
83201+ if (task->exec_file) {
83202+ role_applied = 0;
83203+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
83204+ /* preserve special roles */
83205+ FOR_EACH_ROLE_START(role)
83206+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
83207+ task->role = role;
83208+ role_applied = 1;
83209+ break;
83210+ }
83211+ FOR_EACH_ROLE_END(role)
83212+ }
83213+ if (!role_applied) {
83214+ cred = __task_cred(task);
83215+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83216+ }
83217+ /* this handles non-nested inherited subjects, nested subjects will still
83218+ be dropped currently */
83219+ if (!reload_state->oldmode && task->inherited)
83220+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
83221+ else {
83222+ /* looked up and tagged to the task previously */
83223+ subj = task->tmpacl;
83224+ }
83225+ /* subj will be non-null */
83226+ __gr_apply_subject_to_task(polstate, task, subj);
83227+ if (reload_state->oldmode) {
83228+ task->acl_role_id = 0;
83229+ task->acl_sp_role = 0;
83230+ task->inherited = 0;
83231+ }
83232+ } else {
83233+ // it's a kernel process
83234+ task->role = polstate->kernel_role;
83235+ task->acl = polstate->kernel_role->root_label;
83236+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
83237+ task->acl->mode &= ~GR_PROCFIND;
83238+#endif
83239+ }
83240+ } while_each_thread(task2, task);
83241+
83242+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
83243+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
83244+
83245+out:
83246+
83247+ return ret;
83248+}
83249+
83250+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
83251+{
83252+ struct gr_reload_state new_reload_state = { };
83253+ int err;
83254+
83255+ new_reload_state.oldpolicy_ptr = polstate;
83256+ new_reload_state.oldalloc_ptr = current_alloc_state;
83257+ new_reload_state.oldmode = oldmode;
83258+
83259+ current_alloc_state = &new_reload_state.newalloc;
83260+ polstate = &new_reload_state.newpolicy;
83261+
83262+ /* everything relevant is now saved off, copy in the new policy */
83263+ if (init_variables(args, true)) {
83264+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
83265+ err = -ENOMEM;
83266+ goto error;
83267+ }
83268+
83269+ err = copy_user_acl(args);
83270+ free_init_variables();
83271+ if (err)
83272+ goto error;
83273+ /* the new policy is copied in, with the old policy available via saved_state
83274+ first go through applying roles, making sure to preserve special roles
83275+ then apply new subjects, making sure to preserve inherited and nested subjects,
83276+ though currently only inherited subjects will be preserved
83277+ */
83278+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
83279+ if (err)
83280+ goto error;
83281+
83282+ /* we've now applied the new policy, so restore the old policy state to free it */
83283+ polstate = &new_reload_state.oldpolicy;
83284+ current_alloc_state = &new_reload_state.oldalloc;
83285+ free_variables(true);
83286+
83287+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
83288+ to running_polstate/current_alloc_state inside stop_machine
83289+ */
83290+ err = 0;
83291+ goto out;
83292+error:
83293+ /* on error of loading the new policy, we'll just keep the previous
83294+ policy set around
83295+ */
83296+ free_variables(true);
83297+
83298+ /* doesn't affect runtime, but maintains consistent state */
83299+out:
83300+ polstate = new_reload_state.oldpolicy_ptr;
83301+ current_alloc_state = new_reload_state.oldalloc_ptr;
83302+
83303+ return err;
83304+}
83305+
83306+static int
83307+gracl_init(struct gr_arg *args)
83308+{
83309+ int error = 0;
83310+
83311+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
83312+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
83313+
83314+ if (init_variables(args, false)) {
83315+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
83316+ error = -ENOMEM;
83317+ goto out;
83318+ }
83319+
83320+ error = copy_user_acl(args);
83321+ free_init_variables();
83322+ if (error)
83323+ goto out;
83324+
83325+ error = gr_set_acls(0);
83326+ if (error)
83327+ goto out;
83328+
83329+ gr_enable_rbac_system();
83330+
83331+ return 0;
83332+
83333+out:
83334+ free_variables(false);
83335+ return error;
83336+}
83337+
83338+static int
83339+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
83340+ unsigned char **sum)
83341+{
83342+ struct acl_role_label *r;
83343+ struct role_allowed_ip *ipp;
83344+ struct role_transition *trans;
83345+ unsigned int i;
83346+ int found = 0;
83347+ u32 curr_ip = current->signal->curr_ip;
83348+
83349+ current->signal->saved_ip = curr_ip;
83350+
83351+ /* check transition table */
83352+
83353+ for (trans = current->role->transitions; trans; trans = trans->next) {
83354+ if (!strcmp(rolename, trans->rolename)) {
83355+ found = 1;
83356+ break;
83357+ }
83358+ }
83359+
83360+ if (!found)
83361+ return 0;
83362+
83363+ /* handle special roles that do not require authentication
83364+ and check ip */
83365+
83366+ FOR_EACH_ROLE_START(r)
83367+ if (!strcmp(rolename, r->rolename) &&
83368+ (r->roletype & GR_ROLE_SPECIAL)) {
83369+ found = 0;
83370+ if (r->allowed_ips != NULL) {
83371+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
83372+ if ((ntohl(curr_ip) & ipp->netmask) ==
83373+ (ntohl(ipp->addr) & ipp->netmask))
83374+ found = 1;
83375+ }
83376+ } else
83377+ found = 2;
83378+ if (!found)
83379+ return 0;
83380+
83381+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
83382+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
83383+ *salt = NULL;
83384+ *sum = NULL;
83385+ return 1;
83386+ }
83387+ }
83388+ FOR_EACH_ROLE_END(r)
83389+
83390+ for (i = 0; i < polstate->num_sprole_pws; i++) {
83391+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
83392+ *salt = polstate->acl_special_roles[i]->salt;
83393+ *sum = polstate->acl_special_roles[i]->sum;
83394+ return 1;
83395+ }
83396+ }
83397+
83398+ return 0;
83399+}
83400+
83401+int gr_check_secure_terminal(struct task_struct *task)
83402+{
83403+ struct task_struct *p, *p2, *p3;
83404+ struct files_struct *files;
83405+ struct fdtable *fdt;
83406+ struct file *our_file = NULL, *file;
83407+ int i;
83408+
83409+ if (task->signal->tty == NULL)
83410+ return 1;
83411+
83412+ files = get_files_struct(task);
83413+ if (files != NULL) {
83414+ rcu_read_lock();
83415+ fdt = files_fdtable(files);
83416+ for (i=0; i < fdt->max_fds; i++) {
83417+ file = fcheck_files(files, i);
83418+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
83419+ get_file(file);
83420+ our_file = file;
83421+ }
83422+ }
83423+ rcu_read_unlock();
83424+ put_files_struct(files);
83425+ }
83426+
83427+ if (our_file == NULL)
83428+ return 1;
83429+
83430+ read_lock(&tasklist_lock);
83431+ do_each_thread(p2, p) {
83432+ files = get_files_struct(p);
83433+ if (files == NULL ||
83434+ (p->signal && p->signal->tty == task->signal->tty)) {
83435+ if (files != NULL)
83436+ put_files_struct(files);
83437+ continue;
83438+ }
83439+ rcu_read_lock();
83440+ fdt = files_fdtable(files);
83441+ for (i=0; i < fdt->max_fds; i++) {
83442+ file = fcheck_files(files, i);
83443+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
83444+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
83445+ p3 = task;
83446+ while (task_pid_nr(p3) > 0) {
83447+ if (p3 == p)
83448+ break;
83449+ p3 = p3->real_parent;
83450+ }
83451+ if (p3 == p)
83452+ break;
83453+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
83454+ gr_handle_alertkill(p);
83455+ rcu_read_unlock();
83456+ put_files_struct(files);
83457+ read_unlock(&tasklist_lock);
83458+ fput(our_file);
83459+ return 0;
83460+ }
83461+ }
83462+ rcu_read_unlock();
83463+ put_files_struct(files);
83464+ } while_each_thread(p2, p);
83465+ read_unlock(&tasklist_lock);
83466+
83467+ fput(our_file);
83468+ return 1;
83469+}
83470+
83471+ssize_t
83472+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
83473+{
83474+ struct gr_arg_wrapper uwrap;
83475+ unsigned char *sprole_salt = NULL;
83476+ unsigned char *sprole_sum = NULL;
83477+ int error = 0;
83478+ int error2 = 0;
83479+ size_t req_count = 0;
83480+ unsigned char oldmode = 0;
83481+
83482+ mutex_lock(&gr_dev_mutex);
83483+
83484+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
83485+ error = -EPERM;
83486+ goto out;
83487+ }
83488+
83489+#ifdef CONFIG_COMPAT
83490+ pax_open_kernel();
83491+ if (is_compat_task()) {
83492+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
83493+ copy_gr_arg = &copy_gr_arg_compat;
83494+ copy_acl_object_label = &copy_acl_object_label_compat;
83495+ copy_acl_subject_label = &copy_acl_subject_label_compat;
83496+ copy_acl_role_label = &copy_acl_role_label_compat;
83497+ copy_acl_ip_label = &copy_acl_ip_label_compat;
83498+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
83499+ copy_role_transition = &copy_role_transition_compat;
83500+ copy_sprole_pw = &copy_sprole_pw_compat;
83501+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
83502+ copy_pointer_from_array = &copy_pointer_from_array_compat;
83503+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
83504+ } else {
83505+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
83506+ copy_gr_arg = &copy_gr_arg_normal;
83507+ copy_acl_object_label = &copy_acl_object_label_normal;
83508+ copy_acl_subject_label = &copy_acl_subject_label_normal;
83509+ copy_acl_role_label = &copy_acl_role_label_normal;
83510+ copy_acl_ip_label = &copy_acl_ip_label_normal;
83511+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
83512+ copy_role_transition = &copy_role_transition_normal;
83513+ copy_sprole_pw = &copy_sprole_pw_normal;
83514+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
83515+ copy_pointer_from_array = &copy_pointer_from_array_normal;
83516+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
83517+ }
83518+ pax_close_kernel();
83519+#endif
83520+
83521+ req_count = get_gr_arg_wrapper_size();
83522+
83523+ if (count != req_count) {
83524+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
83525+ error = -EINVAL;
83526+ goto out;
83527+ }
83528+
83529+
83530+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
83531+ gr_auth_expires = 0;
83532+ gr_auth_attempts = 0;
83533+ }
83534+
83535+ error = copy_gr_arg_wrapper(buf, &uwrap);
83536+ if (error)
83537+ goto out;
83538+
83539+ error = copy_gr_arg(uwrap.arg, gr_usermode);
83540+ if (error)
83541+ goto out;
83542+
83543+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
83544+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
83545+ time_after(gr_auth_expires, get_seconds())) {
83546+ error = -EBUSY;
83547+ goto out;
83548+ }
83549+
83550+ /* if non-root trying to do anything other than use a special role,
83551+ do not attempt authentication, do not count towards authentication
83552+ locking
83553+ */
83554+
83555+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
83556+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
83557+ gr_is_global_nonroot(current_uid())) {
83558+ error = -EPERM;
83559+ goto out;
83560+ }
83561+
83562+ /* ensure pw and special role name are null terminated */
83563+
83564+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
83565+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
83566+
83567+ /* Okay.
83568+ * We have our enough of the argument structure..(we have yet
83569+ * to copy_from_user the tables themselves) . Copy the tables
83570+ * only if we need them, i.e. for loading operations. */
83571+
83572+ switch (gr_usermode->mode) {
83573+ case GR_STATUS:
83574+ if (gr_acl_is_enabled()) {
83575+ error = 1;
83576+ if (!gr_check_secure_terminal(current))
83577+ error = 3;
83578+ } else
83579+ error = 2;
83580+ goto out;
83581+ case GR_SHUTDOWN:
83582+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83583+ stop_machine(gr_rbac_disable, NULL, NULL);
83584+ free_variables(false);
83585+ memset(gr_usermode, 0, sizeof(struct gr_arg));
83586+ memset(gr_system_salt, 0, GR_SALT_LEN);
83587+ memset(gr_system_sum, 0, GR_SHA_LEN);
83588+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
83589+ } else if (gr_acl_is_enabled()) {
83590+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
83591+ error = -EPERM;
83592+ } else {
83593+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
83594+ error = -EAGAIN;
83595+ }
83596+ break;
83597+ case GR_ENABLE:
83598+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
83599+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
83600+ else {
83601+ if (gr_acl_is_enabled())
83602+ error = -EAGAIN;
83603+ else
83604+ error = error2;
83605+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
83606+ }
83607+ break;
83608+ case GR_OLDRELOAD:
83609+ oldmode = 1;
83610+ case GR_RELOAD:
83611+ if (!gr_acl_is_enabled()) {
83612+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
83613+ error = -EAGAIN;
83614+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83615+ error2 = gracl_reload(gr_usermode, oldmode);
83616+ if (!error2)
83617+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
83618+ else {
83619+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
83620+ error = error2;
83621+ }
83622+ } else {
83623+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
83624+ error = -EPERM;
83625+ }
83626+ break;
83627+ case GR_SEGVMOD:
83628+ if (unlikely(!gr_acl_is_enabled())) {
83629+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
83630+ error = -EAGAIN;
83631+ break;
83632+ }
83633+
83634+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83635+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
83636+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
83637+ struct acl_subject_label *segvacl;
83638+ segvacl =
83639+ lookup_acl_subj_label(gr_usermode->segv_inode,
83640+ gr_usermode->segv_device,
83641+ current->role);
83642+ if (segvacl) {
83643+ segvacl->crashes = 0;
83644+ segvacl->expires = 0;
83645+ }
83646+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
83647+ gr_remove_uid(gr_usermode->segv_uid);
83648+ }
83649+ } else {
83650+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
83651+ error = -EPERM;
83652+ }
83653+ break;
83654+ case GR_SPROLE:
83655+ case GR_SPROLEPAM:
83656+ if (unlikely(!gr_acl_is_enabled())) {
83657+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
83658+ error = -EAGAIN;
83659+ break;
83660+ }
83661+
83662+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
83663+ current->role->expires = 0;
83664+ current->role->auth_attempts = 0;
83665+ }
83666+
83667+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
83668+ time_after(current->role->expires, get_seconds())) {
83669+ error = -EBUSY;
83670+ goto out;
83671+ }
83672+
83673+ if (lookup_special_role_auth
83674+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
83675+ && ((!sprole_salt && !sprole_sum)
83676+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
83677+ char *p = "";
83678+ assign_special_role(gr_usermode->sp_role);
83679+ read_lock(&tasklist_lock);
83680+ if (current->real_parent)
83681+ p = current->real_parent->role->rolename;
83682+ read_unlock(&tasklist_lock);
83683+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
83684+ p, acl_sp_role_value);
83685+ } else {
83686+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
83687+ error = -EPERM;
83688+ if(!(current->role->auth_attempts++))
83689+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
83690+
83691+ goto out;
83692+ }
83693+ break;
83694+ case GR_UNSPROLE:
83695+ if (unlikely(!gr_acl_is_enabled())) {
83696+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
83697+ error = -EAGAIN;
83698+ break;
83699+ }
83700+
83701+ if (current->role->roletype & GR_ROLE_SPECIAL) {
83702+ char *p = "";
83703+ int i = 0;
83704+
83705+ read_lock(&tasklist_lock);
83706+ if (current->real_parent) {
83707+ p = current->real_parent->role->rolename;
83708+ i = current->real_parent->acl_role_id;
83709+ }
83710+ read_unlock(&tasklist_lock);
83711+
83712+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
83713+ gr_set_acls(1);
83714+ } else {
83715+ error = -EPERM;
83716+ goto out;
83717+ }
83718+ break;
83719+ default:
83720+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
83721+ error = -EINVAL;
83722+ break;
83723+ }
83724+
83725+ if (error != -EPERM)
83726+ goto out;
83727+
83728+ if(!(gr_auth_attempts++))
83729+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
83730+
83731+ out:
83732+ mutex_unlock(&gr_dev_mutex);
83733+
83734+ if (!error)
83735+ error = req_count;
83736+
83737+ return error;
83738+}
83739+
83740+int
83741+gr_set_acls(const int type)
83742+{
83743+ struct task_struct *task, *task2;
83744+ struct acl_role_label *role = current->role;
83745+ struct acl_subject_label *subj;
83746+ __u16 acl_role_id = current->acl_role_id;
83747+ const struct cred *cred;
83748+ int ret;
83749+
83750+ rcu_read_lock();
83751+ read_lock(&tasklist_lock);
83752+ read_lock(&grsec_exec_file_lock);
83753+ do_each_thread(task2, task) {
83754+ /* check to see if we're called from the exit handler,
83755+ if so, only replace ACLs that have inherited the admin
83756+ ACL */
83757+
83758+ if (type && (task->role != role ||
83759+ task->acl_role_id != acl_role_id))
83760+ continue;
83761+
83762+ task->acl_role_id = 0;
83763+ task->acl_sp_role = 0;
83764+ task->inherited = 0;
83765+
83766+ if (task->exec_file) {
83767+ cred = __task_cred(task);
83768+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83769+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
83770+ if (subj == NULL) {
83771+ ret = -EINVAL;
83772+ read_unlock(&grsec_exec_file_lock);
83773+ read_unlock(&tasklist_lock);
83774+ rcu_read_unlock();
83775+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
83776+ return ret;
83777+ }
83778+ __gr_apply_subject_to_task(polstate, task, subj);
83779+ } else {
83780+ // it's a kernel process
83781+ task->role = polstate->kernel_role;
83782+ task->acl = polstate->kernel_role->root_label;
83783+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
83784+ task->acl->mode &= ~GR_PROCFIND;
83785+#endif
83786+ }
83787+ } while_each_thread(task2, task);
83788+ read_unlock(&grsec_exec_file_lock);
83789+ read_unlock(&tasklist_lock);
83790+ rcu_read_unlock();
83791+
83792+ return 0;
83793+}
83794diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
83795new file mode 100644
83796index 0000000..39645c9
83797--- /dev/null
83798+++ b/grsecurity/gracl_res.c
83799@@ -0,0 +1,68 @@
83800+#include <linux/kernel.h>
83801+#include <linux/sched.h>
83802+#include <linux/gracl.h>
83803+#include <linux/grinternal.h>
83804+
83805+static const char *restab_log[] = {
83806+ [RLIMIT_CPU] = "RLIMIT_CPU",
83807+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
83808+ [RLIMIT_DATA] = "RLIMIT_DATA",
83809+ [RLIMIT_STACK] = "RLIMIT_STACK",
83810+ [RLIMIT_CORE] = "RLIMIT_CORE",
83811+ [RLIMIT_RSS] = "RLIMIT_RSS",
83812+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
83813+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
83814+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
83815+ [RLIMIT_AS] = "RLIMIT_AS",
83816+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
83817+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
83818+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
83819+ [RLIMIT_NICE] = "RLIMIT_NICE",
83820+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
83821+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
83822+ [GR_CRASH_RES] = "RLIMIT_CRASH"
83823+};
83824+
83825+void
83826+gr_log_resource(const struct task_struct *task,
83827+ const int res, const unsigned long wanted, const int gt)
83828+{
83829+ const struct cred *cred;
83830+ unsigned long rlim;
83831+
83832+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
83833+ return;
83834+
83835+ // not yet supported resource
83836+ if (unlikely(!restab_log[res]))
83837+ return;
83838+
83839+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
83840+ rlim = task_rlimit_max(task, res);
83841+ else
83842+ rlim = task_rlimit(task, res);
83843+
83844+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
83845+ return;
83846+
83847+ rcu_read_lock();
83848+ cred = __task_cred(task);
83849+
83850+ if (res == RLIMIT_NPROC &&
83851+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
83852+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
83853+ goto out_rcu_unlock;
83854+ else if (res == RLIMIT_MEMLOCK &&
83855+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
83856+ goto out_rcu_unlock;
83857+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
83858+ goto out_rcu_unlock;
83859+ rcu_read_unlock();
83860+
83861+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
83862+
83863+ return;
83864+out_rcu_unlock:
83865+ rcu_read_unlock();
83866+ return;
83867+}
83868diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
83869new file mode 100644
83870index 0000000..35d9e65
83871--- /dev/null
83872+++ b/grsecurity/gracl_segv.c
83873@@ -0,0 +1,324 @@
83874+#include <linux/kernel.h>
83875+#include <linux/mm.h>
83876+#include <asm/uaccess.h>
83877+#include <asm/errno.h>
83878+#include <asm/mman.h>
83879+#include <net/sock.h>
83880+#include <linux/file.h>
83881+#include <linux/fs.h>
83882+#include <linux/net.h>
83883+#include <linux/in.h>
83884+#include <linux/slab.h>
83885+#include <linux/types.h>
83886+#include <linux/sched.h>
83887+#include <linux/timer.h>
83888+#include <linux/gracl.h>
83889+#include <linux/grsecurity.h>
83890+#include <linux/grinternal.h>
83891+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83892+#include <linux/magic.h>
83893+#include <linux/pagemap.h>
83894+#include "../fs/btrfs/async-thread.h"
83895+#include "../fs/btrfs/ctree.h"
83896+#include "../fs/btrfs/btrfs_inode.h"
83897+#endif
83898+
83899+static struct crash_uid *uid_set;
83900+static unsigned short uid_used;
83901+static DEFINE_SPINLOCK(gr_uid_lock);
83902+extern rwlock_t gr_inode_lock;
83903+extern struct acl_subject_label *
83904+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
83905+ struct acl_role_label *role);
83906+
83907+static inline dev_t __get_dev(const struct dentry *dentry)
83908+{
83909+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83910+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83911+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
83912+ else
83913+#endif
83914+ return dentry->d_sb->s_dev;
83915+}
83916+
83917+static inline u64 __get_ino(const struct dentry *dentry)
83918+{
83919+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83920+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83921+ return btrfs_ino(dentry->d_inode);
83922+ else
83923+#endif
83924+ return dentry->d_inode->i_ino;
83925+}
83926+
83927+int
83928+gr_init_uidset(void)
83929+{
83930+ uid_set =
83931+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
83932+ uid_used = 0;
83933+
83934+ return uid_set ? 1 : 0;
83935+}
83936+
83937+void
83938+gr_free_uidset(void)
83939+{
83940+ if (uid_set) {
83941+ struct crash_uid *tmpset;
83942+ spin_lock(&gr_uid_lock);
83943+ tmpset = uid_set;
83944+ uid_set = NULL;
83945+ uid_used = 0;
83946+ spin_unlock(&gr_uid_lock);
83947+ if (tmpset)
83948+ kfree(tmpset);
83949+ }
83950+
83951+ return;
83952+}
83953+
83954+int
83955+gr_find_uid(const uid_t uid)
83956+{
83957+ struct crash_uid *tmp = uid_set;
83958+ uid_t buid;
83959+ int low = 0, high = uid_used - 1, mid;
83960+
83961+ while (high >= low) {
83962+ mid = (low + high) >> 1;
83963+ buid = tmp[mid].uid;
83964+ if (buid == uid)
83965+ return mid;
83966+ if (buid > uid)
83967+ high = mid - 1;
83968+ if (buid < uid)
83969+ low = mid + 1;
83970+ }
83971+
83972+ return -1;
83973+}
83974+
83975+static void
83976+gr_insertsort(void)
83977+{
83978+ unsigned short i, j;
83979+ struct crash_uid index;
83980+
83981+ for (i = 1; i < uid_used; i++) {
83982+ index = uid_set[i];
83983+ j = i;
83984+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
83985+ uid_set[j] = uid_set[j - 1];
83986+ j--;
83987+ }
83988+ uid_set[j] = index;
83989+ }
83990+
83991+ return;
83992+}
83993+
83994+static void
83995+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
83996+{
83997+ int loc;
83998+ uid_t uid = GR_GLOBAL_UID(kuid);
83999+
84000+ if (uid_used == GR_UIDTABLE_MAX)
84001+ return;
84002+
84003+ loc = gr_find_uid(uid);
84004+
84005+ if (loc >= 0) {
84006+ uid_set[loc].expires = expires;
84007+ return;
84008+ }
84009+
84010+ uid_set[uid_used].uid = uid;
84011+ uid_set[uid_used].expires = expires;
84012+ uid_used++;
84013+
84014+ gr_insertsort();
84015+
84016+ return;
84017+}
84018+
84019+void
84020+gr_remove_uid(const unsigned short loc)
84021+{
84022+ unsigned short i;
84023+
84024+ for (i = loc + 1; i < uid_used; i++)
84025+ uid_set[i - 1] = uid_set[i];
84026+
84027+ uid_used--;
84028+
84029+ return;
84030+}
84031+
84032+int
84033+gr_check_crash_uid(const kuid_t kuid)
84034+{
84035+ int loc;
84036+ int ret = 0;
84037+ uid_t uid;
84038+
84039+ if (unlikely(!gr_acl_is_enabled()))
84040+ return 0;
84041+
84042+ uid = GR_GLOBAL_UID(kuid);
84043+
84044+ spin_lock(&gr_uid_lock);
84045+ loc = gr_find_uid(uid);
84046+
84047+ if (loc < 0)
84048+ goto out_unlock;
84049+
84050+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
84051+ gr_remove_uid(loc);
84052+ else
84053+ ret = 1;
84054+
84055+out_unlock:
84056+ spin_unlock(&gr_uid_lock);
84057+ return ret;
84058+}
84059+
84060+static int
84061+proc_is_setxid(const struct cred *cred)
84062+{
84063+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
84064+ !uid_eq(cred->uid, cred->fsuid))
84065+ return 1;
84066+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
84067+ !gid_eq(cred->gid, cred->fsgid))
84068+ return 1;
84069+
84070+ return 0;
84071+}
84072+
84073+extern int gr_fake_force_sig(int sig, struct task_struct *t);
84074+
84075+void
84076+gr_handle_crash(struct task_struct *task, const int sig)
84077+{
84078+ struct acl_subject_label *curr;
84079+ struct task_struct *tsk, *tsk2;
84080+ const struct cred *cred;
84081+ const struct cred *cred2;
84082+
84083+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
84084+ return;
84085+
84086+ if (unlikely(!gr_acl_is_enabled()))
84087+ return;
84088+
84089+ curr = task->acl;
84090+
84091+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
84092+ return;
84093+
84094+ if (time_before_eq(curr->expires, get_seconds())) {
84095+ curr->expires = 0;
84096+ curr->crashes = 0;
84097+ }
84098+
84099+ curr->crashes++;
84100+
84101+ if (!curr->expires)
84102+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
84103+
84104+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
84105+ time_after(curr->expires, get_seconds())) {
84106+ rcu_read_lock();
84107+ cred = __task_cred(task);
84108+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
84109+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
84110+ spin_lock(&gr_uid_lock);
84111+ gr_insert_uid(cred->uid, curr->expires);
84112+ spin_unlock(&gr_uid_lock);
84113+ curr->expires = 0;
84114+ curr->crashes = 0;
84115+ read_lock(&tasklist_lock);
84116+ do_each_thread(tsk2, tsk) {
84117+ cred2 = __task_cred(tsk);
84118+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
84119+ gr_fake_force_sig(SIGKILL, tsk);
84120+ } while_each_thread(tsk2, tsk);
84121+ read_unlock(&tasklist_lock);
84122+ } else {
84123+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
84124+ read_lock(&tasklist_lock);
84125+ read_lock(&grsec_exec_file_lock);
84126+ do_each_thread(tsk2, tsk) {
84127+ if (likely(tsk != task)) {
84128+ // if this thread has the same subject as the one that triggered
84129+ // RES_CRASH and it's the same binary, kill it
84130+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
84131+ gr_fake_force_sig(SIGKILL, tsk);
84132+ }
84133+ } while_each_thread(tsk2, tsk);
84134+ read_unlock(&grsec_exec_file_lock);
84135+ read_unlock(&tasklist_lock);
84136+ }
84137+ rcu_read_unlock();
84138+ }
84139+
84140+ return;
84141+}
84142+
84143+int
84144+gr_check_crash_exec(const struct file *filp)
84145+{
84146+ struct acl_subject_label *curr;
84147+ struct dentry *dentry;
84148+
84149+ if (unlikely(!gr_acl_is_enabled()))
84150+ return 0;
84151+
84152+ read_lock(&gr_inode_lock);
84153+ dentry = filp->f_path.dentry;
84154+ curr = lookup_acl_subj_label(__get_ino(dentry), __get_dev(dentry),
84155+ current->role);
84156+ read_unlock(&gr_inode_lock);
84157+
84158+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
84159+ (!curr->crashes && !curr->expires))
84160+ return 0;
84161+
84162+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
84163+ time_after(curr->expires, get_seconds()))
84164+ return 1;
84165+ else if (time_before_eq(curr->expires, get_seconds())) {
84166+ curr->crashes = 0;
84167+ curr->expires = 0;
84168+ }
84169+
84170+ return 0;
84171+}
84172+
84173+void
84174+gr_handle_alertkill(struct task_struct *task)
84175+{
84176+ struct acl_subject_label *curracl;
84177+ __u32 curr_ip;
84178+ struct task_struct *p, *p2;
84179+
84180+ if (unlikely(!gr_acl_is_enabled()))
84181+ return;
84182+
84183+ curracl = task->acl;
84184+ curr_ip = task->signal->curr_ip;
84185+
84186+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
84187+ read_lock(&tasklist_lock);
84188+ do_each_thread(p2, p) {
84189+ if (p->signal->curr_ip == curr_ip)
84190+ gr_fake_force_sig(SIGKILL, p);
84191+ } while_each_thread(p2, p);
84192+ read_unlock(&tasklist_lock);
84193+ } else if (curracl->mode & GR_KILLPROC)
84194+ gr_fake_force_sig(SIGKILL, task);
84195+
84196+ return;
84197+}
84198diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
84199new file mode 100644
84200index 0000000..6b0c9cc
84201--- /dev/null
84202+++ b/grsecurity/gracl_shm.c
84203@@ -0,0 +1,40 @@
84204+#include <linux/kernel.h>
84205+#include <linux/mm.h>
84206+#include <linux/sched.h>
84207+#include <linux/file.h>
84208+#include <linux/ipc.h>
84209+#include <linux/gracl.h>
84210+#include <linux/grsecurity.h>
84211+#include <linux/grinternal.h>
84212+
84213+int
84214+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84215+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
84216+{
84217+ struct task_struct *task;
84218+
84219+ if (!gr_acl_is_enabled())
84220+ return 1;
84221+
84222+ rcu_read_lock();
84223+ read_lock(&tasklist_lock);
84224+
84225+ task = find_task_by_vpid(shm_cprid);
84226+
84227+ if (unlikely(!task))
84228+ task = find_task_by_vpid(shm_lapid);
84229+
84230+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
84231+ (task_pid_nr(task) == shm_lapid)) &&
84232+ (task->acl->mode & GR_PROTSHM) &&
84233+ (task->acl != current->acl))) {
84234+ read_unlock(&tasklist_lock);
84235+ rcu_read_unlock();
84236+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
84237+ return 0;
84238+ }
84239+ read_unlock(&tasklist_lock);
84240+ rcu_read_unlock();
84241+
84242+ return 1;
84243+}
84244diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
84245new file mode 100644
84246index 0000000..bc0be01
84247--- /dev/null
84248+++ b/grsecurity/grsec_chdir.c
84249@@ -0,0 +1,19 @@
84250+#include <linux/kernel.h>
84251+#include <linux/sched.h>
84252+#include <linux/fs.h>
84253+#include <linux/file.h>
84254+#include <linux/grsecurity.h>
84255+#include <linux/grinternal.h>
84256+
84257+void
84258+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
84259+{
84260+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
84261+ if ((grsec_enable_chdir && grsec_enable_group &&
84262+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
84263+ !grsec_enable_group)) {
84264+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
84265+ }
84266+#endif
84267+ return;
84268+}
84269diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
84270new file mode 100644
84271index 0000000..114ea4f
84272--- /dev/null
84273+++ b/grsecurity/grsec_chroot.c
84274@@ -0,0 +1,467 @@
84275+#include <linux/kernel.h>
84276+#include <linux/module.h>
84277+#include <linux/sched.h>
84278+#include <linux/file.h>
84279+#include <linux/fs.h>
84280+#include <linux/mount.h>
84281+#include <linux/types.h>
84282+#include "../fs/mount.h"
84283+#include <linux/grsecurity.h>
84284+#include <linux/grinternal.h>
84285+
84286+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84287+int gr_init_ran;
84288+#endif
84289+
84290+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
84291+{
84292+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84293+ struct dentry *tmpd = dentry;
84294+
84295+ read_seqlock_excl(&mount_lock);
84296+ write_seqlock(&rename_lock);
84297+
84298+ while (tmpd != mnt->mnt_root) {
84299+ atomic_inc(&tmpd->chroot_refcnt);
84300+ tmpd = tmpd->d_parent;
84301+ }
84302+ atomic_inc(&tmpd->chroot_refcnt);
84303+
84304+ write_sequnlock(&rename_lock);
84305+ read_sequnlock_excl(&mount_lock);
84306+#endif
84307+}
84308+
84309+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
84310+{
84311+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84312+ struct dentry *tmpd = dentry;
84313+
84314+ read_seqlock_excl(&mount_lock);
84315+ write_seqlock(&rename_lock);
84316+
84317+ while (tmpd != mnt->mnt_root) {
84318+ atomic_dec(&tmpd->chroot_refcnt);
84319+ tmpd = tmpd->d_parent;
84320+ }
84321+ atomic_dec(&tmpd->chroot_refcnt);
84322+
84323+ write_sequnlock(&rename_lock);
84324+ read_sequnlock_excl(&mount_lock);
84325+#endif
84326+}
84327+
84328+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84329+static struct dentry *get_closest_chroot(struct dentry *dentry)
84330+{
84331+ write_seqlock(&rename_lock);
84332+ do {
84333+ if (atomic_read(&dentry->chroot_refcnt)) {
84334+ write_sequnlock(&rename_lock);
84335+ return dentry;
84336+ }
84337+ dentry = dentry->d_parent;
84338+ } while (!IS_ROOT(dentry));
84339+ write_sequnlock(&rename_lock);
84340+ return NULL;
84341+}
84342+#endif
84343+
84344+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
84345+ struct dentry *newdentry, struct vfsmount *newmnt)
84346+{
84347+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84348+ struct dentry *chroot;
84349+
84350+ if (unlikely(!grsec_enable_chroot_rename))
84351+ return 0;
84352+
84353+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
84354+ return 0;
84355+
84356+ chroot = get_closest_chroot(olddentry);
84357+
84358+ if (chroot == NULL)
84359+ return 0;
84360+
84361+ if (is_subdir(newdentry, chroot))
84362+ return 0;
84363+
84364+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
84365+
84366+ return 1;
84367+#else
84368+ return 0;
84369+#endif
84370+}
84371+
84372+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
84373+{
84374+#ifdef CONFIG_GRKERNSEC
84375+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
84376+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
84377+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84378+ && gr_init_ran
84379+#endif
84380+ )
84381+ task->gr_is_chrooted = 1;
84382+ else {
84383+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84384+ if (task_pid_nr(task) == 1 && !gr_init_ran)
84385+ gr_init_ran = 1;
84386+#endif
84387+ task->gr_is_chrooted = 0;
84388+ }
84389+
84390+ task->gr_chroot_dentry = path->dentry;
84391+#endif
84392+ return;
84393+}
84394+
84395+void gr_clear_chroot_entries(struct task_struct *task)
84396+{
84397+#ifdef CONFIG_GRKERNSEC
84398+ task->gr_is_chrooted = 0;
84399+ task->gr_chroot_dentry = NULL;
84400+#endif
84401+ return;
84402+}
84403+
84404+int
84405+gr_handle_chroot_unix(const pid_t pid)
84406+{
84407+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
84408+ struct task_struct *p;
84409+
84410+ if (unlikely(!grsec_enable_chroot_unix))
84411+ return 1;
84412+
84413+ if (likely(!proc_is_chrooted(current)))
84414+ return 1;
84415+
84416+ rcu_read_lock();
84417+ read_lock(&tasklist_lock);
84418+ p = find_task_by_vpid_unrestricted(pid);
84419+ if (unlikely(p && !have_same_root(current, p))) {
84420+ read_unlock(&tasklist_lock);
84421+ rcu_read_unlock();
84422+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
84423+ return 0;
84424+ }
84425+ read_unlock(&tasklist_lock);
84426+ rcu_read_unlock();
84427+#endif
84428+ return 1;
84429+}
84430+
84431+int
84432+gr_handle_chroot_nice(void)
84433+{
84434+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
84435+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
84436+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
84437+ return -EPERM;
84438+ }
84439+#endif
84440+ return 0;
84441+}
84442+
84443+int
84444+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
84445+{
84446+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
84447+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
84448+ && proc_is_chrooted(current)) {
84449+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
84450+ return -EACCES;
84451+ }
84452+#endif
84453+ return 0;
84454+}
84455+
84456+int
84457+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
84458+{
84459+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
84460+ struct task_struct *p;
84461+ int ret = 0;
84462+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
84463+ return ret;
84464+
84465+ read_lock(&tasklist_lock);
84466+ do_each_pid_task(pid, type, p) {
84467+ if (!have_same_root(current, p)) {
84468+ ret = 1;
84469+ goto out;
84470+ }
84471+ } while_each_pid_task(pid, type, p);
84472+out:
84473+ read_unlock(&tasklist_lock);
84474+ return ret;
84475+#endif
84476+ return 0;
84477+}
84478+
84479+int
84480+gr_pid_is_chrooted(struct task_struct *p)
84481+{
84482+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
84483+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
84484+ return 0;
84485+
84486+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
84487+ !have_same_root(current, p)) {
84488+ return 1;
84489+ }
84490+#endif
84491+ return 0;
84492+}
84493+
84494+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
84495+
84496+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
84497+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
84498+{
84499+ struct path path, currentroot;
84500+ int ret = 0;
84501+
84502+ path.dentry = (struct dentry *)u_dentry;
84503+ path.mnt = (struct vfsmount *)u_mnt;
84504+ get_fs_root(current->fs, &currentroot);
84505+ if (path_is_under(&path, &currentroot))
84506+ ret = 1;
84507+ path_put(&currentroot);
84508+
84509+ return ret;
84510+}
84511+#endif
84512+
84513+int
84514+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
84515+{
84516+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
84517+ if (!grsec_enable_chroot_fchdir)
84518+ return 1;
84519+
84520+ if (!proc_is_chrooted(current))
84521+ return 1;
84522+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
84523+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
84524+ return 0;
84525+ }
84526+#endif
84527+ return 1;
84528+}
84529+
84530+int
84531+gr_chroot_fhandle(void)
84532+{
84533+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
84534+ if (!grsec_enable_chroot_fchdir)
84535+ return 1;
84536+
84537+ if (!proc_is_chrooted(current))
84538+ return 1;
84539+ else {
84540+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
84541+ return 0;
84542+ }
84543+#endif
84544+ return 1;
84545+}
84546+
84547+int
84548+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84549+ const u64 shm_createtime)
84550+{
84551+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
84552+ struct task_struct *p;
84553+
84554+ if (unlikely(!grsec_enable_chroot_shmat))
84555+ return 1;
84556+
84557+ if (likely(!proc_is_chrooted(current)))
84558+ return 1;
84559+
84560+ rcu_read_lock();
84561+ read_lock(&tasklist_lock);
84562+
84563+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
84564+ if (time_before_eq64(p->start_time, shm_createtime)) {
84565+ if (have_same_root(current, p)) {
84566+ goto allow;
84567+ } else {
84568+ read_unlock(&tasklist_lock);
84569+ rcu_read_unlock();
84570+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
84571+ return 0;
84572+ }
84573+ }
84574+ /* creator exited, pid reuse, fall through to next check */
84575+ }
84576+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
84577+ if (unlikely(!have_same_root(current, p))) {
84578+ read_unlock(&tasklist_lock);
84579+ rcu_read_unlock();
84580+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
84581+ return 0;
84582+ }
84583+ }
84584+
84585+allow:
84586+ read_unlock(&tasklist_lock);
84587+ rcu_read_unlock();
84588+#endif
84589+ return 1;
84590+}
84591+
84592+void
84593+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
84594+{
84595+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
84596+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
84597+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
84598+#endif
84599+ return;
84600+}
84601+
84602+int
84603+gr_handle_chroot_mknod(const struct dentry *dentry,
84604+ const struct vfsmount *mnt, const int mode)
84605+{
84606+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
84607+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
84608+ proc_is_chrooted(current)) {
84609+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
84610+ return -EPERM;
84611+ }
84612+#endif
84613+ return 0;
84614+}
84615+
84616+int
84617+gr_handle_chroot_mount(const struct dentry *dentry,
84618+ const struct vfsmount *mnt, const char *dev_name)
84619+{
84620+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
84621+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
84622+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
84623+ return -EPERM;
84624+ }
84625+#endif
84626+ return 0;
84627+}
84628+
84629+int
84630+gr_handle_chroot_pivot(void)
84631+{
84632+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
84633+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
84634+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
84635+ return -EPERM;
84636+ }
84637+#endif
84638+ return 0;
84639+}
84640+
84641+int
84642+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
84643+{
84644+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
84645+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
84646+ !gr_is_outside_chroot(dentry, mnt)) {
84647+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
84648+ return -EPERM;
84649+ }
84650+#endif
84651+ return 0;
84652+}
84653+
84654+extern const char *captab_log[];
84655+extern int captab_log_entries;
84656+
84657+int
84658+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
84659+{
84660+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84661+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
84662+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
84663+ if (cap_raised(chroot_caps, cap)) {
84664+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
84665+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
84666+ }
84667+ return 0;
84668+ }
84669+ }
84670+#endif
84671+ return 1;
84672+}
84673+
84674+int
84675+gr_chroot_is_capable(const int cap)
84676+{
84677+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84678+ return gr_task_chroot_is_capable(current, current_cred(), cap);
84679+#endif
84680+ return 1;
84681+}
84682+
84683+int
84684+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
84685+{
84686+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84687+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
84688+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
84689+ if (cap_raised(chroot_caps, cap)) {
84690+ return 0;
84691+ }
84692+ }
84693+#endif
84694+ return 1;
84695+}
84696+
84697+int
84698+gr_chroot_is_capable_nolog(const int cap)
84699+{
84700+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84701+ return gr_task_chroot_is_capable_nolog(current, cap);
84702+#endif
84703+ return 1;
84704+}
84705+
84706+int
84707+gr_handle_chroot_sysctl(const int op)
84708+{
84709+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
84710+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
84711+ proc_is_chrooted(current))
84712+ return -EACCES;
84713+#endif
84714+ return 0;
84715+}
84716+
84717+void
84718+gr_handle_chroot_chdir(const struct path *path)
84719+{
84720+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
84721+ if (grsec_enable_chroot_chdir)
84722+ set_fs_pwd(current->fs, path);
84723+#endif
84724+ return;
84725+}
84726+
84727+int
84728+gr_handle_chroot_chmod(const struct dentry *dentry,
84729+ const struct vfsmount *mnt, const int mode)
84730+{
84731+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
84732+ /* allow chmod +s on directories, but not files */
84733+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
84734+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
84735+ proc_is_chrooted(current)) {
84736+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
84737+ return -EPERM;
84738+ }
84739+#endif
84740+ return 0;
84741+}
84742diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
84743new file mode 100644
84744index 0000000..946f750
84745--- /dev/null
84746+++ b/grsecurity/grsec_disabled.c
84747@@ -0,0 +1,445 @@
84748+#include <linux/kernel.h>
84749+#include <linux/module.h>
84750+#include <linux/sched.h>
84751+#include <linux/file.h>
84752+#include <linux/fs.h>
84753+#include <linux/kdev_t.h>
84754+#include <linux/net.h>
84755+#include <linux/in.h>
84756+#include <linux/ip.h>
84757+#include <linux/skbuff.h>
84758+#include <linux/sysctl.h>
84759+
84760+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
84761+void
84762+pax_set_initial_flags(struct linux_binprm *bprm)
84763+{
84764+ return;
84765+}
84766+#endif
84767+
84768+#ifdef CONFIG_SYSCTL
84769+__u32
84770+gr_handle_sysctl(const struct ctl_table * table, const int op)
84771+{
84772+ return 0;
84773+}
84774+#endif
84775+
84776+#ifdef CONFIG_TASKSTATS
84777+int gr_is_taskstats_denied(int pid)
84778+{
84779+ return 0;
84780+}
84781+#endif
84782+
84783+int
84784+gr_acl_is_enabled(void)
84785+{
84786+ return 0;
84787+}
84788+
84789+int
84790+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
84791+{
84792+ return 0;
84793+}
84794+
84795+void
84796+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
84797+{
84798+ return;
84799+}
84800+
84801+int
84802+gr_handle_rawio(const struct inode *inode)
84803+{
84804+ return 0;
84805+}
84806+
84807+void
84808+gr_acl_handle_psacct(struct task_struct *task, const long code)
84809+{
84810+ return;
84811+}
84812+
84813+int
84814+gr_handle_ptrace(struct task_struct *task, const long request)
84815+{
84816+ return 0;
84817+}
84818+
84819+int
84820+gr_handle_proc_ptrace(struct task_struct *task)
84821+{
84822+ return 0;
84823+}
84824+
84825+int
84826+gr_set_acls(const int type)
84827+{
84828+ return 0;
84829+}
84830+
84831+int
84832+gr_check_hidden_task(const struct task_struct *tsk)
84833+{
84834+ return 0;
84835+}
84836+
84837+int
84838+gr_check_protected_task(const struct task_struct *task)
84839+{
84840+ return 0;
84841+}
84842+
84843+int
84844+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
84845+{
84846+ return 0;
84847+}
84848+
84849+void
84850+gr_copy_label(struct task_struct *tsk)
84851+{
84852+ return;
84853+}
84854+
84855+void
84856+gr_set_pax_flags(struct task_struct *task)
84857+{
84858+ return;
84859+}
84860+
84861+int
84862+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
84863+ const int unsafe_share)
84864+{
84865+ return 0;
84866+}
84867+
84868+void
84869+gr_handle_delete(const u64 ino, const dev_t dev)
84870+{
84871+ return;
84872+}
84873+
84874+void
84875+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
84876+{
84877+ return;
84878+}
84879+
84880+void
84881+gr_handle_crash(struct task_struct *task, const int sig)
84882+{
84883+ return;
84884+}
84885+
84886+int
84887+gr_check_crash_exec(const struct file *filp)
84888+{
84889+ return 0;
84890+}
84891+
84892+int
84893+gr_check_crash_uid(const kuid_t uid)
84894+{
84895+ return 0;
84896+}
84897+
84898+void
84899+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
84900+ struct dentry *old_dentry,
84901+ struct dentry *new_dentry,
84902+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
84903+{
84904+ return;
84905+}
84906+
84907+int
84908+gr_search_socket(const int family, const int type, const int protocol)
84909+{
84910+ return 1;
84911+}
84912+
84913+int
84914+gr_search_connectbind(const int mode, const struct socket *sock,
84915+ const struct sockaddr_in *addr)
84916+{
84917+ return 0;
84918+}
84919+
84920+void
84921+gr_handle_alertkill(struct task_struct *task)
84922+{
84923+ return;
84924+}
84925+
84926+__u32
84927+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
84928+{
84929+ return 1;
84930+}
84931+
84932+__u32
84933+gr_acl_handle_hidden_file(const struct dentry * dentry,
84934+ const struct vfsmount * mnt)
84935+{
84936+ return 1;
84937+}
84938+
84939+__u32
84940+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
84941+ int acc_mode)
84942+{
84943+ return 1;
84944+}
84945+
84946+__u32
84947+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
84948+{
84949+ return 1;
84950+}
84951+
84952+__u32
84953+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
84954+{
84955+ return 1;
84956+}
84957+
84958+int
84959+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
84960+ unsigned int *vm_flags)
84961+{
84962+ return 1;
84963+}
84964+
84965+__u32
84966+gr_acl_handle_truncate(const struct dentry * dentry,
84967+ const struct vfsmount * mnt)
84968+{
84969+ return 1;
84970+}
84971+
84972+__u32
84973+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
84974+{
84975+ return 1;
84976+}
84977+
84978+__u32
84979+gr_acl_handle_access(const struct dentry * dentry,
84980+ const struct vfsmount * mnt, const int fmode)
84981+{
84982+ return 1;
84983+}
84984+
84985+__u32
84986+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
84987+ umode_t *mode)
84988+{
84989+ return 1;
84990+}
84991+
84992+__u32
84993+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
84994+{
84995+ return 1;
84996+}
84997+
84998+__u32
84999+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
85000+{
85001+ return 1;
85002+}
85003+
85004+__u32
85005+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
85006+{
85007+ return 1;
85008+}
85009+
85010+void
85011+grsecurity_init(void)
85012+{
85013+ return;
85014+}
85015+
85016+umode_t gr_acl_umask(void)
85017+{
85018+ return 0;
85019+}
85020+
85021+__u32
85022+gr_acl_handle_mknod(const struct dentry * new_dentry,
85023+ const struct dentry * parent_dentry,
85024+ const struct vfsmount * parent_mnt,
85025+ const int mode)
85026+{
85027+ return 1;
85028+}
85029+
85030+__u32
85031+gr_acl_handle_mkdir(const struct dentry * new_dentry,
85032+ const struct dentry * parent_dentry,
85033+ const struct vfsmount * parent_mnt)
85034+{
85035+ return 1;
85036+}
85037+
85038+__u32
85039+gr_acl_handle_symlink(const struct dentry * new_dentry,
85040+ const struct dentry * parent_dentry,
85041+ const struct vfsmount * parent_mnt, const struct filename *from)
85042+{
85043+ return 1;
85044+}
85045+
85046+__u32
85047+gr_acl_handle_link(const struct dentry * new_dentry,
85048+ const struct dentry * parent_dentry,
85049+ const struct vfsmount * parent_mnt,
85050+ const struct dentry * old_dentry,
85051+ const struct vfsmount * old_mnt, const struct filename *to)
85052+{
85053+ return 1;
85054+}
85055+
85056+int
85057+gr_acl_handle_rename(const struct dentry *new_dentry,
85058+ const struct dentry *parent_dentry,
85059+ const struct vfsmount *parent_mnt,
85060+ const struct dentry *old_dentry,
85061+ const struct inode *old_parent_inode,
85062+ const struct vfsmount *old_mnt, const struct filename *newname,
85063+ unsigned int flags)
85064+{
85065+ return 0;
85066+}
85067+
85068+int
85069+gr_acl_handle_filldir(const struct file *file, const char *name,
85070+ const int namelen, const u64 ino)
85071+{
85072+ return 1;
85073+}
85074+
85075+int
85076+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
85077+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
85078+{
85079+ return 1;
85080+}
85081+
85082+int
85083+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
85084+{
85085+ return 0;
85086+}
85087+
85088+int
85089+gr_search_accept(const struct socket *sock)
85090+{
85091+ return 0;
85092+}
85093+
85094+int
85095+gr_search_listen(const struct socket *sock)
85096+{
85097+ return 0;
85098+}
85099+
85100+int
85101+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
85102+{
85103+ return 0;
85104+}
85105+
85106+__u32
85107+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
85108+{
85109+ return 1;
85110+}
85111+
85112+__u32
85113+gr_acl_handle_creat(const struct dentry * dentry,
85114+ const struct dentry * p_dentry,
85115+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
85116+ const int imode)
85117+{
85118+ return 1;
85119+}
85120+
85121+void
85122+gr_acl_handle_exit(void)
85123+{
85124+ return;
85125+}
85126+
85127+int
85128+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
85129+{
85130+ return 1;
85131+}
85132+
85133+void
85134+gr_set_role_label(const kuid_t uid, const kgid_t gid)
85135+{
85136+ return;
85137+}
85138+
85139+int
85140+gr_acl_handle_procpidmem(const struct task_struct *task)
85141+{
85142+ return 0;
85143+}
85144+
85145+int
85146+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
85147+{
85148+ return 0;
85149+}
85150+
85151+int
85152+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
85153+{
85154+ return 0;
85155+}
85156+
85157+int
85158+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
85159+{
85160+ return 0;
85161+}
85162+
85163+int
85164+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
85165+{
85166+ return 0;
85167+}
85168+
85169+int gr_acl_enable_at_secure(void)
85170+{
85171+ return 0;
85172+}
85173+
85174+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
85175+{
85176+ return dentry->d_sb->s_dev;
85177+}
85178+
85179+u64 gr_get_ino_from_dentry(struct dentry *dentry)
85180+{
85181+ return dentry->d_inode->i_ino;
85182+}
85183+
85184+void gr_put_exec_file(struct task_struct *task)
85185+{
85186+ return;
85187+}
85188+
85189+#ifdef CONFIG_SECURITY
85190+EXPORT_SYMBOL_GPL(gr_check_user_change);
85191+EXPORT_SYMBOL_GPL(gr_check_group_change);
85192+#endif
85193diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
85194new file mode 100644
85195index 0000000..fb7531e
85196--- /dev/null
85197+++ b/grsecurity/grsec_exec.c
85198@@ -0,0 +1,189 @@
85199+#include <linux/kernel.h>
85200+#include <linux/sched.h>
85201+#include <linux/file.h>
85202+#include <linux/binfmts.h>
85203+#include <linux/fs.h>
85204+#include <linux/types.h>
85205+#include <linux/grdefs.h>
85206+#include <linux/grsecurity.h>
85207+#include <linux/grinternal.h>
85208+#include <linux/capability.h>
85209+#include <linux/module.h>
85210+#include <linux/compat.h>
85211+
85212+#include <asm/uaccess.h>
85213+
85214+#ifdef CONFIG_GRKERNSEC_EXECLOG
85215+static char gr_exec_arg_buf[132];
85216+static DEFINE_MUTEX(gr_exec_arg_mutex);
85217+#endif
85218+
85219+struct user_arg_ptr {
85220+#ifdef CONFIG_COMPAT
85221+ bool is_compat;
85222+#endif
85223+ union {
85224+ const char __user *const __user *native;
85225+#ifdef CONFIG_COMPAT
85226+ const compat_uptr_t __user *compat;
85227+#endif
85228+ } ptr;
85229+};
85230+
85231+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
85232+
85233+void
85234+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
85235+{
85236+#ifdef CONFIG_GRKERNSEC_EXECLOG
85237+ char *grarg = gr_exec_arg_buf;
85238+ unsigned int i, x, execlen = 0;
85239+ char c;
85240+
85241+ if (!((grsec_enable_execlog && grsec_enable_group &&
85242+ in_group_p(grsec_audit_gid))
85243+ || (grsec_enable_execlog && !grsec_enable_group)))
85244+ return;
85245+
85246+ mutex_lock(&gr_exec_arg_mutex);
85247+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
85248+
85249+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
85250+ const char __user *p;
85251+ unsigned int len;
85252+
85253+ p = get_user_arg_ptr(argv, i);
85254+ if (IS_ERR(p))
85255+ goto log;
85256+
85257+ len = strnlen_user(p, 128 - execlen);
85258+ if (len > 128 - execlen)
85259+ len = 128 - execlen;
85260+ else if (len > 0)
85261+ len--;
85262+ if (copy_from_user(grarg + execlen, p, len))
85263+ goto log;
85264+
85265+ /* rewrite unprintable characters */
85266+ for (x = 0; x < len; x++) {
85267+ c = *(grarg + execlen + x);
85268+ if (c < 32 || c > 126)
85269+ *(grarg + execlen + x) = ' ';
85270+ }
85271+
85272+ execlen += len;
85273+ *(grarg + execlen) = ' ';
85274+ *(grarg + execlen + 1) = '\0';
85275+ execlen++;
85276+ }
85277+
85278+ log:
85279+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
85280+ bprm->file->f_path.mnt, grarg);
85281+ mutex_unlock(&gr_exec_arg_mutex);
85282+#endif
85283+ return;
85284+}
85285+
85286+#ifdef CONFIG_GRKERNSEC
85287+extern int gr_acl_is_capable(const int cap);
85288+extern int gr_acl_is_capable_nolog(const int cap);
85289+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
85290+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
85291+extern int gr_chroot_is_capable(const int cap);
85292+extern int gr_chroot_is_capable_nolog(const int cap);
85293+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
85294+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
85295+#endif
85296+
85297+const char *captab_log[] = {
85298+ "CAP_CHOWN",
85299+ "CAP_DAC_OVERRIDE",
85300+ "CAP_DAC_READ_SEARCH",
85301+ "CAP_FOWNER",
85302+ "CAP_FSETID",
85303+ "CAP_KILL",
85304+ "CAP_SETGID",
85305+ "CAP_SETUID",
85306+ "CAP_SETPCAP",
85307+ "CAP_LINUX_IMMUTABLE",
85308+ "CAP_NET_BIND_SERVICE",
85309+ "CAP_NET_BROADCAST",
85310+ "CAP_NET_ADMIN",
85311+ "CAP_NET_RAW",
85312+ "CAP_IPC_LOCK",
85313+ "CAP_IPC_OWNER",
85314+ "CAP_SYS_MODULE",
85315+ "CAP_SYS_RAWIO",
85316+ "CAP_SYS_CHROOT",
85317+ "CAP_SYS_PTRACE",
85318+ "CAP_SYS_PACCT",
85319+ "CAP_SYS_ADMIN",
85320+ "CAP_SYS_BOOT",
85321+ "CAP_SYS_NICE",
85322+ "CAP_SYS_RESOURCE",
85323+ "CAP_SYS_TIME",
85324+ "CAP_SYS_TTY_CONFIG",
85325+ "CAP_MKNOD",
85326+ "CAP_LEASE",
85327+ "CAP_AUDIT_WRITE",
85328+ "CAP_AUDIT_CONTROL",
85329+ "CAP_SETFCAP",
85330+ "CAP_MAC_OVERRIDE",
85331+ "CAP_MAC_ADMIN",
85332+ "CAP_SYSLOG",
85333+ "CAP_WAKE_ALARM",
85334+ "CAP_BLOCK_SUSPEND",
85335+ "CAP_AUDIT_READ"
85336+};
85337+
85338+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
85339+
85340+int gr_is_capable(const int cap)
85341+{
85342+#ifdef CONFIG_GRKERNSEC
85343+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
85344+ return 1;
85345+ return 0;
85346+#else
85347+ return 1;
85348+#endif
85349+}
85350+
85351+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
85352+{
85353+#ifdef CONFIG_GRKERNSEC
85354+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
85355+ return 1;
85356+ return 0;
85357+#else
85358+ return 1;
85359+#endif
85360+}
85361+
85362+int gr_is_capable_nolog(const int cap)
85363+{
85364+#ifdef CONFIG_GRKERNSEC
85365+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
85366+ return 1;
85367+ return 0;
85368+#else
85369+ return 1;
85370+#endif
85371+}
85372+
85373+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
85374+{
85375+#ifdef CONFIG_GRKERNSEC
85376+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
85377+ return 1;
85378+ return 0;
85379+#else
85380+ return 1;
85381+#endif
85382+}
85383+
85384+EXPORT_SYMBOL_GPL(gr_is_capable);
85385+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
85386+EXPORT_SYMBOL_GPL(gr_task_is_capable);
85387+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
85388diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
85389new file mode 100644
85390index 0000000..06cc6ea
85391--- /dev/null
85392+++ b/grsecurity/grsec_fifo.c
85393@@ -0,0 +1,24 @@
85394+#include <linux/kernel.h>
85395+#include <linux/sched.h>
85396+#include <linux/fs.h>
85397+#include <linux/file.h>
85398+#include <linux/grinternal.h>
85399+
85400+int
85401+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
85402+ const struct dentry *dir, const int flag, const int acc_mode)
85403+{
85404+#ifdef CONFIG_GRKERNSEC_FIFO
85405+ const struct cred *cred = current_cred();
85406+
85407+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
85408+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
85409+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
85410+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
85411+ if (!inode_permission(dentry->d_inode, acc_mode))
85412+ 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));
85413+ return -EACCES;
85414+ }
85415+#endif
85416+ return 0;
85417+}
85418diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
85419new file mode 100644
85420index 0000000..8ca18bf
85421--- /dev/null
85422+++ b/grsecurity/grsec_fork.c
85423@@ -0,0 +1,23 @@
85424+#include <linux/kernel.h>
85425+#include <linux/sched.h>
85426+#include <linux/grsecurity.h>
85427+#include <linux/grinternal.h>
85428+#include <linux/errno.h>
85429+
85430+void
85431+gr_log_forkfail(const int retval)
85432+{
85433+#ifdef CONFIG_GRKERNSEC_FORKFAIL
85434+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
85435+ switch (retval) {
85436+ case -EAGAIN:
85437+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
85438+ break;
85439+ case -ENOMEM:
85440+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
85441+ break;
85442+ }
85443+ }
85444+#endif
85445+ return;
85446+}
85447diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
85448new file mode 100644
85449index 0000000..4ed9e7d
85450--- /dev/null
85451+++ b/grsecurity/grsec_init.c
85452@@ -0,0 +1,290 @@
85453+#include <linux/kernel.h>
85454+#include <linux/sched.h>
85455+#include <linux/mm.h>
85456+#include <linux/gracl.h>
85457+#include <linux/slab.h>
85458+#include <linux/vmalloc.h>
85459+#include <linux/percpu.h>
85460+#include <linux/module.h>
85461+
85462+int grsec_enable_ptrace_readexec;
85463+int grsec_enable_setxid;
85464+int grsec_enable_symlinkown;
85465+kgid_t grsec_symlinkown_gid;
85466+int grsec_enable_brute;
85467+int grsec_enable_link;
85468+int grsec_enable_dmesg;
85469+int grsec_enable_harden_ptrace;
85470+int grsec_enable_harden_ipc;
85471+int grsec_enable_fifo;
85472+int grsec_enable_execlog;
85473+int grsec_enable_signal;
85474+int grsec_enable_forkfail;
85475+int grsec_enable_audit_ptrace;
85476+int grsec_enable_time;
85477+int grsec_enable_group;
85478+kgid_t grsec_audit_gid;
85479+int grsec_enable_chdir;
85480+int grsec_enable_mount;
85481+int grsec_enable_rofs;
85482+int grsec_deny_new_usb;
85483+int grsec_enable_chroot_findtask;
85484+int grsec_enable_chroot_mount;
85485+int grsec_enable_chroot_shmat;
85486+int grsec_enable_chroot_fchdir;
85487+int grsec_enable_chroot_double;
85488+int grsec_enable_chroot_pivot;
85489+int grsec_enable_chroot_chdir;
85490+int grsec_enable_chroot_chmod;
85491+int grsec_enable_chroot_mknod;
85492+int grsec_enable_chroot_nice;
85493+int grsec_enable_chroot_execlog;
85494+int grsec_enable_chroot_caps;
85495+int grsec_enable_chroot_rename;
85496+int grsec_enable_chroot_sysctl;
85497+int grsec_enable_chroot_unix;
85498+int grsec_enable_tpe;
85499+kgid_t grsec_tpe_gid;
85500+int grsec_enable_blackhole;
85501+#ifdef CONFIG_IPV6_MODULE
85502+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
85503+#endif
85504+int grsec_lastack_retries;
85505+int grsec_enable_tpe_all;
85506+int grsec_enable_tpe_invert;
85507+int grsec_enable_socket_all;
85508+kgid_t grsec_socket_all_gid;
85509+int grsec_enable_socket_client;
85510+kgid_t grsec_socket_client_gid;
85511+int grsec_enable_socket_server;
85512+kgid_t grsec_socket_server_gid;
85513+int grsec_resource_logging;
85514+int grsec_disable_privio;
85515+int grsec_enable_log_rwxmaps;
85516+int grsec_lock;
85517+
85518+DEFINE_SPINLOCK(grsec_alert_lock);
85519+unsigned long grsec_alert_wtime = 0;
85520+unsigned long grsec_alert_fyet = 0;
85521+
85522+DEFINE_SPINLOCK(grsec_audit_lock);
85523+
85524+DEFINE_RWLOCK(grsec_exec_file_lock);
85525+
85526+char *gr_shared_page[4];
85527+
85528+char *gr_alert_log_fmt;
85529+char *gr_audit_log_fmt;
85530+char *gr_alert_log_buf;
85531+char *gr_audit_log_buf;
85532+
85533+extern struct gr_arg *gr_usermode;
85534+extern unsigned char *gr_system_salt;
85535+extern unsigned char *gr_system_sum;
85536+
85537+void __init
85538+grsecurity_init(void)
85539+{
85540+ int j;
85541+ /* create the per-cpu shared pages */
85542+
85543+#ifdef CONFIG_X86
85544+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
85545+#endif
85546+
85547+ for (j = 0; j < 4; j++) {
85548+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
85549+ if (gr_shared_page[j] == NULL) {
85550+ panic("Unable to allocate grsecurity shared page");
85551+ return;
85552+ }
85553+ }
85554+
85555+ /* allocate log buffers */
85556+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
85557+ if (!gr_alert_log_fmt) {
85558+ panic("Unable to allocate grsecurity alert log format buffer");
85559+ return;
85560+ }
85561+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
85562+ if (!gr_audit_log_fmt) {
85563+ panic("Unable to allocate grsecurity audit log format buffer");
85564+ return;
85565+ }
85566+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
85567+ if (!gr_alert_log_buf) {
85568+ panic("Unable to allocate grsecurity alert log buffer");
85569+ return;
85570+ }
85571+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
85572+ if (!gr_audit_log_buf) {
85573+ panic("Unable to allocate grsecurity audit log buffer");
85574+ return;
85575+ }
85576+
85577+ /* allocate memory for authentication structure */
85578+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
85579+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
85580+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
85581+
85582+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
85583+ panic("Unable to allocate grsecurity authentication structure");
85584+ return;
85585+ }
85586+
85587+#ifdef CONFIG_GRKERNSEC_IO
85588+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
85589+ grsec_disable_privio = 1;
85590+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
85591+ grsec_disable_privio = 1;
85592+#else
85593+ grsec_disable_privio = 0;
85594+#endif
85595+#endif
85596+
85597+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
85598+ /* for backward compatibility, tpe_invert always defaults to on if
85599+ enabled in the kernel
85600+ */
85601+ grsec_enable_tpe_invert = 1;
85602+#endif
85603+
85604+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
85605+#ifndef CONFIG_GRKERNSEC_SYSCTL
85606+ grsec_lock = 1;
85607+#endif
85608+
85609+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
85610+ grsec_enable_log_rwxmaps = 1;
85611+#endif
85612+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
85613+ grsec_enable_group = 1;
85614+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
85615+#endif
85616+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
85617+ grsec_enable_ptrace_readexec = 1;
85618+#endif
85619+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
85620+ grsec_enable_chdir = 1;
85621+#endif
85622+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
85623+ grsec_enable_harden_ptrace = 1;
85624+#endif
85625+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
85626+ grsec_enable_harden_ipc = 1;
85627+#endif
85628+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
85629+ grsec_enable_mount = 1;
85630+#endif
85631+#ifdef CONFIG_GRKERNSEC_LINK
85632+ grsec_enable_link = 1;
85633+#endif
85634+#ifdef CONFIG_GRKERNSEC_BRUTE
85635+ grsec_enable_brute = 1;
85636+#endif
85637+#ifdef CONFIG_GRKERNSEC_DMESG
85638+ grsec_enable_dmesg = 1;
85639+#endif
85640+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
85641+ grsec_enable_blackhole = 1;
85642+ grsec_lastack_retries = 4;
85643+#endif
85644+#ifdef CONFIG_GRKERNSEC_FIFO
85645+ grsec_enable_fifo = 1;
85646+#endif
85647+#ifdef CONFIG_GRKERNSEC_EXECLOG
85648+ grsec_enable_execlog = 1;
85649+#endif
85650+#ifdef CONFIG_GRKERNSEC_SETXID
85651+ grsec_enable_setxid = 1;
85652+#endif
85653+#ifdef CONFIG_GRKERNSEC_SIGNAL
85654+ grsec_enable_signal = 1;
85655+#endif
85656+#ifdef CONFIG_GRKERNSEC_FORKFAIL
85657+ grsec_enable_forkfail = 1;
85658+#endif
85659+#ifdef CONFIG_GRKERNSEC_TIME
85660+ grsec_enable_time = 1;
85661+#endif
85662+#ifdef CONFIG_GRKERNSEC_RESLOG
85663+ grsec_resource_logging = 1;
85664+#endif
85665+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
85666+ grsec_enable_chroot_findtask = 1;
85667+#endif
85668+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
85669+ grsec_enable_chroot_unix = 1;
85670+#endif
85671+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
85672+ grsec_enable_chroot_mount = 1;
85673+#endif
85674+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
85675+ grsec_enable_chroot_fchdir = 1;
85676+#endif
85677+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
85678+ grsec_enable_chroot_shmat = 1;
85679+#endif
85680+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
85681+ grsec_enable_audit_ptrace = 1;
85682+#endif
85683+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
85684+ grsec_enable_chroot_double = 1;
85685+#endif
85686+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
85687+ grsec_enable_chroot_pivot = 1;
85688+#endif
85689+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
85690+ grsec_enable_chroot_chdir = 1;
85691+#endif
85692+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
85693+ grsec_enable_chroot_chmod = 1;
85694+#endif
85695+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
85696+ grsec_enable_chroot_mknod = 1;
85697+#endif
85698+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
85699+ grsec_enable_chroot_nice = 1;
85700+#endif
85701+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
85702+ grsec_enable_chroot_execlog = 1;
85703+#endif
85704+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
85705+ grsec_enable_chroot_caps = 1;
85706+#endif
85707+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
85708+ grsec_enable_chroot_rename = 1;
85709+#endif
85710+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
85711+ grsec_enable_chroot_sysctl = 1;
85712+#endif
85713+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
85714+ grsec_enable_symlinkown = 1;
85715+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
85716+#endif
85717+#ifdef CONFIG_GRKERNSEC_TPE
85718+ grsec_enable_tpe = 1;
85719+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
85720+#ifdef CONFIG_GRKERNSEC_TPE_ALL
85721+ grsec_enable_tpe_all = 1;
85722+#endif
85723+#endif
85724+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
85725+ grsec_enable_socket_all = 1;
85726+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
85727+#endif
85728+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
85729+ grsec_enable_socket_client = 1;
85730+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
85731+#endif
85732+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
85733+ grsec_enable_socket_server = 1;
85734+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
85735+#endif
85736+#endif
85737+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
85738+ grsec_deny_new_usb = 1;
85739+#endif
85740+
85741+ return;
85742+}
85743diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
85744new file mode 100644
85745index 0000000..1773300
85746--- /dev/null
85747+++ b/grsecurity/grsec_ipc.c
85748@@ -0,0 +1,48 @@
85749+#include <linux/kernel.h>
85750+#include <linux/mm.h>
85751+#include <linux/sched.h>
85752+#include <linux/file.h>
85753+#include <linux/ipc.h>
85754+#include <linux/ipc_namespace.h>
85755+#include <linux/grsecurity.h>
85756+#include <linux/grinternal.h>
85757+
85758+int
85759+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
85760+{
85761+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
85762+ int write;
85763+ int orig_granted_mode;
85764+ kuid_t euid;
85765+ kgid_t egid;
85766+
85767+ if (!grsec_enable_harden_ipc)
85768+ return 1;
85769+
85770+ euid = current_euid();
85771+ egid = current_egid();
85772+
85773+ write = requested_mode & 00002;
85774+ orig_granted_mode = ipcp->mode;
85775+
85776+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
85777+ orig_granted_mode >>= 6;
85778+ else {
85779+ /* if likely wrong permissions, lock to user */
85780+ if (orig_granted_mode & 0007)
85781+ orig_granted_mode = 0;
85782+ /* otherwise do a egid-only check */
85783+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
85784+ orig_granted_mode >>= 3;
85785+ /* otherwise, no access */
85786+ else
85787+ orig_granted_mode = 0;
85788+ }
85789+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
85790+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
85791+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
85792+ return 0;
85793+ }
85794+#endif
85795+ return 1;
85796+}
85797diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
85798new file mode 100644
85799index 0000000..5e05e20
85800--- /dev/null
85801+++ b/grsecurity/grsec_link.c
85802@@ -0,0 +1,58 @@
85803+#include <linux/kernel.h>
85804+#include <linux/sched.h>
85805+#include <linux/fs.h>
85806+#include <linux/file.h>
85807+#include <linux/grinternal.h>
85808+
85809+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
85810+{
85811+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
85812+ const struct inode *link_inode = link->dentry->d_inode;
85813+
85814+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
85815+ /* ignore root-owned links, e.g. /proc/self */
85816+ gr_is_global_nonroot(link_inode->i_uid) && target &&
85817+ !uid_eq(link_inode->i_uid, target->i_uid)) {
85818+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
85819+ return 1;
85820+ }
85821+#endif
85822+ return 0;
85823+}
85824+
85825+int
85826+gr_handle_follow_link(const struct inode *parent,
85827+ const struct inode *inode,
85828+ const struct dentry *dentry, const struct vfsmount *mnt)
85829+{
85830+#ifdef CONFIG_GRKERNSEC_LINK
85831+ const struct cred *cred = current_cred();
85832+
85833+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
85834+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
85835+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
85836+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
85837+ return -EACCES;
85838+ }
85839+#endif
85840+ return 0;
85841+}
85842+
85843+int
85844+gr_handle_hardlink(const struct dentry *dentry,
85845+ const struct vfsmount *mnt,
85846+ struct inode *inode, const int mode, const struct filename *to)
85847+{
85848+#ifdef CONFIG_GRKERNSEC_LINK
85849+ const struct cred *cred = current_cred();
85850+
85851+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
85852+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
85853+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
85854+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
85855+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
85856+ return -EPERM;
85857+ }
85858+#endif
85859+ return 0;
85860+}
85861diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
85862new file mode 100644
85863index 0000000..dbe0a6b
85864--- /dev/null
85865+++ b/grsecurity/grsec_log.c
85866@@ -0,0 +1,341 @@
85867+#include <linux/kernel.h>
85868+#include <linux/sched.h>
85869+#include <linux/file.h>
85870+#include <linux/tty.h>
85871+#include <linux/fs.h>
85872+#include <linux/mm.h>
85873+#include <linux/grinternal.h>
85874+
85875+#ifdef CONFIG_TREE_PREEMPT_RCU
85876+#define DISABLE_PREEMPT() preempt_disable()
85877+#define ENABLE_PREEMPT() preempt_enable()
85878+#else
85879+#define DISABLE_PREEMPT()
85880+#define ENABLE_PREEMPT()
85881+#endif
85882+
85883+#define BEGIN_LOCKS(x) \
85884+ DISABLE_PREEMPT(); \
85885+ rcu_read_lock(); \
85886+ read_lock(&tasklist_lock); \
85887+ read_lock(&grsec_exec_file_lock); \
85888+ if (x != GR_DO_AUDIT) \
85889+ spin_lock(&grsec_alert_lock); \
85890+ else \
85891+ spin_lock(&grsec_audit_lock)
85892+
85893+#define END_LOCKS(x) \
85894+ if (x != GR_DO_AUDIT) \
85895+ spin_unlock(&grsec_alert_lock); \
85896+ else \
85897+ spin_unlock(&grsec_audit_lock); \
85898+ read_unlock(&grsec_exec_file_lock); \
85899+ read_unlock(&tasklist_lock); \
85900+ rcu_read_unlock(); \
85901+ ENABLE_PREEMPT(); \
85902+ if (x == GR_DONT_AUDIT) \
85903+ gr_handle_alertkill(current)
85904+
85905+enum {
85906+ FLOODING,
85907+ NO_FLOODING
85908+};
85909+
85910+extern char *gr_alert_log_fmt;
85911+extern char *gr_audit_log_fmt;
85912+extern char *gr_alert_log_buf;
85913+extern char *gr_audit_log_buf;
85914+
85915+static int gr_log_start(int audit)
85916+{
85917+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
85918+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
85919+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85920+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
85921+ unsigned long curr_secs = get_seconds();
85922+
85923+ if (audit == GR_DO_AUDIT)
85924+ goto set_fmt;
85925+
85926+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
85927+ grsec_alert_wtime = curr_secs;
85928+ grsec_alert_fyet = 0;
85929+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
85930+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
85931+ grsec_alert_fyet++;
85932+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
85933+ grsec_alert_wtime = curr_secs;
85934+ grsec_alert_fyet++;
85935+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
85936+ return FLOODING;
85937+ }
85938+ else return FLOODING;
85939+
85940+set_fmt:
85941+#endif
85942+ memset(buf, 0, PAGE_SIZE);
85943+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
85944+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
85945+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
85946+ } else if (current->signal->curr_ip) {
85947+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
85948+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
85949+ } else if (gr_acl_is_enabled()) {
85950+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
85951+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
85952+ } else {
85953+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
85954+ strcpy(buf, fmt);
85955+ }
85956+
85957+ return NO_FLOODING;
85958+}
85959+
85960+static void gr_log_middle(int audit, const char *msg, va_list ap)
85961+ __attribute__ ((format (printf, 2, 0)));
85962+
85963+static void gr_log_middle(int audit, const char *msg, va_list ap)
85964+{
85965+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85966+ unsigned int len = strlen(buf);
85967+
85968+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
85969+
85970+ return;
85971+}
85972+
85973+static void gr_log_middle_varargs(int audit, const char *msg, ...)
85974+ __attribute__ ((format (printf, 2, 3)));
85975+
85976+static void gr_log_middle_varargs(int audit, const char *msg, ...)
85977+{
85978+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85979+ unsigned int len = strlen(buf);
85980+ va_list ap;
85981+
85982+ va_start(ap, msg);
85983+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
85984+ va_end(ap);
85985+
85986+ return;
85987+}
85988+
85989+static void gr_log_end(int audit, int append_default)
85990+{
85991+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85992+ if (append_default) {
85993+ struct task_struct *task = current;
85994+ struct task_struct *parent = task->real_parent;
85995+ const struct cred *cred = __task_cred(task);
85996+ const struct cred *pcred = __task_cred(parent);
85997+ unsigned int len = strlen(buf);
85998+
85999+ 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));
86000+ }
86001+
86002+ printk("%s\n", buf);
86003+
86004+ return;
86005+}
86006+
86007+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
86008+{
86009+ int logtype;
86010+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
86011+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
86012+ void *voidptr = NULL;
86013+ int num1 = 0, num2 = 0;
86014+ unsigned long ulong1 = 0, ulong2 = 0;
86015+ struct dentry *dentry = NULL;
86016+ struct vfsmount *mnt = NULL;
86017+ struct file *file = NULL;
86018+ struct task_struct *task = NULL;
86019+ struct vm_area_struct *vma = NULL;
86020+ const struct cred *cred, *pcred;
86021+ va_list ap;
86022+
86023+ BEGIN_LOCKS(audit);
86024+ logtype = gr_log_start(audit);
86025+ if (logtype == FLOODING) {
86026+ END_LOCKS(audit);
86027+ return;
86028+ }
86029+ va_start(ap, argtypes);
86030+ switch (argtypes) {
86031+ case GR_TTYSNIFF:
86032+ task = va_arg(ap, struct task_struct *);
86033+ 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));
86034+ break;
86035+ case GR_SYSCTL_HIDDEN:
86036+ str1 = va_arg(ap, char *);
86037+ gr_log_middle_varargs(audit, msg, result, str1);
86038+ break;
86039+ case GR_RBAC:
86040+ dentry = va_arg(ap, struct dentry *);
86041+ mnt = va_arg(ap, struct vfsmount *);
86042+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
86043+ break;
86044+ case GR_RBAC_STR:
86045+ dentry = va_arg(ap, struct dentry *);
86046+ mnt = va_arg(ap, struct vfsmount *);
86047+ str1 = va_arg(ap, char *);
86048+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
86049+ break;
86050+ case GR_STR_RBAC:
86051+ str1 = va_arg(ap, char *);
86052+ dentry = va_arg(ap, struct dentry *);
86053+ mnt = va_arg(ap, struct vfsmount *);
86054+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
86055+ break;
86056+ case GR_RBAC_MODE2:
86057+ dentry = va_arg(ap, struct dentry *);
86058+ mnt = va_arg(ap, struct vfsmount *);
86059+ str1 = va_arg(ap, char *);
86060+ str2 = va_arg(ap, char *);
86061+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
86062+ break;
86063+ case GR_RBAC_MODE3:
86064+ dentry = va_arg(ap, struct dentry *);
86065+ mnt = va_arg(ap, struct vfsmount *);
86066+ str1 = va_arg(ap, char *);
86067+ str2 = va_arg(ap, char *);
86068+ str3 = va_arg(ap, char *);
86069+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
86070+ break;
86071+ case GR_FILENAME:
86072+ dentry = va_arg(ap, struct dentry *);
86073+ mnt = va_arg(ap, struct vfsmount *);
86074+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
86075+ break;
86076+ case GR_STR_FILENAME:
86077+ str1 = va_arg(ap, char *);
86078+ dentry = va_arg(ap, struct dentry *);
86079+ mnt = va_arg(ap, struct vfsmount *);
86080+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
86081+ break;
86082+ case GR_FILENAME_STR:
86083+ dentry = va_arg(ap, struct dentry *);
86084+ mnt = va_arg(ap, struct vfsmount *);
86085+ str1 = va_arg(ap, char *);
86086+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
86087+ break;
86088+ case GR_FILENAME_TWO_INT:
86089+ dentry = va_arg(ap, struct dentry *);
86090+ mnt = va_arg(ap, struct vfsmount *);
86091+ num1 = va_arg(ap, int);
86092+ num2 = va_arg(ap, int);
86093+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
86094+ break;
86095+ case GR_FILENAME_TWO_INT_STR:
86096+ dentry = va_arg(ap, struct dentry *);
86097+ mnt = va_arg(ap, struct vfsmount *);
86098+ num1 = va_arg(ap, int);
86099+ num2 = va_arg(ap, int);
86100+ str1 = va_arg(ap, char *);
86101+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
86102+ break;
86103+ case GR_TEXTREL:
86104+ file = va_arg(ap, struct file *);
86105+ ulong1 = va_arg(ap, unsigned long);
86106+ ulong2 = va_arg(ap, unsigned long);
86107+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
86108+ break;
86109+ case GR_PTRACE:
86110+ task = va_arg(ap, struct task_struct *);
86111+ 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));
86112+ break;
86113+ case GR_RESOURCE:
86114+ task = va_arg(ap, struct task_struct *);
86115+ cred = __task_cred(task);
86116+ pcred = __task_cred(task->real_parent);
86117+ ulong1 = va_arg(ap, unsigned long);
86118+ str1 = va_arg(ap, char *);
86119+ ulong2 = va_arg(ap, unsigned long);
86120+ 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));
86121+ break;
86122+ case GR_CAP:
86123+ task = va_arg(ap, struct task_struct *);
86124+ cred = __task_cred(task);
86125+ pcred = __task_cred(task->real_parent);
86126+ str1 = va_arg(ap, char *);
86127+ 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));
86128+ break;
86129+ case GR_SIG:
86130+ str1 = va_arg(ap, char *);
86131+ voidptr = va_arg(ap, void *);
86132+ gr_log_middle_varargs(audit, msg, str1, voidptr);
86133+ break;
86134+ case GR_SIG2:
86135+ task = va_arg(ap, struct task_struct *);
86136+ cred = __task_cred(task);
86137+ pcred = __task_cred(task->real_parent);
86138+ num1 = va_arg(ap, int);
86139+ 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));
86140+ break;
86141+ case GR_CRASH1:
86142+ task = va_arg(ap, struct task_struct *);
86143+ cred = __task_cred(task);
86144+ pcred = __task_cred(task->real_parent);
86145+ ulong1 = va_arg(ap, unsigned long);
86146+ 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);
86147+ break;
86148+ case GR_CRASH2:
86149+ task = va_arg(ap, struct task_struct *);
86150+ cred = __task_cred(task);
86151+ pcred = __task_cred(task->real_parent);
86152+ ulong1 = va_arg(ap, unsigned long);
86153+ 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);
86154+ break;
86155+ case GR_RWXMAP:
86156+ file = va_arg(ap, struct file *);
86157+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
86158+ break;
86159+ case GR_RWXMAPVMA:
86160+ vma = va_arg(ap, struct vm_area_struct *);
86161+ if (vma->vm_file)
86162+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
86163+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
86164+ str1 = "<stack>";
86165+ else if (vma->vm_start <= current->mm->brk &&
86166+ vma->vm_end >= current->mm->start_brk)
86167+ str1 = "<heap>";
86168+ else
86169+ str1 = "<anonymous mapping>";
86170+ gr_log_middle_varargs(audit, msg, str1);
86171+ break;
86172+ case GR_PSACCT:
86173+ {
86174+ unsigned int wday, cday;
86175+ __u8 whr, chr;
86176+ __u8 wmin, cmin;
86177+ __u8 wsec, csec;
86178+ char cur_tty[64] = { 0 };
86179+ char parent_tty[64] = { 0 };
86180+
86181+ task = va_arg(ap, struct task_struct *);
86182+ wday = va_arg(ap, unsigned int);
86183+ cday = va_arg(ap, unsigned int);
86184+ whr = va_arg(ap, int);
86185+ chr = va_arg(ap, int);
86186+ wmin = va_arg(ap, int);
86187+ cmin = va_arg(ap, int);
86188+ wsec = va_arg(ap, int);
86189+ csec = va_arg(ap, int);
86190+ ulong1 = va_arg(ap, unsigned long);
86191+ cred = __task_cred(task);
86192+ pcred = __task_cred(task->real_parent);
86193+
86194+ 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));
86195+ }
86196+ break;
86197+ default:
86198+ gr_log_middle(audit, msg, ap);
86199+ }
86200+ va_end(ap);
86201+ // these don't need DEFAULTSECARGS printed on the end
86202+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
86203+ gr_log_end(audit, 0);
86204+ else
86205+ gr_log_end(audit, 1);
86206+ END_LOCKS(audit);
86207+}
86208diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
86209new file mode 100644
86210index 0000000..0e39d8c
86211--- /dev/null
86212+++ b/grsecurity/grsec_mem.c
86213@@ -0,0 +1,48 @@
86214+#include <linux/kernel.h>
86215+#include <linux/sched.h>
86216+#include <linux/mm.h>
86217+#include <linux/mman.h>
86218+#include <linux/module.h>
86219+#include <linux/grinternal.h>
86220+
86221+void gr_handle_msr_write(void)
86222+{
86223+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
86224+ return;
86225+}
86226+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
86227+
86228+void
86229+gr_handle_ioperm(void)
86230+{
86231+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
86232+ return;
86233+}
86234+
86235+void
86236+gr_handle_iopl(void)
86237+{
86238+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
86239+ return;
86240+}
86241+
86242+void
86243+gr_handle_mem_readwrite(u64 from, u64 to)
86244+{
86245+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
86246+ return;
86247+}
86248+
86249+void
86250+gr_handle_vm86(void)
86251+{
86252+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
86253+ return;
86254+}
86255+
86256+void
86257+gr_log_badprocpid(const char *entry)
86258+{
86259+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
86260+ return;
86261+}
86262diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
86263new file mode 100644
86264index 0000000..6f9eb73
86265--- /dev/null
86266+++ b/grsecurity/grsec_mount.c
86267@@ -0,0 +1,65 @@
86268+#include <linux/kernel.h>
86269+#include <linux/sched.h>
86270+#include <linux/mount.h>
86271+#include <linux/major.h>
86272+#include <linux/grsecurity.h>
86273+#include <linux/grinternal.h>
86274+
86275+void
86276+gr_log_remount(const char *devname, const int retval)
86277+{
86278+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86279+ if (grsec_enable_mount && (retval >= 0))
86280+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
86281+#endif
86282+ return;
86283+}
86284+
86285+void
86286+gr_log_unmount(const char *devname, const int retval)
86287+{
86288+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86289+ if (grsec_enable_mount && (retval >= 0))
86290+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
86291+#endif
86292+ return;
86293+}
86294+
86295+void
86296+gr_log_mount(const char *from, struct path *to, const int retval)
86297+{
86298+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86299+ if (grsec_enable_mount && (retval >= 0))
86300+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
86301+#endif
86302+ return;
86303+}
86304+
86305+int
86306+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
86307+{
86308+#ifdef CONFIG_GRKERNSEC_ROFS
86309+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
86310+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
86311+ return -EPERM;
86312+ } else
86313+ return 0;
86314+#endif
86315+ return 0;
86316+}
86317+
86318+int
86319+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
86320+{
86321+#ifdef CONFIG_GRKERNSEC_ROFS
86322+ struct inode *inode = dentry->d_inode;
86323+
86324+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
86325+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
86326+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
86327+ return -EPERM;
86328+ } else
86329+ return 0;
86330+#endif
86331+ return 0;
86332+}
86333diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
86334new file mode 100644
86335index 0000000..6ee9d50
86336--- /dev/null
86337+++ b/grsecurity/grsec_pax.c
86338@@ -0,0 +1,45 @@
86339+#include <linux/kernel.h>
86340+#include <linux/sched.h>
86341+#include <linux/mm.h>
86342+#include <linux/file.h>
86343+#include <linux/grinternal.h>
86344+#include <linux/grsecurity.h>
86345+
86346+void
86347+gr_log_textrel(struct vm_area_struct * vma)
86348+{
86349+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86350+ if (grsec_enable_log_rwxmaps)
86351+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
86352+#endif
86353+ return;
86354+}
86355+
86356+void gr_log_ptgnustack(struct file *file)
86357+{
86358+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86359+ if (grsec_enable_log_rwxmaps)
86360+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
86361+#endif
86362+ return;
86363+}
86364+
86365+void
86366+gr_log_rwxmmap(struct file *file)
86367+{
86368+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86369+ if (grsec_enable_log_rwxmaps)
86370+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
86371+#endif
86372+ return;
86373+}
86374+
86375+void
86376+gr_log_rwxmprotect(struct vm_area_struct *vma)
86377+{
86378+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86379+ if (grsec_enable_log_rwxmaps)
86380+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
86381+#endif
86382+ return;
86383+}
86384diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
86385new file mode 100644
86386index 0000000..2005a3a
86387--- /dev/null
86388+++ b/grsecurity/grsec_proc.c
86389@@ -0,0 +1,20 @@
86390+#include <linux/kernel.h>
86391+#include <linux/sched.h>
86392+#include <linux/grsecurity.h>
86393+#include <linux/grinternal.h>
86394+
86395+int gr_proc_is_restricted(void)
86396+{
86397+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86398+ const struct cred *cred = current_cred();
86399+#endif
86400+
86401+#ifdef CONFIG_GRKERNSEC_PROC_USER
86402+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
86403+ return -EACCES;
86404+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86405+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
86406+ return -EACCES;
86407+#endif
86408+ return 0;
86409+}
86410diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
86411new file mode 100644
86412index 0000000..f7f29aa
86413--- /dev/null
86414+++ b/grsecurity/grsec_ptrace.c
86415@@ -0,0 +1,30 @@
86416+#include <linux/kernel.h>
86417+#include <linux/sched.h>
86418+#include <linux/grinternal.h>
86419+#include <linux/security.h>
86420+
86421+void
86422+gr_audit_ptrace(struct task_struct *task)
86423+{
86424+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
86425+ if (grsec_enable_audit_ptrace)
86426+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
86427+#endif
86428+ return;
86429+}
86430+
86431+int
86432+gr_ptrace_readexec(struct file *file, int unsafe_flags)
86433+{
86434+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
86435+ const struct dentry *dentry = file->f_path.dentry;
86436+ const struct vfsmount *mnt = file->f_path.mnt;
86437+
86438+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
86439+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
86440+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
86441+ return -EACCES;
86442+ }
86443+#endif
86444+ return 0;
86445+}
86446diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
86447new file mode 100644
86448index 0000000..3860c7e
86449--- /dev/null
86450+++ b/grsecurity/grsec_sig.c
86451@@ -0,0 +1,236 @@
86452+#include <linux/kernel.h>
86453+#include <linux/sched.h>
86454+#include <linux/fs.h>
86455+#include <linux/delay.h>
86456+#include <linux/grsecurity.h>
86457+#include <linux/grinternal.h>
86458+#include <linux/hardirq.h>
86459+
86460+char *signames[] = {
86461+ [SIGSEGV] = "Segmentation fault",
86462+ [SIGILL] = "Illegal instruction",
86463+ [SIGABRT] = "Abort",
86464+ [SIGBUS] = "Invalid alignment/Bus error"
86465+};
86466+
86467+void
86468+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
86469+{
86470+#ifdef CONFIG_GRKERNSEC_SIGNAL
86471+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
86472+ (sig == SIGABRT) || (sig == SIGBUS))) {
86473+ if (task_pid_nr(t) == task_pid_nr(current)) {
86474+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
86475+ } else {
86476+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
86477+ }
86478+ }
86479+#endif
86480+ return;
86481+}
86482+
86483+int
86484+gr_handle_signal(const struct task_struct *p, const int sig)
86485+{
86486+#ifdef CONFIG_GRKERNSEC
86487+ /* ignore the 0 signal for protected task checks */
86488+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
86489+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
86490+ return -EPERM;
86491+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
86492+ return -EPERM;
86493+ }
86494+#endif
86495+ return 0;
86496+}
86497+
86498+#ifdef CONFIG_GRKERNSEC
86499+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
86500+
86501+int gr_fake_force_sig(int sig, struct task_struct *t)
86502+{
86503+ unsigned long int flags;
86504+ int ret, blocked, ignored;
86505+ struct k_sigaction *action;
86506+
86507+ spin_lock_irqsave(&t->sighand->siglock, flags);
86508+ action = &t->sighand->action[sig-1];
86509+ ignored = action->sa.sa_handler == SIG_IGN;
86510+ blocked = sigismember(&t->blocked, sig);
86511+ if (blocked || ignored) {
86512+ action->sa.sa_handler = SIG_DFL;
86513+ if (blocked) {
86514+ sigdelset(&t->blocked, sig);
86515+ recalc_sigpending_and_wake(t);
86516+ }
86517+ }
86518+ if (action->sa.sa_handler == SIG_DFL)
86519+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
86520+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
86521+
86522+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
86523+
86524+ return ret;
86525+}
86526+#endif
86527+
86528+#define GR_USER_BAN_TIME (15 * 60)
86529+#define GR_DAEMON_BRUTE_TIME (30 * 60)
86530+
86531+void gr_handle_brute_attach(int dumpable)
86532+{
86533+#ifdef CONFIG_GRKERNSEC_BRUTE
86534+ struct task_struct *p = current;
86535+ kuid_t uid = GLOBAL_ROOT_UID;
86536+ int daemon = 0;
86537+
86538+ if (!grsec_enable_brute)
86539+ return;
86540+
86541+ rcu_read_lock();
86542+ read_lock(&tasklist_lock);
86543+ read_lock(&grsec_exec_file_lock);
86544+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
86545+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
86546+ p->real_parent->brute = 1;
86547+ daemon = 1;
86548+ } else {
86549+ const struct cred *cred = __task_cred(p), *cred2;
86550+ struct task_struct *tsk, *tsk2;
86551+
86552+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
86553+ struct user_struct *user;
86554+
86555+ uid = cred->uid;
86556+
86557+ /* this is put upon execution past expiration */
86558+ user = find_user(uid);
86559+ if (user == NULL)
86560+ goto unlock;
86561+ user->suid_banned = 1;
86562+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
86563+ if (user->suid_ban_expires == ~0UL)
86564+ user->suid_ban_expires--;
86565+
86566+ /* only kill other threads of the same binary, from the same user */
86567+ do_each_thread(tsk2, tsk) {
86568+ cred2 = __task_cred(tsk);
86569+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
86570+ gr_fake_force_sig(SIGKILL, tsk);
86571+ } while_each_thread(tsk2, tsk);
86572+ }
86573+ }
86574+unlock:
86575+ read_unlock(&grsec_exec_file_lock);
86576+ read_unlock(&tasklist_lock);
86577+ rcu_read_unlock();
86578+
86579+ if (gr_is_global_nonroot(uid))
86580+ 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);
86581+ else if (daemon)
86582+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
86583+
86584+#endif
86585+ return;
86586+}
86587+
86588+void gr_handle_brute_check(void)
86589+{
86590+#ifdef CONFIG_GRKERNSEC_BRUTE
86591+ struct task_struct *p = current;
86592+
86593+ if (unlikely(p->brute)) {
86594+ if (!grsec_enable_brute)
86595+ p->brute = 0;
86596+ else if (time_before(get_seconds(), p->brute_expires))
86597+ msleep(30 * 1000);
86598+ }
86599+#endif
86600+ return;
86601+}
86602+
86603+void gr_handle_kernel_exploit(void)
86604+{
86605+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86606+ const struct cred *cred;
86607+ struct task_struct *tsk, *tsk2;
86608+ struct user_struct *user;
86609+ kuid_t uid;
86610+
86611+ if (in_irq() || in_serving_softirq() || in_nmi())
86612+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
86613+
86614+ uid = current_uid();
86615+
86616+ if (gr_is_global_root(uid))
86617+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
86618+ else {
86619+ /* kill all the processes of this user, hold a reference
86620+ to their creds struct, and prevent them from creating
86621+ another process until system reset
86622+ */
86623+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
86624+ GR_GLOBAL_UID(uid));
86625+ /* we intentionally leak this ref */
86626+ user = get_uid(current->cred->user);
86627+ if (user)
86628+ user->kernel_banned = 1;
86629+
86630+ /* kill all processes of this user */
86631+ read_lock(&tasklist_lock);
86632+ do_each_thread(tsk2, tsk) {
86633+ cred = __task_cred(tsk);
86634+ if (uid_eq(cred->uid, uid))
86635+ gr_fake_force_sig(SIGKILL, tsk);
86636+ } while_each_thread(tsk2, tsk);
86637+ read_unlock(&tasklist_lock);
86638+ }
86639+#endif
86640+}
86641+
86642+#ifdef CONFIG_GRKERNSEC_BRUTE
86643+static bool suid_ban_expired(struct user_struct *user)
86644+{
86645+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
86646+ user->suid_banned = 0;
86647+ user->suid_ban_expires = 0;
86648+ free_uid(user);
86649+ return true;
86650+ }
86651+
86652+ return false;
86653+}
86654+#endif
86655+
86656+int gr_process_kernel_exec_ban(void)
86657+{
86658+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86659+ if (unlikely(current->cred->user->kernel_banned))
86660+ return -EPERM;
86661+#endif
86662+ return 0;
86663+}
86664+
86665+int gr_process_kernel_setuid_ban(struct user_struct *user)
86666+{
86667+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86668+ if (unlikely(user->kernel_banned))
86669+ gr_fake_force_sig(SIGKILL, current);
86670+#endif
86671+ return 0;
86672+}
86673+
86674+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
86675+{
86676+#ifdef CONFIG_GRKERNSEC_BRUTE
86677+ struct user_struct *user = current->cred->user;
86678+ if (unlikely(user->suid_banned)) {
86679+ if (suid_ban_expired(user))
86680+ return 0;
86681+ /* disallow execution of suid binaries only */
86682+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
86683+ return -EPERM;
86684+ }
86685+#endif
86686+ return 0;
86687+}
86688diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
86689new file mode 100644
86690index 0000000..a523bd2
86691--- /dev/null
86692+++ b/grsecurity/grsec_sock.c
86693@@ -0,0 +1,244 @@
86694+#include <linux/kernel.h>
86695+#include <linux/module.h>
86696+#include <linux/sched.h>
86697+#include <linux/file.h>
86698+#include <linux/net.h>
86699+#include <linux/in.h>
86700+#include <linux/ip.h>
86701+#include <net/sock.h>
86702+#include <net/inet_sock.h>
86703+#include <linux/grsecurity.h>
86704+#include <linux/grinternal.h>
86705+#include <linux/gracl.h>
86706+
86707+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
86708+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
86709+
86710+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
86711+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
86712+
86713+#ifdef CONFIG_UNIX_MODULE
86714+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
86715+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
86716+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
86717+EXPORT_SYMBOL_GPL(gr_handle_create);
86718+#endif
86719+
86720+#ifdef CONFIG_GRKERNSEC
86721+#define gr_conn_table_size 32749
86722+struct conn_table_entry {
86723+ struct conn_table_entry *next;
86724+ struct signal_struct *sig;
86725+};
86726+
86727+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
86728+DEFINE_SPINLOCK(gr_conn_table_lock);
86729+
86730+extern const char * gr_socktype_to_name(unsigned char type);
86731+extern const char * gr_proto_to_name(unsigned char proto);
86732+extern const char * gr_sockfamily_to_name(unsigned char family);
86733+
86734+static int
86735+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
86736+{
86737+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
86738+}
86739+
86740+static int
86741+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
86742+ __u16 sport, __u16 dport)
86743+{
86744+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
86745+ sig->gr_sport == sport && sig->gr_dport == dport))
86746+ return 1;
86747+ else
86748+ return 0;
86749+}
86750+
86751+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
86752+{
86753+ struct conn_table_entry **match;
86754+ unsigned int index;
86755+
86756+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
86757+ sig->gr_sport, sig->gr_dport,
86758+ gr_conn_table_size);
86759+
86760+ newent->sig = sig;
86761+
86762+ match = &gr_conn_table[index];
86763+ newent->next = *match;
86764+ *match = newent;
86765+
86766+ return;
86767+}
86768+
86769+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
86770+{
86771+ struct conn_table_entry *match, *last = NULL;
86772+ unsigned int index;
86773+
86774+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
86775+ sig->gr_sport, sig->gr_dport,
86776+ gr_conn_table_size);
86777+
86778+ match = gr_conn_table[index];
86779+ while (match && !conn_match(match->sig,
86780+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
86781+ sig->gr_dport)) {
86782+ last = match;
86783+ match = match->next;
86784+ }
86785+
86786+ if (match) {
86787+ if (last)
86788+ last->next = match->next;
86789+ else
86790+ gr_conn_table[index] = NULL;
86791+ kfree(match);
86792+ }
86793+
86794+ return;
86795+}
86796+
86797+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
86798+ __u16 sport, __u16 dport)
86799+{
86800+ struct conn_table_entry *match;
86801+ unsigned int index;
86802+
86803+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
86804+
86805+ match = gr_conn_table[index];
86806+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
86807+ match = match->next;
86808+
86809+ if (match)
86810+ return match->sig;
86811+ else
86812+ return NULL;
86813+}
86814+
86815+#endif
86816+
86817+void gr_update_task_in_ip_table(const struct inet_sock *inet)
86818+{
86819+#ifdef CONFIG_GRKERNSEC
86820+ struct signal_struct *sig = current->signal;
86821+ struct conn_table_entry *newent;
86822+
86823+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
86824+ if (newent == NULL)
86825+ return;
86826+ /* no bh lock needed since we are called with bh disabled */
86827+ spin_lock(&gr_conn_table_lock);
86828+ gr_del_task_from_ip_table_nolock(sig);
86829+ sig->gr_saddr = inet->inet_rcv_saddr;
86830+ sig->gr_daddr = inet->inet_daddr;
86831+ sig->gr_sport = inet->inet_sport;
86832+ sig->gr_dport = inet->inet_dport;
86833+ gr_add_to_task_ip_table_nolock(sig, newent);
86834+ spin_unlock(&gr_conn_table_lock);
86835+#endif
86836+ return;
86837+}
86838+
86839+void gr_del_task_from_ip_table(struct task_struct *task)
86840+{
86841+#ifdef CONFIG_GRKERNSEC
86842+ spin_lock_bh(&gr_conn_table_lock);
86843+ gr_del_task_from_ip_table_nolock(task->signal);
86844+ spin_unlock_bh(&gr_conn_table_lock);
86845+#endif
86846+ return;
86847+}
86848+
86849+void
86850+gr_attach_curr_ip(const struct sock *sk)
86851+{
86852+#ifdef CONFIG_GRKERNSEC
86853+ struct signal_struct *p, *set;
86854+ const struct inet_sock *inet = inet_sk(sk);
86855+
86856+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
86857+ return;
86858+
86859+ set = current->signal;
86860+
86861+ spin_lock_bh(&gr_conn_table_lock);
86862+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
86863+ inet->inet_dport, inet->inet_sport);
86864+ if (unlikely(p != NULL)) {
86865+ set->curr_ip = p->curr_ip;
86866+ set->used_accept = 1;
86867+ gr_del_task_from_ip_table_nolock(p);
86868+ spin_unlock_bh(&gr_conn_table_lock);
86869+ return;
86870+ }
86871+ spin_unlock_bh(&gr_conn_table_lock);
86872+
86873+ set->curr_ip = inet->inet_daddr;
86874+ set->used_accept = 1;
86875+#endif
86876+ return;
86877+}
86878+
86879+int
86880+gr_handle_sock_all(const int family, const int type, const int protocol)
86881+{
86882+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
86883+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
86884+ (family != AF_UNIX)) {
86885+ if (family == AF_INET)
86886+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
86887+ else
86888+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
86889+ return -EACCES;
86890+ }
86891+#endif
86892+ return 0;
86893+}
86894+
86895+int
86896+gr_handle_sock_server(const struct sockaddr *sck)
86897+{
86898+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
86899+ if (grsec_enable_socket_server &&
86900+ in_group_p(grsec_socket_server_gid) &&
86901+ sck && (sck->sa_family != AF_UNIX) &&
86902+ (sck->sa_family != AF_LOCAL)) {
86903+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
86904+ return -EACCES;
86905+ }
86906+#endif
86907+ return 0;
86908+}
86909+
86910+int
86911+gr_handle_sock_server_other(const struct sock *sck)
86912+{
86913+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
86914+ if (grsec_enable_socket_server &&
86915+ in_group_p(grsec_socket_server_gid) &&
86916+ sck && (sck->sk_family != AF_UNIX) &&
86917+ (sck->sk_family != AF_LOCAL)) {
86918+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
86919+ return -EACCES;
86920+ }
86921+#endif
86922+ return 0;
86923+}
86924+
86925+int
86926+gr_handle_sock_client(const struct sockaddr *sck)
86927+{
86928+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
86929+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
86930+ sck && (sck->sa_family != AF_UNIX) &&
86931+ (sck->sa_family != AF_LOCAL)) {
86932+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
86933+ return -EACCES;
86934+ }
86935+#endif
86936+ return 0;
86937+}
86938diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
86939new file mode 100644
86940index 0000000..cce889e
86941--- /dev/null
86942+++ b/grsecurity/grsec_sysctl.c
86943@@ -0,0 +1,488 @@
86944+#include <linux/kernel.h>
86945+#include <linux/sched.h>
86946+#include <linux/sysctl.h>
86947+#include <linux/grsecurity.h>
86948+#include <linux/grinternal.h>
86949+
86950+int
86951+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
86952+{
86953+#ifdef CONFIG_GRKERNSEC_SYSCTL
86954+ if (dirname == NULL || name == NULL)
86955+ return 0;
86956+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
86957+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
86958+ return -EACCES;
86959+ }
86960+#endif
86961+ return 0;
86962+}
86963+
86964+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
86965+static int __maybe_unused __read_only one = 1;
86966+#endif
86967+
86968+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
86969+ defined(CONFIG_GRKERNSEC_DENYUSB)
86970+struct ctl_table grsecurity_table[] = {
86971+#ifdef CONFIG_GRKERNSEC_SYSCTL
86972+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
86973+#ifdef CONFIG_GRKERNSEC_IO
86974+ {
86975+ .procname = "disable_priv_io",
86976+ .data = &grsec_disable_privio,
86977+ .maxlen = sizeof(int),
86978+ .mode = 0600,
86979+ .proc_handler = &proc_dointvec,
86980+ },
86981+#endif
86982+#endif
86983+#ifdef CONFIG_GRKERNSEC_LINK
86984+ {
86985+ .procname = "linking_restrictions",
86986+ .data = &grsec_enable_link,
86987+ .maxlen = sizeof(int),
86988+ .mode = 0600,
86989+ .proc_handler = &proc_dointvec,
86990+ },
86991+#endif
86992+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
86993+ {
86994+ .procname = "enforce_symlinksifowner",
86995+ .data = &grsec_enable_symlinkown,
86996+ .maxlen = sizeof(int),
86997+ .mode = 0600,
86998+ .proc_handler = &proc_dointvec,
86999+ },
87000+ {
87001+ .procname = "symlinkown_gid",
87002+ .data = &grsec_symlinkown_gid,
87003+ .maxlen = sizeof(int),
87004+ .mode = 0600,
87005+ .proc_handler = &proc_dointvec,
87006+ },
87007+#endif
87008+#ifdef CONFIG_GRKERNSEC_BRUTE
87009+ {
87010+ .procname = "deter_bruteforce",
87011+ .data = &grsec_enable_brute,
87012+ .maxlen = sizeof(int),
87013+ .mode = 0600,
87014+ .proc_handler = &proc_dointvec,
87015+ },
87016+#endif
87017+#ifdef CONFIG_GRKERNSEC_FIFO
87018+ {
87019+ .procname = "fifo_restrictions",
87020+ .data = &grsec_enable_fifo,
87021+ .maxlen = sizeof(int),
87022+ .mode = 0600,
87023+ .proc_handler = &proc_dointvec,
87024+ },
87025+#endif
87026+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
87027+ {
87028+ .procname = "ptrace_readexec",
87029+ .data = &grsec_enable_ptrace_readexec,
87030+ .maxlen = sizeof(int),
87031+ .mode = 0600,
87032+ .proc_handler = &proc_dointvec,
87033+ },
87034+#endif
87035+#ifdef CONFIG_GRKERNSEC_SETXID
87036+ {
87037+ .procname = "consistent_setxid",
87038+ .data = &grsec_enable_setxid,
87039+ .maxlen = sizeof(int),
87040+ .mode = 0600,
87041+ .proc_handler = &proc_dointvec,
87042+ },
87043+#endif
87044+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
87045+ {
87046+ .procname = "ip_blackhole",
87047+ .data = &grsec_enable_blackhole,
87048+ .maxlen = sizeof(int),
87049+ .mode = 0600,
87050+ .proc_handler = &proc_dointvec,
87051+ },
87052+ {
87053+ .procname = "lastack_retries",
87054+ .data = &grsec_lastack_retries,
87055+ .maxlen = sizeof(int),
87056+ .mode = 0600,
87057+ .proc_handler = &proc_dointvec,
87058+ },
87059+#endif
87060+#ifdef CONFIG_GRKERNSEC_EXECLOG
87061+ {
87062+ .procname = "exec_logging",
87063+ .data = &grsec_enable_execlog,
87064+ .maxlen = sizeof(int),
87065+ .mode = 0600,
87066+ .proc_handler = &proc_dointvec,
87067+ },
87068+#endif
87069+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
87070+ {
87071+ .procname = "rwxmap_logging",
87072+ .data = &grsec_enable_log_rwxmaps,
87073+ .maxlen = sizeof(int),
87074+ .mode = 0600,
87075+ .proc_handler = &proc_dointvec,
87076+ },
87077+#endif
87078+#ifdef CONFIG_GRKERNSEC_SIGNAL
87079+ {
87080+ .procname = "signal_logging",
87081+ .data = &grsec_enable_signal,
87082+ .maxlen = sizeof(int),
87083+ .mode = 0600,
87084+ .proc_handler = &proc_dointvec,
87085+ },
87086+#endif
87087+#ifdef CONFIG_GRKERNSEC_FORKFAIL
87088+ {
87089+ .procname = "forkfail_logging",
87090+ .data = &grsec_enable_forkfail,
87091+ .maxlen = sizeof(int),
87092+ .mode = 0600,
87093+ .proc_handler = &proc_dointvec,
87094+ },
87095+#endif
87096+#ifdef CONFIG_GRKERNSEC_TIME
87097+ {
87098+ .procname = "timechange_logging",
87099+ .data = &grsec_enable_time,
87100+ .maxlen = sizeof(int),
87101+ .mode = 0600,
87102+ .proc_handler = &proc_dointvec,
87103+ },
87104+#endif
87105+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
87106+ {
87107+ .procname = "chroot_deny_shmat",
87108+ .data = &grsec_enable_chroot_shmat,
87109+ .maxlen = sizeof(int),
87110+ .mode = 0600,
87111+ .proc_handler = &proc_dointvec,
87112+ },
87113+#endif
87114+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
87115+ {
87116+ .procname = "chroot_deny_unix",
87117+ .data = &grsec_enable_chroot_unix,
87118+ .maxlen = sizeof(int),
87119+ .mode = 0600,
87120+ .proc_handler = &proc_dointvec,
87121+ },
87122+#endif
87123+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
87124+ {
87125+ .procname = "chroot_deny_mount",
87126+ .data = &grsec_enable_chroot_mount,
87127+ .maxlen = sizeof(int),
87128+ .mode = 0600,
87129+ .proc_handler = &proc_dointvec,
87130+ },
87131+#endif
87132+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
87133+ {
87134+ .procname = "chroot_deny_fchdir",
87135+ .data = &grsec_enable_chroot_fchdir,
87136+ .maxlen = sizeof(int),
87137+ .mode = 0600,
87138+ .proc_handler = &proc_dointvec,
87139+ },
87140+#endif
87141+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
87142+ {
87143+ .procname = "chroot_deny_chroot",
87144+ .data = &grsec_enable_chroot_double,
87145+ .maxlen = sizeof(int),
87146+ .mode = 0600,
87147+ .proc_handler = &proc_dointvec,
87148+ },
87149+#endif
87150+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
87151+ {
87152+ .procname = "chroot_deny_pivot",
87153+ .data = &grsec_enable_chroot_pivot,
87154+ .maxlen = sizeof(int),
87155+ .mode = 0600,
87156+ .proc_handler = &proc_dointvec,
87157+ },
87158+#endif
87159+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
87160+ {
87161+ .procname = "chroot_enforce_chdir",
87162+ .data = &grsec_enable_chroot_chdir,
87163+ .maxlen = sizeof(int),
87164+ .mode = 0600,
87165+ .proc_handler = &proc_dointvec,
87166+ },
87167+#endif
87168+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
87169+ {
87170+ .procname = "chroot_deny_chmod",
87171+ .data = &grsec_enable_chroot_chmod,
87172+ .maxlen = sizeof(int),
87173+ .mode = 0600,
87174+ .proc_handler = &proc_dointvec,
87175+ },
87176+#endif
87177+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
87178+ {
87179+ .procname = "chroot_deny_mknod",
87180+ .data = &grsec_enable_chroot_mknod,
87181+ .maxlen = sizeof(int),
87182+ .mode = 0600,
87183+ .proc_handler = &proc_dointvec,
87184+ },
87185+#endif
87186+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
87187+ {
87188+ .procname = "chroot_restrict_nice",
87189+ .data = &grsec_enable_chroot_nice,
87190+ .maxlen = sizeof(int),
87191+ .mode = 0600,
87192+ .proc_handler = &proc_dointvec,
87193+ },
87194+#endif
87195+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
87196+ {
87197+ .procname = "chroot_execlog",
87198+ .data = &grsec_enable_chroot_execlog,
87199+ .maxlen = sizeof(int),
87200+ .mode = 0600,
87201+ .proc_handler = &proc_dointvec,
87202+ },
87203+#endif
87204+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
87205+ {
87206+ .procname = "chroot_caps",
87207+ .data = &grsec_enable_chroot_caps,
87208+ .maxlen = sizeof(int),
87209+ .mode = 0600,
87210+ .proc_handler = &proc_dointvec,
87211+ },
87212+#endif
87213+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
87214+ {
87215+ .procname = "chroot_deny_bad_rename",
87216+ .data = &grsec_enable_chroot_rename,
87217+ .maxlen = sizeof(int),
87218+ .mode = 0600,
87219+ .proc_handler = &proc_dointvec,
87220+ },
87221+#endif
87222+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
87223+ {
87224+ .procname = "chroot_deny_sysctl",
87225+ .data = &grsec_enable_chroot_sysctl,
87226+ .maxlen = sizeof(int),
87227+ .mode = 0600,
87228+ .proc_handler = &proc_dointvec,
87229+ },
87230+#endif
87231+#ifdef CONFIG_GRKERNSEC_TPE
87232+ {
87233+ .procname = "tpe",
87234+ .data = &grsec_enable_tpe,
87235+ .maxlen = sizeof(int),
87236+ .mode = 0600,
87237+ .proc_handler = &proc_dointvec,
87238+ },
87239+ {
87240+ .procname = "tpe_gid",
87241+ .data = &grsec_tpe_gid,
87242+ .maxlen = sizeof(int),
87243+ .mode = 0600,
87244+ .proc_handler = &proc_dointvec,
87245+ },
87246+#endif
87247+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
87248+ {
87249+ .procname = "tpe_invert",
87250+ .data = &grsec_enable_tpe_invert,
87251+ .maxlen = sizeof(int),
87252+ .mode = 0600,
87253+ .proc_handler = &proc_dointvec,
87254+ },
87255+#endif
87256+#ifdef CONFIG_GRKERNSEC_TPE_ALL
87257+ {
87258+ .procname = "tpe_restrict_all",
87259+ .data = &grsec_enable_tpe_all,
87260+ .maxlen = sizeof(int),
87261+ .mode = 0600,
87262+ .proc_handler = &proc_dointvec,
87263+ },
87264+#endif
87265+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
87266+ {
87267+ .procname = "socket_all",
87268+ .data = &grsec_enable_socket_all,
87269+ .maxlen = sizeof(int),
87270+ .mode = 0600,
87271+ .proc_handler = &proc_dointvec,
87272+ },
87273+ {
87274+ .procname = "socket_all_gid",
87275+ .data = &grsec_socket_all_gid,
87276+ .maxlen = sizeof(int),
87277+ .mode = 0600,
87278+ .proc_handler = &proc_dointvec,
87279+ },
87280+#endif
87281+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
87282+ {
87283+ .procname = "socket_client",
87284+ .data = &grsec_enable_socket_client,
87285+ .maxlen = sizeof(int),
87286+ .mode = 0600,
87287+ .proc_handler = &proc_dointvec,
87288+ },
87289+ {
87290+ .procname = "socket_client_gid",
87291+ .data = &grsec_socket_client_gid,
87292+ .maxlen = sizeof(int),
87293+ .mode = 0600,
87294+ .proc_handler = &proc_dointvec,
87295+ },
87296+#endif
87297+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
87298+ {
87299+ .procname = "socket_server",
87300+ .data = &grsec_enable_socket_server,
87301+ .maxlen = sizeof(int),
87302+ .mode = 0600,
87303+ .proc_handler = &proc_dointvec,
87304+ },
87305+ {
87306+ .procname = "socket_server_gid",
87307+ .data = &grsec_socket_server_gid,
87308+ .maxlen = sizeof(int),
87309+ .mode = 0600,
87310+ .proc_handler = &proc_dointvec,
87311+ },
87312+#endif
87313+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
87314+ {
87315+ .procname = "audit_group",
87316+ .data = &grsec_enable_group,
87317+ .maxlen = sizeof(int),
87318+ .mode = 0600,
87319+ .proc_handler = &proc_dointvec,
87320+ },
87321+ {
87322+ .procname = "audit_gid",
87323+ .data = &grsec_audit_gid,
87324+ .maxlen = sizeof(int),
87325+ .mode = 0600,
87326+ .proc_handler = &proc_dointvec,
87327+ },
87328+#endif
87329+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
87330+ {
87331+ .procname = "audit_chdir",
87332+ .data = &grsec_enable_chdir,
87333+ .maxlen = sizeof(int),
87334+ .mode = 0600,
87335+ .proc_handler = &proc_dointvec,
87336+ },
87337+#endif
87338+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
87339+ {
87340+ .procname = "audit_mount",
87341+ .data = &grsec_enable_mount,
87342+ .maxlen = sizeof(int),
87343+ .mode = 0600,
87344+ .proc_handler = &proc_dointvec,
87345+ },
87346+#endif
87347+#ifdef CONFIG_GRKERNSEC_DMESG
87348+ {
87349+ .procname = "dmesg",
87350+ .data = &grsec_enable_dmesg,
87351+ .maxlen = sizeof(int),
87352+ .mode = 0600,
87353+ .proc_handler = &proc_dointvec,
87354+ },
87355+#endif
87356+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
87357+ {
87358+ .procname = "chroot_findtask",
87359+ .data = &grsec_enable_chroot_findtask,
87360+ .maxlen = sizeof(int),
87361+ .mode = 0600,
87362+ .proc_handler = &proc_dointvec,
87363+ },
87364+#endif
87365+#ifdef CONFIG_GRKERNSEC_RESLOG
87366+ {
87367+ .procname = "resource_logging",
87368+ .data = &grsec_resource_logging,
87369+ .maxlen = sizeof(int),
87370+ .mode = 0600,
87371+ .proc_handler = &proc_dointvec,
87372+ },
87373+#endif
87374+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
87375+ {
87376+ .procname = "audit_ptrace",
87377+ .data = &grsec_enable_audit_ptrace,
87378+ .maxlen = sizeof(int),
87379+ .mode = 0600,
87380+ .proc_handler = &proc_dointvec,
87381+ },
87382+#endif
87383+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
87384+ {
87385+ .procname = "harden_ptrace",
87386+ .data = &grsec_enable_harden_ptrace,
87387+ .maxlen = sizeof(int),
87388+ .mode = 0600,
87389+ .proc_handler = &proc_dointvec,
87390+ },
87391+#endif
87392+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
87393+ {
87394+ .procname = "harden_ipc",
87395+ .data = &grsec_enable_harden_ipc,
87396+ .maxlen = sizeof(int),
87397+ .mode = 0600,
87398+ .proc_handler = &proc_dointvec,
87399+ },
87400+#endif
87401+ {
87402+ .procname = "grsec_lock",
87403+ .data = &grsec_lock,
87404+ .maxlen = sizeof(int),
87405+ .mode = 0600,
87406+ .proc_handler = &proc_dointvec,
87407+ },
87408+#endif
87409+#ifdef CONFIG_GRKERNSEC_ROFS
87410+ {
87411+ .procname = "romount_protect",
87412+ .data = &grsec_enable_rofs,
87413+ .maxlen = sizeof(int),
87414+ .mode = 0600,
87415+ .proc_handler = &proc_dointvec_minmax,
87416+ .extra1 = &one,
87417+ .extra2 = &one,
87418+ },
87419+#endif
87420+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
87421+ {
87422+ .procname = "deny_new_usb",
87423+ .data = &grsec_deny_new_usb,
87424+ .maxlen = sizeof(int),
87425+ .mode = 0600,
87426+ .proc_handler = &proc_dointvec,
87427+ },
87428+#endif
87429+ { }
87430+};
87431+#endif
87432diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
87433new file mode 100644
87434index 0000000..61b514e
87435--- /dev/null
87436+++ b/grsecurity/grsec_time.c
87437@@ -0,0 +1,16 @@
87438+#include <linux/kernel.h>
87439+#include <linux/sched.h>
87440+#include <linux/grinternal.h>
87441+#include <linux/module.h>
87442+
87443+void
87444+gr_log_timechange(void)
87445+{
87446+#ifdef CONFIG_GRKERNSEC_TIME
87447+ if (grsec_enable_time)
87448+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
87449+#endif
87450+ return;
87451+}
87452+
87453+EXPORT_SYMBOL_GPL(gr_log_timechange);
87454diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
87455new file mode 100644
87456index 0000000..d1953de
87457--- /dev/null
87458+++ b/grsecurity/grsec_tpe.c
87459@@ -0,0 +1,78 @@
87460+#include <linux/kernel.h>
87461+#include <linux/sched.h>
87462+#include <linux/file.h>
87463+#include <linux/fs.h>
87464+#include <linux/grinternal.h>
87465+
87466+extern int gr_acl_tpe_check(void);
87467+
87468+int
87469+gr_tpe_allow(const struct file *file)
87470+{
87471+#ifdef CONFIG_GRKERNSEC
87472+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
87473+ struct inode *file_inode = file->f_path.dentry->d_inode;
87474+ const struct cred *cred = current_cred();
87475+ char *msg = NULL;
87476+ char *msg2 = NULL;
87477+
87478+ // never restrict root
87479+ if (gr_is_global_root(cred->uid))
87480+ return 1;
87481+
87482+ if (grsec_enable_tpe) {
87483+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
87484+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
87485+ msg = "not being in trusted group";
87486+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
87487+ msg = "being in untrusted group";
87488+#else
87489+ if (in_group_p(grsec_tpe_gid))
87490+ msg = "being in untrusted group";
87491+#endif
87492+ }
87493+ if (!msg && gr_acl_tpe_check())
87494+ msg = "being in untrusted role";
87495+
87496+ // not in any affected group/role
87497+ if (!msg)
87498+ goto next_check;
87499+
87500+ if (gr_is_global_nonroot(inode->i_uid))
87501+ msg2 = "file in non-root-owned directory";
87502+ else if (inode->i_mode & S_IWOTH)
87503+ msg2 = "file in world-writable directory";
87504+ else if (inode->i_mode & S_IWGRP)
87505+ msg2 = "file in group-writable directory";
87506+ else if (file_inode->i_mode & S_IWOTH)
87507+ msg2 = "file is world-writable";
87508+
87509+ if (msg && msg2) {
87510+ char fullmsg[70] = {0};
87511+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
87512+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
87513+ return 0;
87514+ }
87515+ msg = NULL;
87516+next_check:
87517+#ifdef CONFIG_GRKERNSEC_TPE_ALL
87518+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
87519+ return 1;
87520+
87521+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
87522+ msg = "directory not owned by user";
87523+ else if (inode->i_mode & S_IWOTH)
87524+ msg = "file in world-writable directory";
87525+ else if (inode->i_mode & S_IWGRP)
87526+ msg = "file in group-writable directory";
87527+ else if (file_inode->i_mode & S_IWOTH)
87528+ msg = "file is world-writable";
87529+
87530+ if (msg) {
87531+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
87532+ return 0;
87533+ }
87534+#endif
87535+#endif
87536+ return 1;
87537+}
87538diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
87539new file mode 100644
87540index 0000000..ae02d8e
87541--- /dev/null
87542+++ b/grsecurity/grsec_usb.c
87543@@ -0,0 +1,15 @@
87544+#include <linux/kernel.h>
87545+#include <linux/grinternal.h>
87546+#include <linux/module.h>
87547+
87548+int gr_handle_new_usb(void)
87549+{
87550+#ifdef CONFIG_GRKERNSEC_DENYUSB
87551+ if (grsec_deny_new_usb) {
87552+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
87553+ return 1;
87554+ }
87555+#endif
87556+ return 0;
87557+}
87558+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
87559diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
87560new file mode 100644
87561index 0000000..158b330
87562--- /dev/null
87563+++ b/grsecurity/grsum.c
87564@@ -0,0 +1,64 @@
87565+#include <linux/err.h>
87566+#include <linux/kernel.h>
87567+#include <linux/sched.h>
87568+#include <linux/mm.h>
87569+#include <linux/scatterlist.h>
87570+#include <linux/crypto.h>
87571+#include <linux/gracl.h>
87572+
87573+
87574+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
87575+#error "crypto and sha256 must be built into the kernel"
87576+#endif
87577+
87578+int
87579+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
87580+{
87581+ struct crypto_hash *tfm;
87582+ struct hash_desc desc;
87583+ struct scatterlist sg[2];
87584+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
87585+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
87586+ unsigned long *sumptr = (unsigned long *)sum;
87587+ int cryptres;
87588+ int retval = 1;
87589+ volatile int mismatched = 0;
87590+ volatile int dummy = 0;
87591+ unsigned int i;
87592+
87593+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
87594+ if (IS_ERR(tfm)) {
87595+ /* should never happen, since sha256 should be built in */
87596+ memset(entry->pw, 0, GR_PW_LEN);
87597+ return 1;
87598+ }
87599+
87600+ sg_init_table(sg, 2);
87601+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
87602+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
87603+
87604+ desc.tfm = tfm;
87605+ desc.flags = 0;
87606+
87607+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
87608+ temp_sum);
87609+
87610+ memset(entry->pw, 0, GR_PW_LEN);
87611+
87612+ if (cryptres)
87613+ goto out;
87614+
87615+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
87616+ if (sumptr[i] != tmpsumptr[i])
87617+ mismatched = 1;
87618+ else
87619+ dummy = 1; // waste a cycle
87620+
87621+ if (!mismatched)
87622+ retval = dummy - 1;
87623+
87624+out:
87625+ crypto_free_hash(tfm);
87626+
87627+ return retval;
87628+}
87629diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
87630index 5bdab6b..9ae82fe 100644
87631--- a/include/asm-generic/4level-fixup.h
87632+++ b/include/asm-generic/4level-fixup.h
87633@@ -14,8 +14,10 @@
87634 #define pmd_alloc(mm, pud, address) \
87635 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
87636 NULL: pmd_offset(pud, address))
87637+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
87638
87639 #define pud_alloc(mm, pgd, address) (pgd)
87640+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
87641 #define pud_offset(pgd, start) (pgd)
87642 #define pud_none(pud) 0
87643 #define pud_bad(pud) 0
87644diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
87645index b7babf0..1e4b4f1 100644
87646--- a/include/asm-generic/atomic-long.h
87647+++ b/include/asm-generic/atomic-long.h
87648@@ -22,6 +22,12 @@
87649
87650 typedef atomic64_t atomic_long_t;
87651
87652+#ifdef CONFIG_PAX_REFCOUNT
87653+typedef atomic64_unchecked_t atomic_long_unchecked_t;
87654+#else
87655+typedef atomic64_t atomic_long_unchecked_t;
87656+#endif
87657+
87658 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
87659
87660 static inline long atomic_long_read(atomic_long_t *l)
87661@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
87662 return (long)atomic64_read(v);
87663 }
87664
87665+#ifdef CONFIG_PAX_REFCOUNT
87666+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
87667+{
87668+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87669+
87670+ return (long)atomic64_read_unchecked(v);
87671+}
87672+#endif
87673+
87674 static inline void atomic_long_set(atomic_long_t *l, long i)
87675 {
87676 atomic64_t *v = (atomic64_t *)l;
87677@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
87678 atomic64_set(v, i);
87679 }
87680
87681+#ifdef CONFIG_PAX_REFCOUNT
87682+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
87683+{
87684+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87685+
87686+ atomic64_set_unchecked(v, i);
87687+}
87688+#endif
87689+
87690 static inline void atomic_long_inc(atomic_long_t *l)
87691 {
87692 atomic64_t *v = (atomic64_t *)l;
87693@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
87694 atomic64_inc(v);
87695 }
87696
87697+#ifdef CONFIG_PAX_REFCOUNT
87698+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
87699+{
87700+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87701+
87702+ atomic64_inc_unchecked(v);
87703+}
87704+#endif
87705+
87706 static inline void atomic_long_dec(atomic_long_t *l)
87707 {
87708 atomic64_t *v = (atomic64_t *)l;
87709@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
87710 atomic64_dec(v);
87711 }
87712
87713+#ifdef CONFIG_PAX_REFCOUNT
87714+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
87715+{
87716+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87717+
87718+ atomic64_dec_unchecked(v);
87719+}
87720+#endif
87721+
87722 static inline void atomic_long_add(long i, atomic_long_t *l)
87723 {
87724 atomic64_t *v = (atomic64_t *)l;
87725@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
87726 atomic64_add(i, v);
87727 }
87728
87729+#ifdef CONFIG_PAX_REFCOUNT
87730+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
87731+{
87732+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87733+
87734+ atomic64_add_unchecked(i, v);
87735+}
87736+#endif
87737+
87738 static inline void atomic_long_sub(long i, atomic_long_t *l)
87739 {
87740 atomic64_t *v = (atomic64_t *)l;
87741@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
87742 atomic64_sub(i, v);
87743 }
87744
87745+#ifdef CONFIG_PAX_REFCOUNT
87746+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
87747+{
87748+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87749+
87750+ atomic64_sub_unchecked(i, v);
87751+}
87752+#endif
87753+
87754 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
87755 {
87756 atomic64_t *v = (atomic64_t *)l;
87757@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
87758 return atomic64_add_negative(i, v);
87759 }
87760
87761-static inline long atomic_long_add_return(long i, atomic_long_t *l)
87762+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
87763 {
87764 atomic64_t *v = (atomic64_t *)l;
87765
87766 return (long)atomic64_add_return(i, v);
87767 }
87768
87769+#ifdef CONFIG_PAX_REFCOUNT
87770+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
87771+{
87772+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87773+
87774+ return (long)atomic64_add_return_unchecked(i, v);
87775+}
87776+#endif
87777+
87778 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
87779 {
87780 atomic64_t *v = (atomic64_t *)l;
87781@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
87782 return (long)atomic64_inc_return(v);
87783 }
87784
87785+#ifdef CONFIG_PAX_REFCOUNT
87786+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
87787+{
87788+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87789+
87790+ return (long)atomic64_inc_return_unchecked(v);
87791+}
87792+#endif
87793+
87794 static inline long atomic_long_dec_return(atomic_long_t *l)
87795 {
87796 atomic64_t *v = (atomic64_t *)l;
87797@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
87798
87799 typedef atomic_t atomic_long_t;
87800
87801+#ifdef CONFIG_PAX_REFCOUNT
87802+typedef atomic_unchecked_t atomic_long_unchecked_t;
87803+#else
87804+typedef atomic_t atomic_long_unchecked_t;
87805+#endif
87806+
87807 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
87808 static inline long atomic_long_read(atomic_long_t *l)
87809 {
87810@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
87811 return (long)atomic_read(v);
87812 }
87813
87814+#ifdef CONFIG_PAX_REFCOUNT
87815+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
87816+{
87817+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87818+
87819+ return (long)atomic_read_unchecked(v);
87820+}
87821+#endif
87822+
87823 static inline void atomic_long_set(atomic_long_t *l, long i)
87824 {
87825 atomic_t *v = (atomic_t *)l;
87826@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
87827 atomic_set(v, i);
87828 }
87829
87830+#ifdef CONFIG_PAX_REFCOUNT
87831+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
87832+{
87833+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87834+
87835+ atomic_set_unchecked(v, i);
87836+}
87837+#endif
87838+
87839 static inline void atomic_long_inc(atomic_long_t *l)
87840 {
87841 atomic_t *v = (atomic_t *)l;
87842@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
87843 atomic_inc(v);
87844 }
87845
87846+#ifdef CONFIG_PAX_REFCOUNT
87847+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
87848+{
87849+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87850+
87851+ atomic_inc_unchecked(v);
87852+}
87853+#endif
87854+
87855 static inline void atomic_long_dec(atomic_long_t *l)
87856 {
87857 atomic_t *v = (atomic_t *)l;
87858@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
87859 atomic_dec(v);
87860 }
87861
87862+#ifdef CONFIG_PAX_REFCOUNT
87863+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
87864+{
87865+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87866+
87867+ atomic_dec_unchecked(v);
87868+}
87869+#endif
87870+
87871 static inline void atomic_long_add(long i, atomic_long_t *l)
87872 {
87873 atomic_t *v = (atomic_t *)l;
87874@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
87875 atomic_add(i, v);
87876 }
87877
87878+#ifdef CONFIG_PAX_REFCOUNT
87879+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
87880+{
87881+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87882+
87883+ atomic_add_unchecked(i, v);
87884+}
87885+#endif
87886+
87887 static inline void atomic_long_sub(long i, atomic_long_t *l)
87888 {
87889 atomic_t *v = (atomic_t *)l;
87890@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
87891 atomic_sub(i, v);
87892 }
87893
87894+#ifdef CONFIG_PAX_REFCOUNT
87895+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
87896+{
87897+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87898+
87899+ atomic_sub_unchecked(i, v);
87900+}
87901+#endif
87902+
87903 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
87904 {
87905 atomic_t *v = (atomic_t *)l;
87906@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
87907 return atomic_add_negative(i, v);
87908 }
87909
87910-static inline long atomic_long_add_return(long i, atomic_long_t *l)
87911+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
87912 {
87913 atomic_t *v = (atomic_t *)l;
87914
87915 return (long)atomic_add_return(i, v);
87916 }
87917
87918+#ifdef CONFIG_PAX_REFCOUNT
87919+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
87920+{
87921+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87922+
87923+ return (long)atomic_add_return_unchecked(i, v);
87924+}
87925+
87926+#endif
87927+
87928 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
87929 {
87930 atomic_t *v = (atomic_t *)l;
87931@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
87932 return (long)atomic_inc_return(v);
87933 }
87934
87935+#ifdef CONFIG_PAX_REFCOUNT
87936+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
87937+{
87938+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87939+
87940+ return (long)atomic_inc_return_unchecked(v);
87941+}
87942+#endif
87943+
87944 static inline long atomic_long_dec_return(atomic_long_t *l)
87945 {
87946 atomic_t *v = (atomic_t *)l;
87947@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
87948
87949 #endif /* BITS_PER_LONG == 64 */
87950
87951+#ifdef CONFIG_PAX_REFCOUNT
87952+static inline void pax_refcount_needs_these_functions(void)
87953+{
87954+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
87955+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
87956+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
87957+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
87958+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
87959+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
87960+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
87961+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
87962+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
87963+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
87964+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
87965+#ifdef CONFIG_X86
87966+ atomic_clear_mask_unchecked(0, NULL);
87967+ atomic_set_mask_unchecked(0, NULL);
87968+#endif
87969+
87970+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
87971+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
87972+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
87973+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
87974+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
87975+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
87976+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
87977+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
87978+}
87979+#else
87980+#define atomic_read_unchecked(v) atomic_read(v)
87981+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
87982+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
87983+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
87984+#define atomic_inc_unchecked(v) atomic_inc(v)
87985+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
87986+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
87987+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
87988+#define atomic_dec_unchecked(v) atomic_dec(v)
87989+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
87990+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
87991+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
87992+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
87993+
87994+#define atomic_long_read_unchecked(v) atomic_long_read(v)
87995+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
87996+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
87997+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
87998+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
87999+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
88000+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
88001+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
88002+#endif
88003+
88004 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
88005diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
88006index 30ad9c8..c70c170 100644
88007--- a/include/asm-generic/atomic64.h
88008+++ b/include/asm-generic/atomic64.h
88009@@ -16,6 +16,8 @@ typedef struct {
88010 long long counter;
88011 } atomic64_t;
88012
88013+typedef atomic64_t atomic64_unchecked_t;
88014+
88015 #define ATOMIC64_INIT(i) { (i) }
88016
88017 extern long long atomic64_read(const atomic64_t *v);
88018@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
88019 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
88020 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
88021
88022+#define atomic64_read_unchecked(v) atomic64_read(v)
88023+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
88024+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
88025+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
88026+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
88027+#define atomic64_inc_unchecked(v) atomic64_inc(v)
88028+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
88029+#define atomic64_dec_unchecked(v) atomic64_dec(v)
88030+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
88031+
88032 #endif /* _ASM_GENERIC_ATOMIC64_H */
88033diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
88034index f5c40b0..e902f9d 100644
88035--- a/include/asm-generic/barrier.h
88036+++ b/include/asm-generic/barrier.h
88037@@ -82,7 +82,7 @@
88038 do { \
88039 compiletime_assert_atomic_type(*p); \
88040 smp_mb(); \
88041- ACCESS_ONCE(*p) = (v); \
88042+ ACCESS_ONCE_RW(*p) = (v); \
88043 } while (0)
88044
88045 #define smp_load_acquire(p) \
88046diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
88047index a60a7cc..0fe12f2 100644
88048--- a/include/asm-generic/bitops/__fls.h
88049+++ b/include/asm-generic/bitops/__fls.h
88050@@ -9,7 +9,7 @@
88051 *
88052 * Undefined if no set bit exists, so code should check against 0 first.
88053 */
88054-static __always_inline unsigned long __fls(unsigned long word)
88055+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
88056 {
88057 int num = BITS_PER_LONG - 1;
88058
88059diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
88060index 0576d1f..dad6c71 100644
88061--- a/include/asm-generic/bitops/fls.h
88062+++ b/include/asm-generic/bitops/fls.h
88063@@ -9,7 +9,7 @@
88064 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
88065 */
88066
88067-static __always_inline int fls(int x)
88068+static __always_inline int __intentional_overflow(-1) fls(int x)
88069 {
88070 int r = 32;
88071
88072diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
88073index b097cf8..3d40e14 100644
88074--- a/include/asm-generic/bitops/fls64.h
88075+++ b/include/asm-generic/bitops/fls64.h
88076@@ -15,7 +15,7 @@
88077 * at position 64.
88078 */
88079 #if BITS_PER_LONG == 32
88080-static __always_inline int fls64(__u64 x)
88081+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
88082 {
88083 __u32 h = x >> 32;
88084 if (h)
88085@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
88086 return fls(x);
88087 }
88088 #elif BITS_PER_LONG == 64
88089-static __always_inline int fls64(__u64 x)
88090+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
88091 {
88092 if (x == 0)
88093 return 0;
88094diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
88095index 630dd23..8c1dcb6b 100644
88096--- a/include/asm-generic/bug.h
88097+++ b/include/asm-generic/bug.h
88098@@ -62,13 +62,13 @@ struct bug_entry {
88099 * to provide better diagnostics.
88100 */
88101 #ifndef __WARN_TAINT
88102-extern __printf(3, 4)
88103+extern __printf(3, 4) __nocapture(1, 3, 4)
88104 void warn_slowpath_fmt(const char *file, const int line,
88105 const char *fmt, ...);
88106-extern __printf(4, 5)
88107+extern __printf(4, 5) __nocapture(1, 4, 5)
88108 void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
88109 const char *fmt, ...);
88110-extern void warn_slowpath_null(const char *file, const int line);
88111+extern __nocapture(1) void warn_slowpath_null(const char *file, const int line);
88112 #define WANT_WARN_ON_SLOWPATH
88113 #define __WARN() warn_slowpath_null(__FILE__, __LINE__)
88114 #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
88115diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
88116index 1bfcfe5..e04c5c9 100644
88117--- a/include/asm-generic/cache.h
88118+++ b/include/asm-generic/cache.h
88119@@ -6,7 +6,7 @@
88120 * cache lines need to provide their own cache.h.
88121 */
88122
88123-#define L1_CACHE_SHIFT 5
88124-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
88125+#define L1_CACHE_SHIFT 5UL
88126+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
88127
88128 #endif /* __ASM_GENERIC_CACHE_H */
88129diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
88130index 0d68a1e..b74a761 100644
88131--- a/include/asm-generic/emergency-restart.h
88132+++ b/include/asm-generic/emergency-restart.h
88133@@ -1,7 +1,7 @@
88134 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
88135 #define _ASM_GENERIC_EMERGENCY_RESTART_H
88136
88137-static inline void machine_emergency_restart(void)
88138+static inline __noreturn void machine_emergency_restart(void)
88139 {
88140 machine_restart(NULL);
88141 }
88142diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
88143index 90f99c7..00ce236 100644
88144--- a/include/asm-generic/kmap_types.h
88145+++ b/include/asm-generic/kmap_types.h
88146@@ -2,9 +2,9 @@
88147 #define _ASM_GENERIC_KMAP_TYPES_H
88148
88149 #ifdef __WITH_KM_FENCE
88150-# define KM_TYPE_NR 41
88151+# define KM_TYPE_NR 42
88152 #else
88153-# define KM_TYPE_NR 20
88154+# define KM_TYPE_NR 21
88155 #endif
88156
88157 #endif
88158diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
88159index 9ceb03b..62b0b8f 100644
88160--- a/include/asm-generic/local.h
88161+++ b/include/asm-generic/local.h
88162@@ -23,24 +23,37 @@ typedef struct
88163 atomic_long_t a;
88164 } local_t;
88165
88166+typedef struct {
88167+ atomic_long_unchecked_t a;
88168+} local_unchecked_t;
88169+
88170 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
88171
88172 #define local_read(l) atomic_long_read(&(l)->a)
88173+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
88174 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
88175+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
88176 #define local_inc(l) atomic_long_inc(&(l)->a)
88177+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
88178 #define local_dec(l) atomic_long_dec(&(l)->a)
88179+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
88180 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
88181+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
88182 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
88183+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
88184
88185 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
88186 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
88187 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
88188 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
88189 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
88190+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
88191 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
88192 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
88193+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
88194
88195 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
88196+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
88197 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
88198 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
88199 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
88200diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
88201index 725612b..9cc513a 100644
88202--- a/include/asm-generic/pgtable-nopmd.h
88203+++ b/include/asm-generic/pgtable-nopmd.h
88204@@ -1,14 +1,19 @@
88205 #ifndef _PGTABLE_NOPMD_H
88206 #define _PGTABLE_NOPMD_H
88207
88208-#ifndef __ASSEMBLY__
88209-
88210 #include <asm-generic/pgtable-nopud.h>
88211
88212-struct mm_struct;
88213-
88214 #define __PAGETABLE_PMD_FOLDED
88215
88216+#define PMD_SHIFT PUD_SHIFT
88217+#define PTRS_PER_PMD 1
88218+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
88219+#define PMD_MASK (~(PMD_SIZE-1))
88220+
88221+#ifndef __ASSEMBLY__
88222+
88223+struct mm_struct;
88224+
88225 /*
88226 * Having the pmd type consist of a pud gets the size right, and allows
88227 * us to conceptually access the pud entry that this pmd is folded into
88228@@ -16,11 +21,6 @@ struct mm_struct;
88229 */
88230 typedef struct { pud_t pud; } pmd_t;
88231
88232-#define PMD_SHIFT PUD_SHIFT
88233-#define PTRS_PER_PMD 1
88234-#define PMD_SIZE (1UL << PMD_SHIFT)
88235-#define PMD_MASK (~(PMD_SIZE-1))
88236-
88237 /*
88238 * The "pud_xxx()" functions here are trivial for a folded two-level
88239 * setup: the pmd is never bad, and a pmd always exists (as it's folded
88240diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
88241index 810431d..0ec4804f 100644
88242--- a/include/asm-generic/pgtable-nopud.h
88243+++ b/include/asm-generic/pgtable-nopud.h
88244@@ -1,10 +1,15 @@
88245 #ifndef _PGTABLE_NOPUD_H
88246 #define _PGTABLE_NOPUD_H
88247
88248-#ifndef __ASSEMBLY__
88249-
88250 #define __PAGETABLE_PUD_FOLDED
88251
88252+#define PUD_SHIFT PGDIR_SHIFT
88253+#define PTRS_PER_PUD 1
88254+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
88255+#define PUD_MASK (~(PUD_SIZE-1))
88256+
88257+#ifndef __ASSEMBLY__
88258+
88259 /*
88260 * Having the pud type consist of a pgd gets the size right, and allows
88261 * us to conceptually access the pgd entry that this pud is folded into
88262@@ -12,11 +17,6 @@
88263 */
88264 typedef struct { pgd_t pgd; } pud_t;
88265
88266-#define PUD_SHIFT PGDIR_SHIFT
88267-#define PTRS_PER_PUD 1
88268-#define PUD_SIZE (1UL << PUD_SHIFT)
88269-#define PUD_MASK (~(PUD_SIZE-1))
88270-
88271 /*
88272 * The "pgd_xxx()" functions here are trivial for a folded two-level
88273 * setup: the pud is never bad, and a pud always exists (as it's folded
88274@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
88275 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
88276
88277 #define pgd_populate(mm, pgd, pud) do { } while (0)
88278+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
88279 /*
88280 * (puds are folded into pgds so this doesn't get actually called,
88281 * but the define is needed for a generic inline function.)
88282diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
88283index 4d46085..f4e92ef 100644
88284--- a/include/asm-generic/pgtable.h
88285+++ b/include/asm-generic/pgtable.h
88286@@ -689,6 +689,22 @@ static inline int pmd_protnone(pmd_t pmd)
88287 }
88288 #endif /* CONFIG_NUMA_BALANCING */
88289
88290+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
88291+#ifdef CONFIG_PAX_KERNEXEC
88292+#error KERNEXEC requires pax_open_kernel
88293+#else
88294+static inline unsigned long pax_open_kernel(void) { return 0; }
88295+#endif
88296+#endif
88297+
88298+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
88299+#ifdef CONFIG_PAX_KERNEXEC
88300+#error KERNEXEC requires pax_close_kernel
88301+#else
88302+static inline unsigned long pax_close_kernel(void) { return 0; }
88303+#endif
88304+#endif
88305+
88306 #endif /* CONFIG_MMU */
88307
88308 #endif /* !__ASSEMBLY__ */
88309diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
88310index 72d8803..cb9749c 100644
88311--- a/include/asm-generic/uaccess.h
88312+++ b/include/asm-generic/uaccess.h
88313@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
88314 return __clear_user(to, n);
88315 }
88316
88317+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
88318+#ifdef CONFIG_PAX_MEMORY_UDEREF
88319+#error UDEREF requires pax_open_userland
88320+#else
88321+static inline unsigned long pax_open_userland(void) { return 0; }
88322+#endif
88323+#endif
88324+
88325+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
88326+#ifdef CONFIG_PAX_MEMORY_UDEREF
88327+#error UDEREF requires pax_close_userland
88328+#else
88329+static inline unsigned long pax_close_userland(void) { return 0; }
88330+#endif
88331+#endif
88332+
88333 #endif /* __ASM_GENERIC_UACCESS_H */
88334diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
88335index ac78910..8b5f068 100644
88336--- a/include/asm-generic/vmlinux.lds.h
88337+++ b/include/asm-generic/vmlinux.lds.h
88338@@ -234,6 +234,7 @@
88339 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
88340 VMLINUX_SYMBOL(__start_rodata) = .; \
88341 *(.rodata) *(.rodata.*) \
88342+ *(.data..read_only) \
88343 *(__vermagic) /* Kernel version magic */ \
88344 . = ALIGN(8); \
88345 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
88346@@ -492,6 +493,7 @@
88347 KERNEL_CTORS() \
88348 MCOUNT_REC() \
88349 *(.init.rodata) \
88350+ *(.init.rodata.*) \
88351 FTRACE_EVENTS() \
88352 TRACE_SYSCALLS() \
88353 KPROBE_BLACKLIST() \
88354@@ -511,6 +513,8 @@
88355
88356 #define EXIT_DATA \
88357 *(.exit.data) \
88358+ *(.exit.rodata) \
88359+ *(.exit.rodata.*) \
88360 MEM_DISCARD(exit.data) \
88361 MEM_DISCARD(exit.rodata)
88362
88363@@ -727,17 +731,18 @@
88364 * section in the linker script will go there too. @phdr should have
88365 * a leading colon.
88366 *
88367- * Note that this macros defines __per_cpu_load as an absolute symbol.
88368+ * Note that this macros defines per_cpu_load as an absolute symbol.
88369 * If there is no need to put the percpu section at a predetermined
88370 * address, use PERCPU_SECTION.
88371 */
88372 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
88373- VMLINUX_SYMBOL(__per_cpu_load) = .; \
88374- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
88375+ per_cpu_load = .; \
88376+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
88377 - LOAD_OFFSET) { \
88378+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
88379 PERCPU_INPUT(cacheline) \
88380 } phdr \
88381- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
88382+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
88383
88384 /**
88385 * PERCPU_SECTION - define output section for percpu area, simple version
88386diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
88387index 623a59c..1e79ab9 100644
88388--- a/include/crypto/algapi.h
88389+++ b/include/crypto/algapi.h
88390@@ -34,7 +34,7 @@ struct crypto_type {
88391 unsigned int maskclear;
88392 unsigned int maskset;
88393 unsigned int tfmsize;
88394-};
88395+} __do_const;
88396
88397 struct crypto_instance {
88398 struct crypto_alg alg;
88399diff --git a/include/drm/drmP.h b/include/drm/drmP.h
88400index e928625..ff97886 100644
88401--- a/include/drm/drmP.h
88402+++ b/include/drm/drmP.h
88403@@ -59,6 +59,7 @@
88404
88405 #include <asm/mman.h>
88406 #include <asm/pgalloc.h>
88407+#include <asm/local.h>
88408 #include <asm/uaccess.h>
88409
88410 #include <uapi/drm/drm.h>
88411@@ -133,17 +134,18 @@ void drm_err(const char *format, ...);
88412 /*@{*/
88413
88414 /* driver capabilities and requirements mask */
88415-#define DRIVER_USE_AGP 0x1
88416-#define DRIVER_PCI_DMA 0x8
88417-#define DRIVER_SG 0x10
88418-#define DRIVER_HAVE_DMA 0x20
88419-#define DRIVER_HAVE_IRQ 0x40
88420-#define DRIVER_IRQ_SHARED 0x80
88421-#define DRIVER_GEM 0x1000
88422-#define DRIVER_MODESET 0x2000
88423-#define DRIVER_PRIME 0x4000
88424-#define DRIVER_RENDER 0x8000
88425-#define DRIVER_ATOMIC 0x10000
88426+#define DRIVER_USE_AGP 0x1
88427+#define DRIVER_PCI_DMA 0x8
88428+#define DRIVER_SG 0x10
88429+#define DRIVER_HAVE_DMA 0x20
88430+#define DRIVER_HAVE_IRQ 0x40
88431+#define DRIVER_IRQ_SHARED 0x80
88432+#define DRIVER_GEM 0x1000
88433+#define DRIVER_MODESET 0x2000
88434+#define DRIVER_PRIME 0x4000
88435+#define DRIVER_RENDER 0x8000
88436+#define DRIVER_ATOMIC 0x10000
88437+#define DRIVER_KMS_LEGACY_CONTEXT 0x20000
88438
88439 /***********************************************************************/
88440 /** \name Macros to make printk easier */
88441@@ -224,10 +226,12 @@ void drm_err(const char *format, ...);
88442 * \param cmd command.
88443 * \param arg argument.
88444 */
88445-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
88446+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
88447+ struct drm_file *file_priv);
88448+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
88449 struct drm_file *file_priv);
88450
88451-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
88452+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
88453 unsigned long arg);
88454
88455 #define DRM_IOCTL_NR(n) _IOC_NR(n)
88456@@ -243,10 +247,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
88457 struct drm_ioctl_desc {
88458 unsigned int cmd;
88459 int flags;
88460- drm_ioctl_t *func;
88461+ drm_ioctl_t func;
88462 unsigned int cmd_drv;
88463 const char *name;
88464-};
88465+} __do_const;
88466
88467 /**
88468 * Creates a driver or general drm_ioctl_desc array entry for the given
88469@@ -632,7 +636,8 @@ struct drm_info_list {
88470 int (*show)(struct seq_file*, void*); /** show callback */
88471 u32 driver_features; /**< Required driver features for this entry */
88472 void *data;
88473-};
88474+} __do_const;
88475+typedef struct drm_info_list __no_const drm_info_list_no_const;
88476
88477 /**
88478 * debugfs node structure. This structure represents a debugfs file.
88479@@ -716,7 +721,7 @@ struct drm_device {
88480
88481 /** \name Usage Counters */
88482 /*@{ */
88483- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
88484+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
88485 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
88486 int buf_use; /**< Buffers in use -- cannot alloc */
88487 atomic_t buf_alloc; /**< Buffer allocation in progress */
88488diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
88489index c250a22..59d2094 100644
88490--- a/include/drm/drm_crtc_helper.h
88491+++ b/include/drm/drm_crtc_helper.h
88492@@ -160,7 +160,7 @@ struct drm_encoder_helper_funcs {
88493 int (*atomic_check)(struct drm_encoder *encoder,
88494 struct drm_crtc_state *crtc_state,
88495 struct drm_connector_state *conn_state);
88496-};
88497+} __no_const;
88498
88499 /**
88500 * struct drm_connector_helper_funcs - helper operations for connectors
88501diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
88502index d016dc5..3951fe0 100644
88503--- a/include/drm/i915_pciids.h
88504+++ b/include/drm/i915_pciids.h
88505@@ -37,7 +37,7 @@
88506 */
88507 #define INTEL_VGA_DEVICE(id, info) { \
88508 0x8086, id, \
88509- ~0, ~0, \
88510+ PCI_ANY_ID, PCI_ANY_ID, \
88511 0x030000, 0xff0000, \
88512 (unsigned long) info }
88513
88514diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
88515index 72dcbe8..8db58d7 100644
88516--- a/include/drm/ttm/ttm_memory.h
88517+++ b/include/drm/ttm/ttm_memory.h
88518@@ -48,7 +48,7 @@
88519
88520 struct ttm_mem_shrink {
88521 int (*do_shrink) (struct ttm_mem_shrink *);
88522-};
88523+} __no_const;
88524
88525 /**
88526 * struct ttm_mem_global - Global memory accounting structure.
88527diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
88528index 49a8284..9643967 100644
88529--- a/include/drm/ttm/ttm_page_alloc.h
88530+++ b/include/drm/ttm/ttm_page_alloc.h
88531@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
88532 */
88533 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
88534
88535+struct device;
88536 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
88537 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
88538
88539diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
88540index 4b840e8..155d235 100644
88541--- a/include/keys/asymmetric-subtype.h
88542+++ b/include/keys/asymmetric-subtype.h
88543@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
88544 /* Verify the signature on a key of this subtype (optional) */
88545 int (*verify_signature)(const struct key *key,
88546 const struct public_key_signature *sig);
88547-};
88548+} __do_const;
88549
88550 /**
88551 * asymmetric_key_subtype - Get the subtype from an asymmetric key
88552diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
88553index c1da539..1dcec55 100644
88554--- a/include/linux/atmdev.h
88555+++ b/include/linux/atmdev.h
88556@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
88557 #endif
88558
88559 struct k_atm_aal_stats {
88560-#define __HANDLE_ITEM(i) atomic_t i
88561+#define __HANDLE_ITEM(i) atomic_unchecked_t i
88562 __AAL_STAT_ITEMS
88563 #undef __HANDLE_ITEM
88564 };
88565@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
88566 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
88567 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
88568 struct module *owner;
88569-};
88570+} __do_const ;
88571
88572 struct atmphy_ops {
88573 int (*start)(struct atm_dev *dev);
88574diff --git a/include/linux/atomic.h b/include/linux/atomic.h
88575index 5b08a85..60922fb 100644
88576--- a/include/linux/atomic.h
88577+++ b/include/linux/atomic.h
88578@@ -12,7 +12,7 @@
88579 * Atomically adds @a to @v, so long as @v was not already @u.
88580 * Returns non-zero if @v was not @u, and zero otherwise.
88581 */
88582-static inline int atomic_add_unless(atomic_t *v, int a, int u)
88583+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
88584 {
88585 return __atomic_add_unless(v, a, u) != u;
88586 }
88587diff --git a/include/linux/audit.h b/include/linux/audit.h
88588index c2e7e3a..8bfc0e1 100644
88589--- a/include/linux/audit.h
88590+++ b/include/linux/audit.h
88591@@ -223,7 +223,7 @@ static inline void audit_ptrace(struct task_struct *t)
88592 extern unsigned int audit_serial(void);
88593 extern int auditsc_get_stamp(struct audit_context *ctx,
88594 struct timespec *t, unsigned int *serial);
88595-extern int audit_set_loginuid(kuid_t loginuid);
88596+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
88597
88598 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
88599 {
88600diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
88601index 576e463..28fd926 100644
88602--- a/include/linux/binfmts.h
88603+++ b/include/linux/binfmts.h
88604@@ -44,7 +44,7 @@ struct linux_binprm {
88605 unsigned interp_flags;
88606 unsigned interp_data;
88607 unsigned long loader, exec;
88608-};
88609+} __randomize_layout;
88610
88611 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
88612 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
88613@@ -77,8 +77,10 @@ struct linux_binfmt {
88614 int (*load_binary)(struct linux_binprm *);
88615 int (*load_shlib)(struct file *);
88616 int (*core_dump)(struct coredump_params *cprm);
88617+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
88618+ void (*handle_mmap)(struct file *);
88619 unsigned long min_coredump; /* minimal dump size */
88620-};
88621+} __do_const __randomize_layout;
88622
88623 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
88624
88625diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
88626index dbfbf49..10be372 100644
88627--- a/include/linux/bitmap.h
88628+++ b/include/linux/bitmap.h
88629@@ -299,7 +299,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
88630 return __bitmap_full(src, nbits);
88631 }
88632
88633-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
88634+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
88635 {
88636 if (small_const_nbits(nbits))
88637 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
88638diff --git a/include/linux/bitops.h b/include/linux/bitops.h
88639index 5d858e0..336c1d9 100644
88640--- a/include/linux/bitops.h
88641+++ b/include/linux/bitops.h
88642@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
88643 * @word: value to rotate
88644 * @shift: bits to roll
88645 */
88646-static inline __u32 rol32(__u32 word, unsigned int shift)
88647+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
88648 {
88649 return (word << shift) | (word >> (32 - shift));
88650 }
88651@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
88652 * @word: value to rotate
88653 * @shift: bits to roll
88654 */
88655-static inline __u32 ror32(__u32 word, unsigned int shift)
88656+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
88657 {
88658 return (word >> shift) | (word << (32 - shift));
88659 }
88660@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
88661 return (__s32)(value << shift) >> shift;
88662 }
88663
88664-static inline unsigned fls_long(unsigned long l)
88665+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
88666 {
88667 if (sizeof(l) == 4)
88668 return fls(l);
88669diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
88670index 7f9a516..8889453 100644
88671--- a/include/linux/blkdev.h
88672+++ b/include/linux/blkdev.h
88673@@ -1616,7 +1616,7 @@ struct block_device_operations {
88674 /* this callback is with swap_lock and sometimes page table lock held */
88675 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
88676 struct module *owner;
88677-};
88678+} __do_const;
88679
88680 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
88681 unsigned long);
88682diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
88683index afc1343..9735539 100644
88684--- a/include/linux/blktrace_api.h
88685+++ b/include/linux/blktrace_api.h
88686@@ -25,7 +25,7 @@ struct blk_trace {
88687 struct dentry *dropped_file;
88688 struct dentry *msg_file;
88689 struct list_head running_list;
88690- atomic_t dropped;
88691+ atomic_unchecked_t dropped;
88692 };
88693
88694 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
88695diff --git a/include/linux/cache.h b/include/linux/cache.h
88696index 17e7e82..1d7da26 100644
88697--- a/include/linux/cache.h
88698+++ b/include/linux/cache.h
88699@@ -16,6 +16,14 @@
88700 #define __read_mostly
88701 #endif
88702
88703+#ifndef __read_only
88704+#ifdef CONFIG_PAX_KERNEXEC
88705+#error KERNEXEC requires __read_only
88706+#else
88707+#define __read_only __read_mostly
88708+#endif
88709+#endif
88710+
88711 #ifndef ____cacheline_aligned
88712 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
88713 #endif
88714diff --git a/include/linux/capability.h b/include/linux/capability.h
88715index aa93e5e..985a1b0 100644
88716--- a/include/linux/capability.h
88717+++ b/include/linux/capability.h
88718@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
88719 extern bool capable(int cap);
88720 extern bool ns_capable(struct user_namespace *ns, int cap);
88721 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
88722+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
88723 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
88724+extern bool capable_nolog(int cap);
88725+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
88726
88727 /* audit system wants to get cap info from files as well */
88728 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
88729
88730+extern int is_privileged_binary(const struct dentry *dentry);
88731+
88732 #endif /* !_LINUX_CAPABILITY_H */
88733diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
88734index 8609d57..86e4d79 100644
88735--- a/include/linux/cdrom.h
88736+++ b/include/linux/cdrom.h
88737@@ -87,7 +87,6 @@ struct cdrom_device_ops {
88738
88739 /* driver specifications */
88740 const int capability; /* capability flags */
88741- int n_minors; /* number of active minor devices */
88742 /* handle uniform packets for scsi type devices (scsi,atapi) */
88743 int (*generic_packet) (struct cdrom_device_info *,
88744 struct packet_command *);
88745diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
88746index 4ce9056..86caac6 100644
88747--- a/include/linux/cleancache.h
88748+++ b/include/linux/cleancache.h
88749@@ -31,7 +31,7 @@ struct cleancache_ops {
88750 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
88751 void (*invalidate_inode)(int, struct cleancache_filekey);
88752 void (*invalidate_fs)(int);
88753-};
88754+} __no_const;
88755
88756 extern struct cleancache_ops *
88757 cleancache_register_ops(struct cleancache_ops *ops);
88758diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
88759index 5591ea7..61b77ce 100644
88760--- a/include/linux/clk-provider.h
88761+++ b/include/linux/clk-provider.h
88762@@ -195,6 +195,7 @@ struct clk_ops {
88763 void (*init)(struct clk_hw *hw);
88764 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
88765 };
88766+typedef struct clk_ops __no_const clk_ops_no_const;
88767
88768 /**
88769 * struct clk_init_data - holds init data that's common to all clocks and is
88770diff --git a/include/linux/compat.h b/include/linux/compat.h
88771index ab25814..d1540d1 100644
88772--- a/include/linux/compat.h
88773+++ b/include/linux/compat.h
88774@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
88775 compat_size_t __user *len_ptr);
88776
88777 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
88778-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
88779+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
88780 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
88781 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
88782 compat_ssize_t msgsz, int msgflg);
88783@@ -325,7 +325,7 @@ asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
88784 long compat_sys_msgctl(int first, int second, void __user *uptr);
88785 long compat_sys_shmctl(int first, int second, void __user *uptr);
88786 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
88787- unsigned nsems, const struct compat_timespec __user *timeout);
88788+ compat_long_t nsems, const struct compat_timespec __user *timeout);
88789 asmlinkage long compat_sys_keyctl(u32 option,
88790 u32 arg2, u32 arg3, u32 arg4, u32 arg5);
88791 asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
88792@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
88793 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
88794 compat_ulong_t addr, compat_ulong_t data);
88795 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
88796- compat_long_t addr, compat_long_t data);
88797+ compat_ulong_t addr, compat_ulong_t data);
88798
88799 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
88800 /*
88801diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
88802index cdf13ca..ba5e086 100644
88803--- a/include/linux/compiler-gcc.h
88804+++ b/include/linux/compiler-gcc.h
88805@@ -94,8 +94,8 @@
88806 */
88807 #define __pure __attribute__((pure))
88808 #define __aligned(x) __attribute__((aligned(x)))
88809-#define __printf(a, b) __attribute__((format(printf, a, b)))
88810-#define __scanf(a, b) __attribute__((format(scanf, a, b)))
88811+#define __printf(a, b) __attribute__((format(printf, a, b))) __nocapture(a, b)
88812+#define __scanf(a, b) __attribute__((format(scanf, a, b))) __nocapture(a, b)
88813 #define noinline __attribute__((noinline))
88814 #define __attribute_const__ __attribute__((__const__))
88815 #define __maybe_unused __attribute__((unused))
88816diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
88817index 769e198..7ee7cb5 100644
88818--- a/include/linux/compiler-gcc4.h
88819+++ b/include/linux/compiler-gcc4.h
88820@@ -39,9 +39,38 @@
88821 # define __compiletime_warning(message) __attribute__((warning(message)))
88822 # define __compiletime_error(message) __attribute__((error(message)))
88823 #endif /* __CHECKER__ */
88824+
88825+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
88826+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
88827+#define __bos0(ptr) __bos((ptr), 0)
88828+#define __bos1(ptr) __bos((ptr), 1)
88829 #endif /* GCC_VERSION >= 40300 */
88830
88831 #if GCC_VERSION >= 40500
88832+
88833+#ifdef RANDSTRUCT_PLUGIN
88834+#define __randomize_layout __attribute__((randomize_layout))
88835+#define __no_randomize_layout __attribute__((no_randomize_layout))
88836+#endif
88837+
88838+#ifdef CONSTIFY_PLUGIN
88839+#define __no_const __attribute__((no_const))
88840+#define __do_const __attribute__((do_const))
88841+#endif
88842+
88843+#ifdef SIZE_OVERFLOW_PLUGIN
88844+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
88845+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
88846+#endif
88847+
88848+#ifdef LATENT_ENTROPY_PLUGIN
88849+#define __latent_entropy __attribute__((latent_entropy))
88850+#endif
88851+
88852+#ifdef INITIFY_PLUGIN
88853+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
88854+#endif
88855+
88856 /*
88857 * Mark a position in code as unreachable. This can be used to
88858 * suppress control flow warnings after asm blocks that transfer
88859diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
88860index efee493..8aa8f6b 100644
88861--- a/include/linux/compiler-gcc5.h
88862+++ b/include/linux/compiler-gcc5.h
88863@@ -28,6 +28,34 @@
88864 # define __compiletime_error(message) __attribute__((error(message)))
88865 #endif /* __CHECKER__ */
88866
88867+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
88868+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
88869+#define __bos0(ptr) __bos((ptr), 0)
88870+#define __bos1(ptr) __bos((ptr), 1)
88871+
88872+#ifdef RANDSTRUCT_PLUGIN
88873+#define __randomize_layout __attribute__((randomize_layout))
88874+#define __no_randomize_layout __attribute__((no_randomize_layout))
88875+#endif
88876+
88877+#ifdef CONSTIFY_PLUGIN
88878+#define __no_const __attribute__((no_const))
88879+#define __do_const __attribute__((do_const))
88880+#endif
88881+
88882+#ifdef SIZE_OVERFLOW_PLUGIN
88883+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
88884+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
88885+#endif
88886+
88887+#ifdef LATENT_ENTROPY_PLUGIN
88888+#define __latent_entropy __attribute__((latent_entropy))
88889+#endif
88890+
88891+#ifdef INITIFY_PLUGIN
88892+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
88893+#endif
88894+
88895 /*
88896 * Mark a position in code as unreachable. This can be used to
88897 * suppress control flow warnings after asm blocks that transfer
88898diff --git a/include/linux/compiler.h b/include/linux/compiler.h
88899index 1b45e4a..eff29a7 100644
88900--- a/include/linux/compiler.h
88901+++ b/include/linux/compiler.h
88902@@ -5,11 +5,14 @@
88903
88904 #ifdef __CHECKER__
88905 # define __user __attribute__((noderef, address_space(1)))
88906+# define __force_user __force __user
88907 # define __kernel __attribute__((address_space(0)))
88908+# define __force_kernel __force __kernel
88909 # define __safe __attribute__((safe))
88910 # define __force __attribute__((force))
88911 # define __nocast __attribute__((nocast))
88912 # define __iomem __attribute__((noderef, address_space(2)))
88913+# define __force_iomem __force __iomem
88914 # define __must_hold(x) __attribute__((context(x,1,1)))
88915 # define __acquires(x) __attribute__((context(x,0,1)))
88916 # define __releases(x) __attribute__((context(x,1,0)))
88917@@ -17,20 +20,37 @@
88918 # define __release(x) __context__(x,-1)
88919 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
88920 # define __percpu __attribute__((noderef, address_space(3)))
88921+# define __force_percpu __force __percpu
88922 #ifdef CONFIG_SPARSE_RCU_POINTER
88923 # define __rcu __attribute__((noderef, address_space(4)))
88924+# define __force_rcu __force __rcu
88925 #else
88926 # define __rcu
88927+# define __force_rcu
88928 #endif
88929 extern void __chk_user_ptr(const volatile void __user *);
88930 extern void __chk_io_ptr(const volatile void __iomem *);
88931 #else
88932-# define __user
88933-# define __kernel
88934+# ifdef CHECKER_PLUGIN
88935+//# define __user
88936+//# define __force_user
88937+//# define __kernel
88938+//# define __force_kernel
88939+# else
88940+# ifdef STRUCTLEAK_PLUGIN
88941+# define __user __attribute__((user))
88942+# else
88943+# define __user
88944+# endif
88945+# define __force_user
88946+# define __kernel
88947+# define __force_kernel
88948+# endif
88949 # define __safe
88950 # define __force
88951 # define __nocast
88952 # define __iomem
88953+# define __force_iomem
88954 # define __chk_user_ptr(x) (void)0
88955 # define __chk_io_ptr(x) (void)0
88956 # define __builtin_warning(x, y...) (1)
88957@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
88958 # define __release(x) (void)0
88959 # define __cond_lock(x,c) (c)
88960 # define __percpu
88961+# define __force_percpu
88962 # define __rcu
88963+# define __force_rcu
88964 #endif
88965
88966 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
88967@@ -205,32 +227,32 @@ static __always_inline void data_access_exceeds_word_size(void)
88968 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
88969 {
88970 switch (size) {
88971- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
88972- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
88973- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
88974+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
88975+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
88976+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
88977 #ifdef CONFIG_64BIT
88978- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
88979+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
88980 #endif
88981 default:
88982 barrier();
88983- __builtin_memcpy((void *)res, (const void *)p, size);
88984+ __builtin_memcpy(res, (const void *)p, size);
88985 data_access_exceeds_word_size();
88986 barrier();
88987 }
88988 }
88989
88990-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
88991+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
88992 {
88993 switch (size) {
88994- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
88995- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
88996- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
88997+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
88998+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
88999+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
89000 #ifdef CONFIG_64BIT
89001- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
89002+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
89003 #endif
89004 default:
89005 barrier();
89006- __builtin_memcpy((void *)p, (const void *)res, size);
89007+ __builtin_memcpy((void *)p, res, size);
89008 data_access_exceeds_word_size();
89009 barrier();
89010 }
89011@@ -364,6 +386,38 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
89012 # define __attribute_const__ /* unimplemented */
89013 #endif
89014
89015+#ifndef __randomize_layout
89016+# define __randomize_layout
89017+#endif
89018+
89019+#ifndef __no_randomize_layout
89020+# define __no_randomize_layout
89021+#endif
89022+
89023+#ifndef __no_const
89024+# define __no_const
89025+#endif
89026+
89027+#ifndef __do_const
89028+# define __do_const
89029+#endif
89030+
89031+#ifndef __size_overflow
89032+# define __size_overflow(...)
89033+#endif
89034+
89035+#ifndef __intentional_overflow
89036+# define __intentional_overflow(...)
89037+#endif
89038+
89039+#ifndef __latent_entropy
89040+# define __latent_entropy
89041+#endif
89042+
89043+#ifndef __nocapture
89044+# define __nocapture(...)
89045+#endif
89046+
89047 /*
89048 * Tell gcc if a function is cold. The compiler will assume any path
89049 * directly leading to the call is unlikely.
89050@@ -373,6 +427,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
89051 #define __cold
89052 #endif
89053
89054+#ifndef __alloc_size
89055+#define __alloc_size(...)
89056+#endif
89057+
89058+#ifndef __bos
89059+#define __bos(ptr, arg)
89060+#endif
89061+
89062+#ifndef __bos0
89063+#define __bos0(ptr)
89064+#endif
89065+
89066+#ifndef __bos1
89067+#define __bos1(ptr)
89068+#endif
89069+
89070 /* Simple shorthand for a section definition */
89071 #ifndef __section
89072 # define __section(S) __attribute__ ((__section__(#S)))
89073@@ -387,6 +457,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
89074 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
89075 #endif
89076
89077+#define __type_is_unsigned(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))
89078+
89079 /* Is this type a native word size -- useful for atomic operations */
89080 #ifndef __native_word
89081 # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
89082@@ -466,8 +538,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
89083 */
89084 #define __ACCESS_ONCE(x) ({ \
89085 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
89086- (volatile typeof(x) *)&(x); })
89087+ (volatile const typeof(x) *)&(x); })
89088 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
89089+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
89090
89091 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
89092 #ifdef CONFIG_KPROBES
89093diff --git a/include/linux/completion.h b/include/linux/completion.h
89094index 5d5aaae..0ea9b84 100644
89095--- a/include/linux/completion.h
89096+++ b/include/linux/completion.h
89097@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
89098
89099 extern void wait_for_completion(struct completion *);
89100 extern void wait_for_completion_io(struct completion *);
89101-extern int wait_for_completion_interruptible(struct completion *x);
89102-extern int wait_for_completion_killable(struct completion *x);
89103+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
89104+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
89105 extern unsigned long wait_for_completion_timeout(struct completion *x,
89106- unsigned long timeout);
89107+ unsigned long timeout) __intentional_overflow(-1);
89108 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
89109- unsigned long timeout);
89110+ unsigned long timeout) __intentional_overflow(-1);
89111 extern long wait_for_completion_interruptible_timeout(
89112- struct completion *x, unsigned long timeout);
89113+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
89114 extern long wait_for_completion_killable_timeout(
89115- struct completion *x, unsigned long timeout);
89116+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
89117 extern bool try_wait_for_completion(struct completion *x);
89118 extern bool completion_done(struct completion *x);
89119
89120diff --git a/include/linux/configfs.h b/include/linux/configfs.h
89121index 34025df..2a6ee32 100644
89122--- a/include/linux/configfs.h
89123+++ b/include/linux/configfs.h
89124@@ -64,7 +64,7 @@ struct config_item {
89125 struct dentry *ci_dentry;
89126 };
89127
89128-extern int config_item_set_name(struct config_item *, const char *, ...);
89129+extern __printf(2, 3) int config_item_set_name(struct config_item *, const char *, ...);
89130
89131 static inline char *config_item_name(struct config_item * item)
89132 {
89133@@ -125,7 +125,7 @@ struct configfs_attribute {
89134 const char *ca_name;
89135 struct module *ca_owner;
89136 umode_t ca_mode;
89137-};
89138+} __do_const;
89139
89140 /*
89141 * Users often need to create attribute structures for their configurable
89142diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
89143index 2ee4888..0451f5e 100644
89144--- a/include/linux/cpufreq.h
89145+++ b/include/linux/cpufreq.h
89146@@ -207,6 +207,7 @@ struct global_attr {
89147 ssize_t (*store)(struct kobject *a, struct attribute *b,
89148 const char *c, size_t count);
89149 };
89150+typedef struct global_attr __no_const global_attr_no_const;
89151
89152 #define define_one_global_ro(_name) \
89153 static struct global_attr _name = \
89154@@ -278,7 +279,7 @@ struct cpufreq_driver {
89155 bool boost_supported;
89156 bool boost_enabled;
89157 int (*set_boost)(int state);
89158-};
89159+} __do_const;
89160
89161 /* flags */
89162 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
89163diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
89164index 9c5e892..feb34e0 100644
89165--- a/include/linux/cpuidle.h
89166+++ b/include/linux/cpuidle.h
89167@@ -59,7 +59,8 @@ struct cpuidle_state {
89168 void (*enter_freeze) (struct cpuidle_device *dev,
89169 struct cpuidle_driver *drv,
89170 int index);
89171-};
89172+} __do_const;
89173+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
89174
89175 /* Idle State Flags */
89176 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
89177@@ -227,7 +228,7 @@ struct cpuidle_governor {
89178 void (*reflect) (struct cpuidle_device *dev, int index);
89179
89180 struct module *owner;
89181-};
89182+} __do_const;
89183
89184 #ifdef CONFIG_CPU_IDLE
89185 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
89186diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
89187index 086549a..a572d94 100644
89188--- a/include/linux/cpumask.h
89189+++ b/include/linux/cpumask.h
89190@@ -126,17 +126,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
89191 }
89192
89193 /* Valid inputs for n are -1 and 0. */
89194-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89195+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
89196 {
89197 return n+1;
89198 }
89199
89200-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89201+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
89202 {
89203 return n+1;
89204 }
89205
89206-static inline unsigned int cpumask_next_and(int n,
89207+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
89208 const struct cpumask *srcp,
89209 const struct cpumask *andp)
89210 {
89211@@ -182,7 +182,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
89212 *
89213 * Returns >= nr_cpu_ids if no further cpus set.
89214 */
89215-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89216+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
89217 {
89218 /* -1 is a legal arg here. */
89219 if (n != -1)
89220@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89221 *
89222 * Returns >= nr_cpu_ids if no further cpus unset.
89223 */
89224-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89225+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
89226 {
89227 /* -1 is a legal arg here. */
89228 if (n != -1)
89229@@ -205,7 +205,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89230 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
89231 }
89232
89233-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
89234+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
89235 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
89236 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
89237
89238@@ -472,7 +472,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
89239 * cpumask_weight - Count of bits in *srcp
89240 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
89241 */
89242-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
89243+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
89244 {
89245 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
89246 }
89247diff --git a/include/linux/cred.h b/include/linux/cred.h
89248index 2fb2ca2..d6a3340 100644
89249--- a/include/linux/cred.h
89250+++ b/include/linux/cred.h
89251@@ -35,7 +35,7 @@ struct group_info {
89252 int nblocks;
89253 kgid_t small_block[NGROUPS_SMALL];
89254 kgid_t *blocks[0];
89255-};
89256+} __randomize_layout;
89257
89258 /**
89259 * get_group_info - Get a reference to a group info structure
89260@@ -137,7 +137,7 @@ struct cred {
89261 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
89262 struct group_info *group_info; /* supplementary groups for euid/fsgid */
89263 struct rcu_head rcu; /* RCU deletion hook */
89264-};
89265+} __randomize_layout;
89266
89267 extern void __put_cred(struct cred *);
89268 extern void exit_creds(struct task_struct *);
89269@@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
89270 static inline void validate_process_creds(void)
89271 {
89272 }
89273+static inline void validate_task_creds(struct task_struct *task)
89274+{
89275+}
89276 #endif
89277
89278 /**
89279@@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
89280
89281 #define task_uid(task) (task_cred_xxx((task), uid))
89282 #define task_euid(task) (task_cred_xxx((task), euid))
89283+#define task_securebits(task) (task_cred_xxx((task), securebits))
89284
89285 #define current_cred_xxx(xxx) \
89286 ({ \
89287diff --git a/include/linux/crypto.h b/include/linux/crypto.h
89288index fb5ef16..05d1e59 100644
89289--- a/include/linux/crypto.h
89290+++ b/include/linux/crypto.h
89291@@ -626,7 +626,7 @@ struct cipher_tfm {
89292 const u8 *key, unsigned int keylen);
89293 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
89294 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
89295-};
89296+} __no_const;
89297
89298 struct hash_tfm {
89299 int (*init)(struct hash_desc *desc);
89300@@ -647,13 +647,13 @@ struct compress_tfm {
89301 int (*cot_decompress)(struct crypto_tfm *tfm,
89302 const u8 *src, unsigned int slen,
89303 u8 *dst, unsigned int *dlen);
89304-};
89305+} __no_const;
89306
89307 struct rng_tfm {
89308 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
89309 unsigned int dlen);
89310 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
89311-};
89312+} __no_const;
89313
89314 #define crt_ablkcipher crt_u.ablkcipher
89315 #define crt_aead crt_u.aead
89316diff --git a/include/linux/ctype.h b/include/linux/ctype.h
89317index 653589e..4ef254a 100644
89318--- a/include/linux/ctype.h
89319+++ b/include/linux/ctype.h
89320@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
89321 * Fast implementation of tolower() for internal usage. Do not use in your
89322 * code.
89323 */
89324-static inline char _tolower(const char c)
89325+static inline unsigned char _tolower(const unsigned char c)
89326 {
89327 return c | 0x20;
89328 }
89329diff --git a/include/linux/dcache.h b/include/linux/dcache.h
89330index d835879..c8e5b92 100644
89331--- a/include/linux/dcache.h
89332+++ b/include/linux/dcache.h
89333@@ -123,6 +123,9 @@ struct dentry {
89334 unsigned long d_time; /* used by d_revalidate */
89335 void *d_fsdata; /* fs-specific data */
89336
89337+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
89338+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
89339+#endif
89340 struct list_head d_lru; /* LRU list */
89341 struct list_head d_child; /* child of parent list */
89342 struct list_head d_subdirs; /* our children */
89343@@ -133,7 +136,7 @@ struct dentry {
89344 struct hlist_node d_alias; /* inode alias list */
89345 struct rcu_head d_rcu;
89346 } d_u;
89347-};
89348+} __randomize_layout;
89349
89350 /*
89351 * dentry->d_lock spinlock nesting subclasses:
89352@@ -319,7 +322,7 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
89353
89354 static inline unsigned d_count(const struct dentry *dentry)
89355 {
89356- return dentry->d_lockref.count;
89357+ return __lockref_read(&dentry->d_lockref);
89358 }
89359
89360 /*
89361@@ -347,7 +350,7 @@ extern char *dentry_path(struct dentry *, char *, int);
89362 static inline struct dentry *dget_dlock(struct dentry *dentry)
89363 {
89364 if (dentry)
89365- dentry->d_lockref.count++;
89366+ __lockref_inc(&dentry->d_lockref);
89367 return dentry;
89368 }
89369
89370diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
89371index 7925bf0..d5143d2 100644
89372--- a/include/linux/decompress/mm.h
89373+++ b/include/linux/decompress/mm.h
89374@@ -77,7 +77,7 @@ static void free(void *where)
89375 * warnings when not needed (indeed large_malloc / large_free are not
89376 * needed by inflate */
89377
89378-#define malloc(a) kmalloc(a, GFP_KERNEL)
89379+#define malloc(a) kmalloc((a), GFP_KERNEL)
89380 #define free(a) kfree(a)
89381
89382 #define large_malloc(a) vmalloc(a)
89383diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
89384index ce447f0..83c66bd 100644
89385--- a/include/linux/devfreq.h
89386+++ b/include/linux/devfreq.h
89387@@ -114,7 +114,7 @@ struct devfreq_governor {
89388 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
89389 int (*event_handler)(struct devfreq *devfreq,
89390 unsigned int event, void *data);
89391-};
89392+} __do_const;
89393
89394 /**
89395 * struct devfreq - Device devfreq structure
89396diff --git a/include/linux/device.h b/include/linux/device.h
89397index 0eb8ee2..c603b6a 100644
89398--- a/include/linux/device.h
89399+++ b/include/linux/device.h
89400@@ -311,7 +311,7 @@ struct subsys_interface {
89401 struct list_head node;
89402 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
89403 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
89404-};
89405+} __do_const;
89406
89407 int subsys_interface_register(struct subsys_interface *sif);
89408 void subsys_interface_unregister(struct subsys_interface *sif);
89409@@ -507,7 +507,7 @@ struct device_type {
89410 void (*release)(struct device *dev);
89411
89412 const struct dev_pm_ops *pm;
89413-};
89414+} __do_const;
89415
89416 /* interface for exporting device attributes */
89417 struct device_attribute {
89418@@ -517,11 +517,12 @@ struct device_attribute {
89419 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
89420 const char *buf, size_t count);
89421 };
89422+typedef struct device_attribute __no_const device_attribute_no_const;
89423
89424 struct dev_ext_attribute {
89425 struct device_attribute attr;
89426 void *var;
89427-};
89428+} __do_const;
89429
89430 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
89431 char *buf);
89432diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
89433index c3007cb..43efc8c 100644
89434--- a/include/linux/dma-mapping.h
89435+++ b/include/linux/dma-mapping.h
89436@@ -60,7 +60,7 @@ struct dma_map_ops {
89437 u64 (*get_required_mask)(struct device *dev);
89438 #endif
89439 int is_phys;
89440-};
89441+} __do_const;
89442
89443 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
89444
89445diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
89446index b6997a0..108be6c 100644
89447--- a/include/linux/dmaengine.h
89448+++ b/include/linux/dmaengine.h
89449@@ -1133,9 +1133,9 @@ struct dma_pinned_list {
89450 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
89451 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
89452
89453-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
89454+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
89455 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
89456-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
89457+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
89458 struct dma_pinned_list *pinned_list, struct page *page,
89459 unsigned int offset, size_t len);
89460
89461diff --git a/include/linux/efi.h b/include/linux/efi.h
89462index cf7e431..d239dce 100644
89463--- a/include/linux/efi.h
89464+++ b/include/linux/efi.h
89465@@ -1056,6 +1056,7 @@ struct efivar_operations {
89466 efi_set_variable_nonblocking_t *set_variable_nonblocking;
89467 efi_query_variable_store_t *query_variable_store;
89468 };
89469+typedef struct efivar_operations __no_const efivar_operations_no_const;
89470
89471 struct efivars {
89472 /*
89473diff --git a/include/linux/elf.h b/include/linux/elf.h
89474index 20fa8d8..3d0dd18 100644
89475--- a/include/linux/elf.h
89476+++ b/include/linux/elf.h
89477@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
89478 #define elf_note elf32_note
89479 #define elf_addr_t Elf32_Off
89480 #define Elf_Half Elf32_Half
89481+#define elf_dyn Elf32_Dyn
89482
89483 #else
89484
89485@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
89486 #define elf_note elf64_note
89487 #define elf_addr_t Elf64_Off
89488 #define Elf_Half Elf64_Half
89489+#define elf_dyn Elf64_Dyn
89490
89491 #endif
89492
89493diff --git a/include/linux/err.h b/include/linux/err.h
89494index a729120..6ede2c9 100644
89495--- a/include/linux/err.h
89496+++ b/include/linux/err.h
89497@@ -20,12 +20,12 @@
89498
89499 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
89500
89501-static inline void * __must_check ERR_PTR(long error)
89502+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
89503 {
89504 return (void *) error;
89505 }
89506
89507-static inline long __must_check PTR_ERR(__force const void *ptr)
89508+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
89509 {
89510 return (long) ptr;
89511 }
89512diff --git a/include/linux/extcon.h b/include/linux/extcon.h
89513index 36f49c4..a2a1f4c 100644
89514--- a/include/linux/extcon.h
89515+++ b/include/linux/extcon.h
89516@@ -135,7 +135,7 @@ struct extcon_dev {
89517 /* /sys/class/extcon/.../mutually_exclusive/... */
89518 struct attribute_group attr_g_muex;
89519 struct attribute **attrs_muex;
89520- struct device_attribute *d_attrs_muex;
89521+ device_attribute_no_const *d_attrs_muex;
89522 };
89523
89524 /**
89525diff --git a/include/linux/fb.h b/include/linux/fb.h
89526index 043f328..180ccbf 100644
89527--- a/include/linux/fb.h
89528+++ b/include/linux/fb.h
89529@@ -305,7 +305,8 @@ struct fb_ops {
89530 /* called at KDB enter and leave time to prepare the console */
89531 int (*fb_debug_enter)(struct fb_info *info);
89532 int (*fb_debug_leave)(struct fb_info *info);
89533-};
89534+} __do_const;
89535+typedef struct fb_ops __no_const fb_ops_no_const;
89536
89537 #ifdef CONFIG_FB_TILEBLITTING
89538 #define FB_TILE_CURSOR_NONE 0
89539diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
89540index 230f87b..1fd0485 100644
89541--- a/include/linux/fdtable.h
89542+++ b/include/linux/fdtable.h
89543@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
89544 void put_files_struct(struct files_struct *fs);
89545 void reset_files_struct(struct files_struct *);
89546 int unshare_files(struct files_struct **);
89547-struct files_struct *dup_fd(struct files_struct *, int *);
89548+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
89549 void do_close_on_exec(struct files_struct *);
89550 int iterate_fd(struct files_struct *, unsigned,
89551 int (*)(const void *, struct file *, unsigned),
89552diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
89553index 8293262..2b3b8bd 100644
89554--- a/include/linux/frontswap.h
89555+++ b/include/linux/frontswap.h
89556@@ -11,7 +11,7 @@ struct frontswap_ops {
89557 int (*load)(unsigned, pgoff_t, struct page *);
89558 void (*invalidate_page)(unsigned, pgoff_t);
89559 void (*invalidate_area)(unsigned);
89560-};
89561+} __no_const;
89562
89563 extern bool frontswap_enabled;
89564 extern struct frontswap_ops *
89565diff --git a/include/linux/fs.h b/include/linux/fs.h
89566index 52cc449..31f35cb 100644
89567--- a/include/linux/fs.h
89568+++ b/include/linux/fs.h
89569@@ -410,7 +410,7 @@ struct address_space {
89570 spinlock_t private_lock; /* for use by the address_space */
89571 struct list_head private_list; /* ditto */
89572 void *private_data; /* ditto */
89573-} __attribute__((aligned(sizeof(long))));
89574+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
89575 /*
89576 * On most architectures that alignment is already the case; but
89577 * must be enforced here for CRIS, to let the least significant bit
89578@@ -453,7 +453,7 @@ struct block_device {
89579 int bd_fsfreeze_count;
89580 /* Mutex for freeze */
89581 struct mutex bd_fsfreeze_mutex;
89582-};
89583+} __randomize_layout;
89584
89585 /*
89586 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
89587@@ -639,7 +639,7 @@ struct inode {
89588 #endif
89589
89590 void *i_private; /* fs or device private pointer */
89591-};
89592+} __randomize_layout;
89593
89594 static inline int inode_unhashed(struct inode *inode)
89595 {
89596@@ -834,7 +834,7 @@ struct file {
89597 struct list_head f_tfile_llink;
89598 #endif /* #ifdef CONFIG_EPOLL */
89599 struct address_space *f_mapping;
89600-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
89601+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
89602
89603 struct file_handle {
89604 __u32 handle_bytes;
89605@@ -962,7 +962,7 @@ struct file_lock {
89606 int state; /* state of grant or error if -ve */
89607 } afs;
89608 } fl_u;
89609-};
89610+} __randomize_layout;
89611
89612 struct file_lock_context {
89613 spinlock_t flc_lock;
89614@@ -1316,7 +1316,7 @@ struct super_block {
89615 * Indicates how deep in a filesystem stack this SB is
89616 */
89617 int s_stack_depth;
89618-};
89619+} __randomize_layout;
89620
89621 extern struct timespec current_fs_time(struct super_block *sb);
89622
89623@@ -1570,7 +1570,8 @@ struct file_operations {
89624 #ifndef CONFIG_MMU
89625 unsigned (*mmap_capabilities)(struct file *);
89626 #endif
89627-};
89628+} __do_const __randomize_layout;
89629+typedef struct file_operations __no_const file_operations_no_const;
89630
89631 struct inode_operations {
89632 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
89633@@ -2269,7 +2270,7 @@ extern int register_chrdev_region(dev_t, unsigned, const char *);
89634 extern int __register_chrdev(unsigned int major, unsigned int baseminor,
89635 unsigned int count, const char *name,
89636 const struct file_operations *fops);
89637-extern void __unregister_chrdev(unsigned int major, unsigned int baseminor,
89638+extern __nocapture(4) void __unregister_chrdev(unsigned int major, unsigned int baseminor,
89639 unsigned int count, const char *name);
89640 extern void unregister_chrdev_region(dev_t, unsigned);
89641 extern void chrdev_show(struct seq_file *,off_t);
89642@@ -2918,4 +2919,14 @@ static inline bool dir_relax(struct inode *inode)
89643 return !IS_DEADDIR(inode);
89644 }
89645
89646+static inline bool is_sidechannel_device(const struct inode *inode)
89647+{
89648+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
89649+ umode_t mode = inode->i_mode;
89650+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
89651+#else
89652+ return false;
89653+#endif
89654+}
89655+
89656 #endif /* _LINUX_FS_H */
89657diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
89658index 0efc3e6..fd23610 100644
89659--- a/include/linux/fs_struct.h
89660+++ b/include/linux/fs_struct.h
89661@@ -6,13 +6,13 @@
89662 #include <linux/seqlock.h>
89663
89664 struct fs_struct {
89665- int users;
89666+ atomic_t users;
89667 spinlock_t lock;
89668 seqcount_t seq;
89669 int umask;
89670 int in_exec;
89671 struct path root, pwd;
89672-};
89673+} __randomize_layout;
89674
89675 extern struct kmem_cache *fs_cachep;
89676
89677diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
89678index 7714849..a4a5c7a 100644
89679--- a/include/linux/fscache-cache.h
89680+++ b/include/linux/fscache-cache.h
89681@@ -113,7 +113,7 @@ struct fscache_operation {
89682 fscache_operation_release_t release;
89683 };
89684
89685-extern atomic_t fscache_op_debug_id;
89686+extern atomic_unchecked_t fscache_op_debug_id;
89687 extern void fscache_op_work_func(struct work_struct *work);
89688
89689 extern void fscache_enqueue_operation(struct fscache_operation *);
89690@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
89691 INIT_WORK(&op->work, fscache_op_work_func);
89692 atomic_set(&op->usage, 1);
89693 op->state = FSCACHE_OP_ST_INITIALISED;
89694- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
89695+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
89696 op->processor = processor;
89697 op->release = release;
89698 INIT_LIST_HEAD(&op->pend_link);
89699diff --git a/include/linux/fscache.h b/include/linux/fscache.h
89700index 115bb81..e7b812b 100644
89701--- a/include/linux/fscache.h
89702+++ b/include/linux/fscache.h
89703@@ -152,7 +152,7 @@ struct fscache_cookie_def {
89704 * - this is mandatory for any object that may have data
89705 */
89706 void (*now_uncached)(void *cookie_netfs_data);
89707-};
89708+} __do_const;
89709
89710 /*
89711 * fscache cached network filesystem type
89712diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
89713index 7ee1774..72505b8 100644
89714--- a/include/linux/fsnotify.h
89715+++ b/include/linux/fsnotify.h
89716@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
89717 struct inode *inode = file_inode(file);
89718 __u32 mask = FS_ACCESS;
89719
89720+ if (is_sidechannel_device(inode))
89721+ return;
89722+
89723 if (S_ISDIR(inode->i_mode))
89724 mask |= FS_ISDIR;
89725
89726@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
89727 struct inode *inode = file_inode(file);
89728 __u32 mask = FS_MODIFY;
89729
89730+ if (is_sidechannel_device(inode))
89731+ return;
89732+
89733 if (S_ISDIR(inode->i_mode))
89734 mask |= FS_ISDIR;
89735
89736@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
89737 */
89738 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
89739 {
89740- return kstrdup(name, GFP_KERNEL);
89741+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
89742 }
89743
89744 /*
89745diff --git a/include/linux/genhd.h b/include/linux/genhd.h
89746index ec274e0..e678159 100644
89747--- a/include/linux/genhd.h
89748+++ b/include/linux/genhd.h
89749@@ -194,7 +194,7 @@ struct gendisk {
89750 struct kobject *slave_dir;
89751
89752 struct timer_rand_state *random;
89753- atomic_t sync_io; /* RAID */
89754+ atomic_unchecked_t sync_io; /* RAID */
89755 struct disk_events *ev;
89756 #ifdef CONFIG_BLK_DEV_INTEGRITY
89757 struct blk_integrity *integrity;
89758@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
89759 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
89760
89761 /* drivers/char/random.c */
89762-extern void add_disk_randomness(struct gendisk *disk);
89763+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
89764 extern void rand_initialize_disk(struct gendisk *disk);
89765
89766 static inline sector_t get_start_sect(struct block_device *bdev)
89767diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
89768index 667c311..abac2a7 100644
89769--- a/include/linux/genl_magic_func.h
89770+++ b/include/linux/genl_magic_func.h
89771@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
89772 },
89773
89774 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
89775-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
89776+static struct genl_ops ZZZ_genl_ops[] = {
89777 #include GENL_MAGIC_INCLUDE_FILE
89778 };
89779
89780diff --git a/include/linux/gfp.h b/include/linux/gfp.h
89781index eb6fafe..9360779 100644
89782--- a/include/linux/gfp.h
89783+++ b/include/linux/gfp.h
89784@@ -35,6 +35,13 @@ struct vm_area_struct;
89785 #define ___GFP_NO_KSWAPD 0x400000u
89786 #define ___GFP_OTHER_NODE 0x800000u
89787 #define ___GFP_WRITE 0x1000000u
89788+
89789+#ifdef CONFIG_PAX_USERCOPY_SLABS
89790+#define ___GFP_USERCOPY 0x2000000u
89791+#else
89792+#define ___GFP_USERCOPY 0
89793+#endif
89794+
89795 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
89796
89797 /*
89798@@ -92,6 +99,7 @@ struct vm_area_struct;
89799 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
89800 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
89801 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
89802+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
89803
89804 /*
89805 * This may seem redundant, but it's a way of annotating false positives vs.
89806@@ -99,7 +107,7 @@ struct vm_area_struct;
89807 */
89808 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
89809
89810-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
89811+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
89812 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
89813
89814 /* This equals 0, but use constants in case they ever change */
89815@@ -154,6 +162,8 @@ struct vm_area_struct;
89816 /* 4GB DMA on some platforms */
89817 #define GFP_DMA32 __GFP_DMA32
89818
89819+#define GFP_USERCOPY __GFP_USERCOPY
89820+
89821 /* Convert GFP flags to their corresponding migrate type */
89822 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
89823 {
89824diff --git a/include/linux/gracl.h b/include/linux/gracl.h
89825new file mode 100644
89826index 0000000..91858e4
89827--- /dev/null
89828+++ b/include/linux/gracl.h
89829@@ -0,0 +1,342 @@
89830+#ifndef GR_ACL_H
89831+#define GR_ACL_H
89832+
89833+#include <linux/grdefs.h>
89834+#include <linux/resource.h>
89835+#include <linux/capability.h>
89836+#include <linux/dcache.h>
89837+#include <asm/resource.h>
89838+
89839+/* Major status information */
89840+
89841+#define GR_VERSION "grsecurity 3.1"
89842+#define GRSECURITY_VERSION 0x3100
89843+
89844+enum {
89845+ GR_SHUTDOWN = 0,
89846+ GR_ENABLE = 1,
89847+ GR_SPROLE = 2,
89848+ GR_OLDRELOAD = 3,
89849+ GR_SEGVMOD = 4,
89850+ GR_STATUS = 5,
89851+ GR_UNSPROLE = 6,
89852+ GR_PASSSET = 7,
89853+ GR_SPROLEPAM = 8,
89854+ GR_RELOAD = 9,
89855+};
89856+
89857+/* Password setup definitions
89858+ * kernel/grhash.c */
89859+enum {
89860+ GR_PW_LEN = 128,
89861+ GR_SALT_LEN = 16,
89862+ GR_SHA_LEN = 32,
89863+};
89864+
89865+enum {
89866+ GR_SPROLE_LEN = 64,
89867+};
89868+
89869+enum {
89870+ GR_NO_GLOB = 0,
89871+ GR_REG_GLOB,
89872+ GR_CREATE_GLOB
89873+};
89874+
89875+#define GR_NLIMITS 32
89876+
89877+/* Begin Data Structures */
89878+
89879+struct sprole_pw {
89880+ unsigned char *rolename;
89881+ unsigned char salt[GR_SALT_LEN];
89882+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
89883+};
89884+
89885+struct name_entry {
89886+ __u32 key;
89887+ u64 inode;
89888+ dev_t device;
89889+ char *name;
89890+ __u16 len;
89891+ __u8 deleted;
89892+ struct name_entry *prev;
89893+ struct name_entry *next;
89894+};
89895+
89896+struct inodev_entry {
89897+ struct name_entry *nentry;
89898+ struct inodev_entry *prev;
89899+ struct inodev_entry *next;
89900+};
89901+
89902+struct acl_role_db {
89903+ struct acl_role_label **r_hash;
89904+ __u32 r_size;
89905+};
89906+
89907+struct inodev_db {
89908+ struct inodev_entry **i_hash;
89909+ __u32 i_size;
89910+};
89911+
89912+struct name_db {
89913+ struct name_entry **n_hash;
89914+ __u32 n_size;
89915+};
89916+
89917+struct crash_uid {
89918+ uid_t uid;
89919+ unsigned long expires;
89920+};
89921+
89922+struct gr_hash_struct {
89923+ void **table;
89924+ void **nametable;
89925+ void *first;
89926+ __u32 table_size;
89927+ __u32 used_size;
89928+ int type;
89929+};
89930+
89931+/* Userspace Grsecurity ACL data structures */
89932+
89933+struct acl_subject_label {
89934+ char *filename;
89935+ u64 inode;
89936+ dev_t device;
89937+ __u32 mode;
89938+ kernel_cap_t cap_mask;
89939+ kernel_cap_t cap_lower;
89940+ kernel_cap_t cap_invert_audit;
89941+
89942+ struct rlimit res[GR_NLIMITS];
89943+ __u32 resmask;
89944+
89945+ __u8 user_trans_type;
89946+ __u8 group_trans_type;
89947+ uid_t *user_transitions;
89948+ gid_t *group_transitions;
89949+ __u16 user_trans_num;
89950+ __u16 group_trans_num;
89951+
89952+ __u32 sock_families[2];
89953+ __u32 ip_proto[8];
89954+ __u32 ip_type;
89955+ struct acl_ip_label **ips;
89956+ __u32 ip_num;
89957+ __u32 inaddr_any_override;
89958+
89959+ __u32 crashes;
89960+ unsigned long expires;
89961+
89962+ struct acl_subject_label *parent_subject;
89963+ struct gr_hash_struct *hash;
89964+ struct acl_subject_label *prev;
89965+ struct acl_subject_label *next;
89966+
89967+ struct acl_object_label **obj_hash;
89968+ __u32 obj_hash_size;
89969+ __u16 pax_flags;
89970+};
89971+
89972+struct role_allowed_ip {
89973+ __u32 addr;
89974+ __u32 netmask;
89975+
89976+ struct role_allowed_ip *prev;
89977+ struct role_allowed_ip *next;
89978+};
89979+
89980+struct role_transition {
89981+ char *rolename;
89982+
89983+ struct role_transition *prev;
89984+ struct role_transition *next;
89985+};
89986+
89987+struct acl_role_label {
89988+ char *rolename;
89989+ uid_t uidgid;
89990+ __u16 roletype;
89991+
89992+ __u16 auth_attempts;
89993+ unsigned long expires;
89994+
89995+ struct acl_subject_label *root_label;
89996+ struct gr_hash_struct *hash;
89997+
89998+ struct acl_role_label *prev;
89999+ struct acl_role_label *next;
90000+
90001+ struct role_transition *transitions;
90002+ struct role_allowed_ip *allowed_ips;
90003+ uid_t *domain_children;
90004+ __u16 domain_child_num;
90005+
90006+ umode_t umask;
90007+
90008+ struct acl_subject_label **subj_hash;
90009+ __u32 subj_hash_size;
90010+};
90011+
90012+struct user_acl_role_db {
90013+ struct acl_role_label **r_table;
90014+ __u32 num_pointers; /* Number of allocations to track */
90015+ __u32 num_roles; /* Number of roles */
90016+ __u32 num_domain_children; /* Number of domain children */
90017+ __u32 num_subjects; /* Number of subjects */
90018+ __u32 num_objects; /* Number of objects */
90019+};
90020+
90021+struct acl_object_label {
90022+ char *filename;
90023+ u64 inode;
90024+ dev_t device;
90025+ __u32 mode;
90026+
90027+ struct acl_subject_label *nested;
90028+ struct acl_object_label *globbed;
90029+
90030+ /* next two structures not used */
90031+
90032+ struct acl_object_label *prev;
90033+ struct acl_object_label *next;
90034+};
90035+
90036+struct acl_ip_label {
90037+ char *iface;
90038+ __u32 addr;
90039+ __u32 netmask;
90040+ __u16 low, high;
90041+ __u8 mode;
90042+ __u32 type;
90043+ __u32 proto[8];
90044+
90045+ /* next two structures not used */
90046+
90047+ struct acl_ip_label *prev;
90048+ struct acl_ip_label *next;
90049+};
90050+
90051+struct gr_arg {
90052+ struct user_acl_role_db role_db;
90053+ unsigned char pw[GR_PW_LEN];
90054+ unsigned char salt[GR_SALT_LEN];
90055+ unsigned char sum[GR_SHA_LEN];
90056+ unsigned char sp_role[GR_SPROLE_LEN];
90057+ struct sprole_pw *sprole_pws;
90058+ dev_t segv_device;
90059+ u64 segv_inode;
90060+ uid_t segv_uid;
90061+ __u16 num_sprole_pws;
90062+ __u16 mode;
90063+};
90064+
90065+struct gr_arg_wrapper {
90066+ struct gr_arg *arg;
90067+ __u32 version;
90068+ __u32 size;
90069+};
90070+
90071+struct subject_map {
90072+ struct acl_subject_label *user;
90073+ struct acl_subject_label *kernel;
90074+ struct subject_map *prev;
90075+ struct subject_map *next;
90076+};
90077+
90078+struct acl_subj_map_db {
90079+ struct subject_map **s_hash;
90080+ __u32 s_size;
90081+};
90082+
90083+struct gr_policy_state {
90084+ struct sprole_pw **acl_special_roles;
90085+ __u16 num_sprole_pws;
90086+ struct acl_role_label *kernel_role;
90087+ struct acl_role_label *role_list;
90088+ struct acl_role_label *default_role;
90089+ struct acl_role_db acl_role_set;
90090+ struct acl_subj_map_db subj_map_set;
90091+ struct name_db name_set;
90092+ struct inodev_db inodev_set;
90093+};
90094+
90095+struct gr_alloc_state {
90096+ unsigned long alloc_stack_next;
90097+ unsigned long alloc_stack_size;
90098+ void **alloc_stack;
90099+};
90100+
90101+struct gr_reload_state {
90102+ struct gr_policy_state oldpolicy;
90103+ struct gr_alloc_state oldalloc;
90104+ struct gr_policy_state newpolicy;
90105+ struct gr_alloc_state newalloc;
90106+ struct gr_policy_state *oldpolicy_ptr;
90107+ struct gr_alloc_state *oldalloc_ptr;
90108+ unsigned char oldmode;
90109+};
90110+
90111+/* End Data Structures Section */
90112+
90113+/* Hash functions generated by empirical testing by Brad Spengler
90114+ Makes good use of the low bits of the inode. Generally 0-1 times
90115+ in loop for successful match. 0-3 for unsuccessful match.
90116+ Shift/add algorithm with modulus of table size and an XOR*/
90117+
90118+static __inline__ unsigned int
90119+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
90120+{
90121+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
90122+}
90123+
90124+ static __inline__ unsigned int
90125+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
90126+{
90127+ return ((const unsigned long)userp % sz);
90128+}
90129+
90130+static __inline__ unsigned int
90131+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
90132+{
90133+ unsigned int rem;
90134+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
90135+ return rem;
90136+}
90137+
90138+static __inline__ unsigned int
90139+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
90140+{
90141+ return full_name_hash((const unsigned char *)name, len) % sz;
90142+}
90143+
90144+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
90145+ subj = NULL; \
90146+ iter = 0; \
90147+ while (iter < role->subj_hash_size) { \
90148+ if (subj == NULL) \
90149+ subj = role->subj_hash[iter]; \
90150+ if (subj == NULL) { \
90151+ iter++; \
90152+ continue; \
90153+ }
90154+
90155+#define FOR_EACH_SUBJECT_END(subj,iter) \
90156+ subj = subj->next; \
90157+ if (subj == NULL) \
90158+ iter++; \
90159+ }
90160+
90161+
90162+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
90163+ subj = role->hash->first; \
90164+ while (subj != NULL) {
90165+
90166+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
90167+ subj = subj->next; \
90168+ }
90169+
90170+#endif
90171+
90172diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
90173new file mode 100644
90174index 0000000..af64092
90175--- /dev/null
90176+++ b/include/linux/gracl_compat.h
90177@@ -0,0 +1,156 @@
90178+#ifndef GR_ACL_COMPAT_H
90179+#define GR_ACL_COMPAT_H
90180+
90181+#include <linux/resource.h>
90182+#include <asm/resource.h>
90183+
90184+struct sprole_pw_compat {
90185+ compat_uptr_t rolename;
90186+ unsigned char salt[GR_SALT_LEN];
90187+ unsigned char sum[GR_SHA_LEN];
90188+};
90189+
90190+struct gr_hash_struct_compat {
90191+ compat_uptr_t table;
90192+ compat_uptr_t nametable;
90193+ compat_uptr_t first;
90194+ __u32 table_size;
90195+ __u32 used_size;
90196+ int type;
90197+};
90198+
90199+struct acl_subject_label_compat {
90200+ compat_uptr_t filename;
90201+ compat_u64 inode;
90202+ __u32 device;
90203+ __u32 mode;
90204+ kernel_cap_t cap_mask;
90205+ kernel_cap_t cap_lower;
90206+ kernel_cap_t cap_invert_audit;
90207+
90208+ struct compat_rlimit res[GR_NLIMITS];
90209+ __u32 resmask;
90210+
90211+ __u8 user_trans_type;
90212+ __u8 group_trans_type;
90213+ compat_uptr_t user_transitions;
90214+ compat_uptr_t group_transitions;
90215+ __u16 user_trans_num;
90216+ __u16 group_trans_num;
90217+
90218+ __u32 sock_families[2];
90219+ __u32 ip_proto[8];
90220+ __u32 ip_type;
90221+ compat_uptr_t ips;
90222+ __u32 ip_num;
90223+ __u32 inaddr_any_override;
90224+
90225+ __u32 crashes;
90226+ compat_ulong_t expires;
90227+
90228+ compat_uptr_t parent_subject;
90229+ compat_uptr_t hash;
90230+ compat_uptr_t prev;
90231+ compat_uptr_t next;
90232+
90233+ compat_uptr_t obj_hash;
90234+ __u32 obj_hash_size;
90235+ __u16 pax_flags;
90236+};
90237+
90238+struct role_allowed_ip_compat {
90239+ __u32 addr;
90240+ __u32 netmask;
90241+
90242+ compat_uptr_t prev;
90243+ compat_uptr_t next;
90244+};
90245+
90246+struct role_transition_compat {
90247+ compat_uptr_t rolename;
90248+
90249+ compat_uptr_t prev;
90250+ compat_uptr_t next;
90251+};
90252+
90253+struct acl_role_label_compat {
90254+ compat_uptr_t rolename;
90255+ uid_t uidgid;
90256+ __u16 roletype;
90257+
90258+ __u16 auth_attempts;
90259+ compat_ulong_t expires;
90260+
90261+ compat_uptr_t root_label;
90262+ compat_uptr_t hash;
90263+
90264+ compat_uptr_t prev;
90265+ compat_uptr_t next;
90266+
90267+ compat_uptr_t transitions;
90268+ compat_uptr_t allowed_ips;
90269+ compat_uptr_t domain_children;
90270+ __u16 domain_child_num;
90271+
90272+ umode_t umask;
90273+
90274+ compat_uptr_t subj_hash;
90275+ __u32 subj_hash_size;
90276+};
90277+
90278+struct user_acl_role_db_compat {
90279+ compat_uptr_t r_table;
90280+ __u32 num_pointers;
90281+ __u32 num_roles;
90282+ __u32 num_domain_children;
90283+ __u32 num_subjects;
90284+ __u32 num_objects;
90285+};
90286+
90287+struct acl_object_label_compat {
90288+ compat_uptr_t filename;
90289+ compat_u64 inode;
90290+ __u32 device;
90291+ __u32 mode;
90292+
90293+ compat_uptr_t nested;
90294+ compat_uptr_t globbed;
90295+
90296+ compat_uptr_t prev;
90297+ compat_uptr_t next;
90298+};
90299+
90300+struct acl_ip_label_compat {
90301+ compat_uptr_t iface;
90302+ __u32 addr;
90303+ __u32 netmask;
90304+ __u16 low, high;
90305+ __u8 mode;
90306+ __u32 type;
90307+ __u32 proto[8];
90308+
90309+ compat_uptr_t prev;
90310+ compat_uptr_t next;
90311+};
90312+
90313+struct gr_arg_compat {
90314+ struct user_acl_role_db_compat role_db;
90315+ unsigned char pw[GR_PW_LEN];
90316+ unsigned char salt[GR_SALT_LEN];
90317+ unsigned char sum[GR_SHA_LEN];
90318+ unsigned char sp_role[GR_SPROLE_LEN];
90319+ compat_uptr_t sprole_pws;
90320+ __u32 segv_device;
90321+ compat_u64 segv_inode;
90322+ uid_t segv_uid;
90323+ __u16 num_sprole_pws;
90324+ __u16 mode;
90325+};
90326+
90327+struct gr_arg_wrapper_compat {
90328+ compat_uptr_t arg;
90329+ __u32 version;
90330+ __u32 size;
90331+};
90332+
90333+#endif
90334diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
90335new file mode 100644
90336index 0000000..323ecf2
90337--- /dev/null
90338+++ b/include/linux/gralloc.h
90339@@ -0,0 +1,9 @@
90340+#ifndef __GRALLOC_H
90341+#define __GRALLOC_H
90342+
90343+void acl_free_all(void);
90344+int acl_alloc_stack_init(unsigned long size);
90345+void *acl_alloc(unsigned long len);
90346+void *acl_alloc_num(unsigned long num, unsigned long len);
90347+
90348+#endif
90349diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
90350new file mode 100644
90351index 0000000..be66033
90352--- /dev/null
90353+++ b/include/linux/grdefs.h
90354@@ -0,0 +1,140 @@
90355+#ifndef GRDEFS_H
90356+#define GRDEFS_H
90357+
90358+/* Begin grsecurity status declarations */
90359+
90360+enum {
90361+ GR_READY = 0x01,
90362+ GR_STATUS_INIT = 0x00 // disabled state
90363+};
90364+
90365+/* Begin ACL declarations */
90366+
90367+/* Role flags */
90368+
90369+enum {
90370+ GR_ROLE_USER = 0x0001,
90371+ GR_ROLE_GROUP = 0x0002,
90372+ GR_ROLE_DEFAULT = 0x0004,
90373+ GR_ROLE_SPECIAL = 0x0008,
90374+ GR_ROLE_AUTH = 0x0010,
90375+ GR_ROLE_NOPW = 0x0020,
90376+ GR_ROLE_GOD = 0x0040,
90377+ GR_ROLE_LEARN = 0x0080,
90378+ GR_ROLE_TPE = 0x0100,
90379+ GR_ROLE_DOMAIN = 0x0200,
90380+ GR_ROLE_PAM = 0x0400,
90381+ GR_ROLE_PERSIST = 0x0800
90382+};
90383+
90384+/* ACL Subject and Object mode flags */
90385+enum {
90386+ GR_DELETED = 0x80000000
90387+};
90388+
90389+/* ACL Object-only mode flags */
90390+enum {
90391+ GR_READ = 0x00000001,
90392+ GR_APPEND = 0x00000002,
90393+ GR_WRITE = 0x00000004,
90394+ GR_EXEC = 0x00000008,
90395+ GR_FIND = 0x00000010,
90396+ GR_INHERIT = 0x00000020,
90397+ GR_SETID = 0x00000040,
90398+ GR_CREATE = 0x00000080,
90399+ GR_DELETE = 0x00000100,
90400+ GR_LINK = 0x00000200,
90401+ GR_AUDIT_READ = 0x00000400,
90402+ GR_AUDIT_APPEND = 0x00000800,
90403+ GR_AUDIT_WRITE = 0x00001000,
90404+ GR_AUDIT_EXEC = 0x00002000,
90405+ GR_AUDIT_FIND = 0x00004000,
90406+ GR_AUDIT_INHERIT= 0x00008000,
90407+ GR_AUDIT_SETID = 0x00010000,
90408+ GR_AUDIT_CREATE = 0x00020000,
90409+ GR_AUDIT_DELETE = 0x00040000,
90410+ GR_AUDIT_LINK = 0x00080000,
90411+ GR_PTRACERD = 0x00100000,
90412+ GR_NOPTRACE = 0x00200000,
90413+ GR_SUPPRESS = 0x00400000,
90414+ GR_NOLEARN = 0x00800000,
90415+ GR_INIT_TRANSFER= 0x01000000
90416+};
90417+
90418+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
90419+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
90420+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
90421+
90422+/* ACL subject-only mode flags */
90423+enum {
90424+ GR_KILL = 0x00000001,
90425+ GR_VIEW = 0x00000002,
90426+ GR_PROTECTED = 0x00000004,
90427+ GR_LEARN = 0x00000008,
90428+ GR_OVERRIDE = 0x00000010,
90429+ /* just a placeholder, this mode is only used in userspace */
90430+ GR_DUMMY = 0x00000020,
90431+ GR_PROTSHM = 0x00000040,
90432+ GR_KILLPROC = 0x00000080,
90433+ GR_KILLIPPROC = 0x00000100,
90434+ /* just a placeholder, this mode is only used in userspace */
90435+ GR_NOTROJAN = 0x00000200,
90436+ GR_PROTPROCFD = 0x00000400,
90437+ GR_PROCACCT = 0x00000800,
90438+ GR_RELAXPTRACE = 0x00001000,
90439+ //GR_NESTED = 0x00002000,
90440+ GR_INHERITLEARN = 0x00004000,
90441+ GR_PROCFIND = 0x00008000,
90442+ GR_POVERRIDE = 0x00010000,
90443+ GR_KERNELAUTH = 0x00020000,
90444+ GR_ATSECURE = 0x00040000,
90445+ GR_SHMEXEC = 0x00080000
90446+};
90447+
90448+enum {
90449+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
90450+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
90451+ GR_PAX_ENABLE_MPROTECT = 0x0004,
90452+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
90453+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
90454+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
90455+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
90456+ GR_PAX_DISABLE_MPROTECT = 0x0400,
90457+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
90458+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
90459+};
90460+
90461+enum {
90462+ GR_ID_USER = 0x01,
90463+ GR_ID_GROUP = 0x02,
90464+};
90465+
90466+enum {
90467+ GR_ID_ALLOW = 0x01,
90468+ GR_ID_DENY = 0x02,
90469+};
90470+
90471+#define GR_CRASH_RES 31
90472+#define GR_UIDTABLE_MAX 500
90473+
90474+/* begin resource learning section */
90475+enum {
90476+ GR_RLIM_CPU_BUMP = 60,
90477+ GR_RLIM_FSIZE_BUMP = 50000,
90478+ GR_RLIM_DATA_BUMP = 10000,
90479+ GR_RLIM_STACK_BUMP = 1000,
90480+ GR_RLIM_CORE_BUMP = 10000,
90481+ GR_RLIM_RSS_BUMP = 500000,
90482+ GR_RLIM_NPROC_BUMP = 1,
90483+ GR_RLIM_NOFILE_BUMP = 5,
90484+ GR_RLIM_MEMLOCK_BUMP = 50000,
90485+ GR_RLIM_AS_BUMP = 500000,
90486+ GR_RLIM_LOCKS_BUMP = 2,
90487+ GR_RLIM_SIGPENDING_BUMP = 5,
90488+ GR_RLIM_MSGQUEUE_BUMP = 10000,
90489+ GR_RLIM_NICE_BUMP = 1,
90490+ GR_RLIM_RTPRIO_BUMP = 1,
90491+ GR_RLIM_RTTIME_BUMP = 1000000
90492+};
90493+
90494+#endif
90495diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
90496new file mode 100644
90497index 0000000..fb1de5d
90498--- /dev/null
90499+++ b/include/linux/grinternal.h
90500@@ -0,0 +1,230 @@
90501+#ifndef __GRINTERNAL_H
90502+#define __GRINTERNAL_H
90503+
90504+#ifdef CONFIG_GRKERNSEC
90505+
90506+#include <linux/fs.h>
90507+#include <linux/mnt_namespace.h>
90508+#include <linux/nsproxy.h>
90509+#include <linux/gracl.h>
90510+#include <linux/grdefs.h>
90511+#include <linux/grmsg.h>
90512+
90513+void gr_add_learn_entry(const char *fmt, ...)
90514+ __attribute__ ((format (printf, 1, 2)));
90515+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
90516+ const struct vfsmount *mnt);
90517+__u32 gr_check_create(const struct dentry *new_dentry,
90518+ const struct dentry *parent,
90519+ const struct vfsmount *mnt, const __u32 mode);
90520+int gr_check_protected_task(const struct task_struct *task);
90521+__u32 to_gr_audit(const __u32 reqmode);
90522+int gr_set_acls(const int type);
90523+int gr_acl_is_enabled(void);
90524+char gr_roletype_to_char(void);
90525+
90526+void gr_handle_alertkill(struct task_struct *task);
90527+char *gr_to_filename(const struct dentry *dentry,
90528+ const struct vfsmount *mnt);
90529+char *gr_to_filename1(const struct dentry *dentry,
90530+ const struct vfsmount *mnt);
90531+char *gr_to_filename2(const struct dentry *dentry,
90532+ const struct vfsmount *mnt);
90533+char *gr_to_filename3(const struct dentry *dentry,
90534+ const struct vfsmount *mnt);
90535+
90536+extern int grsec_enable_ptrace_readexec;
90537+extern int grsec_enable_harden_ptrace;
90538+extern int grsec_enable_link;
90539+extern int grsec_enable_fifo;
90540+extern int grsec_enable_execve;
90541+extern int grsec_enable_shm;
90542+extern int grsec_enable_execlog;
90543+extern int grsec_enable_signal;
90544+extern int grsec_enable_audit_ptrace;
90545+extern int grsec_enable_forkfail;
90546+extern int grsec_enable_time;
90547+extern int grsec_enable_rofs;
90548+extern int grsec_deny_new_usb;
90549+extern int grsec_enable_chroot_shmat;
90550+extern int grsec_enable_chroot_mount;
90551+extern int grsec_enable_chroot_double;
90552+extern int grsec_enable_chroot_pivot;
90553+extern int grsec_enable_chroot_chdir;
90554+extern int grsec_enable_chroot_chmod;
90555+extern int grsec_enable_chroot_mknod;
90556+extern int grsec_enable_chroot_fchdir;
90557+extern int grsec_enable_chroot_nice;
90558+extern int grsec_enable_chroot_execlog;
90559+extern int grsec_enable_chroot_caps;
90560+extern int grsec_enable_chroot_rename;
90561+extern int grsec_enable_chroot_sysctl;
90562+extern int grsec_enable_chroot_unix;
90563+extern int grsec_enable_symlinkown;
90564+extern kgid_t grsec_symlinkown_gid;
90565+extern int grsec_enable_tpe;
90566+extern kgid_t grsec_tpe_gid;
90567+extern int grsec_enable_tpe_all;
90568+extern int grsec_enable_tpe_invert;
90569+extern int grsec_enable_socket_all;
90570+extern kgid_t grsec_socket_all_gid;
90571+extern int grsec_enable_socket_client;
90572+extern kgid_t grsec_socket_client_gid;
90573+extern int grsec_enable_socket_server;
90574+extern kgid_t grsec_socket_server_gid;
90575+extern kgid_t grsec_audit_gid;
90576+extern int grsec_enable_group;
90577+extern int grsec_enable_log_rwxmaps;
90578+extern int grsec_enable_mount;
90579+extern int grsec_enable_chdir;
90580+extern int grsec_resource_logging;
90581+extern int grsec_enable_blackhole;
90582+extern int grsec_lastack_retries;
90583+extern int grsec_enable_brute;
90584+extern int grsec_enable_harden_ipc;
90585+extern int grsec_lock;
90586+
90587+extern spinlock_t grsec_alert_lock;
90588+extern unsigned long grsec_alert_wtime;
90589+extern unsigned long grsec_alert_fyet;
90590+
90591+extern spinlock_t grsec_audit_lock;
90592+
90593+extern rwlock_t grsec_exec_file_lock;
90594+
90595+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
90596+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
90597+ (tsk)->exec_file->f_path.mnt) : "/")
90598+
90599+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
90600+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
90601+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
90602+
90603+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
90604+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
90605+ (tsk)->exec_file->f_path.mnt) : "/")
90606+
90607+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
90608+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
90609+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
90610+
90611+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
90612+
90613+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
90614+
90615+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
90616+{
90617+ if (file1 && file2) {
90618+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
90619+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
90620+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
90621+ return true;
90622+ }
90623+
90624+ return false;
90625+}
90626+
90627+#define GR_CHROOT_CAPS {{ \
90628+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
90629+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
90630+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
90631+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
90632+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
90633+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
90634+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
90635+
90636+#define security_learn(normal_msg,args...) \
90637+({ \
90638+ read_lock(&grsec_exec_file_lock); \
90639+ gr_add_learn_entry(normal_msg "\n", ## args); \
90640+ read_unlock(&grsec_exec_file_lock); \
90641+})
90642+
90643+enum {
90644+ GR_DO_AUDIT,
90645+ GR_DONT_AUDIT,
90646+ /* used for non-audit messages that we shouldn't kill the task on */
90647+ GR_DONT_AUDIT_GOOD
90648+};
90649+
90650+enum {
90651+ GR_TTYSNIFF,
90652+ GR_RBAC,
90653+ GR_RBAC_STR,
90654+ GR_STR_RBAC,
90655+ GR_RBAC_MODE2,
90656+ GR_RBAC_MODE3,
90657+ GR_FILENAME,
90658+ GR_SYSCTL_HIDDEN,
90659+ GR_NOARGS,
90660+ GR_ONE_INT,
90661+ GR_ONE_INT_TWO_STR,
90662+ GR_ONE_STR,
90663+ GR_STR_INT,
90664+ GR_TWO_STR_INT,
90665+ GR_TWO_INT,
90666+ GR_TWO_U64,
90667+ GR_THREE_INT,
90668+ GR_FIVE_INT_TWO_STR,
90669+ GR_TWO_STR,
90670+ GR_THREE_STR,
90671+ GR_FOUR_STR,
90672+ GR_STR_FILENAME,
90673+ GR_FILENAME_STR,
90674+ GR_FILENAME_TWO_INT,
90675+ GR_FILENAME_TWO_INT_STR,
90676+ GR_TEXTREL,
90677+ GR_PTRACE,
90678+ GR_RESOURCE,
90679+ GR_CAP,
90680+ GR_SIG,
90681+ GR_SIG2,
90682+ GR_CRASH1,
90683+ GR_CRASH2,
90684+ GR_PSACCT,
90685+ GR_RWXMAP,
90686+ GR_RWXMAPVMA
90687+};
90688+
90689+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
90690+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
90691+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
90692+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
90693+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
90694+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
90695+#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)
90696+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
90697+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
90698+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
90699+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
90700+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
90701+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
90702+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
90703+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
90704+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
90705+#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)
90706+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
90707+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
90708+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
90709+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
90710+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
90711+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
90712+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
90713+#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)
90714+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
90715+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
90716+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
90717+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
90718+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
90719+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
90720+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
90721+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
90722+#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)
90723+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
90724+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
90725+
90726+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
90727+
90728+#endif
90729+
90730+#endif
90731diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
90732new file mode 100644
90733index 0000000..26ef560
90734--- /dev/null
90735+++ b/include/linux/grmsg.h
90736@@ -0,0 +1,118 @@
90737+#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"
90738+#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"
90739+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
90740+#define GR_STOPMOD_MSG "denied modification of module state by "
90741+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
90742+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
90743+#define GR_IOPERM_MSG "denied use of ioperm() by "
90744+#define GR_IOPL_MSG "denied use of iopl() by "
90745+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
90746+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
90747+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
90748+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
90749+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
90750+#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"
90751+#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"
90752+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
90753+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
90754+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
90755+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
90756+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
90757+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
90758+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
90759+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
90760+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
90761+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
90762+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
90763+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
90764+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
90765+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
90766+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
90767+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
90768+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
90769+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
90770+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
90771+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
90772+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
90773+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
90774+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
90775+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
90776+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
90777+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
90778+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
90779+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
90780+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
90781+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
90782+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
90783+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
90784+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
90785+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
90786+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
90787+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
90788+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
90789+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
90790+#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"
90791+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
90792+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
90793+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
90794+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
90795+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
90796+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
90797+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
90798+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
90799+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
90800+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
90801+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
90802+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
90803+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
90804+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
90805+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
90806+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
90807+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
90808+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
90809+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
90810+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
90811+#define GR_FAILFORK_MSG "failed fork with errno %s by "
90812+#define GR_NICE_CHROOT_MSG "denied priority change by "
90813+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
90814+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
90815+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
90816+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
90817+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
90818+#define GR_TIME_MSG "time set by "
90819+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
90820+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
90821+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
90822+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
90823+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
90824+#define GR_BIND_MSG "denied bind() by "
90825+#define GR_CONNECT_MSG "denied connect() by "
90826+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
90827+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
90828+#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"
90829+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
90830+#define GR_CAP_ACL_MSG "use of %s denied for "
90831+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
90832+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
90833+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
90834+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
90835+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
90836+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
90837+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
90838+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
90839+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
90840+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
90841+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
90842+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
90843+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
90844+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
90845+#define GR_VM86_MSG "denied use of vm86 by "
90846+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
90847+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
90848+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
90849+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
90850+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
90851+#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 "
90852+#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 "
90853+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
90854+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
90855diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
90856new file mode 100644
90857index 0000000..63c1850
90858--- /dev/null
90859+++ b/include/linux/grsecurity.h
90860@@ -0,0 +1,250 @@
90861+#ifndef GR_SECURITY_H
90862+#define GR_SECURITY_H
90863+#include <linux/fs.h>
90864+#include <linux/fs_struct.h>
90865+#include <linux/binfmts.h>
90866+#include <linux/gracl.h>
90867+
90868+/* notify of brain-dead configs */
90869+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90870+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
90871+#endif
90872+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90873+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
90874+#endif
90875+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
90876+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
90877+#endif
90878+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
90879+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
90880+#endif
90881+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
90882+#error "CONFIG_PAX enabled, but no PaX options are enabled."
90883+#endif
90884+
90885+int gr_handle_new_usb(void);
90886+
90887+void gr_handle_brute_attach(int dumpable);
90888+void gr_handle_brute_check(void);
90889+void gr_handle_kernel_exploit(void);
90890+
90891+char gr_roletype_to_char(void);
90892+
90893+int gr_proc_is_restricted(void);
90894+
90895+int gr_acl_enable_at_secure(void);
90896+
90897+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
90898+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
90899+
90900+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
90901+
90902+void gr_del_task_from_ip_table(struct task_struct *p);
90903+
90904+int gr_pid_is_chrooted(struct task_struct *p);
90905+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
90906+int gr_handle_chroot_nice(void);
90907+int gr_handle_chroot_sysctl(const int op);
90908+int gr_handle_chroot_setpriority(struct task_struct *p,
90909+ const int niceval);
90910+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
90911+int gr_chroot_fhandle(void);
90912+int gr_handle_chroot_chroot(const struct dentry *dentry,
90913+ const struct vfsmount *mnt);
90914+void gr_handle_chroot_chdir(const struct path *path);
90915+int gr_handle_chroot_chmod(const struct dentry *dentry,
90916+ const struct vfsmount *mnt, const int mode);
90917+int gr_handle_chroot_mknod(const struct dentry *dentry,
90918+ const struct vfsmount *mnt, const int mode);
90919+int gr_handle_chroot_mount(const struct dentry *dentry,
90920+ const struct vfsmount *mnt,
90921+ const char *dev_name);
90922+int gr_handle_chroot_pivot(void);
90923+int gr_handle_chroot_unix(const pid_t pid);
90924+
90925+int gr_handle_rawio(const struct inode *inode);
90926+
90927+void gr_handle_ioperm(void);
90928+void gr_handle_iopl(void);
90929+void gr_handle_msr_write(void);
90930+
90931+umode_t gr_acl_umask(void);
90932+
90933+int gr_tpe_allow(const struct file *file);
90934+
90935+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
90936+void gr_clear_chroot_entries(struct task_struct *task);
90937+
90938+void gr_log_forkfail(const int retval);
90939+void gr_log_timechange(void);
90940+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
90941+void gr_log_chdir(const struct dentry *dentry,
90942+ const struct vfsmount *mnt);
90943+void gr_log_chroot_exec(const struct dentry *dentry,
90944+ const struct vfsmount *mnt);
90945+void gr_log_remount(const char *devname, const int retval);
90946+void gr_log_unmount(const char *devname, const int retval);
90947+void gr_log_mount(const char *from, struct path *to, const int retval);
90948+void gr_log_textrel(struct vm_area_struct *vma);
90949+void gr_log_ptgnustack(struct file *file);
90950+void gr_log_rwxmmap(struct file *file);
90951+void gr_log_rwxmprotect(struct vm_area_struct *vma);
90952+
90953+int gr_handle_follow_link(const struct inode *parent,
90954+ const struct inode *inode,
90955+ const struct dentry *dentry,
90956+ const struct vfsmount *mnt);
90957+int gr_handle_fifo(const struct dentry *dentry,
90958+ const struct vfsmount *mnt,
90959+ const struct dentry *dir, const int flag,
90960+ const int acc_mode);
90961+int gr_handle_hardlink(const struct dentry *dentry,
90962+ const struct vfsmount *mnt,
90963+ struct inode *inode,
90964+ const int mode, const struct filename *to);
90965+
90966+int gr_is_capable(const int cap);
90967+int gr_is_capable_nolog(const int cap);
90968+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
90969+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
90970+
90971+void gr_copy_label(struct task_struct *tsk);
90972+void gr_handle_crash(struct task_struct *task, const int sig);
90973+int gr_handle_signal(const struct task_struct *p, const int sig);
90974+int gr_check_crash_uid(const kuid_t uid);
90975+int gr_check_protected_task(const struct task_struct *task);
90976+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
90977+int gr_acl_handle_mmap(const struct file *file,
90978+ const unsigned long prot);
90979+int gr_acl_handle_mprotect(const struct file *file,
90980+ const unsigned long prot);
90981+int gr_check_hidden_task(const struct task_struct *tsk);
90982+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
90983+ const struct vfsmount *mnt);
90984+__u32 gr_acl_handle_utime(const struct dentry *dentry,
90985+ const struct vfsmount *mnt);
90986+__u32 gr_acl_handle_access(const struct dentry *dentry,
90987+ const struct vfsmount *mnt, const int fmode);
90988+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
90989+ const struct vfsmount *mnt, umode_t *mode);
90990+__u32 gr_acl_handle_chown(const struct dentry *dentry,
90991+ const struct vfsmount *mnt);
90992+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
90993+ const struct vfsmount *mnt);
90994+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
90995+ const struct vfsmount *mnt);
90996+int gr_handle_ptrace(struct task_struct *task, const long request);
90997+int gr_handle_proc_ptrace(struct task_struct *task);
90998+__u32 gr_acl_handle_execve(const struct dentry *dentry,
90999+ const struct vfsmount *mnt);
91000+int gr_check_crash_exec(const struct file *filp);
91001+int gr_acl_is_enabled(void);
91002+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
91003+ const kgid_t gid);
91004+int gr_set_proc_label(const struct dentry *dentry,
91005+ const struct vfsmount *mnt,
91006+ const int unsafe_flags);
91007+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
91008+ const struct vfsmount *mnt);
91009+__u32 gr_acl_handle_open(const struct dentry *dentry,
91010+ const struct vfsmount *mnt, int acc_mode);
91011+__u32 gr_acl_handle_creat(const struct dentry *dentry,
91012+ const struct dentry *p_dentry,
91013+ const struct vfsmount *p_mnt,
91014+ int open_flags, int acc_mode, const int imode);
91015+void gr_handle_create(const struct dentry *dentry,
91016+ const struct vfsmount *mnt);
91017+void gr_handle_proc_create(const struct dentry *dentry,
91018+ const struct inode *inode);
91019+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
91020+ const struct dentry *parent_dentry,
91021+ const struct vfsmount *parent_mnt,
91022+ const int mode);
91023+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
91024+ const struct dentry *parent_dentry,
91025+ const struct vfsmount *parent_mnt);
91026+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
91027+ const struct vfsmount *mnt);
91028+void gr_handle_delete(const u64 ino, const dev_t dev);
91029+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
91030+ const struct vfsmount *mnt);
91031+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
91032+ const struct dentry *parent_dentry,
91033+ const struct vfsmount *parent_mnt,
91034+ const struct filename *from);
91035+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
91036+ const struct dentry *parent_dentry,
91037+ const struct vfsmount *parent_mnt,
91038+ const struct dentry *old_dentry,
91039+ const struct vfsmount *old_mnt, const struct filename *to);
91040+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
91041+int gr_acl_handle_rename(struct dentry *new_dentry,
91042+ struct dentry *parent_dentry,
91043+ const struct vfsmount *parent_mnt,
91044+ struct dentry *old_dentry,
91045+ struct inode *old_parent_inode,
91046+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
91047+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
91048+ struct dentry *old_dentry,
91049+ struct dentry *new_dentry,
91050+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
91051+__u32 gr_check_link(const struct dentry *new_dentry,
91052+ const struct dentry *parent_dentry,
91053+ const struct vfsmount *parent_mnt,
91054+ const struct dentry *old_dentry,
91055+ const struct vfsmount *old_mnt);
91056+int gr_acl_handle_filldir(const struct file *file, const char *name,
91057+ const unsigned int namelen, const u64 ino);
91058+
91059+__u32 gr_acl_handle_unix(const struct dentry *dentry,
91060+ const struct vfsmount *mnt);
91061+void gr_acl_handle_exit(void);
91062+void gr_acl_handle_psacct(struct task_struct *task, const long code);
91063+int gr_acl_handle_procpidmem(const struct task_struct *task);
91064+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
91065+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
91066+void gr_audit_ptrace(struct task_struct *task);
91067+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
91068+u64 gr_get_ino_from_dentry(struct dentry *dentry);
91069+void gr_put_exec_file(struct task_struct *task);
91070+
91071+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
91072+
91073+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
91074+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
91075+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
91076+ struct dentry *newdentry, struct vfsmount *newmnt);
91077+
91078+#ifdef CONFIG_GRKERNSEC_RESLOG
91079+extern void gr_log_resource(const struct task_struct *task, const int res,
91080+ const unsigned long wanted, const int gt);
91081+#else
91082+static inline void gr_log_resource(const struct task_struct *task, const int res,
91083+ const unsigned long wanted, const int gt)
91084+{
91085+}
91086+#endif
91087+
91088+#ifdef CONFIG_GRKERNSEC
91089+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
91090+void gr_handle_vm86(void);
91091+void gr_handle_mem_readwrite(u64 from, u64 to);
91092+
91093+void gr_log_badprocpid(const char *entry);
91094+
91095+extern int grsec_enable_dmesg;
91096+extern int grsec_disable_privio;
91097+
91098+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
91099+extern kgid_t grsec_proc_gid;
91100+#endif
91101+
91102+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
91103+extern int grsec_enable_chroot_findtask;
91104+#endif
91105+#ifdef CONFIG_GRKERNSEC_SETXID
91106+extern int grsec_enable_setxid;
91107+#endif
91108+#endif
91109+
91110+#endif
91111diff --git a/include/linux/grsock.h b/include/linux/grsock.h
91112new file mode 100644
91113index 0000000..e7ffaaf
91114--- /dev/null
91115+++ b/include/linux/grsock.h
91116@@ -0,0 +1,19 @@
91117+#ifndef __GRSOCK_H
91118+#define __GRSOCK_H
91119+
91120+extern void gr_attach_curr_ip(const struct sock *sk);
91121+extern int gr_handle_sock_all(const int family, const int type,
91122+ const int protocol);
91123+extern int gr_handle_sock_server(const struct sockaddr *sck);
91124+extern int gr_handle_sock_server_other(const struct sock *sck);
91125+extern int gr_handle_sock_client(const struct sockaddr *sck);
91126+extern int gr_search_connect(struct socket * sock,
91127+ struct sockaddr_in * addr);
91128+extern int gr_search_bind(struct socket * sock,
91129+ struct sockaddr_in * addr);
91130+extern int gr_search_listen(struct socket * sock);
91131+extern int gr_search_accept(struct socket * sock);
91132+extern int gr_search_socket(const int domain, const int type,
91133+ const int protocol);
91134+
91135+#endif
91136diff --git a/include/linux/highmem.h b/include/linux/highmem.h
91137index 9286a46..373f27f 100644
91138--- a/include/linux/highmem.h
91139+++ b/include/linux/highmem.h
91140@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
91141 kunmap_atomic(kaddr);
91142 }
91143
91144+static inline void sanitize_highpage(struct page *page)
91145+{
91146+ void *kaddr;
91147+ unsigned long flags;
91148+
91149+ local_irq_save(flags);
91150+ kaddr = kmap_atomic(page);
91151+ clear_page(kaddr);
91152+ kunmap_atomic(kaddr);
91153+ local_irq_restore(flags);
91154+}
91155+
91156 static inline void zero_user_segments(struct page *page,
91157 unsigned start1, unsigned end1,
91158 unsigned start2, unsigned end2)
91159diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
91160index 1c7b89a..7dda400 100644
91161--- a/include/linux/hwmon-sysfs.h
91162+++ b/include/linux/hwmon-sysfs.h
91163@@ -25,7 +25,8 @@
91164 struct sensor_device_attribute{
91165 struct device_attribute dev_attr;
91166 int index;
91167-};
91168+} __do_const;
91169+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
91170 #define to_sensor_dev_attr(_dev_attr) \
91171 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
91172
91173@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
91174 struct device_attribute dev_attr;
91175 u8 index;
91176 u8 nr;
91177-};
91178+} __do_const;
91179+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
91180 #define to_sensor_dev_attr_2(_dev_attr) \
91181 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
91182
91183diff --git a/include/linux/i2c.h b/include/linux/i2c.h
91184index f17da50..2f8b203 100644
91185--- a/include/linux/i2c.h
91186+++ b/include/linux/i2c.h
91187@@ -409,6 +409,7 @@ struct i2c_algorithm {
91188 int (*unreg_slave)(struct i2c_client *client);
91189 #endif
91190 };
91191+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
91192
91193 /**
91194 * struct i2c_bus_recovery_info - I2C bus recovery information
91195diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
91196index aff7ad8..3942bbd 100644
91197--- a/include/linux/if_pppox.h
91198+++ b/include/linux/if_pppox.h
91199@@ -76,7 +76,7 @@ struct pppox_proto {
91200 int (*ioctl)(struct socket *sock, unsigned int cmd,
91201 unsigned long arg);
91202 struct module *owner;
91203-};
91204+} __do_const;
91205
91206 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
91207 extern void unregister_pppox_proto(int proto_num);
91208diff --git a/include/linux/init.h b/include/linux/init.h
91209index 2df8e8d..3e1280d 100644
91210--- a/include/linux/init.h
91211+++ b/include/linux/init.h
91212@@ -37,9 +37,17 @@
91213 * section.
91214 */
91215
91216+#define add_init_latent_entropy __latent_entropy
91217+
91218+#ifdef CONFIG_MEMORY_HOTPLUG
91219+#define add_meminit_latent_entropy
91220+#else
91221+#define add_meminit_latent_entropy __latent_entropy
91222+#endif
91223+
91224 /* These are for everybody (although not all archs will actually
91225 discard it in modules) */
91226-#define __init __section(.init.text) __cold notrace
91227+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
91228 #define __initdata __section(.init.data)
91229 #define __initconst __constsection(.init.rodata)
91230 #define __exitdata __section(.exit.data)
91231@@ -100,7 +108,7 @@
91232 #define __cpuexitconst
91233
91234 /* Used for MEMORY_HOTPLUG */
91235-#define __meminit __section(.meminit.text) __cold notrace
91236+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
91237 #define __meminitdata __section(.meminit.data)
91238 #define __meminitconst __constsection(.meminit.rodata)
91239 #define __memexit __section(.memexit.text) __exitused __cold notrace
91240diff --git a/include/linux/init_task.h b/include/linux/init_task.h
91241index 696d223..6d6b39f 100644
91242--- a/include/linux/init_task.h
91243+++ b/include/linux/init_task.h
91244@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
91245
91246 #define INIT_TASK_COMM "swapper"
91247
91248+#ifdef CONFIG_X86
91249+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
91250+#else
91251+#define INIT_TASK_THREAD_INFO
91252+#endif
91253+
91254 #ifdef CONFIG_RT_MUTEXES
91255 # define INIT_RT_MUTEXES(tsk) \
91256 .pi_waiters = RB_ROOT, \
91257@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
91258 RCU_POINTER_INITIALIZER(cred, &init_cred), \
91259 .comm = INIT_TASK_COMM, \
91260 .thread = INIT_THREAD, \
91261+ INIT_TASK_THREAD_INFO \
91262 .fs = &init_fs, \
91263 .files = &init_files, \
91264 .signal = &init_signals, \
91265diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
91266index 2e88580..f6a99a0 100644
91267--- a/include/linux/interrupt.h
91268+++ b/include/linux/interrupt.h
91269@@ -420,8 +420,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
91270
91271 struct softirq_action
91272 {
91273- void (*action)(struct softirq_action *);
91274-};
91275+ void (*action)(void);
91276+} __no_const;
91277
91278 asmlinkage void do_softirq(void);
91279 asmlinkage void __do_softirq(void);
91280@@ -435,7 +435,7 @@ static inline void do_softirq_own_stack(void)
91281 }
91282 #endif
91283
91284-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
91285+extern void open_softirq(int nr, void (*action)(void));
91286 extern void softirq_init(void);
91287 extern void __raise_softirq_irqoff(unsigned int nr);
91288
91289diff --git a/include/linux/iommu.h b/include/linux/iommu.h
91290index 38daa45..4de4317 100644
91291--- a/include/linux/iommu.h
91292+++ b/include/linux/iommu.h
91293@@ -147,7 +147,7 @@ struct iommu_ops {
91294
91295 unsigned long pgsize_bitmap;
91296 void *priv;
91297-};
91298+} __do_const;
91299
91300 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
91301 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
91302diff --git a/include/linux/ioport.h b/include/linux/ioport.h
91303index 2c525022..345b106 100644
91304--- a/include/linux/ioport.h
91305+++ b/include/linux/ioport.h
91306@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
91307 int adjust_resource(struct resource *res, resource_size_t start,
91308 resource_size_t size);
91309 resource_size_t resource_alignment(struct resource *res);
91310-static inline resource_size_t resource_size(const struct resource *res)
91311+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
91312 {
91313 return res->end - res->start + 1;
91314 }
91315diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
91316index 1eee6bc..9cf4912 100644
91317--- a/include/linux/ipc_namespace.h
91318+++ b/include/linux/ipc_namespace.h
91319@@ -60,7 +60,7 @@ struct ipc_namespace {
91320 struct user_namespace *user_ns;
91321
91322 struct ns_common ns;
91323-};
91324+} __randomize_layout;
91325
91326 extern struct ipc_namespace init_ipc_ns;
91327 extern atomic_t nr_ipc_ns;
91328diff --git a/include/linux/irq.h b/include/linux/irq.h
91329index d09ec7a..f373eb5 100644
91330--- a/include/linux/irq.h
91331+++ b/include/linux/irq.h
91332@@ -364,7 +364,8 @@ struct irq_chip {
91333 void (*irq_write_msi_msg)(struct irq_data *data, struct msi_msg *msg);
91334
91335 unsigned long flags;
91336-};
91337+} __do_const;
91338+typedef struct irq_chip __no_const irq_chip_no_const;
91339
91340 /*
91341 * irq_chip specific flags
91342diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
91343index 71d706d..817cdec 100644
91344--- a/include/linux/irqchip/arm-gic.h
91345+++ b/include/linux/irqchip/arm-gic.h
91346@@ -95,7 +95,7 @@
91347
91348 struct device_node;
91349
91350-extern struct irq_chip gic_arch_extn;
91351+extern irq_chip_no_const gic_arch_extn;
91352
91353 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
91354 u32 offset, struct device_node *);
91355diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
91356index dd1109f..4f4fdda 100644
91357--- a/include/linux/irqdesc.h
91358+++ b/include/linux/irqdesc.h
91359@@ -61,7 +61,7 @@ struct irq_desc {
91360 unsigned int irq_count; /* For detecting broken IRQs */
91361 unsigned long last_unhandled; /* Aging timer for unhandled count */
91362 unsigned int irqs_unhandled;
91363- atomic_t threads_handled;
91364+ atomic_unchecked_t threads_handled;
91365 int threads_handled_last;
91366 raw_spinlock_t lock;
91367 struct cpumask *percpu_enabled;
91368diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
91369index 676d730..8d3a1ad 100644
91370--- a/include/linux/irqdomain.h
91371+++ b/include/linux/irqdomain.h
91372@@ -40,6 +40,7 @@ struct device_node;
91373 struct irq_domain;
91374 struct of_device_id;
91375 struct irq_chip;
91376+typedef struct irq_chip __no_const irq_chip_no_const;
91377 struct irq_data;
91378
91379 /* Number of irqs reserved for a legacy isa controller */
91380diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
91381index c367cbd..c9b79e6 100644
91382--- a/include/linux/jiffies.h
91383+++ b/include/linux/jiffies.h
91384@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
91385 /*
91386 * Convert various time units to each other:
91387 */
91388-extern unsigned int jiffies_to_msecs(const unsigned long j);
91389-extern unsigned int jiffies_to_usecs(const unsigned long j);
91390+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
91391+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
91392
91393-static inline u64 jiffies_to_nsecs(const unsigned long j)
91394+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
91395 {
91396 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
91397 }
91398
91399-extern unsigned long msecs_to_jiffies(const unsigned int m);
91400-extern unsigned long usecs_to_jiffies(const unsigned int u);
91401+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
91402+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
91403 extern unsigned long timespec_to_jiffies(const struct timespec *value);
91404 extern void jiffies_to_timespec(const unsigned long jiffies,
91405- struct timespec *value);
91406-extern unsigned long timeval_to_jiffies(const struct timeval *value);
91407+ struct timespec *value) __intentional_overflow(-1);
91408+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
91409 extern void jiffies_to_timeval(const unsigned long jiffies,
91410 struct timeval *value);
91411
91412diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
91413index 6883e19..e854fcb 100644
91414--- a/include/linux/kallsyms.h
91415+++ b/include/linux/kallsyms.h
91416@@ -15,7 +15,8 @@
91417
91418 struct module;
91419
91420-#ifdef CONFIG_KALLSYMS
91421+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
91422+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
91423 /* Lookup the address for a symbol. Returns 0 if not found. */
91424 unsigned long kallsyms_lookup_name(const char *name);
91425
91426@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
91427 /* Stupid that this does nothing, but I didn't create this mess. */
91428 #define __print_symbol(fmt, addr)
91429 #endif /*CONFIG_KALLSYMS*/
91430+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
91431+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
91432+extern unsigned long kallsyms_lookup_name(const char *name);
91433+extern void __print_symbol(const char *fmt, unsigned long address);
91434+extern int sprint_backtrace(char *buffer, unsigned long address);
91435+extern int sprint_symbol(char *buffer, unsigned long address);
91436+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
91437+const char *kallsyms_lookup(unsigned long addr,
91438+ unsigned long *symbolsize,
91439+ unsigned long *offset,
91440+ char **modname, char *namebuf);
91441+extern int kallsyms_lookup_size_offset(unsigned long addr,
91442+ unsigned long *symbolsize,
91443+ unsigned long *offset);
91444+#endif
91445
91446 /* This macro allows us to keep printk typechecking */
91447 static __printf(1, 2)
91448diff --git a/include/linux/kernel.h b/include/linux/kernel.h
91449index d6d630d..feea1f5 100644
91450--- a/include/linux/kernel.h
91451+++ b/include/linux/kernel.h
91452@@ -378,7 +378,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
91453 /* Obsolete, do not use. Use kstrto<foo> instead */
91454
91455 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
91456-extern long simple_strtol(const char *,char **,unsigned int);
91457+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
91458 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
91459 extern long long simple_strtoll(const char *,char **,unsigned int);
91460
91461diff --git a/include/linux/key-type.h b/include/linux/key-type.h
91462index ff9f1d3..6712be5 100644
91463--- a/include/linux/key-type.h
91464+++ b/include/linux/key-type.h
91465@@ -152,7 +152,7 @@ struct key_type {
91466 /* internal fields */
91467 struct list_head link; /* link in types list */
91468 struct lock_class_key lock_class; /* key->sem lock class */
91469-};
91470+} __do_const;
91471
91472 extern struct key_type key_type_keyring;
91473
91474diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
91475index e465bb1..19f605fd 100644
91476--- a/include/linux/kgdb.h
91477+++ b/include/linux/kgdb.h
91478@@ -52,7 +52,7 @@ extern int kgdb_connected;
91479 extern int kgdb_io_module_registered;
91480
91481 extern atomic_t kgdb_setting_breakpoint;
91482-extern atomic_t kgdb_cpu_doing_single_step;
91483+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
91484
91485 extern struct task_struct *kgdb_usethread;
91486 extern struct task_struct *kgdb_contthread;
91487@@ -254,7 +254,7 @@ struct kgdb_arch {
91488 void (*correct_hw_break)(void);
91489
91490 void (*enable_nmi)(bool on);
91491-};
91492+} __do_const;
91493
91494 /**
91495 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
91496@@ -279,7 +279,7 @@ struct kgdb_io {
91497 void (*pre_exception) (void);
91498 void (*post_exception) (void);
91499 int is_console;
91500-};
91501+} __do_const;
91502
91503 extern struct kgdb_arch arch_kgdb_ops;
91504
91505diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
91506index e705467..a92471d 100644
91507--- a/include/linux/kmemleak.h
91508+++ b/include/linux/kmemleak.h
91509@@ -27,7 +27,7 @@
91510
91511 extern void kmemleak_init(void) __ref;
91512 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
91513- gfp_t gfp) __ref;
91514+ gfp_t gfp) __ref __size_overflow(2);
91515 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size) __ref;
91516 extern void kmemleak_free(const void *ptr) __ref;
91517 extern void kmemleak_free_part(const void *ptr, size_t size) __ref;
91518@@ -62,7 +62,7 @@ static inline void kmemleak_erase(void **ptr)
91519 static inline void kmemleak_init(void)
91520 {
91521 }
91522-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
91523+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
91524 gfp_t gfp)
91525 {
91526 }
91527diff --git a/include/linux/kmod.h b/include/linux/kmod.h
91528index 0555cc6..40116ce 100644
91529--- a/include/linux/kmod.h
91530+++ b/include/linux/kmod.h
91531@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
91532 * usually useless though. */
91533 extern __printf(2, 3)
91534 int __request_module(bool wait, const char *name, ...);
91535+extern __printf(3, 4)
91536+int ___request_module(bool wait, char *param_name, const char *name, ...);
91537 #define request_module(mod...) __request_module(true, mod)
91538 #define request_module_nowait(mod...) __request_module(false, mod)
91539 #define try_then_request_module(x, mod...) \
91540@@ -57,6 +59,9 @@ struct subprocess_info {
91541 struct work_struct work;
91542 struct completion *complete;
91543 char *path;
91544+#ifdef CONFIG_GRKERNSEC
91545+ char *origpath;
91546+#endif
91547 char **argv;
91548 char **envp;
91549 int wait;
91550diff --git a/include/linux/kobject.h b/include/linux/kobject.h
91551index 2d61b90..a1d0a13 100644
91552--- a/include/linux/kobject.h
91553+++ b/include/linux/kobject.h
91554@@ -118,7 +118,7 @@ struct kobj_type {
91555 struct attribute **default_attrs;
91556 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
91557 const void *(*namespace)(struct kobject *kobj);
91558-};
91559+} __do_const;
91560
91561 struct kobj_uevent_env {
91562 char *argv[3];
91563@@ -142,6 +142,7 @@ struct kobj_attribute {
91564 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
91565 const char *buf, size_t count);
91566 };
91567+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
91568
91569 extern const struct sysfs_ops kobj_sysfs_ops;
91570
91571@@ -169,7 +170,7 @@ struct kset {
91572 spinlock_t list_lock;
91573 struct kobject kobj;
91574 const struct kset_uevent_ops *uevent_ops;
91575-};
91576+} __randomize_layout;
91577
91578 extern void kset_init(struct kset *kset);
91579 extern int __must_check kset_register(struct kset *kset);
91580diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
91581index df32d25..fb52e27 100644
91582--- a/include/linux/kobject_ns.h
91583+++ b/include/linux/kobject_ns.h
91584@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
91585 const void *(*netlink_ns)(struct sock *sk);
91586 const void *(*initial_ns)(void);
91587 void (*drop_ns)(void *);
91588-};
91589+} __do_const;
91590
91591 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
91592 int kobj_ns_type_registered(enum kobj_ns_type type);
91593diff --git a/include/linux/kref.h b/include/linux/kref.h
91594index 484604d..0f6c5b6 100644
91595--- a/include/linux/kref.h
91596+++ b/include/linux/kref.h
91597@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
91598 static inline int kref_sub(struct kref *kref, unsigned int count,
91599 void (*release)(struct kref *kref))
91600 {
91601- WARN_ON(release == NULL);
91602+ BUG_ON(release == NULL);
91603
91604 if (atomic_sub_and_test((int) count, &kref->refcount)) {
91605 release(kref);
91606diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
91607index d12b210..d91fd76 100644
91608--- a/include/linux/kvm_host.h
91609+++ b/include/linux/kvm_host.h
91610@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
91611 {
91612 }
91613 #endif
91614-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
91615+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
91616 struct module *module);
91617 void kvm_exit(void);
91618
91619@@ -633,7 +633,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
91620 struct kvm_guest_debug *dbg);
91621 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
91622
91623-int kvm_arch_init(void *opaque);
91624+int kvm_arch_init(const void *opaque);
91625 void kvm_arch_exit(void);
91626
91627 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
91628diff --git a/include/linux/libata.h b/include/linux/libata.h
91629index f8994b4..c1dec7a 100644
91630--- a/include/linux/libata.h
91631+++ b/include/linux/libata.h
91632@@ -989,7 +989,7 @@ struct ata_port_operations {
91633 * fields must be pointers.
91634 */
91635 const struct ata_port_operations *inherits;
91636-};
91637+} __do_const;
91638
91639 struct ata_port_info {
91640 unsigned long flags;
91641diff --git a/include/linux/linkage.h b/include/linux/linkage.h
91642index a6a42dd..6c5ebce 100644
91643--- a/include/linux/linkage.h
91644+++ b/include/linux/linkage.h
91645@@ -36,6 +36,7 @@
91646 #endif
91647
91648 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
91649+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
91650 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
91651
91652 /*
91653diff --git a/include/linux/list.h b/include/linux/list.h
91654index feb773c..98f3075 100644
91655--- a/include/linux/list.h
91656+++ b/include/linux/list.h
91657@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
91658 extern void list_del(struct list_head *entry);
91659 #endif
91660
91661+extern void __pax_list_add(struct list_head *new,
91662+ struct list_head *prev,
91663+ struct list_head *next);
91664+static inline void pax_list_add(struct list_head *new, struct list_head *head)
91665+{
91666+ __pax_list_add(new, head, head->next);
91667+}
91668+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
91669+{
91670+ __pax_list_add(new, head->prev, head);
91671+}
91672+extern void pax_list_del(struct list_head *entry);
91673+
91674 /**
91675 * list_replace - replace old entry by new one
91676 * @old : the element to be replaced
91677@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
91678 INIT_LIST_HEAD(entry);
91679 }
91680
91681+extern void pax_list_del_init(struct list_head *entry);
91682+
91683 /**
91684 * list_move - delete from one list and add as another's head
91685 * @list: the entry to move
91686diff --git a/include/linux/lockref.h b/include/linux/lockref.h
91687index b10b122..d37b3de 100644
91688--- a/include/linux/lockref.h
91689+++ b/include/linux/lockref.h
91690@@ -28,7 +28,7 @@ struct lockref {
91691 #endif
91692 struct {
91693 spinlock_t lock;
91694- int count;
91695+ atomic_t count;
91696 };
91697 };
91698 };
91699@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
91700 extern int lockref_get_not_dead(struct lockref *);
91701
91702 /* Must be called under spinlock for reliable results */
91703-static inline int __lockref_is_dead(const struct lockref *l)
91704+static inline int __lockref_is_dead(const struct lockref *lockref)
91705 {
91706- return ((int)l->count < 0);
91707+ return atomic_read(&lockref->count) < 0;
91708+}
91709+
91710+static inline int __lockref_read(const struct lockref *lockref)
91711+{
91712+ return atomic_read(&lockref->count);
91713+}
91714+
91715+static inline void __lockref_set(struct lockref *lockref, int count)
91716+{
91717+ atomic_set(&lockref->count, count);
91718+}
91719+
91720+static inline void __lockref_inc(struct lockref *lockref)
91721+{
91722+ atomic_inc(&lockref->count);
91723+}
91724+
91725+static inline void __lockref_dec(struct lockref *lockref)
91726+{
91727+ atomic_dec(&lockref->count);
91728 }
91729
91730 #endif /* __LINUX_LOCKREF_H */
91731diff --git a/include/linux/math64.h b/include/linux/math64.h
91732index c45c089..298841c 100644
91733--- a/include/linux/math64.h
91734+++ b/include/linux/math64.h
91735@@ -15,7 +15,7 @@
91736 * This is commonly provided by 32bit archs to provide an optimized 64bit
91737 * divide.
91738 */
91739-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91740+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91741 {
91742 *remainder = dividend % divisor;
91743 return dividend / divisor;
91744@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
91745 /**
91746 * div64_u64 - unsigned 64bit divide with 64bit divisor
91747 */
91748-static inline u64 div64_u64(u64 dividend, u64 divisor)
91749+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
91750 {
91751 return dividend / divisor;
91752 }
91753@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
91754 #define div64_ul(x, y) div_u64((x), (y))
91755
91756 #ifndef div_u64_rem
91757-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91758+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91759 {
91760 *remainder = do_div(dividend, divisor);
91761 return dividend;
91762@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
91763 #endif
91764
91765 #ifndef div64_u64
91766-extern u64 div64_u64(u64 dividend, u64 divisor);
91767+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
91768 #endif
91769
91770 #ifndef div64_s64
91771@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
91772 * divide.
91773 */
91774 #ifndef div_u64
91775-static inline u64 div_u64(u64 dividend, u32 divisor)
91776+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
91777 {
91778 u32 remainder;
91779 return div_u64_rem(dividend, divisor, &remainder);
91780diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
91781index 3d385c8..deacb6a 100644
91782--- a/include/linux/mempolicy.h
91783+++ b/include/linux/mempolicy.h
91784@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
91785 }
91786
91787 #define vma_policy(vma) ((vma)->vm_policy)
91788+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
91789+{
91790+ vma->vm_policy = pol;
91791+}
91792
91793 static inline void mpol_get(struct mempolicy *pol)
91794 {
91795@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
91796 }
91797
91798 #define vma_policy(vma) NULL
91799+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
91800+{
91801+}
91802
91803 static inline int
91804 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
91805diff --git a/include/linux/mm.h b/include/linux/mm.h
91806index 47a9392..ef645bc 100644
91807--- a/include/linux/mm.h
91808+++ b/include/linux/mm.h
91809@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
91810
91811 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
91812 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
91813+
91814+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
91815+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
91816+#endif
91817+
91818 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
91819 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
91820 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
91821@@ -254,8 +259,8 @@ struct vm_operations_struct {
91822 /* called by access_process_vm when get_user_pages() fails, typically
91823 * for use by special VMAs that can switch between memory and hardware
91824 */
91825- int (*access)(struct vm_area_struct *vma, unsigned long addr,
91826- void *buf, int len, int write);
91827+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
91828+ void *buf, size_t len, int write);
91829
91830 /* Called by the /proc/PID/maps code to ask the vma whether it
91831 * has a special name. Returning non-NULL will also cause this
91832@@ -293,6 +298,7 @@ struct vm_operations_struct {
91833 struct page *(*find_special_page)(struct vm_area_struct *vma,
91834 unsigned long addr);
91835 };
91836+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
91837
91838 struct mmu_gather;
91839 struct inode;
91840@@ -1213,8 +1219,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
91841 unsigned long *pfn);
91842 int follow_phys(struct vm_area_struct *vma, unsigned long address,
91843 unsigned int flags, unsigned long *prot, resource_size_t *phys);
91844-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
91845- void *buf, int len, int write);
91846+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
91847+ void *buf, size_t len, int write);
91848
91849 static inline void unmap_shared_mapping_range(struct address_space *mapping,
91850 loff_t const holebegin, loff_t const holelen)
91851@@ -1254,9 +1260,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
91852 }
91853 #endif
91854
91855-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
91856-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
91857- void *buf, int len, int write);
91858+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
91859+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
91860+ void *buf, size_t len, int write);
91861
91862 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
91863 unsigned long start, unsigned long nr_pages,
91864@@ -1299,34 +1305,6 @@ int set_page_dirty_lock(struct page *page);
91865 int clear_page_dirty_for_io(struct page *page);
91866 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
91867
91868-/* Is the vma a continuation of the stack vma above it? */
91869-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
91870-{
91871- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
91872-}
91873-
91874-static inline int stack_guard_page_start(struct vm_area_struct *vma,
91875- unsigned long addr)
91876-{
91877- return (vma->vm_flags & VM_GROWSDOWN) &&
91878- (vma->vm_start == addr) &&
91879- !vma_growsdown(vma->vm_prev, addr);
91880-}
91881-
91882-/* Is the vma a continuation of the stack vma below it? */
91883-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
91884-{
91885- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
91886-}
91887-
91888-static inline int stack_guard_page_end(struct vm_area_struct *vma,
91889- unsigned long addr)
91890-{
91891- return (vma->vm_flags & VM_GROWSUP) &&
91892- (vma->vm_end == addr) &&
91893- !vma_growsup(vma->vm_next, addr);
91894-}
91895-
91896 extern struct task_struct *task_of_stack(struct task_struct *task,
91897 struct vm_area_struct *vma, bool in_group);
91898
91899@@ -1449,8 +1427,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
91900 {
91901 return 0;
91902 }
91903+
91904+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
91905+ unsigned long address)
91906+{
91907+ return 0;
91908+}
91909 #else
91910 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
91911+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
91912 #endif
91913
91914 #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
91915@@ -1460,6 +1445,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
91916 return 0;
91917 }
91918
91919+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
91920+ unsigned long address)
91921+{
91922+ return 0;
91923+}
91924+
91925 static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
91926
91927 static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
91928@@ -1472,6 +1463,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
91929
91930 #else
91931 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
91932+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
91933
91934 static inline void mm_nr_pmds_init(struct mm_struct *mm)
91935 {
91936@@ -1509,11 +1501,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
91937 NULL: pud_offset(pgd, address);
91938 }
91939
91940+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
91941+{
91942+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
91943+ NULL: pud_offset(pgd, address);
91944+}
91945+
91946 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
91947 {
91948 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
91949 NULL: pmd_offset(pud, address);
91950 }
91951+
91952+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
91953+{
91954+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
91955+ NULL: pmd_offset(pud, address);
91956+}
91957 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
91958
91959 #if USE_SPLIT_PTE_PTLOCKS
91960@@ -1890,12 +1894,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
91961 bool *need_rmap_locks);
91962 extern void exit_mmap(struct mm_struct *);
91963
91964+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
91965+extern void gr_learn_resource(const struct task_struct *task, const int res,
91966+ const unsigned long wanted, const int gt);
91967+#else
91968+static inline void gr_learn_resource(const struct task_struct *task, const int res,
91969+ const unsigned long wanted, const int gt)
91970+{
91971+}
91972+#endif
91973+
91974 static inline int check_data_rlimit(unsigned long rlim,
91975 unsigned long new,
91976 unsigned long start,
91977 unsigned long end_data,
91978 unsigned long start_data)
91979 {
91980+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
91981 if (rlim < RLIM_INFINITY) {
91982 if (((new - start) + (end_data - start_data)) > rlim)
91983 return -ENOSPC;
91984@@ -1920,7 +1935,7 @@ extern int install_special_mapping(struct mm_struct *mm,
91985 unsigned long addr, unsigned long len,
91986 unsigned long flags, struct page **pages);
91987
91988-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
91989+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
91990
91991 extern unsigned long mmap_region(struct file *file, unsigned long addr,
91992 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
91993@@ -1928,6 +1943,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
91994 unsigned long len, unsigned long prot, unsigned long flags,
91995 unsigned long pgoff, unsigned long *populate);
91996 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
91997+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
91998
91999 #ifdef CONFIG_MMU
92000 extern int __mm_populate(unsigned long addr, unsigned long len,
92001@@ -1956,10 +1972,11 @@ struct vm_unmapped_area_info {
92002 unsigned long high_limit;
92003 unsigned long align_mask;
92004 unsigned long align_offset;
92005+ unsigned long threadstack_offset;
92006 };
92007
92008-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
92009-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
92010+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
92011+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
92012
92013 /*
92014 * Search for an unmapped address range.
92015@@ -1971,7 +1988,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
92016 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
92017 */
92018 static inline unsigned long
92019-vm_unmapped_area(struct vm_unmapped_area_info *info)
92020+vm_unmapped_area(const struct vm_unmapped_area_info *info)
92021 {
92022 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
92023 return unmapped_area(info);
92024@@ -2033,6 +2050,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
92025 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
92026 struct vm_area_struct **pprev);
92027
92028+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
92029+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
92030+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
92031+
92032 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
92033 NULL if none. Assume start_addr < end_addr. */
92034 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
92035@@ -2062,10 +2083,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
92036 }
92037
92038 #ifdef CONFIG_MMU
92039-pgprot_t vm_get_page_prot(unsigned long vm_flags);
92040+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
92041 void vma_set_page_prot(struct vm_area_struct *vma);
92042 #else
92043-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
92044+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
92045 {
92046 return __pgprot(0);
92047 }
92048@@ -2127,6 +2148,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
92049 static inline void vm_stat_account(struct mm_struct *mm,
92050 unsigned long flags, struct file *file, long pages)
92051 {
92052+
92053+#ifdef CONFIG_PAX_RANDMMAP
92054+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
92055+#endif
92056+
92057 mm->total_vm += pages;
92058 }
92059 #endif /* CONFIG_PROC_FS */
92060@@ -2229,7 +2255,7 @@ extern int unpoison_memory(unsigned long pfn);
92061 extern int sysctl_memory_failure_early_kill;
92062 extern int sysctl_memory_failure_recovery;
92063 extern void shake_page(struct page *p, int access);
92064-extern atomic_long_t num_poisoned_pages;
92065+extern atomic_long_unchecked_t num_poisoned_pages;
92066 extern int soft_offline_page(struct page *page, int flags);
92067
92068 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
92069@@ -2280,5 +2306,11 @@ void __init setup_nr_node_ids(void);
92070 static inline void setup_nr_node_ids(void) {}
92071 #endif
92072
92073+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
92074+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
92075+#else
92076+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
92077+#endif
92078+
92079 #endif /* __KERNEL__ */
92080 #endif /* _LINUX_MM_H */
92081diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
92082index 199a03a..7328440 100644
92083--- a/include/linux/mm_types.h
92084+++ b/include/linux/mm_types.h
92085@@ -313,7 +313,9 @@ struct vm_area_struct {
92086 #ifdef CONFIG_NUMA
92087 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
92088 #endif
92089-};
92090+
92091+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
92092+} __randomize_layout;
92093
92094 struct core_thread {
92095 struct task_struct *task;
92096@@ -464,7 +466,25 @@ struct mm_struct {
92097 /* address of the bounds directory */
92098 void __user *bd_addr;
92099 #endif
92100-};
92101+
92102+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
92103+ unsigned long pax_flags;
92104+#endif
92105+
92106+#ifdef CONFIG_PAX_DLRESOLVE
92107+ unsigned long call_dl_resolve;
92108+#endif
92109+
92110+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
92111+ unsigned long call_syscall;
92112+#endif
92113+
92114+#ifdef CONFIG_PAX_ASLR
92115+ unsigned long delta_mmap; /* randomized offset */
92116+ unsigned long delta_stack; /* randomized offset */
92117+#endif
92118+
92119+} __randomize_layout;
92120
92121 static inline void mm_init_cpumask(struct mm_struct *mm)
92122 {
92123diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
92124index 160448f..7b332b7 100644
92125--- a/include/linux/mmc/core.h
92126+++ b/include/linux/mmc/core.h
92127@@ -79,7 +79,7 @@ struct mmc_command {
92128 #define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_MASK)
92129
92130 unsigned int retries; /* max number of retries */
92131- unsigned int error; /* command error */
92132+ int error; /* command error */
92133
92134 /*
92135 * Standard errno values are used for errors, but some have specific
92136diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
92137index c5d5278..f0b68c8 100644
92138--- a/include/linux/mmiotrace.h
92139+++ b/include/linux/mmiotrace.h
92140@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
92141 /* Called from ioremap.c */
92142 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
92143 void __iomem *addr);
92144-extern void mmiotrace_iounmap(volatile void __iomem *addr);
92145+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
92146
92147 /* For anyone to insert markers. Remember trailing newline. */
92148 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
92149@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
92150 {
92151 }
92152
92153-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
92154+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
92155 {
92156 }
92157
92158diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
92159index 2782df4..abe756e 100644
92160--- a/include/linux/mmzone.h
92161+++ b/include/linux/mmzone.h
92162@@ -526,7 +526,7 @@ struct zone {
92163
92164 ZONE_PADDING(_pad3_)
92165 /* Zone statistics */
92166- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
92167+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
92168 } ____cacheline_internodealigned_in_smp;
92169
92170 enum zone_flags {
92171diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
92172index e530533..c9620c7 100644
92173--- a/include/linux/mod_devicetable.h
92174+++ b/include/linux/mod_devicetable.h
92175@@ -139,7 +139,7 @@ struct usb_device_id {
92176 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
92177 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
92178
92179-#define HID_ANY_ID (~0)
92180+#define HID_ANY_ID (~0U)
92181 #define HID_BUS_ANY 0xffff
92182 #define HID_GROUP_ANY 0x0000
92183
92184@@ -470,7 +470,7 @@ struct dmi_system_id {
92185 const char *ident;
92186 struct dmi_strmatch matches[4];
92187 void *driver_data;
92188-};
92189+} __do_const;
92190 /*
92191 * struct dmi_device_id appears during expansion of
92192 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
92193diff --git a/include/linux/module.h b/include/linux/module.h
92194index b03485b..a26974f 100644
92195--- a/include/linux/module.h
92196+++ b/include/linux/module.h
92197@@ -17,9 +17,11 @@
92198 #include <linux/moduleparam.h>
92199 #include <linux/jump_label.h>
92200 #include <linux/export.h>
92201+#include <linux/fs.h>
92202
92203 #include <linux/percpu.h>
92204 #include <asm/module.h>
92205+#include <asm/pgtable.h>
92206
92207 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
92208 #define MODULE_SIG_STRING "~Module signature appended~\n"
92209@@ -42,7 +44,7 @@ struct module_kobject {
92210 struct kobject *drivers_dir;
92211 struct module_param_attrs *mp;
92212 struct completion *kobj_completion;
92213-};
92214+} __randomize_layout;
92215
92216 struct module_attribute {
92217 struct attribute attr;
92218@@ -54,12 +56,13 @@ struct module_attribute {
92219 int (*test)(struct module *);
92220 void (*free)(struct module *);
92221 };
92222+typedef struct module_attribute __no_const module_attribute_no_const;
92223
92224 struct module_version_attribute {
92225 struct module_attribute mattr;
92226 const char *module_name;
92227 const char *version;
92228-} __attribute__ ((__aligned__(sizeof(void *))));
92229+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
92230
92231 extern ssize_t __modver_version_show(struct module_attribute *,
92232 struct module_kobject *, char *);
92233@@ -221,7 +224,7 @@ struct module {
92234
92235 /* Sysfs stuff. */
92236 struct module_kobject mkobj;
92237- struct module_attribute *modinfo_attrs;
92238+ module_attribute_no_const *modinfo_attrs;
92239 const char *version;
92240 const char *srcversion;
92241 struct kobject *holders_dir;
92242@@ -270,19 +273,16 @@ struct module {
92243 int (*init)(void);
92244
92245 /* If this is non-NULL, vfree after init() returns */
92246- void *module_init;
92247+ void *module_init_rx, *module_init_rw;
92248
92249 /* Here is the actual code + data, vfree'd on unload. */
92250- void *module_core;
92251+ void *module_core_rx, *module_core_rw;
92252
92253 /* Here are the sizes of the init and core sections */
92254- unsigned int init_size, core_size;
92255+ unsigned int init_size_rw, core_size_rw;
92256
92257 /* The size of the executable code in each section. */
92258- unsigned int init_text_size, core_text_size;
92259-
92260- /* Size of RO sections of the module (text+rodata) */
92261- unsigned int init_ro_size, core_ro_size;
92262+ unsigned int init_size_rx, core_size_rx;
92263
92264 /* Arch-specific module values */
92265 struct mod_arch_specific arch;
92266@@ -338,6 +338,10 @@ struct module {
92267 #ifdef CONFIG_EVENT_TRACING
92268 struct ftrace_event_call **trace_events;
92269 unsigned int num_trace_events;
92270+ struct file_operations trace_id;
92271+ struct file_operations trace_enable;
92272+ struct file_operations trace_format;
92273+ struct file_operations trace_filter;
92274 #endif
92275 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
92276 unsigned int num_ftrace_callsites;
92277@@ -365,7 +369,7 @@ struct module {
92278 ctor_fn_t *ctors;
92279 unsigned int num_ctors;
92280 #endif
92281-};
92282+} __randomize_layout;
92283 #ifndef MODULE_ARCH_INIT
92284 #define MODULE_ARCH_INIT {}
92285 #endif
92286@@ -386,18 +390,48 @@ bool is_module_address(unsigned long addr);
92287 bool is_module_percpu_address(unsigned long addr);
92288 bool is_module_text_address(unsigned long addr);
92289
92290+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
92291+{
92292+
92293+#ifdef CONFIG_PAX_KERNEXEC
92294+ if (ktla_ktva(addr) >= (unsigned long)start &&
92295+ ktla_ktva(addr) < (unsigned long)start + size)
92296+ return 1;
92297+#endif
92298+
92299+ return ((void *)addr >= start && (void *)addr < start + size);
92300+}
92301+
92302+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
92303+{
92304+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
92305+}
92306+
92307+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
92308+{
92309+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
92310+}
92311+
92312+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
92313+{
92314+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
92315+}
92316+
92317+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
92318+{
92319+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
92320+}
92321+
92322 static inline bool within_module_core(unsigned long addr,
92323 const struct module *mod)
92324 {
92325- return (unsigned long)mod->module_core <= addr &&
92326- addr < (unsigned long)mod->module_core + mod->core_size;
92327+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
92328 }
92329
92330 static inline bool within_module_init(unsigned long addr,
92331 const struct module *mod)
92332 {
92333- return (unsigned long)mod->module_init <= addr &&
92334- addr < (unsigned long)mod->module_init + mod->init_size;
92335+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
92336 }
92337
92338 static inline bool within_module(unsigned long addr, const struct module *mod)
92339diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
92340index 4d0cb9b..3169ac7 100644
92341--- a/include/linux/moduleloader.h
92342+++ b/include/linux/moduleloader.h
92343@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
92344 sections. Returns NULL on failure. */
92345 void *module_alloc(unsigned long size);
92346
92347+#ifdef CONFIG_PAX_KERNEXEC
92348+void *module_alloc_exec(unsigned long size);
92349+#else
92350+#define module_alloc_exec(x) module_alloc(x)
92351+#endif
92352+
92353 /* Free memory returned from module_alloc. */
92354 void module_memfree(void *module_region);
92355
92356+#ifdef CONFIG_PAX_KERNEXEC
92357+void module_memfree_exec(void *module_region);
92358+#else
92359+#define module_memfree_exec(x) module_memfree((x))
92360+#endif
92361+
92362 /*
92363 * Apply the given relocation to the (simplified) ELF. Return -error
92364 * or 0.
92365@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
92366 unsigned int relsec,
92367 struct module *me)
92368 {
92369+#ifdef CONFIG_MODULES
92370 printk(KERN_ERR "module %s: REL relocation unsupported\n",
92371 module_name(me));
92372+#endif
92373 return -ENOEXEC;
92374 }
92375 #endif
92376@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
92377 unsigned int relsec,
92378 struct module *me)
92379 {
92380+#ifdef CONFIG_MODULES
92381 printk(KERN_ERR "module %s: REL relocation unsupported\n",
92382 module_name(me));
92383+#endif
92384 return -ENOEXEC;
92385 }
92386 #endif
92387diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
92388index 1c9effa..1160bdd 100644
92389--- a/include/linux/moduleparam.h
92390+++ b/include/linux/moduleparam.h
92391@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
92392 * @len is usually just sizeof(string).
92393 */
92394 #define module_param_string(name, string, len, perm) \
92395- static const struct kparam_string __param_string_##name \
92396+ static const struct kparam_string __param_string_##name __used \
92397 = { len, string }; \
92398 __module_param_call(MODULE_PARAM_PREFIX, name, \
92399 &param_ops_string, \
92400@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
92401 */
92402 #define module_param_array_named(name, array, type, nump, perm) \
92403 param_check_##type(name, &(array)[0]); \
92404- static const struct kparam_array __param_arr_##name \
92405+ static const struct kparam_array __param_arr_##name __used \
92406 = { .max = ARRAY_SIZE(array), .num = nump, \
92407 .ops = &param_ops_##type, \
92408 .elemsize = sizeof(array[0]), .elem = array }; \
92409diff --git a/include/linux/mount.h b/include/linux/mount.h
92410index 564beee..653be6f 100644
92411--- a/include/linux/mount.h
92412+++ b/include/linux/mount.h
92413@@ -67,7 +67,7 @@ struct vfsmount {
92414 struct dentry *mnt_root; /* root of the mounted tree */
92415 struct super_block *mnt_sb; /* pointer to superblock */
92416 int mnt_flags;
92417-};
92418+} __randomize_layout;
92419
92420 struct file; /* forward dec */
92421 struct path;
92422diff --git a/include/linux/namei.h b/include/linux/namei.h
92423index c899077..b9a2010 100644
92424--- a/include/linux/namei.h
92425+++ b/include/linux/namei.h
92426@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
92427 extern void unlock_rename(struct dentry *, struct dentry *);
92428
92429 extern void nd_jump_link(struct nameidata *nd, struct path *path);
92430-extern void nd_set_link(struct nameidata *nd, char *path);
92431-extern char *nd_get_link(struct nameidata *nd);
92432+extern void nd_set_link(struct nameidata *nd, const char *path);
92433+extern const char *nd_get_link(const struct nameidata *nd);
92434
92435 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
92436 {
92437diff --git a/include/linux/net.h b/include/linux/net.h
92438index 17d8339..81656c0 100644
92439--- a/include/linux/net.h
92440+++ b/include/linux/net.h
92441@@ -192,7 +192,7 @@ struct net_proto_family {
92442 int (*create)(struct net *net, struct socket *sock,
92443 int protocol, int kern);
92444 struct module *owner;
92445-};
92446+} __do_const;
92447
92448 struct iovec;
92449 struct kvec;
92450diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
92451index 2787388..1dd8e88 100644
92452--- a/include/linux/netdevice.h
92453+++ b/include/linux/netdevice.h
92454@@ -1198,6 +1198,7 @@ struct net_device_ops {
92455 u8 state);
92456 #endif
92457 };
92458+typedef struct net_device_ops __no_const net_device_ops_no_const;
92459
92460 /**
92461 * enum net_device_priv_flags - &struct net_device priv_flags
92462@@ -1546,10 +1547,10 @@ struct net_device {
92463
92464 struct net_device_stats stats;
92465
92466- atomic_long_t rx_dropped;
92467- atomic_long_t tx_dropped;
92468+ atomic_long_unchecked_t rx_dropped;
92469+ atomic_long_unchecked_t tx_dropped;
92470
92471- atomic_t carrier_changes;
92472+ atomic_unchecked_t carrier_changes;
92473
92474 #ifdef CONFIG_WIRELESS_EXT
92475 const struct iw_handler_def * wireless_handlers;
92476diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
92477index 2517ece..0bbfcfb 100644
92478--- a/include/linux/netfilter.h
92479+++ b/include/linux/netfilter.h
92480@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
92481 #endif
92482 /* Use the module struct to lock set/get code in place */
92483 struct module *owner;
92484-};
92485+} __do_const;
92486
92487 /* Function to register/unregister hook points. */
92488 int nf_register_hook(struct nf_hook_ops *reg);
92489diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
92490index e955d47..04a5338 100644
92491--- a/include/linux/netfilter/nfnetlink.h
92492+++ b/include/linux/netfilter/nfnetlink.h
92493@@ -19,7 +19,7 @@ struct nfnl_callback {
92494 const struct nlattr * const cda[]);
92495 const struct nla_policy *policy; /* netlink attribute policy */
92496 const u_int16_t attr_count; /* number of nlattr's */
92497-};
92498+} __do_const;
92499
92500 struct nfnetlink_subsystem {
92501 const char *name;
92502diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
92503new file mode 100644
92504index 0000000..33f4af8
92505--- /dev/null
92506+++ b/include/linux/netfilter/xt_gradm.h
92507@@ -0,0 +1,9 @@
92508+#ifndef _LINUX_NETFILTER_XT_GRADM_H
92509+#define _LINUX_NETFILTER_XT_GRADM_H 1
92510+
92511+struct xt_gradm_mtinfo {
92512+ __u16 flags;
92513+ __u16 invflags;
92514+};
92515+
92516+#endif
92517diff --git a/include/linux/nls.h b/include/linux/nls.h
92518index 520681b..2b7fabb 100644
92519--- a/include/linux/nls.h
92520+++ b/include/linux/nls.h
92521@@ -31,7 +31,7 @@ struct nls_table {
92522 const unsigned char *charset2upper;
92523 struct module *owner;
92524 struct nls_table *next;
92525-};
92526+} __do_const;
92527
92528 /* this value hold the maximum octet of charset */
92529 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
92530@@ -46,7 +46,7 @@ enum utf16_endian {
92531 /* nls_base.c */
92532 extern int __register_nls(struct nls_table *, struct module *);
92533 extern int unregister_nls(struct nls_table *);
92534-extern struct nls_table *load_nls(char *);
92535+extern struct nls_table *load_nls(const char *);
92536 extern void unload_nls(struct nls_table *);
92537 extern struct nls_table *load_nls_default(void);
92538 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
92539diff --git a/include/linux/notifier.h b/include/linux/notifier.h
92540index d14a4c3..a078786 100644
92541--- a/include/linux/notifier.h
92542+++ b/include/linux/notifier.h
92543@@ -54,7 +54,8 @@ struct notifier_block {
92544 notifier_fn_t notifier_call;
92545 struct notifier_block __rcu *next;
92546 int priority;
92547-};
92548+} __do_const;
92549+typedef struct notifier_block __no_const notifier_block_no_const;
92550
92551 struct atomic_notifier_head {
92552 spinlock_t lock;
92553diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
92554index b2a0f15..4d7da32 100644
92555--- a/include/linux/oprofile.h
92556+++ b/include/linux/oprofile.h
92557@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
92558 int oprofilefs_create_ro_ulong(struct dentry * root,
92559 char const * name, ulong * val);
92560
92561-/** Create a file for read-only access to an atomic_t. */
92562+/** Create a file for read-only access to an atomic_unchecked_t. */
92563 int oprofilefs_create_ro_atomic(struct dentry * root,
92564- char const * name, atomic_t * val);
92565+ char const * name, atomic_unchecked_t * val);
92566
92567 /** create a directory */
92568 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
92569diff --git a/include/linux/padata.h b/include/linux/padata.h
92570index 4386946..f50c615 100644
92571--- a/include/linux/padata.h
92572+++ b/include/linux/padata.h
92573@@ -129,7 +129,7 @@ struct parallel_data {
92574 struct padata_serial_queue __percpu *squeue;
92575 atomic_t reorder_objects;
92576 atomic_t refcnt;
92577- atomic_t seq_nr;
92578+ atomic_unchecked_t seq_nr;
92579 struct padata_cpumask cpumask;
92580 spinlock_t lock ____cacheline_aligned;
92581 unsigned int processed;
92582diff --git a/include/linux/path.h b/include/linux/path.h
92583index d137218..be0c176 100644
92584--- a/include/linux/path.h
92585+++ b/include/linux/path.h
92586@@ -1,13 +1,15 @@
92587 #ifndef _LINUX_PATH_H
92588 #define _LINUX_PATH_H
92589
92590+#include <linux/compiler.h>
92591+
92592 struct dentry;
92593 struct vfsmount;
92594
92595 struct path {
92596 struct vfsmount *mnt;
92597 struct dentry *dentry;
92598-};
92599+} __randomize_layout;
92600
92601 extern void path_get(const struct path *);
92602 extern void path_put(const struct path *);
92603diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
92604index 8c78950..0d74ed9 100644
92605--- a/include/linux/pci_hotplug.h
92606+++ b/include/linux/pci_hotplug.h
92607@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
92608 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
92609 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
92610 int (*reset_slot) (struct hotplug_slot *slot, int probe);
92611-};
92612+} __do_const;
92613+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
92614
92615 /**
92616 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
92617diff --git a/include/linux/percpu.h b/include/linux/percpu.h
92618index caebf2a..4c3ae9d 100644
92619--- a/include/linux/percpu.h
92620+++ b/include/linux/percpu.h
92621@@ -34,7 +34,7 @@
92622 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
92623 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
92624 */
92625-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
92626+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
92627 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
92628
92629 /*
92630diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
92631index 2b62198..2b74233 100644
92632--- a/include/linux/perf_event.h
92633+++ b/include/linux/perf_event.h
92634@@ -343,8 +343,8 @@ struct perf_event {
92635
92636 enum perf_event_active_state state;
92637 unsigned int attach_state;
92638- local64_t count;
92639- atomic64_t child_count;
92640+ local64_t count; /* PaX: fix it one day */
92641+ atomic64_unchecked_t child_count;
92642
92643 /*
92644 * These are the total time in nanoseconds that the event
92645@@ -395,8 +395,8 @@ struct perf_event {
92646 * These accumulate total time (in nanoseconds) that children
92647 * events have been enabled and running, respectively.
92648 */
92649- atomic64_t child_total_time_enabled;
92650- atomic64_t child_total_time_running;
92651+ atomic64_unchecked_t child_total_time_enabled;
92652+ atomic64_unchecked_t child_total_time_running;
92653
92654 /*
92655 * Protect attach/detach and child_list:
92656@@ -752,7 +752,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
92657 entry->ip[entry->nr++] = ip;
92658 }
92659
92660-extern int sysctl_perf_event_paranoid;
92661+extern int sysctl_perf_event_legitimately_concerned;
92662 extern int sysctl_perf_event_mlock;
92663 extern int sysctl_perf_event_sample_rate;
92664 extern int sysctl_perf_cpu_time_max_percent;
92665@@ -767,19 +767,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
92666 loff_t *ppos);
92667
92668
92669+static inline bool perf_paranoid_any(void)
92670+{
92671+ return sysctl_perf_event_legitimately_concerned > 2;
92672+}
92673+
92674 static inline bool perf_paranoid_tracepoint_raw(void)
92675 {
92676- return sysctl_perf_event_paranoid > -1;
92677+ return sysctl_perf_event_legitimately_concerned > -1;
92678 }
92679
92680 static inline bool perf_paranoid_cpu(void)
92681 {
92682- return sysctl_perf_event_paranoid > 0;
92683+ return sysctl_perf_event_legitimately_concerned > 0;
92684 }
92685
92686 static inline bool perf_paranoid_kernel(void)
92687 {
92688- return sysctl_perf_event_paranoid > 1;
92689+ return sysctl_perf_event_legitimately_concerned > 1;
92690 }
92691
92692 extern void perf_event_init(void);
92693@@ -912,7 +917,7 @@ struct perf_pmu_events_attr {
92694 struct device_attribute attr;
92695 u64 id;
92696 const char *event_str;
92697-};
92698+} __do_const;
92699
92700 ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
92701 char *page);
92702diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
92703index 918b117..7af374b7 100644
92704--- a/include/linux/pid_namespace.h
92705+++ b/include/linux/pid_namespace.h
92706@@ -45,7 +45,7 @@ struct pid_namespace {
92707 int hide_pid;
92708 int reboot; /* group exit code if this pidns was rebooted */
92709 struct ns_common ns;
92710-};
92711+} __randomize_layout;
92712
92713 extern struct pid_namespace init_pid_ns;
92714
92715diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
92716index eb8b8ac..62649e1 100644
92717--- a/include/linux/pipe_fs_i.h
92718+++ b/include/linux/pipe_fs_i.h
92719@@ -47,10 +47,10 @@ struct pipe_inode_info {
92720 struct mutex mutex;
92721 wait_queue_head_t wait;
92722 unsigned int nrbufs, curbuf, buffers;
92723- unsigned int readers;
92724- unsigned int writers;
92725- unsigned int files;
92726- unsigned int waiting_writers;
92727+ atomic_t readers;
92728+ atomic_t writers;
92729+ atomic_t files;
92730+ atomic_t waiting_writers;
92731 unsigned int r_counter;
92732 unsigned int w_counter;
92733 struct page *tmp_page;
92734diff --git a/include/linux/pm.h b/include/linux/pm.h
92735index e2f1be6..78a0506 100644
92736--- a/include/linux/pm.h
92737+++ b/include/linux/pm.h
92738@@ -608,6 +608,7 @@ struct dev_pm_domain {
92739 struct dev_pm_ops ops;
92740 void (*detach)(struct device *dev, bool power_off);
92741 };
92742+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
92743
92744 /*
92745 * The PM_EVENT_ messages are also used by drivers implementing the legacy
92746diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
92747index 080e778..cbdaef7 100644
92748--- a/include/linux/pm_domain.h
92749+++ b/include/linux/pm_domain.h
92750@@ -39,11 +39,11 @@ struct gpd_dev_ops {
92751 int (*save_state)(struct device *dev);
92752 int (*restore_state)(struct device *dev);
92753 bool (*active_wakeup)(struct device *dev);
92754-};
92755+} __no_const;
92756
92757 struct gpd_cpuidle_data {
92758 unsigned int saved_exit_latency;
92759- struct cpuidle_state *idle_state;
92760+ cpuidle_state_no_const *idle_state;
92761 };
92762
92763 struct generic_pm_domain {
92764diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
92765index 30e84d4..22278b4 100644
92766--- a/include/linux/pm_runtime.h
92767+++ b/include/linux/pm_runtime.h
92768@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
92769
92770 static inline void pm_runtime_mark_last_busy(struct device *dev)
92771 {
92772- ACCESS_ONCE(dev->power.last_busy) = jiffies;
92773+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
92774 }
92775
92776 static inline bool pm_runtime_is_irq_safe(struct device *dev)
92777diff --git a/include/linux/pnp.h b/include/linux/pnp.h
92778index 6512e9c..ec27fa2 100644
92779--- a/include/linux/pnp.h
92780+++ b/include/linux/pnp.h
92781@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
92782 struct pnp_fixup {
92783 char id[7];
92784 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
92785-};
92786+} __do_const;
92787
92788 /* config parameters */
92789 #define PNP_CONFIG_NORMAL 0x0001
92790diff --git a/include/linux/poison.h b/include/linux/poison.h
92791index 2110a81..13a11bb 100644
92792--- a/include/linux/poison.h
92793+++ b/include/linux/poison.h
92794@@ -19,8 +19,8 @@
92795 * under normal circumstances, used to verify that nobody uses
92796 * non-initialized list entries.
92797 */
92798-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
92799-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
92800+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
92801+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
92802
92803 /********** include/linux/timer.h **********/
92804 /*
92805diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
92806index d8b187c3..9a9257a 100644
92807--- a/include/linux/power/smartreflex.h
92808+++ b/include/linux/power/smartreflex.h
92809@@ -238,7 +238,7 @@ struct omap_sr_class_data {
92810 int (*notify)(struct omap_sr *sr, u32 status);
92811 u8 notify_flags;
92812 u8 class_type;
92813-};
92814+} __do_const;
92815
92816 /**
92817 * struct omap_sr_nvalue_table - Smartreflex n-target value info
92818diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
92819index 4ea1d37..80f4b33 100644
92820--- a/include/linux/ppp-comp.h
92821+++ b/include/linux/ppp-comp.h
92822@@ -84,7 +84,7 @@ struct compressor {
92823 struct module *owner;
92824 /* Extra skb space needed by the compressor algorithm */
92825 unsigned int comp_extra;
92826-};
92827+} __do_const;
92828
92829 /*
92830 * The return value from decompress routine is the length of the
92831diff --git a/include/linux/preempt.h b/include/linux/preempt.h
92832index de83b4e..c4b997d 100644
92833--- a/include/linux/preempt.h
92834+++ b/include/linux/preempt.h
92835@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
92836 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
92837 #endif
92838
92839+#define raw_preempt_count_add(val) __preempt_count_add(val)
92840+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
92841+
92842 #define __preempt_count_inc() __preempt_count_add(1)
92843 #define __preempt_count_dec() __preempt_count_sub(1)
92844
92845 #define preempt_count_inc() preempt_count_add(1)
92846+#define raw_preempt_count_inc() raw_preempt_count_add(1)
92847 #define preempt_count_dec() preempt_count_sub(1)
92848+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
92849
92850 #ifdef CONFIG_PREEMPT_COUNT
92851
92852@@ -41,6 +46,12 @@ do { \
92853 barrier(); \
92854 } while (0)
92855
92856+#define raw_preempt_disable() \
92857+do { \
92858+ raw_preempt_count_inc(); \
92859+ barrier(); \
92860+} while (0)
92861+
92862 #define sched_preempt_enable_no_resched() \
92863 do { \
92864 barrier(); \
92865@@ -49,6 +60,12 @@ do { \
92866
92867 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
92868
92869+#define raw_preempt_enable_no_resched() \
92870+do { \
92871+ barrier(); \
92872+ raw_preempt_count_dec(); \
92873+} while (0)
92874+
92875 #ifdef CONFIG_PREEMPT
92876 #define preempt_enable() \
92877 do { \
92878@@ -113,8 +130,10 @@ do { \
92879 * region.
92880 */
92881 #define preempt_disable() barrier()
92882+#define raw_preempt_disable() barrier()
92883 #define sched_preempt_enable_no_resched() barrier()
92884 #define preempt_enable_no_resched() barrier()
92885+#define raw_preempt_enable_no_resched() barrier()
92886 #define preempt_enable() barrier()
92887 #define preempt_check_resched() do { } while (0)
92888
92889@@ -128,11 +147,13 @@ do { \
92890 /*
92891 * Modules have no business playing preemption tricks.
92892 */
92893+#ifndef CONFIG_PAX_KERNEXEC
92894 #undef sched_preempt_enable_no_resched
92895 #undef preempt_enable_no_resched
92896 #undef preempt_enable_no_resched_notrace
92897 #undef preempt_check_resched
92898 #endif
92899+#endif
92900
92901 #define preempt_set_need_resched() \
92902 do { \
92903diff --git a/include/linux/printk.h b/include/linux/printk.h
92904index baa3f97..168cff1 100644
92905--- a/include/linux/printk.h
92906+++ b/include/linux/printk.h
92907@@ -121,6 +121,7 @@ void early_printk(const char *s, ...) { }
92908 #endif
92909
92910 typedef int(*printk_func_t)(const char *fmt, va_list args);
92911+extern int kptr_restrict;
92912
92913 #ifdef CONFIG_PRINTK
92914 asmlinkage __printf(5, 0)
92915@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
92916
92917 extern int printk_delay_msec;
92918 extern int dmesg_restrict;
92919-extern int kptr_restrict;
92920
92921 extern void wake_up_klogd(void);
92922
92923diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
92924index b97bf2e..f14c92d4 100644
92925--- a/include/linux/proc_fs.h
92926+++ b/include/linux/proc_fs.h
92927@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
92928 extern struct proc_dir_entry *proc_symlink(const char *,
92929 struct proc_dir_entry *, const char *);
92930 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
92931+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
92932 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
92933 struct proc_dir_entry *, void *);
92934+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
92935+ struct proc_dir_entry *, void *);
92936 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
92937 struct proc_dir_entry *);
92938
92939@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
92940 return proc_create_data(name, mode, parent, proc_fops, NULL);
92941 }
92942
92943+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
92944+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
92945+{
92946+#ifdef CONFIG_GRKERNSEC_PROC_USER
92947+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
92948+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92949+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
92950+#else
92951+ return proc_create_data(name, mode, parent, proc_fops, NULL);
92952+#endif
92953+}
92954+
92955+
92956 extern void proc_set_size(struct proc_dir_entry *, loff_t);
92957 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
92958 extern void *PDE_DATA(const struct inode *);
92959@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
92960 struct proc_dir_entry *parent,const char *dest) { return NULL;}
92961 static inline struct proc_dir_entry *proc_mkdir(const char *name,
92962 struct proc_dir_entry *parent) {return NULL;}
92963+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
92964+ struct proc_dir_entry *parent) { return NULL; }
92965 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
92966 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
92967+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
92968+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
92969 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
92970 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
92971 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
92972@@ -79,7 +99,7 @@ struct net;
92973 static inline struct proc_dir_entry *proc_net_mkdir(
92974 struct net *net, const char *name, struct proc_dir_entry *parent)
92975 {
92976- return proc_mkdir_data(name, 0, parent, net);
92977+ return proc_mkdir_data_restrict(name, 0, parent, net);
92978 }
92979
92980 #endif /* _LINUX_PROC_FS_H */
92981diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
92982index 42dfc61..8113a99 100644
92983--- a/include/linux/proc_ns.h
92984+++ b/include/linux/proc_ns.h
92985@@ -16,7 +16,7 @@ struct proc_ns_operations {
92986 struct ns_common *(*get)(struct task_struct *task);
92987 void (*put)(struct ns_common *ns);
92988 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
92989-};
92990+} __do_const __randomize_layout;
92991
92992 extern const struct proc_ns_operations netns_operations;
92993 extern const struct proc_ns_operations utsns_operations;
92994diff --git a/include/linux/quota.h b/include/linux/quota.h
92995index d534e8e..782e604 100644
92996--- a/include/linux/quota.h
92997+++ b/include/linux/quota.h
92998@@ -75,7 +75,7 @@ struct kqid { /* Type in which we store the quota identifier */
92999
93000 extern bool qid_eq(struct kqid left, struct kqid right);
93001 extern bool qid_lt(struct kqid left, struct kqid right);
93002-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
93003+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
93004 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
93005 extern bool qid_valid(struct kqid qid);
93006
93007diff --git a/include/linux/random.h b/include/linux/random.h
93008index b05856e..0a9f14e 100644
93009--- a/include/linux/random.h
93010+++ b/include/linux/random.h
93011@@ -9,9 +9,19 @@
93012 #include <uapi/linux/random.h>
93013
93014 extern void add_device_randomness(const void *, unsigned int);
93015+
93016+static inline void add_latent_entropy(void)
93017+{
93018+
93019+#ifdef LATENT_ENTROPY_PLUGIN
93020+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
93021+#endif
93022+
93023+}
93024+
93025 extern void add_input_randomness(unsigned int type, unsigned int code,
93026- unsigned int value);
93027-extern void add_interrupt_randomness(int irq, int irq_flags);
93028+ unsigned int value) __latent_entropy;
93029+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
93030
93031 extern void get_random_bytes(void *buf, int nbytes);
93032 extern void get_random_bytes_arch(void *buf, int nbytes);
93033@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
93034 extern const struct file_operations random_fops, urandom_fops;
93035 #endif
93036
93037-unsigned int get_random_int(void);
93038+unsigned int __intentional_overflow(-1) get_random_int(void);
93039 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
93040
93041-u32 prandom_u32(void);
93042+u32 prandom_u32(void) __intentional_overflow(-1);
93043 void prandom_bytes(void *buf, size_t nbytes);
93044 void prandom_seed(u32 seed);
93045 void prandom_reseed_late(void);
93046@@ -37,6 +47,11 @@ struct rnd_state {
93047 u32 prandom_u32_state(struct rnd_state *state);
93048 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
93049
93050+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
93051+{
93052+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
93053+}
93054+
93055 /**
93056 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
93057 * @ep_ro: right open interval endpoint
93058@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
93059 *
93060 * Returns: pseudo-random number in interval [0, ep_ro)
93061 */
93062-static inline u32 prandom_u32_max(u32 ep_ro)
93063+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
93064 {
93065 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
93066 }
93067diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
93068index 378c5ee..aa84a47 100644
93069--- a/include/linux/rbtree_augmented.h
93070+++ b/include/linux/rbtree_augmented.h
93071@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
93072 old->rbaugmented = rbcompute(old); \
93073 } \
93074 rbstatic const struct rb_augment_callbacks rbname = { \
93075- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
93076+ .propagate = rbname ## _propagate, \
93077+ .copy = rbname ## _copy, \
93078+ .rotate = rbname ## _rotate \
93079 };
93080
93081
93082diff --git a/include/linux/rculist.h b/include/linux/rculist.h
93083index a18b16f..2683096 100644
93084--- a/include/linux/rculist.h
93085+++ b/include/linux/rculist.h
93086@@ -29,8 +29,8 @@
93087 */
93088 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
93089 {
93090- ACCESS_ONCE(list->next) = list;
93091- ACCESS_ONCE(list->prev) = list;
93092+ ACCESS_ONCE_RW(list->next) = list;
93093+ ACCESS_ONCE_RW(list->prev) = list;
93094 }
93095
93096 /*
93097@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
93098 struct list_head *prev, struct list_head *next);
93099 #endif
93100
93101+void __pax_list_add_rcu(struct list_head *new,
93102+ struct list_head *prev, struct list_head *next);
93103+
93104 /**
93105 * list_add_rcu - add a new entry to rcu-protected list
93106 * @new: new entry to be added
93107@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
93108 __list_add_rcu(new, head, head->next);
93109 }
93110
93111+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
93112+{
93113+ __pax_list_add_rcu(new, head, head->next);
93114+}
93115+
93116 /**
93117 * list_add_tail_rcu - add a new entry to rcu-protected list
93118 * @new: new entry to be added
93119@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
93120 __list_add_rcu(new, head->prev, head);
93121 }
93122
93123+static inline void pax_list_add_tail_rcu(struct list_head *new,
93124+ struct list_head *head)
93125+{
93126+ __pax_list_add_rcu(new, head->prev, head);
93127+}
93128+
93129 /**
93130 * list_del_rcu - deletes entry from list without re-initialization
93131 * @entry: the element to delete from the list.
93132@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
93133 entry->prev = LIST_POISON2;
93134 }
93135
93136+extern void pax_list_del_rcu(struct list_head *entry);
93137+
93138 /**
93139 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
93140 * @n: the element to delete from the hash list.
93141diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
93142index 7809749..1cd9315 100644
93143--- a/include/linux/rcupdate.h
93144+++ b/include/linux/rcupdate.h
93145@@ -333,7 +333,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
93146 do { \
93147 rcu_all_qs(); \
93148 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
93149- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
93150+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
93151 } while (0)
93152 #else /* #ifdef CONFIG_TASKS_RCU */
93153 #define TASKS_RCU(x) do { } while (0)
93154diff --git a/include/linux/reboot.h b/include/linux/reboot.h
93155index 67fc8fc..a90f7d8 100644
93156--- a/include/linux/reboot.h
93157+++ b/include/linux/reboot.h
93158@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
93159 */
93160
93161 extern void migrate_to_reboot_cpu(void);
93162-extern void machine_restart(char *cmd);
93163-extern void machine_halt(void);
93164-extern void machine_power_off(void);
93165+extern void machine_restart(char *cmd) __noreturn;
93166+extern void machine_halt(void) __noreturn;
93167+extern void machine_power_off(void) __noreturn;
93168
93169 extern void machine_shutdown(void);
93170 struct pt_regs;
93171@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
93172 */
93173
93174 extern void kernel_restart_prepare(char *cmd);
93175-extern void kernel_restart(char *cmd);
93176-extern void kernel_halt(void);
93177-extern void kernel_power_off(void);
93178+extern void kernel_restart(char *cmd) __noreturn;
93179+extern void kernel_halt(void) __noreturn;
93180+extern void kernel_power_off(void) __noreturn;
93181
93182 extern int C_A_D; /* for sysctl */
93183 void ctrl_alt_del(void);
93184@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
93185 * Emergency restart, callable from an interrupt handler.
93186 */
93187
93188-extern void emergency_restart(void);
93189+extern void emergency_restart(void) __noreturn;
93190 #include <asm/emergency-restart.h>
93191
93192 #endif /* _LINUX_REBOOT_H */
93193diff --git a/include/linux/regset.h b/include/linux/regset.h
93194index 8e0c9fe..ac4d221 100644
93195--- a/include/linux/regset.h
93196+++ b/include/linux/regset.h
93197@@ -161,7 +161,8 @@ struct user_regset {
93198 unsigned int align;
93199 unsigned int bias;
93200 unsigned int core_note_type;
93201-};
93202+} __do_const;
93203+typedef struct user_regset __no_const user_regset_no_const;
93204
93205 /**
93206 * struct user_regset_view - available regsets
93207diff --git a/include/linux/relay.h b/include/linux/relay.h
93208index d7c8359..818daf5 100644
93209--- a/include/linux/relay.h
93210+++ b/include/linux/relay.h
93211@@ -157,7 +157,7 @@ struct rchan_callbacks
93212 * The callback should return 0 if successful, negative if not.
93213 */
93214 int (*remove_buf_file)(struct dentry *dentry);
93215-};
93216+} __no_const;
93217
93218 /*
93219 * CONFIG_RELAY kernel API, kernel/relay.c
93220diff --git a/include/linux/rio.h b/include/linux/rio.h
93221index 6bda06f..bf39a9b 100644
93222--- a/include/linux/rio.h
93223+++ b/include/linux/rio.h
93224@@ -358,7 +358,7 @@ struct rio_ops {
93225 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
93226 u64 rstart, u32 size, u32 flags);
93227 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
93228-};
93229+} __no_const;
93230
93231 #define RIO_RESOURCE_MEM 0x00000100
93232 #define RIO_RESOURCE_DOORBELL 0x00000200
93233diff --git a/include/linux/rmap.h b/include/linux/rmap.h
93234index c4c559a..6ba9a26 100644
93235--- a/include/linux/rmap.h
93236+++ b/include/linux/rmap.h
93237@@ -154,8 +154,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
93238 void anon_vma_init(void); /* create anon_vma_cachep */
93239 int anon_vma_prepare(struct vm_area_struct *);
93240 void unlink_anon_vmas(struct vm_area_struct *);
93241-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
93242-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
93243+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
93244+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
93245
93246 static inline void anon_vma_merge(struct vm_area_struct *vma,
93247 struct vm_area_struct *next)
93248diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
93249index ed8f9e70..2e627f2 100644
93250--- a/include/linux/scatterlist.h
93251+++ b/include/linux/scatterlist.h
93252@@ -1,6 +1,7 @@
93253 #ifndef _LINUX_SCATTERLIST_H
93254 #define _LINUX_SCATTERLIST_H
93255
93256+#include <linux/sched.h>
93257 #include <linux/string.h>
93258 #include <linux/bug.h>
93259 #include <linux/mm.h>
93260@@ -111,10 +112,17 @@ static inline struct page *sg_page(struct scatterlist *sg)
93261 static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
93262 unsigned int buflen)
93263 {
93264+ const void *realbuf = buf;
93265+
93266+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93267+ if (object_starts_on_stack(buf))
93268+ realbuf = buf - current->stack + current->lowmem_stack;
93269+#endif
93270+
93271 #ifdef CONFIG_DEBUG_SG
93272- BUG_ON(!virt_addr_valid(buf));
93273+ BUG_ON(!virt_addr_valid(realbuf));
93274 #endif
93275- sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
93276+ sg_set_page(sg, virt_to_page(realbuf), buflen, offset_in_page(realbuf));
93277 }
93278
93279 /*
93280diff --git a/include/linux/sched.h b/include/linux/sched.h
93281index 51348f7..8c8b0ba 100644
93282--- a/include/linux/sched.h
93283+++ b/include/linux/sched.h
93284@@ -133,6 +133,7 @@ struct fs_struct;
93285 struct perf_event_context;
93286 struct blk_plug;
93287 struct filename;
93288+struct linux_binprm;
93289
93290 #define VMACACHE_BITS 2
93291 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
93292@@ -420,7 +421,7 @@ extern char __sched_text_start[], __sched_text_end[];
93293 extern int in_sched_functions(unsigned long addr);
93294
93295 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
93296-extern signed long schedule_timeout(signed long timeout);
93297+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
93298 extern signed long schedule_timeout_interruptible(signed long timeout);
93299 extern signed long schedule_timeout_killable(signed long timeout);
93300 extern signed long schedule_timeout_uninterruptible(signed long timeout);
93301@@ -438,6 +439,19 @@ struct nsproxy;
93302 struct user_namespace;
93303
93304 #ifdef CONFIG_MMU
93305+
93306+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
93307+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
93308+#else
93309+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
93310+{
93311+ return 0;
93312+}
93313+#endif
93314+
93315+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
93316+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
93317+
93318 extern void arch_pick_mmap_layout(struct mm_struct *mm);
93319 extern unsigned long
93320 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
93321@@ -736,6 +750,17 @@ struct signal_struct {
93322 #ifdef CONFIG_TASKSTATS
93323 struct taskstats *stats;
93324 #endif
93325+
93326+#ifdef CONFIG_GRKERNSEC
93327+ u32 curr_ip;
93328+ u32 saved_ip;
93329+ u32 gr_saddr;
93330+ u32 gr_daddr;
93331+ u16 gr_sport;
93332+ u16 gr_dport;
93333+ u8 used_accept:1;
93334+#endif
93335+
93336 #ifdef CONFIG_AUDIT
93337 unsigned audit_tty;
93338 unsigned audit_tty_log_passwd;
93339@@ -762,7 +787,7 @@ struct signal_struct {
93340 struct mutex cred_guard_mutex; /* guard against foreign influences on
93341 * credential calculations
93342 * (notably. ptrace) */
93343-};
93344+} __randomize_layout;
93345
93346 /*
93347 * Bits in flags field of signal_struct.
93348@@ -815,6 +840,14 @@ struct user_struct {
93349 struct key *session_keyring; /* UID's default session keyring */
93350 #endif
93351
93352+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
93353+ unsigned char kernel_banned;
93354+#endif
93355+#ifdef CONFIG_GRKERNSEC_BRUTE
93356+ unsigned char suid_banned;
93357+ unsigned long suid_ban_expires;
93358+#endif
93359+
93360 /* Hash table maintenance information */
93361 struct hlist_node uidhash_node;
93362 kuid_t uid;
93363@@ -822,7 +855,7 @@ struct user_struct {
93364 #ifdef CONFIG_PERF_EVENTS
93365 atomic_long_t locked_vm;
93366 #endif
93367-};
93368+} __randomize_layout;
93369
93370 extern int uids_sysfs_init(void);
93371
93372@@ -1286,6 +1319,9 @@ enum perf_event_task_context {
93373 struct task_struct {
93374 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
93375 void *stack;
93376+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93377+ void *lowmem_stack;
93378+#endif
93379 atomic_t usage;
93380 unsigned int flags; /* per process flags, defined below */
93381 unsigned int ptrace;
93382@@ -1419,8 +1455,8 @@ struct task_struct {
93383 struct list_head thread_node;
93384
93385 struct completion *vfork_done; /* for vfork() */
93386- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
93387- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
93388+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
93389+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
93390
93391 cputime_t utime, stime, utimescaled, stimescaled;
93392 cputime_t gtime;
93393@@ -1445,11 +1481,6 @@ struct task_struct {
93394 struct task_cputime cputime_expires;
93395 struct list_head cpu_timers[3];
93396
93397-/* process credentials */
93398- const struct cred __rcu *real_cred; /* objective and real subjective task
93399- * credentials (COW) */
93400- const struct cred __rcu *cred; /* effective (overridable) subjective task
93401- * credentials (COW) */
93402 char comm[TASK_COMM_LEN]; /* executable name excluding path
93403 - access with [gs]et_task_comm (which lock
93404 it with task_lock())
93405@@ -1467,6 +1498,10 @@ struct task_struct {
93406 #endif
93407 /* CPU-specific state of this task */
93408 struct thread_struct thread;
93409+/* thread_info moved to task_struct */
93410+#ifdef CONFIG_X86
93411+ struct thread_info tinfo;
93412+#endif
93413 /* filesystem information */
93414 struct fs_struct *fs;
93415 /* open file information */
93416@@ -1541,6 +1576,10 @@ struct task_struct {
93417 gfp_t lockdep_reclaim_gfp;
93418 #endif
93419
93420+/* process credentials */
93421+ const struct cred __rcu *real_cred; /* objective and real subjective task
93422+ * credentials (COW) */
93423+
93424 /* journalling filesystem info */
93425 void *journal_info;
93426
93427@@ -1579,6 +1618,10 @@ struct task_struct {
93428 /* cg_list protected by css_set_lock and tsk->alloc_lock */
93429 struct list_head cg_list;
93430 #endif
93431+
93432+ const struct cred __rcu *cred; /* effective (overridable) subjective task
93433+ * credentials (COW) */
93434+
93435 #ifdef CONFIG_FUTEX
93436 struct robust_list_head __user *robust_list;
93437 #ifdef CONFIG_COMPAT
93438@@ -1690,7 +1733,7 @@ struct task_struct {
93439 * Number of functions that haven't been traced
93440 * because of depth overrun.
93441 */
93442- atomic_t trace_overrun;
93443+ atomic_unchecked_t trace_overrun;
93444 /* Pause for the tracing */
93445 atomic_t tracing_graph_pause;
93446 #endif
93447@@ -1718,7 +1761,78 @@ struct task_struct {
93448 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
93449 unsigned long task_state_change;
93450 #endif
93451-};
93452+
93453+#ifdef CONFIG_GRKERNSEC
93454+ /* grsecurity */
93455+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93456+ u64 exec_id;
93457+#endif
93458+#ifdef CONFIG_GRKERNSEC_SETXID
93459+ const struct cred *delayed_cred;
93460+#endif
93461+ struct dentry *gr_chroot_dentry;
93462+ struct acl_subject_label *acl;
93463+ struct acl_subject_label *tmpacl;
93464+ struct acl_role_label *role;
93465+ struct file *exec_file;
93466+ unsigned long brute_expires;
93467+ u16 acl_role_id;
93468+ u8 inherited;
93469+ /* is this the task that authenticated to the special role */
93470+ u8 acl_sp_role;
93471+ u8 is_writable;
93472+ u8 brute;
93473+ u8 gr_is_chrooted;
93474+#endif
93475+
93476+} __randomize_layout;
93477+
93478+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
93479+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
93480+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
93481+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
93482+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
93483+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
93484+
93485+#ifdef CONFIG_PAX_SOFTMODE
93486+extern int pax_softmode;
93487+#endif
93488+
93489+extern int pax_check_flags(unsigned long *);
93490+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
93491+
93492+/* if tsk != current then task_lock must be held on it */
93493+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
93494+static inline unsigned long pax_get_flags(struct task_struct *tsk)
93495+{
93496+ if (likely(tsk->mm))
93497+ return tsk->mm->pax_flags;
93498+ else
93499+ return 0UL;
93500+}
93501+
93502+/* if tsk != current then task_lock must be held on it */
93503+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
93504+{
93505+ if (likely(tsk->mm)) {
93506+ tsk->mm->pax_flags = flags;
93507+ return 0;
93508+ }
93509+ return -EINVAL;
93510+}
93511+#endif
93512+
93513+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
93514+extern void pax_set_initial_flags(struct linux_binprm *bprm);
93515+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
93516+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
93517+#endif
93518+
93519+struct path;
93520+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
93521+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
93522+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
93523+extern void pax_report_refcount_overflow(struct pt_regs *regs);
93524
93525 /* Future-safe accessor for struct task_struct's cpus_allowed. */
93526 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
93527@@ -1801,7 +1915,7 @@ struct pid_namespace;
93528 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
93529 struct pid_namespace *ns);
93530
93531-static inline pid_t task_pid_nr(struct task_struct *tsk)
93532+static inline pid_t task_pid_nr(const struct task_struct *tsk)
93533 {
93534 return tsk->pid;
93535 }
93536@@ -2169,6 +2283,25 @@ extern u64 sched_clock_cpu(int cpu);
93537
93538 extern void sched_clock_init(void);
93539
93540+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93541+static inline void populate_stack(void)
93542+{
93543+ struct task_struct *curtask = current;
93544+ int c;
93545+ int *ptr = curtask->stack;
93546+ int *end = curtask->stack + THREAD_SIZE;
93547+
93548+ while (ptr < end) {
93549+ c = *(volatile int *)ptr;
93550+ ptr += PAGE_SIZE/sizeof(int);
93551+ }
93552+}
93553+#else
93554+static inline void populate_stack(void)
93555+{
93556+}
93557+#endif
93558+
93559 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
93560 static inline void sched_clock_tick(void)
93561 {
93562@@ -2302,7 +2435,9 @@ void yield(void);
93563 extern struct exec_domain default_exec_domain;
93564
93565 union thread_union {
93566+#ifndef CONFIG_X86
93567 struct thread_info thread_info;
93568+#endif
93569 unsigned long stack[THREAD_SIZE/sizeof(long)];
93570 };
93571
93572@@ -2335,6 +2470,7 @@ extern struct pid_namespace init_pid_ns;
93573 */
93574
93575 extern struct task_struct *find_task_by_vpid(pid_t nr);
93576+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
93577 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
93578 struct pid_namespace *ns);
93579
93580@@ -2499,7 +2635,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
93581 extern void exit_itimers(struct signal_struct *);
93582 extern void flush_itimer_signals(void);
93583
93584-extern void do_group_exit(int);
93585+extern __noreturn void do_group_exit(int);
93586
93587 extern int do_execve(struct filename *,
93588 const char __user * const __user *,
93589@@ -2720,9 +2856,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
93590 #define task_stack_end_corrupted(task) \
93591 (*(end_of_stack(task)) != STACK_END_MAGIC)
93592
93593-static inline int object_is_on_stack(void *obj)
93594+static inline int object_starts_on_stack(const void *obj)
93595 {
93596- void *stack = task_stack_page(current);
93597+ const void *stack = task_stack_page(current);
93598
93599 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
93600 }
93601diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
93602index 596a0e0..bea77ec 100644
93603--- a/include/linux/sched/sysctl.h
93604+++ b/include/linux/sched/sysctl.h
93605@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
93606 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
93607
93608 extern int sysctl_max_map_count;
93609+extern unsigned long sysctl_heap_stack_gap;
93610
93611 extern unsigned int sysctl_sched_latency;
93612 extern unsigned int sysctl_sched_min_granularity;
93613diff --git a/include/linux/security.h b/include/linux/security.h
93614index a1b7dbd..036f47f 100644
93615--- a/include/linux/security.h
93616+++ b/include/linux/security.h
93617@@ -27,6 +27,7 @@
93618 #include <linux/slab.h>
93619 #include <linux/err.h>
93620 #include <linux/string.h>
93621+#include <linux/grsecurity.h>
93622
93623 struct linux_binprm;
93624 struct cred;
93625@@ -116,8 +117,6 @@ struct seq_file;
93626
93627 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
93628
93629-void reset_security_ops(void);
93630-
93631 #ifdef CONFIG_MMU
93632 extern unsigned long mmap_min_addr;
93633 extern unsigned long dac_mmap_min_addr;
93634@@ -1756,7 +1755,7 @@ struct security_operations {
93635 struct audit_context *actx);
93636 void (*audit_rule_free) (void *lsmrule);
93637 #endif /* CONFIG_AUDIT */
93638-};
93639+} __randomize_layout;
93640
93641 /* prototypes */
93642 extern int security_init(void);
93643diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
93644index dc368b8..e895209 100644
93645--- a/include/linux/semaphore.h
93646+++ b/include/linux/semaphore.h
93647@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
93648 }
93649
93650 extern void down(struct semaphore *sem);
93651-extern int __must_check down_interruptible(struct semaphore *sem);
93652+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
93653 extern int __must_check down_killable(struct semaphore *sem);
93654 extern int __must_check down_trylock(struct semaphore *sem);
93655 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
93656diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
93657index afbb1fd..e1d205d 100644
93658--- a/include/linux/seq_file.h
93659+++ b/include/linux/seq_file.h
93660@@ -27,6 +27,9 @@ struct seq_file {
93661 struct mutex lock;
93662 const struct seq_operations *op;
93663 int poll_event;
93664+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93665+ u64 exec_id;
93666+#endif
93667 #ifdef CONFIG_USER_NS
93668 struct user_namespace *user_ns;
93669 #endif
93670@@ -39,6 +42,7 @@ struct seq_operations {
93671 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
93672 int (*show) (struct seq_file *m, void *v);
93673 };
93674+typedef struct seq_operations __no_const seq_operations_no_const;
93675
93676 #define SEQ_SKIP 1
93677
93678@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
93679
93680 char *mangle_path(char *s, const char *p, const char *esc);
93681 int seq_open(struct file *, const struct seq_operations *);
93682+int seq_open_restrict(struct file *, const struct seq_operations *);
93683 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
93684 loff_t seq_lseek(struct file *, loff_t, int);
93685 int seq_release(struct inode *, struct file *);
93686@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
93687 const struct path *root, const char *esc);
93688
93689 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
93690+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
93691 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
93692 int single_release(struct inode *, struct file *);
93693 void *__seq_open_private(struct file *, const struct seq_operations *, int);
93694diff --git a/include/linux/shm.h b/include/linux/shm.h
93695index 6fb8016..ab4465e 100644
93696--- a/include/linux/shm.h
93697+++ b/include/linux/shm.h
93698@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
93699 /* The task created the shm object. NULL if the task is dead. */
93700 struct task_struct *shm_creator;
93701 struct list_head shm_clist; /* list by creator */
93702+#ifdef CONFIG_GRKERNSEC
93703+ u64 shm_createtime;
93704+ pid_t shm_lapid;
93705+#endif
93706 };
93707
93708 /* shm_mode upper byte flags */
93709diff --git a/include/linux/signal.h b/include/linux/signal.h
93710index ab1e039..ad4229e 100644
93711--- a/include/linux/signal.h
93712+++ b/include/linux/signal.h
93713@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
93714 * know it'll be handled, so that they don't get converted to
93715 * SIGKILL or just silently dropped.
93716 */
93717- kernel_sigaction(sig, (__force __sighandler_t)2);
93718+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
93719 }
93720
93721 static inline void disallow_signal(int sig)
93722diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
93723index bdccc4b..e9f8670 100644
93724--- a/include/linux/skbuff.h
93725+++ b/include/linux/skbuff.h
93726@@ -771,7 +771,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
93727 int node);
93728 struct sk_buff *__build_skb(void *data, unsigned int frag_size);
93729 struct sk_buff *build_skb(void *data, unsigned int frag_size);
93730-static inline struct sk_buff *alloc_skb(unsigned int size,
93731+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
93732 gfp_t priority)
93733 {
93734 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
93735@@ -1967,7 +1967,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
93736 return skb->inner_transport_header - skb->inner_network_header;
93737 }
93738
93739-static inline int skb_network_offset(const struct sk_buff *skb)
93740+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
93741 {
93742 return skb_network_header(skb) - skb->data;
93743 }
93744@@ -2027,7 +2027,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
93745 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
93746 */
93747 #ifndef NET_SKB_PAD
93748-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
93749+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
93750 #endif
93751
93752 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
93753@@ -2669,9 +2669,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
93754 int *err);
93755 unsigned int datagram_poll(struct file *file, struct socket *sock,
93756 struct poll_table_struct *wait);
93757-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
93758+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
93759 struct iov_iter *to, int size);
93760-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
93761+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
93762 struct msghdr *msg, int size)
93763 {
93764 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
93765@@ -3193,6 +3193,9 @@ static inline void nf_reset(struct sk_buff *skb)
93766 nf_bridge_put(skb->nf_bridge);
93767 skb->nf_bridge = NULL;
93768 #endif
93769+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
93770+ skb->nf_trace = 0;
93771+#endif
93772 }
93773
93774 static inline void nf_reset_trace(struct sk_buff *skb)
93775diff --git a/include/linux/slab.h b/include/linux/slab.h
93776index 76f1fee..d95e6d2 100644
93777--- a/include/linux/slab.h
93778+++ b/include/linux/slab.h
93779@@ -14,15 +14,29 @@
93780 #include <linux/gfp.h>
93781 #include <linux/types.h>
93782 #include <linux/workqueue.h>
93783-
93784+#include <linux/err.h>
93785
93786 /*
93787 * Flags to pass to kmem_cache_create().
93788 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
93789 */
93790 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
93791+
93792+#ifdef CONFIG_PAX_USERCOPY_SLABS
93793+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
93794+#else
93795+#define SLAB_USERCOPY 0x00000000UL
93796+#endif
93797+
93798 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
93799 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
93800+
93801+#ifdef CONFIG_PAX_MEMORY_SANITIZE
93802+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
93803+#else
93804+#define SLAB_NO_SANITIZE 0x00000000UL
93805+#endif
93806+
93807 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
93808 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
93809 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
93810@@ -98,10 +112,13 @@
93811 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
93812 * Both make kfree a no-op.
93813 */
93814-#define ZERO_SIZE_PTR ((void *)16)
93815+#define ZERO_SIZE_PTR \
93816+({ \
93817+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
93818+ (void *)(-MAX_ERRNO-1L); \
93819+})
93820
93821-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
93822- (unsigned long)ZERO_SIZE_PTR)
93823+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
93824
93825 #include <linux/kmemleak.h>
93826 #include <linux/kasan.h>
93827@@ -143,6 +160,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
93828 void kfree(const void *);
93829 void kzfree(const void *);
93830 size_t ksize(const void *);
93831+const char *check_heap_object(const void *ptr, unsigned long n);
93832+bool is_usercopy_object(const void *ptr);
93833
93834 /*
93835 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
93836@@ -235,6 +254,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
93837 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
93838 #endif
93839
93840+#ifdef CONFIG_PAX_USERCOPY_SLABS
93841+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
93842+#endif
93843+
93844 /*
93845 * Figure out which kmalloc slab an allocation of a certain size
93846 * belongs to.
93847@@ -243,7 +266,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
93848 * 2 = 120 .. 192 bytes
93849 * n = 2^(n-1) .. 2^n -1
93850 */
93851-static __always_inline int kmalloc_index(size_t size)
93852+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
93853 {
93854 if (!size)
93855 return 0;
93856@@ -286,15 +309,15 @@ static __always_inline int kmalloc_index(size_t size)
93857 }
93858 #endif /* !CONFIG_SLOB */
93859
93860-void *__kmalloc(size_t size, gfp_t flags);
93861+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
93862 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
93863 void kmem_cache_free(struct kmem_cache *, void *);
93864
93865 #ifdef CONFIG_NUMA
93866-void *__kmalloc_node(size_t size, gfp_t flags, int node);
93867+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
93868 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
93869 #else
93870-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
93871+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
93872 {
93873 return __kmalloc(size, flags);
93874 }
93875diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
93876index 33d0490..70a6313 100644
93877--- a/include/linux/slab_def.h
93878+++ b/include/linux/slab_def.h
93879@@ -40,7 +40,7 @@ struct kmem_cache {
93880 /* 4) cache creation/removal */
93881 const char *name;
93882 struct list_head list;
93883- int refcount;
93884+ atomic_t refcount;
93885 int object_size;
93886 int align;
93887
93888@@ -56,10 +56,14 @@ struct kmem_cache {
93889 unsigned long node_allocs;
93890 unsigned long node_frees;
93891 unsigned long node_overflow;
93892- atomic_t allochit;
93893- atomic_t allocmiss;
93894- atomic_t freehit;
93895- atomic_t freemiss;
93896+ atomic_unchecked_t allochit;
93897+ atomic_unchecked_t allocmiss;
93898+ atomic_unchecked_t freehit;
93899+ atomic_unchecked_t freemiss;
93900+#ifdef CONFIG_PAX_MEMORY_SANITIZE
93901+ atomic_unchecked_t sanitized;
93902+ atomic_unchecked_t not_sanitized;
93903+#endif
93904
93905 /*
93906 * If debugging is enabled, then the allocator can add additional
93907diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
93908index 3388511..6252f90 100644
93909--- a/include/linux/slub_def.h
93910+++ b/include/linux/slub_def.h
93911@@ -74,7 +74,7 @@ struct kmem_cache {
93912 struct kmem_cache_order_objects max;
93913 struct kmem_cache_order_objects min;
93914 gfp_t allocflags; /* gfp flags to use on each alloc */
93915- int refcount; /* Refcount for slab cache destroy */
93916+ atomic_t refcount; /* Refcount for slab cache destroy */
93917 void (*ctor)(void *);
93918 int inuse; /* Offset to metadata */
93919 int align; /* Alignment */
93920diff --git a/include/linux/smp.h b/include/linux/smp.h
93921index be91db2..3f23232 100644
93922--- a/include/linux/smp.h
93923+++ b/include/linux/smp.h
93924@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
93925 #endif
93926
93927 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
93928+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
93929 #define put_cpu() preempt_enable()
93930+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
93931
93932 /*
93933 * Callback to arch code if there's nosmp or maxcpus=0 on the
93934diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
93935index 46cca4c..3323536 100644
93936--- a/include/linux/sock_diag.h
93937+++ b/include/linux/sock_diag.h
93938@@ -11,7 +11,7 @@ struct sock;
93939 struct sock_diag_handler {
93940 __u8 family;
93941 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
93942-};
93943+} __do_const;
93944
93945 int sock_diag_register(const struct sock_diag_handler *h);
93946 void sock_diag_unregister(const struct sock_diag_handler *h);
93947diff --git a/include/linux/sonet.h b/include/linux/sonet.h
93948index 680f9a3..f13aeb0 100644
93949--- a/include/linux/sonet.h
93950+++ b/include/linux/sonet.h
93951@@ -7,7 +7,7 @@
93952 #include <uapi/linux/sonet.h>
93953
93954 struct k_sonet_stats {
93955-#define __HANDLE_ITEM(i) atomic_t i
93956+#define __HANDLE_ITEM(i) atomic_unchecked_t i
93957 __SONET_ITEMS
93958 #undef __HANDLE_ITEM
93959 };
93960diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
93961index 07d8e53..dc934c9 100644
93962--- a/include/linux/sunrpc/addr.h
93963+++ b/include/linux/sunrpc/addr.h
93964@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
93965 {
93966 switch (sap->sa_family) {
93967 case AF_INET:
93968- return ntohs(((struct sockaddr_in *)sap)->sin_port);
93969+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
93970 case AF_INET6:
93971- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
93972+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
93973 }
93974 return 0;
93975 }
93976@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
93977 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
93978 const struct sockaddr *src)
93979 {
93980- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
93981+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
93982 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
93983
93984 dsin->sin_family = ssin->sin_family;
93985@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
93986 if (sa->sa_family != AF_INET6)
93987 return 0;
93988
93989- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
93990+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
93991 }
93992
93993 #endif /* _LINUX_SUNRPC_ADDR_H */
93994diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
93995index 598ba80..d90cba6 100644
93996--- a/include/linux/sunrpc/clnt.h
93997+++ b/include/linux/sunrpc/clnt.h
93998@@ -100,7 +100,7 @@ struct rpc_procinfo {
93999 unsigned int p_timer; /* Which RTT timer to use */
94000 u32 p_statidx; /* Which procedure to account */
94001 const char * p_name; /* name of procedure */
94002-};
94003+} __do_const;
94004
94005 #ifdef __KERNEL__
94006
94007diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
94008index fae6fb9..023fbcd 100644
94009--- a/include/linux/sunrpc/svc.h
94010+++ b/include/linux/sunrpc/svc.h
94011@@ -420,7 +420,7 @@ struct svc_procedure {
94012 unsigned int pc_count; /* call count */
94013 unsigned int pc_cachetype; /* cache info (NFS) */
94014 unsigned int pc_xdrressize; /* maximum size of XDR reply */
94015-};
94016+} __do_const;
94017
94018 /*
94019 * Function prototypes.
94020diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
94021index df8edf8..d140fec 100644
94022--- a/include/linux/sunrpc/svc_rdma.h
94023+++ b/include/linux/sunrpc/svc_rdma.h
94024@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
94025 extern unsigned int svcrdma_max_requests;
94026 extern unsigned int svcrdma_max_req_size;
94027
94028-extern atomic_t rdma_stat_recv;
94029-extern atomic_t rdma_stat_read;
94030-extern atomic_t rdma_stat_write;
94031-extern atomic_t rdma_stat_sq_starve;
94032-extern atomic_t rdma_stat_rq_starve;
94033-extern atomic_t rdma_stat_rq_poll;
94034-extern atomic_t rdma_stat_rq_prod;
94035-extern atomic_t rdma_stat_sq_poll;
94036-extern atomic_t rdma_stat_sq_prod;
94037+extern atomic_unchecked_t rdma_stat_recv;
94038+extern atomic_unchecked_t rdma_stat_read;
94039+extern atomic_unchecked_t rdma_stat_write;
94040+extern atomic_unchecked_t rdma_stat_sq_starve;
94041+extern atomic_unchecked_t rdma_stat_rq_starve;
94042+extern atomic_unchecked_t rdma_stat_rq_poll;
94043+extern atomic_unchecked_t rdma_stat_rq_prod;
94044+extern atomic_unchecked_t rdma_stat_sq_poll;
94045+extern atomic_unchecked_t rdma_stat_sq_prod;
94046
94047 /*
94048 * Contexts are built when an RDMA request is created and are a
94049diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
94050index 8d71d65..f79586e 100644
94051--- a/include/linux/sunrpc/svcauth.h
94052+++ b/include/linux/sunrpc/svcauth.h
94053@@ -120,7 +120,7 @@ struct auth_ops {
94054 int (*release)(struct svc_rqst *rq);
94055 void (*domain_release)(struct auth_domain *);
94056 int (*set_client)(struct svc_rqst *rq);
94057-};
94058+} __do_const;
94059
94060 #define SVC_GARBAGE 1
94061 #define SVC_SYSERR 2
94062diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
94063index e7a018e..49f8b17 100644
94064--- a/include/linux/swiotlb.h
94065+++ b/include/linux/swiotlb.h
94066@@ -60,7 +60,8 @@ extern void
94067
94068 extern void
94069 swiotlb_free_coherent(struct device *hwdev, size_t size,
94070- void *vaddr, dma_addr_t dma_handle);
94071+ void *vaddr, dma_addr_t dma_handle,
94072+ struct dma_attrs *attrs);
94073
94074 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
94075 unsigned long offset, size_t size,
94076diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
94077index 76d1e38..200776e 100644
94078--- a/include/linux/syscalls.h
94079+++ b/include/linux/syscalls.h
94080@@ -102,7 +102,12 @@ union bpf_attr;
94081 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
94082 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
94083 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
94084-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
94085+#define __SC_LONG(t, a) __typeof__( \
94086+ __builtin_choose_expr( \
94087+ sizeof(t) > sizeof(int), \
94088+ (t) 0, \
94089+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
94090+ )) a
94091 #define __SC_CAST(t, a) (t) a
94092 #define __SC_ARGS(t, a) a
94093 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
94094@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
94095 asmlinkage long sys_fsync(unsigned int fd);
94096 asmlinkage long sys_fdatasync(unsigned int fd);
94097 asmlinkage long sys_bdflush(int func, long data);
94098-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
94099- char __user *type, unsigned long flags,
94100+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
94101+ const char __user *type, unsigned long flags,
94102 void __user *data);
94103-asmlinkage long sys_umount(char __user *name, int flags);
94104-asmlinkage long sys_oldumount(char __user *name);
94105+asmlinkage long sys_umount(const char __user *name, int flags);
94106+asmlinkage long sys_oldumount(const char __user *name);
94107 asmlinkage long sys_truncate(const char __user *path, long length);
94108 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
94109 asmlinkage long sys_stat(const char __user *filename,
94110@@ -604,7 +609,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
94111 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
94112 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
94113 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
94114- struct sockaddr __user *, int);
94115+ struct sockaddr __user *, int) __intentional_overflow(0);
94116 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
94117 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
94118 unsigned int vlen, unsigned flags);
94119@@ -663,10 +668,10 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
94120
94121 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
94122 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
94123- unsigned nsops);
94124+ long nsops);
94125 asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
94126 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
94127- unsigned nsops,
94128+ long nsops,
94129 const struct timespec __user *timeout);
94130 asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
94131 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
94132diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
94133index 27b3b0b..e093dd9 100644
94134--- a/include/linux/syscore_ops.h
94135+++ b/include/linux/syscore_ops.h
94136@@ -16,7 +16,7 @@ struct syscore_ops {
94137 int (*suspend)(void);
94138 void (*resume)(void);
94139 void (*shutdown)(void);
94140-};
94141+} __do_const;
94142
94143 extern void register_syscore_ops(struct syscore_ops *ops);
94144 extern void unregister_syscore_ops(struct syscore_ops *ops);
94145diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
94146index b7361f8..341a15a 100644
94147--- a/include/linux/sysctl.h
94148+++ b/include/linux/sysctl.h
94149@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
94150
94151 extern int proc_dostring(struct ctl_table *, int,
94152 void __user *, size_t *, loff_t *);
94153+extern int proc_dostring_modpriv(struct ctl_table *, int,
94154+ void __user *, size_t *, loff_t *);
94155 extern int proc_dointvec(struct ctl_table *, int,
94156 void __user *, size_t *, loff_t *);
94157 extern int proc_dointvec_minmax(struct ctl_table *, int,
94158@@ -113,7 +115,8 @@ struct ctl_table
94159 struct ctl_table_poll *poll;
94160 void *extra1;
94161 void *extra2;
94162-};
94163+} __do_const __randomize_layout;
94164+typedef struct ctl_table __no_const ctl_table_no_const;
94165
94166 struct ctl_node {
94167 struct rb_node node;
94168diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
94169index ddad161..a3efd26 100644
94170--- a/include/linux/sysfs.h
94171+++ b/include/linux/sysfs.h
94172@@ -34,7 +34,8 @@ struct attribute {
94173 struct lock_class_key *key;
94174 struct lock_class_key skey;
94175 #endif
94176-};
94177+} __do_const;
94178+typedef struct attribute __no_const attribute_no_const;
94179
94180 /**
94181 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
94182@@ -63,7 +64,8 @@ struct attribute_group {
94183 struct attribute *, int);
94184 struct attribute **attrs;
94185 struct bin_attribute **bin_attrs;
94186-};
94187+} __do_const;
94188+typedef struct attribute_group __no_const attribute_group_no_const;
94189
94190 /**
94191 * Use these macros to make defining attributes easier. See include/linux/device.h
94192@@ -137,7 +139,8 @@ struct bin_attribute {
94193 char *, loff_t, size_t);
94194 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
94195 struct vm_area_struct *vma);
94196-};
94197+} __do_const;
94198+typedef struct bin_attribute __no_const bin_attribute_no_const;
94199
94200 /**
94201 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
94202diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
94203index 387fa7d..3fcde6b 100644
94204--- a/include/linux/sysrq.h
94205+++ b/include/linux/sysrq.h
94206@@ -16,6 +16,7 @@
94207
94208 #include <linux/errno.h>
94209 #include <linux/types.h>
94210+#include <linux/compiler.h>
94211
94212 /* Possible values of bitmask for enabling sysrq functions */
94213 /* 0x0001 is reserved for enable everything */
94214@@ -33,7 +34,7 @@ struct sysrq_key_op {
94215 char *help_msg;
94216 char *action_msg;
94217 int enable_mask;
94218-};
94219+} __do_const;
94220
94221 #ifdef CONFIG_MAGIC_SYSRQ
94222
94223diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
94224index ff307b5..f1a4468 100644
94225--- a/include/linux/thread_info.h
94226+++ b/include/linux/thread_info.h
94227@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
94228 #error "no set_restore_sigmask() provided and default one won't work"
94229 #endif
94230
94231+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
94232+
94233+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
94234+{
94235+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
94236+}
94237+
94238 #endif /* __KERNEL__ */
94239
94240 #endif /* _LINUX_THREAD_INFO_H */
94241diff --git a/include/linux/tty.h b/include/linux/tty.h
94242index 790752a..36d9b54 100644
94243--- a/include/linux/tty.h
94244+++ b/include/linux/tty.h
94245@@ -225,7 +225,7 @@ struct tty_port {
94246 const struct tty_port_operations *ops; /* Port operations */
94247 spinlock_t lock; /* Lock protecting tty field */
94248 int blocked_open; /* Waiting to open */
94249- int count; /* Usage count */
94250+ atomic_t count; /* Usage count */
94251 wait_queue_head_t open_wait; /* Open waiters */
94252 wait_queue_head_t close_wait; /* Close waiters */
94253 wait_queue_head_t delta_msr_wait; /* Modem status change */
94254@@ -313,7 +313,7 @@ struct tty_struct {
94255 /* If the tty has a pending do_SAK, queue it here - akpm */
94256 struct work_struct SAK_work;
94257 struct tty_port *port;
94258-};
94259+} __randomize_layout;
94260
94261 /* Each of a tty's open files has private_data pointing to tty_file_private */
94262 struct tty_file_private {
94263@@ -572,7 +572,7 @@ extern int tty_port_open(struct tty_port *port,
94264 struct tty_struct *tty, struct file *filp);
94265 static inline int tty_port_users(struct tty_port *port)
94266 {
94267- return port->count + port->blocked_open;
94268+ return atomic_read(&port->count) + port->blocked_open;
94269 }
94270
94271 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
94272diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
94273index 92e337c..f46757b 100644
94274--- a/include/linux/tty_driver.h
94275+++ b/include/linux/tty_driver.h
94276@@ -291,7 +291,7 @@ struct tty_operations {
94277 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
94278 #endif
94279 const struct file_operations *proc_fops;
94280-};
94281+} __do_const __randomize_layout;
94282
94283 struct tty_driver {
94284 int magic; /* magic number for this structure */
94285@@ -325,7 +325,7 @@ struct tty_driver {
94286
94287 const struct tty_operations *ops;
94288 struct list_head tty_drivers;
94289-};
94290+} __randomize_layout;
94291
94292 extern struct list_head tty_drivers;
94293
94294diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
94295index 00c9d68..bc0188b 100644
94296--- a/include/linux/tty_ldisc.h
94297+++ b/include/linux/tty_ldisc.h
94298@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
94299
94300 struct module *owner;
94301
94302- int refcount;
94303+ atomic_t refcount;
94304 };
94305
94306 struct tty_ldisc {
94307diff --git a/include/linux/types.h b/include/linux/types.h
94308index 6747247..fc7ec8b 100644
94309--- a/include/linux/types.h
94310+++ b/include/linux/types.h
94311@@ -174,10 +174,26 @@ typedef struct {
94312 int counter;
94313 } atomic_t;
94314
94315+#ifdef CONFIG_PAX_REFCOUNT
94316+typedef struct {
94317+ int counter;
94318+} atomic_unchecked_t;
94319+#else
94320+typedef atomic_t atomic_unchecked_t;
94321+#endif
94322+
94323 #ifdef CONFIG_64BIT
94324 typedef struct {
94325 long counter;
94326 } atomic64_t;
94327+
94328+#ifdef CONFIG_PAX_REFCOUNT
94329+typedef struct {
94330+ long counter;
94331+} atomic64_unchecked_t;
94332+#else
94333+typedef atomic64_t atomic64_unchecked_t;
94334+#endif
94335 #endif
94336
94337 struct list_head {
94338diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
94339index ecd3319..8a36ded 100644
94340--- a/include/linux/uaccess.h
94341+++ b/include/linux/uaccess.h
94342@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
94343 long ret; \
94344 mm_segment_t old_fs = get_fs(); \
94345 \
94346- set_fs(KERNEL_DS); \
94347 pagefault_disable(); \
94348- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
94349- pagefault_enable(); \
94350+ set_fs(KERNEL_DS); \
94351+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
94352 set_fs(old_fs); \
94353+ pagefault_enable(); \
94354 ret; \
94355 })
94356
94357diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
94358index 2d1f9b6..d7a9fce 100644
94359--- a/include/linux/uidgid.h
94360+++ b/include/linux/uidgid.h
94361@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
94362
94363 #endif /* CONFIG_USER_NS */
94364
94365+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
94366+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
94367+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
94368+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
94369+
94370 #endif /* _LINUX_UIDGID_H */
94371diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
94372index 32c0e83..671eb35 100644
94373--- a/include/linux/uio_driver.h
94374+++ b/include/linux/uio_driver.h
94375@@ -67,7 +67,7 @@ struct uio_device {
94376 struct module *owner;
94377 struct device *dev;
94378 int minor;
94379- atomic_t event;
94380+ atomic_unchecked_t event;
94381 struct fasync_struct *async_queue;
94382 wait_queue_head_t wait;
94383 struct uio_info *info;
94384diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
94385index 99c1b4d..562e6f3 100644
94386--- a/include/linux/unaligned/access_ok.h
94387+++ b/include/linux/unaligned/access_ok.h
94388@@ -4,34 +4,34 @@
94389 #include <linux/kernel.h>
94390 #include <asm/byteorder.h>
94391
94392-static inline u16 get_unaligned_le16(const void *p)
94393+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
94394 {
94395- return le16_to_cpup((__le16 *)p);
94396+ return le16_to_cpup((const __le16 *)p);
94397 }
94398
94399-static inline u32 get_unaligned_le32(const void *p)
94400+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
94401 {
94402- return le32_to_cpup((__le32 *)p);
94403+ return le32_to_cpup((const __le32 *)p);
94404 }
94405
94406-static inline u64 get_unaligned_le64(const void *p)
94407+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
94408 {
94409- return le64_to_cpup((__le64 *)p);
94410+ return le64_to_cpup((const __le64 *)p);
94411 }
94412
94413-static inline u16 get_unaligned_be16(const void *p)
94414+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
94415 {
94416- return be16_to_cpup((__be16 *)p);
94417+ return be16_to_cpup((const __be16 *)p);
94418 }
94419
94420-static inline u32 get_unaligned_be32(const void *p)
94421+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
94422 {
94423- return be32_to_cpup((__be32 *)p);
94424+ return be32_to_cpup((const __be32 *)p);
94425 }
94426
94427-static inline u64 get_unaligned_be64(const void *p)
94428+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
94429 {
94430- return be64_to_cpup((__be64 *)p);
94431+ return be64_to_cpup((const __be64 *)p);
94432 }
94433
94434 static inline void put_unaligned_le16(u16 val, void *p)
94435diff --git a/include/linux/usb.h b/include/linux/usb.h
94436index 447fe29..9fc875f 100644
94437--- a/include/linux/usb.h
94438+++ b/include/linux/usb.h
94439@@ -592,7 +592,7 @@ struct usb_device {
94440 int maxchild;
94441
94442 u32 quirks;
94443- atomic_t urbnum;
94444+ atomic_unchecked_t urbnum;
94445
94446 unsigned long active_duration;
94447
94448@@ -1676,7 +1676,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
94449
94450 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
94451 __u8 request, __u8 requesttype, __u16 value, __u16 index,
94452- void *data, __u16 size, int timeout);
94453+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
94454 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
94455 void *data, int len, int *actual_length, int timeout);
94456 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
94457diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
94458index 9fd9e48..e2c5f35 100644
94459--- a/include/linux/usb/renesas_usbhs.h
94460+++ b/include/linux/usb/renesas_usbhs.h
94461@@ -39,7 +39,7 @@ enum {
94462 */
94463 struct renesas_usbhs_driver_callback {
94464 int (*notify_hotplug)(struct platform_device *pdev);
94465-};
94466+} __no_const;
94467
94468 /*
94469 * callback functions for platform
94470diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
94471index 8297e5b..0dfae27 100644
94472--- a/include/linux/user_namespace.h
94473+++ b/include/linux/user_namespace.h
94474@@ -39,7 +39,7 @@ struct user_namespace {
94475 struct key *persistent_keyring_register;
94476 struct rw_semaphore persistent_keyring_register_sem;
94477 #endif
94478-};
94479+} __randomize_layout;
94480
94481 extern struct user_namespace init_user_ns;
94482
94483diff --git a/include/linux/utsname.h b/include/linux/utsname.h
94484index 5093f58..c103e58 100644
94485--- a/include/linux/utsname.h
94486+++ b/include/linux/utsname.h
94487@@ -25,7 +25,7 @@ struct uts_namespace {
94488 struct new_utsname name;
94489 struct user_namespace *user_ns;
94490 struct ns_common ns;
94491-};
94492+} __randomize_layout;
94493 extern struct uts_namespace init_uts_ns;
94494
94495 #ifdef CONFIG_UTS_NS
94496diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
94497index 6f8fbcf..4efc177 100644
94498--- a/include/linux/vermagic.h
94499+++ b/include/linux/vermagic.h
94500@@ -25,9 +25,42 @@
94501 #define MODULE_ARCH_VERMAGIC ""
94502 #endif
94503
94504+#ifdef CONFIG_PAX_REFCOUNT
94505+#define MODULE_PAX_REFCOUNT "REFCOUNT "
94506+#else
94507+#define MODULE_PAX_REFCOUNT ""
94508+#endif
94509+
94510+#ifdef CONSTIFY_PLUGIN
94511+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
94512+#else
94513+#define MODULE_CONSTIFY_PLUGIN ""
94514+#endif
94515+
94516+#ifdef STACKLEAK_PLUGIN
94517+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
94518+#else
94519+#define MODULE_STACKLEAK_PLUGIN ""
94520+#endif
94521+
94522+#ifdef RANDSTRUCT_PLUGIN
94523+#include <generated/randomize_layout_hash.h>
94524+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
94525+#else
94526+#define MODULE_RANDSTRUCT_PLUGIN
94527+#endif
94528+
94529+#ifdef CONFIG_GRKERNSEC
94530+#define MODULE_GRSEC "GRSEC "
94531+#else
94532+#define MODULE_GRSEC ""
94533+#endif
94534+
94535 #define VERMAGIC_STRING \
94536 UTS_RELEASE " " \
94537 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
94538 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
94539- MODULE_ARCH_VERMAGIC
94540+ MODULE_ARCH_VERMAGIC \
94541+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
94542+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
94543
94544diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
94545index b483abd..af305ad 100644
94546--- a/include/linux/vga_switcheroo.h
94547+++ b/include/linux/vga_switcheroo.h
94548@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
94549
94550 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
94551
94552-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
94553+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
94554 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
94555-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
94556+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
94557 #else
94558
94559 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
94560@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
94561
94562 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
94563
94564-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
94565+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
94566 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
94567-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
94568+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
94569
94570 #endif
94571 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
94572diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
94573index 0ec5983..cc61051 100644
94574--- a/include/linux/vmalloc.h
94575+++ b/include/linux/vmalloc.h
94576@@ -18,6 +18,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
94577 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
94578 #define VM_NO_GUARD 0x00000040 /* don't add guard page */
94579 #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
94580+
94581+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
94582+#define VM_KERNEXEC 0x00000100 /* allocate from executable kernel memory range */
94583+#endif
94584+
94585 /* bits [20..32] reserved for arch specific ioremap internals */
94586
94587 /*
94588@@ -86,6 +91,10 @@ extern void *vmap(struct page **pages, unsigned int count,
94589 unsigned long flags, pgprot_t prot);
94590 extern void vunmap(const void *addr);
94591
94592+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
94593+extern void unmap_process_stacks(struct task_struct *task);
94594+#endif
94595+
94596 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
94597 unsigned long uaddr, void *kaddr,
94598 unsigned long size);
94599@@ -150,7 +159,7 @@ extern void free_vm_area(struct vm_struct *area);
94600
94601 /* for /dev/kmem */
94602 extern long vread(char *buf, char *addr, unsigned long count);
94603-extern long vwrite(char *buf, char *addr, unsigned long count);
94604+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
94605
94606 /*
94607 * Internals. Dont't use..
94608diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
94609index 82e7db7..f8ce3d0 100644
94610--- a/include/linux/vmstat.h
94611+++ b/include/linux/vmstat.h
94612@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
94613 /*
94614 * Zone based page accounting with per cpu differentials.
94615 */
94616-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
94617+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
94618
94619 static inline void zone_page_state_add(long x, struct zone *zone,
94620 enum zone_stat_item item)
94621 {
94622- atomic_long_add(x, &zone->vm_stat[item]);
94623- atomic_long_add(x, &vm_stat[item]);
94624+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
94625+ atomic_long_add_unchecked(x, &vm_stat[item]);
94626 }
94627
94628-static inline unsigned long global_page_state(enum zone_stat_item item)
94629+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
94630 {
94631- long x = atomic_long_read(&vm_stat[item]);
94632+ long x = atomic_long_read_unchecked(&vm_stat[item]);
94633 #ifdef CONFIG_SMP
94634 if (x < 0)
94635 x = 0;
94636@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
94637 return x;
94638 }
94639
94640-static inline unsigned long zone_page_state(struct zone *zone,
94641+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
94642 enum zone_stat_item item)
94643 {
94644- long x = atomic_long_read(&zone->vm_stat[item]);
94645+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
94646 #ifdef CONFIG_SMP
94647 if (x < 0)
94648 x = 0;
94649@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
94650 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
94651 enum zone_stat_item item)
94652 {
94653- long x = atomic_long_read(&zone->vm_stat[item]);
94654+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
94655
94656 #ifdef CONFIG_SMP
94657 int cpu;
94658@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
94659
94660 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
94661 {
94662- atomic_long_inc(&zone->vm_stat[item]);
94663- atomic_long_inc(&vm_stat[item]);
94664+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
94665+ atomic_long_inc_unchecked(&vm_stat[item]);
94666 }
94667
94668 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
94669 {
94670- atomic_long_dec(&zone->vm_stat[item]);
94671- atomic_long_dec(&vm_stat[item]);
94672+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
94673+ atomic_long_dec_unchecked(&vm_stat[item]);
94674 }
94675
94676 static inline void __inc_zone_page_state(struct page *page,
94677diff --git a/include/linux/xattr.h b/include/linux/xattr.h
94678index 91b0a68..0e9adf6 100644
94679--- a/include/linux/xattr.h
94680+++ b/include/linux/xattr.h
94681@@ -28,7 +28,7 @@ struct xattr_handler {
94682 size_t size, int handler_flags);
94683 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
94684 size_t size, int flags, int handler_flags);
94685-};
94686+} __do_const;
94687
94688 struct xattr {
94689 const char *name;
94690@@ -37,6 +37,9 @@ struct xattr {
94691 };
94692
94693 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
94694+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
94695+ssize_t pax_getxattr(struct dentry *, void *, size_t);
94696+#endif
94697 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
94698 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
94699 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
94700diff --git a/include/linux/zlib.h b/include/linux/zlib.h
94701index 92dbbd3..13ab0b3 100644
94702--- a/include/linux/zlib.h
94703+++ b/include/linux/zlib.h
94704@@ -31,6 +31,7 @@
94705 #define _ZLIB_H
94706
94707 #include <linux/zconf.h>
94708+#include <linux/compiler.h>
94709
94710 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
94711 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
94712@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
94713
94714 /* basic functions */
94715
94716-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
94717+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
94718 /*
94719 Returns the number of bytes that needs to be allocated for a per-
94720 stream workspace with the specified parameters. A pointer to this
94721diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
94722index 3e4fddf..5ec9104 100644
94723--- a/include/media/v4l2-dev.h
94724+++ b/include/media/v4l2-dev.h
94725@@ -75,7 +75,7 @@ struct v4l2_file_operations {
94726 int (*mmap) (struct file *, struct vm_area_struct *);
94727 int (*open) (struct file *);
94728 int (*release) (struct file *);
94729-};
94730+} __do_const;
94731
94732 /*
94733 * Newer version of video_device, handled by videodev2.c
94734diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
94735index ffb69da..040393e 100644
94736--- a/include/media/v4l2-device.h
94737+++ b/include/media/v4l2-device.h
94738@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
94739 this function returns 0. If the name ends with a digit (e.g. cx18),
94740 then the name will be set to cx18-0 since cx180 looks really odd. */
94741 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
94742- atomic_t *instance);
94743+ atomic_unchecked_t *instance);
94744
94745 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
94746 Since the parent disappears this ensures that v4l2_dev doesn't have an
94747diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
94748index 2a25dec..bf6dd8a 100644
94749--- a/include/net/9p/transport.h
94750+++ b/include/net/9p/transport.h
94751@@ -62,7 +62,7 @@ struct p9_trans_module {
94752 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
94753 int (*zc_request)(struct p9_client *, struct p9_req_t *,
94754 char *, char *, int , int, int, int);
94755-};
94756+} __do_const;
94757
94758 void v9fs_register_trans(struct p9_trans_module *m);
94759 void v9fs_unregister_trans(struct p9_trans_module *m);
94760diff --git a/include/net/af_unix.h b/include/net/af_unix.h
94761index a175ba4..196eb8242 100644
94762--- a/include/net/af_unix.h
94763+++ b/include/net/af_unix.h
94764@@ -36,7 +36,7 @@ struct unix_skb_parms {
94765 u32 secid; /* Security ID */
94766 #endif
94767 u32 consumed;
94768-};
94769+} __randomize_layout;
94770
94771 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
94772 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
94773diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
94774index 2239a37..a83461f 100644
94775--- a/include/net/bluetooth/l2cap.h
94776+++ b/include/net/bluetooth/l2cap.h
94777@@ -609,7 +609,7 @@ struct l2cap_ops {
94778 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
94779 unsigned long hdr_len,
94780 unsigned long len, int nb);
94781-};
94782+} __do_const;
94783
94784 struct l2cap_conn {
94785 struct hci_conn *hcon;
94786diff --git a/include/net/bonding.h b/include/net/bonding.h
94787index fda6fee..dbdf83c 100644
94788--- a/include/net/bonding.h
94789+++ b/include/net/bonding.h
94790@@ -665,7 +665,7 @@ extern struct rtnl_link_ops bond_link_ops;
94791
94792 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
94793 {
94794- atomic_long_inc(&dev->tx_dropped);
94795+ atomic_long_inc_unchecked(&dev->tx_dropped);
94796 dev_kfree_skb_any(skb);
94797 }
94798
94799diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
94800index f2ae33d..c457cf0 100644
94801--- a/include/net/caif/cfctrl.h
94802+++ b/include/net/caif/cfctrl.h
94803@@ -52,7 +52,7 @@ struct cfctrl_rsp {
94804 void (*radioset_rsp)(void);
94805 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
94806 struct cflayer *client_layer);
94807-};
94808+} __no_const;
94809
94810 /* Link Setup Parameters for CAIF-Links. */
94811 struct cfctrl_link_param {
94812@@ -101,8 +101,8 @@ struct cfctrl_request_info {
94813 struct cfctrl {
94814 struct cfsrvl serv;
94815 struct cfctrl_rsp res;
94816- atomic_t req_seq_no;
94817- atomic_t rsp_seq_no;
94818+ atomic_unchecked_t req_seq_no;
94819+ atomic_unchecked_t rsp_seq_no;
94820 struct list_head list;
94821 /* Protects from simultaneous access to first_req list */
94822 spinlock_t info_list_lock;
94823diff --git a/include/net/flow.h b/include/net/flow.h
94824index 8109a15..504466d 100644
94825--- a/include/net/flow.h
94826+++ b/include/net/flow.h
94827@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
94828
94829 void flow_cache_flush(struct net *net);
94830 void flow_cache_flush_deferred(struct net *net);
94831-extern atomic_t flow_cache_genid;
94832+extern atomic_unchecked_t flow_cache_genid;
94833
94834 #endif
94835diff --git a/include/net/genetlink.h b/include/net/genetlink.h
94836index 0574abd..0f16881 100644
94837--- a/include/net/genetlink.h
94838+++ b/include/net/genetlink.h
94839@@ -130,7 +130,7 @@ struct genl_ops {
94840 u8 cmd;
94841 u8 internal_flags;
94842 u8 flags;
94843-};
94844+} __do_const;
94845
94846 int __genl_register_family(struct genl_family *family);
94847
94848diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
94849index 0f712c0..cd762c4 100644
94850--- a/include/net/gro_cells.h
94851+++ b/include/net/gro_cells.h
94852@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
94853 cell = this_cpu_ptr(gcells->cells);
94854
94855 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
94856- atomic_long_inc(&dev->rx_dropped);
94857+ atomic_long_inc_unchecked(&dev->rx_dropped);
94858 kfree_skb(skb);
94859 return;
94860 }
94861diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
94862index 9fe865c..43735aa 100644
94863--- a/include/net/inet_connection_sock.h
94864+++ b/include/net/inet_connection_sock.h
94865@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
94866 int (*bind_conflict)(const struct sock *sk,
94867 const struct inet_bind_bucket *tb, bool relax);
94868 void (*mtu_reduced)(struct sock *sk);
94869-};
94870+} __do_const;
94871
94872 /** inet_connection_sock - INET connection oriented sock
94873 *
94874diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
94875index 80479ab..0c3f647 100644
94876--- a/include/net/inetpeer.h
94877+++ b/include/net/inetpeer.h
94878@@ -47,7 +47,7 @@ struct inet_peer {
94879 */
94880 union {
94881 struct {
94882- atomic_t rid; /* Frag reception counter */
94883+ atomic_unchecked_t rid; /* Frag reception counter */
94884 };
94885 struct rcu_head rcu;
94886 struct inet_peer *gc_next;
94887diff --git a/include/net/ip.h b/include/net/ip.h
94888index 6cc1eaf..14059b0 100644
94889--- a/include/net/ip.h
94890+++ b/include/net/ip.h
94891@@ -317,7 +317,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
94892 }
94893 }
94894
94895-u32 ip_idents_reserve(u32 hash, int segs);
94896+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
94897 void __ip_select_ident(struct iphdr *iph, int segs);
94898
94899 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
94900diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
94901index 5bd120e4..03fb812 100644
94902--- a/include/net/ip_fib.h
94903+++ b/include/net/ip_fib.h
94904@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
94905
94906 #define FIB_RES_SADDR(net, res) \
94907 ((FIB_RES_NH(res).nh_saddr_genid == \
94908- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
94909+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
94910 FIB_RES_NH(res).nh_saddr : \
94911 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
94912 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
94913diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
94914index 615b20b..fd4cbd8 100644
94915--- a/include/net/ip_vs.h
94916+++ b/include/net/ip_vs.h
94917@@ -534,7 +534,7 @@ struct ip_vs_conn {
94918 struct ip_vs_conn *control; /* Master control connection */
94919 atomic_t n_control; /* Number of controlled ones */
94920 struct ip_vs_dest *dest; /* real server */
94921- atomic_t in_pkts; /* incoming packet counter */
94922+ atomic_unchecked_t in_pkts; /* incoming packet counter */
94923
94924 /* Packet transmitter for different forwarding methods. If it
94925 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
94926@@ -682,7 +682,7 @@ struct ip_vs_dest {
94927 __be16 port; /* port number of the server */
94928 union nf_inet_addr addr; /* IP address of the server */
94929 volatile unsigned int flags; /* dest status flags */
94930- atomic_t conn_flags; /* flags to copy to conn */
94931+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
94932 atomic_t weight; /* server weight */
94933
94934 atomic_t refcnt; /* reference counter */
94935@@ -928,11 +928,11 @@ struct netns_ipvs {
94936 /* ip_vs_lblc */
94937 int sysctl_lblc_expiration;
94938 struct ctl_table_header *lblc_ctl_header;
94939- struct ctl_table *lblc_ctl_table;
94940+ ctl_table_no_const *lblc_ctl_table;
94941 /* ip_vs_lblcr */
94942 int sysctl_lblcr_expiration;
94943 struct ctl_table_header *lblcr_ctl_header;
94944- struct ctl_table *lblcr_ctl_table;
94945+ ctl_table_no_const *lblcr_ctl_table;
94946 /* ip_vs_est */
94947 struct list_head est_list; /* estimator list */
94948 spinlock_t est_lock;
94949diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
94950index 8d4f588..2e37ad2 100644
94951--- a/include/net/irda/ircomm_tty.h
94952+++ b/include/net/irda/ircomm_tty.h
94953@@ -33,6 +33,7 @@
94954 #include <linux/termios.h>
94955 #include <linux/timer.h>
94956 #include <linux/tty.h> /* struct tty_struct */
94957+#include <asm/local.h>
94958
94959 #include <net/irda/irias_object.h>
94960 #include <net/irda/ircomm_core.h>
94961diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
94962index 714cc9a..ea05f3e 100644
94963--- a/include/net/iucv/af_iucv.h
94964+++ b/include/net/iucv/af_iucv.h
94965@@ -149,7 +149,7 @@ struct iucv_skb_cb {
94966 struct iucv_sock_list {
94967 struct hlist_head head;
94968 rwlock_t lock;
94969- atomic_t autobind_name;
94970+ atomic_unchecked_t autobind_name;
94971 };
94972
94973 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
94974diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
94975index f3be818..bf46196 100644
94976--- a/include/net/llc_c_ac.h
94977+++ b/include/net/llc_c_ac.h
94978@@ -87,7 +87,7 @@
94979 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
94980 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
94981
94982-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
94983+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
94984
94985 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
94986 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
94987diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
94988index 3948cf1..83b28c4 100644
94989--- a/include/net/llc_c_ev.h
94990+++ b/include/net/llc_c_ev.h
94991@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
94992 return (struct llc_conn_state_ev *)skb->cb;
94993 }
94994
94995-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
94996-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
94997+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
94998+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
94999
95000 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
95001 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
95002diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
95003index 48f3f89..0e92c50 100644
95004--- a/include/net/llc_c_st.h
95005+++ b/include/net/llc_c_st.h
95006@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
95007 u8 next_state;
95008 const llc_conn_ev_qfyr_t *ev_qualifiers;
95009 const llc_conn_action_t *ev_actions;
95010-};
95011+} __do_const;
95012
95013 struct llc_conn_state {
95014 u8 current_state;
95015diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
95016index a61b98c..aade1eb 100644
95017--- a/include/net/llc_s_ac.h
95018+++ b/include/net/llc_s_ac.h
95019@@ -23,7 +23,7 @@
95020 #define SAP_ACT_TEST_IND 9
95021
95022 /* All action functions must look like this */
95023-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
95024+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
95025
95026 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
95027 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
95028diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
95029index c4359e2..76dbc4a 100644
95030--- a/include/net/llc_s_st.h
95031+++ b/include/net/llc_s_st.h
95032@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
95033 llc_sap_ev_t ev;
95034 u8 next_state;
95035 const llc_sap_action_t *ev_actions;
95036-};
95037+} __do_const;
95038
95039 struct llc_sap_state {
95040 u8 curr_state;
95041diff --git a/include/net/mac80211.h b/include/net/mac80211.h
95042index d52914b..2b13cec 100644
95043--- a/include/net/mac80211.h
95044+++ b/include/net/mac80211.h
95045@@ -4915,7 +4915,7 @@ struct rate_control_ops {
95046 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
95047
95048 u32 (*get_expected_throughput)(void *priv_sta);
95049-};
95050+} __do_const;
95051
95052 static inline int rate_supported(struct ieee80211_sta *sta,
95053 enum ieee80211_band band,
95054diff --git a/include/net/neighbour.h b/include/net/neighbour.h
95055index 76f7084..8f36e39 100644
95056--- a/include/net/neighbour.h
95057+++ b/include/net/neighbour.h
95058@@ -163,7 +163,7 @@ struct neigh_ops {
95059 void (*error_report)(struct neighbour *, struct sk_buff *);
95060 int (*output)(struct neighbour *, struct sk_buff *);
95061 int (*connected_output)(struct neighbour *, struct sk_buff *);
95062-};
95063+} __do_const;
95064
95065 struct pneigh_entry {
95066 struct pneigh_entry *next;
95067@@ -217,7 +217,7 @@ struct neigh_table {
95068 struct neigh_statistics __percpu *stats;
95069 struct neigh_hash_table __rcu *nht;
95070 struct pneigh_entry **phash_buckets;
95071-};
95072+} __randomize_layout;
95073
95074 enum {
95075 NEIGH_ARP_TABLE = 0,
95076diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
95077index 36faf49..6927638 100644
95078--- a/include/net/net_namespace.h
95079+++ b/include/net/net_namespace.h
95080@@ -131,8 +131,8 @@ struct net {
95081 struct netns_ipvs *ipvs;
95082 #endif
95083 struct sock *diag_nlsk;
95084- atomic_t fnhe_genid;
95085-};
95086+ atomic_unchecked_t fnhe_genid;
95087+} __randomize_layout;
95088
95089 #include <linux/seq_file_net.h>
95090
95091@@ -288,7 +288,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
95092 #define __net_init __init
95093 #define __net_exit __exit_refok
95094 #define __net_initdata __initdata
95095+#ifdef CONSTIFY_PLUGIN
95096 #define __net_initconst __initconst
95097+#else
95098+#define __net_initconst __initdata
95099+#endif
95100 #endif
95101
95102 int peernet2id(struct net *net, struct net *peer);
95103@@ -301,7 +305,7 @@ struct pernet_operations {
95104 void (*exit_batch)(struct list_head *net_exit_list);
95105 int *id;
95106 size_t size;
95107-};
95108+} __do_const;
95109
95110 /*
95111 * Use these carefully. If you implement a network device and it
95112@@ -349,12 +353,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
95113
95114 static inline int rt_genid_ipv4(struct net *net)
95115 {
95116- return atomic_read(&net->ipv4.rt_genid);
95117+ return atomic_read_unchecked(&net->ipv4.rt_genid);
95118 }
95119
95120 static inline void rt_genid_bump_ipv4(struct net *net)
95121 {
95122- atomic_inc(&net->ipv4.rt_genid);
95123+ atomic_inc_unchecked(&net->ipv4.rt_genid);
95124 }
95125
95126 extern void (*__fib6_flush_trees)(struct net *net);
95127@@ -381,12 +385,12 @@ static inline void rt_genid_bump_all(struct net *net)
95128
95129 static inline int fnhe_genid(struct net *net)
95130 {
95131- return atomic_read(&net->fnhe_genid);
95132+ return atomic_read_unchecked(&net->fnhe_genid);
95133 }
95134
95135 static inline void fnhe_genid_bump(struct net *net)
95136 {
95137- atomic_inc(&net->fnhe_genid);
95138+ atomic_inc_unchecked(&net->fnhe_genid);
95139 }
95140
95141 #endif /* __NET_NET_NAMESPACE_H */
95142diff --git a/include/net/netlink.h b/include/net/netlink.h
95143index e010ee8..405b9f4 100644
95144--- a/include/net/netlink.h
95145+++ b/include/net/netlink.h
95146@@ -518,7 +518,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
95147 {
95148 if (mark) {
95149 WARN_ON((unsigned char *) mark < skb->data);
95150- skb_trim(skb, (unsigned char *) mark - skb->data);
95151+ skb_trim(skb, (const unsigned char *) mark - skb->data);
95152 }
95153 }
95154
95155diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
95156index 29d6a94..235d3d84 100644
95157--- a/include/net/netns/conntrack.h
95158+++ b/include/net/netns/conntrack.h
95159@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
95160 struct nf_proto_net {
95161 #ifdef CONFIG_SYSCTL
95162 struct ctl_table_header *ctl_table_header;
95163- struct ctl_table *ctl_table;
95164+ ctl_table_no_const *ctl_table;
95165 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
95166 struct ctl_table_header *ctl_compat_header;
95167- struct ctl_table *ctl_compat_table;
95168+ ctl_table_no_const *ctl_compat_table;
95169 #endif
95170 #endif
95171 unsigned int users;
95172@@ -60,7 +60,7 @@ struct nf_ip_net {
95173 struct nf_icmp_net icmpv6;
95174 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
95175 struct ctl_table_header *ctl_table_header;
95176- struct ctl_table *ctl_table;
95177+ ctl_table_no_const *ctl_table;
95178 #endif
95179 };
95180
95181diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
95182index dbe2254..ed0c151 100644
95183--- a/include/net/netns/ipv4.h
95184+++ b/include/net/netns/ipv4.h
95185@@ -87,7 +87,7 @@ struct netns_ipv4 {
95186
95187 struct ping_group_range ping_group_range;
95188
95189- atomic_t dev_addr_genid;
95190+ atomic_unchecked_t dev_addr_genid;
95191
95192 #ifdef CONFIG_SYSCTL
95193 unsigned long *sysctl_local_reserved_ports;
95194@@ -101,6 +101,6 @@ struct netns_ipv4 {
95195 struct fib_rules_ops *mr_rules_ops;
95196 #endif
95197 #endif
95198- atomic_t rt_genid;
95199+ atomic_unchecked_t rt_genid;
95200 };
95201 #endif
95202diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
95203index 69ae41f..4f94868 100644
95204--- a/include/net/netns/ipv6.h
95205+++ b/include/net/netns/ipv6.h
95206@@ -75,8 +75,8 @@ struct netns_ipv6 {
95207 struct fib_rules_ops *mr6_rules_ops;
95208 #endif
95209 #endif
95210- atomic_t dev_addr_genid;
95211- atomic_t fib6_sernum;
95212+ atomic_unchecked_t dev_addr_genid;
95213+ atomic_unchecked_t fib6_sernum;
95214 };
95215
95216 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
95217diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
95218index 730d82a..045f2c4 100644
95219--- a/include/net/netns/xfrm.h
95220+++ b/include/net/netns/xfrm.h
95221@@ -78,7 +78,7 @@ struct netns_xfrm {
95222
95223 /* flow cache part */
95224 struct flow_cache flow_cache_global;
95225- atomic_t flow_cache_genid;
95226+ atomic_unchecked_t flow_cache_genid;
95227 struct list_head flow_cache_gc_list;
95228 spinlock_t flow_cache_gc_lock;
95229 struct work_struct flow_cache_gc_work;
95230diff --git a/include/net/ping.h b/include/net/ping.h
95231index cc16d41..664f40b 100644
95232--- a/include/net/ping.h
95233+++ b/include/net/ping.h
95234@@ -54,7 +54,7 @@ struct ping_iter_state {
95235
95236 extern struct proto ping_prot;
95237 #if IS_ENABLED(CONFIG_IPV6)
95238-extern struct pingv6_ops pingv6_ops;
95239+extern struct pingv6_ops *pingv6_ops;
95240 #endif
95241
95242 struct pingfakehdr {
95243diff --git a/include/net/protocol.h b/include/net/protocol.h
95244index d6fcc1f..ca277058 100644
95245--- a/include/net/protocol.h
95246+++ b/include/net/protocol.h
95247@@ -49,7 +49,7 @@ struct net_protocol {
95248 * socket lookup?
95249 */
95250 icmp_strict_tag_validation:1;
95251-};
95252+} __do_const;
95253
95254 #if IS_ENABLED(CONFIG_IPV6)
95255 struct inet6_protocol {
95256@@ -62,7 +62,7 @@ struct inet6_protocol {
95257 u8 type, u8 code, int offset,
95258 __be32 info);
95259 unsigned int flags; /* INET6_PROTO_xxx */
95260-};
95261+} __do_const;
95262
95263 #define INET6_PROTO_NOPOLICY 0x1
95264 #define INET6_PROTO_FINAL 0x2
95265diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
95266index 6c6d539..af70817 100644
95267--- a/include/net/rtnetlink.h
95268+++ b/include/net/rtnetlink.h
95269@@ -95,7 +95,7 @@ struct rtnl_link_ops {
95270 const struct net_device *dev,
95271 const struct net_device *slave_dev);
95272 struct net *(*get_link_net)(const struct net_device *dev);
95273-};
95274+} __do_const;
95275
95276 int __rtnl_link_register(struct rtnl_link_ops *ops);
95277 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
95278diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
95279index 4a5b9a3..ca27d73 100644
95280--- a/include/net/sctp/checksum.h
95281+++ b/include/net/sctp/checksum.h
95282@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
95283 unsigned int offset)
95284 {
95285 struct sctphdr *sh = sctp_hdr(skb);
95286- __le32 ret, old = sh->checksum;
95287- const struct skb_checksum_ops ops = {
95288+ __le32 ret, old = sh->checksum;
95289+ static const struct skb_checksum_ops ops = {
95290 .update = sctp_csum_update,
95291 .combine = sctp_csum_combine,
95292 };
95293diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
95294index 487ef34..d457f98 100644
95295--- a/include/net/sctp/sm.h
95296+++ b/include/net/sctp/sm.h
95297@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
95298 typedef struct {
95299 sctp_state_fn_t *fn;
95300 const char *name;
95301-} sctp_sm_table_entry_t;
95302+} __do_const sctp_sm_table_entry_t;
95303
95304 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
95305 * currently in use.
95306@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
95307 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
95308
95309 /* Extern declarations for major data structures. */
95310-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
95311+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
95312
95313
95314 /* Get the size of a DATA chunk payload. */
95315diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
95316index 2bb2fcf..d17c291 100644
95317--- a/include/net/sctp/structs.h
95318+++ b/include/net/sctp/structs.h
95319@@ -509,7 +509,7 @@ struct sctp_pf {
95320 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
95321 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
95322 struct sctp_af *af;
95323-};
95324+} __do_const;
95325
95326
95327 /* Structure to track chunk fragments that have been acked, but peer
95328diff --git a/include/net/sock.h b/include/net/sock.h
95329index e4079c2..79c5d3a 100644
95330--- a/include/net/sock.h
95331+++ b/include/net/sock.h
95332@@ -362,7 +362,7 @@ struct sock {
95333 unsigned int sk_napi_id;
95334 unsigned int sk_ll_usec;
95335 #endif
95336- atomic_t sk_drops;
95337+ atomic_unchecked_t sk_drops;
95338 int sk_rcvbuf;
95339
95340 struct sk_filter __rcu *sk_filter;
95341@@ -1039,7 +1039,7 @@ struct proto {
95342 void (*destroy_cgroup)(struct mem_cgroup *memcg);
95343 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
95344 #endif
95345-};
95346+} __randomize_layout;
95347
95348 /*
95349 * Bits in struct cg_proto.flags
95350@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
95351 page_counter_uncharge(&prot->memory_allocated, amt);
95352 }
95353
95354-static inline long
95355+static inline long __intentional_overflow(-1)
95356 sk_memory_allocated(const struct sock *sk)
95357 {
95358 struct proto *prot = sk->sk_prot;
95359@@ -1778,7 +1778,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
95360 }
95361
95362 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
95363- struct iov_iter *from, char *to,
95364+ struct iov_iter *from, unsigned char *to,
95365 int copy, int offset)
95366 {
95367 if (skb->ip_summed == CHECKSUM_NONE) {
95368@@ -2025,7 +2025,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
95369 }
95370 }
95371
95372-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
95373+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
95374
95375 /**
95376 * sk_page_frag - return an appropriate page_frag
95377diff --git a/include/net/tcp.h b/include/net/tcp.h
95378index 8d6b983..5813205 100644
95379--- a/include/net/tcp.h
95380+++ b/include/net/tcp.h
95381@@ -516,7 +516,7 @@ void tcp_retransmit_timer(struct sock *sk);
95382 void tcp_xmit_retransmit_queue(struct sock *);
95383 void tcp_simple_retransmit(struct sock *);
95384 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
95385-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
95386+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
95387
95388 void tcp_send_probe0(struct sock *);
95389 void tcp_send_partial(struct sock *);
95390@@ -694,8 +694,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
95391 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
95392 */
95393 struct tcp_skb_cb {
95394- __u32 seq; /* Starting sequence number */
95395- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
95396+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
95397+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
95398 union {
95399 /* Note : tcp_tw_isn is used in input path only
95400 * (isn chosen by tcp_timewait_state_process())
95401@@ -720,7 +720,7 @@ struct tcp_skb_cb {
95402
95403 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
95404 /* 1 byte hole */
95405- __u32 ack_seq; /* Sequence number ACK'd */
95406+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
95407 union {
95408 struct inet_skb_parm h4;
95409 #if IS_ENABLED(CONFIG_IPV6)
95410diff --git a/include/net/xfrm.h b/include/net/xfrm.h
95411index dc4865e..152ee4c 100644
95412--- a/include/net/xfrm.h
95413+++ b/include/net/xfrm.h
95414@@ -285,7 +285,6 @@ struct xfrm_dst;
95415 struct xfrm_policy_afinfo {
95416 unsigned short family;
95417 struct dst_ops *dst_ops;
95418- void (*garbage_collect)(struct net *net);
95419 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
95420 const xfrm_address_t *saddr,
95421 const xfrm_address_t *daddr);
95422@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
95423 struct net_device *dev,
95424 const struct flowi *fl);
95425 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
95426-};
95427+} __do_const;
95428
95429 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
95430 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
95431@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
95432 int (*transport_finish)(struct sk_buff *skb,
95433 int async);
95434 void (*local_error)(struct sk_buff *skb, u32 mtu);
95435-};
95436+} __do_const;
95437
95438 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
95439 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
95440@@ -437,7 +436,7 @@ struct xfrm_mode {
95441 struct module *owner;
95442 unsigned int encap;
95443 int flags;
95444-};
95445+} __do_const;
95446
95447 /* Flags for xfrm_mode. */
95448 enum {
95449@@ -534,7 +533,7 @@ struct xfrm_policy {
95450 struct timer_list timer;
95451
95452 struct flow_cache_object flo;
95453- atomic_t genid;
95454+ atomic_unchecked_t genid;
95455 u32 priority;
95456 u32 index;
95457 struct xfrm_mark mark;
95458@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
95459 }
95460
95461 void xfrm_garbage_collect(struct net *net);
95462+void xfrm_garbage_collect_deferred(struct net *net);
95463
95464 #else
95465
95466@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
95467 static inline void xfrm_garbage_collect(struct net *net)
95468 {
95469 }
95470+static inline void xfrm_garbage_collect_deferred(struct net *net)
95471+{
95472+}
95473 #endif
95474
95475 static __inline__
95476diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
95477index 1017e0b..227aa4d 100644
95478--- a/include/rdma/iw_cm.h
95479+++ b/include/rdma/iw_cm.h
95480@@ -122,7 +122,7 @@ struct iw_cm_verbs {
95481 int backlog);
95482
95483 int (*destroy_listen)(struct iw_cm_id *cm_id);
95484-};
95485+} __no_const;
95486
95487 /**
95488 * iw_create_cm_id - Create an IW CM identifier.
95489diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
95490index 93d14da..734b3d8 100644
95491--- a/include/scsi/libfc.h
95492+++ b/include/scsi/libfc.h
95493@@ -771,6 +771,7 @@ struct libfc_function_template {
95494 */
95495 void (*disc_stop_final) (struct fc_lport *);
95496 };
95497+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
95498
95499 /**
95500 * struct fc_disc - Discovery context
95501@@ -875,7 +876,7 @@ struct fc_lport {
95502 struct fc_vport *vport;
95503
95504 /* Operational Information */
95505- struct libfc_function_template tt;
95506+ libfc_function_template_no_const tt;
95507 u8 link_up;
95508 u8 qfull;
95509 enum fc_lport_state state;
95510diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
95511index a4c9336..d6f8f34 100644
95512--- a/include/scsi/scsi_device.h
95513+++ b/include/scsi/scsi_device.h
95514@@ -185,9 +185,9 @@ struct scsi_device {
95515 unsigned int max_device_blocked; /* what device_blocked counts down from */
95516 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
95517
95518- atomic_t iorequest_cnt;
95519- atomic_t iodone_cnt;
95520- atomic_t ioerr_cnt;
95521+ atomic_unchecked_t iorequest_cnt;
95522+ atomic_unchecked_t iodone_cnt;
95523+ atomic_unchecked_t ioerr_cnt;
95524
95525 struct device sdev_gendev,
95526 sdev_dev;
95527diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
95528index 891a658..fcd68df 100644
95529--- a/include/scsi/scsi_driver.h
95530+++ b/include/scsi/scsi_driver.h
95531@@ -14,7 +14,7 @@ struct scsi_driver {
95532 void (*rescan)(struct device *);
95533 int (*init_command)(struct scsi_cmnd *);
95534 void (*uninit_command)(struct scsi_cmnd *);
95535- int (*done)(struct scsi_cmnd *);
95536+ unsigned int (*done)(struct scsi_cmnd *);
95537 int (*eh_action)(struct scsi_cmnd *, int);
95538 };
95539 #define to_scsi_driver(drv) \
95540diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
95541index 007a0bc..7188db8 100644
95542--- a/include/scsi/scsi_transport_fc.h
95543+++ b/include/scsi/scsi_transport_fc.h
95544@@ -756,7 +756,8 @@ struct fc_function_template {
95545 unsigned long show_host_system_hostname:1;
95546
95547 unsigned long disable_target_scan:1;
95548-};
95549+} __do_const;
95550+typedef struct fc_function_template __no_const fc_function_template_no_const;
95551
95552
95553 /**
95554diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
95555index f48089d..73abe48 100644
95556--- a/include/sound/compress_driver.h
95557+++ b/include/sound/compress_driver.h
95558@@ -130,7 +130,7 @@ struct snd_compr_ops {
95559 struct snd_compr_caps *caps);
95560 int (*get_codec_caps) (struct snd_compr_stream *stream,
95561 struct snd_compr_codec_caps *codec);
95562-};
95563+} __no_const;
95564
95565 /**
95566 * struct snd_compr: Compressed device
95567diff --git a/include/sound/soc.h b/include/sound/soc.h
95568index 0d1ade1..34e77d3 100644
95569--- a/include/sound/soc.h
95570+++ b/include/sound/soc.h
95571@@ -856,7 +856,7 @@ struct snd_soc_codec_driver {
95572 enum snd_soc_dapm_type, int);
95573
95574 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
95575-};
95576+} __do_const;
95577
95578 /* SoC platform interface */
95579 struct snd_soc_platform_driver {
95580@@ -883,7 +883,7 @@ struct snd_soc_platform_driver {
95581 const struct snd_compr_ops *compr_ops;
95582
95583 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
95584-};
95585+} __do_const;
95586
95587 struct snd_soc_dai_link_component {
95588 const char *name;
95589diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
95590index 985ca4c..b55b54a 100644
95591--- a/include/target/target_core_base.h
95592+++ b/include/target/target_core_base.h
95593@@ -767,7 +767,7 @@ struct se_device {
95594 atomic_long_t write_bytes;
95595 /* Active commands on this virtual SE device */
95596 atomic_t simple_cmds;
95597- atomic_t dev_ordered_id;
95598+ atomic_unchecked_t dev_ordered_id;
95599 atomic_t dev_ordered_sync;
95600 atomic_t dev_qf_count;
95601 int export_count;
95602diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
95603new file mode 100644
95604index 0000000..fb634b7
95605--- /dev/null
95606+++ b/include/trace/events/fs.h
95607@@ -0,0 +1,53 @@
95608+#undef TRACE_SYSTEM
95609+#define TRACE_SYSTEM fs
95610+
95611+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
95612+#define _TRACE_FS_H
95613+
95614+#include <linux/fs.h>
95615+#include <linux/tracepoint.h>
95616+
95617+TRACE_EVENT(do_sys_open,
95618+
95619+ TP_PROTO(const char *filename, int flags, int mode),
95620+
95621+ TP_ARGS(filename, flags, mode),
95622+
95623+ TP_STRUCT__entry(
95624+ __string( filename, filename )
95625+ __field( int, flags )
95626+ __field( int, mode )
95627+ ),
95628+
95629+ TP_fast_assign(
95630+ __assign_str(filename, filename);
95631+ __entry->flags = flags;
95632+ __entry->mode = mode;
95633+ ),
95634+
95635+ TP_printk("\"%s\" %x %o",
95636+ __get_str(filename), __entry->flags, __entry->mode)
95637+);
95638+
95639+TRACE_EVENT(open_exec,
95640+
95641+ TP_PROTO(const char *filename),
95642+
95643+ TP_ARGS(filename),
95644+
95645+ TP_STRUCT__entry(
95646+ __string( filename, filename )
95647+ ),
95648+
95649+ TP_fast_assign(
95650+ __assign_str(filename, filename);
95651+ ),
95652+
95653+ TP_printk("\"%s\"",
95654+ __get_str(filename))
95655+);
95656+
95657+#endif /* _TRACE_FS_H */
95658+
95659+/* This part must be outside protection */
95660+#include <trace/define_trace.h>
95661diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
95662index 3608beb..df39d8a 100644
95663--- a/include/trace/events/irq.h
95664+++ b/include/trace/events/irq.h
95665@@ -36,7 +36,7 @@ struct softirq_action;
95666 */
95667 TRACE_EVENT(irq_handler_entry,
95668
95669- TP_PROTO(int irq, struct irqaction *action),
95670+ TP_PROTO(int irq, const struct irqaction *action),
95671
95672 TP_ARGS(irq, action),
95673
95674@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
95675 */
95676 TRACE_EVENT(irq_handler_exit,
95677
95678- TP_PROTO(int irq, struct irqaction *action, int ret),
95679+ TP_PROTO(int irq, const struct irqaction *action, int ret),
95680
95681 TP_ARGS(irq, action, ret),
95682
95683diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
95684index 6eed16b..3e05750 100644
95685--- a/include/uapi/drm/i915_drm.h
95686+++ b/include/uapi/drm/i915_drm.h
95687@@ -347,6 +347,7 @@ typedef struct drm_i915_irq_wait {
95688 #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
95689 #define I915_PARAM_MMAP_VERSION 30
95690 #define I915_PARAM_HAS_BSD2 31
95691+#define I915_PARAM_HAS_LEGACY_CONTEXT 35
95692
95693 typedef struct drm_i915_getparam {
95694 int param;
95695diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
95696index 7caf44c..23c6f27 100644
95697--- a/include/uapi/linux/a.out.h
95698+++ b/include/uapi/linux/a.out.h
95699@@ -39,6 +39,14 @@ enum machine_type {
95700 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
95701 };
95702
95703+/* Constants for the N_FLAGS field */
95704+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
95705+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
95706+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
95707+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
95708+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
95709+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
95710+
95711 #if !defined (N_MAGIC)
95712 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
95713 #endif
95714diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
95715index 22b6ad3..aeba37e 100644
95716--- a/include/uapi/linux/bcache.h
95717+++ b/include/uapi/linux/bcache.h
95718@@ -5,6 +5,7 @@
95719 * Bcache on disk data structures
95720 */
95721
95722+#include <linux/compiler.h>
95723 #include <asm/types.h>
95724
95725 #define BITMASK(name, type, field, offset, size) \
95726@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
95727 /* Btree keys - all units are in sectors */
95728
95729 struct bkey {
95730- __u64 high;
95731- __u64 low;
95732+ __u64 high __intentional_overflow(-1);
95733+ __u64 low __intentional_overflow(-1);
95734 __u64 ptr[];
95735 };
95736
95737diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
95738index d876736..ccce5c0 100644
95739--- a/include/uapi/linux/byteorder/little_endian.h
95740+++ b/include/uapi/linux/byteorder/little_endian.h
95741@@ -42,51 +42,51 @@
95742
95743 static inline __le64 __cpu_to_le64p(const __u64 *p)
95744 {
95745- return (__force __le64)*p;
95746+ return (__force const __le64)*p;
95747 }
95748-static inline __u64 __le64_to_cpup(const __le64 *p)
95749+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
95750 {
95751- return (__force __u64)*p;
95752+ return (__force const __u64)*p;
95753 }
95754 static inline __le32 __cpu_to_le32p(const __u32 *p)
95755 {
95756- return (__force __le32)*p;
95757+ return (__force const __le32)*p;
95758 }
95759 static inline __u32 __le32_to_cpup(const __le32 *p)
95760 {
95761- return (__force __u32)*p;
95762+ return (__force const __u32)*p;
95763 }
95764 static inline __le16 __cpu_to_le16p(const __u16 *p)
95765 {
95766- return (__force __le16)*p;
95767+ return (__force const __le16)*p;
95768 }
95769 static inline __u16 __le16_to_cpup(const __le16 *p)
95770 {
95771- return (__force __u16)*p;
95772+ return (__force const __u16)*p;
95773 }
95774 static inline __be64 __cpu_to_be64p(const __u64 *p)
95775 {
95776- return (__force __be64)__swab64p(p);
95777+ return (__force const __be64)__swab64p(p);
95778 }
95779 static inline __u64 __be64_to_cpup(const __be64 *p)
95780 {
95781- return __swab64p((__u64 *)p);
95782+ return __swab64p((const __u64 *)p);
95783 }
95784 static inline __be32 __cpu_to_be32p(const __u32 *p)
95785 {
95786- return (__force __be32)__swab32p(p);
95787+ return (__force const __be32)__swab32p(p);
95788 }
95789-static inline __u32 __be32_to_cpup(const __be32 *p)
95790+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
95791 {
95792- return __swab32p((__u32 *)p);
95793+ return __swab32p((const __u32 *)p);
95794 }
95795 static inline __be16 __cpu_to_be16p(const __u16 *p)
95796 {
95797- return (__force __be16)__swab16p(p);
95798+ return (__force const __be16)__swab16p(p);
95799 }
95800 static inline __u16 __be16_to_cpup(const __be16 *p)
95801 {
95802- return __swab16p((__u16 *)p);
95803+ return __swab16p((const __u16 *)p);
95804 }
95805 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
95806 #define __le64_to_cpus(x) do { (void)(x); } while (0)
95807diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
95808index 71e1d0e..6cc9caf 100644
95809--- a/include/uapi/linux/elf.h
95810+++ b/include/uapi/linux/elf.h
95811@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
95812 #define PT_GNU_EH_FRAME 0x6474e550
95813
95814 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
95815+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
95816+
95817+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
95818+
95819+/* Constants for the e_flags field */
95820+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
95821+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
95822+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
95823+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
95824+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
95825+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
95826
95827 /*
95828 * Extended Numbering
95829@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
95830 #define DT_DEBUG 21
95831 #define DT_TEXTREL 22
95832 #define DT_JMPREL 23
95833+#define DT_FLAGS 30
95834+ #define DF_TEXTREL 0x00000004
95835 #define DT_ENCODING 32
95836 #define OLD_DT_LOOS 0x60000000
95837 #define DT_LOOS 0x6000000d
95838@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
95839 #define PF_W 0x2
95840 #define PF_X 0x1
95841
95842+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
95843+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
95844+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
95845+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
95846+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
95847+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
95848+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
95849+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
95850+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
95851+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
95852+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
95853+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
95854+
95855 typedef struct elf32_phdr{
95856 Elf32_Word p_type;
95857 Elf32_Off p_offset;
95858@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
95859 #define EI_OSABI 7
95860 #define EI_PAD 8
95861
95862+#define EI_PAX 14
95863+
95864 #define ELFMAG0 0x7f /* EI_MAG */
95865 #define ELFMAG1 'E'
95866 #define ELFMAG2 'L'
95867diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
95868index aa169c4..6a2771d 100644
95869--- a/include/uapi/linux/personality.h
95870+++ b/include/uapi/linux/personality.h
95871@@ -30,6 +30,7 @@ enum {
95872 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
95873 ADDR_NO_RANDOMIZE | \
95874 ADDR_COMPAT_LAYOUT | \
95875+ ADDR_LIMIT_3GB | \
95876 MMAP_PAGE_ZERO)
95877
95878 /*
95879diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
95880index 7530e74..e714828 100644
95881--- a/include/uapi/linux/screen_info.h
95882+++ b/include/uapi/linux/screen_info.h
95883@@ -43,7 +43,8 @@ struct screen_info {
95884 __u16 pages; /* 0x32 */
95885 __u16 vesa_attributes; /* 0x34 */
95886 __u32 capabilities; /* 0x36 */
95887- __u8 _reserved[6]; /* 0x3a */
95888+ __u16 vesapm_size; /* 0x3a */
95889+ __u8 _reserved[4]; /* 0x3c */
95890 } __attribute__((packed));
95891
95892 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
95893diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
95894index 0e011eb..82681b1 100644
95895--- a/include/uapi/linux/swab.h
95896+++ b/include/uapi/linux/swab.h
95897@@ -43,7 +43,7 @@
95898 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
95899 */
95900
95901-static inline __attribute_const__ __u16 __fswab16(__u16 val)
95902+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
95903 {
95904 #ifdef __HAVE_BUILTIN_BSWAP16__
95905 return __builtin_bswap16(val);
95906@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
95907 #endif
95908 }
95909
95910-static inline __attribute_const__ __u32 __fswab32(__u32 val)
95911+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
95912 {
95913 #ifdef __HAVE_BUILTIN_BSWAP32__
95914 return __builtin_bswap32(val);
95915@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
95916 #endif
95917 }
95918
95919-static inline __attribute_const__ __u64 __fswab64(__u64 val)
95920+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
95921 {
95922 #ifdef __HAVE_BUILTIN_BSWAP64__
95923 return __builtin_bswap64(val);
95924diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
95925index 1590c49..5eab462 100644
95926--- a/include/uapi/linux/xattr.h
95927+++ b/include/uapi/linux/xattr.h
95928@@ -73,5 +73,9 @@
95929 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
95930 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
95931
95932+/* User namespace */
95933+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
95934+#define XATTR_PAX_FLAGS_SUFFIX "flags"
95935+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
95936
95937 #endif /* _UAPI_LINUX_XATTR_H */
95938diff --git a/include/video/udlfb.h b/include/video/udlfb.h
95939index f9466fa..f4e2b81 100644
95940--- a/include/video/udlfb.h
95941+++ b/include/video/udlfb.h
95942@@ -53,10 +53,10 @@ struct dlfb_data {
95943 u32 pseudo_palette[256];
95944 int blank_mode; /*one of FB_BLANK_ */
95945 /* blit-only rendering path metrics, exposed through sysfs */
95946- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
95947- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
95948- atomic_t bytes_sent; /* to usb, after compression including overhead */
95949- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
95950+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
95951+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
95952+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
95953+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
95954 };
95955
95956 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
95957diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
95958index 30f5362..8ed8ac9 100644
95959--- a/include/video/uvesafb.h
95960+++ b/include/video/uvesafb.h
95961@@ -122,6 +122,7 @@ struct uvesafb_par {
95962 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
95963 u8 pmi_setpal; /* PMI for palette changes */
95964 u16 *pmi_base; /* protected mode interface location */
95965+ u8 *pmi_code; /* protected mode code location */
95966 void *pmi_start;
95967 void *pmi_pal;
95968 u8 *vbe_state_orig; /*
95969diff --git a/init/Kconfig b/init/Kconfig
95970index f5dbc6d..8259396 100644
95971--- a/init/Kconfig
95972+++ b/init/Kconfig
95973@@ -1136,6 +1136,7 @@ endif # CGROUPS
95974
95975 config CHECKPOINT_RESTORE
95976 bool "Checkpoint/restore support" if EXPERT
95977+ depends on !GRKERNSEC
95978 default n
95979 help
95980 Enables additional kernel features in a sake of checkpoint/restore.
95981@@ -1646,7 +1647,7 @@ config SLUB_DEBUG
95982
95983 config COMPAT_BRK
95984 bool "Disable heap randomization"
95985- default y
95986+ default n
95987 help
95988 Randomizing heap placement makes heap exploits harder, but it
95989 also breaks ancient binaries (including anything libc5 based).
95990@@ -1977,7 +1978,7 @@ config INIT_ALL_POSSIBLE
95991 config STOP_MACHINE
95992 bool
95993 default y
95994- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
95995+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
95996 help
95997 Need stop_machine() primitive.
95998
95999diff --git a/init/Makefile b/init/Makefile
96000index 7bc47ee..6da2dc7 100644
96001--- a/init/Makefile
96002+++ b/init/Makefile
96003@@ -2,6 +2,9 @@
96004 # Makefile for the linux kernel.
96005 #
96006
96007+ccflags-y := $(GCC_PLUGINS_CFLAGS)
96008+asflags-y := $(GCC_PLUGINS_AFLAGS)
96009+
96010 obj-y := main.o version.o mounts.o
96011 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
96012 obj-y += noinitramfs.o
96013diff --git a/init/do_mounts.c b/init/do_mounts.c
96014index eb41008..f5dbbf9 100644
96015--- a/init/do_mounts.c
96016+++ b/init/do_mounts.c
96017@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
96018 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
96019 {
96020 struct super_block *s;
96021- int err = sys_mount(name, "/root", fs, flags, data);
96022+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
96023 if (err)
96024 return err;
96025
96026- sys_chdir("/root");
96027+ sys_chdir((const char __force_user *)"/root");
96028 s = current->fs->pwd.dentry->d_sb;
96029 ROOT_DEV = s->s_dev;
96030 printk(KERN_INFO
96031@@ -487,18 +487,18 @@ void __init change_floppy(char *fmt, ...)
96032 va_start(args, fmt);
96033 vsprintf(buf, fmt, args);
96034 va_end(args);
96035- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
96036+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
96037 if (fd >= 0) {
96038 sys_ioctl(fd, FDEJECT, 0);
96039 sys_close(fd);
96040 }
96041 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
96042- fd = sys_open("/dev/console", O_RDWR, 0);
96043+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
96044 if (fd >= 0) {
96045 sys_ioctl(fd, TCGETS, (long)&termios);
96046 termios.c_lflag &= ~ICANON;
96047 sys_ioctl(fd, TCSETSF, (long)&termios);
96048- sys_read(fd, &c, 1);
96049+ sys_read(fd, (char __user *)&c, 1);
96050 termios.c_lflag |= ICANON;
96051 sys_ioctl(fd, TCSETSF, (long)&termios);
96052 sys_close(fd);
96053@@ -592,8 +592,8 @@ void __init prepare_namespace(void)
96054 mount_root();
96055 out:
96056 devtmpfs_mount("dev");
96057- sys_mount(".", "/", NULL, MS_MOVE, NULL);
96058- sys_chroot(".");
96059+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
96060+ sys_chroot((const char __force_user *)".");
96061 }
96062
96063 static bool is_tmpfs;
96064diff --git a/init/do_mounts.h b/init/do_mounts.h
96065index f5b978a..69dbfe8 100644
96066--- a/init/do_mounts.h
96067+++ b/init/do_mounts.h
96068@@ -15,15 +15,15 @@ extern int root_mountflags;
96069
96070 static inline int create_dev(char *name, dev_t dev)
96071 {
96072- sys_unlink(name);
96073- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
96074+ sys_unlink((char __force_user *)name);
96075+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
96076 }
96077
96078 #if BITS_PER_LONG == 32
96079 static inline u32 bstat(char *name)
96080 {
96081 struct stat64 stat;
96082- if (sys_stat64(name, &stat) != 0)
96083+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
96084 return 0;
96085 if (!S_ISBLK(stat.st_mode))
96086 return 0;
96087@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
96088 static inline u32 bstat(char *name)
96089 {
96090 struct stat stat;
96091- if (sys_newstat(name, &stat) != 0)
96092+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
96093 return 0;
96094 if (!S_ISBLK(stat.st_mode))
96095 return 0;
96096diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
96097index 3e0878e..8a9d7a0 100644
96098--- a/init/do_mounts_initrd.c
96099+++ b/init/do_mounts_initrd.c
96100@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
96101 {
96102 sys_unshare(CLONE_FS | CLONE_FILES);
96103 /* stdin/stdout/stderr for /linuxrc */
96104- sys_open("/dev/console", O_RDWR, 0);
96105+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
96106 sys_dup(0);
96107 sys_dup(0);
96108 /* move initrd over / and chdir/chroot in initrd root */
96109- sys_chdir("/root");
96110- sys_mount(".", "/", NULL, MS_MOVE, NULL);
96111- sys_chroot(".");
96112+ sys_chdir((const char __force_user *)"/root");
96113+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
96114+ sys_chroot((const char __force_user *)".");
96115 sys_setsid();
96116 return 0;
96117 }
96118@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
96119 create_dev("/dev/root.old", Root_RAM0);
96120 /* mount initrd on rootfs' /root */
96121 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
96122- sys_mkdir("/old", 0700);
96123- sys_chdir("/old");
96124+ sys_mkdir((const char __force_user *)"/old", 0700);
96125+ sys_chdir((const char __force_user *)"/old");
96126
96127 /* try loading default modules from initrd */
96128 load_default_modules();
96129@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
96130 current->flags &= ~PF_FREEZER_SKIP;
96131
96132 /* move initrd to rootfs' /old */
96133- sys_mount("..", ".", NULL, MS_MOVE, NULL);
96134+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
96135 /* switch root and cwd back to / of rootfs */
96136- sys_chroot("..");
96137+ sys_chroot((const char __force_user *)"..");
96138
96139 if (new_decode_dev(real_root_dev) == Root_RAM0) {
96140- sys_chdir("/old");
96141+ sys_chdir((const char __force_user *)"/old");
96142 return;
96143 }
96144
96145- sys_chdir("/");
96146+ sys_chdir((const char __force_user *)"/");
96147 ROOT_DEV = new_decode_dev(real_root_dev);
96148 mount_root();
96149
96150 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
96151- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
96152+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
96153 if (!error)
96154 printk("okay\n");
96155 else {
96156- int fd = sys_open("/dev/root.old", O_RDWR, 0);
96157+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
96158 if (error == -ENOENT)
96159 printk("/initrd does not exist. Ignored.\n");
96160 else
96161 printk("failed\n");
96162 printk(KERN_NOTICE "Unmounting old root\n");
96163- sys_umount("/old", MNT_DETACH);
96164+ sys_umount((char __force_user *)"/old", MNT_DETACH);
96165 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
96166 if (fd < 0) {
96167 error = fd;
96168@@ -127,11 +127,11 @@ int __init initrd_load(void)
96169 * mounted in the normal path.
96170 */
96171 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
96172- sys_unlink("/initrd.image");
96173+ sys_unlink((const char __force_user *)"/initrd.image");
96174 handle_initrd();
96175 return 1;
96176 }
96177 }
96178- sys_unlink("/initrd.image");
96179+ sys_unlink((const char __force_user *)"/initrd.image");
96180 return 0;
96181 }
96182diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
96183index 8cb6db5..d729f50 100644
96184--- a/init/do_mounts_md.c
96185+++ b/init/do_mounts_md.c
96186@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
96187 partitioned ? "_d" : "", minor,
96188 md_setup_args[ent].device_names);
96189
96190- fd = sys_open(name, 0, 0);
96191+ fd = sys_open((char __force_user *)name, 0, 0);
96192 if (fd < 0) {
96193 printk(KERN_ERR "md: open failed - cannot start "
96194 "array %s\n", name);
96195@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
96196 * array without it
96197 */
96198 sys_close(fd);
96199- fd = sys_open(name, 0, 0);
96200+ fd = sys_open((char __force_user *)name, 0, 0);
96201 sys_ioctl(fd, BLKRRPART, 0);
96202 }
96203 sys_close(fd);
96204@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
96205
96206 wait_for_device_probe();
96207
96208- fd = sys_open("/dev/md0", 0, 0);
96209+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
96210 if (fd >= 0) {
96211 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
96212 sys_close(fd);
96213diff --git a/init/init_task.c b/init/init_task.c
96214index ba0a7f36..2bcf1d5 100644
96215--- a/init/init_task.c
96216+++ b/init/init_task.c
96217@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
96218 * Initial thread structure. Alignment of this is handled by a special
96219 * linker map entry.
96220 */
96221+#ifdef CONFIG_X86
96222+union thread_union init_thread_union __init_task_data;
96223+#else
96224 union thread_union init_thread_union __init_task_data =
96225 { INIT_THREAD_INFO(init_task) };
96226+#endif
96227diff --git a/init/initramfs.c b/init/initramfs.c
96228index ad1bd77..dca2c1b 100644
96229--- a/init/initramfs.c
96230+++ b/init/initramfs.c
96231@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
96232
96233 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
96234 while (count) {
96235- ssize_t rv = sys_write(fd, p, count);
96236+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
96237
96238 if (rv < 0) {
96239 if (rv == -EINTR || rv == -EAGAIN)
96240@@ -107,7 +107,7 @@ static void __init free_hash(void)
96241 }
96242 }
96243
96244-static long __init do_utime(char *filename, time_t mtime)
96245+static long __init do_utime(char __force_user *filename, time_t mtime)
96246 {
96247 struct timespec t[2];
96248
96249@@ -142,7 +142,7 @@ static void __init dir_utime(void)
96250 struct dir_entry *de, *tmp;
96251 list_for_each_entry_safe(de, tmp, &dir_list, list) {
96252 list_del(&de->list);
96253- do_utime(de->name, de->mtime);
96254+ do_utime((char __force_user *)de->name, de->mtime);
96255 kfree(de->name);
96256 kfree(de);
96257 }
96258@@ -304,7 +304,7 @@ static int __init maybe_link(void)
96259 if (nlink >= 2) {
96260 char *old = find_link(major, minor, ino, mode, collected);
96261 if (old)
96262- return (sys_link(old, collected) < 0) ? -1 : 1;
96263+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
96264 }
96265 return 0;
96266 }
96267@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
96268 {
96269 struct stat st;
96270
96271- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
96272+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
96273 if (S_ISDIR(st.st_mode))
96274- sys_rmdir(path);
96275+ sys_rmdir((char __force_user *)path);
96276 else
96277- sys_unlink(path);
96278+ sys_unlink((char __force_user *)path);
96279 }
96280 }
96281
96282@@ -338,7 +338,7 @@ static int __init do_name(void)
96283 int openflags = O_WRONLY|O_CREAT;
96284 if (ml != 1)
96285 openflags |= O_TRUNC;
96286- wfd = sys_open(collected, openflags, mode);
96287+ wfd = sys_open((char __force_user *)collected, openflags, mode);
96288
96289 if (wfd >= 0) {
96290 sys_fchown(wfd, uid, gid);
96291@@ -350,17 +350,17 @@ static int __init do_name(void)
96292 }
96293 }
96294 } else if (S_ISDIR(mode)) {
96295- sys_mkdir(collected, mode);
96296- sys_chown(collected, uid, gid);
96297- sys_chmod(collected, mode);
96298+ sys_mkdir((char __force_user *)collected, mode);
96299+ sys_chown((char __force_user *)collected, uid, gid);
96300+ sys_chmod((char __force_user *)collected, mode);
96301 dir_add(collected, mtime);
96302 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
96303 S_ISFIFO(mode) || S_ISSOCK(mode)) {
96304 if (maybe_link() == 0) {
96305- sys_mknod(collected, mode, rdev);
96306- sys_chown(collected, uid, gid);
96307- sys_chmod(collected, mode);
96308- do_utime(collected, mtime);
96309+ sys_mknod((char __force_user *)collected, mode, rdev);
96310+ sys_chown((char __force_user *)collected, uid, gid);
96311+ sys_chmod((char __force_user *)collected, mode);
96312+ do_utime((char __force_user *)collected, mtime);
96313 }
96314 }
96315 return 0;
96316@@ -372,7 +372,7 @@ static int __init do_copy(void)
96317 if (xwrite(wfd, victim, body_len) != body_len)
96318 error("write error");
96319 sys_close(wfd);
96320- do_utime(vcollected, mtime);
96321+ do_utime((char __force_user *)vcollected, mtime);
96322 kfree(vcollected);
96323 eat(body_len);
96324 state = SkipIt;
96325@@ -390,9 +390,9 @@ static int __init do_symlink(void)
96326 {
96327 collected[N_ALIGN(name_len) + body_len] = '\0';
96328 clean_path(collected, 0);
96329- sys_symlink(collected + N_ALIGN(name_len), collected);
96330- sys_lchown(collected, uid, gid);
96331- do_utime(collected, mtime);
96332+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
96333+ sys_lchown((char __force_user *)collected, uid, gid);
96334+ do_utime((char __force_user *)collected, mtime);
96335 state = SkipIt;
96336 next_state = Reset;
96337 return 0;
96338diff --git a/init/main.c b/init/main.c
96339index 6f0f1c5f..a542824 100644
96340--- a/init/main.c
96341+++ b/init/main.c
96342@@ -96,6 +96,8 @@ extern void radix_tree_init(void);
96343 static inline void mark_rodata_ro(void) { }
96344 #endif
96345
96346+extern void grsecurity_init(void);
96347+
96348 /*
96349 * Debug helper: via this flag we know that we are in 'early bootup code'
96350 * where only the boot processor is running with IRQ disabled. This means
96351@@ -157,6 +159,85 @@ static int __init set_reset_devices(char *str)
96352
96353 __setup("reset_devices", set_reset_devices);
96354
96355+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
96356+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
96357+static int __init setup_grsec_proc_gid(char *str)
96358+{
96359+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
96360+ return 1;
96361+}
96362+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
96363+#endif
96364+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
96365+int grsec_enable_sysfs_restrict = 1;
96366+static int __init setup_grsec_sysfs_restrict(char *str)
96367+{
96368+ if (!simple_strtol(str, NULL, 0))
96369+ grsec_enable_sysfs_restrict = 0;
96370+ return 1;
96371+}
96372+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
96373+#endif
96374+
96375+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
96376+unsigned long pax_user_shadow_base __read_only;
96377+EXPORT_SYMBOL(pax_user_shadow_base);
96378+extern char pax_enter_kernel_user[];
96379+extern char pax_exit_kernel_user[];
96380+#endif
96381+
96382+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
96383+static int __init setup_pax_nouderef(char *str)
96384+{
96385+#ifdef CONFIG_X86_32
96386+ unsigned int cpu;
96387+ struct desc_struct *gdt;
96388+
96389+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
96390+ gdt = get_cpu_gdt_table(cpu);
96391+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
96392+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
96393+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
96394+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
96395+ }
96396+ loadsegment(ds, __KERNEL_DS);
96397+ loadsegment(es, __KERNEL_DS);
96398+ loadsegment(ss, __KERNEL_DS);
96399+#else
96400+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
96401+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
96402+ clone_pgd_mask = ~(pgdval_t)0UL;
96403+ pax_user_shadow_base = 0UL;
96404+ setup_clear_cpu_cap(X86_FEATURE_PCID);
96405+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
96406+#endif
96407+
96408+ return 0;
96409+}
96410+early_param("pax_nouderef", setup_pax_nouderef);
96411+
96412+#ifdef CONFIG_X86_64
96413+static int __init setup_pax_weakuderef(char *str)
96414+{
96415+ if (clone_pgd_mask != ~(pgdval_t)0UL)
96416+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
96417+ return 1;
96418+}
96419+__setup("pax_weakuderef", setup_pax_weakuderef);
96420+#endif
96421+#endif
96422+
96423+#ifdef CONFIG_PAX_SOFTMODE
96424+int pax_softmode;
96425+
96426+static int __init setup_pax_softmode(char *str)
96427+{
96428+ get_option(&str, &pax_softmode);
96429+ return 1;
96430+}
96431+__setup("pax_softmode=", setup_pax_softmode);
96432+#endif
96433+
96434 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
96435 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
96436 static const char *panic_later, *panic_param;
96437@@ -722,7 +803,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
96438 struct blacklist_entry *entry;
96439 char *fn_name;
96440
96441- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
96442+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
96443 if (!fn_name)
96444 return false;
96445
96446@@ -774,7 +855,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
96447 {
96448 int count = preempt_count();
96449 int ret;
96450- char msgbuf[64];
96451+ const char *msg1 = "", *msg2 = "";
96452
96453 if (initcall_blacklisted(fn))
96454 return -EPERM;
96455@@ -784,18 +865,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
96456 else
96457 ret = fn();
96458
96459- msgbuf[0] = 0;
96460-
96461 if (preempt_count() != count) {
96462- sprintf(msgbuf, "preemption imbalance ");
96463+ msg1 = " preemption imbalance";
96464 preempt_count_set(count);
96465 }
96466 if (irqs_disabled()) {
96467- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
96468+ msg2 = " disabled interrupts";
96469 local_irq_enable();
96470 }
96471- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
96472+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
96473
96474+ add_latent_entropy();
96475 return ret;
96476 }
96477
96478@@ -901,8 +981,8 @@ static int run_init_process(const char *init_filename)
96479 {
96480 argv_init[0] = init_filename;
96481 return do_execve(getname_kernel(init_filename),
96482- (const char __user *const __user *)argv_init,
96483- (const char __user *const __user *)envp_init);
96484+ (const char __user *const __force_user *)argv_init,
96485+ (const char __user *const __force_user *)envp_init);
96486 }
96487
96488 static int try_to_run_init_process(const char *init_filename)
96489@@ -919,6 +999,10 @@ static int try_to_run_init_process(const char *init_filename)
96490 return ret;
96491 }
96492
96493+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
96494+extern int gr_init_ran;
96495+#endif
96496+
96497 static noinline void __init kernel_init_freeable(void);
96498
96499 static int __ref kernel_init(void *unused)
96500@@ -943,6 +1027,11 @@ static int __ref kernel_init(void *unused)
96501 ramdisk_execute_command, ret);
96502 }
96503
96504+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
96505+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
96506+ gr_init_ran = 1;
96507+#endif
96508+
96509 /*
96510 * We try each of these until one succeeds.
96511 *
96512@@ -998,7 +1087,7 @@ static noinline void __init kernel_init_freeable(void)
96513 do_basic_setup();
96514
96515 /* Open the /dev/console on the rootfs, this should never fail */
96516- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
96517+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
96518 pr_err("Warning: unable to open an initial console.\n");
96519
96520 (void) sys_dup(0);
96521@@ -1011,11 +1100,13 @@ static noinline void __init kernel_init_freeable(void)
96522 if (!ramdisk_execute_command)
96523 ramdisk_execute_command = "/init";
96524
96525- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
96526+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
96527 ramdisk_execute_command = NULL;
96528 prepare_namespace();
96529 }
96530
96531+ grsecurity_init();
96532+
96533 /*
96534 * Ok, we have completed the initial bootup, and
96535 * we're essentially up and running. Get rid of the
96536diff --git a/ipc/compat.c b/ipc/compat.c
96537index 9b3c85f..5266b0f 100644
96538--- a/ipc/compat.c
96539+++ b/ipc/compat.c
96540@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
96541 COMPAT_SHMLBA);
96542 if (err < 0)
96543 return err;
96544- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
96545+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
96546 }
96547 case SHMDT:
96548 return sys_shmdt(compat_ptr(ptr));
96549@@ -747,7 +747,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)
96550 }
96551
96552 COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
96553- unsigned, nsops,
96554+ compat_long_t, nsops,
96555 const struct compat_timespec __user *, timeout)
96556 {
96557 struct timespec __user *ts64;
96558diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
96559index 8ad93c2..efd80f8 100644
96560--- a/ipc/ipc_sysctl.c
96561+++ b/ipc/ipc_sysctl.c
96562@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
96563 static int proc_ipc_dointvec(struct ctl_table *table, int write,
96564 void __user *buffer, size_t *lenp, loff_t *ppos)
96565 {
96566- struct ctl_table ipc_table;
96567+ ctl_table_no_const ipc_table;
96568
96569 memcpy(&ipc_table, table, sizeof(ipc_table));
96570 ipc_table.data = get_ipc(table);
96571@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
96572 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
96573 void __user *buffer, size_t *lenp, loff_t *ppos)
96574 {
96575- struct ctl_table ipc_table;
96576+ ctl_table_no_const ipc_table;
96577
96578 memcpy(&ipc_table, table, sizeof(ipc_table));
96579 ipc_table.data = get_ipc(table);
96580@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
96581 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
96582 void __user *buffer, size_t *lenp, loff_t *ppos)
96583 {
96584- struct ctl_table ipc_table;
96585+ ctl_table_no_const ipc_table;
96586 memcpy(&ipc_table, table, sizeof(ipc_table));
96587 ipc_table.data = get_ipc(table);
96588
96589@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
96590 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
96591 void __user *buffer, size_t *lenp, loff_t *ppos)
96592 {
96593- struct ctl_table ipc_table;
96594+ ctl_table_no_const ipc_table;
96595 int dummy = 0;
96596
96597 memcpy(&ipc_table, table, sizeof(ipc_table));
96598diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
96599index 68d4e95..1477ded 100644
96600--- a/ipc/mq_sysctl.c
96601+++ b/ipc/mq_sysctl.c
96602@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
96603 static int proc_mq_dointvec(struct ctl_table *table, int write,
96604 void __user *buffer, size_t *lenp, loff_t *ppos)
96605 {
96606- struct ctl_table mq_table;
96607+ ctl_table_no_const mq_table;
96608 memcpy(&mq_table, table, sizeof(mq_table));
96609 mq_table.data = get_mq(table);
96610
96611@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
96612 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
96613 void __user *buffer, size_t *lenp, loff_t *ppos)
96614 {
96615- struct ctl_table mq_table;
96616+ ctl_table_no_const mq_table;
96617 memcpy(&mq_table, table, sizeof(mq_table));
96618 mq_table.data = get_mq(table);
96619
96620diff --git a/ipc/mqueue.c b/ipc/mqueue.c
96621index 7635a1c..7432cb6 100644
96622--- a/ipc/mqueue.c
96623+++ b/ipc/mqueue.c
96624@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
96625 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
96626 info->attr.mq_msgsize);
96627
96628+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
96629 spin_lock(&mq_lock);
96630 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
96631 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
96632diff --git a/ipc/sem.c b/ipc/sem.c
96633index 9284211..bca5b1b 100644
96634--- a/ipc/sem.c
96635+++ b/ipc/sem.c
96636@@ -1780,7 +1780,7 @@ static int get_queue_result(struct sem_queue *q)
96637 }
96638
96639 SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
96640- unsigned, nsops, const struct timespec __user *, timeout)
96641+ long, nsops, const struct timespec __user *, timeout)
96642 {
96643 int error = -EINVAL;
96644 struct sem_array *sma;
96645@@ -2015,7 +2015,7 @@ out_free:
96646 }
96647
96648 SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
96649- unsigned, nsops)
96650+ long, nsops)
96651 {
96652 return sys_semtimedop(semid, tsops, nsops, NULL);
96653 }
96654diff --git a/ipc/shm.c b/ipc/shm.c
96655index 19633b4..d454904 100644
96656--- a/ipc/shm.c
96657+++ b/ipc/shm.c
96658@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
96659 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
96660 #endif
96661
96662+#ifdef CONFIG_GRKERNSEC
96663+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
96664+ const u64 shm_createtime, const kuid_t cuid,
96665+ const int shmid);
96666+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
96667+ const u64 shm_createtime);
96668+#endif
96669+
96670 void shm_init_ns(struct ipc_namespace *ns)
96671 {
96672 ns->shm_ctlmax = SHMMAX;
96673@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
96674 shp->shm_lprid = 0;
96675 shp->shm_atim = shp->shm_dtim = 0;
96676 shp->shm_ctim = get_seconds();
96677+#ifdef CONFIG_GRKERNSEC
96678+ shp->shm_createtime = ktime_get_ns();
96679+#endif
96680 shp->shm_segsz = size;
96681 shp->shm_nattch = 0;
96682 shp->shm_file = file;
96683@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96684 f_mode = FMODE_READ | FMODE_WRITE;
96685 }
96686 if (shmflg & SHM_EXEC) {
96687+
96688+#ifdef CONFIG_PAX_MPROTECT
96689+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
96690+ goto out;
96691+#endif
96692+
96693 prot |= PROT_EXEC;
96694 acc_mode |= S_IXUGO;
96695 }
96696@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96697 if (err)
96698 goto out_unlock;
96699
96700+#ifdef CONFIG_GRKERNSEC
96701+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
96702+ shp->shm_perm.cuid, shmid) ||
96703+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
96704+ err = -EACCES;
96705+ goto out_unlock;
96706+ }
96707+#endif
96708+
96709 ipc_lock_object(&shp->shm_perm);
96710
96711 /* check if shm_destroy() is tearing down shp */
96712@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96713 path = shp->shm_file->f_path;
96714 path_get(&path);
96715 shp->shm_nattch++;
96716+#ifdef CONFIG_GRKERNSEC
96717+ shp->shm_lapid = current->pid;
96718+#endif
96719 size = i_size_read(path.dentry->d_inode);
96720 ipc_unlock_object(&shp->shm_perm);
96721 rcu_read_unlock();
96722diff --git a/ipc/util.c b/ipc/util.c
96723index 106bed0..f851429 100644
96724--- a/ipc/util.c
96725+++ b/ipc/util.c
96726@@ -71,6 +71,8 @@ struct ipc_proc_iface {
96727 int (*show)(struct seq_file *, void *);
96728 };
96729
96730+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
96731+
96732 /**
96733 * ipc_init - initialise ipc subsystem
96734 *
96735@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
96736 granted_mode >>= 6;
96737 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
96738 granted_mode >>= 3;
96739+
96740+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
96741+ return -1;
96742+
96743 /* is there some bit set in requested_mode but not in granted_mode? */
96744 if ((requested_mode & ~granted_mode & 0007) &&
96745 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
96746diff --git a/kernel/audit.c b/kernel/audit.c
96747index 72ab759..757deba 100644
96748--- a/kernel/audit.c
96749+++ b/kernel/audit.c
96750@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
96751 3) suppressed due to audit_rate_limit
96752 4) suppressed due to audit_backlog_limit
96753 */
96754-static atomic_t audit_lost = ATOMIC_INIT(0);
96755+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
96756
96757 /* The netlink socket. */
96758 static struct sock *audit_sock;
96759@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
96760 unsigned long now;
96761 int print;
96762
96763- atomic_inc(&audit_lost);
96764+ atomic_inc_unchecked(&audit_lost);
96765
96766 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
96767
96768@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
96769 if (print) {
96770 if (printk_ratelimit())
96771 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
96772- atomic_read(&audit_lost),
96773+ atomic_read_unchecked(&audit_lost),
96774 audit_rate_limit,
96775 audit_backlog_limit);
96776 audit_panic(message);
96777@@ -831,7 +831,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
96778 s.pid = audit_pid;
96779 s.rate_limit = audit_rate_limit;
96780 s.backlog_limit = audit_backlog_limit;
96781- s.lost = atomic_read(&audit_lost);
96782+ s.lost = atomic_read_unchecked(&audit_lost);
96783 s.backlog = skb_queue_len(&audit_skb_queue);
96784 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
96785 s.backlog_wait_time = audit_backlog_wait_time;
96786diff --git a/kernel/auditsc.c b/kernel/auditsc.c
96787index dc4ae70..2a2bddc 100644
96788--- a/kernel/auditsc.c
96789+++ b/kernel/auditsc.c
96790@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
96791 }
96792
96793 /* global counter which is incremented every time something logs in */
96794-static atomic_t session_id = ATOMIC_INIT(0);
96795+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
96796
96797 static int audit_set_loginuid_perm(kuid_t loginuid)
96798 {
96799@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
96800
96801 /* are we setting or clearing? */
96802 if (uid_valid(loginuid))
96803- sessionid = (unsigned int)atomic_inc_return(&session_id);
96804+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
96805
96806 task->sessionid = sessionid;
96807 task->loginuid = loginuid;
96808diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
96809index 0c5796e..a9414e2 100644
96810--- a/kernel/bpf/core.c
96811+++ b/kernel/bpf/core.c
96812@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
96813 * random section of illegal instructions.
96814 */
96815 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
96816- hdr = module_alloc(size);
96817+ hdr = module_alloc_exec(size);
96818 if (hdr == NULL)
96819 return NULL;
96820
96821 /* Fill space with illegal/arch-dep instructions. */
96822 bpf_fill_ill_insns(hdr, size);
96823
96824+ pax_open_kernel();
96825 hdr->pages = size / PAGE_SIZE;
96826+ pax_close_kernel();
96827+
96828 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
96829 PAGE_SIZE - sizeof(*hdr));
96830 start = (prandom_u32() % hole) & ~(alignment - 1);
96831@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
96832
96833 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
96834 {
96835- module_memfree(hdr);
96836+ module_memfree_exec(hdr);
96837 }
96838 #endif /* CONFIG_BPF_JIT */
96839
96840diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
96841index 536edc2..d28c85d 100644
96842--- a/kernel/bpf/syscall.c
96843+++ b/kernel/bpf/syscall.c
96844@@ -548,11 +548,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
96845 int err;
96846
96847 /* the syscall is limited to root temporarily. This restriction will be
96848- * lifted when security audit is clean. Note that eBPF+tracing must have
96849- * this restriction, since it may pass kernel data to user space
96850+ * lifted by upstream when a half-assed security audit is clean. Note
96851+ * that eBPF+tracing must have this restriction, since it may pass
96852+ * kernel data to user space
96853 */
96854 if (!capable(CAP_SYS_ADMIN))
96855 return -EPERM;
96856+#ifdef CONFIG_GRKERNSEC
96857+ return -EPERM;
96858+#endif
96859
96860 if (!access_ok(VERIFY_READ, uattr, 1))
96861 return -EFAULT;
96862diff --git a/kernel/capability.c b/kernel/capability.c
96863index 989f5bf..d317ca0 100644
96864--- a/kernel/capability.c
96865+++ b/kernel/capability.c
96866@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
96867 * before modification is attempted and the application
96868 * fails.
96869 */
96870+ if (tocopy > ARRAY_SIZE(kdata))
96871+ return -EFAULT;
96872+
96873 if (copy_to_user(dataptr, kdata, tocopy
96874 * sizeof(struct __user_cap_data_struct))) {
96875 return -EFAULT;
96876@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
96877 int ret;
96878
96879 rcu_read_lock();
96880- ret = security_capable(__task_cred(t), ns, cap);
96881+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
96882+ gr_task_is_capable(t, __task_cred(t), cap);
96883 rcu_read_unlock();
96884
96885- return (ret == 0);
96886+ return ret;
96887 }
96888
96889 /**
96890@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
96891 int ret;
96892
96893 rcu_read_lock();
96894- ret = security_capable_noaudit(__task_cred(t), ns, cap);
96895+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
96896 rcu_read_unlock();
96897
96898- return (ret == 0);
96899+ return ret;
96900 }
96901
96902 /**
96903@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
96904 BUG();
96905 }
96906
96907- if (security_capable(current_cred(), ns, cap) == 0) {
96908+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
96909 current->flags |= PF_SUPERPRIV;
96910 return true;
96911 }
96912@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
96913 }
96914 EXPORT_SYMBOL(ns_capable);
96915
96916+bool ns_capable_nolog(struct user_namespace *ns, int cap)
96917+{
96918+ if (unlikely(!cap_valid(cap))) {
96919+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
96920+ BUG();
96921+ }
96922+
96923+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
96924+ current->flags |= PF_SUPERPRIV;
96925+ return true;
96926+ }
96927+ return false;
96928+}
96929+EXPORT_SYMBOL(ns_capable_nolog);
96930+
96931 /**
96932 * file_ns_capable - Determine if the file's opener had a capability in effect
96933 * @file: The file we want to check
96934@@ -427,6 +446,12 @@ bool capable(int cap)
96935 }
96936 EXPORT_SYMBOL(capable);
96937
96938+bool capable_nolog(int cap)
96939+{
96940+ return ns_capable_nolog(&init_user_ns, cap);
96941+}
96942+EXPORT_SYMBOL(capable_nolog);
96943+
96944 /**
96945 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
96946 * @inode: The inode in question
96947@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
96948 kgid_has_mapping(ns, inode->i_gid);
96949 }
96950 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
96951+
96952+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
96953+{
96954+ struct user_namespace *ns = current_user_ns();
96955+
96956+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
96957+ kgid_has_mapping(ns, inode->i_gid);
96958+}
96959+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
96960diff --git a/kernel/cgroup.c b/kernel/cgroup.c
96961index 29a7b2c..a64e30a 100644
96962--- a/kernel/cgroup.c
96963+++ b/kernel/cgroup.c
96964@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
96965 if (!pathbuf || !agentbuf)
96966 goto out;
96967
96968+ if (agentbuf[0] == '\0')
96969+ goto out;
96970+
96971 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
96972 if (!path)
96973 goto out;
96974@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
96975 struct task_struct *task;
96976 int count = 0;
96977
96978- seq_printf(seq, "css_set %p\n", cset);
96979+ seq_printf(seq, "css_set %pK\n", cset);
96980
96981 list_for_each_entry(task, &cset->tasks, cg_list) {
96982 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
96983diff --git a/kernel/compat.c b/kernel/compat.c
96984index 24f0061..762ec00 100644
96985--- a/kernel/compat.c
96986+++ b/kernel/compat.c
96987@@ -13,6 +13,7 @@
96988
96989 #include <linux/linkage.h>
96990 #include <linux/compat.h>
96991+#include <linux/module.h>
96992 #include <linux/errno.h>
96993 #include <linux/time.h>
96994 #include <linux/signal.h>
96995@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
96996 mm_segment_t oldfs;
96997 long ret;
96998
96999- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
97000+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
97001 oldfs = get_fs();
97002 set_fs(KERNEL_DS);
97003 ret = hrtimer_nanosleep_restart(restart);
97004@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
97005 oldfs = get_fs();
97006 set_fs(KERNEL_DS);
97007 ret = hrtimer_nanosleep(&tu,
97008- rmtp ? (struct timespec __user *)&rmt : NULL,
97009+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
97010 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
97011 set_fs(oldfs);
97012
97013@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
97014 mm_segment_t old_fs = get_fs();
97015
97016 set_fs(KERNEL_DS);
97017- ret = sys_sigpending((old_sigset_t __user *) &s);
97018+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
97019 set_fs(old_fs);
97020 if (ret == 0)
97021 ret = put_user(s, set);
97022@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
97023 mm_segment_t old_fs = get_fs();
97024
97025 set_fs(KERNEL_DS);
97026- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
97027+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
97028 set_fs(old_fs);
97029
97030 if (!ret) {
97031@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
97032 set_fs (KERNEL_DS);
97033 ret = sys_wait4(pid,
97034 (stat_addr ?
97035- (unsigned int __user *) &status : NULL),
97036- options, (struct rusage __user *) &r);
97037+ (unsigned int __force_user *) &status : NULL),
97038+ options, (struct rusage __force_user *) &r);
97039 set_fs (old_fs);
97040
97041 if (ret > 0) {
97042@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
97043 memset(&info, 0, sizeof(info));
97044
97045 set_fs(KERNEL_DS);
97046- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
97047- uru ? (struct rusage __user *)&ru : NULL);
97048+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
97049+ uru ? (struct rusage __force_user *)&ru : NULL);
97050 set_fs(old_fs);
97051
97052 if ((ret < 0) || (info.si_signo == 0))
97053@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
97054 oldfs = get_fs();
97055 set_fs(KERNEL_DS);
97056 err = sys_timer_settime(timer_id, flags,
97057- (struct itimerspec __user *) &newts,
97058- (struct itimerspec __user *) &oldts);
97059+ (struct itimerspec __force_user *) &newts,
97060+ (struct itimerspec __force_user *) &oldts);
97061 set_fs(oldfs);
97062 if (!err && old && put_compat_itimerspec(old, &oldts))
97063 return -EFAULT;
97064@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
97065 oldfs = get_fs();
97066 set_fs(KERNEL_DS);
97067 err = sys_timer_gettime(timer_id,
97068- (struct itimerspec __user *) &ts);
97069+ (struct itimerspec __force_user *) &ts);
97070 set_fs(oldfs);
97071 if (!err && put_compat_itimerspec(setting, &ts))
97072 return -EFAULT;
97073@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
97074 oldfs = get_fs();
97075 set_fs(KERNEL_DS);
97076 err = sys_clock_settime(which_clock,
97077- (struct timespec __user *) &ts);
97078+ (struct timespec __force_user *) &ts);
97079 set_fs(oldfs);
97080 return err;
97081 }
97082@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
97083 oldfs = get_fs();
97084 set_fs(KERNEL_DS);
97085 err = sys_clock_gettime(which_clock,
97086- (struct timespec __user *) &ts);
97087+ (struct timespec __force_user *) &ts);
97088 set_fs(oldfs);
97089 if (!err && compat_put_timespec(&ts, tp))
97090 return -EFAULT;
97091@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
97092
97093 oldfs = get_fs();
97094 set_fs(KERNEL_DS);
97095- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
97096+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
97097 set_fs(oldfs);
97098
97099 err = compat_put_timex(utp, &txc);
97100@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
97101 oldfs = get_fs();
97102 set_fs(KERNEL_DS);
97103 err = sys_clock_getres(which_clock,
97104- (struct timespec __user *) &ts);
97105+ (struct timespec __force_user *) &ts);
97106 set_fs(oldfs);
97107 if (!err && tp && compat_put_timespec(&ts, tp))
97108 return -EFAULT;
97109@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
97110 struct timespec tu;
97111 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
97112
97113- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
97114+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
97115 oldfs = get_fs();
97116 set_fs(KERNEL_DS);
97117 err = clock_nanosleep_restart(restart);
97118@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
97119 oldfs = get_fs();
97120 set_fs(KERNEL_DS);
97121 err = sys_clock_nanosleep(which_clock, flags,
97122- (struct timespec __user *) &in,
97123- (struct timespec __user *) &out);
97124+ (struct timespec __force_user *) &in,
97125+ (struct timespec __force_user *) &out);
97126 set_fs(oldfs);
97127
97128 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
97129@@ -912,7 +913,8 @@ long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask,
97130 * bitmap. We must however ensure the end of the
97131 * kernel bitmap is zeroed.
97132 */
97133- if (nr_compat_longs-- > 0) {
97134+ if (nr_compat_longs) {
97135+ nr_compat_longs--;
97136 if (__get_user(um, umask))
97137 return -EFAULT;
97138 } else {
97139@@ -954,7 +956,8 @@ long compat_put_bitmap(compat_ulong_t __user *umask, unsigned long *mask,
97140 * We dont want to write past the end of the userspace
97141 * bitmap.
97142 */
97143- if (nr_compat_longs-- > 0) {
97144+ if (nr_compat_longs) {
97145+ nr_compat_longs--;
97146 if (__put_user(um, umask))
97147 return -EFAULT;
97148 }
97149@@ -1145,7 +1148,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
97150 mm_segment_t old_fs = get_fs();
97151
97152 set_fs(KERNEL_DS);
97153- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
97154+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
97155 set_fs(old_fs);
97156 if (compat_put_timespec(&t, interval))
97157 return -EFAULT;
97158diff --git a/kernel/configs.c b/kernel/configs.c
97159index c18b1f1..b9a0132 100644
97160--- a/kernel/configs.c
97161+++ b/kernel/configs.c
97162@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
97163 struct proc_dir_entry *entry;
97164
97165 /* create the current config file */
97166+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
97167+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
97168+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
97169+ &ikconfig_file_ops);
97170+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
97171+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
97172+ &ikconfig_file_ops);
97173+#endif
97174+#else
97175 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
97176 &ikconfig_file_ops);
97177+#endif
97178+
97179 if (!entry)
97180 return -ENOMEM;
97181
97182diff --git a/kernel/cred.c b/kernel/cred.c
97183index e0573a4..26c0fd3 100644
97184--- a/kernel/cred.c
97185+++ b/kernel/cred.c
97186@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
97187 validate_creds(cred);
97188 alter_cred_subscribers(cred, -1);
97189 put_cred(cred);
97190+
97191+#ifdef CONFIG_GRKERNSEC_SETXID
97192+ cred = (struct cred *) tsk->delayed_cred;
97193+ if (cred != NULL) {
97194+ tsk->delayed_cred = NULL;
97195+ validate_creds(cred);
97196+ alter_cred_subscribers(cred, -1);
97197+ put_cred(cred);
97198+ }
97199+#endif
97200 }
97201
97202 /**
97203@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
97204 * Always returns 0 thus allowing this function to be tail-called at the end
97205 * of, say, sys_setgid().
97206 */
97207-int commit_creds(struct cred *new)
97208+static int __commit_creds(struct cred *new)
97209 {
97210 struct task_struct *task = current;
97211 const struct cred *old = task->real_cred;
97212@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
97213
97214 get_cred(new); /* we will require a ref for the subj creds too */
97215
97216+ gr_set_role_label(task, new->uid, new->gid);
97217+
97218 /* dumpability changes */
97219 if (!uid_eq(old->euid, new->euid) ||
97220 !gid_eq(old->egid, new->egid) ||
97221@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
97222 put_cred(old);
97223 return 0;
97224 }
97225+#ifdef CONFIG_GRKERNSEC_SETXID
97226+extern int set_user(struct cred *new);
97227+
97228+void gr_delayed_cred_worker(void)
97229+{
97230+ const struct cred *new = current->delayed_cred;
97231+ struct cred *ncred;
97232+
97233+ current->delayed_cred = NULL;
97234+
97235+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
97236+ // from doing get_cred on it when queueing this
97237+ put_cred(new);
97238+ return;
97239+ } else if (new == NULL)
97240+ return;
97241+
97242+ ncred = prepare_creds();
97243+ if (!ncred)
97244+ goto die;
97245+ // uids
97246+ ncred->uid = new->uid;
97247+ ncred->euid = new->euid;
97248+ ncred->suid = new->suid;
97249+ ncred->fsuid = new->fsuid;
97250+ // gids
97251+ ncred->gid = new->gid;
97252+ ncred->egid = new->egid;
97253+ ncred->sgid = new->sgid;
97254+ ncred->fsgid = new->fsgid;
97255+ // groups
97256+ set_groups(ncred, new->group_info);
97257+ // caps
97258+ ncred->securebits = new->securebits;
97259+ ncred->cap_inheritable = new->cap_inheritable;
97260+ ncred->cap_permitted = new->cap_permitted;
97261+ ncred->cap_effective = new->cap_effective;
97262+ ncred->cap_bset = new->cap_bset;
97263+
97264+ if (set_user(ncred)) {
97265+ abort_creds(ncred);
97266+ goto die;
97267+ }
97268+
97269+ // from doing get_cred on it when queueing this
97270+ put_cred(new);
97271+
97272+ __commit_creds(ncred);
97273+ return;
97274+die:
97275+ // from doing get_cred on it when queueing this
97276+ put_cred(new);
97277+ do_group_exit(SIGKILL);
97278+}
97279+#endif
97280+
97281+int commit_creds(struct cred *new)
97282+{
97283+#ifdef CONFIG_GRKERNSEC_SETXID
97284+ int ret;
97285+ int schedule_it = 0;
97286+ struct task_struct *t;
97287+ unsigned oldsecurebits = current_cred()->securebits;
97288+
97289+ /* we won't get called with tasklist_lock held for writing
97290+ and interrupts disabled as the cred struct in that case is
97291+ init_cred
97292+ */
97293+ if (grsec_enable_setxid && !current_is_single_threaded() &&
97294+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
97295+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
97296+ schedule_it = 1;
97297+ }
97298+ ret = __commit_creds(new);
97299+ if (schedule_it) {
97300+ rcu_read_lock();
97301+ read_lock(&tasklist_lock);
97302+ for (t = next_thread(current); t != current;
97303+ t = next_thread(t)) {
97304+ /* we'll check if the thread has uid 0 in
97305+ * the delayed worker routine
97306+ */
97307+ if (task_securebits(t) == oldsecurebits &&
97308+ t->delayed_cred == NULL) {
97309+ t->delayed_cred = get_cred(new);
97310+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
97311+ set_tsk_need_resched(t);
97312+ }
97313+ }
97314+ read_unlock(&tasklist_lock);
97315+ rcu_read_unlock();
97316+ }
97317+
97318+ return ret;
97319+#else
97320+ return __commit_creds(new);
97321+#endif
97322+}
97323+
97324 EXPORT_SYMBOL(commit_creds);
97325
97326 /**
97327diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
97328index 0874e2e..5b32cc9 100644
97329--- a/kernel/debug/debug_core.c
97330+++ b/kernel/debug/debug_core.c
97331@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
97332 */
97333 static atomic_t masters_in_kgdb;
97334 static atomic_t slaves_in_kgdb;
97335-static atomic_t kgdb_break_tasklet_var;
97336+static atomic_unchecked_t kgdb_break_tasklet_var;
97337 atomic_t kgdb_setting_breakpoint;
97338
97339 struct task_struct *kgdb_usethread;
97340@@ -137,7 +137,7 @@ int kgdb_single_step;
97341 static pid_t kgdb_sstep_pid;
97342
97343 /* to keep track of the CPU which is doing the single stepping*/
97344-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
97345+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
97346
97347 /*
97348 * If you are debugging a problem where roundup (the collection of
97349@@ -552,7 +552,7 @@ return_normal:
97350 * kernel will only try for the value of sstep_tries before
97351 * giving up and continuing on.
97352 */
97353- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
97354+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
97355 (kgdb_info[cpu].task &&
97356 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
97357 atomic_set(&kgdb_active, -1);
97358@@ -654,8 +654,8 @@ cpu_master_loop:
97359 }
97360
97361 kgdb_restore:
97362- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
97363- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
97364+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
97365+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
97366 if (kgdb_info[sstep_cpu].task)
97367 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
97368 else
97369@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
97370 static void kgdb_tasklet_bpt(unsigned long ing)
97371 {
97372 kgdb_breakpoint();
97373- atomic_set(&kgdb_break_tasklet_var, 0);
97374+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
97375 }
97376
97377 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
97378
97379 void kgdb_schedule_breakpoint(void)
97380 {
97381- if (atomic_read(&kgdb_break_tasklet_var) ||
97382+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
97383 atomic_read(&kgdb_active) != -1 ||
97384 atomic_read(&kgdb_setting_breakpoint))
97385 return;
97386- atomic_inc(&kgdb_break_tasklet_var);
97387+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
97388 tasklet_schedule(&kgdb_tasklet_breakpoint);
97389 }
97390 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
97391diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
97392index 41213454..861e178 100644
97393--- a/kernel/debug/kdb/kdb_main.c
97394+++ b/kernel/debug/kdb/kdb_main.c
97395@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
97396 continue;
97397
97398 kdb_printf("%-20s%8u 0x%p ", mod->name,
97399- mod->core_size, (void *)mod);
97400+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
97401 #ifdef CONFIG_MODULE_UNLOAD
97402 kdb_printf("%4d ", module_refcount(mod));
97403 #endif
97404@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
97405 kdb_printf(" (Loading)");
97406 else
97407 kdb_printf(" (Live)");
97408- kdb_printf(" 0x%p", mod->module_core);
97409+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
97410
97411 #ifdef CONFIG_MODULE_UNLOAD
97412 {
97413diff --git a/kernel/events/core.c b/kernel/events/core.c
97414index 2fabc06..79cceec 100644
97415--- a/kernel/events/core.c
97416+++ b/kernel/events/core.c
97417@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
97418 * 0 - disallow raw tracepoint access for unpriv
97419 * 1 - disallow cpu events for unpriv
97420 * 2 - disallow kernel profiling for unpriv
97421+ * 3 - disallow all unpriv perf event use
97422 */
97423-int sysctl_perf_event_paranoid __read_mostly = 1;
97424+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
97425+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
97426+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
97427+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
97428+#else
97429+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
97430+#endif
97431
97432 /* Minimum for 512 kiB + 1 user control page */
97433 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
97434@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
97435
97436 tmp *= sysctl_perf_cpu_time_max_percent;
97437 do_div(tmp, 100);
97438- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
97439+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
97440 }
97441
97442 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
97443@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
97444 }
97445 }
97446
97447-static atomic64_t perf_event_id;
97448+static atomic64_unchecked_t perf_event_id;
97449
97450 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
97451 enum event_type_t event_type);
97452@@ -3220,7 +3227,7 @@ static void __perf_event_read(void *info)
97453
97454 static inline u64 perf_event_count(struct perf_event *event)
97455 {
97456- return local64_read(&event->count) + atomic64_read(&event->child_count);
97457+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
97458 }
97459
97460 static u64 perf_event_read(struct perf_event *event)
97461@@ -3656,9 +3663,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
97462 mutex_lock(&event->child_mutex);
97463 total += perf_event_read(event);
97464 *enabled += event->total_time_enabled +
97465- atomic64_read(&event->child_total_time_enabled);
97466+ atomic64_read_unchecked(&event->child_total_time_enabled);
97467 *running += event->total_time_running +
97468- atomic64_read(&event->child_total_time_running);
97469+ atomic64_read_unchecked(&event->child_total_time_running);
97470
97471 list_for_each_entry(child, &event->child_list, child_list) {
97472 total += perf_event_read(child);
97473@@ -4147,10 +4154,10 @@ void perf_event_update_userpage(struct perf_event *event)
97474 userpg->offset -= local64_read(&event->hw.prev_count);
97475
97476 userpg->time_enabled = enabled +
97477- atomic64_read(&event->child_total_time_enabled);
97478+ atomic64_read_unchecked(&event->child_total_time_enabled);
97479
97480 userpg->time_running = running +
97481- atomic64_read(&event->child_total_time_running);
97482+ atomic64_read_unchecked(&event->child_total_time_running);
97483
97484 arch_perf_update_userpage(event, userpg, now);
97485
97486@@ -4740,7 +4747,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
97487
97488 /* Data. */
97489 sp = perf_user_stack_pointer(regs);
97490- rem = __output_copy_user(handle, (void *) sp, dump_size);
97491+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
97492 dyn_size = dump_size - rem;
97493
97494 perf_output_skip(handle, rem);
97495@@ -4831,11 +4838,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
97496 values[n++] = perf_event_count(event);
97497 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
97498 values[n++] = enabled +
97499- atomic64_read(&event->child_total_time_enabled);
97500+ atomic64_read_unchecked(&event->child_total_time_enabled);
97501 }
97502 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
97503 values[n++] = running +
97504- atomic64_read(&event->child_total_time_running);
97505+ atomic64_read_unchecked(&event->child_total_time_running);
97506 }
97507 if (read_format & PERF_FORMAT_ID)
97508 values[n++] = primary_event_id(event);
97509@@ -7180,7 +7187,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
97510 event->parent = parent_event;
97511
97512 event->ns = get_pid_ns(task_active_pid_ns(current));
97513- event->id = atomic64_inc_return(&perf_event_id);
97514+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
97515
97516 event->state = PERF_EVENT_STATE_INACTIVE;
97517
97518@@ -7470,6 +7477,11 @@ SYSCALL_DEFINE5(perf_event_open,
97519 if (flags & ~PERF_FLAG_ALL)
97520 return -EINVAL;
97521
97522+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
97523+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
97524+ return -EACCES;
97525+#endif
97526+
97527 err = perf_copy_attr(attr_uptr, &attr);
97528 if (err)
97529 return err;
97530@@ -7892,10 +7904,10 @@ static void sync_child_event(struct perf_event *child_event,
97531 /*
97532 * Add back the child's count to the parent's count:
97533 */
97534- atomic64_add(child_val, &parent_event->child_count);
97535- atomic64_add(child_event->total_time_enabled,
97536+ atomic64_add_unchecked(child_val, &parent_event->child_count);
97537+ atomic64_add_unchecked(child_event->total_time_enabled,
97538 &parent_event->child_total_time_enabled);
97539- atomic64_add(child_event->total_time_running,
97540+ atomic64_add_unchecked(child_event->total_time_running,
97541 &parent_event->child_total_time_running);
97542
97543 /*
97544diff --git a/kernel/events/internal.h b/kernel/events/internal.h
97545index 569b2187..19940d9 100644
97546--- a/kernel/events/internal.h
97547+++ b/kernel/events/internal.h
97548@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
97549 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
97550 }
97551
97552-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
97553+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
97554 static inline unsigned long \
97555 func_name(struct perf_output_handle *handle, \
97556- const void *buf, unsigned long len) \
97557+ const void user *buf, unsigned long len) \
97558 { \
97559 unsigned long size, written; \
97560 \
97561@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
97562 return 0;
97563 }
97564
97565-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
97566+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
97567
97568 static inline unsigned long
97569 memcpy_skip(void *dst, const void *src, unsigned long n)
97570@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
97571 return 0;
97572 }
97573
97574-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
97575+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
97576
97577 #ifndef arch_perf_out_copy_user
97578 #define arch_perf_out_copy_user arch_perf_out_copy_user
97579@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
97580 }
97581 #endif
97582
97583-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
97584+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
97585
97586 /* Callchain handling */
97587 extern struct perf_callchain_entry *
97588diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
97589index cb346f2..e4dc317 100644
97590--- a/kernel/events/uprobes.c
97591+++ b/kernel/events/uprobes.c
97592@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
97593 {
97594 struct page *page;
97595 uprobe_opcode_t opcode;
97596- int result;
97597+ long result;
97598
97599 pagefault_disable();
97600 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
97601diff --git a/kernel/exit.c b/kernel/exit.c
97602index feff10b..f623dd5 100644
97603--- a/kernel/exit.c
97604+++ b/kernel/exit.c
97605@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
97606 struct task_struct *leader;
97607 int zap_leader;
97608 repeat:
97609+#ifdef CONFIG_NET
97610+ gr_del_task_from_ip_table(p);
97611+#endif
97612+
97613 /* don't need to get the RCU readlock here - the process is dead and
97614 * can't be modifying its own credentials. But shut RCU-lockdep up */
97615 rcu_read_lock();
97616@@ -656,6 +660,8 @@ void do_exit(long code)
97617 int group_dead;
97618 TASKS_RCU(int tasks_rcu_i);
97619
97620+ set_fs(USER_DS);
97621+
97622 profile_task_exit(tsk);
97623
97624 WARN_ON(blk_needs_flush_plug(tsk));
97625@@ -672,7 +678,6 @@ void do_exit(long code)
97626 * mm_release()->clear_child_tid() from writing to a user-controlled
97627 * kernel address.
97628 */
97629- set_fs(USER_DS);
97630
97631 ptrace_event(PTRACE_EVENT_EXIT, code);
97632
97633@@ -730,6 +735,9 @@ void do_exit(long code)
97634 tsk->exit_code = code;
97635 taskstats_exit(tsk, group_dead);
97636
97637+ gr_acl_handle_psacct(tsk, code);
97638+ gr_acl_handle_exit();
97639+
97640 exit_mm(tsk);
97641
97642 if (group_dead)
97643@@ -849,7 +857,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
97644 * Take down every thread in the group. This is called by fatal signals
97645 * as well as by sys_exit_group (below).
97646 */
97647-void
97648+__noreturn void
97649 do_group_exit(int exit_code)
97650 {
97651 struct signal_struct *sig = current->signal;
97652diff --git a/kernel/fork.c b/kernel/fork.c
97653index cf65139..704476e 100644
97654--- a/kernel/fork.c
97655+++ b/kernel/fork.c
97656@@ -177,12 +177,54 @@ static void free_thread_info(struct thread_info *ti)
97657 void thread_info_cache_init(void)
97658 {
97659 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
97660- THREAD_SIZE, 0, NULL);
97661+ THREAD_SIZE, SLAB_USERCOPY, NULL);
97662 BUG_ON(thread_info_cache == NULL);
97663 }
97664 # endif
97665 #endif
97666
97667+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97668+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
97669+ int node, void **lowmem_stack)
97670+{
97671+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
97672+ void *ret = NULL;
97673+ unsigned int i;
97674+
97675+ *lowmem_stack = alloc_thread_info_node(tsk, node);
97676+ if (*lowmem_stack == NULL)
97677+ goto out;
97678+
97679+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
97680+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
97681+
97682+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
97683+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
97684+ if (ret == NULL) {
97685+ free_thread_info(*lowmem_stack);
97686+ *lowmem_stack = NULL;
97687+ }
97688+
97689+out:
97690+ return ret;
97691+}
97692+
97693+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
97694+{
97695+ unmap_process_stacks(tsk);
97696+}
97697+#else
97698+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
97699+ int node, void **lowmem_stack)
97700+{
97701+ return alloc_thread_info_node(tsk, node);
97702+}
97703+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
97704+{
97705+ free_thread_info(ti);
97706+}
97707+#endif
97708+
97709 /* SLAB cache for signal_struct structures (tsk->signal) */
97710 static struct kmem_cache *signal_cachep;
97711
97712@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
97713 /* SLAB cache for mm_struct structures (tsk->mm) */
97714 static struct kmem_cache *mm_cachep;
97715
97716-static void account_kernel_stack(struct thread_info *ti, int account)
97717+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
97718 {
97719+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97720+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
97721+#else
97722 struct zone *zone = page_zone(virt_to_page(ti));
97723+#endif
97724
97725 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
97726 }
97727
97728 void free_task(struct task_struct *tsk)
97729 {
97730- account_kernel_stack(tsk->stack, -1);
97731+ account_kernel_stack(tsk, tsk->stack, -1);
97732 arch_release_thread_info(tsk->stack);
97733- free_thread_info(tsk->stack);
97734+ gr_free_thread_info(tsk, tsk->stack);
97735 rt_mutex_debug_task_free(tsk);
97736 ftrace_graph_exit_task(tsk);
97737 put_seccomp_filter(tsk);
97738@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97739 {
97740 struct task_struct *tsk;
97741 struct thread_info *ti;
97742+ void *lowmem_stack;
97743 int node = tsk_fork_get_node(orig);
97744 int err;
97745
97746@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97747 if (!tsk)
97748 return NULL;
97749
97750- ti = alloc_thread_info_node(tsk, node);
97751+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
97752 if (!ti)
97753 goto free_tsk;
97754
97755@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97756 goto free_ti;
97757
97758 tsk->stack = ti;
97759+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97760+ tsk->lowmem_stack = lowmem_stack;
97761+#endif
97762 #ifdef CONFIG_SECCOMP
97763 /*
97764 * We must handle setting up seccomp filters once we're under
97765@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97766 set_task_stack_end_magic(tsk);
97767
97768 #ifdef CONFIG_CC_STACKPROTECTOR
97769- tsk->stack_canary = get_random_int();
97770+ tsk->stack_canary = pax_get_random_long();
97771 #endif
97772
97773 /*
97774@@ -352,24 +402,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97775 tsk->splice_pipe = NULL;
97776 tsk->task_frag.page = NULL;
97777
97778- account_kernel_stack(ti, 1);
97779+ account_kernel_stack(tsk, ti, 1);
97780
97781 return tsk;
97782
97783 free_ti:
97784- free_thread_info(ti);
97785+ gr_free_thread_info(tsk, ti);
97786 free_tsk:
97787 free_task_struct(tsk);
97788 return NULL;
97789 }
97790
97791 #ifdef CONFIG_MMU
97792-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97793+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
97794+{
97795+ struct vm_area_struct *tmp;
97796+ unsigned long charge;
97797+ struct file *file;
97798+ int retval;
97799+
97800+ charge = 0;
97801+ if (mpnt->vm_flags & VM_ACCOUNT) {
97802+ unsigned long len = vma_pages(mpnt);
97803+
97804+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
97805+ goto fail_nomem;
97806+ charge = len;
97807+ }
97808+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97809+ if (!tmp)
97810+ goto fail_nomem;
97811+ *tmp = *mpnt;
97812+ tmp->vm_mm = mm;
97813+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
97814+ retval = vma_dup_policy(mpnt, tmp);
97815+ if (retval)
97816+ goto fail_nomem_policy;
97817+ if (anon_vma_fork(tmp, mpnt))
97818+ goto fail_nomem_anon_vma_fork;
97819+ tmp->vm_flags &= ~VM_LOCKED;
97820+ tmp->vm_next = tmp->vm_prev = NULL;
97821+ tmp->vm_mirror = NULL;
97822+ file = tmp->vm_file;
97823+ if (file) {
97824+ struct inode *inode = file_inode(file);
97825+ struct address_space *mapping = file->f_mapping;
97826+
97827+ get_file(file);
97828+ if (tmp->vm_flags & VM_DENYWRITE)
97829+ atomic_dec(&inode->i_writecount);
97830+ i_mmap_lock_write(mapping);
97831+ if (tmp->vm_flags & VM_SHARED)
97832+ atomic_inc(&mapping->i_mmap_writable);
97833+ flush_dcache_mmap_lock(mapping);
97834+ /* insert tmp into the share list, just after mpnt */
97835+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
97836+ flush_dcache_mmap_unlock(mapping);
97837+ i_mmap_unlock_write(mapping);
97838+ }
97839+
97840+ /*
97841+ * Clear hugetlb-related page reserves for children. This only
97842+ * affects MAP_PRIVATE mappings. Faults generated by the child
97843+ * are not guaranteed to succeed, even if read-only
97844+ */
97845+ if (is_vm_hugetlb_page(tmp))
97846+ reset_vma_resv_huge_pages(tmp);
97847+
97848+ return tmp;
97849+
97850+fail_nomem_anon_vma_fork:
97851+ mpol_put(vma_policy(tmp));
97852+fail_nomem_policy:
97853+ kmem_cache_free(vm_area_cachep, tmp);
97854+fail_nomem:
97855+ vm_unacct_memory(charge);
97856+ return NULL;
97857+}
97858+
97859+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97860 {
97861 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
97862 struct rb_node **rb_link, *rb_parent;
97863 int retval;
97864- unsigned long charge;
97865
97866 uprobe_start_dup_mmap();
97867 down_write(&oldmm->mmap_sem);
97868@@ -397,51 +512,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97869
97870 prev = NULL;
97871 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
97872- struct file *file;
97873-
97874 if (mpnt->vm_flags & VM_DONTCOPY) {
97875 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
97876 -vma_pages(mpnt));
97877 continue;
97878 }
97879- charge = 0;
97880- if (mpnt->vm_flags & VM_ACCOUNT) {
97881- unsigned long len = vma_pages(mpnt);
97882-
97883- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
97884- goto fail_nomem;
97885- charge = len;
97886- }
97887- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97888- if (!tmp)
97889- goto fail_nomem;
97890- *tmp = *mpnt;
97891- INIT_LIST_HEAD(&tmp->anon_vma_chain);
97892- retval = vma_dup_policy(mpnt, tmp);
97893- if (retval)
97894- goto fail_nomem_policy;
97895- tmp->vm_mm = mm;
97896- if (anon_vma_fork(tmp, mpnt))
97897- goto fail_nomem_anon_vma_fork;
97898- tmp->vm_flags &= ~VM_LOCKED;
97899- tmp->vm_next = tmp->vm_prev = NULL;
97900- file = tmp->vm_file;
97901- if (file) {
97902- struct inode *inode = file_inode(file);
97903- struct address_space *mapping = file->f_mapping;
97904-
97905- get_file(file);
97906- if (tmp->vm_flags & VM_DENYWRITE)
97907- atomic_dec(&inode->i_writecount);
97908- i_mmap_lock_write(mapping);
97909- if (tmp->vm_flags & VM_SHARED)
97910- atomic_inc(&mapping->i_mmap_writable);
97911- flush_dcache_mmap_lock(mapping);
97912- /* insert tmp into the share list, just after mpnt */
97913- vma_interval_tree_insert_after(tmp, mpnt,
97914- &mapping->i_mmap);
97915- flush_dcache_mmap_unlock(mapping);
97916- i_mmap_unlock_write(mapping);
97917+ tmp = dup_vma(mm, oldmm, mpnt);
97918+ if (!tmp) {
97919+ retval = -ENOMEM;
97920+ goto out;
97921 }
97922
97923 /*
97924@@ -473,6 +552,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97925 if (retval)
97926 goto out;
97927 }
97928+
97929+#ifdef CONFIG_PAX_SEGMEXEC
97930+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
97931+ struct vm_area_struct *mpnt_m;
97932+
97933+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
97934+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
97935+
97936+ if (!mpnt->vm_mirror)
97937+ continue;
97938+
97939+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
97940+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
97941+ mpnt->vm_mirror = mpnt_m;
97942+ } else {
97943+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
97944+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
97945+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
97946+ mpnt->vm_mirror->vm_mirror = mpnt;
97947+ }
97948+ }
97949+ BUG_ON(mpnt_m);
97950+ }
97951+#endif
97952+
97953 /* a new mm has just been created */
97954 arch_dup_mmap(oldmm, mm);
97955 retval = 0;
97956@@ -482,14 +586,6 @@ out:
97957 up_write(&oldmm->mmap_sem);
97958 uprobe_end_dup_mmap();
97959 return retval;
97960-fail_nomem_anon_vma_fork:
97961- mpol_put(vma_policy(tmp));
97962-fail_nomem_policy:
97963- kmem_cache_free(vm_area_cachep, tmp);
97964-fail_nomem:
97965- retval = -ENOMEM;
97966- vm_unacct_memory(charge);
97967- goto out;
97968 }
97969
97970 static inline int mm_alloc_pgd(struct mm_struct *mm)
97971@@ -739,8 +835,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
97972 return ERR_PTR(err);
97973
97974 mm = get_task_mm(task);
97975- if (mm && mm != current->mm &&
97976- !ptrace_may_access(task, mode)) {
97977+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
97978+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
97979 mmput(mm);
97980 mm = ERR_PTR(-EACCES);
97981 }
97982@@ -943,13 +1039,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
97983 spin_unlock(&fs->lock);
97984 return -EAGAIN;
97985 }
97986- fs->users++;
97987+ atomic_inc(&fs->users);
97988 spin_unlock(&fs->lock);
97989 return 0;
97990 }
97991 tsk->fs = copy_fs_struct(fs);
97992 if (!tsk->fs)
97993 return -ENOMEM;
97994+ /* Carry through gr_chroot_dentry and is_chrooted instead
97995+ of recomputing it here. Already copied when the task struct
97996+ is duplicated. This allows pivot_root to not be treated as
97997+ a chroot
97998+ */
97999+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
98000+
98001 return 0;
98002 }
98003
98004@@ -1187,7 +1290,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
98005 * parts of the process environment (as per the clone
98006 * flags). The actual kick-off is left to the caller.
98007 */
98008-static struct task_struct *copy_process(unsigned long clone_flags,
98009+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
98010 unsigned long stack_start,
98011 unsigned long stack_size,
98012 int __user *child_tidptr,
98013@@ -1258,6 +1361,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
98014 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
98015 #endif
98016 retval = -EAGAIN;
98017+
98018+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
98019+
98020 if (atomic_read(&p->real_cred->user->processes) >=
98021 task_rlimit(p, RLIMIT_NPROC)) {
98022 if (p->real_cred->user != INIT_USER &&
98023@@ -1507,6 +1613,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
98024 goto bad_fork_free_pid;
98025 }
98026
98027+ /* synchronizes with gr_set_acls()
98028+ we need to call this past the point of no return for fork()
98029+ */
98030+ gr_copy_label(p);
98031+
98032 if (likely(p->pid)) {
98033 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
98034
98035@@ -1597,6 +1708,8 @@ bad_fork_cleanup_count:
98036 bad_fork_free:
98037 free_task(p);
98038 fork_out:
98039+ gr_log_forkfail(retval);
98040+
98041 return ERR_PTR(retval);
98042 }
98043
98044@@ -1658,6 +1771,7 @@ long do_fork(unsigned long clone_flags,
98045
98046 p = copy_process(clone_flags, stack_start, stack_size,
98047 child_tidptr, NULL, trace);
98048+ add_latent_entropy();
98049 /*
98050 * Do this prior waking up the new thread - the thread pointer
98051 * might get invalid after that point, if the thread exits quickly.
98052@@ -1674,6 +1788,8 @@ long do_fork(unsigned long clone_flags,
98053 if (clone_flags & CLONE_PARENT_SETTID)
98054 put_user(nr, parent_tidptr);
98055
98056+ gr_handle_brute_check();
98057+
98058 if (clone_flags & CLONE_VFORK) {
98059 p->vfork_done = &vfork;
98060 init_completion(&vfork);
98061@@ -1792,7 +1908,7 @@ void __init proc_caches_init(void)
98062 mm_cachep = kmem_cache_create("mm_struct",
98063 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
98064 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
98065- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
98066+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
98067 mmap_init();
98068 nsproxy_cache_init();
98069 }
98070@@ -1832,7 +1948,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
98071 return 0;
98072
98073 /* don't need lock here; in the worst case we'll do useless copy */
98074- if (fs->users == 1)
98075+ if (atomic_read(&fs->users) == 1)
98076 return 0;
98077
98078 *new_fsp = copy_fs_struct(fs);
98079@@ -1944,7 +2060,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
98080 fs = current->fs;
98081 spin_lock(&fs->lock);
98082 current->fs = new_fs;
98083- if (--fs->users)
98084+ gr_set_chroot_entries(current, &current->fs->root);
98085+ if (atomic_dec_return(&fs->users))
98086 new_fs = NULL;
98087 else
98088 new_fs = fs;
98089diff --git a/kernel/futex.c b/kernel/futex.c
98090index 2a5e383..878bac6 100644
98091--- a/kernel/futex.c
98092+++ b/kernel/futex.c
98093@@ -201,7 +201,7 @@ struct futex_pi_state {
98094 atomic_t refcount;
98095
98096 union futex_key key;
98097-};
98098+} __randomize_layout;
98099
98100 /**
98101 * struct futex_q - The hashed futex queue entry, one per waiting task
98102@@ -235,7 +235,7 @@ struct futex_q {
98103 struct rt_mutex_waiter *rt_waiter;
98104 union futex_key *requeue_pi_key;
98105 u32 bitset;
98106-};
98107+} __randomize_layout;
98108
98109 static const struct futex_q futex_q_init = {
98110 /* list gets initialized in queue_me()*/
98111@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
98112 struct page *page, *page_head;
98113 int err, ro = 0;
98114
98115+#ifdef CONFIG_PAX_SEGMEXEC
98116+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
98117+ return -EFAULT;
98118+#endif
98119+
98120 /*
98121 * The futex address must be "naturally" aligned.
98122 */
98123@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
98124
98125 static int get_futex_value_locked(u32 *dest, u32 __user *from)
98126 {
98127- int ret;
98128+ unsigned long ret;
98129
98130 pagefault_disable();
98131 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
98132@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
98133 {
98134 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
98135 u32 curval;
98136+ mm_segment_t oldfs;
98137
98138 /*
98139 * This will fail and we want it. Some arch implementations do
98140@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
98141 * implementation, the non-functional ones will return
98142 * -ENOSYS.
98143 */
98144+ oldfs = get_fs();
98145+ set_fs(USER_DS);
98146 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
98147 futex_cmpxchg_enabled = 1;
98148+ set_fs(oldfs);
98149 #endif
98150 }
98151
98152diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
98153index 55c8c93..9ba7ad6 100644
98154--- a/kernel/futex_compat.c
98155+++ b/kernel/futex_compat.c
98156@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
98157 return 0;
98158 }
98159
98160-static void __user *futex_uaddr(struct robust_list __user *entry,
98161+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
98162 compat_long_t futex_offset)
98163 {
98164 compat_uptr_t base = ptr_to_compat(entry);
98165diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
98166index b358a80..fc25240 100644
98167--- a/kernel/gcov/base.c
98168+++ b/kernel/gcov/base.c
98169@@ -114,11 +114,6 @@ void gcov_enable_events(void)
98170 }
98171
98172 #ifdef CONFIG_MODULES
98173-static inline int within(void *addr, void *start, unsigned long size)
98174-{
98175- return ((addr >= start) && (addr < start + size));
98176-}
98177-
98178 /* Update list and generate events when modules are unloaded. */
98179 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
98180 void *data)
98181@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
98182
98183 /* Remove entries located in module from linked list. */
98184 while ((info = gcov_info_next(info))) {
98185- if (within(info, mod->module_core, mod->core_size)) {
98186+ if (within_module_core_rw((unsigned long)info, mod)) {
98187 gcov_info_unlink(prev, info);
98188 if (gcov_events_enabled)
98189 gcov_event(GCOV_REMOVE, info);
98190diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
98191index 886d09e..c7ff4e5 100644
98192--- a/kernel/irq/manage.c
98193+++ b/kernel/irq/manage.c
98194@@ -874,7 +874,7 @@ static int irq_thread(void *data)
98195
98196 action_ret = handler_fn(desc, action);
98197 if (action_ret == IRQ_HANDLED)
98198- atomic_inc(&desc->threads_handled);
98199+ atomic_inc_unchecked(&desc->threads_handled);
98200
98201 wake_threads_waitq(desc);
98202 }
98203diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
98204index e2514b0..de3dfe0 100644
98205--- a/kernel/irq/spurious.c
98206+++ b/kernel/irq/spurious.c
98207@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
98208 * count. We just care about the count being
98209 * different than the one we saw before.
98210 */
98211- handled = atomic_read(&desc->threads_handled);
98212+ handled = atomic_read_unchecked(&desc->threads_handled);
98213 handled |= SPURIOUS_DEFERRED;
98214 if (handled != desc->threads_handled_last) {
98215 action_ret = IRQ_HANDLED;
98216diff --git a/kernel/jump_label.c b/kernel/jump_label.c
98217index 9019f15..9a3c42e 100644
98218--- a/kernel/jump_label.c
98219+++ b/kernel/jump_label.c
98220@@ -14,6 +14,7 @@
98221 #include <linux/err.h>
98222 #include <linux/static_key.h>
98223 #include <linux/jump_label_ratelimit.h>
98224+#include <linux/mm.h>
98225
98226 #ifdef HAVE_JUMP_LABEL
98227
98228@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
98229
98230 size = (((unsigned long)stop - (unsigned long)start)
98231 / sizeof(struct jump_entry));
98232+ pax_open_kernel();
98233 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
98234+ pax_close_kernel();
98235 }
98236
98237 static void jump_label_update(struct static_key *key, int enable);
98238@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
98239 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
98240 struct jump_entry *iter;
98241
98242+ pax_open_kernel();
98243 for (iter = iter_start; iter < iter_stop; iter++) {
98244 if (within_module_init(iter->code, mod))
98245 iter->code = 0;
98246 }
98247+ pax_close_kernel();
98248 }
98249
98250 static int
98251diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
98252index 5c5987f..bc502b0 100644
98253--- a/kernel/kallsyms.c
98254+++ b/kernel/kallsyms.c
98255@@ -11,6 +11,9 @@
98256 * Changed the compression method from stem compression to "table lookup"
98257 * compression (see scripts/kallsyms.c for a more complete description)
98258 */
98259+#ifdef CONFIG_GRKERNSEC_HIDESYM
98260+#define __INCLUDED_BY_HIDESYM 1
98261+#endif
98262 #include <linux/kallsyms.h>
98263 #include <linux/module.h>
98264 #include <linux/init.h>
98265@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
98266
98267 static inline int is_kernel_inittext(unsigned long addr)
98268 {
98269+ if (system_state != SYSTEM_BOOTING)
98270+ return 0;
98271+
98272 if (addr >= (unsigned long)_sinittext
98273 && addr <= (unsigned long)_einittext)
98274 return 1;
98275 return 0;
98276 }
98277
98278+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98279+#ifdef CONFIG_MODULES
98280+static inline int is_module_text(unsigned long addr)
98281+{
98282+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
98283+ return 1;
98284+
98285+ addr = ktla_ktva(addr);
98286+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
98287+}
98288+#else
98289+static inline int is_module_text(unsigned long addr)
98290+{
98291+ return 0;
98292+}
98293+#endif
98294+#endif
98295+
98296 static inline int is_kernel_text(unsigned long addr)
98297 {
98298 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
98299@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
98300
98301 static inline int is_kernel(unsigned long addr)
98302 {
98303+
98304+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98305+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
98306+ return 1;
98307+
98308+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
98309+#else
98310 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
98311+#endif
98312+
98313 return 1;
98314 return in_gate_area_no_mm(addr);
98315 }
98316
98317 static int is_ksym_addr(unsigned long addr)
98318 {
98319+
98320+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98321+ if (is_module_text(addr))
98322+ return 0;
98323+#endif
98324+
98325 if (all_var)
98326 return is_kernel(addr);
98327
98328@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
98329
98330 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
98331 {
98332- iter->name[0] = '\0';
98333 iter->nameoff = get_symbol_offset(new_pos);
98334 iter->pos = new_pos;
98335 }
98336@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
98337 {
98338 struct kallsym_iter *iter = m->private;
98339
98340+#ifdef CONFIG_GRKERNSEC_HIDESYM
98341+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
98342+ return 0;
98343+#endif
98344+
98345 /* Some debugging symbols have no name. Ignore them. */
98346 if (!iter->name[0])
98347 return 0;
98348@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
98349 */
98350 type = iter->exported ? toupper(iter->type) :
98351 tolower(iter->type);
98352+
98353 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
98354 type, iter->name, iter->module_name);
98355 } else
98356diff --git a/kernel/kcmp.c b/kernel/kcmp.c
98357index 0aa69ea..a7fcafb 100644
98358--- a/kernel/kcmp.c
98359+++ b/kernel/kcmp.c
98360@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
98361 struct task_struct *task1, *task2;
98362 int ret;
98363
98364+#ifdef CONFIG_GRKERNSEC
98365+ return -ENOSYS;
98366+#endif
98367+
98368 rcu_read_lock();
98369
98370 /*
98371diff --git a/kernel/kexec.c b/kernel/kexec.c
98372index 38c25b1..12b3f69 100644
98373--- a/kernel/kexec.c
98374+++ b/kernel/kexec.c
98375@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
98376 compat_ulong_t, flags)
98377 {
98378 struct compat_kexec_segment in;
98379- struct kexec_segment out, __user *ksegments;
98380+ struct kexec_segment out;
98381+ struct kexec_segment __user *ksegments;
98382 unsigned long i, result;
98383
98384 /* Don't allow clients that don't understand the native
98385diff --git a/kernel/kmod.c b/kernel/kmod.c
98386index 2777f40..a689506 100644
98387--- a/kernel/kmod.c
98388+++ b/kernel/kmod.c
98389@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
98390 kfree(info->argv);
98391 }
98392
98393-static int call_modprobe(char *module_name, int wait)
98394+static int call_modprobe(char *module_name, char *module_param, int wait)
98395 {
98396 struct subprocess_info *info;
98397 static char *envp[] = {
98398@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
98399 NULL
98400 };
98401
98402- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
98403+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
98404 if (!argv)
98405 goto out;
98406
98407@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
98408 argv[1] = "-q";
98409 argv[2] = "--";
98410 argv[3] = module_name; /* check free_modprobe_argv() */
98411- argv[4] = NULL;
98412+ argv[4] = module_param;
98413+ argv[5] = NULL;
98414
98415 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
98416 NULL, free_modprobe_argv, NULL);
98417@@ -122,9 +123,8 @@ out:
98418 * If module auto-loading support is disabled then this function
98419 * becomes a no-operation.
98420 */
98421-int __request_module(bool wait, const char *fmt, ...)
98422+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
98423 {
98424- va_list args;
98425 char module_name[MODULE_NAME_LEN];
98426 unsigned int max_modprobes;
98427 int ret;
98428@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
98429 if (!modprobe_path[0])
98430 return 0;
98431
98432- va_start(args, fmt);
98433- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
98434- va_end(args);
98435+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
98436 if (ret >= MODULE_NAME_LEN)
98437 return -ENAMETOOLONG;
98438
98439@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
98440 if (ret)
98441 return ret;
98442
98443+#ifdef CONFIG_GRKERNSEC_MODHARDEN
98444+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
98445+ /* hack to workaround consolekit/udisks stupidity */
98446+ read_lock(&tasklist_lock);
98447+ if (!strcmp(current->comm, "mount") &&
98448+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
98449+ read_unlock(&tasklist_lock);
98450+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
98451+ return -EPERM;
98452+ }
98453+ read_unlock(&tasklist_lock);
98454+ }
98455+#endif
98456+
98457 /* If modprobe needs a service that is in a module, we get a recursive
98458 * loop. Limit the number of running kmod threads to max_threads/2 or
98459 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
98460@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
98461
98462 trace_module_request(module_name, wait, _RET_IP_);
98463
98464- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
98465+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
98466
98467 atomic_dec(&kmod_concurrent);
98468 return ret;
98469 }
98470+
98471+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
98472+{
98473+ va_list args;
98474+ int ret;
98475+
98476+ va_start(args, fmt);
98477+ ret = ____request_module(wait, module_param, fmt, args);
98478+ va_end(args);
98479+
98480+ return ret;
98481+}
98482+
98483+int __request_module(bool wait, const char *fmt, ...)
98484+{
98485+ va_list args;
98486+ int ret;
98487+
98488+#ifdef CONFIG_GRKERNSEC_MODHARDEN
98489+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
98490+ char module_param[MODULE_NAME_LEN];
98491+
98492+ memset(module_param, 0, sizeof(module_param));
98493+
98494+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
98495+
98496+ va_start(args, fmt);
98497+ ret = ____request_module(wait, module_param, fmt, args);
98498+ va_end(args);
98499+
98500+ return ret;
98501+ }
98502+#endif
98503+
98504+ va_start(args, fmt);
98505+ ret = ____request_module(wait, NULL, fmt, args);
98506+ va_end(args);
98507+
98508+ return ret;
98509+}
98510+
98511 EXPORT_SYMBOL(__request_module);
98512 #endif /* CONFIG_MODULES */
98513
98514 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
98515 {
98516+#ifdef CONFIG_GRKERNSEC
98517+ kfree(info->path);
98518+ info->path = info->origpath;
98519+#endif
98520 if (info->cleanup)
98521 (*info->cleanup)(info);
98522 kfree(info);
98523@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
98524 */
98525 set_user_nice(current, 0);
98526
98527+#ifdef CONFIG_GRKERNSEC
98528+ /* this is race-free as far as userland is concerned as we copied
98529+ out the path to be used prior to this point and are now operating
98530+ on that copy
98531+ */
98532+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
98533+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
98534+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
98535+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
98536+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
98537+ retval = -EPERM;
98538+ goto out;
98539+ }
98540+#endif
98541+
98542 retval = -ENOMEM;
98543 new = prepare_kernel_cred(current);
98544 if (!new)
98545@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
98546 commit_creds(new);
98547
98548 retval = do_execve(getname_kernel(sub_info->path),
98549- (const char __user *const __user *)sub_info->argv,
98550- (const char __user *const __user *)sub_info->envp);
98551+ (const char __user *const __force_user *)sub_info->argv,
98552+ (const char __user *const __force_user *)sub_info->envp);
98553 out:
98554 sub_info->retval = retval;
98555 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
98556@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
98557 *
98558 * Thus the __user pointer cast is valid here.
98559 */
98560- sys_wait4(pid, (int __user *)&ret, 0, NULL);
98561+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
98562
98563 /*
98564 * If ret is 0, either ____call_usermodehelper failed and the
98565@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
98566 goto out;
98567
98568 INIT_WORK(&sub_info->work, __call_usermodehelper);
98569+#ifdef CONFIG_GRKERNSEC
98570+ sub_info->origpath = path;
98571+ sub_info->path = kstrdup(path, gfp_mask);
98572+#else
98573 sub_info->path = path;
98574+#endif
98575 sub_info->argv = argv;
98576 sub_info->envp = envp;
98577
98578@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
98579 static int proc_cap_handler(struct ctl_table *table, int write,
98580 void __user *buffer, size_t *lenp, loff_t *ppos)
98581 {
98582- struct ctl_table t;
98583+ ctl_table_no_const t;
98584 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
98585 kernel_cap_t new_cap;
98586 int err, i;
98587diff --git a/kernel/kprobes.c b/kernel/kprobes.c
98588index c90e417..e6c515d 100644
98589--- a/kernel/kprobes.c
98590+++ b/kernel/kprobes.c
98591@@ -31,6 +31,9 @@
98592 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
98593 * <prasanna@in.ibm.com> added function-return probes.
98594 */
98595+#ifdef CONFIG_GRKERNSEC_HIDESYM
98596+#define __INCLUDED_BY_HIDESYM 1
98597+#endif
98598 #include <linux/kprobes.h>
98599 #include <linux/hash.h>
98600 #include <linux/init.h>
98601@@ -122,12 +125,12 @@ enum kprobe_slot_state {
98602
98603 static void *alloc_insn_page(void)
98604 {
98605- return module_alloc(PAGE_SIZE);
98606+ return module_alloc_exec(PAGE_SIZE);
98607 }
98608
98609 static void free_insn_page(void *page)
98610 {
98611- module_memfree(page);
98612+ module_memfree_exec(page);
98613 }
98614
98615 struct kprobe_insn_cache kprobe_insn_slots = {
98616@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
98617 kprobe_type = "k";
98618
98619 if (sym)
98620- seq_printf(pi, "%p %s %s+0x%x %s ",
98621+ seq_printf(pi, "%pK %s %s+0x%x %s ",
98622 p->addr, kprobe_type, sym, offset,
98623 (modname ? modname : " "));
98624 else
98625- seq_printf(pi, "%p %s %p ",
98626+ seq_printf(pi, "%pK %s %pK ",
98627 p->addr, kprobe_type, p->addr);
98628
98629 if (!pp)
98630diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
98631index 6683cce..daf8999 100644
98632--- a/kernel/ksysfs.c
98633+++ b/kernel/ksysfs.c
98634@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
98635 {
98636 if (count+1 > UEVENT_HELPER_PATH_LEN)
98637 return -ENOENT;
98638+ if (!capable(CAP_SYS_ADMIN))
98639+ return -EPERM;
98640 memcpy(uevent_helper, buf, count);
98641 uevent_helper[count] = '\0';
98642 if (count && uevent_helper[count-1] == '\n')
98643@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
98644 return count;
98645 }
98646
98647-static struct bin_attribute notes_attr = {
98648+static bin_attribute_no_const notes_attr __read_only = {
98649 .attr = {
98650 .name = "notes",
98651 .mode = S_IRUGO,
98652diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
98653index ba77ab5..d6a3e20 100644
98654--- a/kernel/locking/lockdep.c
98655+++ b/kernel/locking/lockdep.c
98656@@ -599,6 +599,10 @@ static int static_obj(void *obj)
98657 end = (unsigned long) &_end,
98658 addr = (unsigned long) obj;
98659
98660+#ifdef CONFIG_PAX_KERNEXEC
98661+ start = ktla_ktva(start);
98662+#endif
98663+
98664 /*
98665 * static variable?
98666 */
98667@@ -743,6 +747,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
98668 if (!static_obj(lock->key)) {
98669 debug_locks_off();
98670 printk("INFO: trying to register non-static key.\n");
98671+ printk("lock:%pS key:%pS.\n", lock, lock->key);
98672 printk("the code is fine but needs lockdep annotation.\n");
98673 printk("turning off the locking correctness validator.\n");
98674 dump_stack();
98675@@ -3088,7 +3093,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
98676 if (!class)
98677 return 0;
98678 }
98679- atomic_inc((atomic_t *)&class->ops);
98680+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
98681 if (very_verbose(class)) {
98682 printk("\nacquire class [%p] %s", class->key, class->name);
98683 if (class->name_version > 1)
98684diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
98685index ef43ac4..2720dfa 100644
98686--- a/kernel/locking/lockdep_proc.c
98687+++ b/kernel/locking/lockdep_proc.c
98688@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
98689 return 0;
98690 }
98691
98692- seq_printf(m, "%p", class->key);
98693+ seq_printf(m, "%pK", class->key);
98694 #ifdef CONFIG_DEBUG_LOCKDEP
98695 seq_printf(m, " OPS:%8ld", class->ops);
98696 #endif
98697@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
98698
98699 list_for_each_entry(entry, &class->locks_after, entry) {
98700 if (entry->distance == 1) {
98701- seq_printf(m, " -> [%p] ", entry->class->key);
98702+ seq_printf(m, " -> [%pK] ", entry->class->key);
98703 print_name(m, entry->class);
98704 seq_puts(m, "\n");
98705 }
98706@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
98707 if (!class->key)
98708 continue;
98709
98710- seq_printf(m, "[%p] ", class->key);
98711+ seq_printf(m, "[%pK] ", class->key);
98712 print_name(m, class);
98713 seq_puts(m, "\n");
98714 }
98715@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
98716 if (!i)
98717 seq_line(m, '-', 40-namelen, namelen);
98718
98719- snprintf(ip, sizeof(ip), "[<%p>]",
98720+ snprintf(ip, sizeof(ip), "[<%pK>]",
98721 (void *)class->contention_point[i]);
98722 seq_printf(m, "%40s %14lu %29s %pS\n",
98723 name, stats->contention_point[i],
98724@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
98725 if (!i)
98726 seq_line(m, '-', 40-namelen, namelen);
98727
98728- snprintf(ip, sizeof(ip), "[<%p>]",
98729+ snprintf(ip, sizeof(ip), "[<%pK>]",
98730 (void *)class->contending_point[i]);
98731 seq_printf(m, "%40s %14lu %29s %pS\n",
98732 name, stats->contending_point[i],
98733diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
98734index d1fe2ba..180cd65e 100644
98735--- a/kernel/locking/mcs_spinlock.h
98736+++ b/kernel/locking/mcs_spinlock.h
98737@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
98738 */
98739 return;
98740 }
98741- ACCESS_ONCE(prev->next) = node;
98742+ ACCESS_ONCE_RW(prev->next) = node;
98743
98744 /* Wait until the lock holder passes the lock down. */
98745 arch_mcs_spin_lock_contended(&node->locked);
98746diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
98747index 3ef3736..9c951fa 100644
98748--- a/kernel/locking/mutex-debug.c
98749+++ b/kernel/locking/mutex-debug.c
98750@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
98751 }
98752
98753 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98754- struct thread_info *ti)
98755+ struct task_struct *task)
98756 {
98757 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
98758
98759 /* Mark the current thread as blocked on the lock: */
98760- ti->task->blocked_on = waiter;
98761+ task->blocked_on = waiter;
98762 }
98763
98764 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98765- struct thread_info *ti)
98766+ struct task_struct *task)
98767 {
98768 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
98769- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
98770- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
98771- ti->task->blocked_on = NULL;
98772+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
98773+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
98774+ task->blocked_on = NULL;
98775
98776 list_del_init(&waiter->list);
98777 waiter->task = NULL;
98778diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
98779index 0799fd3..d06ae3b 100644
98780--- a/kernel/locking/mutex-debug.h
98781+++ b/kernel/locking/mutex-debug.h
98782@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
98783 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
98784 extern void debug_mutex_add_waiter(struct mutex *lock,
98785 struct mutex_waiter *waiter,
98786- struct thread_info *ti);
98787+ struct task_struct *task);
98788 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98789- struct thread_info *ti);
98790+ struct task_struct *task);
98791 extern void debug_mutex_unlock(struct mutex *lock);
98792 extern void debug_mutex_init(struct mutex *lock, const char *name,
98793 struct lock_class_key *key);
98794diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
98795index 94674e5..de4966f 100644
98796--- a/kernel/locking/mutex.c
98797+++ b/kernel/locking/mutex.c
98798@@ -542,7 +542,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
98799 goto skip_wait;
98800
98801 debug_mutex_lock_common(lock, &waiter);
98802- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
98803+ debug_mutex_add_waiter(lock, &waiter, task);
98804
98805 /* add waiting tasks to the end of the waitqueue (FIFO): */
98806 list_add_tail(&waiter.list, &lock->wait_list);
98807@@ -589,7 +589,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
98808 }
98809 __set_task_state(task, TASK_RUNNING);
98810
98811- mutex_remove_waiter(lock, &waiter, current_thread_info());
98812+ mutex_remove_waiter(lock, &waiter, task);
98813 /* set it to 0 if there are no waiters left: */
98814 if (likely(list_empty(&lock->wait_list)))
98815 atomic_set(&lock->count, 0);
98816@@ -610,7 +610,7 @@ skip_wait:
98817 return 0;
98818
98819 err:
98820- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
98821+ mutex_remove_waiter(lock, &waiter, task);
98822 spin_unlock_mutex(&lock->wait_lock, flags);
98823 debug_mutex_free_waiter(&waiter);
98824 mutex_release(&lock->dep_map, 1, ip);
98825diff --git a/kernel/locking/osq_lock.c b/kernel/locking/osq_lock.c
98826index c112d00..1946ad9 100644
98827--- a/kernel/locking/osq_lock.c
98828+++ b/kernel/locking/osq_lock.c
98829@@ -98,7 +98,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
98830
98831 prev = decode_cpu(old);
98832 node->prev = prev;
98833- ACCESS_ONCE(prev->next) = node;
98834+ ACCESS_ONCE_RW(prev->next) = node;
98835
98836 /*
98837 * Normally @prev is untouchable after the above store; because at that
98838@@ -170,8 +170,8 @@ unqueue:
98839 * it will wait in Step-A.
98840 */
98841
98842- ACCESS_ONCE(next->prev) = prev;
98843- ACCESS_ONCE(prev->next) = next;
98844+ ACCESS_ONCE_RW(next->prev) = prev;
98845+ ACCESS_ONCE_RW(prev->next) = next;
98846
98847 return false;
98848 }
98849@@ -193,11 +193,11 @@ void osq_unlock(struct optimistic_spin_queue *lock)
98850 node = this_cpu_ptr(&osq_node);
98851 next = xchg(&node->next, NULL);
98852 if (next) {
98853- ACCESS_ONCE(next->locked) = 1;
98854+ ACCESS_ONCE_RW(next->locked) = 1;
98855 return;
98856 }
98857
98858 next = osq_wait_next(lock, node, NULL);
98859 if (next)
98860- ACCESS_ONCE(next->locked) = 1;
98861+ ACCESS_ONCE_RW(next->locked) = 1;
98862 }
98863diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
98864index 1d96dd0..994ff19 100644
98865--- a/kernel/locking/rtmutex-tester.c
98866+++ b/kernel/locking/rtmutex-tester.c
98867@@ -22,7 +22,7 @@
98868 #define MAX_RT_TEST_MUTEXES 8
98869
98870 static spinlock_t rttest_lock;
98871-static atomic_t rttest_event;
98872+static atomic_unchecked_t rttest_event;
98873
98874 struct test_thread_data {
98875 int opcode;
98876@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98877
98878 case RTTEST_LOCKCONT:
98879 td->mutexes[td->opdata] = 1;
98880- td->event = atomic_add_return(1, &rttest_event);
98881+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98882 return 0;
98883
98884 case RTTEST_RESET:
98885@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98886 return 0;
98887
98888 case RTTEST_RESETEVENT:
98889- atomic_set(&rttest_event, 0);
98890+ atomic_set_unchecked(&rttest_event, 0);
98891 return 0;
98892
98893 default:
98894@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98895 return ret;
98896
98897 td->mutexes[id] = 1;
98898- td->event = atomic_add_return(1, &rttest_event);
98899+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98900 rt_mutex_lock(&mutexes[id]);
98901- td->event = atomic_add_return(1, &rttest_event);
98902+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98903 td->mutexes[id] = 4;
98904 return 0;
98905
98906@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98907 return ret;
98908
98909 td->mutexes[id] = 1;
98910- td->event = atomic_add_return(1, &rttest_event);
98911+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98912 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
98913- td->event = atomic_add_return(1, &rttest_event);
98914+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98915 td->mutexes[id] = ret ? 0 : 4;
98916 return ret ? -EINTR : 0;
98917
98918@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98919 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
98920 return ret;
98921
98922- td->event = atomic_add_return(1, &rttest_event);
98923+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98924 rt_mutex_unlock(&mutexes[id]);
98925- td->event = atomic_add_return(1, &rttest_event);
98926+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98927 td->mutexes[id] = 0;
98928 return 0;
98929
98930@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98931 break;
98932
98933 td->mutexes[dat] = 2;
98934- td->event = atomic_add_return(1, &rttest_event);
98935+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98936 break;
98937
98938 default:
98939@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98940 return;
98941
98942 td->mutexes[dat] = 3;
98943- td->event = atomic_add_return(1, &rttest_event);
98944+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98945 break;
98946
98947 case RTTEST_LOCKNOWAIT:
98948@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98949 return;
98950
98951 td->mutexes[dat] = 1;
98952- td->event = atomic_add_return(1, &rttest_event);
98953+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98954 return;
98955
98956 default:
98957diff --git a/kernel/module.c b/kernel/module.c
98958index 538794c..76d7957 100644
98959--- a/kernel/module.c
98960+++ b/kernel/module.c
98961@@ -59,6 +59,7 @@
98962 #include <linux/jump_label.h>
98963 #include <linux/pfn.h>
98964 #include <linux/bsearch.h>
98965+#include <linux/grsecurity.h>
98966 #include <uapi/linux/module.h>
98967 #include "module-internal.h"
98968
98969@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
98970
98971 /* Bounds of module allocation, for speeding __module_address.
98972 * Protected by module_mutex. */
98973-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
98974+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
98975+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
98976
98977 int register_module_notifier(struct notifier_block *nb)
98978 {
98979@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
98980 return true;
98981
98982 list_for_each_entry_rcu(mod, &modules, list) {
98983- struct symsearch arr[] = {
98984+ struct symsearch modarr[] = {
98985 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
98986 NOT_GPL_ONLY, false },
98987 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
98988@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
98989 if (mod->state == MODULE_STATE_UNFORMED)
98990 continue;
98991
98992- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
98993+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
98994 return true;
98995 }
98996 return false;
98997@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
98998 if (!pcpusec->sh_size)
98999 return 0;
99000
99001- if (align > PAGE_SIZE) {
99002+ if (align-1 >= PAGE_SIZE) {
99003 pr_warn("%s: per-cpu alignment %li > %li\n",
99004 mod->name, align, PAGE_SIZE);
99005 align = PAGE_SIZE;
99006@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
99007 static ssize_t show_coresize(struct module_attribute *mattr,
99008 struct module_kobject *mk, char *buffer)
99009 {
99010- return sprintf(buffer, "%u\n", mk->mod->core_size);
99011+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
99012 }
99013
99014 static struct module_attribute modinfo_coresize =
99015@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
99016 static ssize_t show_initsize(struct module_attribute *mattr,
99017 struct module_kobject *mk, char *buffer)
99018 {
99019- return sprintf(buffer, "%u\n", mk->mod->init_size);
99020+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
99021 }
99022
99023 static struct module_attribute modinfo_initsize =
99024@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
99025 goto bad_version;
99026 }
99027
99028+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
99029+ /*
99030+ * avoid potentially printing jibberish on attempted load
99031+ * of a module randomized with a different seed
99032+ */
99033+ pr_warn("no symbol version for %s\n", symname);
99034+#else
99035 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
99036+#endif
99037 return 0;
99038
99039 bad_version:
99040+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
99041+ /*
99042+ * avoid potentially printing jibberish on attempted load
99043+ * of a module randomized with a different seed
99044+ */
99045+ pr_warn("attempted module disagrees about version of symbol %s\n",
99046+ symname);
99047+#else
99048 pr_warn("%s: disagrees about version of symbol %s\n",
99049 mod->name, symname);
99050+#endif
99051 return 0;
99052 }
99053
99054@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
99055 */
99056 #ifdef CONFIG_SYSFS
99057
99058-#ifdef CONFIG_KALLSYMS
99059+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
99060 static inline bool sect_empty(const Elf_Shdr *sect)
99061 {
99062 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
99063@@ -1419,7 +1438,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
99064 {
99065 unsigned int notes, loaded, i;
99066 struct module_notes_attrs *notes_attrs;
99067- struct bin_attribute *nattr;
99068+ bin_attribute_no_const *nattr;
99069
99070 /* failed to create section attributes, so can't create notes */
99071 if (!mod->sect_attrs)
99072@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
99073 static int module_add_modinfo_attrs(struct module *mod)
99074 {
99075 struct module_attribute *attr;
99076- struct module_attribute *temp_attr;
99077+ module_attribute_no_const *temp_attr;
99078 int error = 0;
99079 int i;
99080
99081@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
99082
99083 static void unset_module_core_ro_nx(struct module *mod)
99084 {
99085- set_page_attributes(mod->module_core + mod->core_text_size,
99086- mod->module_core + mod->core_size,
99087+ set_page_attributes(mod->module_core_rw,
99088+ mod->module_core_rw + mod->core_size_rw,
99089 set_memory_x);
99090- set_page_attributes(mod->module_core,
99091- mod->module_core + mod->core_ro_size,
99092+ set_page_attributes(mod->module_core_rx,
99093+ mod->module_core_rx + mod->core_size_rx,
99094 set_memory_rw);
99095 }
99096
99097 static void unset_module_init_ro_nx(struct module *mod)
99098 {
99099- set_page_attributes(mod->module_init + mod->init_text_size,
99100- mod->module_init + mod->init_size,
99101+ set_page_attributes(mod->module_init_rw,
99102+ mod->module_init_rw + mod->init_size_rw,
99103 set_memory_x);
99104- set_page_attributes(mod->module_init,
99105- mod->module_init + mod->init_ro_size,
99106+ set_page_attributes(mod->module_init_rx,
99107+ mod->module_init_rx + mod->init_size_rx,
99108 set_memory_rw);
99109 }
99110
99111@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
99112 list_for_each_entry_rcu(mod, &modules, list) {
99113 if (mod->state == MODULE_STATE_UNFORMED)
99114 continue;
99115- if ((mod->module_core) && (mod->core_text_size)) {
99116- set_page_attributes(mod->module_core,
99117- mod->module_core + mod->core_text_size,
99118+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
99119+ set_page_attributes(mod->module_core_rx,
99120+ mod->module_core_rx + mod->core_size_rx,
99121 set_memory_rw);
99122 }
99123- if ((mod->module_init) && (mod->init_text_size)) {
99124- set_page_attributes(mod->module_init,
99125- mod->module_init + mod->init_text_size,
99126+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
99127+ set_page_attributes(mod->module_init_rx,
99128+ mod->module_init_rx + mod->init_size_rx,
99129 set_memory_rw);
99130 }
99131 }
99132@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
99133 list_for_each_entry_rcu(mod, &modules, list) {
99134 if (mod->state == MODULE_STATE_UNFORMED)
99135 continue;
99136- if ((mod->module_core) && (mod->core_text_size)) {
99137- set_page_attributes(mod->module_core,
99138- mod->module_core + mod->core_text_size,
99139+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
99140+ set_page_attributes(mod->module_core_rx,
99141+ mod->module_core_rx + mod->core_size_rx,
99142 set_memory_ro);
99143 }
99144- if ((mod->module_init) && (mod->init_text_size)) {
99145- set_page_attributes(mod->module_init,
99146- mod->module_init + mod->init_text_size,
99147+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
99148+ set_page_attributes(mod->module_init_rx,
99149+ mod->module_init_rx + mod->init_size_rx,
99150 set_memory_ro);
99151 }
99152 }
99153@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
99154 #else
99155 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
99156 static void unset_module_core_ro_nx(struct module *mod) { }
99157-static void unset_module_init_ro_nx(struct module *mod) { }
99158+static void unset_module_init_ro_nx(struct module *mod)
99159+{
99160+
99161+#ifdef CONFIG_PAX_KERNEXEC
99162+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
99163+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
99164+#endif
99165+
99166+}
99167 #endif
99168
99169 void __weak module_memfree(void *module_region)
99170@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
99171 /* This may be NULL, but that's OK */
99172 unset_module_init_ro_nx(mod);
99173 module_arch_freeing_init(mod);
99174- module_memfree(mod->module_init);
99175+ module_memfree(mod->module_init_rw);
99176+ module_memfree_exec(mod->module_init_rx);
99177 kfree(mod->args);
99178 percpu_modfree(mod);
99179
99180 /* Free lock-classes; relies on the preceding sync_rcu(). */
99181- lockdep_free_key_range(mod->module_core, mod->core_size);
99182+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
99183+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
99184
99185 /* Finally, free the core (containing the module structure) */
99186 unset_module_core_ro_nx(mod);
99187- module_memfree(mod->module_core);
99188+ module_memfree_exec(mod->module_core_rx);
99189+ module_memfree(mod->module_core_rw);
99190
99191 #ifdef CONFIG_MPU
99192 update_protections(current->mm);
99193@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99194 int ret = 0;
99195 const struct kernel_symbol *ksym;
99196
99197+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99198+ int is_fs_load = 0;
99199+ int register_filesystem_found = 0;
99200+ char *p;
99201+
99202+ p = strstr(mod->args, "grsec_modharden_fs");
99203+ if (p) {
99204+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
99205+ /* copy \0 as well */
99206+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
99207+ is_fs_load = 1;
99208+ }
99209+#endif
99210+
99211 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
99212 const char *name = info->strtab + sym[i].st_name;
99213
99214+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99215+ /* it's a real shame this will never get ripped and copied
99216+ upstream! ;(
99217+ */
99218+ if (is_fs_load && !strcmp(name, "register_filesystem"))
99219+ register_filesystem_found = 1;
99220+#endif
99221+
99222 switch (sym[i].st_shndx) {
99223 case SHN_COMMON:
99224 /* Ignore common symbols */
99225@@ -1966,7 +2018,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99226 ksym = resolve_symbol_wait(mod, info, name);
99227 /* Ok if resolved. */
99228 if (ksym && !IS_ERR(ksym)) {
99229+ pax_open_kernel();
99230 sym[i].st_value = ksym->value;
99231+ pax_close_kernel();
99232 break;
99233 }
99234
99235@@ -1985,11 +2039,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99236 secbase = (unsigned long)mod_percpu(mod);
99237 else
99238 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
99239+ pax_open_kernel();
99240 sym[i].st_value += secbase;
99241+ pax_close_kernel();
99242 break;
99243 }
99244 }
99245
99246+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99247+ if (is_fs_load && !register_filesystem_found) {
99248+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
99249+ ret = -EPERM;
99250+ }
99251+#endif
99252+
99253 return ret;
99254 }
99255
99256@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
99257 || s->sh_entsize != ~0UL
99258 || strstarts(sname, ".init"))
99259 continue;
99260- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
99261+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
99262+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
99263+ else
99264+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
99265 pr_debug("\t%s\n", sname);
99266 }
99267- switch (m) {
99268- case 0: /* executable */
99269- mod->core_size = debug_align(mod->core_size);
99270- mod->core_text_size = mod->core_size;
99271- break;
99272- case 1: /* RO: text and ro-data */
99273- mod->core_size = debug_align(mod->core_size);
99274- mod->core_ro_size = mod->core_size;
99275- break;
99276- case 3: /* whole core */
99277- mod->core_size = debug_align(mod->core_size);
99278- break;
99279- }
99280 }
99281
99282 pr_debug("Init section allocation order:\n");
99283@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
99284 || s->sh_entsize != ~0UL
99285 || !strstarts(sname, ".init"))
99286 continue;
99287- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
99288- | INIT_OFFSET_MASK);
99289+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
99290+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
99291+ else
99292+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
99293+ s->sh_entsize |= INIT_OFFSET_MASK;
99294 pr_debug("\t%s\n", sname);
99295 }
99296- switch (m) {
99297- case 0: /* executable */
99298- mod->init_size = debug_align(mod->init_size);
99299- mod->init_text_size = mod->init_size;
99300- break;
99301- case 1: /* RO: text and ro-data */
99302- mod->init_size = debug_align(mod->init_size);
99303- mod->init_ro_size = mod->init_size;
99304- break;
99305- case 3: /* whole init */
99306- mod->init_size = debug_align(mod->init_size);
99307- break;
99308- }
99309 }
99310 }
99311
99312@@ -2291,7 +2334,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
99313
99314 /* Put symbol section at end of init part of module. */
99315 symsect->sh_flags |= SHF_ALLOC;
99316- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
99317+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
99318 info->index.sym) | INIT_OFFSET_MASK;
99319 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
99320
99321@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
99322 }
99323
99324 /* Append room for core symbols at end of core part. */
99325- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
99326- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
99327- mod->core_size += strtab_size;
99328- mod->core_size = debug_align(mod->core_size);
99329+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
99330+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
99331+ mod->core_size_rx += strtab_size;
99332+ mod->core_size_rx = debug_align(mod->core_size_rx);
99333
99334 /* Put string table section at end of init part of module. */
99335 strsect->sh_flags |= SHF_ALLOC;
99336- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
99337+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
99338 info->index.str) | INIT_OFFSET_MASK;
99339- mod->init_size = debug_align(mod->init_size);
99340+ mod->init_size_rx = debug_align(mod->init_size_rx);
99341 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
99342 }
99343
99344@@ -2334,12 +2377,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
99345 /* Make sure we get permanent strtab: don't use info->strtab. */
99346 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
99347
99348+ pax_open_kernel();
99349+
99350 /* Set types up while we still have access to sections. */
99351 for (i = 0; i < mod->num_symtab; i++)
99352 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
99353
99354- mod->core_symtab = dst = mod->module_core + info->symoffs;
99355- mod->core_strtab = s = mod->module_core + info->stroffs;
99356+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
99357+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
99358 src = mod->symtab;
99359 for (ndst = i = 0; i < mod->num_symtab; i++) {
99360 if (i == 0 ||
99361@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
99362 }
99363 }
99364 mod->core_num_syms = ndst;
99365+
99366+ pax_close_kernel();
99367 }
99368 #else
99369 static inline void layout_symtab(struct module *mod, struct load_info *info)
99370@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
99371 return vmalloc_exec(size);
99372 }
99373
99374-static void *module_alloc_update_bounds(unsigned long size)
99375+static void *module_alloc_update_bounds_rw(unsigned long size)
99376 {
99377 void *ret = module_alloc(size);
99378
99379 if (ret) {
99380 mutex_lock(&module_mutex);
99381 /* Update module bounds. */
99382- if ((unsigned long)ret < module_addr_min)
99383- module_addr_min = (unsigned long)ret;
99384- if ((unsigned long)ret + size > module_addr_max)
99385- module_addr_max = (unsigned long)ret + size;
99386+ if ((unsigned long)ret < module_addr_min_rw)
99387+ module_addr_min_rw = (unsigned long)ret;
99388+ if ((unsigned long)ret + size > module_addr_max_rw)
99389+ module_addr_max_rw = (unsigned long)ret + size;
99390+ mutex_unlock(&module_mutex);
99391+ }
99392+ return ret;
99393+}
99394+
99395+static void *module_alloc_update_bounds_rx(unsigned long size)
99396+{
99397+ void *ret = module_alloc_exec(size);
99398+
99399+ if (ret) {
99400+ mutex_lock(&module_mutex);
99401+ /* Update module bounds. */
99402+ if ((unsigned long)ret < module_addr_min_rx)
99403+ module_addr_min_rx = (unsigned long)ret;
99404+ if ((unsigned long)ret + size > module_addr_max_rx)
99405+ module_addr_max_rx = (unsigned long)ret + size;
99406 mutex_unlock(&module_mutex);
99407 }
99408 return ret;
99409@@ -2665,7 +2728,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
99410 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
99411
99412 if (info->index.sym == 0) {
99413+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
99414+ /*
99415+ * avoid potentially printing jibberish on attempted load
99416+ * of a module randomized with a different seed
99417+ */
99418+ pr_warn("module has no symbols (stripped?)\n");
99419+#else
99420 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
99421+#endif
99422 return ERR_PTR(-ENOEXEC);
99423 }
99424
99425@@ -2681,8 +2752,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
99426 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
99427 {
99428 const char *modmagic = get_modinfo(info, "vermagic");
99429+ const char *license = get_modinfo(info, "license");
99430 int err;
99431
99432+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
99433+ if (!license || !license_is_gpl_compatible(license))
99434+ return -ENOEXEC;
99435+#endif
99436+
99437 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
99438 modmagic = NULL;
99439
99440@@ -2707,7 +2784,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
99441 }
99442
99443 /* Set up license info based on the info section */
99444- set_license(mod, get_modinfo(info, "license"));
99445+ set_license(mod, license);
99446
99447 return 0;
99448 }
99449@@ -2801,7 +2878,7 @@ static int move_module(struct module *mod, struct load_info *info)
99450 void *ptr;
99451
99452 /* Do the allocs. */
99453- ptr = module_alloc_update_bounds(mod->core_size);
99454+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
99455 /*
99456 * The pointer to this block is stored in the module structure
99457 * which is inside the block. Just mark it as not being a
99458@@ -2811,11 +2888,11 @@ static int move_module(struct module *mod, struct load_info *info)
99459 if (!ptr)
99460 return -ENOMEM;
99461
99462- memset(ptr, 0, mod->core_size);
99463- mod->module_core = ptr;
99464+ memset(ptr, 0, mod->core_size_rw);
99465+ mod->module_core_rw = ptr;
99466
99467- if (mod->init_size) {
99468- ptr = module_alloc_update_bounds(mod->init_size);
99469+ if (mod->init_size_rw) {
99470+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
99471 /*
99472 * The pointer to this block is stored in the module structure
99473 * which is inside the block. This block doesn't need to be
99474@@ -2824,13 +2901,45 @@ static int move_module(struct module *mod, struct load_info *info)
99475 */
99476 kmemleak_ignore(ptr);
99477 if (!ptr) {
99478- module_memfree(mod->module_core);
99479+ module_memfree(mod->module_core_rw);
99480 return -ENOMEM;
99481 }
99482- memset(ptr, 0, mod->init_size);
99483- mod->module_init = ptr;
99484+ memset(ptr, 0, mod->init_size_rw);
99485+ mod->module_init_rw = ptr;
99486 } else
99487- mod->module_init = NULL;
99488+ mod->module_init_rw = NULL;
99489+
99490+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
99491+ kmemleak_not_leak(ptr);
99492+ if (!ptr) {
99493+ if (mod->module_init_rw)
99494+ module_memfree(mod->module_init_rw);
99495+ module_memfree(mod->module_core_rw);
99496+ return -ENOMEM;
99497+ }
99498+
99499+ pax_open_kernel();
99500+ memset(ptr, 0, mod->core_size_rx);
99501+ pax_close_kernel();
99502+ mod->module_core_rx = ptr;
99503+
99504+ if (mod->init_size_rx) {
99505+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
99506+ kmemleak_ignore(ptr);
99507+ if (!ptr && mod->init_size_rx) {
99508+ module_memfree_exec(mod->module_core_rx);
99509+ if (mod->module_init_rw)
99510+ module_memfree(mod->module_init_rw);
99511+ module_memfree(mod->module_core_rw);
99512+ return -ENOMEM;
99513+ }
99514+
99515+ pax_open_kernel();
99516+ memset(ptr, 0, mod->init_size_rx);
99517+ pax_close_kernel();
99518+ mod->module_init_rx = ptr;
99519+ } else
99520+ mod->module_init_rx = NULL;
99521
99522 /* Transfer each section which specifies SHF_ALLOC */
99523 pr_debug("final section addresses:\n");
99524@@ -2841,16 +2950,45 @@ static int move_module(struct module *mod, struct load_info *info)
99525 if (!(shdr->sh_flags & SHF_ALLOC))
99526 continue;
99527
99528- if (shdr->sh_entsize & INIT_OFFSET_MASK)
99529- dest = mod->module_init
99530- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99531- else
99532- dest = mod->module_core + shdr->sh_entsize;
99533+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
99534+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
99535+ dest = mod->module_init_rw
99536+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99537+ else
99538+ dest = mod->module_init_rx
99539+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99540+ } else {
99541+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
99542+ dest = mod->module_core_rw + shdr->sh_entsize;
99543+ else
99544+ dest = mod->module_core_rx + shdr->sh_entsize;
99545+ }
99546+
99547+ if (shdr->sh_type != SHT_NOBITS) {
99548+
99549+#ifdef CONFIG_PAX_KERNEXEC
99550+#ifdef CONFIG_X86_64
99551+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
99552+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
99553+#endif
99554+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
99555+ pax_open_kernel();
99556+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
99557+ pax_close_kernel();
99558+ } else
99559+#endif
99560
99561- if (shdr->sh_type != SHT_NOBITS)
99562 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
99563+ }
99564 /* Update sh_addr to point to copy in image. */
99565- shdr->sh_addr = (unsigned long)dest;
99566+
99567+#ifdef CONFIG_PAX_KERNEXEC
99568+ if (shdr->sh_flags & SHF_EXECINSTR)
99569+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
99570+ else
99571+#endif
99572+
99573+ shdr->sh_addr = (unsigned long)dest;
99574 pr_debug("\t0x%lx %s\n",
99575 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
99576 }
99577@@ -2907,12 +3045,12 @@ static void flush_module_icache(const struct module *mod)
99578 * Do it before processing of module parameters, so the module
99579 * can provide parameter accessor functions of its own.
99580 */
99581- if (mod->module_init)
99582- flush_icache_range((unsigned long)mod->module_init,
99583- (unsigned long)mod->module_init
99584- + mod->init_size);
99585- flush_icache_range((unsigned long)mod->module_core,
99586- (unsigned long)mod->module_core + mod->core_size);
99587+ if (mod->module_init_rx)
99588+ flush_icache_range((unsigned long)mod->module_init_rx,
99589+ (unsigned long)mod->module_init_rx
99590+ + mod->init_size_rx);
99591+ flush_icache_range((unsigned long)mod->module_core_rx,
99592+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
99593
99594 set_fs(old_fs);
99595 }
99596@@ -2970,8 +3108,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
99597 {
99598 percpu_modfree(mod);
99599 module_arch_freeing_init(mod);
99600- module_memfree(mod->module_init);
99601- module_memfree(mod->module_core);
99602+ module_memfree_exec(mod->module_init_rx);
99603+ module_memfree_exec(mod->module_core_rx);
99604+ module_memfree(mod->module_init_rw);
99605+ module_memfree(mod->module_core_rw);
99606 }
99607
99608 int __weak module_finalize(const Elf_Ehdr *hdr,
99609@@ -2984,7 +3124,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
99610 static int post_relocation(struct module *mod, const struct load_info *info)
99611 {
99612 /* Sort exception table now relocations are done. */
99613+ pax_open_kernel();
99614 sort_extable(mod->extable, mod->extable + mod->num_exentries);
99615+ pax_close_kernel();
99616
99617 /* Copy relocated percpu area over. */
99618 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
99619@@ -3032,13 +3174,15 @@ static void do_mod_ctors(struct module *mod)
99620 /* For freeing module_init on success, in case kallsyms traversing */
99621 struct mod_initfree {
99622 struct rcu_head rcu;
99623- void *module_init;
99624+ void *module_init_rw;
99625+ void *module_init_rx;
99626 };
99627
99628 static void do_free_init(struct rcu_head *head)
99629 {
99630 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
99631- module_memfree(m->module_init);
99632+ module_memfree(m->module_init_rw);
99633+ module_memfree_exec(m->module_init_rx);
99634 kfree(m);
99635 }
99636
99637@@ -3058,7 +3202,8 @@ static noinline int do_init_module(struct module *mod)
99638 ret = -ENOMEM;
99639 goto fail;
99640 }
99641- freeinit->module_init = mod->module_init;
99642+ freeinit->module_init_rw = mod->module_init_rw;
99643+ freeinit->module_init_rx = mod->module_init_rx;
99644
99645 /*
99646 * We want to find out whether @mod uses async during init. Clear
99647@@ -3117,10 +3262,10 @@ static noinline int do_init_module(struct module *mod)
99648 #endif
99649 unset_module_init_ro_nx(mod);
99650 module_arch_freeing_init(mod);
99651- mod->module_init = NULL;
99652- mod->init_size = 0;
99653- mod->init_ro_size = 0;
99654- mod->init_text_size = 0;
99655+ mod->module_init_rw = NULL;
99656+ mod->module_init_rx = NULL;
99657+ mod->init_size_rw = 0;
99658+ mod->init_size_rx = 0;
99659 /*
99660 * We want to free module_init, but be aware that kallsyms may be
99661 * walking this with preempt disabled. In all the failure paths,
99662@@ -3208,16 +3353,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
99663 module_bug_finalize(info->hdr, info->sechdrs, mod);
99664
99665 /* Set RO and NX regions for core */
99666- set_section_ro_nx(mod->module_core,
99667- mod->core_text_size,
99668- mod->core_ro_size,
99669- mod->core_size);
99670+ set_section_ro_nx(mod->module_core_rx,
99671+ mod->core_size_rx,
99672+ mod->core_size_rx,
99673+ mod->core_size_rx);
99674
99675 /* Set RO and NX regions for init */
99676- set_section_ro_nx(mod->module_init,
99677- mod->init_text_size,
99678- mod->init_ro_size,
99679- mod->init_size);
99680+ set_section_ro_nx(mod->module_init_rx,
99681+ mod->init_size_rx,
99682+ mod->init_size_rx,
99683+ mod->init_size_rx);
99684
99685 /* Mark state as coming so strong_try_module_get() ignores us,
99686 * but kallsyms etc. can see us. */
99687@@ -3301,9 +3446,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
99688 if (err)
99689 goto free_unload;
99690
99691+ /* Now copy in args */
99692+ mod->args = strndup_user(uargs, ~0UL >> 1);
99693+ if (IS_ERR(mod->args)) {
99694+ err = PTR_ERR(mod->args);
99695+ goto free_unload;
99696+ }
99697+
99698 /* Set up MODINFO_ATTR fields */
99699 setup_modinfo(mod, info);
99700
99701+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99702+ {
99703+ char *p, *p2;
99704+
99705+ if (strstr(mod->args, "grsec_modharden_netdev")) {
99706+ 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);
99707+ err = -EPERM;
99708+ goto free_modinfo;
99709+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
99710+ p += sizeof("grsec_modharden_normal") - 1;
99711+ p2 = strstr(p, "_");
99712+ if (p2) {
99713+ *p2 = '\0';
99714+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
99715+ *p2 = '_';
99716+ }
99717+ err = -EPERM;
99718+ goto free_modinfo;
99719+ }
99720+ }
99721+#endif
99722+
99723 /* Fix up syms, so that st_value is a pointer to location. */
99724 err = simplify_symbols(mod, info);
99725 if (err < 0)
99726@@ -3319,13 +3493,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
99727
99728 flush_module_icache(mod);
99729
99730- /* Now copy in args */
99731- mod->args = strndup_user(uargs, ~0UL >> 1);
99732- if (IS_ERR(mod->args)) {
99733- err = PTR_ERR(mod->args);
99734- goto free_arch_cleanup;
99735- }
99736-
99737 dynamic_debug_setup(info->debug, info->num_debug);
99738
99739 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
99740@@ -3376,11 +3543,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
99741 ddebug_cleanup:
99742 dynamic_debug_remove(info->debug);
99743 synchronize_sched();
99744- kfree(mod->args);
99745- free_arch_cleanup:
99746 module_arch_cleanup(mod);
99747 free_modinfo:
99748 free_modinfo(mod);
99749+ kfree(mod->args);
99750 free_unload:
99751 module_unload_free(mod);
99752 unlink_mod:
99753@@ -3393,7 +3559,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
99754 mutex_unlock(&module_mutex);
99755 free_module:
99756 /* Free lock-classes; relies on the preceding sync_rcu() */
99757- lockdep_free_key_range(mod->module_core, mod->core_size);
99758+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
99759+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
99760
99761 module_deallocate(mod, info);
99762 free_copy:
99763@@ -3470,10 +3637,16 @@ static const char *get_ksymbol(struct module *mod,
99764 unsigned long nextval;
99765
99766 /* At worse, next value is at end of module */
99767- if (within_module_init(addr, mod))
99768- nextval = (unsigned long)mod->module_init+mod->init_text_size;
99769+ if (within_module_init_rx(addr, mod))
99770+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
99771+ else if (within_module_init_rw(addr, mod))
99772+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
99773+ else if (within_module_core_rx(addr, mod))
99774+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
99775+ else if (within_module_core_rw(addr, mod))
99776+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
99777 else
99778- nextval = (unsigned long)mod->module_core+mod->core_text_size;
99779+ return NULL;
99780
99781 /* Scan for closest preceding symbol, and next symbol. (ELF
99782 starts real symbols at 1). */
99783@@ -3721,7 +3894,7 @@ static int m_show(struct seq_file *m, void *p)
99784 return 0;
99785
99786 seq_printf(m, "%s %u",
99787- mod->name, mod->init_size + mod->core_size);
99788+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
99789 print_unload_info(m, mod);
99790
99791 /* Informative for users. */
99792@@ -3730,7 +3903,7 @@ static int m_show(struct seq_file *m, void *p)
99793 mod->state == MODULE_STATE_COMING ? "Loading" :
99794 "Live");
99795 /* Used by oprofile and other similar tools. */
99796- seq_printf(m, " 0x%pK", mod->module_core);
99797+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
99798
99799 /* Taints info */
99800 if (mod->taints)
99801@@ -3766,7 +3939,17 @@ static const struct file_operations proc_modules_operations = {
99802
99803 static int __init proc_modules_init(void)
99804 {
99805+#ifndef CONFIG_GRKERNSEC_HIDESYM
99806+#ifdef CONFIG_GRKERNSEC_PROC_USER
99807+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
99808+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99809+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
99810+#else
99811 proc_create("modules", 0, NULL, &proc_modules_operations);
99812+#endif
99813+#else
99814+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
99815+#endif
99816 return 0;
99817 }
99818 module_init(proc_modules_init);
99819@@ -3827,7 +4010,8 @@ struct module *__module_address(unsigned long addr)
99820 {
99821 struct module *mod;
99822
99823- if (addr < module_addr_min || addr > module_addr_max)
99824+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
99825+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
99826 return NULL;
99827
99828 list_for_each_entry_rcu(mod, &modules, list) {
99829@@ -3868,11 +4052,20 @@ bool is_module_text_address(unsigned long addr)
99830 */
99831 struct module *__module_text_address(unsigned long addr)
99832 {
99833- struct module *mod = __module_address(addr);
99834+ struct module *mod;
99835+
99836+#ifdef CONFIG_X86_32
99837+ addr = ktla_ktva(addr);
99838+#endif
99839+
99840+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
99841+ return NULL;
99842+
99843+ mod = __module_address(addr);
99844+
99845 if (mod) {
99846 /* Make sure it's within the text section. */
99847- if (!within(addr, mod->module_init, mod->init_text_size)
99848- && !within(addr, mod->module_core, mod->core_text_size))
99849+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
99850 mod = NULL;
99851 }
99852 return mod;
99853diff --git a/kernel/notifier.c b/kernel/notifier.c
99854index ae9fc7c..5085fbf 100644
99855--- a/kernel/notifier.c
99856+++ b/kernel/notifier.c
99857@@ -5,6 +5,7 @@
99858 #include <linux/rcupdate.h>
99859 #include <linux/vmalloc.h>
99860 #include <linux/reboot.h>
99861+#include <linux/mm.h>
99862
99863 /*
99864 * Notifier list for kernel code which wants to be called
99865@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
99866 while ((*nl) != NULL) {
99867 if (n->priority > (*nl)->priority)
99868 break;
99869- nl = &((*nl)->next);
99870+ nl = (struct notifier_block **)&((*nl)->next);
99871 }
99872- n->next = *nl;
99873+ pax_open_kernel();
99874+ *(const void **)&n->next = *nl;
99875 rcu_assign_pointer(*nl, n);
99876+ pax_close_kernel();
99877 return 0;
99878 }
99879
99880@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
99881 return 0;
99882 if (n->priority > (*nl)->priority)
99883 break;
99884- nl = &((*nl)->next);
99885+ nl = (struct notifier_block **)&((*nl)->next);
99886 }
99887- n->next = *nl;
99888+ pax_open_kernel();
99889+ *(const void **)&n->next = *nl;
99890 rcu_assign_pointer(*nl, n);
99891+ pax_close_kernel();
99892 return 0;
99893 }
99894
99895@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
99896 {
99897 while ((*nl) != NULL) {
99898 if ((*nl) == n) {
99899+ pax_open_kernel();
99900 rcu_assign_pointer(*nl, n->next);
99901+ pax_close_kernel();
99902 return 0;
99903 }
99904- nl = &((*nl)->next);
99905+ nl = (struct notifier_block **)&((*nl)->next);
99906 }
99907 return -ENOENT;
99908 }
99909diff --git a/kernel/padata.c b/kernel/padata.c
99910index b38bea9..91acfbe 100644
99911--- a/kernel/padata.c
99912+++ b/kernel/padata.c
99913@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
99914 * seq_nr mod. number of cpus in use.
99915 */
99916
99917- seq_nr = atomic_inc_return(&pd->seq_nr);
99918+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
99919 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
99920
99921 return padata_index_to_cpu(pd, cpu_index);
99922@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
99923 padata_init_pqueues(pd);
99924 padata_init_squeues(pd);
99925 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
99926- atomic_set(&pd->seq_nr, -1);
99927+ atomic_set_unchecked(&pd->seq_nr, -1);
99928 atomic_set(&pd->reorder_objects, 0);
99929 atomic_set(&pd->refcnt, 0);
99930 pd->pinst = pinst;
99931diff --git a/kernel/panic.c b/kernel/panic.c
99932index 8136ad7..15c857b 100644
99933--- a/kernel/panic.c
99934+++ b/kernel/panic.c
99935@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
99936 /*
99937 * Stop ourself in panic -- architecture code may override this
99938 */
99939-void __weak panic_smp_self_stop(void)
99940+void __weak __noreturn panic_smp_self_stop(void)
99941 {
99942 while (1)
99943 cpu_relax();
99944@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
99945 disable_trace_on_warning();
99946
99947 pr_warn("------------[ cut here ]------------\n");
99948- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
99949+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
99950 raw_smp_processor_id(), current->pid, file, line, caller);
99951
99952 if (args)
99953@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
99954 */
99955 __visible void __stack_chk_fail(void)
99956 {
99957- panic("stack-protector: Kernel stack is corrupted in: %p\n",
99958+ dump_stack();
99959+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
99960 __builtin_return_address(0));
99961 }
99962 EXPORT_SYMBOL(__stack_chk_fail);
99963diff --git a/kernel/pid.c b/kernel/pid.c
99964index cd36a5e..11f185d 100644
99965--- a/kernel/pid.c
99966+++ b/kernel/pid.c
99967@@ -33,6 +33,7 @@
99968 #include <linux/rculist.h>
99969 #include <linux/bootmem.h>
99970 #include <linux/hash.h>
99971+#include <linux/security.h>
99972 #include <linux/pid_namespace.h>
99973 #include <linux/init_task.h>
99974 #include <linux/syscalls.h>
99975@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
99976
99977 int pid_max = PID_MAX_DEFAULT;
99978
99979-#define RESERVED_PIDS 300
99980+#define RESERVED_PIDS 500
99981
99982 int pid_max_min = RESERVED_PIDS + 1;
99983 int pid_max_max = PID_MAX_LIMIT;
99984@@ -450,10 +451,18 @@ EXPORT_SYMBOL(pid_task);
99985 */
99986 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
99987 {
99988+ struct task_struct *task;
99989+
99990 rcu_lockdep_assert(rcu_read_lock_held(),
99991 "find_task_by_pid_ns() needs rcu_read_lock()"
99992 " protection");
99993- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
99994+
99995+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
99996+
99997+ if (gr_pid_is_chrooted(task))
99998+ return NULL;
99999+
100000+ return task;
100001 }
100002
100003 struct task_struct *find_task_by_vpid(pid_t vnr)
100004@@ -461,6 +470,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
100005 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
100006 }
100007
100008+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
100009+{
100010+ rcu_lockdep_assert(rcu_read_lock_held(),
100011+ "find_task_by_pid_ns() needs rcu_read_lock()"
100012+ " protection");
100013+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
100014+}
100015+
100016 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
100017 {
100018 struct pid *pid;
100019diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
100020index a65ba13..f600dbb 100644
100021--- a/kernel/pid_namespace.c
100022+++ b/kernel/pid_namespace.c
100023@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
100024 void __user *buffer, size_t *lenp, loff_t *ppos)
100025 {
100026 struct pid_namespace *pid_ns = task_active_pid_ns(current);
100027- struct ctl_table tmp = *table;
100028+ ctl_table_no_const tmp = *table;
100029
100030 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
100031 return -EPERM;
100032diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
100033index 7e01f78..f5da19d 100644
100034--- a/kernel/power/Kconfig
100035+++ b/kernel/power/Kconfig
100036@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
100037 config HIBERNATION
100038 bool "Hibernation (aka 'suspend to disk')"
100039 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
100040+ depends on !GRKERNSEC_KMEM
100041+ depends on !PAX_MEMORY_SANITIZE
100042 select HIBERNATE_CALLBACKS
100043 select LZO_COMPRESS
100044 select LZO_DECOMPRESS
100045diff --git a/kernel/power/process.c b/kernel/power/process.c
100046index 564f786..361a18e 100644
100047--- a/kernel/power/process.c
100048+++ b/kernel/power/process.c
100049@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
100050 unsigned int elapsed_msecs;
100051 bool wakeup = false;
100052 int sleep_usecs = USEC_PER_MSEC;
100053+ bool timedout = false;
100054
100055 do_gettimeofday(&start);
100056
100057@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
100058
100059 while (true) {
100060 todo = 0;
100061+ if (time_after(jiffies, end_time))
100062+ timedout = true;
100063 read_lock(&tasklist_lock);
100064 for_each_process_thread(g, p) {
100065 if (p == current || !freeze_task(p))
100066 continue;
100067
100068- if (!freezer_should_skip(p))
100069+ if (!freezer_should_skip(p)) {
100070 todo++;
100071+ if (timedout) {
100072+ printk(KERN_ERR "Task refusing to freeze:\n");
100073+ sched_show_task(p);
100074+ }
100075+ }
100076 }
100077 read_unlock(&tasklist_lock);
100078
100079@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
100080 todo += wq_busy;
100081 }
100082
100083- if (!todo || time_after(jiffies, end_time))
100084+ if (!todo || timedout)
100085 break;
100086
100087 if (pm_wakeup_pending()) {
100088diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
100089index bb0635b..9aff9f3 100644
100090--- a/kernel/printk/printk.c
100091+++ b/kernel/printk/printk.c
100092@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
100093 if (from_file && type != SYSLOG_ACTION_OPEN)
100094 return 0;
100095
100096+#ifdef CONFIG_GRKERNSEC_DMESG
100097+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
100098+ return -EPERM;
100099+#endif
100100+
100101 if (syslog_action_restricted(type)) {
100102 if (capable(CAP_SYSLOG))
100103 return 0;
100104diff --git a/kernel/profile.c b/kernel/profile.c
100105index a7bcd28..5b368fa 100644
100106--- a/kernel/profile.c
100107+++ b/kernel/profile.c
100108@@ -37,7 +37,7 @@ struct profile_hit {
100109 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
100110 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
100111
100112-static atomic_t *prof_buffer;
100113+static atomic_unchecked_t *prof_buffer;
100114 static unsigned long prof_len, prof_shift;
100115
100116 int prof_on __read_mostly;
100117@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
100118 hits[i].pc = 0;
100119 continue;
100120 }
100121- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
100122+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
100123 hits[i].hits = hits[i].pc = 0;
100124 }
100125 }
100126@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
100127 * Add the current hit(s) and flush the write-queue out
100128 * to the global buffer:
100129 */
100130- atomic_add(nr_hits, &prof_buffer[pc]);
100131+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
100132 for (i = 0; i < NR_PROFILE_HIT; ++i) {
100133- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
100134+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
100135 hits[i].pc = hits[i].hits = 0;
100136 }
100137 out:
100138@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
100139 {
100140 unsigned long pc;
100141 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
100142- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
100143+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
100144 }
100145 #endif /* !CONFIG_SMP */
100146
100147@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
100148 return -EFAULT;
100149 buf++; p++; count--; read++;
100150 }
100151- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
100152+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
100153 if (copy_to_user(buf, (void *)pnt, count))
100154 return -EFAULT;
100155 read += count;
100156@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
100157 }
100158 #endif
100159 profile_discard_flip_buffers();
100160- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
100161+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
100162 return count;
100163 }
100164
100165diff --git a/kernel/ptrace.c b/kernel/ptrace.c
100166index 9a34bd8..38d90e5 100644
100167--- a/kernel/ptrace.c
100168+++ b/kernel/ptrace.c
100169@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
100170 if (seize)
100171 flags |= PT_SEIZED;
100172 rcu_read_lock();
100173- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
100174+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
100175 flags |= PT_PTRACE_CAP;
100176 rcu_read_unlock();
100177 task->ptrace = flags;
100178@@ -515,7 +515,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
100179 break;
100180 return -EIO;
100181 }
100182- if (copy_to_user(dst, buf, retval))
100183+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
100184 return -EFAULT;
100185 copied += retval;
100186 src += retval;
100187@@ -803,7 +803,7 @@ int ptrace_request(struct task_struct *child, long request,
100188 bool seized = child->ptrace & PT_SEIZED;
100189 int ret = -EIO;
100190 siginfo_t siginfo, *si;
100191- void __user *datavp = (void __user *) data;
100192+ void __user *datavp = (__force void __user *) data;
100193 unsigned long __user *datalp = datavp;
100194 unsigned long flags;
100195
100196@@ -1049,14 +1049,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
100197 goto out;
100198 }
100199
100200+ if (gr_handle_ptrace(child, request)) {
100201+ ret = -EPERM;
100202+ goto out_put_task_struct;
100203+ }
100204+
100205 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
100206 ret = ptrace_attach(child, request, addr, data);
100207 /*
100208 * Some architectures need to do book-keeping after
100209 * a ptrace attach.
100210 */
100211- if (!ret)
100212+ if (!ret) {
100213 arch_ptrace_attach(child);
100214+ gr_audit_ptrace(child);
100215+ }
100216 goto out_put_task_struct;
100217 }
100218
100219@@ -1084,7 +1091,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
100220 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
100221 if (copied != sizeof(tmp))
100222 return -EIO;
100223- return put_user(tmp, (unsigned long __user *)data);
100224+ return put_user(tmp, (__force unsigned long __user *)data);
100225 }
100226
100227 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
100228@@ -1177,7 +1184,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
100229 }
100230
100231 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
100232- compat_long_t, addr, compat_long_t, data)
100233+ compat_ulong_t, addr, compat_ulong_t, data)
100234 {
100235 struct task_struct *child;
100236 long ret;
100237@@ -1193,14 +1200,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
100238 goto out;
100239 }
100240
100241+ if (gr_handle_ptrace(child, request)) {
100242+ ret = -EPERM;
100243+ goto out_put_task_struct;
100244+ }
100245+
100246 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
100247 ret = ptrace_attach(child, request, addr, data);
100248 /*
100249 * Some architectures need to do book-keeping after
100250 * a ptrace attach.
100251 */
100252- if (!ret)
100253+ if (!ret) {
100254 arch_ptrace_attach(child);
100255+ gr_audit_ptrace(child);
100256+ }
100257 goto out_put_task_struct;
100258 }
100259
100260diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
100261index 30d42aa..cac5d66 100644
100262--- a/kernel/rcu/rcutorture.c
100263+++ b/kernel/rcu/rcutorture.c
100264@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
100265 rcu_torture_count) = { 0 };
100266 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
100267 rcu_torture_batch) = { 0 };
100268-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
100269-static atomic_t n_rcu_torture_alloc;
100270-static atomic_t n_rcu_torture_alloc_fail;
100271-static atomic_t n_rcu_torture_free;
100272-static atomic_t n_rcu_torture_mberror;
100273-static atomic_t n_rcu_torture_error;
100274+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
100275+static atomic_unchecked_t n_rcu_torture_alloc;
100276+static atomic_unchecked_t n_rcu_torture_alloc_fail;
100277+static atomic_unchecked_t n_rcu_torture_free;
100278+static atomic_unchecked_t n_rcu_torture_mberror;
100279+static atomic_unchecked_t n_rcu_torture_error;
100280 static long n_rcu_torture_barrier_error;
100281 static long n_rcu_torture_boost_ktrerror;
100282 static long n_rcu_torture_boost_rterror;
100283@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
100284 static long n_rcu_torture_timers;
100285 static long n_barrier_attempts;
100286 static long n_barrier_successes;
100287-static atomic_long_t n_cbfloods;
100288+static atomic_long_unchecked_t n_cbfloods;
100289 static struct list_head rcu_torture_removed;
100290
100291 static int rcu_torture_writer_state;
100292@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
100293
100294 spin_lock_bh(&rcu_torture_lock);
100295 if (list_empty(&rcu_torture_freelist)) {
100296- atomic_inc(&n_rcu_torture_alloc_fail);
100297+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
100298 spin_unlock_bh(&rcu_torture_lock);
100299 return NULL;
100300 }
100301- atomic_inc(&n_rcu_torture_alloc);
100302+ atomic_inc_unchecked(&n_rcu_torture_alloc);
100303 p = rcu_torture_freelist.next;
100304 list_del_init(p);
100305 spin_unlock_bh(&rcu_torture_lock);
100306@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
100307 static void
100308 rcu_torture_free(struct rcu_torture *p)
100309 {
100310- atomic_inc(&n_rcu_torture_free);
100311+ atomic_inc_unchecked(&n_rcu_torture_free);
100312 spin_lock_bh(&rcu_torture_lock);
100313 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
100314 spin_unlock_bh(&rcu_torture_lock);
100315@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
100316 i = rp->rtort_pipe_count;
100317 if (i > RCU_TORTURE_PIPE_LEN)
100318 i = RCU_TORTURE_PIPE_LEN;
100319- atomic_inc(&rcu_torture_wcount[i]);
100320+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
100321 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
100322 rp->rtort_mbtest = 0;
100323 return true;
100324@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
100325 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
100326 do {
100327 schedule_timeout_interruptible(cbflood_inter_holdoff);
100328- atomic_long_inc(&n_cbfloods);
100329+ atomic_long_inc_unchecked(&n_cbfloods);
100330 WARN_ON(signal_pending(current));
100331 for (i = 0; i < cbflood_n_burst; i++) {
100332 for (j = 0; j < cbflood_n_per_burst; j++) {
100333@@ -915,7 +915,7 @@ rcu_torture_writer(void *arg)
100334 i = old_rp->rtort_pipe_count;
100335 if (i > RCU_TORTURE_PIPE_LEN)
100336 i = RCU_TORTURE_PIPE_LEN;
100337- atomic_inc(&rcu_torture_wcount[i]);
100338+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
100339 old_rp->rtort_pipe_count++;
100340 switch (synctype[torture_random(&rand) % nsynctypes]) {
100341 case RTWS_DEF_FREE:
100342@@ -1036,7 +1036,7 @@ static void rcu_torture_timer(unsigned long unused)
100343 return;
100344 }
100345 if (p->rtort_mbtest == 0)
100346- atomic_inc(&n_rcu_torture_mberror);
100347+ atomic_inc_unchecked(&n_rcu_torture_mberror);
100348 spin_lock(&rand_lock);
100349 cur_ops->read_delay(&rand);
100350 n_rcu_torture_timers++;
100351@@ -1111,7 +1111,7 @@ rcu_torture_reader(void *arg)
100352 continue;
100353 }
100354 if (p->rtort_mbtest == 0)
100355- atomic_inc(&n_rcu_torture_mberror);
100356+ atomic_inc_unchecked(&n_rcu_torture_mberror);
100357 cur_ops->read_delay(&rand);
100358 preempt_disable();
100359 pipe_count = p->rtort_pipe_count;
100360@@ -1180,11 +1180,11 @@ rcu_torture_stats_print(void)
100361 rcu_torture_current,
100362 rcu_torture_current_version,
100363 list_empty(&rcu_torture_freelist),
100364- atomic_read(&n_rcu_torture_alloc),
100365- atomic_read(&n_rcu_torture_alloc_fail),
100366- atomic_read(&n_rcu_torture_free));
100367+ atomic_read_unchecked(&n_rcu_torture_alloc),
100368+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
100369+ atomic_read_unchecked(&n_rcu_torture_free));
100370 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
100371- atomic_read(&n_rcu_torture_mberror),
100372+ atomic_read_unchecked(&n_rcu_torture_mberror),
100373 n_rcu_torture_boost_ktrerror,
100374 n_rcu_torture_boost_rterror);
100375 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
100376@@ -1196,17 +1196,17 @@ rcu_torture_stats_print(void)
100377 n_barrier_successes,
100378 n_barrier_attempts,
100379 n_rcu_torture_barrier_error);
100380- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
100381+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
100382
100383 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
100384- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
100385+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
100386 n_rcu_torture_barrier_error != 0 ||
100387 n_rcu_torture_boost_ktrerror != 0 ||
100388 n_rcu_torture_boost_rterror != 0 ||
100389 n_rcu_torture_boost_failure != 0 ||
100390 i > 1) {
100391 pr_cont("%s", "!!! ");
100392- atomic_inc(&n_rcu_torture_error);
100393+ atomic_inc_unchecked(&n_rcu_torture_error);
100394 WARN_ON_ONCE(1);
100395 }
100396 pr_cont("Reader Pipe: ");
100397@@ -1223,7 +1223,7 @@ rcu_torture_stats_print(void)
100398 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
100399 pr_cont("Free-Block Circulation: ");
100400 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
100401- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
100402+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
100403 }
100404 pr_cont("\n");
100405
100406@@ -1570,7 +1570,7 @@ rcu_torture_cleanup(void)
100407
100408 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
100409
100410- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
100411+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
100412 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
100413 else if (torture_onoff_failures())
100414 rcu_torture_print_module_parms(cur_ops,
100415@@ -1695,18 +1695,18 @@ rcu_torture_init(void)
100416
100417 rcu_torture_current = NULL;
100418 rcu_torture_current_version = 0;
100419- atomic_set(&n_rcu_torture_alloc, 0);
100420- atomic_set(&n_rcu_torture_alloc_fail, 0);
100421- atomic_set(&n_rcu_torture_free, 0);
100422- atomic_set(&n_rcu_torture_mberror, 0);
100423- atomic_set(&n_rcu_torture_error, 0);
100424+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
100425+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
100426+ atomic_set_unchecked(&n_rcu_torture_free, 0);
100427+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
100428+ atomic_set_unchecked(&n_rcu_torture_error, 0);
100429 n_rcu_torture_barrier_error = 0;
100430 n_rcu_torture_boost_ktrerror = 0;
100431 n_rcu_torture_boost_rterror = 0;
100432 n_rcu_torture_boost_failure = 0;
100433 n_rcu_torture_boosts = 0;
100434 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
100435- atomic_set(&rcu_torture_wcount[i], 0);
100436+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
100437 for_each_possible_cpu(cpu) {
100438 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
100439 per_cpu(rcu_torture_count, cpu)[i] = 0;
100440diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
100441index cc9ceca..ce075a6 100644
100442--- a/kernel/rcu/tiny.c
100443+++ b/kernel/rcu/tiny.c
100444@@ -42,7 +42,7 @@
100445 /* Forward declarations for tiny_plugin.h. */
100446 struct rcu_ctrlblk;
100447 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
100448-static void rcu_process_callbacks(struct softirq_action *unused);
100449+static void rcu_process_callbacks(void);
100450 static void __call_rcu(struct rcu_head *head,
100451 void (*func)(struct rcu_head *rcu),
100452 struct rcu_ctrlblk *rcp);
100453@@ -210,7 +210,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
100454 false));
100455 }
100456
100457-static void rcu_process_callbacks(struct softirq_action *unused)
100458+static __latent_entropy void rcu_process_callbacks(void)
100459 {
100460 __rcu_process_callbacks(&rcu_sched_ctrlblk);
100461 __rcu_process_callbacks(&rcu_bh_ctrlblk);
100462diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
100463index f94e209..d2985bd 100644
100464--- a/kernel/rcu/tiny_plugin.h
100465+++ b/kernel/rcu/tiny_plugin.h
100466@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
100467 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
100468 jiffies - rcp->gp_start, rcp->qlen);
100469 dump_stack();
100470- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
100471+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
100472 3 * rcu_jiffies_till_stall_check() + 3;
100473 } else if (ULONG_CMP_GE(j, js)) {
100474- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100475+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100476 }
100477 }
100478
100479@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
100480 {
100481 rcp->ticks_this_gp = 0;
100482 rcp->gp_start = jiffies;
100483- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100484+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100485 }
100486
100487 static void check_cpu_stalls(void)
100488diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
100489index 48d640c..9401d30 100644
100490--- a/kernel/rcu/tree.c
100491+++ b/kernel/rcu/tree.c
100492@@ -268,7 +268,7 @@ static void rcu_momentary_dyntick_idle(void)
100493 */
100494 rdtp = this_cpu_ptr(&rcu_dynticks);
100495 smp_mb__before_atomic(); /* Earlier stuff before QS. */
100496- atomic_add(2, &rdtp->dynticks); /* QS. */
100497+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
100498 smp_mb__after_atomic(); /* Later stuff after QS. */
100499 break;
100500 }
100501@@ -580,9 +580,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
100502 rcu_prepare_for_idle();
100503 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
100504 smp_mb__before_atomic(); /* See above. */
100505- atomic_inc(&rdtp->dynticks);
100506+ atomic_inc_unchecked(&rdtp->dynticks);
100507 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
100508- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
100509+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
100510 rcu_dynticks_task_enter();
100511
100512 /*
100513@@ -703,10 +703,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
100514
100515 rcu_dynticks_task_exit();
100516 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
100517- atomic_inc(&rdtp->dynticks);
100518+ atomic_inc_unchecked(&rdtp->dynticks);
100519 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
100520 smp_mb__after_atomic(); /* See above. */
100521- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100522+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100523 rcu_cleanup_after_idle();
100524 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
100525 if (!user && !is_idle_task(current)) {
100526@@ -840,12 +840,12 @@ void rcu_nmi_enter(void)
100527 * to be in the outermost NMI handler that interrupted an RCU-idle
100528 * period (observation due to Andy Lutomirski).
100529 */
100530- if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
100531+ if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
100532 smp_mb__before_atomic(); /* Force delay from prior write. */
100533- atomic_inc(&rdtp->dynticks);
100534+ atomic_inc_unchecked(&rdtp->dynticks);
100535 /* atomic_inc() before later RCU read-side crit sects */
100536 smp_mb__after_atomic(); /* See above. */
100537- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100538+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100539 incby = 1;
100540 }
100541 rdtp->dynticks_nmi_nesting += incby;
100542@@ -870,7 +870,7 @@ void rcu_nmi_exit(void)
100543 * to us!)
100544 */
100545 WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
100546- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100547+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100548
100549 /*
100550 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
100551@@ -885,9 +885,9 @@ void rcu_nmi_exit(void)
100552 rdtp->dynticks_nmi_nesting = 0;
100553 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
100554 smp_mb__before_atomic(); /* See above. */
100555- atomic_inc(&rdtp->dynticks);
100556+ atomic_inc_unchecked(&rdtp->dynticks);
100557 smp_mb__after_atomic(); /* Force delay to next write. */
100558- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
100559+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
100560 }
100561
100562 /**
100563@@ -900,7 +900,7 @@ void rcu_nmi_exit(void)
100564 */
100565 bool notrace __rcu_is_watching(void)
100566 {
100567- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
100568+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
100569 }
100570
100571 /**
100572@@ -983,7 +983,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
100573 static int dyntick_save_progress_counter(struct rcu_data *rdp,
100574 bool *isidle, unsigned long *maxj)
100575 {
100576- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
100577+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
100578 rcu_sysidle_check_cpu(rdp, isidle, maxj);
100579 if ((rdp->dynticks_snap & 0x1) == 0) {
100580 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
100581@@ -991,7 +991,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
100582 } else {
100583 if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
100584 rdp->mynode->gpnum))
100585- ACCESS_ONCE(rdp->gpwrap) = true;
100586+ ACCESS_ONCE_RW(rdp->gpwrap) = true;
100587 return 0;
100588 }
100589 }
100590@@ -1009,7 +1009,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
100591 int *rcrmp;
100592 unsigned int snap;
100593
100594- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
100595+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
100596 snap = (unsigned int)rdp->dynticks_snap;
100597
100598 /*
100599@@ -1072,10 +1072,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
100600 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
100601 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
100602 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
100603- ACCESS_ONCE(rdp->cond_resched_completed) =
100604+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
100605 ACCESS_ONCE(rdp->mynode->completed);
100606 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
100607- ACCESS_ONCE(*rcrmp) =
100608+ ACCESS_ONCE_RW(*rcrmp) =
100609 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
100610 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
100611 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
100612@@ -1097,7 +1097,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
100613 rsp->gp_start = j;
100614 smp_wmb(); /* Record start time before stall time. */
100615 j1 = rcu_jiffies_till_stall_check();
100616- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
100617+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
100618 rsp->jiffies_resched = j + j1 / 2;
100619 rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
100620 }
100621@@ -1156,7 +1156,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
100622 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100623 return;
100624 }
100625- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
100626+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
100627 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100628
100629 /*
100630@@ -1240,7 +1240,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
100631
100632 raw_spin_lock_irqsave(&rnp->lock, flags);
100633 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
100634- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
100635+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
100636 3 * rcu_jiffies_till_stall_check() + 3;
100637 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100638
100639@@ -1324,7 +1324,7 @@ void rcu_cpu_stall_reset(void)
100640 struct rcu_state *rsp;
100641
100642 for_each_rcu_flavor(rsp)
100643- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
100644+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
100645 }
100646
100647 /*
100648@@ -1671,7 +1671,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
100649 rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
100650 rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
100651 zero_cpu_stall_ticks(rdp);
100652- ACCESS_ONCE(rdp->gpwrap) = false;
100653+ ACCESS_ONCE_RW(rdp->gpwrap) = false;
100654 }
100655 return ret;
100656 }
100657@@ -1706,7 +1706,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100658 struct rcu_data *rdp;
100659 struct rcu_node *rnp = rcu_get_root(rsp);
100660
100661- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100662+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100663 rcu_bind_gp_kthread();
100664 raw_spin_lock_irq(&rnp->lock);
100665 smp_mb__after_unlock_lock();
100666@@ -1715,7 +1715,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100667 raw_spin_unlock_irq(&rnp->lock);
100668 return 0;
100669 }
100670- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
100671+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
100672
100673 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
100674 /*
100675@@ -1756,9 +1756,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
100676 rdp = this_cpu_ptr(rsp->rda);
100677 rcu_preempt_check_blocked_tasks(rnp);
100678 rnp->qsmask = rnp->qsmaskinit;
100679- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
100680+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
100681 WARN_ON_ONCE(rnp->completed != rsp->completed);
100682- ACCESS_ONCE(rnp->completed) = rsp->completed;
100683+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
100684 if (rnp == rdp->mynode)
100685 (void)__note_gp_changes(rsp, rnp, rdp);
100686 rcu_preempt_boost_start_gp(rnp);
100687@@ -1767,7 +1767,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100688 rnp->grphi, rnp->qsmask);
100689 raw_spin_unlock_irq(&rnp->lock);
100690 cond_resched_rcu_qs();
100691- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100692+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100693 }
100694
100695 mutex_unlock(&rsp->onoff_mutex);
100696@@ -1784,7 +1784,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
100697 unsigned long maxj;
100698 struct rcu_node *rnp = rcu_get_root(rsp);
100699
100700- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100701+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100702 rsp->n_force_qs++;
100703 if (fqs_state == RCU_SAVE_DYNTICK) {
100704 /* Collect dyntick-idle snapshots. */
100705@@ -1805,7 +1805,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
100706 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
100707 raw_spin_lock_irq(&rnp->lock);
100708 smp_mb__after_unlock_lock();
100709- ACCESS_ONCE(rsp->gp_flags) =
100710+ ACCESS_ONCE_RW(rsp->gp_flags) =
100711 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
100712 raw_spin_unlock_irq(&rnp->lock);
100713 }
100714@@ -1823,7 +1823,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100715 struct rcu_data *rdp;
100716 struct rcu_node *rnp = rcu_get_root(rsp);
100717
100718- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100719+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100720 raw_spin_lock_irq(&rnp->lock);
100721 smp_mb__after_unlock_lock();
100722 gp_duration = jiffies - rsp->gp_start;
100723@@ -1852,7 +1852,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100724 rcu_for_each_node_breadth_first(rsp, rnp) {
100725 raw_spin_lock_irq(&rnp->lock);
100726 smp_mb__after_unlock_lock();
100727- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
100728+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
100729 rdp = this_cpu_ptr(rsp->rda);
100730 if (rnp == rdp->mynode)
100731 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
100732@@ -1860,7 +1860,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100733 nocb += rcu_future_gp_cleanup(rsp, rnp);
100734 raw_spin_unlock_irq(&rnp->lock);
100735 cond_resched_rcu_qs();
100736- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100737+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100738 }
100739 rnp = rcu_get_root(rsp);
100740 raw_spin_lock_irq(&rnp->lock);
100741@@ -1868,14 +1868,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100742 rcu_nocb_gp_set(rnp, nocb);
100743
100744 /* Declare grace period done. */
100745- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
100746+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
100747 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
100748 rsp->fqs_state = RCU_GP_IDLE;
100749 rdp = this_cpu_ptr(rsp->rda);
100750 /* Advance CBs to reduce false positives below. */
100751 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
100752 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
100753- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100754+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100755 trace_rcu_grace_period(rsp->name,
100756 ACCESS_ONCE(rsp->gpnum),
100757 TPS("newreq"));
100758@@ -1910,7 +1910,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
100759 if (rcu_gp_init(rsp))
100760 break;
100761 cond_resched_rcu_qs();
100762- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100763+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100764 WARN_ON(signal_pending(current));
100765 trace_rcu_grace_period(rsp->name,
100766 ACCESS_ONCE(rsp->gpnum),
100767@@ -1954,11 +1954,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
100768 ACCESS_ONCE(rsp->gpnum),
100769 TPS("fqsend"));
100770 cond_resched_rcu_qs();
100771- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100772+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100773 } else {
100774 /* Deal with stray signal. */
100775 cond_resched_rcu_qs();
100776- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100777+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100778 WARN_ON(signal_pending(current));
100779 trace_rcu_grace_period(rsp->name,
100780 ACCESS_ONCE(rsp->gpnum),
100781@@ -2003,7 +2003,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
100782 */
100783 return false;
100784 }
100785- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100786+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100787 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
100788 TPS("newreq"));
100789
100790@@ -2228,7 +2228,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
100791 rsp->qlen += rdp->qlen;
100792 rdp->n_cbs_orphaned += rdp->qlen;
100793 rdp->qlen_lazy = 0;
100794- ACCESS_ONCE(rdp->qlen) = 0;
100795+ ACCESS_ONCE_RW(rdp->qlen) = 0;
100796 }
100797
100798 /*
100799@@ -2490,7 +2490,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
100800 }
100801 smp_mb(); /* List handling before counting for rcu_barrier(). */
100802 rdp->qlen_lazy -= count_lazy;
100803- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
100804+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
100805 rdp->n_cbs_invoked += count;
100806
100807 /* Reinstate batch limit if we have worked down the excess. */
100808@@ -2647,7 +2647,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
100809 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
100810 return; /* Someone beat us to it. */
100811 }
100812- ACCESS_ONCE(rsp->gp_flags) =
100813+ ACCESS_ONCE_RW(rsp->gp_flags) =
100814 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
100815 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
100816 rcu_gp_kthread_wake(rsp);
100817@@ -2693,7 +2693,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
100818 /*
100819 * Do RCU core processing for the current CPU.
100820 */
100821-static void rcu_process_callbacks(struct softirq_action *unused)
100822+static void rcu_process_callbacks(void)
100823 {
100824 struct rcu_state *rsp;
100825
100826@@ -2805,7 +2805,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
100827 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
100828 if (debug_rcu_head_queue(head)) {
100829 /* Probable double call_rcu(), so leak the callback. */
100830- ACCESS_ONCE(head->func) = rcu_leak_callback;
100831+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
100832 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
100833 return;
100834 }
100835@@ -2833,7 +2833,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
100836 local_irq_restore(flags);
100837 return;
100838 }
100839- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
100840+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
100841 if (lazy)
100842 rdp->qlen_lazy++;
100843 else
100844@@ -3106,11 +3106,11 @@ void synchronize_sched_expedited(void)
100845 * counter wrap on a 32-bit system. Quite a few more CPUs would of
100846 * course be required on a 64-bit system.
100847 */
100848- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
100849+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
100850 (ulong)atomic_long_read(&rsp->expedited_done) +
100851 ULONG_MAX / 8)) {
100852 synchronize_sched();
100853- atomic_long_inc(&rsp->expedited_wrap);
100854+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
100855 return;
100856 }
100857
100858@@ -3118,12 +3118,12 @@ void synchronize_sched_expedited(void)
100859 * Take a ticket. Note that atomic_inc_return() implies a
100860 * full memory barrier.
100861 */
100862- snap = atomic_long_inc_return(&rsp->expedited_start);
100863+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
100864 firstsnap = snap;
100865 if (!try_get_online_cpus()) {
100866 /* CPU hotplug operation in flight, fall back to normal GP. */
100867 wait_rcu_gp(call_rcu_sched);
100868- atomic_long_inc(&rsp->expedited_normal);
100869+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100870 return;
100871 }
100872 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
100873@@ -3136,7 +3136,7 @@ void synchronize_sched_expedited(void)
100874 for_each_cpu(cpu, cm) {
100875 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
100876
100877- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
100878+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
100879 cpumask_clear_cpu(cpu, cm);
100880 }
100881 if (cpumask_weight(cm) == 0)
100882@@ -3151,14 +3151,14 @@ void synchronize_sched_expedited(void)
100883 synchronize_sched_expedited_cpu_stop,
100884 NULL) == -EAGAIN) {
100885 put_online_cpus();
100886- atomic_long_inc(&rsp->expedited_tryfail);
100887+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
100888
100889 /* Check to see if someone else did our work for us. */
100890 s = atomic_long_read(&rsp->expedited_done);
100891 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
100892 /* ensure test happens before caller kfree */
100893 smp_mb__before_atomic(); /* ^^^ */
100894- atomic_long_inc(&rsp->expedited_workdone1);
100895+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
100896 free_cpumask_var(cm);
100897 return;
100898 }
100899@@ -3168,7 +3168,7 @@ void synchronize_sched_expedited(void)
100900 udelay(trycount * num_online_cpus());
100901 } else {
100902 wait_rcu_gp(call_rcu_sched);
100903- atomic_long_inc(&rsp->expedited_normal);
100904+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100905 free_cpumask_var(cm);
100906 return;
100907 }
100908@@ -3178,7 +3178,7 @@ void synchronize_sched_expedited(void)
100909 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
100910 /* ensure test happens before caller kfree */
100911 smp_mb__before_atomic(); /* ^^^ */
100912- atomic_long_inc(&rsp->expedited_workdone2);
100913+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
100914 free_cpumask_var(cm);
100915 return;
100916 }
100917@@ -3193,14 +3193,14 @@ void synchronize_sched_expedited(void)
100918 if (!try_get_online_cpus()) {
100919 /* CPU hotplug operation in flight, use normal GP. */
100920 wait_rcu_gp(call_rcu_sched);
100921- atomic_long_inc(&rsp->expedited_normal);
100922+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100923 free_cpumask_var(cm);
100924 return;
100925 }
100926- snap = atomic_long_read(&rsp->expedited_start);
100927+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
100928 smp_mb(); /* ensure read is before try_stop_cpus(). */
100929 }
100930- atomic_long_inc(&rsp->expedited_stoppedcpus);
100931+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
100932
100933 all_cpus_idle:
100934 free_cpumask_var(cm);
100935@@ -3212,16 +3212,16 @@ all_cpus_idle:
100936 * than we did already did their update.
100937 */
100938 do {
100939- atomic_long_inc(&rsp->expedited_done_tries);
100940+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
100941 s = atomic_long_read(&rsp->expedited_done);
100942 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
100943 /* ensure test happens before caller kfree */
100944 smp_mb__before_atomic(); /* ^^^ */
100945- atomic_long_inc(&rsp->expedited_done_lost);
100946+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
100947 break;
100948 }
100949 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
100950- atomic_long_inc(&rsp->expedited_done_exit);
100951+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
100952
100953 put_online_cpus();
100954 }
100955@@ -3431,7 +3431,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
100956 * ACCESS_ONCE() to prevent the compiler from speculating
100957 * the increment to precede the early-exit check.
100958 */
100959- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100960+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100961 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
100962 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
100963 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
100964@@ -3487,7 +3487,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
100965
100966 /* Increment ->n_barrier_done to prevent duplicate work. */
100967 smp_mb(); /* Keep increment after above mechanism. */
100968- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100969+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100970 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
100971 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
100972 smp_mb(); /* Keep increment before caller's subsequent code. */
100973@@ -3532,7 +3532,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
100974 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
100975 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
100976 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
100977- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
100978+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
100979 rdp->cpu = cpu;
100980 rdp->rsp = rsp;
100981 rcu_boot_init_nocb_percpu_data(rdp);
100982@@ -3565,8 +3565,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
100983 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
100984 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
100985 rcu_sysidle_init_percpu_data(rdp->dynticks);
100986- atomic_set(&rdp->dynticks->dynticks,
100987- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
100988+ atomic_set_unchecked(&rdp->dynticks->dynticks,
100989+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
100990 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
100991
100992 /* Add CPU to rcu_node bitmasks. */
100993diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
100994index 119de39..f07d31a 100644
100995--- a/kernel/rcu/tree.h
100996+++ b/kernel/rcu/tree.h
100997@@ -86,11 +86,11 @@ struct rcu_dynticks {
100998 long long dynticks_nesting; /* Track irq/process nesting level. */
100999 /* Process level is worth LLONG_MAX/2. */
101000 int dynticks_nmi_nesting; /* Track NMI nesting level. */
101001- atomic_t dynticks; /* Even value for idle, else odd. */
101002+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
101003 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
101004 long long dynticks_idle_nesting;
101005 /* irq/process nesting level from idle. */
101006- atomic_t dynticks_idle; /* Even value for idle, else odd. */
101007+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
101008 /* "Idle" excludes userspace execution. */
101009 unsigned long dynticks_idle_jiffies;
101010 /* End of last non-NMI non-idle period. */
101011@@ -457,17 +457,17 @@ struct rcu_state {
101012 /* _rcu_barrier(). */
101013 /* End of fields guarded by barrier_mutex. */
101014
101015- atomic_long_t expedited_start; /* Starting ticket. */
101016- atomic_long_t expedited_done; /* Done ticket. */
101017- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
101018- atomic_long_t expedited_tryfail; /* # acquisition failures. */
101019- atomic_long_t expedited_workdone1; /* # done by others #1. */
101020- atomic_long_t expedited_workdone2; /* # done by others #2. */
101021- atomic_long_t expedited_normal; /* # fallbacks to normal. */
101022- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
101023- atomic_long_t expedited_done_tries; /* # tries to update _done. */
101024- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
101025- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
101026+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
101027+ atomic_long_t expedited_done; /* Done ticket. */
101028+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
101029+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
101030+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
101031+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
101032+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
101033+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
101034+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
101035+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
101036+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
101037
101038 unsigned long jiffies_force_qs; /* Time at which to invoke */
101039 /* force_quiescent_state(). */
101040diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
101041index 0a571e9..fbfd611 100644
101042--- a/kernel/rcu/tree_plugin.h
101043+++ b/kernel/rcu/tree_plugin.h
101044@@ -619,7 +619,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
101045 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
101046 {
101047 return !rcu_preempted_readers_exp(rnp) &&
101048- ACCESS_ONCE(rnp->expmask) == 0;
101049+ ACCESS_ONCE_RW(rnp->expmask) == 0;
101050 }
101051
101052 /*
101053@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
101054
101055 /* Clean up and exit. */
101056 smp_mb(); /* ensure expedited GP seen before counter increment. */
101057- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
101058+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
101059 sync_rcu_preempt_exp_count + 1;
101060 unlock_mb_ret:
101061 mutex_unlock(&sync_rcu_preempt_exp_mutex);
101062@@ -1290,7 +1290,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
101063 free_cpumask_var(cm);
101064 }
101065
101066-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
101067+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
101068 .store = &rcu_cpu_kthread_task,
101069 .thread_should_run = rcu_cpu_kthread_should_run,
101070 .thread_fn = rcu_cpu_kthread,
101071@@ -1761,7 +1761,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
101072 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
101073 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u fqs=%ld %s\n",
101074 cpu, ticks_value, ticks_title,
101075- atomic_read(&rdtp->dynticks) & 0xfff,
101076+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
101077 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
101078 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
101079 ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
101080@@ -1906,7 +1906,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
101081 return;
101082 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
101083 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
101084- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
101085+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
101086 wake_up(&rdp_leader->nocb_wq);
101087 }
101088 }
101089@@ -1978,7 +1978,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
101090 atomic_long_add(rhcount, &rdp->nocb_q_count);
101091 /* rcu_barrier() relies on ->nocb_q_count add before xchg. */
101092 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
101093- ACCESS_ONCE(*old_rhpp) = rhp;
101094+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
101095 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
101096 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
101097
101098@@ -2167,7 +2167,7 @@ wait_again:
101099 continue; /* No CBs here, try next follower. */
101100
101101 /* Move callbacks to wait-for-GP list, which is empty. */
101102- ACCESS_ONCE(rdp->nocb_head) = NULL;
101103+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
101104 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
101105 gotcbs = true;
101106 }
101107@@ -2288,7 +2288,7 @@ static int rcu_nocb_kthread(void *arg)
101108 list = ACCESS_ONCE(rdp->nocb_follower_head);
101109 BUG_ON(!list);
101110 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
101111- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
101112+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
101113 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
101114
101115 /* Each pass through the following loop invokes a callback. */
101116@@ -2338,7 +2338,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
101117 if (!rcu_nocb_need_deferred_wakeup(rdp))
101118 return;
101119 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
101120- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
101121+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
101122 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
101123 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
101124 }
101125@@ -2461,7 +2461,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
101126 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
101127 "rcuo%c/%d", rsp->abbr, cpu);
101128 BUG_ON(IS_ERR(t));
101129- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
101130+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
101131 }
101132
101133 /*
101134@@ -2666,11 +2666,11 @@ static void rcu_sysidle_enter(int irq)
101135
101136 /* Record start of fully idle period. */
101137 j = jiffies;
101138- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
101139+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
101140 smp_mb__before_atomic();
101141- atomic_inc(&rdtp->dynticks_idle);
101142+ atomic_inc_unchecked(&rdtp->dynticks_idle);
101143 smp_mb__after_atomic();
101144- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
101145+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
101146 }
101147
101148 /*
101149@@ -2741,9 +2741,9 @@ static void rcu_sysidle_exit(int irq)
101150
101151 /* Record end of idle period. */
101152 smp_mb__before_atomic();
101153- atomic_inc(&rdtp->dynticks_idle);
101154+ atomic_inc_unchecked(&rdtp->dynticks_idle);
101155 smp_mb__after_atomic();
101156- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
101157+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
101158
101159 /*
101160 * If we are the timekeeping CPU, we are permitted to be non-idle
101161@@ -2788,7 +2788,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
101162 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
101163
101164 /* Pick up current idle and NMI-nesting counter and check. */
101165- cur = atomic_read(&rdtp->dynticks_idle);
101166+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
101167 if (cur & 0x1) {
101168 *isidle = false; /* We are not idle! */
101169 return;
101170@@ -2837,7 +2837,7 @@ static void rcu_sysidle(unsigned long j)
101171 case RCU_SYSIDLE_NOT:
101172
101173 /* First time all are idle, so note a short idle period. */
101174- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
101175+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
101176 break;
101177
101178 case RCU_SYSIDLE_SHORT:
101179@@ -2875,7 +2875,7 @@ static void rcu_sysidle_cancel(void)
101180 {
101181 smp_mb();
101182 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
101183- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
101184+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
101185 }
101186
101187 /*
101188@@ -2927,7 +2927,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
101189 smp_mb(); /* grace period precedes setting inuse. */
101190
101191 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
101192- ACCESS_ONCE(rshp->inuse) = 0;
101193+ ACCESS_ONCE_RW(rshp->inuse) = 0;
101194 }
101195
101196 /*
101197@@ -3080,7 +3080,7 @@ static void rcu_bind_gp_kthread(void)
101198 static void rcu_dynticks_task_enter(void)
101199 {
101200 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
101201- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
101202+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
101203 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
101204 }
101205
101206@@ -3088,6 +3088,6 @@ static void rcu_dynticks_task_enter(void)
101207 static void rcu_dynticks_task_exit(void)
101208 {
101209 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
101210- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
101211+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
101212 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
101213 }
101214diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
101215index fbb6240..f6c5097 100644
101216--- a/kernel/rcu/tree_trace.c
101217+++ b/kernel/rcu/tree_trace.c
101218@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
101219 rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
101220 rdp->qs_pending);
101221 seq_printf(m, " dt=%d/%llx/%d df=%lu",
101222- atomic_read(&rdp->dynticks->dynticks),
101223+ atomic_read_unchecked(&rdp->dynticks->dynticks),
101224 rdp->dynticks->dynticks_nesting,
101225 rdp->dynticks->dynticks_nmi_nesting,
101226 rdp->dynticks_fqs);
101227@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
101228 struct rcu_state *rsp = (struct rcu_state *)m->private;
101229
101230 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",
101231- atomic_long_read(&rsp->expedited_start),
101232+ atomic_long_read_unchecked(&rsp->expedited_start),
101233 atomic_long_read(&rsp->expedited_done),
101234- atomic_long_read(&rsp->expedited_wrap),
101235- atomic_long_read(&rsp->expedited_tryfail),
101236- atomic_long_read(&rsp->expedited_workdone1),
101237- atomic_long_read(&rsp->expedited_workdone2),
101238- atomic_long_read(&rsp->expedited_normal),
101239- atomic_long_read(&rsp->expedited_stoppedcpus),
101240- atomic_long_read(&rsp->expedited_done_tries),
101241- atomic_long_read(&rsp->expedited_done_lost),
101242- atomic_long_read(&rsp->expedited_done_exit));
101243+ atomic_long_read_unchecked(&rsp->expedited_wrap),
101244+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
101245+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
101246+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
101247+ atomic_long_read_unchecked(&rsp->expedited_normal),
101248+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
101249+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
101250+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
101251+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
101252 return 0;
101253 }
101254
101255diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
101256index e0d31a3..f4dafe3 100644
101257--- a/kernel/rcu/update.c
101258+++ b/kernel/rcu/update.c
101259@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
101260 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
101261 */
101262 if (till_stall_check < 3) {
101263- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
101264+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
101265 till_stall_check = 3;
101266 } else if (till_stall_check > 300) {
101267- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
101268+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
101269 till_stall_check = 300;
101270 }
101271 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
101272@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
101273 !ACCESS_ONCE(t->on_rq) ||
101274 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
101275 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
101276- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
101277+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
101278 list_del_init(&t->rcu_tasks_holdout_list);
101279 put_task_struct(t);
101280 return;
101281@@ -589,7 +589,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
101282 !is_idle_task(t)) {
101283 get_task_struct(t);
101284 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
101285- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
101286+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
101287 list_add(&t->rcu_tasks_holdout_list,
101288 &rcu_tasks_holdouts);
101289 }
101290@@ -686,7 +686,7 @@ static void rcu_spawn_tasks_kthread(void)
101291 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
101292 BUG_ON(IS_ERR(t));
101293 smp_mb(); /* Ensure others see full kthread. */
101294- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
101295+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
101296 mutex_unlock(&rcu_tasks_kthread_mutex);
101297 }
101298
101299diff --git a/kernel/resource.c b/kernel/resource.c
101300index 19f2357..ebe7f35 100644
101301--- a/kernel/resource.c
101302+++ b/kernel/resource.c
101303@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
101304
101305 static int __init ioresources_init(void)
101306 {
101307+#ifdef CONFIG_GRKERNSEC_PROC_ADD
101308+#ifdef CONFIG_GRKERNSEC_PROC_USER
101309+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
101310+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
101311+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
101312+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
101313+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
101314+#endif
101315+#else
101316 proc_create("ioports", 0, NULL, &proc_ioports_operations);
101317 proc_create("iomem", 0, NULL, &proc_iomem_operations);
101318+#endif
101319 return 0;
101320 }
101321 __initcall(ioresources_init);
101322diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
101323index eae160d..c9aa22e 100644
101324--- a/kernel/sched/auto_group.c
101325+++ b/kernel/sched/auto_group.c
101326@@ -11,7 +11,7 @@
101327
101328 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
101329 static struct autogroup autogroup_default;
101330-static atomic_t autogroup_seq_nr;
101331+static atomic_unchecked_t autogroup_seq_nr;
101332
101333 void __init autogroup_init(struct task_struct *init_task)
101334 {
101335@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
101336
101337 kref_init(&ag->kref);
101338 init_rwsem(&ag->lock);
101339- ag->id = atomic_inc_return(&autogroup_seq_nr);
101340+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
101341 ag->tg = tg;
101342 #ifdef CONFIG_RT_GROUP_SCHED
101343 /*
101344diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
101345index 8d0f35d..c16360d 100644
101346--- a/kernel/sched/completion.c
101347+++ b/kernel/sched/completion.c
101348@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
101349 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
101350 * or number of jiffies left till timeout) if completed.
101351 */
101352-long __sched
101353+long __sched __intentional_overflow(-1)
101354 wait_for_completion_interruptible_timeout(struct completion *x,
101355 unsigned long timeout)
101356 {
101357@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
101358 *
101359 * Return: -ERESTARTSYS if interrupted, 0 if completed.
101360 */
101361-int __sched wait_for_completion_killable(struct completion *x)
101362+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
101363 {
101364 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
101365 if (t == -ERESTARTSYS)
101366@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
101367 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
101368 * or number of jiffies left till timeout) if completed.
101369 */
101370-long __sched
101371+long __sched __intentional_overflow(-1)
101372 wait_for_completion_killable_timeout(struct completion *x,
101373 unsigned long timeout)
101374 {
101375diff --git a/kernel/sched/core.c b/kernel/sched/core.c
101376index f4da2cb..e44587b 100644
101377--- a/kernel/sched/core.c
101378+++ b/kernel/sched/core.c
101379@@ -1862,7 +1862,7 @@ void set_numabalancing_state(bool enabled)
101380 int sysctl_numa_balancing(struct ctl_table *table, int write,
101381 void __user *buffer, size_t *lenp, loff_t *ppos)
101382 {
101383- struct ctl_table t;
101384+ ctl_table_no_const t;
101385 int err;
101386 int state = numabalancing_enabled;
101387
101388@@ -2312,8 +2312,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
101389 next->active_mm = oldmm;
101390 atomic_inc(&oldmm->mm_count);
101391 enter_lazy_tlb(oldmm, next);
101392- } else
101393+ } else {
101394 switch_mm(oldmm, mm, next);
101395+ populate_stack();
101396+ }
101397
101398 if (!prev->mm) {
101399 prev->active_mm = NULL;
101400@@ -3124,6 +3126,8 @@ int can_nice(const struct task_struct *p, const int nice)
101401 /* convert nice value [19,-20] to rlimit style value [1,40] */
101402 int nice_rlim = nice_to_rlimit(nice);
101403
101404+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
101405+
101406 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
101407 capable(CAP_SYS_NICE));
101408 }
101409@@ -3150,7 +3154,8 @@ SYSCALL_DEFINE1(nice, int, increment)
101410 nice = task_nice(current) + increment;
101411
101412 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
101413- if (increment < 0 && !can_nice(current, nice))
101414+ if (increment < 0 && (!can_nice(current, nice) ||
101415+ gr_handle_chroot_nice()))
101416 return -EPERM;
101417
101418 retval = security_task_setnice(current, nice);
101419@@ -3462,6 +3467,7 @@ recheck:
101420 if (policy != p->policy && !rlim_rtprio)
101421 return -EPERM;
101422
101423+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
101424 /* can't increase priority */
101425 if (attr->sched_priority > p->rt_priority &&
101426 attr->sched_priority > rlim_rtprio)
101427@@ -4945,6 +4951,7 @@ void idle_task_exit(void)
101428
101429 if (mm != &init_mm) {
101430 switch_mm(mm, &init_mm, current);
101431+ populate_stack();
101432 finish_arch_post_lock_switch();
101433 }
101434 mmdrop(mm);
101435@@ -5040,7 +5047,7 @@ static void migrate_tasks(unsigned int dead_cpu)
101436
101437 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
101438
101439-static struct ctl_table sd_ctl_dir[] = {
101440+static ctl_table_no_const sd_ctl_dir[] __read_only = {
101441 {
101442 .procname = "sched_domain",
101443 .mode = 0555,
101444@@ -5057,17 +5064,17 @@ static struct ctl_table sd_ctl_root[] = {
101445 {}
101446 };
101447
101448-static struct ctl_table *sd_alloc_ctl_entry(int n)
101449+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
101450 {
101451- struct ctl_table *entry =
101452+ ctl_table_no_const *entry =
101453 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
101454
101455 return entry;
101456 }
101457
101458-static void sd_free_ctl_entry(struct ctl_table **tablep)
101459+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
101460 {
101461- struct ctl_table *entry;
101462+ ctl_table_no_const *entry;
101463
101464 /*
101465 * In the intermediate directories, both the child directory and
101466@@ -5075,22 +5082,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
101467 * will always be set. In the lowest directory the names are
101468 * static strings and all have proc handlers.
101469 */
101470- for (entry = *tablep; entry->mode; entry++) {
101471- if (entry->child)
101472- sd_free_ctl_entry(&entry->child);
101473+ for (entry = tablep; entry->mode; entry++) {
101474+ if (entry->child) {
101475+ sd_free_ctl_entry(entry->child);
101476+ pax_open_kernel();
101477+ entry->child = NULL;
101478+ pax_close_kernel();
101479+ }
101480 if (entry->proc_handler == NULL)
101481 kfree(entry->procname);
101482 }
101483
101484- kfree(*tablep);
101485- *tablep = NULL;
101486+ kfree(tablep);
101487 }
101488
101489 static int min_load_idx = 0;
101490 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
101491
101492 static void
101493-set_table_entry(struct ctl_table *entry,
101494+set_table_entry(ctl_table_no_const *entry,
101495 const char *procname, void *data, int maxlen,
101496 umode_t mode, proc_handler *proc_handler,
101497 bool load_idx)
101498@@ -5110,7 +5120,7 @@ set_table_entry(struct ctl_table *entry,
101499 static struct ctl_table *
101500 sd_alloc_ctl_domain_table(struct sched_domain *sd)
101501 {
101502- struct ctl_table *table = sd_alloc_ctl_entry(14);
101503+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
101504
101505 if (table == NULL)
101506 return NULL;
101507@@ -5148,9 +5158,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
101508 return table;
101509 }
101510
101511-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
101512+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
101513 {
101514- struct ctl_table *entry, *table;
101515+ ctl_table_no_const *entry, *table;
101516 struct sched_domain *sd;
101517 int domain_num = 0, i;
101518 char buf[32];
101519@@ -5177,11 +5187,13 @@ static struct ctl_table_header *sd_sysctl_header;
101520 static void register_sched_domain_sysctl(void)
101521 {
101522 int i, cpu_num = num_possible_cpus();
101523- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
101524+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
101525 char buf[32];
101526
101527 WARN_ON(sd_ctl_dir[0].child);
101528+ pax_open_kernel();
101529 sd_ctl_dir[0].child = entry;
101530+ pax_close_kernel();
101531
101532 if (entry == NULL)
101533 return;
101534@@ -5204,8 +5216,12 @@ static void unregister_sched_domain_sysctl(void)
101535 if (sd_sysctl_header)
101536 unregister_sysctl_table(sd_sysctl_header);
101537 sd_sysctl_header = NULL;
101538- if (sd_ctl_dir[0].child)
101539- sd_free_ctl_entry(&sd_ctl_dir[0].child);
101540+ if (sd_ctl_dir[0].child) {
101541+ sd_free_ctl_entry(sd_ctl_dir[0].child);
101542+ pax_open_kernel();
101543+ sd_ctl_dir[0].child = NULL;
101544+ pax_close_kernel();
101545+ }
101546 }
101547 #else
101548 static void register_sched_domain_sysctl(void)
101549diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
101550index 486d00c..62f3f6e 100644
101551--- a/kernel/sched/fair.c
101552+++ b/kernel/sched/fair.c
101553@@ -2092,7 +2092,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
101554
101555 static void reset_ptenuma_scan(struct task_struct *p)
101556 {
101557- ACCESS_ONCE(p->mm->numa_scan_seq)++;
101558+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
101559 p->mm->numa_scan_offset = 0;
101560 }
101561
101562@@ -7656,7 +7656,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
101563 * run_rebalance_domains is triggered when needed from the scheduler tick.
101564 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
101565 */
101566-static void run_rebalance_domains(struct softirq_action *h)
101567+static __latent_entropy void run_rebalance_domains(void)
101568 {
101569 struct rq *this_rq = this_rq();
101570 enum cpu_idle_type idle = this_rq->idle_balance ?
101571diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
101572index dc0f435..ae2e085 100644
101573--- a/kernel/sched/sched.h
101574+++ b/kernel/sched/sched.h
101575@@ -1200,7 +1200,7 @@ struct sched_class {
101576 #ifdef CONFIG_FAIR_GROUP_SCHED
101577 void (*task_move_group) (struct task_struct *p, int on_rq);
101578 #endif
101579-};
101580+} __do_const;
101581
101582 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
101583 {
101584diff --git a/kernel/signal.c b/kernel/signal.c
101585index a390499..ebe9a21 100644
101586--- a/kernel/signal.c
101587+++ b/kernel/signal.c
101588@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
101589
101590 int print_fatal_signals __read_mostly;
101591
101592-static void __user *sig_handler(struct task_struct *t, int sig)
101593+static __sighandler_t sig_handler(struct task_struct *t, int sig)
101594 {
101595 return t->sighand->action[sig - 1].sa.sa_handler;
101596 }
101597
101598-static int sig_handler_ignored(void __user *handler, int sig)
101599+static int sig_handler_ignored(__sighandler_t handler, int sig)
101600 {
101601 /* Is it explicitly or implicitly ignored? */
101602 return handler == SIG_IGN ||
101603@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
101604
101605 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
101606 {
101607- void __user *handler;
101608+ __sighandler_t handler;
101609
101610 handler = sig_handler(t, sig);
101611
101612@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
101613 atomic_inc(&user->sigpending);
101614 rcu_read_unlock();
101615
101616+ if (!override_rlimit)
101617+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
101618+
101619 if (override_rlimit ||
101620 atomic_read(&user->sigpending) <=
101621 task_rlimit(t, RLIMIT_SIGPENDING)) {
101622@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
101623
101624 int unhandled_signal(struct task_struct *tsk, int sig)
101625 {
101626- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
101627+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
101628 if (is_global_init(tsk))
101629 return 1;
101630 if (handler != SIG_IGN && handler != SIG_DFL)
101631@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
101632 }
101633 }
101634
101635+ /* allow glibc communication via tgkill to other threads in our
101636+ thread group */
101637+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
101638+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
101639+ && gr_handle_signal(t, sig))
101640+ return -EPERM;
101641+
101642 return security_task_kill(t, info, sig, 0);
101643 }
101644
101645@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
101646 return send_signal(sig, info, p, 1);
101647 }
101648
101649-static int
101650+int
101651 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101652 {
101653 return send_signal(sig, info, t, 0);
101654@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101655 unsigned long int flags;
101656 int ret, blocked, ignored;
101657 struct k_sigaction *action;
101658+ int is_unhandled = 0;
101659
101660 spin_lock_irqsave(&t->sighand->siglock, flags);
101661 action = &t->sighand->action[sig-1];
101662@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101663 }
101664 if (action->sa.sa_handler == SIG_DFL)
101665 t->signal->flags &= ~SIGNAL_UNKILLABLE;
101666+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
101667+ is_unhandled = 1;
101668 ret = specific_send_sig_info(sig, info, t);
101669 spin_unlock_irqrestore(&t->sighand->siglock, flags);
101670
101671+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
101672+ normal operation */
101673+ if (is_unhandled) {
101674+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
101675+ gr_handle_crash(t, sig);
101676+ }
101677+
101678 return ret;
101679 }
101680
101681@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
101682 ret = check_kill_permission(sig, info, p);
101683 rcu_read_unlock();
101684
101685- if (!ret && sig)
101686+ if (!ret && sig) {
101687 ret = do_send_sig_info(sig, info, p, true);
101688+ if (!ret)
101689+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
101690+ }
101691
101692 return ret;
101693 }
101694@@ -2915,7 +2938,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
101695 int error = -ESRCH;
101696
101697 rcu_read_lock();
101698- p = find_task_by_vpid(pid);
101699+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
101700+ /* allow glibc communication via tgkill to other threads in our
101701+ thread group */
101702+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
101703+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
101704+ p = find_task_by_vpid_unrestricted(pid);
101705+ else
101706+#endif
101707+ p = find_task_by_vpid(pid);
101708 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
101709 error = check_kill_permission(sig, info, p);
101710 /*
101711@@ -3248,8 +3279,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
101712 }
101713 seg = get_fs();
101714 set_fs(KERNEL_DS);
101715- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
101716- (stack_t __force __user *) &uoss,
101717+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
101718+ (stack_t __force_user *) &uoss,
101719 compat_user_stack_pointer());
101720 set_fs(seg);
101721 if (ret >= 0 && uoss_ptr) {
101722diff --git a/kernel/smpboot.c b/kernel/smpboot.c
101723index 40190f2..8861d40 100644
101724--- a/kernel/smpboot.c
101725+++ b/kernel/smpboot.c
101726@@ -290,7 +290,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
101727 }
101728 smpboot_unpark_thread(plug_thread, cpu);
101729 }
101730- list_add(&plug_thread->list, &hotplug_threads);
101731+ pax_list_add(&plug_thread->list, &hotplug_threads);
101732 out:
101733 mutex_unlock(&smpboot_threads_lock);
101734 put_online_cpus();
101735@@ -308,7 +308,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
101736 {
101737 get_online_cpus();
101738 mutex_lock(&smpboot_threads_lock);
101739- list_del(&plug_thread->list);
101740+ pax_list_del(&plug_thread->list);
101741 smpboot_destroy_threads(plug_thread);
101742 mutex_unlock(&smpboot_threads_lock);
101743 put_online_cpus();
101744diff --git a/kernel/softirq.c b/kernel/softirq.c
101745index 479e443..66d845e1 100644
101746--- a/kernel/softirq.c
101747+++ b/kernel/softirq.c
101748@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
101749 EXPORT_SYMBOL(irq_stat);
101750 #endif
101751
101752-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
101753+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
101754
101755 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
101756
101757@@ -270,7 +270,7 @@ restart:
101758 kstat_incr_softirqs_this_cpu(vec_nr);
101759
101760 trace_softirq_entry(vec_nr);
101761- h->action(h);
101762+ h->action();
101763 trace_softirq_exit(vec_nr);
101764 if (unlikely(prev_count != preempt_count())) {
101765 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
101766@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
101767 or_softirq_pending(1UL << nr);
101768 }
101769
101770-void open_softirq(int nr, void (*action)(struct softirq_action *))
101771+void __init open_softirq(int nr, void (*action)(void))
101772 {
101773 softirq_vec[nr].action = action;
101774 }
101775@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
101776 }
101777 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
101778
101779-static void tasklet_action(struct softirq_action *a)
101780+static void tasklet_action(void)
101781 {
101782 struct tasklet_struct *list;
101783
101784@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
101785 }
101786 }
101787
101788-static void tasklet_hi_action(struct softirq_action *a)
101789+static __latent_entropy void tasklet_hi_action(void)
101790 {
101791 struct tasklet_struct *list;
101792
101793@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
101794 .notifier_call = cpu_callback
101795 };
101796
101797-static struct smp_hotplug_thread softirq_threads = {
101798+static struct smp_hotplug_thread softirq_threads __read_only = {
101799 .store = &ksoftirqd,
101800 .thread_should_run = ksoftirqd_should_run,
101801 .thread_fn = run_ksoftirqd,
101802diff --git a/kernel/sys.c b/kernel/sys.c
101803index a03d9cd..55dbe9c 100644
101804--- a/kernel/sys.c
101805+++ b/kernel/sys.c
101806@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
101807 error = -EACCES;
101808 goto out;
101809 }
101810+
101811+ if (gr_handle_chroot_setpriority(p, niceval)) {
101812+ error = -EACCES;
101813+ goto out;
101814+ }
101815+
101816 no_nice = security_task_setnice(p, niceval);
101817 if (no_nice) {
101818 error = no_nice;
101819@@ -365,6 +371,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
101820 goto error;
101821 }
101822
101823+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
101824+ goto error;
101825+
101826+ if (!gid_eq(new->gid, old->gid)) {
101827+ /* make sure we generate a learn log for what will
101828+ end up being a role transition after a full-learning
101829+ policy is generated
101830+ CAP_SETGID is required to perform a transition
101831+ we may not log a CAP_SETGID check above, e.g.
101832+ in the case where new rgid = old egid
101833+ */
101834+ gr_learn_cap(current, new, CAP_SETGID);
101835+ }
101836+
101837 if (rgid != (gid_t) -1 ||
101838 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
101839 new->sgid = new->egid;
101840@@ -400,6 +420,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
101841 old = current_cred();
101842
101843 retval = -EPERM;
101844+
101845+ if (gr_check_group_change(kgid, kgid, kgid))
101846+ goto error;
101847+
101848 if (ns_capable(old->user_ns, CAP_SETGID))
101849 new->gid = new->egid = new->sgid = new->fsgid = kgid;
101850 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
101851@@ -417,7 +441,7 @@ error:
101852 /*
101853 * change the user struct in a credentials set to match the new UID
101854 */
101855-static int set_user(struct cred *new)
101856+int set_user(struct cred *new)
101857 {
101858 struct user_struct *new_user;
101859
101860@@ -497,7 +521,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
101861 goto error;
101862 }
101863
101864+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
101865+ goto error;
101866+
101867 if (!uid_eq(new->uid, old->uid)) {
101868+ /* make sure we generate a learn log for what will
101869+ end up being a role transition after a full-learning
101870+ policy is generated
101871+ CAP_SETUID is required to perform a transition
101872+ we may not log a CAP_SETUID check above, e.g.
101873+ in the case where new ruid = old euid
101874+ */
101875+ gr_learn_cap(current, new, CAP_SETUID);
101876 retval = set_user(new);
101877 if (retval < 0)
101878 goto error;
101879@@ -547,6 +582,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
101880 old = current_cred();
101881
101882 retval = -EPERM;
101883+
101884+ if (gr_check_crash_uid(kuid))
101885+ goto error;
101886+ if (gr_check_user_change(kuid, kuid, kuid))
101887+ goto error;
101888+
101889 if (ns_capable(old->user_ns, CAP_SETUID)) {
101890 new->suid = new->uid = kuid;
101891 if (!uid_eq(kuid, old->uid)) {
101892@@ -616,6 +657,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
101893 goto error;
101894 }
101895
101896+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
101897+ goto error;
101898+
101899 if (ruid != (uid_t) -1) {
101900 new->uid = kruid;
101901 if (!uid_eq(kruid, old->uid)) {
101902@@ -700,6 +744,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
101903 goto error;
101904 }
101905
101906+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
101907+ goto error;
101908+
101909 if (rgid != (gid_t) -1)
101910 new->gid = krgid;
101911 if (egid != (gid_t) -1)
101912@@ -764,12 +811,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
101913 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
101914 ns_capable(old->user_ns, CAP_SETUID)) {
101915 if (!uid_eq(kuid, old->fsuid)) {
101916+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
101917+ goto error;
101918+
101919 new->fsuid = kuid;
101920 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
101921 goto change_okay;
101922 }
101923 }
101924
101925+error:
101926 abort_creds(new);
101927 return old_fsuid;
101928
101929@@ -802,12 +853,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
101930 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
101931 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
101932 ns_capable(old->user_ns, CAP_SETGID)) {
101933+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
101934+ goto error;
101935+
101936 if (!gid_eq(kgid, old->fsgid)) {
101937 new->fsgid = kgid;
101938 goto change_okay;
101939 }
101940 }
101941
101942+error:
101943 abort_creds(new);
101944 return old_fsgid;
101945
101946@@ -1185,19 +1240,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
101947 return -EFAULT;
101948
101949 down_read(&uts_sem);
101950- error = __copy_to_user(&name->sysname, &utsname()->sysname,
101951+ error = __copy_to_user(name->sysname, &utsname()->sysname,
101952 __OLD_UTS_LEN);
101953 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
101954- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
101955+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
101956 __OLD_UTS_LEN);
101957 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
101958- error |= __copy_to_user(&name->release, &utsname()->release,
101959+ error |= __copy_to_user(name->release, &utsname()->release,
101960 __OLD_UTS_LEN);
101961 error |= __put_user(0, name->release + __OLD_UTS_LEN);
101962- error |= __copy_to_user(&name->version, &utsname()->version,
101963+ error |= __copy_to_user(name->version, &utsname()->version,
101964 __OLD_UTS_LEN);
101965 error |= __put_user(0, name->version + __OLD_UTS_LEN);
101966- error |= __copy_to_user(&name->machine, &utsname()->machine,
101967+ error |= __copy_to_user(name->machine, &utsname()->machine,
101968 __OLD_UTS_LEN);
101969 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
101970 up_read(&uts_sem);
101971@@ -1398,6 +1453,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
101972 */
101973 new_rlim->rlim_cur = 1;
101974 }
101975+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
101976+ is changed to a lower value. Since tasks can be created by the same
101977+ user in between this limit change and an execve by this task, force
101978+ a recheck only for this task by setting PF_NPROC_EXCEEDED
101979+ */
101980+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
101981+ tsk->flags |= PF_NPROC_EXCEEDED;
101982 }
101983 if (!retval) {
101984 if (old_rlim)
101985diff --git a/kernel/sysctl.c b/kernel/sysctl.c
101986index ce410bb..cd276f0 100644
101987--- a/kernel/sysctl.c
101988+++ b/kernel/sysctl.c
101989@@ -94,7 +94,6 @@
101990
101991
101992 #if defined(CONFIG_SYSCTL)
101993-
101994 /* External variables not in a header file. */
101995 extern int max_threads;
101996 extern int suid_dumpable;
101997@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
101998
101999 /* Constants used for minimum and maximum */
102000 #ifdef CONFIG_LOCKUP_DETECTOR
102001-static int sixty = 60;
102002+static int sixty __read_only = 60;
102003 #endif
102004
102005-static int __maybe_unused neg_one = -1;
102006+static int __maybe_unused neg_one __read_only = -1;
102007
102008-static int zero;
102009-static int __maybe_unused one = 1;
102010-static int __maybe_unused two = 2;
102011-static int __maybe_unused four = 4;
102012-static unsigned long one_ul = 1;
102013-static int one_hundred = 100;
102014+static int zero __read_only = 0;
102015+static int __maybe_unused one __read_only = 1;
102016+static int __maybe_unused two __read_only = 2;
102017+static int __maybe_unused three __read_only = 3;
102018+static int __maybe_unused four __read_only = 4;
102019+static unsigned long one_ul __read_only = 1;
102020+static int one_hundred __read_only = 100;
102021 #ifdef CONFIG_PRINTK
102022-static int ten_thousand = 10000;
102023+static int ten_thousand __read_only = 10000;
102024 #endif
102025
102026 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
102027@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
102028 void __user *buffer, size_t *lenp, loff_t *ppos);
102029 #endif
102030
102031-#ifdef CONFIG_PRINTK
102032 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102033 void __user *buffer, size_t *lenp, loff_t *ppos);
102034-#endif
102035
102036 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
102037 void __user *buffer, size_t *lenp, loff_t *ppos);
102038@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
102039
102040 #endif
102041
102042+extern struct ctl_table grsecurity_table[];
102043+
102044 static struct ctl_table kern_table[];
102045 static struct ctl_table vm_table[];
102046 static struct ctl_table fs_table[];
102047@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
102048 int sysctl_legacy_va_layout;
102049 #endif
102050
102051+#ifdef CONFIG_PAX_SOFTMODE
102052+static struct ctl_table pax_table[] = {
102053+ {
102054+ .procname = "softmode",
102055+ .data = &pax_softmode,
102056+ .maxlen = sizeof(unsigned int),
102057+ .mode = 0600,
102058+ .proc_handler = &proc_dointvec,
102059+ },
102060+
102061+ { }
102062+};
102063+#endif
102064+
102065 /* The default sysctl tables: */
102066
102067 static struct ctl_table sysctl_base_table[] = {
102068@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
102069 #endif
102070
102071 static struct ctl_table kern_table[] = {
102072+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
102073+ {
102074+ .procname = "grsecurity",
102075+ .mode = 0500,
102076+ .child = grsecurity_table,
102077+ },
102078+#endif
102079+
102080+#ifdef CONFIG_PAX_SOFTMODE
102081+ {
102082+ .procname = "pax",
102083+ .mode = 0500,
102084+ .child = pax_table,
102085+ },
102086+#endif
102087+
102088 {
102089 .procname = "sched_child_runs_first",
102090 .data = &sysctl_sched_child_runs_first,
102091@@ -649,7 +679,7 @@ static struct ctl_table kern_table[] = {
102092 .data = &modprobe_path,
102093 .maxlen = KMOD_PATH_LEN,
102094 .mode = 0644,
102095- .proc_handler = proc_dostring,
102096+ .proc_handler = proc_dostring_modpriv,
102097 },
102098 {
102099 .procname = "modules_disabled",
102100@@ -816,16 +846,20 @@ static struct ctl_table kern_table[] = {
102101 .extra1 = &zero,
102102 .extra2 = &one,
102103 },
102104+#endif
102105 {
102106 .procname = "kptr_restrict",
102107 .data = &kptr_restrict,
102108 .maxlen = sizeof(int),
102109 .mode = 0644,
102110 .proc_handler = proc_dointvec_minmax_sysadmin,
102111+#ifdef CONFIG_GRKERNSEC_HIDESYM
102112+ .extra1 = &two,
102113+#else
102114 .extra1 = &zero,
102115+#endif
102116 .extra2 = &two,
102117 },
102118-#endif
102119 {
102120 .procname = "ngroups_max",
102121 .data = &ngroups_max,
102122@@ -1072,10 +1106,17 @@ static struct ctl_table kern_table[] = {
102123 */
102124 {
102125 .procname = "perf_event_paranoid",
102126- .data = &sysctl_perf_event_paranoid,
102127- .maxlen = sizeof(sysctl_perf_event_paranoid),
102128+ .data = &sysctl_perf_event_legitimately_concerned,
102129+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
102130 .mode = 0644,
102131- .proc_handler = proc_dointvec,
102132+ /* go ahead, be a hero */
102133+ .proc_handler = proc_dointvec_minmax_sysadmin,
102134+ .extra1 = &neg_one,
102135+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
102136+ .extra2 = &three,
102137+#else
102138+ .extra2 = &two,
102139+#endif
102140 },
102141 {
102142 .procname = "perf_event_mlock_kb",
102143@@ -1348,6 +1389,13 @@ static struct ctl_table vm_table[] = {
102144 .proc_handler = proc_dointvec_minmax,
102145 .extra1 = &zero,
102146 },
102147+ {
102148+ .procname = "heap_stack_gap",
102149+ .data = &sysctl_heap_stack_gap,
102150+ .maxlen = sizeof(sysctl_heap_stack_gap),
102151+ .mode = 0644,
102152+ .proc_handler = proc_doulongvec_minmax,
102153+ },
102154 #else
102155 {
102156 .procname = "nr_trim_pages",
102157@@ -1830,6 +1878,16 @@ int proc_dostring(struct ctl_table *table, int write,
102158 (char __user *)buffer, lenp, ppos);
102159 }
102160
102161+int proc_dostring_modpriv(struct ctl_table *table, int write,
102162+ void __user *buffer, size_t *lenp, loff_t *ppos)
102163+{
102164+ if (write && !capable(CAP_SYS_MODULE))
102165+ return -EPERM;
102166+
102167+ return _proc_do_string(table->data, table->maxlen, write,
102168+ buffer, lenp, ppos);
102169+}
102170+
102171 static size_t proc_skip_spaces(char **buf)
102172 {
102173 size_t ret;
102174@@ -1935,6 +1993,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
102175 len = strlen(tmp);
102176 if (len > *size)
102177 len = *size;
102178+ if (len > sizeof(tmp))
102179+ len = sizeof(tmp);
102180 if (copy_to_user(*buf, tmp, len))
102181 return -EFAULT;
102182 *size -= len;
102183@@ -2112,7 +2172,7 @@ int proc_dointvec(struct ctl_table *table, int write,
102184 static int proc_taint(struct ctl_table *table, int write,
102185 void __user *buffer, size_t *lenp, loff_t *ppos)
102186 {
102187- struct ctl_table t;
102188+ ctl_table_no_const t;
102189 unsigned long tmptaint = get_taint();
102190 int err;
102191
102192@@ -2140,7 +2200,6 @@ static int proc_taint(struct ctl_table *table, int write,
102193 return err;
102194 }
102195
102196-#ifdef CONFIG_PRINTK
102197 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102198 void __user *buffer, size_t *lenp, loff_t *ppos)
102199 {
102200@@ -2149,7 +2208,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102201
102202 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
102203 }
102204-#endif
102205
102206 struct do_proc_dointvec_minmax_conv_param {
102207 int *min;
102208@@ -2709,6 +2767,12 @@ int proc_dostring(struct ctl_table *table, int write,
102209 return -ENOSYS;
102210 }
102211
102212+int proc_dostring_modpriv(struct ctl_table *table, int write,
102213+ void __user *buffer, size_t *lenp, loff_t *ppos)
102214+{
102215+ return -ENOSYS;
102216+}
102217+
102218 int proc_dointvec(struct ctl_table *table, int write,
102219 void __user *buffer, size_t *lenp, loff_t *ppos)
102220 {
102221@@ -2765,5 +2829,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
102222 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
102223 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
102224 EXPORT_SYMBOL(proc_dostring);
102225+EXPORT_SYMBOL(proc_dostring_modpriv);
102226 EXPORT_SYMBOL(proc_doulongvec_minmax);
102227 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
102228diff --git a/kernel/taskstats.c b/kernel/taskstats.c
102229index 21f82c2..c1984e5 100644
102230--- a/kernel/taskstats.c
102231+++ b/kernel/taskstats.c
102232@@ -28,9 +28,12 @@
102233 #include <linux/fs.h>
102234 #include <linux/file.h>
102235 #include <linux/pid_namespace.h>
102236+#include <linux/grsecurity.h>
102237 #include <net/genetlink.h>
102238 #include <linux/atomic.h>
102239
102240+extern int gr_is_taskstats_denied(int pid);
102241+
102242 /*
102243 * Maximum length of a cpumask that can be specified in
102244 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
102245@@ -567,6 +570,9 @@ err:
102246
102247 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
102248 {
102249+ if (gr_is_taskstats_denied(current->pid))
102250+ return -EACCES;
102251+
102252 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
102253 return cmd_attr_register_cpumask(info);
102254 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
102255diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
102256index 1b001ed..55ef9e4 100644
102257--- a/kernel/time/alarmtimer.c
102258+++ b/kernel/time/alarmtimer.c
102259@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
102260 struct platform_device *pdev;
102261 int error = 0;
102262 int i;
102263- struct k_clock alarm_clock = {
102264+ static struct k_clock alarm_clock = {
102265 .clock_getres = alarm_clock_getres,
102266 .clock_get = alarm_clock_get,
102267 .timer_create = alarm_timer_create,
102268diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
102269index 38f586c..14386a7 100644
102270--- a/kernel/time/hrtimer.c
102271+++ b/kernel/time/hrtimer.c
102272@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
102273 local_irq_restore(flags);
102274 }
102275
102276-static void run_hrtimer_softirq(struct softirq_action *h)
102277+static __latent_entropy void run_hrtimer_softirq(void)
102278 {
102279 hrtimer_peek_ahead_timers();
102280 }
102281diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
102282index 0075da7..63cc872 100644
102283--- a/kernel/time/posix-cpu-timers.c
102284+++ b/kernel/time/posix-cpu-timers.c
102285@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
102286
102287 static __init int init_posix_cpu_timers(void)
102288 {
102289- struct k_clock process = {
102290+ static struct k_clock process = {
102291 .clock_getres = process_cpu_clock_getres,
102292 .clock_get = process_cpu_clock_get,
102293 .timer_create = process_cpu_timer_create,
102294 .nsleep = process_cpu_nsleep,
102295 .nsleep_restart = process_cpu_nsleep_restart,
102296 };
102297- struct k_clock thread = {
102298+ static struct k_clock thread = {
102299 .clock_getres = thread_cpu_clock_getres,
102300 .clock_get = thread_cpu_clock_get,
102301 .timer_create = thread_cpu_timer_create,
102302diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
102303index 31ea01f..7fc61ef 100644
102304--- a/kernel/time/posix-timers.c
102305+++ b/kernel/time/posix-timers.c
102306@@ -43,6 +43,7 @@
102307 #include <linux/hash.h>
102308 #include <linux/posix-clock.h>
102309 #include <linux/posix-timers.h>
102310+#include <linux/grsecurity.h>
102311 #include <linux/syscalls.h>
102312 #include <linux/wait.h>
102313 #include <linux/workqueue.h>
102314@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
102315 * which we beg off on and pass to do_sys_settimeofday().
102316 */
102317
102318-static struct k_clock posix_clocks[MAX_CLOCKS];
102319+static struct k_clock *posix_clocks[MAX_CLOCKS];
102320
102321 /*
102322 * These ones are defined below.
102323@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
102324 */
102325 static __init int init_posix_timers(void)
102326 {
102327- struct k_clock clock_realtime = {
102328+ static struct k_clock clock_realtime = {
102329 .clock_getres = hrtimer_get_res,
102330 .clock_get = posix_clock_realtime_get,
102331 .clock_set = posix_clock_realtime_set,
102332@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
102333 .timer_get = common_timer_get,
102334 .timer_del = common_timer_del,
102335 };
102336- struct k_clock clock_monotonic = {
102337+ static struct k_clock clock_monotonic = {
102338 .clock_getres = hrtimer_get_res,
102339 .clock_get = posix_ktime_get_ts,
102340 .nsleep = common_nsleep,
102341@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
102342 .timer_get = common_timer_get,
102343 .timer_del = common_timer_del,
102344 };
102345- struct k_clock clock_monotonic_raw = {
102346+ static struct k_clock clock_monotonic_raw = {
102347 .clock_getres = hrtimer_get_res,
102348 .clock_get = posix_get_monotonic_raw,
102349 };
102350- struct k_clock clock_realtime_coarse = {
102351+ static struct k_clock clock_realtime_coarse = {
102352 .clock_getres = posix_get_coarse_res,
102353 .clock_get = posix_get_realtime_coarse,
102354 };
102355- struct k_clock clock_monotonic_coarse = {
102356+ static struct k_clock clock_monotonic_coarse = {
102357 .clock_getres = posix_get_coarse_res,
102358 .clock_get = posix_get_monotonic_coarse,
102359 };
102360- struct k_clock clock_tai = {
102361+ static struct k_clock clock_tai = {
102362 .clock_getres = hrtimer_get_res,
102363 .clock_get = posix_get_tai,
102364 .nsleep = common_nsleep,
102365@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
102366 .timer_get = common_timer_get,
102367 .timer_del = common_timer_del,
102368 };
102369- struct k_clock clock_boottime = {
102370+ static struct k_clock clock_boottime = {
102371 .clock_getres = hrtimer_get_res,
102372 .clock_get = posix_get_boottime,
102373 .nsleep = common_nsleep,
102374@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
102375 return;
102376 }
102377
102378- posix_clocks[clock_id] = *new_clock;
102379+ posix_clocks[clock_id] = new_clock;
102380 }
102381 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
102382
102383@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
102384 return (id & CLOCKFD_MASK) == CLOCKFD ?
102385 &clock_posix_dynamic : &clock_posix_cpu;
102386
102387- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
102388+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
102389 return NULL;
102390- return &posix_clocks[id];
102391+ return posix_clocks[id];
102392 }
102393
102394 static int common_timer_create(struct k_itimer *new_timer)
102395@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
102396 struct k_clock *kc = clockid_to_kclock(which_clock);
102397 struct k_itimer *new_timer;
102398 int error, new_timer_id;
102399- sigevent_t event;
102400+ sigevent_t event = { };
102401 int it_id_set = IT_ID_NOT_SET;
102402
102403 if (!kc)
102404@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
102405 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
102406 return -EFAULT;
102407
102408+ /* only the CLOCK_REALTIME clock can be set, all other clocks
102409+ have their clock_set fptr set to a nosettime dummy function
102410+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
102411+ call common_clock_set, which calls do_sys_settimeofday, which
102412+ we hook
102413+ */
102414+
102415 return kc->clock_set(which_clock, &new_tp);
102416 }
102417
102418diff --git a/kernel/time/time.c b/kernel/time/time.c
102419index 2c85b77..6530536 100644
102420--- a/kernel/time/time.c
102421+++ b/kernel/time/time.c
102422@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
102423 return error;
102424
102425 if (tz) {
102426+ /* we log in do_settimeofday called below, so don't log twice
102427+ */
102428+ if (!tv)
102429+ gr_log_timechange();
102430+
102431 sys_tz = *tz;
102432 update_vsyscall_tz();
102433 if (firsttime) {
102434diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
102435index 91db941..a371671 100644
102436--- a/kernel/time/timekeeping.c
102437+++ b/kernel/time/timekeeping.c
102438@@ -15,6 +15,7 @@
102439 #include <linux/init.h>
102440 #include <linux/mm.h>
102441 #include <linux/sched.h>
102442+#include <linux/grsecurity.h>
102443 #include <linux/syscore_ops.h>
102444 #include <linux/clocksource.h>
102445 #include <linux/jiffies.h>
102446@@ -802,6 +803,8 @@ int do_settimeofday64(const struct timespec64 *ts)
102447 if (!timespec64_valid_strict(ts))
102448 return -EINVAL;
102449
102450+ gr_log_timechange();
102451+
102452 raw_spin_lock_irqsave(&timekeeper_lock, flags);
102453 write_seqcount_begin(&tk_core.seq);
102454
102455diff --git a/kernel/time/timer.c b/kernel/time/timer.c
102456index 2d3f5c5..7ed7dc5 100644
102457--- a/kernel/time/timer.c
102458+++ b/kernel/time/timer.c
102459@@ -1393,7 +1393,7 @@ void update_process_times(int user_tick)
102460 /*
102461 * This function runs timers and the timer-tq in bottom half context.
102462 */
102463-static void run_timer_softirq(struct softirq_action *h)
102464+static __latent_entropy void run_timer_softirq(void)
102465 {
102466 struct tvec_base *base = __this_cpu_read(tvec_bases);
102467
102468@@ -1456,7 +1456,7 @@ static void process_timeout(unsigned long __data)
102469 *
102470 * In all cases the return value is guaranteed to be non-negative.
102471 */
102472-signed long __sched schedule_timeout(signed long timeout)
102473+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
102474 {
102475 struct timer_list timer;
102476 unsigned long expire;
102477diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
102478index 61ed862..3b52c65 100644
102479--- a/kernel/time/timer_list.c
102480+++ b/kernel/time/timer_list.c
102481@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
102482
102483 static void print_name_offset(struct seq_file *m, void *sym)
102484 {
102485+#ifdef CONFIG_GRKERNSEC_HIDESYM
102486+ SEQ_printf(m, "<%p>", NULL);
102487+#else
102488 char symname[KSYM_NAME_LEN];
102489
102490 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
102491 SEQ_printf(m, "<%pK>", sym);
102492 else
102493 SEQ_printf(m, "%s", symname);
102494+#endif
102495 }
102496
102497 static void
102498@@ -119,7 +123,11 @@ next_one:
102499 static void
102500 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
102501 {
102502+#ifdef CONFIG_GRKERNSEC_HIDESYM
102503+ SEQ_printf(m, " .base: %p\n", NULL);
102504+#else
102505 SEQ_printf(m, " .base: %pK\n", base);
102506+#endif
102507 SEQ_printf(m, " .index: %d\n",
102508 base->index);
102509 SEQ_printf(m, " .resolution: %Lu nsecs\n",
102510@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
102511 {
102512 struct proc_dir_entry *pe;
102513
102514+#ifdef CONFIG_GRKERNSEC_PROC_ADD
102515+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
102516+#else
102517 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
102518+#endif
102519 if (!pe)
102520 return -ENOMEM;
102521 return 0;
102522diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
102523index 1fb08f2..ca4bb1e 100644
102524--- a/kernel/time/timer_stats.c
102525+++ b/kernel/time/timer_stats.c
102526@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
102527 static unsigned long nr_entries;
102528 static struct entry entries[MAX_ENTRIES];
102529
102530-static atomic_t overflow_count;
102531+static atomic_unchecked_t overflow_count;
102532
102533 /*
102534 * The entries are in a hash-table, for fast lookup:
102535@@ -140,7 +140,7 @@ static void reset_entries(void)
102536 nr_entries = 0;
102537 memset(entries, 0, sizeof(entries));
102538 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
102539- atomic_set(&overflow_count, 0);
102540+ atomic_set_unchecked(&overflow_count, 0);
102541 }
102542
102543 static struct entry *alloc_entry(void)
102544@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
102545 if (likely(entry))
102546 entry->count++;
102547 else
102548- atomic_inc(&overflow_count);
102549+ atomic_inc_unchecked(&overflow_count);
102550
102551 out_unlock:
102552 raw_spin_unlock_irqrestore(lock, flags);
102553@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
102554
102555 static void print_name_offset(struct seq_file *m, unsigned long addr)
102556 {
102557+#ifdef CONFIG_GRKERNSEC_HIDESYM
102558+ seq_printf(m, "<%p>", NULL);
102559+#else
102560 char symname[KSYM_NAME_LEN];
102561
102562 if (lookup_symbol_name(addr, symname) < 0)
102563- seq_printf(m, "<%p>", (void *)addr);
102564+ seq_printf(m, "<%pK>", (void *)addr);
102565 else
102566 seq_printf(m, "%s", symname);
102567+#endif
102568 }
102569
102570 static int tstats_show(struct seq_file *m, void *v)
102571@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
102572
102573 seq_puts(m, "Timer Stats Version: v0.3\n");
102574 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
102575- if (atomic_read(&overflow_count))
102576- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
102577+ if (atomic_read_unchecked(&overflow_count))
102578+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
102579 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
102580
102581 for (i = 0; i < nr_entries; i++) {
102582@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
102583 {
102584 struct proc_dir_entry *pe;
102585
102586+#ifdef CONFIG_GRKERNSEC_PROC_ADD
102587+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
102588+#else
102589 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
102590+#endif
102591 if (!pe)
102592 return -ENOMEM;
102593 return 0;
102594diff --git a/kernel/torture.c b/kernel/torture.c
102595index dd70993..0bf694b 100644
102596--- a/kernel/torture.c
102597+++ b/kernel/torture.c
102598@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
102599 mutex_lock(&fullstop_mutex);
102600 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
102601 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
102602- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
102603+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
102604 } else {
102605 pr_warn("Concurrent rmmod and shutdown illegal!\n");
102606 }
102607@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
102608 if (!torture_must_stop()) {
102609 if (stutter > 1) {
102610 schedule_timeout_interruptible(stutter - 1);
102611- ACCESS_ONCE(stutter_pause_test) = 2;
102612+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
102613 }
102614 schedule_timeout_interruptible(1);
102615- ACCESS_ONCE(stutter_pause_test) = 1;
102616+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
102617 }
102618 if (!torture_must_stop())
102619 schedule_timeout_interruptible(stutter);
102620- ACCESS_ONCE(stutter_pause_test) = 0;
102621+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
102622 torture_shutdown_absorb("torture_stutter");
102623 } while (!torture_must_stop());
102624 torture_kthread_stopping("torture_stutter");
102625@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
102626 schedule_timeout_uninterruptible(10);
102627 return true;
102628 }
102629- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
102630+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
102631 mutex_unlock(&fullstop_mutex);
102632 torture_shutdown_cleanup();
102633 torture_shuffle_cleanup();
102634diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
102635index 483cecf..ac46091 100644
102636--- a/kernel/trace/blktrace.c
102637+++ b/kernel/trace/blktrace.c
102638@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
102639 struct blk_trace *bt = filp->private_data;
102640 char buf[16];
102641
102642- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
102643+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
102644
102645 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
102646 }
102647@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
102648 return 1;
102649
102650 bt = buf->chan->private_data;
102651- atomic_inc(&bt->dropped);
102652+ atomic_inc_unchecked(&bt->dropped);
102653 return 0;
102654 }
102655
102656@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
102657
102658 bt->dir = dir;
102659 bt->dev = dev;
102660- atomic_set(&bt->dropped, 0);
102661+ atomic_set_unchecked(&bt->dropped, 0);
102662 INIT_LIST_HEAD(&bt->running_list);
102663
102664 ret = -EIO;
102665diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
102666index 4f22802..bd268b1 100644
102667--- a/kernel/trace/ftrace.c
102668+++ b/kernel/trace/ftrace.c
102669@@ -2382,12 +2382,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
102670 if (unlikely(ftrace_disabled))
102671 return 0;
102672
102673+ ret = ftrace_arch_code_modify_prepare();
102674+ FTRACE_WARN_ON(ret);
102675+ if (ret)
102676+ return 0;
102677+
102678 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
102679+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
102680 if (ret) {
102681 ftrace_bug(ret, rec);
102682- return 0;
102683 }
102684- return 1;
102685+ return ret ? 0 : 1;
102686 }
102687
102688 /*
102689@@ -4776,8 +4781,10 @@ static int ftrace_process_locs(struct module *mod,
102690 if (!count)
102691 return 0;
102692
102693+ pax_open_kernel();
102694 sort(start, count, sizeof(*start),
102695 ftrace_cmp_ips, ftrace_swap_ips);
102696+ pax_close_kernel();
102697
102698 start_pg = ftrace_allocate_pages(count);
102699 if (!start_pg)
102700@@ -5653,7 +5660,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
102701
102702 if (t->ret_stack == NULL) {
102703 atomic_set(&t->tracing_graph_pause, 0);
102704- atomic_set(&t->trace_overrun, 0);
102705+ atomic_set_unchecked(&t->trace_overrun, 0);
102706 t->curr_ret_stack = -1;
102707 /* Make sure the tasks see the -1 first: */
102708 smp_wmb();
102709@@ -5876,7 +5883,7 @@ static void
102710 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
102711 {
102712 atomic_set(&t->tracing_graph_pause, 0);
102713- atomic_set(&t->trace_overrun, 0);
102714+ atomic_set_unchecked(&t->trace_overrun, 0);
102715 t->ftrace_timestamp = 0;
102716 /* make curr_ret_stack visible before we add the ret_stack */
102717 smp_wmb();
102718diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
102719index 922048a..bb71a55 100644
102720--- a/kernel/trace/ring_buffer.c
102721+++ b/kernel/trace/ring_buffer.c
102722@@ -348,9 +348,9 @@ struct buffer_data_page {
102723 */
102724 struct buffer_page {
102725 struct list_head list; /* list of buffer pages */
102726- local_t write; /* index for next write */
102727+ local_unchecked_t write; /* index for next write */
102728 unsigned read; /* index for next read */
102729- local_t entries; /* entries on this page */
102730+ local_unchecked_t entries; /* entries on this page */
102731 unsigned long real_end; /* real end of data */
102732 struct buffer_data_page *page; /* Actual data page */
102733 };
102734@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
102735 unsigned long last_overrun;
102736 local_t entries_bytes;
102737 local_t entries;
102738- local_t overrun;
102739- local_t commit_overrun;
102740- local_t dropped_events;
102741+ local_unchecked_t overrun;
102742+ local_unchecked_t commit_overrun;
102743+ local_unchecked_t dropped_events;
102744 local_t committing;
102745- local_t commits;
102746+ local_unchecked_t commits;
102747 unsigned long read;
102748 unsigned long read_bytes;
102749 u64 write_stamp;
102750@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
102751 *
102752 * We add a counter to the write field to denote this.
102753 */
102754- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
102755- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
102756+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
102757+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
102758
102759 /*
102760 * Just make sure we have seen our old_write and synchronize
102761@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
102762 * cmpxchg to only update if an interrupt did not already
102763 * do it for us. If the cmpxchg fails, we don't care.
102764 */
102765- (void)local_cmpxchg(&next_page->write, old_write, val);
102766- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
102767+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
102768+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
102769
102770 /*
102771 * No need to worry about races with clearing out the commit.
102772@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
102773
102774 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
102775 {
102776- return local_read(&bpage->entries) & RB_WRITE_MASK;
102777+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
102778 }
102779
102780 static inline unsigned long rb_page_write(struct buffer_page *bpage)
102781 {
102782- return local_read(&bpage->write) & RB_WRITE_MASK;
102783+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
102784 }
102785
102786 static int
102787@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
102788 * bytes consumed in ring buffer from here.
102789 * Increment overrun to account for the lost events.
102790 */
102791- local_add(page_entries, &cpu_buffer->overrun);
102792+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
102793 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
102794 }
102795
102796@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
102797 * it is our responsibility to update
102798 * the counters.
102799 */
102800- local_add(entries, &cpu_buffer->overrun);
102801+ local_add_unchecked(entries, &cpu_buffer->overrun);
102802 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
102803
102804 /*
102805@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102806 if (tail == BUF_PAGE_SIZE)
102807 tail_page->real_end = 0;
102808
102809- local_sub(length, &tail_page->write);
102810+ local_sub_unchecked(length, &tail_page->write);
102811 return;
102812 }
102813
102814@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102815 rb_event_set_padding(event);
102816
102817 /* Set the write back to the previous setting */
102818- local_sub(length, &tail_page->write);
102819+ local_sub_unchecked(length, &tail_page->write);
102820 return;
102821 }
102822
102823@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102824
102825 /* Set write to end of buffer */
102826 length = (tail + length) - BUF_PAGE_SIZE;
102827- local_sub(length, &tail_page->write);
102828+ local_sub_unchecked(length, &tail_page->write);
102829 }
102830
102831 /*
102832@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102833 * about it.
102834 */
102835 if (unlikely(next_page == commit_page)) {
102836- local_inc(&cpu_buffer->commit_overrun);
102837+ local_inc_unchecked(&cpu_buffer->commit_overrun);
102838 goto out_reset;
102839 }
102840
102841@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102842 * this is easy, just stop here.
102843 */
102844 if (!(buffer->flags & RB_FL_OVERWRITE)) {
102845- local_inc(&cpu_buffer->dropped_events);
102846+ local_inc_unchecked(&cpu_buffer->dropped_events);
102847 goto out_reset;
102848 }
102849
102850@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102851 cpu_buffer->tail_page) &&
102852 (cpu_buffer->commit_page ==
102853 cpu_buffer->reader_page))) {
102854- local_inc(&cpu_buffer->commit_overrun);
102855+ local_inc_unchecked(&cpu_buffer->commit_overrun);
102856 goto out_reset;
102857 }
102858 }
102859@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
102860 length += RB_LEN_TIME_EXTEND;
102861
102862 tail_page = cpu_buffer->tail_page;
102863- write = local_add_return(length, &tail_page->write);
102864+ write = local_add_return_unchecked(length, &tail_page->write);
102865
102866 /* set write to only the index of the write */
102867 write &= RB_WRITE_MASK;
102868@@ -2456,7 +2456,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
102869 kmemcheck_annotate_bitfield(event, bitfield);
102870 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
102871
102872- local_inc(&tail_page->entries);
102873+ local_inc_unchecked(&tail_page->entries);
102874
102875 /*
102876 * If this is the first commit on the page, then update
102877@@ -2489,7 +2489,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102878
102879 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
102880 unsigned long write_mask =
102881- local_read(&bpage->write) & ~RB_WRITE_MASK;
102882+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
102883 unsigned long event_length = rb_event_length(event);
102884 /*
102885 * This is on the tail page. It is possible that
102886@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102887 */
102888 old_index += write_mask;
102889 new_index += write_mask;
102890- index = local_cmpxchg(&bpage->write, old_index, new_index);
102891+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
102892 if (index == old_index) {
102893 /* update counters */
102894 local_sub(event_length, &cpu_buffer->entries_bytes);
102895@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102896 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
102897 {
102898 local_inc(&cpu_buffer->committing);
102899- local_inc(&cpu_buffer->commits);
102900+ local_inc_unchecked(&cpu_buffer->commits);
102901 }
102902
102903 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102904@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102905 return;
102906
102907 again:
102908- commits = local_read(&cpu_buffer->commits);
102909+ commits = local_read_unchecked(&cpu_buffer->commits);
102910 /* synchronize with interrupts */
102911 barrier();
102912 if (local_read(&cpu_buffer->committing) == 1)
102913@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102914 * updating of the commit page and the clearing of the
102915 * committing counter.
102916 */
102917- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
102918+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
102919 !local_read(&cpu_buffer->committing)) {
102920 local_inc(&cpu_buffer->committing);
102921 goto again;
102922@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
102923 barrier();
102924 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
102925 local_dec(&cpu_buffer->committing);
102926- local_dec(&cpu_buffer->commits);
102927+ local_dec_unchecked(&cpu_buffer->commits);
102928 return NULL;
102929 }
102930 #endif
102931@@ -2901,7 +2901,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
102932
102933 /* Do the likely case first */
102934 if (likely(bpage->page == (void *)addr)) {
102935- local_dec(&bpage->entries);
102936+ local_dec_unchecked(&bpage->entries);
102937 return;
102938 }
102939
102940@@ -2913,7 +2913,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
102941 start = bpage;
102942 do {
102943 if (bpage->page == (void *)addr) {
102944- local_dec(&bpage->entries);
102945+ local_dec_unchecked(&bpage->entries);
102946 return;
102947 }
102948 rb_inc_page(cpu_buffer, &bpage);
102949@@ -3197,7 +3197,7 @@ static inline unsigned long
102950 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
102951 {
102952 return local_read(&cpu_buffer->entries) -
102953- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
102954+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
102955 }
102956
102957 /**
102958@@ -3286,7 +3286,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
102959 return 0;
102960
102961 cpu_buffer = buffer->buffers[cpu];
102962- ret = local_read(&cpu_buffer->overrun);
102963+ ret = local_read_unchecked(&cpu_buffer->overrun);
102964
102965 return ret;
102966 }
102967@@ -3309,7 +3309,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
102968 return 0;
102969
102970 cpu_buffer = buffer->buffers[cpu];
102971- ret = local_read(&cpu_buffer->commit_overrun);
102972+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
102973
102974 return ret;
102975 }
102976@@ -3331,7 +3331,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
102977 return 0;
102978
102979 cpu_buffer = buffer->buffers[cpu];
102980- ret = local_read(&cpu_buffer->dropped_events);
102981+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
102982
102983 return ret;
102984 }
102985@@ -3394,7 +3394,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
102986 /* if you care about this being correct, lock the buffer */
102987 for_each_buffer_cpu(buffer, cpu) {
102988 cpu_buffer = buffer->buffers[cpu];
102989- overruns += local_read(&cpu_buffer->overrun);
102990+ overruns += local_read_unchecked(&cpu_buffer->overrun);
102991 }
102992
102993 return overruns;
102994@@ -3565,8 +3565,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
102995 /*
102996 * Reset the reader page to size zero.
102997 */
102998- local_set(&cpu_buffer->reader_page->write, 0);
102999- local_set(&cpu_buffer->reader_page->entries, 0);
103000+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
103001+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
103002 local_set(&cpu_buffer->reader_page->page->commit, 0);
103003 cpu_buffer->reader_page->real_end = 0;
103004
103005@@ -3600,7 +3600,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
103006 * want to compare with the last_overrun.
103007 */
103008 smp_mb();
103009- overwrite = local_read(&(cpu_buffer->overrun));
103010+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
103011
103012 /*
103013 * Here's the tricky part.
103014@@ -4172,8 +4172,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
103015
103016 cpu_buffer->head_page
103017 = list_entry(cpu_buffer->pages, struct buffer_page, list);
103018- local_set(&cpu_buffer->head_page->write, 0);
103019- local_set(&cpu_buffer->head_page->entries, 0);
103020+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
103021+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
103022 local_set(&cpu_buffer->head_page->page->commit, 0);
103023
103024 cpu_buffer->head_page->read = 0;
103025@@ -4183,18 +4183,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
103026
103027 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
103028 INIT_LIST_HEAD(&cpu_buffer->new_pages);
103029- local_set(&cpu_buffer->reader_page->write, 0);
103030- local_set(&cpu_buffer->reader_page->entries, 0);
103031+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
103032+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
103033 local_set(&cpu_buffer->reader_page->page->commit, 0);
103034 cpu_buffer->reader_page->read = 0;
103035
103036 local_set(&cpu_buffer->entries_bytes, 0);
103037- local_set(&cpu_buffer->overrun, 0);
103038- local_set(&cpu_buffer->commit_overrun, 0);
103039- local_set(&cpu_buffer->dropped_events, 0);
103040+ local_set_unchecked(&cpu_buffer->overrun, 0);
103041+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
103042+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
103043 local_set(&cpu_buffer->entries, 0);
103044 local_set(&cpu_buffer->committing, 0);
103045- local_set(&cpu_buffer->commits, 0);
103046+ local_set_unchecked(&cpu_buffer->commits, 0);
103047 cpu_buffer->read = 0;
103048 cpu_buffer->read_bytes = 0;
103049
103050@@ -4595,8 +4595,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
103051 rb_init_page(bpage);
103052 bpage = reader->page;
103053 reader->page = *data_page;
103054- local_set(&reader->write, 0);
103055- local_set(&reader->entries, 0);
103056+ local_set_unchecked(&reader->write, 0);
103057+ local_set_unchecked(&reader->entries, 0);
103058 reader->read = 0;
103059 *data_page = bpage;
103060
103061diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
103062index 62c6506..5c25989 100644
103063--- a/kernel/trace/trace.c
103064+++ b/kernel/trace/trace.c
103065@@ -3500,7 +3500,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
103066 return 0;
103067 }
103068
103069-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
103070+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
103071 {
103072 /* do nothing if flag is already set */
103073 if (!!(trace_flags & mask) == !!enabled)
103074diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
103075index dd8205a..1aae87a 100644
103076--- a/kernel/trace/trace.h
103077+++ b/kernel/trace/trace.h
103078@@ -1271,7 +1271,7 @@ extern const char *__stop___tracepoint_str[];
103079 void trace_printk_init_buffers(void);
103080 void trace_printk_start_comm(void);
103081 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
103082-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
103083+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
103084
103085 /*
103086 * Normal trace_printk() and friends allocates special buffers
103087diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
103088index 57b67b1..66082a9 100644
103089--- a/kernel/trace/trace_clock.c
103090+++ b/kernel/trace/trace_clock.c
103091@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
103092 return now;
103093 }
103094
103095-static atomic64_t trace_counter;
103096+static atomic64_unchecked_t trace_counter;
103097
103098 /*
103099 * trace_clock_counter(): simply an atomic counter.
103100@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
103101 */
103102 u64 notrace trace_clock_counter(void)
103103 {
103104- return atomic64_add_return(1, &trace_counter);
103105+ return atomic64_inc_return_unchecked(&trace_counter);
103106 }
103107diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
103108index a9c10a3..1864f6b 100644
103109--- a/kernel/trace/trace_events.c
103110+++ b/kernel/trace/trace_events.c
103111@@ -1762,7 +1762,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
103112 return 0;
103113 }
103114
103115-struct ftrace_module_file_ops;
103116 static void __add_event_to_tracers(struct ftrace_event_call *call);
103117
103118 /* Add an additional event_call dynamically */
103119diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
103120index 7f2e97c..085a257 100644
103121--- a/kernel/trace/trace_events_filter.c
103122+++ b/kernel/trace/trace_events_filter.c
103123@@ -1056,6 +1056,9 @@ static void parse_init(struct filter_parse_state *ps,
103124
103125 static char infix_next(struct filter_parse_state *ps)
103126 {
103127+ if (!ps->infix.cnt)
103128+ return 0;
103129+
103130 ps->infix.cnt--;
103131
103132 return ps->infix.string[ps->infix.tail++];
103133@@ -1071,6 +1074,9 @@ static char infix_peek(struct filter_parse_state *ps)
103134
103135 static void infix_advance(struct filter_parse_state *ps)
103136 {
103137+ if (!ps->infix.cnt)
103138+ return;
103139+
103140 ps->infix.cnt--;
103141 ps->infix.tail++;
103142 }
103143diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
103144index b6fce36..d9f11a3 100644
103145--- a/kernel/trace/trace_functions_graph.c
103146+++ b/kernel/trace/trace_functions_graph.c
103147@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
103148
103149 /* The return trace stack is full */
103150 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
103151- atomic_inc(&current->trace_overrun);
103152+ atomic_inc_unchecked(&current->trace_overrun);
103153 return -EBUSY;
103154 }
103155
103156@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
103157 *ret = current->ret_stack[index].ret;
103158 trace->func = current->ret_stack[index].func;
103159 trace->calltime = current->ret_stack[index].calltime;
103160- trace->overrun = atomic_read(&current->trace_overrun);
103161+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
103162 trace->depth = index;
103163 }
103164
103165diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
103166index 7a9ba62..2e0e4a1 100644
103167--- a/kernel/trace/trace_mmiotrace.c
103168+++ b/kernel/trace/trace_mmiotrace.c
103169@@ -24,7 +24,7 @@ struct header_iter {
103170 static struct trace_array *mmio_trace_array;
103171 static bool overrun_detected;
103172 static unsigned long prev_overruns;
103173-static atomic_t dropped_count;
103174+static atomic_unchecked_t dropped_count;
103175
103176 static void mmio_reset_data(struct trace_array *tr)
103177 {
103178@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
103179
103180 static unsigned long count_overruns(struct trace_iterator *iter)
103181 {
103182- unsigned long cnt = atomic_xchg(&dropped_count, 0);
103183+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
103184 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
103185
103186 if (over > prev_overruns)
103187@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
103188 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
103189 sizeof(*entry), 0, pc);
103190 if (!event) {
103191- atomic_inc(&dropped_count);
103192+ atomic_inc_unchecked(&dropped_count);
103193 return;
103194 }
103195 entry = ring_buffer_event_data(event);
103196@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
103197 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
103198 sizeof(*entry), 0, pc);
103199 if (!event) {
103200- atomic_inc(&dropped_count);
103201+ atomic_inc_unchecked(&dropped_count);
103202 return;
103203 }
103204 entry = ring_buffer_event_data(event);
103205diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
103206index 692bf71..6d9a9cd 100644
103207--- a/kernel/trace/trace_output.c
103208+++ b/kernel/trace/trace_output.c
103209@@ -751,14 +751,16 @@ int register_ftrace_event(struct trace_event *event)
103210 goto out;
103211 }
103212
103213+ pax_open_kernel();
103214 if (event->funcs->trace == NULL)
103215- event->funcs->trace = trace_nop_print;
103216+ *(void **)&event->funcs->trace = trace_nop_print;
103217 if (event->funcs->raw == NULL)
103218- event->funcs->raw = trace_nop_print;
103219+ *(void **)&event->funcs->raw = trace_nop_print;
103220 if (event->funcs->hex == NULL)
103221- event->funcs->hex = trace_nop_print;
103222+ *(void **)&event->funcs->hex = trace_nop_print;
103223 if (event->funcs->binary == NULL)
103224- event->funcs->binary = trace_nop_print;
103225+ *(void **)&event->funcs->binary = trace_nop_print;
103226+ pax_close_kernel();
103227
103228 key = event->type & (EVENT_HASHSIZE - 1);
103229
103230diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
103231index e694c9f..6775a38 100644
103232--- a/kernel/trace/trace_seq.c
103233+++ b/kernel/trace/trace_seq.c
103234@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
103235 return 0;
103236 }
103237
103238- seq_buf_path(&s->seq, path, "\n");
103239+ seq_buf_path(&s->seq, path, "\n\\");
103240
103241 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
103242 s->seq.len = save_len;
103243diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
103244index c3e4fcf..ef6cc43 100644
103245--- a/kernel/trace/trace_stack.c
103246+++ b/kernel/trace/trace_stack.c
103247@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
103248 return;
103249
103250 /* we do not handle interrupt stacks yet */
103251- if (!object_is_on_stack(stack))
103252+ if (!object_starts_on_stack(stack))
103253 return;
103254
103255 local_irq_save(flags);
103256diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
103257index f97f6e3..d367b48 100644
103258--- a/kernel/trace/trace_syscalls.c
103259+++ b/kernel/trace/trace_syscalls.c
103260@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
103261 int num;
103262
103263 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103264+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103265+ return -EINVAL;
103266
103267 mutex_lock(&syscall_trace_lock);
103268 if (!sys_perf_refcount_enter)
103269@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
103270 int num;
103271
103272 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103273+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103274+ return;
103275
103276 mutex_lock(&syscall_trace_lock);
103277 sys_perf_refcount_enter--;
103278@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
103279 int num;
103280
103281 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103282+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103283+ return -EINVAL;
103284
103285 mutex_lock(&syscall_trace_lock);
103286 if (!sys_perf_refcount_exit)
103287@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
103288 int num;
103289
103290 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103291+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103292+ return;
103293
103294 mutex_lock(&syscall_trace_lock);
103295 sys_perf_refcount_exit--;
103296diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
103297index 4109f83..fe1f830 100644
103298--- a/kernel/user_namespace.c
103299+++ b/kernel/user_namespace.c
103300@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
103301 !kgid_has_mapping(parent_ns, group))
103302 return -EPERM;
103303
103304+#ifdef CONFIG_GRKERNSEC
103305+ /*
103306+ * This doesn't really inspire confidence:
103307+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
103308+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
103309+ * Increases kernel attack surface in areas developers
103310+ * previously cared little about ("low importance due
103311+ * to requiring "root" capability")
103312+ * To be removed when this code receives *proper* review
103313+ */
103314+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
103315+ !capable(CAP_SETGID))
103316+ return -EPERM;
103317+#endif
103318+
103319 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
103320 if (!ns)
103321 return -ENOMEM;
103322@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
103323 if (atomic_read(&current->mm->mm_users) > 1)
103324 return -EINVAL;
103325
103326- if (current->fs->users != 1)
103327+ if (atomic_read(&current->fs->users) != 1)
103328 return -EINVAL;
103329
103330 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
103331diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
103332index c8eac43..4b5f08f 100644
103333--- a/kernel/utsname_sysctl.c
103334+++ b/kernel/utsname_sysctl.c
103335@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
103336 static int proc_do_uts_string(struct ctl_table *table, int write,
103337 void __user *buffer, size_t *lenp, loff_t *ppos)
103338 {
103339- struct ctl_table uts_table;
103340+ ctl_table_no_const uts_table;
103341 int r;
103342 memcpy(&uts_table, table, sizeof(uts_table));
103343 uts_table.data = get_uts(table, write);
103344diff --git a/kernel/watchdog.c b/kernel/watchdog.c
103345index 3174bf8..3553520 100644
103346--- a/kernel/watchdog.c
103347+++ b/kernel/watchdog.c
103348@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
103349 static void watchdog_nmi_disable(unsigned int cpu) { return; }
103350 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
103351
103352-static struct smp_hotplug_thread watchdog_threads = {
103353+static struct smp_hotplug_thread watchdog_threads __read_only = {
103354 .store = &softlockup_watchdog,
103355 .thread_should_run = watchdog_should_run,
103356 .thread_fn = watchdog,
103357diff --git a/kernel/workqueue.c b/kernel/workqueue.c
103358index 41ff75b..5ad683a 100644
103359--- a/kernel/workqueue.c
103360+++ b/kernel/workqueue.c
103361@@ -4564,7 +4564,7 @@ static void rebind_workers(struct worker_pool *pool)
103362 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
103363 worker_flags |= WORKER_REBOUND;
103364 worker_flags &= ~WORKER_UNBOUND;
103365- ACCESS_ONCE(worker->flags) = worker_flags;
103366+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
103367 }
103368
103369 spin_unlock_irq(&pool->lock);
103370diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
103371index c5cefb3..a4241e3 100644
103372--- a/lib/Kconfig.debug
103373+++ b/lib/Kconfig.debug
103374@@ -923,7 +923,7 @@ config DEBUG_MUTEXES
103375
103376 config DEBUG_WW_MUTEX_SLOWPATH
103377 bool "Wait/wound mutex debugging: Slowpath testing"
103378- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103379+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103380 select DEBUG_LOCK_ALLOC
103381 select DEBUG_SPINLOCK
103382 select DEBUG_MUTEXES
103383@@ -940,7 +940,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
103384
103385 config DEBUG_LOCK_ALLOC
103386 bool "Lock debugging: detect incorrect freeing of live locks"
103387- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103388+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103389 select DEBUG_SPINLOCK
103390 select DEBUG_MUTEXES
103391 select LOCKDEP
103392@@ -954,7 +954,7 @@ config DEBUG_LOCK_ALLOC
103393
103394 config PROVE_LOCKING
103395 bool "Lock debugging: prove locking correctness"
103396- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103397+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103398 select LOCKDEP
103399 select DEBUG_SPINLOCK
103400 select DEBUG_MUTEXES
103401@@ -1005,7 +1005,7 @@ config LOCKDEP
103402
103403 config LOCK_STAT
103404 bool "Lock usage statistics"
103405- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103406+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103407 select LOCKDEP
103408 select DEBUG_SPINLOCK
103409 select DEBUG_MUTEXES
103410@@ -1467,6 +1467,7 @@ config LATENCYTOP
103411 depends on DEBUG_KERNEL
103412 depends on STACKTRACE_SUPPORT
103413 depends on PROC_FS
103414+ depends on !GRKERNSEC_HIDESYM
103415 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
103416 select KALLSYMS
103417 select KALLSYMS_ALL
103418@@ -1483,7 +1484,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
103419 config DEBUG_STRICT_USER_COPY_CHECKS
103420 bool "Strict user copy size checks"
103421 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
103422- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
103423+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
103424 help
103425 Enabling this option turns a certain set of sanity checks for user
103426 copy operations into compile time failures.
103427@@ -1614,7 +1615,7 @@ endmenu # runtime tests
103428
103429 config PROVIDE_OHCI1394_DMA_INIT
103430 bool "Remote debugging over FireWire early on boot"
103431- depends on PCI && X86
103432+ depends on PCI && X86 && !GRKERNSEC
103433 help
103434 If you want to debug problems which hang or crash the kernel early
103435 on boot and the crashing machine has a FireWire port, you can use
103436diff --git a/lib/Makefile b/lib/Makefile
103437index 58f74d2..08e011f 100644
103438--- a/lib/Makefile
103439+++ b/lib/Makefile
103440@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
103441 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
103442 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
103443 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
103444-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
103445+obj-y += list_debug.o
103446 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
103447
103448 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
103449diff --git a/lib/average.c b/lib/average.c
103450index 114d1be..ab0350c 100644
103451--- a/lib/average.c
103452+++ b/lib/average.c
103453@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
103454 {
103455 unsigned long internal = ACCESS_ONCE(avg->internal);
103456
103457- ACCESS_ONCE(avg->internal) = internal ?
103458+ ACCESS_ONCE_RW(avg->internal) = internal ?
103459 (((internal << avg->weight) - internal) +
103460 (val << avg->factor)) >> avg->weight :
103461 (val << avg->factor);
103462diff --git a/lib/bitmap.c b/lib/bitmap.c
103463index d456f4c1..29a0308 100644
103464--- a/lib/bitmap.c
103465+++ b/lib/bitmap.c
103466@@ -264,7 +264,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
103467 }
103468 EXPORT_SYMBOL(__bitmap_subset);
103469
103470-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
103471+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
103472 {
103473 unsigned int k, lim = bits/BITS_PER_LONG;
103474 int w = 0;
103475@@ -391,7 +391,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
103476 {
103477 int c, old_c, totaldigits, ndigits, nchunks, nbits;
103478 u32 chunk;
103479- const char __user __force *ubuf = (const char __user __force *)buf;
103480+ const char __user *ubuf = (const char __force_user *)buf;
103481
103482 bitmap_zero(maskp, nmaskbits);
103483
103484@@ -476,7 +476,7 @@ int bitmap_parse_user(const char __user *ubuf,
103485 {
103486 if (!access_ok(VERIFY_READ, ubuf, ulen))
103487 return -EFAULT;
103488- return __bitmap_parse((const char __force *)ubuf,
103489+ return __bitmap_parse((const char __force_kernel *)ubuf,
103490 ulen, 1, maskp, nmaskbits);
103491
103492 }
103493@@ -535,7 +535,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
103494 {
103495 unsigned a, b;
103496 int c, old_c, totaldigits;
103497- const char __user __force *ubuf = (const char __user __force *)buf;
103498+ const char __user *ubuf = (const char __force_user *)buf;
103499 int exp_digit, in_range;
103500
103501 totaldigits = c = 0;
103502@@ -630,7 +630,7 @@ int bitmap_parselist_user(const char __user *ubuf,
103503 {
103504 if (!access_ok(VERIFY_READ, ubuf, ulen))
103505 return -EFAULT;
103506- return __bitmap_parselist((const char __force *)ubuf,
103507+ return __bitmap_parselist((const char __force_kernel *)ubuf,
103508 ulen, 1, maskp, nmaskbits);
103509 }
103510 EXPORT_SYMBOL(bitmap_parselist_user);
103511diff --git a/lib/bug.c b/lib/bug.c
103512index 0c3bd95..5a615a1 100644
103513--- a/lib/bug.c
103514+++ b/lib/bug.c
103515@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
103516 return BUG_TRAP_TYPE_NONE;
103517
103518 bug = find_bug(bugaddr);
103519+ if (!bug)
103520+ return BUG_TRAP_TYPE_NONE;
103521
103522 file = NULL;
103523 line = 0;
103524diff --git a/lib/debugobjects.c b/lib/debugobjects.c
103525index 547f7f9..a6d4ba0 100644
103526--- a/lib/debugobjects.c
103527+++ b/lib/debugobjects.c
103528@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
103529 if (limit > 4)
103530 return;
103531
103532- is_on_stack = object_is_on_stack(addr);
103533+ is_on_stack = object_starts_on_stack(addr);
103534 if (is_on_stack == onstack)
103535 return;
103536
103537diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
103538index 6dd0335..1e9c239 100644
103539--- a/lib/decompress_bunzip2.c
103540+++ b/lib/decompress_bunzip2.c
103541@@ -665,7 +665,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
103542
103543 /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
103544 uncompressed data. Allocate intermediate buffer for block. */
103545- bd->dbufSize = 100000*(i-BZh0);
103546+ i -= BZh0;
103547+ bd->dbufSize = 100000 * i;
103548
103549 bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
103550 if (!bd->dbuf)
103551diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c
103552index 0be83af..4605e93 100644
103553--- a/lib/decompress_unlzma.c
103554+++ b/lib/decompress_unlzma.c
103555@@ -39,10 +39,10 @@
103556
103557 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
103558
103559-static long long INIT read_int(unsigned char *ptr, int size)
103560+static unsigned long long INIT read_int(unsigned char *ptr, int size)
103561 {
103562 int i;
103563- long long ret = 0;
103564+ unsigned long long ret = 0;
103565
103566 for (i = 0; i < size; i++)
103567 ret = (ret << 8) | ptr[size-i-1];
103568diff --git a/lib/div64.c b/lib/div64.c
103569index 4382ad7..08aa558 100644
103570--- a/lib/div64.c
103571+++ b/lib/div64.c
103572@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
103573 EXPORT_SYMBOL(__div64_32);
103574
103575 #ifndef div_s64_rem
103576-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
103577+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
103578 {
103579 u64 quotient;
103580
103581@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
103582 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
103583 */
103584 #ifndef div64_u64
103585-u64 div64_u64(u64 dividend, u64 divisor)
103586+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
103587 {
103588 u32 high = divisor >> 32;
103589 u64 quot;
103590diff --git a/lib/dma-debug.c b/lib/dma-debug.c
103591index 9722bd2..0d826f4 100644
103592--- a/lib/dma-debug.c
103593+++ b/lib/dma-debug.c
103594@@ -979,7 +979,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
103595
103596 void dma_debug_add_bus(struct bus_type *bus)
103597 {
103598- struct notifier_block *nb;
103599+ notifier_block_no_const *nb;
103600
103601 if (dma_debug_disabled())
103602 return;
103603@@ -1161,7 +1161,7 @@ static void check_unmap(struct dma_debug_entry *ref)
103604
103605 static void check_for_stack(struct device *dev, void *addr)
103606 {
103607- if (object_is_on_stack(addr))
103608+ if (object_starts_on_stack(addr))
103609 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
103610 "stack [addr=%p]\n", addr);
103611 }
103612diff --git a/lib/inflate.c b/lib/inflate.c
103613index 013a761..c28f3fc 100644
103614--- a/lib/inflate.c
103615+++ b/lib/inflate.c
103616@@ -269,7 +269,7 @@ static void free(void *where)
103617 malloc_ptr = free_mem_ptr;
103618 }
103619 #else
103620-#define malloc(a) kmalloc(a, GFP_KERNEL)
103621+#define malloc(a) kmalloc((a), GFP_KERNEL)
103622 #define free(a) kfree(a)
103623 #endif
103624
103625diff --git a/lib/ioremap.c b/lib/ioremap.c
103626index 0c9216c..863bd89 100644
103627--- a/lib/ioremap.c
103628+++ b/lib/ioremap.c
103629@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
103630 unsigned long next;
103631
103632 phys_addr -= addr;
103633- pmd = pmd_alloc(&init_mm, pud, addr);
103634+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
103635 if (!pmd)
103636 return -ENOMEM;
103637 do {
103638@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
103639 unsigned long next;
103640
103641 phys_addr -= addr;
103642- pud = pud_alloc(&init_mm, pgd, addr);
103643+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
103644 if (!pud)
103645 return -ENOMEM;
103646 do {
103647diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
103648index bd2bea9..6b3c95e 100644
103649--- a/lib/is_single_threaded.c
103650+++ b/lib/is_single_threaded.c
103651@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
103652 struct task_struct *p, *t;
103653 bool ret;
103654
103655+ if (!mm)
103656+ return true;
103657+
103658 if (atomic_read(&task->signal->live) != 1)
103659 return false;
103660
103661diff --git a/lib/kobject.c b/lib/kobject.c
103662index 03d4ab3..46f6374 100644
103663--- a/lib/kobject.c
103664+++ b/lib/kobject.c
103665@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
103666
103667
103668 static DEFINE_SPINLOCK(kobj_ns_type_lock);
103669-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
103670+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
103671
103672-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
103673+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
103674 {
103675 enum kobj_ns_type type = ops->type;
103676 int error;
103677diff --git a/lib/list_debug.c b/lib/list_debug.c
103678index c24c2f7..f0296f4 100644
103679--- a/lib/list_debug.c
103680+++ b/lib/list_debug.c
103681@@ -11,7 +11,9 @@
103682 #include <linux/bug.h>
103683 #include <linux/kernel.h>
103684 #include <linux/rculist.h>
103685+#include <linux/mm.h>
103686
103687+#ifdef CONFIG_DEBUG_LIST
103688 /*
103689 * Insert a new entry between two known consecutive entries.
103690 *
103691@@ -19,21 +21,40 @@
103692 * the prev/next entries already!
103693 */
103694
103695+static bool __list_add_debug(struct list_head *new,
103696+ struct list_head *prev,
103697+ struct list_head *next)
103698+{
103699+ if (unlikely(next->prev != prev)) {
103700+ printk(KERN_ERR "list_add corruption. next->prev should be "
103701+ "prev (%p), but was %p. (next=%p).\n",
103702+ prev, next->prev, next);
103703+ BUG();
103704+ return false;
103705+ }
103706+ if (unlikely(prev->next != next)) {
103707+ printk(KERN_ERR "list_add corruption. prev->next should be "
103708+ "next (%p), but was %p. (prev=%p).\n",
103709+ next, prev->next, prev);
103710+ BUG();
103711+ return false;
103712+ }
103713+ if (unlikely(new == prev || new == next)) {
103714+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
103715+ new, prev, next);
103716+ BUG();
103717+ return false;
103718+ }
103719+ return true;
103720+}
103721+
103722 void __list_add(struct list_head *new,
103723- struct list_head *prev,
103724- struct list_head *next)
103725+ struct list_head *prev,
103726+ struct list_head *next)
103727 {
103728- WARN(next->prev != prev,
103729- "list_add corruption. next->prev should be "
103730- "prev (%p), but was %p. (next=%p).\n",
103731- prev, next->prev, next);
103732- WARN(prev->next != next,
103733- "list_add corruption. prev->next should be "
103734- "next (%p), but was %p. (prev=%p).\n",
103735- next, prev->next, prev);
103736- WARN(new == prev || new == next,
103737- "list_add double add: new=%p, prev=%p, next=%p.\n",
103738- new, prev, next);
103739+ if (!__list_add_debug(new, prev, next))
103740+ return;
103741+
103742 next->prev = new;
103743 new->next = next;
103744 new->prev = prev;
103745@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
103746 }
103747 EXPORT_SYMBOL(__list_add);
103748
103749-void __list_del_entry(struct list_head *entry)
103750+static bool __list_del_entry_debug(struct list_head *entry)
103751 {
103752 struct list_head *prev, *next;
103753
103754 prev = entry->prev;
103755 next = entry->next;
103756
103757- if (WARN(next == LIST_POISON1,
103758- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
103759- entry, LIST_POISON1) ||
103760- WARN(prev == LIST_POISON2,
103761- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
103762- entry, LIST_POISON2) ||
103763- WARN(prev->next != entry,
103764- "list_del corruption. prev->next should be %p, "
103765- "but was %p\n", entry, prev->next) ||
103766- WARN(next->prev != entry,
103767- "list_del corruption. next->prev should be %p, "
103768- "but was %p\n", entry, next->prev))
103769+ if (unlikely(next == LIST_POISON1)) {
103770+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
103771+ entry, LIST_POISON1);
103772+ BUG();
103773+ return false;
103774+ }
103775+ if (unlikely(prev == LIST_POISON2)) {
103776+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
103777+ entry, LIST_POISON2);
103778+ BUG();
103779+ return false;
103780+ }
103781+ if (unlikely(entry->prev->next != entry)) {
103782+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
103783+ "but was %p\n", entry, prev->next);
103784+ BUG();
103785+ return false;
103786+ }
103787+ if (unlikely(entry->next->prev != entry)) {
103788+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
103789+ "but was %p\n", entry, next->prev);
103790+ BUG();
103791+ return false;
103792+ }
103793+ return true;
103794+}
103795+
103796+void __list_del_entry(struct list_head *entry)
103797+{
103798+ if (!__list_del_entry_debug(entry))
103799 return;
103800
103801- __list_del(prev, next);
103802+ __list_del(entry->prev, entry->next);
103803 }
103804 EXPORT_SYMBOL(__list_del_entry);
103805
103806@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
103807 void __list_add_rcu(struct list_head *new,
103808 struct list_head *prev, struct list_head *next)
103809 {
103810- WARN(next->prev != prev,
103811- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
103812- prev, next->prev, next);
103813- WARN(prev->next != next,
103814- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
103815- next, prev->next, prev);
103816+ if (!__list_add_debug(new, prev, next))
103817+ return;
103818+
103819 new->next = next;
103820 new->prev = prev;
103821 rcu_assign_pointer(list_next_rcu(prev), new);
103822 next->prev = new;
103823 }
103824 EXPORT_SYMBOL(__list_add_rcu);
103825+#endif
103826+
103827+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
103828+{
103829+#ifdef CONFIG_DEBUG_LIST
103830+ if (!__list_add_debug(new, prev, next))
103831+ return;
103832+#endif
103833+
103834+ pax_open_kernel();
103835+ next->prev = new;
103836+ new->next = next;
103837+ new->prev = prev;
103838+ prev->next = new;
103839+ pax_close_kernel();
103840+}
103841+EXPORT_SYMBOL(__pax_list_add);
103842+
103843+void pax_list_del(struct list_head *entry)
103844+{
103845+#ifdef CONFIG_DEBUG_LIST
103846+ if (!__list_del_entry_debug(entry))
103847+ return;
103848+#endif
103849+
103850+ pax_open_kernel();
103851+ __list_del(entry->prev, entry->next);
103852+ entry->next = LIST_POISON1;
103853+ entry->prev = LIST_POISON2;
103854+ pax_close_kernel();
103855+}
103856+EXPORT_SYMBOL(pax_list_del);
103857+
103858+void pax_list_del_init(struct list_head *entry)
103859+{
103860+ pax_open_kernel();
103861+ __list_del(entry->prev, entry->next);
103862+ INIT_LIST_HEAD(entry);
103863+ pax_close_kernel();
103864+}
103865+EXPORT_SYMBOL(pax_list_del_init);
103866+
103867+void __pax_list_add_rcu(struct list_head *new,
103868+ struct list_head *prev, struct list_head *next)
103869+{
103870+#ifdef CONFIG_DEBUG_LIST
103871+ if (!__list_add_debug(new, prev, next))
103872+ return;
103873+#endif
103874+
103875+ pax_open_kernel();
103876+ new->next = next;
103877+ new->prev = prev;
103878+ rcu_assign_pointer(list_next_rcu(prev), new);
103879+ next->prev = new;
103880+ pax_close_kernel();
103881+}
103882+EXPORT_SYMBOL(__pax_list_add_rcu);
103883+
103884+void pax_list_del_rcu(struct list_head *entry)
103885+{
103886+#ifdef CONFIG_DEBUG_LIST
103887+ if (!__list_del_entry_debug(entry))
103888+ return;
103889+#endif
103890+
103891+ pax_open_kernel();
103892+ __list_del(entry->prev, entry->next);
103893+ entry->next = LIST_POISON1;
103894+ entry->prev = LIST_POISON2;
103895+ pax_close_kernel();
103896+}
103897+EXPORT_SYMBOL(pax_list_del_rcu);
103898diff --git a/lib/lockref.c b/lib/lockref.c
103899index ecb9a66..a044fc5 100644
103900--- a/lib/lockref.c
103901+++ b/lib/lockref.c
103902@@ -48,13 +48,13 @@
103903 void lockref_get(struct lockref *lockref)
103904 {
103905 CMPXCHG_LOOP(
103906- new.count++;
103907+ __lockref_inc(&new);
103908 ,
103909 return;
103910 );
103911
103912 spin_lock(&lockref->lock);
103913- lockref->count++;
103914+ __lockref_inc(lockref);
103915 spin_unlock(&lockref->lock);
103916 }
103917 EXPORT_SYMBOL(lockref_get);
103918@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
103919 int retval;
103920
103921 CMPXCHG_LOOP(
103922- new.count++;
103923- if (old.count <= 0)
103924+ __lockref_inc(&new);
103925+ if (__lockref_read(&old) <= 0)
103926 return 0;
103927 ,
103928 return 1;
103929@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
103930
103931 spin_lock(&lockref->lock);
103932 retval = 0;
103933- if (lockref->count > 0) {
103934- lockref->count++;
103935+ if (__lockref_read(lockref) > 0) {
103936+ __lockref_inc(lockref);
103937 retval = 1;
103938 }
103939 spin_unlock(&lockref->lock);
103940@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
103941 int lockref_get_or_lock(struct lockref *lockref)
103942 {
103943 CMPXCHG_LOOP(
103944- new.count++;
103945- if (old.count <= 0)
103946+ __lockref_inc(&new);
103947+ if (__lockref_read(&old) <= 0)
103948 break;
103949 ,
103950 return 1;
103951 );
103952
103953 spin_lock(&lockref->lock);
103954- if (lockref->count <= 0)
103955+ if (__lockref_read(lockref) <= 0)
103956 return 0;
103957- lockref->count++;
103958+ __lockref_inc(lockref);
103959 spin_unlock(&lockref->lock);
103960 return 1;
103961 }
103962@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
103963 int lockref_put_return(struct lockref *lockref)
103964 {
103965 CMPXCHG_LOOP(
103966- new.count--;
103967- if (old.count <= 0)
103968+ __lockref_dec(&new);
103969+ if (__lockref_read(&old) <= 0)
103970 return -1;
103971 ,
103972- return new.count;
103973+ return __lockref_read(&new);
103974 );
103975 return -1;
103976 }
103977@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
103978 int lockref_put_or_lock(struct lockref *lockref)
103979 {
103980 CMPXCHG_LOOP(
103981- new.count--;
103982- if (old.count <= 1)
103983+ __lockref_dec(&new);
103984+ if (__lockref_read(&old) <= 1)
103985 break;
103986 ,
103987 return 1;
103988 );
103989
103990 spin_lock(&lockref->lock);
103991- if (lockref->count <= 1)
103992+ if (__lockref_read(lockref) <= 1)
103993 return 0;
103994- lockref->count--;
103995+ __lockref_dec(lockref);
103996 spin_unlock(&lockref->lock);
103997 return 1;
103998 }
103999@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
104000 void lockref_mark_dead(struct lockref *lockref)
104001 {
104002 assert_spin_locked(&lockref->lock);
104003- lockref->count = -128;
104004+ __lockref_set(lockref, -128);
104005 }
104006 EXPORT_SYMBOL(lockref_mark_dead);
104007
104008@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
104009 int retval;
104010
104011 CMPXCHG_LOOP(
104012- new.count++;
104013- if (old.count < 0)
104014+ __lockref_inc(&new);
104015+ if (__lockref_read(&old) < 0)
104016 return 0;
104017 ,
104018 return 1;
104019@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
104020
104021 spin_lock(&lockref->lock);
104022 retval = 0;
104023- if (lockref->count >= 0) {
104024- lockref->count++;
104025+ if (__lockref_read(lockref) >= 0) {
104026+ __lockref_inc(lockref);
104027 retval = 1;
104028 }
104029 spin_unlock(&lockref->lock);
104030diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h
104031index aac5114..a89d041 100644
104032--- a/lib/mpi/longlong.h
104033+++ b/lib/mpi/longlong.h
104034@@ -639,7 +639,7 @@ do { \
104035 ************** MIPS *****************
104036 ***************************************/
104037 #if defined(__mips__) && W_TYPE_SIZE == 32
104038-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
104039+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
104040 #define umul_ppmm(w1, w0, u, v) \
104041 do { \
104042 UDItype __ll = (UDItype)(u) * (v); \
104043@@ -671,7 +671,7 @@ do { \
104044 ************** MIPS/64 **************
104045 ***************************************/
104046 #if (defined(__mips) && __mips >= 3) && W_TYPE_SIZE == 64
104047-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
104048+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
104049 #define umul_ppmm(w1, w0, u, v) \
104050 do { \
104051 typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \
104052diff --git a/lib/nlattr.c b/lib/nlattr.c
104053index f5907d2..36072be 100644
104054--- a/lib/nlattr.c
104055+++ b/lib/nlattr.c
104056@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
104057 {
104058 int minlen = min_t(int, count, nla_len(src));
104059
104060+ BUG_ON(minlen < 0);
104061+
104062 memcpy(dest, nla_data(src), minlen);
104063 if (count > minlen)
104064 memset(dest + minlen, 0, count - minlen);
104065diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
104066index 6111bcb..02e816b 100644
104067--- a/lib/percpu-refcount.c
104068+++ b/lib/percpu-refcount.c
104069@@ -31,7 +31,7 @@
104070 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
104071 */
104072
104073-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
104074+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
104075
104076 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
104077
104078diff --git a/lib/radix-tree.c b/lib/radix-tree.c
104079index 3d2aa27..a472f20 100644
104080--- a/lib/radix-tree.c
104081+++ b/lib/radix-tree.c
104082@@ -67,7 +67,7 @@ struct radix_tree_preload {
104083 int nr;
104084 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
104085 };
104086-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
104087+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
104088
104089 static inline void *ptr_to_indirect(void *ptr)
104090 {
104091diff --git a/lib/random32.c b/lib/random32.c
104092index 0bee183..526f12f 100644
104093--- a/lib/random32.c
104094+++ b/lib/random32.c
104095@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
104096 }
104097 #endif
104098
104099-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
104100+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
104101
104102 /**
104103 * prandom_u32_state - seeded pseudo-random number generator.
104104diff --git a/lib/rbtree.c b/lib/rbtree.c
104105index c16c81a..4dcbda1 100644
104106--- a/lib/rbtree.c
104107+++ b/lib/rbtree.c
104108@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
104109 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
104110
104111 static const struct rb_augment_callbacks dummy_callbacks = {
104112- dummy_propagate, dummy_copy, dummy_rotate
104113+ .propagate = dummy_propagate,
104114+ .copy = dummy_copy,
104115+ .rotate = dummy_rotate
104116 };
104117
104118 void rb_insert_color(struct rb_node *node, struct rb_root *root)
104119diff --git a/lib/show_mem.c b/lib/show_mem.c
104120index adc98e18..0ce83c2 100644
104121--- a/lib/show_mem.c
104122+++ b/lib/show_mem.c
104123@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
104124 quicklist_total_size());
104125 #endif
104126 #ifdef CONFIG_MEMORY_FAILURE
104127- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
104128+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
104129 #endif
104130 }
104131diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
104132index e0af6ff..fcc9f15 100644
104133--- a/lib/strncpy_from_user.c
104134+++ b/lib/strncpy_from_user.c
104135@@ -22,7 +22,7 @@
104136 */
104137 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
104138 {
104139- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104140+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104141 long res = 0;
104142
104143 /*
104144diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
104145index 1164961..02dccaa 100644
104146--- a/lib/strnlen_user.c
104147+++ b/lib/strnlen_user.c
104148@@ -26,7 +26,7 @@
104149 */
104150 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
104151 {
104152- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104153+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104154 long align, res = 0;
104155 unsigned long c;
104156
104157diff --git a/lib/swiotlb.c b/lib/swiotlb.c
104158index 4abda07..b9d3765 100644
104159--- a/lib/swiotlb.c
104160+++ b/lib/swiotlb.c
104161@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
104162
104163 void
104164 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
104165- dma_addr_t dev_addr)
104166+ dma_addr_t dev_addr, struct dma_attrs *attrs)
104167 {
104168 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
104169
104170diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
104171index daf29a39..56f44ac 100644
104172--- a/lib/test-hexdump.c
104173+++ b/lib/test-hexdump.c
104174@@ -18,26 +18,26 @@ static const unsigned char data_b[] = {
104175
104176 static const unsigned char data_a[] = ".2.{....p..$}.4...1.....L...C...";
104177
104178-static const char *test_data_1_le[] __initconst = {
104179+static const char * const test_data_1_le[] __initconst = {
104180 "be", "32", "db", "7b", "0a", "18", "93", "b2",
104181 "70", "ba", "c4", "24", "7d", "83", "34", "9b",
104182 "a6", "9c", "31", "ad", "9c", "0f", "ac", "e9",
104183 "4c", "d1", "19", "99", "43", "b1", "af", "0c",
104184 };
104185
104186-static const char *test_data_2_le[] __initconst = {
104187+static const char * const test_data_2_le[] __initconst = {
104188 "32be", "7bdb", "180a", "b293",
104189 "ba70", "24c4", "837d", "9b34",
104190 "9ca6", "ad31", "0f9c", "e9ac",
104191 "d14c", "9919", "b143", "0caf",
104192 };
104193
104194-static const char *test_data_4_le[] __initconst = {
104195+static const char * const test_data_4_le[] __initconst = {
104196 "7bdb32be", "b293180a", "24c4ba70", "9b34837d",
104197 "ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
104198 };
104199
104200-static const char *test_data_8_le[] __initconst = {
104201+static const char * const test_data_8_le[] __initconst = {
104202 "b293180a7bdb32be", "9b34837d24c4ba70",
104203 "e9ac0f9cad319ca6", "0cafb1439919d14c",
104204 };
104205diff --git a/lib/usercopy.c b/lib/usercopy.c
104206index 4f5b1dd..7cab418 100644
104207--- a/lib/usercopy.c
104208+++ b/lib/usercopy.c
104209@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
104210 WARN(1, "Buffer overflow detected!\n");
104211 }
104212 EXPORT_SYMBOL(copy_from_user_overflow);
104213+
104214+void copy_to_user_overflow(void)
104215+{
104216+ WARN(1, "Buffer overflow detected!\n");
104217+}
104218+EXPORT_SYMBOL(copy_to_user_overflow);
104219diff --git a/lib/vsprintf.c b/lib/vsprintf.c
104220index b235c96..343ffc1 100644
104221--- a/lib/vsprintf.c
104222+++ b/lib/vsprintf.c
104223@@ -16,6 +16,9 @@
104224 * - scnprintf and vscnprintf
104225 */
104226
104227+#ifdef CONFIG_GRKERNSEC_HIDESYM
104228+#define __INCLUDED_BY_HIDESYM 1
104229+#endif
104230 #include <stdarg.h>
104231 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
104232 #include <linux/types.h>
104233@@ -626,7 +629,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
104234 #ifdef CONFIG_KALLSYMS
104235 if (*fmt == 'B')
104236 sprint_backtrace(sym, value);
104237- else if (*fmt != 'f' && *fmt != 's')
104238+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
104239 sprint_symbol(sym, value);
104240 else
104241 sprint_symbol_no_offset(sym, value);
104242@@ -1322,7 +1325,11 @@ char *address_val(char *buf, char *end, const void *addr,
104243 return number(buf, end, num, spec);
104244 }
104245
104246+#ifdef CONFIG_GRKERNSEC_HIDESYM
104247+int kptr_restrict __read_mostly = 2;
104248+#else
104249 int kptr_restrict __read_mostly;
104250+#endif
104251
104252 /*
104253 * Show a '%p' thing. A kernel extension is that the '%p' is followed
104254@@ -1333,8 +1340,10 @@ int kptr_restrict __read_mostly;
104255 *
104256 * - 'F' For symbolic function descriptor pointers with offset
104257 * - 'f' For simple symbolic function names without offset
104258+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
104259 * - 'S' For symbolic direct pointers with offset
104260 * - 's' For symbolic direct pointers without offset
104261+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
104262 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
104263 * - 'B' For backtraced symbolic direct pointers with offset
104264 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
104265@@ -1417,12 +1426,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104266
104267 if (!ptr && *fmt != 'K') {
104268 /*
104269- * Print (null) with the same width as a pointer so it makes
104270+ * Print (nil) with the same width as a pointer so it makes
104271 * tabular output look nice.
104272 */
104273 if (spec.field_width == -1)
104274 spec.field_width = default_width;
104275- return string(buf, end, "(null)", spec);
104276+ return string(buf, end, "(nil)", spec);
104277 }
104278
104279 switch (*fmt) {
104280@@ -1432,6 +1441,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104281 /* Fallthrough */
104282 case 'S':
104283 case 's':
104284+#ifdef CONFIG_GRKERNSEC_HIDESYM
104285+ break;
104286+#else
104287+ return symbol_string(buf, end, ptr, spec, fmt);
104288+#endif
104289+ case 'X':
104290+ ptr = dereference_function_descriptor(ptr);
104291+ case 'A':
104292 case 'B':
104293 return symbol_string(buf, end, ptr, spec, fmt);
104294 case 'R':
104295@@ -1496,6 +1513,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104296 va_end(va);
104297 return buf;
104298 }
104299+ case 'P':
104300+ break;
104301 case 'K':
104302 /*
104303 * %pK cannot be used in IRQ context because its test
104304@@ -1553,6 +1572,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104305 ((const struct file *)ptr)->f_path.dentry,
104306 spec, fmt);
104307 }
104308+
104309+#ifdef CONFIG_GRKERNSEC_HIDESYM
104310+ /* 'P' = approved pointers to copy to userland,
104311+ as in the /proc/kallsyms case, as we make it display nothing
104312+ for non-root users, and the real contents for root users
104313+ 'X' = approved simple symbols
104314+ Also ignore 'K' pointers, since we force their NULLing for non-root users
104315+ above
104316+ */
104317+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
104318+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
104319+ dump_stack();
104320+ ptr = NULL;
104321+ }
104322+#endif
104323+
104324 spec.flags |= SMALL;
104325 if (spec.field_width == -1) {
104326 spec.field_width = default_width;
104327@@ -2254,11 +2289,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
104328 typeof(type) value; \
104329 if (sizeof(type) == 8) { \
104330 args = PTR_ALIGN(args, sizeof(u32)); \
104331- *(u32 *)&value = *(u32 *)args; \
104332- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
104333+ *(u32 *)&value = *(const u32 *)args; \
104334+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
104335 } else { \
104336 args = PTR_ALIGN(args, sizeof(type)); \
104337- value = *(typeof(type) *)args; \
104338+ value = *(const typeof(type) *)args; \
104339 } \
104340 args += sizeof(type); \
104341 value; \
104342@@ -2321,7 +2356,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
104343 case FORMAT_TYPE_STR: {
104344 const char *str_arg = args;
104345 args += strlen(str_arg) + 1;
104346- str = string(str, end, (char *)str_arg, spec);
104347+ str = string(str, end, str_arg, spec);
104348 break;
104349 }
104350
104351diff --git a/localversion-grsec b/localversion-grsec
104352new file mode 100644
104353index 0000000..7cd6065
104354--- /dev/null
104355+++ b/localversion-grsec
104356@@ -0,0 +1 @@
104357+-grsec
104358diff --git a/mm/Kconfig b/mm/Kconfig
104359index a03131b..1b1bafb 100644
104360--- a/mm/Kconfig
104361+++ b/mm/Kconfig
104362@@ -342,10 +342,11 @@ config KSM
104363 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
104364
104365 config DEFAULT_MMAP_MIN_ADDR
104366- int "Low address space to protect from user allocation"
104367+ int "Low address space to protect from user allocation"
104368 depends on MMU
104369- default 4096
104370- help
104371+ default 32768 if ALPHA || ARM || PARISC || SPARC32
104372+ default 65536
104373+ help
104374 This is the portion of low virtual memory which should be protected
104375 from userspace allocation. Keeping a user from writing to low pages
104376 can help reduce the impact of kernel NULL pointer bugs.
104377@@ -376,7 +377,7 @@ config MEMORY_FAILURE
104378
104379 config HWPOISON_INJECT
104380 tristate "HWPoison pages injector"
104381- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
104382+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
104383 select PROC_PAGE_MONITOR
104384
104385 config NOMMU_INITIAL_TRIM_EXCESS
104386diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
104387index 957d3da..1d34e20 100644
104388--- a/mm/Kconfig.debug
104389+++ b/mm/Kconfig.debug
104390@@ -10,6 +10,7 @@ config PAGE_EXTENSION
104391 config DEBUG_PAGEALLOC
104392 bool "Debug page memory allocations"
104393 depends on DEBUG_KERNEL
104394+ depends on !PAX_MEMORY_SANITIZE
104395 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
104396 depends on !KMEMCHECK
104397 select PAGE_EXTENSION
104398diff --git a/mm/backing-dev.c b/mm/backing-dev.c
104399index 000e7b3..aad2605 100644
104400--- a/mm/backing-dev.c
104401+++ b/mm/backing-dev.c
104402@@ -12,7 +12,7 @@
104403 #include <linux/device.h>
104404 #include <trace/events/writeback.h>
104405
104406-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
104407+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
104408
104409 struct backing_dev_info noop_backing_dev_info = {
104410 .name = "noop",
104411@@ -458,7 +458,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
104412 return err;
104413
104414 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
104415- atomic_long_inc_return(&bdi_seq));
104416+ atomic_long_inc_return_unchecked(&bdi_seq));
104417 if (err) {
104418 bdi_destroy(bdi);
104419 return err;
104420diff --git a/mm/filemap.c b/mm/filemap.c
104421index ad72420..0a20ef2 100644
104422--- a/mm/filemap.c
104423+++ b/mm/filemap.c
104424@@ -2097,7 +2097,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
104425 struct address_space *mapping = file->f_mapping;
104426
104427 if (!mapping->a_ops->readpage)
104428- return -ENOEXEC;
104429+ return -ENODEV;
104430 file_accessed(file);
104431 vma->vm_ops = &generic_file_vm_ops;
104432 return 0;
104433@@ -2275,6 +2275,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
104434 *pos = i_size_read(inode);
104435
104436 if (limit != RLIM_INFINITY) {
104437+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
104438 if (*pos >= limit) {
104439 send_sig(SIGXFSZ, current, 0);
104440 return -EFBIG;
104441diff --git a/mm/gup.c b/mm/gup.c
104442index a6e24e2..72dd2cf 100644
104443--- a/mm/gup.c
104444+++ b/mm/gup.c
104445@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
104446 unsigned int fault_flags = 0;
104447 int ret;
104448
104449- /* For mlock, just skip the stack guard page. */
104450- if ((*flags & FOLL_MLOCK) &&
104451- (stack_guard_page_start(vma, address) ||
104452- stack_guard_page_end(vma, address + PAGE_SIZE)))
104453- return -ENOENT;
104454 if (*flags & FOLL_WRITE)
104455 fault_flags |= FAULT_FLAG_WRITE;
104456 if (nonblocking)
104457@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
104458 if (!(gup_flags & FOLL_FORCE))
104459 gup_flags |= FOLL_NUMA;
104460
104461- do {
104462+ while (nr_pages) {
104463 struct page *page;
104464 unsigned int foll_flags = gup_flags;
104465 unsigned int page_increm;
104466
104467 /* first iteration or cross vma bound */
104468 if (!vma || start >= vma->vm_end) {
104469- vma = find_extend_vma(mm, start);
104470+ vma = find_vma(mm, start);
104471 if (!vma && in_gate_area(mm, start)) {
104472 int ret;
104473 ret = get_gate_page(mm, start & PAGE_MASK,
104474@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
104475 goto next_page;
104476 }
104477
104478- if (!vma || check_vma_flags(vma, gup_flags))
104479+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
104480 return i ? : -EFAULT;
104481 if (is_vm_hugetlb_page(vma)) {
104482 i = follow_hugetlb_page(mm, vma, pages, vmas,
104483@@ -509,7 +504,7 @@ next_page:
104484 i += page_increm;
104485 start += page_increm * PAGE_SIZE;
104486 nr_pages -= page_increm;
104487- } while (nr_pages);
104488+ }
104489 return i;
104490 }
104491 EXPORT_SYMBOL(__get_user_pages);
104492diff --git a/mm/highmem.c b/mm/highmem.c
104493index 123bcd3..0de52ba 100644
104494--- a/mm/highmem.c
104495+++ b/mm/highmem.c
104496@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
104497 * So no dangers, even with speculative execution.
104498 */
104499 page = pte_page(pkmap_page_table[i]);
104500+ pax_open_kernel();
104501 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
104502-
104503+ pax_close_kernel();
104504 set_page_address(page, NULL);
104505 need_flush = 1;
104506 }
104507@@ -259,9 +260,11 @@ start:
104508 }
104509 }
104510 vaddr = PKMAP_ADDR(last_pkmap_nr);
104511+
104512+ pax_open_kernel();
104513 set_pte_at(&init_mm, vaddr,
104514 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
104515-
104516+ pax_close_kernel();
104517 pkmap_count[last_pkmap_nr] = 1;
104518 set_page_address(page, (void *)vaddr);
104519
104520diff --git a/mm/hugetlb.c b/mm/hugetlb.c
104521index caad3c5..4f68807 100644
104522--- a/mm/hugetlb.c
104523+++ b/mm/hugetlb.c
104524@@ -2260,6 +2260,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
104525 struct ctl_table *table, int write,
104526 void __user *buffer, size_t *length, loff_t *ppos)
104527 {
104528+ ctl_table_no_const t;
104529 struct hstate *h = &default_hstate;
104530 unsigned long tmp = h->max_huge_pages;
104531 int ret;
104532@@ -2267,9 +2268,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
104533 if (!hugepages_supported())
104534 return -ENOTSUPP;
104535
104536- table->data = &tmp;
104537- table->maxlen = sizeof(unsigned long);
104538- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
104539+ t = *table;
104540+ t.data = &tmp;
104541+ t.maxlen = sizeof(unsigned long);
104542+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
104543 if (ret)
104544 goto out;
104545
104546@@ -2304,6 +2306,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
104547 struct hstate *h = &default_hstate;
104548 unsigned long tmp;
104549 int ret;
104550+ ctl_table_no_const hugetlb_table;
104551
104552 if (!hugepages_supported())
104553 return -ENOTSUPP;
104554@@ -2313,9 +2316,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
104555 if (write && hstate_is_gigantic(h))
104556 return -EINVAL;
104557
104558- table->data = &tmp;
104559- table->maxlen = sizeof(unsigned long);
104560- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
104561+ hugetlb_table = *table;
104562+ hugetlb_table.data = &tmp;
104563+ hugetlb_table.maxlen = sizeof(unsigned long);
104564+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
104565 if (ret)
104566 goto out;
104567
104568@@ -2800,6 +2804,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
104569 i_mmap_unlock_write(mapping);
104570 }
104571
104572+#ifdef CONFIG_PAX_SEGMEXEC
104573+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
104574+{
104575+ struct mm_struct *mm = vma->vm_mm;
104576+ struct vm_area_struct *vma_m;
104577+ unsigned long address_m;
104578+ pte_t *ptep_m;
104579+
104580+ vma_m = pax_find_mirror_vma(vma);
104581+ if (!vma_m)
104582+ return;
104583+
104584+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104585+ address_m = address + SEGMEXEC_TASK_SIZE;
104586+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
104587+ get_page(page_m);
104588+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
104589+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
104590+}
104591+#endif
104592+
104593 /*
104594 * Hugetlb_cow() should be called with page lock of the original hugepage held.
104595 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
104596@@ -2912,6 +2937,11 @@ retry_avoidcopy:
104597 make_huge_pte(vma, new_page, 1));
104598 page_remove_rmap(old_page);
104599 hugepage_add_new_anon_rmap(new_page, vma, address);
104600+
104601+#ifdef CONFIG_PAX_SEGMEXEC
104602+ pax_mirror_huge_pte(vma, address, new_page);
104603+#endif
104604+
104605 /* Make the old page be freed below */
104606 new_page = old_page;
104607 }
104608@@ -3072,6 +3102,10 @@ retry:
104609 && (vma->vm_flags & VM_SHARED)));
104610 set_huge_pte_at(mm, address, ptep, new_pte);
104611
104612+#ifdef CONFIG_PAX_SEGMEXEC
104613+ pax_mirror_huge_pte(vma, address, page);
104614+#endif
104615+
104616 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
104617 /* Optimization, do the COW without a second fault */
104618 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
104619@@ -3139,6 +3173,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
104620 struct address_space *mapping;
104621 int need_wait_lock = 0;
104622
104623+#ifdef CONFIG_PAX_SEGMEXEC
104624+ struct vm_area_struct *vma_m;
104625+#endif
104626+
104627 address &= huge_page_mask(h);
104628
104629 ptep = huge_pte_offset(mm, address);
104630@@ -3152,6 +3190,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
104631 VM_FAULT_SET_HINDEX(hstate_index(h));
104632 }
104633
104634+#ifdef CONFIG_PAX_SEGMEXEC
104635+ vma_m = pax_find_mirror_vma(vma);
104636+ if (vma_m) {
104637+ unsigned long address_m;
104638+
104639+ if (vma->vm_start > vma_m->vm_start) {
104640+ address_m = address;
104641+ address -= SEGMEXEC_TASK_SIZE;
104642+ vma = vma_m;
104643+ h = hstate_vma(vma);
104644+ } else
104645+ address_m = address + SEGMEXEC_TASK_SIZE;
104646+
104647+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
104648+ return VM_FAULT_OOM;
104649+ address_m &= HPAGE_MASK;
104650+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
104651+ }
104652+#endif
104653+
104654 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
104655 if (!ptep)
104656 return VM_FAULT_OOM;
104657diff --git a/mm/internal.h b/mm/internal.h
104658index a96da5b..42ebd54 100644
104659--- a/mm/internal.h
104660+++ b/mm/internal.h
104661@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
104662
104663 extern int __isolate_free_page(struct page *page, unsigned int order);
104664 extern void __free_pages_bootmem(struct page *page, unsigned int order);
104665+extern void free_compound_page(struct page *page);
104666 extern void prep_compound_page(struct page *page, unsigned long order);
104667 #ifdef CONFIG_MEMORY_FAILURE
104668 extern bool is_free_buddy_page(struct page *page);
104669@@ -411,7 +412,7 @@ extern u32 hwpoison_filter_enable;
104670
104671 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
104672 unsigned long, unsigned long,
104673- unsigned long, unsigned long);
104674+ unsigned long, unsigned long) __intentional_overflow(-1);
104675
104676 extern void set_pageblock_order(void);
104677 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
104678diff --git a/mm/kmemleak.c b/mm/kmemleak.c
104679index f0fe4f2..898208c 100644
104680--- a/mm/kmemleak.c
104681+++ b/mm/kmemleak.c
104682@@ -366,7 +366,7 @@ static void print_unreferenced(struct seq_file *seq,
104683
104684 for (i = 0; i < object->trace_len; i++) {
104685 void *ptr = (void *)object->trace[i];
104686- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
104687+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
104688 }
104689 }
104690
104691@@ -1912,7 +1912,7 @@ static int __init kmemleak_late_init(void)
104692 return -ENOMEM;
104693 }
104694
104695- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
104696+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
104697 &kmemleak_fops);
104698 if (!dentry)
104699 pr_warning("Failed to create the debugfs kmemleak file\n");
104700diff --git a/mm/maccess.c b/mm/maccess.c
104701index d53adf9..03a24bf 100644
104702--- a/mm/maccess.c
104703+++ b/mm/maccess.c
104704@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
104705 set_fs(KERNEL_DS);
104706 pagefault_disable();
104707 ret = __copy_from_user_inatomic(dst,
104708- (__force const void __user *)src, size);
104709+ (const void __force_user *)src, size);
104710 pagefault_enable();
104711 set_fs(old_fs);
104712
104713@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
104714
104715 set_fs(KERNEL_DS);
104716 pagefault_disable();
104717- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
104718+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
104719 pagefault_enable();
104720 set_fs(old_fs);
104721
104722diff --git a/mm/madvise.c b/mm/madvise.c
104723index d551475..8fdd7f3 100644
104724--- a/mm/madvise.c
104725+++ b/mm/madvise.c
104726@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
104727 pgoff_t pgoff;
104728 unsigned long new_flags = vma->vm_flags;
104729
104730+#ifdef CONFIG_PAX_SEGMEXEC
104731+ struct vm_area_struct *vma_m;
104732+#endif
104733+
104734 switch (behavior) {
104735 case MADV_NORMAL:
104736 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
104737@@ -126,6 +130,13 @@ success:
104738 /*
104739 * vm_flags is protected by the mmap_sem held in write mode.
104740 */
104741+
104742+#ifdef CONFIG_PAX_SEGMEXEC
104743+ vma_m = pax_find_mirror_vma(vma);
104744+ if (vma_m)
104745+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
104746+#endif
104747+
104748 vma->vm_flags = new_flags;
104749
104750 out:
104751@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
104752 struct vm_area_struct **prev,
104753 unsigned long start, unsigned long end)
104754 {
104755+
104756+#ifdef CONFIG_PAX_SEGMEXEC
104757+ struct vm_area_struct *vma_m;
104758+#endif
104759+
104760 *prev = vma;
104761 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
104762 return -EINVAL;
104763
104764 zap_page_range(vma, start, end - start, NULL);
104765+
104766+#ifdef CONFIG_PAX_SEGMEXEC
104767+ vma_m = pax_find_mirror_vma(vma);
104768+ if (vma_m) {
104769+ if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
104770+ return -EINVAL;
104771+
104772+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
104773+ }
104774+#endif
104775+
104776 return 0;
104777 }
104778
104779@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
104780 if (end < start)
104781 return error;
104782
104783+#ifdef CONFIG_PAX_SEGMEXEC
104784+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
104785+ if (end > SEGMEXEC_TASK_SIZE)
104786+ return error;
104787+ } else
104788+#endif
104789+
104790+ if (end > TASK_SIZE)
104791+ return error;
104792+
104793 error = 0;
104794 if (end == start)
104795 return error;
104796diff --git a/mm/memory-failure.c b/mm/memory-failure.c
104797index 72a5224..51ba846 100644
104798--- a/mm/memory-failure.c
104799+++ b/mm/memory-failure.c
104800@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
104801
104802 int sysctl_memory_failure_recovery __read_mostly = 1;
104803
104804-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
104805+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
104806
104807 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
104808
104809@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
104810 pfn, t->comm, t->pid);
104811 si.si_signo = SIGBUS;
104812 si.si_errno = 0;
104813- si.si_addr = (void *)addr;
104814+ si.si_addr = (void __user *)addr;
104815 #ifdef __ARCH_SI_TRAPNO
104816 si.si_trapno = trapno;
104817 #endif
104818@@ -779,7 +779,7 @@ static struct page_state {
104819 unsigned long res;
104820 char *msg;
104821 int (*action)(struct page *p, unsigned long pfn);
104822-} error_states[] = {
104823+} __do_const error_states[] = {
104824 { reserved, reserved, "reserved kernel", me_kernel },
104825 /*
104826 * free pages are specially detected outside this table:
104827@@ -1087,7 +1087,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104828 nr_pages = 1 << compound_order(hpage);
104829 else /* normal page or thp */
104830 nr_pages = 1;
104831- atomic_long_add(nr_pages, &num_poisoned_pages);
104832+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
104833
104834 /*
104835 * We need/can do nothing about count=0 pages.
104836@@ -1116,7 +1116,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104837 if (PageHWPoison(hpage)) {
104838 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
104839 || (p != hpage && TestSetPageHWPoison(hpage))) {
104840- atomic_long_sub(nr_pages, &num_poisoned_pages);
104841+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104842 unlock_page(hpage);
104843 return 0;
104844 }
104845@@ -1184,14 +1184,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104846 */
104847 if (!PageHWPoison(p)) {
104848 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
104849- atomic_long_sub(nr_pages, &num_poisoned_pages);
104850+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104851 put_page(hpage);
104852 res = 0;
104853 goto out;
104854 }
104855 if (hwpoison_filter(p)) {
104856 if (TestClearPageHWPoison(p))
104857- atomic_long_sub(nr_pages, &num_poisoned_pages);
104858+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104859 unlock_page(hpage);
104860 put_page(hpage);
104861 return 0;
104862@@ -1421,7 +1421,7 @@ int unpoison_memory(unsigned long pfn)
104863 return 0;
104864 }
104865 if (TestClearPageHWPoison(p))
104866- atomic_long_dec(&num_poisoned_pages);
104867+ atomic_long_dec_unchecked(&num_poisoned_pages);
104868 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
104869 return 0;
104870 }
104871@@ -1435,7 +1435,7 @@ int unpoison_memory(unsigned long pfn)
104872 */
104873 if (TestClearPageHWPoison(page)) {
104874 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
104875- atomic_long_sub(nr_pages, &num_poisoned_pages);
104876+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104877 freeit = 1;
104878 if (PageHuge(page))
104879 clear_page_hwpoison_huge_page(page);
104880@@ -1560,11 +1560,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
104881 if (PageHuge(page)) {
104882 set_page_hwpoison_huge_page(hpage);
104883 dequeue_hwpoisoned_huge_page(hpage);
104884- atomic_long_add(1 << compound_order(hpage),
104885+ atomic_long_add_unchecked(1 << compound_order(hpage),
104886 &num_poisoned_pages);
104887 } else {
104888 SetPageHWPoison(page);
104889- atomic_long_inc(&num_poisoned_pages);
104890+ atomic_long_inc_unchecked(&num_poisoned_pages);
104891 }
104892 }
104893 return ret;
104894@@ -1603,7 +1603,7 @@ static int __soft_offline_page(struct page *page, int flags)
104895 put_page(page);
104896 pr_info("soft_offline: %#lx: invalidated\n", pfn);
104897 SetPageHWPoison(page);
104898- atomic_long_inc(&num_poisoned_pages);
104899+ atomic_long_inc_unchecked(&num_poisoned_pages);
104900 return 0;
104901 }
104902
104903@@ -1652,7 +1652,7 @@ static int __soft_offline_page(struct page *page, int flags)
104904 if (!is_free_buddy_page(page))
104905 pr_info("soft offline: %#lx: page leaked\n",
104906 pfn);
104907- atomic_long_inc(&num_poisoned_pages);
104908+ atomic_long_inc_unchecked(&num_poisoned_pages);
104909 }
104910 } else {
104911 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
104912@@ -1722,11 +1722,11 @@ int soft_offline_page(struct page *page, int flags)
104913 if (PageHuge(page)) {
104914 set_page_hwpoison_huge_page(hpage);
104915 if (!dequeue_hwpoisoned_huge_page(hpage))
104916- atomic_long_add(1 << compound_order(hpage),
104917+ atomic_long_add_unchecked(1 << compound_order(hpage),
104918 &num_poisoned_pages);
104919 } else {
104920 if (!TestSetPageHWPoison(page))
104921- atomic_long_inc(&num_poisoned_pages);
104922+ atomic_long_inc_unchecked(&num_poisoned_pages);
104923 }
104924 }
104925 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
104926diff --git a/mm/memory.c b/mm/memory.c
104927index 97839f5..4bc5530 100644
104928--- a/mm/memory.c
104929+++ b/mm/memory.c
104930@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
104931 free_pte_range(tlb, pmd, addr);
104932 } while (pmd++, addr = next, addr != end);
104933
104934+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
104935 start &= PUD_MASK;
104936 if (start < floor)
104937 return;
104938@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
104939 pud_clear(pud);
104940 pmd_free_tlb(tlb, pmd, start);
104941 mm_dec_nr_pmds(tlb->mm);
104942+#endif
104943 }
104944
104945 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104946@@ -448,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104947 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
104948 } while (pud++, addr = next, addr != end);
104949
104950+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
104951 start &= PGDIR_MASK;
104952 if (start < floor)
104953 return;
104954@@ -462,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104955 pud = pud_offset(pgd, start);
104956 pgd_clear(pgd);
104957 pud_free_tlb(tlb, pud, start);
104958+#endif
104959+
104960 }
104961
104962 /*
104963@@ -691,10 +696,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
104964 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
104965 */
104966 if (vma->vm_ops)
104967- printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
104968+ printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
104969 vma->vm_ops->fault);
104970 if (vma->vm_file)
104971- printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
104972+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
104973 vma->vm_file->f_op->mmap);
104974 dump_stack();
104975 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
104976@@ -1464,6 +1469,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
104977 page_add_file_rmap(page);
104978 set_pte_at(mm, addr, pte, mk_pte(page, prot));
104979
104980+#ifdef CONFIG_PAX_SEGMEXEC
104981+ pax_mirror_file_pte(vma, addr, page, ptl);
104982+#endif
104983+
104984 retval = 0;
104985 pte_unmap_unlock(pte, ptl);
104986 return retval;
104987@@ -1508,9 +1517,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
104988 if (!page_count(page))
104989 return -EINVAL;
104990 if (!(vma->vm_flags & VM_MIXEDMAP)) {
104991+
104992+#ifdef CONFIG_PAX_SEGMEXEC
104993+ struct vm_area_struct *vma_m;
104994+#endif
104995+
104996 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
104997 BUG_ON(vma->vm_flags & VM_PFNMAP);
104998 vma->vm_flags |= VM_MIXEDMAP;
104999+
105000+#ifdef CONFIG_PAX_SEGMEXEC
105001+ vma_m = pax_find_mirror_vma(vma);
105002+ if (vma_m)
105003+ vma_m->vm_flags |= VM_MIXEDMAP;
105004+#endif
105005+
105006 }
105007 return insert_page(vma, addr, page, vma->vm_page_prot);
105008 }
105009@@ -1593,6 +1614,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
105010 unsigned long pfn)
105011 {
105012 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
105013+ BUG_ON(vma->vm_mirror);
105014
105015 if (addr < vma->vm_start || addr >= vma->vm_end)
105016 return -EFAULT;
105017@@ -1840,7 +1862,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
105018
105019 BUG_ON(pud_huge(*pud));
105020
105021- pmd = pmd_alloc(mm, pud, addr);
105022+ pmd = (mm == &init_mm) ?
105023+ pmd_alloc_kernel(mm, pud, addr) :
105024+ pmd_alloc(mm, pud, addr);
105025 if (!pmd)
105026 return -ENOMEM;
105027 do {
105028@@ -1860,7 +1884,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
105029 unsigned long next;
105030 int err;
105031
105032- pud = pud_alloc(mm, pgd, addr);
105033+ pud = (mm == &init_mm) ?
105034+ pud_alloc_kernel(mm, pgd, addr) :
105035+ pud_alloc(mm, pgd, addr);
105036 if (!pud)
105037 return -ENOMEM;
105038 do {
105039@@ -1982,6 +2008,185 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
105040 return ret;
105041 }
105042
105043+#ifdef CONFIG_PAX_SEGMEXEC
105044+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
105045+{
105046+ struct mm_struct *mm = vma->vm_mm;
105047+ spinlock_t *ptl;
105048+ pte_t *pte, entry;
105049+
105050+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
105051+ entry = *pte;
105052+ if (!pte_present(entry)) {
105053+ if (!pte_none(entry)) {
105054+ free_swap_and_cache(pte_to_swp_entry(entry));
105055+ pte_clear_not_present_full(mm, address, pte, 0);
105056+ }
105057+ } else {
105058+ struct page *page;
105059+
105060+ flush_cache_page(vma, address, pte_pfn(entry));
105061+ entry = ptep_clear_flush(vma, address, pte);
105062+ BUG_ON(pte_dirty(entry));
105063+ page = vm_normal_page(vma, address, entry);
105064+ if (page) {
105065+ update_hiwater_rss(mm);
105066+ if (PageAnon(page))
105067+ dec_mm_counter_fast(mm, MM_ANONPAGES);
105068+ else
105069+ dec_mm_counter_fast(mm, MM_FILEPAGES);
105070+ page_remove_rmap(page);
105071+ page_cache_release(page);
105072+ }
105073+ }
105074+ pte_unmap_unlock(pte, ptl);
105075+}
105076+
105077+/* PaX: if vma is mirrored, synchronize the mirror's PTE
105078+ *
105079+ * the ptl of the lower mapped page is held on entry and is not released on exit
105080+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
105081+ */
105082+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
105083+{
105084+ struct mm_struct *mm = vma->vm_mm;
105085+ unsigned long address_m;
105086+ spinlock_t *ptl_m;
105087+ struct vm_area_struct *vma_m;
105088+ pmd_t *pmd_m;
105089+ pte_t *pte_m, entry_m;
105090+
105091+ BUG_ON(!page_m || !PageAnon(page_m));
105092+
105093+ vma_m = pax_find_mirror_vma(vma);
105094+ if (!vma_m)
105095+ return;
105096+
105097+ BUG_ON(!PageLocked(page_m));
105098+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
105099+ address_m = address + SEGMEXEC_TASK_SIZE;
105100+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
105101+ pte_m = pte_offset_map(pmd_m, address_m);
105102+ ptl_m = pte_lockptr(mm, pmd_m);
105103+ if (ptl != ptl_m) {
105104+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
105105+ if (!pte_none(*pte_m))
105106+ goto out;
105107+ }
105108+
105109+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
105110+ page_cache_get(page_m);
105111+ page_add_anon_rmap(page_m, vma_m, address_m);
105112+ inc_mm_counter_fast(mm, MM_ANONPAGES);
105113+ set_pte_at(mm, address_m, pte_m, entry_m);
105114+ update_mmu_cache(vma_m, address_m, pte_m);
105115+out:
105116+ if (ptl != ptl_m)
105117+ spin_unlock(ptl_m);
105118+ pte_unmap(pte_m);
105119+ unlock_page(page_m);
105120+}
105121+
105122+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
105123+{
105124+ struct mm_struct *mm = vma->vm_mm;
105125+ unsigned long address_m;
105126+ spinlock_t *ptl_m;
105127+ struct vm_area_struct *vma_m;
105128+ pmd_t *pmd_m;
105129+ pte_t *pte_m, entry_m;
105130+
105131+ BUG_ON(!page_m || PageAnon(page_m));
105132+
105133+ vma_m = pax_find_mirror_vma(vma);
105134+ if (!vma_m)
105135+ return;
105136+
105137+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
105138+ address_m = address + SEGMEXEC_TASK_SIZE;
105139+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
105140+ pte_m = pte_offset_map(pmd_m, address_m);
105141+ ptl_m = pte_lockptr(mm, pmd_m);
105142+ if (ptl != ptl_m) {
105143+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
105144+ if (!pte_none(*pte_m))
105145+ goto out;
105146+ }
105147+
105148+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
105149+ page_cache_get(page_m);
105150+ page_add_file_rmap(page_m);
105151+ inc_mm_counter_fast(mm, MM_FILEPAGES);
105152+ set_pte_at(mm, address_m, pte_m, entry_m);
105153+ update_mmu_cache(vma_m, address_m, pte_m);
105154+out:
105155+ if (ptl != ptl_m)
105156+ spin_unlock(ptl_m);
105157+ pte_unmap(pte_m);
105158+}
105159+
105160+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
105161+{
105162+ struct mm_struct *mm = vma->vm_mm;
105163+ unsigned long address_m;
105164+ spinlock_t *ptl_m;
105165+ struct vm_area_struct *vma_m;
105166+ pmd_t *pmd_m;
105167+ pte_t *pte_m, entry_m;
105168+
105169+ vma_m = pax_find_mirror_vma(vma);
105170+ if (!vma_m)
105171+ return;
105172+
105173+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
105174+ address_m = address + SEGMEXEC_TASK_SIZE;
105175+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
105176+ pte_m = pte_offset_map(pmd_m, address_m);
105177+ ptl_m = pte_lockptr(mm, pmd_m);
105178+ if (ptl != ptl_m) {
105179+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
105180+ if (!pte_none(*pte_m))
105181+ goto out;
105182+ }
105183+
105184+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
105185+ set_pte_at(mm, address_m, pte_m, entry_m);
105186+out:
105187+ if (ptl != ptl_m)
105188+ spin_unlock(ptl_m);
105189+ pte_unmap(pte_m);
105190+}
105191+
105192+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
105193+{
105194+ struct page *page_m;
105195+ pte_t entry;
105196+
105197+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
105198+ goto out;
105199+
105200+ entry = *pte;
105201+ page_m = vm_normal_page(vma, address, entry);
105202+ if (!page_m)
105203+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
105204+ else if (PageAnon(page_m)) {
105205+ if (pax_find_mirror_vma(vma)) {
105206+ pte_unmap_unlock(pte, ptl);
105207+ lock_page(page_m);
105208+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
105209+ if (pte_same(entry, *pte))
105210+ pax_mirror_anon_pte(vma, address, page_m, ptl);
105211+ else
105212+ unlock_page(page_m);
105213+ }
105214+ } else
105215+ pax_mirror_file_pte(vma, address, page_m, ptl);
105216+
105217+out:
105218+ pte_unmap_unlock(pte, ptl);
105219+}
105220+#endif
105221+
105222 /*
105223 * This routine handles present pages, when users try to write
105224 * to a shared page. It is done by copying the page to a new address
105225@@ -2172,6 +2377,12 @@ gotten:
105226 */
105227 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
105228 if (likely(pte_same(*page_table, orig_pte))) {
105229+
105230+#ifdef CONFIG_PAX_SEGMEXEC
105231+ if (pax_find_mirror_vma(vma))
105232+ BUG_ON(!trylock_page(new_page));
105233+#endif
105234+
105235 if (old_page) {
105236 if (!PageAnon(old_page)) {
105237 dec_mm_counter_fast(mm, MM_FILEPAGES);
105238@@ -2225,6 +2436,10 @@ gotten:
105239 page_remove_rmap(old_page);
105240 }
105241
105242+#ifdef CONFIG_PAX_SEGMEXEC
105243+ pax_mirror_anon_pte(vma, address, new_page, ptl);
105244+#endif
105245+
105246 /* Free the old page.. */
105247 new_page = old_page;
105248 ret |= VM_FAULT_WRITE;
105249@@ -2483,6 +2698,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
105250 swap_free(entry);
105251 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
105252 try_to_free_swap(page);
105253+
105254+#ifdef CONFIG_PAX_SEGMEXEC
105255+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
105256+#endif
105257+
105258 unlock_page(page);
105259 if (page != swapcache) {
105260 /*
105261@@ -2506,6 +2726,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
105262
105263 /* No need to invalidate - it was non-present before */
105264 update_mmu_cache(vma, address, page_table);
105265+
105266+#ifdef CONFIG_PAX_SEGMEXEC
105267+ pax_mirror_anon_pte(vma, address, page, ptl);
105268+#endif
105269+
105270 unlock:
105271 pte_unmap_unlock(page_table, ptl);
105272 out:
105273@@ -2525,40 +2750,6 @@ out_release:
105274 }
105275
105276 /*
105277- * This is like a special single-page "expand_{down|up}wards()",
105278- * except we must first make sure that 'address{-|+}PAGE_SIZE'
105279- * doesn't hit another vma.
105280- */
105281-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
105282-{
105283- address &= PAGE_MASK;
105284- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
105285- struct vm_area_struct *prev = vma->vm_prev;
105286-
105287- /*
105288- * Is there a mapping abutting this one below?
105289- *
105290- * That's only ok if it's the same stack mapping
105291- * that has gotten split..
105292- */
105293- if (prev && prev->vm_end == address)
105294- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
105295-
105296- return expand_downwards(vma, address - PAGE_SIZE);
105297- }
105298- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
105299- struct vm_area_struct *next = vma->vm_next;
105300-
105301- /* As VM_GROWSDOWN but s/below/above/ */
105302- if (next && next->vm_start == address + PAGE_SIZE)
105303- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
105304-
105305- return expand_upwards(vma, address + PAGE_SIZE);
105306- }
105307- return 0;
105308-}
105309-
105310-/*
105311 * We enter with non-exclusive mmap_sem (to exclude vma changes,
105312 * but allow concurrent faults), and pte mapped but not yet locked.
105313 * We return with mmap_sem still held, but pte unmapped and unlocked.
105314@@ -2568,27 +2759,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
105315 unsigned int flags)
105316 {
105317 struct mem_cgroup *memcg;
105318- struct page *page;
105319+ struct page *page = NULL;
105320 spinlock_t *ptl;
105321 pte_t entry;
105322
105323- pte_unmap(page_table);
105324-
105325- /* Check if we need to add a guard page to the stack */
105326- if (check_stack_guard_page(vma, address) < 0)
105327- return VM_FAULT_SIGSEGV;
105328-
105329- /* Use the zero-page for reads */
105330 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
105331 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
105332 vma->vm_page_prot));
105333- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
105334+ ptl = pte_lockptr(mm, pmd);
105335+ spin_lock(ptl);
105336 if (!pte_none(*page_table))
105337 goto unlock;
105338 goto setpte;
105339 }
105340
105341 /* Allocate our own private page. */
105342+ pte_unmap(page_table);
105343+
105344 if (unlikely(anon_vma_prepare(vma)))
105345 goto oom;
105346 page = alloc_zeroed_user_highpage_movable(vma, address);
105347@@ -2612,6 +2799,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
105348 if (!pte_none(*page_table))
105349 goto release;
105350
105351+#ifdef CONFIG_PAX_SEGMEXEC
105352+ if (pax_find_mirror_vma(vma))
105353+ BUG_ON(!trylock_page(page));
105354+#endif
105355+
105356 inc_mm_counter_fast(mm, MM_ANONPAGES);
105357 page_add_new_anon_rmap(page, vma, address);
105358 mem_cgroup_commit_charge(page, memcg, false);
105359@@ -2621,6 +2813,12 @@ setpte:
105360
105361 /* No need to invalidate - it was non-present before */
105362 update_mmu_cache(vma, address, page_table);
105363+
105364+#ifdef CONFIG_PAX_SEGMEXEC
105365+ if (page)
105366+ pax_mirror_anon_pte(vma, address, page, ptl);
105367+#endif
105368+
105369 unlock:
105370 pte_unmap_unlock(page_table, ptl);
105371 return 0;
105372@@ -2853,6 +3051,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105373 return ret;
105374 }
105375 do_set_pte(vma, address, fault_page, pte, false, false);
105376+
105377+#ifdef CONFIG_PAX_SEGMEXEC
105378+ pax_mirror_file_pte(vma, address, fault_page, ptl);
105379+#endif
105380+
105381 unlock_page(fault_page);
105382 unlock_out:
105383 pte_unmap_unlock(pte, ptl);
105384@@ -2904,7 +3107,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105385 }
105386 goto uncharge_out;
105387 }
105388+
105389+#ifdef CONFIG_PAX_SEGMEXEC
105390+ if (pax_find_mirror_vma(vma))
105391+ BUG_ON(!trylock_page(new_page));
105392+#endif
105393+
105394 do_set_pte(vma, address, new_page, pte, true, true);
105395+
105396+#ifdef CONFIG_PAX_SEGMEXEC
105397+ pax_mirror_anon_pte(vma, address, new_page, ptl);
105398+#endif
105399+
105400 mem_cgroup_commit_charge(new_page, memcg, false);
105401 lru_cache_add_active_or_unevictable(new_page, vma);
105402 pte_unmap_unlock(pte, ptl);
105403@@ -2962,6 +3176,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105404 return ret;
105405 }
105406 do_set_pte(vma, address, fault_page, pte, true, false);
105407+
105408+#ifdef CONFIG_PAX_SEGMEXEC
105409+ pax_mirror_file_pte(vma, address, fault_page, ptl);
105410+#endif
105411+
105412 pte_unmap_unlock(pte, ptl);
105413
105414 if (set_page_dirty(fault_page))
105415@@ -3185,6 +3404,12 @@ static int handle_pte_fault(struct mm_struct *mm,
105416 if (flags & FAULT_FLAG_WRITE)
105417 flush_tlb_fix_spurious_fault(vma, address);
105418 }
105419+
105420+#ifdef CONFIG_PAX_SEGMEXEC
105421+ pax_mirror_pte(vma, address, pte, pmd, ptl);
105422+ return 0;
105423+#endif
105424+
105425 unlock:
105426 pte_unmap_unlock(pte, ptl);
105427 return 0;
105428@@ -3204,9 +3429,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105429 pmd_t *pmd;
105430 pte_t *pte;
105431
105432+#ifdef CONFIG_PAX_SEGMEXEC
105433+ struct vm_area_struct *vma_m;
105434+#endif
105435+
105436 if (unlikely(is_vm_hugetlb_page(vma)))
105437 return hugetlb_fault(mm, vma, address, flags);
105438
105439+#ifdef CONFIG_PAX_SEGMEXEC
105440+ vma_m = pax_find_mirror_vma(vma);
105441+ if (vma_m) {
105442+ unsigned long address_m;
105443+ pgd_t *pgd_m;
105444+ pud_t *pud_m;
105445+ pmd_t *pmd_m;
105446+
105447+ if (vma->vm_start > vma_m->vm_start) {
105448+ address_m = address;
105449+ address -= SEGMEXEC_TASK_SIZE;
105450+ vma = vma_m;
105451+ } else
105452+ address_m = address + SEGMEXEC_TASK_SIZE;
105453+
105454+ pgd_m = pgd_offset(mm, address_m);
105455+ pud_m = pud_alloc(mm, pgd_m, address_m);
105456+ if (!pud_m)
105457+ return VM_FAULT_OOM;
105458+ pmd_m = pmd_alloc(mm, pud_m, address_m);
105459+ if (!pmd_m)
105460+ return VM_FAULT_OOM;
105461+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
105462+ return VM_FAULT_OOM;
105463+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
105464+ }
105465+#endif
105466+
105467 pgd = pgd_offset(mm, address);
105468 pud = pud_alloc(mm, pgd, address);
105469 if (!pud)
105470@@ -3341,6 +3598,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
105471 spin_unlock(&mm->page_table_lock);
105472 return 0;
105473 }
105474+
105475+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
105476+{
105477+ pud_t *new = pud_alloc_one(mm, address);
105478+ if (!new)
105479+ return -ENOMEM;
105480+
105481+ smp_wmb(); /* See comment in __pte_alloc */
105482+
105483+ spin_lock(&mm->page_table_lock);
105484+ if (pgd_present(*pgd)) /* Another has populated it */
105485+ pud_free(mm, new);
105486+ else
105487+ pgd_populate_kernel(mm, pgd, new);
105488+ spin_unlock(&mm->page_table_lock);
105489+ return 0;
105490+}
105491 #endif /* __PAGETABLE_PUD_FOLDED */
105492
105493 #ifndef __PAGETABLE_PMD_FOLDED
105494@@ -3373,6 +3647,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
105495 spin_unlock(&mm->page_table_lock);
105496 return 0;
105497 }
105498+
105499+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
105500+{
105501+ pmd_t *new = pmd_alloc_one(mm, address);
105502+ if (!new)
105503+ return -ENOMEM;
105504+
105505+ smp_wmb(); /* See comment in __pte_alloc */
105506+
105507+ spin_lock(&mm->page_table_lock);
105508+#ifndef __ARCH_HAS_4LEVEL_HACK
105509+ if (!pud_present(*pud)) {
105510+ mm_inc_nr_pmds(mm);
105511+ pud_populate_kernel(mm, pud, new);
105512+ } else /* Another has populated it */
105513+ pmd_free(mm, new);
105514+#else
105515+ if (!pgd_present(*pud)) {
105516+ mm_inc_nr_pmds(mm);
105517+ pgd_populate_kernel(mm, pud, new);
105518+ } else /* Another has populated it */
105519+ pmd_free(mm, new);
105520+#endif /* __ARCH_HAS_4LEVEL_HACK */
105521+ spin_unlock(&mm->page_table_lock);
105522+ return 0;
105523+}
105524 #endif /* __PAGETABLE_PMD_FOLDED */
105525
105526 static int __follow_pte(struct mm_struct *mm, unsigned long address,
105527@@ -3482,8 +3782,8 @@ out:
105528 return ret;
105529 }
105530
105531-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
105532- void *buf, int len, int write)
105533+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
105534+ void *buf, size_t len, int write)
105535 {
105536 resource_size_t phys_addr;
105537 unsigned long prot = 0;
105538@@ -3509,8 +3809,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
105539 * Access another process' address space as given in mm. If non-NULL, use the
105540 * given task for page fault accounting.
105541 */
105542-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105543- unsigned long addr, void *buf, int len, int write)
105544+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105545+ unsigned long addr, void *buf, size_t len, int write)
105546 {
105547 struct vm_area_struct *vma;
105548 void *old_buf = buf;
105549@@ -3518,7 +3818,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105550 down_read(&mm->mmap_sem);
105551 /* ignore errors, just check how much was successfully transferred */
105552 while (len) {
105553- int bytes, ret, offset;
105554+ ssize_t bytes, ret, offset;
105555 void *maddr;
105556 struct page *page = NULL;
105557
105558@@ -3579,8 +3879,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105559 *
105560 * The caller must hold a reference on @mm.
105561 */
105562-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
105563- void *buf, int len, int write)
105564+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
105565+ void *buf, size_t len, int write)
105566 {
105567 return __access_remote_vm(NULL, mm, addr, buf, len, write);
105568 }
105569@@ -3590,11 +3890,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
105570 * Source/target buffer must be kernel space,
105571 * Do not walk the page table directly, use get_user_pages
105572 */
105573-int access_process_vm(struct task_struct *tsk, unsigned long addr,
105574- void *buf, int len, int write)
105575+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
105576+ void *buf, size_t len, int write)
105577 {
105578 struct mm_struct *mm;
105579- int ret;
105580+ ssize_t ret;
105581
105582 mm = get_task_mm(tsk);
105583 if (!mm)
105584diff --git a/mm/mempolicy.c b/mm/mempolicy.c
105585index 0f7d73b..737047f 100644
105586--- a/mm/mempolicy.c
105587+++ b/mm/mempolicy.c
105588@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
105589 unsigned long vmstart;
105590 unsigned long vmend;
105591
105592+#ifdef CONFIG_PAX_SEGMEXEC
105593+ struct vm_area_struct *vma_m;
105594+#endif
105595+
105596 vma = find_vma(mm, start);
105597 if (!vma || vma->vm_start > start)
105598 return -EFAULT;
105599@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
105600 err = vma_replace_policy(vma, new_pol);
105601 if (err)
105602 goto out;
105603+
105604+#ifdef CONFIG_PAX_SEGMEXEC
105605+ vma_m = pax_find_mirror_vma(vma);
105606+ if (vma_m) {
105607+ err = vma_replace_policy(vma_m, new_pol);
105608+ if (err)
105609+ goto out;
105610+ }
105611+#endif
105612+
105613 }
105614
105615 out:
105616@@ -1160,6 +1174,17 @@ static long do_mbind(unsigned long start, unsigned long len,
105617
105618 if (end < start)
105619 return -EINVAL;
105620+
105621+#ifdef CONFIG_PAX_SEGMEXEC
105622+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
105623+ if (end > SEGMEXEC_TASK_SIZE)
105624+ return -EINVAL;
105625+ } else
105626+#endif
105627+
105628+ if (end > TASK_SIZE)
105629+ return -EINVAL;
105630+
105631 if (end == start)
105632 return 0;
105633
105634@@ -1385,8 +1410,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
105635 */
105636 tcred = __task_cred(task);
105637 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
105638- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
105639- !capable(CAP_SYS_NICE)) {
105640+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
105641 rcu_read_unlock();
105642 err = -EPERM;
105643 goto out_put;
105644@@ -1417,6 +1441,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
105645 goto out;
105646 }
105647
105648+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
105649+ if (mm != current->mm &&
105650+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
105651+ mmput(mm);
105652+ err = -EPERM;
105653+ goto out;
105654+ }
105655+#endif
105656+
105657 err = do_migrate_pages(mm, old, new,
105658 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
105659
105660diff --git a/mm/migrate.c b/mm/migrate.c
105661index 85e0426..be49beb 100644
105662--- a/mm/migrate.c
105663+++ b/mm/migrate.c
105664@@ -1472,8 +1472,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
105665 */
105666 tcred = __task_cred(task);
105667 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
105668- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
105669- !capable(CAP_SYS_NICE)) {
105670+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
105671 rcu_read_unlock();
105672 err = -EPERM;
105673 goto out;
105674diff --git a/mm/mlock.c b/mm/mlock.c
105675index 8a54cd2..92f1747 100644
105676--- a/mm/mlock.c
105677+++ b/mm/mlock.c
105678@@ -14,6 +14,7 @@
105679 #include <linux/pagevec.h>
105680 #include <linux/mempolicy.h>
105681 #include <linux/syscalls.h>
105682+#include <linux/security.h>
105683 #include <linux/sched.h>
105684 #include <linux/export.h>
105685 #include <linux/rmap.h>
105686@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
105687 {
105688 unsigned long nstart, end, tmp;
105689 struct vm_area_struct * vma, * prev;
105690- int error;
105691+ int error = 0;
105692
105693 VM_BUG_ON(start & ~PAGE_MASK);
105694 VM_BUG_ON(len != PAGE_ALIGN(len));
105695@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
105696 return -EINVAL;
105697 if (end == start)
105698 return 0;
105699+ if (end > TASK_SIZE)
105700+ return -EINVAL;
105701+
105702 vma = find_vma(current->mm, start);
105703 if (!vma || vma->vm_start > start)
105704 return -ENOMEM;
105705@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
105706 for (nstart = start ; ; ) {
105707 vm_flags_t newflags;
105708
105709+#ifdef CONFIG_PAX_SEGMEXEC
105710+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
105711+ break;
105712+#endif
105713+
105714 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
105715
105716 newflags = vma->vm_flags & ~VM_LOCKED;
105717@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
105718 locked += current->mm->locked_vm;
105719
105720 /* check against resource limits */
105721+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
105722 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
105723 error = do_mlock(start, len, 1);
105724
105725@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
105726 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
105727 vm_flags_t newflags;
105728
105729+#ifdef CONFIG_PAX_SEGMEXEC
105730+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
105731+ break;
105732+#endif
105733+
105734 newflags = vma->vm_flags & ~VM_LOCKED;
105735 if (flags & MCL_CURRENT)
105736 newflags |= VM_LOCKED;
105737@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
105738 lock_limit >>= PAGE_SHIFT;
105739
105740 ret = -ENOMEM;
105741+
105742+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
105743+
105744 down_write(&current->mm->mmap_sem);
105745-
105746 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
105747 capable(CAP_IPC_LOCK))
105748 ret = do_mlockall(flags);
105749diff --git a/mm/mm_init.c b/mm/mm_init.c
105750index 5f420f7..dd42fb1b 100644
105751--- a/mm/mm_init.c
105752+++ b/mm/mm_init.c
105753@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
105754 return NOTIFY_OK;
105755 }
105756
105757-static struct notifier_block compute_batch_nb __meminitdata = {
105758+static struct notifier_block compute_batch_nb __meminitconst = {
105759 .notifier_call = mm_compute_batch_notifier,
105760 .priority = IPC_CALLBACK_PRI, /* use lowest priority */
105761 };
105762diff --git a/mm/mmap.c b/mm/mmap.c
105763index 9ec50a3..0476e2d 100644
105764--- a/mm/mmap.c
105765+++ b/mm/mmap.c
105766@@ -41,6 +41,7 @@
105767 #include <linux/notifier.h>
105768 #include <linux/memory.h>
105769 #include <linux/printk.h>
105770+#include <linux/random.h>
105771
105772 #include <asm/uaccess.h>
105773 #include <asm/cacheflush.h>
105774@@ -57,6 +58,16 @@
105775 #define arch_rebalance_pgtables(addr, len) (addr)
105776 #endif
105777
105778+static inline void verify_mm_writelocked(struct mm_struct *mm)
105779+{
105780+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
105781+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
105782+ up_read(&mm->mmap_sem);
105783+ BUG();
105784+ }
105785+#endif
105786+}
105787+
105788 static void unmap_region(struct mm_struct *mm,
105789 struct vm_area_struct *vma, struct vm_area_struct *prev,
105790 unsigned long start, unsigned long end);
105791@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
105792 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
105793 *
105794 */
105795-pgprot_t protection_map[16] = {
105796+pgprot_t protection_map[16] __read_only = {
105797 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
105798 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
105799 };
105800
105801-pgprot_t vm_get_page_prot(unsigned long vm_flags)
105802+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
105803 {
105804- return __pgprot(pgprot_val(protection_map[vm_flags &
105805+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
105806 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
105807 pgprot_val(arch_vm_get_page_prot(vm_flags)));
105808+
105809+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
105810+ if (!(__supported_pte_mask & _PAGE_NX) &&
105811+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
105812+ (vm_flags & (VM_READ | VM_WRITE)))
105813+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
105814+#endif
105815+
105816+ return prot;
105817 }
105818 EXPORT_SYMBOL(vm_get_page_prot);
105819
105820@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
105821 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
105822 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
105823 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
105824+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
105825 /*
105826 * Make sure vm_committed_as in one cacheline and not cacheline shared with
105827 * other variables. It can be updated by several CPUs frequently.
105828@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
105829 struct vm_area_struct *next = vma->vm_next;
105830
105831 might_sleep();
105832+ BUG_ON(vma->vm_mirror);
105833 if (vma->vm_ops && vma->vm_ops->close)
105834 vma->vm_ops->close(vma);
105835 if (vma->vm_file)
105836@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
105837
105838 SYSCALL_DEFINE1(brk, unsigned long, brk)
105839 {
105840+ unsigned long rlim;
105841 unsigned long retval;
105842 unsigned long newbrk, oldbrk;
105843 struct mm_struct *mm = current->mm;
105844@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
105845 * segment grow beyond its set limit the in case where the limit is
105846 * not page aligned -Ram Gupta
105847 */
105848- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
105849+ rlim = rlimit(RLIMIT_DATA);
105850+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
105851+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
105852+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
105853+ rlim = 4096 * PAGE_SIZE;
105854+#endif
105855+ if (check_data_rlimit(rlim, brk, mm->start_brk,
105856 mm->end_data, mm->start_data))
105857 goto out;
105858
105859@@ -967,6 +996,12 @@ static int
105860 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
105861 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
105862 {
105863+
105864+#ifdef CONFIG_PAX_SEGMEXEC
105865+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
105866+ return 0;
105867+#endif
105868+
105869 if (is_mergeable_vma(vma, file, vm_flags) &&
105870 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
105871 if (vma->vm_pgoff == vm_pgoff)
105872@@ -986,6 +1021,12 @@ static int
105873 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
105874 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
105875 {
105876+
105877+#ifdef CONFIG_PAX_SEGMEXEC
105878+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
105879+ return 0;
105880+#endif
105881+
105882 if (is_mergeable_vma(vma, file, vm_flags) &&
105883 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
105884 pgoff_t vm_pglen;
105885@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105886 struct vm_area_struct *area, *next;
105887 int err;
105888
105889+#ifdef CONFIG_PAX_SEGMEXEC
105890+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
105891+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
105892+
105893+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
105894+#endif
105895+
105896 /*
105897 * We later require that vma->vm_flags == vm_flags,
105898 * so this tests vma->vm_flags & VM_SPECIAL, too.
105899@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105900 if (next && next->vm_end == end) /* cases 6, 7, 8 */
105901 next = next->vm_next;
105902
105903+#ifdef CONFIG_PAX_SEGMEXEC
105904+ if (prev)
105905+ prev_m = pax_find_mirror_vma(prev);
105906+ if (area)
105907+ area_m = pax_find_mirror_vma(area);
105908+ if (next)
105909+ next_m = pax_find_mirror_vma(next);
105910+#endif
105911+
105912 /*
105913 * Can it merge with the predecessor?
105914 */
105915@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105916 /* cases 1, 6 */
105917 err = vma_adjust(prev, prev->vm_start,
105918 next->vm_end, prev->vm_pgoff, NULL);
105919- } else /* cases 2, 5, 7 */
105920+
105921+#ifdef CONFIG_PAX_SEGMEXEC
105922+ if (!err && prev_m)
105923+ err = vma_adjust(prev_m, prev_m->vm_start,
105924+ next_m->vm_end, prev_m->vm_pgoff, NULL);
105925+#endif
105926+
105927+ } else { /* cases 2, 5, 7 */
105928 err = vma_adjust(prev, prev->vm_start,
105929 end, prev->vm_pgoff, NULL);
105930+
105931+#ifdef CONFIG_PAX_SEGMEXEC
105932+ if (!err && prev_m)
105933+ err = vma_adjust(prev_m, prev_m->vm_start,
105934+ end_m, prev_m->vm_pgoff, NULL);
105935+#endif
105936+
105937+ }
105938 if (err)
105939 return NULL;
105940 khugepaged_enter_vma_merge(prev, vm_flags);
105941@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105942 mpol_equal(policy, vma_policy(next)) &&
105943 can_vma_merge_before(next, vm_flags,
105944 anon_vma, file, pgoff+pglen)) {
105945- if (prev && addr < prev->vm_end) /* case 4 */
105946+ if (prev && addr < prev->vm_end) { /* case 4 */
105947 err = vma_adjust(prev, prev->vm_start,
105948 addr, prev->vm_pgoff, NULL);
105949- else /* cases 3, 8 */
105950+
105951+#ifdef CONFIG_PAX_SEGMEXEC
105952+ if (!err && prev_m)
105953+ err = vma_adjust(prev_m, prev_m->vm_start,
105954+ addr_m, prev_m->vm_pgoff, NULL);
105955+#endif
105956+
105957+ } else { /* cases 3, 8 */
105958 err = vma_adjust(area, addr, next->vm_end,
105959 next->vm_pgoff - pglen, NULL);
105960+
105961+#ifdef CONFIG_PAX_SEGMEXEC
105962+ if (!err && area_m)
105963+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
105964+ next_m->vm_pgoff - pglen, NULL);
105965+#endif
105966+
105967+ }
105968 if (err)
105969 return NULL;
105970 khugepaged_enter_vma_merge(area, vm_flags);
105971@@ -1199,8 +1286,10 @@ none:
105972 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
105973 struct file *file, long pages)
105974 {
105975- const unsigned long stack_flags
105976- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
105977+
105978+#ifdef CONFIG_PAX_RANDMMAP
105979+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
105980+#endif
105981
105982 mm->total_vm += pages;
105983
105984@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
105985 mm->shared_vm += pages;
105986 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
105987 mm->exec_vm += pages;
105988- } else if (flags & stack_flags)
105989+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
105990 mm->stack_vm += pages;
105991 }
105992 #endif /* CONFIG_PROC_FS */
105993@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
105994 locked += mm->locked_vm;
105995 lock_limit = rlimit(RLIMIT_MEMLOCK);
105996 lock_limit >>= PAGE_SHIFT;
105997+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
105998 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
105999 return -EAGAIN;
106000 }
106001@@ -1264,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
106002 * (the exception is when the underlying filesystem is noexec
106003 * mounted, in which case we dont add PROT_EXEC.)
106004 */
106005- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
106006+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
106007 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
106008 prot |= PROT_EXEC;
106009
106010@@ -1290,7 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
106011 /* Obtain the address to map to. we verify (or select) it and ensure
106012 * that it represents a valid section of the address space.
106013 */
106014- addr = get_unmapped_area(file, addr, len, pgoff, flags);
106015+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
106016 if (addr & ~PAGE_MASK)
106017 return addr;
106018
106019@@ -1301,6 +1391,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
106020 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
106021 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
106022
106023+#ifdef CONFIG_PAX_MPROTECT
106024+ if (mm->pax_flags & MF_PAX_MPROTECT) {
106025+
106026+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
106027+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
106028+ mm->binfmt->handle_mmap)
106029+ mm->binfmt->handle_mmap(file);
106030+#endif
106031+
106032+#ifndef CONFIG_PAX_MPROTECT_COMPAT
106033+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
106034+ gr_log_rwxmmap(file);
106035+
106036+#ifdef CONFIG_PAX_EMUPLT
106037+ vm_flags &= ~VM_EXEC;
106038+#else
106039+ return -EPERM;
106040+#endif
106041+
106042+ }
106043+
106044+ if (!(vm_flags & VM_EXEC))
106045+ vm_flags &= ~VM_MAYEXEC;
106046+#else
106047+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
106048+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
106049+#endif
106050+ else
106051+ vm_flags &= ~VM_MAYWRITE;
106052+ }
106053+#endif
106054+
106055+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
106056+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
106057+ vm_flags &= ~VM_PAGEEXEC;
106058+#endif
106059+
106060 if (flags & MAP_LOCKED)
106061 if (!can_do_mlock())
106062 return -EPERM;
106063@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
106064 vm_flags |= VM_NORESERVE;
106065 }
106066
106067+ if (!gr_acl_handle_mmap(file, prot))
106068+ return -EACCES;
106069+
106070 addr = mmap_region(file, addr, len, vm_flags, pgoff);
106071 if (!IS_ERR_VALUE(addr) &&
106072 ((vm_flags & VM_LOCKED) ||
106073@@ -1481,7 +1611,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
106074 vm_flags_t vm_flags = vma->vm_flags;
106075
106076 /* If it was private or non-writable, the write bit is already clear */
106077- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
106078+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
106079 return 0;
106080
106081 /* The backer wishes to know when pages are first written to? */
106082@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
106083 struct rb_node **rb_link, *rb_parent;
106084 unsigned long charged = 0;
106085
106086+#ifdef CONFIG_PAX_SEGMEXEC
106087+ struct vm_area_struct *vma_m = NULL;
106088+#endif
106089+
106090+ /*
106091+ * mm->mmap_sem is required to protect against another thread
106092+ * changing the mappings in case we sleep.
106093+ */
106094+ verify_mm_writelocked(mm);
106095+
106096 /* Check against address space limit. */
106097+
106098+#ifdef CONFIG_PAX_RANDMMAP
106099+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
106100+#endif
106101+
106102 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
106103 unsigned long nr_pages;
106104
106105@@ -1551,11 +1696,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
106106
106107 /* Clear old maps */
106108 error = -ENOMEM;
106109-munmap_back:
106110 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
106111 if (do_munmap(mm, addr, len))
106112 return -ENOMEM;
106113- goto munmap_back;
106114+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
106115 }
106116
106117 /*
106118@@ -1586,6 +1730,16 @@ munmap_back:
106119 goto unacct_error;
106120 }
106121
106122+#ifdef CONFIG_PAX_SEGMEXEC
106123+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
106124+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106125+ if (!vma_m) {
106126+ error = -ENOMEM;
106127+ goto free_vma;
106128+ }
106129+ }
106130+#endif
106131+
106132 vma->vm_mm = mm;
106133 vma->vm_start = addr;
106134 vma->vm_end = addr + len;
106135@@ -1616,6 +1770,13 @@ munmap_back:
106136 if (error)
106137 goto unmap_and_free_vma;
106138
106139+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
106140+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
106141+ vma->vm_flags |= VM_PAGEEXEC;
106142+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
106143+ }
106144+#endif
106145+
106146 /* Can addr have changed??
106147 *
106148 * Answer: Yes, several device drivers can do it in their
106149@@ -1634,6 +1795,12 @@ munmap_back:
106150 }
106151
106152 vma_link(mm, vma, prev, rb_link, rb_parent);
106153+
106154+#ifdef CONFIG_PAX_SEGMEXEC
106155+ if (vma_m)
106156+ BUG_ON(pax_mirror_vma(vma_m, vma));
106157+#endif
106158+
106159 /* Once vma denies write, undo our temporary denial count */
106160 if (file) {
106161 if (vm_flags & VM_SHARED)
106162@@ -1646,6 +1813,7 @@ out:
106163 perf_event_mmap(vma);
106164
106165 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
106166+ track_exec_limit(mm, addr, addr + len, vm_flags);
106167 if (vm_flags & VM_LOCKED) {
106168 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
106169 vma == get_gate_vma(current->mm)))
106170@@ -1683,6 +1851,12 @@ allow_write_and_free_vma:
106171 if (vm_flags & VM_DENYWRITE)
106172 allow_write_access(file);
106173 free_vma:
106174+
106175+#ifdef CONFIG_PAX_SEGMEXEC
106176+ if (vma_m)
106177+ kmem_cache_free(vm_area_cachep, vma_m);
106178+#endif
106179+
106180 kmem_cache_free(vm_area_cachep, vma);
106181 unacct_error:
106182 if (charged)
106183@@ -1690,7 +1864,63 @@ unacct_error:
106184 return error;
106185 }
106186
106187-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
106188+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
106189+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
106190+{
106191+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
106192+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
106193+
106194+ return 0;
106195+}
106196+#endif
106197+
106198+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
106199+{
106200+ if (!vma) {
106201+#ifdef CONFIG_STACK_GROWSUP
106202+ if (addr > sysctl_heap_stack_gap)
106203+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
106204+ else
106205+ vma = find_vma(current->mm, 0);
106206+ if (vma && (vma->vm_flags & VM_GROWSUP))
106207+ return false;
106208+#endif
106209+ return true;
106210+ }
106211+
106212+ if (addr + len > vma->vm_start)
106213+ return false;
106214+
106215+ if (vma->vm_flags & VM_GROWSDOWN)
106216+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
106217+#ifdef CONFIG_STACK_GROWSUP
106218+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
106219+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
106220+#endif
106221+ else if (offset)
106222+ return offset <= vma->vm_start - addr - len;
106223+
106224+ return true;
106225+}
106226+
106227+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
106228+{
106229+ if (vma->vm_start < len)
106230+ return -ENOMEM;
106231+
106232+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
106233+ if (offset <= vma->vm_start - len)
106234+ return vma->vm_start - len - offset;
106235+ else
106236+ return -ENOMEM;
106237+ }
106238+
106239+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
106240+ return vma->vm_start - len - sysctl_heap_stack_gap;
106241+ return -ENOMEM;
106242+}
106243+
106244+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
106245 {
106246 /*
106247 * We implement the search by looking for an rbtree node that
106248@@ -1738,11 +1968,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
106249 }
106250 }
106251
106252- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
106253+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
106254 check_current:
106255 /* Check if current node has a suitable gap */
106256 if (gap_start > high_limit)
106257 return -ENOMEM;
106258+
106259+ if (gap_end - gap_start > info->threadstack_offset)
106260+ gap_start += info->threadstack_offset;
106261+ else
106262+ gap_start = gap_end;
106263+
106264+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
106265+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106266+ gap_start += sysctl_heap_stack_gap;
106267+ else
106268+ gap_start = gap_end;
106269+ }
106270+ if (vma->vm_flags & VM_GROWSDOWN) {
106271+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106272+ gap_end -= sysctl_heap_stack_gap;
106273+ else
106274+ gap_end = gap_start;
106275+ }
106276 if (gap_end >= low_limit && gap_end - gap_start >= length)
106277 goto found;
106278
106279@@ -1792,7 +2040,7 @@ found:
106280 return gap_start;
106281 }
106282
106283-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
106284+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
106285 {
106286 struct mm_struct *mm = current->mm;
106287 struct vm_area_struct *vma;
106288@@ -1846,6 +2094,24 @@ check_current:
106289 gap_end = vma->vm_start;
106290 if (gap_end < low_limit)
106291 return -ENOMEM;
106292+
106293+ if (gap_end - gap_start > info->threadstack_offset)
106294+ gap_end -= info->threadstack_offset;
106295+ else
106296+ gap_end = gap_start;
106297+
106298+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
106299+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106300+ gap_start += sysctl_heap_stack_gap;
106301+ else
106302+ gap_start = gap_end;
106303+ }
106304+ if (vma->vm_flags & VM_GROWSDOWN) {
106305+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106306+ gap_end -= sysctl_heap_stack_gap;
106307+ else
106308+ gap_end = gap_start;
106309+ }
106310 if (gap_start <= high_limit && gap_end - gap_start >= length)
106311 goto found;
106312
106313@@ -1909,6 +2175,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106314 struct mm_struct *mm = current->mm;
106315 struct vm_area_struct *vma;
106316 struct vm_unmapped_area_info info;
106317+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
106318
106319 if (len > TASK_SIZE - mmap_min_addr)
106320 return -ENOMEM;
106321@@ -1916,11 +2183,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106322 if (flags & MAP_FIXED)
106323 return addr;
106324
106325+#ifdef CONFIG_PAX_RANDMMAP
106326+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
106327+#endif
106328+
106329 if (addr) {
106330 addr = PAGE_ALIGN(addr);
106331 vma = find_vma(mm, addr);
106332 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
106333- (!vma || addr + len <= vma->vm_start))
106334+ check_heap_stack_gap(vma, addr, len, offset))
106335 return addr;
106336 }
106337
106338@@ -1929,6 +2200,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106339 info.low_limit = mm->mmap_base;
106340 info.high_limit = TASK_SIZE;
106341 info.align_mask = 0;
106342+ info.threadstack_offset = offset;
106343 return vm_unmapped_area(&info);
106344 }
106345 #endif
106346@@ -1947,6 +2219,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106347 struct mm_struct *mm = current->mm;
106348 unsigned long addr = addr0;
106349 struct vm_unmapped_area_info info;
106350+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
106351
106352 /* requested length too big for entire address space */
106353 if (len > TASK_SIZE - mmap_min_addr)
106354@@ -1955,12 +2228,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106355 if (flags & MAP_FIXED)
106356 return addr;
106357
106358+#ifdef CONFIG_PAX_RANDMMAP
106359+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
106360+#endif
106361+
106362 /* requesting a specific address */
106363 if (addr) {
106364 addr = PAGE_ALIGN(addr);
106365 vma = find_vma(mm, addr);
106366 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
106367- (!vma || addr + len <= vma->vm_start))
106368+ check_heap_stack_gap(vma, addr, len, offset))
106369 return addr;
106370 }
106371
106372@@ -1969,6 +2246,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106373 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
106374 info.high_limit = mm->mmap_base;
106375 info.align_mask = 0;
106376+ info.threadstack_offset = offset;
106377 addr = vm_unmapped_area(&info);
106378
106379 /*
106380@@ -1981,6 +2259,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106381 VM_BUG_ON(addr != -ENOMEM);
106382 info.flags = 0;
106383 info.low_limit = TASK_UNMAPPED_BASE;
106384+
106385+#ifdef CONFIG_PAX_RANDMMAP
106386+ if (mm->pax_flags & MF_PAX_RANDMMAP)
106387+ info.low_limit += mm->delta_mmap;
106388+#endif
106389+
106390 info.high_limit = TASK_SIZE;
106391 addr = vm_unmapped_area(&info);
106392 }
106393@@ -2081,6 +2365,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
106394 return vma;
106395 }
106396
106397+#ifdef CONFIG_PAX_SEGMEXEC
106398+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
106399+{
106400+ struct vm_area_struct *vma_m;
106401+
106402+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
106403+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
106404+ BUG_ON(vma->vm_mirror);
106405+ return NULL;
106406+ }
106407+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
106408+ vma_m = vma->vm_mirror;
106409+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
106410+ BUG_ON(vma->vm_file != vma_m->vm_file);
106411+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
106412+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
106413+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
106414+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
106415+ return vma_m;
106416+}
106417+#endif
106418+
106419 /*
106420 * Verify that the stack growth is acceptable and
106421 * update accounting. This is shared with both the
106422@@ -2098,8 +2404,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106423
106424 /* Stack limit test */
106425 actual_size = size;
106426- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
106427- actual_size -= PAGE_SIZE;
106428+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
106429 if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
106430 return -ENOMEM;
106431
106432@@ -2110,6 +2415,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106433 locked = mm->locked_vm + grow;
106434 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
106435 limit >>= PAGE_SHIFT;
106436+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
106437 if (locked > limit && !capable(CAP_IPC_LOCK))
106438 return -ENOMEM;
106439 }
106440@@ -2139,37 +2445,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106441 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
106442 * vma is the last one with address > vma->vm_end. Have to extend vma.
106443 */
106444+#ifndef CONFIG_IA64
106445+static
106446+#endif
106447 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
106448 {
106449 int error;
106450+ bool locknext;
106451
106452 if (!(vma->vm_flags & VM_GROWSUP))
106453 return -EFAULT;
106454
106455+ /* Also guard against wrapping around to address 0. */
106456+ if (address < PAGE_ALIGN(address+1))
106457+ address = PAGE_ALIGN(address+1);
106458+ else
106459+ return -ENOMEM;
106460+
106461 /*
106462 * We must make sure the anon_vma is allocated
106463 * so that the anon_vma locking is not a noop.
106464 */
106465 if (unlikely(anon_vma_prepare(vma)))
106466 return -ENOMEM;
106467+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
106468+ if (locknext && anon_vma_prepare(vma->vm_next))
106469+ return -ENOMEM;
106470 vma_lock_anon_vma(vma);
106471+ if (locknext)
106472+ vma_lock_anon_vma(vma->vm_next);
106473
106474 /*
106475 * vma->vm_start/vm_end cannot change under us because the caller
106476 * is required to hold the mmap_sem in read mode. We need the
106477- * anon_vma lock to serialize against concurrent expand_stacks.
106478- * Also guard against wrapping around to address 0.
106479+ * anon_vma locks to serialize against concurrent expand_stacks
106480+ * and expand_upwards.
106481 */
106482- if (address < PAGE_ALIGN(address+4))
106483- address = PAGE_ALIGN(address+4);
106484- else {
106485- vma_unlock_anon_vma(vma);
106486- return -ENOMEM;
106487- }
106488 error = 0;
106489
106490 /* Somebody else might have raced and expanded it already */
106491- if (address > vma->vm_end) {
106492+ 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)
106493+ error = -ENOMEM;
106494+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
106495 unsigned long size, grow;
106496
106497 size = address - vma->vm_start;
106498@@ -2204,6 +2521,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
106499 }
106500 }
106501 }
106502+ if (locknext)
106503+ vma_unlock_anon_vma(vma->vm_next);
106504 vma_unlock_anon_vma(vma);
106505 khugepaged_enter_vma_merge(vma, vma->vm_flags);
106506 validate_mm(vma->vm_mm);
106507@@ -2218,6 +2537,8 @@ int expand_downwards(struct vm_area_struct *vma,
106508 unsigned long address)
106509 {
106510 int error;
106511+ bool lockprev = false;
106512+ struct vm_area_struct *prev;
106513
106514 /*
106515 * We must make sure the anon_vma is allocated
106516@@ -2231,6 +2552,15 @@ int expand_downwards(struct vm_area_struct *vma,
106517 if (error)
106518 return error;
106519
106520+ prev = vma->vm_prev;
106521+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
106522+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
106523+#endif
106524+ if (lockprev && anon_vma_prepare(prev))
106525+ return -ENOMEM;
106526+ if (lockprev)
106527+ vma_lock_anon_vma(prev);
106528+
106529 vma_lock_anon_vma(vma);
106530
106531 /*
106532@@ -2240,9 +2570,17 @@ int expand_downwards(struct vm_area_struct *vma,
106533 */
106534
106535 /* Somebody else might have raced and expanded it already */
106536- if (address < vma->vm_start) {
106537+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
106538+ error = -ENOMEM;
106539+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
106540 unsigned long size, grow;
106541
106542+#ifdef CONFIG_PAX_SEGMEXEC
106543+ struct vm_area_struct *vma_m;
106544+
106545+ vma_m = pax_find_mirror_vma(vma);
106546+#endif
106547+
106548 size = vma->vm_end - address;
106549 grow = (vma->vm_start - address) >> PAGE_SHIFT;
106550
106551@@ -2267,13 +2605,27 @@ int expand_downwards(struct vm_area_struct *vma,
106552 vma->vm_pgoff -= grow;
106553 anon_vma_interval_tree_post_update_vma(vma);
106554 vma_gap_update(vma);
106555+
106556+#ifdef CONFIG_PAX_SEGMEXEC
106557+ if (vma_m) {
106558+ anon_vma_interval_tree_pre_update_vma(vma_m);
106559+ vma_m->vm_start -= grow << PAGE_SHIFT;
106560+ vma_m->vm_pgoff -= grow;
106561+ anon_vma_interval_tree_post_update_vma(vma_m);
106562+ vma_gap_update(vma_m);
106563+ }
106564+#endif
106565+
106566 spin_unlock(&vma->vm_mm->page_table_lock);
106567
106568+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
106569 perf_event_mmap(vma);
106570 }
106571 }
106572 }
106573 vma_unlock_anon_vma(vma);
106574+ if (lockprev)
106575+ vma_unlock_anon_vma(prev);
106576 khugepaged_enter_vma_merge(vma, vma->vm_flags);
106577 validate_mm(vma->vm_mm);
106578 return error;
106579@@ -2373,6 +2725,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
106580 do {
106581 long nrpages = vma_pages(vma);
106582
106583+#ifdef CONFIG_PAX_SEGMEXEC
106584+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
106585+ vma = remove_vma(vma);
106586+ continue;
106587+ }
106588+#endif
106589+
106590 if (vma->vm_flags & VM_ACCOUNT)
106591 nr_accounted += nrpages;
106592 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
106593@@ -2417,6 +2776,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
106594 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
106595 vma->vm_prev = NULL;
106596 do {
106597+
106598+#ifdef CONFIG_PAX_SEGMEXEC
106599+ if (vma->vm_mirror) {
106600+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
106601+ vma->vm_mirror->vm_mirror = NULL;
106602+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
106603+ vma->vm_mirror = NULL;
106604+ }
106605+#endif
106606+
106607 vma_rb_erase(vma, &mm->mm_rb);
106608 mm->map_count--;
106609 tail_vma = vma;
106610@@ -2444,14 +2813,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106611 struct vm_area_struct *new;
106612 int err = -ENOMEM;
106613
106614+#ifdef CONFIG_PAX_SEGMEXEC
106615+ struct vm_area_struct *vma_m, *new_m = NULL;
106616+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
106617+#endif
106618+
106619 if (is_vm_hugetlb_page(vma) && (addr &
106620 ~(huge_page_mask(hstate_vma(vma)))))
106621 return -EINVAL;
106622
106623+#ifdef CONFIG_PAX_SEGMEXEC
106624+ vma_m = pax_find_mirror_vma(vma);
106625+#endif
106626+
106627 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
106628 if (!new)
106629 goto out_err;
106630
106631+#ifdef CONFIG_PAX_SEGMEXEC
106632+ if (vma_m) {
106633+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
106634+ if (!new_m) {
106635+ kmem_cache_free(vm_area_cachep, new);
106636+ goto out_err;
106637+ }
106638+ }
106639+#endif
106640+
106641 /* most fields are the same, copy all, and then fixup */
106642 *new = *vma;
106643
106644@@ -2464,6 +2852,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106645 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
106646 }
106647
106648+#ifdef CONFIG_PAX_SEGMEXEC
106649+ if (vma_m) {
106650+ *new_m = *vma_m;
106651+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
106652+ new_m->vm_mirror = new;
106653+ new->vm_mirror = new_m;
106654+
106655+ if (new_below)
106656+ new_m->vm_end = addr_m;
106657+ else {
106658+ new_m->vm_start = addr_m;
106659+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
106660+ }
106661+ }
106662+#endif
106663+
106664 err = vma_dup_policy(vma, new);
106665 if (err)
106666 goto out_free_vma;
106667@@ -2484,6 +2888,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106668 else
106669 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
106670
106671+#ifdef CONFIG_PAX_SEGMEXEC
106672+ if (!err && vma_m) {
106673+ struct mempolicy *pol = vma_policy(new);
106674+
106675+ if (anon_vma_clone(new_m, vma_m))
106676+ goto out_free_mpol;
106677+
106678+ mpol_get(pol);
106679+ set_vma_policy(new_m, pol);
106680+
106681+ if (new_m->vm_file)
106682+ get_file(new_m->vm_file);
106683+
106684+ if (new_m->vm_ops && new_m->vm_ops->open)
106685+ new_m->vm_ops->open(new_m);
106686+
106687+ if (new_below)
106688+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
106689+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
106690+ else
106691+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
106692+
106693+ if (err) {
106694+ if (new_m->vm_ops && new_m->vm_ops->close)
106695+ new_m->vm_ops->close(new_m);
106696+ if (new_m->vm_file)
106697+ fput(new_m->vm_file);
106698+ mpol_put(pol);
106699+ }
106700+ }
106701+#endif
106702+
106703 /* Success. */
106704 if (!err)
106705 return 0;
106706@@ -2493,10 +2929,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106707 new->vm_ops->close(new);
106708 if (new->vm_file)
106709 fput(new->vm_file);
106710- unlink_anon_vmas(new);
106711 out_free_mpol:
106712 mpol_put(vma_policy(new));
106713 out_free_vma:
106714+
106715+#ifdef CONFIG_PAX_SEGMEXEC
106716+ if (new_m) {
106717+ unlink_anon_vmas(new_m);
106718+ kmem_cache_free(vm_area_cachep, new_m);
106719+ }
106720+#endif
106721+
106722+ unlink_anon_vmas(new);
106723 kmem_cache_free(vm_area_cachep, new);
106724 out_err:
106725 return err;
106726@@ -2509,6 +2953,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106727 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106728 unsigned long addr, int new_below)
106729 {
106730+
106731+#ifdef CONFIG_PAX_SEGMEXEC
106732+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
106733+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
106734+ if (mm->map_count >= sysctl_max_map_count-1)
106735+ return -ENOMEM;
106736+ } else
106737+#endif
106738+
106739 if (mm->map_count >= sysctl_max_map_count)
106740 return -ENOMEM;
106741
106742@@ -2520,11 +2973,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106743 * work. This now handles partial unmappings.
106744 * Jeremy Fitzhardinge <jeremy@goop.org>
106745 */
106746+#ifdef CONFIG_PAX_SEGMEXEC
106747 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106748 {
106749+ int ret = __do_munmap(mm, start, len);
106750+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
106751+ return ret;
106752+
106753+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
106754+}
106755+
106756+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106757+#else
106758+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106759+#endif
106760+{
106761 unsigned long end;
106762 struct vm_area_struct *vma, *prev, *last;
106763
106764+ /*
106765+ * mm->mmap_sem is required to protect against another thread
106766+ * changing the mappings in case we sleep.
106767+ */
106768+ verify_mm_writelocked(mm);
106769+
106770 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
106771 return -EINVAL;
106772
106773@@ -2602,6 +3074,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106774 /* Fix up all other VM information */
106775 remove_vma_list(mm, vma);
106776
106777+ track_exec_limit(mm, start, end, 0UL);
106778+
106779 return 0;
106780 }
106781
106782@@ -2610,6 +3084,13 @@ int vm_munmap(unsigned long start, size_t len)
106783 int ret;
106784 struct mm_struct *mm = current->mm;
106785
106786+
106787+#ifdef CONFIG_PAX_SEGMEXEC
106788+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
106789+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
106790+ return -EINVAL;
106791+#endif
106792+
106793 down_write(&mm->mmap_sem);
106794 ret = do_munmap(mm, start, len);
106795 up_write(&mm->mmap_sem);
106796@@ -2656,6 +3137,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
106797 down_write(&mm->mmap_sem);
106798 vma = find_vma(mm, start);
106799
106800+#ifdef CONFIG_PAX_SEGMEXEC
106801+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
106802+ goto out;
106803+#endif
106804+
106805 if (!vma || !(vma->vm_flags & VM_SHARED))
106806 goto out;
106807
106808@@ -2692,16 +3178,6 @@ out:
106809 return ret;
106810 }
106811
106812-static inline void verify_mm_writelocked(struct mm_struct *mm)
106813-{
106814-#ifdef CONFIG_DEBUG_VM
106815- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
106816- WARN_ON(1);
106817- up_read(&mm->mmap_sem);
106818- }
106819-#endif
106820-}
106821-
106822 /*
106823 * this is really a simplified "do_mmap". it only handles
106824 * anonymous maps. eventually we may be able to do some
106825@@ -2715,6 +3191,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106826 struct rb_node **rb_link, *rb_parent;
106827 pgoff_t pgoff = addr >> PAGE_SHIFT;
106828 int error;
106829+ unsigned long charged;
106830
106831 len = PAGE_ALIGN(len);
106832 if (!len)
106833@@ -2722,10 +3199,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106834
106835 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
106836
106837+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
106838+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
106839+ flags &= ~VM_EXEC;
106840+
106841+#ifdef CONFIG_PAX_MPROTECT
106842+ if (mm->pax_flags & MF_PAX_MPROTECT)
106843+ flags &= ~VM_MAYEXEC;
106844+#endif
106845+
106846+ }
106847+#endif
106848+
106849 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
106850 if (error & ~PAGE_MASK)
106851 return error;
106852
106853+ charged = len >> PAGE_SHIFT;
106854+
106855 error = mlock_future_check(mm, mm->def_flags, len);
106856 if (error)
106857 return error;
106858@@ -2739,21 +3230,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106859 /*
106860 * Clear old maps. this also does some error checking for us
106861 */
106862- munmap_back:
106863 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
106864 if (do_munmap(mm, addr, len))
106865 return -ENOMEM;
106866- goto munmap_back;
106867+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
106868 }
106869
106870 /* Check against address space limits *after* clearing old maps... */
106871- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
106872+ if (!may_expand_vm(mm, charged))
106873 return -ENOMEM;
106874
106875 if (mm->map_count > sysctl_max_map_count)
106876 return -ENOMEM;
106877
106878- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
106879+ if (security_vm_enough_memory_mm(mm, charged))
106880 return -ENOMEM;
106881
106882 /* Can we just expand an old private anonymous mapping? */
106883@@ -2767,7 +3257,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106884 */
106885 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106886 if (!vma) {
106887- vm_unacct_memory(len >> PAGE_SHIFT);
106888+ vm_unacct_memory(charged);
106889 return -ENOMEM;
106890 }
106891
106892@@ -2781,10 +3271,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106893 vma_link(mm, vma, prev, rb_link, rb_parent);
106894 out:
106895 perf_event_mmap(vma);
106896- mm->total_vm += len >> PAGE_SHIFT;
106897+ mm->total_vm += charged;
106898 if (flags & VM_LOCKED)
106899- mm->locked_vm += (len >> PAGE_SHIFT);
106900+ mm->locked_vm += charged;
106901 vma->vm_flags |= VM_SOFTDIRTY;
106902+ track_exec_limit(mm, addr, addr + len, flags);
106903 return addr;
106904 }
106905
106906@@ -2846,6 +3337,7 @@ void exit_mmap(struct mm_struct *mm)
106907 while (vma) {
106908 if (vma->vm_flags & VM_ACCOUNT)
106909 nr_accounted += vma_pages(vma);
106910+ vma->vm_mirror = NULL;
106911 vma = remove_vma(vma);
106912 }
106913 vm_unacct_memory(nr_accounted);
106914@@ -2860,6 +3352,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
106915 struct vm_area_struct *prev;
106916 struct rb_node **rb_link, *rb_parent;
106917
106918+#ifdef CONFIG_PAX_SEGMEXEC
106919+ struct vm_area_struct *vma_m = NULL;
106920+#endif
106921+
106922+ if (security_mmap_addr(vma->vm_start))
106923+ return -EPERM;
106924+
106925 /*
106926 * The vm_pgoff of a purely anonymous vma should be irrelevant
106927 * until its first write fault, when page's anon_vma and index
106928@@ -2883,7 +3382,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
106929 security_vm_enough_memory_mm(mm, vma_pages(vma)))
106930 return -ENOMEM;
106931
106932+#ifdef CONFIG_PAX_SEGMEXEC
106933+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
106934+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106935+ if (!vma_m)
106936+ return -ENOMEM;
106937+ }
106938+#endif
106939+
106940 vma_link(mm, vma, prev, rb_link, rb_parent);
106941+
106942+#ifdef CONFIG_PAX_SEGMEXEC
106943+ if (vma_m)
106944+ BUG_ON(pax_mirror_vma(vma_m, vma));
106945+#endif
106946+
106947 return 0;
106948 }
106949
106950@@ -2902,6 +3415,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
106951 struct rb_node **rb_link, *rb_parent;
106952 bool faulted_in_anon_vma = true;
106953
106954+ BUG_ON(vma->vm_mirror);
106955+
106956 /*
106957 * If anonymous vma has not yet been faulted, update new pgoff
106958 * to match new location, to increase its chance of merging.
106959@@ -2966,6 +3481,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
106960 return NULL;
106961 }
106962
106963+#ifdef CONFIG_PAX_SEGMEXEC
106964+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
106965+{
106966+ struct vm_area_struct *prev_m;
106967+ struct rb_node **rb_link_m, *rb_parent_m;
106968+ struct mempolicy *pol_m;
106969+
106970+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
106971+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
106972+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
106973+ *vma_m = *vma;
106974+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
106975+ if (anon_vma_clone(vma_m, vma))
106976+ return -ENOMEM;
106977+ pol_m = vma_policy(vma_m);
106978+ mpol_get(pol_m);
106979+ set_vma_policy(vma_m, pol_m);
106980+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
106981+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
106982+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
106983+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
106984+ if (vma_m->vm_file)
106985+ get_file(vma_m->vm_file);
106986+ if (vma_m->vm_ops && vma_m->vm_ops->open)
106987+ vma_m->vm_ops->open(vma_m);
106988+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
106989+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
106990+ vma_m->vm_mirror = vma;
106991+ vma->vm_mirror = vma_m;
106992+ return 0;
106993+}
106994+#endif
106995+
106996 /*
106997 * Return true if the calling process may expand its vm space by the passed
106998 * number of pages
106999@@ -2977,6 +3525,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
107000
107001 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
107002
107003+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
107004 if (cur + npages > lim)
107005 return 0;
107006 return 1;
107007@@ -3059,6 +3608,22 @@ static struct vm_area_struct *__install_special_mapping(
107008 vma->vm_start = addr;
107009 vma->vm_end = addr + len;
107010
107011+#ifdef CONFIG_PAX_MPROTECT
107012+ if (mm->pax_flags & MF_PAX_MPROTECT) {
107013+#ifndef CONFIG_PAX_MPROTECT_COMPAT
107014+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
107015+ return ERR_PTR(-EPERM);
107016+ if (!(vm_flags & VM_EXEC))
107017+ vm_flags &= ~VM_MAYEXEC;
107018+#else
107019+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
107020+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
107021+#endif
107022+ else
107023+ vm_flags &= ~VM_MAYWRITE;
107024+ }
107025+#endif
107026+
107027 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
107028 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
107029
107030diff --git a/mm/mprotect.c b/mm/mprotect.c
107031index 8858483..72f2464 100644
107032--- a/mm/mprotect.c
107033+++ b/mm/mprotect.c
107034@@ -24,10 +24,18 @@
107035 #include <linux/migrate.h>
107036 #include <linux/perf_event.h>
107037 #include <linux/ksm.h>
107038+#include <linux/sched/sysctl.h>
107039+
107040+#ifdef CONFIG_PAX_MPROTECT
107041+#include <linux/elf.h>
107042+#include <linux/binfmts.h>
107043+#endif
107044+
107045 #include <asm/uaccess.h>
107046 #include <asm/pgtable.h>
107047 #include <asm/cacheflush.h>
107048 #include <asm/tlbflush.h>
107049+#include <asm/mmu_context.h>
107050
107051 /*
107052 * For a prot_numa update we only hold mmap_sem for read so there is a
107053@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
107054 return pages;
107055 }
107056
107057+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
107058+/* called while holding the mmap semaphor for writing except stack expansion */
107059+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
107060+{
107061+ unsigned long oldlimit, newlimit = 0UL;
107062+
107063+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
107064+ return;
107065+
107066+ spin_lock(&mm->page_table_lock);
107067+ oldlimit = mm->context.user_cs_limit;
107068+ if ((prot & VM_EXEC) && oldlimit < end)
107069+ /* USER_CS limit moved up */
107070+ newlimit = end;
107071+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
107072+ /* USER_CS limit moved down */
107073+ newlimit = start;
107074+
107075+ if (newlimit) {
107076+ mm->context.user_cs_limit = newlimit;
107077+
107078+#ifdef CONFIG_SMP
107079+ wmb();
107080+ cpumask_clear(&mm->context.cpu_user_cs_mask);
107081+ cpumask_set_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask);
107082+#endif
107083+
107084+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
107085+ }
107086+ spin_unlock(&mm->page_table_lock);
107087+ if (newlimit == end) {
107088+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
107089+
107090+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
107091+ if (is_vm_hugetlb_page(vma))
107092+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
107093+ else
107094+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
107095+ }
107096+}
107097+#endif
107098+
107099 int
107100 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
107101 unsigned long start, unsigned long end, unsigned long newflags)
107102@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
107103 int error;
107104 int dirty_accountable = 0;
107105
107106+#ifdef CONFIG_PAX_SEGMEXEC
107107+ struct vm_area_struct *vma_m = NULL;
107108+ unsigned long start_m, end_m;
107109+
107110+ start_m = start + SEGMEXEC_TASK_SIZE;
107111+ end_m = end + SEGMEXEC_TASK_SIZE;
107112+#endif
107113+
107114 if (newflags == oldflags) {
107115 *pprev = vma;
107116 return 0;
107117 }
107118
107119+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
107120+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
107121+
107122+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
107123+ return -ENOMEM;
107124+
107125+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
107126+ return -ENOMEM;
107127+ }
107128+
107129 /*
107130 * If we make a private mapping writable we increase our commit;
107131 * but (without finer accounting) cannot reduce our commit if we
107132@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
107133 }
107134 }
107135
107136+#ifdef CONFIG_PAX_SEGMEXEC
107137+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
107138+ if (start != vma->vm_start) {
107139+ error = split_vma(mm, vma, start, 1);
107140+ if (error)
107141+ goto fail;
107142+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
107143+ *pprev = (*pprev)->vm_next;
107144+ }
107145+
107146+ if (end != vma->vm_end) {
107147+ error = split_vma(mm, vma, end, 0);
107148+ if (error)
107149+ goto fail;
107150+ }
107151+
107152+ if (pax_find_mirror_vma(vma)) {
107153+ error = __do_munmap(mm, start_m, end_m - start_m);
107154+ if (error)
107155+ goto fail;
107156+ } else {
107157+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
107158+ if (!vma_m) {
107159+ error = -ENOMEM;
107160+ goto fail;
107161+ }
107162+ vma->vm_flags = newflags;
107163+ error = pax_mirror_vma(vma_m, vma);
107164+ if (error) {
107165+ vma->vm_flags = oldflags;
107166+ goto fail;
107167+ }
107168+ }
107169+ }
107170+#endif
107171+
107172 /*
107173 * First try to merge with previous and/or next vma.
107174 */
107175@@ -315,7 +419,19 @@ success:
107176 * vm_flags and vm_page_prot are protected by the mmap_sem
107177 * held in write mode.
107178 */
107179+
107180+#ifdef CONFIG_PAX_SEGMEXEC
107181+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
107182+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
107183+#endif
107184+
107185 vma->vm_flags = newflags;
107186+
107187+#ifdef CONFIG_PAX_MPROTECT
107188+ if (mm->binfmt && mm->binfmt->handle_mprotect)
107189+ mm->binfmt->handle_mprotect(vma, newflags);
107190+#endif
107191+
107192 dirty_accountable = vma_wants_writenotify(vma);
107193 vma_set_page_prot(vma);
107194
107195@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107196 end = start + len;
107197 if (end <= start)
107198 return -ENOMEM;
107199+
107200+#ifdef CONFIG_PAX_SEGMEXEC
107201+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
107202+ if (end > SEGMEXEC_TASK_SIZE)
107203+ return -EINVAL;
107204+ } else
107205+#endif
107206+
107207+ if (end > TASK_SIZE)
107208+ return -EINVAL;
107209+
107210 if (!arch_validate_prot(prot))
107211 return -EINVAL;
107212
107213@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107214 /*
107215 * Does the application expect PROT_READ to imply PROT_EXEC:
107216 */
107217- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
107218+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
107219 prot |= PROT_EXEC;
107220
107221 vm_flags = calc_vm_prot_bits(prot);
107222@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107223 if (start > vma->vm_start)
107224 prev = vma;
107225
107226+#ifdef CONFIG_PAX_MPROTECT
107227+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
107228+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
107229+#endif
107230+
107231 for (nstart = start ; ; ) {
107232 unsigned long newflags;
107233
107234@@ -400,6 +532,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107235
107236 /* newflags >> 4 shift VM_MAY% in place of VM_% */
107237 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
107238+ if (prot & (PROT_WRITE | PROT_EXEC))
107239+ gr_log_rwxmprotect(vma);
107240+
107241+ error = -EACCES;
107242+ goto out;
107243+ }
107244+
107245+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
107246 error = -EACCES;
107247 goto out;
107248 }
107249@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107250 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
107251 if (error)
107252 goto out;
107253+
107254+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
107255+
107256 nstart = tmp;
107257
107258 if (nstart < prev->vm_end)
107259diff --git a/mm/mremap.c b/mm/mremap.c
107260index 2dc44b1..caa1819 100644
107261--- a/mm/mremap.c
107262+++ b/mm/mremap.c
107263@@ -142,6 +142,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
107264 continue;
107265 pte = ptep_get_and_clear(mm, old_addr, old_pte);
107266 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
107267+
107268+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
107269+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
107270+ pte = pte_exprotect(pte);
107271+#endif
107272+
107273 pte = move_soft_dirty_pte(pte);
107274 set_pte_at(mm, new_addr, new_pte, pte);
107275 }
107276@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
107277 if (is_vm_hugetlb_page(vma))
107278 goto Einval;
107279
107280+#ifdef CONFIG_PAX_SEGMEXEC
107281+ if (pax_find_mirror_vma(vma))
107282+ goto Einval;
107283+#endif
107284+
107285 /* We can't remap across vm area boundaries */
107286 if (old_len > vma->vm_end - addr)
107287 goto Efault;
107288@@ -405,20 +416,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
107289 unsigned long ret = -EINVAL;
107290 unsigned long charged = 0;
107291 unsigned long map_flags;
107292+ unsigned long pax_task_size = TASK_SIZE;
107293
107294 if (new_addr & ~PAGE_MASK)
107295 goto out;
107296
107297- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
107298+#ifdef CONFIG_PAX_SEGMEXEC
107299+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
107300+ pax_task_size = SEGMEXEC_TASK_SIZE;
107301+#endif
107302+
107303+ pax_task_size -= PAGE_SIZE;
107304+
107305+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
107306 goto out;
107307
107308 /* Check if the location we're moving into overlaps the
107309 * old location at all, and fail if it does.
107310 */
107311- if ((new_addr <= addr) && (new_addr+new_len) > addr)
107312- goto out;
107313-
107314- if ((addr <= new_addr) && (addr+old_len) > new_addr)
107315+ if (addr + old_len > new_addr && new_addr + new_len > addr)
107316 goto out;
107317
107318 ret = do_munmap(mm, new_addr, new_len);
107319@@ -487,6 +503,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107320 unsigned long ret = -EINVAL;
107321 unsigned long charged = 0;
107322 bool locked = false;
107323+ unsigned long pax_task_size = TASK_SIZE;
107324
107325 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
107326 return ret;
107327@@ -508,6 +525,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107328 if (!new_len)
107329 return ret;
107330
107331+#ifdef CONFIG_PAX_SEGMEXEC
107332+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
107333+ pax_task_size = SEGMEXEC_TASK_SIZE;
107334+#endif
107335+
107336+ pax_task_size -= PAGE_SIZE;
107337+
107338+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
107339+ old_len > pax_task_size || addr > pax_task_size-old_len)
107340+ return ret;
107341+
107342 down_write(&current->mm->mmap_sem);
107343
107344 if (flags & MREMAP_FIXED) {
107345@@ -558,6 +586,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107346 new_addr = addr;
107347 }
107348 ret = addr;
107349+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
107350 goto out;
107351 }
107352 }
107353@@ -581,7 +610,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107354 goto out;
107355 }
107356
107357+ map_flags = vma->vm_flags;
107358 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
107359+ if (!(ret & ~PAGE_MASK)) {
107360+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
107361+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
107362+ }
107363 }
107364 out:
107365 if (ret & ~PAGE_MASK)
107366diff --git a/mm/nommu.c b/mm/nommu.c
107367index 3fba2dc9..fdad748 100644
107368--- a/mm/nommu.c
107369+++ b/mm/nommu.c
107370@@ -72,7 +72,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
107371 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
107372 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
107373 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
107374-int heap_stack_gap = 0;
107375
107376 atomic_long_t mmap_pages_allocated;
107377
107378@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
107379 EXPORT_SYMBOL(find_vma);
107380
107381 /*
107382- * find a VMA
107383- * - we don't extend stack VMAs under NOMMU conditions
107384- */
107385-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
107386-{
107387- return find_vma(mm, addr);
107388-}
107389-
107390-/*
107391 * expand a stack to a given address
107392 * - not supported under NOMMU conditions
107393 */
107394@@ -1585,6 +1575,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
107395
107396 /* most fields are the same, copy all, and then fixup */
107397 *new = *vma;
107398+ INIT_LIST_HEAD(&new->anon_vma_chain);
107399 *region = *vma->vm_region;
107400 new->vm_region = region;
107401
107402@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
107403 }
107404 EXPORT_SYMBOL(filemap_map_pages);
107405
107406-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107407- unsigned long addr, void *buf, int len, int write)
107408+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107409+ unsigned long addr, void *buf, size_t len, int write)
107410 {
107411 struct vm_area_struct *vma;
107412
107413@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107414 *
107415 * The caller must hold a reference on @mm.
107416 */
107417-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
107418- void *buf, int len, int write)
107419+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
107420+ void *buf, size_t len, int write)
107421 {
107422 return __access_remote_vm(NULL, mm, addr, buf, len, write);
107423 }
107424@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
107425 * Access another process' address space.
107426 * - source/target buffer must be kernel space
107427 */
107428-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
107429+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
107430 {
107431 struct mm_struct *mm;
107432
107433diff --git a/mm/page-writeback.c b/mm/page-writeback.c
107434index ad05f2f..cee723a 100644
107435--- a/mm/page-writeback.c
107436+++ b/mm/page-writeback.c
107437@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
107438 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
107439 * - the bdi dirty thresh drops quickly due to change of JBOD workload
107440 */
107441-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
107442+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
107443 unsigned long thresh,
107444 unsigned long bg_thresh,
107445 unsigned long dirty,
107446diff --git a/mm/page_alloc.c b/mm/page_alloc.c
107447index 40e2942..0eb29a2 100644
107448--- a/mm/page_alloc.c
107449+++ b/mm/page_alloc.c
107450@@ -61,6 +61,7 @@
107451 #include <linux/hugetlb.h>
107452 #include <linux/sched/rt.h>
107453 #include <linux/page_owner.h>
107454+#include <linux/random.h>
107455
107456 #include <asm/sections.h>
107457 #include <asm/tlbflush.h>
107458@@ -357,7 +358,7 @@ out:
107459 * This usage means that zero-order pages may not be compound.
107460 */
107461
107462-static void free_compound_page(struct page *page)
107463+void free_compound_page(struct page *page)
107464 {
107465 __free_pages_ok(page, compound_order(page));
107466 }
107467@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
107468 __mod_zone_freepage_state(zone, (1 << order), migratetype);
107469 }
107470 #else
107471-struct page_ext_operations debug_guardpage_ops = { NULL, };
107472+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
107473 static inline void set_page_guard(struct zone *zone, struct page *page,
107474 unsigned int order, int migratetype) {}
107475 static inline void clear_page_guard(struct zone *zone, struct page *page,
107476@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
107477 bool compound = PageCompound(page);
107478 int i, bad = 0;
107479
107480+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107481+ unsigned long index = 1UL << order;
107482+#endif
107483+
107484 VM_BUG_ON_PAGE(PageTail(page), page);
107485 VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
107486
107487@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
107488 debug_check_no_obj_freed(page_address(page),
107489 PAGE_SIZE << order);
107490 }
107491+
107492+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107493+ for (; index; --index)
107494+ sanitize_highpage(page + index - 1);
107495+#endif
107496+
107497 arch_free_page(page, order);
107498 kernel_map_pages(page, 1 << order, 0);
107499
107500@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
107501 local_irq_restore(flags);
107502 }
107503
107504+#ifdef CONFIG_PAX_LATENT_ENTROPY
107505+bool __meminitdata extra_latent_entropy;
107506+
107507+static int __init setup_pax_extra_latent_entropy(char *str)
107508+{
107509+ extra_latent_entropy = true;
107510+ return 0;
107511+}
107512+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
107513+
107514+volatile u64 latent_entropy __latent_entropy;
107515+EXPORT_SYMBOL(latent_entropy);
107516+#endif
107517+
107518 void __init __free_pages_bootmem(struct page *page, unsigned int order)
107519 {
107520 unsigned int nr_pages = 1 << order;
107521@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
107522 __ClearPageReserved(p);
107523 set_page_count(p, 0);
107524
107525+#ifdef CONFIG_PAX_LATENT_ENTROPY
107526+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
107527+ u64 hash = 0;
107528+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
107529+ const u64 *data = lowmem_page_address(page);
107530+
107531+ for (index = 0; index < end; index++)
107532+ hash ^= hash + data[index];
107533+ latent_entropy ^= hash;
107534+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
107535+ }
107536+#endif
107537+
107538 page_zone(page)->managed_pages += nr_pages;
107539 set_page_refcounted(page);
107540 __free_pages(page, order);
107541@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
107542 kernel_map_pages(page, 1 << order, 1);
107543 kasan_alloc_pages(page, order);
107544
107545+#ifndef CONFIG_PAX_MEMORY_SANITIZE
107546 if (gfp_flags & __GFP_ZERO)
107547 prep_zero_page(page, order, gfp_flags);
107548+#endif
107549
107550 if (order && (gfp_flags & __GFP_COMP))
107551 prep_compound_page(page, order);
107552@@ -1699,7 +1739,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
107553 }
107554
107555 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
107556- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
107557+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
107558 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
107559 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
107560
107561@@ -2018,7 +2058,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
107562 do {
107563 mod_zone_page_state(zone, NR_ALLOC_BATCH,
107564 high_wmark_pages(zone) - low_wmark_pages(zone) -
107565- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
107566+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
107567 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
107568 } while (zone++ != preferred_zone);
107569 }
107570@@ -5738,7 +5778,7 @@ static void __setup_per_zone_wmarks(void)
107571
107572 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
107573 high_wmark_pages(zone) - low_wmark_pages(zone) -
107574- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
107575+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
107576
107577 setup_zone_migrate_reserve(zone);
107578 spin_unlock_irqrestore(&zone->lock, flags);
107579diff --git a/mm/percpu.c b/mm/percpu.c
107580index 73c97a5..508ee25 100644
107581--- a/mm/percpu.c
107582+++ b/mm/percpu.c
107583@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
107584 static unsigned int pcpu_high_unit_cpu __read_mostly;
107585
107586 /* the address of the first chunk which starts with the kernel static area */
107587-void *pcpu_base_addr __read_mostly;
107588+void *pcpu_base_addr __read_only;
107589 EXPORT_SYMBOL_GPL(pcpu_base_addr);
107590
107591 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
107592diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
107593index b159769..d07037f 100644
107594--- a/mm/process_vm_access.c
107595+++ b/mm/process_vm_access.c
107596@@ -13,6 +13,7 @@
107597 #include <linux/uio.h>
107598 #include <linux/sched.h>
107599 #include <linux/highmem.h>
107600+#include <linux/security.h>
107601 #include <linux/ptrace.h>
107602 #include <linux/slab.h>
107603 #include <linux/syscalls.h>
107604@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
107605 ssize_t iov_len;
107606 size_t total_len = iov_iter_count(iter);
107607
107608+ return -ENOSYS; // PaX: until properly audited
107609+
107610 /*
107611 * Work out how many pages of struct pages we're going to need
107612 * when eventually calling get_user_pages
107613 */
107614 for (i = 0; i < riovcnt; i++) {
107615 iov_len = rvec[i].iov_len;
107616- if (iov_len > 0) {
107617- nr_pages_iov = ((unsigned long)rvec[i].iov_base
107618- + iov_len)
107619- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
107620- / PAGE_SIZE + 1;
107621- nr_pages = max(nr_pages, nr_pages_iov);
107622- }
107623+ if (iov_len <= 0)
107624+ continue;
107625+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
107626+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
107627+ nr_pages = max(nr_pages, nr_pages_iov);
107628 }
107629
107630 if (nr_pages == 0)
107631@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
107632 goto free_proc_pages;
107633 }
107634
107635+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
107636+ rc = -EPERM;
107637+ goto put_task_struct;
107638+ }
107639+
107640 mm = mm_access(task, PTRACE_MODE_ATTACH);
107641 if (!mm || IS_ERR(mm)) {
107642 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
107643diff --git a/mm/rmap.c b/mm/rmap.c
107644index c161a14..8a069bb 100644
107645--- a/mm/rmap.c
107646+++ b/mm/rmap.c
107647@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107648 struct anon_vma *anon_vma = vma->anon_vma;
107649 struct anon_vma_chain *avc;
107650
107651+#ifdef CONFIG_PAX_SEGMEXEC
107652+ struct anon_vma_chain *avc_m = NULL;
107653+#endif
107654+
107655 might_sleep();
107656 if (unlikely(!anon_vma)) {
107657 struct mm_struct *mm = vma->vm_mm;
107658@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107659 if (!avc)
107660 goto out_enomem;
107661
107662+#ifdef CONFIG_PAX_SEGMEXEC
107663+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
107664+ if (!avc_m)
107665+ goto out_enomem_free_avc;
107666+#endif
107667+
107668 anon_vma = find_mergeable_anon_vma(vma);
107669 allocated = NULL;
107670 if (!anon_vma) {
107671@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107672 /* page_table_lock to protect against threads */
107673 spin_lock(&mm->page_table_lock);
107674 if (likely(!vma->anon_vma)) {
107675+
107676+#ifdef CONFIG_PAX_SEGMEXEC
107677+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
107678+
107679+ if (vma_m) {
107680+ BUG_ON(vma_m->anon_vma);
107681+ vma_m->anon_vma = anon_vma;
107682+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
107683+ anon_vma->degree++;
107684+ avc_m = NULL;
107685+ }
107686+#endif
107687+
107688 vma->anon_vma = anon_vma;
107689 anon_vma_chain_link(vma, avc, anon_vma);
107690 /* vma reference or self-parent link for new root */
107691@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107692
107693 if (unlikely(allocated))
107694 put_anon_vma(allocated);
107695+
107696+#ifdef CONFIG_PAX_SEGMEXEC
107697+ if (unlikely(avc_m))
107698+ anon_vma_chain_free(avc_m);
107699+#endif
107700+
107701 if (unlikely(avc))
107702 anon_vma_chain_free(avc);
107703 }
107704 return 0;
107705
107706 out_enomem_free_avc:
107707+
107708+#ifdef CONFIG_PAX_SEGMEXEC
107709+ if (avc_m)
107710+ anon_vma_chain_free(avc_m);
107711+#endif
107712+
107713 anon_vma_chain_free(avc);
107714 out_enomem:
107715 return -ENOMEM;
107716@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
107717 * good chance of avoiding scanning the whole hierarchy when it searches where
107718 * page is mapped.
107719 */
107720-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
107721+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
107722 {
107723 struct anon_vma_chain *avc, *pavc;
107724 struct anon_vma *root = NULL;
107725@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
107726 * the corresponding VMA in the parent process is attached to.
107727 * Returns 0 on success, non-zero on failure.
107728 */
107729-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
107730+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
107731 {
107732 struct anon_vma_chain *avc;
107733 struct anon_vma *anon_vma;
107734@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
107735 void __init anon_vma_init(void)
107736 {
107737 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
107738- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
107739- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
107740+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
107741+ anon_vma_ctor);
107742+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
107743+ SLAB_PANIC|SLAB_NO_SANITIZE);
107744 }
107745
107746 /*
107747diff --git a/mm/shmem.c b/mm/shmem.c
107748index cf2d0ca..ec06b8b 100644
107749--- a/mm/shmem.c
107750+++ b/mm/shmem.c
107751@@ -33,7 +33,7 @@
107752 #include <linux/swap.h>
107753 #include <linux/aio.h>
107754
107755-static struct vfsmount *shm_mnt;
107756+struct vfsmount *shm_mnt;
107757
107758 #ifdef CONFIG_SHMEM
107759 /*
107760@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
107761 #define BOGO_DIRENT_SIZE 20
107762
107763 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
107764-#define SHORT_SYMLINK_LEN 128
107765+#define SHORT_SYMLINK_LEN 64
107766
107767 /*
107768 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
107769@@ -2555,6 +2555,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
107770 static int shmem_xattr_validate(const char *name)
107771 {
107772 struct { const char *prefix; size_t len; } arr[] = {
107773+
107774+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
107775+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
107776+#endif
107777+
107778 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
107779 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
107780 };
107781@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
107782 if (err)
107783 return err;
107784
107785+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
107786+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
107787+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
107788+ return -EOPNOTSUPP;
107789+ if (size > 8)
107790+ return -EINVAL;
107791+ }
107792+#endif
107793+
107794 return simple_xattr_set(&info->xattrs, name, value, size, flags);
107795 }
107796
107797@@ -2993,8 +3007,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
107798 int err = -ENOMEM;
107799
107800 /* Round up to L1_CACHE_BYTES to resist false sharing */
107801- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
107802- L1_CACHE_BYTES), GFP_KERNEL);
107803+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
107804 if (!sbinfo)
107805 return -ENOMEM;
107806
107807diff --git a/mm/slab.c b/mm/slab.c
107808index c4b89ea..20990be 100644
107809--- a/mm/slab.c
107810+++ b/mm/slab.c
107811@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
107812 if ((x)->max_freeable < i) \
107813 (x)->max_freeable = i; \
107814 } while (0)
107815-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
107816-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
107817-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
107818-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
107819+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
107820+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
107821+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
107822+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
107823+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
107824+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
107825 #else
107826 #define STATS_INC_ACTIVE(x) do { } while (0)
107827 #define STATS_DEC_ACTIVE(x) do { } while (0)
107828@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
107829 #define STATS_INC_ALLOCMISS(x) do { } while (0)
107830 #define STATS_INC_FREEHIT(x) do { } while (0)
107831 #define STATS_INC_FREEMISS(x) do { } while (0)
107832+#define STATS_INC_SANITIZED(x) do { } while (0)
107833+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
107834 #endif
107835
107836 #if DEBUG
107837@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
107838 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
107839 */
107840 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
107841- const struct page *page, void *obj)
107842+ const struct page *page, const void *obj)
107843 {
107844 u32 offset = (obj - page->s_mem);
107845 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
107846@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
107847 * structures first. Without this, further allocations will bug.
107848 */
107849 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
107850- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
107851+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
107852 slab_state = PARTIAL_NODE;
107853
107854 slab_early_init = 0;
107855@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
107856
107857 cachep = find_mergeable(size, align, flags, name, ctor);
107858 if (cachep) {
107859- cachep->refcount++;
107860+ atomic_inc(&cachep->refcount);
107861
107862 /*
107863 * Adjust the object sizes so that we clear
107864@@ -3357,6 +3361,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
107865 struct array_cache *ac = cpu_cache_get(cachep);
107866
107867 check_irq_off();
107868+
107869+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107870+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
107871+ STATS_INC_NOT_SANITIZED(cachep);
107872+ else {
107873+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
107874+
107875+ if (cachep->ctor)
107876+ cachep->ctor(objp);
107877+
107878+ STATS_INC_SANITIZED(cachep);
107879+ }
107880+#endif
107881+
107882 kmemleak_free_recursive(objp, cachep->flags);
107883 objp = cache_free_debugcheck(cachep, objp, caller);
107884
107885@@ -3469,7 +3487,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
107886 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
107887 }
107888
107889-void *__kmalloc_node(size_t size, gfp_t flags, int node)
107890+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
107891 {
107892 return __do_kmalloc_node(size, flags, node, _RET_IP_);
107893 }
107894@@ -3489,7 +3507,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
107895 * @flags: the type of memory to allocate (see kmalloc).
107896 * @caller: function caller for debug tracking of the caller
107897 */
107898-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
107899+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
107900 unsigned long caller)
107901 {
107902 struct kmem_cache *cachep;
107903@@ -3562,6 +3580,7 @@ void kfree(const void *objp)
107904
107905 if (unlikely(ZERO_OR_NULL_PTR(objp)))
107906 return;
107907+ VM_BUG_ON(!virt_addr_valid(objp));
107908 local_irq_save(flags);
107909 kfree_debugcheck(objp);
107910 c = virt_to_cache(objp);
107911@@ -3981,14 +4000,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
107912 }
107913 /* cpu stats */
107914 {
107915- unsigned long allochit = atomic_read(&cachep->allochit);
107916- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
107917- unsigned long freehit = atomic_read(&cachep->freehit);
107918- unsigned long freemiss = atomic_read(&cachep->freemiss);
107919+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
107920+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
107921+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
107922+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
107923
107924 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
107925 allochit, allocmiss, freehit, freemiss);
107926 }
107927+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107928+ {
107929+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
107930+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
107931+
107932+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
107933+ }
107934+#endif
107935 #endif
107936 }
107937
107938@@ -4196,13 +4223,69 @@ static const struct file_operations proc_slabstats_operations = {
107939 static int __init slab_proc_init(void)
107940 {
107941 #ifdef CONFIG_DEBUG_SLAB_LEAK
107942- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
107943+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
107944 #endif
107945 return 0;
107946 }
107947 module_init(slab_proc_init);
107948 #endif
107949
107950+bool is_usercopy_object(const void *ptr)
107951+{
107952+ struct page *page;
107953+ struct kmem_cache *cachep;
107954+
107955+ if (ZERO_OR_NULL_PTR(ptr))
107956+ return false;
107957+
107958+ if (!slab_is_available())
107959+ return false;
107960+
107961+ if (!virt_addr_valid(ptr))
107962+ return false;
107963+
107964+ page = virt_to_head_page(ptr);
107965+
107966+ if (!PageSlab(page))
107967+ return false;
107968+
107969+ cachep = page->slab_cache;
107970+ return cachep->flags & SLAB_USERCOPY;
107971+}
107972+
107973+#ifdef CONFIG_PAX_USERCOPY
107974+const char *check_heap_object(const void *ptr, unsigned long n)
107975+{
107976+ struct page *page;
107977+ struct kmem_cache *cachep;
107978+ unsigned int objnr;
107979+ unsigned long offset;
107980+
107981+ if (ZERO_OR_NULL_PTR(ptr))
107982+ return "<null>";
107983+
107984+ if (!virt_addr_valid(ptr))
107985+ return NULL;
107986+
107987+ page = virt_to_head_page(ptr);
107988+
107989+ if (!PageSlab(page))
107990+ return NULL;
107991+
107992+ cachep = page->slab_cache;
107993+ if (!(cachep->flags & SLAB_USERCOPY))
107994+ return cachep->name;
107995+
107996+ objnr = obj_to_index(cachep, page, ptr);
107997+ BUG_ON(objnr >= cachep->num);
107998+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
107999+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
108000+ return NULL;
108001+
108002+ return cachep->name;
108003+}
108004+#endif
108005+
108006 /**
108007 * ksize - get the actual amount of memory allocated for a given object
108008 * @objp: Pointer to the object
108009diff --git a/mm/slab.h b/mm/slab.h
108010index 4c3ac12..7b2e470 100644
108011--- a/mm/slab.h
108012+++ b/mm/slab.h
108013@@ -22,7 +22,7 @@ struct kmem_cache {
108014 unsigned int align; /* Alignment as calculated */
108015 unsigned long flags; /* Active flags on the slab */
108016 const char *name; /* Slab name for sysfs */
108017- int refcount; /* Use counter */
108018+ atomic_t refcount; /* Use counter */
108019 void (*ctor)(void *); /* Called on object slot creation */
108020 struct list_head list; /* List of all slab caches on the system */
108021 };
108022@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
108023 /* The slab cache that manages slab cache information */
108024 extern struct kmem_cache *kmem_cache;
108025
108026+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108027+#ifdef CONFIG_X86_64
108028+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
108029+#else
108030+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
108031+#endif
108032+enum pax_sanitize_mode {
108033+ PAX_SANITIZE_SLAB_OFF = 0,
108034+ PAX_SANITIZE_SLAB_FAST,
108035+ PAX_SANITIZE_SLAB_FULL,
108036+};
108037+extern enum pax_sanitize_mode pax_sanitize_slab;
108038+#endif
108039+
108040 unsigned long calculate_alignment(unsigned long flags,
108041 unsigned long align, unsigned long size);
108042
108043@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
108044
108045 /* Legal flag mask for kmem_cache_create(), for various configurations */
108046 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
108047- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
108048+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
108049+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
108050
108051 #if defined(CONFIG_DEBUG_SLAB)
108052 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
108053@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
108054 return s;
108055
108056 page = virt_to_head_page(x);
108057+
108058+ BUG_ON(!PageSlab(page));
108059+
108060 cachep = page->slab_cache;
108061 if (slab_equal_or_root(cachep, s))
108062 return cachep;
108063diff --git a/mm/slab_common.c b/mm/slab_common.c
108064index 999bb34..9843aea 100644
108065--- a/mm/slab_common.c
108066+++ b/mm/slab_common.c
108067@@ -25,11 +25,35 @@
108068
108069 #include "slab.h"
108070
108071-enum slab_state slab_state;
108072+enum slab_state slab_state __read_only;
108073 LIST_HEAD(slab_caches);
108074 DEFINE_MUTEX(slab_mutex);
108075 struct kmem_cache *kmem_cache;
108076
108077+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108078+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
108079+static int __init pax_sanitize_slab_setup(char *str)
108080+{
108081+ if (!str)
108082+ return 0;
108083+
108084+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
108085+ pr_info("PaX slab sanitization: %s\n", "disabled");
108086+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
108087+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
108088+ pr_info("PaX slab sanitization: %s\n", "fast");
108089+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
108090+ } else if (!strcmp(str, "full")) {
108091+ pr_info("PaX slab sanitization: %s\n", "full");
108092+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
108093+ } else
108094+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
108095+
108096+ return 0;
108097+}
108098+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
108099+#endif
108100+
108101 /*
108102 * Set of flags that will prevent slab merging
108103 */
108104@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
108105 * Merge control. If this is set then no merging of slab caches will occur.
108106 * (Could be removed. This was introduced to pacify the merge skeptics.)
108107 */
108108-static int slab_nomerge;
108109+static int slab_nomerge = 1;
108110
108111 static int __init setup_slab_nomerge(char *str)
108112 {
108113@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
108114 /*
108115 * We may have set a slab to be unmergeable during bootstrap.
108116 */
108117- if (s->refcount < 0)
108118+ if (atomic_read(&s->refcount) < 0)
108119 return 1;
108120
108121 return 0;
108122@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
108123 if (err)
108124 goto out_free_cache;
108125
108126- s->refcount = 1;
108127+ atomic_set(&s->refcount, 1);
108128 list_add(&s->list, &slab_caches);
108129 out:
108130 if (err)
108131@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
108132 */
108133 flags &= CACHE_CREATE_MASK;
108134
108135+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108136+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
108137+ flags |= SLAB_NO_SANITIZE;
108138+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
108139+ flags &= ~SLAB_NO_SANITIZE;
108140+#endif
108141+
108142 s = __kmem_cache_alias(name, size, align, flags, ctor);
108143 if (s)
108144 goto out_unlock;
108145@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
108146 rcu_barrier();
108147
108148 list_for_each_entry_safe(s, s2, release, list) {
108149-#ifdef SLAB_SUPPORTS_SYSFS
108150+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108151 sysfs_slab_remove(s);
108152 #else
108153 slab_kmem_cache_release(s);
108154@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
108155
108156 mutex_lock(&slab_mutex);
108157
108158- s->refcount--;
108159- if (s->refcount)
108160+ if (!atomic_dec_and_test(&s->refcount))
108161 goto out_unlock;
108162
108163 for_each_memcg_cache_safe(c, c2, s) {
108164@@ -691,7 +721,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
108165 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
108166 name, size, err);
108167
108168- s->refcount = -1; /* Exempt from merging for now */
108169+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
108170 }
108171
108172 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
108173@@ -704,7 +734,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
108174
108175 create_boot_cache(s, name, size, flags);
108176 list_add(&s->list, &slab_caches);
108177- s->refcount = 1;
108178+ atomic_set(&s->refcount, 1);
108179 return s;
108180 }
108181
108182@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
108183 EXPORT_SYMBOL(kmalloc_dma_caches);
108184 #endif
108185
108186+#ifdef CONFIG_PAX_USERCOPY_SLABS
108187+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
108188+EXPORT_SYMBOL(kmalloc_usercopy_caches);
108189+#endif
108190+
108191 /*
108192 * Conversion table for small slabs sizes / 8 to the index in the
108193 * kmalloc array. This is necessary for slabs < 192 since we have non power
108194@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
108195 return kmalloc_dma_caches[index];
108196
108197 #endif
108198+
108199+#ifdef CONFIG_PAX_USERCOPY_SLABS
108200+ if (unlikely((flags & GFP_USERCOPY)))
108201+ return kmalloc_usercopy_caches[index];
108202+
108203+#endif
108204+
108205 return kmalloc_caches[index];
108206 }
108207
108208@@ -836,7 +878,7 @@ void __init create_kmalloc_caches(unsigned long flags)
108209 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
108210 if (!kmalloc_caches[i]) {
108211 kmalloc_caches[i] = create_kmalloc_cache(NULL,
108212- 1 << i, flags);
108213+ 1 << i, SLAB_USERCOPY | flags);
108214 }
108215
108216 /*
108217@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
108218 * earlier power of two caches
108219 */
108220 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
108221- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
108222+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
108223
108224 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
108225- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
108226+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
108227 }
108228
108229 /* Kmalloc array is now usable */
108230@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
108231 }
108232 }
108233 #endif
108234+
108235+#ifdef CONFIG_PAX_USERCOPY_SLABS
108236+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
108237+ struct kmem_cache *s = kmalloc_caches[i];
108238+
108239+ if (s) {
108240+ int size = kmalloc_size(i);
108241+ char *n = kasprintf(GFP_NOWAIT,
108242+ "usercopy-kmalloc-%d", size);
108243+
108244+ BUG_ON(!n);
108245+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
108246+ size, SLAB_USERCOPY | flags);
108247+ }
108248+ }
108249+#endif
108250+
108251 }
108252 #endif /* !CONFIG_SLOB */
108253
108254@@ -940,6 +999,9 @@ static void print_slabinfo_header(struct seq_file *m)
108255 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
108256 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
108257 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
108258+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108259+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
108260+#endif
108261 #endif
108262 seq_putc(m, '\n');
108263 }
108264@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
108265 module_init(slab_proc_init);
108266 #endif /* CONFIG_SLABINFO */
108267
108268-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
108269+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
108270 gfp_t flags)
108271 {
108272 void *ret;
108273diff --git a/mm/slob.c b/mm/slob.c
108274index 94a7fed..cf3fb1a 100644
108275--- a/mm/slob.c
108276+++ b/mm/slob.c
108277@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
108278 /*
108279 * Return the size of a slob block.
108280 */
108281-static slobidx_t slob_units(slob_t *s)
108282+static slobidx_t slob_units(const slob_t *s)
108283 {
108284 if (s->units > 0)
108285 return s->units;
108286@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
108287 /*
108288 * Return the next free slob block pointer after this one.
108289 */
108290-static slob_t *slob_next(slob_t *s)
108291+static slob_t *slob_next(const slob_t *s)
108292 {
108293 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
108294 slobidx_t next;
108295@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
108296 /*
108297 * Returns true if s is the last free block in its page.
108298 */
108299-static int slob_last(slob_t *s)
108300+static int slob_last(const slob_t *s)
108301 {
108302 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
108303 }
108304
108305-static void *slob_new_pages(gfp_t gfp, int order, int node)
108306+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
108307 {
108308- void *page;
108309+ struct page *page;
108310
108311 #ifdef CONFIG_NUMA
108312 if (node != NUMA_NO_NODE)
108313@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
108314 if (!page)
108315 return NULL;
108316
108317- return page_address(page);
108318+ __SetPageSlab(page);
108319+ return page;
108320 }
108321
108322-static void slob_free_pages(void *b, int order)
108323+static void slob_free_pages(struct page *sp, int order)
108324 {
108325 if (current->reclaim_state)
108326 current->reclaim_state->reclaimed_slab += 1 << order;
108327- free_pages((unsigned long)b, order);
108328+ __ClearPageSlab(sp);
108329+ page_mapcount_reset(sp);
108330+ sp->private = 0;
108331+ __free_pages(sp, order);
108332 }
108333
108334 /*
108335@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
108336
108337 /* Not enough space: must allocate a new page */
108338 if (!b) {
108339- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
108340- if (!b)
108341+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
108342+ if (!sp)
108343 return NULL;
108344- sp = virt_to_page(b);
108345- __SetPageSlab(sp);
108346+ b = page_address(sp);
108347
108348 spin_lock_irqsave(&slob_lock, flags);
108349 sp->units = SLOB_UNITS(PAGE_SIZE);
108350 sp->freelist = b;
108351+ sp->private = 0;
108352 INIT_LIST_HEAD(&sp->lru);
108353 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
108354 set_slob_page_free(sp, slob_list);
108355@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
108356 /*
108357 * slob_free: entry point into the slob allocator.
108358 */
108359-static void slob_free(void *block, int size)
108360+static void slob_free(struct kmem_cache *c, void *block, int size)
108361 {
108362 struct page *sp;
108363 slob_t *prev, *next, *b = (slob_t *)block;
108364@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
108365 if (slob_page_free(sp))
108366 clear_slob_page_free(sp);
108367 spin_unlock_irqrestore(&slob_lock, flags);
108368- __ClearPageSlab(sp);
108369- page_mapcount_reset(sp);
108370- slob_free_pages(b, 0);
108371+ slob_free_pages(sp, 0);
108372 return;
108373 }
108374
108375+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108376+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
108377+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
108378+#endif
108379+
108380 if (!slob_page_free(sp)) {
108381 /* This slob page is about to become partially free. Easy! */
108382 sp->units = units;
108383@@ -424,11 +431,10 @@ out:
108384 */
108385
108386 static __always_inline void *
108387-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108388+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
108389 {
108390- unsigned int *m;
108391- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108392- void *ret;
108393+ slob_t *m;
108394+ void *ret = NULL;
108395
108396 gfp &= gfp_allowed_mask;
108397
108398@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108399
108400 if (!m)
108401 return NULL;
108402- *m = size;
108403+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
108404+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
108405+ m[0].units = size;
108406+ m[1].units = align;
108407 ret = (void *)m + align;
108408
108409 trace_kmalloc_node(caller, ret,
108410 size, size + align, gfp, node);
108411 } else {
108412 unsigned int order = get_order(size);
108413+ struct page *page;
108414
108415 if (likely(order))
108416 gfp |= __GFP_COMP;
108417- ret = slob_new_pages(gfp, order, node);
108418+ page = slob_new_pages(gfp, order, node);
108419+ if (page) {
108420+ ret = page_address(page);
108421+ page->private = size;
108422+ }
108423
108424 trace_kmalloc_node(caller, ret,
108425 size, PAGE_SIZE << order, gfp, node);
108426 }
108427
108428- kmemleak_alloc(ret, size, 1, gfp);
108429 return ret;
108430 }
108431
108432-void *__kmalloc(size_t size, gfp_t gfp)
108433+static __always_inline void *
108434+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108435+{
108436+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108437+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
108438+
108439+ if (!ZERO_OR_NULL_PTR(ret))
108440+ kmemleak_alloc(ret, size, 1, gfp);
108441+ return ret;
108442+}
108443+
108444+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
108445 {
108446 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
108447 }
108448@@ -491,34 +515,112 @@ void kfree(const void *block)
108449 return;
108450 kmemleak_free(block);
108451
108452+ VM_BUG_ON(!virt_addr_valid(block));
108453 sp = virt_to_page(block);
108454- if (PageSlab(sp)) {
108455+ VM_BUG_ON(!PageSlab(sp));
108456+ if (!sp->private) {
108457 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108458- unsigned int *m = (unsigned int *)(block - align);
108459- slob_free(m, *m + align);
108460- } else
108461+ slob_t *m = (slob_t *)(block - align);
108462+ slob_free(NULL, m, m[0].units + align);
108463+ } else {
108464+ __ClearPageSlab(sp);
108465+ page_mapcount_reset(sp);
108466+ sp->private = 0;
108467 __free_pages(sp, compound_order(sp));
108468+ }
108469 }
108470 EXPORT_SYMBOL(kfree);
108471
108472+bool is_usercopy_object(const void *ptr)
108473+{
108474+ if (!slab_is_available())
108475+ return false;
108476+
108477+ // PAX: TODO
108478+
108479+ return false;
108480+}
108481+
108482+#ifdef CONFIG_PAX_USERCOPY
108483+const char *check_heap_object(const void *ptr, unsigned long n)
108484+{
108485+ struct page *page;
108486+ const slob_t *free;
108487+ const void *base;
108488+ unsigned long flags;
108489+
108490+ if (ZERO_OR_NULL_PTR(ptr))
108491+ return "<null>";
108492+
108493+ if (!virt_addr_valid(ptr))
108494+ return NULL;
108495+
108496+ page = virt_to_head_page(ptr);
108497+ if (!PageSlab(page))
108498+ return NULL;
108499+
108500+ if (page->private) {
108501+ base = page;
108502+ if (base <= ptr && n <= page->private - (ptr - base))
108503+ return NULL;
108504+ return "<slob>";
108505+ }
108506+
108507+ /* some tricky double walking to find the chunk */
108508+ spin_lock_irqsave(&slob_lock, flags);
108509+ base = (void *)((unsigned long)ptr & PAGE_MASK);
108510+ free = page->freelist;
108511+
108512+ while (!slob_last(free) && (void *)free <= ptr) {
108513+ base = free + slob_units(free);
108514+ free = slob_next(free);
108515+ }
108516+
108517+ while (base < (void *)free) {
108518+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
108519+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
108520+ int offset;
108521+
108522+ if (ptr < base + align)
108523+ break;
108524+
108525+ offset = ptr - base - align;
108526+ if (offset >= m) {
108527+ base += size;
108528+ continue;
108529+ }
108530+
108531+ if (n > m - offset)
108532+ break;
108533+
108534+ spin_unlock_irqrestore(&slob_lock, flags);
108535+ return NULL;
108536+ }
108537+
108538+ spin_unlock_irqrestore(&slob_lock, flags);
108539+ return "<slob>";
108540+}
108541+#endif
108542+
108543 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
108544 size_t ksize(const void *block)
108545 {
108546 struct page *sp;
108547 int align;
108548- unsigned int *m;
108549+ slob_t *m;
108550
108551 BUG_ON(!block);
108552 if (unlikely(block == ZERO_SIZE_PTR))
108553 return 0;
108554
108555 sp = virt_to_page(block);
108556- if (unlikely(!PageSlab(sp)))
108557- return PAGE_SIZE << compound_order(sp);
108558+ VM_BUG_ON(!PageSlab(sp));
108559+ if (sp->private)
108560+ return sp->private;
108561
108562 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108563- m = (unsigned int *)(block - align);
108564- return SLOB_UNITS(*m) * SLOB_UNIT;
108565+ m = (slob_t *)(block - align);
108566+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
108567 }
108568 EXPORT_SYMBOL(ksize);
108569
108570@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
108571
108572 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
108573 {
108574- void *b;
108575+ void *b = NULL;
108576
108577 flags &= gfp_allowed_mask;
108578
108579 lockdep_trace_alloc(flags);
108580
108581+#ifdef CONFIG_PAX_USERCOPY_SLABS
108582+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
108583+#else
108584 if (c->size < PAGE_SIZE) {
108585 b = slob_alloc(c->size, flags, c->align, node);
108586 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
108587 SLOB_UNITS(c->size) * SLOB_UNIT,
108588 flags, node);
108589 } else {
108590- b = slob_new_pages(flags, get_order(c->size), node);
108591+ struct page *sp;
108592+
108593+ sp = slob_new_pages(flags, get_order(c->size), node);
108594+ if (sp) {
108595+ b = page_address(sp);
108596+ sp->private = c->size;
108597+ }
108598 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
108599 PAGE_SIZE << get_order(c->size),
108600 flags, node);
108601 }
108602+#endif
108603
108604 if (b && c->ctor)
108605 c->ctor(b);
108606@@ -567,7 +679,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
108607 EXPORT_SYMBOL(kmem_cache_alloc);
108608
108609 #ifdef CONFIG_NUMA
108610-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
108611+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
108612 {
108613 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
108614 }
108615@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
108616 EXPORT_SYMBOL(kmem_cache_alloc_node);
108617 #endif
108618
108619-static void __kmem_cache_free(void *b, int size)
108620+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
108621 {
108622- if (size < PAGE_SIZE)
108623- slob_free(b, size);
108624+ struct page *sp;
108625+
108626+ sp = virt_to_page(b);
108627+ BUG_ON(!PageSlab(sp));
108628+ if (!sp->private)
108629+ slob_free(c, b, size);
108630 else
108631- slob_free_pages(b, get_order(size));
108632+ slob_free_pages(sp, get_order(size));
108633 }
108634
108635 static void kmem_rcu_free(struct rcu_head *head)
108636@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
108637 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
108638 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
108639
108640- __kmem_cache_free(b, slob_rcu->size);
108641+ __kmem_cache_free(NULL, b, slob_rcu->size);
108642 }
108643
108644 void kmem_cache_free(struct kmem_cache *c, void *b)
108645 {
108646+ int size = c->size;
108647+
108648+#ifdef CONFIG_PAX_USERCOPY_SLABS
108649+ if (size + c->align < PAGE_SIZE) {
108650+ size += c->align;
108651+ b -= c->align;
108652+ }
108653+#endif
108654+
108655 kmemleak_free_recursive(b, c->flags);
108656 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
108657 struct slob_rcu *slob_rcu;
108658- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
108659- slob_rcu->size = c->size;
108660+ slob_rcu = b + (size - sizeof(struct slob_rcu));
108661+ slob_rcu->size = size;
108662 call_rcu(&slob_rcu->head, kmem_rcu_free);
108663 } else {
108664- __kmem_cache_free(b, c->size);
108665+ __kmem_cache_free(c, b, size);
108666 }
108667
108668+#ifdef CONFIG_PAX_USERCOPY_SLABS
108669+ trace_kfree(_RET_IP_, b);
108670+#else
108671 trace_kmem_cache_free(_RET_IP_, b);
108672+#endif
108673+
108674 }
108675 EXPORT_SYMBOL(kmem_cache_free);
108676
108677diff --git a/mm/slub.c b/mm/slub.c
108678index 82c4737..55c316a 100644
108679--- a/mm/slub.c
108680+++ b/mm/slub.c
108681@@ -198,7 +198,7 @@ struct track {
108682
108683 enum track_item { TRACK_ALLOC, TRACK_FREE };
108684
108685-#ifdef CONFIG_SYSFS
108686+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108687 static int sysfs_slab_add(struct kmem_cache *);
108688 static int sysfs_slab_alias(struct kmem_cache *, const char *);
108689 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
108690@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
108691 if (!t->addr)
108692 return;
108693
108694- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
108695+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
108696 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
108697 #ifdef CONFIG_STACKTRACE
108698 {
108699@@ -2709,6 +2709,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
108700
108701 slab_free_hook(s, x);
108702
108703+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108704+ if (!(s->flags & SLAB_NO_SANITIZE)) {
108705+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
108706+ if (s->ctor)
108707+ s->ctor(x);
108708+ }
108709+#endif
108710+
108711 redo:
108712 /*
108713 * Determine the currently cpus per cpu slab.
108714@@ -3050,6 +3058,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
108715 s->inuse = size;
108716
108717 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
108718+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108719+ (!(flags & SLAB_NO_SANITIZE)) ||
108720+#endif
108721 s->ctor)) {
108722 /*
108723 * Relocate free pointer after the object if it is not
108724@@ -3304,7 +3315,7 @@ static int __init setup_slub_min_objects(char *str)
108725
108726 __setup("slub_min_objects=", setup_slub_min_objects);
108727
108728-void *__kmalloc(size_t size, gfp_t flags)
108729+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
108730 {
108731 struct kmem_cache *s;
108732 void *ret;
108733@@ -3342,7 +3353,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
108734 return ptr;
108735 }
108736
108737-void *__kmalloc_node(size_t size, gfp_t flags, int node)
108738+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
108739 {
108740 struct kmem_cache *s;
108741 void *ret;
108742@@ -3390,6 +3401,59 @@ static size_t __ksize(const void *object)
108743 return slab_ksize(page->slab_cache);
108744 }
108745
108746+bool is_usercopy_object(const void *ptr)
108747+{
108748+ struct page *page;
108749+ struct kmem_cache *s;
108750+
108751+ if (ZERO_OR_NULL_PTR(ptr))
108752+ return false;
108753+
108754+ if (!slab_is_available())
108755+ return false;
108756+
108757+ if (!virt_addr_valid(ptr))
108758+ return false;
108759+
108760+ page = virt_to_head_page(ptr);
108761+
108762+ if (!PageSlab(page))
108763+ return false;
108764+
108765+ s = page->slab_cache;
108766+ return s->flags & SLAB_USERCOPY;
108767+}
108768+
108769+#ifdef CONFIG_PAX_USERCOPY
108770+const char *check_heap_object(const void *ptr, unsigned long n)
108771+{
108772+ struct page *page;
108773+ struct kmem_cache *s;
108774+ unsigned long offset;
108775+
108776+ if (ZERO_OR_NULL_PTR(ptr))
108777+ return "<null>";
108778+
108779+ if (!virt_addr_valid(ptr))
108780+ return NULL;
108781+
108782+ page = virt_to_head_page(ptr);
108783+
108784+ if (!PageSlab(page))
108785+ return NULL;
108786+
108787+ s = page->slab_cache;
108788+ if (!(s->flags & SLAB_USERCOPY))
108789+ return s->name;
108790+
108791+ offset = (ptr - page_address(page)) % s->size;
108792+ if (offset <= s->object_size && n <= s->object_size - offset)
108793+ return NULL;
108794+
108795+ return s->name;
108796+}
108797+#endif
108798+
108799 size_t ksize(const void *object)
108800 {
108801 size_t size = __ksize(object);
108802@@ -3410,6 +3474,7 @@ void kfree(const void *x)
108803 if (unlikely(ZERO_OR_NULL_PTR(x)))
108804 return;
108805
108806+ VM_BUG_ON(!virt_addr_valid(x));
108807 page = virt_to_head_page(x);
108808 if (unlikely(!PageSlab(page))) {
108809 BUG_ON(!PageCompound(page));
108810@@ -3726,7 +3791,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
108811
108812 s = find_mergeable(size, align, flags, name, ctor);
108813 if (s) {
108814- s->refcount++;
108815+ atomic_inc(&s->refcount);
108816
108817 /*
108818 * Adjust the object sizes so that we clear
108819@@ -3742,7 +3807,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
108820 }
108821
108822 if (sysfs_slab_alias(s, name)) {
108823- s->refcount--;
108824+ atomic_dec(&s->refcount);
108825 s = NULL;
108826 }
108827 }
108828@@ -3859,7 +3924,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
108829 }
108830 #endif
108831
108832-#ifdef CONFIG_SYSFS
108833+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108834 static int count_inuse(struct page *page)
108835 {
108836 return page->inuse;
108837@@ -4140,7 +4205,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
108838 len += sprintf(buf + len, "%7ld ", l->count);
108839
108840 if (l->addr)
108841+#ifdef CONFIG_GRKERNSEC_HIDESYM
108842+ len += sprintf(buf + len, "%pS", NULL);
108843+#else
108844 len += sprintf(buf + len, "%pS", (void *)l->addr);
108845+#endif
108846 else
108847 len += sprintf(buf + len, "<not-available>");
108848
108849@@ -4238,12 +4307,12 @@ static void __init resiliency_test(void)
108850 validate_slab_cache(kmalloc_caches[9]);
108851 }
108852 #else
108853-#ifdef CONFIG_SYSFS
108854+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108855 static void resiliency_test(void) {};
108856 #endif
108857 #endif
108858
108859-#ifdef CONFIG_SYSFS
108860+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108861 enum slab_stat_type {
108862 SL_ALL, /* All slabs */
108863 SL_PARTIAL, /* Only partially allocated slabs */
108864@@ -4480,13 +4549,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
108865 {
108866 if (!s->ctor)
108867 return 0;
108868+#ifdef CONFIG_GRKERNSEC_HIDESYM
108869+ return sprintf(buf, "%pS\n", NULL);
108870+#else
108871 return sprintf(buf, "%pS\n", s->ctor);
108872+#endif
108873 }
108874 SLAB_ATTR_RO(ctor);
108875
108876 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
108877 {
108878- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
108879+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
108880 }
108881 SLAB_ATTR_RO(aliases);
108882
108883@@ -4574,6 +4647,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
108884 SLAB_ATTR_RO(cache_dma);
108885 #endif
108886
108887+#ifdef CONFIG_PAX_USERCOPY_SLABS
108888+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
108889+{
108890+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
108891+}
108892+SLAB_ATTR_RO(usercopy);
108893+#endif
108894+
108895+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108896+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
108897+{
108898+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
108899+}
108900+SLAB_ATTR_RO(sanitize);
108901+#endif
108902+
108903 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
108904 {
108905 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
108906@@ -4629,7 +4718,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
108907 * as well as cause other issues like converting a mergeable
108908 * cache into an umergeable one.
108909 */
108910- if (s->refcount > 1)
108911+ if (atomic_read(&s->refcount) > 1)
108912 return -EINVAL;
108913
108914 s->flags &= ~SLAB_TRACE;
108915@@ -4749,7 +4838,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
108916 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
108917 size_t length)
108918 {
108919- if (s->refcount > 1)
108920+ if (atomic_read(&s->refcount) > 1)
108921 return -EINVAL;
108922
108923 s->flags &= ~SLAB_FAILSLAB;
108924@@ -4916,6 +5005,12 @@ static struct attribute *slab_attrs[] = {
108925 #ifdef CONFIG_ZONE_DMA
108926 &cache_dma_attr.attr,
108927 #endif
108928+#ifdef CONFIG_PAX_USERCOPY_SLABS
108929+ &usercopy_attr.attr,
108930+#endif
108931+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108932+ &sanitize_attr.attr,
108933+#endif
108934 #ifdef CONFIG_NUMA
108935 &remote_node_defrag_ratio_attr.attr,
108936 #endif
108937@@ -5157,6 +5252,7 @@ static char *create_unique_id(struct kmem_cache *s)
108938 return name;
108939 }
108940
108941+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108942 static int sysfs_slab_add(struct kmem_cache *s)
108943 {
108944 int err;
108945@@ -5230,6 +5326,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
108946 kobject_del(&s->kobj);
108947 kobject_put(&s->kobj);
108948 }
108949+#endif
108950
108951 /*
108952 * Need to buffer aliases during bootup until sysfs becomes
108953@@ -5243,6 +5340,7 @@ struct saved_alias {
108954
108955 static struct saved_alias *alias_list;
108956
108957+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108958 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
108959 {
108960 struct saved_alias *al;
108961@@ -5265,6 +5363,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
108962 alias_list = al;
108963 return 0;
108964 }
108965+#endif
108966
108967 static int __init slab_sysfs_init(void)
108968 {
108969diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
108970index 4cba9c2..b4f9fcc 100644
108971--- a/mm/sparse-vmemmap.c
108972+++ b/mm/sparse-vmemmap.c
108973@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
108974 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
108975 if (!p)
108976 return NULL;
108977- pud_populate(&init_mm, pud, p);
108978+ pud_populate_kernel(&init_mm, pud, p);
108979 }
108980 return pud;
108981 }
108982@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
108983 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
108984 if (!p)
108985 return NULL;
108986- pgd_populate(&init_mm, pgd, p);
108987+ pgd_populate_kernel(&init_mm, pgd, p);
108988 }
108989 return pgd;
108990 }
108991diff --git a/mm/sparse.c b/mm/sparse.c
108992index d1b48b6..6e8590e 100644
108993--- a/mm/sparse.c
108994+++ b/mm/sparse.c
108995@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
108996
108997 for (i = 0; i < PAGES_PER_SECTION; i++) {
108998 if (PageHWPoison(&memmap[i])) {
108999- atomic_long_sub(1, &num_poisoned_pages);
109000+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
109001 ClearPageHWPoison(&memmap[i]);
109002 }
109003 }
109004diff --git a/mm/swap.c b/mm/swap.c
109005index cd3a5e6..40c0c8f 100644
109006--- a/mm/swap.c
109007+++ b/mm/swap.c
109008@@ -31,6 +31,7 @@
109009 #include <linux/memcontrol.h>
109010 #include <linux/gfp.h>
109011 #include <linux/uio.h>
109012+#include <linux/hugetlb.h>
109013
109014 #include "internal.h"
109015
109016@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
109017
109018 __page_cache_release(page);
109019 dtor = get_compound_page_dtor(page);
109020+ if (!PageHuge(page))
109021+ BUG_ON(dtor != free_compound_page);
109022 (*dtor)(page);
109023 }
109024
109025diff --git a/mm/swapfile.c b/mm/swapfile.c
109026index 63f55cc..31874e6 100644
109027--- a/mm/swapfile.c
109028+++ b/mm/swapfile.c
109029@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
109030
109031 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
109032 /* Activity counter to indicate that a swapon or swapoff has occurred */
109033-static atomic_t proc_poll_event = ATOMIC_INIT(0);
109034+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
109035
109036 static inline unsigned char swap_count(unsigned char ent)
109037 {
109038@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
109039 spin_unlock(&swap_lock);
109040
109041 err = 0;
109042- atomic_inc(&proc_poll_event);
109043+ atomic_inc_unchecked(&proc_poll_event);
109044 wake_up_interruptible(&proc_poll_wait);
109045
109046 out_dput:
109047@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
109048
109049 poll_wait(file, &proc_poll_wait, wait);
109050
109051- if (seq->poll_event != atomic_read(&proc_poll_event)) {
109052- seq->poll_event = atomic_read(&proc_poll_event);
109053+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
109054+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
109055 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
109056 }
109057
109058@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
109059 return ret;
109060
109061 seq = file->private_data;
109062- seq->poll_event = atomic_read(&proc_poll_event);
109063+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
109064 return 0;
109065 }
109066
109067@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
109068 (frontswap_map) ? "FS" : "");
109069
109070 mutex_unlock(&swapon_mutex);
109071- atomic_inc(&proc_poll_event);
109072+ atomic_inc_unchecked(&proc_poll_event);
109073 wake_up_interruptible(&proc_poll_wait);
109074
109075 if (S_ISREG(inode->i_mode))
109076diff --git a/mm/util.c b/mm/util.c
109077index 3981ae9..28b585b 100644
109078--- a/mm/util.c
109079+++ b/mm/util.c
109080@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
109081 void arch_pick_mmap_layout(struct mm_struct *mm)
109082 {
109083 mm->mmap_base = TASK_UNMAPPED_BASE;
109084+
109085+#ifdef CONFIG_PAX_RANDMMAP
109086+ if (mm->pax_flags & MF_PAX_RANDMMAP)
109087+ mm->mmap_base += mm->delta_mmap;
109088+#endif
109089+
109090 mm->get_unmapped_area = arch_get_unmapped_area;
109091 }
109092 #endif
109093@@ -403,6 +409,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
109094 if (!mm->arg_end)
109095 goto out_mm; /* Shh! No looking before we're done */
109096
109097+ if (gr_acl_handle_procpidmem(task))
109098+ goto out_mm;
109099+
109100 len = mm->arg_end - mm->arg_start;
109101
109102 if (len > buflen)
109103diff --git a/mm/vmalloc.c b/mm/vmalloc.c
109104index 49abccf..7bd1931 100644
109105--- a/mm/vmalloc.c
109106+++ b/mm/vmalloc.c
109107@@ -39,20 +39,65 @@ struct vfree_deferred {
109108 struct work_struct wq;
109109 };
109110 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
109111+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
109112+
109113+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109114+struct stack_deferred_llist {
109115+ struct llist_head list;
109116+ void *stack;
109117+ void *lowmem_stack;
109118+};
109119+
109120+struct stack_deferred {
109121+ struct stack_deferred_llist list;
109122+ struct work_struct wq;
109123+};
109124+
109125+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
109126+#endif
109127
109128 static void __vunmap(const void *, int);
109129
109130-static void free_work(struct work_struct *w)
109131+static void vfree_work(struct work_struct *w)
109132 {
109133 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
109134 struct llist_node *llnode = llist_del_all(&p->list);
109135 while (llnode) {
109136- void *p = llnode;
109137+ void *x = llnode;
109138 llnode = llist_next(llnode);
109139- __vunmap(p, 1);
109140+ __vunmap(x, 1);
109141 }
109142 }
109143
109144+static void vunmap_work(struct work_struct *w)
109145+{
109146+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
109147+ struct llist_node *llnode = llist_del_all(&p->list);
109148+ while (llnode) {
109149+ void *x = llnode;
109150+ llnode = llist_next(llnode);
109151+ __vunmap(x, 0);
109152+ }
109153+}
109154+
109155+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109156+static void unmap_work(struct work_struct *w)
109157+{
109158+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
109159+ struct llist_node *llnode = llist_del_all(&p->list.list);
109160+ while (llnode) {
109161+ struct stack_deferred_llist *x =
109162+ llist_entry((struct llist_head *)llnode,
109163+ struct stack_deferred_llist, list);
109164+ void *stack = ACCESS_ONCE(x->stack);
109165+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
109166+ llnode = llist_next(llnode);
109167+ __vunmap(stack, 0);
109168+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
109169+ }
109170+}
109171+#endif
109172+
109173 /*** Page table manipulation functions ***/
109174
109175 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
109176@@ -61,8 +106,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
109177
109178 pte = pte_offset_kernel(pmd, addr);
109179 do {
109180- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
109181- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
109182+
109183+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
109184+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
109185+ BUG_ON(!pte_exec(*pte));
109186+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
109187+ continue;
109188+ }
109189+#endif
109190+
109191+ {
109192+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
109193+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
109194+ }
109195 } while (pte++, addr += PAGE_SIZE, addr != end);
109196 }
109197
109198@@ -122,16 +178,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
109199 pte = pte_alloc_kernel(pmd, addr);
109200 if (!pte)
109201 return -ENOMEM;
109202+
109203+ pax_open_kernel();
109204 do {
109205 struct page *page = pages[*nr];
109206
109207- if (WARN_ON(!pte_none(*pte)))
109208+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
109209+ if (pgprot_val(prot) & _PAGE_NX)
109210+#endif
109211+
109212+ if (!pte_none(*pte)) {
109213+ pax_close_kernel();
109214+ WARN_ON(1);
109215 return -EBUSY;
109216- if (WARN_ON(!page))
109217+ }
109218+ if (!page) {
109219+ pax_close_kernel();
109220+ WARN_ON(1);
109221 return -ENOMEM;
109222+ }
109223 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
109224 (*nr)++;
109225 } while (pte++, addr += PAGE_SIZE, addr != end);
109226+ pax_close_kernel();
109227 return 0;
109228 }
109229
109230@@ -141,7 +210,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
109231 pmd_t *pmd;
109232 unsigned long next;
109233
109234- pmd = pmd_alloc(&init_mm, pud, addr);
109235+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
109236 if (!pmd)
109237 return -ENOMEM;
109238 do {
109239@@ -158,7 +227,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
109240 pud_t *pud;
109241 unsigned long next;
109242
109243- pud = pud_alloc(&init_mm, pgd, addr);
109244+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
109245 if (!pud)
109246 return -ENOMEM;
109247 do {
109248@@ -218,6 +287,12 @@ int is_vmalloc_or_module_addr(const void *x)
109249 if (addr >= MODULES_VADDR && addr < MODULES_END)
109250 return 1;
109251 #endif
109252+
109253+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
109254+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
109255+ return 1;
109256+#endif
109257+
109258 return is_vmalloc_addr(x);
109259 }
109260
109261@@ -238,8 +313,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
109262
109263 if (!pgd_none(*pgd)) {
109264 pud_t *pud = pud_offset(pgd, addr);
109265+#ifdef CONFIG_X86
109266+ if (!pud_large(*pud))
109267+#endif
109268 if (!pud_none(*pud)) {
109269 pmd_t *pmd = pmd_offset(pud, addr);
109270+#ifdef CONFIG_X86
109271+ if (!pmd_large(*pmd))
109272+#endif
109273 if (!pmd_none(*pmd)) {
109274 pte_t *ptep, pte;
109275
109276@@ -341,7 +422,7 @@ static void purge_vmap_area_lazy(void);
109277 * Allocate a region of KVA of the specified size and alignment, within the
109278 * vstart and vend.
109279 */
109280-static struct vmap_area *alloc_vmap_area(unsigned long size,
109281+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
109282 unsigned long align,
109283 unsigned long vstart, unsigned long vend,
109284 int node, gfp_t gfp_mask)
109285@@ -1182,13 +1263,27 @@ void __init vmalloc_init(void)
109286 for_each_possible_cpu(i) {
109287 struct vmap_block_queue *vbq;
109288 struct vfree_deferred *p;
109289+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109290+ struct stack_deferred *p2;
109291+#endif
109292
109293 vbq = &per_cpu(vmap_block_queue, i);
109294 spin_lock_init(&vbq->lock);
109295 INIT_LIST_HEAD(&vbq->free);
109296+
109297 p = &per_cpu(vfree_deferred, i);
109298 init_llist_head(&p->list);
109299- INIT_WORK(&p->wq, free_work);
109300+ INIT_WORK(&p->wq, vfree_work);
109301+
109302+ p = &per_cpu(vunmap_deferred, i);
109303+ init_llist_head(&p->list);
109304+ INIT_WORK(&p->wq, vunmap_work);
109305+
109306+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109307+ p2 = &per_cpu(stack_deferred, i);
109308+ init_llist_head(&p2->list.list);
109309+ INIT_WORK(&p2->wq, unmap_work);
109310+#endif
109311 }
109312
109313 /* Import existing vmlist entries. */
109314@@ -1313,6 +1408,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
109315 struct vm_struct *area;
109316
109317 BUG_ON(in_interrupt());
109318+
109319+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109320+ if (flags & VM_KERNEXEC) {
109321+ if (start != VMALLOC_START || end != VMALLOC_END)
109322+ return NULL;
109323+ start = (unsigned long)MODULES_EXEC_VADDR;
109324+ end = (unsigned long)MODULES_EXEC_END;
109325+ }
109326+#endif
109327+
109328 if (flags & VM_IOREMAP)
109329 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
109330
109331@@ -1510,13 +1615,36 @@ EXPORT_SYMBOL(vfree);
109332 */
109333 void vunmap(const void *addr)
109334 {
109335- BUG_ON(in_interrupt());
109336- might_sleep();
109337- if (addr)
109338+ if (!addr)
109339+ return;
109340+ if (unlikely(in_interrupt())) {
109341+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
109342+ if (llist_add((struct llist_node *)addr, &p->list))
109343+ schedule_work(&p->wq);
109344+ } else {
109345+ might_sleep();
109346 __vunmap(addr, 0);
109347+ }
109348 }
109349 EXPORT_SYMBOL(vunmap);
109350
109351+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109352+void unmap_process_stacks(struct task_struct *task)
109353+{
109354+ if (unlikely(in_interrupt())) {
109355+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
109356+ struct stack_deferred_llist *list = task->stack;
109357+ list->stack = task->stack;
109358+ list->lowmem_stack = task->lowmem_stack;
109359+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
109360+ schedule_work(&p->wq);
109361+ } else {
109362+ __vunmap(task->stack, 0);
109363+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
109364+ }
109365+}
109366+#endif
109367+
109368 /**
109369 * vmap - map an array of pages into virtually contiguous space
109370 * @pages: array of page pointers
109371@@ -1537,6 +1665,11 @@ void *vmap(struct page **pages, unsigned int count,
109372 if (count > totalram_pages)
109373 return NULL;
109374
109375+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109376+ if (!(pgprot_val(prot) & _PAGE_NX))
109377+ flags |= VM_KERNEXEC;
109378+#endif
109379+
109380 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
109381 __builtin_return_address(0));
109382 if (!area)
109383@@ -1641,6 +1774,14 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
109384 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
109385 goto fail;
109386
109387+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109388+ if (!(pgprot_val(prot) & _PAGE_NX)) {
109389+ vm_flags |= VM_KERNEXEC;
109390+ start = VMALLOC_START;
109391+ end = VMALLOC_END;
109392+ }
109393+#endif
109394+
109395 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
109396 vm_flags, start, end, node, gfp_mask, caller);
109397 if (!area)
109398@@ -1817,10 +1958,9 @@ EXPORT_SYMBOL(vzalloc_node);
109399 * For tight control over page level allocator and protection flags
109400 * use __vmalloc() instead.
109401 */
109402-
109403 void *vmalloc_exec(unsigned long size)
109404 {
109405- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
109406+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
109407 NUMA_NO_NODE, __builtin_return_address(0));
109408 }
109409
109410@@ -2127,6 +2267,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
109411 {
109412 struct vm_struct *area;
109413
109414+ BUG_ON(vma->vm_mirror);
109415+
109416 size = PAGE_ALIGN(size);
109417
109418 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
109419@@ -2609,7 +2751,11 @@ static int s_show(struct seq_file *m, void *p)
109420 v->addr, v->addr + v->size, v->size);
109421
109422 if (v->caller)
109423+#ifdef CONFIG_GRKERNSEC_HIDESYM
109424+ seq_printf(m, " %pK", v->caller);
109425+#else
109426 seq_printf(m, " %pS", v->caller);
109427+#endif
109428
109429 if (v->nr_pages)
109430 seq_printf(m, " pages=%d", v->nr_pages);
109431diff --git a/mm/vmstat.c b/mm/vmstat.c
109432index 4f5cd97..9fb715a 100644
109433--- a/mm/vmstat.c
109434+++ b/mm/vmstat.c
109435@@ -27,6 +27,7 @@
109436 #include <linux/mm_inline.h>
109437 #include <linux/page_ext.h>
109438 #include <linux/page_owner.h>
109439+#include <linux/grsecurity.h>
109440
109441 #include "internal.h"
109442
109443@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
109444 *
109445 * vm_stat contains the global counters
109446 */
109447-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
109448+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
109449 EXPORT_SYMBOL(vm_stat);
109450
109451 #ifdef CONFIG_SMP
109452@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
109453
109454 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
109455 if (diff[i]) {
109456- atomic_long_add(diff[i], &vm_stat[i]);
109457+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
109458 changes++;
109459 }
109460 return changes;
109461@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
109462 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
109463 if (v) {
109464
109465- atomic_long_add(v, &zone->vm_stat[i]);
109466+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109467 global_diff[i] += v;
109468 #ifdef CONFIG_NUMA
109469 /* 3 seconds idle till flush */
109470@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
109471
109472 v = p->vm_stat_diff[i];
109473 p->vm_stat_diff[i] = 0;
109474- atomic_long_add(v, &zone->vm_stat[i]);
109475+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109476 global_diff[i] += v;
109477 }
109478 }
109479@@ -560,8 +561,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
109480 if (pset->vm_stat_diff[i]) {
109481 int v = pset->vm_stat_diff[i];
109482 pset->vm_stat_diff[i] = 0;
109483- atomic_long_add(v, &zone->vm_stat[i]);
109484- atomic_long_add(v, &vm_stat[i]);
109485+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109486+ atomic_long_add_unchecked(v, &vm_stat[i]);
109487 }
109488 }
109489 #endif
109490@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
109491 stat_items_size += sizeof(struct vm_event_state);
109492 #endif
109493
109494- v = kmalloc(stat_items_size, GFP_KERNEL);
109495+ v = kzalloc(stat_items_size, GFP_KERNEL);
109496 m->private = v;
109497 if (!v)
109498 return ERR_PTR(-ENOMEM);
109499+
109500+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109501+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
109502+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
109503+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
109504+ && !in_group_p(grsec_proc_gid)
109505+#endif
109506+ )
109507+ return (unsigned long *)m->private + *pos;
109508+#endif
109509+#endif
109510+
109511 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
109512 v[i] = global_page_state(i);
109513 v += NR_VM_ZONE_STAT_ITEMS;
109514@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
109515 cpu_notifier_register_done();
109516 #endif
109517 #ifdef CONFIG_PROC_FS
109518- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
109519- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
109520- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
109521- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
109522+ {
109523+ mode_t gr_mode = S_IRUGO;
109524+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109525+ gr_mode = S_IRUSR;
109526+#endif
109527+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
109528+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
109529+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
109530+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
109531+ }
109532 #endif
109533 return 0;
109534 }
109535diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
109536index 64c6bed..b79a5de 100644
109537--- a/net/8021q/vlan.c
109538+++ b/net/8021q/vlan.c
109539@@ -481,7 +481,7 @@ out:
109540 return NOTIFY_DONE;
109541 }
109542
109543-static struct notifier_block vlan_notifier_block __read_mostly = {
109544+static struct notifier_block vlan_notifier_block = {
109545 .notifier_call = vlan_device_event,
109546 };
109547
109548@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
109549 err = -EPERM;
109550 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
109551 break;
109552- if ((args.u.name_type >= 0) &&
109553- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
109554+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
109555 struct vlan_net *vn;
109556
109557 vn = net_generic(net, vlan_net_id);
109558diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
109559index c92b52f..006c052 100644
109560--- a/net/8021q/vlan_netlink.c
109561+++ b/net/8021q/vlan_netlink.c
109562@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
109563 return dev_net(real_dev);
109564 }
109565
109566-struct rtnl_link_ops vlan_link_ops __read_mostly = {
109567+struct rtnl_link_ops vlan_link_ops = {
109568 .kind = "vlan",
109569 .maxtype = IFLA_VLAN_MAX,
109570 .policy = vlan_policy,
109571diff --git a/net/9p/client.c b/net/9p/client.c
109572index e86a9bea..e91f70e 100644
109573--- a/net/9p/client.c
109574+++ b/net/9p/client.c
109575@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
109576 len - inline_len);
109577 } else {
109578 err = copy_from_user(ename + inline_len,
109579- uidata, len - inline_len);
109580+ (char __force_user *)uidata, len - inline_len);
109581 if (err) {
109582 err = -EFAULT;
109583 goto out_err;
109584@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
109585 kernel_buf = 1;
109586 indata = data;
109587 } else
109588- indata = (__force char *)udata;
109589+ indata = (__force_kernel char *)udata;
109590 /*
109591 * response header len is 11
109592 * PDU Header(7) + IO Size (4)
109593@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
109594 kernel_buf = 1;
109595 odata = data;
109596 } else
109597- odata = (char *)udata;
109598+ odata = (char __force_kernel *)udata;
109599 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
109600 P9_ZC_HDR_SZ, kernel_buf, "dqd",
109601 fid->fid, offset, rsize);
109602diff --git a/net/9p/mod.c b/net/9p/mod.c
109603index 6ab36ae..6f1841b 100644
109604--- a/net/9p/mod.c
109605+++ b/net/9p/mod.c
109606@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
109607 void v9fs_register_trans(struct p9_trans_module *m)
109608 {
109609 spin_lock(&v9fs_trans_lock);
109610- list_add_tail(&m->list, &v9fs_trans_list);
109611+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
109612 spin_unlock(&v9fs_trans_lock);
109613 }
109614 EXPORT_SYMBOL(v9fs_register_trans);
109615@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
109616 void v9fs_unregister_trans(struct p9_trans_module *m)
109617 {
109618 spin_lock(&v9fs_trans_lock);
109619- list_del_init(&m->list);
109620+ pax_list_del_init((struct list_head *)&m->list);
109621 spin_unlock(&v9fs_trans_lock);
109622 }
109623 EXPORT_SYMBOL(v9fs_unregister_trans);
109624diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
109625index 80d08f6..de63fd1 100644
109626--- a/net/9p/trans_fd.c
109627+++ b/net/9p/trans_fd.c
109628@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
109629 oldfs = get_fs();
109630 set_fs(get_ds());
109631 /* The cast to a user pointer is valid due to the set_fs() */
109632- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
109633+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
109634 set_fs(oldfs);
109635
109636 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
109637diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
109638index af46bc4..f9adfcd 100644
109639--- a/net/appletalk/atalk_proc.c
109640+++ b/net/appletalk/atalk_proc.c
109641@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
109642 struct proc_dir_entry *p;
109643 int rc = -ENOMEM;
109644
109645- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
109646+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
109647 if (!atalk_proc_dir)
109648 goto out;
109649
109650diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
109651index 876fbe8..8bbea9f 100644
109652--- a/net/atm/atm_misc.c
109653+++ b/net/atm/atm_misc.c
109654@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
109655 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
109656 return 1;
109657 atm_return(vcc, truesize);
109658- atomic_inc(&vcc->stats->rx_drop);
109659+ atomic_inc_unchecked(&vcc->stats->rx_drop);
109660 return 0;
109661 }
109662 EXPORT_SYMBOL(atm_charge);
109663@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
109664 }
109665 }
109666 atm_return(vcc, guess);
109667- atomic_inc(&vcc->stats->rx_drop);
109668+ atomic_inc_unchecked(&vcc->stats->rx_drop);
109669 return NULL;
109670 }
109671 EXPORT_SYMBOL(atm_alloc_charge);
109672@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
109673
109674 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
109675 {
109676-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
109677+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
109678 __SONET_ITEMS
109679 #undef __HANDLE_ITEM
109680 }
109681@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
109682
109683 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
109684 {
109685-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
109686+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
109687 __SONET_ITEMS
109688 #undef __HANDLE_ITEM
109689 }
109690diff --git a/net/atm/lec.c b/net/atm/lec.c
109691index 4b98f89..5a2f6cb 100644
109692--- a/net/atm/lec.c
109693+++ b/net/atm/lec.c
109694@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
109695 }
109696
109697 static struct lane2_ops lane2_ops = {
109698- lane2_resolve, /* resolve, spec 3.1.3 */
109699- lane2_associate_req, /* associate_req, spec 3.1.4 */
109700- NULL /* associate indicator, spec 3.1.5 */
109701+ .resolve = lane2_resolve,
109702+ .associate_req = lane2_associate_req,
109703+ .associate_indicator = NULL
109704 };
109705
109706 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
109707diff --git a/net/atm/lec.h b/net/atm/lec.h
109708index 4149db1..f2ab682 100644
109709--- a/net/atm/lec.h
109710+++ b/net/atm/lec.h
109711@@ -48,7 +48,7 @@ struct lane2_ops {
109712 const u8 *tlvs, u32 sizeoftlvs);
109713 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
109714 const u8 *tlvs, u32 sizeoftlvs);
109715-};
109716+} __no_const;
109717
109718 /*
109719 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
109720diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
109721index d1b2d9a..d549f7f 100644
109722--- a/net/atm/mpoa_caches.c
109723+++ b/net/atm/mpoa_caches.c
109724@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
109725
109726
109727 static struct in_cache_ops ingress_ops = {
109728- in_cache_add_entry, /* add_entry */
109729- in_cache_get, /* get */
109730- in_cache_get_with_mask, /* get_with_mask */
109731- in_cache_get_by_vcc, /* get_by_vcc */
109732- in_cache_put, /* put */
109733- in_cache_remove_entry, /* remove_entry */
109734- cache_hit, /* cache_hit */
109735- clear_count_and_expired, /* clear_count */
109736- check_resolving_entries, /* check_resolving */
109737- refresh_entries, /* refresh */
109738- in_destroy_cache /* destroy_cache */
109739+ .add_entry = in_cache_add_entry,
109740+ .get = in_cache_get,
109741+ .get_with_mask = in_cache_get_with_mask,
109742+ .get_by_vcc = in_cache_get_by_vcc,
109743+ .put = in_cache_put,
109744+ .remove_entry = in_cache_remove_entry,
109745+ .cache_hit = cache_hit,
109746+ .clear_count = clear_count_and_expired,
109747+ .check_resolving = check_resolving_entries,
109748+ .refresh = refresh_entries,
109749+ .destroy_cache = in_destroy_cache
109750 };
109751
109752 static struct eg_cache_ops egress_ops = {
109753- eg_cache_add_entry, /* add_entry */
109754- eg_cache_get_by_cache_id, /* get_by_cache_id */
109755- eg_cache_get_by_tag, /* get_by_tag */
109756- eg_cache_get_by_vcc, /* get_by_vcc */
109757- eg_cache_get_by_src_ip, /* get_by_src_ip */
109758- eg_cache_put, /* put */
109759- eg_cache_remove_entry, /* remove_entry */
109760- update_eg_cache_entry, /* update */
109761- clear_expired, /* clear_expired */
109762- eg_destroy_cache /* destroy_cache */
109763+ .add_entry = eg_cache_add_entry,
109764+ .get_by_cache_id = eg_cache_get_by_cache_id,
109765+ .get_by_tag = eg_cache_get_by_tag,
109766+ .get_by_vcc = eg_cache_get_by_vcc,
109767+ .get_by_src_ip = eg_cache_get_by_src_ip,
109768+ .put = eg_cache_put,
109769+ .remove_entry = eg_cache_remove_entry,
109770+ .update = update_eg_cache_entry,
109771+ .clear_expired = clear_expired,
109772+ .destroy_cache = eg_destroy_cache
109773 };
109774
109775
109776diff --git a/net/atm/proc.c b/net/atm/proc.c
109777index bbb6461..cf04016 100644
109778--- a/net/atm/proc.c
109779+++ b/net/atm/proc.c
109780@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
109781 const struct k_atm_aal_stats *stats)
109782 {
109783 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
109784- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
109785- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
109786- atomic_read(&stats->rx_drop));
109787+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
109788+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
109789+ atomic_read_unchecked(&stats->rx_drop));
109790 }
109791
109792 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
109793diff --git a/net/atm/resources.c b/net/atm/resources.c
109794index 0447d5d..3cf4728 100644
109795--- a/net/atm/resources.c
109796+++ b/net/atm/resources.c
109797@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
109798 static void copy_aal_stats(struct k_atm_aal_stats *from,
109799 struct atm_aal_stats *to)
109800 {
109801-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
109802+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
109803 __AAL_STAT_ITEMS
109804 #undef __HANDLE_ITEM
109805 }
109806@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
109807 static void subtract_aal_stats(struct k_atm_aal_stats *from,
109808 struct atm_aal_stats *to)
109809 {
109810-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
109811+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
109812 __AAL_STAT_ITEMS
109813 #undef __HANDLE_ITEM
109814 }
109815diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
109816index 919a5ce..cc6b444 100644
109817--- a/net/ax25/sysctl_net_ax25.c
109818+++ b/net/ax25/sysctl_net_ax25.c
109819@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
109820 {
109821 char path[sizeof("net/ax25/") + IFNAMSIZ];
109822 int k;
109823- struct ctl_table *table;
109824+ ctl_table_no_const *table;
109825
109826 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
109827 if (!table)
109828diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
109829index 00e00e0..710fcd2 100644
109830--- a/net/batman-adv/bat_iv_ogm.c
109831+++ b/net/batman-adv/bat_iv_ogm.c
109832@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
109833
109834 /* randomize initial seqno to avoid collision */
109835 get_random_bytes(&random_seqno, sizeof(random_seqno));
109836- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
109837+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
109838
109839 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
109840 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
109841@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
109842 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
109843
109844 /* change sequence number to network order */
109845- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
109846+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
109847 batadv_ogm_packet->seqno = htonl(seqno);
109848- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
109849+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
109850
109851 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
109852
109853@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
109854 return;
109855
109856 /* could be changed by schedule_own_packet() */
109857- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
109858+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
109859
109860 if (ogm_packet->flags & BATADV_DIRECTLINK)
109861 has_directlink_flag = true;
109862diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
109863index 3d1dcaa..4699f4e 100644
109864--- a/net/batman-adv/fragmentation.c
109865+++ b/net/batman-adv/fragmentation.c
109866@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
109867 frag_header.packet_type = BATADV_UNICAST_FRAG;
109868 frag_header.version = BATADV_COMPAT_VERSION;
109869 frag_header.ttl = BATADV_TTL;
109870- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
109871+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
109872 frag_header.reserved = 0;
109873 frag_header.no = 0;
109874 frag_header.total_size = htons(skb->len);
109875diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
109876index 5ec31d7..e371631 100644
109877--- a/net/batman-adv/soft-interface.c
109878+++ b/net/batman-adv/soft-interface.c
109879@@ -295,7 +295,7 @@ send:
109880 primary_if->net_dev->dev_addr);
109881
109882 /* set broadcast sequence number */
109883- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
109884+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
109885 bcast_packet->seqno = htonl(seqno);
109886
109887 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
109888@@ -760,7 +760,7 @@ static int batadv_softif_init_late(struct net_device *dev)
109889 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
109890
109891 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
109892- atomic_set(&bat_priv->bcast_seqno, 1);
109893+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
109894 atomic_set(&bat_priv->tt.vn, 0);
109895 atomic_set(&bat_priv->tt.local_changes, 0);
109896 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
109897@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
109898
109899 /* randomize initial seqno to avoid collision */
109900 get_random_bytes(&random_seqno, sizeof(random_seqno));
109901- atomic_set(&bat_priv->frag_seqno, random_seqno);
109902+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
109903
109904 bat_priv->primary_if = NULL;
109905 bat_priv->num_ifaces = 0;
109906@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
109907 return 0;
109908 }
109909
109910-struct rtnl_link_ops batadv_link_ops __read_mostly = {
109911+struct rtnl_link_ops batadv_link_ops = {
109912 .kind = "batadv",
109913 .priv_size = sizeof(struct batadv_priv),
109914 .setup = batadv_softif_init_early,
109915diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
109916index 9398c3f..0e79657 100644
109917--- a/net/batman-adv/types.h
109918+++ b/net/batman-adv/types.h
109919@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
109920 struct batadv_hard_iface_bat_iv {
109921 unsigned char *ogm_buff;
109922 int ogm_buff_len;
109923- atomic_t ogm_seqno;
109924+ atomic_unchecked_t ogm_seqno;
109925 };
109926
109927 /**
109928@@ -766,7 +766,7 @@ struct batadv_priv {
109929 atomic_t bonding;
109930 atomic_t fragmentation;
109931 atomic_t packet_size_max;
109932- atomic_t frag_seqno;
109933+ atomic_unchecked_t frag_seqno;
109934 #ifdef CONFIG_BATMAN_ADV_BLA
109935 atomic_t bridge_loop_avoidance;
109936 #endif
109937@@ -785,7 +785,7 @@ struct batadv_priv {
109938 #endif
109939 uint32_t isolation_mark;
109940 uint32_t isolation_mark_mask;
109941- atomic_t bcast_seqno;
109942+ atomic_unchecked_t bcast_seqno;
109943 atomic_t bcast_queue_left;
109944 atomic_t batman_queue_left;
109945 char num_ifaces;
109946diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
109947index 1d65c5b..43e55fd 100644
109948--- a/net/bluetooth/hci_sock.c
109949+++ b/net/bluetooth/hci_sock.c
109950@@ -1042,7 +1042,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
109951 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
109952 }
109953
109954- len = min_t(unsigned int, len, sizeof(uf));
109955+ len = min((size_t)len, sizeof(uf));
109956 if (copy_from_user(&uf, optval, len)) {
109957 err = -EFAULT;
109958 break;
109959diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
109960index 6ba33f9..4afc26f 100644
109961--- a/net/bluetooth/l2cap_core.c
109962+++ b/net/bluetooth/l2cap_core.c
109963@@ -3534,8 +3534,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
109964 break;
109965
109966 case L2CAP_CONF_RFC:
109967- if (olen == sizeof(rfc))
109968- memcpy(&rfc, (void *)val, olen);
109969+ if (olen != sizeof(rfc))
109970+ break;
109971+
109972+ memcpy(&rfc, (void *)val, olen);
109973
109974 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
109975 rfc.mode != chan->mode)
109976diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
109977index 60694f0..32623ed 100644
109978--- a/net/bluetooth/l2cap_sock.c
109979+++ b/net/bluetooth/l2cap_sock.c
109980@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
109981 struct sock *sk = sock->sk;
109982 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
109983 struct l2cap_options opts;
109984- int len, err = 0;
109985+ int err = 0;
109986+ size_t len = optlen;
109987 u32 opt;
109988
109989 BT_DBG("sk %p", sk);
109990@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
109991 opts.max_tx = chan->max_tx;
109992 opts.txwin_size = chan->tx_win;
109993
109994- len = min_t(unsigned int, sizeof(opts), optlen);
109995+ len = min(sizeof(opts), len);
109996 if (copy_from_user((char *) &opts, optval, len)) {
109997 err = -EFAULT;
109998 break;
109999@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
110000 struct bt_security sec;
110001 struct bt_power pwr;
110002 struct l2cap_conn *conn;
110003- int len, err = 0;
110004+ int err = 0;
110005+ size_t len = optlen;
110006 u32 opt;
110007
110008 BT_DBG("sk %p", sk);
110009@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
110010
110011 sec.level = BT_SECURITY_LOW;
110012
110013- len = min_t(unsigned int, sizeof(sec), optlen);
110014+ len = min(sizeof(sec), len);
110015 if (copy_from_user((char *) &sec, optval, len)) {
110016 err = -EFAULT;
110017 break;
110018@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
110019
110020 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
110021
110022- len = min_t(unsigned int, sizeof(pwr), optlen);
110023+ len = min(sizeof(pwr), len);
110024 if (copy_from_user((char *) &pwr, optval, len)) {
110025 err = -EFAULT;
110026 break;
110027diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
110028index 3c6d2c8..6afc970 100644
110029--- a/net/bluetooth/rfcomm/sock.c
110030+++ b/net/bluetooth/rfcomm/sock.c
110031@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
110032 struct sock *sk = sock->sk;
110033 struct bt_security sec;
110034 int err = 0;
110035- size_t len;
110036+ size_t len = optlen;
110037 u32 opt;
110038
110039 BT_DBG("sk %p", sk);
110040@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
110041
110042 sec.level = BT_SECURITY_LOW;
110043
110044- len = min_t(unsigned int, sizeof(sec), optlen);
110045+ len = min(sizeof(sec), len);
110046 if (copy_from_user((char *) &sec, optval, len)) {
110047 err = -EFAULT;
110048 break;
110049diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
110050index 8e385a0..a5bdd8e 100644
110051--- a/net/bluetooth/rfcomm/tty.c
110052+++ b/net/bluetooth/rfcomm/tty.c
110053@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
110054 BT_DBG("tty %p id %d", tty, tty->index);
110055
110056 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
110057- dev->channel, dev->port.count);
110058+ dev->channel, atomic_read(&dev->port.count));
110059
110060 err = tty_port_open(&dev->port, tty, filp);
110061 if (err)
110062@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
110063 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
110064
110065 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
110066- dev->port.count);
110067+ atomic_read(&dev->port.count));
110068
110069 tty_port_close(&dev->port, tty, filp);
110070 }
110071diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
110072index 4fbcea0..69a6786 100644
110073--- a/net/bridge/br_netlink.c
110074+++ b/net/bridge/br_netlink.c
110075@@ -726,7 +726,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
110076 .get_link_af_size = br_get_link_af_size,
110077 };
110078
110079-struct rtnl_link_ops br_link_ops __read_mostly = {
110080+struct rtnl_link_ops br_link_ops = {
110081 .kind = "bridge",
110082 .priv_size = sizeof(struct net_bridge),
110083 .setup = br_dev_setup,
110084diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
110085index 91180a7..1301daa 100644
110086--- a/net/bridge/netfilter/ebtables.c
110087+++ b/net/bridge/netfilter/ebtables.c
110088@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
110089 tmp.valid_hooks = t->table->valid_hooks;
110090 }
110091 mutex_unlock(&ebt_mutex);
110092- if (copy_to_user(user, &tmp, *len) != 0) {
110093+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
110094 BUGPRINT("c2u Didn't work\n");
110095 ret = -EFAULT;
110096 break;
110097@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
110098 goto out;
110099 tmp.valid_hooks = t->valid_hooks;
110100
110101- if (copy_to_user(user, &tmp, *len) != 0) {
110102+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
110103 ret = -EFAULT;
110104 break;
110105 }
110106@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
110107 tmp.entries_size = t->table->entries_size;
110108 tmp.valid_hooks = t->table->valid_hooks;
110109
110110- if (copy_to_user(user, &tmp, *len) != 0) {
110111+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
110112 ret = -EFAULT;
110113 break;
110114 }
110115diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
110116index f5afda1..dcf770a 100644
110117--- a/net/caif/cfctrl.c
110118+++ b/net/caif/cfctrl.c
110119@@ -10,6 +10,7 @@
110120 #include <linux/spinlock.h>
110121 #include <linux/slab.h>
110122 #include <linux/pkt_sched.h>
110123+#include <linux/sched.h>
110124 #include <net/caif/caif_layer.h>
110125 #include <net/caif/cfpkt.h>
110126 #include <net/caif/cfctrl.h>
110127@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
110128 memset(&dev_info, 0, sizeof(dev_info));
110129 dev_info.id = 0xff;
110130 cfsrvl_init(&this->serv, 0, &dev_info, false);
110131- atomic_set(&this->req_seq_no, 1);
110132- atomic_set(&this->rsp_seq_no, 1);
110133+ atomic_set_unchecked(&this->req_seq_no, 1);
110134+ atomic_set_unchecked(&this->rsp_seq_no, 1);
110135 this->serv.layer.receive = cfctrl_recv;
110136 sprintf(this->serv.layer.name, "ctrl");
110137 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
110138@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
110139 struct cfctrl_request_info *req)
110140 {
110141 spin_lock_bh(&ctrl->info_list_lock);
110142- atomic_inc(&ctrl->req_seq_no);
110143- req->sequence_no = atomic_read(&ctrl->req_seq_no);
110144+ atomic_inc_unchecked(&ctrl->req_seq_no);
110145+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
110146 list_add_tail(&req->list, &ctrl->list);
110147 spin_unlock_bh(&ctrl->info_list_lock);
110148 }
110149@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
110150 if (p != first)
110151 pr_warn("Requests are not received in order\n");
110152
110153- atomic_set(&ctrl->rsp_seq_no,
110154+ atomic_set_unchecked(&ctrl->rsp_seq_no,
110155 p->sequence_no);
110156 list_del(&p->list);
110157 goto out;
110158diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
110159index 67a4a36..8d28068 100644
110160--- a/net/caif/chnl_net.c
110161+++ b/net/caif/chnl_net.c
110162@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
110163 };
110164
110165
110166-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
110167+static struct rtnl_link_ops ipcaif_link_ops = {
110168 .kind = "caif",
110169 .priv_size = sizeof(struct chnl_net),
110170 .setup = ipcaif_net_setup,
110171diff --git a/net/can/af_can.c b/net/can/af_can.c
110172index 32d710e..93bcf05 100644
110173--- a/net/can/af_can.c
110174+++ b/net/can/af_can.c
110175@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
110176 };
110177
110178 /* notifier block for netdevice event */
110179-static struct notifier_block can_netdev_notifier __read_mostly = {
110180+static struct notifier_block can_netdev_notifier = {
110181 .notifier_call = can_notifier,
110182 };
110183
110184diff --git a/net/can/bcm.c b/net/can/bcm.c
110185index ee9ffd9..dfdf3d4 100644
110186--- a/net/can/bcm.c
110187+++ b/net/can/bcm.c
110188@@ -1619,7 +1619,7 @@ static int __init bcm_module_init(void)
110189 }
110190
110191 /* create /proc/net/can-bcm directory */
110192- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
110193+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
110194 return 0;
110195 }
110196
110197diff --git a/net/can/gw.c b/net/can/gw.c
110198index a6f448e..5902171 100644
110199--- a/net/can/gw.c
110200+++ b/net/can/gw.c
110201@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
110202 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
110203
110204 static HLIST_HEAD(cgw_list);
110205-static struct notifier_block notifier;
110206
110207 static struct kmem_cache *cgw_cache __read_mostly;
110208
110209@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
110210 return err;
110211 }
110212
110213+static struct notifier_block notifier = {
110214+ .notifier_call = cgw_notifier
110215+};
110216+
110217 static __init int cgw_module_init(void)
110218 {
110219 /* sanitize given module parameter */
110220@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
110221 return -ENOMEM;
110222
110223 /* set notifier */
110224- notifier.notifier_call = cgw_notifier;
110225 register_netdevice_notifier(&notifier);
110226
110227 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
110228diff --git a/net/can/proc.c b/net/can/proc.c
110229index 1a19b98..df2b4ec 100644
110230--- a/net/can/proc.c
110231+++ b/net/can/proc.c
110232@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
110233 void can_init_proc(void)
110234 {
110235 /* create /proc/net/can directory */
110236- can_dir = proc_mkdir("can", init_net.proc_net);
110237+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
110238
110239 if (!can_dir) {
110240 printk(KERN_INFO "can: failed to create /proc/net/can . "
110241diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
110242index a9f4ae4..ee19b92 100644
110243--- a/net/ceph/messenger.c
110244+++ b/net/ceph/messenger.c
110245@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
110246 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
110247
110248 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
110249-static atomic_t addr_str_seq = ATOMIC_INIT(0);
110250+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
110251
110252 static struct page *zero_page; /* used in certain error cases */
110253
110254@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
110255 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
110256 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
110257
110258- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
110259+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
110260 s = addr_str[i];
110261
110262 switch (ss->ss_family) {
110263diff --git a/net/compat.c b/net/compat.c
110264index f7bd286..76ea56a 100644
110265--- a/net/compat.c
110266+++ b/net/compat.c
110267@@ -100,20 +100,20 @@ ssize_t get_compat_msghdr(struct msghdr *kmsg,
110268
110269 #define CMSG_COMPAT_FIRSTHDR(msg) \
110270 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
110271- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
110272+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
110273 (struct compat_cmsghdr __user *)NULL)
110274
110275 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
110276 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
110277 (ucmlen) <= (unsigned long) \
110278 ((mhdr)->msg_controllen - \
110279- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
110280+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
110281
110282 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
110283 struct compat_cmsghdr __user *cmsg, int cmsg_len)
110284 {
110285 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
110286- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
110287+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
110288 msg->msg_controllen)
110289 return NULL;
110290 return (struct compat_cmsghdr __user *)ptr;
110291@@ -203,7 +203,7 @@ Efault:
110292
110293 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
110294 {
110295- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
110296+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
110297 struct compat_cmsghdr cmhdr;
110298 struct compat_timeval ctv;
110299 struct compat_timespec cts[3];
110300@@ -259,7 +259,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
110301
110302 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
110303 {
110304- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
110305+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
110306 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
110307 int fdnum = scm->fp->count;
110308 struct file **fp = scm->fp->fp;
110309@@ -347,7 +347,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
110310 return -EFAULT;
110311 old_fs = get_fs();
110312 set_fs(KERNEL_DS);
110313- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
110314+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
110315 set_fs(old_fs);
110316
110317 return err;
110318@@ -408,7 +408,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
110319 len = sizeof(ktime);
110320 old_fs = get_fs();
110321 set_fs(KERNEL_DS);
110322- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
110323+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
110324 set_fs(old_fs);
110325
110326 if (!err) {
110327@@ -551,7 +551,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110328 case MCAST_JOIN_GROUP:
110329 case MCAST_LEAVE_GROUP:
110330 {
110331- struct compat_group_req __user *gr32 = (void *)optval;
110332+ struct compat_group_req __user *gr32 = (void __user *)optval;
110333 struct group_req __user *kgr =
110334 compat_alloc_user_space(sizeof(struct group_req));
110335 u32 interface;
110336@@ -572,7 +572,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110337 case MCAST_BLOCK_SOURCE:
110338 case MCAST_UNBLOCK_SOURCE:
110339 {
110340- struct compat_group_source_req __user *gsr32 = (void *)optval;
110341+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
110342 struct group_source_req __user *kgsr = compat_alloc_user_space(
110343 sizeof(struct group_source_req));
110344 u32 interface;
110345@@ -593,7 +593,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110346 }
110347 case MCAST_MSFILTER:
110348 {
110349- struct compat_group_filter __user *gf32 = (void *)optval;
110350+ struct compat_group_filter __user *gf32 = (void __user *)optval;
110351 struct group_filter __user *kgf;
110352 u32 interface, fmode, numsrc;
110353
110354@@ -631,7 +631,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
110355 char __user *optval, int __user *optlen,
110356 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
110357 {
110358- struct compat_group_filter __user *gf32 = (void *)optval;
110359+ struct compat_group_filter __user *gf32 = (void __user *)optval;
110360 struct group_filter __user *kgf;
110361 int __user *koptlen;
110362 u32 interface, fmode, numsrc;
110363@@ -775,7 +775,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
110364
110365 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
110366 return -EINVAL;
110367- if (copy_from_user(a, args, nas[call]))
110368+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
110369 return -EFAULT;
110370 a0 = a[0];
110371 a1 = a[1];
110372diff --git a/net/core/datagram.c b/net/core/datagram.c
110373index df493d6..1145766 100644
110374--- a/net/core/datagram.c
110375+++ b/net/core/datagram.c
110376@@ -302,7 +302,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
110377 }
110378
110379 kfree_skb(skb);
110380- atomic_inc(&sk->sk_drops);
110381+ atomic_inc_unchecked(&sk->sk_drops);
110382 sk_mem_reclaim_partial(sk);
110383
110384 return err;
110385diff --git a/net/core/dev.c b/net/core/dev.c
110386index e977e15..74b19b0 100644
110387--- a/net/core/dev.c
110388+++ b/net/core/dev.c
110389@@ -1681,14 +1681,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
110390 {
110391 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
110392 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
110393- atomic_long_inc(&dev->rx_dropped);
110394+ atomic_long_inc_unchecked(&dev->rx_dropped);
110395 kfree_skb(skb);
110396 return NET_RX_DROP;
110397 }
110398 }
110399
110400 if (unlikely(!is_skb_forwardable(dev, skb))) {
110401- atomic_long_inc(&dev->rx_dropped);
110402+ atomic_long_inc_unchecked(&dev->rx_dropped);
110403 kfree_skb(skb);
110404 return NET_RX_DROP;
110405 }
110406@@ -2987,7 +2987,7 @@ recursion_alert:
110407 drop:
110408 rcu_read_unlock_bh();
110409
110410- atomic_long_inc(&dev->tx_dropped);
110411+ atomic_long_inc_unchecked(&dev->tx_dropped);
110412 kfree_skb_list(skb);
110413 return rc;
110414 out:
110415@@ -3336,7 +3336,7 @@ enqueue:
110416
110417 local_irq_restore(flags);
110418
110419- atomic_long_inc(&skb->dev->rx_dropped);
110420+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
110421 kfree_skb(skb);
110422 return NET_RX_DROP;
110423 }
110424@@ -3413,7 +3413,7 @@ int netif_rx_ni(struct sk_buff *skb)
110425 }
110426 EXPORT_SYMBOL(netif_rx_ni);
110427
110428-static void net_tx_action(struct softirq_action *h)
110429+static __latent_entropy void net_tx_action(void)
110430 {
110431 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
110432
110433@@ -3751,7 +3751,7 @@ ncls:
110434 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
110435 } else {
110436 drop:
110437- atomic_long_inc(&skb->dev->rx_dropped);
110438+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
110439 kfree_skb(skb);
110440 /* Jamal, now you will not able to escape explaining
110441 * me how you were going to use this. :-)
110442@@ -4640,7 +4640,7 @@ out_unlock:
110443 return work;
110444 }
110445
110446-static void net_rx_action(struct softirq_action *h)
110447+static __latent_entropy void net_rx_action(void)
110448 {
110449 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
110450 unsigned long time_limit = jiffies + 2;
110451@@ -6676,8 +6676,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
110452 } else {
110453 netdev_stats_to_stats64(storage, &dev->stats);
110454 }
110455- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
110456- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
110457+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
110458+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
110459 return storage;
110460 }
110461 EXPORT_SYMBOL(dev_get_stats);
110462diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
110463index b94b1d2..da3ed7c 100644
110464--- a/net/core/dev_ioctl.c
110465+++ b/net/core/dev_ioctl.c
110466@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
110467 no_module = !dev;
110468 if (no_module && capable(CAP_NET_ADMIN))
110469 no_module = request_module("netdev-%s", name);
110470- if (no_module && capable(CAP_SYS_MODULE))
110471+ if (no_module && capable(CAP_SYS_MODULE)) {
110472+#ifdef CONFIG_GRKERNSEC_MODHARDEN
110473+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
110474+#else
110475 request_module("%s", name);
110476+#endif
110477+ }
110478 }
110479 EXPORT_SYMBOL(dev_load);
110480
110481diff --git a/net/core/filter.c b/net/core/filter.c
110482index f6bdc2b..76eba8e 100644
110483--- a/net/core/filter.c
110484+++ b/net/core/filter.c
110485@@ -533,7 +533,11 @@ do_pass:
110486
110487 /* Unknown instruction. */
110488 default:
110489- goto err;
110490+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
110491+ fp->code, fp->jt, fp->jf, fp->k);
110492+ kfree(addrs);
110493+ BUG();
110494+ return -EINVAL;
110495 }
110496
110497 insn++;
110498@@ -577,7 +581,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
110499 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
110500 int pc, ret = 0;
110501
110502- BUILD_BUG_ON(BPF_MEMWORDS > 16);
110503+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
110504
110505 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
110506 if (!masks)
110507@@ -992,7 +996,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
110508 if (!fp)
110509 return -ENOMEM;
110510
110511- memcpy(fp->insns, fprog->filter, fsize);
110512+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
110513
110514 fp->len = fprog->len;
110515 /* Since unattached filters are not copied back to user
110516diff --git a/net/core/flow.c b/net/core/flow.c
110517index 1033725..340f65d 100644
110518--- a/net/core/flow.c
110519+++ b/net/core/flow.c
110520@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
110521 static int flow_entry_valid(struct flow_cache_entry *fle,
110522 struct netns_xfrm *xfrm)
110523 {
110524- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
110525+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
110526 return 0;
110527 if (fle->object && !fle->object->ops->check(fle->object))
110528 return 0;
110529@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
110530 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
110531 fcp->hash_count++;
110532 }
110533- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
110534+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
110535 flo = fle->object;
110536 if (!flo)
110537 goto ret_object;
110538@@ -263,7 +263,7 @@ nocache:
110539 }
110540 flo = resolver(net, key, family, dir, flo, ctx);
110541 if (fle) {
110542- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
110543+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
110544 if (!IS_ERR(flo))
110545 fle->object = flo;
110546 else
110547diff --git a/net/core/neighbour.c b/net/core/neighbour.c
110548index 70fe9e1..c55e69d 100644
110549--- a/net/core/neighbour.c
110550+++ b/net/core/neighbour.c
110551@@ -971,6 +971,8 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
110552 rc = 0;
110553 if (neigh->nud_state & (NUD_CONNECTED | NUD_DELAY | NUD_PROBE))
110554 goto out_unlock_bh;
110555+ if (neigh->dead)
110556+ goto out_dead;
110557
110558 if (!(neigh->nud_state & (NUD_STALE | NUD_INCOMPLETE))) {
110559 if (NEIGH_VAR(neigh->parms, MCAST_PROBES) +
110560@@ -1027,6 +1029,13 @@ out_unlock_bh:
110561 write_unlock(&neigh->lock);
110562 local_bh_enable();
110563 return rc;
110564+
110565+out_dead:
110566+ if (neigh->nud_state & NUD_STALE)
110567+ goto out_unlock_bh;
110568+ write_unlock_bh(&neigh->lock);
110569+ kfree_skb(skb);
110570+ return 1;
110571 }
110572 EXPORT_SYMBOL(__neigh_event_send);
110573
110574@@ -1090,6 +1099,8 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
110575 if (!(flags & NEIGH_UPDATE_F_ADMIN) &&
110576 (old & (NUD_NOARP | NUD_PERMANENT)))
110577 goto out;
110578+ if (neigh->dead)
110579+ goto out;
110580
110581 if (!(new & NUD_VALID)) {
110582 neigh_del_timer(neigh);
110583@@ -1239,6 +1250,8 @@ EXPORT_SYMBOL(neigh_update);
110584 */
110585 void __neigh_set_probe_once(struct neighbour *neigh)
110586 {
110587+ if (neigh->dead)
110588+ return;
110589 neigh->updated = jiffies;
110590 if (!(neigh->nud_state & NUD_FAILED))
110591 return;
110592@@ -2806,7 +2819,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
110593 void __user *buffer, size_t *lenp, loff_t *ppos)
110594 {
110595 int size, ret;
110596- struct ctl_table tmp = *ctl;
110597+ ctl_table_no_const tmp = *ctl;
110598
110599 tmp.extra1 = &zero;
110600 tmp.extra2 = &unres_qlen_max;
110601@@ -2868,7 +2881,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
110602 void __user *buffer,
110603 size_t *lenp, loff_t *ppos)
110604 {
110605- struct ctl_table tmp = *ctl;
110606+ ctl_table_no_const tmp = *ctl;
110607 int ret;
110608
110609 tmp.extra1 = &zero;
110610diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
110611index 2bf8329..2eb1423 100644
110612--- a/net/core/net-procfs.c
110613+++ b/net/core/net-procfs.c
110614@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
110615 struct rtnl_link_stats64 temp;
110616 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
110617
110618- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110619+ if (gr_proc_is_restricted())
110620+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110621+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
110622+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
110623+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
110624+ else
110625+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110626 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
110627 dev->name, stats->rx_bytes, stats->rx_packets,
110628 stats->rx_errors,
110629@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
110630 return 0;
110631 }
110632
110633-static const struct seq_operations dev_seq_ops = {
110634+const struct seq_operations dev_seq_ops = {
110635 .start = dev_seq_start,
110636 .next = dev_seq_next,
110637 .stop = dev_seq_stop,
110638@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
110639
110640 static int softnet_seq_open(struct inode *inode, struct file *file)
110641 {
110642- return seq_open(file, &softnet_seq_ops);
110643+ return seq_open_restrict(file, &softnet_seq_ops);
110644 }
110645
110646 static const struct file_operations softnet_seq_fops = {
110647@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
110648 else
110649 seq_printf(seq, "%04x", ntohs(pt->type));
110650
110651+#ifdef CONFIG_GRKERNSEC_HIDESYM
110652+ seq_printf(seq, " %-8s %pf\n",
110653+ pt->dev ? pt->dev->name : "", NULL);
110654+#else
110655 seq_printf(seq, " %-8s %pf\n",
110656 pt->dev ? pt->dev->name : "", pt->func);
110657+#endif
110658 }
110659
110660 return 0;
110661diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
110662index f2aa73b..0d1a1ea 100644
110663--- a/net/core/net-sysfs.c
110664+++ b/net/core/net-sysfs.c
110665@@ -279,7 +279,7 @@ static ssize_t carrier_changes_show(struct device *dev,
110666 {
110667 struct net_device *netdev = to_net_dev(dev);
110668 return sprintf(buf, fmt_dec,
110669- atomic_read(&netdev->carrier_changes));
110670+ atomic_read_unchecked(&netdev->carrier_changes));
110671 }
110672 static DEVICE_ATTR_RO(carrier_changes);
110673
110674diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
110675index 70d3450..eb7c528 100644
110676--- a/net/core/net_namespace.c
110677+++ b/net/core/net_namespace.c
110678@@ -663,7 +663,7 @@ static int __register_pernet_operations(struct list_head *list,
110679 int error;
110680 LIST_HEAD(net_exit_list);
110681
110682- list_add_tail(&ops->list, list);
110683+ pax_list_add_tail((struct list_head *)&ops->list, list);
110684 if (ops->init || (ops->id && ops->size)) {
110685 for_each_net(net) {
110686 error = ops_init(ops, net);
110687@@ -676,7 +676,7 @@ static int __register_pernet_operations(struct list_head *list,
110688
110689 out_undo:
110690 /* If I have an error cleanup all namespaces I initialized */
110691- list_del(&ops->list);
110692+ pax_list_del((struct list_head *)&ops->list);
110693 ops_exit_list(ops, &net_exit_list);
110694 ops_free_list(ops, &net_exit_list);
110695 return error;
110696@@ -687,7 +687,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
110697 struct net *net;
110698 LIST_HEAD(net_exit_list);
110699
110700- list_del(&ops->list);
110701+ pax_list_del((struct list_head *)&ops->list);
110702 for_each_net(net)
110703 list_add_tail(&net->exit_list, &net_exit_list);
110704 ops_exit_list(ops, &net_exit_list);
110705@@ -821,7 +821,7 @@ int register_pernet_device(struct pernet_operations *ops)
110706 mutex_lock(&net_mutex);
110707 error = register_pernet_operations(&pernet_list, ops);
110708 if (!error && (first_device == &pernet_list))
110709- first_device = &ops->list;
110710+ first_device = (struct list_head *)&ops->list;
110711 mutex_unlock(&net_mutex);
110712 return error;
110713 }
110714diff --git a/net/core/netpoll.c b/net/core/netpoll.c
110715index c126a87..10ad89d 100644
110716--- a/net/core/netpoll.c
110717+++ b/net/core/netpoll.c
110718@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
110719 struct udphdr *udph;
110720 struct iphdr *iph;
110721 struct ethhdr *eth;
110722- static atomic_t ip_ident;
110723+ static atomic_unchecked_t ip_ident;
110724 struct ipv6hdr *ip6h;
110725
110726 udp_len = len + sizeof(*udph);
110727@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
110728 put_unaligned(0x45, (unsigned char *)iph);
110729 iph->tos = 0;
110730 put_unaligned(htons(ip_len), &(iph->tot_len));
110731- iph->id = htons(atomic_inc_return(&ip_ident));
110732+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
110733 iph->frag_off = 0;
110734 iph->ttl = 64;
110735 iph->protocol = IPPROTO_UDP;
110736diff --git a/net/core/pktgen.c b/net/core/pktgen.c
110737index 508155b..fad080f 100644
110738--- a/net/core/pktgen.c
110739+++ b/net/core/pktgen.c
110740@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
110741 pn->net = net;
110742 INIT_LIST_HEAD(&pn->pktgen_threads);
110743 pn->pktgen_exiting = false;
110744- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
110745+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
110746 if (!pn->proc_dir) {
110747 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
110748 return -ENODEV;
110749diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
110750index a2b90e1..7882f75 100644
110751--- a/net/core/rtnetlink.c
110752+++ b/net/core/rtnetlink.c
110753@@ -61,7 +61,7 @@ struct rtnl_link {
110754 rtnl_doit_func doit;
110755 rtnl_dumpit_func dumpit;
110756 rtnl_calcit_func calcit;
110757-};
110758+} __no_const;
110759
110760 static DEFINE_MUTEX(rtnl_mutex);
110761
110762@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
110763 * to use the ops for creating device. So do not
110764 * fill up dellink as well. That disables rtnl_dellink.
110765 */
110766- if (ops->setup && !ops->dellink)
110767- ops->dellink = unregister_netdevice_queue;
110768+ if (ops->setup && !ops->dellink) {
110769+ pax_open_kernel();
110770+ *(void **)&ops->dellink = unregister_netdevice_queue;
110771+ pax_close_kernel();
110772+ }
110773
110774- list_add_tail(&ops->list, &link_ops);
110775+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
110776 return 0;
110777 }
110778 EXPORT_SYMBOL_GPL(__rtnl_link_register);
110779@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
110780 for_each_net(net) {
110781 __rtnl_kill_links(net, ops);
110782 }
110783- list_del(&ops->list);
110784+ pax_list_del((struct list_head *)&ops->list);
110785 }
110786 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
110787
110788@@ -1047,7 +1050,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
110789 (dev->ifalias &&
110790 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
110791 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
110792- atomic_read(&dev->carrier_changes)))
110793+ atomic_read_unchecked(&dev->carrier_changes)))
110794 goto nla_put_failure;
110795
110796 if (1) {
110797diff --git a/net/core/scm.c b/net/core/scm.c
110798index 3b6899b..cf36238 100644
110799--- a/net/core/scm.c
110800+++ b/net/core/scm.c
110801@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
110802 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
110803 {
110804 struct cmsghdr __user *cm
110805- = (__force struct cmsghdr __user *)msg->msg_control;
110806+ = (struct cmsghdr __force_user *)msg->msg_control;
110807 struct cmsghdr cmhdr;
110808 int cmlen = CMSG_LEN(len);
110809 int err;
110810@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
110811 err = -EFAULT;
110812 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
110813 goto out;
110814- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
110815+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
110816 goto out;
110817 cmlen = CMSG_SPACE(len);
110818 if (msg->msg_controllen < cmlen)
110819@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
110820 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
110821 {
110822 struct cmsghdr __user *cm
110823- = (__force struct cmsghdr __user*)msg->msg_control;
110824+ = (struct cmsghdr __force_user *)msg->msg_control;
110825
110826 int fdmax = 0;
110827 int fdnum = scm->fp->count;
110828@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
110829 if (fdnum < fdmax)
110830 fdmax = fdnum;
110831
110832- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
110833+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
110834 i++, cmfptr++)
110835 {
110836 struct socket *sock;
110837diff --git a/net/core/skbuff.c b/net/core/skbuff.c
110838index e9f9a15..6eb024e 100644
110839--- a/net/core/skbuff.c
110840+++ b/net/core/skbuff.c
110841@@ -2139,7 +2139,7 @@ EXPORT_SYMBOL(__skb_checksum);
110842 __wsum skb_checksum(const struct sk_buff *skb, int offset,
110843 int len, __wsum csum)
110844 {
110845- const struct skb_checksum_ops ops = {
110846+ static const struct skb_checksum_ops ops = {
110847 .update = csum_partial_ext,
110848 .combine = csum_block_add_ext,
110849 };
110850@@ -3379,12 +3379,14 @@ void __init skb_init(void)
110851 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
110852 sizeof(struct sk_buff),
110853 0,
110854- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
110855+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
110856+ SLAB_NO_SANITIZE,
110857 NULL);
110858 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
110859 sizeof(struct sk_buff_fclones),
110860 0,
110861- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
110862+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
110863+ SLAB_NO_SANITIZE,
110864 NULL);
110865 }
110866
110867diff --git a/net/core/sock.c b/net/core/sock.c
110868index 71e3e5f..ab90920 100644
110869--- a/net/core/sock.c
110870+++ b/net/core/sock.c
110871@@ -443,7 +443,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110872 struct sk_buff_head *list = &sk->sk_receive_queue;
110873
110874 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
110875- atomic_inc(&sk->sk_drops);
110876+ atomic_inc_unchecked(&sk->sk_drops);
110877 trace_sock_rcvqueue_full(sk, skb);
110878 return -ENOMEM;
110879 }
110880@@ -453,7 +453,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110881 return err;
110882
110883 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
110884- atomic_inc(&sk->sk_drops);
110885+ atomic_inc_unchecked(&sk->sk_drops);
110886 return -ENOBUFS;
110887 }
110888
110889@@ -466,7 +466,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110890 skb_dst_force(skb);
110891
110892 spin_lock_irqsave(&list->lock, flags);
110893- skb->dropcount = atomic_read(&sk->sk_drops);
110894+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
110895 __skb_queue_tail(list, skb);
110896 spin_unlock_irqrestore(&list->lock, flags);
110897
110898@@ -486,7 +486,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
110899 skb->dev = NULL;
110900
110901 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
110902- atomic_inc(&sk->sk_drops);
110903+ atomic_inc_unchecked(&sk->sk_drops);
110904 goto discard_and_relse;
110905 }
110906 if (nested)
110907@@ -504,7 +504,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
110908 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
110909 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
110910 bh_unlock_sock(sk);
110911- atomic_inc(&sk->sk_drops);
110912+ atomic_inc_unchecked(&sk->sk_drops);
110913 goto discard_and_relse;
110914 }
110915
110916@@ -910,6 +910,7 @@ set_rcvbuf:
110917 }
110918 break;
110919
110920+#ifndef GRKERNSEC_BPF_HARDEN
110921 case SO_ATTACH_BPF:
110922 ret = -EINVAL;
110923 if (optlen == sizeof(u32)) {
110924@@ -922,7 +923,7 @@ set_rcvbuf:
110925 ret = sk_attach_bpf(ufd, sk);
110926 }
110927 break;
110928-
110929+#endif
110930 case SO_DETACH_FILTER:
110931 ret = sk_detach_filter(sk);
110932 break;
110933@@ -1026,12 +1027,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110934 struct timeval tm;
110935 } v;
110936
110937- int lv = sizeof(int);
110938- int len;
110939+ unsigned int lv = sizeof(int);
110940+ unsigned int len;
110941
110942 if (get_user(len, optlen))
110943 return -EFAULT;
110944- if (len < 0)
110945+ if (len > INT_MAX)
110946 return -EINVAL;
110947
110948 memset(&v, 0, sizeof(v));
110949@@ -1169,11 +1170,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110950
110951 case SO_PEERNAME:
110952 {
110953- char address[128];
110954+ char address[_K_SS_MAXSIZE];
110955
110956 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
110957 return -ENOTCONN;
110958- if (lv < len)
110959+ if (lv < len || sizeof address < len)
110960 return -EINVAL;
110961 if (copy_to_user(optval, address, len))
110962 return -EFAULT;
110963@@ -1258,7 +1259,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110964
110965 if (len > lv)
110966 len = lv;
110967- if (copy_to_user(optval, &v, len))
110968+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
110969 return -EFAULT;
110970 lenout:
110971 if (put_user(len, optlen))
110972@@ -2375,7 +2376,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
110973 */
110974 smp_wmb();
110975 atomic_set(&sk->sk_refcnt, 1);
110976- atomic_set(&sk->sk_drops, 0);
110977+ atomic_set_unchecked(&sk->sk_drops, 0);
110978 }
110979 EXPORT_SYMBOL(sock_init_data);
110980
110981@@ -2503,6 +2504,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
110982 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
110983 int level, int type)
110984 {
110985+ struct sock_extended_err ee;
110986 struct sock_exterr_skb *serr;
110987 struct sk_buff *skb;
110988 int copied, err;
110989@@ -2524,7 +2526,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
110990 sock_recv_timestamp(msg, sk, skb);
110991
110992 serr = SKB_EXT_ERR(skb);
110993- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
110994+ ee = serr->ee;
110995+ put_cmsg(msg, level, type, sizeof ee, &ee);
110996
110997 msg->msg_flags |= MSG_ERRQUEUE;
110998 err = copied;
110999diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
111000index ad704c7..ca48aff 100644
111001--- a/net/core/sock_diag.c
111002+++ b/net/core/sock_diag.c
111003@@ -9,26 +9,33 @@
111004 #include <linux/inet_diag.h>
111005 #include <linux/sock_diag.h>
111006
111007-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
111008+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
111009 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
111010 static DEFINE_MUTEX(sock_diag_table_mutex);
111011
111012 int sock_diag_check_cookie(void *sk, __u32 *cookie)
111013 {
111014+#ifndef CONFIG_GRKERNSEC_HIDESYM
111015 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
111016 cookie[1] != INET_DIAG_NOCOOKIE) &&
111017 ((u32)(unsigned long)sk != cookie[0] ||
111018 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
111019 return -ESTALE;
111020 else
111021+#endif
111022 return 0;
111023 }
111024 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
111025
111026 void sock_diag_save_cookie(void *sk, __u32 *cookie)
111027 {
111028+#ifdef CONFIG_GRKERNSEC_HIDESYM
111029+ cookie[0] = 0;
111030+ cookie[1] = 0;
111031+#else
111032 cookie[0] = (u32)(unsigned long)sk;
111033 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
111034+#endif
111035 }
111036 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
111037
111038@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
111039 mutex_lock(&sock_diag_table_mutex);
111040 if (sock_diag_handlers[hndl->family])
111041 err = -EBUSY;
111042- else
111043+ else {
111044+ pax_open_kernel();
111045 sock_diag_handlers[hndl->family] = hndl;
111046+ pax_close_kernel();
111047+ }
111048 mutex_unlock(&sock_diag_table_mutex);
111049
111050 return err;
111051@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
111052
111053 mutex_lock(&sock_diag_table_mutex);
111054 BUG_ON(sock_diag_handlers[family] != hnld);
111055+ pax_open_kernel();
111056 sock_diag_handlers[family] = NULL;
111057+ pax_close_kernel();
111058 mutex_unlock(&sock_diag_table_mutex);
111059 }
111060 EXPORT_SYMBOL_GPL(sock_diag_unregister);
111061diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
111062index 8ce351f..2c388f7 100644
111063--- a/net/core/sysctl_net_core.c
111064+++ b/net/core/sysctl_net_core.c
111065@@ -36,7 +36,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
111066 {
111067 unsigned int orig_size, size;
111068 int ret, i;
111069- struct ctl_table tmp = {
111070+ ctl_table_no_const tmp = {
111071 .data = &size,
111072 .maxlen = sizeof(size),
111073 .mode = table->mode
111074@@ -204,7 +204,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
111075 void __user *buffer, size_t *lenp, loff_t *ppos)
111076 {
111077 char id[IFNAMSIZ];
111078- struct ctl_table tbl = {
111079+ ctl_table_no_const tbl = {
111080 .data = id,
111081 .maxlen = IFNAMSIZ,
111082 };
111083@@ -222,7 +222,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
111084 static int proc_do_rss_key(struct ctl_table *table, int write,
111085 void __user *buffer, size_t *lenp, loff_t *ppos)
111086 {
111087- struct ctl_table fake_table;
111088+ ctl_table_no_const fake_table;
111089 char buf[NETDEV_RSS_KEY_LEN * 3];
111090
111091 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
111092@@ -286,7 +286,7 @@ static struct ctl_table net_core_table[] = {
111093 .mode = 0444,
111094 .proc_handler = proc_do_rss_key,
111095 },
111096-#ifdef CONFIG_BPF_JIT
111097+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
111098 {
111099 .procname = "bpf_jit_enable",
111100 .data = &bpf_jit_enable,
111101@@ -411,13 +411,12 @@ static struct ctl_table netns_core_table[] = {
111102
111103 static __net_init int sysctl_core_net_init(struct net *net)
111104 {
111105- struct ctl_table *tbl;
111106+ ctl_table_no_const *tbl = NULL;
111107
111108 net->core.sysctl_somaxconn = SOMAXCONN;
111109
111110- tbl = netns_core_table;
111111 if (!net_eq(net, &init_net)) {
111112- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
111113+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
111114 if (tbl == NULL)
111115 goto err_dup;
111116
111117@@ -427,17 +426,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
111118 if (net->user_ns != &init_user_ns) {
111119 tbl[0].procname = NULL;
111120 }
111121- }
111122-
111123- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
111124+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
111125+ } else
111126+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
111127 if (net->core.sysctl_hdr == NULL)
111128 goto err_reg;
111129
111130 return 0;
111131
111132 err_reg:
111133- if (tbl != netns_core_table)
111134- kfree(tbl);
111135+ kfree(tbl);
111136 err_dup:
111137 return -ENOMEM;
111138 }
111139@@ -452,7 +450,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
111140 kfree(tbl);
111141 }
111142
111143-static __net_initdata struct pernet_operations sysctl_core_ops = {
111144+static __net_initconst struct pernet_operations sysctl_core_ops = {
111145 .init = sysctl_core_net_init,
111146 .exit = sysctl_core_net_exit,
111147 };
111148diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
111149index 8102286..a0c2755 100644
111150--- a/net/decnet/af_decnet.c
111151+++ b/net/decnet/af_decnet.c
111152@@ -466,6 +466,7 @@ static struct proto dn_proto = {
111153 .sysctl_rmem = sysctl_decnet_rmem,
111154 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
111155 .obj_size = sizeof(struct dn_sock),
111156+ .slab_flags = SLAB_USERCOPY,
111157 };
111158
111159 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
111160diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
111161index b2c26b0..41f803e 100644
111162--- a/net/decnet/dn_dev.c
111163+++ b/net/decnet/dn_dev.c
111164@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
111165 .extra1 = &min_t3,
111166 .extra2 = &max_t3
111167 },
111168- {0}
111169+ { }
111170 },
111171 };
111172
111173diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
111174index 5325b54..a0d4d69 100644
111175--- a/net/decnet/sysctl_net_decnet.c
111176+++ b/net/decnet/sysctl_net_decnet.c
111177@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
111178
111179 if (len > *lenp) len = *lenp;
111180
111181- if (copy_to_user(buffer, addr, len))
111182+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
111183 return -EFAULT;
111184
111185 *lenp = len;
111186@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
111187
111188 if (len > *lenp) len = *lenp;
111189
111190- if (copy_to_user(buffer, devname, len))
111191+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
111192 return -EFAULT;
111193
111194 *lenp = len;
111195diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
111196index a2c7e4c..3dc9f67 100644
111197--- a/net/hsr/hsr_netlink.c
111198+++ b/net/hsr/hsr_netlink.c
111199@@ -102,7 +102,7 @@ nla_put_failure:
111200 return -EMSGSIZE;
111201 }
111202
111203-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
111204+static struct rtnl_link_ops hsr_link_ops = {
111205 .kind = "hsr",
111206 .maxtype = IFLA_HSR_MAX,
111207 .policy = hsr_policy,
111208diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
111209index 055fbb7..c0dbe60 100644
111210--- a/net/ieee802154/6lowpan/core.c
111211+++ b/net/ieee802154/6lowpan/core.c
111212@@ -217,7 +217,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
111213 dev_put(real_dev);
111214 }
111215
111216-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
111217+static struct rtnl_link_ops lowpan_link_ops = {
111218 .kind = "lowpan",
111219 .priv_size = sizeof(struct lowpan_dev_info),
111220 .setup = lowpan_setup,
111221diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
111222index f46e4d1..30231f1 100644
111223--- a/net/ieee802154/6lowpan/reassembly.c
111224+++ b/net/ieee802154/6lowpan/reassembly.c
111225@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
111226
111227 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
111228 {
111229- struct ctl_table *table;
111230+ ctl_table_no_const *table = NULL;
111231 struct ctl_table_header *hdr;
111232 struct netns_ieee802154_lowpan *ieee802154_lowpan =
111233 net_ieee802154_lowpan(net);
111234
111235- table = lowpan_frags_ns_ctl_table;
111236 if (!net_eq(net, &init_net)) {
111237- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
111238+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
111239 GFP_KERNEL);
111240 if (table == NULL)
111241 goto err_alloc;
111242@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
111243 /* Don't export sysctls to unprivileged users */
111244 if (net->user_ns != &init_user_ns)
111245 table[0].procname = NULL;
111246- }
111247-
111248- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
111249+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
111250+ } else
111251+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
111252 if (hdr == NULL)
111253 goto err_reg;
111254
111255@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
111256 return 0;
111257
111258 err_reg:
111259- if (!net_eq(net, &init_net))
111260- kfree(table);
111261+ kfree(table);
111262 err_alloc:
111263 return -ENOMEM;
111264 }
111265diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
111266index d2e49ba..f78e8aa 100644
111267--- a/net/ipv4/af_inet.c
111268+++ b/net/ipv4/af_inet.c
111269@@ -1390,7 +1390,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
111270 return ip_recv_error(sk, msg, len, addr_len);
111271 #if IS_ENABLED(CONFIG_IPV6)
111272 if (sk->sk_family == AF_INET6)
111273- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
111274+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
111275 #endif
111276 return -EINVAL;
111277 }
111278diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
111279index 3a8985c..9d2a870 100644
111280--- a/net/ipv4/devinet.c
111281+++ b/net/ipv4/devinet.c
111282@@ -69,7 +69,8 @@
111283
111284 static struct ipv4_devconf ipv4_devconf = {
111285 .data = {
111286- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
111287+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
111288+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
111289 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
111290 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
111291 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
111292@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
111293
111294 static struct ipv4_devconf ipv4_devconf_dflt = {
111295 .data = {
111296- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
111297+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
111298+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
111299 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
111300 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
111301 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
111302@@ -1549,7 +1551,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
111303 idx = 0;
111304 head = &net->dev_index_head[h];
111305 rcu_read_lock();
111306- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
111307+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
111308 net->dev_base_seq;
111309 hlist_for_each_entry_rcu(dev, head, index_hlist) {
111310 if (idx < s_idx)
111311@@ -1868,7 +1870,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
111312 idx = 0;
111313 head = &net->dev_index_head[h];
111314 rcu_read_lock();
111315- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
111316+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
111317 net->dev_base_seq;
111318 hlist_for_each_entry_rcu(dev, head, index_hlist) {
111319 if (idx < s_idx)
111320@@ -2103,7 +2105,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
111321 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
111322 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
111323
111324-static struct devinet_sysctl_table {
111325+static const struct devinet_sysctl_table {
111326 struct ctl_table_header *sysctl_header;
111327 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
111328 } devinet_sysctl = {
111329@@ -2235,7 +2237,7 @@ static __net_init int devinet_init_net(struct net *net)
111330 int err;
111331 struct ipv4_devconf *all, *dflt;
111332 #ifdef CONFIG_SYSCTL
111333- struct ctl_table *tbl = ctl_forward_entry;
111334+ ctl_table_no_const *tbl = NULL;
111335 struct ctl_table_header *forw_hdr;
111336 #endif
111337
111338@@ -2253,7 +2255,7 @@ static __net_init int devinet_init_net(struct net *net)
111339 goto err_alloc_dflt;
111340
111341 #ifdef CONFIG_SYSCTL
111342- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
111343+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
111344 if (tbl == NULL)
111345 goto err_alloc_ctl;
111346
111347@@ -2273,7 +2275,10 @@ static __net_init int devinet_init_net(struct net *net)
111348 goto err_reg_dflt;
111349
111350 err = -ENOMEM;
111351- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
111352+ if (!net_eq(net, &init_net))
111353+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
111354+ else
111355+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
111356 if (forw_hdr == NULL)
111357 goto err_reg_ctl;
111358 net->ipv4.forw_hdr = forw_hdr;
111359@@ -2289,8 +2294,7 @@ err_reg_ctl:
111360 err_reg_dflt:
111361 __devinet_sysctl_unregister(all);
111362 err_reg_all:
111363- if (tbl != ctl_forward_entry)
111364- kfree(tbl);
111365+ kfree(tbl);
111366 err_alloc_ctl:
111367 #endif
111368 if (dflt != &ipv4_devconf_dflt)
111369diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
111370index 23b9b3e..60cf0c4 100644
111371--- a/net/ipv4/fib_frontend.c
111372+++ b/net/ipv4/fib_frontend.c
111373@@ -1020,12 +1020,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
111374 #ifdef CONFIG_IP_ROUTE_MULTIPATH
111375 fib_sync_up(dev);
111376 #endif
111377- atomic_inc(&net->ipv4.dev_addr_genid);
111378+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111379 rt_cache_flush(dev_net(dev));
111380 break;
111381 case NETDEV_DOWN:
111382 fib_del_ifaddr(ifa, NULL);
111383- atomic_inc(&net->ipv4.dev_addr_genid);
111384+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111385 if (ifa->ifa_dev->ifa_list == NULL) {
111386 /* Last address was deleted from this interface.
111387 * Disable IP.
111388@@ -1063,7 +1063,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
111389 #ifdef CONFIG_IP_ROUTE_MULTIPATH
111390 fib_sync_up(dev);
111391 #endif
111392- atomic_inc(&net->ipv4.dev_addr_genid);
111393+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111394 rt_cache_flush(net);
111395 break;
111396 case NETDEV_DOWN:
111397diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
111398index 1e2090e..351a724 100644
111399--- a/net/ipv4/fib_semantics.c
111400+++ b/net/ipv4/fib_semantics.c
111401@@ -753,7 +753,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
111402 nh->nh_saddr = inet_select_addr(nh->nh_dev,
111403 nh->nh_gw,
111404 nh->nh_parent->fib_scope);
111405- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
111406+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
111407
111408 return nh->nh_saddr;
111409 }
111410diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
111411index ff069f6..335e752 100644
111412--- a/net/ipv4/fou.c
111413+++ b/net/ipv4/fou.c
111414@@ -771,12 +771,12 @@ EXPORT_SYMBOL(gue_build_header);
111415
111416 #ifdef CONFIG_NET_FOU_IP_TUNNELS
111417
111418-static const struct ip_tunnel_encap_ops __read_mostly fou_iptun_ops = {
111419+static const struct ip_tunnel_encap_ops fou_iptun_ops = {
111420 .encap_hlen = fou_encap_hlen,
111421 .build_header = fou_build_header,
111422 };
111423
111424-static const struct ip_tunnel_encap_ops __read_mostly gue_iptun_ops = {
111425+static const struct ip_tunnel_encap_ops gue_iptun_ops = {
111426 .encap_hlen = gue_encap_hlen,
111427 .build_header = gue_build_header,
111428 };
111429diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
111430index 9111a4e..3576905 100644
111431--- a/net/ipv4/inet_hashtables.c
111432+++ b/net/ipv4/inet_hashtables.c
111433@@ -18,6 +18,7 @@
111434 #include <linux/sched.h>
111435 #include <linux/slab.h>
111436 #include <linux/wait.h>
111437+#include <linux/security.h>
111438
111439 #include <net/inet_connection_sock.h>
111440 #include <net/inet_hashtables.h>
111441@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
111442 return inet_ehashfn(net, laddr, lport, faddr, fport);
111443 }
111444
111445+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
111446+
111447 /*
111448 * Allocate and initialize a new local port bind bucket.
111449 * The bindhash mutex for snum's hash chain must be held here.
111450@@ -554,6 +557,8 @@ ok:
111451 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
111452 spin_unlock(&head->lock);
111453
111454+ gr_update_task_in_ip_table(inet_sk(sk));
111455+
111456 if (tw) {
111457 inet_twsk_deschedule(tw, death_row);
111458 while (twrefcnt) {
111459diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
111460index 241afd7..31b95d5 100644
111461--- a/net/ipv4/inetpeer.c
111462+++ b/net/ipv4/inetpeer.c
111463@@ -461,7 +461,7 @@ relookup:
111464 if (p) {
111465 p->daddr = *daddr;
111466 atomic_set(&p->refcnt, 1);
111467- atomic_set(&p->rid, 0);
111468+ atomic_set_unchecked(&p->rid, 0);
111469 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
111470 p->rate_tokens = 0;
111471 /* 60*HZ is arbitrary, but chosen enough high so that the first
111472diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
111473index 145a50c..5dd8cc5 100644
111474--- a/net/ipv4/ip_fragment.c
111475+++ b/net/ipv4/ip_fragment.c
111476@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
111477 return 0;
111478
111479 start = qp->rid;
111480- end = atomic_inc_return(&peer->rid);
111481+ end = atomic_inc_return_unchecked(&peer->rid);
111482 qp->rid = end;
111483
111484 rc = qp->q.fragments && (end - start) > max;
111485@@ -748,12 +748,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
111486
111487 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111488 {
111489- struct ctl_table *table;
111490+ ctl_table_no_const *table = NULL;
111491 struct ctl_table_header *hdr;
111492
111493- table = ip4_frags_ns_ctl_table;
111494 if (!net_eq(net, &init_net)) {
111495- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
111496+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
111497 if (table == NULL)
111498 goto err_alloc;
111499
111500@@ -767,9 +766,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111501 /* Don't export sysctls to unprivileged users */
111502 if (net->user_ns != &init_user_ns)
111503 table[0].procname = NULL;
111504- }
111505+ hdr = register_net_sysctl(net, "net/ipv4", table);
111506+ } else
111507+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
111508
111509- hdr = register_net_sysctl(net, "net/ipv4", table);
111510 if (hdr == NULL)
111511 goto err_reg;
111512
111513@@ -777,8 +777,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111514 return 0;
111515
111516 err_reg:
111517- if (!net_eq(net, &init_net))
111518- kfree(table);
111519+ kfree(table);
111520 err_alloc:
111521 return -ENOMEM;
111522 }
111523diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
111524index 6207275f..00323a2 100644
111525--- a/net/ipv4/ip_gre.c
111526+++ b/net/ipv4/ip_gre.c
111527@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
111528 module_param(log_ecn_error, bool, 0644);
111529 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
111530
111531-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
111532+static struct rtnl_link_ops ipgre_link_ops;
111533 static int ipgre_tunnel_init(struct net_device *dev);
111534
111535 static int ipgre_net_id __read_mostly;
111536@@ -817,7 +817,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
111537 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
111538 };
111539
111540-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
111541+static struct rtnl_link_ops ipgre_link_ops = {
111542 .kind = "gre",
111543 .maxtype = IFLA_GRE_MAX,
111544 .policy = ipgre_policy,
111545@@ -832,7 +832,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
111546 .get_link_net = ip_tunnel_get_link_net,
111547 };
111548
111549-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
111550+static struct rtnl_link_ops ipgre_tap_ops = {
111551 .kind = "gretap",
111552 .maxtype = IFLA_GRE_MAX,
111553 .policy = ipgre_policy,
111554diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
111555index 3d4da2c..40f9c29 100644
111556--- a/net/ipv4/ip_input.c
111557+++ b/net/ipv4/ip_input.c
111558@@ -147,6 +147,10 @@
111559 #include <linux/mroute.h>
111560 #include <linux/netlink.h>
111561
111562+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111563+extern int grsec_enable_blackhole;
111564+#endif
111565+
111566 /*
111567 * Process Router Attention IP option (RFC 2113)
111568 */
111569@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
111570 if (!raw) {
111571 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
111572 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
111573+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111574+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
111575+#endif
111576 icmp_send(skb, ICMP_DEST_UNREACH,
111577 ICMP_PROT_UNREACH, 0);
111578 }
111579diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
111580index 5cd9927..8610b9f 100644
111581--- a/net/ipv4/ip_sockglue.c
111582+++ b/net/ipv4/ip_sockglue.c
111583@@ -1254,7 +1254,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
111584 len = min_t(unsigned int, len, opt->optlen);
111585 if (put_user(len, optlen))
111586 return -EFAULT;
111587- if (copy_to_user(optval, opt->__data, len))
111588+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
111589+ copy_to_user(optval, opt->__data, len))
111590 return -EFAULT;
111591 return 0;
111592 }
111593@@ -1388,7 +1389,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
111594 if (sk->sk_type != SOCK_STREAM)
111595 return -ENOPROTOOPT;
111596
111597- msg.msg_control = (__force void *) optval;
111598+ msg.msg_control = (__force_kernel void *) optval;
111599 msg.msg_controllen = len;
111600 msg.msg_flags = flags;
111601
111602diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
111603index 94efe14..1453fcc 100644
111604--- a/net/ipv4/ip_vti.c
111605+++ b/net/ipv4/ip_vti.c
111606@@ -45,7 +45,7 @@
111607 #include <net/net_namespace.h>
111608 #include <net/netns/generic.h>
111609
111610-static struct rtnl_link_ops vti_link_ops __read_mostly;
111611+static struct rtnl_link_ops vti_link_ops;
111612
111613 static int vti_net_id __read_mostly;
111614 static int vti_tunnel_init(struct net_device *dev);
111615@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
111616 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
111617 };
111618
111619-static struct rtnl_link_ops vti_link_ops __read_mostly = {
111620+static struct rtnl_link_ops vti_link_ops = {
111621 .kind = "vti",
111622 .maxtype = IFLA_VTI_MAX,
111623 .policy = vti_policy,
111624diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
111625index b26376e..fc3d733 100644
111626--- a/net/ipv4/ipconfig.c
111627+++ b/net/ipv4/ipconfig.c
111628@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
111629
111630 mm_segment_t oldfs = get_fs();
111631 set_fs(get_ds());
111632- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
111633+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
111634 set_fs(oldfs);
111635 return res;
111636 }
111637@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
111638
111639 mm_segment_t oldfs = get_fs();
111640 set_fs(get_ds());
111641- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
111642+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
111643 set_fs(oldfs);
111644 return res;
111645 }
111646@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
111647
111648 mm_segment_t oldfs = get_fs();
111649 set_fs(get_ds());
111650- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
111651+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
111652 set_fs(oldfs);
111653 return res;
111654 }
111655diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
111656index 915d215..48d1db7 100644
111657--- a/net/ipv4/ipip.c
111658+++ b/net/ipv4/ipip.c
111659@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
111660 static int ipip_net_id __read_mostly;
111661
111662 static int ipip_tunnel_init(struct net_device *dev);
111663-static struct rtnl_link_ops ipip_link_ops __read_mostly;
111664+static struct rtnl_link_ops ipip_link_ops;
111665
111666 static int ipip_err(struct sk_buff *skb, u32 info)
111667 {
111668@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
111669 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
111670 };
111671
111672-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
111673+static struct rtnl_link_ops ipip_link_ops = {
111674 .kind = "ipip",
111675 .maxtype = IFLA_IPTUN_MAX,
111676 .policy = ipip_policy,
111677diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
111678index f95b6f9..2ee2097 100644
111679--- a/net/ipv4/netfilter/arp_tables.c
111680+++ b/net/ipv4/netfilter/arp_tables.c
111681@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
111682 #endif
111683
111684 static int get_info(struct net *net, void __user *user,
111685- const int *len, int compat)
111686+ int len, int compat)
111687 {
111688 char name[XT_TABLE_MAXNAMELEN];
111689 struct xt_table *t;
111690 int ret;
111691
111692- if (*len != sizeof(struct arpt_getinfo)) {
111693- duprintf("length %u != %Zu\n", *len,
111694+ if (len != sizeof(struct arpt_getinfo)) {
111695+ duprintf("length %u != %Zu\n", len,
111696 sizeof(struct arpt_getinfo));
111697 return -EINVAL;
111698 }
111699@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
111700 info.size = private->size;
111701 strcpy(info.name, name);
111702
111703- if (copy_to_user(user, &info, *len) != 0)
111704+ if (copy_to_user(user, &info, len) != 0)
111705 ret = -EFAULT;
111706 else
111707 ret = 0;
111708@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
111709
111710 switch (cmd) {
111711 case ARPT_SO_GET_INFO:
111712- ret = get_info(sock_net(sk), user, len, 1);
111713+ ret = get_info(sock_net(sk), user, *len, 1);
111714 break;
111715 case ARPT_SO_GET_ENTRIES:
111716 ret = compat_get_entries(sock_net(sk), user, len);
111717@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
111718
111719 switch (cmd) {
111720 case ARPT_SO_GET_INFO:
111721- ret = get_info(sock_net(sk), user, len, 0);
111722+ ret = get_info(sock_net(sk), user, *len, 0);
111723 break;
111724
111725 case ARPT_SO_GET_ENTRIES:
111726diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
111727index cf5e82f..75a20f5 100644
111728--- a/net/ipv4/netfilter/ip_tables.c
111729+++ b/net/ipv4/netfilter/ip_tables.c
111730@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
111731 #endif
111732
111733 static int get_info(struct net *net, void __user *user,
111734- const int *len, int compat)
111735+ int len, int compat)
111736 {
111737 char name[XT_TABLE_MAXNAMELEN];
111738 struct xt_table *t;
111739 int ret;
111740
111741- if (*len != sizeof(struct ipt_getinfo)) {
111742- duprintf("length %u != %zu\n", *len,
111743+ if (len != sizeof(struct ipt_getinfo)) {
111744+ duprintf("length %u != %zu\n", len,
111745 sizeof(struct ipt_getinfo));
111746 return -EINVAL;
111747 }
111748@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
111749 info.size = private->size;
111750 strcpy(info.name, name);
111751
111752- if (copy_to_user(user, &info, *len) != 0)
111753+ if (copy_to_user(user, &info, len) != 0)
111754 ret = -EFAULT;
111755 else
111756 ret = 0;
111757@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
111758
111759 switch (cmd) {
111760 case IPT_SO_GET_INFO:
111761- ret = get_info(sock_net(sk), user, len, 1);
111762+ ret = get_info(sock_net(sk), user, *len, 1);
111763 break;
111764 case IPT_SO_GET_ENTRIES:
111765 ret = compat_get_entries(sock_net(sk), user, len);
111766@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
111767
111768 switch (cmd) {
111769 case IPT_SO_GET_INFO:
111770- ret = get_info(sock_net(sk), user, len, 0);
111771+ ret = get_info(sock_net(sk), user, *len, 0);
111772 break;
111773
111774 case IPT_SO_GET_ENTRIES:
111775diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
111776index e90f83a..3e6acca 100644
111777--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
111778+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
111779@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
111780 spin_lock_init(&cn->lock);
111781
111782 #ifdef CONFIG_PROC_FS
111783- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
111784+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
111785 if (!cn->procdir) {
111786 pr_err("Unable to proc dir entry\n");
111787 return -ENOMEM;
111788diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
111789index 787b0d6..ab6c0ba 100644
111790--- a/net/ipv4/ping.c
111791+++ b/net/ipv4/ping.c
111792@@ -59,7 +59,7 @@ struct ping_table {
111793 };
111794
111795 static struct ping_table ping_table;
111796-struct pingv6_ops pingv6_ops;
111797+struct pingv6_ops *pingv6_ops;
111798 EXPORT_SYMBOL_GPL(pingv6_ops);
111799
111800 static u16 ping_port_rover;
111801@@ -359,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
111802 return -ENODEV;
111803 }
111804 }
111805- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
111806+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
111807 scoped);
111808 rcu_read_unlock();
111809
111810@@ -567,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
111811 }
111812 #if IS_ENABLED(CONFIG_IPV6)
111813 } else if (skb->protocol == htons(ETH_P_IPV6)) {
111814- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
111815+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
111816 #endif
111817 }
111818
111819@@ -585,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
111820 info, (u8 *)icmph);
111821 #if IS_ENABLED(CONFIG_IPV6)
111822 } else if (family == AF_INET6) {
111823- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
111824+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
111825 info, (u8 *)icmph);
111826 #endif
111827 }
111828@@ -919,10 +919,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
111829 }
111830
111831 if (inet6_sk(sk)->rxopt.all)
111832- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
111833+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
111834 if (skb->protocol == htons(ETH_P_IPV6) &&
111835 inet6_sk(sk)->rxopt.all)
111836- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
111837+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
111838 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
111839 ip_cmsg_recv(msg, skb);
111840 #endif
111841@@ -1117,7 +1117,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
111842 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
111843 0, sock_i_ino(sp),
111844 atomic_read(&sp->sk_refcnt), sp,
111845- atomic_read(&sp->sk_drops));
111846+ atomic_read_unchecked(&sp->sk_drops));
111847 }
111848
111849 static int ping_v4_seq_show(struct seq_file *seq, void *v)
111850diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
111851index f027a70..2e64edc 100644
111852--- a/net/ipv4/raw.c
111853+++ b/net/ipv4/raw.c
111854@@ -324,7 +324,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
111855 int raw_rcv(struct sock *sk, struct sk_buff *skb)
111856 {
111857 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
111858- atomic_inc(&sk->sk_drops);
111859+ atomic_inc_unchecked(&sk->sk_drops);
111860 kfree_skb(skb);
111861 return NET_RX_DROP;
111862 }
111863@@ -773,16 +773,20 @@ static int raw_init(struct sock *sk)
111864
111865 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
111866 {
111867+ struct icmp_filter filter;
111868+
111869 if (optlen > sizeof(struct icmp_filter))
111870 optlen = sizeof(struct icmp_filter);
111871- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
111872+ if (copy_from_user(&filter, optval, optlen))
111873 return -EFAULT;
111874+ raw_sk(sk)->filter = filter;
111875 return 0;
111876 }
111877
111878 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
111879 {
111880 int len, ret = -EFAULT;
111881+ struct icmp_filter filter;
111882
111883 if (get_user(len, optlen))
111884 goto out;
111885@@ -792,8 +796,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
111886 if (len > sizeof(struct icmp_filter))
111887 len = sizeof(struct icmp_filter);
111888 ret = -EFAULT;
111889- if (put_user(len, optlen) ||
111890- copy_to_user(optval, &raw_sk(sk)->filter, len))
111891+ filter = raw_sk(sk)->filter;
111892+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
111893 goto out;
111894 ret = 0;
111895 out: return ret;
111896@@ -1022,7 +1026,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
111897 0, 0L, 0,
111898 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
111899 0, sock_i_ino(sp),
111900- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
111901+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
111902 }
111903
111904 static int raw_seq_show(struct seq_file *seq, void *v)
111905diff --git a/net/ipv4/route.c b/net/ipv4/route.c
111906index e262a08..d1fc3be 100644
111907--- a/net/ipv4/route.c
111908+++ b/net/ipv4/route.c
111909@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
111910
111911 static int rt_cache_seq_open(struct inode *inode, struct file *file)
111912 {
111913- return seq_open(file, &rt_cache_seq_ops);
111914+ return seq_open_restrict(file, &rt_cache_seq_ops);
111915 }
111916
111917 static const struct file_operations rt_cache_seq_fops = {
111918@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
111919
111920 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
111921 {
111922- return seq_open(file, &rt_cpu_seq_ops);
111923+ return seq_open_restrict(file, &rt_cpu_seq_ops);
111924 }
111925
111926 static const struct file_operations rt_cpu_seq_fops = {
111927@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
111928
111929 static int rt_acct_proc_open(struct inode *inode, struct file *file)
111930 {
111931- return single_open(file, rt_acct_proc_show, NULL);
111932+ return single_open_restrict(file, rt_acct_proc_show, NULL);
111933 }
111934
111935 static const struct file_operations rt_acct_proc_fops = {
111936@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
111937
111938 #define IP_IDENTS_SZ 2048u
111939 struct ip_ident_bucket {
111940- atomic_t id;
111941+ atomic_unchecked_t id;
111942 u32 stamp32;
111943 };
111944
111945-static struct ip_ident_bucket *ip_idents __read_mostly;
111946+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
111947
111948 /* In order to protect privacy, we add a perturbation to identifiers
111949 * if one generator is seldom used. This makes hard for an attacker
111950@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
111951 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
111952 delta = prandom_u32_max(now - old);
111953
111954- return atomic_add_return(segs + delta, &bucket->id) - segs;
111955+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
111956 }
111957 EXPORT_SYMBOL(ip_idents_reserve);
111958
111959@@ -2643,34 +2643,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
111960 .maxlen = sizeof(int),
111961 .mode = 0200,
111962 .proc_handler = ipv4_sysctl_rtcache_flush,
111963+ .extra1 = &init_net,
111964 },
111965 { },
111966 };
111967
111968 static __net_init int sysctl_route_net_init(struct net *net)
111969 {
111970- struct ctl_table *tbl;
111971+ ctl_table_no_const *tbl = NULL;
111972
111973- tbl = ipv4_route_flush_table;
111974 if (!net_eq(net, &init_net)) {
111975- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
111976+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
111977 if (tbl == NULL)
111978 goto err_dup;
111979
111980 /* Don't export sysctls to unprivileged users */
111981 if (net->user_ns != &init_user_ns)
111982 tbl[0].procname = NULL;
111983- }
111984- tbl[0].extra1 = net;
111985+ tbl[0].extra1 = net;
111986+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
111987+ } else
111988+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
111989
111990- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
111991 if (net->ipv4.route_hdr == NULL)
111992 goto err_reg;
111993 return 0;
111994
111995 err_reg:
111996- if (tbl != ipv4_route_flush_table)
111997- kfree(tbl);
111998+ kfree(tbl);
111999 err_dup:
112000 return -ENOMEM;
112001 }
112002@@ -2693,8 +2693,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
112003
112004 static __net_init int rt_genid_init(struct net *net)
112005 {
112006- atomic_set(&net->ipv4.rt_genid, 0);
112007- atomic_set(&net->fnhe_genid, 0);
112008+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
112009+ atomic_set_unchecked(&net->fnhe_genid, 0);
112010 get_random_bytes(&net->ipv4.dev_addr_genid,
112011 sizeof(net->ipv4.dev_addr_genid));
112012 return 0;
112013@@ -2738,11 +2738,7 @@ int __init ip_rt_init(void)
112014 int rc = 0;
112015 int cpu;
112016
112017- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
112018- if (!ip_idents)
112019- panic("IP: failed to allocate ip_idents\n");
112020-
112021- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
112022+ prandom_bytes(ip_idents, sizeof(ip_idents));
112023
112024 for_each_possible_cpu(cpu) {
112025 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
112026diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
112027index d151539..5f5e247 100644
112028--- a/net/ipv4/sysctl_net_ipv4.c
112029+++ b/net/ipv4/sysctl_net_ipv4.c
112030@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
112031 container_of(table->data, struct net, ipv4.ip_local_ports.range);
112032 int ret;
112033 int range[2];
112034- struct ctl_table tmp = {
112035+ ctl_table_no_const tmp = {
112036 .data = &range,
112037 .maxlen = sizeof(range),
112038 .mode = table->mode,
112039@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
112040 int ret;
112041 gid_t urange[2];
112042 kgid_t low, high;
112043- struct ctl_table tmp = {
112044+ ctl_table_no_const tmp = {
112045 .data = &urange,
112046 .maxlen = sizeof(urange),
112047 .mode = table->mode,
112048@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
112049 void __user *buffer, size_t *lenp, loff_t *ppos)
112050 {
112051 char val[TCP_CA_NAME_MAX];
112052- struct ctl_table tbl = {
112053+ ctl_table_no_const tbl = {
112054 .data = val,
112055 .maxlen = TCP_CA_NAME_MAX,
112056 };
112057@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
112058 void __user *buffer, size_t *lenp,
112059 loff_t *ppos)
112060 {
112061- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
112062+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
112063 int ret;
112064
112065 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
112066@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
112067 void __user *buffer, size_t *lenp,
112068 loff_t *ppos)
112069 {
112070- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
112071+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
112072 int ret;
112073
112074 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
112075@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
112076 void __user *buffer, size_t *lenp,
112077 loff_t *ppos)
112078 {
112079- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
112080+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
112081 struct tcp_fastopen_context *ctxt;
112082 int ret;
112083 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
112084@@ -888,13 +888,12 @@ static struct ctl_table ipv4_net_table[] = {
112085
112086 static __net_init int ipv4_sysctl_init_net(struct net *net)
112087 {
112088- struct ctl_table *table;
112089+ ctl_table_no_const *table = NULL;
112090
112091- table = ipv4_net_table;
112092 if (!net_eq(net, &init_net)) {
112093 int i;
112094
112095- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
112096+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
112097 if (table == NULL)
112098 goto err_alloc;
112099
112100@@ -903,7 +902,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
112101 table[i].data += (void *)net - (void *)&init_net;
112102 }
112103
112104- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
112105+ if (!net_eq(net, &init_net))
112106+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
112107+ else
112108+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
112109 if (net->ipv4.ipv4_hdr == NULL)
112110 goto err_reg;
112111
112112diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
112113index 995a225..e1e9183 100644
112114--- a/net/ipv4/tcp.c
112115+++ b/net/ipv4/tcp.c
112116@@ -520,8 +520,10 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
112117
112118 /* Race breaker. If space is freed after
112119 * wspace test but before the flags are set,
112120- * IO signal will be lost.
112121+ * IO signal will be lost. Memory barrier
112122+ * pairs with the input side.
112123 */
112124+ smp_mb__after_atomic();
112125 if (sk_stream_is_writeable(sk))
112126 mask |= POLLOUT | POLLWRNORM;
112127 }
112128diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
112129index f501ac04..0c5a1b2 100644
112130--- a/net/ipv4/tcp_input.c
112131+++ b/net/ipv4/tcp_input.c
112132@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
112133 * without any lock. We want to make sure compiler wont store
112134 * intermediate values in this location.
112135 */
112136- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
112137+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
112138 sk->sk_max_pacing_rate);
112139 }
112140
112141@@ -4541,7 +4541,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
112142 * simplifies code)
112143 */
112144 static void
112145-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
112146+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
112147 struct sk_buff *head, struct sk_buff *tail,
112148 u32 start, u32 end)
112149 {
112150@@ -4799,6 +4799,8 @@ static void tcp_check_space(struct sock *sk)
112151 {
112152 if (sock_flag(sk, SOCK_QUEUE_SHRUNK)) {
112153 sock_reset_flag(sk, SOCK_QUEUE_SHRUNK);
112154+ /* pairs with tcp_poll() */
112155+ smp_mb__after_atomic();
112156 if (sk->sk_socket &&
112157 test_bit(SOCK_NOSPACE, &sk->sk_socket->flags))
112158 tcp_new_space(sk);
112159@@ -5525,6 +5527,7 @@ discard:
112160 tcp_paws_reject(&tp->rx_opt, 0))
112161 goto discard_and_undo;
112162
112163+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
112164 if (th->syn) {
112165 /* We see SYN without ACK. It is attempt of
112166 * simultaneous connect with crossed SYNs.
112167@@ -5575,6 +5578,7 @@ discard:
112168 goto discard;
112169 #endif
112170 }
112171+#endif
112172 /* "fifth, if neither of the SYN or RST bits is set then
112173 * drop the segment and return."
112174 */
112175@@ -5621,7 +5625,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
112176 goto discard;
112177
112178 if (th->syn) {
112179- if (th->fin)
112180+ if (th->fin || th->urg || th->psh)
112181 goto discard;
112182 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
112183 return 1;
112184diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
112185index f1756ee..8908cb0 100644
112186--- a/net/ipv4/tcp_ipv4.c
112187+++ b/net/ipv4/tcp_ipv4.c
112188@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
112189 int sysctl_tcp_low_latency __read_mostly;
112190 EXPORT_SYMBOL(sysctl_tcp_low_latency);
112191
112192+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112193+extern int grsec_enable_blackhole;
112194+#endif
112195+
112196 #ifdef CONFIG_TCP_MD5SIG
112197 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
112198 __be32 daddr, __be32 saddr, const struct tcphdr *th);
112199@@ -1475,6 +1479,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
112200 return 0;
112201
112202 reset:
112203+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112204+ if (!grsec_enable_blackhole)
112205+#endif
112206 tcp_v4_send_reset(rsk, skb);
112207 discard:
112208 kfree_skb(skb);
112209@@ -1639,12 +1646,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
112210 TCP_SKB_CB(skb)->sacked = 0;
112211
112212 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
112213- if (!sk)
112214+ if (!sk) {
112215+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112216+ ret = 1;
112217+#endif
112218 goto no_tcp_socket;
112219-
112220+ }
112221 process:
112222- if (sk->sk_state == TCP_TIME_WAIT)
112223+ if (sk->sk_state == TCP_TIME_WAIT) {
112224+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112225+ ret = 2;
112226+#endif
112227 goto do_time_wait;
112228+ }
112229
112230 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
112231 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
112232@@ -1700,6 +1714,10 @@ csum_error:
112233 bad_packet:
112234 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
112235 } else {
112236+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112237+ if (!grsec_enable_blackhole || (ret == 1 &&
112238+ (skb->dev->flags & IFF_LOOPBACK)))
112239+#endif
112240 tcp_v4_send_reset(NULL, skb);
112241 }
112242
112243diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
112244index 50277af..defe393 100644
112245--- a/net/ipv4/tcp_minisocks.c
112246+++ b/net/ipv4/tcp_minisocks.c
112247@@ -27,6 +27,10 @@
112248 #include <net/inet_common.h>
112249 #include <net/xfrm.h>
112250
112251+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112252+extern int grsec_enable_blackhole;
112253+#endif
112254+
112255 int sysctl_tcp_syncookies __read_mostly = 1;
112256 EXPORT_SYMBOL(sysctl_tcp_syncookies);
112257
112258@@ -788,7 +792,10 @@ embryonic_reset:
112259 * avoid becoming vulnerable to outside attack aiming at
112260 * resetting legit local connections.
112261 */
112262- req->rsk_ops->send_reset(sk, skb);
112263+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112264+ if (!grsec_enable_blackhole)
112265+#endif
112266+ req->rsk_ops->send_reset(sk, skb);
112267 } else if (fastopen) { /* received a valid RST pkt */
112268 reqsk_fastopen_remove(sk, req, true);
112269 tcp_reset(sk);
112270diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
112271index ebf5ff5..4d1ff32 100644
112272--- a/net/ipv4/tcp_probe.c
112273+++ b/net/ipv4/tcp_probe.c
112274@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
112275 if (cnt + width >= len)
112276 break;
112277
112278- if (copy_to_user(buf + cnt, tbuf, width))
112279+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
112280 return -EFAULT;
112281 cnt += width;
112282 }
112283diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
112284index 0732b78..a82bdc6 100644
112285--- a/net/ipv4/tcp_timer.c
112286+++ b/net/ipv4/tcp_timer.c
112287@@ -22,6 +22,10 @@
112288 #include <linux/gfp.h>
112289 #include <net/tcp.h>
112290
112291+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112292+extern int grsec_lastack_retries;
112293+#endif
112294+
112295 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
112296 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
112297 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
112298@@ -194,6 +198,13 @@ static int tcp_write_timeout(struct sock *sk)
112299 }
112300 }
112301
112302+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112303+ if ((sk->sk_state == TCP_LAST_ACK) &&
112304+ (grsec_lastack_retries > 0) &&
112305+ (grsec_lastack_retries < retry_until))
112306+ retry_until = grsec_lastack_retries;
112307+#endif
112308+
112309 if (retransmits_timed_out(sk, retry_until,
112310 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
112311 /* Has it gone just too far? */
112312diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
112313index 51f1745..4bc0427 100644
112314--- a/net/ipv4/udp.c
112315+++ b/net/ipv4/udp.c
112316@@ -87,6 +87,7 @@
112317 #include <linux/types.h>
112318 #include <linux/fcntl.h>
112319 #include <linux/module.h>
112320+#include <linux/security.h>
112321 #include <linux/socket.h>
112322 #include <linux/sockios.h>
112323 #include <linux/igmp.h>
112324@@ -115,6 +116,10 @@
112325 #include <net/busy_poll.h>
112326 #include "udp_impl.h"
112327
112328+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112329+extern int grsec_enable_blackhole;
112330+#endif
112331+
112332 struct udp_table udp_table __read_mostly;
112333 EXPORT_SYMBOL(udp_table);
112334
112335@@ -609,6 +614,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
112336 return true;
112337 }
112338
112339+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
112340+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
112341+
112342 /*
112343 * This routine is called by the ICMP module when it gets some
112344 * sort of error condition. If err < 0 then the socket should
112345@@ -946,9 +954,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
112346 dport = usin->sin_port;
112347 if (dport == 0)
112348 return -EINVAL;
112349+
112350+ err = gr_search_udp_sendmsg(sk, usin);
112351+ if (err)
112352+ return err;
112353 } else {
112354 if (sk->sk_state != TCP_ESTABLISHED)
112355 return -EDESTADDRREQ;
112356+
112357+ err = gr_search_udp_sendmsg(sk, NULL);
112358+ if (err)
112359+ return err;
112360+
112361 daddr = inet->inet_daddr;
112362 dport = inet->inet_dport;
112363 /* Open fast path for connected socket.
112364@@ -1196,7 +1213,7 @@ static unsigned int first_packet_length(struct sock *sk)
112365 IS_UDPLITE(sk));
112366 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112367 IS_UDPLITE(sk));
112368- atomic_inc(&sk->sk_drops);
112369+ atomic_inc_unchecked(&sk->sk_drops);
112370 __skb_unlink(skb, rcvq);
112371 __skb_queue_tail(&list_kill, skb);
112372 }
112373@@ -1276,6 +1293,10 @@ try_again:
112374 if (!skb)
112375 goto out;
112376
112377+ err = gr_search_udp_recvmsg(sk, skb);
112378+ if (err)
112379+ goto out_free;
112380+
112381 ulen = skb->len - sizeof(struct udphdr);
112382 copied = len;
112383 if (copied > ulen)
112384@@ -1308,7 +1329,7 @@ try_again:
112385 if (unlikely(err)) {
112386 trace_kfree_skb(skb, udp_recvmsg);
112387 if (!peeked) {
112388- atomic_inc(&sk->sk_drops);
112389+ atomic_inc_unchecked(&sk->sk_drops);
112390 UDP_INC_STATS_USER(sock_net(sk),
112391 UDP_MIB_INERRORS, is_udplite);
112392 }
112393@@ -1604,7 +1625,7 @@ csum_error:
112394 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
112395 drop:
112396 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
112397- atomic_inc(&sk->sk_drops);
112398+ atomic_inc_unchecked(&sk->sk_drops);
112399 kfree_skb(skb);
112400 return -1;
112401 }
112402@@ -1623,7 +1644,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
112403 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
112404
112405 if (!skb1) {
112406- atomic_inc(&sk->sk_drops);
112407+ atomic_inc_unchecked(&sk->sk_drops);
112408 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
112409 IS_UDPLITE(sk));
112410 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112411@@ -1829,6 +1850,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
112412 goto csum_error;
112413
112414 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
112415+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112416+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
112417+#endif
112418 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
112419
112420 /*
112421@@ -2426,7 +2450,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
112422 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
112423 0, sock_i_ino(sp),
112424 atomic_read(&sp->sk_refcnt), sp,
112425- atomic_read(&sp->sk_drops));
112426+ atomic_read_unchecked(&sp->sk_drops));
112427 }
112428
112429 int udp4_seq_show(struct seq_file *seq, void *v)
112430diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
112431index 6156f68..d6ab46d 100644
112432--- a/net/ipv4/xfrm4_policy.c
112433+++ b/net/ipv4/xfrm4_policy.c
112434@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
112435 fl4->flowi4_tos = iph->tos;
112436 }
112437
112438-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
112439+static int xfrm4_garbage_collect(struct dst_ops *ops)
112440 {
112441 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
112442
112443- xfrm4_policy_afinfo.garbage_collect(net);
112444+ xfrm_garbage_collect_deferred(net);
112445 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
112446 }
112447
112448@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
112449
112450 static int __net_init xfrm4_net_init(struct net *net)
112451 {
112452- struct ctl_table *table;
112453+ ctl_table_no_const *table = NULL;
112454 struct ctl_table_header *hdr;
112455
112456- table = xfrm4_policy_table;
112457 if (!net_eq(net, &init_net)) {
112458- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
112459+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
112460 if (!table)
112461 goto err_alloc;
112462
112463 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
112464- }
112465-
112466- hdr = register_net_sysctl(net, "net/ipv4", table);
112467+ hdr = register_net_sysctl(net, "net/ipv4", table);
112468+ } else
112469+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
112470 if (!hdr)
112471 goto err_reg;
112472
112473@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
112474 return 0;
112475
112476 err_reg:
112477- if (!net_eq(net, &init_net))
112478- kfree(table);
112479+ kfree(table);
112480 err_alloc:
112481 return -ENOMEM;
112482 }
112483diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
112484index b603002..0de5c88 100644
112485--- a/net/ipv6/addrconf.c
112486+++ b/net/ipv6/addrconf.c
112487@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
112488 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
112489 .mtu6 = IPV6_MIN_MTU,
112490 .accept_ra = 1,
112491- .accept_redirects = 1,
112492+ .accept_redirects = 0,
112493 .autoconf = 1,
112494 .force_mld_version = 0,
112495 .mldv1_unsolicited_report_interval = 10 * HZ,
112496@@ -209,7 +209,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
112497 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
112498 .mtu6 = IPV6_MIN_MTU,
112499 .accept_ra = 1,
112500- .accept_redirects = 1,
112501+ .accept_redirects = 0,
112502 .autoconf = 1,
112503 .force_mld_version = 0,
112504 .mldv1_unsolicited_report_interval = 10 * HZ,
112505@@ -607,7 +607,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
112506 idx = 0;
112507 head = &net->dev_index_head[h];
112508 rcu_read_lock();
112509- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
112510+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
112511 net->dev_base_seq;
112512 hlist_for_each_entry_rcu(dev, head, index_hlist) {
112513 if (idx < s_idx)
112514@@ -2438,7 +2438,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
112515 p.iph.ihl = 5;
112516 p.iph.protocol = IPPROTO_IPV6;
112517 p.iph.ttl = 64;
112518- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
112519+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
112520
112521 if (ops->ndo_do_ioctl) {
112522 mm_segment_t oldfs = get_fs();
112523@@ -3587,16 +3587,23 @@ static const struct file_operations if6_fops = {
112524 .release = seq_release_net,
112525 };
112526
112527+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
112528+extern void unregister_ipv6_seq_ops_addr(void);
112529+
112530 static int __net_init if6_proc_net_init(struct net *net)
112531 {
112532- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
112533+ register_ipv6_seq_ops_addr(&if6_seq_ops);
112534+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
112535+ unregister_ipv6_seq_ops_addr();
112536 return -ENOMEM;
112537+ }
112538 return 0;
112539 }
112540
112541 static void __net_exit if6_proc_net_exit(struct net *net)
112542 {
112543 remove_proc_entry("if_inet6", net->proc_net);
112544+ unregister_ipv6_seq_ops_addr();
112545 }
112546
112547 static struct pernet_operations if6_proc_net_ops = {
112548@@ -4215,7 +4222,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
112549 s_ip_idx = ip_idx = cb->args[2];
112550
112551 rcu_read_lock();
112552- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
112553+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
112554 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
112555 idx = 0;
112556 head = &net->dev_index_head[h];
112557@@ -4864,7 +4871,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
112558 rt_genid_bump_ipv6(net);
112559 break;
112560 }
112561- atomic_inc(&net->ipv6.dev_addr_genid);
112562+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
112563 }
112564
112565 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
112566@@ -4884,7 +4891,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
112567 int *valp = ctl->data;
112568 int val = *valp;
112569 loff_t pos = *ppos;
112570- struct ctl_table lctl;
112571+ ctl_table_no_const lctl;
112572 int ret;
112573
112574 /*
112575@@ -4909,7 +4916,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
112576 {
112577 struct inet6_dev *idev = ctl->extra1;
112578 int min_mtu = IPV6_MIN_MTU;
112579- struct ctl_table lctl;
112580+ ctl_table_no_const lctl;
112581
112582 lctl = *ctl;
112583 lctl.extra1 = &min_mtu;
112584@@ -4984,7 +4991,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
112585 int *valp = ctl->data;
112586 int val = *valp;
112587 loff_t pos = *ppos;
112588- struct ctl_table lctl;
112589+ ctl_table_no_const lctl;
112590 int ret;
112591
112592 /*
112593diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
112594index 98cc4cd..0768c4e 100644
112595--- a/net/ipv6/addrconf_core.c
112596+++ b/net/ipv6/addrconf_core.c
112597@@ -133,6 +133,14 @@ static void snmp6_free_dev(struct inet6_dev *idev)
112598 free_percpu(idev->stats.ipv6);
112599 }
112600
112601+static void in6_dev_finish_destroy_rcu(struct rcu_head *head)
112602+{
112603+ struct inet6_dev *idev = container_of(head, struct inet6_dev, rcu);
112604+
112605+ snmp6_free_dev(idev);
112606+ kfree(idev);
112607+}
112608+
112609 /* Nobody refers to this device, we may destroy it. */
112610
112611 void in6_dev_finish_destroy(struct inet6_dev *idev)
112612@@ -151,7 +159,6 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)
112613 pr_warn("Freeing alive inet6 device %p\n", idev);
112614 return;
112615 }
112616- snmp6_free_dev(idev);
112617- kfree_rcu(idev, rcu);
112618+ call_rcu(&idev->rcu, in6_dev_finish_destroy_rcu);
112619 }
112620 EXPORT_SYMBOL(in6_dev_finish_destroy);
112621diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
112622index e8c4400..a4cd5da 100644
112623--- a/net/ipv6/af_inet6.c
112624+++ b/net/ipv6/af_inet6.c
112625@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
112626 net->ipv6.sysctl.icmpv6_time = 1*HZ;
112627 net->ipv6.sysctl.flowlabel_consistency = 1;
112628 net->ipv6.sysctl.auto_flowlabels = 0;
112629- atomic_set(&net->ipv6.fib6_sernum, 1);
112630+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
112631
112632 err = ipv6_init_mibs(net);
112633 if (err)
112634diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
112635index ace8dac..bd6942d 100644
112636--- a/net/ipv6/datagram.c
112637+++ b/net/ipv6/datagram.c
112638@@ -957,5 +957,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
112639 0,
112640 sock_i_ino(sp),
112641 atomic_read(&sp->sk_refcnt), sp,
112642- atomic_read(&sp->sk_drops));
112643+ atomic_read_unchecked(&sp->sk_drops));
112644 }
112645diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
112646index a5e9519..16b7412 100644
112647--- a/net/ipv6/icmp.c
112648+++ b/net/ipv6/icmp.c
112649@@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
112650
112651 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
112652 {
112653- struct ctl_table *table;
112654+ ctl_table_no_const *table;
112655
112656 table = kmemdup(ipv6_icmp_table_template,
112657 sizeof(ipv6_icmp_table_template),
112658diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
112659index 263ef41..88c7be8 100644
112660--- a/net/ipv6/ip6_fib.c
112661+++ b/net/ipv6/ip6_fib.c
112662@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
112663 int new, old;
112664
112665 do {
112666- old = atomic_read(&net->ipv6.fib6_sernum);
112667+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
112668 new = old < INT_MAX ? old + 1 : 1;
112669- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
112670+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
112671 old, new) != old);
112672 return new;
112673 }
112674diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
112675index bc28b7d..a08feea 100644
112676--- a/net/ipv6/ip6_gre.c
112677+++ b/net/ipv6/ip6_gre.c
112678@@ -71,8 +71,8 @@ struct ip6gre_net {
112679 struct net_device *fb_tunnel_dev;
112680 };
112681
112682-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
112683-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
112684+static struct rtnl_link_ops ip6gre_link_ops;
112685+static struct rtnl_link_ops ip6gre_tap_ops;
112686 static int ip6gre_tunnel_init(struct net_device *dev);
112687 static void ip6gre_tunnel_setup(struct net_device *dev);
112688 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
112689@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
112690 }
112691
112692
112693-static struct inet6_protocol ip6gre_protocol __read_mostly = {
112694+static struct inet6_protocol ip6gre_protocol = {
112695 .handler = ip6gre_rcv,
112696 .err_handler = ip6gre_err,
112697 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
112698@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
112699 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
112700 };
112701
112702-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
112703+static struct rtnl_link_ops ip6gre_link_ops = {
112704 .kind = "ip6gre",
112705 .maxtype = IFLA_GRE_MAX,
112706 .policy = ip6gre_policy,
112707@@ -1665,7 +1665,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
112708 .get_link_net = ip6_tnl_get_link_net,
112709 };
112710
112711-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
112712+static struct rtnl_link_ops ip6gre_tap_ops = {
112713 .kind = "ip6gretap",
112714 .maxtype = IFLA_GRE_MAX,
112715 .policy = ip6gre_policy,
112716diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
112717index ddd94ec..b7cfefb 100644
112718--- a/net/ipv6/ip6_tunnel.c
112719+++ b/net/ipv6/ip6_tunnel.c
112720@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
112721
112722 static int ip6_tnl_dev_init(struct net_device *dev);
112723 static void ip6_tnl_dev_setup(struct net_device *dev);
112724-static struct rtnl_link_ops ip6_link_ops __read_mostly;
112725+static struct rtnl_link_ops ip6_link_ops;
112726
112727 static int ip6_tnl_net_id __read_mostly;
112728 struct ip6_tnl_net {
112729@@ -1780,7 +1780,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
112730 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
112731 };
112732
112733-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
112734+static struct rtnl_link_ops ip6_link_ops = {
112735 .kind = "ip6tnl",
112736 .maxtype = IFLA_IPTUN_MAX,
112737 .policy = ip6_tnl_policy,
112738diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
112739index 5fb9e21..92bf04b 100644
112740--- a/net/ipv6/ip6_vti.c
112741+++ b/net/ipv6/ip6_vti.c
112742@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
112743
112744 static int vti6_dev_init(struct net_device *dev);
112745 static void vti6_dev_setup(struct net_device *dev);
112746-static struct rtnl_link_ops vti6_link_ops __read_mostly;
112747+static struct rtnl_link_ops vti6_link_ops;
112748
112749 static int vti6_net_id __read_mostly;
112750 struct vti6_net {
112751@@ -1004,7 +1004,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
112752 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
112753 };
112754
112755-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
112756+static struct rtnl_link_ops vti6_link_ops = {
112757 .kind = "vti6",
112758 .maxtype = IFLA_VTI_MAX,
112759 .policy = vti6_policy,
112760diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
112761index 8d766d9..dcdfea7 100644
112762--- a/net/ipv6/ipv6_sockglue.c
112763+++ b/net/ipv6/ipv6_sockglue.c
112764@@ -989,7 +989,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
112765 if (sk->sk_type != SOCK_STREAM)
112766 return -ENOPROTOOPT;
112767
112768- msg.msg_control = optval;
112769+ msg.msg_control = (void __force_kernel *)optval;
112770 msg.msg_controllen = len;
112771 msg.msg_flags = flags;
112772
112773diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
112774index bb00c6f..16c90d7 100644
112775--- a/net/ipv6/netfilter/ip6_tables.c
112776+++ b/net/ipv6/netfilter/ip6_tables.c
112777@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
112778 #endif
112779
112780 static int get_info(struct net *net, void __user *user,
112781- const int *len, int compat)
112782+ int len, int compat)
112783 {
112784 char name[XT_TABLE_MAXNAMELEN];
112785 struct xt_table *t;
112786 int ret;
112787
112788- if (*len != sizeof(struct ip6t_getinfo)) {
112789- duprintf("length %u != %zu\n", *len,
112790+ if (len != sizeof(struct ip6t_getinfo)) {
112791+ duprintf("length %u != %zu\n", len,
112792 sizeof(struct ip6t_getinfo));
112793 return -EINVAL;
112794 }
112795@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
112796 info.size = private->size;
112797 strcpy(info.name, name);
112798
112799- if (copy_to_user(user, &info, *len) != 0)
112800+ if (copy_to_user(user, &info, len) != 0)
112801 ret = -EFAULT;
112802 else
112803 ret = 0;
112804@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
112805
112806 switch (cmd) {
112807 case IP6T_SO_GET_INFO:
112808- ret = get_info(sock_net(sk), user, len, 1);
112809+ ret = get_info(sock_net(sk), user, *len, 1);
112810 break;
112811 case IP6T_SO_GET_ENTRIES:
112812 ret = compat_get_entries(sock_net(sk), user, len);
112813@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
112814
112815 switch (cmd) {
112816 case IP6T_SO_GET_INFO:
112817- ret = get_info(sock_net(sk), user, len, 0);
112818+ ret = get_info(sock_net(sk), user, *len, 0);
112819 break;
112820
112821 case IP6T_SO_GET_ENTRIES:
112822diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
112823index 6f187c8..34b367f 100644
112824--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
112825+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
112826@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
112827
112828 static int nf_ct_frag6_sysctl_register(struct net *net)
112829 {
112830- struct ctl_table *table;
112831+ ctl_table_no_const *table = NULL;
112832 struct ctl_table_header *hdr;
112833
112834- table = nf_ct_frag6_sysctl_table;
112835 if (!net_eq(net, &init_net)) {
112836- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
112837+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
112838 GFP_KERNEL);
112839 if (table == NULL)
112840 goto err_alloc;
112841@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
112842 table[2].data = &net->nf_frag.frags.high_thresh;
112843 table[2].extra1 = &net->nf_frag.frags.low_thresh;
112844 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
112845- }
112846-
112847- hdr = register_net_sysctl(net, "net/netfilter", table);
112848+ hdr = register_net_sysctl(net, "net/netfilter", table);
112849+ } else
112850+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
112851 if (hdr == NULL)
112852 goto err_reg;
112853
112854@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
112855 return 0;
112856
112857 err_reg:
112858- if (!net_eq(net, &init_net))
112859- kfree(table);
112860+ kfree(table);
112861 err_alloc:
112862 return -ENOMEM;
112863 }
112864diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
112865index a2dfff6..1e52e6d 100644
112866--- a/net/ipv6/ping.c
112867+++ b/net/ipv6/ping.c
112868@@ -241,6 +241,24 @@ static struct pernet_operations ping_v6_net_ops = {
112869 };
112870 #endif
112871
112872+static struct pingv6_ops real_pingv6_ops = {
112873+ .ipv6_recv_error = ipv6_recv_error,
112874+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
112875+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
112876+ .icmpv6_err_convert = icmpv6_err_convert,
112877+ .ipv6_icmp_error = ipv6_icmp_error,
112878+ .ipv6_chk_addr = ipv6_chk_addr,
112879+};
112880+
112881+static struct pingv6_ops dummy_pingv6_ops = {
112882+ .ipv6_recv_error = dummy_ipv6_recv_error,
112883+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
112884+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
112885+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
112886+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
112887+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
112888+};
112889+
112890 int __init pingv6_init(void)
112891 {
112892 #ifdef CONFIG_PROC_FS
112893@@ -248,13 +266,7 @@ int __init pingv6_init(void)
112894 if (ret)
112895 return ret;
112896 #endif
112897- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
112898- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
112899- pingv6_ops.ip6_datagram_recv_specific_ctl =
112900- ip6_datagram_recv_specific_ctl;
112901- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
112902- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
112903- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
112904+ pingv6_ops = &real_pingv6_ops;
112905 return inet6_register_protosw(&pingv6_protosw);
112906 }
112907
112908@@ -263,14 +275,9 @@ int __init pingv6_init(void)
112909 */
112910 void pingv6_exit(void)
112911 {
112912- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
112913- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
112914- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
112915- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
112916- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
112917- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
112918 #ifdef CONFIG_PROC_FS
112919 unregister_pernet_subsys(&ping_v6_net_ops);
112920 #endif
112921+ pingv6_ops = &dummy_pingv6_ops;
112922 inet6_unregister_protosw(&pingv6_protosw);
112923 }
112924diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
112925index 679253d0..70b653c 100644
112926--- a/net/ipv6/proc.c
112927+++ b/net/ipv6/proc.c
112928@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
112929 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
112930 goto proc_snmp6_fail;
112931
112932- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
112933+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
112934 if (!net->mib.proc_net_devsnmp6)
112935 goto proc_dev_snmp6_fail;
112936 return 0;
112937diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
112938index dae7f1a..783b20d 100644
112939--- a/net/ipv6/raw.c
112940+++ b/net/ipv6/raw.c
112941@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
112942 {
112943 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
112944 skb_checksum_complete(skb)) {
112945- atomic_inc(&sk->sk_drops);
112946+ atomic_inc_unchecked(&sk->sk_drops);
112947 kfree_skb(skb);
112948 return NET_RX_DROP;
112949 }
112950@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
112951 struct raw6_sock *rp = raw6_sk(sk);
112952
112953 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
112954- atomic_inc(&sk->sk_drops);
112955+ atomic_inc_unchecked(&sk->sk_drops);
112956 kfree_skb(skb);
112957 return NET_RX_DROP;
112958 }
112959@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
112960
112961 if (inet->hdrincl) {
112962 if (skb_checksum_complete(skb)) {
112963- atomic_inc(&sk->sk_drops);
112964+ atomic_inc_unchecked(&sk->sk_drops);
112965 kfree_skb(skb);
112966 return NET_RX_DROP;
112967 }
112968@@ -609,7 +609,7 @@ out:
112969 return err;
112970 }
112971
112972-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
112973+static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
112974 struct flowi6 *fl6, struct dst_entry **dstp,
112975 unsigned int flags)
112976 {
112977@@ -915,12 +915,15 @@ do_confirm:
112978 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
112979 char __user *optval, int optlen)
112980 {
112981+ struct icmp6_filter filter;
112982+
112983 switch (optname) {
112984 case ICMPV6_FILTER:
112985 if (optlen > sizeof(struct icmp6_filter))
112986 optlen = sizeof(struct icmp6_filter);
112987- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
112988+ if (copy_from_user(&filter, optval, optlen))
112989 return -EFAULT;
112990+ raw6_sk(sk)->filter = filter;
112991 return 0;
112992 default:
112993 return -ENOPROTOOPT;
112994@@ -933,6 +936,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
112995 char __user *optval, int __user *optlen)
112996 {
112997 int len;
112998+ struct icmp6_filter filter;
112999
113000 switch (optname) {
113001 case ICMPV6_FILTER:
113002@@ -944,7 +948,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
113003 len = sizeof(struct icmp6_filter);
113004 if (put_user(len, optlen))
113005 return -EFAULT;
113006- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
113007+ filter = raw6_sk(sk)->filter;
113008+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
113009 return -EFAULT;
113010 return 0;
113011 default:
113012diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
113013index d7d70e6..bd5e9fc 100644
113014--- a/net/ipv6/reassembly.c
113015+++ b/net/ipv6/reassembly.c
113016@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
113017
113018 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
113019 {
113020- struct ctl_table *table;
113021+ ctl_table_no_const *table = NULL;
113022 struct ctl_table_header *hdr;
113023
113024- table = ip6_frags_ns_ctl_table;
113025 if (!net_eq(net, &init_net)) {
113026- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
113027+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
113028 if (table == NULL)
113029 goto err_alloc;
113030
113031@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
113032 /* Don't export sysctls to unprivileged users */
113033 if (net->user_ns != &init_user_ns)
113034 table[0].procname = NULL;
113035- }
113036+ hdr = register_net_sysctl(net, "net/ipv6", table);
113037+ } else
113038+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
113039
113040- hdr = register_net_sysctl(net, "net/ipv6", table);
113041 if (hdr == NULL)
113042 goto err_reg;
113043
113044@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
113045 return 0;
113046
113047 err_reg:
113048- if (!net_eq(net, &init_net))
113049- kfree(table);
113050+ kfree(table);
113051 err_alloc:
113052 return -ENOMEM;
113053 }
113054diff --git a/net/ipv6/route.c b/net/ipv6/route.c
113055index 4688bd4..584453d 100644
113056--- a/net/ipv6/route.c
113057+++ b/net/ipv6/route.c
113058@@ -3029,7 +3029,7 @@ struct ctl_table ipv6_route_table_template[] = {
113059
113060 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
113061 {
113062- struct ctl_table *table;
113063+ ctl_table_no_const *table;
113064
113065 table = kmemdup(ipv6_route_table_template,
113066 sizeof(ipv6_route_table_template),
113067diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
113068index e4cbd57..02b1aaa 100644
113069--- a/net/ipv6/sit.c
113070+++ b/net/ipv6/sit.c
113071@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
113072 static void ipip6_dev_free(struct net_device *dev);
113073 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
113074 __be32 *v4dst);
113075-static struct rtnl_link_ops sit_link_ops __read_mostly;
113076+static struct rtnl_link_ops sit_link_ops;
113077
113078 static int sit_net_id __read_mostly;
113079 struct sit_net {
113080@@ -1751,7 +1751,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
113081 unregister_netdevice_queue(dev, head);
113082 }
113083
113084-static struct rtnl_link_ops sit_link_ops __read_mostly = {
113085+static struct rtnl_link_ops sit_link_ops = {
113086 .kind = "sit",
113087 .maxtype = IFLA_IPTUN_MAX,
113088 .policy = ipip6_policy,
113089diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
113090index c5c10fa..2577d51 100644
113091--- a/net/ipv6/sysctl_net_ipv6.c
113092+++ b/net/ipv6/sysctl_net_ipv6.c
113093@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
113094
113095 static int __net_init ipv6_sysctl_net_init(struct net *net)
113096 {
113097- struct ctl_table *ipv6_table;
113098+ ctl_table_no_const *ipv6_table;
113099 struct ctl_table *ipv6_route_table;
113100 struct ctl_table *ipv6_icmp_table;
113101 int err;
113102diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
113103index 5ca3bc8..8c53c81 100644
113104--- a/net/ipv6/tcp_ipv6.c
113105+++ b/net/ipv6/tcp_ipv6.c
113106@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
113107 }
113108 }
113109
113110+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113111+extern int grsec_enable_blackhole;
113112+#endif
113113+
113114 static void tcp_v6_hash(struct sock *sk)
113115 {
113116 if (sk->sk_state != TCP_CLOSE) {
113117@@ -1345,6 +1349,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
113118 return 0;
113119
113120 reset:
113121+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113122+ if (!grsec_enable_blackhole)
113123+#endif
113124 tcp_v6_send_reset(sk, skb);
113125 discard:
113126 if (opt_skb)
113127@@ -1454,12 +1461,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
113128
113129 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
113130 inet6_iif(skb));
113131- if (!sk)
113132+ if (!sk) {
113133+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113134+ ret = 1;
113135+#endif
113136 goto no_tcp_socket;
113137+ }
113138
113139 process:
113140- if (sk->sk_state == TCP_TIME_WAIT)
113141+ if (sk->sk_state == TCP_TIME_WAIT) {
113142+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113143+ ret = 2;
113144+#endif
113145 goto do_time_wait;
113146+ }
113147
113148 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
113149 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
113150@@ -1510,6 +1525,10 @@ csum_error:
113151 bad_packet:
113152 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
113153 } else {
113154+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113155+ if (!grsec_enable_blackhole || (ret == 1 &&
113156+ (skb->dev->flags & IFF_LOOPBACK)))
113157+#endif
113158 tcp_v6_send_reset(NULL, skb);
113159 }
113160
113161diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
113162index 1c9512a..786b8d6 100644
113163--- a/net/ipv6/udp.c
113164+++ b/net/ipv6/udp.c
113165@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
113166 udp_ipv6_hash_secret + net_hash_mix(net));
113167 }
113168
113169+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113170+extern int grsec_enable_blackhole;
113171+#endif
113172+
113173 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
113174 {
113175 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
113176@@ -448,7 +452,7 @@ try_again:
113177 if (unlikely(err)) {
113178 trace_kfree_skb(skb, udpv6_recvmsg);
113179 if (!peeked) {
113180- atomic_inc(&sk->sk_drops);
113181+ atomic_inc_unchecked(&sk->sk_drops);
113182 if (is_udp4)
113183 UDP_INC_STATS_USER(sock_net(sk),
113184 UDP_MIB_INERRORS,
113185@@ -712,7 +716,7 @@ csum_error:
113186 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
113187 drop:
113188 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
113189- atomic_inc(&sk->sk_drops);
113190+ atomic_inc_unchecked(&sk->sk_drops);
113191 kfree_skb(skb);
113192 return -1;
113193 }
113194@@ -753,7 +757,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
113195 if (likely(skb1 == NULL))
113196 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
113197 if (!skb1) {
113198- atomic_inc(&sk->sk_drops);
113199+ atomic_inc_unchecked(&sk->sk_drops);
113200 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
113201 IS_UDPLITE(sk));
113202 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
113203@@ -937,6 +941,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
113204 goto csum_error;
113205
113206 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
113207+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113208+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
113209+#endif
113210 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
113211
113212 kfree_skb(skb);
113213diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
113214index 8d2d01b4..313511e 100644
113215--- a/net/ipv6/xfrm6_policy.c
113216+++ b/net/ipv6/xfrm6_policy.c
113217@@ -224,11 +224,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
113218 }
113219 }
113220
113221-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
113222+static int xfrm6_garbage_collect(struct dst_ops *ops)
113223 {
113224 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
113225
113226- xfrm6_policy_afinfo.garbage_collect(net);
113227+ xfrm_garbage_collect_deferred(net);
113228 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
113229 }
113230
113231@@ -341,19 +341,19 @@ static struct ctl_table xfrm6_policy_table[] = {
113232
113233 static int __net_init xfrm6_net_init(struct net *net)
113234 {
113235- struct ctl_table *table;
113236+ ctl_table_no_const *table = NULL;
113237 struct ctl_table_header *hdr;
113238
113239- table = xfrm6_policy_table;
113240 if (!net_eq(net, &init_net)) {
113241- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
113242+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
113243 if (!table)
113244 goto err_alloc;
113245
113246 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
113247- }
113248+ hdr = register_net_sysctl(net, "net/ipv6", table);
113249+ } else
113250+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
113251
113252- hdr = register_net_sysctl(net, "net/ipv6", table);
113253 if (!hdr)
113254 goto err_reg;
113255
113256@@ -361,8 +361,7 @@ static int __net_init xfrm6_net_init(struct net *net)
113257 return 0;
113258
113259 err_reg:
113260- if (!net_eq(net, &init_net))
113261- kfree(table);
113262+ kfree(table);
113263 err_alloc:
113264 return -ENOMEM;
113265 }
113266diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
113267index c1d247e..9e5949d 100644
113268--- a/net/ipx/ipx_proc.c
113269+++ b/net/ipx/ipx_proc.c
113270@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
113271 struct proc_dir_entry *p;
113272 int rc = -ENOMEM;
113273
113274- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
113275+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
113276
113277 if (!ipx_proc_dir)
113278 goto out;
113279diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
113280index 683346d..cb0e12d 100644
113281--- a/net/irda/ircomm/ircomm_tty.c
113282+++ b/net/irda/ircomm/ircomm_tty.c
113283@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113284 add_wait_queue(&port->open_wait, &wait);
113285
113286 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
113287- __FILE__, __LINE__, tty->driver->name, port->count);
113288+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113289
113290 spin_lock_irqsave(&port->lock, flags);
113291- port->count--;
113292+ atomic_dec(&port->count);
113293 port->blocked_open++;
113294 spin_unlock_irqrestore(&port->lock, flags);
113295
113296@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113297 }
113298
113299 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
113300- __FILE__, __LINE__, tty->driver->name, port->count);
113301+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113302
113303 schedule();
113304 }
113305@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113306
113307 spin_lock_irqsave(&port->lock, flags);
113308 if (!tty_hung_up_p(filp))
113309- port->count++;
113310+ atomic_inc(&port->count);
113311 port->blocked_open--;
113312 spin_unlock_irqrestore(&port->lock, flags);
113313
113314 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
113315- __FILE__, __LINE__, tty->driver->name, port->count);
113316+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113317
113318 if (!retval)
113319 port->flags |= ASYNC_NORMAL_ACTIVE;
113320@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
113321
113322 /* ++ is not atomic, so this should be protected - Jean II */
113323 spin_lock_irqsave(&self->port.lock, flags);
113324- self->port.count++;
113325+ atomic_inc(&self->port.count);
113326 spin_unlock_irqrestore(&self->port.lock, flags);
113327 tty_port_tty_set(&self->port, tty);
113328
113329 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
113330- self->line, self->port.count);
113331+ self->line, atomic_read(&self->port.count));
113332
113333 /* Not really used by us, but lets do it anyway */
113334 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
113335@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
113336 tty_kref_put(port->tty);
113337 }
113338 port->tty = NULL;
113339- port->count = 0;
113340+ atomic_set(&port->count, 0);
113341 spin_unlock_irqrestore(&port->lock, flags);
113342
113343 wake_up_interruptible(&port->open_wait);
113344@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
113345 seq_putc(m, '\n');
113346
113347 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
113348- seq_printf(m, "Open count: %d\n", self->port.count);
113349+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
113350 seq_printf(m, "Max data size: %d\n", self->max_data_size);
113351 seq_printf(m, "Max header size: %d\n", self->max_header_size);
113352
113353diff --git a/net/irda/irproc.c b/net/irda/irproc.c
113354index b9ac598..f88cc56 100644
113355--- a/net/irda/irproc.c
113356+++ b/net/irda/irproc.c
113357@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
113358 {
113359 int i;
113360
113361- proc_irda = proc_mkdir("irda", init_net.proc_net);
113362+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
113363 if (proc_irda == NULL)
113364 return;
113365
113366diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
113367index 53d9311..cbaf99f 100644
113368--- a/net/iucv/af_iucv.c
113369+++ b/net/iucv/af_iucv.c
113370@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
113371 {
113372 char name[12];
113373
113374- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
113375+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
113376 while (__iucv_get_sock_by_name(name)) {
113377 sprintf(name, "%08x",
113378- atomic_inc_return(&iucv_sk_list.autobind_name));
113379+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
113380 }
113381 memcpy(iucv->src_name, name, 8);
113382 }
113383diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
113384index 2a6a1fd..6c112b0 100644
113385--- a/net/iucv/iucv.c
113386+++ b/net/iucv/iucv.c
113387@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
113388 return NOTIFY_OK;
113389 }
113390
113391-static struct notifier_block __refdata iucv_cpu_notifier = {
113392+static struct notifier_block iucv_cpu_notifier = {
113393 .notifier_call = iucv_cpu_notify,
113394 };
113395
113396diff --git a/net/key/af_key.c b/net/key/af_key.c
113397index f8ac939..1e189bf 100644
113398--- a/net/key/af_key.c
113399+++ b/net/key/af_key.c
113400@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
113401 static u32 get_acqseq(void)
113402 {
113403 u32 res;
113404- static atomic_t acqseq;
113405+ static atomic_unchecked_t acqseq;
113406
113407 do {
113408- res = atomic_inc_return(&acqseq);
113409+ res = atomic_inc_return_unchecked(&acqseq);
113410 } while (!res);
113411 return res;
113412 }
113413diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
113414index 781b3a2..73a7434 100644
113415--- a/net/l2tp/l2tp_eth.c
113416+++ b/net/l2tp/l2tp_eth.c
113417@@ -42,12 +42,12 @@ struct l2tp_eth {
113418 struct sock *tunnel_sock;
113419 struct l2tp_session *session;
113420 struct list_head list;
113421- atomic_long_t tx_bytes;
113422- atomic_long_t tx_packets;
113423- atomic_long_t tx_dropped;
113424- atomic_long_t rx_bytes;
113425- atomic_long_t rx_packets;
113426- atomic_long_t rx_errors;
113427+ atomic_long_unchecked_t tx_bytes;
113428+ atomic_long_unchecked_t tx_packets;
113429+ atomic_long_unchecked_t tx_dropped;
113430+ atomic_long_unchecked_t rx_bytes;
113431+ atomic_long_unchecked_t rx_packets;
113432+ atomic_long_unchecked_t rx_errors;
113433 };
113434
113435 /* via l2tp_session_priv() */
113436@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
113437 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
113438
113439 if (likely(ret == NET_XMIT_SUCCESS)) {
113440- atomic_long_add(len, &priv->tx_bytes);
113441- atomic_long_inc(&priv->tx_packets);
113442+ atomic_long_add_unchecked(len, &priv->tx_bytes);
113443+ atomic_long_inc_unchecked(&priv->tx_packets);
113444 } else {
113445- atomic_long_inc(&priv->tx_dropped);
113446+ atomic_long_inc_unchecked(&priv->tx_dropped);
113447 }
113448 return NETDEV_TX_OK;
113449 }
113450@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
113451 {
113452 struct l2tp_eth *priv = netdev_priv(dev);
113453
113454- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
113455- stats->tx_packets = atomic_long_read(&priv->tx_packets);
113456- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
113457- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
113458- stats->rx_packets = atomic_long_read(&priv->rx_packets);
113459- stats->rx_errors = atomic_long_read(&priv->rx_errors);
113460+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
113461+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
113462+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
113463+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
113464+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
113465+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
113466 return stats;
113467 }
113468
113469@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
113470 nf_reset(skb);
113471
113472 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
113473- atomic_long_inc(&priv->rx_packets);
113474- atomic_long_add(data_len, &priv->rx_bytes);
113475+ atomic_long_inc_unchecked(&priv->rx_packets);
113476+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
113477 } else {
113478- atomic_long_inc(&priv->rx_errors);
113479+ atomic_long_inc_unchecked(&priv->rx_errors);
113480 }
113481 return;
113482
113483 error:
113484- atomic_long_inc(&priv->rx_errors);
113485+ atomic_long_inc_unchecked(&priv->rx_errors);
113486 kfree_skb(skb);
113487 }
113488
113489diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
113490index 05dfc8aa..df6cfd7 100644
113491--- a/net/l2tp/l2tp_ip.c
113492+++ b/net/l2tp/l2tp_ip.c
113493@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
113494 .ops = &l2tp_ip_ops,
113495 };
113496
113497-static struct net_protocol l2tp_ip_protocol __read_mostly = {
113498+static const struct net_protocol l2tp_ip_protocol = {
113499 .handler = l2tp_ip_recv,
113500 .netns_ok = 1,
113501 };
113502diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
113503index 8611f1b..bc60a2d 100644
113504--- a/net/l2tp/l2tp_ip6.c
113505+++ b/net/l2tp/l2tp_ip6.c
113506@@ -757,7 +757,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
113507 .ops = &l2tp_ip6_ops,
113508 };
113509
113510-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
113511+static const struct inet6_protocol l2tp_ip6_protocol = {
113512 .handler = l2tp_ip6_recv,
113513 };
113514
113515diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
113516index 1a3c7e0..80f8b0c 100644
113517--- a/net/llc/llc_proc.c
113518+++ b/net/llc/llc_proc.c
113519@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
113520 int rc = -ENOMEM;
113521 struct proc_dir_entry *p;
113522
113523- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
113524+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
113525 if (!llc_proc_dir)
113526 goto out;
113527
113528diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
113529index dd4ff36..3462997 100644
113530--- a/net/mac80211/cfg.c
113531+++ b/net/mac80211/cfg.c
113532@@ -581,7 +581,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
113533 ret = ieee80211_vif_use_channel(sdata, chandef,
113534 IEEE80211_CHANCTX_EXCLUSIVE);
113535 }
113536- } else if (local->open_count == local->monitors) {
113537+ } else if (local_read(&local->open_count) == local->monitors) {
113538 local->_oper_chandef = *chandef;
113539 ieee80211_hw_config(local, 0);
113540 }
113541@@ -3468,7 +3468,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
113542 else
113543 local->probe_req_reg--;
113544
113545- if (!local->open_count)
113546+ if (!local_read(&local->open_count))
113547 break;
113548
113549 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
113550@@ -3603,8 +3603,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
113551 if (chanctx_conf) {
113552 *chandef = sdata->vif.bss_conf.chandef;
113553 ret = 0;
113554- } else if (local->open_count > 0 &&
113555- local->open_count == local->monitors &&
113556+ } else if (local_read(&local->open_count) > 0 &&
113557+ local_read(&local->open_count) == local->monitors &&
113558 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
113559 if (local->use_chanctx)
113560 *chandef = local->monitor_chandef;
113561diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
113562index 81e8dc5..5b77c58 100644
113563--- a/net/mac80211/ieee80211_i.h
113564+++ b/net/mac80211/ieee80211_i.h
113565@@ -29,6 +29,7 @@
113566 #include <net/ieee80211_radiotap.h>
113567 #include <net/cfg80211.h>
113568 #include <net/mac80211.h>
113569+#include <asm/local.h>
113570 #include "key.h"
113571 #include "sta_info.h"
113572 #include "debug.h"
113573@@ -1129,7 +1130,7 @@ struct ieee80211_local {
113574 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
113575 spinlock_t queue_stop_reason_lock;
113576
113577- int open_count;
113578+ local_t open_count;
113579 int monitors, cooked_mntrs;
113580 /* number of interfaces with corresponding FIF_ flags */
113581 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
113582diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
113583index 81a2751..c06a026 100644
113584--- a/net/mac80211/iface.c
113585+++ b/net/mac80211/iface.c
113586@@ -544,7 +544,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113587 break;
113588 }
113589
113590- if (local->open_count == 0) {
113591+ if (local_read(&local->open_count) == 0) {
113592 res = drv_start(local);
113593 if (res)
113594 goto err_del_bss;
113595@@ -591,7 +591,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113596 res = drv_add_interface(local, sdata);
113597 if (res)
113598 goto err_stop;
113599- } else if (local->monitors == 0 && local->open_count == 0) {
113600+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
113601 res = ieee80211_add_virtual_monitor(local);
113602 if (res)
113603 goto err_stop;
113604@@ -701,7 +701,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113605 atomic_inc(&local->iff_promiscs);
113606
113607 if (coming_up)
113608- local->open_count++;
113609+ local_inc(&local->open_count);
113610
113611 if (hw_reconf_flags)
113612 ieee80211_hw_config(local, hw_reconf_flags);
113613@@ -739,7 +739,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113614 err_del_interface:
113615 drv_remove_interface(local, sdata);
113616 err_stop:
113617- if (!local->open_count)
113618+ if (!local_read(&local->open_count))
113619 drv_stop(local);
113620 err_del_bss:
113621 sdata->bss = NULL;
113622@@ -907,7 +907,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113623 }
113624
113625 if (going_down)
113626- local->open_count--;
113627+ local_dec(&local->open_count);
113628
113629 switch (sdata->vif.type) {
113630 case NL80211_IFTYPE_AP_VLAN:
113631@@ -969,7 +969,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113632 }
113633 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
113634
113635- if (local->open_count == 0)
113636+ if (local_read(&local->open_count) == 0)
113637 ieee80211_clear_tx_pending(local);
113638
113639 /*
113640@@ -1012,7 +1012,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113641 if (cancel_scan)
113642 flush_delayed_work(&local->scan_work);
113643
113644- if (local->open_count == 0) {
113645+ if (local_read(&local->open_count) == 0) {
113646 ieee80211_stop_device(local);
113647
113648 /* no reconfiguring after stop! */
113649@@ -1023,7 +1023,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113650 ieee80211_configure_filter(local);
113651 ieee80211_hw_config(local, hw_reconf_flags);
113652
113653- if (local->monitors == local->open_count)
113654+ if (local->monitors == local_read(&local->open_count))
113655 ieee80211_add_virtual_monitor(local);
113656 }
113657
113658diff --git a/net/mac80211/main.c b/net/mac80211/main.c
113659index 5e09d35..e2fdbe2 100644
113660--- a/net/mac80211/main.c
113661+++ b/net/mac80211/main.c
113662@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
113663 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
113664 IEEE80211_CONF_CHANGE_POWER);
113665
113666- if (changed && local->open_count) {
113667+ if (changed && local_read(&local->open_count)) {
113668 ret = drv_config(local, changed);
113669 /*
113670 * Goal:
113671diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
113672index ca405b6..6cc8bee 100644
113673--- a/net/mac80211/pm.c
113674+++ b/net/mac80211/pm.c
113675@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113676 struct ieee80211_sub_if_data *sdata;
113677 struct sta_info *sta;
113678
113679- if (!local->open_count)
113680+ if (!local_read(&local->open_count))
113681 goto suspend;
113682
113683 ieee80211_scan_cancel(local);
113684@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113685 cancel_work_sync(&local->dynamic_ps_enable_work);
113686 del_timer_sync(&local->dynamic_ps_timer);
113687
113688- local->wowlan = wowlan && local->open_count;
113689+ local->wowlan = wowlan && local_read(&local->open_count);
113690 if (local->wowlan) {
113691 int err = drv_suspend(local, wowlan);
113692 if (err < 0) {
113693@@ -126,7 +126,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113694 WARN_ON(!list_empty(&local->chanctx_list));
113695
113696 /* stop hardware - this must stop RX */
113697- if (local->open_count)
113698+ if (local_read(&local->open_count))
113699 ieee80211_stop_device(local);
113700
113701 suspend:
113702diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
113703index d53355b..21f583a 100644
113704--- a/net/mac80211/rate.c
113705+++ b/net/mac80211/rate.c
113706@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
113707
113708 ASSERT_RTNL();
113709
113710- if (local->open_count)
113711+ if (local_read(&local->open_count))
113712 return -EBUSY;
113713
113714 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
113715diff --git a/net/mac80211/util.c b/net/mac80211/util.c
113716index 747bdcf..eb2b981 100644
113717--- a/net/mac80211/util.c
113718+++ b/net/mac80211/util.c
113719@@ -1741,7 +1741,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113720 bool sched_scan_stopped = false;
113721
113722 /* nothing to do if HW shouldn't run */
113723- if (!local->open_count)
113724+ if (!local_read(&local->open_count))
113725 goto wake_up;
113726
113727 #ifdef CONFIG_PM
113728@@ -1993,7 +1993,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113729 local->in_reconfig = false;
113730 barrier();
113731
113732- if (local->monitors == local->open_count && local->monitors > 0)
113733+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
113734 ieee80211_add_virtual_monitor(local);
113735
113736 /*
113737@@ -2048,7 +2048,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113738 * If this is for hw restart things are still running.
113739 * We may want to change that later, however.
113740 */
113741- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
113742+ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
113743 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
113744
113745 if (!local->suspended)
113746@@ -2072,7 +2072,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113747 flush_delayed_work(&local->scan_work);
113748 }
113749
113750- if (local->open_count && !reconfig_due_to_wowlan)
113751+ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
113752 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
113753
113754 list_for_each_entry(sdata, &local->interfaces, list) {
113755diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
113756index b02660f..c0f791c 100644
113757--- a/net/netfilter/Kconfig
113758+++ b/net/netfilter/Kconfig
113759@@ -1122,6 +1122,16 @@ config NETFILTER_XT_MATCH_ESP
113760
113761 To compile it as a module, choose M here. If unsure, say N.
113762
113763+config NETFILTER_XT_MATCH_GRADM
113764+ tristate '"gradm" match support'
113765+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
113766+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
113767+ ---help---
113768+ The gradm match allows to match on grsecurity RBAC being enabled.
113769+ It is useful when iptables rules are applied early on bootup to
113770+ prevent connections to the machine (except from a trusted host)
113771+ while the RBAC system is disabled.
113772+
113773 config NETFILTER_XT_MATCH_HASHLIMIT
113774 tristate '"hashlimit" match support'
113775 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
113776diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
113777index 89f73a9..e4e5bd9 100644
113778--- a/net/netfilter/Makefile
113779+++ b/net/netfilter/Makefile
113780@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
113781 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
113782 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
113783 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
113784+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
113785 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
113786 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
113787 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
113788diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
113789index d259da3..6a32b2c 100644
113790--- a/net/netfilter/ipset/ip_set_core.c
113791+++ b/net/netfilter/ipset/ip_set_core.c
113792@@ -1952,7 +1952,7 @@ done:
113793 return ret;
113794 }
113795
113796-static struct nf_sockopt_ops so_set __read_mostly = {
113797+static struct nf_sockopt_ops so_set = {
113798 .pf = PF_INET,
113799 .get_optmin = SO_IP_SET,
113800 .get_optmax = SO_IP_SET + 1,
113801diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
113802index b0f7b62..0541842 100644
113803--- a/net/netfilter/ipvs/ip_vs_conn.c
113804+++ b/net/netfilter/ipvs/ip_vs_conn.c
113805@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
113806 /* Increase the refcnt counter of the dest */
113807 ip_vs_dest_hold(dest);
113808
113809- conn_flags = atomic_read(&dest->conn_flags);
113810+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
113811 if (cp->protocol != IPPROTO_UDP)
113812 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
113813 flags = cp->flags;
113814@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
113815
113816 cp->control = NULL;
113817 atomic_set(&cp->n_control, 0);
113818- atomic_set(&cp->in_pkts, 0);
113819+ atomic_set_unchecked(&cp->in_pkts, 0);
113820
113821 cp->packet_xmit = NULL;
113822 cp->app = NULL;
113823@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
113824
113825 /* Don't drop the entry if its number of incoming packets is not
113826 located in [0, 8] */
113827- i = atomic_read(&cp->in_pkts);
113828+ i = atomic_read_unchecked(&cp->in_pkts);
113829 if (i > 8 || i < 0) return 0;
113830
113831 if (!todrop_rate[i]) return 0;
113832diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
113833index b87ca32..76c7799 100644
113834--- a/net/netfilter/ipvs/ip_vs_core.c
113835+++ b/net/netfilter/ipvs/ip_vs_core.c
113836@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
113837 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
113838 /* do not touch skb anymore */
113839
113840- atomic_inc(&cp->in_pkts);
113841+ atomic_inc_unchecked(&cp->in_pkts);
113842 ip_vs_conn_put(cp);
113843 return ret;
113844 }
113845@@ -1723,7 +1723,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
113846 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
113847 pkts = sysctl_sync_threshold(ipvs);
113848 else
113849- pkts = atomic_add_return(1, &cp->in_pkts);
113850+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113851
113852 if (ipvs->sync_state & IP_VS_STATE_MASTER)
113853 ip_vs_sync_conn(net, cp, pkts);
113854diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
113855index ed99448..3ba6cad 100644
113856--- a/net/netfilter/ipvs/ip_vs_ctl.c
113857+++ b/net/netfilter/ipvs/ip_vs_ctl.c
113858@@ -799,7 +799,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
113859 */
113860 ip_vs_rs_hash(ipvs, dest);
113861 }
113862- atomic_set(&dest->conn_flags, conn_flags);
113863+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
113864
113865 /* bind the service */
113866 old_svc = rcu_dereference_protected(dest->svc, 1);
113867@@ -1664,7 +1664,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
113868 * align with netns init in ip_vs_control_net_init()
113869 */
113870
113871-static struct ctl_table vs_vars[] = {
113872+static ctl_table_no_const vs_vars[] __read_only = {
113873 {
113874 .procname = "amemthresh",
113875 .maxlen = sizeof(int),
113876@@ -1999,7 +1999,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
113877 " %-7s %-6d %-10d %-10d\n",
113878 &dest->addr.in6,
113879 ntohs(dest->port),
113880- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
113881+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
113882 atomic_read(&dest->weight),
113883 atomic_read(&dest->activeconns),
113884 atomic_read(&dest->inactconns));
113885@@ -2010,7 +2010,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
113886 "%-7s %-6d %-10d %-10d\n",
113887 ntohl(dest->addr.ip),
113888 ntohs(dest->port),
113889- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
113890+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
113891 atomic_read(&dest->weight),
113892 atomic_read(&dest->activeconns),
113893 atomic_read(&dest->inactconns));
113894@@ -2499,7 +2499,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
113895
113896 entry.addr = dest->addr.ip;
113897 entry.port = dest->port;
113898- entry.conn_flags = atomic_read(&dest->conn_flags);
113899+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
113900 entry.weight = atomic_read(&dest->weight);
113901 entry.u_threshold = dest->u_threshold;
113902 entry.l_threshold = dest->l_threshold;
113903@@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
113904 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
113905 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
113906 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
113907- (atomic_read(&dest->conn_flags) &
113908+ (atomic_read_unchecked(&dest->conn_flags) &
113909 IP_VS_CONN_F_FWD_MASK)) ||
113910 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
113911 atomic_read(&dest->weight)) ||
113912@@ -3675,7 +3675,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
113913 {
113914 int idx;
113915 struct netns_ipvs *ipvs = net_ipvs(net);
113916- struct ctl_table *tbl;
113917+ ctl_table_no_const *tbl;
113918
113919 atomic_set(&ipvs->dropentry, 0);
113920 spin_lock_init(&ipvs->dropentry_lock);
113921diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
113922index 127f140..553d652 100644
113923--- a/net/netfilter/ipvs/ip_vs_lblc.c
113924+++ b/net/netfilter/ipvs/ip_vs_lblc.c
113925@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
113926 * IPVS LBLC sysctl table
113927 */
113928 #ifdef CONFIG_SYSCTL
113929-static struct ctl_table vs_vars_table[] = {
113930+static ctl_table_no_const vs_vars_table[] __read_only = {
113931 {
113932 .procname = "lblc_expiration",
113933 .data = NULL,
113934diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
113935index 2229d2d..b32b785 100644
113936--- a/net/netfilter/ipvs/ip_vs_lblcr.c
113937+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
113938@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
113939 * IPVS LBLCR sysctl table
113940 */
113941
113942-static struct ctl_table vs_vars_table[] = {
113943+static ctl_table_no_const vs_vars_table[] __read_only = {
113944 {
113945 .procname = "lblcr_expiration",
113946 .data = NULL,
113947diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
113948index d93ceeb..4556144 100644
113949--- a/net/netfilter/ipvs/ip_vs_sync.c
113950+++ b/net/netfilter/ipvs/ip_vs_sync.c
113951@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
113952 cp = cp->control;
113953 if (cp) {
113954 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
113955- pkts = atomic_add_return(1, &cp->in_pkts);
113956+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113957 else
113958 pkts = sysctl_sync_threshold(ipvs);
113959 ip_vs_sync_conn(net, cp->control, pkts);
113960@@ -771,7 +771,7 @@ control:
113961 if (!cp)
113962 return;
113963 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
113964- pkts = atomic_add_return(1, &cp->in_pkts);
113965+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113966 else
113967 pkts = sysctl_sync_threshold(ipvs);
113968 goto sloop;
113969@@ -902,7 +902,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
113970
113971 if (opt)
113972 memcpy(&cp->in_seq, opt, sizeof(*opt));
113973- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
113974+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
113975 cp->state = state;
113976 cp->old_state = cp->state;
113977 /*
113978diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
113979index 3aedbda..6a63567 100644
113980--- a/net/netfilter/ipvs/ip_vs_xmit.c
113981+++ b/net/netfilter/ipvs/ip_vs_xmit.c
113982@@ -1214,7 +1214,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
113983 else
113984 rc = NF_ACCEPT;
113985 /* do not touch skb anymore */
113986- atomic_inc(&cp->in_pkts);
113987+ atomic_inc_unchecked(&cp->in_pkts);
113988 goto out;
113989 }
113990
113991@@ -1307,7 +1307,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
113992 else
113993 rc = NF_ACCEPT;
113994 /* do not touch skb anymore */
113995- atomic_inc(&cp->in_pkts);
113996+ atomic_inc_unchecked(&cp->in_pkts);
113997 goto out;
113998 }
113999
114000diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
114001index a4b5e2a..13b1de3 100644
114002--- a/net/netfilter/nf_conntrack_acct.c
114003+++ b/net/netfilter/nf_conntrack_acct.c
114004@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
114005 #ifdef CONFIG_SYSCTL
114006 static int nf_conntrack_acct_init_sysctl(struct net *net)
114007 {
114008- struct ctl_table *table;
114009+ ctl_table_no_const *table;
114010
114011 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
114012 GFP_KERNEL);
114013diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
114014index 13fad86..18c984c 100644
114015--- a/net/netfilter/nf_conntrack_core.c
114016+++ b/net/netfilter/nf_conntrack_core.c
114017@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
114018 #define DYING_NULLS_VAL ((1<<30)+1)
114019 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
114020
114021+#ifdef CONFIG_GRKERNSEC_HIDESYM
114022+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
114023+#endif
114024+
114025 int nf_conntrack_init_net(struct net *net)
114026 {
114027 int ret = -ENOMEM;
114028@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
114029 if (!net->ct.stat)
114030 goto err_pcpu_lists;
114031
114032+#ifdef CONFIG_GRKERNSEC_HIDESYM
114033+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
114034+#else
114035 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
114036+#endif
114037 if (!net->ct.slabname)
114038 goto err_slabname;
114039
114040diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
114041index 4e78c57..ec8fb74 100644
114042--- a/net/netfilter/nf_conntrack_ecache.c
114043+++ b/net/netfilter/nf_conntrack_ecache.c
114044@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
114045 #ifdef CONFIG_SYSCTL
114046 static int nf_conntrack_event_init_sysctl(struct net *net)
114047 {
114048- struct ctl_table *table;
114049+ ctl_table_no_const *table;
114050
114051 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
114052 GFP_KERNEL);
114053diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
114054index bd9d315..989947e 100644
114055--- a/net/netfilter/nf_conntrack_helper.c
114056+++ b/net/netfilter/nf_conntrack_helper.c
114057@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
114058
114059 static int nf_conntrack_helper_init_sysctl(struct net *net)
114060 {
114061- struct ctl_table *table;
114062+ ctl_table_no_const *table;
114063
114064 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
114065 GFP_KERNEL);
114066diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
114067index b65d586..beec902 100644
114068--- a/net/netfilter/nf_conntrack_proto.c
114069+++ b/net/netfilter/nf_conntrack_proto.c
114070@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
114071
114072 static void
114073 nf_ct_unregister_sysctl(struct ctl_table_header **header,
114074- struct ctl_table **table,
114075+ ctl_table_no_const **table,
114076 unsigned int users)
114077 {
114078 if (users > 0)
114079diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
114080index fc823fa..8311af3 100644
114081--- a/net/netfilter/nf_conntrack_standalone.c
114082+++ b/net/netfilter/nf_conntrack_standalone.c
114083@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
114084
114085 static int nf_conntrack_standalone_init_sysctl(struct net *net)
114086 {
114087- struct ctl_table *table;
114088+ ctl_table_no_const *table;
114089
114090 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
114091 GFP_KERNEL);
114092diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
114093index 7a394df..bd91a8a 100644
114094--- a/net/netfilter/nf_conntrack_timestamp.c
114095+++ b/net/netfilter/nf_conntrack_timestamp.c
114096@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
114097 #ifdef CONFIG_SYSCTL
114098 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
114099 {
114100- struct ctl_table *table;
114101+ ctl_table_no_const *table;
114102
114103 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
114104 GFP_KERNEL);
114105diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
114106index 675d12c..b36e825 100644
114107--- a/net/netfilter/nf_log.c
114108+++ b/net/netfilter/nf_log.c
114109@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
114110
114111 #ifdef CONFIG_SYSCTL
114112 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
114113-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
114114+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
114115
114116 static int nf_log_proc_dostring(struct ctl_table *table, int write,
114117 void __user *buffer, size_t *lenp, loff_t *ppos)
114118@@ -417,13 +417,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
114119 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
114120 mutex_unlock(&nf_log_mutex);
114121 } else {
114122+ ctl_table_no_const nf_log_table = *table;
114123+
114124 mutex_lock(&nf_log_mutex);
114125 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
114126 if (!logger)
114127- table->data = "NONE";
114128+ nf_log_table.data = "NONE";
114129 else
114130- table->data = logger->name;
114131- r = proc_dostring(table, write, buffer, lenp, ppos);
114132+ nf_log_table.data = logger->name;
114133+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
114134 mutex_unlock(&nf_log_mutex);
114135 }
114136
114137diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
114138index c68c1e5..8b5d670 100644
114139--- a/net/netfilter/nf_sockopt.c
114140+++ b/net/netfilter/nf_sockopt.c
114141@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
114142 }
114143 }
114144
114145- list_add(&reg->list, &nf_sockopts);
114146+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
114147 out:
114148 mutex_unlock(&nf_sockopt_mutex);
114149 return ret;
114150@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
114151 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
114152 {
114153 mutex_lock(&nf_sockopt_mutex);
114154- list_del(&reg->list);
114155+ pax_list_del((struct list_head *)&reg->list);
114156 mutex_unlock(&nf_sockopt_mutex);
114157 }
114158 EXPORT_SYMBOL(nf_unregister_sockopt);
114159diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
114160index 11d85b3..7fcc420 100644
114161--- a/net/netfilter/nfnetlink_log.c
114162+++ b/net/netfilter/nfnetlink_log.c
114163@@ -83,7 +83,7 @@ static int nfnl_log_net_id __read_mostly;
114164 struct nfnl_log_net {
114165 spinlock_t instances_lock;
114166 struct hlist_head instance_table[INSTANCE_BUCKETS];
114167- atomic_t global_seq;
114168+ atomic_unchecked_t global_seq;
114169 };
114170
114171 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
114172@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
114173 /* global sequence number */
114174 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
114175 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
114176- htonl(atomic_inc_return(&log->global_seq))))
114177+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
114178 goto nla_put_failure;
114179
114180 if (data_len) {
114181diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
114182index 65f3e2b..2e9d6a0 100644
114183--- a/net/netfilter/nft_compat.c
114184+++ b/net/netfilter/nft_compat.c
114185@@ -317,14 +317,7 @@ static void nft_match_eval(const struct nft_expr *expr,
114186 return;
114187 }
114188
114189- switch(ret) {
114190- case true:
114191- data[NFT_REG_VERDICT].verdict = NFT_CONTINUE;
114192- break;
114193- case false:
114194- data[NFT_REG_VERDICT].verdict = NFT_BREAK;
114195- break;
114196- }
114197+ data[NFT_REG_VERDICT].verdict = ret ? NFT_CONTINUE : NFT_BREAK;
114198 }
114199
114200 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
114201diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
114202new file mode 100644
114203index 0000000..c566332
114204--- /dev/null
114205+++ b/net/netfilter/xt_gradm.c
114206@@ -0,0 +1,51 @@
114207+/*
114208+ * gradm match for netfilter
114209