]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-4.0.5-201506171322.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.5-201506171322.patch
CommitLineData
578d7714
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 1880cf7..a141b1e 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 318d127..9aab0d1 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@@ -632,8 +633,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 d2bfbc2..a8eacd2 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@@ -109,7 +109,10 @@ void __init init_IRQ(void)
6688 #endif
6689 }
6690
6691+
6692 #ifdef DEBUG_STACKOVERFLOW
6693+extern void gr_handle_kernel_exploit(void);
6694+
6695 static inline void check_stack_overflow(void)
6696 {
6697 unsigned long sp;
6698@@ -125,6 +128,7 @@ static inline void check_stack_overflow(void)
6699 printk("do_IRQ: stack overflow: %ld\n",
6700 sp - sizeof(struct thread_info));
6701 dump_stack();
6702+ gr_handle_kernel_exploit();
6703 }
6704 }
6705 #else
6706diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6707index 0614717..002fa43 100644
6708--- a/arch/mips/kernel/pm-cps.c
6709+++ b/arch/mips/kernel/pm-cps.c
6710@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6711 nc_core_ready_count = nc_addr;
6712
6713 /* Ensure ready_count is zero-initialised before the assembly runs */
6714- ACCESS_ONCE(*nc_core_ready_count) = 0;
6715+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6716 coupled_barrier(&per_cpu(pm_barrier, core), online);
6717
6718 /* Run the generated entry code */
6719diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6720index bf85cc1..b365c61 100644
6721--- a/arch/mips/kernel/process.c
6722+++ b/arch/mips/kernel/process.c
6723@@ -535,18 +535,6 @@ out:
6724 return pc;
6725 }
6726
6727-/*
6728- * Don't forget that the stack pointer must be aligned on a 8 bytes
6729- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6730- */
6731-unsigned long arch_align_stack(unsigned long sp)
6732-{
6733- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6734- sp -= get_random_int() & ~PAGE_MASK;
6735-
6736- return sp & ALMASK;
6737-}
6738-
6739 static void arch_dump_stack(void *info)
6740 {
6741 struct pt_regs *regs;
6742diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6743index 5104528..950bbdc 100644
6744--- a/arch/mips/kernel/ptrace.c
6745+++ b/arch/mips/kernel/ptrace.c
6746@@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6747 return ret;
6748 }
6749
6750+#ifdef CONFIG_GRKERNSEC_SETXID
6751+extern void gr_delayed_cred_worker(void);
6752+#endif
6753+
6754 /*
6755 * Notification of system call entry/exit
6756 * - triggered by current->work.syscall_trace
6757@@ -779,6 +783,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6758 tracehook_report_syscall_entry(regs))
6759 ret = -1;
6760
6761+#ifdef CONFIG_GRKERNSEC_SETXID
6762+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6763+ gr_delayed_cred_worker();
6764+#endif
6765+
6766 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6767 trace_sys_enter(regs, regs->regs[2]);
6768
6769diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6770index 07fc524..b9d7f28 100644
6771--- a/arch/mips/kernel/reset.c
6772+++ b/arch/mips/kernel/reset.c
6773@@ -13,6 +13,7 @@
6774 #include <linux/reboot.h>
6775
6776 #include <asm/reboot.h>
6777+#include <asm/bug.h>
6778
6779 /*
6780 * Urgs ... Too many MIPS machines to handle this in a generic way.
6781@@ -29,16 +30,19 @@ void machine_restart(char *command)
6782 {
6783 if (_machine_restart)
6784 _machine_restart(command);
6785+ BUG();
6786 }
6787
6788 void machine_halt(void)
6789 {
6790 if (_machine_halt)
6791 _machine_halt();
6792+ BUG();
6793 }
6794
6795 void machine_power_off(void)
6796 {
6797 if (pm_power_off)
6798 pm_power_off();
6799+ BUG();
6800 }
6801diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6802index 2242bdd..b284048 100644
6803--- a/arch/mips/kernel/sync-r4k.c
6804+++ b/arch/mips/kernel/sync-r4k.c
6805@@ -18,8 +18,8 @@
6806 #include <asm/mipsregs.h>
6807
6808 static atomic_t count_start_flag = ATOMIC_INIT(0);
6809-static atomic_t count_count_start = ATOMIC_INIT(0);
6810-static atomic_t count_count_stop = ATOMIC_INIT(0);
6811+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6812+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6813 static atomic_t count_reference = ATOMIC_INIT(0);
6814
6815 #define COUNTON 100
6816@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6817
6818 for (i = 0; i < NR_LOOPS; i++) {
6819 /* slaves loop on '!= 2' */
6820- while (atomic_read(&count_count_start) != 1)
6821+ while (atomic_read_unchecked(&count_count_start) != 1)
6822 mb();
6823- atomic_set(&count_count_stop, 0);
6824+ atomic_set_unchecked(&count_count_stop, 0);
6825 smp_wmb();
6826
6827 /* this lets the slaves write their count register */
6828- atomic_inc(&count_count_start);
6829+ atomic_inc_unchecked(&count_count_start);
6830
6831 /*
6832 * Everyone initialises count in the last loop:
6833@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6834 /*
6835 * Wait for all slaves to leave the synchronization point:
6836 */
6837- while (atomic_read(&count_count_stop) != 1)
6838+ while (atomic_read_unchecked(&count_count_stop) != 1)
6839 mb();
6840- atomic_set(&count_count_start, 0);
6841+ atomic_set_unchecked(&count_count_start, 0);
6842 smp_wmb();
6843- atomic_inc(&count_count_stop);
6844+ atomic_inc_unchecked(&count_count_stop);
6845 }
6846 /* Arrange for an interrupt in a short while */
6847 write_c0_compare(read_c0_count() + COUNTON);
6848@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6849 initcount = atomic_read(&count_reference);
6850
6851 for (i = 0; i < NR_LOOPS; i++) {
6852- atomic_inc(&count_count_start);
6853- while (atomic_read(&count_count_start) != 2)
6854+ atomic_inc_unchecked(&count_count_start);
6855+ while (atomic_read_unchecked(&count_count_start) != 2)
6856 mb();
6857
6858 /*
6859@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6860 if (i == NR_LOOPS-1)
6861 write_c0_count(initcount);
6862
6863- atomic_inc(&count_count_stop);
6864- while (atomic_read(&count_count_stop) != 2)
6865+ atomic_inc_unchecked(&count_count_stop);
6866+ while (atomic_read_unchecked(&count_count_stop) != 2)
6867 mb();
6868 }
6869 /* Arrange for an interrupt in a short while */
6870diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6871index 33984c0..666a96d 100644
6872--- a/arch/mips/kernel/traps.c
6873+++ b/arch/mips/kernel/traps.c
6874@@ -689,7 +689,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6875 siginfo_t info;
6876
6877 prev_state = exception_enter();
6878- die_if_kernel("Integer overflow", regs);
6879+ if (unlikely(!user_mode(regs))) {
6880+
6881+#ifdef CONFIG_PAX_REFCOUNT
6882+ if (fixup_exception(regs)) {
6883+ pax_report_refcount_overflow(regs);
6884+ exception_exit(prev_state);
6885+ return;
6886+ }
6887+#endif
6888+
6889+ die("Integer overflow", regs);
6890+ }
6891
6892 info.si_code = FPE_INTOVF;
6893 info.si_signo = SIGFPE;
6894diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6895index f5e7dda..47198ec 100644
6896--- a/arch/mips/kvm/mips.c
6897+++ b/arch/mips/kvm/mips.c
6898@@ -816,7 +816,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6899 return r;
6900 }
6901
6902-int kvm_arch_init(void *opaque)
6903+int kvm_arch_init(const void *opaque)
6904 {
6905 if (kvm_mips_callbacks) {
6906 kvm_err("kvm: module already exists\n");
6907diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6908index 7ff8637..6004edb 100644
6909--- a/arch/mips/mm/fault.c
6910+++ b/arch/mips/mm/fault.c
6911@@ -31,6 +31,23 @@
6912
6913 int show_unhandled_signals = 1;
6914
6915+#ifdef CONFIG_PAX_PAGEEXEC
6916+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6917+{
6918+ unsigned long i;
6919+
6920+ printk(KERN_ERR "PAX: bytes at PC: ");
6921+ for (i = 0; i < 5; i++) {
6922+ unsigned int c;
6923+ if (get_user(c, (unsigned int *)pc+i))
6924+ printk(KERN_CONT "???????? ");
6925+ else
6926+ printk(KERN_CONT "%08x ", c);
6927+ }
6928+ printk("\n");
6929+}
6930+#endif
6931+
6932 /*
6933 * This routine handles page faults. It determines the address,
6934 * and the problem, and then passes it off to one of the appropriate
6935@@ -206,6 +223,14 @@ bad_area:
6936 bad_area_nosemaphore:
6937 /* User mode accesses just cause a SIGSEGV */
6938 if (user_mode(regs)) {
6939+
6940+#ifdef CONFIG_PAX_PAGEEXEC
6941+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6942+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6943+ do_group_exit(SIGKILL);
6944+ }
6945+#endif
6946+
6947 tsk->thread.cp0_badvaddr = address;
6948 tsk->thread.error_code = write;
6949 if (show_unhandled_signals &&
6950diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6951index f1baadd..5472dca 100644
6952--- a/arch/mips/mm/mmap.c
6953+++ b/arch/mips/mm/mmap.c
6954@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6955 struct vm_area_struct *vma;
6956 unsigned long addr = addr0;
6957 int do_color_align;
6958+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6959 struct vm_unmapped_area_info info;
6960
6961 if (unlikely(len > TASK_SIZE))
6962@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6963 do_color_align = 1;
6964
6965 /* requesting a specific address */
6966+
6967+#ifdef CONFIG_PAX_RANDMMAP
6968+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6969+#endif
6970+
6971 if (addr) {
6972 if (do_color_align)
6973 addr = COLOUR_ALIGN(addr, pgoff);
6974@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6975 addr = PAGE_ALIGN(addr);
6976
6977 vma = find_vma(mm, addr);
6978- if (TASK_SIZE - len >= addr &&
6979- (!vma || addr + len <= vma->vm_start))
6980+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6981 return addr;
6982 }
6983
6984 info.length = len;
6985 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6986 info.align_offset = pgoff << PAGE_SHIFT;
6987+ info.threadstack_offset = offset;
6988
6989 if (dir == DOWN) {
6990 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6991@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6992 {
6993 unsigned long random_factor = 0UL;
6994
6995+#ifdef CONFIG_PAX_RANDMMAP
6996+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6997+#endif
6998+
6999 if (current->flags & PF_RANDOMIZE) {
7000 random_factor = get_random_int();
7001 random_factor = random_factor << PAGE_SHIFT;
7002@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7003
7004 if (mmap_is_legacy()) {
7005 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7006+
7007+#ifdef CONFIG_PAX_RANDMMAP
7008+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7009+ mm->mmap_base += mm->delta_mmap;
7010+#endif
7011+
7012 mm->get_unmapped_area = arch_get_unmapped_area;
7013 } else {
7014 mm->mmap_base = mmap_base(random_factor);
7015+
7016+#ifdef CONFIG_PAX_RANDMMAP
7017+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7018+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7019+#endif
7020+
7021 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7022 }
7023 }
7024
7025-static inline unsigned long brk_rnd(void)
7026-{
7027- unsigned long rnd = get_random_int();
7028-
7029- rnd = rnd << PAGE_SHIFT;
7030- /* 8MB for 32bit, 256MB for 64bit */
7031- if (TASK_IS_32BIT_ADDR)
7032- rnd = rnd & 0x7ffffful;
7033- else
7034- rnd = rnd & 0xffffffful;
7035-
7036- return rnd;
7037-}
7038-
7039-unsigned long arch_randomize_brk(struct mm_struct *mm)
7040-{
7041- unsigned long base = mm->brk;
7042- unsigned long ret;
7043-
7044- ret = PAGE_ALIGN(base + brk_rnd());
7045-
7046- if (ret < mm->brk)
7047- return mm->brk;
7048-
7049- return ret;
7050-}
7051-
7052 int __virt_addr_valid(const volatile void *kaddr)
7053 {
7054 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7055diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7056index a2358b4..7cead4f 100644
7057--- a/arch/mips/sgi-ip27/ip27-nmi.c
7058+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7059@@ -187,9 +187,9 @@ void
7060 cont_nmi_dump(void)
7061 {
7062 #ifndef REAL_NMI_SIGNAL
7063- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7064+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7065
7066- atomic_inc(&nmied_cpus);
7067+ atomic_inc_unchecked(&nmied_cpus);
7068 #endif
7069 /*
7070 * Only allow 1 cpu to proceed
7071@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7072 udelay(10000);
7073 }
7074 #else
7075- while (atomic_read(&nmied_cpus) != num_online_cpus());
7076+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7077 #endif
7078
7079 /*
7080diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7081index a046b30..6799527 100644
7082--- a/arch/mips/sni/rm200.c
7083+++ b/arch/mips/sni/rm200.c
7084@@ -270,7 +270,7 @@ spurious_8259A_irq:
7085 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7086 spurious_irq_mask |= irqmask;
7087 }
7088- atomic_inc(&irq_err_count);
7089+ atomic_inc_unchecked(&irq_err_count);
7090 /*
7091 * Theoretically we do not have to handle this IRQ,
7092 * but in Linux this does not cause problems and is
7093diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7094index 41e873b..34d33a7 100644
7095--- a/arch/mips/vr41xx/common/icu.c
7096+++ b/arch/mips/vr41xx/common/icu.c
7097@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7098
7099 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7100
7101- atomic_inc(&irq_err_count);
7102+ atomic_inc_unchecked(&irq_err_count);
7103
7104 return -1;
7105 }
7106diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7107index ae0e4ee..e8f0692 100644
7108--- a/arch/mips/vr41xx/common/irq.c
7109+++ b/arch/mips/vr41xx/common/irq.c
7110@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7111 irq_cascade_t *cascade;
7112
7113 if (irq >= NR_IRQS) {
7114- atomic_inc(&irq_err_count);
7115+ atomic_inc_unchecked(&irq_err_count);
7116 return;
7117 }
7118
7119@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7120 ret = cascade->get_irq(irq);
7121 irq = ret;
7122 if (ret < 0)
7123- atomic_inc(&irq_err_count);
7124+ atomic_inc_unchecked(&irq_err_count);
7125 else
7126 irq_dispatch(irq);
7127 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7128diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7129index 967d144..db12197 100644
7130--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7131+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7132@@ -11,12 +11,14 @@
7133 #ifndef _ASM_PROC_CACHE_H
7134 #define _ASM_PROC_CACHE_H
7135
7136+#include <linux/const.h>
7137+
7138 /* L1 cache */
7139
7140 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7141 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7142-#define L1_CACHE_BYTES 16 /* bytes per entry */
7143 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7144+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7145 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7146
7147 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7148diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7149index bcb5df2..84fabd2 100644
7150--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7151+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7152@@ -16,13 +16,15 @@
7153 #ifndef _ASM_PROC_CACHE_H
7154 #define _ASM_PROC_CACHE_H
7155
7156+#include <linux/const.h>
7157+
7158 /*
7159 * L1 cache
7160 */
7161 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7162 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7163-#define L1_CACHE_BYTES 32 /* bytes per entry */
7164 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7165+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7166 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7167
7168 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7169diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7170index 4ce7a01..449202a 100644
7171--- a/arch/openrisc/include/asm/cache.h
7172+++ b/arch/openrisc/include/asm/cache.h
7173@@ -19,11 +19,13 @@
7174 #ifndef __ASM_OPENRISC_CACHE_H
7175 #define __ASM_OPENRISC_CACHE_H
7176
7177+#include <linux/const.h>
7178+
7179 /* FIXME: How can we replace these with values from the CPU...
7180 * they shouldn't be hard-coded!
7181 */
7182
7183-#define L1_CACHE_BYTES 16
7184 #define L1_CACHE_SHIFT 4
7185+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7186
7187 #endif /* __ASM_OPENRISC_CACHE_H */
7188diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7189index 226f8ca..9d9b87d 100644
7190--- a/arch/parisc/include/asm/atomic.h
7191+++ b/arch/parisc/include/asm/atomic.h
7192@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7193 return dec;
7194 }
7195
7196+#define atomic64_read_unchecked(v) atomic64_read(v)
7197+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7198+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7199+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7200+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7201+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7202+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7203+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7204+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7205+
7206 #endif /* !CONFIG_64BIT */
7207
7208
7209diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7210index 47f11c7..3420df2 100644
7211--- a/arch/parisc/include/asm/cache.h
7212+++ b/arch/parisc/include/asm/cache.h
7213@@ -5,6 +5,7 @@
7214 #ifndef __ARCH_PARISC_CACHE_H
7215 #define __ARCH_PARISC_CACHE_H
7216
7217+#include <linux/const.h>
7218
7219 /*
7220 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7221@@ -15,13 +16,13 @@
7222 * just ruin performance.
7223 */
7224 #ifdef CONFIG_PA20
7225-#define L1_CACHE_BYTES 64
7226 #define L1_CACHE_SHIFT 6
7227 #else
7228-#define L1_CACHE_BYTES 32
7229 #define L1_CACHE_SHIFT 5
7230 #endif
7231
7232+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7233+
7234 #ifndef __ASSEMBLY__
7235
7236 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7237diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7238index 78c9fd3..42fa66a 100644
7239--- a/arch/parisc/include/asm/elf.h
7240+++ b/arch/parisc/include/asm/elf.h
7241@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7242
7243 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7244
7245+#ifdef CONFIG_PAX_ASLR
7246+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7247+
7248+#define PAX_DELTA_MMAP_LEN 16
7249+#define PAX_DELTA_STACK_LEN 16
7250+#endif
7251+
7252 /* This yields a mask that user programs can use to figure out what
7253 instruction set this CPU supports. This could be done in user space,
7254 but it's not easy, and we've already done it here. */
7255diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7256index d174372..f27fe5c 100644
7257--- a/arch/parisc/include/asm/pgalloc.h
7258+++ b/arch/parisc/include/asm/pgalloc.h
7259@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7260 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7261 }
7262
7263+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7264+{
7265+ pgd_populate(mm, pgd, pmd);
7266+}
7267+
7268 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7269 {
7270 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7271@@ -96,6 +101,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7272 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7273 #define pmd_free(mm, x) do { } while (0)
7274 #define pgd_populate(mm, pmd, pte) BUG()
7275+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7276
7277 #endif
7278
7279diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7280index 15207b9..3209e65 100644
7281--- a/arch/parisc/include/asm/pgtable.h
7282+++ b/arch/parisc/include/asm/pgtable.h
7283@@ -215,6 +215,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7284 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7285 #define PAGE_COPY PAGE_EXECREAD
7286 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7287+
7288+#ifdef CONFIG_PAX_PAGEEXEC
7289+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7290+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7291+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7292+#else
7293+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7294+# define PAGE_COPY_NOEXEC PAGE_COPY
7295+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7296+#endif
7297+
7298 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7299 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7300 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7301diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7302index 0abdd4c..1af92f0 100644
7303--- a/arch/parisc/include/asm/uaccess.h
7304+++ b/arch/parisc/include/asm/uaccess.h
7305@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7306 const void __user *from,
7307 unsigned long n)
7308 {
7309- int sz = __compiletime_object_size(to);
7310+ size_t sz = __compiletime_object_size(to);
7311 int ret = -EFAULT;
7312
7313- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7314+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7315 ret = __copy_from_user(to, from, n);
7316 else
7317 copy_from_user_overflow();
7318diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7319index 3c63a82..b1d6ee9 100644
7320--- a/arch/parisc/kernel/module.c
7321+++ b/arch/parisc/kernel/module.c
7322@@ -98,16 +98,38 @@
7323
7324 /* three functions to determine where in the module core
7325 * or init pieces the location is */
7326+static inline int in_init_rx(struct module *me, void *loc)
7327+{
7328+ return (loc >= me->module_init_rx &&
7329+ loc < (me->module_init_rx + me->init_size_rx));
7330+}
7331+
7332+static inline int in_init_rw(struct module *me, void *loc)
7333+{
7334+ return (loc >= me->module_init_rw &&
7335+ loc < (me->module_init_rw + me->init_size_rw));
7336+}
7337+
7338 static inline int in_init(struct module *me, void *loc)
7339 {
7340- return (loc >= me->module_init &&
7341- loc <= (me->module_init + me->init_size));
7342+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7343+}
7344+
7345+static inline int in_core_rx(struct module *me, void *loc)
7346+{
7347+ return (loc >= me->module_core_rx &&
7348+ loc < (me->module_core_rx + me->core_size_rx));
7349+}
7350+
7351+static inline int in_core_rw(struct module *me, void *loc)
7352+{
7353+ return (loc >= me->module_core_rw &&
7354+ loc < (me->module_core_rw + me->core_size_rw));
7355 }
7356
7357 static inline int in_core(struct module *me, void *loc)
7358 {
7359- return (loc >= me->module_core &&
7360- loc <= (me->module_core + me->core_size));
7361+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7362 }
7363
7364 static inline int in_local(struct module *me, void *loc)
7365@@ -367,13 +389,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7366 }
7367
7368 /* align things a bit */
7369- me->core_size = ALIGN(me->core_size, 16);
7370- me->arch.got_offset = me->core_size;
7371- me->core_size += gots * sizeof(struct got_entry);
7372+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7373+ me->arch.got_offset = me->core_size_rw;
7374+ me->core_size_rw += gots * sizeof(struct got_entry);
7375
7376- me->core_size = ALIGN(me->core_size, 16);
7377- me->arch.fdesc_offset = me->core_size;
7378- me->core_size += fdescs * sizeof(Elf_Fdesc);
7379+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7380+ me->arch.fdesc_offset = me->core_size_rw;
7381+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7382
7383 me->arch.got_max = gots;
7384 me->arch.fdesc_max = fdescs;
7385@@ -391,7 +413,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7386
7387 BUG_ON(value == 0);
7388
7389- got = me->module_core + me->arch.got_offset;
7390+ got = me->module_core_rw + me->arch.got_offset;
7391 for (i = 0; got[i].addr; i++)
7392 if (got[i].addr == value)
7393 goto out;
7394@@ -409,7 +431,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7395 #ifdef CONFIG_64BIT
7396 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7397 {
7398- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7399+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7400
7401 if (!value) {
7402 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7403@@ -427,7 +449,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7404
7405 /* Create new one */
7406 fdesc->addr = value;
7407- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7408+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7409 return (Elf_Addr)fdesc;
7410 }
7411 #endif /* CONFIG_64BIT */
7412@@ -839,7 +861,7 @@ register_unwind_table(struct module *me,
7413
7414 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7415 end = table + sechdrs[me->arch.unwind_section].sh_size;
7416- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7417+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7418
7419 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7420 me->arch.unwind_section, table, end, gp);
7421diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7422index 5aba01a..47cdd5a 100644
7423--- a/arch/parisc/kernel/sys_parisc.c
7424+++ b/arch/parisc/kernel/sys_parisc.c
7425@@ -92,6 +92,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7426 unsigned long task_size = TASK_SIZE;
7427 int do_color_align, last_mmap;
7428 struct vm_unmapped_area_info info;
7429+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7430
7431 if (len > task_size)
7432 return -ENOMEM;
7433@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7434 goto found_addr;
7435 }
7436
7437+#ifdef CONFIG_PAX_RANDMMAP
7438+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7439+#endif
7440+
7441 if (addr) {
7442 if (do_color_align && last_mmap)
7443 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7444@@ -127,6 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7445 info.high_limit = mmap_upper_limit();
7446 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7447 info.align_offset = shared_align_offset(last_mmap, pgoff);
7448+ info.threadstack_offset = offset;
7449 addr = vm_unmapped_area(&info);
7450
7451 found_addr:
7452@@ -146,6 +152,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7453 unsigned long addr = addr0;
7454 int do_color_align, last_mmap;
7455 struct vm_unmapped_area_info info;
7456+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7457
7458 #ifdef CONFIG_64BIT
7459 /* This should only ever run for 32-bit processes. */
7460@@ -170,6 +177,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7461 }
7462
7463 /* requesting a specific address */
7464+#ifdef CONFIG_PAX_RANDMMAP
7465+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7466+#endif
7467+
7468 if (addr) {
7469 if (do_color_align && last_mmap)
7470 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7471@@ -187,6 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7472 info.high_limit = mm->mmap_base;
7473 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7474 info.align_offset = shared_align_offset(last_mmap, pgoff);
7475+ info.threadstack_offset = offset;
7476 addr = vm_unmapped_area(&info);
7477 if (!(addr & ~PAGE_MASK))
7478 goto found_addr;
7479@@ -252,6 +264,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7480 mm->mmap_legacy_base = mmap_legacy_base();
7481 mm->mmap_base = mmap_upper_limit();
7482
7483+#ifdef CONFIG_PAX_RANDMMAP
7484+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7485+ mm->mmap_legacy_base += mm->delta_mmap;
7486+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7487+ }
7488+#endif
7489+
7490 if (mmap_is_legacy()) {
7491 mm->mmap_base = mm->mmap_legacy_base;
7492 mm->get_unmapped_area = arch_get_unmapped_area;
7493diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7494index 47ee620..1107387 100644
7495--- a/arch/parisc/kernel/traps.c
7496+++ b/arch/parisc/kernel/traps.c
7497@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7498
7499 down_read(&current->mm->mmap_sem);
7500 vma = find_vma(current->mm,regs->iaoq[0]);
7501- if (vma && (regs->iaoq[0] >= vma->vm_start)
7502- && (vma->vm_flags & VM_EXEC)) {
7503-
7504+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7505 fault_address = regs->iaoq[0];
7506 fault_space = regs->iasq[0];
7507
7508diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7509index e5120e6..8ddb5cc 100644
7510--- a/arch/parisc/mm/fault.c
7511+++ b/arch/parisc/mm/fault.c
7512@@ -15,6 +15,7 @@
7513 #include <linux/sched.h>
7514 #include <linux/interrupt.h>
7515 #include <linux/module.h>
7516+#include <linux/unistd.h>
7517
7518 #include <asm/uaccess.h>
7519 #include <asm/traps.h>
7520@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7521 static unsigned long
7522 parisc_acctyp(unsigned long code, unsigned int inst)
7523 {
7524- if (code == 6 || code == 16)
7525+ if (code == 6 || code == 7 || code == 16)
7526 return VM_EXEC;
7527
7528 switch (inst & 0xf0000000) {
7529@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7530 }
7531 #endif
7532
7533+#ifdef CONFIG_PAX_PAGEEXEC
7534+/*
7535+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7536+ *
7537+ * returns 1 when task should be killed
7538+ * 2 when rt_sigreturn trampoline was detected
7539+ * 3 when unpatched PLT trampoline was detected
7540+ */
7541+static int pax_handle_fetch_fault(struct pt_regs *regs)
7542+{
7543+
7544+#ifdef CONFIG_PAX_EMUPLT
7545+ int err;
7546+
7547+ do { /* PaX: unpatched PLT emulation */
7548+ unsigned int bl, depwi;
7549+
7550+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7551+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7552+
7553+ if (err)
7554+ break;
7555+
7556+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7557+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7558+
7559+ err = get_user(ldw, (unsigned int *)addr);
7560+ err |= get_user(bv, (unsigned int *)(addr+4));
7561+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7562+
7563+ if (err)
7564+ break;
7565+
7566+ if (ldw == 0x0E801096U &&
7567+ bv == 0xEAC0C000U &&
7568+ ldw2 == 0x0E881095U)
7569+ {
7570+ unsigned int resolver, map;
7571+
7572+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7573+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7574+ if (err)
7575+ break;
7576+
7577+ regs->gr[20] = instruction_pointer(regs)+8;
7578+ regs->gr[21] = map;
7579+ regs->gr[22] = resolver;
7580+ regs->iaoq[0] = resolver | 3UL;
7581+ regs->iaoq[1] = regs->iaoq[0] + 4;
7582+ return 3;
7583+ }
7584+ }
7585+ } while (0);
7586+#endif
7587+
7588+#ifdef CONFIG_PAX_EMUTRAMP
7589+
7590+#ifndef CONFIG_PAX_EMUSIGRT
7591+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7592+ return 1;
7593+#endif
7594+
7595+ do { /* PaX: rt_sigreturn emulation */
7596+ unsigned int ldi1, ldi2, bel, nop;
7597+
7598+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7599+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7600+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7601+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7602+
7603+ if (err)
7604+ break;
7605+
7606+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7607+ ldi2 == 0x3414015AU &&
7608+ bel == 0xE4008200U &&
7609+ nop == 0x08000240U)
7610+ {
7611+ regs->gr[25] = (ldi1 & 2) >> 1;
7612+ regs->gr[20] = __NR_rt_sigreturn;
7613+ regs->gr[31] = regs->iaoq[1] + 16;
7614+ regs->sr[0] = regs->iasq[1];
7615+ regs->iaoq[0] = 0x100UL;
7616+ regs->iaoq[1] = regs->iaoq[0] + 4;
7617+ regs->iasq[0] = regs->sr[2];
7618+ regs->iasq[1] = regs->sr[2];
7619+ return 2;
7620+ }
7621+ } while (0);
7622+#endif
7623+
7624+ return 1;
7625+}
7626+
7627+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7628+{
7629+ unsigned long i;
7630+
7631+ printk(KERN_ERR "PAX: bytes at PC: ");
7632+ for (i = 0; i < 5; i++) {
7633+ unsigned int c;
7634+ if (get_user(c, (unsigned int *)pc+i))
7635+ printk(KERN_CONT "???????? ");
7636+ else
7637+ printk(KERN_CONT "%08x ", c);
7638+ }
7639+ printk("\n");
7640+}
7641+#endif
7642+
7643 int fixup_exception(struct pt_regs *regs)
7644 {
7645 const struct exception_table_entry *fix;
7646@@ -234,8 +345,33 @@ retry:
7647
7648 good_area:
7649
7650- if ((vma->vm_flags & acc_type) != acc_type)
7651+ if ((vma->vm_flags & acc_type) != acc_type) {
7652+
7653+#ifdef CONFIG_PAX_PAGEEXEC
7654+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7655+ (address & ~3UL) == instruction_pointer(regs))
7656+ {
7657+ up_read(&mm->mmap_sem);
7658+ switch (pax_handle_fetch_fault(regs)) {
7659+
7660+#ifdef CONFIG_PAX_EMUPLT
7661+ case 3:
7662+ return;
7663+#endif
7664+
7665+#ifdef CONFIG_PAX_EMUTRAMP
7666+ case 2:
7667+ return;
7668+#endif
7669+
7670+ }
7671+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7672+ do_group_exit(SIGKILL);
7673+ }
7674+#endif
7675+
7676 goto bad_area;
7677+ }
7678
7679 /*
7680 * If for any reason at all we couldn't handle the fault, make
7681diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7682index 22b0940..309f790 100644
7683--- a/arch/powerpc/Kconfig
7684+++ b/arch/powerpc/Kconfig
7685@@ -409,6 +409,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7686 config KEXEC
7687 bool "kexec system call"
7688 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7689+ depends on !GRKERNSEC_KMEM
7690 help
7691 kexec is a system call that implements the ability to shutdown your
7692 current kernel, and to start another kernel. It is like a reboot
7693diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7694index 512d278..d31fadd 100644
7695--- a/arch/powerpc/include/asm/atomic.h
7696+++ b/arch/powerpc/include/asm/atomic.h
7697@@ -12,6 +12,11 @@
7698
7699 #define ATOMIC_INIT(i) { (i) }
7700
7701+#define _ASM_EXTABLE(from, to) \
7702+" .section __ex_table,\"a\"\n" \
7703+ PPC_LONG" " #from ", " #to"\n" \
7704+" .previous\n"
7705+
7706 static __inline__ int atomic_read(const atomic_t *v)
7707 {
7708 int t;
7709@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7710 return t;
7711 }
7712
7713+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7714+{
7715+ int t;
7716+
7717+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7718+
7719+ return t;
7720+}
7721+
7722 static __inline__ void atomic_set(atomic_t *v, int i)
7723 {
7724 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7725 }
7726
7727-#define ATOMIC_OP(op, asm_op) \
7728-static __inline__ void atomic_##op(int a, atomic_t *v) \
7729+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7730+{
7731+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7732+}
7733+
7734+#ifdef CONFIG_PAX_REFCOUNT
7735+#define __REFCOUNT_OP(op) op##o.
7736+#define __OVERFLOW_PRE \
7737+ " mcrxr cr0\n"
7738+#define __OVERFLOW_POST \
7739+ " bf 4*cr0+so, 3f\n" \
7740+ "2: .long 0x00c00b00\n" \
7741+ "3:\n"
7742+#define __OVERFLOW_EXTABLE \
7743+ "\n4:\n"
7744+ _ASM_EXTABLE(2b, 4b)
7745+#else
7746+#define __REFCOUNT_OP(op) op
7747+#define __OVERFLOW_PRE
7748+#define __OVERFLOW_POST
7749+#define __OVERFLOW_EXTABLE
7750+#endif
7751+
7752+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7753+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7754 { \
7755 int t; \
7756 \
7757 __asm__ __volatile__( \
7758-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7759+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7760+ pre_op \
7761 #asm_op " %0,%2,%0\n" \
7762+ post_op \
7763 PPC405_ERR77(0,%3) \
7764 " stwcx. %0,0,%3 \n" \
7765 " bne- 1b\n" \
7766+ extable \
7767 : "=&r" (t), "+m" (v->counter) \
7768 : "r" (a), "r" (&v->counter) \
7769 : "cc"); \
7770 } \
7771
7772-#define ATOMIC_OP_RETURN(op, asm_op) \
7773-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7774+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7775+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7776+
7777+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7778+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7779 { \
7780 int t; \
7781 \
7782 __asm__ __volatile__( \
7783 PPC_ATOMIC_ENTRY_BARRIER \
7784-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7785+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7786+ pre_op \
7787 #asm_op " %0,%1,%0\n" \
7788+ post_op \
7789 PPC405_ERR77(0,%2) \
7790 " stwcx. %0,0,%2 \n" \
7791 " bne- 1b\n" \
7792+ extable \
7793 PPC_ATOMIC_EXIT_BARRIER \
7794 : "=&r" (t) \
7795 : "r" (a), "r" (&v->counter) \
7796@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7797 return t; \
7798 }
7799
7800+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7801+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7802+
7803 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7804
7805 ATOMIC_OPS(add, add)
7806@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7807
7808 #undef ATOMIC_OPS
7809 #undef ATOMIC_OP_RETURN
7810+#undef __ATOMIC_OP_RETURN
7811 #undef ATOMIC_OP
7812+#undef __ATOMIC_OP
7813
7814 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7815
7816-static __inline__ void atomic_inc(atomic_t *v)
7817-{
7818- int t;
7819+/*
7820+ * atomic_inc - increment atomic variable
7821+ * @v: pointer of type atomic_t
7822+ *
7823+ * Automatically increments @v by 1
7824+ */
7825+#define atomic_inc(v) atomic_add(1, (v))
7826+#define atomic_inc_return(v) atomic_add_return(1, (v))
7827
7828- __asm__ __volatile__(
7829-"1: lwarx %0,0,%2 # atomic_inc\n\
7830- addic %0,%0,1\n"
7831- PPC405_ERR77(0,%2)
7832-" stwcx. %0,0,%2 \n\
7833- bne- 1b"
7834- : "=&r" (t), "+m" (v->counter)
7835- : "r" (&v->counter)
7836- : "cc", "xer");
7837+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7838+{
7839+ atomic_add_unchecked(1, v);
7840 }
7841
7842-static __inline__ int atomic_inc_return(atomic_t *v)
7843+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7844 {
7845- int t;
7846-
7847- __asm__ __volatile__(
7848- PPC_ATOMIC_ENTRY_BARRIER
7849-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7850- addic %0,%0,1\n"
7851- PPC405_ERR77(0,%1)
7852-" stwcx. %0,0,%1 \n\
7853- bne- 1b"
7854- PPC_ATOMIC_EXIT_BARRIER
7855- : "=&r" (t)
7856- : "r" (&v->counter)
7857- : "cc", "xer", "memory");
7858-
7859- return t;
7860+ return atomic_add_return_unchecked(1, v);
7861 }
7862
7863 /*
7864@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7865 */
7866 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7867
7868-static __inline__ void atomic_dec(atomic_t *v)
7869+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7870 {
7871- int t;
7872-
7873- __asm__ __volatile__(
7874-"1: lwarx %0,0,%2 # atomic_dec\n\
7875- addic %0,%0,-1\n"
7876- PPC405_ERR77(0,%2)\
7877-" stwcx. %0,0,%2\n\
7878- bne- 1b"
7879- : "=&r" (t), "+m" (v->counter)
7880- : "r" (&v->counter)
7881- : "cc", "xer");
7882+ return atomic_add_return_unchecked(1, v) == 0;
7883 }
7884
7885-static __inline__ int atomic_dec_return(atomic_t *v)
7886+/*
7887+ * atomic_dec - decrement atomic variable
7888+ * @v: pointer of type atomic_t
7889+ *
7890+ * Atomically decrements @v by 1
7891+ */
7892+#define atomic_dec(v) atomic_sub(1, (v))
7893+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7894+
7895+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7896 {
7897- int t;
7898-
7899- __asm__ __volatile__(
7900- PPC_ATOMIC_ENTRY_BARRIER
7901-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7902- addic %0,%0,-1\n"
7903- PPC405_ERR77(0,%1)
7904-" stwcx. %0,0,%1\n\
7905- bne- 1b"
7906- PPC_ATOMIC_EXIT_BARRIER
7907- : "=&r" (t)
7908- : "r" (&v->counter)
7909- : "cc", "xer", "memory");
7910-
7911- return t;
7912+ atomic_sub_unchecked(1, v);
7913 }
7914
7915 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7916 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7917
7918+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7919+{
7920+ return cmpxchg(&(v->counter), old, new);
7921+}
7922+
7923+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7924+{
7925+ return xchg(&(v->counter), new);
7926+}
7927+
7928 /**
7929 * __atomic_add_unless - add unless the number is a given value
7930 * @v: pointer of type atomic_t
7931@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7932 PPC_ATOMIC_ENTRY_BARRIER
7933 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7934 cmpw 0,%0,%3 \n\
7935- beq- 2f \n\
7936- add %0,%2,%0 \n"
7937+ beq- 2f \n"
7938+
7939+#ifdef CONFIG_PAX_REFCOUNT
7940+" mcrxr cr0\n"
7941+" addo. %0,%2,%0\n"
7942+" bf 4*cr0+so, 4f\n"
7943+"3:.long " "0x00c00b00""\n"
7944+"4:\n"
7945+#else
7946+ "add %0,%2,%0 \n"
7947+#endif
7948+
7949 PPC405_ERR77(0,%2)
7950 " stwcx. %0,0,%1 \n\
7951 bne- 1b \n"
7952+"5:"
7953+
7954+#ifdef CONFIG_PAX_REFCOUNT
7955+ _ASM_EXTABLE(3b, 5b)
7956+#endif
7957+
7958 PPC_ATOMIC_EXIT_BARRIER
7959 " subf %0,%2,%0 \n\
7960 2:"
7961@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7962 }
7963 #define atomic_dec_if_positive atomic_dec_if_positive
7964
7965+#define smp_mb__before_atomic_dec() smp_mb()
7966+#define smp_mb__after_atomic_dec() smp_mb()
7967+#define smp_mb__before_atomic_inc() smp_mb()
7968+#define smp_mb__after_atomic_inc() smp_mb()
7969+
7970 #ifdef __powerpc64__
7971
7972 #define ATOMIC64_INIT(i) { (i) }
7973@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
7974 return t;
7975 }
7976
7977+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
7978+{
7979+ long t;
7980+
7981+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7982+
7983+ return t;
7984+}
7985+
7986 static __inline__ void atomic64_set(atomic64_t *v, long i)
7987 {
7988 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7989 }
7990
7991-#define ATOMIC64_OP(op, asm_op) \
7992-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
7993+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
7994+{
7995+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7996+}
7997+
7998+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7999+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8000 { \
8001 long t; \
8002 \
8003 __asm__ __volatile__( \
8004 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8005+ pre_op \
8006 #asm_op " %0,%2,%0\n" \
8007+ post_op \
8008 " stdcx. %0,0,%3 \n" \
8009 " bne- 1b\n" \
8010+ extable \
8011 : "=&r" (t), "+m" (v->counter) \
8012 : "r" (a), "r" (&v->counter) \
8013 : "cc"); \
8014 }
8015
8016-#define ATOMIC64_OP_RETURN(op, asm_op) \
8017-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8018+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8019+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8020+
8021+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8022+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8023 { \
8024 long t; \
8025 \
8026 __asm__ __volatile__( \
8027 PPC_ATOMIC_ENTRY_BARRIER \
8028 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8029+ pre_op \
8030 #asm_op " %0,%1,%0\n" \
8031+ post_op \
8032 " stdcx. %0,0,%2 \n" \
8033 " bne- 1b\n" \
8034+ extable \
8035 PPC_ATOMIC_EXIT_BARRIER \
8036 : "=&r" (t) \
8037 : "r" (a), "r" (&v->counter) \
8038@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8039 return t; \
8040 }
8041
8042+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8043+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8044+
8045 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8046
8047 ATOMIC64_OPS(add, add)
8048@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8049
8050 #undef ATOMIC64_OPS
8051 #undef ATOMIC64_OP_RETURN
8052+#undef __ATOMIC64_OP_RETURN
8053 #undef ATOMIC64_OP
8054+#undef __ATOMIC64_OP
8055+#undef __OVERFLOW_EXTABLE
8056+#undef __OVERFLOW_POST
8057+#undef __OVERFLOW_PRE
8058+#undef __REFCOUNT_OP
8059
8060 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8061
8062-static __inline__ void atomic64_inc(atomic64_t *v)
8063-{
8064- long t;
8065+/*
8066+ * atomic64_inc - increment atomic variable
8067+ * @v: pointer of type atomic64_t
8068+ *
8069+ * Automatically increments @v by 1
8070+ */
8071+#define atomic64_inc(v) atomic64_add(1, (v))
8072+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8073
8074- __asm__ __volatile__(
8075-"1: ldarx %0,0,%2 # atomic64_inc\n\
8076- addic %0,%0,1\n\
8077- stdcx. %0,0,%2 \n\
8078- bne- 1b"
8079- : "=&r" (t), "+m" (v->counter)
8080- : "r" (&v->counter)
8081- : "cc", "xer");
8082+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8083+{
8084+ atomic64_add_unchecked(1, v);
8085 }
8086
8087-static __inline__ long atomic64_inc_return(atomic64_t *v)
8088+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8089 {
8090- long t;
8091-
8092- __asm__ __volatile__(
8093- PPC_ATOMIC_ENTRY_BARRIER
8094-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8095- addic %0,%0,1\n\
8096- stdcx. %0,0,%1 \n\
8097- bne- 1b"
8098- PPC_ATOMIC_EXIT_BARRIER
8099- : "=&r" (t)
8100- : "r" (&v->counter)
8101- : "cc", "xer", "memory");
8102-
8103- return t;
8104+ return atomic64_add_return_unchecked(1, v);
8105 }
8106
8107 /*
8108@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8109 */
8110 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8111
8112-static __inline__ void atomic64_dec(atomic64_t *v)
8113+/*
8114+ * atomic64_dec - decrement atomic variable
8115+ * @v: pointer of type atomic64_t
8116+ *
8117+ * Atomically decrements @v by 1
8118+ */
8119+#define atomic64_dec(v) atomic64_sub(1, (v))
8120+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8121+
8122+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8123 {
8124- long t;
8125-
8126- __asm__ __volatile__(
8127-"1: ldarx %0,0,%2 # atomic64_dec\n\
8128- addic %0,%0,-1\n\
8129- stdcx. %0,0,%2\n\
8130- bne- 1b"
8131- : "=&r" (t), "+m" (v->counter)
8132- : "r" (&v->counter)
8133- : "cc", "xer");
8134-}
8135-
8136-static __inline__ long atomic64_dec_return(atomic64_t *v)
8137-{
8138- long t;
8139-
8140- __asm__ __volatile__(
8141- PPC_ATOMIC_ENTRY_BARRIER
8142-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8143- addic %0,%0,-1\n\
8144- stdcx. %0,0,%1\n\
8145- bne- 1b"
8146- PPC_ATOMIC_EXIT_BARRIER
8147- : "=&r" (t)
8148- : "r" (&v->counter)
8149- : "cc", "xer", "memory");
8150-
8151- return t;
8152+ atomic64_sub_unchecked(1, v);
8153 }
8154
8155 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8156@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8157 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8158 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8159
8160+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8161+{
8162+ return cmpxchg(&(v->counter), old, new);
8163+}
8164+
8165+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8166+{
8167+ return xchg(&(v->counter), new);
8168+}
8169+
8170 /**
8171 * atomic64_add_unless - add unless the number is a given value
8172 * @v: pointer of type atomic64_t
8173@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8174
8175 __asm__ __volatile__ (
8176 PPC_ATOMIC_ENTRY_BARRIER
8177-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8178+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8179 cmpd 0,%0,%3 \n\
8180- beq- 2f \n\
8181- add %0,%2,%0 \n"
8182+ beq- 2f \n"
8183+
8184+#ifdef CONFIG_PAX_REFCOUNT
8185+" mcrxr cr0\n"
8186+" addo. %0,%2,%0\n"
8187+" bf 4*cr0+so, 4f\n"
8188+"3:.long " "0x00c00b00""\n"
8189+"4:\n"
8190+#else
8191+ "add %0,%2,%0 \n"
8192+#endif
8193+
8194 " stdcx. %0,0,%1 \n\
8195 bne- 1b \n"
8196 PPC_ATOMIC_EXIT_BARRIER
8197+"5:"
8198+
8199+#ifdef CONFIG_PAX_REFCOUNT
8200+ _ASM_EXTABLE(3b, 5b)
8201+#endif
8202+
8203 " subf %0,%2,%0 \n\
8204 2:"
8205 : "=&r" (t)
8206diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8207index a3bf5be..e03ba81 100644
8208--- a/arch/powerpc/include/asm/barrier.h
8209+++ b/arch/powerpc/include/asm/barrier.h
8210@@ -76,7 +76,7 @@
8211 do { \
8212 compiletime_assert_atomic_type(*p); \
8213 smp_lwsync(); \
8214- ACCESS_ONCE(*p) = (v); \
8215+ ACCESS_ONCE_RW(*p) = (v); \
8216 } while (0)
8217
8218 #define smp_load_acquire(p) \
8219diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8220index 34a05a1..a1f2c67 100644
8221--- a/arch/powerpc/include/asm/cache.h
8222+++ b/arch/powerpc/include/asm/cache.h
8223@@ -4,6 +4,7 @@
8224 #ifdef __KERNEL__
8225
8226 #include <asm/reg.h>
8227+#include <linux/const.h>
8228
8229 /* bytes per L1 cache line */
8230 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8231@@ -23,7 +24,7 @@
8232 #define L1_CACHE_SHIFT 7
8233 #endif
8234
8235-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8236+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8237
8238 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8239
8240diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8241index 57d289a..b36c98c 100644
8242--- a/arch/powerpc/include/asm/elf.h
8243+++ b/arch/powerpc/include/asm/elf.h
8244@@ -30,6 +30,18 @@
8245
8246 #define ELF_ET_DYN_BASE 0x20000000
8247
8248+#ifdef CONFIG_PAX_ASLR
8249+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8250+
8251+#ifdef __powerpc64__
8252+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8253+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8254+#else
8255+#define PAX_DELTA_MMAP_LEN 15
8256+#define PAX_DELTA_STACK_LEN 15
8257+#endif
8258+#endif
8259+
8260 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8261
8262 /*
8263@@ -128,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8264 (0x7ff >> (PAGE_SHIFT - 12)) : \
8265 (0x3ffff >> (PAGE_SHIFT - 12)))
8266
8267-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8268-#define arch_randomize_brk arch_randomize_brk
8269-
8270-
8271 #ifdef CONFIG_SPU_BASE
8272 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8273 #define NT_SPU 1
8274diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8275index 8196e9c..d83a9f3 100644
8276--- a/arch/powerpc/include/asm/exec.h
8277+++ b/arch/powerpc/include/asm/exec.h
8278@@ -4,6 +4,6 @@
8279 #ifndef _ASM_POWERPC_EXEC_H
8280 #define _ASM_POWERPC_EXEC_H
8281
8282-extern unsigned long arch_align_stack(unsigned long sp);
8283+#define arch_align_stack(x) ((x) & ~0xfUL)
8284
8285 #endif /* _ASM_POWERPC_EXEC_H */
8286diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8287index 5acabbd..7ea14fa 100644
8288--- a/arch/powerpc/include/asm/kmap_types.h
8289+++ b/arch/powerpc/include/asm/kmap_types.h
8290@@ -10,7 +10,7 @@
8291 * 2 of the License, or (at your option) any later version.
8292 */
8293
8294-#define KM_TYPE_NR 16
8295+#define KM_TYPE_NR 17
8296
8297 #endif /* __KERNEL__ */
8298 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8299diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8300index b8da913..c02b593 100644
8301--- a/arch/powerpc/include/asm/local.h
8302+++ b/arch/powerpc/include/asm/local.h
8303@@ -9,21 +9,65 @@ typedef struct
8304 atomic_long_t a;
8305 } local_t;
8306
8307+typedef struct
8308+{
8309+ atomic_long_unchecked_t a;
8310+} local_unchecked_t;
8311+
8312 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8313
8314 #define local_read(l) atomic_long_read(&(l)->a)
8315+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8316 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8317+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8318
8319 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8320+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8321 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8322+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8323 #define local_inc(l) atomic_long_inc(&(l)->a)
8324+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8325 #define local_dec(l) atomic_long_dec(&(l)->a)
8326+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8327
8328 static __inline__ long local_add_return(long a, local_t *l)
8329 {
8330 long t;
8331
8332 __asm__ __volatile__(
8333+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8334+
8335+#ifdef CONFIG_PAX_REFCOUNT
8336+" mcrxr cr0\n"
8337+" addo. %0,%1,%0\n"
8338+" bf 4*cr0+so, 3f\n"
8339+"2:.long " "0x00c00b00""\n"
8340+#else
8341+" add %0,%1,%0\n"
8342+#endif
8343+
8344+"3:\n"
8345+ PPC405_ERR77(0,%2)
8346+ PPC_STLCX "%0,0,%2 \n\
8347+ bne- 1b"
8348+
8349+#ifdef CONFIG_PAX_REFCOUNT
8350+"\n4:\n"
8351+ _ASM_EXTABLE(2b, 4b)
8352+#endif
8353+
8354+ : "=&r" (t)
8355+ : "r" (a), "r" (&(l->a.counter))
8356+ : "cc", "memory");
8357+
8358+ return t;
8359+}
8360+
8361+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8362+{
8363+ long t;
8364+
8365+ __asm__ __volatile__(
8366 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8367 add %0,%1,%0\n"
8368 PPC405_ERR77(0,%2)
8369@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8370
8371 #define local_cmpxchg(l, o, n) \
8372 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8373+#define local_cmpxchg_unchecked(l, o, n) \
8374+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8375 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8376
8377 /**
8378diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8379index 8565c25..2865190 100644
8380--- a/arch/powerpc/include/asm/mman.h
8381+++ b/arch/powerpc/include/asm/mman.h
8382@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8383 }
8384 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8385
8386-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8387+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8388 {
8389 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8390 }
8391diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8392index 69c0598..2c56964 100644
8393--- a/arch/powerpc/include/asm/page.h
8394+++ b/arch/powerpc/include/asm/page.h
8395@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8396 * and needs to be executable. This means the whole heap ends
8397 * up being executable.
8398 */
8399-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8400- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8401+#define VM_DATA_DEFAULT_FLAGS32 \
8402+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8403+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8404
8405 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8406 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8407@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8408 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8409 #endif
8410
8411+#define ktla_ktva(addr) (addr)
8412+#define ktva_ktla(addr) (addr)
8413+
8414 #ifndef CONFIG_PPC_BOOK3S_64
8415 /*
8416 * Use the top bit of the higher-level page table entries to indicate whether
8417diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8418index d908a46..3753f71 100644
8419--- a/arch/powerpc/include/asm/page_64.h
8420+++ b/arch/powerpc/include/asm/page_64.h
8421@@ -172,15 +172,18 @@ do { \
8422 * stack by default, so in the absence of a PT_GNU_STACK program header
8423 * we turn execute permission off.
8424 */
8425-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8426- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8427+#define VM_STACK_DEFAULT_FLAGS32 \
8428+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8429+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8430
8431 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8432 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8433
8434+#ifndef CONFIG_PAX_PAGEEXEC
8435 #define VM_STACK_DEFAULT_FLAGS \
8436 (is_32bit_task() ? \
8437 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8438+#endif
8439
8440 #include <asm-generic/getorder.h>
8441
8442diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8443index 4b0be20..c15a27d 100644
8444--- a/arch/powerpc/include/asm/pgalloc-64.h
8445+++ b/arch/powerpc/include/asm/pgalloc-64.h
8446@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8447 #ifndef CONFIG_PPC_64K_PAGES
8448
8449 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8450+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8451
8452 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8453 {
8454@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8455 pud_set(pud, (unsigned long)pmd);
8456 }
8457
8458+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8459+{
8460+ pud_populate(mm, pud, pmd);
8461+}
8462+
8463 #define pmd_populate(mm, pmd, pte_page) \
8464 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8465 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8466@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8467 #endif
8468
8469 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8470+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8471
8472 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8473 pte_t *pte)
8474diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8475index 9835ac4..900430f 100644
8476--- a/arch/powerpc/include/asm/pgtable.h
8477+++ b/arch/powerpc/include/asm/pgtable.h
8478@@ -2,6 +2,7 @@
8479 #define _ASM_POWERPC_PGTABLE_H
8480 #ifdef __KERNEL__
8481
8482+#include <linux/const.h>
8483 #ifndef __ASSEMBLY__
8484 #include <linux/mmdebug.h>
8485 #include <linux/mmzone.h>
8486diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8487index 62cfb0c..50c6402 100644
8488--- a/arch/powerpc/include/asm/pte-hash32.h
8489+++ b/arch/powerpc/include/asm/pte-hash32.h
8490@@ -20,6 +20,7 @@
8491 #define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */
8492 #define _PAGE_USER 0x004 /* usermode access allowed */
8493 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8494+#define _PAGE_EXEC _PAGE_GUARDED
8495 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8496 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8497 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8498diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8499index af56b5c..f86f3f6 100644
8500--- a/arch/powerpc/include/asm/reg.h
8501+++ b/arch/powerpc/include/asm/reg.h
8502@@ -253,6 +253,7 @@
8503 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8504 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8505 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8506+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8507 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8508 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8509 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8510diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8511index d607df5..08dc9ae 100644
8512--- a/arch/powerpc/include/asm/smp.h
8513+++ b/arch/powerpc/include/asm/smp.h
8514@@ -51,7 +51,7 @@ struct smp_ops_t {
8515 int (*cpu_disable)(void);
8516 void (*cpu_die)(unsigned int nr);
8517 int (*cpu_bootable)(unsigned int nr);
8518-};
8519+} __no_const;
8520
8521 extern void smp_send_debugger_break(void);
8522 extern void start_secondary_resume(void);
8523diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8524index 4dbe072..b803275 100644
8525--- a/arch/powerpc/include/asm/spinlock.h
8526+++ b/arch/powerpc/include/asm/spinlock.h
8527@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8528 __asm__ __volatile__(
8529 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8530 __DO_SIGN_EXTEND
8531-" addic. %0,%0,1\n\
8532- ble- 2f\n"
8533+
8534+#ifdef CONFIG_PAX_REFCOUNT
8535+" mcrxr cr0\n"
8536+" addico. %0,%0,1\n"
8537+" bf 4*cr0+so, 3f\n"
8538+"2:.long " "0x00c00b00""\n"
8539+#else
8540+" addic. %0,%0,1\n"
8541+#endif
8542+
8543+"3:\n"
8544+ "ble- 4f\n"
8545 PPC405_ERR77(0,%1)
8546 " stwcx. %0,0,%1\n\
8547 bne- 1b\n"
8548 PPC_ACQUIRE_BARRIER
8549-"2:" : "=&r" (tmp)
8550+"4:"
8551+
8552+#ifdef CONFIG_PAX_REFCOUNT
8553+ _ASM_EXTABLE(2b,4b)
8554+#endif
8555+
8556+ : "=&r" (tmp)
8557 : "r" (&rw->lock)
8558 : "cr0", "xer", "memory");
8559
8560@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8561 __asm__ __volatile__(
8562 "# read_unlock\n\t"
8563 PPC_RELEASE_BARRIER
8564-"1: lwarx %0,0,%1\n\
8565- addic %0,%0,-1\n"
8566+"1: lwarx %0,0,%1\n"
8567+
8568+#ifdef CONFIG_PAX_REFCOUNT
8569+" mcrxr cr0\n"
8570+" addico. %0,%0,-1\n"
8571+" bf 4*cr0+so, 3f\n"
8572+"2:.long " "0x00c00b00""\n"
8573+#else
8574+" addic. %0,%0,-1\n"
8575+#endif
8576+
8577+"3:\n"
8578 PPC405_ERR77(0,%1)
8579 " stwcx. %0,0,%1\n\
8580 bne- 1b"
8581+
8582+#ifdef CONFIG_PAX_REFCOUNT
8583+"\n4:\n"
8584+ _ASM_EXTABLE(2b, 4b)
8585+#endif
8586+
8587 : "=&r"(tmp)
8588 : "r"(&rw->lock)
8589 : "cr0", "xer", "memory");
8590diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8591index 7248979..80b75de 100644
8592--- a/arch/powerpc/include/asm/thread_info.h
8593+++ b/arch/powerpc/include/asm/thread_info.h
8594@@ -103,6 +103,8 @@ static inline struct thread_info *current_thread_info(void)
8595 #if defined(CONFIG_PPC64)
8596 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8597 #endif
8598+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8599+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8600
8601 /* as above, but as bit values */
8602 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8603@@ -121,9 +123,10 @@ static inline struct thread_info *current_thread_info(void)
8604 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8605 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8606 #define _TIF_NOHZ (1<<TIF_NOHZ)
8607+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8608 #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8609 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8610- _TIF_NOHZ)
8611+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8612
8613 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8614 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8615diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8616index a0c071d..49cdc7f 100644
8617--- a/arch/powerpc/include/asm/uaccess.h
8618+++ b/arch/powerpc/include/asm/uaccess.h
8619@@ -58,6 +58,7 @@
8620
8621 #endif
8622
8623+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8624 #define access_ok(type, addr, size) \
8625 (__chk_user_ptr(addr), \
8626 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8627@@ -318,52 +319,6 @@ do { \
8628 extern unsigned long __copy_tofrom_user(void __user *to,
8629 const void __user *from, unsigned long size);
8630
8631-#ifndef __powerpc64__
8632-
8633-static inline unsigned long copy_from_user(void *to,
8634- const void __user *from, unsigned long n)
8635-{
8636- unsigned long over;
8637-
8638- if (access_ok(VERIFY_READ, from, n))
8639- return __copy_tofrom_user((__force void __user *)to, from, n);
8640- if ((unsigned long)from < TASK_SIZE) {
8641- over = (unsigned long)from + n - TASK_SIZE;
8642- return __copy_tofrom_user((__force void __user *)to, from,
8643- n - over) + over;
8644- }
8645- return n;
8646-}
8647-
8648-static inline unsigned long copy_to_user(void __user *to,
8649- const void *from, unsigned long n)
8650-{
8651- unsigned long over;
8652-
8653- if (access_ok(VERIFY_WRITE, to, n))
8654- return __copy_tofrom_user(to, (__force void __user *)from, n);
8655- if ((unsigned long)to < TASK_SIZE) {
8656- over = (unsigned long)to + n - TASK_SIZE;
8657- return __copy_tofrom_user(to, (__force void __user *)from,
8658- n - over) + over;
8659- }
8660- return n;
8661-}
8662-
8663-#else /* __powerpc64__ */
8664-
8665-#define __copy_in_user(to, from, size) \
8666- __copy_tofrom_user((to), (from), (size))
8667-
8668-extern unsigned long copy_from_user(void *to, const void __user *from,
8669- unsigned long n);
8670-extern unsigned long copy_to_user(void __user *to, const void *from,
8671- unsigned long n);
8672-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8673- unsigned long n);
8674-
8675-#endif /* __powerpc64__ */
8676-
8677 static inline unsigned long __copy_from_user_inatomic(void *to,
8678 const void __user *from, unsigned long n)
8679 {
8680@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8681 if (ret == 0)
8682 return 0;
8683 }
8684+
8685+ if (!__builtin_constant_p(n))
8686+ check_object_size(to, n, false);
8687+
8688 return __copy_tofrom_user((__force void __user *)to, from, n);
8689 }
8690
8691@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8692 if (ret == 0)
8693 return 0;
8694 }
8695+
8696+ if (!__builtin_constant_p(n))
8697+ check_object_size(from, n, true);
8698+
8699 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8700 }
8701
8702@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8703 return __copy_to_user_inatomic(to, from, size);
8704 }
8705
8706+#ifndef __powerpc64__
8707+
8708+static inline unsigned long __must_check copy_from_user(void *to,
8709+ const void __user *from, unsigned long n)
8710+{
8711+ unsigned long over;
8712+
8713+ if ((long)n < 0)
8714+ return n;
8715+
8716+ if (access_ok(VERIFY_READ, from, n)) {
8717+ if (!__builtin_constant_p(n))
8718+ check_object_size(to, n, false);
8719+ return __copy_tofrom_user((__force void __user *)to, from, n);
8720+ }
8721+ if ((unsigned long)from < TASK_SIZE) {
8722+ over = (unsigned long)from + n - TASK_SIZE;
8723+ if (!__builtin_constant_p(n - over))
8724+ check_object_size(to, n - over, false);
8725+ return __copy_tofrom_user((__force void __user *)to, from,
8726+ n - over) + over;
8727+ }
8728+ return n;
8729+}
8730+
8731+static inline unsigned long __must_check copy_to_user(void __user *to,
8732+ const void *from, unsigned long n)
8733+{
8734+ unsigned long over;
8735+
8736+ if ((long)n < 0)
8737+ return n;
8738+
8739+ if (access_ok(VERIFY_WRITE, to, n)) {
8740+ if (!__builtin_constant_p(n))
8741+ check_object_size(from, n, true);
8742+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8743+ }
8744+ if ((unsigned long)to < TASK_SIZE) {
8745+ over = (unsigned long)to + n - TASK_SIZE;
8746+ if (!__builtin_constant_p(n))
8747+ check_object_size(from, n - over, true);
8748+ return __copy_tofrom_user(to, (__force void __user *)from,
8749+ n - over) + over;
8750+ }
8751+ return n;
8752+}
8753+
8754+#else /* __powerpc64__ */
8755+
8756+#define __copy_in_user(to, from, size) \
8757+ __copy_tofrom_user((to), (from), (size))
8758+
8759+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8760+{
8761+ if ((long)n < 0 || n > INT_MAX)
8762+ return n;
8763+
8764+ if (!__builtin_constant_p(n))
8765+ check_object_size(to, n, false);
8766+
8767+ if (likely(access_ok(VERIFY_READ, from, n)))
8768+ n = __copy_from_user(to, from, n);
8769+ else
8770+ memset(to, 0, n);
8771+ return n;
8772+}
8773+
8774+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8775+{
8776+ if ((long)n < 0 || n > INT_MAX)
8777+ return n;
8778+
8779+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8780+ if (!__builtin_constant_p(n))
8781+ check_object_size(from, n, true);
8782+ n = __copy_to_user(to, from, n);
8783+ }
8784+ return n;
8785+}
8786+
8787+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8788+ unsigned long n);
8789+
8790+#endif /* __powerpc64__ */
8791+
8792 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8793
8794 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8795diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8796index 502cf69..53936a1 100644
8797--- a/arch/powerpc/kernel/Makefile
8798+++ b/arch/powerpc/kernel/Makefile
8799@@ -15,6 +15,11 @@ CFLAGS_prom_init.o += -fPIC
8800 CFLAGS_btext.o += -fPIC
8801 endif
8802
8803+CFLAGS_REMOVE_cputable.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8804+CFLAGS_REMOVE_prom_init.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8805+CFLAGS_REMOVE_btext.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8806+CFLAGS_REMOVE_prom.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8807+
8808 ifdef CONFIG_FUNCTION_TRACER
8809 # Do not trace early boot code
8810 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
8811@@ -27,6 +32,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8812 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8813 endif
8814
8815+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8816+
8817 obj-y := cputable.o ptrace.o syscalls.o \
8818 irq.o align.o signal_32.o pmc.o vdso.o \
8819 process.o systbl.o idle.o \
8820diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8821index 3e68d1c..72a5ee6 100644
8822--- a/arch/powerpc/kernel/exceptions-64e.S
8823+++ b/arch/powerpc/kernel/exceptions-64e.S
8824@@ -1010,6 +1010,7 @@ storage_fault_common:
8825 std r14,_DAR(r1)
8826 std r15,_DSISR(r1)
8827 addi r3,r1,STACK_FRAME_OVERHEAD
8828+ bl save_nvgprs
8829 mr r4,r14
8830 mr r5,r15
8831 ld r14,PACA_EXGEN+EX_R14(r13)
8832@@ -1018,8 +1019,7 @@ storage_fault_common:
8833 cmpdi r3,0
8834 bne- 1f
8835 b ret_from_except_lite
8836-1: bl save_nvgprs
8837- mr r5,r3
8838+1: mr r5,r3
8839 addi r3,r1,STACK_FRAME_OVERHEAD
8840 ld r4,_DAR(r1)
8841 bl bad_page_fault
8842diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8843index 9519e6b..13f6c38 100644
8844--- a/arch/powerpc/kernel/exceptions-64s.S
8845+++ b/arch/powerpc/kernel/exceptions-64s.S
8846@@ -1599,10 +1599,10 @@ handle_page_fault:
8847 11: ld r4,_DAR(r1)
8848 ld r5,_DSISR(r1)
8849 addi r3,r1,STACK_FRAME_OVERHEAD
8850+ bl save_nvgprs
8851 bl do_page_fault
8852 cmpdi r3,0
8853 beq+ 12f
8854- bl save_nvgprs
8855 mr r5,r3
8856 addi r3,r1,STACK_FRAME_OVERHEAD
8857 lwz r4,_DAR(r1)
8858diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8859index 4509603..cdb491f 100644
8860--- a/arch/powerpc/kernel/irq.c
8861+++ b/arch/powerpc/kernel/irq.c
8862@@ -460,6 +460,8 @@ void migrate_irqs(void)
8863 }
8864 #endif
8865
8866+extern void gr_handle_kernel_exploit(void);
8867+
8868 static inline void check_stack_overflow(void)
8869 {
8870 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8871@@ -472,6 +474,7 @@ static inline void check_stack_overflow(void)
8872 pr_err("do_IRQ: stack overflow: %ld\n",
8873 sp - sizeof(struct thread_info));
8874 dump_stack();
8875+ gr_handle_kernel_exploit();
8876 }
8877 #endif
8878 }
8879diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8880index c94d2e0..992a9ce 100644
8881--- a/arch/powerpc/kernel/module_32.c
8882+++ b/arch/powerpc/kernel/module_32.c
8883@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8884 me->arch.core_plt_section = i;
8885 }
8886 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8887- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8888+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8889 return -ENOEXEC;
8890 }
8891
8892@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8893
8894 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8895 /* Init, or core PLT? */
8896- if (location >= mod->module_core
8897- && location < mod->module_core + mod->core_size)
8898+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8899+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8900 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8901- else
8902+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8903+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8904 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8905+ else {
8906+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8907+ return ~0UL;
8908+ }
8909
8910 /* Find this entry, or if that fails, the next avail. entry */
8911 while (entry->jump[0]) {
8912@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8913 }
8914 #ifdef CONFIG_DYNAMIC_FTRACE
8915 module->arch.tramp =
8916- do_plt_call(module->module_core,
8917+ do_plt_call(module->module_core_rx,
8918 (unsigned long)ftrace_caller,
8919 sechdrs, module);
8920 #endif
8921diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8922index b4cc7be..1fe8bb3 100644
8923--- a/arch/powerpc/kernel/process.c
8924+++ b/arch/powerpc/kernel/process.c
8925@@ -1036,8 +1036,8 @@ void show_regs(struct pt_regs * regs)
8926 * Lookup NIP late so we have the best change of getting the
8927 * above info out without failing
8928 */
8929- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8930- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8931+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8932+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8933 #endif
8934 show_stack(current, (unsigned long *) regs->gpr[1]);
8935 if (!user_mode(regs))
8936@@ -1549,10 +1549,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8937 newsp = stack[0];
8938 ip = stack[STACK_FRAME_LR_SAVE];
8939 if (!firstframe || ip != lr) {
8940- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8941+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8942 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8943 if ((ip == rth) && curr_frame >= 0) {
8944- printk(" (%pS)",
8945+ printk(" (%pA)",
8946 (void *)current->ret_stack[curr_frame].ret);
8947 curr_frame--;
8948 }
8949@@ -1572,7 +1572,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8950 struct pt_regs *regs = (struct pt_regs *)
8951 (sp + STACK_FRAME_OVERHEAD);
8952 lr = regs->link;
8953- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8954+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8955 regs->trap, (void *)regs->nip, (void *)lr);
8956 firstframe = 1;
8957 }
8958@@ -1608,49 +1608,3 @@ void notrace __ppc64_runlatch_off(void)
8959 mtspr(SPRN_CTRLT, ctrl);
8960 }
8961 #endif /* CONFIG_PPC64 */
8962-
8963-unsigned long arch_align_stack(unsigned long sp)
8964-{
8965- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8966- sp -= get_random_int() & ~PAGE_MASK;
8967- return sp & ~0xf;
8968-}
8969-
8970-static inline unsigned long brk_rnd(void)
8971-{
8972- unsigned long rnd = 0;
8973-
8974- /* 8MB for 32bit, 1GB for 64bit */
8975- if (is_32bit_task())
8976- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8977- else
8978- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8979-
8980- return rnd << PAGE_SHIFT;
8981-}
8982-
8983-unsigned long arch_randomize_brk(struct mm_struct *mm)
8984-{
8985- unsigned long base = mm->brk;
8986- unsigned long ret;
8987-
8988-#ifdef CONFIG_PPC_STD_MMU_64
8989- /*
8990- * If we are using 1TB segments and we are allowed to randomise
8991- * the heap, we can put it above 1TB so it is backed by a 1TB
8992- * segment. Otherwise the heap will be in the bottom 1TB
8993- * which always uses 256MB segments and this may result in a
8994- * performance penalty.
8995- */
8996- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8997- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8998-#endif
8999-
9000- ret = PAGE_ALIGN(base + brk_rnd());
9001-
9002- if (ret < mm->brk)
9003- return mm->brk;
9004-
9005- return ret;
9006-}
9007-
9008diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9009index f21897b..28c0428 100644
9010--- a/arch/powerpc/kernel/ptrace.c
9011+++ b/arch/powerpc/kernel/ptrace.c
9012@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9013 return ret;
9014 }
9015
9016+#ifdef CONFIG_GRKERNSEC_SETXID
9017+extern void gr_delayed_cred_worker(void);
9018+#endif
9019+
9020 /*
9021 * We must return the syscall number to actually look up in the table.
9022 * This can be -1L to skip running any syscall at all.
9023@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9024
9025 secure_computing_strict(regs->gpr[0]);
9026
9027+#ifdef CONFIG_GRKERNSEC_SETXID
9028+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9029+ gr_delayed_cred_worker();
9030+#endif
9031+
9032 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9033 tracehook_report_syscall_entry(regs))
9034 /*
9035@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9036 {
9037 int step;
9038
9039+#ifdef CONFIG_GRKERNSEC_SETXID
9040+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9041+ gr_delayed_cred_worker();
9042+#endif
9043+
9044 audit_syscall_exit(regs);
9045
9046 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9047diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9048index d3a831a..3a33123 100644
9049--- a/arch/powerpc/kernel/signal_32.c
9050+++ b/arch/powerpc/kernel/signal_32.c
9051@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9052 /* Save user registers on the stack */
9053 frame = &rt_sf->uc.uc_mcontext;
9054 addr = frame;
9055- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9056+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9057 sigret = 0;
9058 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9059 } else {
9060diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9061index c7c24d2..1bf7039 100644
9062--- a/arch/powerpc/kernel/signal_64.c
9063+++ b/arch/powerpc/kernel/signal_64.c
9064@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9065 current->thread.fp_state.fpscr = 0;
9066
9067 /* Set up to return from userspace. */
9068- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9069+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9070 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9071 } else {
9072 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9073diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9074index 19e4744..28a8d7b 100644
9075--- a/arch/powerpc/kernel/traps.c
9076+++ b/arch/powerpc/kernel/traps.c
9077@@ -36,6 +36,7 @@
9078 #include <linux/debugfs.h>
9079 #include <linux/ratelimit.h>
9080 #include <linux/context_tracking.h>
9081+#include <linux/uaccess.h>
9082
9083 #include <asm/emulated_ops.h>
9084 #include <asm/pgtable.h>
9085@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9086 return flags;
9087 }
9088
9089+extern void gr_handle_kernel_exploit(void);
9090+
9091 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9092 int signr)
9093 {
9094@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9095 panic("Fatal exception in interrupt");
9096 if (panic_on_oops)
9097 panic("Fatal exception");
9098+
9099+ gr_handle_kernel_exploit();
9100+
9101 do_exit(signr);
9102 }
9103
9104@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9105 enum ctx_state prev_state = exception_enter();
9106 unsigned int reason = get_reason(regs);
9107
9108+#ifdef CONFIG_PAX_REFCOUNT
9109+ unsigned int bkpt;
9110+ const struct exception_table_entry *entry;
9111+
9112+ if (reason & REASON_ILLEGAL) {
9113+ /* Check if PaX bad instruction */
9114+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9115+ current->thread.trap_nr = 0;
9116+ pax_report_refcount_overflow(regs);
9117+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9118+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9119+ regs->nip = entry->fixup;
9120+ return;
9121+ }
9122+ /* fixup_exception() could not handle */
9123+ goto bail;
9124+ }
9125+ }
9126+#endif
9127+
9128 /* We can now get here via a FP Unavailable exception if the core
9129 * has no FPU, in that case the reason flags will be 0 */
9130
9131diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9132index 305eb0d..accc5b40 100644
9133--- a/arch/powerpc/kernel/vdso.c
9134+++ b/arch/powerpc/kernel/vdso.c
9135@@ -34,6 +34,7 @@
9136 #include <asm/vdso.h>
9137 #include <asm/vdso_datapage.h>
9138 #include <asm/setup.h>
9139+#include <asm/mman.h>
9140
9141 #undef DEBUG
9142
9143@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9144 vdso_base = VDSO32_MBASE;
9145 #endif
9146
9147- current->mm->context.vdso_base = 0;
9148+ current->mm->context.vdso_base = ~0UL;
9149
9150 /* vDSO has a problem and was disabled, just don't "enable" it for the
9151 * process
9152@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9153 vdso_base = get_unmapped_area(NULL, vdso_base,
9154 (vdso_pages << PAGE_SHIFT) +
9155 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9156- 0, 0);
9157+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9158 if (IS_ERR_VALUE(vdso_base)) {
9159 rc = vdso_base;
9160 goto fail_mmapsem;
9161diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9162index 27c0fac..6ec4a32 100644
9163--- a/arch/powerpc/kvm/powerpc.c
9164+++ b/arch/powerpc/kvm/powerpc.c
9165@@ -1402,7 +1402,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9166 }
9167 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9168
9169-int kvm_arch_init(void *opaque)
9170+int kvm_arch_init(const void *opaque)
9171 {
9172 return 0;
9173 }
9174diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9175index 5eea6f3..5d10396 100644
9176--- a/arch/powerpc/lib/usercopy_64.c
9177+++ b/arch/powerpc/lib/usercopy_64.c
9178@@ -9,22 +9,6 @@
9179 #include <linux/module.h>
9180 #include <asm/uaccess.h>
9181
9182-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9183-{
9184- if (likely(access_ok(VERIFY_READ, from, n)))
9185- n = __copy_from_user(to, from, n);
9186- else
9187- memset(to, 0, n);
9188- return n;
9189-}
9190-
9191-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9192-{
9193- if (likely(access_ok(VERIFY_WRITE, to, n)))
9194- n = __copy_to_user(to, from, n);
9195- return n;
9196-}
9197-
9198 unsigned long copy_in_user(void __user *to, const void __user *from,
9199 unsigned long n)
9200 {
9201@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9202 return n;
9203 }
9204
9205-EXPORT_SYMBOL(copy_from_user);
9206-EXPORT_SYMBOL(copy_to_user);
9207 EXPORT_SYMBOL(copy_in_user);
9208
9209diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9210index b396868..3eb6b9f 100644
9211--- a/arch/powerpc/mm/fault.c
9212+++ b/arch/powerpc/mm/fault.c
9213@@ -33,6 +33,10 @@
9214 #include <linux/ratelimit.h>
9215 #include <linux/context_tracking.h>
9216 #include <linux/hugetlb.h>
9217+#include <linux/slab.h>
9218+#include <linux/pagemap.h>
9219+#include <linux/compiler.h>
9220+#include <linux/unistd.h>
9221
9222 #include <asm/firmware.h>
9223 #include <asm/page.h>
9224@@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9225 }
9226 #endif
9227
9228+#ifdef CONFIG_PAX_PAGEEXEC
9229+/*
9230+ * PaX: decide what to do with offenders (regs->nip = fault address)
9231+ *
9232+ * returns 1 when task should be killed
9233+ */
9234+static int pax_handle_fetch_fault(struct pt_regs *regs)
9235+{
9236+ return 1;
9237+}
9238+
9239+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9240+{
9241+ unsigned long i;
9242+
9243+ printk(KERN_ERR "PAX: bytes at PC: ");
9244+ for (i = 0; i < 5; i++) {
9245+ unsigned int c;
9246+ if (get_user(c, (unsigned int __user *)pc+i))
9247+ printk(KERN_CONT "???????? ");
9248+ else
9249+ printk(KERN_CONT "%08x ", c);
9250+ }
9251+ printk("\n");
9252+}
9253+#endif
9254+
9255 /*
9256 * Check whether the instruction at regs->nip is a store using
9257 * an update addressing form which will update r1.
9258@@ -227,7 +258,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9259 * indicate errors in DSISR but can validly be set in SRR1.
9260 */
9261 if (trap == 0x400)
9262- error_code &= 0x48200000;
9263+ error_code &= 0x58200000;
9264 else
9265 is_write = error_code & DSISR_ISSTORE;
9266 #else
9267@@ -383,12 +414,16 @@ good_area:
9268 * "undefined". Of those that can be set, this is the only
9269 * one which seems bad.
9270 */
9271- if (error_code & 0x10000000)
9272+ if (error_code & DSISR_GUARDED)
9273 /* Guarded storage error. */
9274 goto bad_area;
9275 #endif /* CONFIG_8xx */
9276
9277 if (is_exec) {
9278+#ifdef CONFIG_PPC_STD_MMU
9279+ if (error_code & DSISR_GUARDED)
9280+ goto bad_area;
9281+#endif
9282 /*
9283 * Allow execution from readable areas if the MMU does not
9284 * provide separate controls over reading and executing.
9285@@ -483,6 +518,23 @@ bad_area:
9286 bad_area_nosemaphore:
9287 /* User mode accesses cause a SIGSEGV */
9288 if (user_mode(regs)) {
9289+
9290+#ifdef CONFIG_PAX_PAGEEXEC
9291+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9292+#ifdef CONFIG_PPC_STD_MMU
9293+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9294+#else
9295+ if (is_exec && regs->nip == address) {
9296+#endif
9297+ switch (pax_handle_fetch_fault(regs)) {
9298+ }
9299+
9300+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9301+ do_group_exit(SIGKILL);
9302+ }
9303+ }
9304+#endif
9305+
9306 _exception(SIGSEGV, regs, code, address);
9307 goto bail;
9308 }
9309diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9310index cb8bdbe..cde4bc7 100644
9311--- a/arch/powerpc/mm/mmap.c
9312+++ b/arch/powerpc/mm/mmap.c
9313@@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9314 return sysctl_legacy_va_layout;
9315 }
9316
9317-static unsigned long mmap_rnd(void)
9318+static unsigned long mmap_rnd(struct mm_struct *mm)
9319 {
9320 unsigned long rnd = 0;
9321
9322+#ifdef CONFIG_PAX_RANDMMAP
9323+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9324+#endif
9325+
9326 if (current->flags & PF_RANDOMIZE) {
9327 /* 8MB for 32bit, 1GB for 64bit */
9328 if (is_32bit_task())
9329@@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9330 return rnd << PAGE_SHIFT;
9331 }
9332
9333-static inline unsigned long mmap_base(void)
9334+static inline unsigned long mmap_base(struct mm_struct *mm)
9335 {
9336 unsigned long gap = rlimit(RLIMIT_STACK);
9337
9338@@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9339 else if (gap > MAX_GAP)
9340 gap = MAX_GAP;
9341
9342- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9343+ return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9344 }
9345
9346 /*
9347@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9348 */
9349 if (mmap_is_legacy()) {
9350 mm->mmap_base = TASK_UNMAPPED_BASE;
9351+
9352+#ifdef CONFIG_PAX_RANDMMAP
9353+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9354+ mm->mmap_base += mm->delta_mmap;
9355+#endif
9356+
9357 mm->get_unmapped_area = arch_get_unmapped_area;
9358 } else {
9359- mm->mmap_base = mmap_base();
9360+ mm->mmap_base = mmap_base(mm);
9361+
9362+#ifdef CONFIG_PAX_RANDMMAP
9363+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9364+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9365+#endif
9366+
9367 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9368 }
9369 }
9370diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9371index 0f432a7..abfe841 100644
9372--- a/arch/powerpc/mm/slice.c
9373+++ b/arch/powerpc/mm/slice.c
9374@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9375 if ((mm->task_size - len) < addr)
9376 return 0;
9377 vma = find_vma(mm, addr);
9378- return (!vma || (addr + len) <= vma->vm_start);
9379+ return check_heap_stack_gap(vma, addr, len, 0);
9380 }
9381
9382 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9383@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9384 info.align_offset = 0;
9385
9386 addr = TASK_UNMAPPED_BASE;
9387+
9388+#ifdef CONFIG_PAX_RANDMMAP
9389+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9390+ addr += mm->delta_mmap;
9391+#endif
9392+
9393 while (addr < TASK_SIZE) {
9394 info.low_limit = addr;
9395 if (!slice_scan_available(addr, available, 1, &addr))
9396@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9397 if (fixed && addr > (mm->task_size - len))
9398 return -ENOMEM;
9399
9400+#ifdef CONFIG_PAX_RANDMMAP
9401+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9402+ addr = 0;
9403+#endif
9404+
9405 /* If hint, make sure it matches our alignment restrictions */
9406 if (!fixed && addr) {
9407 addr = _ALIGN_UP(addr, 1ul << pshift);
9408diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9409index d966bbe..372124a 100644
9410--- a/arch/powerpc/platforms/cell/spufs/file.c
9411+++ b/arch/powerpc/platforms/cell/spufs/file.c
9412@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9413 return VM_FAULT_NOPAGE;
9414 }
9415
9416-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9417+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9418 unsigned long address,
9419- void *buf, int len, int write)
9420+ void *buf, size_t len, int write)
9421 {
9422 struct spu_context *ctx = vma->vm_file->private_data;
9423 unsigned long offset = address - vma->vm_start;
9424diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9425index fa934fe..c296056 100644
9426--- a/arch/s390/include/asm/atomic.h
9427+++ b/arch/s390/include/asm/atomic.h
9428@@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9429 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9430 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9431
9432+#define atomic64_read_unchecked(v) atomic64_read(v)
9433+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9434+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9435+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9436+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9437+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9438+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9439+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9440+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9441+
9442 #endif /* __ARCH_S390_ATOMIC__ */
9443diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9444index 8d72471..5322500 100644
9445--- a/arch/s390/include/asm/barrier.h
9446+++ b/arch/s390/include/asm/barrier.h
9447@@ -42,7 +42,7 @@
9448 do { \
9449 compiletime_assert_atomic_type(*p); \
9450 barrier(); \
9451- ACCESS_ONCE(*p) = (v); \
9452+ ACCESS_ONCE_RW(*p) = (v); \
9453 } while (0)
9454
9455 #define smp_load_acquire(p) \
9456diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9457index 4d7ccac..d03d0ad 100644
9458--- a/arch/s390/include/asm/cache.h
9459+++ b/arch/s390/include/asm/cache.h
9460@@ -9,8 +9,10 @@
9461 #ifndef __ARCH_S390_CACHE_H
9462 #define __ARCH_S390_CACHE_H
9463
9464-#define L1_CACHE_BYTES 256
9465+#include <linux/const.h>
9466+
9467 #define L1_CACHE_SHIFT 8
9468+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9469 #define NET_SKB_PAD 32
9470
9471 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9472diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9473index c9c875d..b4b0e4c 100644
9474--- a/arch/s390/include/asm/elf.h
9475+++ b/arch/s390/include/asm/elf.h
9476@@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9477 the loader. We need to make sure that it is out of the way of the program
9478 that it will "exec", and that there is sufficient room for the brk. */
9479
9480-extern unsigned long randomize_et_dyn(void);
9481-#define ELF_ET_DYN_BASE randomize_et_dyn()
9482+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9483+
9484+#ifdef CONFIG_PAX_ASLR
9485+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9486+
9487+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9488+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9489+#endif
9490
9491 /* This yields a mask that user programs can use to figure out what
9492 instruction set this CPU supports. */
9493@@ -225,9 +231,6 @@ struct linux_binprm;
9494 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9495 int arch_setup_additional_pages(struct linux_binprm *, int);
9496
9497-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9498-#define arch_randomize_brk arch_randomize_brk
9499-
9500 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9501
9502 #endif
9503diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9504index c4a93d6..4d2a9b4 100644
9505--- a/arch/s390/include/asm/exec.h
9506+++ b/arch/s390/include/asm/exec.h
9507@@ -7,6 +7,6 @@
9508 #ifndef __ASM_EXEC_H
9509 #define __ASM_EXEC_H
9510
9511-extern unsigned long arch_align_stack(unsigned long sp);
9512+#define arch_align_stack(x) ((x) & ~0xfUL)
9513
9514 #endif /* __ASM_EXEC_H */
9515diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9516index cd4c68e..6764641 100644
9517--- a/arch/s390/include/asm/uaccess.h
9518+++ b/arch/s390/include/asm/uaccess.h
9519@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9520 __range_ok((unsigned long)(addr), (size)); \
9521 })
9522
9523+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9524 #define access_ok(type, addr, size) __access_ok(addr, size)
9525
9526 /*
9527@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9528 copy_to_user(void __user *to, const void *from, unsigned long n)
9529 {
9530 might_fault();
9531+
9532+ if ((long)n < 0)
9533+ return n;
9534+
9535 return __copy_to_user(to, from, n);
9536 }
9537
9538@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9539 static inline unsigned long __must_check
9540 copy_from_user(void *to, const void __user *from, unsigned long n)
9541 {
9542- unsigned int sz = __compiletime_object_size(to);
9543+ size_t sz = __compiletime_object_size(to);
9544
9545 might_fault();
9546- if (unlikely(sz != -1 && sz < n)) {
9547+
9548+ if ((long)n < 0)
9549+ return n;
9550+
9551+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9552 copy_from_user_overflow();
9553 return n;
9554 }
9555diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9556index 2ca9586..55682a9 100644
9557--- a/arch/s390/kernel/module.c
9558+++ b/arch/s390/kernel/module.c
9559@@ -165,11 +165,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9560
9561 /* Increase core size by size of got & plt and set start
9562 offsets for got and plt. */
9563- me->core_size = ALIGN(me->core_size, 4);
9564- me->arch.got_offset = me->core_size;
9565- me->core_size += me->arch.got_size;
9566- me->arch.plt_offset = me->core_size;
9567- me->core_size += me->arch.plt_size;
9568+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9569+ me->arch.got_offset = me->core_size_rw;
9570+ me->core_size_rw += me->arch.got_size;
9571+ me->arch.plt_offset = me->core_size_rx;
9572+ me->core_size_rx += me->arch.plt_size;
9573 return 0;
9574 }
9575
9576@@ -285,7 +285,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9577 if (info->got_initialized == 0) {
9578 Elf_Addr *gotent;
9579
9580- gotent = me->module_core + me->arch.got_offset +
9581+ gotent = me->module_core_rw + me->arch.got_offset +
9582 info->got_offset;
9583 *gotent = val;
9584 info->got_initialized = 1;
9585@@ -308,7 +308,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9586 rc = apply_rela_bits(loc, val, 0, 64, 0);
9587 else if (r_type == R_390_GOTENT ||
9588 r_type == R_390_GOTPLTENT) {
9589- val += (Elf_Addr) me->module_core - loc;
9590+ val += (Elf_Addr) me->module_core_rw - loc;
9591 rc = apply_rela_bits(loc, val, 1, 32, 1);
9592 }
9593 break;
9594@@ -321,7 +321,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9595 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9596 if (info->plt_initialized == 0) {
9597 unsigned int *ip;
9598- ip = me->module_core + me->arch.plt_offset +
9599+ ip = me->module_core_rx + me->arch.plt_offset +
9600 info->plt_offset;
9601 #ifndef CONFIG_64BIT
9602 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9603@@ -346,7 +346,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9604 val - loc + 0xffffUL < 0x1ffffeUL) ||
9605 (r_type == R_390_PLT32DBL &&
9606 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9607- val = (Elf_Addr) me->module_core +
9608+ val = (Elf_Addr) me->module_core_rx +
9609 me->arch.plt_offset +
9610 info->plt_offset;
9611 val += rela->r_addend - loc;
9612@@ -368,7 +368,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9613 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9614 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9615 val = val + rela->r_addend -
9616- ((Elf_Addr) me->module_core + me->arch.got_offset);
9617+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9618 if (r_type == R_390_GOTOFF16)
9619 rc = apply_rela_bits(loc, val, 0, 16, 0);
9620 else if (r_type == R_390_GOTOFF32)
9621@@ -378,7 +378,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9622 break;
9623 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9624 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9625- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9626+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9627 rela->r_addend - loc;
9628 if (r_type == R_390_GOTPC)
9629 rc = apply_rela_bits(loc, val, 1, 32, 0);
9630diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9631index 13fc097..84d375f 100644
9632--- a/arch/s390/kernel/process.c
9633+++ b/arch/s390/kernel/process.c
9634@@ -227,27 +227,3 @@ unsigned long get_wchan(struct task_struct *p)
9635 }
9636 return 0;
9637 }
9638-
9639-unsigned long arch_align_stack(unsigned long sp)
9640-{
9641- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9642- sp -= get_random_int() & ~PAGE_MASK;
9643- return sp & ~0xf;
9644-}
9645-
9646-static inline unsigned long brk_rnd(void)
9647-{
9648- /* 8MB for 32bit, 1GB for 64bit */
9649- if (is_32bit_task())
9650- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9651- else
9652- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9653-}
9654-
9655-unsigned long arch_randomize_brk(struct mm_struct *mm)
9656-{
9657- unsigned long ret;
9658-
9659- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9660- return (ret > mm->brk) ? ret : mm->brk;
9661-}
9662diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9663index 179a2c2..4ba9137 100644
9664--- a/arch/s390/mm/mmap.c
9665+++ b/arch/s390/mm/mmap.c
9666@@ -62,6 +62,12 @@ static inline int mmap_is_legacy(void)
9667
9668 static unsigned long mmap_rnd(void)
9669 {
9670+
9671+#ifdef CONFIG_PAX_RANDMMAP
9672+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
9673+ return 0;
9674+#endif
9675+
9676 if (!(current->flags & PF_RANDOMIZE))
9677 return 0;
9678 if (is_32bit_task())
9679@@ -204,9 +210,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9680 */
9681 if (mmap_is_legacy()) {
9682 mm->mmap_base = mmap_base_legacy();
9683+
9684+#ifdef CONFIG_PAX_RANDMMAP
9685+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9686+ mm->mmap_base += mm->delta_mmap;
9687+#endif
9688+
9689 mm->get_unmapped_area = arch_get_unmapped_area;
9690 } else {
9691 mm->mmap_base = mmap_base();
9692+
9693+#ifdef CONFIG_PAX_RANDMMAP
9694+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9695+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9696+#endif
9697+
9698 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9699 }
9700 }
9701@@ -279,9 +297,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9702 */
9703 if (mmap_is_legacy()) {
9704 mm->mmap_base = mmap_base_legacy();
9705+
9706+#ifdef CONFIG_PAX_RANDMMAP
9707+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9708+ mm->mmap_base += mm->delta_mmap;
9709+#endif
9710+
9711 mm->get_unmapped_area = s390_get_unmapped_area;
9712 } else {
9713 mm->mmap_base = mmap_base();
9714+
9715+#ifdef CONFIG_PAX_RANDMMAP
9716+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9717+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9718+#endif
9719+
9720 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9721 }
9722 }
9723diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9724index ae3d59f..f65f075 100644
9725--- a/arch/score/include/asm/cache.h
9726+++ b/arch/score/include/asm/cache.h
9727@@ -1,7 +1,9 @@
9728 #ifndef _ASM_SCORE_CACHE_H
9729 #define _ASM_SCORE_CACHE_H
9730
9731+#include <linux/const.h>
9732+
9733 #define L1_CACHE_SHIFT 4
9734-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9735+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9736
9737 #endif /* _ASM_SCORE_CACHE_H */
9738diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9739index f9f3cd5..58ff438 100644
9740--- a/arch/score/include/asm/exec.h
9741+++ b/arch/score/include/asm/exec.h
9742@@ -1,6 +1,6 @@
9743 #ifndef _ASM_SCORE_EXEC_H
9744 #define _ASM_SCORE_EXEC_H
9745
9746-extern unsigned long arch_align_stack(unsigned long sp);
9747+#define arch_align_stack(x) (x)
9748
9749 #endif /* _ASM_SCORE_EXEC_H */
9750diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9751index a1519ad3..e8ac1ff 100644
9752--- a/arch/score/kernel/process.c
9753+++ b/arch/score/kernel/process.c
9754@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9755
9756 return task_pt_regs(task)->cp0_epc;
9757 }
9758-
9759-unsigned long arch_align_stack(unsigned long sp)
9760-{
9761- return sp;
9762-}
9763diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9764index ef9e555..331bd29 100644
9765--- a/arch/sh/include/asm/cache.h
9766+++ b/arch/sh/include/asm/cache.h
9767@@ -9,10 +9,11 @@
9768 #define __ASM_SH_CACHE_H
9769 #ifdef __KERNEL__
9770
9771+#include <linux/const.h>
9772 #include <linux/init.h>
9773 #include <cpu/cache.h>
9774
9775-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9776+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9777
9778 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9779
9780diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9781index 6777177..cb5e44f 100644
9782--- a/arch/sh/mm/mmap.c
9783+++ b/arch/sh/mm/mmap.c
9784@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9785 struct mm_struct *mm = current->mm;
9786 struct vm_area_struct *vma;
9787 int do_colour_align;
9788+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9789 struct vm_unmapped_area_info info;
9790
9791 if (flags & MAP_FIXED) {
9792@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9793 if (filp || (flags & MAP_SHARED))
9794 do_colour_align = 1;
9795
9796+#ifdef CONFIG_PAX_RANDMMAP
9797+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9798+#endif
9799+
9800 if (addr) {
9801 if (do_colour_align)
9802 addr = COLOUR_ALIGN(addr, pgoff);
9803@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9804 addr = PAGE_ALIGN(addr);
9805
9806 vma = find_vma(mm, addr);
9807- if (TASK_SIZE - len >= addr &&
9808- (!vma || addr + len <= vma->vm_start))
9809+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9810 return addr;
9811 }
9812
9813 info.flags = 0;
9814 info.length = len;
9815- info.low_limit = TASK_UNMAPPED_BASE;
9816+ info.low_limit = mm->mmap_base;
9817 info.high_limit = TASK_SIZE;
9818 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9819 info.align_offset = pgoff << PAGE_SHIFT;
9820@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9821 struct mm_struct *mm = current->mm;
9822 unsigned long addr = addr0;
9823 int do_colour_align;
9824+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9825 struct vm_unmapped_area_info info;
9826
9827 if (flags & MAP_FIXED) {
9828@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9829 if (filp || (flags & MAP_SHARED))
9830 do_colour_align = 1;
9831
9832+#ifdef CONFIG_PAX_RANDMMAP
9833+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9834+#endif
9835+
9836 /* requesting a specific address */
9837 if (addr) {
9838 if (do_colour_align)
9839@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9840 addr = PAGE_ALIGN(addr);
9841
9842 vma = find_vma(mm, addr);
9843- if (TASK_SIZE - len >= addr &&
9844- (!vma || addr + len <= vma->vm_start))
9845+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9846 return addr;
9847 }
9848
9849@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9850 VM_BUG_ON(addr != -ENOMEM);
9851 info.flags = 0;
9852 info.low_limit = TASK_UNMAPPED_BASE;
9853+
9854+#ifdef CONFIG_PAX_RANDMMAP
9855+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9856+ info.low_limit += mm->delta_mmap;
9857+#endif
9858+
9859 info.high_limit = TASK_SIZE;
9860 addr = vm_unmapped_area(&info);
9861 }
9862diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9863index 4082749..fd97781 100644
9864--- a/arch/sparc/include/asm/atomic_64.h
9865+++ b/arch/sparc/include/asm/atomic_64.h
9866@@ -15,18 +15,38 @@
9867 #define ATOMIC64_INIT(i) { (i) }
9868
9869 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9870+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9871+{
9872+ return ACCESS_ONCE(v->counter);
9873+}
9874 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9875+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9876+{
9877+ return ACCESS_ONCE(v->counter);
9878+}
9879
9880 #define atomic_set(v, i) (((v)->counter) = i)
9881+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9882+{
9883+ v->counter = i;
9884+}
9885 #define atomic64_set(v, i) (((v)->counter) = i)
9886+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9887+{
9888+ v->counter = i;
9889+}
9890
9891-#define ATOMIC_OP(op) \
9892-void atomic_##op(int, atomic_t *); \
9893-void atomic64_##op(long, atomic64_t *);
9894+#define __ATOMIC_OP(op, suffix) \
9895+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9896+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9897
9898-#define ATOMIC_OP_RETURN(op) \
9899-int atomic_##op##_return(int, atomic_t *); \
9900-long atomic64_##op##_return(long, atomic64_t *);
9901+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9902+
9903+#define __ATOMIC_OP_RETURN(op, suffix) \
9904+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9905+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9906+
9907+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9908
9909 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9910
9911@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9912
9913 #undef ATOMIC_OPS
9914 #undef ATOMIC_OP_RETURN
9915+#undef __ATOMIC_OP_RETURN
9916 #undef ATOMIC_OP
9917+#undef __ATOMIC_OP
9918
9919 #define atomic_dec_return(v) atomic_sub_return(1, v)
9920 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9921
9922 #define atomic_inc_return(v) atomic_add_return(1, v)
9923+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9924+{
9925+ return atomic_add_return_unchecked(1, v);
9926+}
9927 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9928+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9929+{
9930+ return atomic64_add_return_unchecked(1, v);
9931+}
9932
9933 /*
9934 * atomic_inc_and_test - increment and test
9935@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9936 * other cases.
9937 */
9938 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9939+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9940+{
9941+ return atomic_inc_return_unchecked(v) == 0;
9942+}
9943 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9944
9945 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9946@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9947 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9948
9949 #define atomic_inc(v) atomic_add(1, v)
9950+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9951+{
9952+ atomic_add_unchecked(1, v);
9953+}
9954 #define atomic64_inc(v) atomic64_add(1, v)
9955+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9956+{
9957+ atomic64_add_unchecked(1, v);
9958+}
9959
9960 #define atomic_dec(v) atomic_sub(1, v)
9961+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9962+{
9963+ atomic_sub_unchecked(1, v);
9964+}
9965 #define atomic64_dec(v) atomic64_sub(1, v)
9966+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9967+{
9968+ atomic64_sub_unchecked(1, v);
9969+}
9970
9971 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9972 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9973
9974 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9975+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9976+{
9977+ return cmpxchg(&v->counter, old, new);
9978+}
9979 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9980+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9981+{
9982+ return xchg(&v->counter, new);
9983+}
9984
9985 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9986 {
9987- int c, old;
9988+ int c, old, new;
9989 c = atomic_read(v);
9990 for (;;) {
9991- if (unlikely(c == (u)))
9992+ if (unlikely(c == u))
9993 break;
9994- old = atomic_cmpxchg((v), c, c + (a));
9995+
9996+ asm volatile("addcc %2, %0, %0\n"
9997+
9998+#ifdef CONFIG_PAX_REFCOUNT
9999+ "tvs %%icc, 6\n"
10000+#endif
10001+
10002+ : "=r" (new)
10003+ : "0" (c), "ir" (a)
10004+ : "cc");
10005+
10006+ old = atomic_cmpxchg(v, c, new);
10007 if (likely(old == c))
10008 break;
10009 c = old;
10010@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10011 #define atomic64_cmpxchg(v, o, n) \
10012 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10013 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10014+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10015+{
10016+ return xchg(&v->counter, new);
10017+}
10018
10019 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10020 {
10021- long c, old;
10022+ long c, old, new;
10023 c = atomic64_read(v);
10024 for (;;) {
10025- if (unlikely(c == (u)))
10026+ if (unlikely(c == u))
10027 break;
10028- old = atomic64_cmpxchg((v), c, c + (a));
10029+
10030+ asm volatile("addcc %2, %0, %0\n"
10031+
10032+#ifdef CONFIG_PAX_REFCOUNT
10033+ "tvs %%xcc, 6\n"
10034+#endif
10035+
10036+ : "=r" (new)
10037+ : "0" (c), "ir" (a)
10038+ : "cc");
10039+
10040+ old = atomic64_cmpxchg(v, c, new);
10041 if (likely(old == c))
10042 break;
10043 c = old;
10044 }
10045- return c != (u);
10046+ return c != u;
10047 }
10048
10049 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10050diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10051index 7664894..45a974b 100644
10052--- a/arch/sparc/include/asm/barrier_64.h
10053+++ b/arch/sparc/include/asm/barrier_64.h
10054@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10055 do { \
10056 compiletime_assert_atomic_type(*p); \
10057 barrier(); \
10058- ACCESS_ONCE(*p) = (v); \
10059+ ACCESS_ONCE_RW(*p) = (v); \
10060 } while (0)
10061
10062 #define smp_load_acquire(p) \
10063diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10064index 5bb6991..5c2132e 100644
10065--- a/arch/sparc/include/asm/cache.h
10066+++ b/arch/sparc/include/asm/cache.h
10067@@ -7,10 +7,12 @@
10068 #ifndef _SPARC_CACHE_H
10069 #define _SPARC_CACHE_H
10070
10071+#include <linux/const.h>
10072+
10073 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10074
10075 #define L1_CACHE_SHIFT 5
10076-#define L1_CACHE_BYTES 32
10077+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10078
10079 #ifdef CONFIG_SPARC32
10080 #define SMP_CACHE_BYTES_SHIFT 5
10081diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10082index a24e41f..47677ff 100644
10083--- a/arch/sparc/include/asm/elf_32.h
10084+++ b/arch/sparc/include/asm/elf_32.h
10085@@ -114,6 +114,13 @@ typedef struct {
10086
10087 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10088
10089+#ifdef CONFIG_PAX_ASLR
10090+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10091+
10092+#define PAX_DELTA_MMAP_LEN 16
10093+#define PAX_DELTA_STACK_LEN 16
10094+#endif
10095+
10096 /* This yields a mask that user programs can use to figure out what
10097 instruction set this cpu supports. This can NOT be done in userspace
10098 on Sparc. */
10099diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10100index 370ca1e..d4f4a98 100644
10101--- a/arch/sparc/include/asm/elf_64.h
10102+++ b/arch/sparc/include/asm/elf_64.h
10103@@ -189,6 +189,13 @@ typedef struct {
10104 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10105 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10106
10107+#ifdef CONFIG_PAX_ASLR
10108+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10109+
10110+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10111+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10112+#endif
10113+
10114 extern unsigned long sparc64_elf_hwcap;
10115 #define ELF_HWCAP sparc64_elf_hwcap
10116
10117diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10118index a3890da..f6a408e 100644
10119--- a/arch/sparc/include/asm/pgalloc_32.h
10120+++ b/arch/sparc/include/asm/pgalloc_32.h
10121@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10122 }
10123
10124 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10125+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10126
10127 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10128 unsigned long address)
10129diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10130index 5e31871..13469c6 100644
10131--- a/arch/sparc/include/asm/pgalloc_64.h
10132+++ b/arch/sparc/include/asm/pgalloc_64.h
10133@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10134 }
10135
10136 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10137+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10138
10139 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10140 {
10141@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10142 }
10143
10144 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10145+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10146
10147 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10148 {
10149diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10150index 59ba6f6..4518128 100644
10151--- a/arch/sparc/include/asm/pgtable.h
10152+++ b/arch/sparc/include/asm/pgtable.h
10153@@ -5,4 +5,8 @@
10154 #else
10155 #include <asm/pgtable_32.h>
10156 #endif
10157+
10158+#define ktla_ktva(addr) (addr)
10159+#define ktva_ktla(addr) (addr)
10160+
10161 #endif
10162diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10163index f06b36a..bca3189 100644
10164--- a/arch/sparc/include/asm/pgtable_32.h
10165+++ b/arch/sparc/include/asm/pgtable_32.h
10166@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10167 #define PAGE_SHARED SRMMU_PAGE_SHARED
10168 #define PAGE_COPY SRMMU_PAGE_COPY
10169 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10170+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10171+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10172+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10173 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10174
10175 /* Top-level page directory - dummy used by init-mm.
10176@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10177
10178 /* xwr */
10179 #define __P000 PAGE_NONE
10180-#define __P001 PAGE_READONLY
10181-#define __P010 PAGE_COPY
10182-#define __P011 PAGE_COPY
10183+#define __P001 PAGE_READONLY_NOEXEC
10184+#define __P010 PAGE_COPY_NOEXEC
10185+#define __P011 PAGE_COPY_NOEXEC
10186 #define __P100 PAGE_READONLY
10187 #define __P101 PAGE_READONLY
10188 #define __P110 PAGE_COPY
10189 #define __P111 PAGE_COPY
10190
10191 #define __S000 PAGE_NONE
10192-#define __S001 PAGE_READONLY
10193-#define __S010 PAGE_SHARED
10194-#define __S011 PAGE_SHARED
10195+#define __S001 PAGE_READONLY_NOEXEC
10196+#define __S010 PAGE_SHARED_NOEXEC
10197+#define __S011 PAGE_SHARED_NOEXEC
10198 #define __S100 PAGE_READONLY
10199 #define __S101 PAGE_READONLY
10200 #define __S110 PAGE_SHARED
10201diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10202index ae51a11..eadfd03 100644
10203--- a/arch/sparc/include/asm/pgtsrmmu.h
10204+++ b/arch/sparc/include/asm/pgtsrmmu.h
10205@@ -111,6 +111,11 @@
10206 SRMMU_EXEC | SRMMU_REF)
10207 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10208 SRMMU_EXEC | SRMMU_REF)
10209+
10210+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10211+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10212+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10213+
10214 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10215 SRMMU_DIRTY | SRMMU_REF)
10216
10217diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10218index 29d64b1..4272fe8 100644
10219--- a/arch/sparc/include/asm/setup.h
10220+++ b/arch/sparc/include/asm/setup.h
10221@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10222 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10223
10224 /* init_64.c */
10225-extern atomic_t dcpage_flushes;
10226-extern atomic_t dcpage_flushes_xcall;
10227+extern atomic_unchecked_t dcpage_flushes;
10228+extern atomic_unchecked_t dcpage_flushes_xcall;
10229
10230 extern int sysctl_tsb_ratio;
10231 #endif
10232diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10233index 9689176..63c18ea 100644
10234--- a/arch/sparc/include/asm/spinlock_64.h
10235+++ b/arch/sparc/include/asm/spinlock_64.h
10236@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10237
10238 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10239
10240-static void inline arch_read_lock(arch_rwlock_t *lock)
10241+static inline void arch_read_lock(arch_rwlock_t *lock)
10242 {
10243 unsigned long tmp1, tmp2;
10244
10245 __asm__ __volatile__ (
10246 "1: ldsw [%2], %0\n"
10247 " brlz,pn %0, 2f\n"
10248-"4: add %0, 1, %1\n"
10249+"4: addcc %0, 1, %1\n"
10250+
10251+#ifdef CONFIG_PAX_REFCOUNT
10252+" tvs %%icc, 6\n"
10253+#endif
10254+
10255 " cas [%2], %0, %1\n"
10256 " cmp %0, %1\n"
10257 " bne,pn %%icc, 1b\n"
10258@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10259 " .previous"
10260 : "=&r" (tmp1), "=&r" (tmp2)
10261 : "r" (lock)
10262- : "memory");
10263+ : "memory", "cc");
10264 }
10265
10266-static int inline arch_read_trylock(arch_rwlock_t *lock)
10267+static inline int arch_read_trylock(arch_rwlock_t *lock)
10268 {
10269 int tmp1, tmp2;
10270
10271@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10272 "1: ldsw [%2], %0\n"
10273 " brlz,a,pn %0, 2f\n"
10274 " mov 0, %0\n"
10275-" add %0, 1, %1\n"
10276+" addcc %0, 1, %1\n"
10277+
10278+#ifdef CONFIG_PAX_REFCOUNT
10279+" tvs %%icc, 6\n"
10280+#endif
10281+
10282 " cas [%2], %0, %1\n"
10283 " cmp %0, %1\n"
10284 " bne,pn %%icc, 1b\n"
10285@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10286 return tmp1;
10287 }
10288
10289-static void inline arch_read_unlock(arch_rwlock_t *lock)
10290+static inline void arch_read_unlock(arch_rwlock_t *lock)
10291 {
10292 unsigned long tmp1, tmp2;
10293
10294 __asm__ __volatile__(
10295 "1: lduw [%2], %0\n"
10296-" sub %0, 1, %1\n"
10297+" subcc %0, 1, %1\n"
10298+
10299+#ifdef CONFIG_PAX_REFCOUNT
10300+" tvs %%icc, 6\n"
10301+#endif
10302+
10303 " cas [%2], %0, %1\n"
10304 " cmp %0, %1\n"
10305 " bne,pn %%xcc, 1b\n"
10306@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10307 : "memory");
10308 }
10309
10310-static void inline arch_write_lock(arch_rwlock_t *lock)
10311+static inline void arch_write_lock(arch_rwlock_t *lock)
10312 {
10313 unsigned long mask, tmp1, tmp2;
10314
10315@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10316 : "memory");
10317 }
10318
10319-static void inline arch_write_unlock(arch_rwlock_t *lock)
10320+static inline void arch_write_unlock(arch_rwlock_t *lock)
10321 {
10322 __asm__ __volatile__(
10323 " stw %%g0, [%0]"
10324@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10325 : "memory");
10326 }
10327
10328-static int inline arch_write_trylock(arch_rwlock_t *lock)
10329+static inline int arch_write_trylock(arch_rwlock_t *lock)
10330 {
10331 unsigned long mask, tmp1, tmp2, result;
10332
10333diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10334index fd7bd0a..2e2fa7a 100644
10335--- a/arch/sparc/include/asm/thread_info_32.h
10336+++ b/arch/sparc/include/asm/thread_info_32.h
10337@@ -47,6 +47,7 @@ struct thread_info {
10338 struct reg_window32 reg_window[NSWINS]; /* align for ldd! */
10339 unsigned long rwbuf_stkptrs[NSWINS];
10340 unsigned long w_saved;
10341+ unsigned long lowest_stack;
10342 };
10343
10344 /*
10345diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10346index ff45516..73001ab 100644
10347--- a/arch/sparc/include/asm/thread_info_64.h
10348+++ b/arch/sparc/include/asm/thread_info_64.h
10349@@ -61,6 +61,8 @@ struct thread_info {
10350 struct pt_regs *kern_una_regs;
10351 unsigned int kern_una_insn;
10352
10353+ unsigned long lowest_stack;
10354+
10355 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10356 __attribute__ ((aligned(64)));
10357 };
10358@@ -184,12 +186,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10359 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10360 /* flag bit 4 is available */
10361 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10362-/* flag bit 6 is available */
10363+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10364 #define TIF_32BIT 7 /* 32-bit binary */
10365 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10366 #define TIF_SECCOMP 9 /* secure computing */
10367 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10368 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10369+
10370 /* NOTE: Thread flags >= 12 should be ones we have no interest
10371 * in using in assembly, else we can't use the mask as
10372 * an immediate value in instructions such as andcc.
10373@@ -209,12 +212,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10374 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10375 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10376 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10377+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10378
10379 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10380 _TIF_DO_NOTIFY_RESUME_MASK | \
10381 _TIF_NEED_RESCHED)
10382 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10383
10384+#define _TIF_WORK_SYSCALL \
10385+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10386+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10387+
10388 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10389
10390 /*
10391diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10392index bd56c28..4b63d83 100644
10393--- a/arch/sparc/include/asm/uaccess.h
10394+++ b/arch/sparc/include/asm/uaccess.h
10395@@ -1,5 +1,6 @@
10396 #ifndef ___ASM_SPARC_UACCESS_H
10397 #define ___ASM_SPARC_UACCESS_H
10398+
10399 #if defined(__sparc__) && defined(__arch64__)
10400 #include <asm/uaccess_64.h>
10401 #else
10402diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10403index 64ee103..388aef0 100644
10404--- a/arch/sparc/include/asm/uaccess_32.h
10405+++ b/arch/sparc/include/asm/uaccess_32.h
10406@@ -47,6 +47,7 @@
10407 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10408 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10409 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
10410+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10411 #define access_ok(type, addr, size) \
10412 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10413
10414@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10415
10416 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10417 {
10418- if (n && __access_ok((unsigned long) to, n))
10419+ if ((long)n < 0)
10420+ return n;
10421+
10422+ if (n && __access_ok((unsigned long) to, n)) {
10423+ if (!__builtin_constant_p(n))
10424+ check_object_size(from, n, true);
10425 return __copy_user(to, (__force void __user *) from, n);
10426- else
10427+ } else
10428 return n;
10429 }
10430
10431 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10432 {
10433+ if ((long)n < 0)
10434+ return n;
10435+
10436+ if (!__builtin_constant_p(n))
10437+ check_object_size(from, n, true);
10438+
10439 return __copy_user(to, (__force void __user *) from, n);
10440 }
10441
10442 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10443 {
10444- if (n && __access_ok((unsigned long) from, n))
10445+ if ((long)n < 0)
10446+ return n;
10447+
10448+ if (n && __access_ok((unsigned long) from, n)) {
10449+ if (!__builtin_constant_p(n))
10450+ check_object_size(to, n, false);
10451 return __copy_user((__force void __user *) to, from, n);
10452- else
10453+ } else
10454 return n;
10455 }
10456
10457 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10458 {
10459+ if ((long)n < 0)
10460+ return n;
10461+
10462 return __copy_user((__force void __user *) to, from, n);
10463 }
10464
10465diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10466index a35194b..47dabc0d 100644
10467--- a/arch/sparc/include/asm/uaccess_64.h
10468+++ b/arch/sparc/include/asm/uaccess_64.h
10469@@ -10,6 +10,7 @@
10470 #include <linux/compiler.h>
10471 #include <linux/string.h>
10472 #include <linux/thread_info.h>
10473+#include <linux/kernel.h>
10474 #include <asm/asi.h>
10475 #include <asm/spitfire.h>
10476 #include <asm-generic/uaccess-unaligned.h>
10477@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10478 return 1;
10479 }
10480
10481+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10482+{
10483+ return 1;
10484+}
10485+
10486 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10487 {
10488 return 1;
10489@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10490 static inline unsigned long __must_check
10491 copy_from_user(void *to, const void __user *from, unsigned long size)
10492 {
10493- unsigned long ret = ___copy_from_user(to, from, size);
10494+ unsigned long ret;
10495
10496+ if ((long)size < 0 || size > INT_MAX)
10497+ return size;
10498+
10499+ if (!__builtin_constant_p(size))
10500+ check_object_size(to, size, false);
10501+
10502+ ret = ___copy_from_user(to, from, size);
10503 if (unlikely(ret))
10504 ret = copy_from_user_fixup(to, from, size);
10505
10506@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10507 static inline unsigned long __must_check
10508 copy_to_user(void __user *to, const void *from, unsigned long size)
10509 {
10510- unsigned long ret = ___copy_to_user(to, from, size);
10511+ unsigned long ret;
10512
10513+ if ((long)size < 0 || size > INT_MAX)
10514+ return size;
10515+
10516+ if (!__builtin_constant_p(size))
10517+ check_object_size(from, size, true);
10518+
10519+ ret = ___copy_to_user(to, from, size);
10520 if (unlikely(ret))
10521 ret = copy_to_user_fixup(to, from, size);
10522 return ret;
10523diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10524index 7cf9c6e..6206648 100644
10525--- a/arch/sparc/kernel/Makefile
10526+++ b/arch/sparc/kernel/Makefile
10527@@ -4,7 +4,7 @@
10528 #
10529
10530 asflags-y := -ansi
10531-ccflags-y := -Werror
10532+#ccflags-y := -Werror
10533
10534 extra-y := head_$(BITS).o
10535
10536diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10537index 50e7b62..79fae35 100644
10538--- a/arch/sparc/kernel/process_32.c
10539+++ b/arch/sparc/kernel/process_32.c
10540@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10541
10542 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10543 r->psr, r->pc, r->npc, r->y, print_tainted());
10544- printk("PC: <%pS>\n", (void *) r->pc);
10545+ printk("PC: <%pA>\n", (void *) r->pc);
10546 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10547 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10548 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10549 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10550 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10551 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10552- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10553+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10554
10555 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10556 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10557@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10558 rw = (struct reg_window32 *) fp;
10559 pc = rw->ins[7];
10560 printk("[%08lx : ", pc);
10561- printk("%pS ] ", (void *) pc);
10562+ printk("%pA ] ", (void *) pc);
10563 fp = rw->ins[6];
10564 } while (++count < 16);
10565 printk("\n");
10566diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10567index 46a5964..a35c62c 100644
10568--- a/arch/sparc/kernel/process_64.c
10569+++ b/arch/sparc/kernel/process_64.c
10570@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10571 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10572 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10573 if (regs->tstate & TSTATE_PRIV)
10574- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10575+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10576 }
10577
10578 void show_regs(struct pt_regs *regs)
10579@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10580
10581 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10582 regs->tpc, regs->tnpc, regs->y, print_tainted());
10583- printk("TPC: <%pS>\n", (void *) regs->tpc);
10584+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10585 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10586 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10587 regs->u_regs[3]);
10588@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10589 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10590 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10591 regs->u_regs[15]);
10592- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10593+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10594 show_regwindow(regs);
10595 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10596 }
10597@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10598 ((tp && tp->task) ? tp->task->pid : -1));
10599
10600 if (gp->tstate & TSTATE_PRIV) {
10601- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10602+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10603 (void *) gp->tpc,
10604 (void *) gp->o7,
10605 (void *) gp->i7,
10606diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10607index 79cc0d1..ec62734 100644
10608--- a/arch/sparc/kernel/prom_common.c
10609+++ b/arch/sparc/kernel/prom_common.c
10610@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10611
10612 unsigned int prom_early_allocated __initdata;
10613
10614-static struct of_pdt_ops prom_sparc_ops __initdata = {
10615+static struct of_pdt_ops prom_sparc_ops __initconst = {
10616 .nextprop = prom_common_nextprop,
10617 .getproplen = prom_getproplen,
10618 .getproperty = prom_getproperty,
10619diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10620index 9ddc492..27a5619 100644
10621--- a/arch/sparc/kernel/ptrace_64.c
10622+++ b/arch/sparc/kernel/ptrace_64.c
10623@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10624 return ret;
10625 }
10626
10627+#ifdef CONFIG_GRKERNSEC_SETXID
10628+extern void gr_delayed_cred_worker(void);
10629+#endif
10630+
10631 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10632 {
10633 int ret = 0;
10634@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10635 if (test_thread_flag(TIF_NOHZ))
10636 user_exit();
10637
10638+#ifdef CONFIG_GRKERNSEC_SETXID
10639+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10640+ gr_delayed_cred_worker();
10641+#endif
10642+
10643 if (test_thread_flag(TIF_SYSCALL_TRACE))
10644 ret = tracehook_report_syscall_entry(regs);
10645
10646@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10647 if (test_thread_flag(TIF_NOHZ))
10648 user_exit();
10649
10650+#ifdef CONFIG_GRKERNSEC_SETXID
10651+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10652+ gr_delayed_cred_worker();
10653+#endif
10654+
10655 audit_syscall_exit(regs);
10656
10657 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10658diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10659index 61139d9..c1a5f28 100644
10660--- a/arch/sparc/kernel/smp_64.c
10661+++ b/arch/sparc/kernel/smp_64.c
10662@@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10663 return;
10664
10665 #ifdef CONFIG_DEBUG_DCFLUSH
10666- atomic_inc(&dcpage_flushes);
10667+ atomic_inc_unchecked(&dcpage_flushes);
10668 #endif
10669
10670 this_cpu = get_cpu();
10671@@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10672 xcall_deliver(data0, __pa(pg_addr),
10673 (u64) pg_addr, cpumask_of(cpu));
10674 #ifdef CONFIG_DEBUG_DCFLUSH
10675- atomic_inc(&dcpage_flushes_xcall);
10676+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10677 #endif
10678 }
10679 }
10680@@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10681 preempt_disable();
10682
10683 #ifdef CONFIG_DEBUG_DCFLUSH
10684- atomic_inc(&dcpage_flushes);
10685+ atomic_inc_unchecked(&dcpage_flushes);
10686 #endif
10687 data0 = 0;
10688 pg_addr = page_address(page);
10689@@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10690 xcall_deliver(data0, __pa(pg_addr),
10691 (u64) pg_addr, cpu_online_mask);
10692 #ifdef CONFIG_DEBUG_DCFLUSH
10693- atomic_inc(&dcpage_flushes_xcall);
10694+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10695 #endif
10696 }
10697 __local_flush_dcache_page(page);
10698diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10699index 646988d..b88905f 100644
10700--- a/arch/sparc/kernel/sys_sparc_32.c
10701+++ b/arch/sparc/kernel/sys_sparc_32.c
10702@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10703 if (len > TASK_SIZE - PAGE_SIZE)
10704 return -ENOMEM;
10705 if (!addr)
10706- addr = TASK_UNMAPPED_BASE;
10707+ addr = current->mm->mmap_base;
10708
10709 info.flags = 0;
10710 info.length = len;
10711diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10712index 30e7ddb..266a3b0 100644
10713--- a/arch/sparc/kernel/sys_sparc_64.c
10714+++ b/arch/sparc/kernel/sys_sparc_64.c
10715@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10716 struct vm_area_struct * vma;
10717 unsigned long task_size = TASK_SIZE;
10718 int do_color_align;
10719+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10720 struct vm_unmapped_area_info info;
10721
10722 if (flags & MAP_FIXED) {
10723 /* We do not accept a shared mapping if it would violate
10724 * cache aliasing constraints.
10725 */
10726- if ((flags & MAP_SHARED) &&
10727+ if ((filp || (flags & MAP_SHARED)) &&
10728 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10729 return -EINVAL;
10730 return addr;
10731@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10732 if (filp || (flags & MAP_SHARED))
10733 do_color_align = 1;
10734
10735+#ifdef CONFIG_PAX_RANDMMAP
10736+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10737+#endif
10738+
10739 if (addr) {
10740 if (do_color_align)
10741 addr = COLOR_ALIGN(addr, pgoff);
10742@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10743 addr = PAGE_ALIGN(addr);
10744
10745 vma = find_vma(mm, addr);
10746- if (task_size - len >= addr &&
10747- (!vma || addr + len <= vma->vm_start))
10748+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10749 return addr;
10750 }
10751
10752 info.flags = 0;
10753 info.length = len;
10754- info.low_limit = TASK_UNMAPPED_BASE;
10755+ info.low_limit = mm->mmap_base;
10756 info.high_limit = min(task_size, VA_EXCLUDE_START);
10757 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10758 info.align_offset = pgoff << PAGE_SHIFT;
10759+ info.threadstack_offset = offset;
10760 addr = vm_unmapped_area(&info);
10761
10762 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10763 VM_BUG_ON(addr != -ENOMEM);
10764 info.low_limit = VA_EXCLUDE_END;
10765+
10766+#ifdef CONFIG_PAX_RANDMMAP
10767+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10768+ info.low_limit += mm->delta_mmap;
10769+#endif
10770+
10771 info.high_limit = task_size;
10772 addr = vm_unmapped_area(&info);
10773 }
10774@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10775 unsigned long task_size = STACK_TOP32;
10776 unsigned long addr = addr0;
10777 int do_color_align;
10778+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10779 struct vm_unmapped_area_info info;
10780
10781 /* This should only ever run for 32-bit processes. */
10782@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10783 /* We do not accept a shared mapping if it would violate
10784 * cache aliasing constraints.
10785 */
10786- if ((flags & MAP_SHARED) &&
10787+ if ((filp || (flags & MAP_SHARED)) &&
10788 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10789 return -EINVAL;
10790 return addr;
10791@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10792 if (filp || (flags & MAP_SHARED))
10793 do_color_align = 1;
10794
10795+#ifdef CONFIG_PAX_RANDMMAP
10796+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10797+#endif
10798+
10799 /* requesting a specific address */
10800 if (addr) {
10801 if (do_color_align)
10802@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10803 addr = PAGE_ALIGN(addr);
10804
10805 vma = find_vma(mm, addr);
10806- if (task_size - len >= addr &&
10807- (!vma || addr + len <= vma->vm_start))
10808+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10809 return addr;
10810 }
10811
10812@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10813 info.high_limit = mm->mmap_base;
10814 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10815 info.align_offset = pgoff << PAGE_SHIFT;
10816+ info.threadstack_offset = offset;
10817 addr = vm_unmapped_area(&info);
10818
10819 /*
10820@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10821 VM_BUG_ON(addr != -ENOMEM);
10822 info.flags = 0;
10823 info.low_limit = TASK_UNMAPPED_BASE;
10824+
10825+#ifdef CONFIG_PAX_RANDMMAP
10826+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10827+ info.low_limit += mm->delta_mmap;
10828+#endif
10829+
10830 info.high_limit = STACK_TOP32;
10831 addr = vm_unmapped_area(&info);
10832 }
10833@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10834 EXPORT_SYMBOL(get_fb_unmapped_area);
10835
10836 /* Essentially the same as PowerPC. */
10837-static unsigned long mmap_rnd(void)
10838+static unsigned long mmap_rnd(struct mm_struct *mm)
10839 {
10840 unsigned long rnd = 0UL;
10841
10842+#ifdef CONFIG_PAX_RANDMMAP
10843+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10844+#endif
10845+
10846 if (current->flags & PF_RANDOMIZE) {
10847 unsigned long val = get_random_int();
10848 if (test_thread_flag(TIF_32BIT))
10849@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10850
10851 void arch_pick_mmap_layout(struct mm_struct *mm)
10852 {
10853- unsigned long random_factor = mmap_rnd();
10854+ unsigned long random_factor = mmap_rnd(mm);
10855 unsigned long gap;
10856
10857 /*
10858@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10859 gap == RLIM_INFINITY ||
10860 sysctl_legacy_va_layout) {
10861 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10862+
10863+#ifdef CONFIG_PAX_RANDMMAP
10864+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10865+ mm->mmap_base += mm->delta_mmap;
10866+#endif
10867+
10868 mm->get_unmapped_area = arch_get_unmapped_area;
10869 } else {
10870 /* We know it's 32-bit */
10871@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10872 gap = (task_size / 6 * 5);
10873
10874 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10875+
10876+#ifdef CONFIG_PAX_RANDMMAP
10877+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10878+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10879+#endif
10880+
10881 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10882 }
10883 }
10884diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10885index bb00089..e0ea580 100644
10886--- a/arch/sparc/kernel/syscalls.S
10887+++ b/arch/sparc/kernel/syscalls.S
10888@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10889 #endif
10890 .align 32
10891 1: ldx [%g6 + TI_FLAGS], %l5
10892- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10893+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10894 be,pt %icc, rtrap
10895 nop
10896 call syscall_trace_leave
10897@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10898
10899 srl %i3, 0, %o3 ! IEU0
10900 srl %i2, 0, %o2 ! IEU0 Group
10901- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10902+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10903 bne,pn %icc, linux_syscall_trace32 ! CTI
10904 mov %i0, %l5 ! IEU1
10905 5: call %l7 ! CTI Group brk forced
10906@@ -218,7 +218,7 @@ linux_sparc_syscall:
10907
10908 mov %i3, %o3 ! IEU1
10909 mov %i4, %o4 ! IEU0 Group
10910- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10911+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10912 bne,pn %icc, linux_syscall_trace ! CTI Group
10913 mov %i0, %l5 ! IEU0
10914 2: call %l7 ! CTI Group brk forced
10915@@ -233,7 +233,7 @@ ret_sys_call:
10916
10917 cmp %o0, -ERESTART_RESTARTBLOCK
10918 bgeu,pn %xcc, 1f
10919- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10920+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10921 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10922
10923 2:
10924diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10925index 6fd386c5..6907d81 100644
10926--- a/arch/sparc/kernel/traps_32.c
10927+++ b/arch/sparc/kernel/traps_32.c
10928@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10929 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10930 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10931
10932+extern void gr_handle_kernel_exploit(void);
10933+
10934 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10935 {
10936 static int die_counter;
10937@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10938 count++ < 30 &&
10939 (((unsigned long) rw) >= PAGE_OFFSET) &&
10940 !(((unsigned long) rw) & 0x7)) {
10941- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10942+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10943 (void *) rw->ins[7]);
10944 rw = (struct reg_window32 *)rw->ins[6];
10945 }
10946 }
10947 printk("Instruction DUMP:");
10948 instruction_dump ((unsigned long *) regs->pc);
10949- if(regs->psr & PSR_PS)
10950+ if(regs->psr & PSR_PS) {
10951+ gr_handle_kernel_exploit();
10952 do_exit(SIGKILL);
10953+ }
10954 do_exit(SIGSEGV);
10955 }
10956
10957diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10958index 0e69974..0c15a6e 100644
10959--- a/arch/sparc/kernel/traps_64.c
10960+++ b/arch/sparc/kernel/traps_64.c
10961@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10962 i + 1,
10963 p->trapstack[i].tstate, p->trapstack[i].tpc,
10964 p->trapstack[i].tnpc, p->trapstack[i].tt);
10965- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10966+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10967 }
10968 }
10969
10970@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10971
10972 lvl -= 0x100;
10973 if (regs->tstate & TSTATE_PRIV) {
10974+
10975+#ifdef CONFIG_PAX_REFCOUNT
10976+ if (lvl == 6)
10977+ pax_report_refcount_overflow(regs);
10978+#endif
10979+
10980 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10981 die_if_kernel(buffer, regs);
10982 }
10983@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10984 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10985 {
10986 char buffer[32];
10987-
10988+
10989 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10990 0, lvl, SIGTRAP) == NOTIFY_STOP)
10991 return;
10992
10993+#ifdef CONFIG_PAX_REFCOUNT
10994+ if (lvl == 6)
10995+ pax_report_refcount_overflow(regs);
10996+#endif
10997+
10998 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10999
11000 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
11001@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
11002 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
11003 printk("%s" "ERROR(%d): ",
11004 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
11005- printk("TPC<%pS>\n", (void *) regs->tpc);
11006+ printk("TPC<%pA>\n", (void *) regs->tpc);
11007 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
11008 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
11009 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
11010@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11011 smp_processor_id(),
11012 (type & 0x1) ? 'I' : 'D',
11013 regs->tpc);
11014- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11015+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11016 panic("Irrecoverable Cheetah+ parity error.");
11017 }
11018
11019@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11020 smp_processor_id(),
11021 (type & 0x1) ? 'I' : 'D',
11022 regs->tpc);
11023- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11024+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11025 }
11026
11027 struct sun4v_error_entry {
11028@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11029 /*0x38*/u64 reserved_5;
11030 };
11031
11032-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11033-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11034+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11035+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11036
11037 static const char *sun4v_err_type_to_str(u8 type)
11038 {
11039@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11040 }
11041
11042 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11043- int cpu, const char *pfx, atomic_t *ocnt)
11044+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11045 {
11046 u64 *raw_ptr = (u64 *) ent;
11047 u32 attrs;
11048@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11049
11050 show_regs(regs);
11051
11052- if ((cnt = atomic_read(ocnt)) != 0) {
11053- atomic_set(ocnt, 0);
11054+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11055+ atomic_set_unchecked(ocnt, 0);
11056 wmb();
11057 printk("%s: Queue overflowed %d times.\n",
11058 pfx, cnt);
11059@@ -2048,7 +2059,7 @@ out:
11060 */
11061 void sun4v_resum_overflow(struct pt_regs *regs)
11062 {
11063- atomic_inc(&sun4v_resum_oflow_cnt);
11064+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11065 }
11066
11067 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11068@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11069 /* XXX Actually even this can make not that much sense. Perhaps
11070 * XXX we should just pull the plug and panic directly from here?
11071 */
11072- atomic_inc(&sun4v_nonresum_oflow_cnt);
11073+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11074 }
11075
11076 static void sun4v_tlb_error(struct pt_regs *regs)
11077@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11078
11079 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11080 regs->tpc, tl);
11081- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11082+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11083 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11084- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11085+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11086 (void *) regs->u_regs[UREG_I7]);
11087 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11088 "pte[%lx] error[%lx]\n",
11089@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11090
11091 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11092 regs->tpc, tl);
11093- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11094+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11095 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11096- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11097+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11098 (void *) regs->u_regs[UREG_I7]);
11099 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11100 "pte[%lx] error[%lx]\n",
11101@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11102 fp = (unsigned long)sf->fp + STACK_BIAS;
11103 }
11104
11105- printk(" [%016lx] %pS\n", pc, (void *) pc);
11106+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11107 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11108 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11109 int index = tsk->curr_ret_stack;
11110 if (tsk->ret_stack && index >= graph) {
11111 pc = tsk->ret_stack[index - graph].ret;
11112- printk(" [%016lx] %pS\n", pc, (void *) pc);
11113+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11114 graph++;
11115 }
11116 }
11117@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11118 return (struct reg_window *) (fp + STACK_BIAS);
11119 }
11120
11121+extern void gr_handle_kernel_exploit(void);
11122+
11123 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11124 {
11125 static int die_counter;
11126@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11127 while (rw &&
11128 count++ < 30 &&
11129 kstack_valid(tp, (unsigned long) rw)) {
11130- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11131+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11132 (void *) rw->ins[7]);
11133
11134 rw = kernel_stack_up(rw);
11135@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11136 }
11137 if (panic_on_oops)
11138 panic("Fatal exception");
11139- if (regs->tstate & TSTATE_PRIV)
11140+ if (regs->tstate & TSTATE_PRIV) {
11141+ gr_handle_kernel_exploit();
11142 do_exit(SIGKILL);
11143+ }
11144 do_exit(SIGSEGV);
11145 }
11146 EXPORT_SYMBOL(die_if_kernel);
11147diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11148index 62098a8..547ab2c 100644
11149--- a/arch/sparc/kernel/unaligned_64.c
11150+++ b/arch/sparc/kernel/unaligned_64.c
11151@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11152 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11153
11154 if (__ratelimit(&ratelimit)) {
11155- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11156+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11157 regs->tpc, (void *) regs->tpc);
11158 }
11159 }
11160diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11161index 3269b02..64f5231 100644
11162--- a/arch/sparc/lib/Makefile
11163+++ b/arch/sparc/lib/Makefile
11164@@ -2,7 +2,7 @@
11165 #
11166
11167 asflags-y := -ansi -DST_DIV0=0x02
11168-ccflags-y := -Werror
11169+#ccflags-y := -Werror
11170
11171 lib-$(CONFIG_SPARC32) += ashrdi3.o
11172 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11173diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11174index 05dac43..76f8ed4 100644
11175--- a/arch/sparc/lib/atomic_64.S
11176+++ b/arch/sparc/lib/atomic_64.S
11177@@ -15,11 +15,22 @@
11178 * a value and does the barriers.
11179 */
11180
11181-#define ATOMIC_OP(op) \
11182-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11183+#ifdef CONFIG_PAX_REFCOUNT
11184+#define __REFCOUNT_OP(op) op##cc
11185+#define __OVERFLOW_IOP tvs %icc, 6;
11186+#define __OVERFLOW_XOP tvs %xcc, 6;
11187+#else
11188+#define __REFCOUNT_OP(op) op
11189+#define __OVERFLOW_IOP
11190+#define __OVERFLOW_XOP
11191+#endif
11192+
11193+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11194+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11195 BACKOFF_SETUP(%o2); \
11196 1: lduw [%o1], %g1; \
11197- op %g1, %o0, %g7; \
11198+ asm_op %g1, %o0, %g7; \
11199+ post_op \
11200 cas [%o1], %g1, %g7; \
11201 cmp %g1, %g7; \
11202 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11203@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11204 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11205 ENDPROC(atomic_##op); \
11206
11207-#define ATOMIC_OP_RETURN(op) \
11208-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11209+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11210+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11211+
11212+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11213+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11214 BACKOFF_SETUP(%o2); \
11215 1: lduw [%o1], %g1; \
11216- op %g1, %o0, %g7; \
11217+ asm_op %g1, %o0, %g7; \
11218+ post_op \
11219 cas [%o1], %g1, %g7; \
11220 cmp %g1, %g7; \
11221 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11222@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11223 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11224 ENDPROC(atomic_##op##_return);
11225
11226+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11227+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11228+
11229 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11230
11231 ATOMIC_OPS(add)
11232@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11233
11234 #undef ATOMIC_OPS
11235 #undef ATOMIC_OP_RETURN
11236+#undef __ATOMIC_OP_RETURN
11237 #undef ATOMIC_OP
11238+#undef __ATOMIC_OP
11239
11240-#define ATOMIC64_OP(op) \
11241-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11242+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11243+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11244 BACKOFF_SETUP(%o2); \
11245 1: ldx [%o1], %g1; \
11246- op %g1, %o0, %g7; \
11247+ asm_op %g1, %o0, %g7; \
11248+ post_op \
11249 casx [%o1], %g1, %g7; \
11250 cmp %g1, %g7; \
11251 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11252@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11253 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11254 ENDPROC(atomic64_##op); \
11255
11256-#define ATOMIC64_OP_RETURN(op) \
11257-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11258+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11259+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11260+
11261+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11262+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11263 BACKOFF_SETUP(%o2); \
11264 1: ldx [%o1], %g1; \
11265- op %g1, %o0, %g7; \
11266+ asm_op %g1, %o0, %g7; \
11267+ post_op \
11268 casx [%o1], %g1, %g7; \
11269 cmp %g1, %g7; \
11270 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11271@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11272 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11273 ENDPROC(atomic64_##op##_return);
11274
11275+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11276+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11277+
11278 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11279
11280 ATOMIC64_OPS(add)
11281@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11282
11283 #undef ATOMIC64_OPS
11284 #undef ATOMIC64_OP_RETURN
11285+#undef __ATOMIC64_OP_RETURN
11286 #undef ATOMIC64_OP
11287+#undef __ATOMIC64_OP
11288+#undef __OVERFLOW_XOP
11289+#undef __OVERFLOW_IOP
11290+#undef __REFCOUNT_OP
11291
11292 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11293 BACKOFF_SETUP(%o2)
11294diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11295index 1d649a9..fbc5bfc 100644
11296--- a/arch/sparc/lib/ksyms.c
11297+++ b/arch/sparc/lib/ksyms.c
11298@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11299 /* Atomic counter implementation. */
11300 #define ATOMIC_OP(op) \
11301 EXPORT_SYMBOL(atomic_##op); \
11302-EXPORT_SYMBOL(atomic64_##op);
11303+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11304+EXPORT_SYMBOL(atomic64_##op); \
11305+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11306
11307 #define ATOMIC_OP_RETURN(op) \
11308 EXPORT_SYMBOL(atomic_##op##_return); \
11309@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11310 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11311
11312 ATOMIC_OPS(add)
11313+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11314+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11315 ATOMIC_OPS(sub)
11316
11317 #undef ATOMIC_OPS
11318diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11319index 30c3ecc..736f015 100644
11320--- a/arch/sparc/mm/Makefile
11321+++ b/arch/sparc/mm/Makefile
11322@@ -2,7 +2,7 @@
11323 #
11324
11325 asflags-y := -ansi
11326-ccflags-y := -Werror
11327+#ccflags-y := -Werror
11328
11329 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11330 obj-y += fault_$(BITS).o
11331diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11332index 70d8171..274c6c0 100644
11333--- a/arch/sparc/mm/fault_32.c
11334+++ b/arch/sparc/mm/fault_32.c
11335@@ -21,6 +21,9 @@
11336 #include <linux/perf_event.h>
11337 #include <linux/interrupt.h>
11338 #include <linux/kdebug.h>
11339+#include <linux/slab.h>
11340+#include <linux/pagemap.h>
11341+#include <linux/compiler.h>
11342
11343 #include <asm/page.h>
11344 #include <asm/pgtable.h>
11345@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11346 return safe_compute_effective_address(regs, insn);
11347 }
11348
11349+#ifdef CONFIG_PAX_PAGEEXEC
11350+#ifdef CONFIG_PAX_DLRESOLVE
11351+static void pax_emuplt_close(struct vm_area_struct *vma)
11352+{
11353+ vma->vm_mm->call_dl_resolve = 0UL;
11354+}
11355+
11356+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11357+{
11358+ unsigned int *kaddr;
11359+
11360+ vmf->page = alloc_page(GFP_HIGHUSER);
11361+ if (!vmf->page)
11362+ return VM_FAULT_OOM;
11363+
11364+ kaddr = kmap(vmf->page);
11365+ memset(kaddr, 0, PAGE_SIZE);
11366+ kaddr[0] = 0x9DE3BFA8U; /* save */
11367+ flush_dcache_page(vmf->page);
11368+ kunmap(vmf->page);
11369+ return VM_FAULT_MAJOR;
11370+}
11371+
11372+static const struct vm_operations_struct pax_vm_ops = {
11373+ .close = pax_emuplt_close,
11374+ .fault = pax_emuplt_fault
11375+};
11376+
11377+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11378+{
11379+ int ret;
11380+
11381+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11382+ vma->vm_mm = current->mm;
11383+ vma->vm_start = addr;
11384+ vma->vm_end = addr + PAGE_SIZE;
11385+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11386+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11387+ vma->vm_ops = &pax_vm_ops;
11388+
11389+ ret = insert_vm_struct(current->mm, vma);
11390+ if (ret)
11391+ return ret;
11392+
11393+ ++current->mm->total_vm;
11394+ return 0;
11395+}
11396+#endif
11397+
11398+/*
11399+ * PaX: decide what to do with offenders (regs->pc = fault address)
11400+ *
11401+ * returns 1 when task should be killed
11402+ * 2 when patched PLT trampoline was detected
11403+ * 3 when unpatched PLT trampoline was detected
11404+ */
11405+static int pax_handle_fetch_fault(struct pt_regs *regs)
11406+{
11407+
11408+#ifdef CONFIG_PAX_EMUPLT
11409+ int err;
11410+
11411+ do { /* PaX: patched PLT emulation #1 */
11412+ unsigned int sethi1, sethi2, jmpl;
11413+
11414+ err = get_user(sethi1, (unsigned int *)regs->pc);
11415+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11416+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11417+
11418+ if (err)
11419+ break;
11420+
11421+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11422+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11423+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11424+ {
11425+ unsigned int addr;
11426+
11427+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11428+ addr = regs->u_regs[UREG_G1];
11429+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11430+ regs->pc = addr;
11431+ regs->npc = addr+4;
11432+ return 2;
11433+ }
11434+ } while (0);
11435+
11436+ do { /* PaX: patched PLT emulation #2 */
11437+ unsigned int ba;
11438+
11439+ err = get_user(ba, (unsigned int *)regs->pc);
11440+
11441+ if (err)
11442+ break;
11443+
11444+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11445+ unsigned int addr;
11446+
11447+ if ((ba & 0xFFC00000U) == 0x30800000U)
11448+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11449+ else
11450+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11451+ regs->pc = addr;
11452+ regs->npc = addr+4;
11453+ return 2;
11454+ }
11455+ } while (0);
11456+
11457+ do { /* PaX: patched PLT emulation #3 */
11458+ unsigned int sethi, bajmpl, nop;
11459+
11460+ err = get_user(sethi, (unsigned int *)regs->pc);
11461+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11462+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11463+
11464+ if (err)
11465+ break;
11466+
11467+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11468+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11469+ nop == 0x01000000U)
11470+ {
11471+ unsigned int addr;
11472+
11473+ addr = (sethi & 0x003FFFFFU) << 10;
11474+ regs->u_regs[UREG_G1] = addr;
11475+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11476+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11477+ else
11478+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11479+ regs->pc = addr;
11480+ regs->npc = addr+4;
11481+ return 2;
11482+ }
11483+ } while (0);
11484+
11485+ do { /* PaX: unpatched PLT emulation step 1 */
11486+ unsigned int sethi, ba, nop;
11487+
11488+ err = get_user(sethi, (unsigned int *)regs->pc);
11489+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11490+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11491+
11492+ if (err)
11493+ break;
11494+
11495+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11496+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11497+ nop == 0x01000000U)
11498+ {
11499+ unsigned int addr, save, call;
11500+
11501+ if ((ba & 0xFFC00000U) == 0x30800000U)
11502+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11503+ else
11504+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11505+
11506+ err = get_user(save, (unsigned int *)addr);
11507+ err |= get_user(call, (unsigned int *)(addr+4));
11508+ err |= get_user(nop, (unsigned int *)(addr+8));
11509+ if (err)
11510+ break;
11511+
11512+#ifdef CONFIG_PAX_DLRESOLVE
11513+ if (save == 0x9DE3BFA8U &&
11514+ (call & 0xC0000000U) == 0x40000000U &&
11515+ nop == 0x01000000U)
11516+ {
11517+ struct vm_area_struct *vma;
11518+ unsigned long call_dl_resolve;
11519+
11520+ down_read(&current->mm->mmap_sem);
11521+ call_dl_resolve = current->mm->call_dl_resolve;
11522+ up_read(&current->mm->mmap_sem);
11523+ if (likely(call_dl_resolve))
11524+ goto emulate;
11525+
11526+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11527+
11528+ down_write(&current->mm->mmap_sem);
11529+ if (current->mm->call_dl_resolve) {
11530+ call_dl_resolve = current->mm->call_dl_resolve;
11531+ up_write(&current->mm->mmap_sem);
11532+ if (vma)
11533+ kmem_cache_free(vm_area_cachep, vma);
11534+ goto emulate;
11535+ }
11536+
11537+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11538+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11539+ up_write(&current->mm->mmap_sem);
11540+ if (vma)
11541+ kmem_cache_free(vm_area_cachep, vma);
11542+ return 1;
11543+ }
11544+
11545+ if (pax_insert_vma(vma, call_dl_resolve)) {
11546+ up_write(&current->mm->mmap_sem);
11547+ kmem_cache_free(vm_area_cachep, vma);
11548+ return 1;
11549+ }
11550+
11551+ current->mm->call_dl_resolve = call_dl_resolve;
11552+ up_write(&current->mm->mmap_sem);
11553+
11554+emulate:
11555+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11556+ regs->pc = call_dl_resolve;
11557+ regs->npc = addr+4;
11558+ return 3;
11559+ }
11560+#endif
11561+
11562+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11563+ if ((save & 0xFFC00000U) == 0x05000000U &&
11564+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11565+ nop == 0x01000000U)
11566+ {
11567+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11568+ regs->u_regs[UREG_G2] = addr + 4;
11569+ addr = (save & 0x003FFFFFU) << 10;
11570+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11571+ regs->pc = addr;
11572+ regs->npc = addr+4;
11573+ return 3;
11574+ }
11575+ }
11576+ } while (0);
11577+
11578+ do { /* PaX: unpatched PLT emulation step 2 */
11579+ unsigned int save, call, nop;
11580+
11581+ err = get_user(save, (unsigned int *)(regs->pc-4));
11582+ err |= get_user(call, (unsigned int *)regs->pc);
11583+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11584+ if (err)
11585+ break;
11586+
11587+ if (save == 0x9DE3BFA8U &&
11588+ (call & 0xC0000000U) == 0x40000000U &&
11589+ nop == 0x01000000U)
11590+ {
11591+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11592+
11593+ regs->u_regs[UREG_RETPC] = regs->pc;
11594+ regs->pc = dl_resolve;
11595+ regs->npc = dl_resolve+4;
11596+ return 3;
11597+ }
11598+ } while (0);
11599+#endif
11600+
11601+ return 1;
11602+}
11603+
11604+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11605+{
11606+ unsigned long i;
11607+
11608+ printk(KERN_ERR "PAX: bytes at PC: ");
11609+ for (i = 0; i < 8; i++) {
11610+ unsigned int c;
11611+ if (get_user(c, (unsigned int *)pc+i))
11612+ printk(KERN_CONT "???????? ");
11613+ else
11614+ printk(KERN_CONT "%08x ", c);
11615+ }
11616+ printk("\n");
11617+}
11618+#endif
11619+
11620 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11621 int text_fault)
11622 {
11623@@ -226,6 +500,24 @@ good_area:
11624 if (!(vma->vm_flags & VM_WRITE))
11625 goto bad_area;
11626 } else {
11627+
11628+#ifdef CONFIG_PAX_PAGEEXEC
11629+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11630+ up_read(&mm->mmap_sem);
11631+ switch (pax_handle_fetch_fault(regs)) {
11632+
11633+#ifdef CONFIG_PAX_EMUPLT
11634+ case 2:
11635+ case 3:
11636+ return;
11637+#endif
11638+
11639+ }
11640+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11641+ do_group_exit(SIGKILL);
11642+ }
11643+#endif
11644+
11645 /* Allow reads even for write-only mappings */
11646 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11647 goto bad_area;
11648diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11649index 4798232..f76e3aa 100644
11650--- a/arch/sparc/mm/fault_64.c
11651+++ b/arch/sparc/mm/fault_64.c
11652@@ -22,6 +22,9 @@
11653 #include <linux/kdebug.h>
11654 #include <linux/percpu.h>
11655 #include <linux/context_tracking.h>
11656+#include <linux/slab.h>
11657+#include <linux/pagemap.h>
11658+#include <linux/compiler.h>
11659
11660 #include <asm/page.h>
11661 #include <asm/pgtable.h>
11662@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11663 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11664 regs->tpc);
11665 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11666- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11667+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11668 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11669 dump_stack();
11670 unhandled_fault(regs->tpc, current, regs);
11671@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11672 show_regs(regs);
11673 }
11674
11675+#ifdef CONFIG_PAX_PAGEEXEC
11676+#ifdef CONFIG_PAX_DLRESOLVE
11677+static void pax_emuplt_close(struct vm_area_struct *vma)
11678+{
11679+ vma->vm_mm->call_dl_resolve = 0UL;
11680+}
11681+
11682+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11683+{
11684+ unsigned int *kaddr;
11685+
11686+ vmf->page = alloc_page(GFP_HIGHUSER);
11687+ if (!vmf->page)
11688+ return VM_FAULT_OOM;
11689+
11690+ kaddr = kmap(vmf->page);
11691+ memset(kaddr, 0, PAGE_SIZE);
11692+ kaddr[0] = 0x9DE3BFA8U; /* save */
11693+ flush_dcache_page(vmf->page);
11694+ kunmap(vmf->page);
11695+ return VM_FAULT_MAJOR;
11696+}
11697+
11698+static const struct vm_operations_struct pax_vm_ops = {
11699+ .close = pax_emuplt_close,
11700+ .fault = pax_emuplt_fault
11701+};
11702+
11703+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11704+{
11705+ int ret;
11706+
11707+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11708+ vma->vm_mm = current->mm;
11709+ vma->vm_start = addr;
11710+ vma->vm_end = addr + PAGE_SIZE;
11711+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11712+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11713+ vma->vm_ops = &pax_vm_ops;
11714+
11715+ ret = insert_vm_struct(current->mm, vma);
11716+ if (ret)
11717+ return ret;
11718+
11719+ ++current->mm->total_vm;
11720+ return 0;
11721+}
11722+#endif
11723+
11724+/*
11725+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11726+ *
11727+ * returns 1 when task should be killed
11728+ * 2 when patched PLT trampoline was detected
11729+ * 3 when unpatched PLT trampoline was detected
11730+ */
11731+static int pax_handle_fetch_fault(struct pt_regs *regs)
11732+{
11733+
11734+#ifdef CONFIG_PAX_EMUPLT
11735+ int err;
11736+
11737+ do { /* PaX: patched PLT emulation #1 */
11738+ unsigned int sethi1, sethi2, jmpl;
11739+
11740+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11741+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11742+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11743+
11744+ if (err)
11745+ break;
11746+
11747+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11748+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11749+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11750+ {
11751+ unsigned long addr;
11752+
11753+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11754+ addr = regs->u_regs[UREG_G1];
11755+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11756+
11757+ if (test_thread_flag(TIF_32BIT))
11758+ addr &= 0xFFFFFFFFUL;
11759+
11760+ regs->tpc = addr;
11761+ regs->tnpc = addr+4;
11762+ return 2;
11763+ }
11764+ } while (0);
11765+
11766+ do { /* PaX: patched PLT emulation #2 */
11767+ unsigned int ba;
11768+
11769+ err = get_user(ba, (unsigned int *)regs->tpc);
11770+
11771+ if (err)
11772+ break;
11773+
11774+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11775+ unsigned long addr;
11776+
11777+ if ((ba & 0xFFC00000U) == 0x30800000U)
11778+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11779+ else
11780+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11781+
11782+ if (test_thread_flag(TIF_32BIT))
11783+ addr &= 0xFFFFFFFFUL;
11784+
11785+ regs->tpc = addr;
11786+ regs->tnpc = addr+4;
11787+ return 2;
11788+ }
11789+ } while (0);
11790+
11791+ do { /* PaX: patched PLT emulation #3 */
11792+ unsigned int sethi, bajmpl, nop;
11793+
11794+ err = get_user(sethi, (unsigned int *)regs->tpc);
11795+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11796+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11797+
11798+ if (err)
11799+ break;
11800+
11801+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11802+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11803+ nop == 0x01000000U)
11804+ {
11805+ unsigned long addr;
11806+
11807+ addr = (sethi & 0x003FFFFFU) << 10;
11808+ regs->u_regs[UREG_G1] = addr;
11809+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11810+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11811+ else
11812+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11813+
11814+ if (test_thread_flag(TIF_32BIT))
11815+ addr &= 0xFFFFFFFFUL;
11816+
11817+ regs->tpc = addr;
11818+ regs->tnpc = addr+4;
11819+ return 2;
11820+ }
11821+ } while (0);
11822+
11823+ do { /* PaX: patched PLT emulation #4 */
11824+ unsigned int sethi, mov1, call, mov2;
11825+
11826+ err = get_user(sethi, (unsigned int *)regs->tpc);
11827+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11828+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11829+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11830+
11831+ if (err)
11832+ break;
11833+
11834+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11835+ mov1 == 0x8210000FU &&
11836+ (call & 0xC0000000U) == 0x40000000U &&
11837+ mov2 == 0x9E100001U)
11838+ {
11839+ unsigned long addr;
11840+
11841+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11842+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11843+
11844+ if (test_thread_flag(TIF_32BIT))
11845+ addr &= 0xFFFFFFFFUL;
11846+
11847+ regs->tpc = addr;
11848+ regs->tnpc = addr+4;
11849+ return 2;
11850+ }
11851+ } while (0);
11852+
11853+ do { /* PaX: patched PLT emulation #5 */
11854+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11855+
11856+ err = get_user(sethi, (unsigned int *)regs->tpc);
11857+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11858+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11859+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11860+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11861+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11862+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11863+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11864+
11865+ if (err)
11866+ break;
11867+
11868+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11869+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11870+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11871+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11872+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11873+ sllx == 0x83287020U &&
11874+ jmpl == 0x81C04005U &&
11875+ nop == 0x01000000U)
11876+ {
11877+ unsigned long addr;
11878+
11879+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11880+ regs->u_regs[UREG_G1] <<= 32;
11881+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11882+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11883+ regs->tpc = addr;
11884+ regs->tnpc = addr+4;
11885+ return 2;
11886+ }
11887+ } while (0);
11888+
11889+ do { /* PaX: patched PLT emulation #6 */
11890+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11891+
11892+ err = get_user(sethi, (unsigned int *)regs->tpc);
11893+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11894+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11895+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11896+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11897+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11898+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11899+
11900+ if (err)
11901+ break;
11902+
11903+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11904+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11905+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11906+ sllx == 0x83287020U &&
11907+ (or & 0xFFFFE000U) == 0x8A116000U &&
11908+ jmpl == 0x81C04005U &&
11909+ nop == 0x01000000U)
11910+ {
11911+ unsigned long addr;
11912+
11913+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11914+ regs->u_regs[UREG_G1] <<= 32;
11915+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11916+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11917+ regs->tpc = addr;
11918+ regs->tnpc = addr+4;
11919+ return 2;
11920+ }
11921+ } while (0);
11922+
11923+ do { /* PaX: unpatched PLT emulation step 1 */
11924+ unsigned int sethi, ba, nop;
11925+
11926+ err = get_user(sethi, (unsigned int *)regs->tpc);
11927+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11928+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11929+
11930+ if (err)
11931+ break;
11932+
11933+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11934+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11935+ nop == 0x01000000U)
11936+ {
11937+ unsigned long addr;
11938+ unsigned int save, call;
11939+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11940+
11941+ if ((ba & 0xFFC00000U) == 0x30800000U)
11942+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11943+ else
11944+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11945+
11946+ if (test_thread_flag(TIF_32BIT))
11947+ addr &= 0xFFFFFFFFUL;
11948+
11949+ err = get_user(save, (unsigned int *)addr);
11950+ err |= get_user(call, (unsigned int *)(addr+4));
11951+ err |= get_user(nop, (unsigned int *)(addr+8));
11952+ if (err)
11953+ break;
11954+
11955+#ifdef CONFIG_PAX_DLRESOLVE
11956+ if (save == 0x9DE3BFA8U &&
11957+ (call & 0xC0000000U) == 0x40000000U &&
11958+ nop == 0x01000000U)
11959+ {
11960+ struct vm_area_struct *vma;
11961+ unsigned long call_dl_resolve;
11962+
11963+ down_read(&current->mm->mmap_sem);
11964+ call_dl_resolve = current->mm->call_dl_resolve;
11965+ up_read(&current->mm->mmap_sem);
11966+ if (likely(call_dl_resolve))
11967+ goto emulate;
11968+
11969+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11970+
11971+ down_write(&current->mm->mmap_sem);
11972+ if (current->mm->call_dl_resolve) {
11973+ call_dl_resolve = current->mm->call_dl_resolve;
11974+ up_write(&current->mm->mmap_sem);
11975+ if (vma)
11976+ kmem_cache_free(vm_area_cachep, vma);
11977+ goto emulate;
11978+ }
11979+
11980+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11981+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11982+ up_write(&current->mm->mmap_sem);
11983+ if (vma)
11984+ kmem_cache_free(vm_area_cachep, vma);
11985+ return 1;
11986+ }
11987+
11988+ if (pax_insert_vma(vma, call_dl_resolve)) {
11989+ up_write(&current->mm->mmap_sem);
11990+ kmem_cache_free(vm_area_cachep, vma);
11991+ return 1;
11992+ }
11993+
11994+ current->mm->call_dl_resolve = call_dl_resolve;
11995+ up_write(&current->mm->mmap_sem);
11996+
11997+emulate:
11998+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11999+ regs->tpc = call_dl_resolve;
12000+ regs->tnpc = addr+4;
12001+ return 3;
12002+ }
12003+#endif
12004+
12005+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
12006+ if ((save & 0xFFC00000U) == 0x05000000U &&
12007+ (call & 0xFFFFE000U) == 0x85C0A000U &&
12008+ nop == 0x01000000U)
12009+ {
12010+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12011+ regs->u_regs[UREG_G2] = addr + 4;
12012+ addr = (save & 0x003FFFFFU) << 10;
12013+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12014+
12015+ if (test_thread_flag(TIF_32BIT))
12016+ addr &= 0xFFFFFFFFUL;
12017+
12018+ regs->tpc = addr;
12019+ regs->tnpc = addr+4;
12020+ return 3;
12021+ }
12022+
12023+ /* PaX: 64-bit PLT stub */
12024+ err = get_user(sethi1, (unsigned int *)addr);
12025+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12026+ err |= get_user(or1, (unsigned int *)(addr+8));
12027+ err |= get_user(or2, (unsigned int *)(addr+12));
12028+ err |= get_user(sllx, (unsigned int *)(addr+16));
12029+ err |= get_user(add, (unsigned int *)(addr+20));
12030+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12031+ err |= get_user(nop, (unsigned int *)(addr+28));
12032+ if (err)
12033+ break;
12034+
12035+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12036+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12037+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12038+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12039+ sllx == 0x89293020U &&
12040+ add == 0x8A010005U &&
12041+ jmpl == 0x89C14000U &&
12042+ nop == 0x01000000U)
12043+ {
12044+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12045+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12046+ regs->u_regs[UREG_G4] <<= 32;
12047+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12048+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12049+ regs->u_regs[UREG_G4] = addr + 24;
12050+ addr = regs->u_regs[UREG_G5];
12051+ regs->tpc = addr;
12052+ regs->tnpc = addr+4;
12053+ return 3;
12054+ }
12055+ }
12056+ } while (0);
12057+
12058+#ifdef CONFIG_PAX_DLRESOLVE
12059+ do { /* PaX: unpatched PLT emulation step 2 */
12060+ unsigned int save, call, nop;
12061+
12062+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12063+ err |= get_user(call, (unsigned int *)regs->tpc);
12064+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12065+ if (err)
12066+ break;
12067+
12068+ if (save == 0x9DE3BFA8U &&
12069+ (call & 0xC0000000U) == 0x40000000U &&
12070+ nop == 0x01000000U)
12071+ {
12072+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12073+
12074+ if (test_thread_flag(TIF_32BIT))
12075+ dl_resolve &= 0xFFFFFFFFUL;
12076+
12077+ regs->u_regs[UREG_RETPC] = regs->tpc;
12078+ regs->tpc = dl_resolve;
12079+ regs->tnpc = dl_resolve+4;
12080+ return 3;
12081+ }
12082+ } while (0);
12083+#endif
12084+
12085+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12086+ unsigned int sethi, ba, nop;
12087+
12088+ err = get_user(sethi, (unsigned int *)regs->tpc);
12089+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12090+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12091+
12092+ if (err)
12093+ break;
12094+
12095+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12096+ (ba & 0xFFF00000U) == 0x30600000U &&
12097+ nop == 0x01000000U)
12098+ {
12099+ unsigned long addr;
12100+
12101+ addr = (sethi & 0x003FFFFFU) << 10;
12102+ regs->u_regs[UREG_G1] = addr;
12103+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12104+
12105+ if (test_thread_flag(TIF_32BIT))
12106+ addr &= 0xFFFFFFFFUL;
12107+
12108+ regs->tpc = addr;
12109+ regs->tnpc = addr+4;
12110+ return 2;
12111+ }
12112+ } while (0);
12113+
12114+#endif
12115+
12116+ return 1;
12117+}
12118+
12119+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12120+{
12121+ unsigned long i;
12122+
12123+ printk(KERN_ERR "PAX: bytes at PC: ");
12124+ for (i = 0; i < 8; i++) {
12125+ unsigned int c;
12126+ if (get_user(c, (unsigned int *)pc+i))
12127+ printk(KERN_CONT "???????? ");
12128+ else
12129+ printk(KERN_CONT "%08x ", c);
12130+ }
12131+ printk("\n");
12132+}
12133+#endif
12134+
12135 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12136 {
12137 enum ctx_state prev_state = exception_enter();
12138@@ -353,6 +816,29 @@ retry:
12139 if (!vma)
12140 goto bad_area;
12141
12142+#ifdef CONFIG_PAX_PAGEEXEC
12143+ /* PaX: detect ITLB misses on non-exec pages */
12144+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12145+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12146+ {
12147+ if (address != regs->tpc)
12148+ goto good_area;
12149+
12150+ up_read(&mm->mmap_sem);
12151+ switch (pax_handle_fetch_fault(regs)) {
12152+
12153+#ifdef CONFIG_PAX_EMUPLT
12154+ case 2:
12155+ case 3:
12156+ return;
12157+#endif
12158+
12159+ }
12160+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12161+ do_group_exit(SIGKILL);
12162+ }
12163+#endif
12164+
12165 /* Pure DTLB misses do not tell us whether the fault causing
12166 * load/store/atomic was a write or not, it only says that there
12167 * was no match. So in such a case we (carefully) read the
12168diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12169index 4242eab..9ae6360 100644
12170--- a/arch/sparc/mm/hugetlbpage.c
12171+++ b/arch/sparc/mm/hugetlbpage.c
12172@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12173 unsigned long addr,
12174 unsigned long len,
12175 unsigned long pgoff,
12176- unsigned long flags)
12177+ unsigned long flags,
12178+ unsigned long offset)
12179 {
12180+ struct mm_struct *mm = current->mm;
12181 unsigned long task_size = TASK_SIZE;
12182 struct vm_unmapped_area_info info;
12183
12184@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12185
12186 info.flags = 0;
12187 info.length = len;
12188- info.low_limit = TASK_UNMAPPED_BASE;
12189+ info.low_limit = mm->mmap_base;
12190 info.high_limit = min(task_size, VA_EXCLUDE_START);
12191 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12192 info.align_offset = 0;
12193+ info.threadstack_offset = offset;
12194 addr = vm_unmapped_area(&info);
12195
12196 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12197 VM_BUG_ON(addr != -ENOMEM);
12198 info.low_limit = VA_EXCLUDE_END;
12199+
12200+#ifdef CONFIG_PAX_RANDMMAP
12201+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12202+ info.low_limit += mm->delta_mmap;
12203+#endif
12204+
12205 info.high_limit = task_size;
12206 addr = vm_unmapped_area(&info);
12207 }
12208@@ -55,7 +64,8 @@ static unsigned long
12209 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12210 const unsigned long len,
12211 const unsigned long pgoff,
12212- const unsigned long flags)
12213+ const unsigned long flags,
12214+ const unsigned long offset)
12215 {
12216 struct mm_struct *mm = current->mm;
12217 unsigned long addr = addr0;
12218@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12219 info.high_limit = mm->mmap_base;
12220 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12221 info.align_offset = 0;
12222+ info.threadstack_offset = offset;
12223 addr = vm_unmapped_area(&info);
12224
12225 /*
12226@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12227 VM_BUG_ON(addr != -ENOMEM);
12228 info.flags = 0;
12229 info.low_limit = TASK_UNMAPPED_BASE;
12230+
12231+#ifdef CONFIG_PAX_RANDMMAP
12232+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12233+ info.low_limit += mm->delta_mmap;
12234+#endif
12235+
12236 info.high_limit = STACK_TOP32;
12237 addr = vm_unmapped_area(&info);
12238 }
12239@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12240 struct mm_struct *mm = current->mm;
12241 struct vm_area_struct *vma;
12242 unsigned long task_size = TASK_SIZE;
12243+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12244
12245 if (test_thread_flag(TIF_32BIT))
12246 task_size = STACK_TOP32;
12247@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12248 return addr;
12249 }
12250
12251+#ifdef CONFIG_PAX_RANDMMAP
12252+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12253+#endif
12254+
12255 if (addr) {
12256 addr = ALIGN(addr, HPAGE_SIZE);
12257 vma = find_vma(mm, addr);
12258- if (task_size - len >= addr &&
12259- (!vma || addr + len <= vma->vm_start))
12260+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12261 return addr;
12262 }
12263 if (mm->get_unmapped_area == arch_get_unmapped_area)
12264 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12265- pgoff, flags);
12266+ pgoff, flags, offset);
12267 else
12268 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12269- pgoff, flags);
12270+ pgoff, flags, offset);
12271 }
12272
12273 pte_t *huge_pte_alloc(struct mm_struct *mm,
12274diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12275index 4ca0d6b..e89bca1 100644
12276--- a/arch/sparc/mm/init_64.c
12277+++ b/arch/sparc/mm/init_64.c
12278@@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12279 int num_kernel_image_mappings;
12280
12281 #ifdef CONFIG_DEBUG_DCFLUSH
12282-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12283+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12284 #ifdef CONFIG_SMP
12285-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12286+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12287 #endif
12288 #endif
12289
12290@@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12291 {
12292 BUG_ON(tlb_type == hypervisor);
12293 #ifdef CONFIG_DEBUG_DCFLUSH
12294- atomic_inc(&dcpage_flushes);
12295+ atomic_inc_unchecked(&dcpage_flushes);
12296 #endif
12297
12298 #ifdef DCACHE_ALIASING_POSSIBLE
12299@@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12300
12301 #ifdef CONFIG_DEBUG_DCFLUSH
12302 seq_printf(m, "DCPageFlushes\t: %d\n",
12303- atomic_read(&dcpage_flushes));
12304+ atomic_read_unchecked(&dcpage_flushes));
12305 #ifdef CONFIG_SMP
12306 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12307- atomic_read(&dcpage_flushes_xcall));
12308+ atomic_read_unchecked(&dcpage_flushes_xcall));
12309 #endif /* CONFIG_SMP */
12310 #endif /* CONFIG_DEBUG_DCFLUSH */
12311 }
12312diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12313index 7cca418..53fc030 100644
12314--- a/arch/tile/Kconfig
12315+++ b/arch/tile/Kconfig
12316@@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12317
12318 config KEXEC
12319 bool "kexec system call"
12320+ depends on !GRKERNSEC_KMEM
12321 ---help---
12322 kexec is a system call that implements the ability to shutdown your
12323 current kernel, and to start another kernel. It is like a reboot
12324diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12325index 7b11c5f..755a026 100644
12326--- a/arch/tile/include/asm/atomic_64.h
12327+++ b/arch/tile/include/asm/atomic_64.h
12328@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12329
12330 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12331
12332+#define atomic64_read_unchecked(v) atomic64_read(v)
12333+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12334+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12335+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12336+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12337+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12338+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12339+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12340+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12341+
12342 /* Define this to indicate that cmpxchg is an efficient operation. */
12343 #define __HAVE_ARCH_CMPXCHG
12344
12345diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12346index 6160761..00cac88 100644
12347--- a/arch/tile/include/asm/cache.h
12348+++ b/arch/tile/include/asm/cache.h
12349@@ -15,11 +15,12 @@
12350 #ifndef _ASM_TILE_CACHE_H
12351 #define _ASM_TILE_CACHE_H
12352
12353+#include <linux/const.h>
12354 #include <arch/chip.h>
12355
12356 /* bytes per L1 data cache line */
12357 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12358-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12359+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12360
12361 /* bytes per L2 cache line */
12362 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12363diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12364index f41cb53..31d3ab4 100644
12365--- a/arch/tile/include/asm/uaccess.h
12366+++ b/arch/tile/include/asm/uaccess.h
12367@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12368 const void __user *from,
12369 unsigned long n)
12370 {
12371- int sz = __compiletime_object_size(to);
12372+ size_t sz = __compiletime_object_size(to);
12373
12374- if (likely(sz == -1 || sz >= n))
12375+ if (likely(sz == (size_t)-1 || sz >= n))
12376 n = _copy_from_user(to, from, n);
12377 else
12378 copy_from_user_overflow();
12379diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12380index 8416240..a012fb7 100644
12381--- a/arch/tile/mm/hugetlbpage.c
12382+++ b/arch/tile/mm/hugetlbpage.c
12383@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12384 info.high_limit = TASK_SIZE;
12385 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12386 info.align_offset = 0;
12387+ info.threadstack_offset = 0;
12388 return vm_unmapped_area(&info);
12389 }
12390
12391@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12392 info.high_limit = current->mm->mmap_base;
12393 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12394 info.align_offset = 0;
12395+ info.threadstack_offset = 0;
12396 addr = vm_unmapped_area(&info);
12397
12398 /*
12399diff --git a/arch/um/Makefile b/arch/um/Makefile
12400index e4b1a96..16162f8 100644
12401--- a/arch/um/Makefile
12402+++ b/arch/um/Makefile
12403@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12404 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12405 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12406
12407+ifdef CONSTIFY_PLUGIN
12408+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12409+endif
12410+
12411 #This will adjust *FLAGS accordingly to the platform.
12412 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12413
12414diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12415index 19e1bdd..3665b77 100644
12416--- a/arch/um/include/asm/cache.h
12417+++ b/arch/um/include/asm/cache.h
12418@@ -1,6 +1,7 @@
12419 #ifndef __UM_CACHE_H
12420 #define __UM_CACHE_H
12421
12422+#include <linux/const.h>
12423
12424 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12425 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12426@@ -12,6 +13,6 @@
12427 # define L1_CACHE_SHIFT 5
12428 #endif
12429
12430-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12431+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12432
12433 #endif
12434diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12435index 2e0a6b1..a64d0f5 100644
12436--- a/arch/um/include/asm/kmap_types.h
12437+++ b/arch/um/include/asm/kmap_types.h
12438@@ -8,6 +8,6 @@
12439
12440 /* No more #include "asm/arch/kmap_types.h" ! */
12441
12442-#define KM_TYPE_NR 14
12443+#define KM_TYPE_NR 15
12444
12445 #endif
12446diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12447index 71c5d13..4c7b9f1 100644
12448--- a/arch/um/include/asm/page.h
12449+++ b/arch/um/include/asm/page.h
12450@@ -14,6 +14,9 @@
12451 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12452 #define PAGE_MASK (~(PAGE_SIZE-1))
12453
12454+#define ktla_ktva(addr) (addr)
12455+#define ktva_ktla(addr) (addr)
12456+
12457 #ifndef __ASSEMBLY__
12458
12459 struct page;
12460diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12461index 2b4274e..754fe06 100644
12462--- a/arch/um/include/asm/pgtable-3level.h
12463+++ b/arch/um/include/asm/pgtable-3level.h
12464@@ -58,6 +58,7 @@
12465 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12466 #define pud_populate(mm, pud, pmd) \
12467 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12468+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12469
12470 #ifdef CONFIG_64BIT
12471 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12472diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12473index f17bca8..48adb87 100644
12474--- a/arch/um/kernel/process.c
12475+++ b/arch/um/kernel/process.c
12476@@ -356,22 +356,6 @@ int singlestepping(void * t)
12477 return 2;
12478 }
12479
12480-/*
12481- * Only x86 and x86_64 have an arch_align_stack().
12482- * All other arches have "#define arch_align_stack(x) (x)"
12483- * in their asm/exec.h
12484- * As this is included in UML from asm-um/system-generic.h,
12485- * we can use it to behave as the subarch does.
12486- */
12487-#ifndef arch_align_stack
12488-unsigned long arch_align_stack(unsigned long sp)
12489-{
12490- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12491- sp -= get_random_int() % 8192;
12492- return sp & ~0xf;
12493-}
12494-#endif
12495-
12496 unsigned long get_wchan(struct task_struct *p)
12497 {
12498 unsigned long stack_page, sp, ip;
12499diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12500index ad8f795..2c7eec6 100644
12501--- a/arch/unicore32/include/asm/cache.h
12502+++ b/arch/unicore32/include/asm/cache.h
12503@@ -12,8 +12,10 @@
12504 #ifndef __UNICORE_CACHE_H__
12505 #define __UNICORE_CACHE_H__
12506
12507-#define L1_CACHE_SHIFT (5)
12508-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12509+#include <linux/const.h>
12510+
12511+#define L1_CACHE_SHIFT 5
12512+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12513
12514 /*
12515 * Memory returned by kmalloc() may be used for DMA, so we must make
12516diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12517index b7d31ca..9481ec5 100644
12518--- a/arch/x86/Kconfig
12519+++ b/arch/x86/Kconfig
12520@@ -132,7 +132,7 @@ config X86
12521 select RTC_LIB
12522 select HAVE_DEBUG_STACKOVERFLOW
12523 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12524- select HAVE_CC_STACKPROTECTOR
12525+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12526 select GENERIC_CPU_AUTOPROBE
12527 select HAVE_ARCH_AUDITSYSCALL
12528 select ARCH_SUPPORTS_ATOMIC_RMW
12529@@ -266,7 +266,7 @@ config X86_HT
12530
12531 config X86_32_LAZY_GS
12532 def_bool y
12533- depends on X86_32 && !CC_STACKPROTECTOR
12534+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12535
12536 config ARCH_HWEIGHT_CFLAGS
12537 string
12538@@ -632,6 +632,7 @@ config SCHED_OMIT_FRAME_POINTER
12539
12540 menuconfig HYPERVISOR_GUEST
12541 bool "Linux guest support"
12542+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12543 ---help---
12544 Say Y here to enable options for running Linux under various hyper-
12545 visors. This option enables basic hypervisor detection and platform
12546@@ -1013,6 +1014,7 @@ config VM86
12547
12548 config X86_16BIT
12549 bool "Enable support for 16-bit segments" if EXPERT
12550+ depends on !GRKERNSEC
12551 default y
12552 ---help---
12553 This option is required by programs like Wine to run 16-bit
12554@@ -1186,6 +1188,7 @@ choice
12555
12556 config NOHIGHMEM
12557 bool "off"
12558+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12559 ---help---
12560 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12561 However, the address space of 32-bit x86 processors is only 4
12562@@ -1222,6 +1225,7 @@ config NOHIGHMEM
12563
12564 config HIGHMEM4G
12565 bool "4GB"
12566+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12567 ---help---
12568 Select this if you have a 32-bit processor and between 1 and 4
12569 gigabytes of physical RAM.
12570@@ -1274,7 +1278,7 @@ config PAGE_OFFSET
12571 hex
12572 default 0xB0000000 if VMSPLIT_3G_OPT
12573 default 0x80000000 if VMSPLIT_2G
12574- default 0x78000000 if VMSPLIT_2G_OPT
12575+ default 0x70000000 if VMSPLIT_2G_OPT
12576 default 0x40000000 if VMSPLIT_1G
12577 default 0xC0000000
12578 depends on X86_32
12579@@ -1715,6 +1719,7 @@ source kernel/Kconfig.hz
12580
12581 config KEXEC
12582 bool "kexec system call"
12583+ depends on !GRKERNSEC_KMEM
12584 ---help---
12585 kexec is a system call that implements the ability to shutdown your
12586 current kernel, and to start another kernel. It is like a reboot
12587@@ -1900,7 +1905,9 @@ config X86_NEED_RELOCS
12588
12589 config PHYSICAL_ALIGN
12590 hex "Alignment value to which kernel should be aligned"
12591- default "0x200000"
12592+ default "0x1000000"
12593+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12594+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12595 range 0x2000 0x1000000 if X86_32
12596 range 0x200000 0x1000000 if X86_64
12597 ---help---
12598@@ -1983,6 +1990,7 @@ config COMPAT_VDSO
12599 def_bool n
12600 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12601 depends on X86_32 || IA32_EMULATION
12602+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12603 ---help---
12604 Certain buggy versions of glibc will crash if they are
12605 presented with a 32-bit vDSO that is not mapped at the address
12606diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12607index 6983314..54ad7e8 100644
12608--- a/arch/x86/Kconfig.cpu
12609+++ b/arch/x86/Kconfig.cpu
12610@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12611
12612 config X86_F00F_BUG
12613 def_bool y
12614- depends on M586MMX || M586TSC || M586 || M486
12615+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12616
12617 config X86_INVD_BUG
12618 def_bool y
12619@@ -327,7 +327,7 @@ config X86_INVD_BUG
12620
12621 config X86_ALIGNMENT_16
12622 def_bool y
12623- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12624+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12625
12626 config X86_INTEL_USERCOPY
12627 def_bool y
12628@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12629 # generates cmov.
12630 config X86_CMOV
12631 def_bool y
12632- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12633+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12634
12635 config X86_MINIMUM_CPU_FAMILY
12636 int
12637diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12638index 20028da..88d5946 100644
12639--- a/arch/x86/Kconfig.debug
12640+++ b/arch/x86/Kconfig.debug
12641@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12642 config DEBUG_RODATA
12643 bool "Write protect kernel read-only data structures"
12644 default y
12645- depends on DEBUG_KERNEL
12646+ depends on DEBUG_KERNEL && BROKEN
12647 ---help---
12648 Mark the kernel read-only data as write-protected in the pagetables,
12649 in order to catch accidental (and incorrect) writes to such const
12650@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12651
12652 config DEBUG_SET_MODULE_RONX
12653 bool "Set loadable kernel module data as NX and text as RO"
12654- depends on MODULES
12655+ depends on MODULES && BROKEN
12656 ---help---
12657 This option helps catch unintended modifications to loadable
12658 kernel module's text and read-only data. It also prevents execution
12659diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12660index 5ba2d9c..41e5bb6 100644
12661--- a/arch/x86/Makefile
12662+++ b/arch/x86/Makefile
12663@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12664 # CPU-specific tuning. Anything which can be shared with UML should go here.
12665 include $(srctree)/arch/x86/Makefile_32.cpu
12666 KBUILD_CFLAGS += $(cflags-y)
12667-
12668- # temporary until string.h is fixed
12669- KBUILD_CFLAGS += -ffreestanding
12670 else
12671 BITS := 64
12672 UTS_MACHINE := x86_64
12673@@ -107,6 +104,9 @@ else
12674 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12675 endif
12676
12677+# temporary until string.h is fixed
12678+KBUILD_CFLAGS += -ffreestanding
12679+
12680 # Make sure compiler does not have buggy stack-protector support.
12681 ifdef CONFIG_CC_STACKPROTECTOR
12682 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12683@@ -181,6 +181,7 @@ archheaders:
12684 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12685
12686 archprepare:
12687+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12688 ifeq ($(CONFIG_KEXEC_FILE),y)
12689 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12690 endif
12691@@ -264,3 +265,9 @@ define archhelp
12692 echo ' FDARGS="..." arguments for the booted kernel'
12693 echo ' FDINITRD=file initrd for the booted kernel'
12694 endef
12695+
12696+define OLD_LD
12697+
12698+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12699+*** Please upgrade your binutils to 2.18 or newer
12700+endef
12701diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12702index 57bbf2f..b100fce 100644
12703--- a/arch/x86/boot/Makefile
12704+++ b/arch/x86/boot/Makefile
12705@@ -58,6 +58,9 @@ clean-files += cpustr.h
12706 # ---------------------------------------------------------------------------
12707
12708 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12709+ifdef CONSTIFY_PLUGIN
12710+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12711+endif
12712 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12713 GCOV_PROFILE := n
12714
12715diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12716index 878e4b9..20537ab 100644
12717--- a/arch/x86/boot/bitops.h
12718+++ b/arch/x86/boot/bitops.h
12719@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12720 u8 v;
12721 const u32 *p = (const u32 *)addr;
12722
12723- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12724+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12725 return v;
12726 }
12727
12728@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12729
12730 static inline void set_bit(int nr, void *addr)
12731 {
12732- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12733+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12734 }
12735
12736 #endif /* BOOT_BITOPS_H */
12737diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12738index bd49ec6..94c7f58 100644
12739--- a/arch/x86/boot/boot.h
12740+++ b/arch/x86/boot/boot.h
12741@@ -84,7 +84,7 @@ static inline void io_delay(void)
12742 static inline u16 ds(void)
12743 {
12744 u16 seg;
12745- asm("movw %%ds,%0" : "=rm" (seg));
12746+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12747 return seg;
12748 }
12749
12750diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12751index 0a291cd..9686efc 100644
12752--- a/arch/x86/boot/compressed/Makefile
12753+++ b/arch/x86/boot/compressed/Makefile
12754@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
12755 KBUILD_CFLAGS += -mno-mmx -mno-sse
12756 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12757 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12758+ifdef CONSTIFY_PLUGIN
12759+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12760+endif
12761
12762 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12763 GCOV_PROFILE := n
12764diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12765index a53440e..c3dbf1e 100644
12766--- a/arch/x86/boot/compressed/efi_stub_32.S
12767+++ b/arch/x86/boot/compressed/efi_stub_32.S
12768@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12769 * parameter 2, ..., param n. To make things easy, we save the return
12770 * address of efi_call_phys in a global variable.
12771 */
12772- popl %ecx
12773- movl %ecx, saved_return_addr(%edx)
12774- /* get the function pointer into ECX*/
12775- popl %ecx
12776- movl %ecx, efi_rt_function_ptr(%edx)
12777+ popl saved_return_addr(%edx)
12778+ popl efi_rt_function_ptr(%edx)
12779
12780 /*
12781 * 3. Call the physical function.
12782 */
12783- call *%ecx
12784+ call *efi_rt_function_ptr(%edx)
12785
12786 /*
12787 * 4. Balance the stack. And because EAX contain the return value,
12788@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12789 1: popl %edx
12790 subl $1b, %edx
12791
12792- movl efi_rt_function_ptr(%edx), %ecx
12793- pushl %ecx
12794+ pushl efi_rt_function_ptr(%edx)
12795
12796 /*
12797 * 10. Push the saved return address onto the stack and return.
12798 */
12799- movl saved_return_addr(%edx), %ecx
12800- pushl %ecx
12801- ret
12802+ jmpl *saved_return_addr(%edx)
12803 ENDPROC(efi_call_phys)
12804 .previous
12805
12806diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12807index 630384a..278e788 100644
12808--- a/arch/x86/boot/compressed/efi_thunk_64.S
12809+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12810@@ -189,8 +189,8 @@ efi_gdt64:
12811 .long 0 /* Filled out by user */
12812 .word 0
12813 .quad 0x0000000000000000 /* NULL descriptor */
12814- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12815- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12816+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12817+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12818 .quad 0x0080890000000000 /* TS descriptor */
12819 .quad 0x0000000000000000 /* TS continued */
12820 efi_gdt64_end:
12821diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12822index 1d7fbbc..36ecd58 100644
12823--- a/arch/x86/boot/compressed/head_32.S
12824+++ b/arch/x86/boot/compressed/head_32.S
12825@@ -140,10 +140,10 @@ preferred_addr:
12826 addl %eax, %ebx
12827 notl %eax
12828 andl %eax, %ebx
12829- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12830+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12831 jge 1f
12832 #endif
12833- movl $LOAD_PHYSICAL_ADDR, %ebx
12834+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12835 1:
12836
12837 /* Target address to relocate to for decompression */
12838diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12839index 6b1766c..ad465c9 100644
12840--- a/arch/x86/boot/compressed/head_64.S
12841+++ b/arch/x86/boot/compressed/head_64.S
12842@@ -94,10 +94,10 @@ ENTRY(startup_32)
12843 addl %eax, %ebx
12844 notl %eax
12845 andl %eax, %ebx
12846- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12847+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12848 jge 1f
12849 #endif
12850- movl $LOAD_PHYSICAL_ADDR, %ebx
12851+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12852 1:
12853
12854 /* Target address to relocate to for decompression */
12855@@ -322,10 +322,10 @@ preferred_addr:
12856 addq %rax, %rbp
12857 notq %rax
12858 andq %rax, %rbp
12859- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12860+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12861 jge 1f
12862 #endif
12863- movq $LOAD_PHYSICAL_ADDR, %rbp
12864+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12865 1:
12866
12867 /* Target address to relocate to for decompression */
12868@@ -434,8 +434,8 @@ gdt:
12869 .long gdt
12870 .word 0
12871 .quad 0x0000000000000000 /* NULL descriptor */
12872- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12873- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12874+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12875+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12876 .quad 0x0080890000000000 /* TS descriptor */
12877 .quad 0x0000000000000000 /* TS continued */
12878 gdt_end:
12879diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12880index a950864..c710239 100644
12881--- a/arch/x86/boot/compressed/misc.c
12882+++ b/arch/x86/boot/compressed/misc.c
12883@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12884 * Calculate the delta between where vmlinux was linked to load
12885 * and where it was actually loaded.
12886 */
12887- delta = min_addr - LOAD_PHYSICAL_ADDR;
12888+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12889 if (!delta) {
12890 debug_putstr("No relocation needed... ");
12891 return;
12892@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12893 Elf32_Ehdr ehdr;
12894 Elf32_Phdr *phdrs, *phdr;
12895 #endif
12896- void *dest;
12897+ void *dest, *prev;
12898 int i;
12899
12900 memcpy(&ehdr, output, sizeof(ehdr));
12901@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12902 case PT_LOAD:
12903 #ifdef CONFIG_RELOCATABLE
12904 dest = output;
12905- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12906+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12907 #else
12908 dest = (void *)(phdr->p_paddr);
12909 #endif
12910 memcpy(dest,
12911 output + phdr->p_offset,
12912 phdr->p_filesz);
12913+ if (i)
12914+ memset(prev, 0xff, dest - prev);
12915+ prev = dest + phdr->p_filesz;
12916 break;
12917 default: /* Ignore other PT_* */ break;
12918 }
12919@@ -416,7 +419,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12920 error("Destination address too large");
12921 #endif
12922 #ifndef CONFIG_RELOCATABLE
12923- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12924+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12925 error("Wrong destination address");
12926 #endif
12927
12928diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12929index 1fd7d57..0f7d096 100644
12930--- a/arch/x86/boot/cpucheck.c
12931+++ b/arch/x86/boot/cpucheck.c
12932@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12933 u32 ecx = MSR_K7_HWCR;
12934 u32 eax, edx;
12935
12936- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12937+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12938 eax &= ~(1 << 15);
12939- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12940+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12941
12942 get_cpuflags(); /* Make sure it really did something */
12943 err = check_cpuflags();
12944@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12945 u32 ecx = MSR_VIA_FCR;
12946 u32 eax, edx;
12947
12948- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12949+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12950 eax |= (1<<1)|(1<<7);
12951- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12952+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12953
12954 set_bit(X86_FEATURE_CX8, cpu.flags);
12955 err = check_cpuflags();
12956@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12957 u32 eax, edx;
12958 u32 level = 1;
12959
12960- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12961- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12962- asm("cpuid"
12963+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12964+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12965+ asm volatile("cpuid"
12966 : "+a" (level), "=d" (cpu.flags[0])
12967 : : "ecx", "ebx");
12968- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12969+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12970
12971 err = check_cpuflags();
12972 } else if (err == 0x01 &&
12973diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12974index 16ef025..91e033b 100644
12975--- a/arch/x86/boot/header.S
12976+++ b/arch/x86/boot/header.S
12977@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12978 # single linked list of
12979 # struct setup_data
12980
12981-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12982+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12983
12984 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12985+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12986+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12987+#else
12988 #define VO_INIT_SIZE (VO__end - VO__text)
12989+#endif
12990 #if ZO_INIT_SIZE > VO_INIT_SIZE
12991 #define INIT_SIZE ZO_INIT_SIZE
12992 #else
12993diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12994index db75d07..8e6d0af 100644
12995--- a/arch/x86/boot/memory.c
12996+++ b/arch/x86/boot/memory.c
12997@@ -19,7 +19,7 @@
12998
12999 static int detect_memory_e820(void)
13000 {
13001- int count = 0;
13002+ unsigned int count = 0;
13003 struct biosregs ireg, oreg;
13004 struct e820entry *desc = boot_params.e820_map;
13005 static struct e820entry buf; /* static so it is zeroed */
13006diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13007index ba3e100..6501b8f 100644
13008--- a/arch/x86/boot/video-vesa.c
13009+++ b/arch/x86/boot/video-vesa.c
13010@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13011
13012 boot_params.screen_info.vesapm_seg = oreg.es;
13013 boot_params.screen_info.vesapm_off = oreg.di;
13014+ boot_params.screen_info.vesapm_size = oreg.cx;
13015 }
13016
13017 /*
13018diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13019index 43eda28..5ab5fdb 100644
13020--- a/arch/x86/boot/video.c
13021+++ b/arch/x86/boot/video.c
13022@@ -96,7 +96,7 @@ static void store_mode_params(void)
13023 static unsigned int get_entry(void)
13024 {
13025 char entry_buf[4];
13026- int i, len = 0;
13027+ unsigned int i, len = 0;
13028 int key;
13029 unsigned int v;
13030
13031diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13032index 9105655..41779c1 100644
13033--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13034+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13035@@ -8,6 +8,8 @@
13036 * including this sentence is retained in full.
13037 */
13038
13039+#include <asm/alternative-asm.h>
13040+
13041 .extern crypto_ft_tab
13042 .extern crypto_it_tab
13043 .extern crypto_fl_tab
13044@@ -70,6 +72,8 @@
13045 je B192; \
13046 leaq 32(r9),r9;
13047
13048+#define ret pax_force_retaddr; ret
13049+
13050 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13051 movq r1,r2; \
13052 movq r3,r4; \
13053diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13054index 6bd2c6c..368c93e 100644
13055--- a/arch/x86/crypto/aesni-intel_asm.S
13056+++ b/arch/x86/crypto/aesni-intel_asm.S
13057@@ -31,6 +31,7 @@
13058
13059 #include <linux/linkage.h>
13060 #include <asm/inst.h>
13061+#include <asm/alternative-asm.h>
13062
13063 /*
13064 * The following macros are used to move an (un)aligned 16 byte value to/from
13065@@ -217,7 +218,7 @@ enc: .octa 0x2
13066 * num_initial_blocks = b mod 4
13067 * encrypt the initial num_initial_blocks blocks and apply ghash on
13068 * the ciphertext
13069-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13070+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13071 * are clobbered
13072 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13073 */
13074@@ -227,8 +228,8 @@ enc: .octa 0x2
13075 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13076 MOVADQ SHUF_MASK(%rip), %xmm14
13077 mov arg7, %r10 # %r10 = AAD
13078- mov arg8, %r12 # %r12 = aadLen
13079- mov %r12, %r11
13080+ mov arg8, %r15 # %r15 = aadLen
13081+ mov %r15, %r11
13082 pxor %xmm\i, %xmm\i
13083
13084 _get_AAD_loop\num_initial_blocks\operation:
13085@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
13086 psrldq $4, %xmm\i
13087 pxor \TMP1, %xmm\i
13088 add $4, %r10
13089- sub $4, %r12
13090+ sub $4, %r15
13091 jne _get_AAD_loop\num_initial_blocks\operation
13092
13093 cmp $16, %r11
13094 je _get_AAD_loop2_done\num_initial_blocks\operation
13095
13096- mov $16, %r12
13097+ mov $16, %r15
13098 _get_AAD_loop2\num_initial_blocks\operation:
13099 psrldq $4, %xmm\i
13100- sub $4, %r12
13101- cmp %r11, %r12
13102+ sub $4, %r15
13103+ cmp %r11, %r15
13104 jne _get_AAD_loop2\num_initial_blocks\operation
13105
13106 _get_AAD_loop2_done\num_initial_blocks\operation:
13107@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13108 * num_initial_blocks = b mod 4
13109 * encrypt the initial num_initial_blocks blocks and apply ghash on
13110 * the ciphertext
13111-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13112+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13113 * are clobbered
13114 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13115 */
13116@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13117 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13118 MOVADQ SHUF_MASK(%rip), %xmm14
13119 mov arg7, %r10 # %r10 = AAD
13120- mov arg8, %r12 # %r12 = aadLen
13121- mov %r12, %r11
13122+ mov arg8, %r15 # %r15 = aadLen
13123+ mov %r15, %r11
13124 pxor %xmm\i, %xmm\i
13125 _get_AAD_loop\num_initial_blocks\operation:
13126 movd (%r10), \TMP1
13127@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13128 psrldq $4, %xmm\i
13129 pxor \TMP1, %xmm\i
13130 add $4, %r10
13131- sub $4, %r12
13132+ sub $4, %r15
13133 jne _get_AAD_loop\num_initial_blocks\operation
13134 cmp $16, %r11
13135 je _get_AAD_loop2_done\num_initial_blocks\operation
13136- mov $16, %r12
13137+ mov $16, %r15
13138 _get_AAD_loop2\num_initial_blocks\operation:
13139 psrldq $4, %xmm\i
13140- sub $4, %r12
13141- cmp %r11, %r12
13142+ sub $4, %r15
13143+ cmp %r11, %r15
13144 jne _get_AAD_loop2\num_initial_blocks\operation
13145 _get_AAD_loop2_done\num_initial_blocks\operation:
13146 PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data
13147@@ -1280,7 +1281,7 @@ _esb_loop_\@:
13148 *
13149 *****************************************************************************/
13150 ENTRY(aesni_gcm_dec)
13151- push %r12
13152+ push %r15
13153 push %r13
13154 push %r14
13155 mov %rsp, %r14
13156@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
13157 */
13158 sub $VARIABLE_OFFSET, %rsp
13159 and $~63, %rsp # align rsp to 64 bytes
13160- mov %arg6, %r12
13161- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13162+ mov %arg6, %r15
13163+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13164 movdqa SHUF_MASK(%rip), %xmm2
13165 PSHUFB_XMM %xmm2, %xmm13
13166
13167@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
13168 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13169 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13170 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13171- mov %r13, %r12
13172- and $(3<<4), %r12
13173+ mov %r13, %r15
13174+ and $(3<<4), %r15
13175 jz _initial_num_blocks_is_0_decrypt
13176- cmp $(2<<4), %r12
13177+ cmp $(2<<4), %r15
13178 jb _initial_num_blocks_is_1_decrypt
13179 je _initial_num_blocks_is_2_decrypt
13180 _initial_num_blocks_is_3_decrypt:
13181@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
13182 sub $16, %r11
13183 add %r13, %r11
13184 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13185- lea SHIFT_MASK+16(%rip), %r12
13186- sub %r13, %r12
13187+ lea SHIFT_MASK+16(%rip), %r15
13188+ sub %r13, %r15
13189 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13190 # (%r13 is the number of bytes in plaintext mod 16)
13191- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13192+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13193 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13194
13195 movdqa %xmm1, %xmm2
13196 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13197- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13198+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13199 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13200 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13201 pand %xmm1, %xmm2
13202@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
13203 sub $1, %r13
13204 jne _less_than_8_bytes_left_decrypt
13205 _multiple_of_16_bytes_decrypt:
13206- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13207- shl $3, %r12 # convert into number of bits
13208- movd %r12d, %xmm15 # len(A) in %xmm15
13209+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13210+ shl $3, %r15 # convert into number of bits
13211+ movd %r15d, %xmm15 # len(A) in %xmm15
13212 shl $3, %arg4 # len(C) in bits (*128)
13213 MOVQ_R64_XMM %arg4, %xmm1
13214 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13215@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
13216 mov %r14, %rsp
13217 pop %r14
13218 pop %r13
13219- pop %r12
13220+ pop %r15
13221+ pax_force_retaddr
13222 ret
13223 ENDPROC(aesni_gcm_dec)
13224
13225@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
13226 * poly = x^128 + x^127 + x^126 + x^121 + 1
13227 ***************************************************************************/
13228 ENTRY(aesni_gcm_enc)
13229- push %r12
13230+ push %r15
13231 push %r13
13232 push %r14
13233 mov %rsp, %r14
13234@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
13235 #
13236 sub $VARIABLE_OFFSET, %rsp
13237 and $~63, %rsp
13238- mov %arg6, %r12
13239- movdqu (%r12), %xmm13
13240+ mov %arg6, %r15
13241+ movdqu (%r15), %xmm13
13242 movdqa SHUF_MASK(%rip), %xmm2
13243 PSHUFB_XMM %xmm2, %xmm13
13244
13245@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
13246 movdqa %xmm13, HashKey(%rsp)
13247 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13248 and $-16, %r13
13249- mov %r13, %r12
13250+ mov %r13, %r15
13251
13252 # Encrypt first few blocks
13253
13254- and $(3<<4), %r12
13255+ and $(3<<4), %r15
13256 jz _initial_num_blocks_is_0_encrypt
13257- cmp $(2<<4), %r12
13258+ cmp $(2<<4), %r15
13259 jb _initial_num_blocks_is_1_encrypt
13260 je _initial_num_blocks_is_2_encrypt
13261 _initial_num_blocks_is_3_encrypt:
13262@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
13263 sub $16, %r11
13264 add %r13, %r11
13265 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13266- lea SHIFT_MASK+16(%rip), %r12
13267- sub %r13, %r12
13268+ lea SHIFT_MASK+16(%rip), %r15
13269+ sub %r13, %r15
13270 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13271 # (%r13 is the number of bytes in plaintext mod 16)
13272- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13273+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13274 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13275 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13276- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13277+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13278 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13279 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13280 movdqa SHUF_MASK(%rip), %xmm10
13281@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
13282 sub $1, %r13
13283 jne _less_than_8_bytes_left_encrypt
13284 _multiple_of_16_bytes_encrypt:
13285- mov arg8, %r12 # %r12 = addLen (number of bytes)
13286- shl $3, %r12
13287- movd %r12d, %xmm15 # len(A) in %xmm15
13288+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13289+ shl $3, %r15
13290+ movd %r15d, %xmm15 # len(A) in %xmm15
13291 shl $3, %arg4 # len(C) in bits (*128)
13292 MOVQ_R64_XMM %arg4, %xmm1
13293 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13294@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
13295 mov %r14, %rsp
13296 pop %r14
13297 pop %r13
13298- pop %r12
13299+ pop %r15
13300+ pax_force_retaddr
13301 ret
13302 ENDPROC(aesni_gcm_enc)
13303
13304@@ -1733,6 +1736,7 @@ _key_expansion_256a:
13305 pxor %xmm1, %xmm0
13306 movaps %xmm0, (TKEYP)
13307 add $0x10, TKEYP
13308+ pax_force_retaddr
13309 ret
13310 ENDPROC(_key_expansion_128)
13311 ENDPROC(_key_expansion_256a)
13312@@ -1759,6 +1763,7 @@ _key_expansion_192a:
13313 shufps $0b01001110, %xmm2, %xmm1
13314 movaps %xmm1, 0x10(TKEYP)
13315 add $0x20, TKEYP
13316+ pax_force_retaddr
13317 ret
13318 ENDPROC(_key_expansion_192a)
13319
13320@@ -1779,6 +1784,7 @@ _key_expansion_192b:
13321
13322 movaps %xmm0, (TKEYP)
13323 add $0x10, TKEYP
13324+ pax_force_retaddr
13325 ret
13326 ENDPROC(_key_expansion_192b)
13327
13328@@ -1792,6 +1798,7 @@ _key_expansion_256b:
13329 pxor %xmm1, %xmm2
13330 movaps %xmm2, (TKEYP)
13331 add $0x10, TKEYP
13332+ pax_force_retaddr
13333 ret
13334 ENDPROC(_key_expansion_256b)
13335
13336@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
13337 #ifndef __x86_64__
13338 popl KEYP
13339 #endif
13340+ pax_force_retaddr
13341 ret
13342 ENDPROC(aesni_set_key)
13343
13344@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
13345 popl KLEN
13346 popl KEYP
13347 #endif
13348+ pax_force_retaddr
13349 ret
13350 ENDPROC(aesni_enc)
13351
13352@@ -1985,6 +1994,7 @@ _aesni_enc1:
13353 AESENC KEY STATE
13354 movaps 0x70(TKEYP), KEY
13355 AESENCLAST KEY STATE
13356+ pax_force_retaddr
13357 ret
13358 ENDPROC(_aesni_enc1)
13359
13360@@ -2094,6 +2104,7 @@ _aesni_enc4:
13361 AESENCLAST KEY STATE2
13362 AESENCLAST KEY STATE3
13363 AESENCLAST KEY STATE4
13364+ pax_force_retaddr
13365 ret
13366 ENDPROC(_aesni_enc4)
13367
13368@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
13369 popl KLEN
13370 popl KEYP
13371 #endif
13372+ pax_force_retaddr
13373 ret
13374 ENDPROC(aesni_dec)
13375
13376@@ -2175,6 +2187,7 @@ _aesni_dec1:
13377 AESDEC KEY STATE
13378 movaps 0x70(TKEYP), KEY
13379 AESDECLAST KEY STATE
13380+ pax_force_retaddr
13381 ret
13382 ENDPROC(_aesni_dec1)
13383
13384@@ -2284,6 +2297,7 @@ _aesni_dec4:
13385 AESDECLAST KEY STATE2
13386 AESDECLAST KEY STATE3
13387 AESDECLAST KEY STATE4
13388+ pax_force_retaddr
13389 ret
13390 ENDPROC(_aesni_dec4)
13391
13392@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
13393 popl KEYP
13394 popl LEN
13395 #endif
13396+ pax_force_retaddr
13397 ret
13398 ENDPROC(aesni_ecb_enc)
13399
13400@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
13401 popl KEYP
13402 popl LEN
13403 #endif
13404+ pax_force_retaddr
13405 ret
13406 ENDPROC(aesni_ecb_dec)
13407
13408@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
13409 popl LEN
13410 popl IVP
13411 #endif
13412+ pax_force_retaddr
13413 ret
13414 ENDPROC(aesni_cbc_enc)
13415
13416@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
13417 popl LEN
13418 popl IVP
13419 #endif
13420+ pax_force_retaddr
13421 ret
13422 ENDPROC(aesni_cbc_dec)
13423
13424@@ -2561,6 +2579,7 @@ _aesni_inc_init:
13425 mov $1, TCTR_LOW
13426 MOVQ_R64_XMM TCTR_LOW INC
13427 MOVQ_R64_XMM CTR TCTR_LOW
13428+ pax_force_retaddr
13429 ret
13430 ENDPROC(_aesni_inc_init)
13431
13432@@ -2590,6 +2609,7 @@ _aesni_inc:
13433 .Linc_low:
13434 movaps CTR, IV
13435 PSHUFB_XMM BSWAP_MASK IV
13436+ pax_force_retaddr
13437 ret
13438 ENDPROC(_aesni_inc)
13439
13440@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
13441 .Lctr_enc_ret:
13442 movups IV, (IVP)
13443 .Lctr_enc_just_ret:
13444+ pax_force_retaddr
13445 ret
13446 ENDPROC(aesni_ctr_enc)
13447
13448@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
13449 pxor INC, STATE4
13450 movdqu STATE4, 0x70(OUTP)
13451
13452+ pax_force_retaddr
13453 ret
13454 ENDPROC(aesni_xts_crypt8)
13455
13456diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13457index 246c670..466e2d6 100644
13458--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13459+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13460@@ -21,6 +21,7 @@
13461 */
13462
13463 #include <linux/linkage.h>
13464+#include <asm/alternative-asm.h>
13465
13466 .file "blowfish-x86_64-asm.S"
13467 .text
13468@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13469 jnz .L__enc_xor;
13470
13471 write_block();
13472+ pax_force_retaddr
13473 ret;
13474 .L__enc_xor:
13475 xor_block();
13476+ pax_force_retaddr
13477 ret;
13478 ENDPROC(__blowfish_enc_blk)
13479
13480@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13481
13482 movq %r11, %rbp;
13483
13484+ pax_force_retaddr
13485 ret;
13486 ENDPROC(blowfish_dec_blk)
13487
13488@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13489
13490 popq %rbx;
13491 popq %rbp;
13492+ pax_force_retaddr
13493 ret;
13494
13495 .L__enc_xor4:
13496@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13497
13498 popq %rbx;
13499 popq %rbp;
13500+ pax_force_retaddr
13501 ret;
13502 ENDPROC(__blowfish_enc_blk_4way)
13503
13504@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13505 popq %rbx;
13506 popq %rbp;
13507
13508+ pax_force_retaddr
13509 ret;
13510 ENDPROC(blowfish_dec_blk_4way)
13511diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13512index ce71f92..1dce7ec 100644
13513--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13514+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13515@@ -16,6 +16,7 @@
13516 */
13517
13518 #include <linux/linkage.h>
13519+#include <asm/alternative-asm.h>
13520
13521 #define CAMELLIA_TABLE_BYTE_LEN 272
13522
13523@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13524 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13525 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13526 %rcx, (%r9));
13527+ pax_force_retaddr
13528 ret;
13529 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13530
13531@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13532 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13533 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13534 %rax, (%r9));
13535+ pax_force_retaddr
13536 ret;
13537 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13538
13539@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13540 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13541 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13542
13543+ pax_force_retaddr
13544 ret;
13545
13546 .align 8
13547@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13548 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13549 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13550
13551+ pax_force_retaddr
13552 ret;
13553
13554 .align 8
13555@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13556 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13557 %xmm8, %rsi);
13558
13559+ pax_force_retaddr
13560 ret;
13561 ENDPROC(camellia_ecb_enc_16way)
13562
13563@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13564 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13565 %xmm8, %rsi);
13566
13567+ pax_force_retaddr
13568 ret;
13569 ENDPROC(camellia_ecb_dec_16way)
13570
13571@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13572 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13573 %xmm8, %rsi);
13574
13575+ pax_force_retaddr
13576 ret;
13577 ENDPROC(camellia_cbc_dec_16way)
13578
13579@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13580 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13581 %xmm8, %rsi);
13582
13583+ pax_force_retaddr
13584 ret;
13585 ENDPROC(camellia_ctr_16way)
13586
13587@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13588 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13589 %xmm8, %rsi);
13590
13591+ pax_force_retaddr
13592 ret;
13593 ENDPROC(camellia_xts_crypt_16way)
13594
13595diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13596index 0e0b886..5a3123c 100644
13597--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13598+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13599@@ -11,6 +11,7 @@
13600 */
13601
13602 #include <linux/linkage.h>
13603+#include <asm/alternative-asm.h>
13604
13605 #define CAMELLIA_TABLE_BYTE_LEN 272
13606
13607@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13608 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13609 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13610 %rcx, (%r9));
13611+ pax_force_retaddr
13612 ret;
13613 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13614
13615@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13616 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13617 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13618 %rax, (%r9));
13619+ pax_force_retaddr
13620 ret;
13621 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13622
13623@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13624 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13625 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13626
13627+ pax_force_retaddr
13628 ret;
13629
13630 .align 8
13631@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13632 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13633 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13634
13635+ pax_force_retaddr
13636 ret;
13637
13638 .align 8
13639@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13640
13641 vzeroupper;
13642
13643+ pax_force_retaddr
13644 ret;
13645 ENDPROC(camellia_ecb_enc_32way)
13646
13647@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13648
13649 vzeroupper;
13650
13651+ pax_force_retaddr
13652 ret;
13653 ENDPROC(camellia_ecb_dec_32way)
13654
13655@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13656
13657 vzeroupper;
13658
13659+ pax_force_retaddr
13660 ret;
13661 ENDPROC(camellia_cbc_dec_32way)
13662
13663@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13664
13665 vzeroupper;
13666
13667+ pax_force_retaddr
13668 ret;
13669 ENDPROC(camellia_ctr_32way)
13670
13671@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13672
13673 vzeroupper;
13674
13675+ pax_force_retaddr
13676 ret;
13677 ENDPROC(camellia_xts_crypt_32way)
13678
13679diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13680index 310319c..db3d7b5 100644
13681--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13682+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13683@@ -21,6 +21,7 @@
13684 */
13685
13686 #include <linux/linkage.h>
13687+#include <asm/alternative-asm.h>
13688
13689 .file "camellia-x86_64-asm_64.S"
13690 .text
13691@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13692 enc_outunpack(mov, RT1);
13693
13694 movq RRBP, %rbp;
13695+ pax_force_retaddr
13696 ret;
13697
13698 .L__enc_xor:
13699 enc_outunpack(xor, RT1);
13700
13701 movq RRBP, %rbp;
13702+ pax_force_retaddr
13703 ret;
13704 ENDPROC(__camellia_enc_blk)
13705
13706@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13707 dec_outunpack();
13708
13709 movq RRBP, %rbp;
13710+ pax_force_retaddr
13711 ret;
13712 ENDPROC(camellia_dec_blk)
13713
13714@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13715
13716 movq RRBP, %rbp;
13717 popq %rbx;
13718+ pax_force_retaddr
13719 ret;
13720
13721 .L__enc2_xor:
13722@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13723
13724 movq RRBP, %rbp;
13725 popq %rbx;
13726+ pax_force_retaddr
13727 ret;
13728 ENDPROC(__camellia_enc_blk_2way)
13729
13730@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13731
13732 movq RRBP, %rbp;
13733 movq RXOR, %rbx;
13734+ pax_force_retaddr
13735 ret;
13736 ENDPROC(camellia_dec_blk_2way)
13737diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13738index c35fd5d..2d8c7db 100644
13739--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13740+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13741@@ -24,6 +24,7 @@
13742 */
13743
13744 #include <linux/linkage.h>
13745+#include <asm/alternative-asm.h>
13746
13747 .file "cast5-avx-x86_64-asm_64.S"
13748
13749@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13750 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13751 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13752
13753+ pax_force_retaddr
13754 ret;
13755 ENDPROC(__cast5_enc_blk16)
13756
13757@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13758 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13759 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13760
13761+ pax_force_retaddr
13762 ret;
13763
13764 .L__skip_dec:
13765@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13766 vmovdqu RR4, (6*4*4)(%r11);
13767 vmovdqu RL4, (7*4*4)(%r11);
13768
13769+ pax_force_retaddr
13770 ret;
13771 ENDPROC(cast5_ecb_enc_16way)
13772
13773@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13774 vmovdqu RR4, (6*4*4)(%r11);
13775 vmovdqu RL4, (7*4*4)(%r11);
13776
13777+ pax_force_retaddr
13778 ret;
13779 ENDPROC(cast5_ecb_dec_16way)
13780
13781@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13782 * %rdx: src
13783 */
13784
13785- pushq %r12;
13786+ pushq %r14;
13787
13788 movq %rsi, %r11;
13789- movq %rdx, %r12;
13790+ movq %rdx, %r14;
13791
13792 vmovdqu (0*16)(%rdx), RL1;
13793 vmovdqu (1*16)(%rdx), RR1;
13794@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13795 call __cast5_dec_blk16;
13796
13797 /* xor with src */
13798- vmovq (%r12), RX;
13799+ vmovq (%r14), RX;
13800 vpshufd $0x4f, RX, RX;
13801 vpxor RX, RR1, RR1;
13802- vpxor 0*16+8(%r12), RL1, RL1;
13803- vpxor 1*16+8(%r12), RR2, RR2;
13804- vpxor 2*16+8(%r12), RL2, RL2;
13805- vpxor 3*16+8(%r12), RR3, RR3;
13806- vpxor 4*16+8(%r12), RL3, RL3;
13807- vpxor 5*16+8(%r12), RR4, RR4;
13808- vpxor 6*16+8(%r12), RL4, RL4;
13809+ vpxor 0*16+8(%r14), RL1, RL1;
13810+ vpxor 1*16+8(%r14), RR2, RR2;
13811+ vpxor 2*16+8(%r14), RL2, RL2;
13812+ vpxor 3*16+8(%r14), RR3, RR3;
13813+ vpxor 4*16+8(%r14), RL3, RL3;
13814+ vpxor 5*16+8(%r14), RR4, RR4;
13815+ vpxor 6*16+8(%r14), RL4, RL4;
13816
13817 vmovdqu RR1, (0*16)(%r11);
13818 vmovdqu RL1, (1*16)(%r11);
13819@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13820 vmovdqu RR4, (6*16)(%r11);
13821 vmovdqu RL4, (7*16)(%r11);
13822
13823- popq %r12;
13824+ popq %r14;
13825
13826+ pax_force_retaddr
13827 ret;
13828 ENDPROC(cast5_cbc_dec_16way)
13829
13830@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13831 * %rcx: iv (big endian, 64bit)
13832 */
13833
13834- pushq %r12;
13835+ pushq %r14;
13836
13837 movq %rsi, %r11;
13838- movq %rdx, %r12;
13839+ movq %rdx, %r14;
13840
13841 vpcmpeqd RTMP, RTMP, RTMP;
13842 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13843@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13844 call __cast5_enc_blk16;
13845
13846 /* dst = src ^ iv */
13847- vpxor (0*16)(%r12), RR1, RR1;
13848- vpxor (1*16)(%r12), RL1, RL1;
13849- vpxor (2*16)(%r12), RR2, RR2;
13850- vpxor (3*16)(%r12), RL2, RL2;
13851- vpxor (4*16)(%r12), RR3, RR3;
13852- vpxor (5*16)(%r12), RL3, RL3;
13853- vpxor (6*16)(%r12), RR4, RR4;
13854- vpxor (7*16)(%r12), RL4, RL4;
13855+ vpxor (0*16)(%r14), RR1, RR1;
13856+ vpxor (1*16)(%r14), RL1, RL1;
13857+ vpxor (2*16)(%r14), RR2, RR2;
13858+ vpxor (3*16)(%r14), RL2, RL2;
13859+ vpxor (4*16)(%r14), RR3, RR3;
13860+ vpxor (5*16)(%r14), RL3, RL3;
13861+ vpxor (6*16)(%r14), RR4, RR4;
13862+ vpxor (7*16)(%r14), RL4, RL4;
13863 vmovdqu RR1, (0*16)(%r11);
13864 vmovdqu RL1, (1*16)(%r11);
13865 vmovdqu RR2, (2*16)(%r11);
13866@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13867 vmovdqu RR4, (6*16)(%r11);
13868 vmovdqu RL4, (7*16)(%r11);
13869
13870- popq %r12;
13871+ popq %r14;
13872
13873+ pax_force_retaddr
13874 ret;
13875 ENDPROC(cast5_ctr_16way)
13876diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13877index e3531f8..e123f35 100644
13878--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13879+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13880@@ -24,6 +24,7 @@
13881 */
13882
13883 #include <linux/linkage.h>
13884+#include <asm/alternative-asm.h>
13885 #include "glue_helper-asm-avx.S"
13886
13887 .file "cast6-avx-x86_64-asm_64.S"
13888@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13889 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13890 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13891
13892+ pax_force_retaddr
13893 ret;
13894 ENDPROC(__cast6_enc_blk8)
13895
13896@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13897 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13898 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13899
13900+ pax_force_retaddr
13901 ret;
13902 ENDPROC(__cast6_dec_blk8)
13903
13904@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13905
13906 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13907
13908+ pax_force_retaddr
13909 ret;
13910 ENDPROC(cast6_ecb_enc_8way)
13911
13912@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13913
13914 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13915
13916+ pax_force_retaddr
13917 ret;
13918 ENDPROC(cast6_ecb_dec_8way)
13919
13920@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13921 * %rdx: src
13922 */
13923
13924- pushq %r12;
13925+ pushq %r14;
13926
13927 movq %rsi, %r11;
13928- movq %rdx, %r12;
13929+ movq %rdx, %r14;
13930
13931 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13932
13933 call __cast6_dec_blk8;
13934
13935- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13936+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13937
13938- popq %r12;
13939+ popq %r14;
13940
13941+ pax_force_retaddr
13942 ret;
13943 ENDPROC(cast6_cbc_dec_8way)
13944
13945@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13946 * %rcx: iv (little endian, 128bit)
13947 */
13948
13949- pushq %r12;
13950+ pushq %r14;
13951
13952 movq %rsi, %r11;
13953- movq %rdx, %r12;
13954+ movq %rdx, %r14;
13955
13956 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13957 RD2, RX, RKR, RKM);
13958
13959 call __cast6_enc_blk8;
13960
13961- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13962+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13963
13964- popq %r12;
13965+ popq %r14;
13966
13967+ pax_force_retaddr
13968 ret;
13969 ENDPROC(cast6_ctr_8way)
13970
13971@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13972 /* dst <= regs xor IVs(in dst) */
13973 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13974
13975+ pax_force_retaddr
13976 ret;
13977 ENDPROC(cast6_xts_enc_8way)
13978
13979@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13980 /* dst <= regs xor IVs(in dst) */
13981 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13982
13983+ pax_force_retaddr
13984 ret;
13985 ENDPROC(cast6_xts_dec_8way)
13986diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13987index 26d49eb..8bf39c8 100644
13988--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13989+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13990@@ -45,6 +45,7 @@
13991
13992 #include <asm/inst.h>
13993 #include <linux/linkage.h>
13994+#include <asm/alternative-asm.h>
13995
13996 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13997
13998@@ -309,6 +310,7 @@ do_return:
13999 popq %rsi
14000 popq %rdi
14001 popq %rbx
14002+ pax_force_retaddr
14003 ret
14004
14005 ################################################################
14006@@ -330,7 +332,7 @@ ENDPROC(crc_pcl)
14007 ## PCLMULQDQ tables
14008 ## Table is 128 entries x 2 words (8 bytes) each
14009 ################################################################
14010-.section .rotata, "a", %progbits
14011+.section .rodata, "a", %progbits
14012 .align 8
14013 K_table:
14014 .long 0x493c7d27, 0x00000001
14015diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14016index 5d1e007..098cb4f 100644
14017--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14018+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14019@@ -18,6 +18,7 @@
14020
14021 #include <linux/linkage.h>
14022 #include <asm/inst.h>
14023+#include <asm/alternative-asm.h>
14024
14025 .data
14026
14027@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14028 psrlq $1, T2
14029 pxor T2, T1
14030 pxor T1, DATA
14031+ pax_force_retaddr
14032 ret
14033 ENDPROC(__clmul_gf128mul_ble)
14034
14035@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14036 call __clmul_gf128mul_ble
14037 PSHUFB_XMM BSWAP DATA
14038 movups DATA, (%rdi)
14039+ pax_force_retaddr
14040 ret
14041 ENDPROC(clmul_ghash_mul)
14042
14043@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14044 PSHUFB_XMM BSWAP DATA
14045 movups DATA, (%rdi)
14046 .Lupdate_just_ret:
14047+ pax_force_retaddr
14048 ret
14049 ENDPROC(clmul_ghash_update)
14050diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14051index 9279e0b..c4b3d2c 100644
14052--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14053+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14054@@ -1,4 +1,5 @@
14055 #include <linux/linkage.h>
14056+#include <asm/alternative-asm.h>
14057
14058 # enter salsa20_encrypt_bytes
14059 ENTRY(salsa20_encrypt_bytes)
14060@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14061 add %r11,%rsp
14062 mov %rdi,%rax
14063 mov %rsi,%rdx
14064+ pax_force_retaddr
14065 ret
14066 # bytesatleast65:
14067 ._bytesatleast65:
14068@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14069 add %r11,%rsp
14070 mov %rdi,%rax
14071 mov %rsi,%rdx
14072+ pax_force_retaddr
14073 ret
14074 ENDPROC(salsa20_keysetup)
14075
14076@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14077 add %r11,%rsp
14078 mov %rdi,%rax
14079 mov %rsi,%rdx
14080+ pax_force_retaddr
14081 ret
14082 ENDPROC(salsa20_ivsetup)
14083diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14084index 2f202f4..d9164d6 100644
14085--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14086+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14087@@ -24,6 +24,7 @@
14088 */
14089
14090 #include <linux/linkage.h>
14091+#include <asm/alternative-asm.h>
14092 #include "glue_helper-asm-avx.S"
14093
14094 .file "serpent-avx-x86_64-asm_64.S"
14095@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14096 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14097 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14098
14099+ pax_force_retaddr
14100 ret;
14101 ENDPROC(__serpent_enc_blk8_avx)
14102
14103@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14104 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14105 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14106
14107+ pax_force_retaddr
14108 ret;
14109 ENDPROC(__serpent_dec_blk8_avx)
14110
14111@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14112
14113 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14114
14115+ pax_force_retaddr
14116 ret;
14117 ENDPROC(serpent_ecb_enc_8way_avx)
14118
14119@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14120
14121 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14122
14123+ pax_force_retaddr
14124 ret;
14125 ENDPROC(serpent_ecb_dec_8way_avx)
14126
14127@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14128
14129 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14130
14131+ pax_force_retaddr
14132 ret;
14133 ENDPROC(serpent_cbc_dec_8way_avx)
14134
14135@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14136
14137 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14138
14139+ pax_force_retaddr
14140 ret;
14141 ENDPROC(serpent_ctr_8way_avx)
14142
14143@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14144 /* dst <= regs xor IVs(in dst) */
14145 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14146
14147+ pax_force_retaddr
14148 ret;
14149 ENDPROC(serpent_xts_enc_8way_avx)
14150
14151@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14152 /* dst <= regs xor IVs(in dst) */
14153 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14154
14155+ pax_force_retaddr
14156 ret;
14157 ENDPROC(serpent_xts_dec_8way_avx)
14158diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14159index b222085..abd483c 100644
14160--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14161+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14162@@ -15,6 +15,7 @@
14163 */
14164
14165 #include <linux/linkage.h>
14166+#include <asm/alternative-asm.h>
14167 #include "glue_helper-asm-avx2.S"
14168
14169 .file "serpent-avx2-asm_64.S"
14170@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14171 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14172 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14173
14174+ pax_force_retaddr
14175 ret;
14176 ENDPROC(__serpent_enc_blk16)
14177
14178@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14179 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14180 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14181
14182+ pax_force_retaddr
14183 ret;
14184 ENDPROC(__serpent_dec_blk16)
14185
14186@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14187
14188 vzeroupper;
14189
14190+ pax_force_retaddr
14191 ret;
14192 ENDPROC(serpent_ecb_enc_16way)
14193
14194@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14195
14196 vzeroupper;
14197
14198+ pax_force_retaddr
14199 ret;
14200 ENDPROC(serpent_ecb_dec_16way)
14201
14202@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14203
14204 vzeroupper;
14205
14206+ pax_force_retaddr
14207 ret;
14208 ENDPROC(serpent_cbc_dec_16way)
14209
14210@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14211
14212 vzeroupper;
14213
14214+ pax_force_retaddr
14215 ret;
14216 ENDPROC(serpent_ctr_16way)
14217
14218@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14219
14220 vzeroupper;
14221
14222+ pax_force_retaddr
14223 ret;
14224 ENDPROC(serpent_xts_enc_16way)
14225
14226@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14227
14228 vzeroupper;
14229
14230+ pax_force_retaddr
14231 ret;
14232 ENDPROC(serpent_xts_dec_16way)
14233diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14234index acc066c..1559cc4 100644
14235--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14236+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14237@@ -25,6 +25,7 @@
14238 */
14239
14240 #include <linux/linkage.h>
14241+#include <asm/alternative-asm.h>
14242
14243 .file "serpent-sse2-x86_64-asm_64.S"
14244 .text
14245@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14246 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14247 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14248
14249+ pax_force_retaddr
14250 ret;
14251
14252 .L__enc_xor8:
14253 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14254 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14255
14256+ pax_force_retaddr
14257 ret;
14258 ENDPROC(__serpent_enc_blk_8way)
14259
14260@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14261 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14262 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14263
14264+ pax_force_retaddr
14265 ret;
14266 ENDPROC(serpent_dec_blk_8way)
14267diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14268index a410950..9dfe7ad 100644
14269--- a/arch/x86/crypto/sha1_ssse3_asm.S
14270+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14271@@ -29,6 +29,7 @@
14272 */
14273
14274 #include <linux/linkage.h>
14275+#include <asm/alternative-asm.h>
14276
14277 #define CTX %rdi // arg1
14278 #define BUF %rsi // arg2
14279@@ -75,9 +76,9 @@
14280
14281 push %rbx
14282 push %rbp
14283- push %r12
14284+ push %r14
14285
14286- mov %rsp, %r12
14287+ mov %rsp, %r14
14288 sub $64, %rsp # allocate workspace
14289 and $~15, %rsp # align stack
14290
14291@@ -99,11 +100,12 @@
14292 xor %rax, %rax
14293 rep stosq
14294
14295- mov %r12, %rsp # deallocate workspace
14296+ mov %r14, %rsp # deallocate workspace
14297
14298- pop %r12
14299+ pop %r14
14300 pop %rbp
14301 pop %rbx
14302+ pax_force_retaddr
14303 ret
14304
14305 ENDPROC(\name)
14306diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14307index 642f156..51a513c 100644
14308--- a/arch/x86/crypto/sha256-avx-asm.S
14309+++ b/arch/x86/crypto/sha256-avx-asm.S
14310@@ -49,6 +49,7 @@
14311
14312 #ifdef CONFIG_AS_AVX
14313 #include <linux/linkage.h>
14314+#include <asm/alternative-asm.h>
14315
14316 ## assume buffers not aligned
14317 #define VMOVDQ vmovdqu
14318@@ -460,6 +461,7 @@ done_hash:
14319 popq %r13
14320 popq %rbp
14321 popq %rbx
14322+ pax_force_retaddr
14323 ret
14324 ENDPROC(sha256_transform_avx)
14325
14326diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14327index 9e86944..3795e6a 100644
14328--- a/arch/x86/crypto/sha256-avx2-asm.S
14329+++ b/arch/x86/crypto/sha256-avx2-asm.S
14330@@ -50,6 +50,7 @@
14331
14332 #ifdef CONFIG_AS_AVX2
14333 #include <linux/linkage.h>
14334+#include <asm/alternative-asm.h>
14335
14336 ## assume buffers not aligned
14337 #define VMOVDQ vmovdqu
14338@@ -720,6 +721,7 @@ done_hash:
14339 popq %r12
14340 popq %rbp
14341 popq %rbx
14342+ pax_force_retaddr
14343 ret
14344 ENDPROC(sha256_transform_rorx)
14345
14346diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14347index f833b74..8c62a9e 100644
14348--- a/arch/x86/crypto/sha256-ssse3-asm.S
14349+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14350@@ -47,6 +47,7 @@
14351 ########################################################################
14352
14353 #include <linux/linkage.h>
14354+#include <asm/alternative-asm.h>
14355
14356 ## assume buffers not aligned
14357 #define MOVDQ movdqu
14358@@ -471,6 +472,7 @@ done_hash:
14359 popq %rbp
14360 popq %rbx
14361
14362+ pax_force_retaddr
14363 ret
14364 ENDPROC(sha256_transform_ssse3)
14365
14366diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14367index 974dde9..a823ff9 100644
14368--- a/arch/x86/crypto/sha512-avx-asm.S
14369+++ b/arch/x86/crypto/sha512-avx-asm.S
14370@@ -49,6 +49,7 @@
14371
14372 #ifdef CONFIG_AS_AVX
14373 #include <linux/linkage.h>
14374+#include <asm/alternative-asm.h>
14375
14376 .text
14377
14378@@ -364,6 +365,7 @@ updateblock:
14379 mov frame_RSPSAVE(%rsp), %rsp
14380
14381 nowork:
14382+ pax_force_retaddr
14383 ret
14384 ENDPROC(sha512_transform_avx)
14385
14386diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14387index 568b961..ed20c37 100644
14388--- a/arch/x86/crypto/sha512-avx2-asm.S
14389+++ b/arch/x86/crypto/sha512-avx2-asm.S
14390@@ -51,6 +51,7 @@
14391
14392 #ifdef CONFIG_AS_AVX2
14393 #include <linux/linkage.h>
14394+#include <asm/alternative-asm.h>
14395
14396 .text
14397
14398@@ -678,6 +679,7 @@ done_hash:
14399
14400 # Restore Stack Pointer
14401 mov frame_RSPSAVE(%rsp), %rsp
14402+ pax_force_retaddr
14403 ret
14404 ENDPROC(sha512_transform_rorx)
14405
14406diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14407index fb56855..6edd768 100644
14408--- a/arch/x86/crypto/sha512-ssse3-asm.S
14409+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14410@@ -48,6 +48,7 @@
14411 ########################################################################
14412
14413 #include <linux/linkage.h>
14414+#include <asm/alternative-asm.h>
14415
14416 .text
14417
14418@@ -363,6 +364,7 @@ updateblock:
14419 mov frame_RSPSAVE(%rsp), %rsp
14420
14421 nowork:
14422+ pax_force_retaddr
14423 ret
14424 ENDPROC(sha512_transform_ssse3)
14425
14426diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14427index 0505813..b067311 100644
14428--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14429+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14430@@ -24,6 +24,7 @@
14431 */
14432
14433 #include <linux/linkage.h>
14434+#include <asm/alternative-asm.h>
14435 #include "glue_helper-asm-avx.S"
14436
14437 .file "twofish-avx-x86_64-asm_64.S"
14438@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14439 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14440 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14441
14442+ pax_force_retaddr
14443 ret;
14444 ENDPROC(__twofish_enc_blk8)
14445
14446@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14447 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14448 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14449
14450+ pax_force_retaddr
14451 ret;
14452 ENDPROC(__twofish_dec_blk8)
14453
14454@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14455
14456 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14457
14458+ pax_force_retaddr
14459 ret;
14460 ENDPROC(twofish_ecb_enc_8way)
14461
14462@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14463
14464 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14465
14466+ pax_force_retaddr
14467 ret;
14468 ENDPROC(twofish_ecb_dec_8way)
14469
14470@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14471 * %rdx: src
14472 */
14473
14474- pushq %r12;
14475+ pushq %r14;
14476
14477 movq %rsi, %r11;
14478- movq %rdx, %r12;
14479+ movq %rdx, %r14;
14480
14481 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14482
14483 call __twofish_dec_blk8;
14484
14485- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14486+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14487
14488- popq %r12;
14489+ popq %r14;
14490
14491+ pax_force_retaddr
14492 ret;
14493 ENDPROC(twofish_cbc_dec_8way)
14494
14495@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14496 * %rcx: iv (little endian, 128bit)
14497 */
14498
14499- pushq %r12;
14500+ pushq %r14;
14501
14502 movq %rsi, %r11;
14503- movq %rdx, %r12;
14504+ movq %rdx, %r14;
14505
14506 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14507 RD2, RX0, RX1, RY0);
14508
14509 call __twofish_enc_blk8;
14510
14511- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14512+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14513
14514- popq %r12;
14515+ popq %r14;
14516
14517+ pax_force_retaddr
14518 ret;
14519 ENDPROC(twofish_ctr_8way)
14520
14521@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14522 /* dst <= regs xor IVs(in dst) */
14523 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14524
14525+ pax_force_retaddr
14526 ret;
14527 ENDPROC(twofish_xts_enc_8way)
14528
14529@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14530 /* dst <= regs xor IVs(in dst) */
14531 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14532
14533+ pax_force_retaddr
14534 ret;
14535 ENDPROC(twofish_xts_dec_8way)
14536diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14537index 1c3b7ce..02f578d 100644
14538--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14539+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14540@@ -21,6 +21,7 @@
14541 */
14542
14543 #include <linux/linkage.h>
14544+#include <asm/alternative-asm.h>
14545
14546 .file "twofish-x86_64-asm-3way.S"
14547 .text
14548@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14549 popq %r13;
14550 popq %r14;
14551 popq %r15;
14552+ pax_force_retaddr
14553 ret;
14554
14555 .L__enc_xor3:
14556@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14557 popq %r13;
14558 popq %r14;
14559 popq %r15;
14560+ pax_force_retaddr
14561 ret;
14562 ENDPROC(__twofish_enc_blk_3way)
14563
14564@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14565 popq %r13;
14566 popq %r14;
14567 popq %r15;
14568+ pax_force_retaddr
14569 ret;
14570 ENDPROC(twofish_dec_blk_3way)
14571diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14572index a039d21..524b8b2 100644
14573--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14574+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14575@@ -22,6 +22,7 @@
14576
14577 #include <linux/linkage.h>
14578 #include <asm/asm-offsets.h>
14579+#include <asm/alternative-asm.h>
14580
14581 #define a_offset 0
14582 #define b_offset 4
14583@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14584
14585 popq R1
14586 movq $1,%rax
14587+ pax_force_retaddr
14588 ret
14589 ENDPROC(twofish_enc_blk)
14590
14591@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14592
14593 popq R1
14594 movq $1,%rax
14595+ pax_force_retaddr
14596 ret
14597 ENDPROC(twofish_dec_blk)
14598diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14599index ae6aad1..719d6d9 100644
14600--- a/arch/x86/ia32/ia32_aout.c
14601+++ b/arch/x86/ia32/ia32_aout.c
14602@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14603 unsigned long dump_start, dump_size;
14604 struct user32 dump;
14605
14606+ memset(&dump, 0, sizeof(dump));
14607+
14608 fs = get_fs();
14609 set_fs(KERNEL_DS);
14610 has_dumped = 1;
14611diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14612index d0165c9..0d5639b 100644
14613--- a/arch/x86/ia32/ia32_signal.c
14614+++ b/arch/x86/ia32/ia32_signal.c
14615@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14616 if (__get_user(set.sig[0], &frame->sc.oldmask)
14617 || (_COMPAT_NSIG_WORDS > 1
14618 && __copy_from_user((((char *) &set.sig) + 4),
14619- &frame->extramask,
14620+ frame->extramask,
14621 sizeof(frame->extramask))))
14622 goto badframe;
14623
14624@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14625 sp -= frame_size;
14626 /* Align the stack pointer according to the i386 ABI,
14627 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14628- sp = ((sp + 4) & -16ul) - 4;
14629+ sp = ((sp - 12) & -16ul) - 4;
14630 return (void __user *) sp;
14631 }
14632
14633@@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14634 } else {
14635 /* Return stub is in 32bit vsyscall page */
14636 if (current->mm->context.vdso)
14637- restorer = current->mm->context.vdso +
14638- selected_vdso32->sym___kernel_sigreturn;
14639+ restorer = (void __force_user *)(current->mm->context.vdso +
14640+ selected_vdso32->sym___kernel_sigreturn);
14641 else
14642- restorer = &frame->retcode;
14643+ restorer = frame->retcode;
14644 }
14645
14646 put_user_try {
14647@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14648 * These are actually not used anymore, but left because some
14649 * gdb versions depend on them as a marker.
14650 */
14651- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14652+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14653 } put_user_catch(err);
14654
14655 if (err)
14656@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14657 0xb8,
14658 __NR_ia32_rt_sigreturn,
14659 0x80cd,
14660- 0,
14661+ 0
14662 };
14663
14664 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14665@@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14666
14667 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14668 restorer = ksig->ka.sa.sa_restorer;
14669+ else if (current->mm->context.vdso)
14670+ /* Return stub is in 32bit vsyscall page */
14671+ restorer = (void __force_user *)(current->mm->context.vdso +
14672+ selected_vdso32->sym___kernel_rt_sigreturn);
14673 else
14674- restorer = current->mm->context.vdso +
14675- selected_vdso32->sym___kernel_rt_sigreturn;
14676+ restorer = frame->retcode;
14677 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14678
14679 /*
14680 * Not actually used anymore, but left because some gdb
14681 * versions need it.
14682 */
14683- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14684+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14685 } put_user_catch(err);
14686
14687 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14688diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14689index 156ebca..9591cf0 100644
14690--- a/arch/x86/ia32/ia32entry.S
14691+++ b/arch/x86/ia32/ia32entry.S
14692@@ -15,8 +15,10 @@
14693 #include <asm/irqflags.h>
14694 #include <asm/asm.h>
14695 #include <asm/smap.h>
14696+#include <asm/pgtable.h>
14697 #include <linux/linkage.h>
14698 #include <linux/err.h>
14699+#include <asm/alternative-asm.h>
14700
14701 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14702 #include <linux/elf-em.h>
14703@@ -62,12 +64,12 @@
14704 */
14705 .macro LOAD_ARGS32 offset, _r9=0
14706 .if \_r9
14707- movl \offset+16(%rsp),%r9d
14708+ movl \offset+R9(%rsp),%r9d
14709 .endif
14710- movl \offset+40(%rsp),%ecx
14711- movl \offset+48(%rsp),%edx
14712- movl \offset+56(%rsp),%esi
14713- movl \offset+64(%rsp),%edi
14714+ movl \offset+RCX(%rsp),%ecx
14715+ movl \offset+RDX(%rsp),%edx
14716+ movl \offset+RSI(%rsp),%esi
14717+ movl \offset+RDI(%rsp),%edi
14718 movl %eax,%eax /* zero extension */
14719 .endm
14720
14721@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14722 ENDPROC(native_irq_enable_sysexit)
14723 #endif
14724
14725+ .macro pax_enter_kernel_user
14726+ pax_set_fptr_mask
14727+#ifdef CONFIG_PAX_MEMORY_UDEREF
14728+ call pax_enter_kernel_user
14729+#endif
14730+ .endm
14731+
14732+ .macro pax_exit_kernel_user
14733+#ifdef CONFIG_PAX_MEMORY_UDEREF
14734+ call pax_exit_kernel_user
14735+#endif
14736+#ifdef CONFIG_PAX_RANDKSTACK
14737+ pushq %rax
14738+ pushq %r11
14739+ call pax_randomize_kstack
14740+ popq %r11
14741+ popq %rax
14742+#endif
14743+ .endm
14744+
14745+ .macro pax_erase_kstack
14746+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14747+ call pax_erase_kstack
14748+#endif
14749+ .endm
14750+
14751 /*
14752 * 32bit SYSENTER instruction entry.
14753 *
14754@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14755 CFI_REGISTER rsp,rbp
14756 SWAPGS_UNSAFE_STACK
14757 movq PER_CPU_VAR(kernel_stack), %rsp
14758- addq $(KERNEL_STACK_OFFSET),%rsp
14759- /*
14760- * No need to follow this irqs on/off section: the syscall
14761- * disabled irqs, here we enable it straight after entry:
14762- */
14763- ENABLE_INTERRUPTS(CLBR_NONE)
14764 movl %ebp,%ebp /* zero extension */
14765 pushq_cfi $__USER32_DS
14766 /*CFI_REL_OFFSET ss,0*/
14767@@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14768 CFI_REL_OFFSET rsp,0
14769 pushfq_cfi
14770 /*CFI_REL_OFFSET rflags,0*/
14771- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14772- CFI_REGISTER rip,r10
14773+ orl $X86_EFLAGS_IF,(%rsp)
14774+ GET_THREAD_INFO(%r11)
14775+ movl TI_sysenter_return(%r11), %r11d
14776+ CFI_REGISTER rip,r11
14777 pushq_cfi $__USER32_CS
14778 /*CFI_REL_OFFSET cs,0*/
14779 movl %eax, %eax
14780- pushq_cfi %r10
14781+ pushq_cfi %r11
14782 CFI_REL_OFFSET rip,0
14783 pushq_cfi %rax
14784 cld
14785 SAVE_ARGS 0,1,0
14786+ pax_enter_kernel_user
14787+
14788+#ifdef CONFIG_PAX_RANDKSTACK
14789+ pax_erase_kstack
14790+#endif
14791+
14792+ /*
14793+ * No need to follow this irqs on/off section: the syscall
14794+ * disabled irqs, here we enable it straight after entry:
14795+ */
14796+ ENABLE_INTERRUPTS(CLBR_NONE)
14797 /* no need to do an access_ok check here because rbp has been
14798 32bit zero extended */
14799+
14800+#ifdef CONFIG_PAX_MEMORY_UDEREF
14801+ addq pax_user_shadow_base,%rbp
14802+ ASM_PAX_OPEN_USERLAND
14803+#endif
14804+
14805 ASM_STAC
14806 1: movl (%rbp),%ebp
14807 _ASM_EXTABLE(1b,ia32_badarg)
14808 ASM_CLAC
14809
14810+#ifdef CONFIG_PAX_MEMORY_UDEREF
14811+ ASM_PAX_CLOSE_USERLAND
14812+#endif
14813+
14814 /*
14815 * Sysenter doesn't filter flags, so we need to clear NT
14816 * ourselves. To save a few cycles, we can check whether
14817@@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14818 jnz sysenter_fix_flags
14819 sysenter_flags_fixed:
14820
14821- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14822- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14823+ GET_THREAD_INFO(%r11)
14824+ orl $TS_COMPAT,TI_status(%r11)
14825+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14826 CFI_REMEMBER_STATE
14827 jnz sysenter_tracesys
14828 cmpq $(IA32_NR_syscalls-1),%rax
14829@@ -172,14 +218,17 @@ sysenter_do_call:
14830 sysenter_dispatch:
14831 call *ia32_sys_call_table(,%rax,8)
14832 movq %rax,RAX-ARGOFFSET(%rsp)
14833+ GET_THREAD_INFO(%r11)
14834 DISABLE_INTERRUPTS(CLBR_NONE)
14835 TRACE_IRQS_OFF
14836- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14837+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14838 jnz sysexit_audit
14839 sysexit_from_sys_call:
14840- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14841+ pax_exit_kernel_user
14842+ pax_erase_kstack
14843+ andl $~TS_COMPAT,TI_status(%r11)
14844 /* clear IF, that popfq doesn't enable interrupts early */
14845- andl $~0x200,EFLAGS-ARGOFFSET(%rsp)
14846+ andl $~X86_EFLAGS_IF,EFLAGS-ARGOFFSET(%rsp)
14847 movl RIP-ARGOFFSET(%rsp),%edx /* User %eip */
14848 CFI_REGISTER rip,rdx
14849 RESTORE_ARGS 0,24,0,0,0,0
14850@@ -205,6 +254,9 @@ sysexit_from_sys_call:
14851 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14852 movl %eax,%edi /* 1st arg: syscall number */
14853 call __audit_syscall_entry
14854+
14855+ pax_erase_kstack
14856+
14857 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14858 cmpq $(IA32_NR_syscalls-1),%rax
14859 ja ia32_badsys
14860@@ -216,7 +268,7 @@ sysexit_from_sys_call:
14861 .endm
14862
14863 .macro auditsys_exit exit
14864- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14865+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14866 jnz ia32_ret_from_sys_call
14867 TRACE_IRQS_ON
14868 ENABLE_INTERRUPTS(CLBR_NONE)
14869@@ -227,11 +279,12 @@ sysexit_from_sys_call:
14870 1: setbe %al /* 1 if error, 0 if not */
14871 movzbl %al,%edi /* zero-extend that into %edi */
14872 call __audit_syscall_exit
14873+ GET_THREAD_INFO(%r11)
14874 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14875 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14876 DISABLE_INTERRUPTS(CLBR_NONE)
14877 TRACE_IRQS_OFF
14878- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14879+ testl %edi,TI_flags(%r11)
14880 jz \exit
14881 CLEAR_RREGS -ARGOFFSET
14882 jmp int_with_check
14883@@ -253,7 +306,7 @@ sysenter_fix_flags:
14884
14885 sysenter_tracesys:
14886 #ifdef CONFIG_AUDITSYSCALL
14887- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14888+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14889 jz sysenter_auditsys
14890 #endif
14891 SAVE_REST
14892@@ -265,6 +318,9 @@ sysenter_tracesys:
14893 RESTORE_REST
14894 cmpq $(IA32_NR_syscalls-1),%rax
14895 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14896+
14897+ pax_erase_kstack
14898+
14899 jmp sysenter_do_call
14900 CFI_ENDPROC
14901 ENDPROC(ia32_sysenter_target)
14902@@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14903 ENTRY(ia32_cstar_target)
14904 CFI_STARTPROC32 simple
14905 CFI_SIGNAL_FRAME
14906- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14907+ CFI_DEF_CFA rsp,0
14908 CFI_REGISTER rip,rcx
14909 /*CFI_REGISTER rflags,r11*/
14910 SWAPGS_UNSAFE_STACK
14911 movl %esp,%r8d
14912 CFI_REGISTER rsp,r8
14913 movq PER_CPU_VAR(kernel_stack),%rsp
14914+ SAVE_ARGS 8*6,0,0
14915+ pax_enter_kernel_user
14916+
14917+#ifdef CONFIG_PAX_RANDKSTACK
14918+ pax_erase_kstack
14919+#endif
14920+
14921 /*
14922 * No need to follow this irqs on/off section: the syscall
14923 * disabled irqs and here we enable it straight after entry:
14924 */
14925 ENABLE_INTERRUPTS(CLBR_NONE)
14926- SAVE_ARGS 8,0,0
14927 movl %eax,%eax /* zero extension */
14928 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14929 movq %rcx,RIP-ARGOFFSET(%rsp)
14930@@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14931 /* no need to do an access_ok check here because r8 has been
14932 32bit zero extended */
14933 /* hardware stack frame is complete now */
14934+
14935+#ifdef CONFIG_PAX_MEMORY_UDEREF
14936+ ASM_PAX_OPEN_USERLAND
14937+ movq pax_user_shadow_base,%r8
14938+ addq RSP-ARGOFFSET(%rsp),%r8
14939+#endif
14940+
14941 ASM_STAC
14942 1: movl (%r8),%r9d
14943 _ASM_EXTABLE(1b,ia32_badarg)
14944 ASM_CLAC
14945- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14946- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14947+
14948+#ifdef CONFIG_PAX_MEMORY_UDEREF
14949+ ASM_PAX_CLOSE_USERLAND
14950+#endif
14951+
14952+ GET_THREAD_INFO(%r11)
14953+ orl $TS_COMPAT,TI_status(%r11)
14954+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14955 CFI_REMEMBER_STATE
14956 jnz cstar_tracesys
14957 cmpq $IA32_NR_syscalls-1,%rax
14958@@ -335,13 +410,16 @@ cstar_do_call:
14959 cstar_dispatch:
14960 call *ia32_sys_call_table(,%rax,8)
14961 movq %rax,RAX-ARGOFFSET(%rsp)
14962+ GET_THREAD_INFO(%r11)
14963 DISABLE_INTERRUPTS(CLBR_NONE)
14964 TRACE_IRQS_OFF
14965- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14966+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14967 jnz sysretl_audit
14968 sysretl_from_sys_call:
14969- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14970- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14971+ pax_exit_kernel_user
14972+ pax_erase_kstack
14973+ andl $~TS_COMPAT,TI_status(%r11)
14974+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14975 movl RIP-ARGOFFSET(%rsp),%ecx
14976 CFI_REGISTER rip,rcx
14977 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14978@@ -368,7 +446,7 @@ sysretl_audit:
14979
14980 cstar_tracesys:
14981 #ifdef CONFIG_AUDITSYSCALL
14982- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14983+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14984 jz cstar_auditsys
14985 #endif
14986 xchgl %r9d,%ebp
14987@@ -382,11 +460,19 @@ cstar_tracesys:
14988 xchgl %ebp,%r9d
14989 cmpq $(IA32_NR_syscalls-1),%rax
14990 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14991+
14992+ pax_erase_kstack
14993+
14994 jmp cstar_do_call
14995 END(ia32_cstar_target)
14996
14997 ia32_badarg:
14998 ASM_CLAC
14999+
15000+#ifdef CONFIG_PAX_MEMORY_UDEREF
15001+ ASM_PAX_CLOSE_USERLAND
15002+#endif
15003+
15004 movq $-EFAULT,%rax
15005 jmp ia32_sysret
15006 CFI_ENDPROC
15007@@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
15008 CFI_REL_OFFSET rip,RIP-RIP
15009 PARAVIRT_ADJUST_EXCEPTION_FRAME
15010 SWAPGS
15011- /*
15012- * No need to follow this irqs on/off section: the syscall
15013- * disabled irqs and here we enable it straight after entry:
15014- */
15015- ENABLE_INTERRUPTS(CLBR_NONE)
15016 movl %eax,%eax
15017 pushq_cfi %rax
15018 cld
15019 /* note the registers are not zero extended to the sf.
15020 this could be a problem. */
15021 SAVE_ARGS 0,1,0
15022- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15023- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15024+ pax_enter_kernel_user
15025+
15026+#ifdef CONFIG_PAX_RANDKSTACK
15027+ pax_erase_kstack
15028+#endif
15029+
15030+ /*
15031+ * No need to follow this irqs on/off section: the syscall
15032+ * disabled irqs and here we enable it straight after entry:
15033+ */
15034+ ENABLE_INTERRUPTS(CLBR_NONE)
15035+ GET_THREAD_INFO(%r11)
15036+ orl $TS_COMPAT,TI_status(%r11)
15037+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15038 jnz ia32_tracesys
15039 cmpq $(IA32_NR_syscalls-1),%rax
15040 ja ia32_badsys
15041@@ -458,6 +551,9 @@ ia32_tracesys:
15042 RESTORE_REST
15043 cmpq $(IA32_NR_syscalls-1),%rax
15044 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15045+
15046+ pax_erase_kstack
15047+
15048 jmp ia32_do_call
15049 END(ia32_syscall)
15050
15051diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15052index 8e0ceec..af13504 100644
15053--- a/arch/x86/ia32/sys_ia32.c
15054+++ b/arch/x86/ia32/sys_ia32.c
15055@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15056 */
15057 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15058 {
15059- typeof(ubuf->st_uid) uid = 0;
15060- typeof(ubuf->st_gid) gid = 0;
15061+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15062+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15063 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15064 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15065 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15066diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15067index 372231c..51b537d 100644
15068--- a/arch/x86/include/asm/alternative-asm.h
15069+++ b/arch/x86/include/asm/alternative-asm.h
15070@@ -18,6 +18,45 @@
15071 .endm
15072 #endif
15073
15074+#ifdef KERNEXEC_PLUGIN
15075+ .macro pax_force_retaddr_bts rip=0
15076+ btsq $63,\rip(%rsp)
15077+ .endm
15078+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15079+ .macro pax_force_retaddr rip=0, reload=0
15080+ btsq $63,\rip(%rsp)
15081+ .endm
15082+ .macro pax_force_fptr ptr
15083+ btsq $63,\ptr
15084+ .endm
15085+ .macro pax_set_fptr_mask
15086+ .endm
15087+#endif
15088+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15089+ .macro pax_force_retaddr rip=0, reload=0
15090+ .if \reload
15091+ pax_set_fptr_mask
15092+ .endif
15093+ orq %r12,\rip(%rsp)
15094+ .endm
15095+ .macro pax_force_fptr ptr
15096+ orq %r12,\ptr
15097+ .endm
15098+ .macro pax_set_fptr_mask
15099+ movabs $0x8000000000000000,%r12
15100+ .endm
15101+#endif
15102+#else
15103+ .macro pax_force_retaddr rip=0, reload=0
15104+ .endm
15105+ .macro pax_force_fptr ptr
15106+ .endm
15107+ .macro pax_force_retaddr_bts rip=0
15108+ .endm
15109+ .macro pax_set_fptr_mask
15110+ .endm
15111+#endif
15112+
15113 .macro altinstruction_entry orig alt feature orig_len alt_len
15114 .long \orig - .
15115 .long \alt - .
15116diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15117index 473bdbe..b1e3377 100644
15118--- a/arch/x86/include/asm/alternative.h
15119+++ b/arch/x86/include/asm/alternative.h
15120@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15121 ".pushsection .discard,\"aw\",@progbits\n" \
15122 DISCARD_ENTRY(1) \
15123 ".popsection\n" \
15124- ".pushsection .altinstr_replacement, \"ax\"\n" \
15125+ ".pushsection .altinstr_replacement, \"a\"\n" \
15126 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15127 ".popsection"
15128
15129@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15130 DISCARD_ENTRY(1) \
15131 DISCARD_ENTRY(2) \
15132 ".popsection\n" \
15133- ".pushsection .altinstr_replacement, \"ax\"\n" \
15134+ ".pushsection .altinstr_replacement, \"a\"\n" \
15135 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15136 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15137 ".popsection"
15138diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15139index efc3b22..85c4f3a 100644
15140--- a/arch/x86/include/asm/apic.h
15141+++ b/arch/x86/include/asm/apic.h
15142@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15143
15144 #ifdef CONFIG_X86_LOCAL_APIC
15145
15146-extern unsigned int apic_verbosity;
15147+extern int apic_verbosity;
15148 extern int local_apic_timer_c2_ok;
15149
15150 extern int disable_apic;
15151diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15152index 20370c6..a2eb9b0 100644
15153--- a/arch/x86/include/asm/apm.h
15154+++ b/arch/x86/include/asm/apm.h
15155@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15156 __asm__ __volatile__(APM_DO_ZERO_SEGS
15157 "pushl %%edi\n\t"
15158 "pushl %%ebp\n\t"
15159- "lcall *%%cs:apm_bios_entry\n\t"
15160+ "lcall *%%ss:apm_bios_entry\n\t"
15161 "setc %%al\n\t"
15162 "popl %%ebp\n\t"
15163 "popl %%edi\n\t"
15164@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15165 __asm__ __volatile__(APM_DO_ZERO_SEGS
15166 "pushl %%edi\n\t"
15167 "pushl %%ebp\n\t"
15168- "lcall *%%cs:apm_bios_entry\n\t"
15169+ "lcall *%%ss:apm_bios_entry\n\t"
15170 "setc %%bl\n\t"
15171 "popl %%ebp\n\t"
15172 "popl %%edi\n\t"
15173diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15174index 5e5cd12..51cdc93 100644
15175--- a/arch/x86/include/asm/atomic.h
15176+++ b/arch/x86/include/asm/atomic.h
15177@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15178 }
15179
15180 /**
15181+ * atomic_read_unchecked - read atomic variable
15182+ * @v: pointer of type atomic_unchecked_t
15183+ *
15184+ * Atomically reads the value of @v.
15185+ */
15186+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15187+{
15188+ return ACCESS_ONCE((v)->counter);
15189+}
15190+
15191+/**
15192 * atomic_set - set atomic variable
15193 * @v: pointer of type atomic_t
15194 * @i: required value
15195@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15196 }
15197
15198 /**
15199+ * atomic_set_unchecked - set atomic variable
15200+ * @v: pointer of type atomic_unchecked_t
15201+ * @i: required value
15202+ *
15203+ * Atomically sets the value of @v to @i.
15204+ */
15205+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15206+{
15207+ v->counter = i;
15208+}
15209+
15210+/**
15211 * atomic_add - add integer to atomic variable
15212 * @i: integer value to add
15213 * @v: pointer of type atomic_t
15214@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15215 */
15216 static inline void atomic_add(int i, atomic_t *v)
15217 {
15218- asm volatile(LOCK_PREFIX "addl %1,%0"
15219+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15220+
15221+#ifdef CONFIG_PAX_REFCOUNT
15222+ "jno 0f\n"
15223+ LOCK_PREFIX "subl %1,%0\n"
15224+ "int $4\n0:\n"
15225+ _ASM_EXTABLE(0b, 0b)
15226+#endif
15227+
15228+ : "+m" (v->counter)
15229+ : "ir" (i));
15230+}
15231+
15232+/**
15233+ * atomic_add_unchecked - add integer to atomic variable
15234+ * @i: integer value to add
15235+ * @v: pointer of type atomic_unchecked_t
15236+ *
15237+ * Atomically adds @i to @v.
15238+ */
15239+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15240+{
15241+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15242 : "+m" (v->counter)
15243 : "ir" (i));
15244 }
15245@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15246 */
15247 static inline void atomic_sub(int i, atomic_t *v)
15248 {
15249- asm volatile(LOCK_PREFIX "subl %1,%0"
15250+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15251+
15252+#ifdef CONFIG_PAX_REFCOUNT
15253+ "jno 0f\n"
15254+ LOCK_PREFIX "addl %1,%0\n"
15255+ "int $4\n0:\n"
15256+ _ASM_EXTABLE(0b, 0b)
15257+#endif
15258+
15259+ : "+m" (v->counter)
15260+ : "ir" (i));
15261+}
15262+
15263+/**
15264+ * atomic_sub_unchecked - subtract integer from atomic variable
15265+ * @i: integer value to subtract
15266+ * @v: pointer of type atomic_unchecked_t
15267+ *
15268+ * Atomically subtracts @i from @v.
15269+ */
15270+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15271+{
15272+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15273 : "+m" (v->counter)
15274 : "ir" (i));
15275 }
15276@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15277 */
15278 static inline int atomic_sub_and_test(int i, atomic_t *v)
15279 {
15280- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15281+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15282 }
15283
15284 /**
15285@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15286 */
15287 static inline void atomic_inc(atomic_t *v)
15288 {
15289- asm volatile(LOCK_PREFIX "incl %0"
15290+ asm volatile(LOCK_PREFIX "incl %0\n"
15291+
15292+#ifdef CONFIG_PAX_REFCOUNT
15293+ "jno 0f\n"
15294+ LOCK_PREFIX "decl %0\n"
15295+ "int $4\n0:\n"
15296+ _ASM_EXTABLE(0b, 0b)
15297+#endif
15298+
15299+ : "+m" (v->counter));
15300+}
15301+
15302+/**
15303+ * atomic_inc_unchecked - increment atomic variable
15304+ * @v: pointer of type atomic_unchecked_t
15305+ *
15306+ * Atomically increments @v by 1.
15307+ */
15308+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15309+{
15310+ asm volatile(LOCK_PREFIX "incl %0\n"
15311 : "+m" (v->counter));
15312 }
15313
15314@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15315 */
15316 static inline void atomic_dec(atomic_t *v)
15317 {
15318- asm volatile(LOCK_PREFIX "decl %0"
15319+ asm volatile(LOCK_PREFIX "decl %0\n"
15320+
15321+#ifdef CONFIG_PAX_REFCOUNT
15322+ "jno 0f\n"
15323+ LOCK_PREFIX "incl %0\n"
15324+ "int $4\n0:\n"
15325+ _ASM_EXTABLE(0b, 0b)
15326+#endif
15327+
15328+ : "+m" (v->counter));
15329+}
15330+
15331+/**
15332+ * atomic_dec_unchecked - decrement atomic variable
15333+ * @v: pointer of type atomic_unchecked_t
15334+ *
15335+ * Atomically decrements @v by 1.
15336+ */
15337+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15338+{
15339+ asm volatile(LOCK_PREFIX "decl %0\n"
15340 : "+m" (v->counter));
15341 }
15342
15343@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15344 */
15345 static inline int atomic_dec_and_test(atomic_t *v)
15346 {
15347- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15348+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15349 }
15350
15351 /**
15352@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15353 */
15354 static inline int atomic_inc_and_test(atomic_t *v)
15355 {
15356- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15357+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15358+}
15359+
15360+/**
15361+ * atomic_inc_and_test_unchecked - increment and test
15362+ * @v: pointer of type atomic_unchecked_t
15363+ *
15364+ * Atomically increments @v by 1
15365+ * and returns true if the result is zero, or false for all
15366+ * other cases.
15367+ */
15368+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15369+{
15370+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15371 }
15372
15373 /**
15374@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15375 */
15376 static inline int atomic_add_negative(int i, atomic_t *v)
15377 {
15378- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15379+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15380 }
15381
15382 /**
15383@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15384 *
15385 * Atomically adds @i to @v and returns @i + @v
15386 */
15387-static inline int atomic_add_return(int i, atomic_t *v)
15388+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15389+{
15390+ return i + xadd_check_overflow(&v->counter, i);
15391+}
15392+
15393+/**
15394+ * atomic_add_return_unchecked - add integer and return
15395+ * @i: integer value to add
15396+ * @v: pointer of type atomic_unchecked_t
15397+ *
15398+ * Atomically adds @i to @v and returns @i + @v
15399+ */
15400+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15401 {
15402 return i + xadd(&v->counter, i);
15403 }
15404@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15405 *
15406 * Atomically subtracts @i from @v and returns @v - @i
15407 */
15408-static inline int atomic_sub_return(int i, atomic_t *v)
15409+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15410 {
15411 return atomic_add_return(-i, v);
15412 }
15413
15414 #define atomic_inc_return(v) (atomic_add_return(1, v))
15415+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15416+{
15417+ return atomic_add_return_unchecked(1, v);
15418+}
15419 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15420
15421-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15422+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15423+{
15424+ return cmpxchg(&v->counter, old, new);
15425+}
15426+
15427+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15428 {
15429 return cmpxchg(&v->counter, old, new);
15430 }
15431@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15432 return xchg(&v->counter, new);
15433 }
15434
15435+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15436+{
15437+ return xchg(&v->counter, new);
15438+}
15439+
15440 /**
15441 * __atomic_add_unless - add unless the number is already a given value
15442 * @v: pointer of type atomic_t
15443@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15444 */
15445 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15446 {
15447- int c, old;
15448+ int c, old, new;
15449 c = atomic_read(v);
15450 for (;;) {
15451- if (unlikely(c == (u)))
15452+ if (unlikely(c == u))
15453 break;
15454- old = atomic_cmpxchg((v), c, c + (a));
15455+
15456+ asm volatile("addl %2,%0\n"
15457+
15458+#ifdef CONFIG_PAX_REFCOUNT
15459+ "jno 0f\n"
15460+ "subl %2,%0\n"
15461+ "int $4\n0:\n"
15462+ _ASM_EXTABLE(0b, 0b)
15463+#endif
15464+
15465+ : "=r" (new)
15466+ : "0" (c), "ir" (a));
15467+
15468+ old = atomic_cmpxchg(v, c, new);
15469 if (likely(old == c))
15470 break;
15471 c = old;
15472@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15473 }
15474
15475 /**
15476+ * atomic_inc_not_zero_hint - increment if not null
15477+ * @v: pointer of type atomic_t
15478+ * @hint: probable value of the atomic before the increment
15479+ *
15480+ * This version of atomic_inc_not_zero() gives a hint of probable
15481+ * value of the atomic. This helps processor to not read the memory
15482+ * before doing the atomic read/modify/write cycle, lowering
15483+ * number of bus transactions on some arches.
15484+ *
15485+ * Returns: 0 if increment was not done, 1 otherwise.
15486+ */
15487+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15488+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15489+{
15490+ int val, c = hint, new;
15491+
15492+ /* sanity test, should be removed by compiler if hint is a constant */
15493+ if (!hint)
15494+ return __atomic_add_unless(v, 1, 0);
15495+
15496+ do {
15497+ asm volatile("incl %0\n"
15498+
15499+#ifdef CONFIG_PAX_REFCOUNT
15500+ "jno 0f\n"
15501+ "decl %0\n"
15502+ "int $4\n0:\n"
15503+ _ASM_EXTABLE(0b, 0b)
15504+#endif
15505+
15506+ : "=r" (new)
15507+ : "0" (c));
15508+
15509+ val = atomic_cmpxchg(v, c, new);
15510+ if (val == c)
15511+ return 1;
15512+ c = val;
15513+ } while (c);
15514+
15515+ return 0;
15516+}
15517+
15518+/**
15519 * atomic_inc_short - increment of a short integer
15520 * @v: pointer to type int
15521 *
15522@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15523 }
15524
15525 /* These are x86-specific, used by some header files */
15526-#define atomic_clear_mask(mask, addr) \
15527- asm volatile(LOCK_PREFIX "andl %0,%1" \
15528- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15529+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15530+{
15531+ asm volatile(LOCK_PREFIX "andl %1,%0"
15532+ : "+m" (v->counter)
15533+ : "r" (~(mask))
15534+ : "memory");
15535+}
15536
15537-#define atomic_set_mask(mask, addr) \
15538- asm volatile(LOCK_PREFIX "orl %0,%1" \
15539- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15540- : "memory")
15541+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15542+{
15543+ asm volatile(LOCK_PREFIX "andl %1,%0"
15544+ : "+m" (v->counter)
15545+ : "r" (~(mask))
15546+ : "memory");
15547+}
15548+
15549+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15550+{
15551+ asm volatile(LOCK_PREFIX "orl %1,%0"
15552+ : "+m" (v->counter)
15553+ : "r" (mask)
15554+ : "memory");
15555+}
15556+
15557+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15558+{
15559+ asm volatile(LOCK_PREFIX "orl %1,%0"
15560+ : "+m" (v->counter)
15561+ : "r" (mask)
15562+ : "memory");
15563+}
15564
15565 #ifdef CONFIG_X86_32
15566 # include <asm/atomic64_32.h>
15567diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15568index b154de7..bf18a5a 100644
15569--- a/arch/x86/include/asm/atomic64_32.h
15570+++ b/arch/x86/include/asm/atomic64_32.h
15571@@ -12,6 +12,14 @@ typedef struct {
15572 u64 __aligned(8) counter;
15573 } atomic64_t;
15574
15575+#ifdef CONFIG_PAX_REFCOUNT
15576+typedef struct {
15577+ u64 __aligned(8) counter;
15578+} atomic64_unchecked_t;
15579+#else
15580+typedef atomic64_t atomic64_unchecked_t;
15581+#endif
15582+
15583 #define ATOMIC64_INIT(val) { (val) }
15584
15585 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15586@@ -37,21 +45,31 @@ typedef struct {
15587 ATOMIC64_DECL_ONE(sym##_386)
15588
15589 ATOMIC64_DECL_ONE(add_386);
15590+ATOMIC64_DECL_ONE(add_unchecked_386);
15591 ATOMIC64_DECL_ONE(sub_386);
15592+ATOMIC64_DECL_ONE(sub_unchecked_386);
15593 ATOMIC64_DECL_ONE(inc_386);
15594+ATOMIC64_DECL_ONE(inc_unchecked_386);
15595 ATOMIC64_DECL_ONE(dec_386);
15596+ATOMIC64_DECL_ONE(dec_unchecked_386);
15597 #endif
15598
15599 #define alternative_atomic64(f, out, in...) \
15600 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15601
15602 ATOMIC64_DECL(read);
15603+ATOMIC64_DECL(read_unchecked);
15604 ATOMIC64_DECL(set);
15605+ATOMIC64_DECL(set_unchecked);
15606 ATOMIC64_DECL(xchg);
15607 ATOMIC64_DECL(add_return);
15608+ATOMIC64_DECL(add_return_unchecked);
15609 ATOMIC64_DECL(sub_return);
15610+ATOMIC64_DECL(sub_return_unchecked);
15611 ATOMIC64_DECL(inc_return);
15612+ATOMIC64_DECL(inc_return_unchecked);
15613 ATOMIC64_DECL(dec_return);
15614+ATOMIC64_DECL(dec_return_unchecked);
15615 ATOMIC64_DECL(dec_if_positive);
15616 ATOMIC64_DECL(inc_not_zero);
15617 ATOMIC64_DECL(add_unless);
15618@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15619 }
15620
15621 /**
15622+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15623+ * @p: pointer to type atomic64_unchecked_t
15624+ * @o: expected value
15625+ * @n: new value
15626+ *
15627+ * Atomically sets @v to @n if it was equal to @o and returns
15628+ * the old value.
15629+ */
15630+
15631+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15632+{
15633+ return cmpxchg64(&v->counter, o, n);
15634+}
15635+
15636+/**
15637 * atomic64_xchg - xchg atomic64 variable
15638 * @v: pointer to type atomic64_t
15639 * @n: value to assign
15640@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15641 }
15642
15643 /**
15644+ * atomic64_set_unchecked - set atomic64 variable
15645+ * @v: pointer to type atomic64_unchecked_t
15646+ * @n: value to assign
15647+ *
15648+ * Atomically sets the value of @v to @n.
15649+ */
15650+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15651+{
15652+ unsigned high = (unsigned)(i >> 32);
15653+ unsigned low = (unsigned)i;
15654+ alternative_atomic64(set, /* no output */,
15655+ "S" (v), "b" (low), "c" (high)
15656+ : "eax", "edx", "memory");
15657+}
15658+
15659+/**
15660 * atomic64_read - read atomic64 variable
15661 * @v: pointer to type atomic64_t
15662 *
15663@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15664 }
15665
15666 /**
15667+ * atomic64_read_unchecked - read atomic64 variable
15668+ * @v: pointer to type atomic64_unchecked_t
15669+ *
15670+ * Atomically reads the value of @v and returns it.
15671+ */
15672+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15673+{
15674+ long long r;
15675+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15676+ return r;
15677+ }
15678+
15679+/**
15680 * atomic64_add_return - add and return
15681 * @i: integer value to add
15682 * @v: pointer to type atomic64_t
15683@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15684 return i;
15685 }
15686
15687+/**
15688+ * atomic64_add_return_unchecked - add and return
15689+ * @i: integer value to add
15690+ * @v: pointer to type atomic64_unchecked_t
15691+ *
15692+ * Atomically adds @i to @v and returns @i + *@v
15693+ */
15694+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15695+{
15696+ alternative_atomic64(add_return_unchecked,
15697+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15698+ ASM_NO_INPUT_CLOBBER("memory"));
15699+ return i;
15700+}
15701+
15702 /*
15703 * Other variants with different arithmetic operators:
15704 */
15705@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15706 return a;
15707 }
15708
15709+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15710+{
15711+ long long a;
15712+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15713+ "S" (v) : "memory", "ecx");
15714+ return a;
15715+}
15716+
15717 static inline long long atomic64_dec_return(atomic64_t *v)
15718 {
15719 long long a;
15720@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15721 }
15722
15723 /**
15724+ * atomic64_add_unchecked - add integer to atomic64 variable
15725+ * @i: integer value to add
15726+ * @v: pointer to type atomic64_unchecked_t
15727+ *
15728+ * Atomically adds @i to @v.
15729+ */
15730+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15731+{
15732+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15733+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15734+ ASM_NO_INPUT_CLOBBER("memory"));
15735+ return i;
15736+}
15737+
15738+/**
15739 * atomic64_sub - subtract the atomic64 variable
15740 * @i: integer value to subtract
15741 * @v: pointer to type atomic64_t
15742diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15743index f8d273e..02f39f3 100644
15744--- a/arch/x86/include/asm/atomic64_64.h
15745+++ b/arch/x86/include/asm/atomic64_64.h
15746@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15747 }
15748
15749 /**
15750+ * atomic64_read_unchecked - read atomic64 variable
15751+ * @v: pointer of type atomic64_unchecked_t
15752+ *
15753+ * Atomically reads the value of @v.
15754+ * Doesn't imply a read memory barrier.
15755+ */
15756+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15757+{
15758+ return ACCESS_ONCE((v)->counter);
15759+}
15760+
15761+/**
15762 * atomic64_set - set atomic64 variable
15763 * @v: pointer to type atomic64_t
15764 * @i: required value
15765@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15766 }
15767
15768 /**
15769+ * atomic64_set_unchecked - set atomic64 variable
15770+ * @v: pointer to type atomic64_unchecked_t
15771+ * @i: required value
15772+ *
15773+ * Atomically sets the value of @v to @i.
15774+ */
15775+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15776+{
15777+ v->counter = i;
15778+}
15779+
15780+/**
15781 * atomic64_add - add integer to atomic64 variable
15782 * @i: integer value to add
15783 * @v: pointer to type atomic64_t
15784@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15785 */
15786 static inline void atomic64_add(long i, atomic64_t *v)
15787 {
15788+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15789+
15790+#ifdef CONFIG_PAX_REFCOUNT
15791+ "jno 0f\n"
15792+ LOCK_PREFIX "subq %1,%0\n"
15793+ "int $4\n0:\n"
15794+ _ASM_EXTABLE(0b, 0b)
15795+#endif
15796+
15797+ : "=m" (v->counter)
15798+ : "er" (i), "m" (v->counter));
15799+}
15800+
15801+/**
15802+ * atomic64_add_unchecked - add integer to atomic64 variable
15803+ * @i: integer value to add
15804+ * @v: pointer to type atomic64_unchecked_t
15805+ *
15806+ * Atomically adds @i to @v.
15807+ */
15808+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15809+{
15810 asm volatile(LOCK_PREFIX "addq %1,%0"
15811 : "=m" (v->counter)
15812 : "er" (i), "m" (v->counter));
15813@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15814 */
15815 static inline void atomic64_sub(long i, atomic64_t *v)
15816 {
15817- asm volatile(LOCK_PREFIX "subq %1,%0"
15818+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15819+
15820+#ifdef CONFIG_PAX_REFCOUNT
15821+ "jno 0f\n"
15822+ LOCK_PREFIX "addq %1,%0\n"
15823+ "int $4\n0:\n"
15824+ _ASM_EXTABLE(0b, 0b)
15825+#endif
15826+
15827+ : "=m" (v->counter)
15828+ : "er" (i), "m" (v->counter));
15829+}
15830+
15831+/**
15832+ * atomic64_sub_unchecked - subtract the atomic64 variable
15833+ * @i: integer value to subtract
15834+ * @v: pointer to type atomic64_unchecked_t
15835+ *
15836+ * Atomically subtracts @i from @v.
15837+ */
15838+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15839+{
15840+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15841 : "=m" (v->counter)
15842 : "er" (i), "m" (v->counter));
15843 }
15844@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15845 */
15846 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15847 {
15848- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15849+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15850 }
15851
15852 /**
15853@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15854 */
15855 static inline void atomic64_inc(atomic64_t *v)
15856 {
15857+ asm volatile(LOCK_PREFIX "incq %0\n"
15858+
15859+#ifdef CONFIG_PAX_REFCOUNT
15860+ "jno 0f\n"
15861+ LOCK_PREFIX "decq %0\n"
15862+ "int $4\n0:\n"
15863+ _ASM_EXTABLE(0b, 0b)
15864+#endif
15865+
15866+ : "=m" (v->counter)
15867+ : "m" (v->counter));
15868+}
15869+
15870+/**
15871+ * atomic64_inc_unchecked - increment atomic64 variable
15872+ * @v: pointer to type atomic64_unchecked_t
15873+ *
15874+ * Atomically increments @v by 1.
15875+ */
15876+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15877+{
15878 asm volatile(LOCK_PREFIX "incq %0"
15879 : "=m" (v->counter)
15880 : "m" (v->counter));
15881@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15882 */
15883 static inline void atomic64_dec(atomic64_t *v)
15884 {
15885- asm volatile(LOCK_PREFIX "decq %0"
15886+ asm volatile(LOCK_PREFIX "decq %0\n"
15887+
15888+#ifdef CONFIG_PAX_REFCOUNT
15889+ "jno 0f\n"
15890+ LOCK_PREFIX "incq %0\n"
15891+ "int $4\n0:\n"
15892+ _ASM_EXTABLE(0b, 0b)
15893+#endif
15894+
15895+ : "=m" (v->counter)
15896+ : "m" (v->counter));
15897+}
15898+
15899+/**
15900+ * atomic64_dec_unchecked - decrement atomic64 variable
15901+ * @v: pointer to type atomic64_t
15902+ *
15903+ * Atomically decrements @v by 1.
15904+ */
15905+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15906+{
15907+ asm volatile(LOCK_PREFIX "decq %0\n"
15908 : "=m" (v->counter)
15909 : "m" (v->counter));
15910 }
15911@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15912 */
15913 static inline int atomic64_dec_and_test(atomic64_t *v)
15914 {
15915- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15916+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15917 }
15918
15919 /**
15920@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15921 */
15922 static inline int atomic64_inc_and_test(atomic64_t *v)
15923 {
15924- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15925+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15926 }
15927
15928 /**
15929@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15930 */
15931 static inline int atomic64_add_negative(long i, atomic64_t *v)
15932 {
15933- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15934+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15935 }
15936
15937 /**
15938@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15939 */
15940 static inline long atomic64_add_return(long i, atomic64_t *v)
15941 {
15942+ return i + xadd_check_overflow(&v->counter, i);
15943+}
15944+
15945+/**
15946+ * atomic64_add_return_unchecked - add and return
15947+ * @i: integer value to add
15948+ * @v: pointer to type atomic64_unchecked_t
15949+ *
15950+ * Atomically adds @i to @v and returns @i + @v
15951+ */
15952+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15953+{
15954 return i + xadd(&v->counter, i);
15955 }
15956
15957@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15958 }
15959
15960 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15961+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15962+{
15963+ return atomic64_add_return_unchecked(1, v);
15964+}
15965 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15966
15967 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15968@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15969 return cmpxchg(&v->counter, old, new);
15970 }
15971
15972+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15973+{
15974+ return cmpxchg(&v->counter, old, new);
15975+}
15976+
15977 static inline long atomic64_xchg(atomic64_t *v, long new)
15978 {
15979 return xchg(&v->counter, new);
15980@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15981 */
15982 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15983 {
15984- long c, old;
15985+ long c, old, new;
15986 c = atomic64_read(v);
15987 for (;;) {
15988- if (unlikely(c == (u)))
15989+ if (unlikely(c == u))
15990 break;
15991- old = atomic64_cmpxchg((v), c, c + (a));
15992+
15993+ asm volatile("add %2,%0\n"
15994+
15995+#ifdef CONFIG_PAX_REFCOUNT
15996+ "jno 0f\n"
15997+ "sub %2,%0\n"
15998+ "int $4\n0:\n"
15999+ _ASM_EXTABLE(0b, 0b)
16000+#endif
16001+
16002+ : "=r" (new)
16003+ : "0" (c), "ir" (a));
16004+
16005+ old = atomic64_cmpxchg(v, c, new);
16006 if (likely(old == c))
16007 break;
16008 c = old;
16009 }
16010- return c != (u);
16011+ return c != u;
16012 }
16013
16014 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16015diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16016index 2ab1eb3..1e8cc5d 100644
16017--- a/arch/x86/include/asm/barrier.h
16018+++ b/arch/x86/include/asm/barrier.h
16019@@ -57,7 +57,7 @@
16020 do { \
16021 compiletime_assert_atomic_type(*p); \
16022 smp_mb(); \
16023- ACCESS_ONCE(*p) = (v); \
16024+ ACCESS_ONCE_RW(*p) = (v); \
16025 } while (0)
16026
16027 #define smp_load_acquire(p) \
16028@@ -74,7 +74,7 @@ do { \
16029 do { \
16030 compiletime_assert_atomic_type(*p); \
16031 barrier(); \
16032- ACCESS_ONCE(*p) = (v); \
16033+ ACCESS_ONCE_RW(*p) = (v); \
16034 } while (0)
16035
16036 #define smp_load_acquire(p) \
16037diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16038index cfe3b95..d01b118 100644
16039--- a/arch/x86/include/asm/bitops.h
16040+++ b/arch/x86/include/asm/bitops.h
16041@@ -50,7 +50,7 @@
16042 * a mask operation on a byte.
16043 */
16044 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16045-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16046+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16047 #define CONST_MASK(nr) (1 << ((nr) & 7))
16048
16049 /**
16050@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16051 */
16052 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16053 {
16054- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16055+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16056 }
16057
16058 /**
16059@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16060 */
16061 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16062 {
16063- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16064+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16065 }
16066
16067 /**
16068@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16069 */
16070 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16071 {
16072- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16073+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16074 }
16075
16076 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16077@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16078 *
16079 * Undefined if no bit exists, so code should check against 0 first.
16080 */
16081-static inline unsigned long __ffs(unsigned long word)
16082+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16083 {
16084 asm("rep; bsf %1,%0"
16085 : "=r" (word)
16086@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16087 *
16088 * Undefined if no zero exists, so code should check against ~0UL first.
16089 */
16090-static inline unsigned long ffz(unsigned long word)
16091+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16092 {
16093 asm("rep; bsf %1,%0"
16094 : "=r" (word)
16095@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16096 *
16097 * Undefined if no set bit exists, so code should check against 0 first.
16098 */
16099-static inline unsigned long __fls(unsigned long word)
16100+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16101 {
16102 asm("bsr %1,%0"
16103 : "=r" (word)
16104@@ -434,7 +434,7 @@ static inline int ffs(int x)
16105 * set bit if value is nonzero. The last (most significant) bit is
16106 * at position 32.
16107 */
16108-static inline int fls(int x)
16109+static inline int __intentional_overflow(-1) fls(int x)
16110 {
16111 int r;
16112
16113@@ -476,7 +476,7 @@ static inline int fls(int x)
16114 * at position 64.
16115 */
16116 #ifdef CONFIG_X86_64
16117-static __always_inline int fls64(__u64 x)
16118+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16119 {
16120 int bitpos = -1;
16121 /*
16122diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16123index 4fa687a..60f2d39 100644
16124--- a/arch/x86/include/asm/boot.h
16125+++ b/arch/x86/include/asm/boot.h
16126@@ -6,10 +6,15 @@
16127 #include <uapi/asm/boot.h>
16128
16129 /* Physical address where kernel should be loaded. */
16130-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16131+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16132 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16133 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16134
16135+#ifndef __ASSEMBLY__
16136+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16137+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16138+#endif
16139+
16140 /* Minimum kernel alignment, as a power of two */
16141 #ifdef CONFIG_X86_64
16142 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16143diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16144index 48f99f1..d78ebf9 100644
16145--- a/arch/x86/include/asm/cache.h
16146+++ b/arch/x86/include/asm/cache.h
16147@@ -5,12 +5,13 @@
16148
16149 /* L1 cache line size */
16150 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16151-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16152+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16153
16154 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16155+#define __read_only __attribute__((__section__(".data..read_only")))
16156
16157 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16158-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16159+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16160
16161 #ifdef CONFIG_X86_VSMP
16162 #ifdef CONFIG_SMP
16163diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16164index 1f1297b..72b8439 100644
16165--- a/arch/x86/include/asm/calling.h
16166+++ b/arch/x86/include/asm/calling.h
16167@@ -82,106 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16168 #define RSP 152
16169 #define SS 160
16170
16171-#define ARGOFFSET R11
16172+#define ARGOFFSET R15
16173
16174 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16175- subq $9*8+\addskip, %rsp
16176- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16177- movq_cfi rdi, 8*8
16178- movq_cfi rsi, 7*8
16179- movq_cfi rdx, 6*8
16180+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16181+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16182+ movq_cfi rdi, RDI
16183+ movq_cfi rsi, RSI
16184+ movq_cfi rdx, RDX
16185
16186 .if \save_rcx
16187- movq_cfi rcx, 5*8
16188+ movq_cfi rcx, RCX
16189 .endif
16190
16191 .if \rax_enosys
16192- movq $-ENOSYS, 4*8(%rsp)
16193+ movq $-ENOSYS, RAX(%rsp)
16194 .else
16195- movq_cfi rax, 4*8
16196+ movq_cfi rax, RAX
16197 .endif
16198
16199 .if \save_r891011
16200- movq_cfi r8, 3*8
16201- movq_cfi r9, 2*8
16202- movq_cfi r10, 1*8
16203- movq_cfi r11, 0*8
16204+ movq_cfi r8, R8
16205+ movq_cfi r9, R9
16206+ movq_cfi r10, R10
16207+ movq_cfi r11, R11
16208 .endif
16209
16210+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16211+ movq_cfi r12, R12
16212+#endif
16213+
16214 .endm
16215
16216-#define ARG_SKIP (9*8)
16217+#define ARG_SKIP ORIG_RAX
16218
16219 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16220 rstor_r8910=1, rstor_rdx=1
16221+
16222+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16223+ movq_cfi_restore R12, r12
16224+#endif
16225+
16226 .if \rstor_r11
16227- movq_cfi_restore 0*8, r11
16228+ movq_cfi_restore R11, r11
16229 .endif
16230
16231 .if \rstor_r8910
16232- movq_cfi_restore 1*8, r10
16233- movq_cfi_restore 2*8, r9
16234- movq_cfi_restore 3*8, r8
16235+ movq_cfi_restore R10, r10
16236+ movq_cfi_restore R9, r9
16237+ movq_cfi_restore R8, r8
16238 .endif
16239
16240 .if \rstor_rax
16241- movq_cfi_restore 4*8, rax
16242+ movq_cfi_restore RAX, rax
16243 .endif
16244
16245 .if \rstor_rcx
16246- movq_cfi_restore 5*8, rcx
16247+ movq_cfi_restore RCX, rcx
16248 .endif
16249
16250 .if \rstor_rdx
16251- movq_cfi_restore 6*8, rdx
16252+ movq_cfi_restore RDX, rdx
16253 .endif
16254
16255- movq_cfi_restore 7*8, rsi
16256- movq_cfi_restore 8*8, rdi
16257+ movq_cfi_restore RSI, rsi
16258+ movq_cfi_restore RDI, rdi
16259
16260- .if ARG_SKIP+\addskip > 0
16261- addq $ARG_SKIP+\addskip, %rsp
16262- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16263+ .if ORIG_RAX+\addskip > 0
16264+ addq $ORIG_RAX+\addskip, %rsp
16265+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16266 .endif
16267 .endm
16268
16269- .macro LOAD_ARGS offset, skiprax=0
16270- movq \offset(%rsp), %r11
16271- movq \offset+8(%rsp), %r10
16272- movq \offset+16(%rsp), %r9
16273- movq \offset+24(%rsp), %r8
16274- movq \offset+40(%rsp), %rcx
16275- movq \offset+48(%rsp), %rdx
16276- movq \offset+56(%rsp), %rsi
16277- movq \offset+64(%rsp), %rdi
16278+ .macro LOAD_ARGS skiprax=0
16279+ movq R11(%rsp), %r11
16280+ movq R10(%rsp), %r10
16281+ movq R9(%rsp), %r9
16282+ movq R8(%rsp), %r8
16283+ movq RCX(%rsp), %rcx
16284+ movq RDX(%rsp), %rdx
16285+ movq RSI(%rsp), %rsi
16286+ movq RDI(%rsp), %rdi
16287 .if \skiprax
16288 .else
16289- movq \offset+72(%rsp), %rax
16290+ movq ORIG_RAX(%rsp), %rax
16291 .endif
16292 .endm
16293
16294-#define REST_SKIP (6*8)
16295-
16296 .macro SAVE_REST
16297- subq $REST_SKIP, %rsp
16298- CFI_ADJUST_CFA_OFFSET REST_SKIP
16299- movq_cfi rbx, 5*8
16300- movq_cfi rbp, 4*8
16301- movq_cfi r12, 3*8
16302- movq_cfi r13, 2*8
16303- movq_cfi r14, 1*8
16304- movq_cfi r15, 0*8
16305+ movq_cfi rbx, RBX
16306+ movq_cfi rbp, RBP
16307+
16308+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16309+ movq_cfi r12, R12
16310+#endif
16311+
16312+ movq_cfi r13, R13
16313+ movq_cfi r14, R14
16314+ movq_cfi r15, R15
16315 .endm
16316
16317 .macro RESTORE_REST
16318- movq_cfi_restore 0*8, r15
16319- movq_cfi_restore 1*8, r14
16320- movq_cfi_restore 2*8, r13
16321- movq_cfi_restore 3*8, r12
16322- movq_cfi_restore 4*8, rbp
16323- movq_cfi_restore 5*8, rbx
16324- addq $REST_SKIP, %rsp
16325- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16326+ movq_cfi_restore R15, r15
16327+ movq_cfi_restore R14, r14
16328+ movq_cfi_restore R13, r13
16329+
16330+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16331+ movq_cfi_restore R12, r12
16332+#endif
16333+
16334+ movq_cfi_restore RBP, rbp
16335+ movq_cfi_restore RBX, rbx
16336 .endm
16337
16338 .macro SAVE_ALL
16339diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16340index f50de69..2b0a458 100644
16341--- a/arch/x86/include/asm/checksum_32.h
16342+++ b/arch/x86/include/asm/checksum_32.h
16343@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16344 int len, __wsum sum,
16345 int *src_err_ptr, int *dst_err_ptr);
16346
16347+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16348+ int len, __wsum sum,
16349+ int *src_err_ptr, int *dst_err_ptr);
16350+
16351+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16352+ int len, __wsum sum,
16353+ int *src_err_ptr, int *dst_err_ptr);
16354+
16355 /*
16356 * Note: when you get a NULL pointer exception here this means someone
16357 * passed in an incorrect kernel address to one of these functions.
16358@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16359
16360 might_sleep();
16361 stac();
16362- ret = csum_partial_copy_generic((__force void *)src, dst,
16363+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16364 len, sum, err_ptr, NULL);
16365 clac();
16366
16367@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16368 might_sleep();
16369 if (access_ok(VERIFY_WRITE, dst, len)) {
16370 stac();
16371- ret = csum_partial_copy_generic(src, (__force void *)dst,
16372+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16373 len, sum, NULL, err_ptr);
16374 clac();
16375 return ret;
16376diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16377index 99c105d7..2f667ac 100644
16378--- a/arch/x86/include/asm/cmpxchg.h
16379+++ b/arch/x86/include/asm/cmpxchg.h
16380@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16381 __compiletime_error("Bad argument size for cmpxchg");
16382 extern void __xadd_wrong_size(void)
16383 __compiletime_error("Bad argument size for xadd");
16384+extern void __xadd_check_overflow_wrong_size(void)
16385+ __compiletime_error("Bad argument size for xadd_check_overflow");
16386 extern void __add_wrong_size(void)
16387 __compiletime_error("Bad argument size for add");
16388+extern void __add_check_overflow_wrong_size(void)
16389+ __compiletime_error("Bad argument size for add_check_overflow");
16390
16391 /*
16392 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16393@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16394 __ret; \
16395 })
16396
16397+#ifdef CONFIG_PAX_REFCOUNT
16398+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16399+ ({ \
16400+ __typeof__ (*(ptr)) __ret = (arg); \
16401+ switch (sizeof(*(ptr))) { \
16402+ case __X86_CASE_L: \
16403+ asm volatile (lock #op "l %0, %1\n" \
16404+ "jno 0f\n" \
16405+ "mov %0,%1\n" \
16406+ "int $4\n0:\n" \
16407+ _ASM_EXTABLE(0b, 0b) \
16408+ : "+r" (__ret), "+m" (*(ptr)) \
16409+ : : "memory", "cc"); \
16410+ break; \
16411+ case __X86_CASE_Q: \
16412+ asm volatile (lock #op "q %q0, %1\n" \
16413+ "jno 0f\n" \
16414+ "mov %0,%1\n" \
16415+ "int $4\n0:\n" \
16416+ _ASM_EXTABLE(0b, 0b) \
16417+ : "+r" (__ret), "+m" (*(ptr)) \
16418+ : : "memory", "cc"); \
16419+ break; \
16420+ default: \
16421+ __ ## op ## _check_overflow_wrong_size(); \
16422+ } \
16423+ __ret; \
16424+ })
16425+#else
16426+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16427+#endif
16428+
16429 /*
16430 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16431 * Since this is generally used to protect other memory information, we
16432@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16433 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16434 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16435
16436+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16437+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16438+
16439 #define __add(ptr, inc, lock) \
16440 ({ \
16441 __typeof__ (*(ptr)) __ret = (inc); \
16442diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16443index 59c6c40..5e0b22c 100644
16444--- a/arch/x86/include/asm/compat.h
16445+++ b/arch/x86/include/asm/compat.h
16446@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16447 typedef u32 compat_uint_t;
16448 typedef u32 compat_ulong_t;
16449 typedef u64 __attribute__((aligned(4))) compat_u64;
16450-typedef u32 compat_uptr_t;
16451+typedef u32 __user compat_uptr_t;
16452
16453 struct compat_timespec {
16454 compat_time_t tv_sec;
16455diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16456index 90a5485..43b6211 100644
16457--- a/arch/x86/include/asm/cpufeature.h
16458+++ b/arch/x86/include/asm/cpufeature.h
16459@@ -213,7 +213,7 @@
16460 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16461 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16462 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16463-
16464+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16465
16466 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16467 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16468@@ -221,7 +221,7 @@
16469 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16470 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16471 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16472-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16473+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16474 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16475 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16476 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16477@@ -390,6 +390,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16478 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16479 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16480 #define cpu_has_bpext boot_cpu_has(X86_FEATURE_BPEXT)
16481+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16482
16483 #if __GNUC__ >= 4
16484 extern void warn_pre_alternatives(void);
16485@@ -441,7 +442,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16486
16487 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16488 t_warn:
16489- warn_pre_alternatives();
16490+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16491+ warn_pre_alternatives();
16492 return false;
16493 #endif
16494
16495@@ -461,7 +463,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16496 ".section .discard,\"aw\",@progbits\n"
16497 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16498 ".previous\n"
16499- ".section .altinstr_replacement,\"ax\"\n"
16500+ ".section .altinstr_replacement,\"a\"\n"
16501 "3: movb $1,%0\n"
16502 "4:\n"
16503 ".previous\n"
16504@@ -498,7 +500,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16505 " .byte 2b - 1b\n" /* src len */
16506 " .byte 4f - 3f\n" /* repl len */
16507 ".previous\n"
16508- ".section .altinstr_replacement,\"ax\"\n"
16509+ ".section .altinstr_replacement,\"a\"\n"
16510 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16511 "4:\n"
16512 ".previous\n"
16513@@ -531,7 +533,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16514 ".section .discard,\"aw\",@progbits\n"
16515 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16516 ".previous\n"
16517- ".section .altinstr_replacement,\"ax\"\n"
16518+ ".section .altinstr_replacement,\"a\"\n"
16519 "3: movb $0,%0\n"
16520 "4:\n"
16521 ".previous\n"
16522@@ -545,7 +547,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16523 ".section .discard,\"aw\",@progbits\n"
16524 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16525 ".previous\n"
16526- ".section .altinstr_replacement,\"ax\"\n"
16527+ ".section .altinstr_replacement,\"a\"\n"
16528 "5: movb $1,%0\n"
16529 "6:\n"
16530 ".previous\n"
16531diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16532index a94b82e..59ecefa 100644
16533--- a/arch/x86/include/asm/desc.h
16534+++ b/arch/x86/include/asm/desc.h
16535@@ -4,6 +4,7 @@
16536 #include <asm/desc_defs.h>
16537 #include <asm/ldt.h>
16538 #include <asm/mmu.h>
16539+#include <asm/pgtable.h>
16540
16541 #include <linux/smp.h>
16542 #include <linux/percpu.h>
16543@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16544
16545 desc->type = (info->read_exec_only ^ 1) << 1;
16546 desc->type |= info->contents << 2;
16547+ desc->type |= info->seg_not_present ^ 1;
16548
16549 desc->s = 1;
16550 desc->dpl = 0x3;
16551@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16552 }
16553
16554 extern struct desc_ptr idt_descr;
16555-extern gate_desc idt_table[];
16556-extern struct desc_ptr debug_idt_descr;
16557-extern gate_desc debug_idt_table[];
16558-
16559-struct gdt_page {
16560- struct desc_struct gdt[GDT_ENTRIES];
16561-} __attribute__((aligned(PAGE_SIZE)));
16562-
16563-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16564+extern gate_desc idt_table[IDT_ENTRIES];
16565+extern const struct desc_ptr debug_idt_descr;
16566+extern gate_desc debug_idt_table[IDT_ENTRIES];
16567
16568+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16569 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16570 {
16571- return per_cpu(gdt_page, cpu).gdt;
16572+ return cpu_gdt_table[cpu];
16573 }
16574
16575 #ifdef CONFIG_X86_64
16576@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16577 unsigned long base, unsigned dpl, unsigned flags,
16578 unsigned short seg)
16579 {
16580- gate->a = (seg << 16) | (base & 0xffff);
16581- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16582+ gate->gate.offset_low = base;
16583+ gate->gate.seg = seg;
16584+ gate->gate.reserved = 0;
16585+ gate->gate.type = type;
16586+ gate->gate.s = 0;
16587+ gate->gate.dpl = dpl;
16588+ gate->gate.p = 1;
16589+ gate->gate.offset_high = base >> 16;
16590 }
16591
16592 #endif
16593@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16594
16595 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16596 {
16597+ pax_open_kernel();
16598 memcpy(&idt[entry], gate, sizeof(*gate));
16599+ pax_close_kernel();
16600 }
16601
16602 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16603 {
16604+ pax_open_kernel();
16605 memcpy(&ldt[entry], desc, 8);
16606+ pax_close_kernel();
16607 }
16608
16609 static inline void
16610@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16611 default: size = sizeof(*gdt); break;
16612 }
16613
16614+ pax_open_kernel();
16615 memcpy(&gdt[entry], desc, size);
16616+ pax_close_kernel();
16617 }
16618
16619 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16620@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16621
16622 static inline void native_load_tr_desc(void)
16623 {
16624+ pax_open_kernel();
16625 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16626+ pax_close_kernel();
16627 }
16628
16629 static inline void native_load_gdt(const struct desc_ptr *dtr)
16630@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16631 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16632 unsigned int i;
16633
16634+ pax_open_kernel();
16635 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16636 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16637+ pax_close_kernel();
16638 }
16639
16640 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16641@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16642 preempt_enable();
16643 }
16644
16645-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16646+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16647 {
16648 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16649 }
16650@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16651 }
16652
16653 #ifdef CONFIG_X86_64
16654-static inline void set_nmi_gate(int gate, void *addr)
16655+static inline void set_nmi_gate(int gate, const void *addr)
16656 {
16657 gate_desc s;
16658
16659@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16660 #endif
16661
16662 #ifdef CONFIG_TRACING
16663-extern struct desc_ptr trace_idt_descr;
16664-extern gate_desc trace_idt_table[];
16665+extern const struct desc_ptr trace_idt_descr;
16666+extern gate_desc trace_idt_table[IDT_ENTRIES];
16667 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16668 {
16669 write_idt_entry(trace_idt_table, entry, gate);
16670 }
16671
16672-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16673+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16674 unsigned dpl, unsigned ist, unsigned seg)
16675 {
16676 gate_desc s;
16677@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16678 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16679 #endif
16680
16681-static inline void _set_gate(int gate, unsigned type, void *addr,
16682+static inline void _set_gate(int gate, unsigned type, const void *addr,
16683 unsigned dpl, unsigned ist, unsigned seg)
16684 {
16685 gate_desc s;
16686@@ -379,9 +392,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16687 #define set_intr_gate(n, addr) \
16688 do { \
16689 BUG_ON((unsigned)n > 0xFF); \
16690- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16691+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16692 __KERNEL_CS); \
16693- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16694+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16695 0, 0, __KERNEL_CS); \
16696 } while (0)
16697
16698@@ -409,19 +422,19 @@ static inline void alloc_system_vector(int vector)
16699 /*
16700 * This routine sets up an interrupt gate at directory privilege level 3.
16701 */
16702-static inline void set_system_intr_gate(unsigned int n, void *addr)
16703+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16704 {
16705 BUG_ON((unsigned)n > 0xFF);
16706 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16707 }
16708
16709-static inline void set_system_trap_gate(unsigned int n, void *addr)
16710+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16711 {
16712 BUG_ON((unsigned)n > 0xFF);
16713 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16714 }
16715
16716-static inline void set_trap_gate(unsigned int n, void *addr)
16717+static inline void set_trap_gate(unsigned int n, const void *addr)
16718 {
16719 BUG_ON((unsigned)n > 0xFF);
16720 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16721@@ -430,16 +443,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16722 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16723 {
16724 BUG_ON((unsigned)n > 0xFF);
16725- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16726+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16727 }
16728
16729-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16730+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16731 {
16732 BUG_ON((unsigned)n > 0xFF);
16733 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16734 }
16735
16736-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16737+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16738 {
16739 BUG_ON((unsigned)n > 0xFF);
16740 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16741@@ -511,4 +524,17 @@ static inline void load_current_idt(void)
16742 else
16743 load_idt((const struct desc_ptr *)&idt_descr);
16744 }
16745+
16746+#ifdef CONFIG_X86_32
16747+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16748+{
16749+ struct desc_struct d;
16750+
16751+ if (likely(limit))
16752+ limit = (limit - 1UL) >> PAGE_SHIFT;
16753+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16754+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16755+}
16756+#endif
16757+
16758 #endif /* _ASM_X86_DESC_H */
16759diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16760index 278441f..b95a174 100644
16761--- a/arch/x86/include/asm/desc_defs.h
16762+++ b/arch/x86/include/asm/desc_defs.h
16763@@ -31,6 +31,12 @@ struct desc_struct {
16764 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16765 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16766 };
16767+ struct {
16768+ u16 offset_low;
16769+ u16 seg;
16770+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16771+ unsigned offset_high: 16;
16772+ } gate;
16773 };
16774 } __attribute__((packed));
16775
16776diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16777index ced283a..ffe04cc 100644
16778--- a/arch/x86/include/asm/div64.h
16779+++ b/arch/x86/include/asm/div64.h
16780@@ -39,7 +39,7 @@
16781 __mod; \
16782 })
16783
16784-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16785+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16786 {
16787 union {
16788 u64 v64;
16789diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16790index ca3347a..1a5082a 100644
16791--- a/arch/x86/include/asm/elf.h
16792+++ b/arch/x86/include/asm/elf.h
16793@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16794
16795 #include <asm/vdso.h>
16796
16797-#ifdef CONFIG_X86_64
16798-extern unsigned int vdso64_enabled;
16799-#endif
16800 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16801 extern unsigned int vdso32_enabled;
16802 #endif
16803@@ -249,7 +246,25 @@ extern int force_personality32;
16804 the loader. We need to make sure that it is out of the way of the program
16805 that it will "exec", and that there is sufficient room for the brk. */
16806
16807+#ifdef CONFIG_PAX_SEGMEXEC
16808+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16809+#else
16810 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16811+#endif
16812+
16813+#ifdef CONFIG_PAX_ASLR
16814+#ifdef CONFIG_X86_32
16815+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16816+
16817+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16818+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16819+#else
16820+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16821+
16822+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16823+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16824+#endif
16825+#endif
16826
16827 /* This yields a mask that user programs can use to figure out what
16828 instruction set this CPU supports. This could be done in user space,
16829@@ -298,17 +313,13 @@ do { \
16830
16831 #define ARCH_DLINFO \
16832 do { \
16833- if (vdso64_enabled) \
16834- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16835- (unsigned long __force)current->mm->context.vdso); \
16836+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16837 } while (0)
16838
16839 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16840 #define ARCH_DLINFO_X32 \
16841 do { \
16842- if (vdso64_enabled) \
16843- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16844- (unsigned long __force)current->mm->context.vdso); \
16845+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16846 } while (0)
16847
16848 #define AT_SYSINFO 32
16849@@ -323,10 +334,10 @@ else \
16850
16851 #endif /* !CONFIG_X86_32 */
16852
16853-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16854+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16855
16856 #define VDSO_ENTRY \
16857- ((unsigned long)current->mm->context.vdso + \
16858+ (current->mm->context.vdso + \
16859 selected_vdso32->sym___kernel_vsyscall)
16860
16861 struct linux_binprm;
16862@@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16863 int uses_interp);
16864 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16865
16866-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16867-#define arch_randomize_brk arch_randomize_brk
16868-
16869 /*
16870 * True on X86_32 or when emulating IA32 on X86_64
16871 */
16872diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16873index 77a99ac..39ff7f5 100644
16874--- a/arch/x86/include/asm/emergency-restart.h
16875+++ b/arch/x86/include/asm/emergency-restart.h
16876@@ -1,6 +1,6 @@
16877 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16878 #define _ASM_X86_EMERGENCY_RESTART_H
16879
16880-extern void machine_emergency_restart(void);
16881+extern void machine_emergency_restart(void) __noreturn;
16882
16883 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16884diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16885index 1c7eefe..d0e4702 100644
16886--- a/arch/x86/include/asm/floppy.h
16887+++ b/arch/x86/include/asm/floppy.h
16888@@ -229,18 +229,18 @@ static struct fd_routine_l {
16889 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16890 } fd_routine[] = {
16891 {
16892- request_dma,
16893- free_dma,
16894- get_dma_residue,
16895- dma_mem_alloc,
16896- hard_dma_setup
16897+ ._request_dma = request_dma,
16898+ ._free_dma = free_dma,
16899+ ._get_dma_residue = get_dma_residue,
16900+ ._dma_mem_alloc = dma_mem_alloc,
16901+ ._dma_setup = hard_dma_setup
16902 },
16903 {
16904- vdma_request_dma,
16905- vdma_nop,
16906- vdma_get_dma_residue,
16907- vdma_mem_alloc,
16908- vdma_dma_setup
16909+ ._request_dma = vdma_request_dma,
16910+ ._free_dma = vdma_nop,
16911+ ._get_dma_residue = vdma_get_dma_residue,
16912+ ._dma_mem_alloc = vdma_mem_alloc,
16913+ ._dma_setup = vdma_dma_setup
16914 }
16915 };
16916
16917diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16918index 72ba21a..79f3f66 100644
16919--- a/arch/x86/include/asm/fpu-internal.h
16920+++ b/arch/x86/include/asm/fpu-internal.h
16921@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16922 #define user_insn(insn, output, input...) \
16923 ({ \
16924 int err; \
16925+ pax_open_userland(); \
16926 asm volatile(ASM_STAC "\n" \
16927- "1:" #insn "\n\t" \
16928+ "1:" \
16929+ __copyuser_seg \
16930+ #insn "\n\t" \
16931 "2: " ASM_CLAC "\n" \
16932 ".section .fixup,\"ax\"\n" \
16933 "3: movl $-1,%[err]\n" \
16934@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16935 _ASM_EXTABLE(1b, 3b) \
16936 : [err] "=r" (err), output \
16937 : "0"(0), input); \
16938+ pax_close_userland(); \
16939 err; \
16940 })
16941
16942@@ -300,7 +304,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16943 "fnclex\n\t"
16944 "emms\n\t"
16945 "fildl %P[addr]" /* set F?P to defined value */
16946- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16947+ : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16948 }
16949
16950 return fpu_restore_checking(&tsk->thread.fpu);
16951diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16952index b4c1f54..e290c08 100644
16953--- a/arch/x86/include/asm/futex.h
16954+++ b/arch/x86/include/asm/futex.h
16955@@ -12,6 +12,7 @@
16956 #include <asm/smap.h>
16957
16958 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16959+ typecheck(u32 __user *, uaddr); \
16960 asm volatile("\t" ASM_STAC "\n" \
16961 "1:\t" insn "\n" \
16962 "2:\t" ASM_CLAC "\n" \
16963@@ -20,15 +21,16 @@
16964 "\tjmp\t2b\n" \
16965 "\t.previous\n" \
16966 _ASM_EXTABLE(1b, 3b) \
16967- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16968+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16969 : "i" (-EFAULT), "0" (oparg), "1" (0))
16970
16971 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16972+ typecheck(u32 __user *, uaddr); \
16973 asm volatile("\t" ASM_STAC "\n" \
16974 "1:\tmovl %2, %0\n" \
16975 "\tmovl\t%0, %3\n" \
16976 "\t" insn "\n" \
16977- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16978+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16979 "\tjnz\t1b\n" \
16980 "3:\t" ASM_CLAC "\n" \
16981 "\t.section .fixup,\"ax\"\n" \
16982@@ -38,7 +40,7 @@
16983 _ASM_EXTABLE(1b, 4b) \
16984 _ASM_EXTABLE(2b, 4b) \
16985 : "=&a" (oldval), "=&r" (ret), \
16986- "+m" (*uaddr), "=&r" (tem) \
16987+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16988 : "r" (oparg), "i" (-EFAULT), "1" (0))
16989
16990 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16991@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16992
16993 pagefault_disable();
16994
16995+ pax_open_userland();
16996 switch (op) {
16997 case FUTEX_OP_SET:
16998- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16999+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
17000 break;
17001 case FUTEX_OP_ADD:
17002- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
17003+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
17004 uaddr, oparg);
17005 break;
17006 case FUTEX_OP_OR:
17007@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17008 default:
17009 ret = -ENOSYS;
17010 }
17011+ pax_close_userland();
17012
17013 pagefault_enable();
17014
17015diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17016index 9662290..49ca5e5 100644
17017--- a/arch/x86/include/asm/hw_irq.h
17018+++ b/arch/x86/include/asm/hw_irq.h
17019@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
17020 #endif /* CONFIG_X86_LOCAL_APIC */
17021
17022 /* Statistics */
17023-extern atomic_t irq_err_count;
17024-extern atomic_t irq_mis_count;
17025+extern atomic_unchecked_t irq_err_count;
17026+extern atomic_unchecked_t irq_mis_count;
17027
17028 /* EISA */
17029 extern void eisa_set_level_irq(unsigned int irq);
17030diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17031index ccffa53..3c90c87 100644
17032--- a/arch/x86/include/asm/i8259.h
17033+++ b/arch/x86/include/asm/i8259.h
17034@@ -62,7 +62,7 @@ struct legacy_pic {
17035 void (*init)(int auto_eoi);
17036 int (*irq_pending)(unsigned int irq);
17037 void (*make_irq)(unsigned int irq);
17038-};
17039+} __do_const;
17040
17041 extern struct legacy_pic *legacy_pic;
17042 extern struct legacy_pic null_legacy_pic;
17043diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17044index 34a5b93..27e40a6 100644
17045--- a/arch/x86/include/asm/io.h
17046+++ b/arch/x86/include/asm/io.h
17047@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17048 "m" (*(volatile type __force *)addr) barrier); }
17049
17050 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17051-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17052-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17053+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17054+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17055
17056 build_mmio_read(__readb, "b", unsigned char, "=q", )
17057-build_mmio_read(__readw, "w", unsigned short, "=r", )
17058-build_mmio_read(__readl, "l", unsigned int, "=r", )
17059+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17060+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17061
17062 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17063 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17064@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17065 * this function
17066 */
17067
17068-static inline phys_addr_t virt_to_phys(volatile void *address)
17069+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17070 {
17071 return __pa(address);
17072 }
17073@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17074 return ioremap_nocache(offset, size);
17075 }
17076
17077-extern void iounmap(volatile void __iomem *addr);
17078+extern void iounmap(const volatile void __iomem *addr);
17079
17080 extern void set_iounmap_nonlazy(void);
17081
17082@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17083
17084 #include <linux/vmalloc.h>
17085
17086+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17087+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17088+{
17089+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17090+}
17091+
17092+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17093+{
17094+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17095+}
17096+
17097 /*
17098 * Convert a virtual cached pointer to an uncached pointer
17099 */
17100diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17101index 0a8b519..80e7d5b 100644
17102--- a/arch/x86/include/asm/irqflags.h
17103+++ b/arch/x86/include/asm/irqflags.h
17104@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17105 sti; \
17106 sysexit
17107
17108+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17109+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17110+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17111+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17112+
17113 #else
17114 #define INTERRUPT_RETURN iret
17115 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17116diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17117index 4421b5d..8543006 100644
17118--- a/arch/x86/include/asm/kprobes.h
17119+++ b/arch/x86/include/asm/kprobes.h
17120@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17121 #define RELATIVEJUMP_SIZE 5
17122 #define RELATIVECALL_OPCODE 0xe8
17123 #define RELATIVE_ADDR_SIZE 4
17124-#define MAX_STACK_SIZE 64
17125-#define MIN_STACK_SIZE(ADDR) \
17126- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17127- THREAD_SIZE - (unsigned long)(ADDR))) \
17128- ? (MAX_STACK_SIZE) \
17129- : (((unsigned long)current_thread_info()) + \
17130- THREAD_SIZE - (unsigned long)(ADDR)))
17131+#define MAX_STACK_SIZE 64UL
17132+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17133
17134 #define flush_insn_slot(p) do { } while (0)
17135
17136diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17137index 4ad6560..75c7bdd 100644
17138--- a/arch/x86/include/asm/local.h
17139+++ b/arch/x86/include/asm/local.h
17140@@ -10,33 +10,97 @@ typedef struct {
17141 atomic_long_t a;
17142 } local_t;
17143
17144+typedef struct {
17145+ atomic_long_unchecked_t a;
17146+} local_unchecked_t;
17147+
17148 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17149
17150 #define local_read(l) atomic_long_read(&(l)->a)
17151+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17152 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17153+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17154
17155 static inline void local_inc(local_t *l)
17156 {
17157- asm volatile(_ASM_INC "%0"
17158+ asm volatile(_ASM_INC "%0\n"
17159+
17160+#ifdef CONFIG_PAX_REFCOUNT
17161+ "jno 0f\n"
17162+ _ASM_DEC "%0\n"
17163+ "int $4\n0:\n"
17164+ _ASM_EXTABLE(0b, 0b)
17165+#endif
17166+
17167+ : "+m" (l->a.counter));
17168+}
17169+
17170+static inline void local_inc_unchecked(local_unchecked_t *l)
17171+{
17172+ asm volatile(_ASM_INC "%0\n"
17173 : "+m" (l->a.counter));
17174 }
17175
17176 static inline void local_dec(local_t *l)
17177 {
17178- asm volatile(_ASM_DEC "%0"
17179+ asm volatile(_ASM_DEC "%0\n"
17180+
17181+#ifdef CONFIG_PAX_REFCOUNT
17182+ "jno 0f\n"
17183+ _ASM_INC "%0\n"
17184+ "int $4\n0:\n"
17185+ _ASM_EXTABLE(0b, 0b)
17186+#endif
17187+
17188+ : "+m" (l->a.counter));
17189+}
17190+
17191+static inline void local_dec_unchecked(local_unchecked_t *l)
17192+{
17193+ asm volatile(_ASM_DEC "%0\n"
17194 : "+m" (l->a.counter));
17195 }
17196
17197 static inline void local_add(long i, local_t *l)
17198 {
17199- asm volatile(_ASM_ADD "%1,%0"
17200+ asm volatile(_ASM_ADD "%1,%0\n"
17201+
17202+#ifdef CONFIG_PAX_REFCOUNT
17203+ "jno 0f\n"
17204+ _ASM_SUB "%1,%0\n"
17205+ "int $4\n0:\n"
17206+ _ASM_EXTABLE(0b, 0b)
17207+#endif
17208+
17209+ : "+m" (l->a.counter)
17210+ : "ir" (i));
17211+}
17212+
17213+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17214+{
17215+ asm volatile(_ASM_ADD "%1,%0\n"
17216 : "+m" (l->a.counter)
17217 : "ir" (i));
17218 }
17219
17220 static inline void local_sub(long i, local_t *l)
17221 {
17222- asm volatile(_ASM_SUB "%1,%0"
17223+ asm volatile(_ASM_SUB "%1,%0\n"
17224+
17225+#ifdef CONFIG_PAX_REFCOUNT
17226+ "jno 0f\n"
17227+ _ASM_ADD "%1,%0\n"
17228+ "int $4\n0:\n"
17229+ _ASM_EXTABLE(0b, 0b)
17230+#endif
17231+
17232+ : "+m" (l->a.counter)
17233+ : "ir" (i));
17234+}
17235+
17236+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17237+{
17238+ asm volatile(_ASM_SUB "%1,%0\n"
17239 : "+m" (l->a.counter)
17240 : "ir" (i));
17241 }
17242@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17243 */
17244 static inline int local_sub_and_test(long i, local_t *l)
17245 {
17246- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17247+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17248 }
17249
17250 /**
17251@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17252 */
17253 static inline int local_dec_and_test(local_t *l)
17254 {
17255- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17256+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17257 }
17258
17259 /**
17260@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17261 */
17262 static inline int local_inc_and_test(local_t *l)
17263 {
17264- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17265+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17266 }
17267
17268 /**
17269@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17270 */
17271 static inline int local_add_negative(long i, local_t *l)
17272 {
17273- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17274+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17275 }
17276
17277 /**
17278@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17279 static inline long local_add_return(long i, local_t *l)
17280 {
17281 long __i = i;
17282+ asm volatile(_ASM_XADD "%0, %1\n"
17283+
17284+#ifdef CONFIG_PAX_REFCOUNT
17285+ "jno 0f\n"
17286+ _ASM_MOV "%0,%1\n"
17287+ "int $4\n0:\n"
17288+ _ASM_EXTABLE(0b, 0b)
17289+#endif
17290+
17291+ : "+r" (i), "+m" (l->a.counter)
17292+ : : "memory");
17293+ return i + __i;
17294+}
17295+
17296+/**
17297+ * local_add_return_unchecked - add and return
17298+ * @i: integer value to add
17299+ * @l: pointer to type local_unchecked_t
17300+ *
17301+ * Atomically adds @i to @l and returns @i + @l
17302+ */
17303+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17304+{
17305+ long __i = i;
17306 asm volatile(_ASM_XADD "%0, %1;"
17307 : "+r" (i), "+m" (l->a.counter)
17308 : : "memory");
17309@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17310
17311 #define local_cmpxchg(l, o, n) \
17312 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17313+#define local_cmpxchg_unchecked(l, o, n) \
17314+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17315 /* Always has a lock prefix */
17316 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17317
17318diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17319new file mode 100644
17320index 0000000..2bfd3ba
17321--- /dev/null
17322+++ b/arch/x86/include/asm/mman.h
17323@@ -0,0 +1,15 @@
17324+#ifndef _X86_MMAN_H
17325+#define _X86_MMAN_H
17326+
17327+#include <uapi/asm/mman.h>
17328+
17329+#ifdef __KERNEL__
17330+#ifndef __ASSEMBLY__
17331+#ifdef CONFIG_X86_32
17332+#define arch_mmap_check i386_mmap_check
17333+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17334+#endif
17335+#endif
17336+#endif
17337+
17338+#endif /* X86_MMAN_H */
17339diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17340index 09b9620..923aecd 100644
17341--- a/arch/x86/include/asm/mmu.h
17342+++ b/arch/x86/include/asm/mmu.h
17343@@ -9,7 +9,7 @@
17344 * we put the segment information here.
17345 */
17346 typedef struct {
17347- void *ldt;
17348+ struct desc_struct *ldt;
17349 int size;
17350
17351 #ifdef CONFIG_X86_64
17352@@ -18,7 +18,19 @@ typedef struct {
17353 #endif
17354
17355 struct mutex lock;
17356- void __user *vdso;
17357+ unsigned long vdso;
17358+
17359+#ifdef CONFIG_X86_32
17360+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17361+ unsigned long user_cs_base;
17362+ unsigned long user_cs_limit;
17363+
17364+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17365+ cpumask_t cpu_user_cs_mask;
17366+#endif
17367+
17368+#endif
17369+#endif
17370
17371 atomic_t perf_rdpmc_allowed; /* nonzero if rdpmc is allowed */
17372 } mm_context_t;
17373diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17374index 883f6b93..6869d96 100644
17375--- a/arch/x86/include/asm/mmu_context.h
17376+++ b/arch/x86/include/asm/mmu_context.h
17377@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
17378
17379 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17380 {
17381+
17382+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17383+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17384+ unsigned int i;
17385+ pgd_t *pgd;
17386+
17387+ pax_open_kernel();
17388+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17389+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17390+ set_pgd_batched(pgd+i, native_make_pgd(0));
17391+ pax_close_kernel();
17392+ }
17393+#endif
17394+
17395 #ifdef CONFIG_SMP
17396 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17397 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17398@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17399 struct task_struct *tsk)
17400 {
17401 unsigned cpu = smp_processor_id();
17402+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17403+ int tlbstate = TLBSTATE_OK;
17404+#endif
17405
17406 if (likely(prev != next)) {
17407 #ifdef CONFIG_SMP
17408+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17409+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17410+#endif
17411 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17412 this_cpu_write(cpu_tlbstate.active_mm, next);
17413 #endif
17414 cpumask_set_cpu(cpu, mm_cpumask(next));
17415
17416 /* Re-load page tables */
17417+#ifdef CONFIG_PAX_PER_CPU_PGD
17418+ pax_open_kernel();
17419+
17420+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17421+ if (static_cpu_has(X86_FEATURE_PCID))
17422+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17423+ else
17424+#endif
17425+
17426+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17427+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17428+ pax_close_kernel();
17429+ 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));
17430+
17431+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17432+ if (static_cpu_has(X86_FEATURE_PCID)) {
17433+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17434+ u64 descriptor[2];
17435+ descriptor[0] = PCID_USER;
17436+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17437+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17438+ descriptor[0] = PCID_KERNEL;
17439+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17440+ }
17441+ } else {
17442+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17443+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17444+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17445+ else
17446+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17447+ }
17448+ } else
17449+#endif
17450+
17451+ load_cr3(get_cpu_pgd(cpu, kernel));
17452+#else
17453 load_cr3(next->pgd);
17454+#endif
17455 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17456
17457 /* Stop flush ipis for the previous mm */
17458@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17459 */
17460 if (unlikely(prev->context.ldt != next->context.ldt))
17461 load_LDT_nolock(&next->context);
17462+
17463+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17464+ if (!(__supported_pte_mask & _PAGE_NX)) {
17465+ smp_mb__before_atomic();
17466+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17467+ smp_mb__after_atomic();
17468+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17469+ }
17470+#endif
17471+
17472+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17473+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17474+ prev->context.user_cs_limit != next->context.user_cs_limit))
17475+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17476+#ifdef CONFIG_SMP
17477+ else if (unlikely(tlbstate != TLBSTATE_OK))
17478+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17479+#endif
17480+#endif
17481+
17482 }
17483+ else {
17484+
17485+#ifdef CONFIG_PAX_PER_CPU_PGD
17486+ pax_open_kernel();
17487+
17488+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17489+ if (static_cpu_has(X86_FEATURE_PCID))
17490+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17491+ else
17492+#endif
17493+
17494+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17495+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17496+ pax_close_kernel();
17497+ 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));
17498+
17499+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17500+ if (static_cpu_has(X86_FEATURE_PCID)) {
17501+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17502+ u64 descriptor[2];
17503+ descriptor[0] = PCID_USER;
17504+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17505+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17506+ descriptor[0] = PCID_KERNEL;
17507+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17508+ }
17509+ } else {
17510+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17511+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17512+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17513+ else
17514+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17515+ }
17516+ } else
17517+#endif
17518+
17519+ load_cr3(get_cpu_pgd(cpu, kernel));
17520+#endif
17521+
17522 #ifdef CONFIG_SMP
17523- else {
17524 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17525 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17526
17527@@ -103,13 +218,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17528 * tlb flush IPI delivery. We must reload CR3
17529 * to make sure to use no freed page tables.
17530 */
17531+
17532+#ifndef CONFIG_PAX_PER_CPU_PGD
17533 load_cr3(next->pgd);
17534 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17535+#endif
17536+
17537 load_mm_cr4(next);
17538 load_LDT_nolock(&next->context);
17539+
17540+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17541+ if (!(__supported_pte_mask & _PAGE_NX))
17542+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17543+#endif
17544+
17545+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17546+#ifdef CONFIG_PAX_PAGEEXEC
17547+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17548+#endif
17549+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17550+#endif
17551+
17552 }
17553+#endif
17554 }
17555-#endif
17556 }
17557
17558 #define activate_mm(prev, next) \
17559diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17560index e3b7819..b257c64 100644
17561--- a/arch/x86/include/asm/module.h
17562+++ b/arch/x86/include/asm/module.h
17563@@ -5,6 +5,7 @@
17564
17565 #ifdef CONFIG_X86_64
17566 /* X86_64 does not define MODULE_PROC_FAMILY */
17567+#define MODULE_PROC_FAMILY ""
17568 #elif defined CONFIG_M486
17569 #define MODULE_PROC_FAMILY "486 "
17570 #elif defined CONFIG_M586
17571@@ -57,8 +58,20 @@
17572 #error unknown processor family
17573 #endif
17574
17575-#ifdef CONFIG_X86_32
17576-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17577+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17578+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17579+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17580+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17581+#else
17582+#define MODULE_PAX_KERNEXEC ""
17583 #endif
17584
17585+#ifdef CONFIG_PAX_MEMORY_UDEREF
17586+#define MODULE_PAX_UDEREF "UDEREF "
17587+#else
17588+#define MODULE_PAX_UDEREF ""
17589+#endif
17590+
17591+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17592+
17593 #endif /* _ASM_X86_MODULE_H */
17594diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17595index 5f2fc44..106caa6 100644
17596--- a/arch/x86/include/asm/nmi.h
17597+++ b/arch/x86/include/asm/nmi.h
17598@@ -36,26 +36,35 @@ enum {
17599
17600 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17601
17602+struct nmiaction;
17603+
17604+struct nmiwork {
17605+ const struct nmiaction *action;
17606+ u64 max_duration;
17607+ struct irq_work irq_work;
17608+};
17609+
17610 struct nmiaction {
17611 struct list_head list;
17612 nmi_handler_t handler;
17613- u64 max_duration;
17614- struct irq_work irq_work;
17615 unsigned long flags;
17616 const char *name;
17617-};
17618+ struct nmiwork *work;
17619+} __do_const;
17620
17621 #define register_nmi_handler(t, fn, fg, n, init...) \
17622 ({ \
17623- static struct nmiaction init fn##_na = { \
17624+ static struct nmiwork fn##_nw; \
17625+ static const struct nmiaction init fn##_na = { \
17626 .handler = (fn), \
17627 .name = (n), \
17628 .flags = (fg), \
17629+ .work = &fn##_nw, \
17630 }; \
17631 __register_nmi_handler((t), &fn##_na); \
17632 })
17633
17634-int __register_nmi_handler(unsigned int, struct nmiaction *);
17635+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17636
17637 void unregister_nmi_handler(unsigned int, const char *);
17638
17639diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17640index 802dde3..9183e68 100644
17641--- a/arch/x86/include/asm/page.h
17642+++ b/arch/x86/include/asm/page.h
17643@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17644 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17645
17646 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17647+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17648
17649 #define __boot_va(x) __va(x)
17650 #define __boot_pa(x) __pa(x)
17651@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17652 * virt_to_page(kaddr) returns a valid pointer if and only if
17653 * virt_addr_valid(kaddr) returns true.
17654 */
17655-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17656 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17657 extern bool __virt_addr_valid(unsigned long kaddr);
17658 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17659
17660+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17661+#define virt_to_page(kaddr) \
17662+ ({ \
17663+ const void *__kaddr = (const void *)(kaddr); \
17664+ BUG_ON(!virt_addr_valid(__kaddr)); \
17665+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17666+ })
17667+#else
17668+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17669+#endif
17670+
17671 #endif /* __ASSEMBLY__ */
17672
17673 #include <asm-generic/memory_model.h>
17674diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17675index b3bebf9..13ac22e 100644
17676--- a/arch/x86/include/asm/page_64.h
17677+++ b/arch/x86/include/asm/page_64.h
17678@@ -7,9 +7,9 @@
17679
17680 /* duplicated to the one in bootmem.h */
17681 extern unsigned long max_pfn;
17682-extern unsigned long phys_base;
17683+extern const unsigned long phys_base;
17684
17685-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17686+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17687 {
17688 unsigned long y = x - __START_KERNEL_map;
17689
17690@@ -20,8 +20,8 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17691 }
17692
17693 #ifdef CONFIG_DEBUG_VIRTUAL
17694-extern unsigned long __phys_addr(unsigned long);
17695-extern unsigned long __phys_addr_symbol(unsigned long);
17696+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17697+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17698 #else
17699 #define __phys_addr(x) __phys_addr_nodebug(x)
17700 #define __phys_addr_symbol(x) \
17701diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17702index 965c47d..ffe0af8 100644
17703--- a/arch/x86/include/asm/paravirt.h
17704+++ b/arch/x86/include/asm/paravirt.h
17705@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17706 return (pmd_t) { ret };
17707 }
17708
17709-static inline pmdval_t pmd_val(pmd_t pmd)
17710+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17711 {
17712 pmdval_t ret;
17713
17714@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17715 val);
17716 }
17717
17718+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17719+{
17720+ pgdval_t val = native_pgd_val(pgd);
17721+
17722+ if (sizeof(pgdval_t) > sizeof(long))
17723+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17724+ val, (u64)val >> 32);
17725+ else
17726+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17727+ val);
17728+}
17729+
17730 static inline void pgd_clear(pgd_t *pgdp)
17731 {
17732 set_pgd(pgdp, __pgd(0));
17733@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17734 pv_mmu_ops.set_fixmap(idx, phys, flags);
17735 }
17736
17737+#ifdef CONFIG_PAX_KERNEXEC
17738+static inline unsigned long pax_open_kernel(void)
17739+{
17740+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17741+}
17742+
17743+static inline unsigned long pax_close_kernel(void)
17744+{
17745+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17746+}
17747+#else
17748+static inline unsigned long pax_open_kernel(void) { return 0; }
17749+static inline unsigned long pax_close_kernel(void) { return 0; }
17750+#endif
17751+
17752 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17753
17754 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17755@@ -906,7 +933,7 @@ extern void default_banner(void);
17756
17757 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17758 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17759-#define PARA_INDIRECT(addr) *%cs:addr
17760+#define PARA_INDIRECT(addr) *%ss:addr
17761 #endif
17762
17763 #define INTERRUPT_RETURN \
17764@@ -981,6 +1008,21 @@ extern void default_banner(void);
17765 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17766 CLBR_NONE, \
17767 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17768+
17769+#define GET_CR0_INTO_RDI \
17770+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17771+ mov %rax,%rdi
17772+
17773+#define SET_RDI_INTO_CR0 \
17774+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17775+
17776+#define GET_CR3_INTO_RDI \
17777+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17778+ mov %rax,%rdi
17779+
17780+#define SET_RDI_INTO_CR3 \
17781+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17782+
17783 #endif /* CONFIG_X86_32 */
17784
17785 #endif /* __ASSEMBLY__ */
17786diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17787index 7549b8b..f0edfda 100644
17788--- a/arch/x86/include/asm/paravirt_types.h
17789+++ b/arch/x86/include/asm/paravirt_types.h
17790@@ -84,7 +84,7 @@ struct pv_init_ops {
17791 */
17792 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17793 unsigned long addr, unsigned len);
17794-};
17795+} __no_const __no_randomize_layout;
17796
17797
17798 struct pv_lazy_ops {
17799@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17800 void (*enter)(void);
17801 void (*leave)(void);
17802 void (*flush)(void);
17803-};
17804+} __no_randomize_layout;
17805
17806 struct pv_time_ops {
17807 unsigned long long (*sched_clock)(void);
17808 unsigned long long (*steal_clock)(int cpu);
17809 unsigned long (*get_tsc_khz)(void);
17810-};
17811+} __no_const __no_randomize_layout;
17812
17813 struct pv_cpu_ops {
17814 /* hooks for various privileged instructions */
17815@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17816
17817 void (*start_context_switch)(struct task_struct *prev);
17818 void (*end_context_switch)(struct task_struct *next);
17819-};
17820+} __no_const __no_randomize_layout;
17821
17822 struct pv_irq_ops {
17823 /*
17824@@ -215,7 +215,7 @@ struct pv_irq_ops {
17825 #ifdef CONFIG_X86_64
17826 void (*adjust_exception_frame)(void);
17827 #endif
17828-};
17829+} __no_randomize_layout;
17830
17831 struct pv_apic_ops {
17832 #ifdef CONFIG_X86_LOCAL_APIC
17833@@ -223,7 +223,7 @@ struct pv_apic_ops {
17834 unsigned long start_eip,
17835 unsigned long start_esp);
17836 #endif
17837-};
17838+} __no_const __no_randomize_layout;
17839
17840 struct pv_mmu_ops {
17841 unsigned long (*read_cr2)(void);
17842@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17843 struct paravirt_callee_save make_pud;
17844
17845 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17846+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17847 #endif /* PAGETABLE_LEVELS == 4 */
17848 #endif /* PAGETABLE_LEVELS >= 3 */
17849
17850@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17851 an mfn. We can tell which is which from the index. */
17852 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17853 phys_addr_t phys, pgprot_t flags);
17854-};
17855+
17856+#ifdef CONFIG_PAX_KERNEXEC
17857+ unsigned long (*pax_open_kernel)(void);
17858+ unsigned long (*pax_close_kernel)(void);
17859+#endif
17860+
17861+} __no_randomize_layout;
17862
17863 struct arch_spinlock;
17864 #ifdef CONFIG_SMP
17865@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17866 struct pv_lock_ops {
17867 struct paravirt_callee_save lock_spinning;
17868 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17869-};
17870+} __no_randomize_layout;
17871
17872 /* This contains all the paravirt structures: we get a convenient
17873 * number for each function using the offset which we use to indicate
17874- * what to patch. */
17875+ * what to patch.
17876+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17877+ */
17878+
17879 struct paravirt_patch_template {
17880 struct pv_init_ops pv_init_ops;
17881 struct pv_time_ops pv_time_ops;
17882@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17883 struct pv_apic_ops pv_apic_ops;
17884 struct pv_mmu_ops pv_mmu_ops;
17885 struct pv_lock_ops pv_lock_ops;
17886-};
17887+} __no_randomize_layout;
17888
17889 extern struct pv_info pv_info;
17890 extern struct pv_init_ops pv_init_ops;
17891diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17892index c4412e9..90e88c5 100644
17893--- a/arch/x86/include/asm/pgalloc.h
17894+++ b/arch/x86/include/asm/pgalloc.h
17895@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17896 pmd_t *pmd, pte_t *pte)
17897 {
17898 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17899+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17900+}
17901+
17902+static inline void pmd_populate_user(struct mm_struct *mm,
17903+ pmd_t *pmd, pte_t *pte)
17904+{
17905+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17906 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17907 }
17908
17909@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17910
17911 #ifdef CONFIG_X86_PAE
17912 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17913+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17914+{
17915+ pud_populate(mm, pudp, pmd);
17916+}
17917 #else /* !CONFIG_X86_PAE */
17918 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17919 {
17920 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17921 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17922 }
17923+
17924+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17925+{
17926+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17927+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17928+}
17929 #endif /* CONFIG_X86_PAE */
17930
17931 #if PAGETABLE_LEVELS > 3
17932@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17933 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17934 }
17935
17936+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17937+{
17938+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17939+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17940+}
17941+
17942 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17943 {
17944 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17945diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17946index fd74a11..35fd5af 100644
17947--- a/arch/x86/include/asm/pgtable-2level.h
17948+++ b/arch/x86/include/asm/pgtable-2level.h
17949@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17950
17951 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17952 {
17953+ pax_open_kernel();
17954 *pmdp = pmd;
17955+ pax_close_kernel();
17956 }
17957
17958 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17959diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17960index cdaa58c..e61122b 100644
17961--- a/arch/x86/include/asm/pgtable-3level.h
17962+++ b/arch/x86/include/asm/pgtable-3level.h
17963@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17964
17965 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17966 {
17967+ pax_open_kernel();
17968 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17969+ pax_close_kernel();
17970 }
17971
17972 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17973 {
17974+ pax_open_kernel();
17975 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17976+ pax_close_kernel();
17977 }
17978
17979 /*
17980diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17981index a0c35bf..7045c6a 100644
17982--- a/arch/x86/include/asm/pgtable.h
17983+++ b/arch/x86/include/asm/pgtable.h
17984@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17985
17986 #ifndef __PAGETABLE_PUD_FOLDED
17987 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17988+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17989 #define pgd_clear(pgd) native_pgd_clear(pgd)
17990 #endif
17991
17992@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17993
17994 #define arch_end_context_switch(prev) do {} while(0)
17995
17996+#define pax_open_kernel() native_pax_open_kernel()
17997+#define pax_close_kernel() native_pax_close_kernel()
17998 #endif /* CONFIG_PARAVIRT */
17999
18000+#define __HAVE_ARCH_PAX_OPEN_KERNEL
18001+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18002+
18003+#ifdef CONFIG_PAX_KERNEXEC
18004+static inline unsigned long native_pax_open_kernel(void)
18005+{
18006+ unsigned long cr0;
18007+
18008+ preempt_disable();
18009+ barrier();
18010+ cr0 = read_cr0() ^ X86_CR0_WP;
18011+ BUG_ON(cr0 & X86_CR0_WP);
18012+ write_cr0(cr0);
18013+ barrier();
18014+ return cr0 ^ X86_CR0_WP;
18015+}
18016+
18017+static inline unsigned long native_pax_close_kernel(void)
18018+{
18019+ unsigned long cr0;
18020+
18021+ barrier();
18022+ cr0 = read_cr0() ^ X86_CR0_WP;
18023+ BUG_ON(!(cr0 & X86_CR0_WP));
18024+ write_cr0(cr0);
18025+ barrier();
18026+ preempt_enable_no_resched();
18027+ return cr0 ^ X86_CR0_WP;
18028+}
18029+#else
18030+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18031+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18032+#endif
18033+
18034 /*
18035 * The following only work if pte_present() is true.
18036 * Undefined behaviour if not..
18037 */
18038+static inline int pte_user(pte_t pte)
18039+{
18040+ return pte_val(pte) & _PAGE_USER;
18041+}
18042+
18043 static inline int pte_dirty(pte_t pte)
18044 {
18045 return pte_flags(pte) & _PAGE_DIRTY;
18046@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18047 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18048 }
18049
18050+static inline unsigned long pgd_pfn(pgd_t pgd)
18051+{
18052+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18053+}
18054+
18055 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18056
18057 static inline int pmd_large(pmd_t pte)
18058@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18059 return pte_clear_flags(pte, _PAGE_RW);
18060 }
18061
18062+static inline pte_t pte_mkread(pte_t pte)
18063+{
18064+ return __pte(pte_val(pte) | _PAGE_USER);
18065+}
18066+
18067 static inline pte_t pte_mkexec(pte_t pte)
18068 {
18069- return pte_clear_flags(pte, _PAGE_NX);
18070+#ifdef CONFIG_X86_PAE
18071+ if (__supported_pte_mask & _PAGE_NX)
18072+ return pte_clear_flags(pte, _PAGE_NX);
18073+ else
18074+#endif
18075+ return pte_set_flags(pte, _PAGE_USER);
18076+}
18077+
18078+static inline pte_t pte_exprotect(pte_t pte)
18079+{
18080+#ifdef CONFIG_X86_PAE
18081+ if (__supported_pte_mask & _PAGE_NX)
18082+ return pte_set_flags(pte, _PAGE_NX);
18083+ else
18084+#endif
18085+ return pte_clear_flags(pte, _PAGE_USER);
18086 }
18087
18088 static inline pte_t pte_mkdirty(pte_t pte)
18089@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18090 #endif
18091
18092 #ifndef __ASSEMBLY__
18093+
18094+#ifdef CONFIG_PAX_PER_CPU_PGD
18095+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18096+enum cpu_pgd_type {kernel = 0, user = 1};
18097+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18098+{
18099+ return cpu_pgd[cpu][type];
18100+}
18101+#endif
18102+
18103 #include <linux/mm_types.h>
18104 #include <linux/mmdebug.h>
18105 #include <linux/log2.h>
18106@@ -571,7 +648,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18107 * Currently stuck as a macro due to indirect forward reference to
18108 * linux/mmzone.h's __section_mem_map_addr() definition:
18109 */
18110-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18111+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18112
18113 /* Find an entry in the second-level page table.. */
18114 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18115@@ -611,7 +688,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18116 * Currently stuck as a macro due to indirect forward reference to
18117 * linux/mmzone.h's __section_mem_map_addr() definition:
18118 */
18119-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18120+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18121
18122 /* to find an entry in a page-table-directory. */
18123 static inline unsigned long pud_index(unsigned long address)
18124@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18125
18126 static inline int pgd_bad(pgd_t pgd)
18127 {
18128- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18129+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18130 }
18131
18132 static inline int pgd_none(pgd_t pgd)
18133@@ -649,7 +726,12 @@ static inline int pgd_none(pgd_t pgd)
18134 * pgd_offset() returns a (pgd_t *)
18135 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18136 */
18137-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18138+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18139+
18140+#ifdef CONFIG_PAX_PER_CPU_PGD
18141+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18142+#endif
18143+
18144 /*
18145 * a shortcut which implies the use of the kernel's pgd, instead
18146 * of a process's
18147@@ -660,6 +742,25 @@ static inline int pgd_none(pgd_t pgd)
18148 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18149 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18150
18151+#ifdef CONFIG_X86_32
18152+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18153+#else
18154+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18155+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18156+
18157+#ifdef CONFIG_PAX_MEMORY_UDEREF
18158+#ifdef __ASSEMBLY__
18159+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18160+#else
18161+extern unsigned long pax_user_shadow_base;
18162+extern pgdval_t clone_pgd_mask;
18163+#endif
18164+#else
18165+#define pax_user_shadow_base (0UL)
18166+#endif
18167+
18168+#endif
18169+
18170 #ifndef __ASSEMBLY__
18171
18172 extern int direct_gbpages;
18173@@ -826,11 +927,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18174 * dst and src can be on the same page, but the range must not overlap,
18175 * and must not cross a page boundary.
18176 */
18177-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18178+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18179 {
18180- memcpy(dst, src, count * sizeof(pgd_t));
18181+ pax_open_kernel();
18182+ while (count--)
18183+ *dst++ = *src++;
18184+ pax_close_kernel();
18185 }
18186
18187+#ifdef CONFIG_PAX_PER_CPU_PGD
18188+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18189+#endif
18190+
18191+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18192+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18193+#else
18194+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18195+#endif
18196+
18197 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18198 static inline int page_level_shift(enum pg_level level)
18199 {
18200diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18201index b6c0b40..3535d47 100644
18202--- a/arch/x86/include/asm/pgtable_32.h
18203+++ b/arch/x86/include/asm/pgtable_32.h
18204@@ -25,9 +25,6 @@
18205 struct mm_struct;
18206 struct vm_area_struct;
18207
18208-extern pgd_t swapper_pg_dir[1024];
18209-extern pgd_t initial_page_table[1024];
18210-
18211 static inline void pgtable_cache_init(void) { }
18212 static inline void check_pgt_cache(void) { }
18213 void paging_init(void);
18214@@ -45,6 +42,12 @@ void paging_init(void);
18215 # include <asm/pgtable-2level.h>
18216 #endif
18217
18218+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18219+extern pgd_t initial_page_table[PTRS_PER_PGD];
18220+#ifdef CONFIG_X86_PAE
18221+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18222+#endif
18223+
18224 #if defined(CONFIG_HIGHPTE)
18225 #define pte_offset_map(dir, address) \
18226 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18227@@ -59,12 +62,17 @@ void paging_init(void);
18228 /* Clear a kernel PTE and flush it from the TLB */
18229 #define kpte_clear_flush(ptep, vaddr) \
18230 do { \
18231+ pax_open_kernel(); \
18232 pte_clear(&init_mm, (vaddr), (ptep)); \
18233+ pax_close_kernel(); \
18234 __flush_tlb_one((vaddr)); \
18235 } while (0)
18236
18237 #endif /* !__ASSEMBLY__ */
18238
18239+#define HAVE_ARCH_UNMAPPED_AREA
18240+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18241+
18242 /*
18243 * kern_addr_valid() is (1) for FLATMEM and (0) for
18244 * SPARSEMEM and DISCONTIGMEM
18245diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18246index 9fb2f2b..b04b4bf 100644
18247--- a/arch/x86/include/asm/pgtable_32_types.h
18248+++ b/arch/x86/include/asm/pgtable_32_types.h
18249@@ -8,7 +8,7 @@
18250 */
18251 #ifdef CONFIG_X86_PAE
18252 # include <asm/pgtable-3level_types.h>
18253-# define PMD_SIZE (1UL << PMD_SHIFT)
18254+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18255 # define PMD_MASK (~(PMD_SIZE - 1))
18256 #else
18257 # include <asm/pgtable-2level_types.h>
18258@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18259 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18260 #endif
18261
18262+#ifdef CONFIG_PAX_KERNEXEC
18263+#ifndef __ASSEMBLY__
18264+extern unsigned char MODULES_EXEC_VADDR[];
18265+extern unsigned char MODULES_EXEC_END[];
18266+#endif
18267+#include <asm/boot.h>
18268+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18269+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18270+#else
18271+#define ktla_ktva(addr) (addr)
18272+#define ktva_ktla(addr) (addr)
18273+#endif
18274+
18275 #define MODULES_VADDR VMALLOC_START
18276 #define MODULES_END VMALLOC_END
18277 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18278diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18279index 2ee7811..55aca24 100644
18280--- a/arch/x86/include/asm/pgtable_64.h
18281+++ b/arch/x86/include/asm/pgtable_64.h
18282@@ -16,11 +16,16 @@
18283
18284 extern pud_t level3_kernel_pgt[512];
18285 extern pud_t level3_ident_pgt[512];
18286+extern pud_t level3_vmalloc_start_pgt[512];
18287+extern pud_t level3_vmalloc_end_pgt[512];
18288+extern pud_t level3_vmemmap_pgt[512];
18289+extern pud_t level2_vmemmap_pgt[512];
18290 extern pmd_t level2_kernel_pgt[512];
18291 extern pmd_t level2_fixmap_pgt[512];
18292-extern pmd_t level2_ident_pgt[512];
18293-extern pte_t level1_fixmap_pgt[512];
18294-extern pgd_t init_level4_pgt[];
18295+extern pmd_t level2_ident_pgt[2][512];
18296+extern pte_t level1_fixmap_pgt[3][512];
18297+extern pte_t level1_vsyscall_pgt[512];
18298+extern pgd_t init_level4_pgt[512];
18299
18300 #define swapper_pg_dir init_level4_pgt
18301
18302@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18303
18304 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18305 {
18306+ pax_open_kernel();
18307 *pmdp = pmd;
18308+ pax_close_kernel();
18309 }
18310
18311 static inline void native_pmd_clear(pmd_t *pmd)
18312@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18313
18314 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18315 {
18316+ pax_open_kernel();
18317 *pudp = pud;
18318+ pax_close_kernel();
18319 }
18320
18321 static inline void native_pud_clear(pud_t *pud)
18322@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18323
18324 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18325 {
18326+ pax_open_kernel();
18327+ *pgdp = pgd;
18328+ pax_close_kernel();
18329+}
18330+
18331+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18332+{
18333 *pgdp = pgd;
18334 }
18335
18336diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18337index 602b602..acb53ed 100644
18338--- a/arch/x86/include/asm/pgtable_64_types.h
18339+++ b/arch/x86/include/asm/pgtable_64_types.h
18340@@ -61,11 +61,16 @@ typedef struct { pteval_t pte; } pte_t;
18341 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18342 #define MODULES_END _AC(0xffffffffff000000, UL)
18343 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18344+#define MODULES_EXEC_VADDR MODULES_VADDR
18345+#define MODULES_EXEC_END MODULES_END
18346 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18347 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18348 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18349 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18350
18351+#define ktla_ktva(addr) (addr)
18352+#define ktva_ktla(addr) (addr)
18353+
18354 #define EARLY_DYNAMIC_PAGE_TABLES 64
18355
18356 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18357diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18358index 8c7c108..1c1b77f 100644
18359--- a/arch/x86/include/asm/pgtable_types.h
18360+++ b/arch/x86/include/asm/pgtable_types.h
18361@@ -85,8 +85,10 @@
18362
18363 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18364 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18365-#else
18366+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18367 #define _PAGE_NX (_AT(pteval_t, 0))
18368+#else
18369+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18370 #endif
18371
18372 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
18373@@ -141,6 +143,9 @@ enum page_cache_mode {
18374 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18375 _PAGE_ACCESSED)
18376
18377+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18378+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18379+
18380 #define __PAGE_KERNEL_EXEC \
18381 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18382 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18383@@ -148,7 +153,7 @@ enum page_cache_mode {
18384 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18385 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18386 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18387-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18388+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18389 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18390 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18391 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18392@@ -194,7 +199,7 @@ enum page_cache_mode {
18393 #ifdef CONFIG_X86_64
18394 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18395 #else
18396-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18397+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18398 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18399 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18400 #endif
18401@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18402 {
18403 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18404 }
18405+#endif
18406
18407+#if PAGETABLE_LEVELS == 3
18408+#include <asm-generic/pgtable-nopud.h>
18409+#endif
18410+
18411+#if PAGETABLE_LEVELS == 2
18412+#include <asm-generic/pgtable-nopmd.h>
18413+#endif
18414+
18415+#ifndef __ASSEMBLY__
18416 #if PAGETABLE_LEVELS > 3
18417 typedef struct { pudval_t pud; } pud_t;
18418
18419@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18420 return pud.pud;
18421 }
18422 #else
18423-#include <asm-generic/pgtable-nopud.h>
18424-
18425 static inline pudval_t native_pud_val(pud_t pud)
18426 {
18427 return native_pgd_val(pud.pgd);
18428@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18429 return pmd.pmd;
18430 }
18431 #else
18432-#include <asm-generic/pgtable-nopmd.h>
18433-
18434 static inline pmdval_t native_pmd_val(pmd_t pmd)
18435 {
18436 return native_pgd_val(pmd.pud.pgd);
18437@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
18438
18439 extern pteval_t __supported_pte_mask;
18440 extern void set_nx(void);
18441-extern int nx_enabled;
18442
18443 #define pgprot_writecombine pgprot_writecombine
18444 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18445diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18446index 8f327184..368fb29 100644
18447--- a/arch/x86/include/asm/preempt.h
18448+++ b/arch/x86/include/asm/preempt.h
18449@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18450 */
18451 static __always_inline bool __preempt_count_dec_and_test(void)
18452 {
18453- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18454+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18455 }
18456
18457 /*
18458diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18459index ec1c935..5cc6023 100644
18460--- a/arch/x86/include/asm/processor.h
18461+++ b/arch/x86/include/asm/processor.h
18462@@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18463 /* Index into per_cpu list: */
18464 u16 cpu_index;
18465 u32 microcode;
18466-};
18467+} __randomize_layout;
18468
18469 #define X86_VENDOR_INTEL 0
18470 #define X86_VENDOR_CYRIX 1
18471@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18472 : "memory");
18473 }
18474
18475+/* invpcid (%rdx),%rax */
18476+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18477+
18478+#define INVPCID_SINGLE_ADDRESS 0UL
18479+#define INVPCID_SINGLE_CONTEXT 1UL
18480+#define INVPCID_ALL_GLOBAL 2UL
18481+#define INVPCID_ALL_NONGLOBAL 3UL
18482+
18483+#define PCID_KERNEL 0UL
18484+#define PCID_USER 1UL
18485+#define PCID_NOFLUSH (1UL << 63)
18486+
18487 static inline void load_cr3(pgd_t *pgdir)
18488 {
18489- write_cr3(__pa(pgdir));
18490+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18491 }
18492
18493 #ifdef CONFIG_X86_32
18494@@ -282,7 +294,7 @@ struct tss_struct {
18495
18496 } ____cacheline_aligned;
18497
18498-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18499+extern struct tss_struct init_tss[NR_CPUS];
18500
18501 /*
18502 * Save the original ist values for checking stack pointers during debugging
18503@@ -479,6 +491,7 @@ struct thread_struct {
18504 unsigned short ds;
18505 unsigned short fsindex;
18506 unsigned short gsindex;
18507+ unsigned short ss;
18508 #endif
18509 #ifdef CONFIG_X86_32
18510 unsigned long ip;
18511@@ -805,11 +818,18 @@ static inline void spin_lock_prefetch(const void *x)
18512 */
18513 #define TASK_SIZE PAGE_OFFSET
18514 #define TASK_SIZE_MAX TASK_SIZE
18515+
18516+#ifdef CONFIG_PAX_SEGMEXEC
18517+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18518+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18519+#else
18520 #define STACK_TOP TASK_SIZE
18521-#define STACK_TOP_MAX STACK_TOP
18522+#endif
18523+
18524+#define STACK_TOP_MAX TASK_SIZE
18525
18526 #define INIT_THREAD { \
18527- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18528+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18529 .vm86_info = NULL, \
18530 .sysenter_cs = __KERNEL_CS, \
18531 .io_bitmap_ptr = NULL, \
18532@@ -823,7 +843,7 @@ static inline void spin_lock_prefetch(const void *x)
18533 */
18534 #define INIT_TSS { \
18535 .x86_tss = { \
18536- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18537+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18538 .ss0 = __KERNEL_DS, \
18539 .ss1 = __KERNEL_CS, \
18540 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18541@@ -834,11 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18542 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18543
18544 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18545-#define KSTK_TOP(info) \
18546-({ \
18547- unsigned long *__ptr = (unsigned long *)(info); \
18548- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18549-})
18550+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18551
18552 /*
18553 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18554@@ -853,7 +869,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18555 #define task_pt_regs(task) \
18556 ({ \
18557 struct pt_regs *__regs__; \
18558- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18559+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18560 __regs__ - 1; \
18561 })
18562
18563@@ -869,13 +885,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18564 * particular problem by preventing anything from being mapped
18565 * at the maximum canonical address.
18566 */
18567-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18568+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18569
18570 /* This decides where the kernel will search for a free chunk of vm
18571 * space during mmap's.
18572 */
18573 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18574- 0xc0000000 : 0xFFFFe000)
18575+ 0xc0000000 : 0xFFFFf000)
18576
18577 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18578 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18579@@ -886,11 +902,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18580 #define STACK_TOP_MAX TASK_SIZE_MAX
18581
18582 #define INIT_THREAD { \
18583- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18584+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18585 }
18586
18587 #define INIT_TSS { \
18588- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18589+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18590 }
18591
18592 /*
18593@@ -918,6 +934,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18594 */
18595 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18596
18597+#ifdef CONFIG_PAX_SEGMEXEC
18598+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18599+#endif
18600+
18601 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18602
18603 /* Get/set a process' ability to use the timestamp counter instruction */
18604@@ -962,7 +982,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18605 return 0;
18606 }
18607
18608-extern unsigned long arch_align_stack(unsigned long sp);
18609+#define arch_align_stack(x) ((x) & ~0xfUL)
18610 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18611
18612 void default_idle(void);
18613@@ -972,6 +992,6 @@ bool xen_set_default_idle(void);
18614 #define xen_set_default_idle 0
18615 #endif
18616
18617-void stop_this_cpu(void *dummy);
18618+void stop_this_cpu(void *dummy) __noreturn;
18619 void df_debug(struct pt_regs *regs, long error_code);
18620 #endif /* _ASM_X86_PROCESSOR_H */
18621diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18622index 86fc2bb..bd5049a 100644
18623--- a/arch/x86/include/asm/ptrace.h
18624+++ b/arch/x86/include/asm/ptrace.h
18625@@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18626 }
18627
18628 /*
18629- * user_mode_vm(regs) determines whether a register set came from user mode.
18630+ * user_mode(regs) determines whether a register set came from user mode.
18631 * This is true if V8086 mode was enabled OR if the register set was from
18632 * protected mode with RPL-3 CS value. This tricky test checks that with
18633 * one comparison. Many places in the kernel can bypass this full check
18634- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18635+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18636+ * be used.
18637 */
18638-static inline int user_mode(struct pt_regs *regs)
18639+static inline int user_mode_novm(struct pt_regs *regs)
18640 {
18641 #ifdef CONFIG_X86_32
18642 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18643 #else
18644- return !!(regs->cs & 3);
18645+ return !!(regs->cs & SEGMENT_RPL_MASK);
18646 #endif
18647 }
18648
18649-static inline int user_mode_vm(struct pt_regs *regs)
18650+static inline int user_mode(struct pt_regs *regs)
18651 {
18652 #ifdef CONFIG_X86_32
18653 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18654 USER_RPL;
18655 #else
18656- return user_mode(regs);
18657+ return user_mode_novm(regs);
18658 #endif
18659 }
18660
18661@@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18662 #ifdef CONFIG_X86_64
18663 static inline bool user_64bit_mode(struct pt_regs *regs)
18664 {
18665+ unsigned long cs = regs->cs & 0xffff;
18666 #ifndef CONFIG_PARAVIRT
18667 /*
18668 * On non-paravirt systems, this is the only long mode CPL 3
18669 * selector. We do not allow long mode selectors in the LDT.
18670 */
18671- return regs->cs == __USER_CS;
18672+ return cs == __USER_CS;
18673 #else
18674 /* Headers are too twisted for this to go in paravirt.h. */
18675- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18676+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18677 #endif
18678 }
18679
18680@@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18681 * Traps from the kernel do not save sp and ss.
18682 * Use the helper function to retrieve sp.
18683 */
18684- if (offset == offsetof(struct pt_regs, sp) &&
18685- regs->cs == __KERNEL_CS)
18686- return kernel_stack_pointer(regs);
18687+ if (offset == offsetof(struct pt_regs, sp)) {
18688+ unsigned long cs = regs->cs & 0xffff;
18689+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18690+ return kernel_stack_pointer(regs);
18691+ }
18692 #endif
18693 return *(unsigned long *)((unsigned long)regs + offset);
18694 }
18695diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18696index ae0e241..e80b10b 100644
18697--- a/arch/x86/include/asm/qrwlock.h
18698+++ b/arch/x86/include/asm/qrwlock.h
18699@@ -7,8 +7,8 @@
18700 #define queue_write_unlock queue_write_unlock
18701 static inline void queue_write_unlock(struct qrwlock *lock)
18702 {
18703- barrier();
18704- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18705+ barrier();
18706+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18707 }
18708 #endif
18709
18710diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18711index 9c6b890..5305f53 100644
18712--- a/arch/x86/include/asm/realmode.h
18713+++ b/arch/x86/include/asm/realmode.h
18714@@ -22,16 +22,14 @@ struct real_mode_header {
18715 #endif
18716 /* APM/BIOS reboot */
18717 u32 machine_real_restart_asm;
18718-#ifdef CONFIG_X86_64
18719 u32 machine_real_restart_seg;
18720-#endif
18721 };
18722
18723 /* This must match data at trampoline_32/64.S */
18724 struct trampoline_header {
18725 #ifdef CONFIG_X86_32
18726 u32 start;
18727- u16 gdt_pad;
18728+ u16 boot_cs;
18729 u16 gdt_limit;
18730 u32 gdt_base;
18731 #else
18732diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18733index a82c4f1..ac45053 100644
18734--- a/arch/x86/include/asm/reboot.h
18735+++ b/arch/x86/include/asm/reboot.h
18736@@ -6,13 +6,13 @@
18737 struct pt_regs;
18738
18739 struct machine_ops {
18740- void (*restart)(char *cmd);
18741- void (*halt)(void);
18742- void (*power_off)(void);
18743+ void (* __noreturn restart)(char *cmd);
18744+ void (* __noreturn halt)(void);
18745+ void (* __noreturn power_off)(void);
18746 void (*shutdown)(void);
18747 void (*crash_shutdown)(struct pt_regs *);
18748- void (*emergency_restart)(void);
18749-};
18750+ void (* __noreturn emergency_restart)(void);
18751+} __no_const;
18752
18753 extern struct machine_ops machine_ops;
18754
18755diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18756index 8f7866a..e442f20 100644
18757--- a/arch/x86/include/asm/rmwcc.h
18758+++ b/arch/x86/include/asm/rmwcc.h
18759@@ -3,7 +3,34 @@
18760
18761 #ifdef CC_HAVE_ASM_GOTO
18762
18763-#define __GEN_RMWcc(fullop, var, cc, ...) \
18764+#ifdef CONFIG_PAX_REFCOUNT
18765+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18766+do { \
18767+ asm_volatile_goto (fullop \
18768+ ";jno 0f\n" \
18769+ fullantiop \
18770+ ";int $4\n0:\n" \
18771+ _ASM_EXTABLE(0b, 0b) \
18772+ ";j" cc " %l[cc_label]" \
18773+ : : "m" (var), ## __VA_ARGS__ \
18774+ : "memory" : cc_label); \
18775+ return 0; \
18776+cc_label: \
18777+ return 1; \
18778+} while (0)
18779+#else
18780+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18781+do { \
18782+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18783+ : : "m" (var), ## __VA_ARGS__ \
18784+ : "memory" : cc_label); \
18785+ return 0; \
18786+cc_label: \
18787+ return 1; \
18788+} while (0)
18789+#endif
18790+
18791+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18792 do { \
18793 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18794 : : "m" (var), ## __VA_ARGS__ \
18795@@ -13,15 +40,46 @@ cc_label: \
18796 return 1; \
18797 } while (0)
18798
18799-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18800- __GEN_RMWcc(op " " arg0, var, cc)
18801+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18802+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18803
18804-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18805- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18806+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18807+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18808+
18809+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18810+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18811+
18812+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18813+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18814
18815 #else /* !CC_HAVE_ASM_GOTO */
18816
18817-#define __GEN_RMWcc(fullop, var, cc, ...) \
18818+#ifdef CONFIG_PAX_REFCOUNT
18819+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18820+do { \
18821+ char c; \
18822+ asm volatile (fullop \
18823+ ";jno 0f\n" \
18824+ fullantiop \
18825+ ";int $4\n0:\n" \
18826+ _ASM_EXTABLE(0b, 0b) \
18827+ "; set" cc " %1" \
18828+ : "+m" (var), "=qm" (c) \
18829+ : __VA_ARGS__ : "memory"); \
18830+ return c != 0; \
18831+} while (0)
18832+#else
18833+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18834+do { \
18835+ char c; \
18836+ asm volatile (fullop "; set" cc " %1" \
18837+ : "+m" (var), "=qm" (c) \
18838+ : __VA_ARGS__ : "memory"); \
18839+ return c != 0; \
18840+} while (0)
18841+#endif
18842+
18843+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18844 do { \
18845 char c; \
18846 asm volatile (fullop "; set" cc " %1" \
18847@@ -30,11 +88,17 @@ do { \
18848 return c != 0; \
18849 } while (0)
18850
18851-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18852- __GEN_RMWcc(op " " arg0, var, cc)
18853+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18854+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18855+
18856+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18857+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18858+
18859+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18860+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18861
18862-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18863- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18864+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18865+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18866
18867 #endif /* CC_HAVE_ASM_GOTO */
18868
18869diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18870index cad82c9..2e5c5c1 100644
18871--- a/arch/x86/include/asm/rwsem.h
18872+++ b/arch/x86/include/asm/rwsem.h
18873@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18874 {
18875 asm volatile("# beginning down_read\n\t"
18876 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18877+
18878+#ifdef CONFIG_PAX_REFCOUNT
18879+ "jno 0f\n"
18880+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18881+ "int $4\n0:\n"
18882+ _ASM_EXTABLE(0b, 0b)
18883+#endif
18884+
18885 /* adds 0x00000001 */
18886 " jns 1f\n"
18887 " call call_rwsem_down_read_failed\n"
18888@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18889 "1:\n\t"
18890 " mov %1,%2\n\t"
18891 " add %3,%2\n\t"
18892+
18893+#ifdef CONFIG_PAX_REFCOUNT
18894+ "jno 0f\n"
18895+ "sub %3,%2\n"
18896+ "int $4\n0:\n"
18897+ _ASM_EXTABLE(0b, 0b)
18898+#endif
18899+
18900 " jle 2f\n\t"
18901 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18902 " jnz 1b\n\t"
18903@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18904 long tmp;
18905 asm volatile("# beginning down_write\n\t"
18906 LOCK_PREFIX " xadd %1,(%2)\n\t"
18907+
18908+#ifdef CONFIG_PAX_REFCOUNT
18909+ "jno 0f\n"
18910+ "mov %1,(%2)\n"
18911+ "int $4\n0:\n"
18912+ _ASM_EXTABLE(0b, 0b)
18913+#endif
18914+
18915 /* adds 0xffff0001, returns the old value */
18916 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18917 /* was the active mask 0 before? */
18918@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18919 long tmp;
18920 asm volatile("# beginning __up_read\n\t"
18921 LOCK_PREFIX " xadd %1,(%2)\n\t"
18922+
18923+#ifdef CONFIG_PAX_REFCOUNT
18924+ "jno 0f\n"
18925+ "mov %1,(%2)\n"
18926+ "int $4\n0:\n"
18927+ _ASM_EXTABLE(0b, 0b)
18928+#endif
18929+
18930 /* subtracts 1, returns the old value */
18931 " jns 1f\n\t"
18932 " call call_rwsem_wake\n" /* expects old value in %edx */
18933@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18934 long tmp;
18935 asm volatile("# beginning __up_write\n\t"
18936 LOCK_PREFIX " xadd %1,(%2)\n\t"
18937+
18938+#ifdef CONFIG_PAX_REFCOUNT
18939+ "jno 0f\n"
18940+ "mov %1,(%2)\n"
18941+ "int $4\n0:\n"
18942+ _ASM_EXTABLE(0b, 0b)
18943+#endif
18944+
18945 /* subtracts 0xffff0001, returns the old value */
18946 " jns 1f\n\t"
18947 " call call_rwsem_wake\n" /* expects old value in %edx */
18948@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18949 {
18950 asm volatile("# beginning __downgrade_write\n\t"
18951 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18952+
18953+#ifdef CONFIG_PAX_REFCOUNT
18954+ "jno 0f\n"
18955+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18956+ "int $4\n0:\n"
18957+ _ASM_EXTABLE(0b, 0b)
18958+#endif
18959+
18960 /*
18961 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18962 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18963@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18964 */
18965 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18966 {
18967- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18968+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18969+
18970+#ifdef CONFIG_PAX_REFCOUNT
18971+ "jno 0f\n"
18972+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18973+ "int $4\n0:\n"
18974+ _ASM_EXTABLE(0b, 0b)
18975+#endif
18976+
18977 : "+m" (sem->count)
18978 : "er" (delta));
18979 }
18980@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18981 */
18982 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18983 {
18984- return delta + xadd(&sem->count, delta);
18985+ return delta + xadd_check_overflow(&sem->count, delta);
18986 }
18987
18988 #endif /* __KERNEL__ */
18989diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18990index db257a5..b91bc77 100644
18991--- a/arch/x86/include/asm/segment.h
18992+++ b/arch/x86/include/asm/segment.h
18993@@ -73,10 +73,15 @@
18994 * 26 - ESPFIX small SS
18995 * 27 - per-cpu [ offset to per-cpu data area ]
18996 * 28 - stack_canary-20 [ for stack protector ]
18997- * 29 - unused
18998- * 30 - unused
18999+ * 29 - PCI BIOS CS
19000+ * 30 - PCI BIOS DS
19001 * 31 - TSS for double fault handler
19002 */
19003+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19004+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19005+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19006+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19007+
19008 #define GDT_ENTRY_TLS_MIN 6
19009 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19010
19011@@ -88,6 +93,8 @@
19012
19013 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19014
19015+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19016+
19017 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19018
19019 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19020@@ -113,6 +120,12 @@
19021 #define __KERNEL_STACK_CANARY 0
19022 #endif
19023
19024+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19025+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19026+
19027+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19028+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19029+
19030 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19031
19032 /*
19033@@ -140,7 +153,7 @@
19034 */
19035
19036 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19037-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19038+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19039
19040
19041 #else
19042@@ -164,6 +177,8 @@
19043 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19044 #define __USER32_DS __USER_DS
19045
19046+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19047+
19048 #define GDT_ENTRY_TSS 8 /* needs two entries */
19049 #define GDT_ENTRY_LDT 10 /* needs two entries */
19050 #define GDT_ENTRY_TLS_MIN 12
19051@@ -172,6 +187,8 @@
19052 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19053 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19054
19055+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19056+
19057 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19058 #define FS_TLS 0
19059 #define GS_TLS 1
19060@@ -179,12 +196,14 @@
19061 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19062 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19063
19064-#define GDT_ENTRIES 16
19065+#define GDT_ENTRIES 17
19066
19067 #endif
19068
19069 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19070+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19071 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19072+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19073 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19074 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19075 #ifndef CONFIG_PARAVIRT
19076@@ -256,7 +275,7 @@ static inline unsigned long get_limit(unsigned long segment)
19077 {
19078 unsigned long __limit;
19079 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19080- return __limit + 1;
19081+ return __limit;
19082 }
19083
19084 #endif /* !__ASSEMBLY__ */
19085diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19086index 8d3120f..352b440 100644
19087--- a/arch/x86/include/asm/smap.h
19088+++ b/arch/x86/include/asm/smap.h
19089@@ -25,11 +25,40 @@
19090
19091 #include <asm/alternative-asm.h>
19092
19093+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19094+#define ASM_PAX_OPEN_USERLAND \
19095+ 661: jmp 663f; \
19096+ .pushsection .altinstr_replacement, "a" ; \
19097+ 662: pushq %rax; nop; \
19098+ .popsection ; \
19099+ .pushsection .altinstructions, "a" ; \
19100+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19101+ .popsection ; \
19102+ call __pax_open_userland; \
19103+ popq %rax; \
19104+ 663:
19105+
19106+#define ASM_PAX_CLOSE_USERLAND \
19107+ 661: jmp 663f; \
19108+ .pushsection .altinstr_replacement, "a" ; \
19109+ 662: pushq %rax; nop; \
19110+ .popsection; \
19111+ .pushsection .altinstructions, "a" ; \
19112+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19113+ .popsection; \
19114+ call __pax_close_userland; \
19115+ popq %rax; \
19116+ 663:
19117+#else
19118+#define ASM_PAX_OPEN_USERLAND
19119+#define ASM_PAX_CLOSE_USERLAND
19120+#endif
19121+
19122 #ifdef CONFIG_X86_SMAP
19123
19124 #define ASM_CLAC \
19125 661: ASM_NOP3 ; \
19126- .pushsection .altinstr_replacement, "ax" ; \
19127+ .pushsection .altinstr_replacement, "a" ; \
19128 662: __ASM_CLAC ; \
19129 .popsection ; \
19130 .pushsection .altinstructions, "a" ; \
19131@@ -38,7 +67,7 @@
19132
19133 #define ASM_STAC \
19134 661: ASM_NOP3 ; \
19135- .pushsection .altinstr_replacement, "ax" ; \
19136+ .pushsection .altinstr_replacement, "a" ; \
19137 662: __ASM_STAC ; \
19138 .popsection ; \
19139 .pushsection .altinstructions, "a" ; \
19140@@ -56,6 +85,37 @@
19141
19142 #include <asm/alternative.h>
19143
19144+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19145+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19146+
19147+extern void __pax_open_userland(void);
19148+static __always_inline unsigned long pax_open_userland(void)
19149+{
19150+
19151+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19152+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19153+ :
19154+ : [open] "i" (__pax_open_userland)
19155+ : "memory", "rax");
19156+#endif
19157+
19158+ return 0;
19159+}
19160+
19161+extern void __pax_close_userland(void);
19162+static __always_inline unsigned long pax_close_userland(void)
19163+{
19164+
19165+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19166+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19167+ :
19168+ : [close] "i" (__pax_close_userland)
19169+ : "memory", "rax");
19170+#endif
19171+
19172+ return 0;
19173+}
19174+
19175 #ifdef CONFIG_X86_SMAP
19176
19177 static __always_inline void clac(void)
19178diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19179index 8cd1cc3..827e09e 100644
19180--- a/arch/x86/include/asm/smp.h
19181+++ b/arch/x86/include/asm/smp.h
19182@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19183 /* cpus sharing the last level cache: */
19184 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19185 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19186-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19187+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19188
19189 static inline struct cpumask *cpu_sibling_mask(int cpu)
19190 {
19191@@ -78,7 +78,7 @@ struct smp_ops {
19192
19193 void (*send_call_func_ipi)(const struct cpumask *mask);
19194 void (*send_call_func_single_ipi)(int cpu);
19195-};
19196+} __no_const;
19197
19198 /* Globals due to paravirt */
19199 extern void set_cpu_sibling_map(int cpu);
19200@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19201 extern int safe_smp_processor_id(void);
19202
19203 #elif defined(CONFIG_X86_64_SMP)
19204-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19205-
19206-#define stack_smp_processor_id() \
19207-({ \
19208- struct thread_info *ti; \
19209- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19210- ti->cpu; \
19211-})
19212+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19213+#define stack_smp_processor_id() raw_smp_processor_id()
19214 #define safe_smp_processor_id() smp_processor_id()
19215
19216 #endif
19217diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19218index 6a99859..03cb807 100644
19219--- a/arch/x86/include/asm/stackprotector.h
19220+++ b/arch/x86/include/asm/stackprotector.h
19221@@ -47,7 +47,7 @@
19222 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19223 */
19224 #define GDT_STACK_CANARY_INIT \
19225- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19226+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19227
19228 /*
19229 * Initialize the stackprotector canary value.
19230@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19231
19232 static inline void load_stack_canary_segment(void)
19233 {
19234-#ifdef CONFIG_X86_32
19235+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19236 asm volatile ("mov %0, %%gs" : : "r" (0));
19237 #endif
19238 }
19239diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19240index 70bbe39..4ae2bd4 100644
19241--- a/arch/x86/include/asm/stacktrace.h
19242+++ b/arch/x86/include/asm/stacktrace.h
19243@@ -11,28 +11,20 @@
19244
19245 extern int kstack_depth_to_print;
19246
19247-struct thread_info;
19248+struct task_struct;
19249 struct stacktrace_ops;
19250
19251-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19252- unsigned long *stack,
19253- unsigned long bp,
19254- const struct stacktrace_ops *ops,
19255- void *data,
19256- unsigned long *end,
19257- int *graph);
19258+typedef unsigned long walk_stack_t(struct task_struct *task,
19259+ void *stack_start,
19260+ unsigned long *stack,
19261+ unsigned long bp,
19262+ const struct stacktrace_ops *ops,
19263+ void *data,
19264+ unsigned long *end,
19265+ int *graph);
19266
19267-extern unsigned long
19268-print_context_stack(struct thread_info *tinfo,
19269- unsigned long *stack, unsigned long bp,
19270- const struct stacktrace_ops *ops, void *data,
19271- unsigned long *end, int *graph);
19272-
19273-extern unsigned long
19274-print_context_stack_bp(struct thread_info *tinfo,
19275- unsigned long *stack, unsigned long bp,
19276- const struct stacktrace_ops *ops, void *data,
19277- unsigned long *end, int *graph);
19278+extern walk_stack_t print_context_stack;
19279+extern walk_stack_t print_context_stack_bp;
19280
19281 /* Generic stack tracer with callbacks */
19282
19283@@ -40,7 +32,7 @@ struct stacktrace_ops {
19284 void (*address)(void *data, unsigned long address, int reliable);
19285 /* On negative return stop dumping */
19286 int (*stack)(void *data, char *name);
19287- walk_stack_t walk_stack;
19288+ walk_stack_t *walk_stack;
19289 };
19290
19291 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19292diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19293index 751bf4b..a1278b5 100644
19294--- a/arch/x86/include/asm/switch_to.h
19295+++ b/arch/x86/include/asm/switch_to.h
19296@@ -112,7 +112,7 @@ do { \
19297 "call __switch_to\n\t" \
19298 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19299 __switch_canary \
19300- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19301+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19302 "movq %%rax,%%rdi\n\t" \
19303 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19304 "jnz ret_from_fork\n\t" \
19305@@ -123,7 +123,7 @@ do { \
19306 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19307 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19308 [_tif_fork] "i" (_TIF_FORK), \
19309- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19310+ [thread_info] "m" (current_tinfo), \
19311 [current_task] "m" (current_task) \
19312 __switch_canary_iparam \
19313 : "memory", "cc" __EXTRA_CLOBBER)
19314diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19315index 1d4e4f2..506db18 100644
19316--- a/arch/x86/include/asm/thread_info.h
19317+++ b/arch/x86/include/asm/thread_info.h
19318@@ -24,7 +24,6 @@ struct exec_domain;
19319 #include <linux/atomic.h>
19320
19321 struct thread_info {
19322- struct task_struct *task; /* main task structure */
19323 struct exec_domain *exec_domain; /* execution domain */
19324 __u32 flags; /* low level flags */
19325 __u32 status; /* thread synchronous flags */
19326@@ -32,13 +31,13 @@ struct thread_info {
19327 int saved_preempt_count;
19328 mm_segment_t addr_limit;
19329 void __user *sysenter_return;
19330+ unsigned long lowest_stack;
19331 unsigned int sig_on_uaccess_error:1;
19332 unsigned int uaccess_err:1; /* uaccess failed */
19333 };
19334
19335-#define INIT_THREAD_INFO(tsk) \
19336+#define INIT_THREAD_INFO \
19337 { \
19338- .task = &tsk, \
19339 .exec_domain = &default_exec_domain, \
19340 .flags = 0, \
19341 .cpu = 0, \
19342@@ -46,7 +45,7 @@ struct thread_info {
19343 .addr_limit = KERNEL_DS, \
19344 }
19345
19346-#define init_thread_info (init_thread_union.thread_info)
19347+#define init_thread_info (init_thread_union.stack)
19348 #define init_stack (init_thread_union.stack)
19349
19350 #else /* !__ASSEMBLY__ */
19351@@ -86,6 +85,7 @@ struct thread_info {
19352 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19353 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19354 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19355+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19356
19357 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19358 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19359@@ -109,17 +109,18 @@ struct thread_info {
19360 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19361 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19362 #define _TIF_X32 (1 << TIF_X32)
19363+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19364
19365 /* work to do in syscall_trace_enter() */
19366 #define _TIF_WORK_SYSCALL_ENTRY \
19367 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19368 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19369- _TIF_NOHZ)
19370+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19371
19372 /* work to do in syscall_trace_leave() */
19373 #define _TIF_WORK_SYSCALL_EXIT \
19374 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19375- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19376+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19377
19378 /* work to do on interrupt/exception return */
19379 #define _TIF_WORK_MASK \
19380@@ -130,7 +131,7 @@ struct thread_info {
19381 /* work to do on any return to user space */
19382 #define _TIF_ALLWORK_MASK \
19383 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19384- _TIF_NOHZ)
19385+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19386
19387 /* Only used for 64 bit */
19388 #define _TIF_DO_NOTIFY_MASK \
19389@@ -145,7 +146,6 @@ struct thread_info {
19390 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19391
19392 #define STACK_WARN (THREAD_SIZE/8)
19393-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19394
19395 /*
19396 * macros/functions for gaining access to the thread information structure
19397@@ -156,12 +156,11 @@ struct thread_info {
19398
19399 DECLARE_PER_CPU(unsigned long, kernel_stack);
19400
19401+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19402+
19403 static inline struct thread_info *current_thread_info(void)
19404 {
19405- struct thread_info *ti;
19406- ti = (void *)(this_cpu_read_stable(kernel_stack) +
19407- KERNEL_STACK_OFFSET - THREAD_SIZE);
19408- return ti;
19409+ return this_cpu_read_stable(current_tinfo);
19410 }
19411
19412 static inline unsigned long current_stack_pointer(void)
19413@@ -179,14 +178,7 @@ static inline unsigned long current_stack_pointer(void)
19414
19415 /* how to get the thread information struct from ASM */
19416 #define GET_THREAD_INFO(reg) \
19417- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19418- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19419-
19420-/*
19421- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19422- * a certain register (to be used in assembler memory operands).
19423- */
19424-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19425+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19426
19427 #endif
19428
19429@@ -242,5 +234,12 @@ static inline bool is_ia32_task(void)
19430 extern void arch_task_cache_init(void);
19431 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19432 extern void arch_release_task_struct(struct task_struct *tsk);
19433+
19434+#define __HAVE_THREAD_FUNCTIONS
19435+#define task_thread_info(task) (&(task)->tinfo)
19436+#define task_stack_page(task) ((task)->stack)
19437+#define setup_thread_stack(p, org) do {} while (0)
19438+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19439+
19440 #endif
19441 #endif /* _ASM_X86_THREAD_INFO_H */
19442diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19443index cd79194..e7a9491 100644
19444--- a/arch/x86/include/asm/tlbflush.h
19445+++ b/arch/x86/include/asm/tlbflush.h
19446@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
19447
19448 static inline void __native_flush_tlb(void)
19449 {
19450+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19451+ u64 descriptor[2];
19452+
19453+ descriptor[0] = PCID_KERNEL;
19454+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19455+ return;
19456+ }
19457+
19458+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19459+ if (static_cpu_has(X86_FEATURE_PCID)) {
19460+ unsigned int cpu = raw_get_cpu();
19461+
19462+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19463+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19464+ raw_put_cpu_no_resched();
19465+ return;
19466+ }
19467+#endif
19468+
19469 native_write_cr3(native_read_cr3());
19470 }
19471
19472 static inline void __native_flush_tlb_global_irq_disabled(void)
19473 {
19474- unsigned long cr4;
19475+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19476+ u64 descriptor[2];
19477
19478- cr4 = this_cpu_read(cpu_tlbstate.cr4);
19479- /* clear PGE */
19480- native_write_cr4(cr4 & ~X86_CR4_PGE);
19481- /* write old PGE again and flush TLBs */
19482- native_write_cr4(cr4);
19483+ descriptor[0] = PCID_KERNEL;
19484+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19485+ } else {
19486+ unsigned long cr4;
19487+
19488+ cr4 = this_cpu_read(cpu_tlbstate.cr4);
19489+ /* clear PGE */
19490+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19491+ /* write old PGE again and flush TLBs */
19492+ native_write_cr4(cr4);
19493+ }
19494 }
19495
19496 static inline void __native_flush_tlb_global(void)
19497@@ -118,6 +144,41 @@ static inline void __native_flush_tlb_global(void)
19498
19499 static inline void __native_flush_tlb_single(unsigned long addr)
19500 {
19501+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19502+ u64 descriptor[2];
19503+
19504+ descriptor[0] = PCID_KERNEL;
19505+ descriptor[1] = addr;
19506+
19507+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19508+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19509+ if (addr < TASK_SIZE_MAX)
19510+ descriptor[1] += pax_user_shadow_base;
19511+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19512+ }
19513+
19514+ descriptor[0] = PCID_USER;
19515+ descriptor[1] = addr;
19516+#endif
19517+
19518+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19519+ return;
19520+ }
19521+
19522+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19523+ if (static_cpu_has(X86_FEATURE_PCID)) {
19524+ unsigned int cpu = raw_get_cpu();
19525+
19526+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19527+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19528+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19529+ raw_put_cpu_no_resched();
19530+
19531+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19532+ addr += pax_user_shadow_base;
19533+ }
19534+#endif
19535+
19536 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19537 }
19538
19539diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19540index ace9dec..3f9e253 100644
19541--- a/arch/x86/include/asm/uaccess.h
19542+++ b/arch/x86/include/asm/uaccess.h
19543@@ -7,6 +7,7 @@
19544 #include <linux/compiler.h>
19545 #include <linux/thread_info.h>
19546 #include <linux/string.h>
19547+#include <linux/spinlock.h>
19548 #include <asm/asm.h>
19549 #include <asm/page.h>
19550 #include <asm/smap.h>
19551@@ -29,7 +30,12 @@
19552
19553 #define get_ds() (KERNEL_DS)
19554 #define get_fs() (current_thread_info()->addr_limit)
19555+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19556+void __set_fs(mm_segment_t x);
19557+void set_fs(mm_segment_t x);
19558+#else
19559 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19560+#endif
19561
19562 #define segment_eq(a, b) ((a).seg == (b).seg)
19563
19564@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19565 * checks that the pointer is in the user space range - after calling
19566 * this function, memory access functions may still return -EFAULT.
19567 */
19568-#define access_ok(type, addr, size) \
19569- likely(!__range_not_ok(addr, size, user_addr_max()))
19570+extern int _cond_resched(void);
19571+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19572+#define access_ok(type, addr, size) \
19573+({ \
19574+ unsigned long __size = size; \
19575+ unsigned long __addr = (unsigned long)addr; \
19576+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19577+ if (__ret_ao && __size) { \
19578+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19579+ unsigned long __end_ao = __addr + __size - 1; \
19580+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19581+ while (__addr_ao <= __end_ao) { \
19582+ char __c_ao; \
19583+ __addr_ao += PAGE_SIZE; \
19584+ if (__size > PAGE_SIZE) \
19585+ _cond_resched(); \
19586+ if (__get_user(__c_ao, (char __user *)__addr)) \
19587+ break; \
19588+ if (type != VERIFY_WRITE) { \
19589+ __addr = __addr_ao; \
19590+ continue; \
19591+ } \
19592+ if (__put_user(__c_ao, (char __user *)__addr)) \
19593+ break; \
19594+ __addr = __addr_ao; \
19595+ } \
19596+ } \
19597+ } \
19598+ __ret_ao; \
19599+})
19600
19601 /*
19602 * The exception table consists of pairs of addresses relative to the
19603@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19604 extern int __get_user_bad(void);
19605
19606 /*
19607- * This is a type: either unsigned long, if the argument fits into
19608- * that type, or otherwise unsigned long long.
19609+ * This is a type: either (un)signed int, if the argument fits into
19610+ * that type, or otherwise (un)signed long long.
19611 */
19612 #define __inttype(x) \
19613-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19614+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19615+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19616+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19617
19618 /**
19619 * get_user: - Get a simple variable from user space.
19620@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19621 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19622 __chk_user_ptr(ptr); \
19623 might_fault(); \
19624+ pax_open_userland(); \
19625 asm volatile("call __get_user_%P3" \
19626 : "=a" (__ret_gu), "=r" (__val_gu) \
19627 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19628 (x) = (__force __typeof__(*(ptr))) __val_gu; \
19629+ pax_close_userland(); \
19630 __ret_gu; \
19631 })
19632
19633@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19634 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19635 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19636
19637-
19638+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19639+#define __copyuser_seg "gs;"
19640+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19641+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19642+#else
19643+#define __copyuser_seg
19644+#define __COPYUSER_SET_ES
19645+#define __COPYUSER_RESTORE_ES
19646+#endif
19647
19648 #ifdef CONFIG_X86_32
19649 #define __put_user_asm_u64(x, addr, err, errret) \
19650 asm volatile(ASM_STAC "\n" \
19651- "1: movl %%eax,0(%2)\n" \
19652- "2: movl %%edx,4(%2)\n" \
19653+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19654+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19655 "3: " ASM_CLAC "\n" \
19656 ".section .fixup,\"ax\"\n" \
19657 "4: movl %3,%0\n" \
19658@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19659
19660 #define __put_user_asm_ex_u64(x, addr) \
19661 asm volatile(ASM_STAC "\n" \
19662- "1: movl %%eax,0(%1)\n" \
19663- "2: movl %%edx,4(%1)\n" \
19664+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19665+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19666 "3: " ASM_CLAC "\n" \
19667 _ASM_EXTABLE_EX(1b, 2b) \
19668 _ASM_EXTABLE_EX(2b, 3b) \
19669@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19670 __typeof__(*(ptr)) __pu_val; \
19671 __chk_user_ptr(ptr); \
19672 might_fault(); \
19673- __pu_val = x; \
19674+ __pu_val = (x); \
19675+ pax_open_userland(); \
19676 switch (sizeof(*(ptr))) { \
19677 case 1: \
19678 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19679@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19680 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19681 break; \
19682 } \
19683+ pax_close_userland(); \
19684 __ret_pu; \
19685 })
19686
19687@@ -355,8 +403,10 @@ do { \
19688 } while (0)
19689
19690 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19691+do { \
19692+ pax_open_userland(); \
19693 asm volatile(ASM_STAC "\n" \
19694- "1: mov"itype" %2,%"rtype"1\n" \
19695+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19696 "2: " ASM_CLAC "\n" \
19697 ".section .fixup,\"ax\"\n" \
19698 "3: mov %3,%0\n" \
19699@@ -364,8 +414,10 @@ do { \
19700 " jmp 2b\n" \
19701 ".previous\n" \
19702 _ASM_EXTABLE(1b, 3b) \
19703- : "=r" (err), ltype(x) \
19704- : "m" (__m(addr)), "i" (errret), "0" (err))
19705+ : "=r" (err), ltype (x) \
19706+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19707+ pax_close_userland(); \
19708+} while (0)
19709
19710 #define __get_user_size_ex(x, ptr, size) \
19711 do { \
19712@@ -389,7 +441,7 @@ do { \
19713 } while (0)
19714
19715 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19716- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19717+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19718 "2:\n" \
19719 _ASM_EXTABLE_EX(1b, 2b) \
19720 : ltype(x) : "m" (__m(addr)))
19721@@ -406,13 +458,24 @@ do { \
19722 int __gu_err; \
19723 unsigned long __gu_val; \
19724 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19725- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19726+ (x) = (__typeof__(*(ptr)))__gu_val; \
19727 __gu_err; \
19728 })
19729
19730 /* FIXME: this hack is definitely wrong -AK */
19731 struct __large_struct { unsigned long buf[100]; };
19732-#define __m(x) (*(struct __large_struct __user *)(x))
19733+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19734+#define ____m(x) \
19735+({ \
19736+ unsigned long ____x = (unsigned long)(x); \
19737+ if (____x < pax_user_shadow_base) \
19738+ ____x += pax_user_shadow_base; \
19739+ (typeof(x))____x; \
19740+})
19741+#else
19742+#define ____m(x) (x)
19743+#endif
19744+#define __m(x) (*(struct __large_struct __user *)____m(x))
19745
19746 /*
19747 * Tell gcc we read from memory instead of writing: this is because
19748@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19749 * aliasing issues.
19750 */
19751 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19752+do { \
19753+ pax_open_userland(); \
19754 asm volatile(ASM_STAC "\n" \
19755- "1: mov"itype" %"rtype"1,%2\n" \
19756+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19757 "2: " ASM_CLAC "\n" \
19758 ".section .fixup,\"ax\"\n" \
19759 "3: mov %3,%0\n" \
19760@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19761 ".previous\n" \
19762 _ASM_EXTABLE(1b, 3b) \
19763 : "=r"(err) \
19764- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19765+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19766+ pax_close_userland(); \
19767+} while (0)
19768
19769 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19770- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19771+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19772 "2:\n" \
19773 _ASM_EXTABLE_EX(1b, 2b) \
19774 : : ltype(x), "m" (__m(addr)))
19775@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19776 */
19777 #define uaccess_try do { \
19778 current_thread_info()->uaccess_err = 0; \
19779+ pax_open_userland(); \
19780 stac(); \
19781 barrier();
19782
19783 #define uaccess_catch(err) \
19784 clac(); \
19785+ pax_close_userland(); \
19786 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19787 } while (0)
19788
19789@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19790 * On error, the variable @x is set to zero.
19791 */
19792
19793+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19794+#define __get_user(x, ptr) get_user((x), (ptr))
19795+#else
19796 #define __get_user(x, ptr) \
19797 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19798+#endif
19799
19800 /**
19801 * __put_user: - Write a simple value into user space, with less checking.
19802@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19803 * Returns zero on success, or -EFAULT on error.
19804 */
19805
19806+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19807+#define __put_user(x, ptr) put_user((x), (ptr))
19808+#else
19809 #define __put_user(x, ptr) \
19810 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19811+#endif
19812
19813 #define __get_user_unaligned __get_user
19814 #define __put_user_unaligned __put_user
19815@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19816 #define get_user_ex(x, ptr) do { \
19817 unsigned long __gue_val; \
19818 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19819- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19820+ (x) = (__typeof__(*(ptr)))__gue_val; \
19821 } while (0)
19822
19823 #define put_user_try uaccess_try
19824@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19825 extern __must_check long strnlen_user(const char __user *str, long n);
19826
19827 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19828-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19829+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19830
19831 extern void __cmpxchg_wrong_size(void)
19832 __compiletime_error("Bad argument size for cmpxchg");
19833@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19834 __typeof__(ptr) __uval = (uval); \
19835 __typeof__(*(ptr)) __old = (old); \
19836 __typeof__(*(ptr)) __new = (new); \
19837+ pax_open_userland(); \
19838 switch (size) { \
19839 case 1: \
19840 { \
19841 asm volatile("\t" ASM_STAC "\n" \
19842- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19843+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19844 "2:\t" ASM_CLAC "\n" \
19845 "\t.section .fixup, \"ax\"\n" \
19846 "3:\tmov %3, %0\n" \
19847 "\tjmp 2b\n" \
19848 "\t.previous\n" \
19849 _ASM_EXTABLE(1b, 3b) \
19850- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19851+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19852 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19853 : "memory" \
19854 ); \
19855@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19856 case 2: \
19857 { \
19858 asm volatile("\t" ASM_STAC "\n" \
19859- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19860+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19861 "2:\t" ASM_CLAC "\n" \
19862 "\t.section .fixup, \"ax\"\n" \
19863 "3:\tmov %3, %0\n" \
19864 "\tjmp 2b\n" \
19865 "\t.previous\n" \
19866 _ASM_EXTABLE(1b, 3b) \
19867- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19868+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19869 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19870 : "memory" \
19871 ); \
19872@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19873 case 4: \
19874 { \
19875 asm volatile("\t" ASM_STAC "\n" \
19876- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19877+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19878 "2:\t" ASM_CLAC "\n" \
19879 "\t.section .fixup, \"ax\"\n" \
19880 "3:\tmov %3, %0\n" \
19881 "\tjmp 2b\n" \
19882 "\t.previous\n" \
19883 _ASM_EXTABLE(1b, 3b) \
19884- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19885+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19886 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19887 : "memory" \
19888 ); \
19889@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19890 __cmpxchg_wrong_size(); \
19891 \
19892 asm volatile("\t" ASM_STAC "\n" \
19893- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19894+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19895 "2:\t" ASM_CLAC "\n" \
19896 "\t.section .fixup, \"ax\"\n" \
19897 "3:\tmov %3, %0\n" \
19898 "\tjmp 2b\n" \
19899 "\t.previous\n" \
19900 _ASM_EXTABLE(1b, 3b) \
19901- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19902+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19903 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19904 : "memory" \
19905 ); \
19906@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
19907 default: \
19908 __cmpxchg_wrong_size(); \
19909 } \
19910+ pax_close_userland(); \
19911 *__uval = __old; \
19912 __ret; \
19913 })
19914@@ -636,17 +715,6 @@ extern struct movsl_mask {
19915
19916 #define ARCH_HAS_NOCACHE_UACCESS 1
19917
19918-#ifdef CONFIG_X86_32
19919-# include <asm/uaccess_32.h>
19920-#else
19921-# include <asm/uaccess_64.h>
19922-#endif
19923-
19924-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19925- unsigned n);
19926-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19927- unsigned n);
19928-
19929 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19930 # define copy_user_diag __compiletime_error
19931 #else
19932@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19933 extern void copy_user_diag("copy_from_user() buffer size is too small")
19934 copy_from_user_overflow(void);
19935 extern void copy_user_diag("copy_to_user() buffer size is too small")
19936-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19937+copy_to_user_overflow(void);
19938
19939 #undef copy_user_diag
19940
19941@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19942
19943 extern void
19944 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19945-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19946+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19947 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19948
19949 #else
19950@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19951
19952 #endif
19953
19954+#ifdef CONFIG_X86_32
19955+# include <asm/uaccess_32.h>
19956+#else
19957+# include <asm/uaccess_64.h>
19958+#endif
19959+
19960 static inline unsigned long __must_check
19961 copy_from_user(void *to, const void __user *from, unsigned long n)
19962 {
19963- int sz = __compiletime_object_size(to);
19964+ size_t sz = __compiletime_object_size(to);
19965
19966 might_fault();
19967
19968@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19969 * case, and do only runtime checking for non-constant sizes.
19970 */
19971
19972- if (likely(sz < 0 || sz >= n))
19973- n = _copy_from_user(to, from, n);
19974- else if(__builtin_constant_p(n))
19975- copy_from_user_overflow();
19976- else
19977- __copy_from_user_overflow(sz, n);
19978+ if (likely(sz != (size_t)-1 && sz < n)) {
19979+ if(__builtin_constant_p(n))
19980+ copy_from_user_overflow();
19981+ else
19982+ __copy_from_user_overflow(sz, n);
19983+ } else if (access_ok(VERIFY_READ, from, n))
19984+ n = __copy_from_user(to, from, n);
19985+ else if ((long)n > 0)
19986+ memset(to, 0, n);
19987
19988 return n;
19989 }
19990@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19991 static inline unsigned long __must_check
19992 copy_to_user(void __user *to, const void *from, unsigned long n)
19993 {
19994- int sz = __compiletime_object_size(from);
19995+ size_t sz = __compiletime_object_size(from);
19996
19997 might_fault();
19998
19999 /* See the comment in copy_from_user() above. */
20000- if (likely(sz < 0 || sz >= n))
20001- n = _copy_to_user(to, from, n);
20002- else if(__builtin_constant_p(n))
20003- copy_to_user_overflow();
20004- else
20005- __copy_to_user_overflow(sz, n);
20006+ if (likely(sz != (size_t)-1 && sz < n)) {
20007+ if(__builtin_constant_p(n))
20008+ copy_to_user_overflow();
20009+ else
20010+ __copy_to_user_overflow(sz, n);
20011+ } else if (access_ok(VERIFY_WRITE, to, n))
20012+ n = __copy_to_user(to, from, n);
20013
20014 return n;
20015 }
20016diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
20017index 3c03a5d..edb68ae 100644
20018--- a/arch/x86/include/asm/uaccess_32.h
20019+++ b/arch/x86/include/asm/uaccess_32.h
20020@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
20021 * anything, so this is accurate.
20022 */
20023
20024-static __always_inline unsigned long __must_check
20025+static __always_inline __size_overflow(3) unsigned long __must_check
20026 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20027 {
20028+ if ((long)n < 0)
20029+ return n;
20030+
20031+ check_object_size(from, n, true);
20032+
20033 if (__builtin_constant_p(n)) {
20034 unsigned long ret;
20035
20036@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20037 __copy_to_user(void __user *to, const void *from, unsigned long n)
20038 {
20039 might_fault();
20040+
20041 return __copy_to_user_inatomic(to, from, n);
20042 }
20043
20044-static __always_inline unsigned long
20045+static __always_inline __size_overflow(3) unsigned long
20046 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20047 {
20048+ if ((long)n < 0)
20049+ return n;
20050+
20051 /* Avoid zeroing the tail if the copy fails..
20052 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20053 * but as the zeroing behaviour is only significant when n is not
20054@@ -137,6 +146,12 @@ static __always_inline unsigned long
20055 __copy_from_user(void *to, const void __user *from, unsigned long n)
20056 {
20057 might_fault();
20058+
20059+ if ((long)n < 0)
20060+ return n;
20061+
20062+ check_object_size(to, n, false);
20063+
20064 if (__builtin_constant_p(n)) {
20065 unsigned long ret;
20066
20067@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20068 const void __user *from, unsigned long n)
20069 {
20070 might_fault();
20071+
20072+ if ((long)n < 0)
20073+ return n;
20074+
20075 if (__builtin_constant_p(n)) {
20076 unsigned long ret;
20077
20078@@ -181,7 +200,10 @@ static __always_inline unsigned long
20079 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20080 unsigned long n)
20081 {
20082- return __copy_from_user_ll_nocache_nozero(to, from, n);
20083+ if ((long)n < 0)
20084+ return n;
20085+
20086+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20087 }
20088
20089 #endif /* _ASM_X86_UACCESS_32_H */
20090diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20091index f2f9b39..2ae1bf8 100644
20092--- a/arch/x86/include/asm/uaccess_64.h
20093+++ b/arch/x86/include/asm/uaccess_64.h
20094@@ -10,6 +10,9 @@
20095 #include <asm/alternative.h>
20096 #include <asm/cpufeature.h>
20097 #include <asm/page.h>
20098+#include <asm/pgtable.h>
20099+
20100+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20101
20102 /*
20103 * Copy To/From Userspace
20104@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20105 __must_check unsigned long
20106 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20107
20108-static __always_inline __must_check unsigned long
20109-copy_user_generic(void *to, const void *from, unsigned len)
20110+static __always_inline __must_check __size_overflow(3) unsigned long
20111+copy_user_generic(void *to, const void *from, unsigned long len)
20112 {
20113 unsigned ret;
20114
20115@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20116 }
20117
20118 __must_check unsigned long
20119-copy_in_user(void __user *to, const void __user *from, unsigned len);
20120+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20121
20122 static __always_inline __must_check
20123-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20124+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20125 {
20126- int ret = 0;
20127+ size_t sz = __compiletime_object_size(dst);
20128+ unsigned ret = 0;
20129+
20130+ if (size > INT_MAX)
20131+ return size;
20132+
20133+ check_object_size(dst, size, false);
20134+
20135+#ifdef CONFIG_PAX_MEMORY_UDEREF
20136+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20137+ return size;
20138+#endif
20139+
20140+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20141+ if(__builtin_constant_p(size))
20142+ copy_from_user_overflow();
20143+ else
20144+ __copy_from_user_overflow(sz, size);
20145+ return size;
20146+ }
20147
20148 if (!__builtin_constant_p(size))
20149- return copy_user_generic(dst, (__force void *)src, size);
20150+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20151 switch (size) {
20152- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20153+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20154 ret, "b", "b", "=q", 1);
20155 return ret;
20156- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20157+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20158 ret, "w", "w", "=r", 2);
20159 return ret;
20160- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20161+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20162 ret, "l", "k", "=r", 4);
20163 return ret;
20164- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20165+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20166 ret, "q", "", "=r", 8);
20167 return ret;
20168 case 10:
20169- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20170+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20171 ret, "q", "", "=r", 10);
20172 if (unlikely(ret))
20173 return ret;
20174 __get_user_asm(*(u16 *)(8 + (char *)dst),
20175- (u16 __user *)(8 + (char __user *)src),
20176+ (const u16 __user *)(8 + (const char __user *)src),
20177 ret, "w", "w", "=r", 2);
20178 return ret;
20179 case 16:
20180- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20181+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20182 ret, "q", "", "=r", 16);
20183 if (unlikely(ret))
20184 return ret;
20185 __get_user_asm(*(u64 *)(8 + (char *)dst),
20186- (u64 __user *)(8 + (char __user *)src),
20187+ (const u64 __user *)(8 + (const char __user *)src),
20188 ret, "q", "", "=r", 8);
20189 return ret;
20190 default:
20191- return copy_user_generic(dst, (__force void *)src, size);
20192+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20193 }
20194 }
20195
20196 static __always_inline __must_check
20197-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20198+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20199 {
20200 might_fault();
20201 return __copy_from_user_nocheck(dst, src, size);
20202 }
20203
20204 static __always_inline __must_check
20205-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20206+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20207 {
20208- int ret = 0;
20209+ size_t sz = __compiletime_object_size(src);
20210+ unsigned ret = 0;
20211+
20212+ if (size > INT_MAX)
20213+ return size;
20214+
20215+ check_object_size(src, size, true);
20216+
20217+#ifdef CONFIG_PAX_MEMORY_UDEREF
20218+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20219+ return size;
20220+#endif
20221+
20222+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20223+ if(__builtin_constant_p(size))
20224+ copy_to_user_overflow();
20225+ else
20226+ __copy_to_user_overflow(sz, size);
20227+ return size;
20228+ }
20229
20230 if (!__builtin_constant_p(size))
20231- return copy_user_generic((__force void *)dst, src, size);
20232+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20233 switch (size) {
20234- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20235+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20236 ret, "b", "b", "iq", 1);
20237 return ret;
20238- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20239+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20240 ret, "w", "w", "ir", 2);
20241 return ret;
20242- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20243+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20244 ret, "l", "k", "ir", 4);
20245 return ret;
20246- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20247+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20248 ret, "q", "", "er", 8);
20249 return ret;
20250 case 10:
20251- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20252+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20253 ret, "q", "", "er", 10);
20254 if (unlikely(ret))
20255 return ret;
20256 asm("":::"memory");
20257- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20258+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20259 ret, "w", "w", "ir", 2);
20260 return ret;
20261 case 16:
20262- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20263+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20264 ret, "q", "", "er", 16);
20265 if (unlikely(ret))
20266 return ret;
20267 asm("":::"memory");
20268- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20269+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20270 ret, "q", "", "er", 8);
20271 return ret;
20272 default:
20273- return copy_user_generic((__force void *)dst, src, size);
20274+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20275 }
20276 }
20277
20278 static __always_inline __must_check
20279-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20280+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20281 {
20282 might_fault();
20283 return __copy_to_user_nocheck(dst, src, size);
20284 }
20285
20286 static __always_inline __must_check
20287-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20288+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20289 {
20290- int ret = 0;
20291+ unsigned ret = 0;
20292
20293 might_fault();
20294+
20295+ if (size > INT_MAX)
20296+ return size;
20297+
20298+#ifdef CONFIG_PAX_MEMORY_UDEREF
20299+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20300+ return size;
20301+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20302+ return size;
20303+#endif
20304+
20305 if (!__builtin_constant_p(size))
20306- return copy_user_generic((__force void *)dst,
20307- (__force void *)src, size);
20308+ return copy_user_generic((__force_kernel void *)____m(dst),
20309+ (__force_kernel const void *)____m(src), size);
20310 switch (size) {
20311 case 1: {
20312 u8 tmp;
20313- __get_user_asm(tmp, (u8 __user *)src,
20314+ __get_user_asm(tmp, (const u8 __user *)src,
20315 ret, "b", "b", "=q", 1);
20316 if (likely(!ret))
20317 __put_user_asm(tmp, (u8 __user *)dst,
20318@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20319 }
20320 case 2: {
20321 u16 tmp;
20322- __get_user_asm(tmp, (u16 __user *)src,
20323+ __get_user_asm(tmp, (const u16 __user *)src,
20324 ret, "w", "w", "=r", 2);
20325 if (likely(!ret))
20326 __put_user_asm(tmp, (u16 __user *)dst,
20327@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20328
20329 case 4: {
20330 u32 tmp;
20331- __get_user_asm(tmp, (u32 __user *)src,
20332+ __get_user_asm(tmp, (const u32 __user *)src,
20333 ret, "l", "k", "=r", 4);
20334 if (likely(!ret))
20335 __put_user_asm(tmp, (u32 __user *)dst,
20336@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20337 }
20338 case 8: {
20339 u64 tmp;
20340- __get_user_asm(tmp, (u64 __user *)src,
20341+ __get_user_asm(tmp, (const u64 __user *)src,
20342 ret, "q", "", "=r", 8);
20343 if (likely(!ret))
20344 __put_user_asm(tmp, (u64 __user *)dst,
20345@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20346 return ret;
20347 }
20348 default:
20349- return copy_user_generic((__force void *)dst,
20350- (__force void *)src, size);
20351+ return copy_user_generic((__force_kernel void *)____m(dst),
20352+ (__force_kernel const void *)____m(src), size);
20353 }
20354 }
20355
20356-static __must_check __always_inline int
20357-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20358+static __must_check __always_inline unsigned long
20359+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20360 {
20361 return __copy_from_user_nocheck(dst, src, size);
20362 }
20363
20364-static __must_check __always_inline int
20365-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20366+static __must_check __always_inline unsigned long
20367+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20368 {
20369 return __copy_to_user_nocheck(dst, src, size);
20370 }
20371
20372-extern long __copy_user_nocache(void *dst, const void __user *src,
20373- unsigned size, int zerorest);
20374+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20375+ unsigned long size, int zerorest);
20376
20377-static inline int
20378-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20379+static inline unsigned long
20380+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20381 {
20382 might_fault();
20383+
20384+ if (size > INT_MAX)
20385+ return size;
20386+
20387+#ifdef CONFIG_PAX_MEMORY_UDEREF
20388+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20389+ return size;
20390+#endif
20391+
20392 return __copy_user_nocache(dst, src, size, 1);
20393 }
20394
20395-static inline int
20396+static inline unsigned long
20397 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20398- unsigned size)
20399+ unsigned long size)
20400 {
20401+ if (size > INT_MAX)
20402+ return size;
20403+
20404+#ifdef CONFIG_PAX_MEMORY_UDEREF
20405+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20406+ return size;
20407+#endif
20408+
20409 return __copy_user_nocache(dst, src, size, 0);
20410 }
20411
20412 unsigned long
20413-copy_user_handle_tail(char *to, char *from, unsigned len);
20414+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
20415
20416 #endif /* _ASM_X86_UACCESS_64_H */
20417diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20418index 5b238981..77fdd78 100644
20419--- a/arch/x86/include/asm/word-at-a-time.h
20420+++ b/arch/x86/include/asm/word-at-a-time.h
20421@@ -11,7 +11,7 @@
20422 * and shift, for example.
20423 */
20424 struct word_at_a_time {
20425- const unsigned long one_bits, high_bits;
20426+ unsigned long one_bits, high_bits;
20427 };
20428
20429 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20430diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20431index f58a9c7..dc378042a 100644
20432--- a/arch/x86/include/asm/x86_init.h
20433+++ b/arch/x86/include/asm/x86_init.h
20434@@ -129,7 +129,7 @@ struct x86_init_ops {
20435 struct x86_init_timers timers;
20436 struct x86_init_iommu iommu;
20437 struct x86_init_pci pci;
20438-};
20439+} __no_const;
20440
20441 /**
20442 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20443@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20444 void (*setup_percpu_clockev)(void);
20445 void (*early_percpu_clock_init)(void);
20446 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20447-};
20448+} __no_const;
20449
20450 struct timespec;
20451
20452@@ -168,7 +168,7 @@ struct x86_platform_ops {
20453 void (*save_sched_clock_state)(void);
20454 void (*restore_sched_clock_state)(void);
20455 void (*apic_post_init)(void);
20456-};
20457+} __no_const;
20458
20459 struct pci_dev;
20460 struct msi_msg;
20461@@ -182,7 +182,7 @@ struct x86_msi_ops {
20462 void (*teardown_msi_irqs)(struct pci_dev *dev);
20463 void (*restore_msi_irqs)(struct pci_dev *dev);
20464 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20465-};
20466+} __no_const;
20467
20468 struct IO_APIC_route_entry;
20469 struct io_apic_irq_attr;
20470@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20471 unsigned int destination, int vector,
20472 struct io_apic_irq_attr *attr);
20473 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20474-};
20475+} __no_const;
20476
20477 extern struct x86_init_ops x86_init;
20478 extern struct x86_cpuinit_ops x86_cpuinit;
20479diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20480index 358dcd3..23c0bf1 100644
20481--- a/arch/x86/include/asm/xen/page.h
20482+++ b/arch/x86/include/asm/xen/page.h
20483@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20484 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20485 * cases needing an extended handling.
20486 */
20487-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20488+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20489 {
20490 unsigned long mfn;
20491
20492diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20493index c9a6d68..cb57f42 100644
20494--- a/arch/x86/include/asm/xsave.h
20495+++ b/arch/x86/include/asm/xsave.h
20496@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20497 if (unlikely(err))
20498 return -EFAULT;
20499
20500+ pax_open_userland();
20501 __asm__ __volatile__(ASM_STAC "\n"
20502- "1:"XSAVE"\n"
20503+ "1:"
20504+ __copyuser_seg
20505+ XSAVE"\n"
20506 "2: " ASM_CLAC "\n"
20507 xstate_fault
20508 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20509 : "memory");
20510+ pax_close_userland();
20511 return err;
20512 }
20513
20514@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20515 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20516 {
20517 int err = 0;
20518- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20519+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20520 u32 lmask = mask;
20521 u32 hmask = mask >> 32;
20522
20523+ pax_open_userland();
20524 __asm__ __volatile__(ASM_STAC "\n"
20525- "1:"XRSTOR"\n"
20526+ "1:"
20527+ __copyuser_seg
20528+ XRSTOR"\n"
20529 "2: " ASM_CLAC "\n"
20530 xstate_fault
20531 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20532 : "memory"); /* memory required? */
20533+ pax_close_userland();
20534 return err;
20535 }
20536
20537diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20538index d993e33..8db1b18 100644
20539--- a/arch/x86/include/uapi/asm/e820.h
20540+++ b/arch/x86/include/uapi/asm/e820.h
20541@@ -58,7 +58,7 @@ struct e820map {
20542 #define ISA_START_ADDRESS 0xa0000
20543 #define ISA_END_ADDRESS 0x100000
20544
20545-#define BIOS_BEGIN 0x000a0000
20546+#define BIOS_BEGIN 0x000c0000
20547 #define BIOS_END 0x00100000
20548
20549 #define BIOS_ROM_BASE 0xffe00000
20550diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20551index 7b0a55a..ad115bf 100644
20552--- a/arch/x86/include/uapi/asm/ptrace-abi.h
20553+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20554@@ -49,7 +49,6 @@
20555 #define EFLAGS 144
20556 #define RSP 152
20557 #define SS 160
20558-#define ARGOFFSET R11
20559 #endif /* __ASSEMBLY__ */
20560
20561 /* top of stack page */
20562diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20563index cdb1b70..426434c 100644
20564--- a/arch/x86/kernel/Makefile
20565+++ b/arch/x86/kernel/Makefile
20566@@ -28,7 +28,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20567 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20568 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20569 obj-y += probe_roms.o
20570-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20571+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20572 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20573 obj-$(CONFIG_X86_64) += mcount_64.o
20574 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20575diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20576index 803b684..68c64f1 100644
20577--- a/arch/x86/kernel/acpi/boot.c
20578+++ b/arch/x86/kernel/acpi/boot.c
20579@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
20580 * If your system is blacklisted here, but you find that acpi=force
20581 * works for you, please contact linux-acpi@vger.kernel.org
20582 */
20583-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20584+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20585 /*
20586 * Boxes that need ACPI disabled
20587 */
20588@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20589 };
20590
20591 /* second table for DMI checks that should run after early-quirks */
20592-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20593+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20594 /*
20595 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20596 * which includes some code which overrides all temperature
20597diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20598index d1daead..acd77e2 100644
20599--- a/arch/x86/kernel/acpi/sleep.c
20600+++ b/arch/x86/kernel/acpi/sleep.c
20601@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20602 #else /* CONFIG_64BIT */
20603 #ifdef CONFIG_SMP
20604 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20605+
20606+ pax_open_kernel();
20607 early_gdt_descr.address =
20608 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20609+ pax_close_kernel();
20610+
20611 initial_gs = per_cpu_offset(smp_processor_id());
20612 #endif
20613 initial_code = (unsigned long)wakeup_long64;
20614diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20615index 665c6b7..eae4d56 100644
20616--- a/arch/x86/kernel/acpi/wakeup_32.S
20617+++ b/arch/x86/kernel/acpi/wakeup_32.S
20618@@ -29,13 +29,11 @@ wakeup_pmode_return:
20619 # and restore the stack ... but you need gdt for this to work
20620 movl saved_context_esp, %esp
20621
20622- movl %cs:saved_magic, %eax
20623- cmpl $0x12345678, %eax
20624+ cmpl $0x12345678, saved_magic
20625 jne bogus_magic
20626
20627 # jump to place where we left off
20628- movl saved_eip, %eax
20629- jmp *%eax
20630+ jmp *(saved_eip)
20631
20632 bogus_magic:
20633 jmp bogus_magic
20634diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20635index 703130f..27a155d 100644
20636--- a/arch/x86/kernel/alternative.c
20637+++ b/arch/x86/kernel/alternative.c
20638@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20639 */
20640 for (a = start; a < end; a++) {
20641 instr = (u8 *)&a->instr_offset + a->instr_offset;
20642+
20643+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20644+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20645+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20646+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20647+#endif
20648+
20649 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20650 BUG_ON(a->replacementlen > a->instrlen);
20651 BUG_ON(a->instrlen > sizeof(insnbuf));
20652@@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20653 add_nops(insnbuf + a->replacementlen,
20654 a->instrlen - a->replacementlen);
20655
20656+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20657+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20658+ instr = ktva_ktla(instr);
20659+#endif
20660+
20661 text_poke_early(instr, insnbuf, a->instrlen);
20662 }
20663 }
20664@@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20665 for (poff = start; poff < end; poff++) {
20666 u8 *ptr = (u8 *)poff + *poff;
20667
20668+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20669+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20670+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20671+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20672+#endif
20673+
20674 if (!*poff || ptr < text || ptr >= text_end)
20675 continue;
20676 /* turn DS segment override prefix into lock prefix */
20677- if (*ptr == 0x3e)
20678+ if (*ktla_ktva(ptr) == 0x3e)
20679 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20680 }
20681 mutex_unlock(&text_mutex);
20682@@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20683 for (poff = start; poff < end; poff++) {
20684 u8 *ptr = (u8 *)poff + *poff;
20685
20686+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20687+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20688+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20689+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20690+#endif
20691+
20692 if (!*poff || ptr < text || ptr >= text_end)
20693 continue;
20694 /* turn lock prefix into DS segment override prefix */
20695- if (*ptr == 0xf0)
20696+ if (*ktla_ktva(ptr) == 0xf0)
20697 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20698 }
20699 mutex_unlock(&text_mutex);
20700@@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20701
20702 BUG_ON(p->len > MAX_PATCH_LEN);
20703 /* prep the buffer with the original instructions */
20704- memcpy(insnbuf, p->instr, p->len);
20705+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20706 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20707 (unsigned long)p->instr, p->len);
20708
20709@@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20710 if (!uniproc_patched || num_possible_cpus() == 1)
20711 free_init_pages("SMP alternatives",
20712 (unsigned long)__smp_locks,
20713- (unsigned long)__smp_locks_end);
20714+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20715 #endif
20716
20717 apply_paravirt(__parainstructions, __parainstructions_end);
20718@@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20719 * instructions. And on the local CPU you need to be protected again NMI or MCE
20720 * handlers seeing an inconsistent instruction while you patch.
20721 */
20722-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20723+void *__kprobes text_poke_early(void *addr, const void *opcode,
20724 size_t len)
20725 {
20726 unsigned long flags;
20727 local_irq_save(flags);
20728- memcpy(addr, opcode, len);
20729+
20730+ pax_open_kernel();
20731+ memcpy(ktla_ktva(addr), opcode, len);
20732 sync_core();
20733+ pax_close_kernel();
20734+
20735 local_irq_restore(flags);
20736 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20737 that causes hangs on some VIA CPUs. */
20738@@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20739 */
20740 void *text_poke(void *addr, const void *opcode, size_t len)
20741 {
20742- unsigned long flags;
20743- char *vaddr;
20744+ unsigned char *vaddr = ktla_ktva(addr);
20745 struct page *pages[2];
20746- int i;
20747+ size_t i;
20748
20749 if (!core_kernel_text((unsigned long)addr)) {
20750- pages[0] = vmalloc_to_page(addr);
20751- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20752+ pages[0] = vmalloc_to_page(vaddr);
20753+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20754 } else {
20755- pages[0] = virt_to_page(addr);
20756+ pages[0] = virt_to_page(vaddr);
20757 WARN_ON(!PageReserved(pages[0]));
20758- pages[1] = virt_to_page(addr + PAGE_SIZE);
20759+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20760 }
20761 BUG_ON(!pages[0]);
20762- local_irq_save(flags);
20763- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20764- if (pages[1])
20765- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20766- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20767- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20768- clear_fixmap(FIX_TEXT_POKE0);
20769- if (pages[1])
20770- clear_fixmap(FIX_TEXT_POKE1);
20771- local_flush_tlb();
20772- sync_core();
20773- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20774- that causes hangs on some VIA CPUs. */
20775+ text_poke_early(addr, opcode, len);
20776 for (i = 0; i < len; i++)
20777- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20778- local_irq_restore(flags);
20779+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20780 return addr;
20781 }
20782
20783@@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20784 if (likely(!bp_patching_in_progress))
20785 return 0;
20786
20787- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20788+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20789 return 0;
20790
20791 /* set up the specified breakpoint handler */
20792@@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20793 */
20794 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20795 {
20796- unsigned char int3 = 0xcc;
20797+ const unsigned char int3 = 0xcc;
20798
20799 bp_int3_handler = handler;
20800 bp_int3_addr = (u8 *)addr + sizeof(int3);
20801diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20802index ad3639a..bd4253c 100644
20803--- a/arch/x86/kernel/apic/apic.c
20804+++ b/arch/x86/kernel/apic/apic.c
20805@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20806 /*
20807 * Debug level, exported for io_apic.c
20808 */
20809-unsigned int apic_verbosity;
20810+int apic_verbosity;
20811
20812 int pic_mode;
20813
20814@@ -1918,7 +1918,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20815 apic_write(APIC_ESR, 0);
20816 v = apic_read(APIC_ESR);
20817 ack_APIC_irq();
20818- atomic_inc(&irq_err_count);
20819+ atomic_inc_unchecked(&irq_err_count);
20820
20821 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20822 smp_processor_id(), v);
20823diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20824index de918c4..32eed23 100644
20825--- a/arch/x86/kernel/apic/apic_flat_64.c
20826+++ b/arch/x86/kernel/apic/apic_flat_64.c
20827@@ -154,7 +154,7 @@ static int flat_probe(void)
20828 return 1;
20829 }
20830
20831-static struct apic apic_flat = {
20832+static struct apic apic_flat __read_only = {
20833 .name = "flat",
20834 .probe = flat_probe,
20835 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20836@@ -260,7 +260,7 @@ static int physflat_probe(void)
20837 return 0;
20838 }
20839
20840-static struct apic apic_physflat = {
20841+static struct apic apic_physflat __read_only = {
20842
20843 .name = "physical flat",
20844 .probe = physflat_probe,
20845diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20846index b205cdb..d8503ff 100644
20847--- a/arch/x86/kernel/apic/apic_noop.c
20848+++ b/arch/x86/kernel/apic/apic_noop.c
20849@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20850 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20851 }
20852
20853-struct apic apic_noop = {
20854+struct apic apic_noop __read_only = {
20855 .name = "noop",
20856 .probe = noop_probe,
20857 .acpi_madt_oem_check = NULL,
20858diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20859index c4a8d63..fe893ac 100644
20860--- a/arch/x86/kernel/apic/bigsmp_32.c
20861+++ b/arch/x86/kernel/apic/bigsmp_32.c
20862@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20863 return dmi_bigsmp;
20864 }
20865
20866-static struct apic apic_bigsmp = {
20867+static struct apic apic_bigsmp __read_only = {
20868
20869 .name = "bigsmp",
20870 .probe = probe_bigsmp,
20871diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20872index f4dc246..fbab133 100644
20873--- a/arch/x86/kernel/apic/io_apic.c
20874+++ b/arch/x86/kernel/apic/io_apic.c
20875@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20876 return ret;
20877 }
20878
20879-atomic_t irq_mis_count;
20880+atomic_unchecked_t irq_mis_count;
20881
20882 #ifdef CONFIG_GENERIC_PENDING_IRQ
20883 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20884@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
20885 * at the cpu.
20886 */
20887 if (!(v & (1 << (i & 0x1f)))) {
20888- atomic_inc(&irq_mis_count);
20889+ atomic_inc_unchecked(&irq_mis_count);
20890
20891 eoi_ioapic_irq(irq, cfg);
20892 }
20893@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
20894 ioapic_irqd_unmask(data, cfg, masked);
20895 }
20896
20897-static struct irq_chip ioapic_chip __read_mostly = {
20898+static struct irq_chip ioapic_chip = {
20899 .name = "IO-APIC",
20900 .irq_startup = startup_ioapic_irq,
20901 .irq_mask = mask_ioapic_irq,
20902@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
20903 ack_APIC_irq();
20904 }
20905
20906-static struct irq_chip lapic_chip __read_mostly = {
20907+static struct irq_chip lapic_chip = {
20908 .name = "local-APIC",
20909 .irq_mask = mask_lapic_irq,
20910 .irq_unmask = unmask_lapic_irq,
20911diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20912index bda4886..f9c7195 100644
20913--- a/arch/x86/kernel/apic/probe_32.c
20914+++ b/arch/x86/kernel/apic/probe_32.c
20915@@ -72,7 +72,7 @@ static int probe_default(void)
20916 return 1;
20917 }
20918
20919-static struct apic apic_default = {
20920+static struct apic apic_default __read_only = {
20921
20922 .name = "default",
20923 .probe = probe_default,
20924diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
20925index 6cedd79..023ff8e 100644
20926--- a/arch/x86/kernel/apic/vector.c
20927+++ b/arch/x86/kernel/apic/vector.c
20928@@ -21,7 +21,7 @@
20929
20930 static DEFINE_RAW_SPINLOCK(vector_lock);
20931
20932-void lock_vector_lock(void)
20933+void lock_vector_lock(void) __acquires(vector_lock)
20934 {
20935 /* Used to the online set of cpus does not change
20936 * during assign_irq_vector.
20937@@ -29,7 +29,7 @@ void lock_vector_lock(void)
20938 raw_spin_lock(&vector_lock);
20939 }
20940
20941-void unlock_vector_lock(void)
20942+void unlock_vector_lock(void) __releases(vector_lock)
20943 {
20944 raw_spin_unlock(&vector_lock);
20945 }
20946diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20947index e658f21..b695a1a 100644
20948--- a/arch/x86/kernel/apic/x2apic_cluster.c
20949+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20950@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20951 return notifier_from_errno(err);
20952 }
20953
20954-static struct notifier_block __refdata x2apic_cpu_notifier = {
20955+static struct notifier_block x2apic_cpu_notifier = {
20956 .notifier_call = update_clusterinfo,
20957 };
20958
20959@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20960 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20961 }
20962
20963-static struct apic apic_x2apic_cluster = {
20964+static struct apic apic_x2apic_cluster __read_only = {
20965
20966 .name = "cluster x2apic",
20967 .probe = x2apic_cluster_probe,
20968diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20969index 6fae733..5ca17af 100644
20970--- a/arch/x86/kernel/apic/x2apic_phys.c
20971+++ b/arch/x86/kernel/apic/x2apic_phys.c
20972@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20973 return apic == &apic_x2apic_phys;
20974 }
20975
20976-static struct apic apic_x2apic_phys = {
20977+static struct apic apic_x2apic_phys __read_only = {
20978
20979 .name = "physical x2apic",
20980 .probe = x2apic_phys_probe,
20981diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20982index 8e9dcfd..c61b3e4 100644
20983--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20984+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20985@@ -348,7 +348,7 @@ static int uv_probe(void)
20986 return apic == &apic_x2apic_uv_x;
20987 }
20988
20989-static struct apic __refdata apic_x2apic_uv_x = {
20990+static struct apic apic_x2apic_uv_x __read_only = {
20991
20992 .name = "UV large system",
20993 .probe = uv_probe,
20994diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20995index 927ec92..de68f32 100644
20996--- a/arch/x86/kernel/apm_32.c
20997+++ b/arch/x86/kernel/apm_32.c
20998@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
20999 * This is for buggy BIOS's that refer to (real mode) segment 0x40
21000 * even though they are called in protected mode.
21001 */
21002-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
21003+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21004 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21005
21006 static const char driver_version[] = "1.16ac"; /* no spaces */
21007@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
21008 BUG_ON(cpu != 0);
21009 gdt = get_cpu_gdt_table(cpu);
21010 save_desc_40 = gdt[0x40 / 8];
21011+
21012+ pax_open_kernel();
21013 gdt[0x40 / 8] = bad_bios_desc;
21014+ pax_close_kernel();
21015
21016 apm_irq_save(flags);
21017 APM_DO_SAVE_SEGS;
21018@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
21019 &call->esi);
21020 APM_DO_RESTORE_SEGS;
21021 apm_irq_restore(flags);
21022+
21023+ pax_open_kernel();
21024 gdt[0x40 / 8] = save_desc_40;
21025+ pax_close_kernel();
21026+
21027 put_cpu();
21028
21029 return call->eax & 0xff;
21030@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
21031 BUG_ON(cpu != 0);
21032 gdt = get_cpu_gdt_table(cpu);
21033 save_desc_40 = gdt[0x40 / 8];
21034+
21035+ pax_open_kernel();
21036 gdt[0x40 / 8] = bad_bios_desc;
21037+ pax_close_kernel();
21038
21039 apm_irq_save(flags);
21040 APM_DO_SAVE_SEGS;
21041@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
21042 &call->eax);
21043 APM_DO_RESTORE_SEGS;
21044 apm_irq_restore(flags);
21045+
21046+ pax_open_kernel();
21047 gdt[0x40 / 8] = save_desc_40;
21048+ pax_close_kernel();
21049+
21050 put_cpu();
21051 return error;
21052 }
21053@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21054 return 0;
21055 }
21056
21057-static struct dmi_system_id __initdata apm_dmi_table[] = {
21058+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21059 {
21060 print_if_true,
21061 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21062@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21063 * code to that CPU.
21064 */
21065 gdt = get_cpu_gdt_table(0);
21066+
21067+ pax_open_kernel();
21068 set_desc_base(&gdt[APM_CS >> 3],
21069 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21070 set_desc_base(&gdt[APM_CS_16 >> 3],
21071 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21072 set_desc_base(&gdt[APM_DS >> 3],
21073 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21074+ pax_close_kernel();
21075
21076 proc_create("apm", 0, NULL, &apm_file_ops);
21077
21078diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21079index 9f6b934..cf5ffb3 100644
21080--- a/arch/x86/kernel/asm-offsets.c
21081+++ b/arch/x86/kernel/asm-offsets.c
21082@@ -32,6 +32,8 @@ void common(void) {
21083 OFFSET(TI_flags, thread_info, flags);
21084 OFFSET(TI_status, thread_info, status);
21085 OFFSET(TI_addr_limit, thread_info, addr_limit);
21086+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21087+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21088
21089 BLANK();
21090 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21091@@ -52,8 +54,26 @@ void common(void) {
21092 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21093 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21094 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21095+
21096+#ifdef CONFIG_PAX_KERNEXEC
21097+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21098 #endif
21099
21100+#ifdef CONFIG_PAX_MEMORY_UDEREF
21101+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21102+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21103+#ifdef CONFIG_X86_64
21104+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21105+#endif
21106+#endif
21107+
21108+#endif
21109+
21110+ BLANK();
21111+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21112+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21113+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21114+
21115 #ifdef CONFIG_XEN
21116 BLANK();
21117 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21118diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21119index fdcbb4d..036dd93 100644
21120--- a/arch/x86/kernel/asm-offsets_64.c
21121+++ b/arch/x86/kernel/asm-offsets_64.c
21122@@ -80,6 +80,7 @@ int main(void)
21123 BLANK();
21124 #undef ENTRY
21125
21126+ DEFINE(TSS_size, sizeof(struct tss_struct));
21127 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21128 BLANK();
21129
21130diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21131index 80091ae..0c5184f 100644
21132--- a/arch/x86/kernel/cpu/Makefile
21133+++ b/arch/x86/kernel/cpu/Makefile
21134@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21135 CFLAGS_REMOVE_perf_event.o = -pg
21136 endif
21137
21138-# Make sure load_percpu_segment has no stackprotector
21139-nostackp := $(call cc-option, -fno-stack-protector)
21140-CFLAGS_common.o := $(nostackp)
21141-
21142 obj-y := intel_cacheinfo.o scattered.o topology.o
21143 obj-y += common.o
21144 obj-y += rdrand.o
21145diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21146index a220239..607fc38 100644
21147--- a/arch/x86/kernel/cpu/amd.c
21148+++ b/arch/x86/kernel/cpu/amd.c
21149@@ -717,7 +717,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21150 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21151 {
21152 /* AMD errata T13 (order #21922) */
21153- if ((c->x86 == 6)) {
21154+ if (c->x86 == 6) {
21155 /* Duron Rev A0 */
21156 if (c->x86_model == 3 && c->x86_mask == 0)
21157 size = 64;
21158diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21159index 2346c95..c061472 100644
21160--- a/arch/x86/kernel/cpu/common.c
21161+++ b/arch/x86/kernel/cpu/common.c
21162@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
21163
21164 static const struct cpu_dev *this_cpu = &default_cpu;
21165
21166-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21167-#ifdef CONFIG_X86_64
21168- /*
21169- * We need valid kernel segments for data and code in long mode too
21170- * IRET will check the segment types kkeil 2000/10/28
21171- * Also sysret mandates a special GDT layout
21172- *
21173- * TLS descriptors are currently at a different place compared to i386.
21174- * Hopefully nobody expects them at a fixed place (Wine?)
21175- */
21176- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21177- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21178- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21179- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21180- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21181- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21182-#else
21183- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21184- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21185- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21186- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21187- /*
21188- * Segments used for calling PnP BIOS have byte granularity.
21189- * They code segments and data segments have fixed 64k limits,
21190- * the transfer segment sizes are set at run time.
21191- */
21192- /* 32-bit code */
21193- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21194- /* 16-bit code */
21195- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21196- /* 16-bit data */
21197- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21198- /* 16-bit data */
21199- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21200- /* 16-bit data */
21201- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21202- /*
21203- * The APM segments have byte granularity and their bases
21204- * are set at run time. All have 64k limits.
21205- */
21206- /* 32-bit code */
21207- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21208- /* 16-bit code */
21209- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21210- /* data */
21211- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21212-
21213- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21214- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21215- GDT_STACK_CANARY_INIT
21216-#endif
21217-} };
21218-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21219-
21220 static int __init x86_xsave_setup(char *s)
21221 {
21222 if (strlen(s))
21223@@ -306,6 +252,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21224 }
21225 }
21226
21227+#ifdef CONFIG_X86_64
21228+static __init int setup_disable_pcid(char *arg)
21229+{
21230+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21231+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21232+
21233+#ifdef CONFIG_PAX_MEMORY_UDEREF
21234+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21235+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21236+#endif
21237+
21238+ return 1;
21239+}
21240+__setup("nopcid", setup_disable_pcid);
21241+
21242+static void setup_pcid(struct cpuinfo_x86 *c)
21243+{
21244+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21245+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21246+
21247+#ifdef CONFIG_PAX_MEMORY_UDEREF
21248+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
21249+ pax_open_kernel();
21250+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21251+ pax_close_kernel();
21252+ printk("PAX: slow and weak UDEREF enabled\n");
21253+ } else
21254+ printk("PAX: UDEREF disabled\n");
21255+#endif
21256+
21257+ return;
21258+ }
21259+
21260+ printk("PAX: PCID detected\n");
21261+ cr4_set_bits(X86_CR4_PCIDE);
21262+
21263+#ifdef CONFIG_PAX_MEMORY_UDEREF
21264+ pax_open_kernel();
21265+ clone_pgd_mask = ~(pgdval_t)0UL;
21266+ pax_close_kernel();
21267+ if (pax_user_shadow_base)
21268+ printk("PAX: weak UDEREF enabled\n");
21269+ else {
21270+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21271+ printk("PAX: strong UDEREF enabled\n");
21272+ }
21273+#endif
21274+
21275+ if (cpu_has(c, X86_FEATURE_INVPCID))
21276+ printk("PAX: INVPCID detected\n");
21277+}
21278+#endif
21279+
21280 /*
21281 * Some CPU features depend on higher CPUID levels, which may not always
21282 * be available due to CPUID level capping or broken virtualization
21283@@ -406,7 +405,7 @@ void switch_to_new_gdt(int cpu)
21284 {
21285 struct desc_ptr gdt_descr;
21286
21287- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21288+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21289 gdt_descr.size = GDT_SIZE - 1;
21290 load_gdt(&gdt_descr);
21291 /* Reload the per-cpu base */
21292@@ -897,6 +896,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21293 setup_smep(c);
21294 setup_smap(c);
21295
21296+#ifdef CONFIG_X86_32
21297+#ifdef CONFIG_PAX_PAGEEXEC
21298+ if (!(__supported_pte_mask & _PAGE_NX))
21299+ clear_cpu_cap(c, X86_FEATURE_PSE);
21300+#endif
21301+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21302+ clear_cpu_cap(c, X86_FEATURE_SEP);
21303+#endif
21304+#endif
21305+
21306+#ifdef CONFIG_X86_64
21307+ setup_pcid(c);
21308+#endif
21309+
21310 /*
21311 * The vendor-specific functions might have changed features.
21312 * Now we do "generic changes."
21313@@ -979,7 +992,7 @@ static void syscall32_cpu_init(void)
21314 void enable_sep_cpu(void)
21315 {
21316 int cpu = get_cpu();
21317- struct tss_struct *tss = &per_cpu(init_tss, cpu);
21318+ struct tss_struct *tss = init_tss + cpu;
21319
21320 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21321 put_cpu();
21322@@ -1117,14 +1130,16 @@ static __init int setup_disablecpuid(char *arg)
21323 }
21324 __setup("clearcpuid=", setup_disablecpuid);
21325
21326+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21327+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21328+
21329 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21330- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21331+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21332 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21333
21334 #ifdef CONFIG_X86_64
21335-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21336-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21337- (unsigned long) debug_idt_table };
21338+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21339+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21340
21341 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21342 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21343@@ -1307,7 +1322,7 @@ void cpu_init(void)
21344 */
21345 load_ucode_ap();
21346
21347- t = &per_cpu(init_tss, cpu);
21348+ t = init_tss + cpu;
21349 oist = &per_cpu(orig_ist, cpu);
21350
21351 #ifdef CONFIG_NUMA
21352@@ -1339,7 +1354,6 @@ void cpu_init(void)
21353 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21354 barrier();
21355
21356- x86_configure_nx();
21357 x2apic_setup();
21358
21359 /*
21360@@ -1391,7 +1405,7 @@ void cpu_init(void)
21361 {
21362 int cpu = smp_processor_id();
21363 struct task_struct *curr = current;
21364- struct tss_struct *t = &per_cpu(init_tss, cpu);
21365+ struct tss_struct *t = init_tss + cpu;
21366 struct thread_struct *thread = &curr->thread;
21367
21368 wait_for_master_cpu(cpu);
21369diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21370index 6596433..1ad6eaf 100644
21371--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21372+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21373@@ -1024,6 +1024,22 @@ static struct attribute *default_attrs[] = {
21374 };
21375
21376 #ifdef CONFIG_AMD_NB
21377+static struct attribute *default_attrs_amd_nb[] = {
21378+ &type.attr,
21379+ &level.attr,
21380+ &coherency_line_size.attr,
21381+ &physical_line_partition.attr,
21382+ &ways_of_associativity.attr,
21383+ &number_of_sets.attr,
21384+ &size.attr,
21385+ &shared_cpu_map.attr,
21386+ &shared_cpu_list.attr,
21387+ NULL,
21388+ NULL,
21389+ NULL,
21390+ NULL
21391+};
21392+
21393 static struct attribute **amd_l3_attrs(void)
21394 {
21395 static struct attribute **attrs;
21396@@ -1034,18 +1050,7 @@ static struct attribute **amd_l3_attrs(void)
21397
21398 n = ARRAY_SIZE(default_attrs);
21399
21400- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21401- n += 2;
21402-
21403- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21404- n += 1;
21405-
21406- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21407- if (attrs == NULL)
21408- return attrs = default_attrs;
21409-
21410- for (n = 0; default_attrs[n]; n++)
21411- attrs[n] = default_attrs[n];
21412+ attrs = default_attrs_amd_nb;
21413
21414 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21415 attrs[n++] = &cache_disable_0.attr;
21416@@ -1096,6 +1101,13 @@ static struct kobj_type ktype_cache = {
21417 .default_attrs = default_attrs,
21418 };
21419
21420+#ifdef CONFIG_AMD_NB
21421+static struct kobj_type ktype_cache_amd_nb = {
21422+ .sysfs_ops = &sysfs_ops,
21423+ .default_attrs = default_attrs_amd_nb,
21424+};
21425+#endif
21426+
21427 static struct kobj_type ktype_percpu_entry = {
21428 .sysfs_ops = &sysfs_ops,
21429 };
21430@@ -1161,20 +1173,26 @@ static int cache_add_dev(struct device *dev)
21431 return retval;
21432 }
21433
21434+#ifdef CONFIG_AMD_NB
21435+ amd_l3_attrs();
21436+#endif
21437+
21438 for (i = 0; i < num_cache_leaves; i++) {
21439+ struct kobj_type *ktype;
21440+
21441 this_object = INDEX_KOBJECT_PTR(cpu, i);
21442 this_object->cpu = cpu;
21443 this_object->index = i;
21444
21445 this_leaf = CPUID4_INFO_IDX(cpu, i);
21446
21447- ktype_cache.default_attrs = default_attrs;
21448+ ktype = &ktype_cache;
21449 #ifdef CONFIG_AMD_NB
21450 if (this_leaf->base.nb)
21451- ktype_cache.default_attrs = amd_l3_attrs();
21452+ ktype = &ktype_cache_amd_nb;
21453 #endif
21454 retval = kobject_init_and_add(&(this_object->kobj),
21455- &ktype_cache,
21456+ ktype,
21457 per_cpu(ici_cache_kobject, cpu),
21458 "index%1lu", i);
21459 if (unlikely(retval)) {
21460diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21461index 11dd8f2..fd88f68 100644
21462--- a/arch/x86/kernel/cpu/mcheck/mce.c
21463+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21464@@ -47,6 +47,7 @@
21465 #include <asm/tlbflush.h>
21466 #include <asm/mce.h>
21467 #include <asm/msr.h>
21468+#include <asm/local.h>
21469
21470 #include "mce-internal.h"
21471
21472@@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
21473 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21474 m->cs, m->ip);
21475
21476- if (m->cs == __KERNEL_CS)
21477+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21478 print_symbol("{%s}", m->ip);
21479 pr_cont("\n");
21480 }
21481@@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
21482
21483 #define PANIC_TIMEOUT 5 /* 5 seconds */
21484
21485-static atomic_t mce_panicked;
21486+static atomic_unchecked_t mce_panicked;
21487
21488 static int fake_panic;
21489-static atomic_t mce_fake_panicked;
21490+static atomic_unchecked_t mce_fake_panicked;
21491
21492 /* Panic in progress. Enable interrupts and wait for final IPI */
21493 static void wait_for_panic(void)
21494@@ -318,7 +319,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21495 /*
21496 * Make sure only one CPU runs in machine check panic
21497 */
21498- if (atomic_inc_return(&mce_panicked) > 1)
21499+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21500 wait_for_panic();
21501 barrier();
21502
21503@@ -326,7 +327,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21504 console_verbose();
21505 } else {
21506 /* Don't log too much for fake panic */
21507- if (atomic_inc_return(&mce_fake_panicked) > 1)
21508+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21509 return;
21510 }
21511 /* First print corrected ones that are still unlogged */
21512@@ -365,7 +366,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21513 if (!fake_panic) {
21514 if (panic_timeout == 0)
21515 panic_timeout = mca_cfg.panic_timeout;
21516- panic(msg);
21517+ panic("%s", msg);
21518 } else
21519 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21520 }
21521@@ -746,7 +747,7 @@ static int mce_timed_out(u64 *t, const char *msg)
21522 * might have been modified by someone else.
21523 */
21524 rmb();
21525- if (atomic_read(&mce_panicked))
21526+ if (atomic_read_unchecked(&mce_panicked))
21527 wait_for_panic();
21528 if (!mca_cfg.monarch_timeout)
21529 goto out;
21530@@ -1672,7 +1673,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21531 }
21532
21533 /* Call the installed machine check handler for this CPU setup. */
21534-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21535+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21536 unexpected_machine_check;
21537
21538 /*
21539@@ -1695,7 +1696,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21540 return;
21541 }
21542
21543+ pax_open_kernel();
21544 machine_check_vector = do_machine_check;
21545+ pax_close_kernel();
21546
21547 __mcheck_cpu_init_generic();
21548 __mcheck_cpu_init_vendor(c);
21549@@ -1709,7 +1712,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21550 */
21551
21552 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21553-static int mce_chrdev_open_count; /* #times opened */
21554+static local_t mce_chrdev_open_count; /* #times opened */
21555 static int mce_chrdev_open_exclu; /* already open exclusive? */
21556
21557 static int mce_chrdev_open(struct inode *inode, struct file *file)
21558@@ -1717,7 +1720,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21559 spin_lock(&mce_chrdev_state_lock);
21560
21561 if (mce_chrdev_open_exclu ||
21562- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21563+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21564 spin_unlock(&mce_chrdev_state_lock);
21565
21566 return -EBUSY;
21567@@ -1725,7 +1728,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21568
21569 if (file->f_flags & O_EXCL)
21570 mce_chrdev_open_exclu = 1;
21571- mce_chrdev_open_count++;
21572+ local_inc(&mce_chrdev_open_count);
21573
21574 spin_unlock(&mce_chrdev_state_lock);
21575
21576@@ -1736,7 +1739,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21577 {
21578 spin_lock(&mce_chrdev_state_lock);
21579
21580- mce_chrdev_open_count--;
21581+ local_dec(&mce_chrdev_open_count);
21582 mce_chrdev_open_exclu = 0;
21583
21584 spin_unlock(&mce_chrdev_state_lock);
21585@@ -2411,7 +2414,7 @@ static __init void mce_init_banks(void)
21586
21587 for (i = 0; i < mca_cfg.banks; i++) {
21588 struct mce_bank *b = &mce_banks[i];
21589- struct device_attribute *a = &b->attr;
21590+ device_attribute_no_const *a = &b->attr;
21591
21592 sysfs_attr_init(&a->attr);
21593 a->attr.name = b->attrname;
21594@@ -2518,7 +2521,7 @@ struct dentry *mce_get_debugfs_dir(void)
21595 static void mce_reset(void)
21596 {
21597 cpu_missing = 0;
21598- atomic_set(&mce_fake_panicked, 0);
21599+ atomic_set_unchecked(&mce_fake_panicked, 0);
21600 atomic_set(&mce_executing, 0);
21601 atomic_set(&mce_callin, 0);
21602 atomic_set(&global_nwo, 0);
21603diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21604index 737b0ad..09ec66e 100644
21605--- a/arch/x86/kernel/cpu/mcheck/p5.c
21606+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21607@@ -12,6 +12,7 @@
21608 #include <asm/tlbflush.h>
21609 #include <asm/mce.h>
21610 #include <asm/msr.h>
21611+#include <asm/pgtable.h>
21612
21613 /* By default disabled */
21614 int mce_p5_enabled __read_mostly;
21615@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21616 if (!cpu_has(c, X86_FEATURE_MCE))
21617 return;
21618
21619+ pax_open_kernel();
21620 machine_check_vector = pentium_machine_check;
21621+ pax_close_kernel();
21622 /* Make sure the vector pointer is visible before we enable MCEs: */
21623 wmb();
21624
21625diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21626index 44f1382..315b292 100644
21627--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21628+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21629@@ -11,6 +11,7 @@
21630 #include <asm/tlbflush.h>
21631 #include <asm/mce.h>
21632 #include <asm/msr.h>
21633+#include <asm/pgtable.h>
21634
21635 /* Machine check handler for WinChip C6: */
21636 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21637@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21638 {
21639 u32 lo, hi;
21640
21641+ pax_open_kernel();
21642 machine_check_vector = winchip_machine_check;
21643+ pax_close_kernel();
21644 /* Make sure the vector pointer is visible before we enable MCEs: */
21645 wmb();
21646
21647diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21648index 36a8361..e7058c2 100644
21649--- a/arch/x86/kernel/cpu/microcode/core.c
21650+++ b/arch/x86/kernel/cpu/microcode/core.c
21651@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21652 return NOTIFY_OK;
21653 }
21654
21655-static struct notifier_block __refdata mc_cpu_notifier = {
21656+static struct notifier_block mc_cpu_notifier = {
21657 .notifier_call = mc_cpu_callback,
21658 };
21659
21660diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21661index 746e7fd..8dc677e 100644
21662--- a/arch/x86/kernel/cpu/microcode/intel.c
21663+++ b/arch/x86/kernel/cpu/microcode/intel.c
21664@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21665
21666 static int get_ucode_user(void *to, const void *from, size_t n)
21667 {
21668- return copy_from_user(to, from, n);
21669+ return copy_from_user(to, (const void __force_user *)from, n);
21670 }
21671
21672 static enum ucode_state
21673 request_microcode_user(int cpu, const void __user *buf, size_t size)
21674 {
21675- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21676+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21677 }
21678
21679 static void microcode_fini_cpu(int cpu)
21680diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21681index ea5f363..cb0e905 100644
21682--- a/arch/x86/kernel/cpu/mtrr/main.c
21683+++ b/arch/x86/kernel/cpu/mtrr/main.c
21684@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21685 u64 size_or_mask, size_and_mask;
21686 static bool mtrr_aps_delayed_init;
21687
21688-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21689+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21690
21691 const struct mtrr_ops *mtrr_if;
21692
21693diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21694index df5e41f..816c719 100644
21695--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21696+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21697@@ -25,7 +25,7 @@ struct mtrr_ops {
21698 int (*validate_add_page)(unsigned long base, unsigned long size,
21699 unsigned int type);
21700 int (*have_wrcomb)(void);
21701-};
21702+} __do_const;
21703
21704 extern int generic_get_free_region(unsigned long base, unsigned long size,
21705 int replace_reg);
21706diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21707index b71a7f8..534af0e 100644
21708--- a/arch/x86/kernel/cpu/perf_event.c
21709+++ b/arch/x86/kernel/cpu/perf_event.c
21710@@ -1376,7 +1376,7 @@ static void __init pmu_check_apic(void)
21711
21712 }
21713
21714-static struct attribute_group x86_pmu_format_group = {
21715+static attribute_group_no_const x86_pmu_format_group = {
21716 .name = "format",
21717 .attrs = NULL,
21718 };
21719@@ -1475,7 +1475,7 @@ static struct attribute *events_attr[] = {
21720 NULL,
21721 };
21722
21723-static struct attribute_group x86_pmu_events_group = {
21724+static attribute_group_no_const x86_pmu_events_group = {
21725 .name = "events",
21726 .attrs = events_attr,
21727 };
21728@@ -2037,7 +2037,7 @@ static unsigned long get_segment_base(unsigned int segment)
21729 if (idx > GDT_ENTRIES)
21730 return 0;
21731
21732- desc = raw_cpu_ptr(gdt_page.gdt);
21733+ desc = get_cpu_gdt_table(smp_processor_id());
21734 }
21735
21736 return get_desc_base(desc + idx);
21737@@ -2127,7 +2127,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21738 break;
21739
21740 perf_callchain_store(entry, frame.return_address);
21741- fp = frame.next_frame;
21742+ fp = (const void __force_user *)frame.next_frame;
21743 }
21744 }
21745
21746diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21747index 97242a9..cf9c30e 100644
21748--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21749+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21750@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21751 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21752 {
21753 struct attribute **attrs;
21754- struct attribute_group *attr_group;
21755+ attribute_group_no_const *attr_group;
21756 int i = 0, j;
21757
21758 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21759diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21760index 2589906..1ca1000 100644
21761--- a/arch/x86/kernel/cpu/perf_event_intel.c
21762+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21763@@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21764 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21765
21766 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21767- u64 capabilities;
21768+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21769
21770- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21771- x86_pmu.intel_cap.capabilities = capabilities;
21772+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21773+ x86_pmu.intel_cap.capabilities = capabilities;
21774 }
21775
21776 intel_ds_init();
21777diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21778index 76d8cbe..e5f9681 100644
21779--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21780+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21781@@ -465,7 +465,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21782 NULL,
21783 };
21784
21785-static struct attribute_group rapl_pmu_events_group = {
21786+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21787 .name = "events",
21788 .attrs = NULL, /* patched at runtime */
21789 };
21790diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21791index c635b8b..b78835e 100644
21792--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21793+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21794@@ -733,7 +733,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21795 static int __init uncore_type_init(struct intel_uncore_type *type)
21796 {
21797 struct intel_uncore_pmu *pmus;
21798- struct attribute_group *attr_group;
21799+ attribute_group_no_const *attr_group;
21800 struct attribute **attrs;
21801 int i, j;
21802
21803diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21804index 6c8c1e7..515b98a 100644
21805--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21806+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21807@@ -114,7 +114,7 @@ struct intel_uncore_box {
21808 struct uncore_event_desc {
21809 struct kobj_attribute attr;
21810 const char *config;
21811-};
21812+} __do_const;
21813
21814 ssize_t uncore_event_show(struct kobject *kobj,
21815 struct kobj_attribute *attr, char *buf);
21816diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21817index 83741a7..bd3507d 100644
21818--- a/arch/x86/kernel/cpuid.c
21819+++ b/arch/x86/kernel/cpuid.c
21820@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21821 return notifier_from_errno(err);
21822 }
21823
21824-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21825+static struct notifier_block cpuid_class_cpu_notifier =
21826 {
21827 .notifier_call = cpuid_class_cpu_callback,
21828 };
21829diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21830index aceb2f9..c76d3e3 100644
21831--- a/arch/x86/kernel/crash.c
21832+++ b/arch/x86/kernel/crash.c
21833@@ -105,7 +105,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21834 #ifdef CONFIG_X86_32
21835 struct pt_regs fixed_regs;
21836
21837- if (!user_mode_vm(regs)) {
21838+ if (!user_mode(regs)) {
21839 crash_fixup_ss_esp(&fixed_regs, regs);
21840 regs = &fixed_regs;
21841 }
21842diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21843index afa64ad..dce67dd 100644
21844--- a/arch/x86/kernel/crash_dump_64.c
21845+++ b/arch/x86/kernel/crash_dump_64.c
21846@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21847 return -ENOMEM;
21848
21849 if (userbuf) {
21850- if (copy_to_user(buf, vaddr + offset, csize)) {
21851+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21852 iounmap(vaddr);
21853 return -EFAULT;
21854 }
21855diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21856index f6dfd93..892ade4 100644
21857--- a/arch/x86/kernel/doublefault.c
21858+++ b/arch/x86/kernel/doublefault.c
21859@@ -12,7 +12,7 @@
21860
21861 #define DOUBLEFAULT_STACKSIZE (1024)
21862 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21863-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21864+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21865
21866 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21867
21868@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21869 unsigned long gdt, tss;
21870
21871 native_store_gdt(&gdt_desc);
21872- gdt = gdt_desc.address;
21873+ gdt = (unsigned long)gdt_desc.address;
21874
21875 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21876
21877@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21878 /* 0x2 bit is always set */
21879 .flags = X86_EFLAGS_SF | 0x2,
21880 .sp = STACK_START,
21881- .es = __USER_DS,
21882+ .es = __KERNEL_DS,
21883 .cs = __KERNEL_CS,
21884 .ss = __KERNEL_DS,
21885- .ds = __USER_DS,
21886+ .ds = __KERNEL_DS,
21887 .fs = __KERNEL_PERCPU,
21888
21889 .__cr3 = __pa_nodebug(swapper_pg_dir),
21890diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21891index cf3df1d..b637d9a 100644
21892--- a/arch/x86/kernel/dumpstack.c
21893+++ b/arch/x86/kernel/dumpstack.c
21894@@ -2,6 +2,9 @@
21895 * Copyright (C) 1991, 1992 Linus Torvalds
21896 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21897 */
21898+#ifdef CONFIG_GRKERNSEC_HIDESYM
21899+#define __INCLUDED_BY_HIDESYM 1
21900+#endif
21901 #include <linux/kallsyms.h>
21902 #include <linux/kprobes.h>
21903 #include <linux/uaccess.h>
21904@@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21905
21906 void printk_address(unsigned long address)
21907 {
21908- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21909+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21910 }
21911
21912 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21913 static void
21914 print_ftrace_graph_addr(unsigned long addr, void *data,
21915 const struct stacktrace_ops *ops,
21916- struct thread_info *tinfo, int *graph)
21917+ struct task_struct *task, int *graph)
21918 {
21919- struct task_struct *task;
21920 unsigned long ret_addr;
21921 int index;
21922
21923 if (addr != (unsigned long)return_to_handler)
21924 return;
21925
21926- task = tinfo->task;
21927 index = task->curr_ret_stack;
21928
21929 if (!task->ret_stack || index < *graph)
21930@@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21931 static inline void
21932 print_ftrace_graph_addr(unsigned long addr, void *data,
21933 const struct stacktrace_ops *ops,
21934- struct thread_info *tinfo, int *graph)
21935+ struct task_struct *task, int *graph)
21936 { }
21937 #endif
21938
21939@@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21940 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21941 */
21942
21943-static inline int valid_stack_ptr(struct thread_info *tinfo,
21944- void *p, unsigned int size, void *end)
21945+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21946 {
21947- void *t = tinfo;
21948 if (end) {
21949 if (p < end && p >= (end-THREAD_SIZE))
21950 return 1;
21951@@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21952 }
21953
21954 unsigned long
21955-print_context_stack(struct thread_info *tinfo,
21956+print_context_stack(struct task_struct *task, void *stack_start,
21957 unsigned long *stack, unsigned long bp,
21958 const struct stacktrace_ops *ops, void *data,
21959 unsigned long *end, int *graph)
21960 {
21961 struct stack_frame *frame = (struct stack_frame *)bp;
21962
21963- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21964+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21965 unsigned long addr;
21966
21967 addr = *stack;
21968@@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21969 } else {
21970 ops->address(data, addr, 0);
21971 }
21972- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21973+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21974 }
21975 stack++;
21976 }
21977@@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21978 EXPORT_SYMBOL_GPL(print_context_stack);
21979
21980 unsigned long
21981-print_context_stack_bp(struct thread_info *tinfo,
21982+print_context_stack_bp(struct task_struct *task, void *stack_start,
21983 unsigned long *stack, unsigned long bp,
21984 const struct stacktrace_ops *ops, void *data,
21985 unsigned long *end, int *graph)
21986@@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21987 struct stack_frame *frame = (struct stack_frame *)bp;
21988 unsigned long *ret_addr = &frame->return_address;
21989
21990- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21991+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21992 unsigned long addr = *ret_addr;
21993
21994 if (!__kernel_text_address(addr))
21995@@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21996 ops->address(data, addr, 1);
21997 frame = frame->next_frame;
21998 ret_addr = &frame->return_address;
21999- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22000+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22001 }
22002
22003 return (unsigned long)frame;
22004@@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
22005 static void print_trace_address(void *data, unsigned long addr, int reliable)
22006 {
22007 touch_nmi_watchdog();
22008- printk(data);
22009+ printk("%s", (char *)data);
22010 printk_stack_address(addr, reliable);
22011 }
22012
22013@@ -225,6 +224,8 @@ unsigned long oops_begin(void)
22014 EXPORT_SYMBOL_GPL(oops_begin);
22015 NOKPROBE_SYMBOL(oops_begin);
22016
22017+extern void gr_handle_kernel_exploit(void);
22018+
22019 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22020 {
22021 if (regs && kexec_should_crash(current))
22022@@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22023 panic("Fatal exception in interrupt");
22024 if (panic_on_oops)
22025 panic("Fatal exception");
22026- do_exit(signr);
22027+
22028+ gr_handle_kernel_exploit();
22029+
22030+ do_group_exit(signr);
22031 }
22032 NOKPROBE_SYMBOL(oops_end);
22033
22034@@ -278,7 +282,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22035 print_modules();
22036 show_regs(regs);
22037 #ifdef CONFIG_X86_32
22038- if (user_mode_vm(regs)) {
22039+ if (user_mode(regs)) {
22040 sp = regs->sp;
22041 ss = regs->ss & 0xffff;
22042 } else {
22043@@ -307,7 +311,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22044 unsigned long flags = oops_begin();
22045 int sig = SIGSEGV;
22046
22047- if (!user_mode_vm(regs))
22048+ if (!user_mode(regs))
22049 report_bug(regs->ip, regs);
22050
22051 if (__die(str, regs, err))
22052diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22053index 5abd4cd..c65733b 100644
22054--- a/arch/x86/kernel/dumpstack_32.c
22055+++ b/arch/x86/kernel/dumpstack_32.c
22056@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22057 bp = stack_frame(task, regs);
22058
22059 for (;;) {
22060- struct thread_info *context;
22061+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22062 void *end_stack;
22063
22064 end_stack = is_hardirq_stack(stack, cpu);
22065 if (!end_stack)
22066 end_stack = is_softirq_stack(stack, cpu);
22067
22068- context = task_thread_info(task);
22069- bp = ops->walk_stack(context, stack, bp, ops, data,
22070+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22071 end_stack, &graph);
22072
22073 /* Stop if not on irq stack */
22074@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22075 int i;
22076
22077 show_regs_print_info(KERN_EMERG);
22078- __show_regs(regs, !user_mode_vm(regs));
22079+ __show_regs(regs, !user_mode(regs));
22080
22081 /*
22082 * When in-kernel, we also print out the stack and code at the
22083 * time of the fault..
22084 */
22085- if (!user_mode_vm(regs)) {
22086+ if (!user_mode(regs)) {
22087 unsigned int code_prologue = code_bytes * 43 / 64;
22088 unsigned int code_len = code_bytes;
22089 unsigned char c;
22090 u8 *ip;
22091+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22092
22093 pr_emerg("Stack:\n");
22094 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22095
22096 pr_emerg("Code:");
22097
22098- ip = (u8 *)regs->ip - code_prologue;
22099+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22100 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22101 /* try starting at IP */
22102- ip = (u8 *)regs->ip;
22103+ ip = (u8 *)regs->ip + cs_base;
22104 code_len = code_len - code_prologue + 1;
22105 }
22106 for (i = 0; i < code_len; i++, ip++) {
22107@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22108 pr_cont(" Bad EIP value.");
22109 break;
22110 }
22111- if (ip == (u8 *)regs->ip)
22112+ if (ip == (u8 *)regs->ip + cs_base)
22113 pr_cont(" <%02x>", c);
22114 else
22115 pr_cont(" %02x", c);
22116@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22117 {
22118 unsigned short ud2;
22119
22120+ ip = ktla_ktva(ip);
22121 if (ip < PAGE_OFFSET)
22122 return 0;
22123 if (probe_kernel_address((unsigned short *)ip, ud2))
22124@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22125
22126 return ud2 == 0x0b0f;
22127 }
22128+
22129+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22130+void pax_check_alloca(unsigned long size)
22131+{
22132+ unsigned long sp = (unsigned long)&sp, stack_left;
22133+
22134+ /* all kernel stacks are of the same size */
22135+ stack_left = sp & (THREAD_SIZE - 1);
22136+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22137+}
22138+EXPORT_SYMBOL(pax_check_alloca);
22139+#endif
22140diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22141index ff86f19..73eabf4 100644
22142--- a/arch/x86/kernel/dumpstack_64.c
22143+++ b/arch/x86/kernel/dumpstack_64.c
22144@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22145 const struct stacktrace_ops *ops, void *data)
22146 {
22147 const unsigned cpu = get_cpu();
22148- struct thread_info *tinfo;
22149 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22150 unsigned long dummy;
22151 unsigned used = 0;
22152 int graph = 0;
22153 int done = 0;
22154+ void *stack_start;
22155
22156 if (!task)
22157 task = current;
22158@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22159 * current stack address. If the stacks consist of nested
22160 * exceptions
22161 */
22162- tinfo = task_thread_info(task);
22163 while (!done) {
22164 unsigned long *stack_end;
22165 enum stack_type stype;
22166@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22167 if (ops->stack(data, id) < 0)
22168 break;
22169
22170- bp = ops->walk_stack(tinfo, stack, bp, ops,
22171+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22172 data, stack_end, &graph);
22173 ops->stack(data, "<EOE>");
22174 /*
22175@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22176 * second-to-last pointer (index -2 to end) in the
22177 * exception stack:
22178 */
22179+ if ((u16)stack_end[-1] != __KERNEL_DS)
22180+ goto out;
22181 stack = (unsigned long *) stack_end[-2];
22182 done = 0;
22183 break;
22184@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22185
22186 if (ops->stack(data, "IRQ") < 0)
22187 break;
22188- bp = ops->walk_stack(tinfo, stack, bp,
22189+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22190 ops, data, stack_end, &graph);
22191 /*
22192 * We link to the next stack (which would be
22193@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22194 /*
22195 * This handles the process stack:
22196 */
22197- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22198+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22199+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22200+out:
22201 put_cpu();
22202 }
22203 EXPORT_SYMBOL(dump_trace);
22204@@ -344,8 +347,55 @@ int is_valid_bugaddr(unsigned long ip)
22205 {
22206 unsigned short ud2;
22207
22208- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22209+ if (probe_kernel_address((unsigned short *)ip, ud2))
22210 return 0;
22211
22212 return ud2 == 0x0b0f;
22213 }
22214+
22215+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22216+void pax_check_alloca(unsigned long size)
22217+{
22218+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22219+ unsigned cpu, used;
22220+ char *id;
22221+
22222+ /* check the process stack first */
22223+ stack_start = (unsigned long)task_stack_page(current);
22224+ stack_end = stack_start + THREAD_SIZE;
22225+ if (likely(stack_start <= sp && sp < stack_end)) {
22226+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22227+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22228+ return;
22229+ }
22230+
22231+ cpu = get_cpu();
22232+
22233+ /* check the irq stacks */
22234+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22235+ stack_start = stack_end - IRQ_STACK_SIZE;
22236+ if (stack_start <= sp && sp < stack_end) {
22237+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22238+ put_cpu();
22239+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22240+ return;
22241+ }
22242+
22243+ /* check the exception stacks */
22244+ used = 0;
22245+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22246+ stack_start = stack_end - EXCEPTION_STKSZ;
22247+ if (stack_end && stack_start <= sp && sp < stack_end) {
22248+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22249+ put_cpu();
22250+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22251+ return;
22252+ }
22253+
22254+ put_cpu();
22255+
22256+ /* unknown stack */
22257+ BUG();
22258+}
22259+EXPORT_SYMBOL(pax_check_alloca);
22260+#endif
22261diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22262index 46201de..ebffabf 100644
22263--- a/arch/x86/kernel/e820.c
22264+++ b/arch/x86/kernel/e820.c
22265@@ -794,8 +794,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22266
22267 static void early_panic(char *msg)
22268 {
22269- early_printk(msg);
22270- panic(msg);
22271+ early_printk("%s", msg);
22272+ panic("%s", msg);
22273 }
22274
22275 static int userdef __initdata;
22276diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22277index a62536a..8444df4 100644
22278--- a/arch/x86/kernel/early_printk.c
22279+++ b/arch/x86/kernel/early_printk.c
22280@@ -7,6 +7,7 @@
22281 #include <linux/pci_regs.h>
22282 #include <linux/pci_ids.h>
22283 #include <linux/errno.h>
22284+#include <linux/sched.h>
22285 #include <asm/io.h>
22286 #include <asm/processor.h>
22287 #include <asm/fcntl.h>
22288diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22289index 31e2d5b..b31c76d 100644
22290--- a/arch/x86/kernel/entry_32.S
22291+++ b/arch/x86/kernel/entry_32.S
22292@@ -177,13 +177,154 @@
22293 /*CFI_REL_OFFSET gs, PT_GS*/
22294 .endm
22295 .macro SET_KERNEL_GS reg
22296+
22297+#ifdef CONFIG_CC_STACKPROTECTOR
22298 movl $(__KERNEL_STACK_CANARY), \reg
22299+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22300+ movl $(__USER_DS), \reg
22301+#else
22302+ xorl \reg, \reg
22303+#endif
22304+
22305 movl \reg, %gs
22306 .endm
22307
22308 #endif /* CONFIG_X86_32_LAZY_GS */
22309
22310-.macro SAVE_ALL
22311+.macro pax_enter_kernel
22312+#ifdef CONFIG_PAX_KERNEXEC
22313+ call pax_enter_kernel
22314+#endif
22315+.endm
22316+
22317+.macro pax_exit_kernel
22318+#ifdef CONFIG_PAX_KERNEXEC
22319+ call pax_exit_kernel
22320+#endif
22321+.endm
22322+
22323+#ifdef CONFIG_PAX_KERNEXEC
22324+ENTRY(pax_enter_kernel)
22325+#ifdef CONFIG_PARAVIRT
22326+ pushl %eax
22327+ pushl %ecx
22328+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22329+ mov %eax, %esi
22330+#else
22331+ mov %cr0, %esi
22332+#endif
22333+ bts $16, %esi
22334+ jnc 1f
22335+ mov %cs, %esi
22336+ cmp $__KERNEL_CS, %esi
22337+ jz 3f
22338+ ljmp $__KERNEL_CS, $3f
22339+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22340+2:
22341+#ifdef CONFIG_PARAVIRT
22342+ mov %esi, %eax
22343+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22344+#else
22345+ mov %esi, %cr0
22346+#endif
22347+3:
22348+#ifdef CONFIG_PARAVIRT
22349+ popl %ecx
22350+ popl %eax
22351+#endif
22352+ ret
22353+ENDPROC(pax_enter_kernel)
22354+
22355+ENTRY(pax_exit_kernel)
22356+#ifdef CONFIG_PARAVIRT
22357+ pushl %eax
22358+ pushl %ecx
22359+#endif
22360+ mov %cs, %esi
22361+ cmp $__KERNEXEC_KERNEL_CS, %esi
22362+ jnz 2f
22363+#ifdef CONFIG_PARAVIRT
22364+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22365+ mov %eax, %esi
22366+#else
22367+ mov %cr0, %esi
22368+#endif
22369+ btr $16, %esi
22370+ ljmp $__KERNEL_CS, $1f
22371+1:
22372+#ifdef CONFIG_PARAVIRT
22373+ mov %esi, %eax
22374+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22375+#else
22376+ mov %esi, %cr0
22377+#endif
22378+2:
22379+#ifdef CONFIG_PARAVIRT
22380+ popl %ecx
22381+ popl %eax
22382+#endif
22383+ ret
22384+ENDPROC(pax_exit_kernel)
22385+#endif
22386+
22387+ .macro pax_erase_kstack
22388+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22389+ call pax_erase_kstack
22390+#endif
22391+ .endm
22392+
22393+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22394+/*
22395+ * ebp: thread_info
22396+ */
22397+ENTRY(pax_erase_kstack)
22398+ pushl %edi
22399+ pushl %ecx
22400+ pushl %eax
22401+
22402+ mov TI_lowest_stack(%ebp), %edi
22403+ mov $-0xBEEF, %eax
22404+ std
22405+
22406+1: mov %edi, %ecx
22407+ and $THREAD_SIZE_asm - 1, %ecx
22408+ shr $2, %ecx
22409+ repne scasl
22410+ jecxz 2f
22411+
22412+ cmp $2*16, %ecx
22413+ jc 2f
22414+
22415+ mov $2*16, %ecx
22416+ repe scasl
22417+ jecxz 2f
22418+ jne 1b
22419+
22420+2: cld
22421+ or $2*4, %edi
22422+ mov %esp, %ecx
22423+ sub %edi, %ecx
22424+
22425+ cmp $THREAD_SIZE_asm, %ecx
22426+ jb 3f
22427+ ud2
22428+3:
22429+
22430+ shr $2, %ecx
22431+ rep stosl
22432+
22433+ mov TI_task_thread_sp0(%ebp), %edi
22434+ sub $128, %edi
22435+ mov %edi, TI_lowest_stack(%ebp)
22436+
22437+ popl %eax
22438+ popl %ecx
22439+ popl %edi
22440+ ret
22441+ENDPROC(pax_erase_kstack)
22442+#endif
22443+
22444+.macro __SAVE_ALL _DS
22445 cld
22446 PUSH_GS
22447 pushl_cfi %fs
22448@@ -206,7 +347,7 @@
22449 CFI_REL_OFFSET ecx, 0
22450 pushl_cfi %ebx
22451 CFI_REL_OFFSET ebx, 0
22452- movl $(__USER_DS), %edx
22453+ movl $\_DS, %edx
22454 movl %edx, %ds
22455 movl %edx, %es
22456 movl $(__KERNEL_PERCPU), %edx
22457@@ -214,6 +355,15 @@
22458 SET_KERNEL_GS %edx
22459 .endm
22460
22461+.macro SAVE_ALL
22462+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22463+ __SAVE_ALL __KERNEL_DS
22464+ pax_enter_kernel
22465+#else
22466+ __SAVE_ALL __USER_DS
22467+#endif
22468+.endm
22469+
22470 .macro RESTORE_INT_REGS
22471 popl_cfi %ebx
22472 CFI_RESTORE ebx
22473@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22474 popfl_cfi
22475 jmp syscall_exit
22476 CFI_ENDPROC
22477-END(ret_from_fork)
22478+ENDPROC(ret_from_fork)
22479
22480 ENTRY(ret_from_kernel_thread)
22481 CFI_STARTPROC
22482@@ -340,7 +490,15 @@ ret_from_intr:
22483 andl $SEGMENT_RPL_MASK, %eax
22484 #endif
22485 cmpl $USER_RPL, %eax
22486+
22487+#ifdef CONFIG_PAX_KERNEXEC
22488+ jae resume_userspace
22489+
22490+ pax_exit_kernel
22491+ jmp resume_kernel
22492+#else
22493 jb resume_kernel # not returning to v8086 or userspace
22494+#endif
22495
22496 ENTRY(resume_userspace)
22497 LOCKDEP_SYS_EXIT
22498@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22499 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22500 # int/exception return?
22501 jne work_pending
22502- jmp restore_all
22503-END(ret_from_exception)
22504+ jmp restore_all_pax
22505+ENDPROC(ret_from_exception)
22506
22507 #ifdef CONFIG_PREEMPT
22508 ENTRY(resume_kernel)
22509@@ -365,7 +523,7 @@ need_resched:
22510 jz restore_all
22511 call preempt_schedule_irq
22512 jmp need_resched
22513-END(resume_kernel)
22514+ENDPROC(resume_kernel)
22515 #endif
22516 CFI_ENDPROC
22517
22518@@ -395,30 +553,45 @@ sysenter_past_esp:
22519 /*CFI_REL_OFFSET cs, 0*/
22520 /*
22521 * Push current_thread_info()->sysenter_return to the stack.
22522- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22523- * pushed above; +8 corresponds to copy_thread's esp0 setting.
22524 */
22525- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22526+ pushl_cfi $0
22527 CFI_REL_OFFSET eip, 0
22528
22529 pushl_cfi %eax
22530 SAVE_ALL
22531+ GET_THREAD_INFO(%ebp)
22532+ movl TI_sysenter_return(%ebp),%ebp
22533+ movl %ebp,PT_EIP(%esp)
22534 ENABLE_INTERRUPTS(CLBR_NONE)
22535
22536 /*
22537 * Load the potential sixth argument from user stack.
22538 * Careful about security.
22539 */
22540+ movl PT_OLDESP(%esp),%ebp
22541+
22542+#ifdef CONFIG_PAX_MEMORY_UDEREF
22543+ mov PT_OLDSS(%esp),%ds
22544+1: movl %ds:(%ebp),%ebp
22545+ push %ss
22546+ pop %ds
22547+#else
22548 cmpl $__PAGE_OFFSET-3,%ebp
22549 jae syscall_fault
22550 ASM_STAC
22551 1: movl (%ebp),%ebp
22552 ASM_CLAC
22553+#endif
22554+
22555 movl %ebp,PT_EBP(%esp)
22556 _ASM_EXTABLE(1b,syscall_fault)
22557
22558 GET_THREAD_INFO(%ebp)
22559
22560+#ifdef CONFIG_PAX_RANDKSTACK
22561+ pax_erase_kstack
22562+#endif
22563+
22564 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22565 jnz sysenter_audit
22566 sysenter_do_call:
22567@@ -434,12 +607,24 @@ sysenter_after_call:
22568 testl $_TIF_ALLWORK_MASK, %ecx
22569 jne sysexit_audit
22570 sysenter_exit:
22571+
22572+#ifdef CONFIG_PAX_RANDKSTACK
22573+ pushl_cfi %eax
22574+ movl %esp, %eax
22575+ call pax_randomize_kstack
22576+ popl_cfi %eax
22577+#endif
22578+
22579+ pax_erase_kstack
22580+
22581 /* if something modifies registers it must also disable sysexit */
22582 movl PT_EIP(%esp), %edx
22583 movl PT_OLDESP(%esp), %ecx
22584 xorl %ebp,%ebp
22585 TRACE_IRQS_ON
22586 1: mov PT_FS(%esp), %fs
22587+2: mov PT_DS(%esp), %ds
22588+3: mov PT_ES(%esp), %es
22589 PTGS_TO_GS
22590 ENABLE_INTERRUPTS_SYSEXIT
22591
22592@@ -453,6 +638,9 @@ sysenter_audit:
22593 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22594 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22595 call __audit_syscall_entry
22596+
22597+ pax_erase_kstack
22598+
22599 popl_cfi %ecx /* get that remapped edx off the stack */
22600 popl_cfi %ecx /* get that remapped esi off the stack */
22601 movl PT_EAX(%esp),%eax /* reload syscall number */
22602@@ -479,10 +667,16 @@ sysexit_audit:
22603
22604 CFI_ENDPROC
22605 .pushsection .fixup,"ax"
22606-2: movl $0,PT_FS(%esp)
22607+4: movl $0,PT_FS(%esp)
22608+ jmp 1b
22609+5: movl $0,PT_DS(%esp)
22610+ jmp 1b
22611+6: movl $0,PT_ES(%esp)
22612 jmp 1b
22613 .popsection
22614- _ASM_EXTABLE(1b,2b)
22615+ _ASM_EXTABLE(1b,4b)
22616+ _ASM_EXTABLE(2b,5b)
22617+ _ASM_EXTABLE(3b,6b)
22618 PTGS_TO_GS_EX
22619 ENDPROC(ia32_sysenter_target)
22620
22621@@ -493,6 +687,11 @@ ENTRY(system_call)
22622 pushl_cfi %eax # save orig_eax
22623 SAVE_ALL
22624 GET_THREAD_INFO(%ebp)
22625+
22626+#ifdef CONFIG_PAX_RANDKSTACK
22627+ pax_erase_kstack
22628+#endif
22629+
22630 # system call tracing in operation / emulation
22631 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22632 jnz syscall_trace_entry
22633@@ -512,6 +711,15 @@ syscall_exit:
22634 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22635 jne syscall_exit_work
22636
22637+restore_all_pax:
22638+
22639+#ifdef CONFIG_PAX_RANDKSTACK
22640+ movl %esp, %eax
22641+ call pax_randomize_kstack
22642+#endif
22643+
22644+ pax_erase_kstack
22645+
22646 restore_all:
22647 TRACE_IRQS_IRET
22648 restore_all_notrace:
22649@@ -566,14 +774,34 @@ ldt_ss:
22650 * compensating for the offset by changing to the ESPFIX segment with
22651 * a base address that matches for the difference.
22652 */
22653-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22654+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22655 mov %esp, %edx /* load kernel esp */
22656 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22657 mov %dx, %ax /* eax: new kernel esp */
22658 sub %eax, %edx /* offset (low word is 0) */
22659+#ifdef CONFIG_SMP
22660+ movl PER_CPU_VAR(cpu_number), %ebx
22661+ shll $PAGE_SHIFT_asm, %ebx
22662+ addl $cpu_gdt_table, %ebx
22663+#else
22664+ movl $cpu_gdt_table, %ebx
22665+#endif
22666 shr $16, %edx
22667- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22668- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22669+
22670+#ifdef CONFIG_PAX_KERNEXEC
22671+ mov %cr0, %esi
22672+ btr $16, %esi
22673+ mov %esi, %cr0
22674+#endif
22675+
22676+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22677+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22678+
22679+#ifdef CONFIG_PAX_KERNEXEC
22680+ bts $16, %esi
22681+ mov %esi, %cr0
22682+#endif
22683+
22684 pushl_cfi $__ESPFIX_SS
22685 pushl_cfi %eax /* new kernel esp */
22686 /* Disable interrupts, but do not irqtrace this section: we
22687@@ -603,20 +831,18 @@ work_resched:
22688 movl TI_flags(%ebp), %ecx
22689 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22690 # than syscall tracing?
22691- jz restore_all
22692+ jz restore_all_pax
22693 testb $_TIF_NEED_RESCHED, %cl
22694 jnz work_resched
22695
22696 work_notifysig: # deal with pending signals and
22697 # notify-resume requests
22698+ movl %esp, %eax
22699 #ifdef CONFIG_VM86
22700 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22701- movl %esp, %eax
22702 jne work_notifysig_v86 # returning to kernel-space or
22703 # vm86-space
22704 1:
22705-#else
22706- movl %esp, %eax
22707 #endif
22708 TRACE_IRQS_ON
22709 ENABLE_INTERRUPTS(CLBR_NONE)
22710@@ -637,7 +863,7 @@ work_notifysig_v86:
22711 movl %eax, %esp
22712 jmp 1b
22713 #endif
22714-END(work_pending)
22715+ENDPROC(work_pending)
22716
22717 # perform syscall exit tracing
22718 ALIGN
22719@@ -645,11 +871,14 @@ syscall_trace_entry:
22720 movl $-ENOSYS,PT_EAX(%esp)
22721 movl %esp, %eax
22722 call syscall_trace_enter
22723+
22724+ pax_erase_kstack
22725+
22726 /* What it returned is what we'll actually use. */
22727 cmpl $(NR_syscalls), %eax
22728 jnae syscall_call
22729 jmp syscall_exit
22730-END(syscall_trace_entry)
22731+ENDPROC(syscall_trace_entry)
22732
22733 # perform syscall exit tracing
22734 ALIGN
22735@@ -662,26 +891,30 @@ syscall_exit_work:
22736 movl %esp, %eax
22737 call syscall_trace_leave
22738 jmp resume_userspace
22739-END(syscall_exit_work)
22740+ENDPROC(syscall_exit_work)
22741 CFI_ENDPROC
22742
22743 RING0_INT_FRAME # can't unwind into user space anyway
22744 syscall_fault:
22745+#ifdef CONFIG_PAX_MEMORY_UDEREF
22746+ push %ss
22747+ pop %ds
22748+#endif
22749 ASM_CLAC
22750 GET_THREAD_INFO(%ebp)
22751 movl $-EFAULT,PT_EAX(%esp)
22752 jmp resume_userspace
22753-END(syscall_fault)
22754+ENDPROC(syscall_fault)
22755
22756 syscall_badsys:
22757 movl $-ENOSYS,%eax
22758 jmp syscall_after_call
22759-END(syscall_badsys)
22760+ENDPROC(syscall_badsys)
22761
22762 sysenter_badsys:
22763 movl $-ENOSYS,%eax
22764 jmp sysenter_after_call
22765-END(sysenter_badsys)
22766+ENDPROC(sysenter_badsys)
22767 CFI_ENDPROC
22768
22769 .macro FIXUP_ESPFIX_STACK
22770@@ -694,8 +927,15 @@ END(sysenter_badsys)
22771 */
22772 #ifdef CONFIG_X86_ESPFIX32
22773 /* fixup the stack */
22774- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22775- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22776+#ifdef CONFIG_SMP
22777+ movl PER_CPU_VAR(cpu_number), %ebx
22778+ shll $PAGE_SHIFT_asm, %ebx
22779+ addl $cpu_gdt_table, %ebx
22780+#else
22781+ movl $cpu_gdt_table, %ebx
22782+#endif
22783+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22784+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22785 shl $16, %eax
22786 addl %esp, %eax /* the adjusted stack pointer */
22787 pushl_cfi $__KERNEL_DS
22788@@ -751,7 +991,7 @@ vector=vector+1
22789 .endr
22790 2: jmp common_interrupt
22791 .endr
22792-END(irq_entries_start)
22793+ENDPROC(irq_entries_start)
22794
22795 .previous
22796 END(interrupt)
22797@@ -808,7 +1048,7 @@ ENTRY(coprocessor_error)
22798 pushl_cfi $do_coprocessor_error
22799 jmp error_code
22800 CFI_ENDPROC
22801-END(coprocessor_error)
22802+ENDPROC(coprocessor_error)
22803
22804 ENTRY(simd_coprocessor_error)
22805 RING0_INT_FRAME
22806@@ -821,7 +1061,7 @@ ENTRY(simd_coprocessor_error)
22807 .section .altinstructions,"a"
22808 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22809 .previous
22810-.section .altinstr_replacement,"ax"
22811+.section .altinstr_replacement,"a"
22812 663: pushl $do_simd_coprocessor_error
22813 664:
22814 .previous
22815@@ -830,7 +1070,7 @@ ENTRY(simd_coprocessor_error)
22816 #endif
22817 jmp error_code
22818 CFI_ENDPROC
22819-END(simd_coprocessor_error)
22820+ENDPROC(simd_coprocessor_error)
22821
22822 ENTRY(device_not_available)
22823 RING0_INT_FRAME
22824@@ -839,18 +1079,18 @@ ENTRY(device_not_available)
22825 pushl_cfi $do_device_not_available
22826 jmp error_code
22827 CFI_ENDPROC
22828-END(device_not_available)
22829+ENDPROC(device_not_available)
22830
22831 #ifdef CONFIG_PARAVIRT
22832 ENTRY(native_iret)
22833 iret
22834 _ASM_EXTABLE(native_iret, iret_exc)
22835-END(native_iret)
22836+ENDPROC(native_iret)
22837
22838 ENTRY(native_irq_enable_sysexit)
22839 sti
22840 sysexit
22841-END(native_irq_enable_sysexit)
22842+ENDPROC(native_irq_enable_sysexit)
22843 #endif
22844
22845 ENTRY(overflow)
22846@@ -860,7 +1100,7 @@ ENTRY(overflow)
22847 pushl_cfi $do_overflow
22848 jmp error_code
22849 CFI_ENDPROC
22850-END(overflow)
22851+ENDPROC(overflow)
22852
22853 ENTRY(bounds)
22854 RING0_INT_FRAME
22855@@ -869,7 +1109,7 @@ ENTRY(bounds)
22856 pushl_cfi $do_bounds
22857 jmp error_code
22858 CFI_ENDPROC
22859-END(bounds)
22860+ENDPROC(bounds)
22861
22862 ENTRY(invalid_op)
22863 RING0_INT_FRAME
22864@@ -878,7 +1118,7 @@ ENTRY(invalid_op)
22865 pushl_cfi $do_invalid_op
22866 jmp error_code
22867 CFI_ENDPROC
22868-END(invalid_op)
22869+ENDPROC(invalid_op)
22870
22871 ENTRY(coprocessor_segment_overrun)
22872 RING0_INT_FRAME
22873@@ -887,7 +1127,7 @@ ENTRY(coprocessor_segment_overrun)
22874 pushl_cfi $do_coprocessor_segment_overrun
22875 jmp error_code
22876 CFI_ENDPROC
22877-END(coprocessor_segment_overrun)
22878+ENDPROC(coprocessor_segment_overrun)
22879
22880 ENTRY(invalid_TSS)
22881 RING0_EC_FRAME
22882@@ -895,7 +1135,7 @@ ENTRY(invalid_TSS)
22883 pushl_cfi $do_invalid_TSS
22884 jmp error_code
22885 CFI_ENDPROC
22886-END(invalid_TSS)
22887+ENDPROC(invalid_TSS)
22888
22889 ENTRY(segment_not_present)
22890 RING0_EC_FRAME
22891@@ -903,7 +1143,7 @@ ENTRY(segment_not_present)
22892 pushl_cfi $do_segment_not_present
22893 jmp error_code
22894 CFI_ENDPROC
22895-END(segment_not_present)
22896+ENDPROC(segment_not_present)
22897
22898 ENTRY(stack_segment)
22899 RING0_EC_FRAME
22900@@ -911,7 +1151,7 @@ ENTRY(stack_segment)
22901 pushl_cfi $do_stack_segment
22902 jmp error_code
22903 CFI_ENDPROC
22904-END(stack_segment)
22905+ENDPROC(stack_segment)
22906
22907 ENTRY(alignment_check)
22908 RING0_EC_FRAME
22909@@ -919,7 +1159,7 @@ ENTRY(alignment_check)
22910 pushl_cfi $do_alignment_check
22911 jmp error_code
22912 CFI_ENDPROC
22913-END(alignment_check)
22914+ENDPROC(alignment_check)
22915
22916 ENTRY(divide_error)
22917 RING0_INT_FRAME
22918@@ -928,7 +1168,7 @@ ENTRY(divide_error)
22919 pushl_cfi $do_divide_error
22920 jmp error_code
22921 CFI_ENDPROC
22922-END(divide_error)
22923+ENDPROC(divide_error)
22924
22925 #ifdef CONFIG_X86_MCE
22926 ENTRY(machine_check)
22927@@ -938,7 +1178,7 @@ ENTRY(machine_check)
22928 pushl_cfi machine_check_vector
22929 jmp error_code
22930 CFI_ENDPROC
22931-END(machine_check)
22932+ENDPROC(machine_check)
22933 #endif
22934
22935 ENTRY(spurious_interrupt_bug)
22936@@ -948,7 +1188,7 @@ ENTRY(spurious_interrupt_bug)
22937 pushl_cfi $do_spurious_interrupt_bug
22938 jmp error_code
22939 CFI_ENDPROC
22940-END(spurious_interrupt_bug)
22941+ENDPROC(spurious_interrupt_bug)
22942
22943 #ifdef CONFIG_XEN
22944 /* Xen doesn't set %esp to be precisely what the normal sysenter
22945@@ -1057,7 +1297,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22946
22947 ENTRY(mcount)
22948 ret
22949-END(mcount)
22950+ENDPROC(mcount)
22951
22952 ENTRY(ftrace_caller)
22953 pushl %eax
22954@@ -1087,7 +1327,7 @@ ftrace_graph_call:
22955 .globl ftrace_stub
22956 ftrace_stub:
22957 ret
22958-END(ftrace_caller)
22959+ENDPROC(ftrace_caller)
22960
22961 ENTRY(ftrace_regs_caller)
22962 pushf /* push flags before compare (in cs location) */
22963@@ -1185,7 +1425,7 @@ trace:
22964 popl %ecx
22965 popl %eax
22966 jmp ftrace_stub
22967-END(mcount)
22968+ENDPROC(mcount)
22969 #endif /* CONFIG_DYNAMIC_FTRACE */
22970 #endif /* CONFIG_FUNCTION_TRACER */
22971
22972@@ -1203,7 +1443,7 @@ ENTRY(ftrace_graph_caller)
22973 popl %ecx
22974 popl %eax
22975 ret
22976-END(ftrace_graph_caller)
22977+ENDPROC(ftrace_graph_caller)
22978
22979 .globl return_to_handler
22980 return_to_handler:
22981@@ -1264,15 +1504,18 @@ error_code:
22982 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22983 REG_TO_PTGS %ecx
22984 SET_KERNEL_GS %ecx
22985- movl $(__USER_DS), %ecx
22986+ movl $(__KERNEL_DS), %ecx
22987 movl %ecx, %ds
22988 movl %ecx, %es
22989+
22990+ pax_enter_kernel
22991+
22992 TRACE_IRQS_OFF
22993 movl %esp,%eax # pt_regs pointer
22994 call *%edi
22995 jmp ret_from_exception
22996 CFI_ENDPROC
22997-END(page_fault)
22998+ENDPROC(page_fault)
22999
23000 /*
23001 * Debug traps and NMI can happen at the one SYSENTER instruction
23002@@ -1315,7 +1558,7 @@ debug_stack_correct:
23003 call do_debug
23004 jmp ret_from_exception
23005 CFI_ENDPROC
23006-END(debug)
23007+ENDPROC(debug)
23008
23009 /*
23010 * NMI is doubly nasty. It can happen _while_ we're handling
23011@@ -1355,6 +1598,9 @@ nmi_stack_correct:
23012 xorl %edx,%edx # zero error code
23013 movl %esp,%eax # pt_regs pointer
23014 call do_nmi
23015+
23016+ pax_exit_kernel
23017+
23018 jmp restore_all_notrace
23019 CFI_ENDPROC
23020
23021@@ -1392,13 +1638,16 @@ nmi_espfix_stack:
23022 FIXUP_ESPFIX_STACK # %eax == %esp
23023 xorl %edx,%edx # zero error code
23024 call do_nmi
23025+
23026+ pax_exit_kernel
23027+
23028 RESTORE_REGS
23029 lss 12+4(%esp), %esp # back to espfix stack
23030 CFI_ADJUST_CFA_OFFSET -24
23031 jmp irq_return
23032 #endif
23033 CFI_ENDPROC
23034-END(nmi)
23035+ENDPROC(nmi)
23036
23037 ENTRY(int3)
23038 RING0_INT_FRAME
23039@@ -1411,14 +1660,14 @@ ENTRY(int3)
23040 call do_int3
23041 jmp ret_from_exception
23042 CFI_ENDPROC
23043-END(int3)
23044+ENDPROC(int3)
23045
23046 ENTRY(general_protection)
23047 RING0_EC_FRAME
23048 pushl_cfi $do_general_protection
23049 jmp error_code
23050 CFI_ENDPROC
23051-END(general_protection)
23052+ENDPROC(general_protection)
23053
23054 #ifdef CONFIG_KVM_GUEST
23055 ENTRY(async_page_fault)
23056@@ -1427,6 +1676,6 @@ ENTRY(async_page_fault)
23057 pushl_cfi $do_async_page_fault
23058 jmp error_code
23059 CFI_ENDPROC
23060-END(async_page_fault)
23061+ENDPROC(async_page_fault)
23062 #endif
23063
23064diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23065index f0095a7..ec77893 100644
23066--- a/arch/x86/kernel/entry_64.S
23067+++ b/arch/x86/kernel/entry_64.S
23068@@ -59,6 +59,8 @@
23069 #include <asm/smap.h>
23070 #include <asm/pgtable_types.h>
23071 #include <linux/err.h>
23072+#include <asm/pgtable.h>
23073+#include <asm/alternative-asm.h>
23074
23075 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23076 #include <linux/elf-em.h>
23077@@ -81,6 +83,431 @@ ENTRY(native_usergs_sysret64)
23078 ENDPROC(native_usergs_sysret64)
23079 #endif /* CONFIG_PARAVIRT */
23080
23081+ .macro ljmpq sel, off
23082+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23083+ .byte 0x48; ljmp *1234f(%rip)
23084+ .pushsection .rodata
23085+ .align 16
23086+ 1234: .quad \off; .word \sel
23087+ .popsection
23088+#else
23089+ pushq $\sel
23090+ pushq $\off
23091+ lretq
23092+#endif
23093+ .endm
23094+
23095+ .macro pax_enter_kernel
23096+ pax_set_fptr_mask
23097+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23098+ call pax_enter_kernel
23099+#endif
23100+ .endm
23101+
23102+ .macro pax_exit_kernel
23103+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23104+ call pax_exit_kernel
23105+#endif
23106+
23107+ .endm
23108+
23109+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23110+ENTRY(pax_enter_kernel)
23111+ pushq %rdi
23112+
23113+#ifdef CONFIG_PARAVIRT
23114+ PV_SAVE_REGS(CLBR_RDI)
23115+#endif
23116+
23117+#ifdef CONFIG_PAX_KERNEXEC
23118+ GET_CR0_INTO_RDI
23119+ bts $16,%rdi
23120+ jnc 3f
23121+ mov %cs,%edi
23122+ cmp $__KERNEL_CS,%edi
23123+ jnz 2f
23124+1:
23125+#endif
23126+
23127+#ifdef CONFIG_PAX_MEMORY_UDEREF
23128+ 661: jmp 111f
23129+ .pushsection .altinstr_replacement, "a"
23130+ 662: ASM_NOP2
23131+ .popsection
23132+ .pushsection .altinstructions, "a"
23133+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23134+ .popsection
23135+ GET_CR3_INTO_RDI
23136+ cmp $0,%dil
23137+ jnz 112f
23138+ mov $__KERNEL_DS,%edi
23139+ mov %edi,%ss
23140+ jmp 111f
23141+112: cmp $1,%dil
23142+ jz 113f
23143+ ud2
23144+113: sub $4097,%rdi
23145+ bts $63,%rdi
23146+ SET_RDI_INTO_CR3
23147+ mov $__UDEREF_KERNEL_DS,%edi
23148+ mov %edi,%ss
23149+111:
23150+#endif
23151+
23152+#ifdef CONFIG_PARAVIRT
23153+ PV_RESTORE_REGS(CLBR_RDI)
23154+#endif
23155+
23156+ popq %rdi
23157+ pax_force_retaddr
23158+ retq
23159+
23160+#ifdef CONFIG_PAX_KERNEXEC
23161+2: ljmpq __KERNEL_CS,1b
23162+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23163+4: SET_RDI_INTO_CR0
23164+ jmp 1b
23165+#endif
23166+ENDPROC(pax_enter_kernel)
23167+
23168+ENTRY(pax_exit_kernel)
23169+ pushq %rdi
23170+
23171+#ifdef CONFIG_PARAVIRT
23172+ PV_SAVE_REGS(CLBR_RDI)
23173+#endif
23174+
23175+#ifdef CONFIG_PAX_KERNEXEC
23176+ mov %cs,%rdi
23177+ cmp $__KERNEXEC_KERNEL_CS,%edi
23178+ jz 2f
23179+ GET_CR0_INTO_RDI
23180+ bts $16,%rdi
23181+ jnc 4f
23182+1:
23183+#endif
23184+
23185+#ifdef CONFIG_PAX_MEMORY_UDEREF
23186+ 661: jmp 111f
23187+ .pushsection .altinstr_replacement, "a"
23188+ 662: ASM_NOP2
23189+ .popsection
23190+ .pushsection .altinstructions, "a"
23191+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23192+ .popsection
23193+ mov %ss,%edi
23194+ cmp $__UDEREF_KERNEL_DS,%edi
23195+ jnz 111f
23196+ GET_CR3_INTO_RDI
23197+ cmp $0,%dil
23198+ jz 112f
23199+ ud2
23200+112: add $4097,%rdi
23201+ bts $63,%rdi
23202+ SET_RDI_INTO_CR3
23203+ mov $__KERNEL_DS,%edi
23204+ mov %edi,%ss
23205+111:
23206+#endif
23207+
23208+#ifdef CONFIG_PARAVIRT
23209+ PV_RESTORE_REGS(CLBR_RDI);
23210+#endif
23211+
23212+ popq %rdi
23213+ pax_force_retaddr
23214+ retq
23215+
23216+#ifdef CONFIG_PAX_KERNEXEC
23217+2: GET_CR0_INTO_RDI
23218+ btr $16,%rdi
23219+ jnc 4f
23220+ ljmpq __KERNEL_CS,3f
23221+3: SET_RDI_INTO_CR0
23222+ jmp 1b
23223+4: ud2
23224+ jmp 4b
23225+#endif
23226+ENDPROC(pax_exit_kernel)
23227+#endif
23228+
23229+ .macro pax_enter_kernel_user
23230+ pax_set_fptr_mask
23231+#ifdef CONFIG_PAX_MEMORY_UDEREF
23232+ call pax_enter_kernel_user
23233+#endif
23234+ .endm
23235+
23236+ .macro pax_exit_kernel_user
23237+#ifdef CONFIG_PAX_MEMORY_UDEREF
23238+ call pax_exit_kernel_user
23239+#endif
23240+#ifdef CONFIG_PAX_RANDKSTACK
23241+ pushq %rax
23242+ pushq %r11
23243+ call pax_randomize_kstack
23244+ popq %r11
23245+ popq %rax
23246+#endif
23247+ .endm
23248+
23249+#ifdef CONFIG_PAX_MEMORY_UDEREF
23250+ENTRY(pax_enter_kernel_user)
23251+ pushq %rdi
23252+ pushq %rbx
23253+
23254+#ifdef CONFIG_PARAVIRT
23255+ PV_SAVE_REGS(CLBR_RDI)
23256+#endif
23257+
23258+ 661: jmp 111f
23259+ .pushsection .altinstr_replacement, "a"
23260+ 662: ASM_NOP2
23261+ .popsection
23262+ .pushsection .altinstructions, "a"
23263+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23264+ .popsection
23265+ GET_CR3_INTO_RDI
23266+ cmp $1,%dil
23267+ jnz 4f
23268+ sub $4097,%rdi
23269+ bts $63,%rdi
23270+ SET_RDI_INTO_CR3
23271+ jmp 3f
23272+111:
23273+
23274+ GET_CR3_INTO_RDI
23275+ mov %rdi,%rbx
23276+ add $__START_KERNEL_map,%rbx
23277+ sub phys_base(%rip),%rbx
23278+
23279+#ifdef CONFIG_PARAVIRT
23280+ cmpl $0, pv_info+PARAVIRT_enabled
23281+ jz 1f
23282+ pushq %rdi
23283+ i = 0
23284+ .rept USER_PGD_PTRS
23285+ mov i*8(%rbx),%rsi
23286+ mov $0,%sil
23287+ lea i*8(%rbx),%rdi
23288+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23289+ i = i + 1
23290+ .endr
23291+ popq %rdi
23292+ jmp 2f
23293+1:
23294+#endif
23295+
23296+ i = 0
23297+ .rept USER_PGD_PTRS
23298+ movb $0,i*8(%rbx)
23299+ i = i + 1
23300+ .endr
23301+
23302+2: SET_RDI_INTO_CR3
23303+
23304+#ifdef CONFIG_PAX_KERNEXEC
23305+ GET_CR0_INTO_RDI
23306+ bts $16,%rdi
23307+ SET_RDI_INTO_CR0
23308+#endif
23309+
23310+3:
23311+
23312+#ifdef CONFIG_PARAVIRT
23313+ PV_RESTORE_REGS(CLBR_RDI)
23314+#endif
23315+
23316+ popq %rbx
23317+ popq %rdi
23318+ pax_force_retaddr
23319+ retq
23320+4: ud2
23321+ENDPROC(pax_enter_kernel_user)
23322+
23323+ENTRY(pax_exit_kernel_user)
23324+ pushq %rdi
23325+ pushq %rbx
23326+
23327+#ifdef CONFIG_PARAVIRT
23328+ PV_SAVE_REGS(CLBR_RDI)
23329+#endif
23330+
23331+ GET_CR3_INTO_RDI
23332+ 661: jmp 1f
23333+ .pushsection .altinstr_replacement, "a"
23334+ 662: ASM_NOP2
23335+ .popsection
23336+ .pushsection .altinstructions, "a"
23337+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23338+ .popsection
23339+ cmp $0,%dil
23340+ jnz 3f
23341+ add $4097,%rdi
23342+ bts $63,%rdi
23343+ SET_RDI_INTO_CR3
23344+ jmp 2f
23345+1:
23346+
23347+ mov %rdi,%rbx
23348+
23349+#ifdef CONFIG_PAX_KERNEXEC
23350+ GET_CR0_INTO_RDI
23351+ btr $16,%rdi
23352+ jnc 3f
23353+ SET_RDI_INTO_CR0
23354+#endif
23355+
23356+ add $__START_KERNEL_map,%rbx
23357+ sub phys_base(%rip),%rbx
23358+
23359+#ifdef CONFIG_PARAVIRT
23360+ cmpl $0, pv_info+PARAVIRT_enabled
23361+ jz 1f
23362+ i = 0
23363+ .rept USER_PGD_PTRS
23364+ mov i*8(%rbx),%rsi
23365+ mov $0x67,%sil
23366+ lea i*8(%rbx),%rdi
23367+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23368+ i = i + 1
23369+ .endr
23370+ jmp 2f
23371+1:
23372+#endif
23373+
23374+ i = 0
23375+ .rept USER_PGD_PTRS
23376+ movb $0x67,i*8(%rbx)
23377+ i = i + 1
23378+ .endr
23379+2:
23380+
23381+#ifdef CONFIG_PARAVIRT
23382+ PV_RESTORE_REGS(CLBR_RDI)
23383+#endif
23384+
23385+ popq %rbx
23386+ popq %rdi
23387+ pax_force_retaddr
23388+ retq
23389+3: ud2
23390+ENDPROC(pax_exit_kernel_user)
23391+#endif
23392+
23393+ .macro pax_enter_kernel_nmi
23394+ pax_set_fptr_mask
23395+
23396+#ifdef CONFIG_PAX_KERNEXEC
23397+ GET_CR0_INTO_RDI
23398+ bts $16,%rdi
23399+ jc 110f
23400+ SET_RDI_INTO_CR0
23401+ or $2,%ebx
23402+110:
23403+#endif
23404+
23405+#ifdef CONFIG_PAX_MEMORY_UDEREF
23406+ 661: jmp 111f
23407+ .pushsection .altinstr_replacement, "a"
23408+ 662: ASM_NOP2
23409+ .popsection
23410+ .pushsection .altinstructions, "a"
23411+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23412+ .popsection
23413+ GET_CR3_INTO_RDI
23414+ cmp $0,%dil
23415+ jz 111f
23416+ sub $4097,%rdi
23417+ or $4,%ebx
23418+ bts $63,%rdi
23419+ SET_RDI_INTO_CR3
23420+ mov $__UDEREF_KERNEL_DS,%edi
23421+ mov %edi,%ss
23422+111:
23423+#endif
23424+ .endm
23425+
23426+ .macro pax_exit_kernel_nmi
23427+#ifdef CONFIG_PAX_KERNEXEC
23428+ btr $1,%ebx
23429+ jnc 110f
23430+ GET_CR0_INTO_RDI
23431+ btr $16,%rdi
23432+ SET_RDI_INTO_CR0
23433+110:
23434+#endif
23435+
23436+#ifdef CONFIG_PAX_MEMORY_UDEREF
23437+ btr $2,%ebx
23438+ jnc 111f
23439+ GET_CR3_INTO_RDI
23440+ add $4097,%rdi
23441+ bts $63,%rdi
23442+ SET_RDI_INTO_CR3
23443+ mov $__KERNEL_DS,%edi
23444+ mov %edi,%ss
23445+111:
23446+#endif
23447+ .endm
23448+
23449+ .macro pax_erase_kstack
23450+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23451+ call pax_erase_kstack
23452+#endif
23453+ .endm
23454+
23455+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23456+ENTRY(pax_erase_kstack)
23457+ pushq %rdi
23458+ pushq %rcx
23459+ pushq %rax
23460+ pushq %r11
23461+
23462+ GET_THREAD_INFO(%r11)
23463+ mov TI_lowest_stack(%r11), %rdi
23464+ mov $-0xBEEF, %rax
23465+ std
23466+
23467+1: mov %edi, %ecx
23468+ and $THREAD_SIZE_asm - 1, %ecx
23469+ shr $3, %ecx
23470+ repne scasq
23471+ jecxz 2f
23472+
23473+ cmp $2*8, %ecx
23474+ jc 2f
23475+
23476+ mov $2*8, %ecx
23477+ repe scasq
23478+ jecxz 2f
23479+ jne 1b
23480+
23481+2: cld
23482+ or $2*8, %rdi
23483+ mov %esp, %ecx
23484+ sub %edi, %ecx
23485+
23486+ cmp $THREAD_SIZE_asm, %rcx
23487+ jb 3f
23488+ ud2
23489+3:
23490+
23491+ shr $3, %ecx
23492+ rep stosq
23493+
23494+ mov TI_task_thread_sp0(%r11), %rdi
23495+ sub $256, %rdi
23496+ mov %rdi, TI_lowest_stack(%r11)
23497+
23498+ popq %r11
23499+ popq %rax
23500+ popq %rcx
23501+ popq %rdi
23502+ pax_force_retaddr
23503+ ret
23504+ENDPROC(pax_erase_kstack)
23505+#endif
23506
23507 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23508 #ifdef CONFIG_TRACE_IRQFLAGS
23509@@ -117,7 +544,7 @@ ENDPROC(native_usergs_sysret64)
23510 .endm
23511
23512 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23513- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23514+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23515 jnc 1f
23516 TRACE_IRQS_ON_DEBUG
23517 1:
23518@@ -243,9 +670,52 @@ ENTRY(save_paranoid)
23519 js 1f /* negative -> in kernel */
23520 SWAPGS
23521 xorl %ebx,%ebx
23522-1: ret
23523+1:
23524+#ifdef CONFIG_PAX_MEMORY_UDEREF
23525+ testb $3, CS+8(%rsp)
23526+ jnz 1f
23527+ pax_enter_kernel
23528+ jmp 2f
23529+1: pax_enter_kernel_user
23530+2:
23531+#else
23532+ pax_enter_kernel
23533+#endif
23534+ pax_force_retaddr
23535+ ret
23536 CFI_ENDPROC
23537-END(save_paranoid)
23538+ENDPROC(save_paranoid)
23539+
23540+ENTRY(save_paranoid_nmi)
23541+ XCPT_FRAME 1 RDI+8
23542+ cld
23543+ movq_cfi rdi, RDI+8
23544+ movq_cfi rsi, RSI+8
23545+ movq_cfi rdx, RDX+8
23546+ movq_cfi rcx, RCX+8
23547+ movq_cfi rax, RAX+8
23548+ movq_cfi r8, R8+8
23549+ movq_cfi r9, R9+8
23550+ movq_cfi r10, R10+8
23551+ movq_cfi r11, R11+8
23552+ movq_cfi rbx, RBX+8
23553+ movq_cfi rbp, RBP+8
23554+ movq_cfi r12, R12+8
23555+ movq_cfi r13, R13+8
23556+ movq_cfi r14, R14+8
23557+ movq_cfi r15, R15+8
23558+ movl $1,%ebx
23559+ movl $MSR_GS_BASE,%ecx
23560+ rdmsr
23561+ testl %edx,%edx
23562+ js 1f /* negative -> in kernel */
23563+ SWAPGS
23564+ xorl %ebx,%ebx
23565+1: pax_enter_kernel_nmi
23566+ pax_force_retaddr
23567+ ret
23568+ CFI_ENDPROC
23569+ENDPROC(save_paranoid_nmi)
23570
23571 /*
23572 * A newly forked process directly context switches into this address.
23573@@ -266,7 +736,7 @@ ENTRY(ret_from_fork)
23574
23575 RESTORE_REST
23576
23577- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23578+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23579 jz 1f
23580
23581 /*
23582@@ -279,15 +749,13 @@ ENTRY(ret_from_fork)
23583 jmp int_ret_from_sys_call
23584
23585 1:
23586- subq $REST_SKIP, %rsp # leave space for volatiles
23587- CFI_ADJUST_CFA_OFFSET REST_SKIP
23588 movq %rbp, %rdi
23589 call *%rbx
23590 movl $0, RAX(%rsp)
23591 RESTORE_REST
23592 jmp int_ret_from_sys_call
23593 CFI_ENDPROC
23594-END(ret_from_fork)
23595+ENDPROC(ret_from_fork)
23596
23597 /*
23598 * System call entry. Up to 6 arguments in registers are supported.
23599@@ -324,7 +792,7 @@ END(ret_from_fork)
23600 ENTRY(system_call)
23601 CFI_STARTPROC simple
23602 CFI_SIGNAL_FRAME
23603- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23604+ CFI_DEF_CFA rsp,0
23605 CFI_REGISTER rip,rcx
23606 /*CFI_REGISTER rflags,r11*/
23607 SWAPGS_UNSAFE_STACK
23608@@ -337,16 +805,23 @@ GLOBAL(system_call_after_swapgs)
23609
23610 movq %rsp,PER_CPU_VAR(old_rsp)
23611 movq PER_CPU_VAR(kernel_stack),%rsp
23612+ SAVE_ARGS 8*6, 0, rax_enosys=1
23613+ pax_enter_kernel_user
23614+
23615+#ifdef CONFIG_PAX_RANDKSTACK
23616+ pax_erase_kstack
23617+#endif
23618+
23619 /*
23620 * No need to follow this irqs off/on section - it's straight
23621 * and short:
23622 */
23623 ENABLE_INTERRUPTS(CLBR_NONE)
23624- SAVE_ARGS 8, 0, rax_enosys=1
23625 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23626 movq %rcx,RIP-ARGOFFSET(%rsp)
23627 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23628- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23629+ GET_THREAD_INFO(%rcx)
23630+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23631 jnz tracesys
23632 system_call_fastpath:
23633 #if __SYSCALL_MASK == ~0
23634@@ -376,10 +851,13 @@ ret_from_sys_call:
23635 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
23636 * very bad.
23637 */
23638- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23639+ GET_THREAD_INFO(%rcx)
23640+ testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
23641 jnz int_ret_from_sys_call_fixup /* Go the the slow path */
23642
23643 CFI_REMEMBER_STATE
23644+ pax_exit_kernel_user
23645+ pax_erase_kstack
23646 /*
23647 * sysretq will re-enable interrupts:
23648 */
23649@@ -399,12 +877,15 @@ int_ret_from_sys_call_fixup:
23650
23651 /* Do syscall tracing */
23652 tracesys:
23653- leaq -REST_SKIP(%rsp), %rdi
23654+ movq %rsp, %rdi
23655 movq $AUDIT_ARCH_X86_64, %rsi
23656 call syscall_trace_enter_phase1
23657 test %rax, %rax
23658 jnz tracesys_phase2 /* if needed, run the slow path */
23659- LOAD_ARGS 0 /* else restore clobbered regs */
23660+
23661+ pax_erase_kstack
23662+
23663+ LOAD_ARGS /* else restore clobbered regs */
23664 jmp system_call_fastpath /* and return to the fast path */
23665
23666 tracesys_phase2:
23667@@ -415,12 +896,14 @@ tracesys_phase2:
23668 movq %rax,%rdx
23669 call syscall_trace_enter_phase2
23670
23671+ pax_erase_kstack
23672+
23673 /*
23674 * Reload arg registers from stack in case ptrace changed them.
23675 * We don't reload %rax because syscall_trace_entry_phase2() returned
23676 * the value it wants us to use in the table lookup.
23677 */
23678- LOAD_ARGS ARGOFFSET, 1
23679+ LOAD_ARGS 1
23680 RESTORE_REST
23681 #if __SYSCALL_MASK == ~0
23682 cmpq $__NR_syscall_max,%rax
23683@@ -451,7 +934,9 @@ GLOBAL(int_with_check)
23684 andl %edi,%edx
23685 jnz int_careful
23686 andl $~TS_COMPAT,TI_status(%rcx)
23687- jmp retint_swapgs
23688+ pax_exit_kernel_user
23689+ pax_erase_kstack
23690+ jmp retint_swapgs_pax
23691
23692 /* Either reschedule or signal or syscall exit tracking needed. */
23693 /* First do a reschedule test. */
23694@@ -497,7 +982,7 @@ int_restore_rest:
23695 TRACE_IRQS_OFF
23696 jmp int_with_check
23697 CFI_ENDPROC
23698-END(system_call)
23699+ENDPROC(system_call)
23700
23701 .macro FORK_LIKE func
23702 ENTRY(stub_\func)
23703@@ -510,9 +995,10 @@ ENTRY(stub_\func)
23704 DEFAULT_FRAME 0 8 /* offset 8: return address */
23705 call sys_\func
23706 RESTORE_TOP_OF_STACK %r11, 8
23707- ret $REST_SKIP /* pop extended registers */
23708+ pax_force_retaddr
23709+ ret
23710 CFI_ENDPROC
23711-END(stub_\func)
23712+ENDPROC(stub_\func)
23713 .endm
23714
23715 .macro FIXED_FRAME label,func
23716@@ -522,9 +1008,10 @@ ENTRY(\label)
23717 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23718 call \func
23719 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23720+ pax_force_retaddr
23721 ret
23722 CFI_ENDPROC
23723-END(\label)
23724+ENDPROC(\label)
23725 .endm
23726
23727 FORK_LIKE clone
23728@@ -543,7 +1030,7 @@ ENTRY(stub_execve)
23729 RESTORE_REST
23730 jmp int_ret_from_sys_call
23731 CFI_ENDPROC
23732-END(stub_execve)
23733+ENDPROC(stub_execve)
23734
23735 ENTRY(stub_execveat)
23736 CFI_STARTPROC
23737@@ -557,7 +1044,7 @@ ENTRY(stub_execveat)
23738 RESTORE_REST
23739 jmp int_ret_from_sys_call
23740 CFI_ENDPROC
23741-END(stub_execveat)
23742+ENDPROC(stub_execveat)
23743
23744 /*
23745 * sigreturn is special because it needs to restore all registers on return.
23746@@ -574,7 +1061,7 @@ ENTRY(stub_rt_sigreturn)
23747 RESTORE_REST
23748 jmp int_ret_from_sys_call
23749 CFI_ENDPROC
23750-END(stub_rt_sigreturn)
23751+ENDPROC(stub_rt_sigreturn)
23752
23753 #ifdef CONFIG_X86_X32_ABI
23754 ENTRY(stub_x32_rt_sigreturn)
23755@@ -588,7 +1075,7 @@ ENTRY(stub_x32_rt_sigreturn)
23756 RESTORE_REST
23757 jmp int_ret_from_sys_call
23758 CFI_ENDPROC
23759-END(stub_x32_rt_sigreturn)
23760+ENDPROC(stub_x32_rt_sigreturn)
23761
23762 ENTRY(stub_x32_execve)
23763 CFI_STARTPROC
23764@@ -602,7 +1089,7 @@ ENTRY(stub_x32_execve)
23765 RESTORE_REST
23766 jmp int_ret_from_sys_call
23767 CFI_ENDPROC
23768-END(stub_x32_execve)
23769+ENDPROC(stub_x32_execve)
23770
23771 ENTRY(stub_x32_execveat)
23772 CFI_STARTPROC
23773@@ -616,7 +1103,7 @@ ENTRY(stub_x32_execveat)
23774 RESTORE_REST
23775 jmp int_ret_from_sys_call
23776 CFI_ENDPROC
23777-END(stub_x32_execveat)
23778+ENDPROC(stub_x32_execveat)
23779
23780 #endif
23781
23782@@ -653,7 +1140,7 @@ vector=vector+1
23783 2: jmp common_interrupt
23784 .endr
23785 CFI_ENDPROC
23786-END(irq_entries_start)
23787+ENDPROC(irq_entries_start)
23788
23789 .previous
23790 END(interrupt)
23791@@ -670,28 +1157,29 @@ END(interrupt)
23792 /* 0(%rsp): ~(interrupt number) */
23793 .macro interrupt func
23794 /* reserve pt_regs for scratch regs and rbp */
23795- subq $ORIG_RAX-RBP, %rsp
23796- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23797+ subq $ORIG_RAX, %rsp
23798+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
23799 cld
23800- /* start from rbp in pt_regs and jump over */
23801- movq_cfi rdi, (RDI-RBP)
23802- movq_cfi rsi, (RSI-RBP)
23803- movq_cfi rdx, (RDX-RBP)
23804- movq_cfi rcx, (RCX-RBP)
23805- movq_cfi rax, (RAX-RBP)
23806- movq_cfi r8, (R8-RBP)
23807- movq_cfi r9, (R9-RBP)
23808- movq_cfi r10, (R10-RBP)
23809- movq_cfi r11, (R11-RBP)
23810+ /* start from r15 in pt_regs and jump over */
23811+ movq_cfi rdi, RDI
23812+ movq_cfi rsi, RSI
23813+ movq_cfi rdx, RDX
23814+ movq_cfi rcx, RCX
23815+ movq_cfi rax, RAX
23816+ movq_cfi r8, R8
23817+ movq_cfi r9, R9
23818+ movq_cfi r10, R10
23819+ movq_cfi r11, R11
23820+ movq_cfi r12, R12
23821
23822 /* Save rbp so that we can unwind from get_irq_regs() */
23823- movq_cfi rbp, 0
23824+ movq_cfi rbp, RBP
23825
23826 /* Save previous stack value */
23827 movq %rsp, %rsi
23828
23829- leaq -RBP(%rsp),%rdi /* arg1 for handler */
23830- testl $3, CS-RBP(%rsi)
23831+ movq %rsp,%rdi /* arg1 for handler */
23832+ testb $3, CS(%rsi)
23833 je 1f
23834 SWAPGS
23835 /*
23836@@ -711,6 +1199,18 @@ END(interrupt)
23837 0x06 /* DW_OP_deref */, \
23838 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23839 0x22 /* DW_OP_plus */
23840+
23841+#ifdef CONFIG_PAX_MEMORY_UDEREF
23842+ testb $3, CS(%rdi)
23843+ jnz 1f
23844+ pax_enter_kernel
23845+ jmp 2f
23846+1: pax_enter_kernel_user
23847+2:
23848+#else
23849+ pax_enter_kernel
23850+#endif
23851+
23852 /* We entered an interrupt context - irqs are off: */
23853 TRACE_IRQS_OFF
23854
23855@@ -735,14 +1235,14 @@ ret_from_intr:
23856
23857 /* Restore saved previous stack */
23858 popq %rsi
23859- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23860- leaq ARGOFFSET-RBP(%rsi), %rsp
23861+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23862+ movq %rsi, %rsp
23863 CFI_DEF_CFA_REGISTER rsp
23864- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23865+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23866
23867 exit_intr:
23868 GET_THREAD_INFO(%rcx)
23869- testl $3,CS-ARGOFFSET(%rsp)
23870+ testb $3,CS-ARGOFFSET(%rsp)
23871 je retint_kernel
23872
23873 /* Interrupt came from user space */
23874@@ -764,14 +1264,16 @@ retint_swapgs: /* return to user-space */
23875 * The iretq could re-enable interrupts:
23876 */
23877 DISABLE_INTERRUPTS(CLBR_ANY)
23878+ pax_exit_kernel_user
23879+retint_swapgs_pax:
23880 TRACE_IRQS_IRETQ
23881
23882 /*
23883 * Try to use SYSRET instead of IRET if we're returning to
23884 * a completely clean 64-bit userspace context.
23885 */
23886- movq (RCX-R11)(%rsp), %rcx
23887- cmpq %rcx,(RIP-R11)(%rsp) /* RCX == RIP */
23888+ movq (RCX-ARGOFFSET)(%rsp), %rcx
23889+ cmpq %rcx,(RIP-ARGOFFSET)(%rsp) /* RCX == RIP */
23890 jne opportunistic_sysret_failed
23891
23892 /*
23893@@ -792,7 +1294,7 @@ retint_swapgs: /* return to user-space */
23894 shr $__VIRTUAL_MASK_SHIFT, %rcx
23895 jnz opportunistic_sysret_failed
23896
23897- cmpq $__USER_CS,(CS-R11)(%rsp) /* CS must match SYSRET */
23898+ cmpq $__USER_CS,(CS-ARGOFFSET)(%rsp) /* CS must match SYSRET */
23899 jne opportunistic_sysret_failed
23900
23901 movq (R11-ARGOFFSET)(%rsp), %r11
23902@@ -838,6 +1340,27 @@ opportunistic_sysret_failed:
23903
23904 retint_restore_args: /* return to kernel space */
23905 DISABLE_INTERRUPTS(CLBR_ANY)
23906+ pax_exit_kernel
23907+
23908+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23909+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23910+ * namely calling EFI runtime services with a phys mapping. We're
23911+ * starting off with NOPs and patch in the real instrumentation
23912+ * (BTS/OR) before starting any userland process; even before starting
23913+ * up the APs.
23914+ */
23915+ .pushsection .altinstr_replacement, "a"
23916+ 601: pax_force_retaddr (RIP-ARGOFFSET)
23917+ 602:
23918+ .popsection
23919+ 603: .fill 602b-601b, 1, 0x90
23920+ .pushsection .altinstructions, "a"
23921+ altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23922+ .popsection
23923+#else
23924+ pax_force_retaddr (RIP-ARGOFFSET)
23925+#endif
23926+
23927 /*
23928 * The iretq could re-enable interrupts:
23929 */
23930@@ -875,15 +1398,15 @@ native_irq_return_ldt:
23931 SWAPGS
23932 movq PER_CPU_VAR(espfix_waddr),%rdi
23933 movq %rax,(0*8)(%rdi) /* RAX */
23934- movq (2*8)(%rsp),%rax /* RIP */
23935+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23936 movq %rax,(1*8)(%rdi)
23937- movq (3*8)(%rsp),%rax /* CS */
23938+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23939 movq %rax,(2*8)(%rdi)
23940- movq (4*8)(%rsp),%rax /* RFLAGS */
23941+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23942 movq %rax,(3*8)(%rdi)
23943- movq (6*8)(%rsp),%rax /* SS */
23944+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23945 movq %rax,(5*8)(%rdi)
23946- movq (5*8)(%rsp),%rax /* RSP */
23947+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23948 movq %rax,(4*8)(%rdi)
23949 andl $0xffff0000,%eax
23950 popq_cfi %rdi
23951@@ -937,7 +1460,7 @@ ENTRY(retint_kernel)
23952 jmp exit_intr
23953 #endif
23954 CFI_ENDPROC
23955-END(common_interrupt)
23956+ENDPROC(common_interrupt)
23957
23958 /*
23959 * APIC interrupts.
23960@@ -951,7 +1474,7 @@ ENTRY(\sym)
23961 interrupt \do_sym
23962 jmp ret_from_intr
23963 CFI_ENDPROC
23964-END(\sym)
23965+ENDPROC(\sym)
23966 .endm
23967
23968 #ifdef CONFIG_TRACING
23969@@ -1024,7 +1547,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23970 /*
23971 * Exception entry points.
23972 */
23973-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23974+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23975
23976 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23977 ENTRY(\sym)
23978@@ -1080,6 +1603,12 @@ ENTRY(\sym)
23979 .endif
23980
23981 .if \shift_ist != -1
23982+#ifdef CONFIG_SMP
23983+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23984+ lea init_tss(%r13), %r13
23985+#else
23986+ lea init_tss(%rip), %r13
23987+#endif
23988 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23989 .endif
23990
23991@@ -1126,7 +1655,7 @@ ENTRY(\sym)
23992 .endif
23993
23994 CFI_ENDPROC
23995-END(\sym)
23996+ENDPROC(\sym)
23997 .endm
23998
23999 #ifdef CONFIG_TRACING
24000@@ -1167,9 +1696,10 @@ gs_change:
24001 2: mfence /* workaround */
24002 SWAPGS
24003 popfq_cfi
24004+ pax_force_retaddr
24005 ret
24006 CFI_ENDPROC
24007-END(native_load_gs_index)
24008+ENDPROC(native_load_gs_index)
24009
24010 _ASM_EXTABLE(gs_change,bad_gs)
24011 .section .fixup,"ax"
24012@@ -1197,9 +1727,10 @@ ENTRY(do_softirq_own_stack)
24013 CFI_DEF_CFA_REGISTER rsp
24014 CFI_ADJUST_CFA_OFFSET -8
24015 decl PER_CPU_VAR(irq_count)
24016+ pax_force_retaddr
24017 ret
24018 CFI_ENDPROC
24019-END(do_softirq_own_stack)
24020+ENDPROC(do_softirq_own_stack)
24021
24022 #ifdef CONFIG_XEN
24023 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24024@@ -1240,7 +1771,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24025 #endif
24026 jmp error_exit
24027 CFI_ENDPROC
24028-END(xen_do_hypervisor_callback)
24029+ENDPROC(xen_do_hypervisor_callback)
24030
24031 /*
24032 * Hypervisor uses this for application faults while it executes.
24033@@ -1299,7 +1830,7 @@ ENTRY(xen_failsafe_callback)
24034 SAVE_ALL
24035 jmp error_exit
24036 CFI_ENDPROC
24037-END(xen_failsafe_callback)
24038+ENDPROC(xen_failsafe_callback)
24039
24040 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24041 xen_hvm_callback_vector xen_evtchn_do_upcall
24042@@ -1344,18 +1875,25 @@ ENTRY(paranoid_exit)
24043 DEFAULT_FRAME
24044 DISABLE_INTERRUPTS(CLBR_NONE)
24045 TRACE_IRQS_OFF_DEBUG
24046- testl %ebx,%ebx /* swapgs needed? */
24047+ testl $1,%ebx /* swapgs needed? */
24048 jnz paranoid_restore
24049+#ifdef CONFIG_PAX_MEMORY_UDEREF
24050+ pax_exit_kernel_user
24051+#else
24052+ pax_exit_kernel
24053+#endif
24054 TRACE_IRQS_IRETQ 0
24055 SWAPGS_UNSAFE_STACK
24056 RESTORE_ALL 8
24057 INTERRUPT_RETURN
24058 paranoid_restore:
24059+ pax_exit_kernel
24060 TRACE_IRQS_IRETQ_DEBUG 0
24061 RESTORE_ALL 8
24062+ pax_force_retaddr_bts
24063 INTERRUPT_RETURN
24064 CFI_ENDPROC
24065-END(paranoid_exit)
24066+ENDPROC(paranoid_exit)
24067
24068 /*
24069 * Exception entry point. This expects an error code/orig_rax on the stack.
24070@@ -1382,12 +1920,23 @@ ENTRY(error_entry)
24071 movq %r14, R14+8(%rsp)
24072 movq %r15, R15+8(%rsp)
24073 xorl %ebx,%ebx
24074- testl $3,CS+8(%rsp)
24075+ testb $3,CS+8(%rsp)
24076 je error_kernelspace
24077 error_swapgs:
24078 SWAPGS
24079 error_sti:
24080+#ifdef CONFIG_PAX_MEMORY_UDEREF
24081+ testb $3, CS+8(%rsp)
24082+ jnz 1f
24083+ pax_enter_kernel
24084+ jmp 2f
24085+1: pax_enter_kernel_user
24086+2:
24087+#else
24088+ pax_enter_kernel
24089+#endif
24090 TRACE_IRQS_OFF
24091+ pax_force_retaddr
24092 ret
24093
24094 /*
24095@@ -1422,7 +1971,7 @@ error_bad_iret:
24096 decl %ebx /* Return to usergs */
24097 jmp error_sti
24098 CFI_ENDPROC
24099-END(error_entry)
24100+ENDPROC(error_entry)
24101
24102
24103 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24104@@ -1433,7 +1982,7 @@ ENTRY(error_exit)
24105 DISABLE_INTERRUPTS(CLBR_NONE)
24106 TRACE_IRQS_OFF
24107 GET_THREAD_INFO(%rcx)
24108- testl %eax,%eax
24109+ testl $1,%eax
24110 jne retint_kernel
24111 LOCKDEP_SYS_EXIT_IRQ
24112 movl TI_flags(%rcx),%edx
24113@@ -1442,7 +1991,7 @@ ENTRY(error_exit)
24114 jnz retint_careful
24115 jmp retint_swapgs
24116 CFI_ENDPROC
24117-END(error_exit)
24118+ENDPROC(error_exit)
24119
24120 /*
24121 * Test if a given stack is an NMI stack or not.
24122@@ -1500,9 +2049,11 @@ ENTRY(nmi)
24123 * If %cs was not the kernel segment, then the NMI triggered in user
24124 * space, which means it is definitely not nested.
24125 */
24126+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24127+ je 1f
24128 cmpl $__KERNEL_CS, 16(%rsp)
24129 jne first_nmi
24130-
24131+1:
24132 /*
24133 * Check the special variable on the stack to see if NMIs are
24134 * executing.
24135@@ -1536,8 +2087,7 @@ nested_nmi:
24136
24137 1:
24138 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24139- leaq -1*8(%rsp), %rdx
24140- movq %rdx, %rsp
24141+ subq $8, %rsp
24142 CFI_ADJUST_CFA_OFFSET 1*8
24143 leaq -10*8(%rsp), %rdx
24144 pushq_cfi $__KERNEL_DS
24145@@ -1555,6 +2105,7 @@ nested_nmi_out:
24146 CFI_RESTORE rdx
24147
24148 /* No need to check faults here */
24149+# pax_force_retaddr_bts
24150 INTERRUPT_RETURN
24151
24152 CFI_RESTORE_STATE
24153@@ -1651,13 +2202,13 @@ end_repeat_nmi:
24154 subq $ORIG_RAX-R15, %rsp
24155 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24156 /*
24157- * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24158+ * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24159 * as we should not be calling schedule in NMI context.
24160 * Even with normal interrupts enabled. An NMI should not be
24161 * setting NEED_RESCHED or anything that normal interrupts and
24162 * exceptions might do.
24163 */
24164- call save_paranoid
24165+ call save_paranoid_nmi
24166 DEFAULT_FRAME 0
24167
24168 /*
24169@@ -1667,9 +2218,9 @@ end_repeat_nmi:
24170 * NMI itself takes a page fault, the page fault that was preempted
24171 * will read the information from the NMI page fault and not the
24172 * origin fault. Save it off and restore it if it changes.
24173- * Use the r12 callee-saved register.
24174+ * Use the r13 callee-saved register.
24175 */
24176- movq %cr2, %r12
24177+ movq %cr2, %r13
24178
24179 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24180 movq %rsp,%rdi
24181@@ -1678,29 +2229,34 @@ end_repeat_nmi:
24182
24183 /* Did the NMI take a page fault? Restore cr2 if it did */
24184 movq %cr2, %rcx
24185- cmpq %rcx, %r12
24186+ cmpq %rcx, %r13
24187 je 1f
24188- movq %r12, %cr2
24189+ movq %r13, %cr2
24190 1:
24191
24192- testl %ebx,%ebx /* swapgs needed? */
24193+ testl $1,%ebx /* swapgs needed? */
24194 jnz nmi_restore
24195 nmi_swapgs:
24196 SWAPGS_UNSAFE_STACK
24197 nmi_restore:
24198+ pax_exit_kernel_nmi
24199 /* Pop the extra iret frame at once */
24200 RESTORE_ALL 6*8
24201+ testb $3, 8(%rsp)
24202+ jnz 1f
24203+ pax_force_retaddr_bts
24204+1:
24205
24206 /* Clear the NMI executing stack variable */
24207 movq $0, 5*8(%rsp)
24208 jmp irq_return
24209 CFI_ENDPROC
24210-END(nmi)
24211+ENDPROC(nmi)
24212
24213 ENTRY(ignore_sysret)
24214 CFI_STARTPROC
24215 mov $-ENOSYS,%eax
24216 sysret
24217 CFI_ENDPROC
24218-END(ignore_sysret)
24219+ENDPROC(ignore_sysret)
24220
24221diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24222index f5d0730..5bce89c 100644
24223--- a/arch/x86/kernel/espfix_64.c
24224+++ b/arch/x86/kernel/espfix_64.c
24225@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24226 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24227 static void *espfix_pages[ESPFIX_MAX_PAGES];
24228
24229-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24230- __aligned(PAGE_SIZE);
24231+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24232
24233 static unsigned int page_random, slot_random;
24234
24235@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24236 void __init init_espfix_bsp(void)
24237 {
24238 pgd_t *pgd_p;
24239+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24240
24241 /* Install the espfix pud into the kernel page directory */
24242- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24243+ pgd_p = &init_level4_pgt[index];
24244 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24245
24246+#ifdef CONFIG_PAX_PER_CPU_PGD
24247+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24248+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24249+#endif
24250+
24251 /* Randomize the locations */
24252 init_espfix_random();
24253
24254@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24255 set_pte(&pte_p[n*PTE_STRIDE], pte);
24256
24257 /* Job is done for this CPU and any CPU which shares this page */
24258- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24259+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24260
24261 unlock_done:
24262 mutex_unlock(&espfix_init_mutex);
24263diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24264index 8b7b0a5..2395f29 100644
24265--- a/arch/x86/kernel/ftrace.c
24266+++ b/arch/x86/kernel/ftrace.c
24267@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24268 * kernel identity mapping to modify code.
24269 */
24270 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24271- ip = (unsigned long)__va(__pa_symbol(ip));
24272+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24273
24274 return ip;
24275 }
24276@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24277 {
24278 unsigned char replaced[MCOUNT_INSN_SIZE];
24279
24280+ ip = ktla_ktva(ip);
24281+
24282 /*
24283 * Note: Due to modules and __init, code can
24284 * disappear and change, we need to protect against faulting
24285@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24286 unsigned char old[MCOUNT_INSN_SIZE];
24287 int ret;
24288
24289- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24290+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24291
24292 ftrace_update_func = ip;
24293 /* Make sure the breakpoints see the ftrace_update_func update */
24294@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24295 unsigned char replaced[MCOUNT_INSN_SIZE];
24296 unsigned char brk = BREAKPOINT_INSTRUCTION;
24297
24298- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24299+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24300 return -EFAULT;
24301
24302 /* Make sure it is what we expect it to be */
24303diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24304index c4f8d46..2d63ae2 100644
24305--- a/arch/x86/kernel/head64.c
24306+++ b/arch/x86/kernel/head64.c
24307@@ -68,12 +68,12 @@ again:
24308 pgd = *pgd_p;
24309
24310 /*
24311- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24312- * critical -- __PAGE_OFFSET would point us back into the dynamic
24313+ * The use of __early_va rather than __va here is critical:
24314+ * __va would point us back into the dynamic
24315 * range and we might end up looping forever...
24316 */
24317 if (pgd)
24318- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24319+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24320 else {
24321 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24322 reset_early_page_tables();
24323@@ -83,13 +83,13 @@ again:
24324 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24325 for (i = 0; i < PTRS_PER_PUD; i++)
24326 pud_p[i] = 0;
24327- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24328+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24329 }
24330 pud_p += pud_index(address);
24331 pud = *pud_p;
24332
24333 if (pud)
24334- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24335+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24336 else {
24337 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24338 reset_early_page_tables();
24339@@ -99,7 +99,7 @@ again:
24340 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24341 for (i = 0; i < PTRS_PER_PMD; i++)
24342 pmd_p[i] = 0;
24343- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24344+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24345 }
24346 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24347 pmd_p[pmd_index(address)] = pmd;
24348@@ -180,7 +180,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24349 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24350 early_printk("Kernel alive\n");
24351
24352- clear_page(init_level4_pgt);
24353 /* set init_level4_pgt kernel high mapping*/
24354 init_level4_pgt[511] = early_level4_pgt[511];
24355
24356diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24357index f36bd42..0ab4474 100644
24358--- a/arch/x86/kernel/head_32.S
24359+++ b/arch/x86/kernel/head_32.S
24360@@ -26,6 +26,12 @@
24361 /* Physical address */
24362 #define pa(X) ((X) - __PAGE_OFFSET)
24363
24364+#ifdef CONFIG_PAX_KERNEXEC
24365+#define ta(X) (X)
24366+#else
24367+#define ta(X) ((X) - __PAGE_OFFSET)
24368+#endif
24369+
24370 /*
24371 * References to members of the new_cpu_data structure.
24372 */
24373@@ -55,11 +61,7 @@
24374 * and small than max_low_pfn, otherwise will waste some page table entries
24375 */
24376
24377-#if PTRS_PER_PMD > 1
24378-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24379-#else
24380-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24381-#endif
24382+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24383
24384 /* Number of possible pages in the lowmem region */
24385 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24386@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24387 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24388
24389 /*
24390+ * Real beginning of normal "text" segment
24391+ */
24392+ENTRY(stext)
24393+ENTRY(_stext)
24394+
24395+/*
24396 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24397 * %esi points to the real-mode code as a 32-bit pointer.
24398 * CS and DS must be 4 GB flat segments, but we don't depend on
24399@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24400 * can.
24401 */
24402 __HEAD
24403+
24404+#ifdef CONFIG_PAX_KERNEXEC
24405+ jmp startup_32
24406+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24407+.fill PAGE_SIZE-5,1,0xcc
24408+#endif
24409+
24410 ENTRY(startup_32)
24411 movl pa(stack_start),%ecx
24412
24413@@ -106,6 +121,59 @@ ENTRY(startup_32)
24414 2:
24415 leal -__PAGE_OFFSET(%ecx),%esp
24416
24417+#ifdef CONFIG_SMP
24418+ movl $pa(cpu_gdt_table),%edi
24419+ movl $__per_cpu_load,%eax
24420+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24421+ rorl $16,%eax
24422+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24423+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24424+ movl $__per_cpu_end - 1,%eax
24425+ subl $__per_cpu_start,%eax
24426+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24427+#endif
24428+
24429+#ifdef CONFIG_PAX_MEMORY_UDEREF
24430+ movl $NR_CPUS,%ecx
24431+ movl $pa(cpu_gdt_table),%edi
24432+1:
24433+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24434+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24435+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24436+ addl $PAGE_SIZE_asm,%edi
24437+ loop 1b
24438+#endif
24439+
24440+#ifdef CONFIG_PAX_KERNEXEC
24441+ movl $pa(boot_gdt),%edi
24442+ movl $__LOAD_PHYSICAL_ADDR,%eax
24443+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24444+ rorl $16,%eax
24445+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24446+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24447+ rorl $16,%eax
24448+
24449+ ljmp $(__BOOT_CS),$1f
24450+1:
24451+
24452+ movl $NR_CPUS,%ecx
24453+ movl $pa(cpu_gdt_table),%edi
24454+ addl $__PAGE_OFFSET,%eax
24455+1:
24456+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24457+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24458+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24459+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24460+ rorl $16,%eax
24461+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24462+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24463+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24464+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24465+ rorl $16,%eax
24466+ addl $PAGE_SIZE_asm,%edi
24467+ loop 1b
24468+#endif
24469+
24470 /*
24471 * Clear BSS first so that there are no surprises...
24472 */
24473@@ -201,8 +269,11 @@ ENTRY(startup_32)
24474 movl %eax, pa(max_pfn_mapped)
24475
24476 /* Do early initialization of the fixmap area */
24477- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24478- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24479+#ifdef CONFIG_COMPAT_VDSO
24480+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24481+#else
24482+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24483+#endif
24484 #else /* Not PAE */
24485
24486 page_pde_offset = (__PAGE_OFFSET >> 20);
24487@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24488 movl %eax, pa(max_pfn_mapped)
24489
24490 /* Do early initialization of the fixmap area */
24491- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24492- movl %eax,pa(initial_page_table+0xffc)
24493+#ifdef CONFIG_COMPAT_VDSO
24494+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24495+#else
24496+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24497+#endif
24498 #endif
24499
24500 #ifdef CONFIG_PARAVIRT
24501@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24502 cmpl $num_subarch_entries, %eax
24503 jae bad_subarch
24504
24505- movl pa(subarch_entries)(,%eax,4), %eax
24506- subl $__PAGE_OFFSET, %eax
24507- jmp *%eax
24508+ jmp *pa(subarch_entries)(,%eax,4)
24509
24510 bad_subarch:
24511 WEAK(lguest_entry)
24512@@ -261,10 +333,10 @@ WEAK(xen_entry)
24513 __INITDATA
24514
24515 subarch_entries:
24516- .long default_entry /* normal x86/PC */
24517- .long lguest_entry /* lguest hypervisor */
24518- .long xen_entry /* Xen hypervisor */
24519- .long default_entry /* Moorestown MID */
24520+ .long ta(default_entry) /* normal x86/PC */
24521+ .long ta(lguest_entry) /* lguest hypervisor */
24522+ .long ta(xen_entry) /* Xen hypervisor */
24523+ .long ta(default_entry) /* Moorestown MID */
24524 num_subarch_entries = (. - subarch_entries) / 4
24525 .previous
24526 #else
24527@@ -354,6 +426,7 @@ default_entry:
24528 movl pa(mmu_cr4_features),%eax
24529 movl %eax,%cr4
24530
24531+#ifdef CONFIG_X86_PAE
24532 testb $X86_CR4_PAE, %al # check if PAE is enabled
24533 jz enable_paging
24534
24535@@ -382,6 +455,9 @@ default_entry:
24536 /* Make changes effective */
24537 wrmsr
24538
24539+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24540+#endif
24541+
24542 enable_paging:
24543
24544 /*
24545@@ -449,14 +525,20 @@ is486:
24546 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24547 movl %eax,%ss # after changing gdt.
24548
24549- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24550+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24551 movl %eax,%ds
24552 movl %eax,%es
24553
24554 movl $(__KERNEL_PERCPU), %eax
24555 movl %eax,%fs # set this cpu's percpu
24556
24557+#ifdef CONFIG_CC_STACKPROTECTOR
24558 movl $(__KERNEL_STACK_CANARY),%eax
24559+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24560+ movl $(__USER_DS),%eax
24561+#else
24562+ xorl %eax,%eax
24563+#endif
24564 movl %eax,%gs
24565
24566 xorl %eax,%eax # Clear LDT
24567@@ -512,8 +594,11 @@ setup_once:
24568 * relocation. Manually set base address in stack canary
24569 * segment descriptor.
24570 */
24571- movl $gdt_page,%eax
24572+ movl $cpu_gdt_table,%eax
24573 movl $stack_canary,%ecx
24574+#ifdef CONFIG_SMP
24575+ addl $__per_cpu_load,%ecx
24576+#endif
24577 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24578 shrl $16, %ecx
24579 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24580@@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24581 cmpl $2,(%esp) # X86_TRAP_NMI
24582 je is_nmi # Ignore NMI
24583
24584- cmpl $2,%ss:early_recursion_flag
24585+ cmpl $1,%ss:early_recursion_flag
24586 je hlt_loop
24587 incl %ss:early_recursion_flag
24588
24589@@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24590 pushl (20+6*4)(%esp) /* trapno */
24591 pushl $fault_msg
24592 call printk
24593-#endif
24594 call dump_stack
24595+#endif
24596 hlt_loop:
24597 hlt
24598 jmp hlt_loop
24599@@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24600 /* This is the default interrupt "handler" :-) */
24601 ALIGN
24602 ignore_int:
24603- cld
24604 #ifdef CONFIG_PRINTK
24605+ cmpl $2,%ss:early_recursion_flag
24606+ je hlt_loop
24607+ incl %ss:early_recursion_flag
24608+ cld
24609 pushl %eax
24610 pushl %ecx
24611 pushl %edx
24612@@ -617,9 +705,6 @@ ignore_int:
24613 movl $(__KERNEL_DS),%eax
24614 movl %eax,%ds
24615 movl %eax,%es
24616- cmpl $2,early_recursion_flag
24617- je hlt_loop
24618- incl early_recursion_flag
24619 pushl 16(%esp)
24620 pushl 24(%esp)
24621 pushl 32(%esp)
24622@@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24623 /*
24624 * BSS section
24625 */
24626-__PAGE_ALIGNED_BSS
24627- .align PAGE_SIZE
24628 #ifdef CONFIG_X86_PAE
24629+.section .initial_pg_pmd,"a",@progbits
24630 initial_pg_pmd:
24631 .fill 1024*KPMDS,4,0
24632 #else
24633+.section .initial_page_table,"a",@progbits
24634 ENTRY(initial_page_table)
24635 .fill 1024,4,0
24636 #endif
24637+.section .initial_pg_fixmap,"a",@progbits
24638 initial_pg_fixmap:
24639 .fill 1024,4,0
24640+.section .empty_zero_page,"a",@progbits
24641 ENTRY(empty_zero_page)
24642 .fill 4096,1,0
24643+.section .swapper_pg_dir,"a",@progbits
24644 ENTRY(swapper_pg_dir)
24645+#ifdef CONFIG_X86_PAE
24646+ .fill 4,8,0
24647+#else
24648 .fill 1024,4,0
24649+#endif
24650
24651 /*
24652 * This starts the data section.
24653 */
24654 #ifdef CONFIG_X86_PAE
24655-__PAGE_ALIGNED_DATA
24656- /* Page-aligned for the benefit of paravirt? */
24657- .align PAGE_SIZE
24658+.section .initial_page_table,"a",@progbits
24659 ENTRY(initial_page_table)
24660 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24661 # if KPMDS == 3
24662@@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24663 # error "Kernel PMDs should be 1, 2 or 3"
24664 # endif
24665 .align PAGE_SIZE /* needs to be page-sized too */
24666+
24667+#ifdef CONFIG_PAX_PER_CPU_PGD
24668+ENTRY(cpu_pgd)
24669+ .rept 2*NR_CPUS
24670+ .fill 4,8,0
24671+ .endr
24672+#endif
24673+
24674 #endif
24675
24676 .data
24677 .balign 4
24678 ENTRY(stack_start)
24679- .long init_thread_union+THREAD_SIZE
24680+ .long init_thread_union+THREAD_SIZE-8
24681
24682 __INITRODATA
24683 int_msg:
24684@@ -727,7 +825,7 @@ fault_msg:
24685 * segment size, and 32-bit linear address value:
24686 */
24687
24688- .data
24689+.section .rodata,"a",@progbits
24690 .globl boot_gdt_descr
24691 .globl idt_descr
24692
24693@@ -736,7 +834,7 @@ fault_msg:
24694 .word 0 # 32 bit align gdt_desc.address
24695 boot_gdt_descr:
24696 .word __BOOT_DS+7
24697- .long boot_gdt - __PAGE_OFFSET
24698+ .long pa(boot_gdt)
24699
24700 .word 0 # 32-bit align idt_desc.address
24701 idt_descr:
24702@@ -747,7 +845,7 @@ idt_descr:
24703 .word 0 # 32 bit align gdt_desc.address
24704 ENTRY(early_gdt_descr)
24705 .word GDT_ENTRIES*8-1
24706- .long gdt_page /* Overwritten for secondary CPUs */
24707+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24708
24709 /*
24710 * The boot_gdt must mirror the equivalent in setup.S and is
24711@@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24712 .align L1_CACHE_BYTES
24713 ENTRY(boot_gdt)
24714 .fill GDT_ENTRY_BOOT_CS,8,0
24715- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24716- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24717+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24718+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24719+
24720+ .align PAGE_SIZE_asm
24721+ENTRY(cpu_gdt_table)
24722+ .rept NR_CPUS
24723+ .quad 0x0000000000000000 /* NULL descriptor */
24724+ .quad 0x0000000000000000 /* 0x0b reserved */
24725+ .quad 0x0000000000000000 /* 0x13 reserved */
24726+ .quad 0x0000000000000000 /* 0x1b reserved */
24727+
24728+#ifdef CONFIG_PAX_KERNEXEC
24729+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24730+#else
24731+ .quad 0x0000000000000000 /* 0x20 unused */
24732+#endif
24733+
24734+ .quad 0x0000000000000000 /* 0x28 unused */
24735+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24736+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24737+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24738+ .quad 0x0000000000000000 /* 0x4b reserved */
24739+ .quad 0x0000000000000000 /* 0x53 reserved */
24740+ .quad 0x0000000000000000 /* 0x5b reserved */
24741+
24742+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24743+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24744+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24745+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24746+
24747+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24748+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24749+
24750+ /*
24751+ * Segments used for calling PnP BIOS have byte granularity.
24752+ * The code segments and data segments have fixed 64k limits,
24753+ * the transfer segment sizes are set at run time.
24754+ */
24755+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24756+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24757+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24758+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24759+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24760+
24761+ /*
24762+ * The APM segments have byte granularity and their bases
24763+ * are set at run time. All have 64k limits.
24764+ */
24765+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24766+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24767+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24768+
24769+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24770+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24771+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24772+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24773+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24774+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24775+
24776+ /* Be sure this is zeroed to avoid false validations in Xen */
24777+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24778+ .endr
24779diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24780index 6fd514d9..320367e 100644
24781--- a/arch/x86/kernel/head_64.S
24782+++ b/arch/x86/kernel/head_64.S
24783@@ -20,6 +20,8 @@
24784 #include <asm/processor-flags.h>
24785 #include <asm/percpu.h>
24786 #include <asm/nops.h>
24787+#include <asm/cpufeature.h>
24788+#include <asm/alternative-asm.h>
24789
24790 #ifdef CONFIG_PARAVIRT
24791 #include <asm/asm-offsets.h>
24792@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24793 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24794 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24795 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24796+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24797+L3_VMALLOC_START = pud_index(VMALLOC_START)
24798+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24799+L3_VMALLOC_END = pud_index(VMALLOC_END)
24800+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24801+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24802
24803 .text
24804 __HEAD
24805@@ -89,11 +97,26 @@ startup_64:
24806 * Fixup the physical addresses in the page table
24807 */
24808 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24809+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24810+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24811+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24812+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24813+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24814
24815- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24816- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24817+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24818+#ifndef CONFIG_XEN
24819+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24820+#endif
24821
24822+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24823+
24824+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24825+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24826+
24827+ addq %rbp, level2_fixmap_pgt + (504*8)(%rip)
24828+ addq %rbp, level2_fixmap_pgt + (505*8)(%rip)
24829 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24830+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24831
24832 /*
24833 * Set up the identity mapping for the switchover. These
24834@@ -174,11 +197,12 @@ ENTRY(secondary_startup_64)
24835 * after the boot processor executes this code.
24836 */
24837
24838+ orq $-1, %rbp
24839 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24840 1:
24841
24842- /* Enable PAE mode and PGE */
24843- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24844+ /* Enable PAE mode and PSE/PGE */
24845+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24846 movq %rcx, %cr4
24847
24848 /* Setup early boot stage 4 level pagetables. */
24849@@ -199,10 +223,21 @@ ENTRY(secondary_startup_64)
24850 movl $MSR_EFER, %ecx
24851 rdmsr
24852 btsl $_EFER_SCE, %eax /* Enable System Call */
24853- btl $20,%edi /* No Execute supported? */
24854+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24855 jnc 1f
24856 btsl $_EFER_NX, %eax
24857+ cmpq $-1, %rbp
24858+ je 1f
24859 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24860+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24861+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24862+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24863+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24864+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*504(%rip)
24865+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*505(%rip)
24866+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24867+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24868+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24869 1: wrmsr /* Make changes effective */
24870
24871 /* Setup cr0 */
24872@@ -282,6 +317,7 @@ ENTRY(secondary_startup_64)
24873 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24874 * address given in m16:64.
24875 */
24876+ pax_set_fptr_mask
24877 movq initial_code(%rip),%rax
24878 pushq $0 # fake return address to stop unwinder
24879 pushq $__KERNEL_CS # set correct cs
24880@@ -313,7 +349,7 @@ ENDPROC(start_cpu0)
24881 .quad INIT_PER_CPU_VAR(irq_stack_union)
24882
24883 GLOBAL(stack_start)
24884- .quad init_thread_union+THREAD_SIZE-8
24885+ .quad init_thread_union+THREAD_SIZE-16
24886 .word 0
24887 __FINITDATA
24888
24889@@ -391,7 +427,7 @@ ENTRY(early_idt_handler)
24890 call dump_stack
24891 #ifdef CONFIG_KALLSYMS
24892 leaq early_idt_ripmsg(%rip),%rdi
24893- movq 40(%rsp),%rsi # %rip again
24894+ movq 88(%rsp),%rsi # %rip again
24895 call __print_symbol
24896 #endif
24897 #endif /* EARLY_PRINTK */
24898@@ -420,6 +456,7 @@ ENDPROC(early_idt_handler)
24899 early_recursion_flag:
24900 .long 0
24901
24902+ .section .rodata,"a",@progbits
24903 #ifdef CONFIG_EARLY_PRINTK
24904 early_idt_msg:
24905 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24906@@ -447,29 +484,52 @@ NEXT_PAGE(early_level4_pgt)
24907 NEXT_PAGE(early_dynamic_pgts)
24908 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24909
24910- .data
24911+ .section .rodata,"a",@progbits
24912
24913-#ifndef CONFIG_XEN
24914 NEXT_PAGE(init_level4_pgt)
24915- .fill 512,8,0
24916-#else
24917-NEXT_PAGE(init_level4_pgt)
24918- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24919 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24920 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24921+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24922+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24923+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24924+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24925+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24926+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24927 .org init_level4_pgt + L4_START_KERNEL*8, 0
24928 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24929 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24930
24931+#ifdef CONFIG_PAX_PER_CPU_PGD
24932+NEXT_PAGE(cpu_pgd)
24933+ .rept 2*NR_CPUS
24934+ .fill 512,8,0
24935+ .endr
24936+#endif
24937+
24938 NEXT_PAGE(level3_ident_pgt)
24939 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24940+#ifdef CONFIG_XEN
24941 .fill 511, 8, 0
24942+#else
24943+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24944+ .fill 510,8,0
24945+#endif
24946+
24947+NEXT_PAGE(level3_vmalloc_start_pgt)
24948+ .fill 512,8,0
24949+
24950+NEXT_PAGE(level3_vmalloc_end_pgt)
24951+ .fill 512,8,0
24952+
24953+NEXT_PAGE(level3_vmemmap_pgt)
24954+ .fill L3_VMEMMAP_START,8,0
24955+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24956+
24957 NEXT_PAGE(level2_ident_pgt)
24958- /* Since I easily can, map the first 1G.
24959+ /* Since I easily can, map the first 2G.
24960 * Don't set NX because code runs from these pages.
24961 */
24962- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24963-#endif
24964+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24965
24966 NEXT_PAGE(level3_kernel_pgt)
24967 .fill L3_START_KERNEL,8,0
24968@@ -477,6 +537,9 @@ NEXT_PAGE(level3_kernel_pgt)
24969 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24970 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24971
24972+NEXT_PAGE(level2_vmemmap_pgt)
24973+ .fill 512,8,0
24974+
24975 NEXT_PAGE(level2_kernel_pgt)
24976 /*
24977 * 512 MB kernel mapping. We spend a full page on this pagetable
24978@@ -492,23 +555,61 @@ NEXT_PAGE(level2_kernel_pgt)
24979 KERNEL_IMAGE_SIZE/PMD_SIZE)
24980
24981 NEXT_PAGE(level2_fixmap_pgt)
24982- .fill 506,8,0
24983- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24984- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24985- .fill 5,8,0
24986+ .fill 504,8,0
24987+ .quad level1_fixmap_pgt - __START_KERNEL_map + 0 * PAGE_SIZE + _PAGE_TABLE
24988+ .quad level1_fixmap_pgt - __START_KERNEL_map + 1 * PAGE_SIZE + _PAGE_TABLE
24989+ .quad level1_fixmap_pgt - __START_KERNEL_map + 2 * PAGE_SIZE + _PAGE_TABLE
24990+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24991+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
24992+ .fill 4,8,0
24993
24994 NEXT_PAGE(level1_fixmap_pgt)
24995+ .fill 3*512,8,0
24996+
24997+NEXT_PAGE(level1_vsyscall_pgt)
24998 .fill 512,8,0
24999
25000 #undef PMDS
25001
25002- .data
25003+ .align PAGE_SIZE
25004+ENTRY(cpu_gdt_table)
25005+ .rept NR_CPUS
25006+ .quad 0x0000000000000000 /* NULL descriptor */
25007+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25008+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25009+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25010+ .quad 0x00cffb000000ffff /* __USER32_CS */
25011+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25012+ .quad 0x00affb000000ffff /* __USER_CS */
25013+
25014+#ifdef CONFIG_PAX_KERNEXEC
25015+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25016+#else
25017+ .quad 0x0 /* unused */
25018+#endif
25019+
25020+ .quad 0,0 /* TSS */
25021+ .quad 0,0 /* LDT */
25022+ .quad 0,0,0 /* three TLS descriptors */
25023+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25024+ /* asm/segment.h:GDT_ENTRIES must match this */
25025+
25026+#ifdef CONFIG_PAX_MEMORY_UDEREF
25027+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25028+#else
25029+ .quad 0x0 /* unused */
25030+#endif
25031+
25032+ /* zero the remaining page */
25033+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25034+ .endr
25035+
25036 .align 16
25037 .globl early_gdt_descr
25038 early_gdt_descr:
25039 .word GDT_ENTRIES*8-1
25040 early_gdt_descr_base:
25041- .quad INIT_PER_CPU_VAR(gdt_page)
25042+ .quad cpu_gdt_table
25043
25044 ENTRY(phys_base)
25045 /* This must match the first entry in level2_kernel_pgt */
25046@@ -532,8 +633,8 @@ NEXT_PAGE(kasan_zero_pud)
25047
25048
25049 #include "../../x86/xen/xen-head.S"
25050-
25051- __PAGE_ALIGNED_BSS
25052+
25053+ .section .rodata,"a",@progbits
25054 NEXT_PAGE(empty_zero_page)
25055 .skip PAGE_SIZE
25056
25057diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25058index 05fd74f..c3548b1 100644
25059--- a/arch/x86/kernel/i386_ksyms_32.c
25060+++ b/arch/x86/kernel/i386_ksyms_32.c
25061@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25062 EXPORT_SYMBOL(cmpxchg8b_emu);
25063 #endif
25064
25065+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25066+
25067 /* Networking helper routines. */
25068 EXPORT_SYMBOL(csum_partial_copy_generic);
25069+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25070+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25071
25072 EXPORT_SYMBOL(__get_user_1);
25073 EXPORT_SYMBOL(__get_user_2);
25074@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25075 EXPORT_SYMBOL(___preempt_schedule_context);
25076 #endif
25077 #endif
25078+
25079+#ifdef CONFIG_PAX_KERNEXEC
25080+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25081+#endif
25082+
25083+#ifdef CONFIG_PAX_PER_CPU_PGD
25084+EXPORT_SYMBOL(cpu_pgd);
25085+#endif
25086diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25087index f341d56..d9b527b 100644
25088--- a/arch/x86/kernel/i387.c
25089+++ b/arch/x86/kernel/i387.c
25090@@ -68,7 +68,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25091 static inline bool interrupted_user_mode(void)
25092 {
25093 struct pt_regs *regs = get_irq_regs();
25094- return regs && user_mode_vm(regs);
25095+ return regs && user_mode(regs);
25096 }
25097
25098 /*
25099diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25100index e7cc537..67d7372 100644
25101--- a/arch/x86/kernel/i8259.c
25102+++ b/arch/x86/kernel/i8259.c
25103@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25104 static void make_8259A_irq(unsigned int irq)
25105 {
25106 disable_irq_nosync(irq);
25107- io_apic_irqs &= ~(1<<irq);
25108+ io_apic_irqs &= ~(1UL<<irq);
25109 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25110 enable_irq(irq);
25111 }
25112@@ -208,7 +208,7 @@ spurious_8259A_irq:
25113 "spurious 8259A interrupt: IRQ%d.\n", irq);
25114 spurious_irq_mask |= irqmask;
25115 }
25116- atomic_inc(&irq_err_count);
25117+ atomic_inc_unchecked(&irq_err_count);
25118 /*
25119 * Theoretically we do not have to handle this IRQ,
25120 * but in Linux this does not cause problems and is
25121@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25122 /* (slave's support for AEOI in flat mode is to be investigated) */
25123 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25124
25125+ pax_open_kernel();
25126 if (auto_eoi)
25127 /*
25128 * In AEOI mode we just have to mask the interrupt
25129 * when acking.
25130 */
25131- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25132+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25133 else
25134- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25135+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25136+ pax_close_kernel();
25137
25138 udelay(100); /* wait for 8259A to initialize */
25139
25140diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25141index a979b5b..1d6db75 100644
25142--- a/arch/x86/kernel/io_delay.c
25143+++ b/arch/x86/kernel/io_delay.c
25144@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25145 * Quirk table for systems that misbehave (lock up, etc.) if port
25146 * 0x80 is used:
25147 */
25148-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25149+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25150 {
25151 .callback = dmi_io_delay_0xed_port,
25152 .ident = "Compaq Presario V6000",
25153diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25154index 4ddaf66..49d5c18 100644
25155--- a/arch/x86/kernel/ioport.c
25156+++ b/arch/x86/kernel/ioport.c
25157@@ -6,6 +6,7 @@
25158 #include <linux/sched.h>
25159 #include <linux/kernel.h>
25160 #include <linux/capability.h>
25161+#include <linux/security.h>
25162 #include <linux/errno.h>
25163 #include <linux/types.h>
25164 #include <linux/ioport.h>
25165@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25166 return -EINVAL;
25167 if (turn_on && !capable(CAP_SYS_RAWIO))
25168 return -EPERM;
25169+#ifdef CONFIG_GRKERNSEC_IO
25170+ if (turn_on && grsec_disable_privio) {
25171+ gr_handle_ioperm();
25172+ return -ENODEV;
25173+ }
25174+#endif
25175
25176 /*
25177 * If it's the first ioperm() call in this thread's lifetime, set the
25178@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25179 * because the ->io_bitmap_max value must match the bitmap
25180 * contents:
25181 */
25182- tss = &per_cpu(init_tss, get_cpu());
25183+ tss = init_tss + get_cpu();
25184
25185 if (turn_on)
25186 bitmap_clear(t->io_bitmap_ptr, from, num);
25187@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25188 if (level > old) {
25189 if (!capable(CAP_SYS_RAWIO))
25190 return -EPERM;
25191+#ifdef CONFIG_GRKERNSEC_IO
25192+ if (grsec_disable_privio) {
25193+ gr_handle_iopl();
25194+ return -ENODEV;
25195+ }
25196+#endif
25197 }
25198 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25199 t->iopl = level << 12;
25200diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25201index 67b1cbe..6ad4cbc 100644
25202--- a/arch/x86/kernel/irq.c
25203+++ b/arch/x86/kernel/irq.c
25204@@ -22,7 +22,7 @@
25205 #define CREATE_TRACE_POINTS
25206 #include <asm/trace/irq_vectors.h>
25207
25208-atomic_t irq_err_count;
25209+atomic_unchecked_t irq_err_count;
25210
25211 /* Function pointer for generic interrupt vector handling */
25212 void (*x86_platform_ipi_callback)(void) = NULL;
25213@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25214 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25215 seq_puts(p, " Hypervisor callback interrupts\n");
25216 #endif
25217- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25218+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25219 #if defined(CONFIG_X86_IO_APIC)
25220- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25221+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25222 #endif
25223 return 0;
25224 }
25225@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25226
25227 u64 arch_irq_stat(void)
25228 {
25229- u64 sum = atomic_read(&irq_err_count);
25230+ u64 sum = atomic_read_unchecked(&irq_err_count);
25231 return sum;
25232 }
25233
25234diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25235index 28d28f5..e6cc9ae 100644
25236--- a/arch/x86/kernel/irq_32.c
25237+++ b/arch/x86/kernel/irq_32.c
25238@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25239
25240 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25241
25242+extern void gr_handle_kernel_exploit(void);
25243+
25244 int sysctl_panic_on_stackoverflow __read_mostly;
25245
25246 /* Debugging check for stack overflow: is there less than 1KB free? */
25247@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25248 __asm__ __volatile__("andl %%esp,%0" :
25249 "=r" (sp) : "0" (THREAD_SIZE - 1));
25250
25251- return sp < (sizeof(struct thread_info) + STACK_WARN);
25252+ return sp < STACK_WARN;
25253 }
25254
25255 static void print_stack_overflow(void)
25256 {
25257 printk(KERN_WARNING "low stack detected by irq handler\n");
25258 dump_stack();
25259+ gr_handle_kernel_exploit();
25260 if (sysctl_panic_on_stackoverflow)
25261 panic("low stack detected by irq handler - check messages\n");
25262 }
25263@@ -77,10 +80,9 @@ static inline void *current_stack(void)
25264 static inline int
25265 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25266 {
25267- struct irq_stack *curstk, *irqstk;
25268+ struct irq_stack *irqstk;
25269 u32 *isp, *prev_esp, arg1, arg2;
25270
25271- curstk = (struct irq_stack *) current_stack();
25272 irqstk = __this_cpu_read(hardirq_stack);
25273
25274 /*
25275@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25276 * handler) we can't do that and just have to keep using the
25277 * current stack (which is the irq stack already after all)
25278 */
25279- if (unlikely(curstk == irqstk))
25280+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25281 return 0;
25282
25283- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25284+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25285
25286 /* Save the next esp at the bottom of the stack */
25287 prev_esp = (u32 *)irqstk;
25288 *prev_esp = current_stack_pointer();
25289
25290+#ifdef CONFIG_PAX_MEMORY_UDEREF
25291+ __set_fs(MAKE_MM_SEG(0));
25292+#endif
25293+
25294 if (unlikely(overflow))
25295 call_on_stack(print_stack_overflow, isp);
25296
25297@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25298 : "0" (irq), "1" (desc), "2" (isp),
25299 "D" (desc->handle_irq)
25300 : "memory", "cc", "ecx");
25301+
25302+#ifdef CONFIG_PAX_MEMORY_UDEREF
25303+ __set_fs(current_thread_info()->addr_limit);
25304+#endif
25305+
25306 return 1;
25307 }
25308
25309@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25310 */
25311 void irq_ctx_init(int cpu)
25312 {
25313- struct irq_stack *irqstk;
25314-
25315 if (per_cpu(hardirq_stack, cpu))
25316 return;
25317
25318- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25319- THREADINFO_GFP,
25320- THREAD_SIZE_ORDER));
25321- per_cpu(hardirq_stack, cpu) = irqstk;
25322-
25323- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25324- THREADINFO_GFP,
25325- THREAD_SIZE_ORDER));
25326- per_cpu(softirq_stack, cpu) = irqstk;
25327-
25328- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25329- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25330+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25331+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25332 }
25333
25334 void do_softirq_own_stack(void)
25335 {
25336- struct thread_info *curstk;
25337 struct irq_stack *irqstk;
25338 u32 *isp, *prev_esp;
25339
25340- curstk = current_stack();
25341 irqstk = __this_cpu_read(softirq_stack);
25342
25343 /* build the stack frame on the softirq stack */
25344@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
25345 prev_esp = (u32 *)irqstk;
25346 *prev_esp = current_stack_pointer();
25347
25348+#ifdef CONFIG_PAX_MEMORY_UDEREF
25349+ __set_fs(MAKE_MM_SEG(0));
25350+#endif
25351+
25352 call_on_stack(__do_softirq, isp);
25353+
25354+#ifdef CONFIG_PAX_MEMORY_UDEREF
25355+ __set_fs(current_thread_info()->addr_limit);
25356+#endif
25357+
25358 }
25359
25360 bool handle_irq(unsigned irq, struct pt_regs *regs)
25361@@ -165,7 +171,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25362 if (unlikely(!desc))
25363 return false;
25364
25365- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25366+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25367 if (unlikely(overflow))
25368 print_stack_overflow();
25369 desc->handle_irq(irq, desc);
25370diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25371index e4b503d..824fce8 100644
25372--- a/arch/x86/kernel/irq_64.c
25373+++ b/arch/x86/kernel/irq_64.c
25374@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25375 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25376 EXPORT_PER_CPU_SYMBOL(irq_regs);
25377
25378+extern void gr_handle_kernel_exploit(void);
25379+
25380 int sysctl_panic_on_stackoverflow;
25381
25382 /*
25383@@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25384 u64 estack_top, estack_bottom;
25385 u64 curbase = (u64)task_stack_page(current);
25386
25387- if (user_mode_vm(regs))
25388+ if (user_mode(regs))
25389 return;
25390
25391 if (regs->sp >= curbase + sizeof(struct thread_info) +
25392@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25393 irq_stack_top, irq_stack_bottom,
25394 estack_top, estack_bottom);
25395
25396+ gr_handle_kernel_exploit();
25397+
25398 if (sysctl_panic_on_stackoverflow)
25399 panic("low stack detected by irq handler - check messages\n");
25400 #endif
25401diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25402index 26d5a55..a01160a 100644
25403--- a/arch/x86/kernel/jump_label.c
25404+++ b/arch/x86/kernel/jump_label.c
25405@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25406 * Jump label is enabled for the first time.
25407 * So we expect a default_nop...
25408 */
25409- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25410+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25411 != 0))
25412 bug_at((void *)entry->code, __LINE__);
25413 } else {
25414@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25415 * ...otherwise expect an ideal_nop. Otherwise
25416 * something went horribly wrong.
25417 */
25418- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25419+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25420 != 0))
25421 bug_at((void *)entry->code, __LINE__);
25422 }
25423@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25424 * are converting the default nop to the ideal nop.
25425 */
25426 if (init) {
25427- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25428+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25429 bug_at((void *)entry->code, __LINE__);
25430 } else {
25431 code.jump = 0xe9;
25432 code.offset = entry->target -
25433 (entry->code + JUMP_LABEL_NOP_SIZE);
25434- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25435+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25436 bug_at((void *)entry->code, __LINE__);
25437 }
25438 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25439diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25440index 25ecd56..e12482f 100644
25441--- a/arch/x86/kernel/kgdb.c
25442+++ b/arch/x86/kernel/kgdb.c
25443@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25444 #ifdef CONFIG_X86_32
25445 switch (regno) {
25446 case GDB_SS:
25447- if (!user_mode_vm(regs))
25448+ if (!user_mode(regs))
25449 *(unsigned long *)mem = __KERNEL_DS;
25450 break;
25451 case GDB_SP:
25452- if (!user_mode_vm(regs))
25453+ if (!user_mode(regs))
25454 *(unsigned long *)mem = kernel_stack_pointer(regs);
25455 break;
25456 case GDB_GS:
25457@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25458 bp->attr.bp_addr = breakinfo[breakno].addr;
25459 bp->attr.bp_len = breakinfo[breakno].len;
25460 bp->attr.bp_type = breakinfo[breakno].type;
25461- info->address = breakinfo[breakno].addr;
25462+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25463+ info->address = ktla_ktva(breakinfo[breakno].addr);
25464+ else
25465+ info->address = breakinfo[breakno].addr;
25466 info->len = breakinfo[breakno].len;
25467 info->type = breakinfo[breakno].type;
25468 val = arch_install_hw_breakpoint(bp);
25469@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25470 case 'k':
25471 /* clear the trace bit */
25472 linux_regs->flags &= ~X86_EFLAGS_TF;
25473- atomic_set(&kgdb_cpu_doing_single_step, -1);
25474+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25475
25476 /* set the trace bit if we're stepping */
25477 if (remcomInBuffer[0] == 's') {
25478 linux_regs->flags |= X86_EFLAGS_TF;
25479- atomic_set(&kgdb_cpu_doing_single_step,
25480+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25481 raw_smp_processor_id());
25482 }
25483
25484@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25485
25486 switch (cmd) {
25487 case DIE_DEBUG:
25488- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25489+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25490 if (user_mode(regs))
25491 return single_step_cont(regs, args);
25492 break;
25493@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25494 #endif /* CONFIG_DEBUG_RODATA */
25495
25496 bpt->type = BP_BREAKPOINT;
25497- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25498+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25499 BREAK_INSTR_SIZE);
25500 if (err)
25501 return err;
25502- err = probe_kernel_write((char *)bpt->bpt_addr,
25503+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25504 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25505 #ifdef CONFIG_DEBUG_RODATA
25506 if (!err)
25507@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25508 return -EBUSY;
25509 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25510 BREAK_INSTR_SIZE);
25511- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25512+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25513 if (err)
25514 return err;
25515 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25516@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25517 if (mutex_is_locked(&text_mutex))
25518 goto knl_write;
25519 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25520- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25521+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25522 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25523 goto knl_write;
25524 return err;
25525 knl_write:
25526 #endif /* CONFIG_DEBUG_RODATA */
25527- return probe_kernel_write((char *)bpt->bpt_addr,
25528+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25529 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25530 }
25531
25532diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25533index 4e3d5a9..03fffd8 100644
25534--- a/arch/x86/kernel/kprobes/core.c
25535+++ b/arch/x86/kernel/kprobes/core.c
25536@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25537 s32 raddr;
25538 } __packed *insn;
25539
25540- insn = (struct __arch_relative_insn *)from;
25541+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25542+
25543+ pax_open_kernel();
25544 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25545 insn->op = op;
25546+ pax_close_kernel();
25547 }
25548
25549 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25550@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25551 kprobe_opcode_t opcode;
25552 kprobe_opcode_t *orig_opcodes = opcodes;
25553
25554- if (search_exception_tables((unsigned long)opcodes))
25555+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25556 return 0; /* Page fault may occur on this address. */
25557
25558 retry:
25559@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25560 * Fortunately, we know that the original code is the ideal 5-byte
25561 * long NOP.
25562 */
25563- memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25564+ memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25565 if (faddr)
25566 memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
25567 else
25568 buf[0] = kp->opcode;
25569- return (unsigned long)buf;
25570+ return ktva_ktla((unsigned long)buf);
25571 }
25572
25573 /*
25574@@ -364,7 +367,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25575 /* Another subsystem puts a breakpoint, failed to recover */
25576 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25577 return 0;
25578+ pax_open_kernel();
25579 memcpy(dest, insn.kaddr, insn.length);
25580+ pax_close_kernel();
25581
25582 #ifdef CONFIG_X86_64
25583 if (insn_rip_relative(&insn)) {
25584@@ -391,7 +396,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25585 return 0;
25586 }
25587 disp = (u8 *) dest + insn_offset_displacement(&insn);
25588+ pax_open_kernel();
25589 *(s32 *) disp = (s32) newdisp;
25590+ pax_close_kernel();
25591 }
25592 #endif
25593 return insn.length;
25594@@ -533,7 +540,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25595 * nor set current_kprobe, because it doesn't use single
25596 * stepping.
25597 */
25598- regs->ip = (unsigned long)p->ainsn.insn;
25599+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25600 preempt_enable_no_resched();
25601 return;
25602 }
25603@@ -550,9 +557,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25604 regs->flags &= ~X86_EFLAGS_IF;
25605 /* single step inline if the instruction is an int3 */
25606 if (p->opcode == BREAKPOINT_INSTRUCTION)
25607- regs->ip = (unsigned long)p->addr;
25608+ regs->ip = ktla_ktva((unsigned long)p->addr);
25609 else
25610- regs->ip = (unsigned long)p->ainsn.insn;
25611+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25612 }
25613 NOKPROBE_SYMBOL(setup_singlestep);
25614
25615@@ -602,7 +609,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25616 struct kprobe *p;
25617 struct kprobe_ctlblk *kcb;
25618
25619- if (user_mode_vm(regs))
25620+ if (user_mode(regs))
25621 return 0;
25622
25623 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25624@@ -637,7 +644,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25625 setup_singlestep(p, regs, kcb, 0);
25626 return 1;
25627 }
25628- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25629+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25630 /*
25631 * The breakpoint instruction was removed right
25632 * after we hit it. Another cpu has removed
25633@@ -684,6 +691,9 @@ static void __used kretprobe_trampoline_holder(void)
25634 " movq %rax, 152(%rsp)\n"
25635 RESTORE_REGS_STRING
25636 " popfq\n"
25637+#ifdef KERNEXEC_PLUGIN
25638+ " btsq $63,(%rsp)\n"
25639+#endif
25640 #else
25641 " pushf\n"
25642 SAVE_REGS_STRING
25643@@ -824,7 +834,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25644 struct kprobe_ctlblk *kcb)
25645 {
25646 unsigned long *tos = stack_addr(regs);
25647- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25648+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25649 unsigned long orig_ip = (unsigned long)p->addr;
25650 kprobe_opcode_t *insn = p->ainsn.insn;
25651
25652@@ -1007,7 +1017,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25653 struct die_args *args = data;
25654 int ret = NOTIFY_DONE;
25655
25656- if (args->regs && user_mode_vm(args->regs))
25657+ if (args->regs && user_mode(args->regs))
25658 return ret;
25659
25660 if (val == DIE_GPF) {
25661diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25662index 7b3b9d1..e2478b91 100644
25663--- a/arch/x86/kernel/kprobes/opt.c
25664+++ b/arch/x86/kernel/kprobes/opt.c
25665@@ -79,6 +79,7 @@ found:
25666 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25667 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25668 {
25669+ pax_open_kernel();
25670 #ifdef CONFIG_X86_64
25671 *addr++ = 0x48;
25672 *addr++ = 0xbf;
25673@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25674 *addr++ = 0xb8;
25675 #endif
25676 *(unsigned long *)addr = val;
25677+ pax_close_kernel();
25678 }
25679
25680 asm (
25681@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25682 * Verify if the address gap is in 2GB range, because this uses
25683 * a relative jump.
25684 */
25685- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25686+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25687 if (abs(rel) > 0x7fffffff) {
25688 __arch_remove_optimized_kprobe(op, 0);
25689 return -ERANGE;
25690@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25691 op->optinsn.size = ret;
25692
25693 /* Copy arch-dep-instance from template */
25694- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25695+ pax_open_kernel();
25696+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25697+ pax_close_kernel();
25698
25699 /* Set probe information */
25700 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25701
25702 /* Set probe function call */
25703- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25704+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25705
25706 /* Set returning jmp instruction at the tail of out-of-line buffer */
25707- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25708+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25709 (u8 *)op->kp.addr + op->optinsn.size);
25710
25711 flush_icache_range((unsigned long) buf,
25712@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25713 WARN_ON(kprobe_disabled(&op->kp));
25714
25715 /* Backup instructions which will be replaced by jump address */
25716- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25717+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25718 RELATIVE_ADDR_SIZE);
25719
25720 insn_buf[0] = RELATIVEJUMP_OPCODE;
25721@@ -441,7 +445,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25722 /* This kprobe is really able to run optimized path. */
25723 op = container_of(p, struct optimized_kprobe, kp);
25724 /* Detour through copied instructions */
25725- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25726+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25727 if (!reenter)
25728 reset_current_kprobe();
25729 preempt_enable_no_resched();
25730diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25731index c2bedae..25e7ab60 100644
25732--- a/arch/x86/kernel/ksysfs.c
25733+++ b/arch/x86/kernel/ksysfs.c
25734@@ -184,7 +184,7 @@ out:
25735
25736 static struct kobj_attribute type_attr = __ATTR_RO(type);
25737
25738-static struct bin_attribute data_attr = {
25739+static bin_attribute_no_const data_attr __read_only = {
25740 .attr = {
25741 .name = "data",
25742 .mode = S_IRUGO,
25743diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25744index c37886d..d851d32 100644
25745--- a/arch/x86/kernel/ldt.c
25746+++ b/arch/x86/kernel/ldt.c
25747@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25748 if (reload) {
25749 #ifdef CONFIG_SMP
25750 preempt_disable();
25751- load_LDT(pc);
25752+ load_LDT_nolock(pc);
25753 if (!cpumask_equal(mm_cpumask(current->mm),
25754 cpumask_of(smp_processor_id())))
25755 smp_call_function(flush_ldt, current->mm, 1);
25756 preempt_enable();
25757 #else
25758- load_LDT(pc);
25759+ load_LDT_nolock(pc);
25760 #endif
25761 }
25762 if (oldsize) {
25763@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25764 return err;
25765
25766 for (i = 0; i < old->size; i++)
25767- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25768+ write_ldt_entry(new->ldt, i, old->ldt + i);
25769 return 0;
25770 }
25771
25772@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25773 retval = copy_ldt(&mm->context, &old_mm->context);
25774 mutex_unlock(&old_mm->context.lock);
25775 }
25776+
25777+ if (tsk == current) {
25778+ mm->context.vdso = 0;
25779+
25780+#ifdef CONFIG_X86_32
25781+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25782+ mm->context.user_cs_base = 0UL;
25783+ mm->context.user_cs_limit = ~0UL;
25784+
25785+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25786+ cpus_clear(mm->context.cpu_user_cs_mask);
25787+#endif
25788+
25789+#endif
25790+#endif
25791+
25792+ }
25793+
25794 return retval;
25795 }
25796
25797@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25798 }
25799 }
25800
25801+#ifdef CONFIG_PAX_SEGMEXEC
25802+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25803+ error = -EINVAL;
25804+ goto out_unlock;
25805+ }
25806+#endif
25807+
25808 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25809 error = -EINVAL;
25810 goto out_unlock;
25811diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
25812index ff3c3101d..d7c0cd8 100644
25813--- a/arch/x86/kernel/livepatch.c
25814+++ b/arch/x86/kernel/livepatch.c
25815@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25816 int ret, numpages, size = 4;
25817 bool readonly;
25818 unsigned long val;
25819- unsigned long core = (unsigned long)mod->module_core;
25820- unsigned long core_ro_size = mod->core_ro_size;
25821- unsigned long core_size = mod->core_size;
25822+ unsigned long core_rx = (unsigned long)mod->module_core_rx;
25823+ unsigned long core_rw = (unsigned long)mod->module_core_rw;
25824+ unsigned long core_size_rx = mod->core_size_rx;
25825+ unsigned long core_size_rw = mod->core_size_rw;
25826
25827 switch (type) {
25828 case R_X86_64_NONE:
25829@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25830 return -EINVAL;
25831 }
25832
25833- if (loc < core || loc >= core + core_size)
25834+ if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
25835+ (loc < core_rw || loc >= core_rw + core_size_rw))
25836 /* loc does not point to any symbol inside the module */
25837 return -EINVAL;
25838
25839- if (loc < core + core_ro_size)
25840+ if (loc < core_rx + core_size_rx)
25841 readonly = true;
25842 else
25843 readonly = false;
25844diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25845index 469b23d..5449cfe 100644
25846--- a/arch/x86/kernel/machine_kexec_32.c
25847+++ b/arch/x86/kernel/machine_kexec_32.c
25848@@ -26,7 +26,7 @@
25849 #include <asm/cacheflush.h>
25850 #include <asm/debugreg.h>
25851
25852-static void set_idt(void *newidt, __u16 limit)
25853+static void set_idt(struct desc_struct *newidt, __u16 limit)
25854 {
25855 struct desc_ptr curidt;
25856
25857@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
25858 }
25859
25860
25861-static void set_gdt(void *newgdt, __u16 limit)
25862+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25863 {
25864 struct desc_ptr curgdt;
25865
25866@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
25867 }
25868
25869 control_page = page_address(image->control_code_page);
25870- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25871+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25872
25873 relocate_kernel_ptr = control_page;
25874 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25875diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25876index 94ea120..4154cea 100644
25877--- a/arch/x86/kernel/mcount_64.S
25878+++ b/arch/x86/kernel/mcount_64.S
25879@@ -7,7 +7,7 @@
25880 #include <linux/linkage.h>
25881 #include <asm/ptrace.h>
25882 #include <asm/ftrace.h>
25883-
25884+#include <asm/alternative-asm.h>
25885
25886 .code64
25887 .section .entry.text, "ax"
25888@@ -148,8 +148,9 @@
25889 #ifdef CONFIG_DYNAMIC_FTRACE
25890
25891 ENTRY(function_hook)
25892+ pax_force_retaddr
25893 retq
25894-END(function_hook)
25895+ENDPROC(function_hook)
25896
25897 ENTRY(ftrace_caller)
25898 /* save_mcount_regs fills in first two parameters */
25899@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
25900 #endif
25901
25902 GLOBAL(ftrace_stub)
25903+ pax_force_retaddr
25904 retq
25905-END(ftrace_caller)
25906+ENDPROC(ftrace_caller)
25907
25908 ENTRY(ftrace_regs_caller)
25909 /* Save the current flags before any operations that can change them */
25910@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
25911
25912 jmp ftrace_return
25913
25914-END(ftrace_regs_caller)
25915+ENDPROC(ftrace_regs_caller)
25916
25917
25918 #else /* ! CONFIG_DYNAMIC_FTRACE */
25919@@ -272,18 +274,20 @@ fgraph_trace:
25920 #endif
25921
25922 GLOBAL(ftrace_stub)
25923+ pax_force_retaddr
25924 retq
25925
25926 trace:
25927 /* save_mcount_regs fills in first two parameters */
25928 save_mcount_regs
25929
25930+ pax_force_fptr ftrace_trace_function
25931 call *ftrace_trace_function
25932
25933 restore_mcount_regs
25934
25935 jmp fgraph_trace
25936-END(function_hook)
25937+ENDPROC(function_hook)
25938 #endif /* CONFIG_DYNAMIC_FTRACE */
25939 #endif /* CONFIG_FUNCTION_TRACER */
25940
25941@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
25942
25943 restore_mcount_regs
25944
25945+ pax_force_retaddr
25946 retq
25947-END(ftrace_graph_caller)
25948+ENDPROC(ftrace_graph_caller)
25949
25950 GLOBAL(return_to_handler)
25951 subq $24, %rsp
25952@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
25953 movq 8(%rsp), %rdx
25954 movq (%rsp), %rax
25955 addq $24, %rsp
25956+ pax_force_fptr %rdi
25957 jmp *%rdi
25958+ENDPROC(return_to_handler)
25959 #endif
25960diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25961index d1ac80b..f593701 100644
25962--- a/arch/x86/kernel/module.c
25963+++ b/arch/x86/kernel/module.c
25964@@ -82,17 +82,17 @@ static unsigned long int get_module_load_offset(void)
25965 }
25966 #endif
25967
25968-void *module_alloc(unsigned long size)
25969+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25970 {
25971 void *p;
25972
25973- if (PAGE_ALIGN(size) > MODULES_LEN)
25974+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25975 return NULL;
25976
25977 p = __vmalloc_node_range(size, MODULE_ALIGN,
25978 MODULES_VADDR + get_module_load_offset(),
25979- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25980- PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
25981+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25982+ prot, 0, NUMA_NO_NODE,
25983 __builtin_return_address(0));
25984 if (p && (kasan_module_alloc(p, size) < 0)) {
25985 vfree(p);
25986@@ -102,6 +102,51 @@ void *module_alloc(unsigned long size)
25987 return p;
25988 }
25989
25990+void *module_alloc(unsigned long size)
25991+{
25992+
25993+#ifdef CONFIG_PAX_KERNEXEC
25994+ return __module_alloc(size, PAGE_KERNEL);
25995+#else
25996+ return __module_alloc(size, PAGE_KERNEL_EXEC);
25997+#endif
25998+
25999+}
26000+
26001+#ifdef CONFIG_PAX_KERNEXEC
26002+#ifdef CONFIG_X86_32
26003+void *module_alloc_exec(unsigned long size)
26004+{
26005+ struct vm_struct *area;
26006+
26007+ if (size == 0)
26008+ return NULL;
26009+
26010+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
26011+return area ? area->addr : NULL;
26012+}
26013+EXPORT_SYMBOL(module_alloc_exec);
26014+
26015+void module_memfree_exec(void *module_region)
26016+{
26017+ vunmap(module_region);
26018+}
26019+EXPORT_SYMBOL(module_memfree_exec);
26020+#else
26021+void module_memfree_exec(void *module_region)
26022+{
26023+ module_memfree(module_region);
26024+}
26025+EXPORT_SYMBOL(module_memfree_exec);
26026+
26027+void *module_alloc_exec(unsigned long size)
26028+{
26029+ return __module_alloc(size, PAGE_KERNEL_RX);
26030+}
26031+EXPORT_SYMBOL(module_alloc_exec);
26032+#endif
26033+#endif
26034+
26035 #ifdef CONFIG_X86_32
26036 int apply_relocate(Elf32_Shdr *sechdrs,
26037 const char *strtab,
26038@@ -112,14 +157,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26039 unsigned int i;
26040 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26041 Elf32_Sym *sym;
26042- uint32_t *location;
26043+ uint32_t *plocation, location;
26044
26045 DEBUGP("Applying relocate section %u to %u\n",
26046 relsec, sechdrs[relsec].sh_info);
26047 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26048 /* This is where to make the change */
26049- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26050- + rel[i].r_offset;
26051+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26052+ location = (uint32_t)plocation;
26053+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26054+ plocation = ktla_ktva((void *)plocation);
26055 /* This is the symbol it is referring to. Note that all
26056 undefined symbols have been resolved. */
26057 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26058@@ -128,11 +175,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26059 switch (ELF32_R_TYPE(rel[i].r_info)) {
26060 case R_386_32:
26061 /* We add the value into the location given */
26062- *location += sym->st_value;
26063+ pax_open_kernel();
26064+ *plocation += sym->st_value;
26065+ pax_close_kernel();
26066 break;
26067 case R_386_PC32:
26068 /* Add the value, subtract its position */
26069- *location += sym->st_value - (uint32_t)location;
26070+ pax_open_kernel();
26071+ *plocation += sym->st_value - location;
26072+ pax_close_kernel();
26073 break;
26074 default:
26075 pr_err("%s: Unknown relocation: %u\n",
26076@@ -177,21 +228,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26077 case R_X86_64_NONE:
26078 break;
26079 case R_X86_64_64:
26080+ pax_open_kernel();
26081 *(u64 *)loc = val;
26082+ pax_close_kernel();
26083 break;
26084 case R_X86_64_32:
26085+ pax_open_kernel();
26086 *(u32 *)loc = val;
26087+ pax_close_kernel();
26088 if (val != *(u32 *)loc)
26089 goto overflow;
26090 break;
26091 case R_X86_64_32S:
26092+ pax_open_kernel();
26093 *(s32 *)loc = val;
26094+ pax_close_kernel();
26095 if ((s64)val != *(s32 *)loc)
26096 goto overflow;
26097 break;
26098 case R_X86_64_PC32:
26099 val -= (u64)loc;
26100+ pax_open_kernel();
26101 *(u32 *)loc = val;
26102+ pax_close_kernel();
26103+
26104 #if 0
26105 if ((s64)val != *(s32 *)loc)
26106 goto overflow;
26107diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26108index 113e707..0a690e1 100644
26109--- a/arch/x86/kernel/msr.c
26110+++ b/arch/x86/kernel/msr.c
26111@@ -39,6 +39,7 @@
26112 #include <linux/notifier.h>
26113 #include <linux/uaccess.h>
26114 #include <linux/gfp.h>
26115+#include <linux/grsecurity.h>
26116
26117 #include <asm/processor.h>
26118 #include <asm/msr.h>
26119@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26120 int err = 0;
26121 ssize_t bytes = 0;
26122
26123+#ifdef CONFIG_GRKERNSEC_KMEM
26124+ gr_handle_msr_write();
26125+ return -EPERM;
26126+#endif
26127+
26128 if (count % 8)
26129 return -EINVAL; /* Invalid chunk size */
26130
26131@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26132 err = -EBADF;
26133 break;
26134 }
26135+#ifdef CONFIG_GRKERNSEC_KMEM
26136+ gr_handle_msr_write();
26137+ return -EPERM;
26138+#endif
26139 if (copy_from_user(&regs, uregs, sizeof regs)) {
26140 err = -EFAULT;
26141 break;
26142@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26143 return notifier_from_errno(err);
26144 }
26145
26146-static struct notifier_block __refdata msr_class_cpu_notifier = {
26147+static struct notifier_block msr_class_cpu_notifier = {
26148 .notifier_call = msr_class_cpu_callback,
26149 };
26150
26151diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26152index c3e985d..110a36a 100644
26153--- a/arch/x86/kernel/nmi.c
26154+++ b/arch/x86/kernel/nmi.c
26155@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26156
26157 static void nmi_max_handler(struct irq_work *w)
26158 {
26159- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26160+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26161 int remainder_ns, decimal_msecs;
26162- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26163+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26164
26165 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26166 decimal_msecs = remainder_ns / 1000;
26167
26168 printk_ratelimited(KERN_INFO
26169 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26170- a->handler, whole_msecs, decimal_msecs);
26171+ n->action->handler, whole_msecs, decimal_msecs);
26172 }
26173
26174 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26175@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26176 delta = sched_clock() - delta;
26177 trace_nmi_handler(a->handler, (int)delta, thishandled);
26178
26179- if (delta < nmi_longest_ns || delta < a->max_duration)
26180+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26181 continue;
26182
26183- a->max_duration = delta;
26184- irq_work_queue(&a->irq_work);
26185+ a->work->max_duration = delta;
26186+ irq_work_queue(&a->work->irq_work);
26187 }
26188
26189 rcu_read_unlock();
26190@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26191 }
26192 NOKPROBE_SYMBOL(nmi_handle);
26193
26194-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26195+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26196 {
26197 struct nmi_desc *desc = nmi_to_desc(type);
26198 unsigned long flags;
26199@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26200 if (!action->handler)
26201 return -EINVAL;
26202
26203- init_irq_work(&action->irq_work, nmi_max_handler);
26204+ action->work->action = action;
26205+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26206
26207 spin_lock_irqsave(&desc->lock, flags);
26208
26209@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26210 * event confuses some handlers (kdump uses this flag)
26211 */
26212 if (action->flags & NMI_FLAG_FIRST)
26213- list_add_rcu(&action->list, &desc->head);
26214+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26215 else
26216- list_add_tail_rcu(&action->list, &desc->head);
26217+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26218
26219 spin_unlock_irqrestore(&desc->lock, flags);
26220 return 0;
26221@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26222 if (!strcmp(n->name, name)) {
26223 WARN(in_nmi(),
26224 "Trying to free NMI (%s) from NMI context!\n", n->name);
26225- list_del_rcu(&n->list);
26226+ pax_list_del_rcu((struct list_head *)&n->list);
26227 break;
26228 }
26229 }
26230@@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26231 dotraplinkage notrace void
26232 do_nmi(struct pt_regs *regs, long error_code)
26233 {
26234+
26235+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26236+ if (!user_mode(regs)) {
26237+ unsigned long cs = regs->cs & 0xFFFF;
26238+ unsigned long ip = ktva_ktla(regs->ip);
26239+
26240+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26241+ regs->ip = ip;
26242+ }
26243+#endif
26244+
26245 nmi_nesting_preprocess(regs);
26246
26247 nmi_enter();
26248diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26249index 6d9582e..f746287 100644
26250--- a/arch/x86/kernel/nmi_selftest.c
26251+++ b/arch/x86/kernel/nmi_selftest.c
26252@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26253 {
26254 /* trap all the unknown NMIs we may generate */
26255 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26256- __initdata);
26257+ __initconst);
26258 }
26259
26260 static void __init cleanup_nmi_testsuite(void)
26261@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26262 unsigned long timeout;
26263
26264 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26265- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26266+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26267 nmi_fail = FAILURE;
26268 return;
26269 }
26270diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26271index bbb6c73..24a58ef 100644
26272--- a/arch/x86/kernel/paravirt-spinlocks.c
26273+++ b/arch/x86/kernel/paravirt-spinlocks.c
26274@@ -8,7 +8,7 @@
26275
26276 #include <asm/paravirt.h>
26277
26278-struct pv_lock_ops pv_lock_ops = {
26279+struct pv_lock_ops pv_lock_ops __read_only = {
26280 #ifdef CONFIG_SMP
26281 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26282 .unlock_kick = paravirt_nop,
26283diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26284index 548d25f..f8fb99c 100644
26285--- a/arch/x86/kernel/paravirt.c
26286+++ b/arch/x86/kernel/paravirt.c
26287@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26288 {
26289 return x;
26290 }
26291+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26292+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26293+#endif
26294
26295 void __init default_banner(void)
26296 {
26297@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26298
26299 if (opfunc == NULL)
26300 /* If there's no function, patch it with a ud2a (BUG) */
26301- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26302- else if (opfunc == _paravirt_nop)
26303+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26304+ else if (opfunc == (void *)_paravirt_nop)
26305 /* If the operation is a nop, then nop the callsite */
26306 ret = paravirt_patch_nop();
26307
26308 /* identity functions just return their single argument */
26309- else if (opfunc == _paravirt_ident_32)
26310+ else if (opfunc == (void *)_paravirt_ident_32)
26311 ret = paravirt_patch_ident_32(insnbuf, len);
26312- else if (opfunc == _paravirt_ident_64)
26313+ else if (opfunc == (void *)_paravirt_ident_64)
26314 ret = paravirt_patch_ident_64(insnbuf, len);
26315+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26316+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26317+ ret = paravirt_patch_ident_64(insnbuf, len);
26318+#endif
26319
26320 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26321 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26322@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26323 if (insn_len > len || start == NULL)
26324 insn_len = len;
26325 else
26326- memcpy(insnbuf, start, insn_len);
26327+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26328
26329 return insn_len;
26330 }
26331@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26332 return this_cpu_read(paravirt_lazy_mode);
26333 }
26334
26335-struct pv_info pv_info = {
26336+struct pv_info pv_info __read_only = {
26337 .name = "bare hardware",
26338 .paravirt_enabled = 0,
26339 .kernel_rpl = 0,
26340@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26341 #endif
26342 };
26343
26344-struct pv_init_ops pv_init_ops = {
26345+struct pv_init_ops pv_init_ops __read_only = {
26346 .patch = native_patch,
26347 };
26348
26349-struct pv_time_ops pv_time_ops = {
26350+struct pv_time_ops pv_time_ops __read_only = {
26351 .sched_clock = native_sched_clock,
26352 .steal_clock = native_steal_clock,
26353 };
26354
26355-__visible struct pv_irq_ops pv_irq_ops = {
26356+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26357 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26358 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26359 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26360@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26361 #endif
26362 };
26363
26364-__visible struct pv_cpu_ops pv_cpu_ops = {
26365+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26366 .cpuid = native_cpuid,
26367 .get_debugreg = native_get_debugreg,
26368 .set_debugreg = native_set_debugreg,
26369@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26370 NOKPROBE_SYMBOL(native_set_debugreg);
26371 NOKPROBE_SYMBOL(native_load_idt);
26372
26373-struct pv_apic_ops pv_apic_ops = {
26374+struct pv_apic_ops pv_apic_ops __read_only= {
26375 #ifdef CONFIG_X86_LOCAL_APIC
26376 .startup_ipi_hook = paravirt_nop,
26377 #endif
26378 };
26379
26380-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26381+#ifdef CONFIG_X86_32
26382+#ifdef CONFIG_X86_PAE
26383+/* 64-bit pagetable entries */
26384+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26385+#else
26386 /* 32-bit pagetable entries */
26387 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26388+#endif
26389 #else
26390 /* 64-bit pagetable entries */
26391 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26392 #endif
26393
26394-struct pv_mmu_ops pv_mmu_ops = {
26395+struct pv_mmu_ops pv_mmu_ops __read_only = {
26396
26397 .read_cr2 = native_read_cr2,
26398 .write_cr2 = native_write_cr2,
26399@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26400 .make_pud = PTE_IDENT,
26401
26402 .set_pgd = native_set_pgd,
26403+ .set_pgd_batched = native_set_pgd_batched,
26404 #endif
26405 #endif /* PAGETABLE_LEVELS >= 3 */
26406
26407@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26408 },
26409
26410 .set_fixmap = native_set_fixmap,
26411+
26412+#ifdef CONFIG_PAX_KERNEXEC
26413+ .pax_open_kernel = native_pax_open_kernel,
26414+ .pax_close_kernel = native_pax_close_kernel,
26415+#endif
26416+
26417 };
26418
26419 EXPORT_SYMBOL_GPL(pv_time_ops);
26420diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26421index a1da673..b6f5831 100644
26422--- a/arch/x86/kernel/paravirt_patch_64.c
26423+++ b/arch/x86/kernel/paravirt_patch_64.c
26424@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26425 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26426 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26427 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26428+
26429+#ifndef CONFIG_PAX_MEMORY_UDEREF
26430 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26431+#endif
26432+
26433 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26434 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26435
26436@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26437 PATCH_SITE(pv_mmu_ops, read_cr3);
26438 PATCH_SITE(pv_mmu_ops, write_cr3);
26439 PATCH_SITE(pv_cpu_ops, clts);
26440+
26441+#ifndef CONFIG_PAX_MEMORY_UDEREF
26442 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26443+#endif
26444+
26445 PATCH_SITE(pv_cpu_ops, wbinvd);
26446
26447 patch_site:
26448diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26449index 0497f71..7186c0d 100644
26450--- a/arch/x86/kernel/pci-calgary_64.c
26451+++ b/arch/x86/kernel/pci-calgary_64.c
26452@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26453 tce_space = be64_to_cpu(readq(target));
26454 tce_space = tce_space & TAR_SW_BITS;
26455
26456- tce_space = tce_space & (~specified_table_size);
26457+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26458 info->tce_space = (u64 *)__va(tce_space);
26459 }
26460 }
26461diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26462index 35ccf75..7a15747 100644
26463--- a/arch/x86/kernel/pci-iommu_table.c
26464+++ b/arch/x86/kernel/pci-iommu_table.c
26465@@ -2,7 +2,7 @@
26466 #include <asm/iommu_table.h>
26467 #include <linux/string.h>
26468 #include <linux/kallsyms.h>
26469-
26470+#include <linux/sched.h>
26471
26472 #define DEBUG 1
26473
26474diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26475index 77dd0ad..9ec4723 100644
26476--- a/arch/x86/kernel/pci-swiotlb.c
26477+++ b/arch/x86/kernel/pci-swiotlb.c
26478@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26479 struct dma_attrs *attrs)
26480 {
26481 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26482- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26483+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26484 else
26485 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26486 }
26487diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26488index a388bb8..97064ad 100644
26489--- a/arch/x86/kernel/process.c
26490+++ b/arch/x86/kernel/process.c
26491@@ -38,7 +38,8 @@
26492 * section. Since TSS's are completely CPU-local, we want them
26493 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26494 */
26495-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26496+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26497+EXPORT_SYMBOL(init_tss);
26498
26499 #ifdef CONFIG_X86_64
26500 static DEFINE_PER_CPU(unsigned char, is_idle);
26501@@ -96,7 +97,7 @@ void arch_task_cache_init(void)
26502 task_xstate_cachep =
26503 kmem_cache_create("task_xstate", xstate_size,
26504 __alignof__(union thread_xstate),
26505- SLAB_PANIC | SLAB_NOTRACK, NULL);
26506+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26507 setup_xstate_comp();
26508 }
26509
26510@@ -110,7 +111,7 @@ void exit_thread(void)
26511 unsigned long *bp = t->io_bitmap_ptr;
26512
26513 if (bp) {
26514- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26515+ struct tss_struct *tss = init_tss + get_cpu();
26516
26517 t->io_bitmap_ptr = NULL;
26518 clear_thread_flag(TIF_IO_BITMAP);
26519@@ -130,6 +131,9 @@ void flush_thread(void)
26520 {
26521 struct task_struct *tsk = current;
26522
26523+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26524+ loadsegment(gs, 0);
26525+#endif
26526 flush_ptrace_hw_breakpoint(tsk);
26527 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26528 drop_init_fpu(tsk);
26529@@ -276,7 +280,7 @@ static void __exit_idle(void)
26530 void exit_idle(void)
26531 {
26532 /* idle loop has pid 0 */
26533- if (current->pid)
26534+ if (task_pid_nr(current))
26535 return;
26536 __exit_idle();
26537 }
26538@@ -329,7 +333,7 @@ bool xen_set_default_idle(void)
26539 return ret;
26540 }
26541 #endif
26542-void stop_this_cpu(void *dummy)
26543+__noreturn void stop_this_cpu(void *dummy)
26544 {
26545 local_irq_disable();
26546 /*
26547@@ -508,16 +512,37 @@ static int __init idle_setup(char *str)
26548 }
26549 early_param("idle", idle_setup);
26550
26551-unsigned long arch_align_stack(unsigned long sp)
26552+#ifdef CONFIG_PAX_RANDKSTACK
26553+void pax_randomize_kstack(struct pt_regs *regs)
26554 {
26555- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26556- sp -= get_random_int() % 8192;
26557- return sp & ~0xf;
26558-}
26559+ struct thread_struct *thread = &current->thread;
26560+ unsigned long time;
26561
26562-unsigned long arch_randomize_brk(struct mm_struct *mm)
26563-{
26564- unsigned long range_end = mm->brk + 0x02000000;
26565- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26566-}
26567+ if (!randomize_va_space)
26568+ return;
26569+
26570+ if (v8086_mode(regs))
26571+ return;
26572
26573+ rdtscl(time);
26574+
26575+ /* P4 seems to return a 0 LSB, ignore it */
26576+#ifdef CONFIG_MPENTIUM4
26577+ time &= 0x3EUL;
26578+ time <<= 2;
26579+#elif defined(CONFIG_X86_64)
26580+ time &= 0xFUL;
26581+ time <<= 4;
26582+#else
26583+ time &= 0x1FUL;
26584+ time <<= 3;
26585+#endif
26586+
26587+ thread->sp0 ^= time;
26588+ load_sp0(init_tss + smp_processor_id(), thread);
26589+
26590+#ifdef CONFIG_X86_64
26591+ this_cpu_write(kernel_stack, thread->sp0);
26592+#endif
26593+}
26594+#endif
26595diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26596index 603c4f9..3a105d7 100644
26597--- a/arch/x86/kernel/process_32.c
26598+++ b/arch/x86/kernel/process_32.c
26599@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26600 unsigned long thread_saved_pc(struct task_struct *tsk)
26601 {
26602 return ((unsigned long *)tsk->thread.sp)[3];
26603+//XXX return tsk->thread.eip;
26604 }
26605
26606 void __show_regs(struct pt_regs *regs, int all)
26607@@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26608 unsigned long sp;
26609 unsigned short ss, gs;
26610
26611- if (user_mode_vm(regs)) {
26612+ if (user_mode(regs)) {
26613 sp = regs->sp;
26614 ss = regs->ss & 0xffff;
26615- gs = get_user_gs(regs);
26616 } else {
26617 sp = kernel_stack_pointer(regs);
26618 savesegment(ss, ss);
26619- savesegment(gs, gs);
26620 }
26621+ gs = get_user_gs(regs);
26622
26623 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26624 (u16)regs->cs, regs->ip, regs->flags,
26625- smp_processor_id());
26626+ raw_smp_processor_id());
26627 print_symbol("EIP is at %s\n", regs->ip);
26628
26629 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26630@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26631 int copy_thread(unsigned long clone_flags, unsigned long sp,
26632 unsigned long arg, struct task_struct *p)
26633 {
26634- struct pt_regs *childregs = task_pt_regs(p);
26635+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26636 struct task_struct *tsk;
26637 int err;
26638
26639 p->thread.sp = (unsigned long) childregs;
26640 p->thread.sp0 = (unsigned long) (childregs+1);
26641+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26642 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26643
26644 if (unlikely(p->flags & PF_KTHREAD)) {
26645 /* kernel thread */
26646 memset(childregs, 0, sizeof(struct pt_regs));
26647 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26648- task_user_gs(p) = __KERNEL_STACK_CANARY;
26649- childregs->ds = __USER_DS;
26650- childregs->es = __USER_DS;
26651+ savesegment(gs, childregs->gs);
26652+ childregs->ds = __KERNEL_DS;
26653+ childregs->es = __KERNEL_DS;
26654 childregs->fs = __KERNEL_PERCPU;
26655 childregs->bx = sp; /* function */
26656 childregs->bp = arg;
26657@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26658 struct thread_struct *prev = &prev_p->thread,
26659 *next = &next_p->thread;
26660 int cpu = smp_processor_id();
26661- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26662+ struct tss_struct *tss = init_tss + cpu;
26663 fpu_switch_t fpu;
26664
26665 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26666@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26667 */
26668 lazy_save_gs(prev->gs);
26669
26670+#ifdef CONFIG_PAX_MEMORY_UDEREF
26671+ __set_fs(task_thread_info(next_p)->addr_limit);
26672+#endif
26673+
26674 /*
26675 * Load the per-thread Thread-Local Storage descriptor.
26676 */
26677@@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26678 */
26679 arch_end_context_switch(next_p);
26680
26681- this_cpu_write(kernel_stack,
26682- (unsigned long)task_stack_page(next_p) +
26683- THREAD_SIZE - KERNEL_STACK_OFFSET);
26684+ this_cpu_write(current_task, next_p);
26685+ this_cpu_write(current_tinfo, &next_p->tinfo);
26686+ this_cpu_write(kernel_stack, next->sp0);
26687
26688 /*
26689 * Restore %gs if needed (which is common)
26690@@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26691
26692 switch_fpu_finish(next_p, fpu);
26693
26694- this_cpu_write(current_task, next_p);
26695-
26696 return prev_p;
26697 }
26698
26699@@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26700 } while (count++ < 16);
26701 return 0;
26702 }
26703-
26704diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26705index 67fcc43..0d2c630 100644
26706--- a/arch/x86/kernel/process_64.c
26707+++ b/arch/x86/kernel/process_64.c
26708@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26709 struct pt_regs *childregs;
26710 struct task_struct *me = current;
26711
26712- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26713+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26714 childregs = task_pt_regs(p);
26715 p->thread.sp = (unsigned long) childregs;
26716 p->thread.usersp = me->thread.usersp;
26717+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26718 set_tsk_thread_flag(p, TIF_FORK);
26719 p->thread.io_bitmap_ptr = NULL;
26720
26721@@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26722 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26723 savesegment(es, p->thread.es);
26724 savesegment(ds, p->thread.ds);
26725+ savesegment(ss, p->thread.ss);
26726+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26727 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26728
26729 if (unlikely(p->flags & PF_KTHREAD)) {
26730@@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26731 struct thread_struct *prev = &prev_p->thread;
26732 struct thread_struct *next = &next_p->thread;
26733 int cpu = smp_processor_id();
26734- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26735+ struct tss_struct *tss = init_tss + cpu;
26736 unsigned fsindex, gsindex;
26737 fpu_switch_t fpu;
26738
26739@@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26740 if (unlikely(next->ds | prev->ds))
26741 loadsegment(ds, next->ds);
26742
26743+ savesegment(ss, prev->ss);
26744+ if (unlikely(next->ss != prev->ss))
26745+ loadsegment(ss, next->ss);
26746+
26747 /*
26748 * Switch FS and GS.
26749 *
26750@@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26751 prev->usersp = this_cpu_read(old_rsp);
26752 this_cpu_write(old_rsp, next->usersp);
26753 this_cpu_write(current_task, next_p);
26754+ this_cpu_write(current_tinfo, &next_p->tinfo);
26755
26756 /*
26757 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26758@@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26759 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26760 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26761
26762- this_cpu_write(kernel_stack,
26763- (unsigned long)task_stack_page(next_p) +
26764- THREAD_SIZE - KERNEL_STACK_OFFSET);
26765+ this_cpu_write(kernel_stack, next->sp0);
26766
26767 /*
26768 * Now maybe reload the debug registers and handle I/O bitmaps
26769@@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
26770 if (!p || p == current || p->state == TASK_RUNNING)
26771 return 0;
26772 stack = (unsigned long)task_stack_page(p);
26773- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26774+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26775 return 0;
26776 fp = *(u64 *)(p->thread.sp);
26777 do {
26778- if (fp < (unsigned long)stack ||
26779- fp >= (unsigned long)stack+THREAD_SIZE)
26780+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26781 return 0;
26782 ip = *(u64 *)(fp+8);
26783 if (!in_sched_functions(ip))
26784diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26785index e510618..5165ac0 100644
26786--- a/arch/x86/kernel/ptrace.c
26787+++ b/arch/x86/kernel/ptrace.c
26788@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26789 unsigned long sp = (unsigned long)&regs->sp;
26790 u32 *prev_esp;
26791
26792- if (context == (sp & ~(THREAD_SIZE - 1)))
26793+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26794 return sp;
26795
26796- prev_esp = (u32 *)(context);
26797+ prev_esp = *(u32 **)(context);
26798 if (prev_esp)
26799 return (unsigned long)prev_esp;
26800
26801@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26802 if (child->thread.gs != value)
26803 return do_arch_prctl(child, ARCH_SET_GS, value);
26804 return 0;
26805+
26806+ case offsetof(struct user_regs_struct,ip):
26807+ /*
26808+ * Protect against any attempt to set ip to an
26809+ * impossible address. There are dragons lurking if the
26810+ * address is noncanonical. (This explicitly allows
26811+ * setting ip to TASK_SIZE_MAX, because user code can do
26812+ * that all by itself by running off the end of its
26813+ * address space.
26814+ */
26815+ if (value > TASK_SIZE_MAX)
26816+ return -EIO;
26817+ break;
26818+
26819 #endif
26820 }
26821
26822@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26823 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26824 {
26825 int i;
26826- int dr7 = 0;
26827+ unsigned long dr7 = 0;
26828 struct arch_hw_breakpoint *info;
26829
26830 for (i = 0; i < HBP_NUM; i++) {
26831@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26832 unsigned long addr, unsigned long data)
26833 {
26834 int ret;
26835- unsigned long __user *datap = (unsigned long __user *)data;
26836+ unsigned long __user *datap = (__force unsigned long __user *)data;
26837
26838 switch (request) {
26839 /* read the word at location addr in the USER area. */
26840@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26841 if ((int) addr < 0)
26842 return -EIO;
26843 ret = do_get_thread_area(child, addr,
26844- (struct user_desc __user *)data);
26845+ (__force struct user_desc __user *) data);
26846 break;
26847
26848 case PTRACE_SET_THREAD_AREA:
26849 if ((int) addr < 0)
26850 return -EIO;
26851 ret = do_set_thread_area(child, addr,
26852- (struct user_desc __user *)data, 0);
26853+ (__force struct user_desc __user *) data, 0);
26854 break;
26855 #endif
26856
26857@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26858
26859 #ifdef CONFIG_X86_64
26860
26861-static struct user_regset x86_64_regsets[] __read_mostly = {
26862+static user_regset_no_const x86_64_regsets[] __read_only = {
26863 [REGSET_GENERAL] = {
26864 .core_note_type = NT_PRSTATUS,
26865 .n = sizeof(struct user_regs_struct) / sizeof(long),
26866@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26867 #endif /* CONFIG_X86_64 */
26868
26869 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26870-static struct user_regset x86_32_regsets[] __read_mostly = {
26871+static user_regset_no_const x86_32_regsets[] __read_only = {
26872 [REGSET_GENERAL] = {
26873 .core_note_type = NT_PRSTATUS,
26874 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26875@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26876 */
26877 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26878
26879-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26880+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26881 {
26882 #ifdef CONFIG_X86_64
26883 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26884@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26885 memset(info, 0, sizeof(*info));
26886 info->si_signo = SIGTRAP;
26887 info->si_code = si_code;
26888- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26889+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26890 }
26891
26892 void user_single_step_siginfo(struct task_struct *tsk,
26893@@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26894 }
26895 }
26896
26897+#ifdef CONFIG_GRKERNSEC_SETXID
26898+extern void gr_delayed_cred_worker(void);
26899+#endif
26900+
26901 /*
26902 * We can return 0 to resume the syscall or anything else to go to phase
26903 * 2. If we resume the syscall, we need to put something appropriate in
26904@@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26905
26906 BUG_ON(regs != task_pt_regs(current));
26907
26908+#ifdef CONFIG_GRKERNSEC_SETXID
26909+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26910+ gr_delayed_cred_worker();
26911+#endif
26912+
26913 /*
26914 * If we stepped into a sysenter/syscall insn, it trapped in
26915 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26916@@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26917 */
26918 user_exit();
26919
26920+#ifdef CONFIG_GRKERNSEC_SETXID
26921+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26922+ gr_delayed_cred_worker();
26923+#endif
26924+
26925 audit_syscall_exit(regs);
26926
26927 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26928diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26929index e5ecd20..60f7eef 100644
26930--- a/arch/x86/kernel/pvclock.c
26931+++ b/arch/x86/kernel/pvclock.c
26932@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26933 reset_hung_task_detector();
26934 }
26935
26936-static atomic64_t last_value = ATOMIC64_INIT(0);
26937+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26938
26939 void pvclock_resume(void)
26940 {
26941- atomic64_set(&last_value, 0);
26942+ atomic64_set_unchecked(&last_value, 0);
26943 }
26944
26945 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26946@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26947 * updating at the same time, and one of them could be slightly behind,
26948 * making the assumption that last_value always go forward fail to hold.
26949 */
26950- last = atomic64_read(&last_value);
26951+ last = atomic64_read_unchecked(&last_value);
26952 do {
26953 if (ret < last)
26954 return last;
26955- last = atomic64_cmpxchg(&last_value, last, ret);
26956+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26957 } while (unlikely(last != ret));
26958
26959 return ret;
26960diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26961index 86db4bc..a50a54a 100644
26962--- a/arch/x86/kernel/reboot.c
26963+++ b/arch/x86/kernel/reboot.c
26964@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26965
26966 void __noreturn machine_real_restart(unsigned int type)
26967 {
26968+
26969+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26970+ struct desc_struct *gdt;
26971+#endif
26972+
26973 local_irq_disable();
26974
26975 /*
26976@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
26977
26978 /* Jump to the identity-mapped low memory code */
26979 #ifdef CONFIG_X86_32
26980- asm volatile("jmpl *%0" : :
26981+
26982+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26983+ gdt = get_cpu_gdt_table(smp_processor_id());
26984+ pax_open_kernel();
26985+#ifdef CONFIG_PAX_MEMORY_UDEREF
26986+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26987+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26988+ loadsegment(ds, __KERNEL_DS);
26989+ loadsegment(es, __KERNEL_DS);
26990+ loadsegment(ss, __KERNEL_DS);
26991+#endif
26992+#ifdef CONFIG_PAX_KERNEXEC
26993+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26994+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26995+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26996+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26997+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26998+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26999+#endif
27000+ pax_close_kernel();
27001+#endif
27002+
27003+ asm volatile("ljmpl *%0" : :
27004 "rm" (real_mode_header->machine_real_restart_asm),
27005 "a" (type));
27006 #else
27007@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
27008 /*
27009 * This is a single dmi_table handling all reboot quirks.
27010 */
27011-static struct dmi_system_id __initdata reboot_dmi_table[] = {
27012+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
27013
27014 /* Acer */
27015 { /* Handle reboot issue on Acer Aspire one */
27016@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
27017 * This means that this function can never return, it can misbehave
27018 * by not rebooting properly and hanging.
27019 */
27020-static void native_machine_emergency_restart(void)
27021+static void __noreturn native_machine_emergency_restart(void)
27022 {
27023 int i;
27024 int attempt = 0;
27025@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
27026 #endif
27027 }
27028
27029-static void __machine_emergency_restart(int emergency)
27030+static void __noreturn __machine_emergency_restart(int emergency)
27031 {
27032 reboot_emergency = emergency;
27033 machine_ops.emergency_restart();
27034 }
27035
27036-static void native_machine_restart(char *__unused)
27037+static void __noreturn native_machine_restart(char *__unused)
27038 {
27039 pr_notice("machine restart\n");
27040
27041@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27042 __machine_emergency_restart(0);
27043 }
27044
27045-static void native_machine_halt(void)
27046+static void __noreturn native_machine_halt(void)
27047 {
27048 /* Stop other cpus and apics */
27049 machine_shutdown();
27050@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27051 stop_this_cpu(NULL);
27052 }
27053
27054-static void native_machine_power_off(void)
27055+static void __noreturn native_machine_power_off(void)
27056 {
27057 if (pm_power_off) {
27058 if (!reboot_force)
27059@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27060 }
27061 /* A fallback in case there is no PM info available */
27062 tboot_shutdown(TB_SHUTDOWN_HALT);
27063+ unreachable();
27064 }
27065
27066-struct machine_ops machine_ops = {
27067+struct machine_ops machine_ops __read_only = {
27068 .power_off = native_machine_power_off,
27069 .shutdown = native_machine_shutdown,
27070 .emergency_restart = native_machine_emergency_restart,
27071diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27072index c8e41e9..64049ef 100644
27073--- a/arch/x86/kernel/reboot_fixups_32.c
27074+++ b/arch/x86/kernel/reboot_fixups_32.c
27075@@ -57,7 +57,7 @@ struct device_fixup {
27076 unsigned int vendor;
27077 unsigned int device;
27078 void (*reboot_fixup)(struct pci_dev *);
27079-};
27080+} __do_const;
27081
27082 /*
27083 * PCI ids solely used for fixups_table go here
27084diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27085index 3fd2c69..a444264 100644
27086--- a/arch/x86/kernel/relocate_kernel_64.S
27087+++ b/arch/x86/kernel/relocate_kernel_64.S
27088@@ -96,8 +96,7 @@ relocate_kernel:
27089
27090 /* jump to identity mapped page */
27091 addq $(identity_mapped - relocate_kernel), %r8
27092- pushq %r8
27093- ret
27094+ jmp *%r8
27095
27096 identity_mapped:
27097 /* set return address to 0 if not preserving context */
27098diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27099index 0a2421c..11f3f36 100644
27100--- a/arch/x86/kernel/setup.c
27101+++ b/arch/x86/kernel/setup.c
27102@@ -111,6 +111,7 @@
27103 #include <asm/mce.h>
27104 #include <asm/alternative.h>
27105 #include <asm/prom.h>
27106+#include <asm/boot.h>
27107
27108 /*
27109 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27110@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
27111 #endif
27112
27113
27114-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27115-__visible unsigned long mmu_cr4_features;
27116+#ifdef CONFIG_X86_64
27117+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27118+#elif defined(CONFIG_X86_PAE)
27119+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27120 #else
27121-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27122+__visible unsigned long mmu_cr4_features __read_only;
27123 #endif
27124
27125 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27126@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
27127 * area (640->1Mb) as ram even though it is not.
27128 * take them out.
27129 */
27130- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27131+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27132
27133 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27134 }
27135@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
27136 /* called before trim_bios_range() to spare extra sanitize */
27137 static void __init e820_add_kernel_range(void)
27138 {
27139- u64 start = __pa_symbol(_text);
27140+ u64 start = __pa_symbol(ktla_ktva(_text));
27141 u64 size = __pa_symbol(_end) - start;
27142
27143 /*
27144@@ -855,8 +858,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27145
27146 void __init setup_arch(char **cmdline_p)
27147 {
27148+#ifdef CONFIG_X86_32
27149+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27150+#else
27151 memblock_reserve(__pa_symbol(_text),
27152 (unsigned long)__bss_stop - (unsigned long)_text);
27153+#endif
27154
27155 early_reserve_initrd();
27156
27157@@ -954,16 +961,16 @@ void __init setup_arch(char **cmdline_p)
27158
27159 if (!boot_params.hdr.root_flags)
27160 root_mountflags &= ~MS_RDONLY;
27161- init_mm.start_code = (unsigned long) _text;
27162- init_mm.end_code = (unsigned long) _etext;
27163+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27164+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27165 init_mm.end_data = (unsigned long) _edata;
27166 init_mm.brk = _brk_end;
27167
27168 mpx_mm_init(&init_mm);
27169
27170- code_resource.start = __pa_symbol(_text);
27171- code_resource.end = __pa_symbol(_etext)-1;
27172- data_resource.start = __pa_symbol(_etext);
27173+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27174+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27175+ data_resource.start = __pa_symbol(_sdata);
27176 data_resource.end = __pa_symbol(_edata)-1;
27177 bss_resource.start = __pa_symbol(__bss_start);
27178 bss_resource.end = __pa_symbol(__bss_stop)-1;
27179diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27180index e4fcb87..9c06c55 100644
27181--- a/arch/x86/kernel/setup_percpu.c
27182+++ b/arch/x86/kernel/setup_percpu.c
27183@@ -21,19 +21,17 @@
27184 #include <asm/cpu.h>
27185 #include <asm/stackprotector.h>
27186
27187-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27188+#ifdef CONFIG_SMP
27189+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27190 EXPORT_PER_CPU_SYMBOL(cpu_number);
27191+#endif
27192
27193-#ifdef CONFIG_X86_64
27194 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27195-#else
27196-#define BOOT_PERCPU_OFFSET 0
27197-#endif
27198
27199 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27200 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27201
27202-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27203+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27204 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27205 };
27206 EXPORT_SYMBOL(__per_cpu_offset);
27207@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27208 {
27209 #ifdef CONFIG_NEED_MULTIPLE_NODES
27210 pg_data_t *last = NULL;
27211- unsigned int cpu;
27212+ int cpu;
27213
27214 for_each_possible_cpu(cpu) {
27215 int node = early_cpu_to_node(cpu);
27216@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27217 {
27218 #ifdef CONFIG_X86_32
27219 struct desc_struct gdt;
27220+ unsigned long base = per_cpu_offset(cpu);
27221
27222- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27223- 0x2 | DESCTYPE_S, 0x8);
27224- gdt.s = 1;
27225+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27226+ 0x83 | DESCTYPE_S, 0xC);
27227 write_gdt_entry(get_cpu_gdt_table(cpu),
27228 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27229 #endif
27230@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27231 /* alrighty, percpu areas up and running */
27232 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27233 for_each_possible_cpu(cpu) {
27234+#ifdef CONFIG_CC_STACKPROTECTOR
27235+#ifdef CONFIG_X86_32
27236+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27237+#endif
27238+#endif
27239 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27240 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27241 per_cpu(cpu_number, cpu) = cpu;
27242@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27243 */
27244 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27245 #endif
27246+#ifdef CONFIG_CC_STACKPROTECTOR
27247+#ifdef CONFIG_X86_32
27248+ if (!cpu)
27249+ per_cpu(stack_canary.canary, cpu) = canary;
27250+#endif
27251+#endif
27252 /*
27253 * Up to this point, the boot CPU has been using .init.data
27254 * area. Reload any changed state for the boot CPU.
27255diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27256index e504246..ba10432 100644
27257--- a/arch/x86/kernel/signal.c
27258+++ b/arch/x86/kernel/signal.c
27259@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27260 * Align the stack pointer according to the i386 ABI,
27261 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27262 */
27263- sp = ((sp + 4) & -16ul) - 4;
27264+ sp = ((sp - 12) & -16ul) - 4;
27265 #else /* !CONFIG_X86_32 */
27266 sp = round_down(sp, 16) - 8;
27267 #endif
27268@@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27269 }
27270
27271 if (current->mm->context.vdso)
27272- restorer = current->mm->context.vdso +
27273- selected_vdso32->sym___kernel_sigreturn;
27274+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27275 else
27276- restorer = &frame->retcode;
27277+ restorer = (void __user *)&frame->retcode;
27278 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27279 restorer = ksig->ka.sa.sa_restorer;
27280
27281@@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27282 * reasons and because gdb uses it as a signature to notice
27283 * signal handler stack frames.
27284 */
27285- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27286+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27287
27288 if (err)
27289 return -EFAULT;
27290@@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27291 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27292
27293 /* Set up to return from userspace. */
27294- restorer = current->mm->context.vdso +
27295- selected_vdso32->sym___kernel_rt_sigreturn;
27296+ if (current->mm->context.vdso)
27297+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27298+ else
27299+ restorer = (void __user *)&frame->retcode;
27300 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27301 restorer = ksig->ka.sa.sa_restorer;
27302 put_user_ex(restorer, &frame->pretcode);
27303@@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27304 * reasons and because gdb uses it as a signature to notice
27305 * signal handler stack frames.
27306 */
27307- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27308+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27309 } put_user_catch(err);
27310
27311 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27312@@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27313 {
27314 int usig = signr_convert(ksig->sig);
27315 sigset_t *set = sigmask_to_save();
27316- compat_sigset_t *cset = (compat_sigset_t *) set;
27317+ sigset_t sigcopy;
27318+ compat_sigset_t *cset;
27319+
27320+ sigcopy = *set;
27321+
27322+ cset = (compat_sigset_t *) &sigcopy;
27323
27324 /* Set up the stack frame */
27325 if (is_ia32_frame()) {
27326@@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27327 } else if (is_x32_frame()) {
27328 return x32_setup_rt_frame(ksig, cset, regs);
27329 } else {
27330- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27331+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27332 }
27333 }
27334
27335diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27336index be8e1bd..a3d93fa 100644
27337--- a/arch/x86/kernel/smp.c
27338+++ b/arch/x86/kernel/smp.c
27339@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27340
27341 __setup("nonmi_ipi", nonmi_ipi_setup);
27342
27343-struct smp_ops smp_ops = {
27344+struct smp_ops smp_ops __read_only = {
27345 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27346 .smp_prepare_cpus = native_smp_prepare_cpus,
27347 .smp_cpus_done = native_smp_cpus_done,
27348diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27349index febc6aa..37d8edf 100644
27350--- a/arch/x86/kernel/smpboot.c
27351+++ b/arch/x86/kernel/smpboot.c
27352@@ -229,14 +229,17 @@ static void notrace start_secondary(void *unused)
27353
27354 enable_start_cpu0 = 0;
27355
27356-#ifdef CONFIG_X86_32
27357+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27358+ barrier();
27359+
27360 /* switch away from the initial page table */
27361+#ifdef CONFIG_PAX_PER_CPU_PGD
27362+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27363+#else
27364 load_cr3(swapper_pg_dir);
27365+#endif
27366 __flush_tlb_all();
27367-#endif
27368
27369- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27370- barrier();
27371 /*
27372 * Check TSC synchronization with the BP:
27373 */
27374@@ -800,8 +803,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27375 alternatives_enable_smp();
27376
27377 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27378- (THREAD_SIZE + task_stack_page(idle))) - 1);
27379+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27380 per_cpu(current_task, cpu) = idle;
27381+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27382
27383 #ifdef CONFIG_X86_32
27384 /* Stack for startup_32 can be just as for start_secondary onwards */
27385@@ -810,10 +814,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27386 clear_tsk_thread_flag(idle, TIF_FORK);
27387 initial_gs = per_cpu_offset(cpu);
27388 #endif
27389- per_cpu(kernel_stack, cpu) =
27390- (unsigned long)task_stack_page(idle) -
27391- KERNEL_STACK_OFFSET + THREAD_SIZE;
27392+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27393+ pax_open_kernel();
27394 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27395+ pax_close_kernel();
27396 initial_code = (unsigned long)start_secondary;
27397 stack_start = idle->thread.sp;
27398
27399@@ -953,6 +957,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27400 /* the FPU context is blank, nobody can own it */
27401 __cpu_disable_lazy_restore(cpu);
27402
27403+#ifdef CONFIG_PAX_PER_CPU_PGD
27404+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27405+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27406+ KERNEL_PGD_PTRS);
27407+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27408+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27409+ KERNEL_PGD_PTRS);
27410+#endif
27411+
27412 err = do_boot_cpu(apicid, cpu, tidle);
27413 if (err) {
27414 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27415diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27416index 9b4d51d..5d28b58 100644
27417--- a/arch/x86/kernel/step.c
27418+++ b/arch/x86/kernel/step.c
27419@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27420 struct desc_struct *desc;
27421 unsigned long base;
27422
27423- seg &= ~7UL;
27424+ seg >>= 3;
27425
27426 mutex_lock(&child->mm->context.lock);
27427- if (unlikely((seg >> 3) >= child->mm->context.size))
27428+ if (unlikely(seg >= child->mm->context.size))
27429 addr = -1L; /* bogus selector, access would fault */
27430 else {
27431 desc = child->mm->context.ldt + seg;
27432@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27433 addr += base;
27434 }
27435 mutex_unlock(&child->mm->context.lock);
27436- }
27437+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27438+ addr = ktla_ktva(addr);
27439
27440 return addr;
27441 }
27442@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27443 unsigned char opcode[15];
27444 unsigned long addr = convert_ip_to_linear(child, regs);
27445
27446+ if (addr == -EINVAL)
27447+ return 0;
27448+
27449 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27450 for (i = 0; i < copied; i++) {
27451 switch (opcode[i]) {
27452diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27453new file mode 100644
27454index 0000000..5877189
27455--- /dev/null
27456+++ b/arch/x86/kernel/sys_i386_32.c
27457@@ -0,0 +1,189 @@
27458+/*
27459+ * This file contains various random system calls that
27460+ * have a non-standard calling sequence on the Linux/i386
27461+ * platform.
27462+ */
27463+
27464+#include <linux/errno.h>
27465+#include <linux/sched.h>
27466+#include <linux/mm.h>
27467+#include <linux/fs.h>
27468+#include <linux/smp.h>
27469+#include <linux/sem.h>
27470+#include <linux/msg.h>
27471+#include <linux/shm.h>
27472+#include <linux/stat.h>
27473+#include <linux/syscalls.h>
27474+#include <linux/mman.h>
27475+#include <linux/file.h>
27476+#include <linux/utsname.h>
27477+#include <linux/ipc.h>
27478+#include <linux/elf.h>
27479+
27480+#include <linux/uaccess.h>
27481+#include <linux/unistd.h>
27482+
27483+#include <asm/syscalls.h>
27484+
27485+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27486+{
27487+ unsigned long pax_task_size = TASK_SIZE;
27488+
27489+#ifdef CONFIG_PAX_SEGMEXEC
27490+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27491+ pax_task_size = SEGMEXEC_TASK_SIZE;
27492+#endif
27493+
27494+ if (flags & MAP_FIXED)
27495+ if (len > pax_task_size || addr > pax_task_size - len)
27496+ return -EINVAL;
27497+
27498+ return 0;
27499+}
27500+
27501+/*
27502+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27503+ */
27504+static unsigned long get_align_mask(void)
27505+{
27506+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27507+ return 0;
27508+
27509+ if (!(current->flags & PF_RANDOMIZE))
27510+ return 0;
27511+
27512+ return va_align.mask;
27513+}
27514+
27515+unsigned long
27516+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27517+ unsigned long len, unsigned long pgoff, unsigned long flags)
27518+{
27519+ struct mm_struct *mm = current->mm;
27520+ struct vm_area_struct *vma;
27521+ unsigned long pax_task_size = TASK_SIZE;
27522+ struct vm_unmapped_area_info info;
27523+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27524+
27525+#ifdef CONFIG_PAX_SEGMEXEC
27526+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27527+ pax_task_size = SEGMEXEC_TASK_SIZE;
27528+#endif
27529+
27530+ pax_task_size -= PAGE_SIZE;
27531+
27532+ if (len > pax_task_size)
27533+ return -ENOMEM;
27534+
27535+ if (flags & MAP_FIXED)
27536+ return addr;
27537+
27538+#ifdef CONFIG_PAX_RANDMMAP
27539+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27540+#endif
27541+
27542+ if (addr) {
27543+ addr = PAGE_ALIGN(addr);
27544+ if (pax_task_size - len >= addr) {
27545+ vma = find_vma(mm, addr);
27546+ if (check_heap_stack_gap(vma, addr, len, offset))
27547+ return addr;
27548+ }
27549+ }
27550+
27551+ info.flags = 0;
27552+ info.length = len;
27553+ info.align_mask = filp ? get_align_mask() : 0;
27554+ info.align_offset = pgoff << PAGE_SHIFT;
27555+ info.threadstack_offset = offset;
27556+
27557+#ifdef CONFIG_PAX_PAGEEXEC
27558+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27559+ info.low_limit = 0x00110000UL;
27560+ info.high_limit = mm->start_code;
27561+
27562+#ifdef CONFIG_PAX_RANDMMAP
27563+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27564+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27565+#endif
27566+
27567+ if (info.low_limit < info.high_limit) {
27568+ addr = vm_unmapped_area(&info);
27569+ if (!IS_ERR_VALUE(addr))
27570+ return addr;
27571+ }
27572+ } else
27573+#endif
27574+
27575+ info.low_limit = mm->mmap_base;
27576+ info.high_limit = pax_task_size;
27577+
27578+ return vm_unmapped_area(&info);
27579+}
27580+
27581+unsigned long
27582+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27583+ const unsigned long len, const unsigned long pgoff,
27584+ const unsigned long flags)
27585+{
27586+ struct vm_area_struct *vma;
27587+ struct mm_struct *mm = current->mm;
27588+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27589+ struct vm_unmapped_area_info info;
27590+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27591+
27592+#ifdef CONFIG_PAX_SEGMEXEC
27593+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27594+ pax_task_size = SEGMEXEC_TASK_SIZE;
27595+#endif
27596+
27597+ pax_task_size -= PAGE_SIZE;
27598+
27599+ /* requested length too big for entire address space */
27600+ if (len > pax_task_size)
27601+ return -ENOMEM;
27602+
27603+ if (flags & MAP_FIXED)
27604+ return addr;
27605+
27606+#ifdef CONFIG_PAX_PAGEEXEC
27607+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27608+ goto bottomup;
27609+#endif
27610+
27611+#ifdef CONFIG_PAX_RANDMMAP
27612+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27613+#endif
27614+
27615+ /* requesting a specific address */
27616+ if (addr) {
27617+ addr = PAGE_ALIGN(addr);
27618+ if (pax_task_size - len >= addr) {
27619+ vma = find_vma(mm, addr);
27620+ if (check_heap_stack_gap(vma, addr, len, offset))
27621+ return addr;
27622+ }
27623+ }
27624+
27625+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27626+ info.length = len;
27627+ info.low_limit = PAGE_SIZE;
27628+ info.high_limit = mm->mmap_base;
27629+ info.align_mask = filp ? get_align_mask() : 0;
27630+ info.align_offset = pgoff << PAGE_SHIFT;
27631+ info.threadstack_offset = offset;
27632+
27633+ addr = vm_unmapped_area(&info);
27634+ if (!(addr & ~PAGE_MASK))
27635+ return addr;
27636+ VM_BUG_ON(addr != -ENOMEM);
27637+
27638+bottomup:
27639+ /*
27640+ * A failed mmap() very likely causes application failure,
27641+ * so fall back to the bottom-up function here. This scenario
27642+ * can happen with large stack limits and large mmap()
27643+ * allocations.
27644+ */
27645+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27646+}
27647diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27648index 30277e2..5664a29 100644
27649--- a/arch/x86/kernel/sys_x86_64.c
27650+++ b/arch/x86/kernel/sys_x86_64.c
27651@@ -81,8 +81,8 @@ out:
27652 return error;
27653 }
27654
27655-static void find_start_end(unsigned long flags, unsigned long *begin,
27656- unsigned long *end)
27657+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27658+ unsigned long *begin, unsigned long *end)
27659 {
27660 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27661 unsigned long new_begin;
27662@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27663 *begin = new_begin;
27664 }
27665 } else {
27666- *begin = current->mm->mmap_legacy_base;
27667+ *begin = mm->mmap_legacy_base;
27668 *end = TASK_SIZE;
27669 }
27670 }
27671@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27672 struct vm_area_struct *vma;
27673 struct vm_unmapped_area_info info;
27674 unsigned long begin, end;
27675+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27676
27677 if (flags & MAP_FIXED)
27678 return addr;
27679
27680- find_start_end(flags, &begin, &end);
27681+ find_start_end(mm, flags, &begin, &end);
27682
27683 if (len > end)
27684 return -ENOMEM;
27685
27686+#ifdef CONFIG_PAX_RANDMMAP
27687+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27688+#endif
27689+
27690 if (addr) {
27691 addr = PAGE_ALIGN(addr);
27692 vma = find_vma(mm, addr);
27693- if (end - len >= addr &&
27694- (!vma || addr + len <= vma->vm_start))
27695+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27696 return addr;
27697 }
27698
27699@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27700 info.high_limit = end;
27701 info.align_mask = filp ? get_align_mask() : 0;
27702 info.align_offset = pgoff << PAGE_SHIFT;
27703+ info.threadstack_offset = offset;
27704 return vm_unmapped_area(&info);
27705 }
27706
27707@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27708 struct mm_struct *mm = current->mm;
27709 unsigned long addr = addr0;
27710 struct vm_unmapped_area_info info;
27711+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27712
27713 /* requested length too big for entire address space */
27714 if (len > TASK_SIZE)
27715@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27716 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27717 goto bottomup;
27718
27719+#ifdef CONFIG_PAX_RANDMMAP
27720+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27721+#endif
27722+
27723 /* requesting a specific address */
27724 if (addr) {
27725 addr = PAGE_ALIGN(addr);
27726 vma = find_vma(mm, addr);
27727- if (TASK_SIZE - len >= addr &&
27728- (!vma || addr + len <= vma->vm_start))
27729+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27730 return addr;
27731 }
27732
27733@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27734 info.high_limit = mm->mmap_base;
27735 info.align_mask = filp ? get_align_mask() : 0;
27736 info.align_offset = pgoff << PAGE_SHIFT;
27737+ info.threadstack_offset = offset;
27738 addr = vm_unmapped_area(&info);
27739 if (!(addr & ~PAGE_MASK))
27740 return addr;
27741diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27742index 91a4496..42fc304 100644
27743--- a/arch/x86/kernel/tboot.c
27744+++ b/arch/x86/kernel/tboot.c
27745@@ -44,6 +44,7 @@
27746 #include <asm/setup.h>
27747 #include <asm/e820.h>
27748 #include <asm/io.h>
27749+#include <asm/tlbflush.h>
27750
27751 #include "../realmode/rm/wakeup.h"
27752
27753@@ -221,7 +222,7 @@ static int tboot_setup_sleep(void)
27754
27755 void tboot_shutdown(u32 shutdown_type)
27756 {
27757- void (*shutdown)(void);
27758+ void (* __noreturn shutdown)(void);
27759
27760 if (!tboot_enabled())
27761 return;
27762@@ -242,8 +243,9 @@ void tboot_shutdown(u32 shutdown_type)
27763 tboot->shutdown_type = shutdown_type;
27764
27765 switch_to_tboot_pt();
27766+ cr4_clear_bits(X86_CR4_PCIDE);
27767
27768- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27769+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27770 shutdown();
27771
27772 /* should not reach here */
27773@@ -310,7 +312,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27774 return -ENODEV;
27775 }
27776
27777-static atomic_t ap_wfs_count;
27778+static atomic_unchecked_t ap_wfs_count;
27779
27780 static int tboot_wait_for_aps(int num_aps)
27781 {
27782@@ -334,9 +336,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27783 {
27784 switch (action) {
27785 case CPU_DYING:
27786- atomic_inc(&ap_wfs_count);
27787+ atomic_inc_unchecked(&ap_wfs_count);
27788 if (num_online_cpus() == 1)
27789- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27790+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27791 return NOTIFY_BAD;
27792 break;
27793 }
27794@@ -422,7 +424,7 @@ static __init int tboot_late_init(void)
27795
27796 tboot_create_trampoline();
27797
27798- atomic_set(&ap_wfs_count, 0);
27799+ atomic_set_unchecked(&ap_wfs_count, 0);
27800 register_hotcpu_notifier(&tboot_cpu_notifier);
27801
27802 #ifdef CONFIG_DEBUG_FS
27803diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27804index 25adc0e..1df4349 100644
27805--- a/arch/x86/kernel/time.c
27806+++ b/arch/x86/kernel/time.c
27807@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27808 {
27809 unsigned long pc = instruction_pointer(regs);
27810
27811- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27812+ if (!user_mode(regs) && in_lock_functions(pc)) {
27813 #ifdef CONFIG_FRAME_POINTER
27814- return *(unsigned long *)(regs->bp + sizeof(long));
27815+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27816 #else
27817 unsigned long *sp =
27818 (unsigned long *)kernel_stack_pointer(regs);
27819@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27820 * or above a saved flags. Eflags has bits 22-31 zero,
27821 * kernel addresses don't.
27822 */
27823+
27824+#ifdef CONFIG_PAX_KERNEXEC
27825+ return ktla_ktva(sp[0]);
27826+#else
27827 if (sp[0] >> 22)
27828 return sp[0];
27829 if (sp[1] >> 22)
27830 return sp[1];
27831 #endif
27832+
27833+#endif
27834 }
27835 return pc;
27836 }
27837diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27838index 7fc5e84..c6e445a 100644
27839--- a/arch/x86/kernel/tls.c
27840+++ b/arch/x86/kernel/tls.c
27841@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27842 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27843 return -EINVAL;
27844
27845+#ifdef CONFIG_PAX_SEGMEXEC
27846+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27847+ return -EINVAL;
27848+#endif
27849+
27850 set_tls_desc(p, idx, &info, 1);
27851
27852 return 0;
27853@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27854
27855 if (kbuf)
27856 info = kbuf;
27857- else if (__copy_from_user(infobuf, ubuf, count))
27858+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27859 return -EFAULT;
27860 else
27861 info = infobuf;
27862diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27863index 1c113db..287b42e 100644
27864--- a/arch/x86/kernel/tracepoint.c
27865+++ b/arch/x86/kernel/tracepoint.c
27866@@ -9,11 +9,11 @@
27867 #include <linux/atomic.h>
27868
27869 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27870-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27871+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27872 (unsigned long) trace_idt_table };
27873
27874 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27875-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27876+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27877
27878 static int trace_irq_vector_refcount;
27879 static DEFINE_MUTEX(irq_vector_mutex);
27880diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27881index 4ff5d16..736e3e1 100644
27882--- a/arch/x86/kernel/traps.c
27883+++ b/arch/x86/kernel/traps.c
27884@@ -68,7 +68,7 @@
27885 #include <asm/proto.h>
27886
27887 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27888-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27889+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27890 #else
27891 #include <asm/processor-flags.h>
27892 #include <asm/setup.h>
27893@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
27894 #endif
27895
27896 /* Must be page-aligned because the real IDT is used in a fixmap. */
27897-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27898+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27899
27900 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27901 EXPORT_SYMBOL_GPL(used_vectors);
27902@@ -112,7 +112,7 @@ enum ctx_state ist_enter(struct pt_regs *regs)
27903 {
27904 enum ctx_state prev_state;
27905
27906- if (user_mode_vm(regs)) {
27907+ if (user_mode(regs)) {
27908 /* Other than that, we're just an exception. */
27909 prev_state = exception_enter();
27910 } else {
27911@@ -146,7 +146,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27912 /* Must be before exception_exit. */
27913 preempt_count_sub(HARDIRQ_OFFSET);
27914
27915- if (user_mode_vm(regs))
27916+ if (user_mode(regs))
27917 return exception_exit(prev_state);
27918 else
27919 rcu_nmi_exit();
27920@@ -158,7 +158,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27921 *
27922 * IST exception handlers normally cannot schedule. As a special
27923 * exception, if the exception interrupted userspace code (i.e.
27924- * user_mode_vm(regs) would return true) and the exception was not
27925+ * user_mode(regs) would return true) and the exception was not
27926 * a double fault, it can be safe to schedule. ist_begin_non_atomic()
27927 * begins a non-atomic section within an ist_enter()/ist_exit() region.
27928 * Callers are responsible for enabling interrupts themselves inside
27929@@ -167,7 +167,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27930 */
27931 void ist_begin_non_atomic(struct pt_regs *regs)
27932 {
27933- BUG_ON(!user_mode_vm(regs));
27934+ BUG_ON(!user_mode(regs));
27935
27936 /*
27937 * Sanity check: we need to be on the normal thread stack. This
27938@@ -191,11 +191,11 @@ void ist_end_non_atomic(void)
27939 }
27940
27941 static nokprobe_inline int
27942-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27943+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27944 struct pt_regs *regs, long error_code)
27945 {
27946 #ifdef CONFIG_X86_32
27947- if (regs->flags & X86_VM_MASK) {
27948+ if (v8086_mode(regs)) {
27949 /*
27950 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27951 * On nmi (interrupt 2), do_trap should not be called.
27952@@ -208,12 +208,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27953 return -1;
27954 }
27955 #endif
27956- if (!user_mode(regs)) {
27957+ if (!user_mode_novm(regs)) {
27958 if (!fixup_exception(regs)) {
27959 tsk->thread.error_code = error_code;
27960 tsk->thread.trap_nr = trapnr;
27961+
27962+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27963+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27964+ str = "PAX: suspicious stack segment fault";
27965+#endif
27966+
27967 die(str, regs, error_code);
27968 }
27969+
27970+#ifdef CONFIG_PAX_REFCOUNT
27971+ if (trapnr == X86_TRAP_OF)
27972+ pax_report_refcount_overflow(regs);
27973+#endif
27974+
27975 return 0;
27976 }
27977
27978@@ -252,7 +264,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
27979 }
27980
27981 static void
27982-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27983+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27984 long error_code, siginfo_t *info)
27985 {
27986 struct task_struct *tsk = current;
27987@@ -276,7 +288,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27988 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27989 printk_ratelimit()) {
27990 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27991- tsk->comm, tsk->pid, str,
27992+ tsk->comm, task_pid_nr(tsk), str,
27993 regs->ip, regs->sp, error_code);
27994 print_vma_addr(" in ", regs->ip);
27995 pr_cont("\n");
27996@@ -358,6 +370,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
27997 tsk->thread.error_code = error_code;
27998 tsk->thread.trap_nr = X86_TRAP_DF;
27999
28000+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
28001+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
28002+ die("grsec: kernel stack overflow detected", regs, error_code);
28003+#endif
28004+
28005 #ifdef CONFIG_DOUBLEFAULT
28006 df_debug(regs, error_code);
28007 #endif
28008@@ -384,7 +401,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code)
28009 goto exit;
28010 conditional_sti(regs);
28011
28012- if (!user_mode_vm(regs))
28013+ if (!user_mode(regs))
28014 die("bounds", regs, error_code);
28015
28016 if (!cpu_feature_enabled(X86_FEATURE_MPX)) {
28017@@ -463,7 +480,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
28018 conditional_sti(regs);
28019
28020 #ifdef CONFIG_X86_32
28021- if (regs->flags & X86_VM_MASK) {
28022+ if (v8086_mode(regs)) {
28023 local_irq_enable();
28024 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
28025 goto exit;
28026@@ -471,18 +488,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
28027 #endif
28028
28029 tsk = current;
28030- if (!user_mode(regs)) {
28031+ if (!user_mode_novm(regs)) {
28032 if (fixup_exception(regs))
28033 goto exit;
28034
28035 tsk->thread.error_code = error_code;
28036 tsk->thread.trap_nr = X86_TRAP_GP;
28037 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28038- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28039+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28040+
28041+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28042+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28043+ die("PAX: suspicious general protection fault", regs, error_code);
28044+ else
28045+#endif
28046+
28047 die("general protection fault", regs, error_code);
28048+ }
28049 goto exit;
28050 }
28051
28052+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28053+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28054+ struct mm_struct *mm = tsk->mm;
28055+ unsigned long limit;
28056+
28057+ down_write(&mm->mmap_sem);
28058+ limit = mm->context.user_cs_limit;
28059+ if (limit < TASK_SIZE) {
28060+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28061+ up_write(&mm->mmap_sem);
28062+ return;
28063+ }
28064+ up_write(&mm->mmap_sem);
28065+ }
28066+#endif
28067+
28068 tsk->thread.error_code = error_code;
28069 tsk->thread.trap_nr = X86_TRAP_GP;
28070
28071@@ -581,13 +622,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28072 container_of(task_pt_regs(current),
28073 struct bad_iret_stack, regs);
28074
28075+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28076+ new_stack = s;
28077+
28078 /* Copy the IRET target to the new stack. */
28079 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28080
28081 /* Copy the remainder of the stack from the current stack. */
28082 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28083
28084- BUG_ON(!user_mode_vm(&new_stack->regs));
28085+ BUG_ON(!user_mode(&new_stack->regs));
28086 return new_stack;
28087 }
28088 NOKPROBE_SYMBOL(fixup_bad_iret);
28089@@ -637,7 +681,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28090 * then it's very likely the result of an icebp/int01 trap.
28091 * User wants a sigtrap for that.
28092 */
28093- if (!dr6 && user_mode_vm(regs))
28094+ if (!dr6 && user_mode(regs))
28095 user_icebp = 1;
28096
28097 /* Catch kmemcheck conditions first of all! */
28098@@ -673,7 +717,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28099 /* It's safe to allow irq's after DR6 has been saved */
28100 preempt_conditional_sti(regs);
28101
28102- if (regs->flags & X86_VM_MASK) {
28103+ if (v8086_mode(regs)) {
28104 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28105 X86_TRAP_DB);
28106 preempt_conditional_cli(regs);
28107@@ -688,7 +732,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28108 * We already checked v86 mode above, so we can check for kernel mode
28109 * by just checking the CPL of CS.
28110 */
28111- if ((dr6 & DR_STEP) && !user_mode(regs)) {
28112+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28113 tsk->thread.debugreg6 &= ~DR_STEP;
28114 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28115 regs->flags &= ~X86_EFLAGS_TF;
28116@@ -721,7 +765,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28117 return;
28118 conditional_sti(regs);
28119
28120- if (!user_mode_vm(regs))
28121+ if (!user_mode(regs))
28122 {
28123 if (!fixup_exception(regs)) {
28124 task->thread.error_code = error_code;
28125diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28126index 5054497..139f8f8 100644
28127--- a/arch/x86/kernel/tsc.c
28128+++ b/arch/x86/kernel/tsc.c
28129@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28130 */
28131 smp_wmb();
28132
28133- ACCESS_ONCE(c2n->head) = data;
28134+ ACCESS_ONCE_RW(c2n->head) = data;
28135 }
28136
28137 /*
28138diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28139index 81f8adb0..fff670e 100644
28140--- a/arch/x86/kernel/uprobes.c
28141+++ b/arch/x86/kernel/uprobes.c
28142@@ -912,7 +912,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28143 int ret = NOTIFY_DONE;
28144
28145 /* We are only interested in userspace traps */
28146- if (regs && !user_mode_vm(regs))
28147+ if (regs && !user_mode(regs))
28148 return NOTIFY_DONE;
28149
28150 switch (val) {
28151@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28152
28153 if (nleft != rasize) {
28154 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28155- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28156+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28157
28158 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28159 }
28160diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28161index b9242ba..50c5edd 100644
28162--- a/arch/x86/kernel/verify_cpu.S
28163+++ b/arch/x86/kernel/verify_cpu.S
28164@@ -20,6 +20,7 @@
28165 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28166 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28167 * arch/x86/kernel/head_32.S: processor startup
28168+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28169 *
28170 * verify_cpu, returns the status of longmode and SSE in register %eax.
28171 * 0: Success 1: Failure
28172diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28173index e8edcf5..27f9344 100644
28174--- a/arch/x86/kernel/vm86_32.c
28175+++ b/arch/x86/kernel/vm86_32.c
28176@@ -44,6 +44,7 @@
28177 #include <linux/ptrace.h>
28178 #include <linux/audit.h>
28179 #include <linux/stddef.h>
28180+#include <linux/grsecurity.h>
28181
28182 #include <asm/uaccess.h>
28183 #include <asm/io.h>
28184@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28185 do_exit(SIGSEGV);
28186 }
28187
28188- tss = &per_cpu(init_tss, get_cpu());
28189+ tss = init_tss + get_cpu();
28190 current->thread.sp0 = current->thread.saved_sp0;
28191 current->thread.sysenter_cs = __KERNEL_CS;
28192 load_sp0(tss, &current->thread);
28193@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28194
28195 if (tsk->thread.saved_sp0)
28196 return -EPERM;
28197+
28198+#ifdef CONFIG_GRKERNSEC_VM86
28199+ if (!capable(CAP_SYS_RAWIO)) {
28200+ gr_handle_vm86();
28201+ return -EPERM;
28202+ }
28203+#endif
28204+
28205 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28206 offsetof(struct kernel_vm86_struct, vm86plus) -
28207 sizeof(info.regs));
28208@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28209 int tmp;
28210 struct vm86plus_struct __user *v86;
28211
28212+#ifdef CONFIG_GRKERNSEC_VM86
28213+ if (!capable(CAP_SYS_RAWIO)) {
28214+ gr_handle_vm86();
28215+ return -EPERM;
28216+ }
28217+#endif
28218+
28219 tsk = current;
28220 switch (cmd) {
28221 case VM86_REQUEST_IRQ:
28222@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28223 tsk->thread.saved_fs = info->regs32->fs;
28224 tsk->thread.saved_gs = get_user_gs(info->regs32);
28225
28226- tss = &per_cpu(init_tss, get_cpu());
28227+ tss = init_tss + get_cpu();
28228 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28229 if (cpu_has_sep)
28230 tsk->thread.sysenter_cs = 0;
28231@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28232 goto cannot_handle;
28233 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28234 goto cannot_handle;
28235- intr_ptr = (unsigned long __user *) (i << 2);
28236+ intr_ptr = (__force unsigned long __user *) (i << 2);
28237 if (get_user(segoffs, intr_ptr))
28238 goto cannot_handle;
28239 if ((segoffs >> 16) == BIOSSEG)
28240diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28241index 00bf300..129df8e 100644
28242--- a/arch/x86/kernel/vmlinux.lds.S
28243+++ b/arch/x86/kernel/vmlinux.lds.S
28244@@ -26,6 +26,13 @@
28245 #include <asm/page_types.h>
28246 #include <asm/cache.h>
28247 #include <asm/boot.h>
28248+#include <asm/segment.h>
28249+
28250+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28251+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28252+#else
28253+#define __KERNEL_TEXT_OFFSET 0
28254+#endif
28255
28256 #undef i386 /* in case the preprocessor is a 32bit one */
28257
28258@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28259
28260 PHDRS {
28261 text PT_LOAD FLAGS(5); /* R_E */
28262+#ifdef CONFIG_X86_32
28263+ module PT_LOAD FLAGS(5); /* R_E */
28264+#endif
28265+#ifdef CONFIG_XEN
28266+ rodata PT_LOAD FLAGS(5); /* R_E */
28267+#else
28268+ rodata PT_LOAD FLAGS(4); /* R__ */
28269+#endif
28270 data PT_LOAD FLAGS(6); /* RW_ */
28271-#ifdef CONFIG_X86_64
28272+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28273 #ifdef CONFIG_SMP
28274 percpu PT_LOAD FLAGS(6); /* RW_ */
28275 #endif
28276+ text.init PT_LOAD FLAGS(5); /* R_E */
28277+ text.exit PT_LOAD FLAGS(5); /* R_E */
28278 init PT_LOAD FLAGS(7); /* RWE */
28279-#endif
28280 note PT_NOTE FLAGS(0); /* ___ */
28281 }
28282
28283 SECTIONS
28284 {
28285 #ifdef CONFIG_X86_32
28286- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28287- phys_startup_32 = startup_32 - LOAD_OFFSET;
28288+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28289 #else
28290- . = __START_KERNEL;
28291- phys_startup_64 = startup_64 - LOAD_OFFSET;
28292+ . = __START_KERNEL;
28293 #endif
28294
28295 /* Text and read-only data */
28296- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28297- _text = .;
28298+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28299 /* bootstrapping code */
28300+#ifdef CONFIG_X86_32
28301+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28302+#else
28303+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28304+#endif
28305+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28306+ _text = .;
28307 HEAD_TEXT
28308 . = ALIGN(8);
28309 _stext = .;
28310@@ -104,13 +124,47 @@ SECTIONS
28311 IRQENTRY_TEXT
28312 *(.fixup)
28313 *(.gnu.warning)
28314- /* End of text section */
28315- _etext = .;
28316 } :text = 0x9090
28317
28318- NOTES :text :note
28319+ . += __KERNEL_TEXT_OFFSET;
28320
28321- EXCEPTION_TABLE(16) :text = 0x9090
28322+#ifdef CONFIG_X86_32
28323+ . = ALIGN(PAGE_SIZE);
28324+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28325+
28326+#ifdef CONFIG_PAX_KERNEXEC
28327+ MODULES_EXEC_VADDR = .;
28328+ BYTE(0)
28329+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28330+ . = ALIGN(HPAGE_SIZE) - 1;
28331+ MODULES_EXEC_END = .;
28332+#endif
28333+
28334+ } :module
28335+#endif
28336+
28337+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28338+ /* End of text section */
28339+ BYTE(0)
28340+ _etext = . - __KERNEL_TEXT_OFFSET;
28341+ }
28342+
28343+#ifdef CONFIG_X86_32
28344+ . = ALIGN(PAGE_SIZE);
28345+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28346+ . = ALIGN(PAGE_SIZE);
28347+ *(.empty_zero_page)
28348+ *(.initial_pg_fixmap)
28349+ *(.initial_pg_pmd)
28350+ *(.initial_page_table)
28351+ *(.swapper_pg_dir)
28352+ } :rodata
28353+#endif
28354+
28355+ . = ALIGN(PAGE_SIZE);
28356+ NOTES :rodata :note
28357+
28358+ EXCEPTION_TABLE(16) :rodata
28359
28360 #if defined(CONFIG_DEBUG_RODATA)
28361 /* .text should occupy whole number of pages */
28362@@ -122,16 +176,20 @@ SECTIONS
28363
28364 /* Data */
28365 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28366+
28367+#ifdef CONFIG_PAX_KERNEXEC
28368+ . = ALIGN(HPAGE_SIZE);
28369+#else
28370+ . = ALIGN(PAGE_SIZE);
28371+#endif
28372+
28373 /* Start of data section */
28374 _sdata = .;
28375
28376 /* init_task */
28377 INIT_TASK_DATA(THREAD_SIZE)
28378
28379-#ifdef CONFIG_X86_32
28380- /* 32 bit has nosave before _edata */
28381 NOSAVE_DATA
28382-#endif
28383
28384 PAGE_ALIGNED_DATA(PAGE_SIZE)
28385
28386@@ -174,12 +232,19 @@ SECTIONS
28387 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28388
28389 /* Init code and data - will be freed after init */
28390- . = ALIGN(PAGE_SIZE);
28391 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28392+ BYTE(0)
28393+
28394+#ifdef CONFIG_PAX_KERNEXEC
28395+ . = ALIGN(HPAGE_SIZE);
28396+#else
28397+ . = ALIGN(PAGE_SIZE);
28398+#endif
28399+
28400 __init_begin = .; /* paired with __init_end */
28401- }
28402+ } :init.begin
28403
28404-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28405+#ifdef CONFIG_SMP
28406 /*
28407 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28408 * output PHDR, so the next output section - .init.text - should
28409@@ -190,12 +255,27 @@ SECTIONS
28410 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28411 #endif
28412
28413- INIT_TEXT_SECTION(PAGE_SIZE)
28414-#ifdef CONFIG_X86_64
28415- :init
28416-#endif
28417+ . = ALIGN(PAGE_SIZE);
28418+ init_begin = .;
28419+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28420+ VMLINUX_SYMBOL(_sinittext) = .;
28421+ INIT_TEXT
28422+ . = ALIGN(PAGE_SIZE);
28423+ } :text.init
28424
28425- INIT_DATA_SECTION(16)
28426+ /*
28427+ * .exit.text is discard at runtime, not link time, to deal with
28428+ * references from .altinstructions and .eh_frame
28429+ */
28430+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28431+ EXIT_TEXT
28432+ VMLINUX_SYMBOL(_einittext) = .;
28433+ . = ALIGN(16);
28434+ } :text.exit
28435+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28436+
28437+ . = ALIGN(PAGE_SIZE);
28438+ INIT_DATA_SECTION(16) :init
28439
28440 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28441 __x86_cpu_dev_start = .;
28442@@ -266,19 +346,12 @@ SECTIONS
28443 }
28444
28445 . = ALIGN(8);
28446- /*
28447- * .exit.text is discard at runtime, not link time, to deal with
28448- * references from .altinstructions and .eh_frame
28449- */
28450- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28451- EXIT_TEXT
28452- }
28453
28454 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28455 EXIT_DATA
28456 }
28457
28458-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28459+#ifndef CONFIG_SMP
28460 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28461 #endif
28462
28463@@ -297,16 +370,10 @@ SECTIONS
28464 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28465 __smp_locks = .;
28466 *(.smp_locks)
28467- . = ALIGN(PAGE_SIZE);
28468 __smp_locks_end = .;
28469+ . = ALIGN(PAGE_SIZE);
28470 }
28471
28472-#ifdef CONFIG_X86_64
28473- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28474- NOSAVE_DATA
28475- }
28476-#endif
28477-
28478 /* BSS */
28479 . = ALIGN(PAGE_SIZE);
28480 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28481@@ -322,6 +389,7 @@ SECTIONS
28482 __brk_base = .;
28483 . += 64 * 1024; /* 64k alignment slop space */
28484 *(.brk_reservation) /* areas brk users have reserved */
28485+ . = ALIGN(HPAGE_SIZE);
28486 __brk_limit = .;
28487 }
28488
28489@@ -348,13 +416,12 @@ SECTIONS
28490 * for the boot processor.
28491 */
28492 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28493-INIT_PER_CPU(gdt_page);
28494 INIT_PER_CPU(irq_stack_union);
28495
28496 /*
28497 * Build-time check on the image size:
28498 */
28499-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28500+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28501 "kernel image bigger than KERNEL_IMAGE_SIZE");
28502
28503 #ifdef CONFIG_SMP
28504diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28505index 2dcc6ff..082dc7a 100644
28506--- a/arch/x86/kernel/vsyscall_64.c
28507+++ b/arch/x86/kernel/vsyscall_64.c
28508@@ -38,15 +38,13 @@
28509 #define CREATE_TRACE_POINTS
28510 #include "vsyscall_trace.h"
28511
28512-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28513+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28514
28515 static int __init vsyscall_setup(char *str)
28516 {
28517 if (str) {
28518 if (!strcmp("emulate", str))
28519 vsyscall_mode = EMULATE;
28520- else if (!strcmp("native", str))
28521- vsyscall_mode = NATIVE;
28522 else if (!strcmp("none", str))
28523 vsyscall_mode = NONE;
28524 else
28525@@ -264,8 +262,7 @@ do_ret:
28526 return true;
28527
28528 sigsegv:
28529- force_sig(SIGSEGV, current);
28530- return true;
28531+ do_group_exit(SIGKILL);
28532 }
28533
28534 /*
28535@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28536 static struct vm_area_struct gate_vma = {
28537 .vm_start = VSYSCALL_ADDR,
28538 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28539- .vm_page_prot = PAGE_READONLY_EXEC,
28540- .vm_flags = VM_READ | VM_EXEC,
28541+ .vm_page_prot = PAGE_READONLY,
28542+ .vm_flags = VM_READ,
28543 .vm_ops = &gate_vma_ops,
28544 };
28545
28546@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28547 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28548
28549 if (vsyscall_mode != NONE)
28550- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28551- vsyscall_mode == NATIVE
28552- ? PAGE_KERNEL_VSYSCALL
28553- : PAGE_KERNEL_VVAR);
28554+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28555
28556 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28557 (unsigned long)VSYSCALL_ADDR);
28558diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28559index 37d8fa4..66e319a 100644
28560--- a/arch/x86/kernel/x8664_ksyms_64.c
28561+++ b/arch/x86/kernel/x8664_ksyms_64.c
28562@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28563 EXPORT_SYMBOL(copy_user_generic_unrolled);
28564 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28565 EXPORT_SYMBOL(__copy_user_nocache);
28566-EXPORT_SYMBOL(_copy_from_user);
28567-EXPORT_SYMBOL(_copy_to_user);
28568
28569 EXPORT_SYMBOL(copy_page);
28570 EXPORT_SYMBOL(clear_page);
28571@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28572 EXPORT_SYMBOL(___preempt_schedule_context);
28573 #endif
28574 #endif
28575+
28576+#ifdef CONFIG_PAX_PER_CPU_PGD
28577+EXPORT_SYMBOL(cpu_pgd);
28578+#endif
28579diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28580index 234b072..b7ab191 100644
28581--- a/arch/x86/kernel/x86_init.c
28582+++ b/arch/x86/kernel/x86_init.c
28583@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28584 static void default_nmi_init(void) { };
28585 static int default_i8042_detect(void) { return 1; };
28586
28587-struct x86_platform_ops x86_platform = {
28588+struct x86_platform_ops x86_platform __read_only = {
28589 .calibrate_tsc = native_calibrate_tsc,
28590 .get_wallclock = mach_get_cmos_time,
28591 .set_wallclock = mach_set_rtc_mmss,
28592@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28593 EXPORT_SYMBOL_GPL(x86_platform);
28594
28595 #if defined(CONFIG_PCI_MSI)
28596-struct x86_msi_ops x86_msi = {
28597+struct x86_msi_ops x86_msi __read_only = {
28598 .setup_msi_irqs = native_setup_msi_irqs,
28599 .compose_msi_msg = native_compose_msi_msg,
28600 .teardown_msi_irq = native_teardown_msi_irq,
28601@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28602 }
28603 #endif
28604
28605-struct x86_io_apic_ops x86_io_apic_ops = {
28606+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28607 .init = native_io_apic_init_mappings,
28608 .read = native_io_apic_read,
28609 .write = native_io_apic_write,
28610diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28611index cdc6cf9..e04f495 100644
28612--- a/arch/x86/kernel/xsave.c
28613+++ b/arch/x86/kernel/xsave.c
28614@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28615
28616 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28617 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28618- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28619+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28620
28621 if (!use_xsave())
28622 return err;
28623
28624- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28625+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28626
28627 /*
28628 * Read the xstate_bv which we copied (directly from the cpu or
28629 * from the state in task struct) to the user buffers.
28630 */
28631- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28632+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28633
28634 /*
28635 * For legacy compatible, we always set FP/SSE bits in the bit
28636@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28637 */
28638 xstate_bv |= XSTATE_FPSSE;
28639
28640- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28641+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28642
28643 return err;
28644 }
28645@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28646 {
28647 int err;
28648
28649+ buf = (struct xsave_struct __user *)____m(buf);
28650 if (use_xsave())
28651 err = xsave_user(buf);
28652 else if (use_fxsr())
28653@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28654 */
28655 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28656 {
28657+ buf = (void __user *)____m(buf);
28658 if (use_xsave()) {
28659 if ((unsigned long)buf % 64 || fx_only) {
28660 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28661diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28662index 307f9ec..0d8aa91 100644
28663--- a/arch/x86/kvm/cpuid.c
28664+++ b/arch/x86/kvm/cpuid.c
28665@@ -186,15 +186,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28666 struct kvm_cpuid2 *cpuid,
28667 struct kvm_cpuid_entry2 __user *entries)
28668 {
28669- int r;
28670+ int r, i;
28671
28672 r = -E2BIG;
28673 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28674 goto out;
28675 r = -EFAULT;
28676- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28677- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28678+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28679 goto out;
28680+ for (i = 0; i < cpuid->nent; ++i) {
28681+ struct kvm_cpuid_entry2 cpuid_entry;
28682+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28683+ goto out;
28684+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28685+ }
28686 vcpu->arch.cpuid_nent = cpuid->nent;
28687 kvm_apic_set_version(vcpu);
28688 kvm_x86_ops->cpuid_update(vcpu);
28689@@ -207,15 +212,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28690 struct kvm_cpuid2 *cpuid,
28691 struct kvm_cpuid_entry2 __user *entries)
28692 {
28693- int r;
28694+ int r, i;
28695
28696 r = -E2BIG;
28697 if (cpuid->nent < vcpu->arch.cpuid_nent)
28698 goto out;
28699 r = -EFAULT;
28700- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28701- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28702+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28703 goto out;
28704+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28705+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28706+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28707+ goto out;
28708+ }
28709 return 0;
28710
28711 out:
28712diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28713index 106c015..2db7161 100644
28714--- a/arch/x86/kvm/emulate.c
28715+++ b/arch/x86/kvm/emulate.c
28716@@ -3572,7 +3572,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28717 int cr = ctxt->modrm_reg;
28718 u64 efer = 0;
28719
28720- static u64 cr_reserved_bits[] = {
28721+ static const u64 cr_reserved_bits[] = {
28722 0xffffffff00000000ULL,
28723 0, 0, 0, /* CR3 checked later */
28724 CR4_RESERVED_BITS,
28725diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28726index 4ee827d..a14eff9 100644
28727--- a/arch/x86/kvm/lapic.c
28728+++ b/arch/x86/kvm/lapic.c
28729@@ -56,7 +56,7 @@
28730 #define APIC_BUS_CYCLE_NS 1
28731
28732 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28733-#define apic_debug(fmt, arg...)
28734+#define apic_debug(fmt, arg...) do {} while (0)
28735
28736 #define APIC_LVT_NUM 6
28737 /* 14 is the version for Xeon and Pentium 8.4.8*/
28738diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28739index 6e6d115..43fecbf 100644
28740--- a/arch/x86/kvm/paging_tmpl.h
28741+++ b/arch/x86/kvm/paging_tmpl.h
28742@@ -343,7 +343,7 @@ retry_walk:
28743 if (unlikely(kvm_is_error_hva(host_addr)))
28744 goto error;
28745
28746- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28747+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28748 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28749 goto error;
28750 walker->ptep_user[walker->level - 1] = ptep_user;
28751diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28752index a4e62fc..fbbad55 100644
28753--- a/arch/x86/kvm/svm.c
28754+++ b/arch/x86/kvm/svm.c
28755@@ -3568,7 +3568,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28756 int cpu = raw_smp_processor_id();
28757
28758 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28759+
28760+ pax_open_kernel();
28761 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28762+ pax_close_kernel();
28763+
28764 load_TR_desc();
28765 }
28766
28767@@ -3964,6 +3968,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28768 #endif
28769 #endif
28770
28771+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28772+ __set_fs(current_thread_info()->addr_limit);
28773+#endif
28774+
28775 reload_tss(vcpu);
28776
28777 local_irq_disable();
28778diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28779index 5318d64..ff5f7aa 100644
28780--- a/arch/x86/kvm/vmx.c
28781+++ b/arch/x86/kvm/vmx.c
28782@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28783 #endif
28784 }
28785
28786-static void vmcs_clear_bits(unsigned long field, u32 mask)
28787+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28788 {
28789 vmcs_writel(field, vmcs_readl(field) & ~mask);
28790 }
28791
28792-static void vmcs_set_bits(unsigned long field, u32 mask)
28793+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28794 {
28795 vmcs_writel(field, vmcs_readl(field) | mask);
28796 }
28797@@ -1705,7 +1705,11 @@ static void reload_tss(void)
28798 struct desc_struct *descs;
28799
28800 descs = (void *)gdt->address;
28801+
28802+ pax_open_kernel();
28803 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28804+ pax_close_kernel();
28805+
28806 load_TR_desc();
28807 }
28808
28809@@ -1941,6 +1945,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28810 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28811 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28812
28813+#ifdef CONFIG_PAX_PER_CPU_PGD
28814+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28815+#endif
28816+
28817 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28818 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28819 vmx->loaded_vmcs->cpu = cpu;
28820@@ -2233,7 +2241,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28821 * reads and returns guest's timestamp counter "register"
28822 * guest_tsc = host_tsc + tsc_offset -- 21.3
28823 */
28824-static u64 guest_read_tsc(void)
28825+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28826 {
28827 u64 host_tsc, tsc_offset;
28828
28829@@ -4466,7 +4474,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28830 unsigned long cr4;
28831
28832 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28833+
28834+#ifndef CONFIG_PAX_PER_CPU_PGD
28835 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28836+#endif
28837
28838 /* Save the most likely value for this task's CR4 in the VMCS. */
28839 cr4 = cr4_read_shadow();
28840@@ -4493,7 +4504,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28841 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28842 vmx->host_idt_base = dt.address;
28843
28844- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28845+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28846
28847 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28848 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28849@@ -6104,11 +6115,17 @@ static __init int hardware_setup(void)
28850 * page upon invalidation. No need to do anything if not
28851 * using the APIC_ACCESS_ADDR VMCS field.
28852 */
28853- if (!flexpriority_enabled)
28854- kvm_x86_ops->set_apic_access_page_addr = NULL;
28855+ if (!flexpriority_enabled) {
28856+ pax_open_kernel();
28857+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28858+ pax_close_kernel();
28859+ }
28860
28861- if (!cpu_has_vmx_tpr_shadow())
28862- kvm_x86_ops->update_cr8_intercept = NULL;
28863+ if (!cpu_has_vmx_tpr_shadow()) {
28864+ pax_open_kernel();
28865+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28866+ pax_close_kernel();
28867+ }
28868
28869 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28870 kvm_disable_largepages();
28871@@ -6119,14 +6136,16 @@ static __init int hardware_setup(void)
28872 if (!cpu_has_vmx_apicv())
28873 enable_apicv = 0;
28874
28875+ pax_open_kernel();
28876 if (enable_apicv)
28877- kvm_x86_ops->update_cr8_intercept = NULL;
28878+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28879 else {
28880- kvm_x86_ops->hwapic_irr_update = NULL;
28881- kvm_x86_ops->hwapic_isr_update = NULL;
28882- kvm_x86_ops->deliver_posted_interrupt = NULL;
28883- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28884+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28885+ *(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
28886+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28887+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28888 }
28889+ pax_close_kernel();
28890
28891 vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
28892 vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
28893@@ -6179,10 +6198,12 @@ static __init int hardware_setup(void)
28894 enable_pml = 0;
28895
28896 if (!enable_pml) {
28897- kvm_x86_ops->slot_enable_log_dirty = NULL;
28898- kvm_x86_ops->slot_disable_log_dirty = NULL;
28899- kvm_x86_ops->flush_log_dirty = NULL;
28900- kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28901+ pax_open_kernel();
28902+ *(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
28903+ *(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
28904+ *(void **)&kvm_x86_ops->flush_log_dirty = NULL;
28905+ *(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28906+ pax_close_kernel();
28907 }
28908
28909 return alloc_kvm_area();
28910@@ -8227,6 +8248,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28911 "jmp 2f \n\t"
28912 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28913 "2: "
28914+
28915+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28916+ "ljmp %[cs],$3f\n\t"
28917+ "3: "
28918+#endif
28919+
28920 /* Save guest registers, load host registers, keep flags */
28921 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28922 "pop %0 \n\t"
28923@@ -8279,6 +8306,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28924 #endif
28925 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28926 [wordsize]"i"(sizeof(ulong))
28927+
28928+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28929+ ,[cs]"i"(__KERNEL_CS)
28930+#endif
28931+
28932 : "cc", "memory"
28933 #ifdef CONFIG_X86_64
28934 , "rax", "rbx", "rdi", "rsi"
28935@@ -8292,7 +8324,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28936 if (debugctlmsr)
28937 update_debugctlmsr(debugctlmsr);
28938
28939-#ifndef CONFIG_X86_64
28940+#ifdef CONFIG_X86_32
28941 /*
28942 * The sysexit path does not restore ds/es, so we must set them to
28943 * a reasonable value ourselves.
28944@@ -8301,8 +8333,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28945 * may be executed in interrupt context, which saves and restore segments
28946 * around it, nullifying its effect.
28947 */
28948- loadsegment(ds, __USER_DS);
28949- loadsegment(es, __USER_DS);
28950+ loadsegment(ds, __KERNEL_DS);
28951+ loadsegment(es, __KERNEL_DS);
28952+ loadsegment(ss, __KERNEL_DS);
28953+
28954+#ifdef CONFIG_PAX_KERNEXEC
28955+ loadsegment(fs, __KERNEL_PERCPU);
28956+#endif
28957+
28958+#ifdef CONFIG_PAX_MEMORY_UDEREF
28959+ __set_fs(current_thread_info()->addr_limit);
28960+#endif
28961+
28962 #endif
28963
28964 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28965diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28966index 8838057..8f42ce3 100644
28967--- a/arch/x86/kvm/x86.c
28968+++ b/arch/x86/kvm/x86.c
28969@@ -1895,8 +1895,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28970 {
28971 struct kvm *kvm = vcpu->kvm;
28972 int lm = is_long_mode(vcpu);
28973- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28974- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28975+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28976+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28977 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28978 : kvm->arch.xen_hvm_config.blob_size_32;
28979 u32 page_num = data & ~PAGE_MASK;
28980@@ -2833,6 +2833,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28981 if (n < msr_list.nmsrs)
28982 goto out;
28983 r = -EFAULT;
28984+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28985+ goto out;
28986 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28987 num_msrs_to_save * sizeof(u32)))
28988 goto out;
28989@@ -5737,7 +5739,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28990 };
28991 #endif
28992
28993-int kvm_arch_init(void *opaque)
28994+int kvm_arch_init(const void *opaque)
28995 {
28996 int r;
28997 struct kvm_x86_ops *ops = opaque;
28998diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28999index ac4453d..1f43bf3 100644
29000--- a/arch/x86/lguest/boot.c
29001+++ b/arch/x86/lguest/boot.c
29002@@ -1340,9 +1340,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
29003 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
29004 * Launcher to reboot us.
29005 */
29006-static void lguest_restart(char *reason)
29007+static __noreturn void lguest_restart(char *reason)
29008 {
29009 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
29010+ BUG();
29011 }
29012
29013 /*G:050
29014diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
29015index 00933d5..3a64af9 100644
29016--- a/arch/x86/lib/atomic64_386_32.S
29017+++ b/arch/x86/lib/atomic64_386_32.S
29018@@ -48,6 +48,10 @@ BEGIN(read)
29019 movl (v), %eax
29020 movl 4(v), %edx
29021 RET_ENDP
29022+BEGIN(read_unchecked)
29023+ movl (v), %eax
29024+ movl 4(v), %edx
29025+RET_ENDP
29026 #undef v
29027
29028 #define v %esi
29029@@ -55,6 +59,10 @@ BEGIN(set)
29030 movl %ebx, (v)
29031 movl %ecx, 4(v)
29032 RET_ENDP
29033+BEGIN(set_unchecked)
29034+ movl %ebx, (v)
29035+ movl %ecx, 4(v)
29036+RET_ENDP
29037 #undef v
29038
29039 #define v %esi
29040@@ -70,6 +78,20 @@ RET_ENDP
29041 BEGIN(add)
29042 addl %eax, (v)
29043 adcl %edx, 4(v)
29044+
29045+#ifdef CONFIG_PAX_REFCOUNT
29046+ jno 0f
29047+ subl %eax, (v)
29048+ sbbl %edx, 4(v)
29049+ int $4
29050+0:
29051+ _ASM_EXTABLE(0b, 0b)
29052+#endif
29053+
29054+RET_ENDP
29055+BEGIN(add_unchecked)
29056+ addl %eax, (v)
29057+ adcl %edx, 4(v)
29058 RET_ENDP
29059 #undef v
29060
29061@@ -77,6 +99,24 @@ RET_ENDP
29062 BEGIN(add_return)
29063 addl (v), %eax
29064 adcl 4(v), %edx
29065+
29066+#ifdef CONFIG_PAX_REFCOUNT
29067+ into
29068+1234:
29069+ _ASM_EXTABLE(1234b, 2f)
29070+#endif
29071+
29072+ movl %eax, (v)
29073+ movl %edx, 4(v)
29074+
29075+#ifdef CONFIG_PAX_REFCOUNT
29076+2:
29077+#endif
29078+
29079+RET_ENDP
29080+BEGIN(add_return_unchecked)
29081+ addl (v), %eax
29082+ adcl 4(v), %edx
29083 movl %eax, (v)
29084 movl %edx, 4(v)
29085 RET_ENDP
29086@@ -86,6 +126,20 @@ RET_ENDP
29087 BEGIN(sub)
29088 subl %eax, (v)
29089 sbbl %edx, 4(v)
29090+
29091+#ifdef CONFIG_PAX_REFCOUNT
29092+ jno 0f
29093+ addl %eax, (v)
29094+ adcl %edx, 4(v)
29095+ int $4
29096+0:
29097+ _ASM_EXTABLE(0b, 0b)
29098+#endif
29099+
29100+RET_ENDP
29101+BEGIN(sub_unchecked)
29102+ subl %eax, (v)
29103+ sbbl %edx, 4(v)
29104 RET_ENDP
29105 #undef v
29106
29107@@ -96,6 +150,27 @@ BEGIN(sub_return)
29108 sbbl $0, %edx
29109 addl (v), %eax
29110 adcl 4(v), %edx
29111+
29112+#ifdef CONFIG_PAX_REFCOUNT
29113+ into
29114+1234:
29115+ _ASM_EXTABLE(1234b, 2f)
29116+#endif
29117+
29118+ movl %eax, (v)
29119+ movl %edx, 4(v)
29120+
29121+#ifdef CONFIG_PAX_REFCOUNT
29122+2:
29123+#endif
29124+
29125+RET_ENDP
29126+BEGIN(sub_return_unchecked)
29127+ negl %edx
29128+ negl %eax
29129+ sbbl $0, %edx
29130+ addl (v), %eax
29131+ adcl 4(v), %edx
29132 movl %eax, (v)
29133 movl %edx, 4(v)
29134 RET_ENDP
29135@@ -105,6 +180,20 @@ RET_ENDP
29136 BEGIN(inc)
29137 addl $1, (v)
29138 adcl $0, 4(v)
29139+
29140+#ifdef CONFIG_PAX_REFCOUNT
29141+ jno 0f
29142+ subl $1, (v)
29143+ sbbl $0, 4(v)
29144+ int $4
29145+0:
29146+ _ASM_EXTABLE(0b, 0b)
29147+#endif
29148+
29149+RET_ENDP
29150+BEGIN(inc_unchecked)
29151+ addl $1, (v)
29152+ adcl $0, 4(v)
29153 RET_ENDP
29154 #undef v
29155
29156@@ -114,6 +203,26 @@ BEGIN(inc_return)
29157 movl 4(v), %edx
29158 addl $1, %eax
29159 adcl $0, %edx
29160+
29161+#ifdef CONFIG_PAX_REFCOUNT
29162+ into
29163+1234:
29164+ _ASM_EXTABLE(1234b, 2f)
29165+#endif
29166+
29167+ movl %eax, (v)
29168+ movl %edx, 4(v)
29169+
29170+#ifdef CONFIG_PAX_REFCOUNT
29171+2:
29172+#endif
29173+
29174+RET_ENDP
29175+BEGIN(inc_return_unchecked)
29176+ movl (v), %eax
29177+ movl 4(v), %edx
29178+ addl $1, %eax
29179+ adcl $0, %edx
29180 movl %eax, (v)
29181 movl %edx, 4(v)
29182 RET_ENDP
29183@@ -123,6 +232,20 @@ RET_ENDP
29184 BEGIN(dec)
29185 subl $1, (v)
29186 sbbl $0, 4(v)
29187+
29188+#ifdef CONFIG_PAX_REFCOUNT
29189+ jno 0f
29190+ addl $1, (v)
29191+ adcl $0, 4(v)
29192+ int $4
29193+0:
29194+ _ASM_EXTABLE(0b, 0b)
29195+#endif
29196+
29197+RET_ENDP
29198+BEGIN(dec_unchecked)
29199+ subl $1, (v)
29200+ sbbl $0, 4(v)
29201 RET_ENDP
29202 #undef v
29203
29204@@ -132,6 +255,26 @@ BEGIN(dec_return)
29205 movl 4(v), %edx
29206 subl $1, %eax
29207 sbbl $0, %edx
29208+
29209+#ifdef CONFIG_PAX_REFCOUNT
29210+ into
29211+1234:
29212+ _ASM_EXTABLE(1234b, 2f)
29213+#endif
29214+
29215+ movl %eax, (v)
29216+ movl %edx, 4(v)
29217+
29218+#ifdef CONFIG_PAX_REFCOUNT
29219+2:
29220+#endif
29221+
29222+RET_ENDP
29223+BEGIN(dec_return_unchecked)
29224+ movl (v), %eax
29225+ movl 4(v), %edx
29226+ subl $1, %eax
29227+ sbbl $0, %edx
29228 movl %eax, (v)
29229 movl %edx, 4(v)
29230 RET_ENDP
29231@@ -143,6 +286,13 @@ BEGIN(add_unless)
29232 adcl %edx, %edi
29233 addl (v), %eax
29234 adcl 4(v), %edx
29235+
29236+#ifdef CONFIG_PAX_REFCOUNT
29237+ into
29238+1234:
29239+ _ASM_EXTABLE(1234b, 2f)
29240+#endif
29241+
29242 cmpl %eax, %ecx
29243 je 3f
29244 1:
29245@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29246 1:
29247 addl $1, %eax
29248 adcl $0, %edx
29249+
29250+#ifdef CONFIG_PAX_REFCOUNT
29251+ into
29252+1234:
29253+ _ASM_EXTABLE(1234b, 2f)
29254+#endif
29255+
29256 movl %eax, (v)
29257 movl %edx, 4(v)
29258 movl $1, %eax
29259@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29260 movl 4(v), %edx
29261 subl $1, %eax
29262 sbbl $0, %edx
29263+
29264+#ifdef CONFIG_PAX_REFCOUNT
29265+ into
29266+1234:
29267+ _ASM_EXTABLE(1234b, 1f)
29268+#endif
29269+
29270 js 1f
29271 movl %eax, (v)
29272 movl %edx, 4(v)
29273diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29274index f5cc9eb..51fa319 100644
29275--- a/arch/x86/lib/atomic64_cx8_32.S
29276+++ b/arch/x86/lib/atomic64_cx8_32.S
29277@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29278 CFI_STARTPROC
29279
29280 read64 %ecx
29281+ pax_force_retaddr
29282 ret
29283 CFI_ENDPROC
29284 ENDPROC(atomic64_read_cx8)
29285
29286+ENTRY(atomic64_read_unchecked_cx8)
29287+ CFI_STARTPROC
29288+
29289+ read64 %ecx
29290+ pax_force_retaddr
29291+ ret
29292+ CFI_ENDPROC
29293+ENDPROC(atomic64_read_unchecked_cx8)
29294+
29295 ENTRY(atomic64_set_cx8)
29296 CFI_STARTPROC
29297
29298@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29299 cmpxchg8b (%esi)
29300 jne 1b
29301
29302+ pax_force_retaddr
29303 ret
29304 CFI_ENDPROC
29305 ENDPROC(atomic64_set_cx8)
29306
29307+ENTRY(atomic64_set_unchecked_cx8)
29308+ CFI_STARTPROC
29309+
29310+1:
29311+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29312+ * are atomic on 586 and newer */
29313+ cmpxchg8b (%esi)
29314+ jne 1b
29315+
29316+ pax_force_retaddr
29317+ ret
29318+ CFI_ENDPROC
29319+ENDPROC(atomic64_set_unchecked_cx8)
29320+
29321 ENTRY(atomic64_xchg_cx8)
29322 CFI_STARTPROC
29323
29324@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29325 cmpxchg8b (%esi)
29326 jne 1b
29327
29328+ pax_force_retaddr
29329 ret
29330 CFI_ENDPROC
29331 ENDPROC(atomic64_xchg_cx8)
29332
29333-.macro addsub_return func ins insc
29334-ENTRY(atomic64_\func\()_return_cx8)
29335+.macro addsub_return func ins insc unchecked=""
29336+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29337 CFI_STARTPROC
29338 SAVE ebp
29339 SAVE ebx
29340@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29341 movl %edx, %ecx
29342 \ins\()l %esi, %ebx
29343 \insc\()l %edi, %ecx
29344+
29345+.ifb \unchecked
29346+#ifdef CONFIG_PAX_REFCOUNT
29347+ into
29348+2:
29349+ _ASM_EXTABLE(2b, 3f)
29350+#endif
29351+.endif
29352+
29353 LOCK_PREFIX
29354 cmpxchg8b (%ebp)
29355 jne 1b
29356-
29357-10:
29358 movl %ebx, %eax
29359 movl %ecx, %edx
29360+
29361+.ifb \unchecked
29362+#ifdef CONFIG_PAX_REFCOUNT
29363+3:
29364+#endif
29365+.endif
29366+
29367 RESTORE edi
29368 RESTORE esi
29369 RESTORE ebx
29370 RESTORE ebp
29371+ pax_force_retaddr
29372 ret
29373 CFI_ENDPROC
29374-ENDPROC(atomic64_\func\()_return_cx8)
29375+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29376 .endm
29377
29378 addsub_return add add adc
29379 addsub_return sub sub sbb
29380+addsub_return add add adc _unchecked
29381+addsub_return sub sub sbb _unchecked
29382
29383-.macro incdec_return func ins insc
29384-ENTRY(atomic64_\func\()_return_cx8)
29385+.macro incdec_return func ins insc unchecked=""
29386+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29387 CFI_STARTPROC
29388 SAVE ebx
29389
29390@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29391 movl %edx, %ecx
29392 \ins\()l $1, %ebx
29393 \insc\()l $0, %ecx
29394+
29395+.ifb \unchecked
29396+#ifdef CONFIG_PAX_REFCOUNT
29397+ into
29398+2:
29399+ _ASM_EXTABLE(2b, 3f)
29400+#endif
29401+.endif
29402+
29403 LOCK_PREFIX
29404 cmpxchg8b (%esi)
29405 jne 1b
29406
29407-10:
29408 movl %ebx, %eax
29409 movl %ecx, %edx
29410+
29411+.ifb \unchecked
29412+#ifdef CONFIG_PAX_REFCOUNT
29413+3:
29414+#endif
29415+.endif
29416+
29417 RESTORE ebx
29418+ pax_force_retaddr
29419 ret
29420 CFI_ENDPROC
29421-ENDPROC(atomic64_\func\()_return_cx8)
29422+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29423 .endm
29424
29425 incdec_return inc add adc
29426 incdec_return dec sub sbb
29427+incdec_return inc add adc _unchecked
29428+incdec_return dec sub sbb _unchecked
29429
29430 ENTRY(atomic64_dec_if_positive_cx8)
29431 CFI_STARTPROC
29432@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29433 movl %edx, %ecx
29434 subl $1, %ebx
29435 sbb $0, %ecx
29436+
29437+#ifdef CONFIG_PAX_REFCOUNT
29438+ into
29439+1234:
29440+ _ASM_EXTABLE(1234b, 2f)
29441+#endif
29442+
29443 js 2f
29444 LOCK_PREFIX
29445 cmpxchg8b (%esi)
29446@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29447 movl %ebx, %eax
29448 movl %ecx, %edx
29449 RESTORE ebx
29450+ pax_force_retaddr
29451 ret
29452 CFI_ENDPROC
29453 ENDPROC(atomic64_dec_if_positive_cx8)
29454@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29455 movl %edx, %ecx
29456 addl %ebp, %ebx
29457 adcl %edi, %ecx
29458+
29459+#ifdef CONFIG_PAX_REFCOUNT
29460+ into
29461+1234:
29462+ _ASM_EXTABLE(1234b, 3f)
29463+#endif
29464+
29465 LOCK_PREFIX
29466 cmpxchg8b (%esi)
29467 jne 1b
29468@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29469 CFI_ADJUST_CFA_OFFSET -8
29470 RESTORE ebx
29471 RESTORE ebp
29472+ pax_force_retaddr
29473 ret
29474 4:
29475 cmpl %edx, 4(%esp)
29476@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29477 xorl %ecx, %ecx
29478 addl $1, %ebx
29479 adcl %edx, %ecx
29480+
29481+#ifdef CONFIG_PAX_REFCOUNT
29482+ into
29483+1234:
29484+ _ASM_EXTABLE(1234b, 3f)
29485+#endif
29486+
29487 LOCK_PREFIX
29488 cmpxchg8b (%esi)
29489 jne 1b
29490@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29491 movl $1, %eax
29492 3:
29493 RESTORE ebx
29494+ pax_force_retaddr
29495 ret
29496 CFI_ENDPROC
29497 ENDPROC(atomic64_inc_not_zero_cx8)
29498diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29499index e78b8eee..7e173a8 100644
29500--- a/arch/x86/lib/checksum_32.S
29501+++ b/arch/x86/lib/checksum_32.S
29502@@ -29,7 +29,8 @@
29503 #include <asm/dwarf2.h>
29504 #include <asm/errno.h>
29505 #include <asm/asm.h>
29506-
29507+#include <asm/segment.h>
29508+
29509 /*
29510 * computes a partial checksum, e.g. for TCP/UDP fragments
29511 */
29512@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29513
29514 #define ARGBASE 16
29515 #define FP 12
29516-
29517-ENTRY(csum_partial_copy_generic)
29518+
29519+ENTRY(csum_partial_copy_generic_to_user)
29520 CFI_STARTPROC
29521+
29522+#ifdef CONFIG_PAX_MEMORY_UDEREF
29523+ pushl_cfi %gs
29524+ popl_cfi %es
29525+ jmp csum_partial_copy_generic
29526+#endif
29527+
29528+ENTRY(csum_partial_copy_generic_from_user)
29529+
29530+#ifdef CONFIG_PAX_MEMORY_UDEREF
29531+ pushl_cfi %gs
29532+ popl_cfi %ds
29533+#endif
29534+
29535+ENTRY(csum_partial_copy_generic)
29536 subl $4,%esp
29537 CFI_ADJUST_CFA_OFFSET 4
29538 pushl_cfi %edi
29539@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29540 jmp 4f
29541 SRC(1: movw (%esi), %bx )
29542 addl $2, %esi
29543-DST( movw %bx, (%edi) )
29544+DST( movw %bx, %es:(%edi) )
29545 addl $2, %edi
29546 addw %bx, %ax
29547 adcl $0, %eax
29548@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29549 SRC(1: movl (%esi), %ebx )
29550 SRC( movl 4(%esi), %edx )
29551 adcl %ebx, %eax
29552-DST( movl %ebx, (%edi) )
29553+DST( movl %ebx, %es:(%edi) )
29554 adcl %edx, %eax
29555-DST( movl %edx, 4(%edi) )
29556+DST( movl %edx, %es:4(%edi) )
29557
29558 SRC( movl 8(%esi), %ebx )
29559 SRC( movl 12(%esi), %edx )
29560 adcl %ebx, %eax
29561-DST( movl %ebx, 8(%edi) )
29562+DST( movl %ebx, %es:8(%edi) )
29563 adcl %edx, %eax
29564-DST( movl %edx, 12(%edi) )
29565+DST( movl %edx, %es:12(%edi) )
29566
29567 SRC( movl 16(%esi), %ebx )
29568 SRC( movl 20(%esi), %edx )
29569 adcl %ebx, %eax
29570-DST( movl %ebx, 16(%edi) )
29571+DST( movl %ebx, %es:16(%edi) )
29572 adcl %edx, %eax
29573-DST( movl %edx, 20(%edi) )
29574+DST( movl %edx, %es:20(%edi) )
29575
29576 SRC( movl 24(%esi), %ebx )
29577 SRC( movl 28(%esi), %edx )
29578 adcl %ebx, %eax
29579-DST( movl %ebx, 24(%edi) )
29580+DST( movl %ebx, %es:24(%edi) )
29581 adcl %edx, %eax
29582-DST( movl %edx, 28(%edi) )
29583+DST( movl %edx, %es:28(%edi) )
29584
29585 lea 32(%esi), %esi
29586 lea 32(%edi), %edi
29587@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29588 shrl $2, %edx # This clears CF
29589 SRC(3: movl (%esi), %ebx )
29590 adcl %ebx, %eax
29591-DST( movl %ebx, (%edi) )
29592+DST( movl %ebx, %es:(%edi) )
29593 lea 4(%esi), %esi
29594 lea 4(%edi), %edi
29595 dec %edx
29596@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29597 jb 5f
29598 SRC( movw (%esi), %cx )
29599 leal 2(%esi), %esi
29600-DST( movw %cx, (%edi) )
29601+DST( movw %cx, %es:(%edi) )
29602 leal 2(%edi), %edi
29603 je 6f
29604 shll $16,%ecx
29605 SRC(5: movb (%esi), %cl )
29606-DST( movb %cl, (%edi) )
29607+DST( movb %cl, %es:(%edi) )
29608 6: addl %ecx, %eax
29609 adcl $0, %eax
29610 7:
29611@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29612
29613 6001:
29614 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29615- movl $-EFAULT, (%ebx)
29616+ movl $-EFAULT, %ss:(%ebx)
29617
29618 # zero the complete destination - computing the rest
29619 # is too much work
29620@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29621
29622 6002:
29623 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29624- movl $-EFAULT,(%ebx)
29625+ movl $-EFAULT,%ss:(%ebx)
29626 jmp 5000b
29627
29628 .previous
29629
29630+ pushl_cfi %ss
29631+ popl_cfi %ds
29632+ pushl_cfi %ss
29633+ popl_cfi %es
29634 popl_cfi %ebx
29635 CFI_RESTORE ebx
29636 popl_cfi %esi
29637@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29638 popl_cfi %ecx # equivalent to addl $4,%esp
29639 ret
29640 CFI_ENDPROC
29641-ENDPROC(csum_partial_copy_generic)
29642+ENDPROC(csum_partial_copy_generic_to_user)
29643
29644 #else
29645
29646 /* Version for PentiumII/PPro */
29647
29648 #define ROUND1(x) \
29649+ nop; nop; nop; \
29650 SRC(movl x(%esi), %ebx ) ; \
29651 addl %ebx, %eax ; \
29652- DST(movl %ebx, x(%edi) ) ;
29653+ DST(movl %ebx, %es:x(%edi)) ;
29654
29655 #define ROUND(x) \
29656+ nop; nop; nop; \
29657 SRC(movl x(%esi), %ebx ) ; \
29658 adcl %ebx, %eax ; \
29659- DST(movl %ebx, x(%edi) ) ;
29660+ DST(movl %ebx, %es:x(%edi)) ;
29661
29662 #define ARGBASE 12
29663-
29664-ENTRY(csum_partial_copy_generic)
29665+
29666+ENTRY(csum_partial_copy_generic_to_user)
29667 CFI_STARTPROC
29668+
29669+#ifdef CONFIG_PAX_MEMORY_UDEREF
29670+ pushl_cfi %gs
29671+ popl_cfi %es
29672+ jmp csum_partial_copy_generic
29673+#endif
29674+
29675+ENTRY(csum_partial_copy_generic_from_user)
29676+
29677+#ifdef CONFIG_PAX_MEMORY_UDEREF
29678+ pushl_cfi %gs
29679+ popl_cfi %ds
29680+#endif
29681+
29682+ENTRY(csum_partial_copy_generic)
29683 pushl_cfi %ebx
29684 CFI_REL_OFFSET ebx, 0
29685 pushl_cfi %edi
29686@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29687 subl %ebx, %edi
29688 lea -1(%esi),%edx
29689 andl $-32,%edx
29690- lea 3f(%ebx,%ebx), %ebx
29691+ lea 3f(%ebx,%ebx,2), %ebx
29692 testl %esi, %esi
29693 jmp *%ebx
29694 1: addl $64,%esi
29695@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29696 jb 5f
29697 SRC( movw (%esi), %dx )
29698 leal 2(%esi), %esi
29699-DST( movw %dx, (%edi) )
29700+DST( movw %dx, %es:(%edi) )
29701 leal 2(%edi), %edi
29702 je 6f
29703 shll $16,%edx
29704 5:
29705 SRC( movb (%esi), %dl )
29706-DST( movb %dl, (%edi) )
29707+DST( movb %dl, %es:(%edi) )
29708 6: addl %edx, %eax
29709 adcl $0, %eax
29710 7:
29711 .section .fixup, "ax"
29712 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29713- movl $-EFAULT, (%ebx)
29714+ movl $-EFAULT, %ss:(%ebx)
29715 # zero the complete destination (computing the rest is too much work)
29716 movl ARGBASE+8(%esp),%edi # dst
29717 movl ARGBASE+12(%esp),%ecx # len
29718@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29719 rep; stosb
29720 jmp 7b
29721 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29722- movl $-EFAULT, (%ebx)
29723+ movl $-EFAULT, %ss:(%ebx)
29724 jmp 7b
29725 .previous
29726
29727+#ifdef CONFIG_PAX_MEMORY_UDEREF
29728+ pushl_cfi %ss
29729+ popl_cfi %ds
29730+ pushl_cfi %ss
29731+ popl_cfi %es
29732+#endif
29733+
29734 popl_cfi %esi
29735 CFI_RESTORE esi
29736 popl_cfi %edi
29737@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29738 CFI_RESTORE ebx
29739 ret
29740 CFI_ENDPROC
29741-ENDPROC(csum_partial_copy_generic)
29742+ENDPROC(csum_partial_copy_generic_to_user)
29743
29744 #undef ROUND
29745 #undef ROUND1
29746diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29747index f2145cf..cea889d 100644
29748--- a/arch/x86/lib/clear_page_64.S
29749+++ b/arch/x86/lib/clear_page_64.S
29750@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29751 movl $4096/8,%ecx
29752 xorl %eax,%eax
29753 rep stosq
29754+ pax_force_retaddr
29755 ret
29756 CFI_ENDPROC
29757 ENDPROC(clear_page_c)
29758@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29759 movl $4096,%ecx
29760 xorl %eax,%eax
29761 rep stosb
29762+ pax_force_retaddr
29763 ret
29764 CFI_ENDPROC
29765 ENDPROC(clear_page_c_e)
29766@@ -43,6 +45,7 @@ ENTRY(clear_page)
29767 leaq 64(%rdi),%rdi
29768 jnz .Lloop
29769 nop
29770+ pax_force_retaddr
29771 ret
29772 CFI_ENDPROC
29773 .Lclear_page_end:
29774@@ -58,7 +61,7 @@ ENDPROC(clear_page)
29775
29776 #include <asm/cpufeature.h>
29777
29778- .section .altinstr_replacement,"ax"
29779+ .section .altinstr_replacement,"a"
29780 1: .byte 0xeb /* jmp <disp8> */
29781 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29782 2: .byte 0xeb /* jmp <disp8> */
29783diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29784index 40a1725..5d12ac4 100644
29785--- a/arch/x86/lib/cmpxchg16b_emu.S
29786+++ b/arch/x86/lib/cmpxchg16b_emu.S
29787@@ -8,6 +8,7 @@
29788 #include <linux/linkage.h>
29789 #include <asm/dwarf2.h>
29790 #include <asm/percpu.h>
29791+#include <asm/alternative-asm.h>
29792
29793 .text
29794
29795@@ -46,12 +47,14 @@ CFI_STARTPROC
29796 CFI_REMEMBER_STATE
29797 popfq_cfi
29798 mov $1, %al
29799+ pax_force_retaddr
29800 ret
29801
29802 CFI_RESTORE_STATE
29803 .Lnot_same:
29804 popfq_cfi
29805 xor %al,%al
29806+ pax_force_retaddr
29807 ret
29808
29809 CFI_ENDPROC
29810diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29811index 176cca6..e0d658e 100644
29812--- a/arch/x86/lib/copy_page_64.S
29813+++ b/arch/x86/lib/copy_page_64.S
29814@@ -9,6 +9,7 @@ copy_page_rep:
29815 CFI_STARTPROC
29816 movl $4096/8, %ecx
29817 rep movsq
29818+ pax_force_retaddr
29819 ret
29820 CFI_ENDPROC
29821 ENDPROC(copy_page_rep)
29822@@ -24,8 +25,8 @@ ENTRY(copy_page)
29823 CFI_ADJUST_CFA_OFFSET 2*8
29824 movq %rbx, (%rsp)
29825 CFI_REL_OFFSET rbx, 0
29826- movq %r12, 1*8(%rsp)
29827- CFI_REL_OFFSET r12, 1*8
29828+ movq %r13, 1*8(%rsp)
29829+ CFI_REL_OFFSET r13, 1*8
29830
29831 movl $(4096/64)-5, %ecx
29832 .p2align 4
29833@@ -38,7 +39,7 @@ ENTRY(copy_page)
29834 movq 0x8*4(%rsi), %r9
29835 movq 0x8*5(%rsi), %r10
29836 movq 0x8*6(%rsi), %r11
29837- movq 0x8*7(%rsi), %r12
29838+ movq 0x8*7(%rsi), %r13
29839
29840 prefetcht0 5*64(%rsi)
29841
29842@@ -49,7 +50,7 @@ ENTRY(copy_page)
29843 movq %r9, 0x8*4(%rdi)
29844 movq %r10, 0x8*5(%rdi)
29845 movq %r11, 0x8*6(%rdi)
29846- movq %r12, 0x8*7(%rdi)
29847+ movq %r13, 0x8*7(%rdi)
29848
29849 leaq 64 (%rsi), %rsi
29850 leaq 64 (%rdi), %rdi
29851@@ -68,7 +69,7 @@ ENTRY(copy_page)
29852 movq 0x8*4(%rsi), %r9
29853 movq 0x8*5(%rsi), %r10
29854 movq 0x8*6(%rsi), %r11
29855- movq 0x8*7(%rsi), %r12
29856+ movq 0x8*7(%rsi), %r13
29857
29858 movq %rax, 0x8*0(%rdi)
29859 movq %rbx, 0x8*1(%rdi)
29860@@ -77,7 +78,7 @@ ENTRY(copy_page)
29861 movq %r9, 0x8*4(%rdi)
29862 movq %r10, 0x8*5(%rdi)
29863 movq %r11, 0x8*6(%rdi)
29864- movq %r12, 0x8*7(%rdi)
29865+ movq %r13, 0x8*7(%rdi)
29866
29867 leaq 64(%rdi), %rdi
29868 leaq 64(%rsi), %rsi
29869@@ -85,10 +86,11 @@ ENTRY(copy_page)
29870
29871 movq (%rsp), %rbx
29872 CFI_RESTORE rbx
29873- movq 1*8(%rsp), %r12
29874- CFI_RESTORE r12
29875+ movq 1*8(%rsp), %r13
29876+ CFI_RESTORE r13
29877 addq $2*8, %rsp
29878 CFI_ADJUST_CFA_OFFSET -2*8
29879+ pax_force_retaddr
29880 ret
29881 .Lcopy_page_end:
29882 CFI_ENDPROC
29883@@ -99,7 +101,7 @@ ENDPROC(copy_page)
29884
29885 #include <asm/cpufeature.h>
29886
29887- .section .altinstr_replacement,"ax"
29888+ .section .altinstr_replacement,"a"
29889 1: .byte 0xeb /* jmp <disp8> */
29890 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29891 2:
29892diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29893index dee945d..a84067b 100644
29894--- a/arch/x86/lib/copy_user_64.S
29895+++ b/arch/x86/lib/copy_user_64.S
29896@@ -18,31 +18,7 @@
29897 #include <asm/alternative-asm.h>
29898 #include <asm/asm.h>
29899 #include <asm/smap.h>
29900-
29901-/*
29902- * By placing feature2 after feature1 in altinstructions section, we logically
29903- * implement:
29904- * If CPU has feature2, jmp to alt2 is used
29905- * else if CPU has feature1, jmp to alt1 is used
29906- * else jmp to orig is used.
29907- */
29908- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29909-0:
29910- .byte 0xe9 /* 32bit jump */
29911- .long \orig-1f /* by default jump to orig */
29912-1:
29913- .section .altinstr_replacement,"ax"
29914-2: .byte 0xe9 /* near jump with 32bit immediate */
29915- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29916-3: .byte 0xe9 /* near jump with 32bit immediate */
29917- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29918- .previous
29919-
29920- .section .altinstructions,"a"
29921- altinstruction_entry 0b,2b,\feature1,5,5
29922- altinstruction_entry 0b,3b,\feature2,5,5
29923- .previous
29924- .endm
29925+#include <asm/pgtable.h>
29926
29927 .macro ALIGN_DESTINATION
29928 #ifdef FIX_ALIGNMENT
29929@@ -70,52 +46,6 @@
29930 #endif
29931 .endm
29932
29933-/* Standard copy_to_user with segment limit checking */
29934-ENTRY(_copy_to_user)
29935- CFI_STARTPROC
29936- GET_THREAD_INFO(%rax)
29937- movq %rdi,%rcx
29938- addq %rdx,%rcx
29939- jc bad_to_user
29940- cmpq TI_addr_limit(%rax),%rcx
29941- ja bad_to_user
29942- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29943- copy_user_generic_unrolled,copy_user_generic_string, \
29944- copy_user_enhanced_fast_string
29945- CFI_ENDPROC
29946-ENDPROC(_copy_to_user)
29947-
29948-/* Standard copy_from_user with segment limit checking */
29949-ENTRY(_copy_from_user)
29950- CFI_STARTPROC
29951- GET_THREAD_INFO(%rax)
29952- movq %rsi,%rcx
29953- addq %rdx,%rcx
29954- jc bad_from_user
29955- cmpq TI_addr_limit(%rax),%rcx
29956- ja bad_from_user
29957- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29958- copy_user_generic_unrolled,copy_user_generic_string, \
29959- copy_user_enhanced_fast_string
29960- CFI_ENDPROC
29961-ENDPROC(_copy_from_user)
29962-
29963- .section .fixup,"ax"
29964- /* must zero dest */
29965-ENTRY(bad_from_user)
29966-bad_from_user:
29967- CFI_STARTPROC
29968- movl %edx,%ecx
29969- xorl %eax,%eax
29970- rep
29971- stosb
29972-bad_to_user:
29973- movl %edx,%eax
29974- ret
29975- CFI_ENDPROC
29976-ENDPROC(bad_from_user)
29977- .previous
29978-
29979 /*
29980 * copy_user_generic_unrolled - memory copy with exception handling.
29981 * This version is for CPUs like P4 that don't have efficient micro
29982@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29983 */
29984 ENTRY(copy_user_generic_unrolled)
29985 CFI_STARTPROC
29986+ ASM_PAX_OPEN_USERLAND
29987 ASM_STAC
29988 cmpl $8,%edx
29989 jb 20f /* less then 8 bytes, go to byte copy loop */
29990@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29991 jnz 21b
29992 23: xor %eax,%eax
29993 ASM_CLAC
29994+ ASM_PAX_CLOSE_USERLAND
29995+ pax_force_retaddr
29996 ret
29997
29998 .section .fixup,"ax"
29999@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
30000 */
30001 ENTRY(copy_user_generic_string)
30002 CFI_STARTPROC
30003+ ASM_PAX_OPEN_USERLAND
30004 ASM_STAC
30005 cmpl $8,%edx
30006 jb 2f /* less than 8 bytes, go to byte copy loop */
30007@@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
30008 movsb
30009 xorl %eax,%eax
30010 ASM_CLAC
30011+ ASM_PAX_CLOSE_USERLAND
30012+ pax_force_retaddr
30013 ret
30014
30015 .section .fixup,"ax"
30016@@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
30017 */
30018 ENTRY(copy_user_enhanced_fast_string)
30019 CFI_STARTPROC
30020+ ASM_PAX_OPEN_USERLAND
30021 ASM_STAC
30022 movl %edx,%ecx
30023 1: rep
30024 movsb
30025 xorl %eax,%eax
30026 ASM_CLAC
30027+ ASM_PAX_CLOSE_USERLAND
30028+ pax_force_retaddr
30029 ret
30030
30031 .section .fixup,"ax"
30032diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
30033index 6a4f43c..c70fb52 100644
30034--- a/arch/x86/lib/copy_user_nocache_64.S
30035+++ b/arch/x86/lib/copy_user_nocache_64.S
30036@@ -8,6 +8,7 @@
30037
30038 #include <linux/linkage.h>
30039 #include <asm/dwarf2.h>
30040+#include <asm/alternative-asm.h>
30041
30042 #define FIX_ALIGNMENT 1
30043
30044@@ -16,6 +17,7 @@
30045 #include <asm/thread_info.h>
30046 #include <asm/asm.h>
30047 #include <asm/smap.h>
30048+#include <asm/pgtable.h>
30049
30050 .macro ALIGN_DESTINATION
30051 #ifdef FIX_ALIGNMENT
30052@@ -49,6 +51,16 @@
30053 */
30054 ENTRY(__copy_user_nocache)
30055 CFI_STARTPROC
30056+
30057+#ifdef CONFIG_PAX_MEMORY_UDEREF
30058+ mov pax_user_shadow_base,%rcx
30059+ cmp %rcx,%rsi
30060+ jae 1f
30061+ add %rcx,%rsi
30062+1:
30063+#endif
30064+
30065+ ASM_PAX_OPEN_USERLAND
30066 ASM_STAC
30067 cmpl $8,%edx
30068 jb 20f /* less then 8 bytes, go to byte copy loop */
30069@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30070 jnz 21b
30071 23: xorl %eax,%eax
30072 ASM_CLAC
30073+ ASM_PAX_CLOSE_USERLAND
30074 sfence
30075+ pax_force_retaddr
30076 ret
30077
30078 .section .fixup,"ax"
30079diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30080index 2419d5f..fe52d0e 100644
30081--- a/arch/x86/lib/csum-copy_64.S
30082+++ b/arch/x86/lib/csum-copy_64.S
30083@@ -9,6 +9,7 @@
30084 #include <asm/dwarf2.h>
30085 #include <asm/errno.h>
30086 #include <asm/asm.h>
30087+#include <asm/alternative-asm.h>
30088
30089 /*
30090 * Checksum copy with exception handling.
30091@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30092 CFI_ADJUST_CFA_OFFSET 7*8
30093 movq %rbx, 2*8(%rsp)
30094 CFI_REL_OFFSET rbx, 2*8
30095- movq %r12, 3*8(%rsp)
30096- CFI_REL_OFFSET r12, 3*8
30097+ movq %r15, 3*8(%rsp)
30098+ CFI_REL_OFFSET r15, 3*8
30099 movq %r14, 4*8(%rsp)
30100 CFI_REL_OFFSET r14, 4*8
30101 movq %r13, 5*8(%rsp)
30102@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30103 movl %edx, %ecx
30104
30105 xorl %r9d, %r9d
30106- movq %rcx, %r12
30107+ movq %rcx, %r15
30108
30109- shrq $6, %r12
30110+ shrq $6, %r15
30111 jz .Lhandle_tail /* < 64 */
30112
30113 clc
30114
30115 /* main loop. clear in 64 byte blocks */
30116 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30117- /* r11: temp3, rdx: temp4, r12 loopcnt */
30118+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30119 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30120 .p2align 4
30121 .Lloop:
30122@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30123 adcq %r14, %rax
30124 adcq %r13, %rax
30125
30126- decl %r12d
30127+ decl %r15d
30128
30129 dest
30130 movq %rbx, (%rsi)
30131@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30132 .Lende:
30133 movq 2*8(%rsp), %rbx
30134 CFI_RESTORE rbx
30135- movq 3*8(%rsp), %r12
30136- CFI_RESTORE r12
30137+ movq 3*8(%rsp), %r15
30138+ CFI_RESTORE r15
30139 movq 4*8(%rsp), %r14
30140 CFI_RESTORE r14
30141 movq 5*8(%rsp), %r13
30142@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30143 CFI_RESTORE rbp
30144 addq $7*8, %rsp
30145 CFI_ADJUST_CFA_OFFSET -7*8
30146+ pax_force_retaddr
30147 ret
30148 CFI_RESTORE_STATE
30149
30150diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30151index 1318f75..44c30fd 100644
30152--- a/arch/x86/lib/csum-wrappers_64.c
30153+++ b/arch/x86/lib/csum-wrappers_64.c
30154@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30155 len -= 2;
30156 }
30157 }
30158+ pax_open_userland();
30159 stac();
30160- isum = csum_partial_copy_generic((__force const void *)src,
30161+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30162 dst, len, isum, errp, NULL);
30163 clac();
30164+ pax_close_userland();
30165 if (unlikely(*errp))
30166 goto out_err;
30167
30168@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30169 }
30170
30171 *errp = 0;
30172+ pax_open_userland();
30173 stac();
30174- ret = csum_partial_copy_generic(src, (void __force *)dst,
30175+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30176 len, isum, NULL, errp);
30177 clac();
30178+ pax_close_userland();
30179 return ret;
30180 }
30181 EXPORT_SYMBOL(csum_partial_copy_to_user);
30182diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30183index a451235..a74bfa3 100644
30184--- a/arch/x86/lib/getuser.S
30185+++ b/arch/x86/lib/getuser.S
30186@@ -33,17 +33,40 @@
30187 #include <asm/thread_info.h>
30188 #include <asm/asm.h>
30189 #include <asm/smap.h>
30190+#include <asm/segment.h>
30191+#include <asm/pgtable.h>
30192+#include <asm/alternative-asm.h>
30193+
30194+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30195+#define __copyuser_seg gs;
30196+#else
30197+#define __copyuser_seg
30198+#endif
30199
30200 .text
30201 ENTRY(__get_user_1)
30202 CFI_STARTPROC
30203+
30204+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30205 GET_THREAD_INFO(%_ASM_DX)
30206 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30207 jae bad_get_user
30208+
30209+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30210+ mov pax_user_shadow_base,%_ASM_DX
30211+ cmp %_ASM_DX,%_ASM_AX
30212+ jae 1234f
30213+ add %_ASM_DX,%_ASM_AX
30214+1234:
30215+#endif
30216+
30217+#endif
30218+
30219 ASM_STAC
30220-1: movzbl (%_ASM_AX),%edx
30221+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30222 xor %eax,%eax
30223 ASM_CLAC
30224+ pax_force_retaddr
30225 ret
30226 CFI_ENDPROC
30227 ENDPROC(__get_user_1)
30228@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30229 ENTRY(__get_user_2)
30230 CFI_STARTPROC
30231 add $1,%_ASM_AX
30232+
30233+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30234 jc bad_get_user
30235 GET_THREAD_INFO(%_ASM_DX)
30236 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30237 jae bad_get_user
30238+
30239+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30240+ mov pax_user_shadow_base,%_ASM_DX
30241+ cmp %_ASM_DX,%_ASM_AX
30242+ jae 1234f
30243+ add %_ASM_DX,%_ASM_AX
30244+1234:
30245+#endif
30246+
30247+#endif
30248+
30249 ASM_STAC
30250-2: movzwl -1(%_ASM_AX),%edx
30251+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30252 xor %eax,%eax
30253 ASM_CLAC
30254+ pax_force_retaddr
30255 ret
30256 CFI_ENDPROC
30257 ENDPROC(__get_user_2)
30258@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30259 ENTRY(__get_user_4)
30260 CFI_STARTPROC
30261 add $3,%_ASM_AX
30262+
30263+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30264 jc bad_get_user
30265 GET_THREAD_INFO(%_ASM_DX)
30266 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30267 jae bad_get_user
30268+
30269+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30270+ mov pax_user_shadow_base,%_ASM_DX
30271+ cmp %_ASM_DX,%_ASM_AX
30272+ jae 1234f
30273+ add %_ASM_DX,%_ASM_AX
30274+1234:
30275+#endif
30276+
30277+#endif
30278+
30279 ASM_STAC
30280-3: movl -3(%_ASM_AX),%edx
30281+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30282 xor %eax,%eax
30283 ASM_CLAC
30284+ pax_force_retaddr
30285 ret
30286 CFI_ENDPROC
30287 ENDPROC(__get_user_4)
30288@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30289 GET_THREAD_INFO(%_ASM_DX)
30290 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30291 jae bad_get_user
30292+
30293+#ifdef CONFIG_PAX_MEMORY_UDEREF
30294+ mov pax_user_shadow_base,%_ASM_DX
30295+ cmp %_ASM_DX,%_ASM_AX
30296+ jae 1234f
30297+ add %_ASM_DX,%_ASM_AX
30298+1234:
30299+#endif
30300+
30301 ASM_STAC
30302 4: movq -7(%_ASM_AX),%rdx
30303 xor %eax,%eax
30304 ASM_CLAC
30305+ pax_force_retaddr
30306 ret
30307 #else
30308 add $7,%_ASM_AX
30309@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30310 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30311 jae bad_get_user_8
30312 ASM_STAC
30313-4: movl -7(%_ASM_AX),%edx
30314-5: movl -3(%_ASM_AX),%ecx
30315+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30316+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30317 xor %eax,%eax
30318 ASM_CLAC
30319+ pax_force_retaddr
30320 ret
30321 #endif
30322 CFI_ENDPROC
30323@@ -113,6 +175,7 @@ bad_get_user:
30324 xor %edx,%edx
30325 mov $(-EFAULT),%_ASM_AX
30326 ASM_CLAC
30327+ pax_force_retaddr
30328 ret
30329 CFI_ENDPROC
30330 END(bad_get_user)
30331@@ -124,6 +187,7 @@ bad_get_user_8:
30332 xor %ecx,%ecx
30333 mov $(-EFAULT),%_ASM_AX
30334 ASM_CLAC
30335+ pax_force_retaddr
30336 ret
30337 CFI_ENDPROC
30338 END(bad_get_user_8)
30339diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30340index 85994f5..9929d7f 100644
30341--- a/arch/x86/lib/insn.c
30342+++ b/arch/x86/lib/insn.c
30343@@ -20,8 +20,10 @@
30344
30345 #ifdef __KERNEL__
30346 #include <linux/string.h>
30347+#include <asm/pgtable_types.h>
30348 #else
30349 #include <string.h>
30350+#define ktla_ktva(addr) addr
30351 #endif
30352 #include <asm/inat.h>
30353 #include <asm/insn.h>
30354@@ -60,9 +62,9 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30355 buf_len = MAX_INSN_SIZE;
30356
30357 memset(insn, 0, sizeof(*insn));
30358- insn->kaddr = kaddr;
30359- insn->end_kaddr = kaddr + buf_len;
30360- insn->next_byte = kaddr;
30361+ insn->kaddr = ktla_ktva(kaddr);
30362+ insn->end_kaddr = insn->kaddr + buf_len;
30363+ insn->next_byte = insn->kaddr;
30364 insn->x86_64 = x86_64 ? 1 : 0;
30365 insn->opnd_bytes = 4;
30366 if (x86_64)
30367diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30368index 05a95e7..326f2fa 100644
30369--- a/arch/x86/lib/iomap_copy_64.S
30370+++ b/arch/x86/lib/iomap_copy_64.S
30371@@ -17,6 +17,7 @@
30372
30373 #include <linux/linkage.h>
30374 #include <asm/dwarf2.h>
30375+#include <asm/alternative-asm.h>
30376
30377 /*
30378 * override generic version in lib/iomap_copy.c
30379@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30380 CFI_STARTPROC
30381 movl %edx,%ecx
30382 rep movsd
30383+ pax_force_retaddr
30384 ret
30385 CFI_ENDPROC
30386 ENDPROC(__iowrite32_copy)
30387diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30388index 89b53c9..97357ca 100644
30389--- a/arch/x86/lib/memcpy_64.S
30390+++ b/arch/x86/lib/memcpy_64.S
30391@@ -24,7 +24,7 @@
30392 * This gets patched over the unrolled variant (below) via the
30393 * alternative instructions framework:
30394 */
30395- .section .altinstr_replacement, "ax", @progbits
30396+ .section .altinstr_replacement, "a", @progbits
30397 .Lmemcpy_c:
30398 movq %rdi, %rax
30399 movq %rdx, %rcx
30400@@ -33,6 +33,7 @@
30401 rep movsq
30402 movl %edx, %ecx
30403 rep movsb
30404+ pax_force_retaddr
30405 ret
30406 .Lmemcpy_e:
30407 .previous
30408@@ -44,11 +45,12 @@
30409 * This gets patched over the unrolled variant (below) via the
30410 * alternative instructions framework:
30411 */
30412- .section .altinstr_replacement, "ax", @progbits
30413+ .section .altinstr_replacement, "a", @progbits
30414 .Lmemcpy_c_e:
30415 movq %rdi, %rax
30416 movq %rdx, %rcx
30417 rep movsb
30418+ pax_force_retaddr
30419 ret
30420 .Lmemcpy_e_e:
30421 .previous
30422@@ -138,6 +140,7 @@ ENTRY(memcpy)
30423 movq %r9, 1*8(%rdi)
30424 movq %r10, -2*8(%rdi, %rdx)
30425 movq %r11, -1*8(%rdi, %rdx)
30426+ pax_force_retaddr
30427 retq
30428 .p2align 4
30429 .Lless_16bytes:
30430@@ -150,6 +153,7 @@ ENTRY(memcpy)
30431 movq -1*8(%rsi, %rdx), %r9
30432 movq %r8, 0*8(%rdi)
30433 movq %r9, -1*8(%rdi, %rdx)
30434+ pax_force_retaddr
30435 retq
30436 .p2align 4
30437 .Lless_8bytes:
30438@@ -163,6 +167,7 @@ ENTRY(memcpy)
30439 movl -4(%rsi, %rdx), %r8d
30440 movl %ecx, (%rdi)
30441 movl %r8d, -4(%rdi, %rdx)
30442+ pax_force_retaddr
30443 retq
30444 .p2align 4
30445 .Lless_3bytes:
30446@@ -181,6 +186,7 @@ ENTRY(memcpy)
30447 movb %cl, (%rdi)
30448
30449 .Lend:
30450+ pax_force_retaddr
30451 retq
30452 CFI_ENDPROC
30453 ENDPROC(memcpy)
30454diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30455index 9c4b530..830b77a 100644
30456--- a/arch/x86/lib/memmove_64.S
30457+++ b/arch/x86/lib/memmove_64.S
30458@@ -205,14 +205,16 @@ ENTRY(__memmove)
30459 movb (%rsi), %r11b
30460 movb %r11b, (%rdi)
30461 13:
30462+ pax_force_retaddr
30463 retq
30464 CFI_ENDPROC
30465
30466- .section .altinstr_replacement,"ax"
30467+ .section .altinstr_replacement,"a"
30468 .Lmemmove_begin_forward_efs:
30469 /* Forward moving data. */
30470 movq %rdx, %rcx
30471 rep movsb
30472+ pax_force_retaddr
30473 retq
30474 .Lmemmove_end_forward_efs:
30475 .previous
30476diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30477index 6f44935..fbf5f6d 100644
30478--- a/arch/x86/lib/memset_64.S
30479+++ b/arch/x86/lib/memset_64.S
30480@@ -16,7 +16,7 @@
30481 *
30482 * rax original destination
30483 */
30484- .section .altinstr_replacement, "ax", @progbits
30485+ .section .altinstr_replacement, "a", @progbits
30486 .Lmemset_c:
30487 movq %rdi,%r9
30488 movq %rdx,%rcx
30489@@ -30,6 +30,7 @@
30490 movl %edx,%ecx
30491 rep stosb
30492 movq %r9,%rax
30493+ pax_force_retaddr
30494 ret
30495 .Lmemset_e:
30496 .previous
30497@@ -45,13 +46,14 @@
30498 *
30499 * rax original destination
30500 */
30501- .section .altinstr_replacement, "ax", @progbits
30502+ .section .altinstr_replacement, "a", @progbits
30503 .Lmemset_c_e:
30504 movq %rdi,%r9
30505 movb %sil,%al
30506 movq %rdx,%rcx
30507 rep stosb
30508 movq %r9,%rax
30509+ pax_force_retaddr
30510 ret
30511 .Lmemset_e_e:
30512 .previous
30513@@ -120,6 +122,7 @@ ENTRY(__memset)
30514
30515 .Lende:
30516 movq %r10,%rax
30517+ pax_force_retaddr
30518 ret
30519
30520 CFI_RESTORE_STATE
30521diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30522index c9f2d9b..e7fd2c0 100644
30523--- a/arch/x86/lib/mmx_32.c
30524+++ b/arch/x86/lib/mmx_32.c
30525@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30526 {
30527 void *p;
30528 int i;
30529+ unsigned long cr0;
30530
30531 if (unlikely(in_interrupt()))
30532 return __memcpy(to, from, len);
30533@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30534 kernel_fpu_begin();
30535
30536 __asm__ __volatile__ (
30537- "1: prefetch (%0)\n" /* This set is 28 bytes */
30538- " prefetch 64(%0)\n"
30539- " prefetch 128(%0)\n"
30540- " prefetch 192(%0)\n"
30541- " prefetch 256(%0)\n"
30542+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30543+ " prefetch 64(%1)\n"
30544+ " prefetch 128(%1)\n"
30545+ " prefetch 192(%1)\n"
30546+ " prefetch 256(%1)\n"
30547 "2: \n"
30548 ".section .fixup, \"ax\"\n"
30549- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30550+ "3: \n"
30551+
30552+#ifdef CONFIG_PAX_KERNEXEC
30553+ " movl %%cr0, %0\n"
30554+ " movl %0, %%eax\n"
30555+ " andl $0xFFFEFFFF, %%eax\n"
30556+ " movl %%eax, %%cr0\n"
30557+#endif
30558+
30559+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30560+
30561+#ifdef CONFIG_PAX_KERNEXEC
30562+ " movl %0, %%cr0\n"
30563+#endif
30564+
30565 " jmp 2b\n"
30566 ".previous\n"
30567 _ASM_EXTABLE(1b, 3b)
30568- : : "r" (from));
30569+ : "=&r" (cr0) : "r" (from) : "ax");
30570
30571 for ( ; i > 5; i--) {
30572 __asm__ __volatile__ (
30573- "1: prefetch 320(%0)\n"
30574- "2: movq (%0), %%mm0\n"
30575- " movq 8(%0), %%mm1\n"
30576- " movq 16(%0), %%mm2\n"
30577- " movq 24(%0), %%mm3\n"
30578- " movq %%mm0, (%1)\n"
30579- " movq %%mm1, 8(%1)\n"
30580- " movq %%mm2, 16(%1)\n"
30581- " movq %%mm3, 24(%1)\n"
30582- " movq 32(%0), %%mm0\n"
30583- " movq 40(%0), %%mm1\n"
30584- " movq 48(%0), %%mm2\n"
30585- " movq 56(%0), %%mm3\n"
30586- " movq %%mm0, 32(%1)\n"
30587- " movq %%mm1, 40(%1)\n"
30588- " movq %%mm2, 48(%1)\n"
30589- " movq %%mm3, 56(%1)\n"
30590+ "1: prefetch 320(%1)\n"
30591+ "2: movq (%1), %%mm0\n"
30592+ " movq 8(%1), %%mm1\n"
30593+ " movq 16(%1), %%mm2\n"
30594+ " movq 24(%1), %%mm3\n"
30595+ " movq %%mm0, (%2)\n"
30596+ " movq %%mm1, 8(%2)\n"
30597+ " movq %%mm2, 16(%2)\n"
30598+ " movq %%mm3, 24(%2)\n"
30599+ " movq 32(%1), %%mm0\n"
30600+ " movq 40(%1), %%mm1\n"
30601+ " movq 48(%1), %%mm2\n"
30602+ " movq 56(%1), %%mm3\n"
30603+ " movq %%mm0, 32(%2)\n"
30604+ " movq %%mm1, 40(%2)\n"
30605+ " movq %%mm2, 48(%2)\n"
30606+ " movq %%mm3, 56(%2)\n"
30607 ".section .fixup, \"ax\"\n"
30608- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30609+ "3:\n"
30610+
30611+#ifdef CONFIG_PAX_KERNEXEC
30612+ " movl %%cr0, %0\n"
30613+ " movl %0, %%eax\n"
30614+ " andl $0xFFFEFFFF, %%eax\n"
30615+ " movl %%eax, %%cr0\n"
30616+#endif
30617+
30618+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30619+
30620+#ifdef CONFIG_PAX_KERNEXEC
30621+ " movl %0, %%cr0\n"
30622+#endif
30623+
30624 " jmp 2b\n"
30625 ".previous\n"
30626 _ASM_EXTABLE(1b, 3b)
30627- : : "r" (from), "r" (to) : "memory");
30628+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30629
30630 from += 64;
30631 to += 64;
30632@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30633 static void fast_copy_page(void *to, void *from)
30634 {
30635 int i;
30636+ unsigned long cr0;
30637
30638 kernel_fpu_begin();
30639
30640@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30641 * but that is for later. -AV
30642 */
30643 __asm__ __volatile__(
30644- "1: prefetch (%0)\n"
30645- " prefetch 64(%0)\n"
30646- " prefetch 128(%0)\n"
30647- " prefetch 192(%0)\n"
30648- " prefetch 256(%0)\n"
30649+ "1: prefetch (%1)\n"
30650+ " prefetch 64(%1)\n"
30651+ " prefetch 128(%1)\n"
30652+ " prefetch 192(%1)\n"
30653+ " prefetch 256(%1)\n"
30654 "2: \n"
30655 ".section .fixup, \"ax\"\n"
30656- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30657+ "3: \n"
30658+
30659+#ifdef CONFIG_PAX_KERNEXEC
30660+ " movl %%cr0, %0\n"
30661+ " movl %0, %%eax\n"
30662+ " andl $0xFFFEFFFF, %%eax\n"
30663+ " movl %%eax, %%cr0\n"
30664+#endif
30665+
30666+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30667+
30668+#ifdef CONFIG_PAX_KERNEXEC
30669+ " movl %0, %%cr0\n"
30670+#endif
30671+
30672 " jmp 2b\n"
30673 ".previous\n"
30674- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30675+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30676
30677 for (i = 0; i < (4096-320)/64; i++) {
30678 __asm__ __volatile__ (
30679- "1: prefetch 320(%0)\n"
30680- "2: movq (%0), %%mm0\n"
30681- " movntq %%mm0, (%1)\n"
30682- " movq 8(%0), %%mm1\n"
30683- " movntq %%mm1, 8(%1)\n"
30684- " movq 16(%0), %%mm2\n"
30685- " movntq %%mm2, 16(%1)\n"
30686- " movq 24(%0), %%mm3\n"
30687- " movntq %%mm3, 24(%1)\n"
30688- " movq 32(%0), %%mm4\n"
30689- " movntq %%mm4, 32(%1)\n"
30690- " movq 40(%0), %%mm5\n"
30691- " movntq %%mm5, 40(%1)\n"
30692- " movq 48(%0), %%mm6\n"
30693- " movntq %%mm6, 48(%1)\n"
30694- " movq 56(%0), %%mm7\n"
30695- " movntq %%mm7, 56(%1)\n"
30696+ "1: prefetch 320(%1)\n"
30697+ "2: movq (%1), %%mm0\n"
30698+ " movntq %%mm0, (%2)\n"
30699+ " movq 8(%1), %%mm1\n"
30700+ " movntq %%mm1, 8(%2)\n"
30701+ " movq 16(%1), %%mm2\n"
30702+ " movntq %%mm2, 16(%2)\n"
30703+ " movq 24(%1), %%mm3\n"
30704+ " movntq %%mm3, 24(%2)\n"
30705+ " movq 32(%1), %%mm4\n"
30706+ " movntq %%mm4, 32(%2)\n"
30707+ " movq 40(%1), %%mm5\n"
30708+ " movntq %%mm5, 40(%2)\n"
30709+ " movq 48(%1), %%mm6\n"
30710+ " movntq %%mm6, 48(%2)\n"
30711+ " movq 56(%1), %%mm7\n"
30712+ " movntq %%mm7, 56(%2)\n"
30713 ".section .fixup, \"ax\"\n"
30714- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30715+ "3:\n"
30716+
30717+#ifdef CONFIG_PAX_KERNEXEC
30718+ " movl %%cr0, %0\n"
30719+ " movl %0, %%eax\n"
30720+ " andl $0xFFFEFFFF, %%eax\n"
30721+ " movl %%eax, %%cr0\n"
30722+#endif
30723+
30724+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30725+
30726+#ifdef CONFIG_PAX_KERNEXEC
30727+ " movl %0, %%cr0\n"
30728+#endif
30729+
30730 " jmp 2b\n"
30731 ".previous\n"
30732- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30733+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30734
30735 from += 64;
30736 to += 64;
30737@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30738 static void fast_copy_page(void *to, void *from)
30739 {
30740 int i;
30741+ unsigned long cr0;
30742
30743 kernel_fpu_begin();
30744
30745 __asm__ __volatile__ (
30746- "1: prefetch (%0)\n"
30747- " prefetch 64(%0)\n"
30748- " prefetch 128(%0)\n"
30749- " prefetch 192(%0)\n"
30750- " prefetch 256(%0)\n"
30751+ "1: prefetch (%1)\n"
30752+ " prefetch 64(%1)\n"
30753+ " prefetch 128(%1)\n"
30754+ " prefetch 192(%1)\n"
30755+ " prefetch 256(%1)\n"
30756 "2: \n"
30757 ".section .fixup, \"ax\"\n"
30758- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30759+ "3: \n"
30760+
30761+#ifdef CONFIG_PAX_KERNEXEC
30762+ " movl %%cr0, %0\n"
30763+ " movl %0, %%eax\n"
30764+ " andl $0xFFFEFFFF, %%eax\n"
30765+ " movl %%eax, %%cr0\n"
30766+#endif
30767+
30768+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30769+
30770+#ifdef CONFIG_PAX_KERNEXEC
30771+ " movl %0, %%cr0\n"
30772+#endif
30773+
30774 " jmp 2b\n"
30775 ".previous\n"
30776- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30777+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30778
30779 for (i = 0; i < 4096/64; i++) {
30780 __asm__ __volatile__ (
30781- "1: prefetch 320(%0)\n"
30782- "2: movq (%0), %%mm0\n"
30783- " movq 8(%0), %%mm1\n"
30784- " movq 16(%0), %%mm2\n"
30785- " movq 24(%0), %%mm3\n"
30786- " movq %%mm0, (%1)\n"
30787- " movq %%mm1, 8(%1)\n"
30788- " movq %%mm2, 16(%1)\n"
30789- " movq %%mm3, 24(%1)\n"
30790- " movq 32(%0), %%mm0\n"
30791- " movq 40(%0), %%mm1\n"
30792- " movq 48(%0), %%mm2\n"
30793- " movq 56(%0), %%mm3\n"
30794- " movq %%mm0, 32(%1)\n"
30795- " movq %%mm1, 40(%1)\n"
30796- " movq %%mm2, 48(%1)\n"
30797- " movq %%mm3, 56(%1)\n"
30798+ "1: prefetch 320(%1)\n"
30799+ "2: movq (%1), %%mm0\n"
30800+ " movq 8(%1), %%mm1\n"
30801+ " movq 16(%1), %%mm2\n"
30802+ " movq 24(%1), %%mm3\n"
30803+ " movq %%mm0, (%2)\n"
30804+ " movq %%mm1, 8(%2)\n"
30805+ " movq %%mm2, 16(%2)\n"
30806+ " movq %%mm3, 24(%2)\n"
30807+ " movq 32(%1), %%mm0\n"
30808+ " movq 40(%1), %%mm1\n"
30809+ " movq 48(%1), %%mm2\n"
30810+ " movq 56(%1), %%mm3\n"
30811+ " movq %%mm0, 32(%2)\n"
30812+ " movq %%mm1, 40(%2)\n"
30813+ " movq %%mm2, 48(%2)\n"
30814+ " movq %%mm3, 56(%2)\n"
30815 ".section .fixup, \"ax\"\n"
30816- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30817+ "3:\n"
30818+
30819+#ifdef CONFIG_PAX_KERNEXEC
30820+ " movl %%cr0, %0\n"
30821+ " movl %0, %%eax\n"
30822+ " andl $0xFFFEFFFF, %%eax\n"
30823+ " movl %%eax, %%cr0\n"
30824+#endif
30825+
30826+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30827+
30828+#ifdef CONFIG_PAX_KERNEXEC
30829+ " movl %0, %%cr0\n"
30830+#endif
30831+
30832 " jmp 2b\n"
30833 ".previous\n"
30834 _ASM_EXTABLE(1b, 3b)
30835- : : "r" (from), "r" (to) : "memory");
30836+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30837
30838 from += 64;
30839 to += 64;
30840diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30841index f6d13ee..d789440 100644
30842--- a/arch/x86/lib/msr-reg.S
30843+++ b/arch/x86/lib/msr-reg.S
30844@@ -3,6 +3,7 @@
30845 #include <asm/dwarf2.h>
30846 #include <asm/asm.h>
30847 #include <asm/msr.h>
30848+#include <asm/alternative-asm.h>
30849
30850 #ifdef CONFIG_X86_64
30851 /*
30852@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30853 movl %edi, 28(%r10)
30854 popq_cfi %rbp
30855 popq_cfi %rbx
30856+ pax_force_retaddr
30857 ret
30858 3:
30859 CFI_RESTORE_STATE
30860diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30861index fc6ba17..14ad9a5 100644
30862--- a/arch/x86/lib/putuser.S
30863+++ b/arch/x86/lib/putuser.S
30864@@ -16,7 +16,9 @@
30865 #include <asm/errno.h>
30866 #include <asm/asm.h>
30867 #include <asm/smap.h>
30868-
30869+#include <asm/segment.h>
30870+#include <asm/pgtable.h>
30871+#include <asm/alternative-asm.h>
30872
30873 /*
30874 * __put_user_X
30875@@ -30,57 +32,125 @@
30876 * as they get called from within inline assembly.
30877 */
30878
30879-#define ENTER CFI_STARTPROC ; \
30880- GET_THREAD_INFO(%_ASM_BX)
30881-#define EXIT ASM_CLAC ; \
30882- ret ; \
30883+#define ENTER CFI_STARTPROC
30884+#define EXIT ASM_CLAC ; \
30885+ pax_force_retaddr ; \
30886+ ret ; \
30887 CFI_ENDPROC
30888
30889+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30890+#define _DEST %_ASM_CX,%_ASM_BX
30891+#else
30892+#define _DEST %_ASM_CX
30893+#endif
30894+
30895+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30896+#define __copyuser_seg gs;
30897+#else
30898+#define __copyuser_seg
30899+#endif
30900+
30901 .text
30902 ENTRY(__put_user_1)
30903 ENTER
30904+
30905+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30906+ GET_THREAD_INFO(%_ASM_BX)
30907 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30908 jae bad_put_user
30909+
30910+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30911+ mov pax_user_shadow_base,%_ASM_BX
30912+ cmp %_ASM_BX,%_ASM_CX
30913+ jb 1234f
30914+ xor %ebx,%ebx
30915+1234:
30916+#endif
30917+
30918+#endif
30919+
30920 ASM_STAC
30921-1: movb %al,(%_ASM_CX)
30922+1: __copyuser_seg movb %al,(_DEST)
30923 xor %eax,%eax
30924 EXIT
30925 ENDPROC(__put_user_1)
30926
30927 ENTRY(__put_user_2)
30928 ENTER
30929+
30930+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30931+ GET_THREAD_INFO(%_ASM_BX)
30932 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30933 sub $1,%_ASM_BX
30934 cmp %_ASM_BX,%_ASM_CX
30935 jae bad_put_user
30936+
30937+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30938+ mov pax_user_shadow_base,%_ASM_BX
30939+ cmp %_ASM_BX,%_ASM_CX
30940+ jb 1234f
30941+ xor %ebx,%ebx
30942+1234:
30943+#endif
30944+
30945+#endif
30946+
30947 ASM_STAC
30948-2: movw %ax,(%_ASM_CX)
30949+2: __copyuser_seg movw %ax,(_DEST)
30950 xor %eax,%eax
30951 EXIT
30952 ENDPROC(__put_user_2)
30953
30954 ENTRY(__put_user_4)
30955 ENTER
30956+
30957+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30958+ GET_THREAD_INFO(%_ASM_BX)
30959 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30960 sub $3,%_ASM_BX
30961 cmp %_ASM_BX,%_ASM_CX
30962 jae bad_put_user
30963+
30964+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30965+ mov pax_user_shadow_base,%_ASM_BX
30966+ cmp %_ASM_BX,%_ASM_CX
30967+ jb 1234f
30968+ xor %ebx,%ebx
30969+1234:
30970+#endif
30971+
30972+#endif
30973+
30974 ASM_STAC
30975-3: movl %eax,(%_ASM_CX)
30976+3: __copyuser_seg movl %eax,(_DEST)
30977 xor %eax,%eax
30978 EXIT
30979 ENDPROC(__put_user_4)
30980
30981 ENTRY(__put_user_8)
30982 ENTER
30983+
30984+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30985+ GET_THREAD_INFO(%_ASM_BX)
30986 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30987 sub $7,%_ASM_BX
30988 cmp %_ASM_BX,%_ASM_CX
30989 jae bad_put_user
30990+
30991+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30992+ mov pax_user_shadow_base,%_ASM_BX
30993+ cmp %_ASM_BX,%_ASM_CX
30994+ jb 1234f
30995+ xor %ebx,%ebx
30996+1234:
30997+#endif
30998+
30999+#endif
31000+
31001 ASM_STAC
31002-4: mov %_ASM_AX,(%_ASM_CX)
31003+4: __copyuser_seg mov %_ASM_AX,(_DEST)
31004 #ifdef CONFIG_X86_32
31005-5: movl %edx,4(%_ASM_CX)
31006+5: __copyuser_seg movl %edx,4(_DEST)
31007 #endif
31008 xor %eax,%eax
31009 EXIT
31010diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
31011index 5dff5f0..cadebf4 100644
31012--- a/arch/x86/lib/rwsem.S
31013+++ b/arch/x86/lib/rwsem.S
31014@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
31015 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31016 CFI_RESTORE __ASM_REG(dx)
31017 restore_common_regs
31018+ pax_force_retaddr
31019 ret
31020 CFI_ENDPROC
31021 ENDPROC(call_rwsem_down_read_failed)
31022@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
31023 movq %rax,%rdi
31024 call rwsem_down_write_failed
31025 restore_common_regs
31026+ pax_force_retaddr
31027 ret
31028 CFI_ENDPROC
31029 ENDPROC(call_rwsem_down_write_failed)
31030@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
31031 movq %rax,%rdi
31032 call rwsem_wake
31033 restore_common_regs
31034-1: ret
31035+1: pax_force_retaddr
31036+ ret
31037 CFI_ENDPROC
31038 ENDPROC(call_rwsem_wake)
31039
31040@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
31041 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31042 CFI_RESTORE __ASM_REG(dx)
31043 restore_common_regs
31044+ pax_force_retaddr
31045 ret
31046 CFI_ENDPROC
31047 ENDPROC(call_rwsem_downgrade_wake)
31048diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
31049index b30b5eb..2b57052 100644
31050--- a/arch/x86/lib/thunk_64.S
31051+++ b/arch/x86/lib/thunk_64.S
31052@@ -9,6 +9,7 @@
31053 #include <asm/dwarf2.h>
31054 #include <asm/calling.h>
31055 #include <asm/asm.h>
31056+#include <asm/alternative-asm.h>
31057
31058 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
31059 .macro THUNK name, func, put_ret_addr_in_rdi=0
31060@@ -16,11 +17,11 @@
31061 \name:
31062 CFI_STARTPROC
31063
31064- /* this one pushes 9 elems, the next one would be %rIP */
31065- SAVE_ARGS
31066+ /* this one pushes 15+1 elems, the next one would be %rIP */
31067+ SAVE_ARGS 8
31068
31069 .if \put_ret_addr_in_rdi
31070- movq_cfi_restore 9*8, rdi
31071+ movq_cfi_restore RIP, rdi
31072 .endif
31073
31074 call \func
31075@@ -47,9 +48,10 @@
31076
31077 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
31078 CFI_STARTPROC
31079- SAVE_ARGS
31080+ SAVE_ARGS 8
31081 restore:
31082- RESTORE_ARGS
31083+ RESTORE_ARGS 1,8
31084+ pax_force_retaddr
31085 ret
31086 CFI_ENDPROC
31087 _ASM_NOKPROBE(restore)
31088diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31089index e2f5e21..4b22130 100644
31090--- a/arch/x86/lib/usercopy_32.c
31091+++ b/arch/x86/lib/usercopy_32.c
31092@@ -42,11 +42,13 @@ do { \
31093 int __d0; \
31094 might_fault(); \
31095 __asm__ __volatile__( \
31096+ __COPYUSER_SET_ES \
31097 ASM_STAC "\n" \
31098 "0: rep; stosl\n" \
31099 " movl %2,%0\n" \
31100 "1: rep; stosb\n" \
31101 "2: " ASM_CLAC "\n" \
31102+ __COPYUSER_RESTORE_ES \
31103 ".section .fixup,\"ax\"\n" \
31104 "3: lea 0(%2,%0,4),%0\n" \
31105 " jmp 2b\n" \
31106@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31107
31108 #ifdef CONFIG_X86_INTEL_USERCOPY
31109 static unsigned long
31110-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31111+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31112 {
31113 int d0, d1;
31114 __asm__ __volatile__(
31115@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31116 " .align 2,0x90\n"
31117 "3: movl 0(%4), %%eax\n"
31118 "4: movl 4(%4), %%edx\n"
31119- "5: movl %%eax, 0(%3)\n"
31120- "6: movl %%edx, 4(%3)\n"
31121+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31122+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31123 "7: movl 8(%4), %%eax\n"
31124 "8: movl 12(%4),%%edx\n"
31125- "9: movl %%eax, 8(%3)\n"
31126- "10: movl %%edx, 12(%3)\n"
31127+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31128+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31129 "11: movl 16(%4), %%eax\n"
31130 "12: movl 20(%4), %%edx\n"
31131- "13: movl %%eax, 16(%3)\n"
31132- "14: movl %%edx, 20(%3)\n"
31133+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31134+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31135 "15: movl 24(%4), %%eax\n"
31136 "16: movl 28(%4), %%edx\n"
31137- "17: movl %%eax, 24(%3)\n"
31138- "18: movl %%edx, 28(%3)\n"
31139+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31140+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31141 "19: movl 32(%4), %%eax\n"
31142 "20: movl 36(%4), %%edx\n"
31143- "21: movl %%eax, 32(%3)\n"
31144- "22: movl %%edx, 36(%3)\n"
31145+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31146+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31147 "23: movl 40(%4), %%eax\n"
31148 "24: movl 44(%4), %%edx\n"
31149- "25: movl %%eax, 40(%3)\n"
31150- "26: movl %%edx, 44(%3)\n"
31151+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31152+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31153 "27: movl 48(%4), %%eax\n"
31154 "28: movl 52(%4), %%edx\n"
31155- "29: movl %%eax, 48(%3)\n"
31156- "30: movl %%edx, 52(%3)\n"
31157+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31158+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31159 "31: movl 56(%4), %%eax\n"
31160 "32: movl 60(%4), %%edx\n"
31161- "33: movl %%eax, 56(%3)\n"
31162- "34: movl %%edx, 60(%3)\n"
31163+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31164+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31165 " addl $-64, %0\n"
31166 " addl $64, %4\n"
31167 " addl $64, %3\n"
31168@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31169 " shrl $2, %0\n"
31170 " andl $3, %%eax\n"
31171 " cld\n"
31172+ __COPYUSER_SET_ES
31173 "99: rep; movsl\n"
31174 "36: movl %%eax, %0\n"
31175 "37: rep; movsb\n"
31176 "100:\n"
31177+ __COPYUSER_RESTORE_ES
31178+ ".section .fixup,\"ax\"\n"
31179+ "101: lea 0(%%eax,%0,4),%0\n"
31180+ " jmp 100b\n"
31181+ ".previous\n"
31182+ _ASM_EXTABLE(1b,100b)
31183+ _ASM_EXTABLE(2b,100b)
31184+ _ASM_EXTABLE(3b,100b)
31185+ _ASM_EXTABLE(4b,100b)
31186+ _ASM_EXTABLE(5b,100b)
31187+ _ASM_EXTABLE(6b,100b)
31188+ _ASM_EXTABLE(7b,100b)
31189+ _ASM_EXTABLE(8b,100b)
31190+ _ASM_EXTABLE(9b,100b)
31191+ _ASM_EXTABLE(10b,100b)
31192+ _ASM_EXTABLE(11b,100b)
31193+ _ASM_EXTABLE(12b,100b)
31194+ _ASM_EXTABLE(13b,100b)
31195+ _ASM_EXTABLE(14b,100b)
31196+ _ASM_EXTABLE(15b,100b)
31197+ _ASM_EXTABLE(16b,100b)
31198+ _ASM_EXTABLE(17b,100b)
31199+ _ASM_EXTABLE(18b,100b)
31200+ _ASM_EXTABLE(19b,100b)
31201+ _ASM_EXTABLE(20b,100b)
31202+ _ASM_EXTABLE(21b,100b)
31203+ _ASM_EXTABLE(22b,100b)
31204+ _ASM_EXTABLE(23b,100b)
31205+ _ASM_EXTABLE(24b,100b)
31206+ _ASM_EXTABLE(25b,100b)
31207+ _ASM_EXTABLE(26b,100b)
31208+ _ASM_EXTABLE(27b,100b)
31209+ _ASM_EXTABLE(28b,100b)
31210+ _ASM_EXTABLE(29b,100b)
31211+ _ASM_EXTABLE(30b,100b)
31212+ _ASM_EXTABLE(31b,100b)
31213+ _ASM_EXTABLE(32b,100b)
31214+ _ASM_EXTABLE(33b,100b)
31215+ _ASM_EXTABLE(34b,100b)
31216+ _ASM_EXTABLE(35b,100b)
31217+ _ASM_EXTABLE(36b,100b)
31218+ _ASM_EXTABLE(37b,100b)
31219+ _ASM_EXTABLE(99b,101b)
31220+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31221+ : "1"(to), "2"(from), "0"(size)
31222+ : "eax", "edx", "memory");
31223+ return size;
31224+}
31225+
31226+static unsigned long
31227+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31228+{
31229+ int d0, d1;
31230+ __asm__ __volatile__(
31231+ " .align 2,0x90\n"
31232+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31233+ " cmpl $67, %0\n"
31234+ " jbe 3f\n"
31235+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31236+ " .align 2,0x90\n"
31237+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31238+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31239+ "5: movl %%eax, 0(%3)\n"
31240+ "6: movl %%edx, 4(%3)\n"
31241+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31242+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31243+ "9: movl %%eax, 8(%3)\n"
31244+ "10: movl %%edx, 12(%3)\n"
31245+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31246+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31247+ "13: movl %%eax, 16(%3)\n"
31248+ "14: movl %%edx, 20(%3)\n"
31249+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31250+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31251+ "17: movl %%eax, 24(%3)\n"
31252+ "18: movl %%edx, 28(%3)\n"
31253+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31254+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31255+ "21: movl %%eax, 32(%3)\n"
31256+ "22: movl %%edx, 36(%3)\n"
31257+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31258+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31259+ "25: movl %%eax, 40(%3)\n"
31260+ "26: movl %%edx, 44(%3)\n"
31261+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31262+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31263+ "29: movl %%eax, 48(%3)\n"
31264+ "30: movl %%edx, 52(%3)\n"
31265+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31266+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31267+ "33: movl %%eax, 56(%3)\n"
31268+ "34: movl %%edx, 60(%3)\n"
31269+ " addl $-64, %0\n"
31270+ " addl $64, %4\n"
31271+ " addl $64, %3\n"
31272+ " cmpl $63, %0\n"
31273+ " ja 1b\n"
31274+ "35: movl %0, %%eax\n"
31275+ " shrl $2, %0\n"
31276+ " andl $3, %%eax\n"
31277+ " cld\n"
31278+ "99: rep; "__copyuser_seg" movsl\n"
31279+ "36: movl %%eax, %0\n"
31280+ "37: rep; "__copyuser_seg" movsb\n"
31281+ "100:\n"
31282 ".section .fixup,\"ax\"\n"
31283 "101: lea 0(%%eax,%0,4),%0\n"
31284 " jmp 100b\n"
31285@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31286 int d0, d1;
31287 __asm__ __volatile__(
31288 " .align 2,0x90\n"
31289- "0: movl 32(%4), %%eax\n"
31290+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31291 " cmpl $67, %0\n"
31292 " jbe 2f\n"
31293- "1: movl 64(%4), %%eax\n"
31294+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31295 " .align 2,0x90\n"
31296- "2: movl 0(%4), %%eax\n"
31297- "21: movl 4(%4), %%edx\n"
31298+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31299+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31300 " movl %%eax, 0(%3)\n"
31301 " movl %%edx, 4(%3)\n"
31302- "3: movl 8(%4), %%eax\n"
31303- "31: movl 12(%4),%%edx\n"
31304+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31305+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31306 " movl %%eax, 8(%3)\n"
31307 " movl %%edx, 12(%3)\n"
31308- "4: movl 16(%4), %%eax\n"
31309- "41: movl 20(%4), %%edx\n"
31310+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31311+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31312 " movl %%eax, 16(%3)\n"
31313 " movl %%edx, 20(%3)\n"
31314- "10: movl 24(%4), %%eax\n"
31315- "51: movl 28(%4), %%edx\n"
31316+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31317+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31318 " movl %%eax, 24(%3)\n"
31319 " movl %%edx, 28(%3)\n"
31320- "11: movl 32(%4), %%eax\n"
31321- "61: movl 36(%4), %%edx\n"
31322+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31323+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31324 " movl %%eax, 32(%3)\n"
31325 " movl %%edx, 36(%3)\n"
31326- "12: movl 40(%4), %%eax\n"
31327- "71: movl 44(%4), %%edx\n"
31328+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31329+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31330 " movl %%eax, 40(%3)\n"
31331 " movl %%edx, 44(%3)\n"
31332- "13: movl 48(%4), %%eax\n"
31333- "81: movl 52(%4), %%edx\n"
31334+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31335+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31336 " movl %%eax, 48(%3)\n"
31337 " movl %%edx, 52(%3)\n"
31338- "14: movl 56(%4), %%eax\n"
31339- "91: movl 60(%4), %%edx\n"
31340+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31341+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31342 " movl %%eax, 56(%3)\n"
31343 " movl %%edx, 60(%3)\n"
31344 " addl $-64, %0\n"
31345@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31346 " shrl $2, %0\n"
31347 " andl $3, %%eax\n"
31348 " cld\n"
31349- "6: rep; movsl\n"
31350+ "6: rep; "__copyuser_seg" movsl\n"
31351 " movl %%eax,%0\n"
31352- "7: rep; movsb\n"
31353+ "7: rep; "__copyuser_seg" movsb\n"
31354 "8:\n"
31355 ".section .fixup,\"ax\"\n"
31356 "9: lea 0(%%eax,%0,4),%0\n"
31357@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31358
31359 __asm__ __volatile__(
31360 " .align 2,0x90\n"
31361- "0: movl 32(%4), %%eax\n"
31362+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31363 " cmpl $67, %0\n"
31364 " jbe 2f\n"
31365- "1: movl 64(%4), %%eax\n"
31366+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31367 " .align 2,0x90\n"
31368- "2: movl 0(%4), %%eax\n"
31369- "21: movl 4(%4), %%edx\n"
31370+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31371+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31372 " movnti %%eax, 0(%3)\n"
31373 " movnti %%edx, 4(%3)\n"
31374- "3: movl 8(%4), %%eax\n"
31375- "31: movl 12(%4),%%edx\n"
31376+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31377+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31378 " movnti %%eax, 8(%3)\n"
31379 " movnti %%edx, 12(%3)\n"
31380- "4: movl 16(%4), %%eax\n"
31381- "41: movl 20(%4), %%edx\n"
31382+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31383+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31384 " movnti %%eax, 16(%3)\n"
31385 " movnti %%edx, 20(%3)\n"
31386- "10: movl 24(%4), %%eax\n"
31387- "51: movl 28(%4), %%edx\n"
31388+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31389+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31390 " movnti %%eax, 24(%3)\n"
31391 " movnti %%edx, 28(%3)\n"
31392- "11: movl 32(%4), %%eax\n"
31393- "61: movl 36(%4), %%edx\n"
31394+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31395+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31396 " movnti %%eax, 32(%3)\n"
31397 " movnti %%edx, 36(%3)\n"
31398- "12: movl 40(%4), %%eax\n"
31399- "71: movl 44(%4), %%edx\n"
31400+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31401+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31402 " movnti %%eax, 40(%3)\n"
31403 " movnti %%edx, 44(%3)\n"
31404- "13: movl 48(%4), %%eax\n"
31405- "81: movl 52(%4), %%edx\n"
31406+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31407+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31408 " movnti %%eax, 48(%3)\n"
31409 " movnti %%edx, 52(%3)\n"
31410- "14: movl 56(%4), %%eax\n"
31411- "91: movl 60(%4), %%edx\n"
31412+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31413+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31414 " movnti %%eax, 56(%3)\n"
31415 " movnti %%edx, 60(%3)\n"
31416 " addl $-64, %0\n"
31417@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31418 " shrl $2, %0\n"
31419 " andl $3, %%eax\n"
31420 " cld\n"
31421- "6: rep; movsl\n"
31422+ "6: rep; "__copyuser_seg" movsl\n"
31423 " movl %%eax,%0\n"
31424- "7: rep; movsb\n"
31425+ "7: rep; "__copyuser_seg" movsb\n"
31426 "8:\n"
31427 ".section .fixup,\"ax\"\n"
31428 "9: lea 0(%%eax,%0,4),%0\n"
31429@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31430
31431 __asm__ __volatile__(
31432 " .align 2,0x90\n"
31433- "0: movl 32(%4), %%eax\n"
31434+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31435 " cmpl $67, %0\n"
31436 " jbe 2f\n"
31437- "1: movl 64(%4), %%eax\n"
31438+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31439 " .align 2,0x90\n"
31440- "2: movl 0(%4), %%eax\n"
31441- "21: movl 4(%4), %%edx\n"
31442+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31443+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31444 " movnti %%eax, 0(%3)\n"
31445 " movnti %%edx, 4(%3)\n"
31446- "3: movl 8(%4), %%eax\n"
31447- "31: movl 12(%4),%%edx\n"
31448+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31449+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31450 " movnti %%eax, 8(%3)\n"
31451 " movnti %%edx, 12(%3)\n"
31452- "4: movl 16(%4), %%eax\n"
31453- "41: movl 20(%4), %%edx\n"
31454+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31455+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31456 " movnti %%eax, 16(%3)\n"
31457 " movnti %%edx, 20(%3)\n"
31458- "10: movl 24(%4), %%eax\n"
31459- "51: movl 28(%4), %%edx\n"
31460+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31461+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31462 " movnti %%eax, 24(%3)\n"
31463 " movnti %%edx, 28(%3)\n"
31464- "11: movl 32(%4), %%eax\n"
31465- "61: movl 36(%4), %%edx\n"
31466+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31467+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31468 " movnti %%eax, 32(%3)\n"
31469 " movnti %%edx, 36(%3)\n"
31470- "12: movl 40(%4), %%eax\n"
31471- "71: movl 44(%4), %%edx\n"
31472+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31473+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31474 " movnti %%eax, 40(%3)\n"
31475 " movnti %%edx, 44(%3)\n"
31476- "13: movl 48(%4), %%eax\n"
31477- "81: movl 52(%4), %%edx\n"
31478+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31479+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31480 " movnti %%eax, 48(%3)\n"
31481 " movnti %%edx, 52(%3)\n"
31482- "14: movl 56(%4), %%eax\n"
31483- "91: movl 60(%4), %%edx\n"
31484+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31485+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31486 " movnti %%eax, 56(%3)\n"
31487 " movnti %%edx, 60(%3)\n"
31488 " addl $-64, %0\n"
31489@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31490 " shrl $2, %0\n"
31491 " andl $3, %%eax\n"
31492 " cld\n"
31493- "6: rep; movsl\n"
31494+ "6: rep; "__copyuser_seg" movsl\n"
31495 " movl %%eax,%0\n"
31496- "7: rep; movsb\n"
31497+ "7: rep; "__copyuser_seg" movsb\n"
31498 "8:\n"
31499 ".section .fixup,\"ax\"\n"
31500 "9: lea 0(%%eax,%0,4),%0\n"
31501@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31502 */
31503 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31504 unsigned long size);
31505-unsigned long __copy_user_intel(void __user *to, const void *from,
31506+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31507+ unsigned long size);
31508+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31509 unsigned long size);
31510 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31511 const void __user *from, unsigned long size);
31512 #endif /* CONFIG_X86_INTEL_USERCOPY */
31513
31514 /* Generic arbitrary sized copy. */
31515-#define __copy_user(to, from, size) \
31516+#define __copy_user(to, from, size, prefix, set, restore) \
31517 do { \
31518 int __d0, __d1, __d2; \
31519 __asm__ __volatile__( \
31520+ set \
31521 " cmp $7,%0\n" \
31522 " jbe 1f\n" \
31523 " movl %1,%0\n" \
31524 " negl %0\n" \
31525 " andl $7,%0\n" \
31526 " subl %0,%3\n" \
31527- "4: rep; movsb\n" \
31528+ "4: rep; "prefix"movsb\n" \
31529 " movl %3,%0\n" \
31530 " shrl $2,%0\n" \
31531 " andl $3,%3\n" \
31532 " .align 2,0x90\n" \
31533- "0: rep; movsl\n" \
31534+ "0: rep; "prefix"movsl\n" \
31535 " movl %3,%0\n" \
31536- "1: rep; movsb\n" \
31537+ "1: rep; "prefix"movsb\n" \
31538 "2:\n" \
31539+ restore \
31540 ".section .fixup,\"ax\"\n" \
31541 "5: addl %3,%0\n" \
31542 " jmp 2b\n" \
31543@@ -538,14 +650,14 @@ do { \
31544 " negl %0\n" \
31545 " andl $7,%0\n" \
31546 " subl %0,%3\n" \
31547- "4: rep; movsb\n" \
31548+ "4: rep; "__copyuser_seg"movsb\n" \
31549 " movl %3,%0\n" \
31550 " shrl $2,%0\n" \
31551 " andl $3,%3\n" \
31552 " .align 2,0x90\n" \
31553- "0: rep; movsl\n" \
31554+ "0: rep; "__copyuser_seg"movsl\n" \
31555 " movl %3,%0\n" \
31556- "1: rep; movsb\n" \
31557+ "1: rep; "__copyuser_seg"movsb\n" \
31558 "2:\n" \
31559 ".section .fixup,\"ax\"\n" \
31560 "5: addl %3,%0\n" \
31561@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31562 {
31563 stac();
31564 if (movsl_is_ok(to, from, n))
31565- __copy_user(to, from, n);
31566+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31567 else
31568- n = __copy_user_intel(to, from, n);
31569+ n = __generic_copy_to_user_intel(to, from, n);
31570 clac();
31571 return n;
31572 }
31573@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31574 {
31575 stac();
31576 if (movsl_is_ok(to, from, n))
31577- __copy_user(to, from, n);
31578+ __copy_user(to, from, n, __copyuser_seg, "", "");
31579 else
31580- n = __copy_user_intel((void __user *)to,
31581- (const void *)from, n);
31582+ n = __generic_copy_from_user_intel(to, from, n);
31583 clac();
31584 return n;
31585 }
31586@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31587 if (n > 64 && cpu_has_xmm2)
31588 n = __copy_user_intel_nocache(to, from, n);
31589 else
31590- __copy_user(to, from, n);
31591+ __copy_user(to, from, n, __copyuser_seg, "", "");
31592 #else
31593- __copy_user(to, from, n);
31594+ __copy_user(to, from, n, __copyuser_seg, "", "");
31595 #endif
31596 clac();
31597 return n;
31598 }
31599 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31600
31601-/**
31602- * copy_to_user: - Copy a block of data into user space.
31603- * @to: Destination address, in user space.
31604- * @from: Source address, in kernel space.
31605- * @n: Number of bytes to copy.
31606- *
31607- * Context: User context only. This function may sleep.
31608- *
31609- * Copy data from kernel space to user space.
31610- *
31611- * Returns number of bytes that could not be copied.
31612- * On success, this will be zero.
31613- */
31614-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31615+#ifdef CONFIG_PAX_MEMORY_UDEREF
31616+void __set_fs(mm_segment_t x)
31617 {
31618- if (access_ok(VERIFY_WRITE, to, n))
31619- n = __copy_to_user(to, from, n);
31620- return n;
31621+ switch (x.seg) {
31622+ case 0:
31623+ loadsegment(gs, 0);
31624+ break;
31625+ case TASK_SIZE_MAX:
31626+ loadsegment(gs, __USER_DS);
31627+ break;
31628+ case -1UL:
31629+ loadsegment(gs, __KERNEL_DS);
31630+ break;
31631+ default:
31632+ BUG();
31633+ }
31634 }
31635-EXPORT_SYMBOL(_copy_to_user);
31636+EXPORT_SYMBOL(__set_fs);
31637
31638-/**
31639- * copy_from_user: - Copy a block of data from user space.
31640- * @to: Destination address, in kernel space.
31641- * @from: Source address, in user space.
31642- * @n: Number of bytes to copy.
31643- *
31644- * Context: User context only. This function may sleep.
31645- *
31646- * Copy data from user space to kernel space.
31647- *
31648- * Returns number of bytes that could not be copied.
31649- * On success, this will be zero.
31650- *
31651- * If some data could not be copied, this function will pad the copied
31652- * data to the requested size using zero bytes.
31653- */
31654-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31655+void set_fs(mm_segment_t x)
31656 {
31657- if (access_ok(VERIFY_READ, from, n))
31658- n = __copy_from_user(to, from, n);
31659- else
31660- memset(to, 0, n);
31661- return n;
31662+ current_thread_info()->addr_limit = x;
31663+ __set_fs(x);
31664 }
31665-EXPORT_SYMBOL(_copy_from_user);
31666+EXPORT_SYMBOL(set_fs);
31667+#endif
31668diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31669index 0a42327..7a82465 100644
31670--- a/arch/x86/lib/usercopy_64.c
31671+++ b/arch/x86/lib/usercopy_64.c
31672@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31673 might_fault();
31674 /* no memory constraint because it doesn't change any memory gcc knows
31675 about */
31676+ pax_open_userland();
31677 stac();
31678 asm volatile(
31679 " testq %[size8],%[size8]\n"
31680@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31681 _ASM_EXTABLE(0b,3b)
31682 _ASM_EXTABLE(1b,2b)
31683 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31684- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31685+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31686 [zero] "r" (0UL), [eight] "r" (8UL));
31687 clac();
31688+ pax_close_userland();
31689 return size;
31690 }
31691 EXPORT_SYMBOL(__clear_user);
31692@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31693 }
31694 EXPORT_SYMBOL(clear_user);
31695
31696-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31697+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31698 {
31699- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31700- return copy_user_generic((__force void *)to, (__force void *)from, len);
31701- }
31702- return len;
31703+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31704+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31705+ return len;
31706 }
31707 EXPORT_SYMBOL(copy_in_user);
31708
31709@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
31710 * it is not necessary to optimize tail handling.
31711 */
31712 __visible unsigned long
31713-copy_user_handle_tail(char *to, char *from, unsigned len)
31714+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
31715 {
31716+ clac();
31717+ pax_close_userland();
31718 for (; len; --len, to++) {
31719 char c;
31720
31721@@ -79,10 +82,9 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
31722 if (__put_user_nocheck(c, to, sizeof(char)))
31723 break;
31724 }
31725- clac();
31726
31727 /* If the destination is a kernel buffer, we always clear the end */
31728- if (!__addr_ok(to))
31729+ if (!__addr_ok(to) && (unsigned long)to >= TASK_SIZE_MAX + pax_user_shadow_base)
31730 memset(to, 0, len);
31731 return len;
31732 }
31733diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31734index c4cc740..60a7362 100644
31735--- a/arch/x86/mm/Makefile
31736+++ b/arch/x86/mm/Makefile
31737@@ -35,3 +35,7 @@ obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31738 obj-$(CONFIG_MEMTEST) += memtest.o
31739
31740 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
31741+
31742+quote:="
31743+obj-$(CONFIG_X86_64) += uderef_64.o
31744+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31745diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31746index 903ec1e..c4166b2 100644
31747--- a/arch/x86/mm/extable.c
31748+++ b/arch/x86/mm/extable.c
31749@@ -6,12 +6,24 @@
31750 static inline unsigned long
31751 ex_insn_addr(const struct exception_table_entry *x)
31752 {
31753- return (unsigned long)&x->insn + x->insn;
31754+ unsigned long reloc = 0;
31755+
31756+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31757+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31758+#endif
31759+
31760+ return (unsigned long)&x->insn + x->insn + reloc;
31761 }
31762 static inline unsigned long
31763 ex_fixup_addr(const struct exception_table_entry *x)
31764 {
31765- return (unsigned long)&x->fixup + x->fixup;
31766+ unsigned long reloc = 0;
31767+
31768+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31769+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31770+#endif
31771+
31772+ return (unsigned long)&x->fixup + x->fixup + reloc;
31773 }
31774
31775 int fixup_exception(struct pt_regs *regs)
31776@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31777 unsigned long new_ip;
31778
31779 #ifdef CONFIG_PNPBIOS
31780- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31781+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31782 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31783 extern u32 pnp_bios_is_utter_crap;
31784 pnp_bios_is_utter_crap = 1;
31785@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31786 i += 4;
31787 p->fixup -= i;
31788 i += 4;
31789+
31790+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31791+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31792+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31793+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31794+#endif
31795+
31796 }
31797 }
31798
31799diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31800index ede025f..1ef909b 100644
31801--- a/arch/x86/mm/fault.c
31802+++ b/arch/x86/mm/fault.c
31803@@ -13,12 +13,19 @@
31804 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31805 #include <linux/prefetch.h> /* prefetchw */
31806 #include <linux/context_tracking.h> /* exception_enter(), ... */
31807+#include <linux/unistd.h>
31808+#include <linux/compiler.h>
31809
31810 #include <asm/traps.h> /* dotraplinkage, ... */
31811 #include <asm/pgalloc.h> /* pgd_*(), ... */
31812 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31813 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31814 #include <asm/vsyscall.h> /* emulate_vsyscall */
31815+#include <asm/tlbflush.h>
31816+
31817+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31818+#include <asm/stacktrace.h>
31819+#endif
31820
31821 #define CREATE_TRACE_POINTS
31822 #include <asm/trace/exceptions.h>
31823@@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31824 int ret = 0;
31825
31826 /* kprobe_running() needs smp_processor_id() */
31827- if (kprobes_built_in() && !user_mode_vm(regs)) {
31828+ if (kprobes_built_in() && !user_mode(regs)) {
31829 preempt_disable();
31830 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31831 ret = 1;
31832@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31833 return !instr_lo || (instr_lo>>1) == 1;
31834 case 0x00:
31835 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31836- if (probe_kernel_address(instr, opcode))
31837+ if (user_mode(regs)) {
31838+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31839+ return 0;
31840+ } else if (probe_kernel_address(instr, opcode))
31841 return 0;
31842
31843 *prefetch = (instr_lo == 0xF) &&
31844@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31845 while (instr < max_instr) {
31846 unsigned char opcode;
31847
31848- if (probe_kernel_address(instr, opcode))
31849+ if (user_mode(regs)) {
31850+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31851+ break;
31852+ } else if (probe_kernel_address(instr, opcode))
31853 break;
31854
31855 instr++;
31856@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31857 force_sig_info(si_signo, &info, tsk);
31858 }
31859
31860+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31861+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31862+#endif
31863+
31864+#ifdef CONFIG_PAX_EMUTRAMP
31865+static int pax_handle_fetch_fault(struct pt_regs *regs);
31866+#endif
31867+
31868+#ifdef CONFIG_PAX_PAGEEXEC
31869+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31870+{
31871+ pgd_t *pgd;
31872+ pud_t *pud;
31873+ pmd_t *pmd;
31874+
31875+ pgd = pgd_offset(mm, address);
31876+ if (!pgd_present(*pgd))
31877+ return NULL;
31878+ pud = pud_offset(pgd, address);
31879+ if (!pud_present(*pud))
31880+ return NULL;
31881+ pmd = pmd_offset(pud, address);
31882+ if (!pmd_present(*pmd))
31883+ return NULL;
31884+ return pmd;
31885+}
31886+#endif
31887+
31888 DEFINE_SPINLOCK(pgd_lock);
31889 LIST_HEAD(pgd_list);
31890
31891@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31892 for (address = VMALLOC_START & PMD_MASK;
31893 address >= TASK_SIZE && address < FIXADDR_TOP;
31894 address += PMD_SIZE) {
31895+
31896+#ifdef CONFIG_PAX_PER_CPU_PGD
31897+ unsigned long cpu;
31898+#else
31899 struct page *page;
31900+#endif
31901
31902 spin_lock(&pgd_lock);
31903+
31904+#ifdef CONFIG_PAX_PER_CPU_PGD
31905+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31906+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31907+ pmd_t *ret;
31908+
31909+ ret = vmalloc_sync_one(pgd, address);
31910+ if (!ret)
31911+ break;
31912+ pgd = get_cpu_pgd(cpu, kernel);
31913+#else
31914 list_for_each_entry(page, &pgd_list, lru) {
31915+ pgd_t *pgd;
31916 spinlock_t *pgt_lock;
31917 pmd_t *ret;
31918
31919@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31920 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31921
31922 spin_lock(pgt_lock);
31923- ret = vmalloc_sync_one(page_address(page), address);
31924+ pgd = page_address(page);
31925+#endif
31926+
31927+ ret = vmalloc_sync_one(pgd, address);
31928+
31929+#ifndef CONFIG_PAX_PER_CPU_PGD
31930 spin_unlock(pgt_lock);
31931+#endif
31932
31933 if (!ret)
31934 break;
31935@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31936 * an interrupt in the middle of a task switch..
31937 */
31938 pgd_paddr = read_cr3();
31939+
31940+#ifdef CONFIG_PAX_PER_CPU_PGD
31941+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31942+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31943+#endif
31944+
31945 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31946 if (!pmd_k)
31947 return -1;
31948@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31949 * happen within a race in page table update. In the later
31950 * case just flush:
31951 */
31952- pgd = pgd_offset(current->active_mm, address);
31953+
31954 pgd_ref = pgd_offset_k(address);
31955 if (pgd_none(*pgd_ref))
31956 return -1;
31957
31958+#ifdef CONFIG_PAX_PER_CPU_PGD
31959+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31960+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31961+ if (pgd_none(*pgd)) {
31962+ set_pgd(pgd, *pgd_ref);
31963+ arch_flush_lazy_mmu_mode();
31964+ } else {
31965+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31966+ }
31967+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31968+#else
31969+ pgd = pgd_offset(current->active_mm, address);
31970+#endif
31971+
31972 if (pgd_none(*pgd)) {
31973 set_pgd(pgd, *pgd_ref);
31974 arch_flush_lazy_mmu_mode();
31975@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31976 static int is_errata100(struct pt_regs *regs, unsigned long address)
31977 {
31978 #ifdef CONFIG_X86_64
31979- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31980+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31981 return 1;
31982 #endif
31983 return 0;
31984@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31985 }
31986
31987 static const char nx_warning[] = KERN_CRIT
31988-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31989+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31990 static const char smep_warning[] = KERN_CRIT
31991-"unable to execute userspace code (SMEP?) (uid: %d)\n";
31992+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31993
31994 static void
31995 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31996@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31997 if (!oops_may_print())
31998 return;
31999
32000- if (error_code & PF_INSTR) {
32001+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
32002 unsigned int level;
32003 pgd_t *pgd;
32004 pte_t *pte;
32005@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32006 pte = lookup_address_in_pgd(pgd, address, &level);
32007
32008 if (pte && pte_present(*pte) && !pte_exec(*pte))
32009- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
32010+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32011 if (pte && pte_present(*pte) && pte_exec(*pte) &&
32012 (pgd_flags(*pgd) & _PAGE_USER) &&
32013 (__read_cr4() & X86_CR4_SMEP))
32014- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
32015+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32016 }
32017
32018+#ifdef CONFIG_PAX_KERNEXEC
32019+ if (init_mm.start_code <= address && address < init_mm.end_code) {
32020+ if (current->signal->curr_ip)
32021+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
32022+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
32023+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32024+ else
32025+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
32026+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32027+ }
32028+#endif
32029+
32030 printk(KERN_ALERT "BUG: unable to handle kernel ");
32031 if (address < PAGE_SIZE)
32032 printk(KERN_CONT "NULL pointer dereference");
32033@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
32034 return;
32035 }
32036 #endif
32037+
32038+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32039+ if (pax_is_fetch_fault(regs, error_code, address)) {
32040+
32041+#ifdef CONFIG_PAX_EMUTRAMP
32042+ switch (pax_handle_fetch_fault(regs)) {
32043+ case 2:
32044+ return;
32045+ }
32046+#endif
32047+
32048+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32049+ do_group_exit(SIGKILL);
32050+ }
32051+#endif
32052+
32053 /* Kernel addresses are always protection faults: */
32054 if (address >= TASK_SIZE)
32055 error_code |= PF_PROT;
32056@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
32057 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
32058 printk(KERN_ERR
32059 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
32060- tsk->comm, tsk->pid, address);
32061+ tsk->comm, task_pid_nr(tsk), address);
32062 code = BUS_MCEERR_AR;
32063 }
32064 #endif
32065@@ -916,6 +1028,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
32066 return 1;
32067 }
32068
32069+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32070+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32071+{
32072+ pte_t *pte;
32073+ pmd_t *pmd;
32074+ spinlock_t *ptl;
32075+ unsigned char pte_mask;
32076+
32077+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32078+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
32079+ return 0;
32080+
32081+ /* PaX: it's our fault, let's handle it if we can */
32082+
32083+ /* PaX: take a look at read faults before acquiring any locks */
32084+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32085+ /* instruction fetch attempt from a protected page in user mode */
32086+ up_read(&mm->mmap_sem);
32087+
32088+#ifdef CONFIG_PAX_EMUTRAMP
32089+ switch (pax_handle_fetch_fault(regs)) {
32090+ case 2:
32091+ return 1;
32092+ }
32093+#endif
32094+
32095+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32096+ do_group_exit(SIGKILL);
32097+ }
32098+
32099+ pmd = pax_get_pmd(mm, address);
32100+ if (unlikely(!pmd))
32101+ return 0;
32102+
32103+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32104+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32105+ pte_unmap_unlock(pte, ptl);
32106+ return 0;
32107+ }
32108+
32109+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32110+ /* write attempt to a protected page in user mode */
32111+ pte_unmap_unlock(pte, ptl);
32112+ return 0;
32113+ }
32114+
32115+#ifdef CONFIG_SMP
32116+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32117+#else
32118+ if (likely(address > get_limit(regs->cs)))
32119+#endif
32120+ {
32121+ set_pte(pte, pte_mkread(*pte));
32122+ __flush_tlb_one(address);
32123+ pte_unmap_unlock(pte, ptl);
32124+ up_read(&mm->mmap_sem);
32125+ return 1;
32126+ }
32127+
32128+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32129+
32130+ /*
32131+ * PaX: fill DTLB with user rights and retry
32132+ */
32133+ __asm__ __volatile__ (
32134+ "orb %2,(%1)\n"
32135+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32136+/*
32137+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32138+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32139+ * page fault when examined during a TLB load attempt. this is true not only
32140+ * for PTEs holding a non-present entry but also present entries that will
32141+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32142+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32143+ * for our target pages since their PTEs are simply not in the TLBs at all.
32144+
32145+ * the best thing in omitting it is that we gain around 15-20% speed in the
32146+ * fast path of the page fault handler and can get rid of tracing since we
32147+ * can no longer flush unintended entries.
32148+ */
32149+ "invlpg (%0)\n"
32150+#endif
32151+ __copyuser_seg"testb $0,(%0)\n"
32152+ "xorb %3,(%1)\n"
32153+ :
32154+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32155+ : "memory", "cc");
32156+ pte_unmap_unlock(pte, ptl);
32157+ up_read(&mm->mmap_sem);
32158+ return 1;
32159+}
32160+#endif
32161+
32162 /*
32163 * Handle a spurious fault caused by a stale TLB entry.
32164 *
32165@@ -1001,6 +1206,9 @@ int show_unhandled_signals = 1;
32166 static inline int
32167 access_error(unsigned long error_code, struct vm_area_struct *vma)
32168 {
32169+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32170+ return 1;
32171+
32172 if (error_code & PF_WRITE) {
32173 /* write, present and write, not present: */
32174 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32175@@ -1035,7 +1243,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32176 if (error_code & PF_USER)
32177 return false;
32178
32179- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32180+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32181 return false;
32182
32183 return true;
32184@@ -1063,6 +1271,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32185 tsk = current;
32186 mm = tsk->mm;
32187
32188+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32189+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32190+ if (!search_exception_tables(regs->ip)) {
32191+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32192+ bad_area_nosemaphore(regs, error_code, address);
32193+ return;
32194+ }
32195+ if (address < pax_user_shadow_base) {
32196+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32197+ printk(KERN_EMERG "PAX: faulting IP: %pS\n", (void *)regs->ip);
32198+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_EMERG);
32199+ } else
32200+ address -= pax_user_shadow_base;
32201+ }
32202+#endif
32203+
32204 /*
32205 * Detect and handle instructions that would cause a page fault for
32206 * both a tracked kernel page and a userspace page.
32207@@ -1140,7 +1364,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32208 * User-mode registers count as a user access even for any
32209 * potential system fault or CPU buglet:
32210 */
32211- if (user_mode_vm(regs)) {
32212+ if (user_mode(regs)) {
32213 local_irq_enable();
32214 error_code |= PF_USER;
32215 flags |= FAULT_FLAG_USER;
32216@@ -1187,6 +1411,11 @@ retry:
32217 might_sleep();
32218 }
32219
32220+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32221+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32222+ return;
32223+#endif
32224+
32225 vma = find_vma(mm, address);
32226 if (unlikely(!vma)) {
32227 bad_area(regs, error_code, address);
32228@@ -1198,18 +1427,24 @@ retry:
32229 bad_area(regs, error_code, address);
32230 return;
32231 }
32232- if (error_code & PF_USER) {
32233- /*
32234- * Accessing the stack below %sp is always a bug.
32235- * The large cushion allows instructions like enter
32236- * and pusha to work. ("enter $65535, $31" pushes
32237- * 32 pointers and then decrements %sp by 65535.)
32238- */
32239- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32240- bad_area(regs, error_code, address);
32241- return;
32242- }
32243+ /*
32244+ * Accessing the stack below %sp is always a bug.
32245+ * The large cushion allows instructions like enter
32246+ * and pusha to work. ("enter $65535, $31" pushes
32247+ * 32 pointers and then decrements %sp by 65535.)
32248+ */
32249+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32250+ bad_area(regs, error_code, address);
32251+ return;
32252 }
32253+
32254+#ifdef CONFIG_PAX_SEGMEXEC
32255+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32256+ bad_area(regs, error_code, address);
32257+ return;
32258+ }
32259+#endif
32260+
32261 if (unlikely(expand_stack(vma, address))) {
32262 bad_area(regs, error_code, address);
32263 return;
32264@@ -1329,3 +1564,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32265 }
32266 NOKPROBE_SYMBOL(trace_do_page_fault);
32267 #endif /* CONFIG_TRACING */
32268+
32269+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32270+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32271+{
32272+ struct mm_struct *mm = current->mm;
32273+ unsigned long ip = regs->ip;
32274+
32275+ if (v8086_mode(regs))
32276+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32277+
32278+#ifdef CONFIG_PAX_PAGEEXEC
32279+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32280+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32281+ return true;
32282+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32283+ return true;
32284+ return false;
32285+ }
32286+#endif
32287+
32288+#ifdef CONFIG_PAX_SEGMEXEC
32289+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32290+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32291+ return true;
32292+ return false;
32293+ }
32294+#endif
32295+
32296+ return false;
32297+}
32298+#endif
32299+
32300+#ifdef CONFIG_PAX_EMUTRAMP
32301+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32302+{
32303+ int err;
32304+
32305+ do { /* PaX: libffi trampoline emulation */
32306+ unsigned char mov, jmp;
32307+ unsigned int addr1, addr2;
32308+
32309+#ifdef CONFIG_X86_64
32310+ if ((regs->ip + 9) >> 32)
32311+ break;
32312+#endif
32313+
32314+ err = get_user(mov, (unsigned char __user *)regs->ip);
32315+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32316+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32317+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32318+
32319+ if (err)
32320+ break;
32321+
32322+ if (mov == 0xB8 && jmp == 0xE9) {
32323+ regs->ax = addr1;
32324+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32325+ return 2;
32326+ }
32327+ } while (0);
32328+
32329+ do { /* PaX: gcc trampoline emulation #1 */
32330+ unsigned char mov1, mov2;
32331+ unsigned short jmp;
32332+ unsigned int addr1, addr2;
32333+
32334+#ifdef CONFIG_X86_64
32335+ if ((regs->ip + 11) >> 32)
32336+ break;
32337+#endif
32338+
32339+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32340+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32341+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32342+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32343+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32344+
32345+ if (err)
32346+ break;
32347+
32348+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32349+ regs->cx = addr1;
32350+ regs->ax = addr2;
32351+ regs->ip = addr2;
32352+ return 2;
32353+ }
32354+ } while (0);
32355+
32356+ do { /* PaX: gcc trampoline emulation #2 */
32357+ unsigned char mov, jmp;
32358+ unsigned int addr1, addr2;
32359+
32360+#ifdef CONFIG_X86_64
32361+ if ((regs->ip + 9) >> 32)
32362+ break;
32363+#endif
32364+
32365+ err = get_user(mov, (unsigned char __user *)regs->ip);
32366+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32367+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32368+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32369+
32370+ if (err)
32371+ break;
32372+
32373+ if (mov == 0xB9 && jmp == 0xE9) {
32374+ regs->cx = addr1;
32375+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32376+ return 2;
32377+ }
32378+ } while (0);
32379+
32380+ return 1; /* PaX in action */
32381+}
32382+
32383+#ifdef CONFIG_X86_64
32384+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32385+{
32386+ int err;
32387+
32388+ do { /* PaX: libffi trampoline emulation */
32389+ unsigned short mov1, mov2, jmp1;
32390+ unsigned char stcclc, jmp2;
32391+ unsigned long addr1, addr2;
32392+
32393+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32394+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32395+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32396+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32397+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32398+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32399+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32400+
32401+ if (err)
32402+ break;
32403+
32404+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32405+ regs->r11 = addr1;
32406+ regs->r10 = addr2;
32407+ if (stcclc == 0xF8)
32408+ regs->flags &= ~X86_EFLAGS_CF;
32409+ else
32410+ regs->flags |= X86_EFLAGS_CF;
32411+ regs->ip = addr1;
32412+ return 2;
32413+ }
32414+ } while (0);
32415+
32416+ do { /* PaX: gcc trampoline emulation #1 */
32417+ unsigned short mov1, mov2, jmp1;
32418+ unsigned char jmp2;
32419+ unsigned int addr1;
32420+ unsigned long addr2;
32421+
32422+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32423+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32424+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32425+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32426+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32427+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32428+
32429+ if (err)
32430+ break;
32431+
32432+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32433+ regs->r11 = addr1;
32434+ regs->r10 = addr2;
32435+ regs->ip = addr1;
32436+ return 2;
32437+ }
32438+ } while (0);
32439+
32440+ do { /* PaX: gcc trampoline emulation #2 */
32441+ unsigned short mov1, mov2, jmp1;
32442+ unsigned char jmp2;
32443+ unsigned long addr1, addr2;
32444+
32445+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32446+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32447+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32448+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32449+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32450+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32451+
32452+ if (err)
32453+ break;
32454+
32455+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32456+ regs->r11 = addr1;
32457+ regs->r10 = addr2;
32458+ regs->ip = addr1;
32459+ return 2;
32460+ }
32461+ } while (0);
32462+
32463+ return 1; /* PaX in action */
32464+}
32465+#endif
32466+
32467+/*
32468+ * PaX: decide what to do with offenders (regs->ip = fault address)
32469+ *
32470+ * returns 1 when task should be killed
32471+ * 2 when gcc trampoline was detected
32472+ */
32473+static int pax_handle_fetch_fault(struct pt_regs *regs)
32474+{
32475+ if (v8086_mode(regs))
32476+ return 1;
32477+
32478+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32479+ return 1;
32480+
32481+#ifdef CONFIG_X86_32
32482+ return pax_handle_fetch_fault_32(regs);
32483+#else
32484+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32485+ return pax_handle_fetch_fault_32(regs);
32486+ else
32487+ return pax_handle_fetch_fault_64(regs);
32488+#endif
32489+}
32490+#endif
32491+
32492+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32493+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32494+{
32495+ long i;
32496+
32497+ printk(KERN_ERR "PAX: bytes at PC: ");
32498+ for (i = 0; i < 20; i++) {
32499+ unsigned char c;
32500+ if (get_user(c, (unsigned char __force_user *)pc+i))
32501+ printk(KERN_CONT "?? ");
32502+ else
32503+ printk(KERN_CONT "%02x ", c);
32504+ }
32505+ printk("\n");
32506+
32507+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32508+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32509+ unsigned long c;
32510+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32511+#ifdef CONFIG_X86_32
32512+ printk(KERN_CONT "???????? ");
32513+#else
32514+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32515+ printk(KERN_CONT "???????? ???????? ");
32516+ else
32517+ printk(KERN_CONT "???????????????? ");
32518+#endif
32519+ } else {
32520+#ifdef CONFIG_X86_64
32521+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32522+ printk(KERN_CONT "%08x ", (unsigned int)c);
32523+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32524+ } else
32525+#endif
32526+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32527+ }
32528+ }
32529+ printk("\n");
32530+}
32531+#endif
32532+
32533+/**
32534+ * probe_kernel_write(): safely attempt to write to a location
32535+ * @dst: address to write to
32536+ * @src: pointer to the data that shall be written
32537+ * @size: size of the data chunk
32538+ *
32539+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32540+ * happens, handle that and return -EFAULT.
32541+ */
32542+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32543+{
32544+ long ret;
32545+ mm_segment_t old_fs = get_fs();
32546+
32547+ set_fs(KERNEL_DS);
32548+ pagefault_disable();
32549+ pax_open_kernel();
32550+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32551+ pax_close_kernel();
32552+ pagefault_enable();
32553+ set_fs(old_fs);
32554+
32555+ return ret ? -EFAULT : 0;
32556+}
32557diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32558index 81bf3d2..7ef25c2 100644
32559--- a/arch/x86/mm/gup.c
32560+++ b/arch/x86/mm/gup.c
32561@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32562 addr = start;
32563 len = (unsigned long) nr_pages << PAGE_SHIFT;
32564 end = start + len;
32565- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32566+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32567 (void __user *)start, len)))
32568 return 0;
32569
32570@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32571 goto slow_irqon;
32572 #endif
32573
32574+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32575+ (void __user *)start, len)))
32576+ return 0;
32577+
32578 /*
32579 * XXX: batch / limit 'nr', to avoid large irq off latency
32580 * needs some instrumenting to determine the common sizes used by
32581diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32582index 4500142..53a363c 100644
32583--- a/arch/x86/mm/highmem_32.c
32584+++ b/arch/x86/mm/highmem_32.c
32585@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32586 idx = type + KM_TYPE_NR*smp_processor_id();
32587 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32588 BUG_ON(!pte_none(*(kmap_pte-idx)));
32589+
32590+ pax_open_kernel();
32591 set_pte(kmap_pte-idx, mk_pte(page, prot));
32592+ pax_close_kernel();
32593+
32594 arch_flush_lazy_mmu_mode();
32595
32596 return (void *)vaddr;
32597diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32598index 42982b2..7168fc3 100644
32599--- a/arch/x86/mm/hugetlbpage.c
32600+++ b/arch/x86/mm/hugetlbpage.c
32601@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32602 #ifdef CONFIG_HUGETLB_PAGE
32603 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32604 unsigned long addr, unsigned long len,
32605- unsigned long pgoff, unsigned long flags)
32606+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32607 {
32608 struct hstate *h = hstate_file(file);
32609 struct vm_unmapped_area_info info;
32610-
32611+
32612 info.flags = 0;
32613 info.length = len;
32614 info.low_limit = current->mm->mmap_legacy_base;
32615 info.high_limit = TASK_SIZE;
32616 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32617 info.align_offset = 0;
32618+ info.threadstack_offset = offset;
32619 return vm_unmapped_area(&info);
32620 }
32621
32622 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32623 unsigned long addr0, unsigned long len,
32624- unsigned long pgoff, unsigned long flags)
32625+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32626 {
32627 struct hstate *h = hstate_file(file);
32628 struct vm_unmapped_area_info info;
32629@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32630 info.high_limit = current->mm->mmap_base;
32631 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32632 info.align_offset = 0;
32633+ info.threadstack_offset = offset;
32634 addr = vm_unmapped_area(&info);
32635
32636 /*
32637@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32638 VM_BUG_ON(addr != -ENOMEM);
32639 info.flags = 0;
32640 info.low_limit = TASK_UNMAPPED_BASE;
32641+
32642+#ifdef CONFIG_PAX_RANDMMAP
32643+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32644+ info.low_limit += current->mm->delta_mmap;
32645+#endif
32646+
32647 info.high_limit = TASK_SIZE;
32648 addr = vm_unmapped_area(&info);
32649 }
32650@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32651 struct hstate *h = hstate_file(file);
32652 struct mm_struct *mm = current->mm;
32653 struct vm_area_struct *vma;
32654+ unsigned long pax_task_size = TASK_SIZE;
32655+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32656
32657 if (len & ~huge_page_mask(h))
32658 return -EINVAL;
32659- if (len > TASK_SIZE)
32660+
32661+#ifdef CONFIG_PAX_SEGMEXEC
32662+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32663+ pax_task_size = SEGMEXEC_TASK_SIZE;
32664+#endif
32665+
32666+ pax_task_size -= PAGE_SIZE;
32667+
32668+ if (len > pax_task_size)
32669 return -ENOMEM;
32670
32671 if (flags & MAP_FIXED) {
32672@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32673 return addr;
32674 }
32675
32676+#ifdef CONFIG_PAX_RANDMMAP
32677+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32678+#endif
32679+
32680 if (addr) {
32681 addr = ALIGN(addr, huge_page_size(h));
32682 vma = find_vma(mm, addr);
32683- if (TASK_SIZE - len >= addr &&
32684- (!vma || addr + len <= vma->vm_start))
32685+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32686 return addr;
32687 }
32688 if (mm->get_unmapped_area == arch_get_unmapped_area)
32689 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32690- pgoff, flags);
32691+ pgoff, flags, offset);
32692 else
32693 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32694- pgoff, flags);
32695+ pgoff, flags, offset);
32696 }
32697 #endif /* CONFIG_HUGETLB_PAGE */
32698
32699diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32700index a110efc..a31a18f 100644
32701--- a/arch/x86/mm/init.c
32702+++ b/arch/x86/mm/init.c
32703@@ -4,6 +4,7 @@
32704 #include <linux/swap.h>
32705 #include <linux/memblock.h>
32706 #include <linux/bootmem.h> /* for max_low_pfn */
32707+#include <linux/tboot.h>
32708
32709 #include <asm/cacheflush.h>
32710 #include <asm/e820.h>
32711@@ -17,6 +18,8 @@
32712 #include <asm/proto.h>
32713 #include <asm/dma.h> /* for MAX_DMA_PFN */
32714 #include <asm/microcode.h>
32715+#include <asm/desc.h>
32716+#include <asm/bios_ebda.h>
32717
32718 /*
32719 * We need to define the tracepoints somewhere, and tlb.c
32720@@ -620,7 +623,18 @@ void __init init_mem_mapping(void)
32721 early_ioremap_page_table_range_init();
32722 #endif
32723
32724+#ifdef CONFIG_PAX_PER_CPU_PGD
32725+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32726+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32727+ KERNEL_PGD_PTRS);
32728+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32729+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32730+ KERNEL_PGD_PTRS);
32731+ load_cr3(get_cpu_pgd(0, kernel));
32732+#else
32733 load_cr3(swapper_pg_dir);
32734+#endif
32735+
32736 __flush_tlb_all();
32737
32738 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32739@@ -636,10 +650,40 @@ void __init init_mem_mapping(void)
32740 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32741 * mmio resources as well as potential bios/acpi data regions.
32742 */
32743+
32744+#ifdef CONFIG_GRKERNSEC_KMEM
32745+static unsigned int ebda_start __read_only;
32746+static unsigned int ebda_end __read_only;
32747+#endif
32748+
32749 int devmem_is_allowed(unsigned long pagenr)
32750 {
32751- if (pagenr < 256)
32752+#ifdef CONFIG_GRKERNSEC_KMEM
32753+ /* allow BDA */
32754+ if (!pagenr)
32755 return 1;
32756+ /* allow EBDA */
32757+ if (pagenr >= ebda_start && pagenr < ebda_end)
32758+ return 1;
32759+ /* if tboot is in use, allow access to its hardcoded serial log range */
32760+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32761+ return 1;
32762+#else
32763+ if (!pagenr)
32764+ return 1;
32765+#ifdef CONFIG_VM86
32766+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32767+ return 1;
32768+#endif
32769+#endif
32770+
32771+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32772+ return 1;
32773+#ifdef CONFIG_GRKERNSEC_KMEM
32774+ /* throw out everything else below 1MB */
32775+ if (pagenr <= 256)
32776+ return 0;
32777+#endif
32778 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32779 return 0;
32780 if (!page_is_ram(pagenr))
32781@@ -685,8 +729,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32782 #endif
32783 }
32784
32785+#ifdef CONFIG_GRKERNSEC_KMEM
32786+static inline void gr_init_ebda(void)
32787+{
32788+ unsigned int ebda_addr;
32789+ unsigned int ebda_size = 0;
32790+
32791+ ebda_addr = get_bios_ebda();
32792+ if (ebda_addr) {
32793+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32794+ ebda_size <<= 10;
32795+ }
32796+ if (ebda_addr && ebda_size) {
32797+ ebda_start = ebda_addr >> PAGE_SHIFT;
32798+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32799+ } else {
32800+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32801+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32802+ }
32803+}
32804+#else
32805+static inline void gr_init_ebda(void) { }
32806+#endif
32807+
32808 void free_initmem(void)
32809 {
32810+#ifdef CONFIG_PAX_KERNEXEC
32811+#ifdef CONFIG_X86_32
32812+ /* PaX: limit KERNEL_CS to actual size */
32813+ unsigned long addr, limit;
32814+ struct desc_struct d;
32815+ int cpu;
32816+#else
32817+ pgd_t *pgd;
32818+ pud_t *pud;
32819+ pmd_t *pmd;
32820+ unsigned long addr, end;
32821+#endif
32822+#endif
32823+
32824+ gr_init_ebda();
32825+
32826+#ifdef CONFIG_PAX_KERNEXEC
32827+#ifdef CONFIG_X86_32
32828+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32829+ limit = (limit - 1UL) >> PAGE_SHIFT;
32830+
32831+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32832+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32833+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32834+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32835+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32836+ }
32837+
32838+ /* PaX: make KERNEL_CS read-only */
32839+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32840+ if (!paravirt_enabled())
32841+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32842+/*
32843+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32844+ pgd = pgd_offset_k(addr);
32845+ pud = pud_offset(pgd, addr);
32846+ pmd = pmd_offset(pud, addr);
32847+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32848+ }
32849+*/
32850+#ifdef CONFIG_X86_PAE
32851+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32852+/*
32853+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32854+ pgd = pgd_offset_k(addr);
32855+ pud = pud_offset(pgd, addr);
32856+ pmd = pmd_offset(pud, addr);
32857+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32858+ }
32859+*/
32860+#endif
32861+
32862+#ifdef CONFIG_MODULES
32863+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32864+#endif
32865+
32866+#else
32867+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32868+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32869+ pgd = pgd_offset_k(addr);
32870+ pud = pud_offset(pgd, addr);
32871+ pmd = pmd_offset(pud, addr);
32872+ if (!pmd_present(*pmd))
32873+ continue;
32874+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32875+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32876+ else
32877+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32878+ }
32879+
32880+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32881+ end = addr + KERNEL_IMAGE_SIZE;
32882+ for (; addr < end; addr += PMD_SIZE) {
32883+ pgd = pgd_offset_k(addr);
32884+ pud = pud_offset(pgd, addr);
32885+ pmd = pmd_offset(pud, addr);
32886+ if (!pmd_present(*pmd))
32887+ continue;
32888+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32889+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32890+ }
32891+#endif
32892+
32893+ flush_tlb_all();
32894+#endif
32895+
32896 free_init_pages("unused kernel",
32897 (unsigned long)(&__init_begin),
32898 (unsigned long)(&__init_end));
32899diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32900index c8140e1..59257fc 100644
32901--- a/arch/x86/mm/init_32.c
32902+++ b/arch/x86/mm/init_32.c
32903@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32904 bool __read_mostly __vmalloc_start_set = false;
32905
32906 /*
32907- * Creates a middle page table and puts a pointer to it in the
32908- * given global directory entry. This only returns the gd entry
32909- * in non-PAE compilation mode, since the middle layer is folded.
32910- */
32911-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32912-{
32913- pud_t *pud;
32914- pmd_t *pmd_table;
32915-
32916-#ifdef CONFIG_X86_PAE
32917- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32918- pmd_table = (pmd_t *)alloc_low_page();
32919- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32920- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32921- pud = pud_offset(pgd, 0);
32922- BUG_ON(pmd_table != pmd_offset(pud, 0));
32923-
32924- return pmd_table;
32925- }
32926-#endif
32927- pud = pud_offset(pgd, 0);
32928- pmd_table = pmd_offset(pud, 0);
32929-
32930- return pmd_table;
32931-}
32932-
32933-/*
32934 * Create a page table and place a pointer to it in a middle page
32935 * directory entry:
32936 */
32937@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32938 pte_t *page_table = (pte_t *)alloc_low_page();
32939
32940 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32941+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32942+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32943+#else
32944 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32945+#endif
32946 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32947 }
32948
32949 return pte_offset_kernel(pmd, 0);
32950 }
32951
32952+static pmd_t * __init one_md_table_init(pgd_t *pgd)
32953+{
32954+ pud_t *pud;
32955+ pmd_t *pmd_table;
32956+
32957+ pud = pud_offset(pgd, 0);
32958+ pmd_table = pmd_offset(pud, 0);
32959+
32960+ return pmd_table;
32961+}
32962+
32963 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32964 {
32965 int pgd_idx = pgd_index(vaddr);
32966@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32967 int pgd_idx, pmd_idx;
32968 unsigned long vaddr;
32969 pgd_t *pgd;
32970+ pud_t *pud;
32971 pmd_t *pmd;
32972 pte_t *pte = NULL;
32973 unsigned long count = page_table_range_init_count(start, end);
32974@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32975 pgd = pgd_base + pgd_idx;
32976
32977 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32978- pmd = one_md_table_init(pgd);
32979- pmd = pmd + pmd_index(vaddr);
32980+ pud = pud_offset(pgd, vaddr);
32981+ pmd = pmd_offset(pud, vaddr);
32982+
32983+#ifdef CONFIG_X86_PAE
32984+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32985+#endif
32986+
32987 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32988 pmd++, pmd_idx++) {
32989 pte = page_table_kmap_check(one_page_table_init(pmd),
32990@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32991 }
32992 }
32993
32994-static inline int is_kernel_text(unsigned long addr)
32995+static inline int is_kernel_text(unsigned long start, unsigned long end)
32996 {
32997- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32998- return 1;
32999- return 0;
33000+ if ((start >= ktla_ktva((unsigned long)_etext) ||
33001+ end <= ktla_ktva((unsigned long)_stext)) &&
33002+ (start >= ktla_ktva((unsigned long)_einittext) ||
33003+ end <= ktla_ktva((unsigned long)_sinittext)) &&
33004+
33005+#ifdef CONFIG_ACPI_SLEEP
33006+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
33007+#endif
33008+
33009+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
33010+ return 0;
33011+ return 1;
33012 }
33013
33014 /*
33015@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
33016 unsigned long last_map_addr = end;
33017 unsigned long start_pfn, end_pfn;
33018 pgd_t *pgd_base = swapper_pg_dir;
33019- int pgd_idx, pmd_idx, pte_ofs;
33020+ unsigned int pgd_idx, pmd_idx, pte_ofs;
33021 unsigned long pfn;
33022 pgd_t *pgd;
33023+ pud_t *pud;
33024 pmd_t *pmd;
33025 pte_t *pte;
33026 unsigned pages_2m, pages_4k;
33027@@ -291,8 +295,13 @@ repeat:
33028 pfn = start_pfn;
33029 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33030 pgd = pgd_base + pgd_idx;
33031- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
33032- pmd = one_md_table_init(pgd);
33033+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
33034+ pud = pud_offset(pgd, 0);
33035+ pmd = pmd_offset(pud, 0);
33036+
33037+#ifdef CONFIG_X86_PAE
33038+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33039+#endif
33040
33041 if (pfn >= end_pfn)
33042 continue;
33043@@ -304,14 +313,13 @@ repeat:
33044 #endif
33045 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
33046 pmd++, pmd_idx++) {
33047- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
33048+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
33049
33050 /*
33051 * Map with big pages if possible, otherwise
33052 * create normal page tables:
33053 */
33054 if (use_pse) {
33055- unsigned int addr2;
33056 pgprot_t prot = PAGE_KERNEL_LARGE;
33057 /*
33058 * first pass will use the same initial
33059@@ -322,11 +330,7 @@ repeat:
33060 _PAGE_PSE);
33061
33062 pfn &= PMD_MASK >> PAGE_SHIFT;
33063- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
33064- PAGE_OFFSET + PAGE_SIZE-1;
33065-
33066- if (is_kernel_text(addr) ||
33067- is_kernel_text(addr2))
33068+ if (is_kernel_text(address, address + PMD_SIZE))
33069 prot = PAGE_KERNEL_LARGE_EXEC;
33070
33071 pages_2m++;
33072@@ -343,7 +347,7 @@ repeat:
33073 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33074 pte += pte_ofs;
33075 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33076- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33077+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33078 pgprot_t prot = PAGE_KERNEL;
33079 /*
33080 * first pass will use the same initial
33081@@ -351,7 +355,7 @@ repeat:
33082 */
33083 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33084
33085- if (is_kernel_text(addr))
33086+ if (is_kernel_text(address, address + PAGE_SIZE))
33087 prot = PAGE_KERNEL_EXEC;
33088
33089 pages_4k++;
33090@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33091
33092 pud = pud_offset(pgd, va);
33093 pmd = pmd_offset(pud, va);
33094- if (!pmd_present(*pmd))
33095+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33096 break;
33097
33098 /* should not be large page here */
33099@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33100
33101 static void __init pagetable_init(void)
33102 {
33103- pgd_t *pgd_base = swapper_pg_dir;
33104-
33105- permanent_kmaps_init(pgd_base);
33106+ permanent_kmaps_init(swapper_pg_dir);
33107 }
33108
33109-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33110+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33111 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33112
33113 /* user-defined highmem size */
33114@@ -787,10 +789,10 @@ void __init mem_init(void)
33115 ((unsigned long)&__init_end -
33116 (unsigned long)&__init_begin) >> 10,
33117
33118- (unsigned long)&_etext, (unsigned long)&_edata,
33119- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33120+ (unsigned long)&_sdata, (unsigned long)&_edata,
33121+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33122
33123- (unsigned long)&_text, (unsigned long)&_etext,
33124+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33125 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33126
33127 /*
33128@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33129 if (!kernel_set_to_readonly)
33130 return;
33131
33132+ start = ktla_ktva(start);
33133 pr_debug("Set kernel text: %lx - %lx for read write\n",
33134 start, start+size);
33135
33136@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33137 if (!kernel_set_to_readonly)
33138 return;
33139
33140+ start = ktla_ktva(start);
33141 pr_debug("Set kernel text: %lx - %lx for read only\n",
33142 start, start+size);
33143
33144@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33145 unsigned long start = PFN_ALIGN(_text);
33146 unsigned long size = PFN_ALIGN(_etext) - start;
33147
33148+ start = ktla_ktva(start);
33149 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33150 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33151 size >> 10);
33152diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33153index 30eb05a..ae671ac 100644
33154--- a/arch/x86/mm/init_64.c
33155+++ b/arch/x86/mm/init_64.c
33156@@ -150,7 +150,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33157 * around without checking the pgd every time.
33158 */
33159
33160-pteval_t __supported_pte_mask __read_mostly = ~0;
33161+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33162 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33163
33164 int force_personality32;
33165@@ -183,7 +183,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33166
33167 for (address = start; address <= end; address += PGDIR_SIZE) {
33168 const pgd_t *pgd_ref = pgd_offset_k(address);
33169+
33170+#ifdef CONFIG_PAX_PER_CPU_PGD
33171+ unsigned long cpu;
33172+#else
33173 struct page *page;
33174+#endif
33175
33176 /*
33177 * When it is called after memory hot remove, pgd_none()
33178@@ -194,6 +199,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33179 continue;
33180
33181 spin_lock(&pgd_lock);
33182+
33183+#ifdef CONFIG_PAX_PER_CPU_PGD
33184+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33185+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33186+
33187+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33188+ BUG_ON(pgd_page_vaddr(*pgd)
33189+ != pgd_page_vaddr(*pgd_ref));
33190+
33191+ if (removed) {
33192+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33193+ pgd_clear(pgd);
33194+ } else {
33195+ if (pgd_none(*pgd))
33196+ set_pgd(pgd, *pgd_ref);
33197+ }
33198+
33199+ pgd = pgd_offset_cpu(cpu, kernel, address);
33200+#else
33201 list_for_each_entry(page, &pgd_list, lru) {
33202 pgd_t *pgd;
33203 spinlock_t *pgt_lock;
33204@@ -202,6 +226,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33205 /* the pgt_lock only for Xen */
33206 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33207 spin_lock(pgt_lock);
33208+#endif
33209
33210 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33211 BUG_ON(pgd_page_vaddr(*pgd)
33212@@ -215,7 +240,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33213 set_pgd(pgd, *pgd_ref);
33214 }
33215
33216+#ifndef CONFIG_PAX_PER_CPU_PGD
33217 spin_unlock(pgt_lock);
33218+#endif
33219+
33220 }
33221 spin_unlock(&pgd_lock);
33222 }
33223@@ -248,7 +276,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33224 {
33225 if (pgd_none(*pgd)) {
33226 pud_t *pud = (pud_t *)spp_getpage();
33227- pgd_populate(&init_mm, pgd, pud);
33228+ pgd_populate_kernel(&init_mm, pgd, pud);
33229 if (pud != pud_offset(pgd, 0))
33230 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33231 pud, pud_offset(pgd, 0));
33232@@ -260,7 +288,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33233 {
33234 if (pud_none(*pud)) {
33235 pmd_t *pmd = (pmd_t *) spp_getpage();
33236- pud_populate(&init_mm, pud, pmd);
33237+ pud_populate_kernel(&init_mm, pud, pmd);
33238 if (pmd != pmd_offset(pud, 0))
33239 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33240 pmd, pmd_offset(pud, 0));
33241@@ -289,7 +317,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33242 pmd = fill_pmd(pud, vaddr);
33243 pte = fill_pte(pmd, vaddr);
33244
33245+ pax_open_kernel();
33246 set_pte(pte, new_pte);
33247+ pax_close_kernel();
33248
33249 /*
33250 * It's enough to flush this one mapping.
33251@@ -351,14 +381,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33252 pgd = pgd_offset_k((unsigned long)__va(phys));
33253 if (pgd_none(*pgd)) {
33254 pud = (pud_t *) spp_getpage();
33255- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33256- _PAGE_USER));
33257+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33258 }
33259 pud = pud_offset(pgd, (unsigned long)__va(phys));
33260 if (pud_none(*pud)) {
33261 pmd = (pmd_t *) spp_getpage();
33262- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33263- _PAGE_USER));
33264+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33265 }
33266 pmd = pmd_offset(pud, phys);
33267 BUG_ON(!pmd_none(*pmd));
33268@@ -599,7 +627,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33269 prot);
33270
33271 spin_lock(&init_mm.page_table_lock);
33272- pud_populate(&init_mm, pud, pmd);
33273+ pud_populate_kernel(&init_mm, pud, pmd);
33274 spin_unlock(&init_mm.page_table_lock);
33275 }
33276 __flush_tlb_all();
33277@@ -640,7 +668,7 @@ kernel_physical_mapping_init(unsigned long start,
33278 page_size_mask);
33279
33280 spin_lock(&init_mm.page_table_lock);
33281- pgd_populate(&init_mm, pgd, pud);
33282+ pgd_populate_kernel(&init_mm, pgd, pud);
33283 spin_unlock(&init_mm.page_table_lock);
33284 pgd_changed = true;
33285 }
33286diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33287index 9ca35fc..4b2b7b7 100644
33288--- a/arch/x86/mm/iomap_32.c
33289+++ b/arch/x86/mm/iomap_32.c
33290@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33291 type = kmap_atomic_idx_push();
33292 idx = type + KM_TYPE_NR * smp_processor_id();
33293 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33294+
33295+ pax_open_kernel();
33296 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33297+ pax_close_kernel();
33298+
33299 arch_flush_lazy_mmu_mode();
33300
33301 return (void *)vaddr;
33302diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33303index fdf617c..b9e85bc 100644
33304--- a/arch/x86/mm/ioremap.c
33305+++ b/arch/x86/mm/ioremap.c
33306@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33307 unsigned long i;
33308
33309 for (i = 0; i < nr_pages; ++i)
33310- if (pfn_valid(start_pfn + i) &&
33311- !PageReserved(pfn_to_page(start_pfn + i)))
33312+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33313+ !PageReserved(pfn_to_page(start_pfn + i))))
33314 return 1;
33315
33316 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33317@@ -283,7 +283,7 @@ EXPORT_SYMBOL(ioremap_prot);
33318 *
33319 * Caller must ensure there is only one unmapping for the same pointer.
33320 */
33321-void iounmap(volatile void __iomem *addr)
33322+void iounmap(const volatile void __iomem *addr)
33323 {
33324 struct vm_struct *p, *o;
33325
33326@@ -332,30 +332,29 @@ EXPORT_SYMBOL(iounmap);
33327 */
33328 void *xlate_dev_mem_ptr(phys_addr_t phys)
33329 {
33330- void *addr;
33331- unsigned long start = phys & PAGE_MASK;
33332-
33333 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33334- if (page_is_ram(start >> PAGE_SHIFT))
33335+ if (page_is_ram(phys >> PAGE_SHIFT))
33336+#ifdef CONFIG_HIGHMEM
33337+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33338+#endif
33339 return __va(phys);
33340
33341- addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33342- if (addr)
33343- addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
33344-
33345- return addr;
33346+ return (void __force *)ioremap_cache(phys, PAGE_SIZE);
33347 }
33348
33349 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33350 {
33351 if (page_is_ram(phys >> PAGE_SHIFT))
33352+#ifdef CONFIG_HIGHMEM
33353+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33354+#endif
33355 return;
33356
33357 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33358 return;
33359 }
33360
33361-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33362+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33363
33364 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33365 {
33366@@ -391,8 +390,7 @@ void __init early_ioremap_init(void)
33367 early_ioremap_setup();
33368
33369 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33370- memset(bm_pte, 0, sizeof(bm_pte));
33371- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33372+ pmd_populate_user(&init_mm, pmd, bm_pte);
33373
33374 /*
33375 * The boot-ioremap range spans multiple pmds, for which
33376diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33377index b4f2e7e..96c9c3e 100644
33378--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33379+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33380@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33381 * memory (e.g. tracked pages)? For now, we need this to avoid
33382 * invoking kmemcheck for PnP BIOS calls.
33383 */
33384- if (regs->flags & X86_VM_MASK)
33385+ if (v8086_mode(regs))
33386 return false;
33387- if (regs->cs != __KERNEL_CS)
33388+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33389 return false;
33390
33391 pte = kmemcheck_pte_lookup(address);
33392diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33393index df4552b..12c129c 100644
33394--- a/arch/x86/mm/mmap.c
33395+++ b/arch/x86/mm/mmap.c
33396@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33397 * Leave an at least ~128 MB hole with possible stack randomization.
33398 */
33399 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33400-#define MAX_GAP (TASK_SIZE/6*5)
33401+#define MAX_GAP (pax_task_size/6*5)
33402
33403 static int mmap_is_legacy(void)
33404 {
33405@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33406 return rnd << PAGE_SHIFT;
33407 }
33408
33409-static unsigned long mmap_base(void)
33410+static unsigned long mmap_base(struct mm_struct *mm)
33411 {
33412 unsigned long gap = rlimit(RLIMIT_STACK);
33413+ unsigned long pax_task_size = TASK_SIZE;
33414+
33415+#ifdef CONFIG_PAX_SEGMEXEC
33416+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33417+ pax_task_size = SEGMEXEC_TASK_SIZE;
33418+#endif
33419
33420 if (gap < MIN_GAP)
33421 gap = MIN_GAP;
33422 else if (gap > MAX_GAP)
33423 gap = MAX_GAP;
33424
33425- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33426+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33427 }
33428
33429 /*
33430 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33431 * does, but not when emulating X86_32
33432 */
33433-static unsigned long mmap_legacy_base(void)
33434+static unsigned long mmap_legacy_base(struct mm_struct *mm)
33435 {
33436- if (mmap_is_ia32())
33437+ if (mmap_is_ia32()) {
33438+
33439+#ifdef CONFIG_PAX_SEGMEXEC
33440+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33441+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33442+ else
33443+#endif
33444+
33445 return TASK_UNMAPPED_BASE;
33446- else
33447+ } else
33448 return TASK_UNMAPPED_BASE + mmap_rnd();
33449 }
33450
33451@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33452 */
33453 void arch_pick_mmap_layout(struct mm_struct *mm)
33454 {
33455- mm->mmap_legacy_base = mmap_legacy_base();
33456- mm->mmap_base = mmap_base();
33457+ mm->mmap_legacy_base = mmap_legacy_base(mm);
33458+ mm->mmap_base = mmap_base(mm);
33459+
33460+#ifdef CONFIG_PAX_RANDMMAP
33461+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33462+ mm->mmap_legacy_base += mm->delta_mmap;
33463+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33464+ }
33465+#endif
33466
33467 if (mmap_is_legacy()) {
33468 mm->mmap_base = mm->mmap_legacy_base;
33469diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33470index 0057a7a..95c7edd 100644
33471--- a/arch/x86/mm/mmio-mod.c
33472+++ b/arch/x86/mm/mmio-mod.c
33473@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33474 break;
33475 default:
33476 {
33477- unsigned char *ip = (unsigned char *)instptr;
33478+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33479 my_trace->opcode = MMIO_UNKNOWN_OP;
33480 my_trace->width = 0;
33481 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33482@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33483 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33484 void __iomem *addr)
33485 {
33486- static atomic_t next_id;
33487+ static atomic_unchecked_t next_id;
33488 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33489 /* These are page-unaligned. */
33490 struct mmiotrace_map map = {
33491@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33492 .private = trace
33493 },
33494 .phys = offset,
33495- .id = atomic_inc_return(&next_id)
33496+ .id = atomic_inc_return_unchecked(&next_id)
33497 };
33498 map.map_id = trace->id;
33499
33500@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33501 ioremap_trace_core(offset, size, addr);
33502 }
33503
33504-static void iounmap_trace_core(volatile void __iomem *addr)
33505+static void iounmap_trace_core(const volatile void __iomem *addr)
33506 {
33507 struct mmiotrace_map map = {
33508 .phys = 0,
33509@@ -328,7 +328,7 @@ not_enabled:
33510 }
33511 }
33512
33513-void mmiotrace_iounmap(volatile void __iomem *addr)
33514+void mmiotrace_iounmap(const volatile void __iomem *addr)
33515 {
33516 might_sleep();
33517 if (is_enabled()) /* recheck and proper locking in *_core() */
33518diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33519index cd4785b..25188b6 100644
33520--- a/arch/x86/mm/numa.c
33521+++ b/arch/x86/mm/numa.c
33522@@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33523 }
33524 }
33525
33526-static int __init numa_register_memblks(struct numa_meminfo *mi)
33527+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33528 {
33529 unsigned long uninitialized_var(pfn_align);
33530 int i, nid;
33531diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33532index 536ea2f..f42c293 100644
33533--- a/arch/x86/mm/pageattr.c
33534+++ b/arch/x86/mm/pageattr.c
33535@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33536 */
33537 #ifdef CONFIG_PCI_BIOS
33538 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33539- pgprot_val(forbidden) |= _PAGE_NX;
33540+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33541 #endif
33542
33543 /*
33544@@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33545 * Does not cover __inittext since that is gone later on. On
33546 * 64bit we do not enforce !NX on the low mapping
33547 */
33548- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33549- pgprot_val(forbidden) |= _PAGE_NX;
33550+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33551+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33552
33553+#ifdef CONFIG_DEBUG_RODATA
33554 /*
33555 * The .rodata section needs to be read-only. Using the pfn
33556 * catches all aliases.
33557@@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33558 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33559 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33560 pgprot_val(forbidden) |= _PAGE_RW;
33561+#endif
33562
33563 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33564 /*
33565@@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33566 }
33567 #endif
33568
33569+#ifdef CONFIG_PAX_KERNEXEC
33570+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33571+ pgprot_val(forbidden) |= _PAGE_RW;
33572+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33573+ }
33574+#endif
33575+
33576 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33577
33578 return prot;
33579@@ -440,23 +449,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33580 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33581 {
33582 /* change init_mm */
33583+ pax_open_kernel();
33584 set_pte_atomic(kpte, pte);
33585+
33586 #ifdef CONFIG_X86_32
33587 if (!SHARED_KERNEL_PMD) {
33588+
33589+#ifdef CONFIG_PAX_PER_CPU_PGD
33590+ unsigned long cpu;
33591+#else
33592 struct page *page;
33593+#endif
33594
33595+#ifdef CONFIG_PAX_PER_CPU_PGD
33596+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33597+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33598+#else
33599 list_for_each_entry(page, &pgd_list, lru) {
33600- pgd_t *pgd;
33601+ pgd_t *pgd = (pgd_t *)page_address(page);
33602+#endif
33603+
33604 pud_t *pud;
33605 pmd_t *pmd;
33606
33607- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33608+ pgd += pgd_index(address);
33609 pud = pud_offset(pgd, address);
33610 pmd = pmd_offset(pud, address);
33611 set_pte_atomic((pte_t *)pmd, pte);
33612 }
33613 }
33614 #endif
33615+ pax_close_kernel();
33616 }
33617
33618 static int
33619diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33620index 7ac6869..c0ba541 100644
33621--- a/arch/x86/mm/pat.c
33622+++ b/arch/x86/mm/pat.c
33623@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33624 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33625
33626 if (pg_flags == _PGMT_DEFAULT)
33627- return -1;
33628+ return _PAGE_CACHE_MODE_NUM;
33629 else if (pg_flags == _PGMT_WC)
33630 return _PAGE_CACHE_MODE_WC;
33631 else if (pg_flags == _PGMT_UC_MINUS)
33632@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33633
33634 page = pfn_to_page(pfn);
33635 type = get_page_memtype(page);
33636- if (type != -1) {
33637+ if (type != _PAGE_CACHE_MODE_NUM) {
33638 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33639 start, end - 1, type, req_type);
33640 if (new_type)
33641@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33642
33643 if (!entry) {
33644 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33645- current->comm, current->pid, start, end - 1);
33646+ current->comm, task_pid_nr(current), start, end - 1);
33647 return -EINVAL;
33648 }
33649
33650@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33651 page = pfn_to_page(paddr >> PAGE_SHIFT);
33652 rettype = get_page_memtype(page);
33653 /*
33654- * -1 from get_page_memtype() implies RAM page is in its
33655+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33656 * default state and not reserved, and hence of type WB
33657 */
33658- if (rettype == -1)
33659+ if (rettype == _PAGE_CACHE_MODE_NUM)
33660 rettype = _PAGE_CACHE_MODE_WB;
33661
33662 return rettype;
33663@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33664
33665 while (cursor < to) {
33666 if (!devmem_is_allowed(pfn)) {
33667- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33668- current->comm, from, to - 1);
33669+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33670+ current->comm, from, to - 1, cursor);
33671 return 0;
33672 }
33673 cursor += PAGE_SIZE;
33674@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33675 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33676 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33677 "for [mem %#010Lx-%#010Lx]\n",
33678- current->comm, current->pid,
33679+ current->comm, task_pid_nr(current),
33680 cattr_name(pcm),
33681 base, (unsigned long long)(base + size-1));
33682 return -EINVAL;
33683@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33684 pcm = lookup_memtype(paddr);
33685 if (want_pcm != pcm) {
33686 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33687- current->comm, current->pid,
33688+ current->comm, task_pid_nr(current),
33689 cattr_name(want_pcm),
33690 (unsigned long long)paddr,
33691 (unsigned long long)(paddr + size - 1),
33692@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33693 free_memtype(paddr, paddr + size);
33694 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33695 " for [mem %#010Lx-%#010Lx], got %s\n",
33696- current->comm, current->pid,
33697+ current->comm, task_pid_nr(current),
33698 cattr_name(want_pcm),
33699 (unsigned long long)paddr,
33700 (unsigned long long)(paddr + size - 1),
33701diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33702index 6582adc..fcc5d0b 100644
33703--- a/arch/x86/mm/pat_rbtree.c
33704+++ b/arch/x86/mm/pat_rbtree.c
33705@@ -161,7 +161,7 @@ success:
33706
33707 failure:
33708 printk(KERN_INFO "%s:%d conflicting memory types "
33709- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33710+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33711 end, cattr_name(found_type), cattr_name(match->type));
33712 return -EBUSY;
33713 }
33714diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33715index 9f0614d..92ae64a 100644
33716--- a/arch/x86/mm/pf_in.c
33717+++ b/arch/x86/mm/pf_in.c
33718@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33719 int i;
33720 enum reason_type rv = OTHERS;
33721
33722- p = (unsigned char *)ins_addr;
33723+ p = (unsigned char *)ktla_ktva(ins_addr);
33724 p += skip_prefix(p, &prf);
33725 p += get_opcode(p, &opcode);
33726
33727@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33728 struct prefix_bits prf;
33729 int i;
33730
33731- p = (unsigned char *)ins_addr;
33732+ p = (unsigned char *)ktla_ktva(ins_addr);
33733 p += skip_prefix(p, &prf);
33734 p += get_opcode(p, &opcode);
33735
33736@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33737 struct prefix_bits prf;
33738 int i;
33739
33740- p = (unsigned char *)ins_addr;
33741+ p = (unsigned char *)ktla_ktva(ins_addr);
33742 p += skip_prefix(p, &prf);
33743 p += get_opcode(p, &opcode);
33744
33745@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33746 struct prefix_bits prf;
33747 int i;
33748
33749- p = (unsigned char *)ins_addr;
33750+ p = (unsigned char *)ktla_ktva(ins_addr);
33751 p += skip_prefix(p, &prf);
33752 p += get_opcode(p, &opcode);
33753 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33754@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33755 struct prefix_bits prf;
33756 int i;
33757
33758- p = (unsigned char *)ins_addr;
33759+ p = (unsigned char *)ktla_ktva(ins_addr);
33760 p += skip_prefix(p, &prf);
33761 p += get_opcode(p, &opcode);
33762 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33763diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33764index 7b22ada..b11e66f 100644
33765--- a/arch/x86/mm/pgtable.c
33766+++ b/arch/x86/mm/pgtable.c
33767@@ -97,10 +97,75 @@ static inline void pgd_list_del(pgd_t *pgd)
33768 list_del(&page->lru);
33769 }
33770
33771-#define UNSHARED_PTRS_PER_PGD \
33772- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33773+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33774+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33775
33776+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33777+{
33778+ unsigned int count = USER_PGD_PTRS;
33779
33780+ if (!pax_user_shadow_base)
33781+ return;
33782+
33783+ while (count--)
33784+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33785+}
33786+#endif
33787+
33788+#ifdef CONFIG_PAX_PER_CPU_PGD
33789+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33790+{
33791+ unsigned int count = USER_PGD_PTRS;
33792+
33793+ while (count--) {
33794+ pgd_t pgd;
33795+
33796+#ifdef CONFIG_X86_64
33797+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33798+#else
33799+ pgd = *src++;
33800+#endif
33801+
33802+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33803+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33804+#endif
33805+
33806+ *dst++ = pgd;
33807+ }
33808+
33809+}
33810+#endif
33811+
33812+#ifdef CONFIG_X86_64
33813+#define pxd_t pud_t
33814+#define pyd_t pgd_t
33815+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33816+#define pgtable_pxd_page_ctor(page) true
33817+#define pgtable_pxd_page_dtor(page) do {} while (0)
33818+#define pxd_free(mm, pud) pud_free((mm), (pud))
33819+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33820+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33821+#define PYD_SIZE PGDIR_SIZE
33822+#define mm_inc_nr_pxds(mm) do {} while (0)
33823+#define mm_dec_nr_pxds(mm) do {} while (0)
33824+#else
33825+#define pxd_t pmd_t
33826+#define pyd_t pud_t
33827+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33828+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33829+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33830+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33831+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33832+#define pyd_offset(mm, address) pud_offset((mm), (address))
33833+#define PYD_SIZE PUD_SIZE
33834+#define mm_inc_nr_pxds(mm) mm_inc_nr_pmds(mm)
33835+#define mm_dec_nr_pxds(mm) mm_dec_nr_pmds(mm)
33836+#endif
33837+
33838+#ifdef CONFIG_PAX_PER_CPU_PGD
33839+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33840+static inline void pgd_dtor(pgd_t *pgd) {}
33841+#else
33842 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33843 {
33844 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33845@@ -141,6 +206,7 @@ static void pgd_dtor(pgd_t *pgd)
33846 pgd_list_del(pgd);
33847 spin_unlock(&pgd_lock);
33848 }
33849+#endif
33850
33851 /*
33852 * List of all pgd's needed for non-PAE so it can invalidate entries
33853@@ -153,7 +219,7 @@ static void pgd_dtor(pgd_t *pgd)
33854 * -- nyc
33855 */
33856
33857-#ifdef CONFIG_X86_PAE
33858+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33859 /*
33860 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33861 * updating the top-level pagetable entries to guarantee the
33862@@ -165,7 +231,7 @@ static void pgd_dtor(pgd_t *pgd)
33863 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33864 * and initialize the kernel pmds here.
33865 */
33866-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33867+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33868
33869 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33870 {
33871@@ -183,46 +249,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33872 */
33873 flush_tlb_mm(mm);
33874 }
33875+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33876+#define PREALLOCATED_PXDS USER_PGD_PTRS
33877 #else /* !CONFIG_X86_PAE */
33878
33879 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33880-#define PREALLOCATED_PMDS 0
33881+#define PREALLOCATED_PXDS 0
33882
33883 #endif /* CONFIG_X86_PAE */
33884
33885-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
33886+static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
33887 {
33888 int i;
33889
33890- for(i = 0; i < PREALLOCATED_PMDS; i++)
33891- if (pmds[i]) {
33892- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33893- free_page((unsigned long)pmds[i]);
33894- mm_dec_nr_pmds(mm);
33895+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33896+ if (pxds[i]) {
33897+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33898+ free_page((unsigned long)pxds[i]);
33899+ mm_dec_nr_pxds(mm);
33900 }
33901 }
33902
33903-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33904+static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
33905 {
33906 int i;
33907 bool failed = false;
33908
33909- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33910- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33911- if (!pmd)
33912+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33913+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33914+ if (!pxd)
33915 failed = true;
33916- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33917- free_page((unsigned long)pmd);
33918- pmd = NULL;
33919+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33920+ free_page((unsigned long)pxd);
33921+ pxd = NULL;
33922 failed = true;
33923 }
33924- if (pmd)
33925- mm_inc_nr_pmds(mm);
33926- pmds[i] = pmd;
33927+ if (pxd)
33928+ mm_inc_nr_pxds(mm);
33929+ pxds[i] = pxd;
33930 }
33931
33932 if (failed) {
33933- free_pmds(mm, pmds);
33934+ free_pxds(mm, pxds);
33935 return -ENOMEM;
33936 }
33937
33938@@ -235,50 +303,54 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33939 * preallocate which never got a corresponding vma will need to be
33940 * freed manually.
33941 */
33942-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33943+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33944 {
33945 int i;
33946
33947- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33948+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33949 pgd_t pgd = pgdp[i];
33950
33951 if (pgd_val(pgd) != 0) {
33952- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33953+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33954
33955- pgdp[i] = native_make_pgd(0);
33956+ set_pgd(pgdp + i, native_make_pgd(0));
33957
33958- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33959- pmd_free(mm, pmd);
33960- mm_dec_nr_pmds(mm);
33961+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33962+ pxd_free(mm, pxd);
33963+ mm_dec_nr_pxds(mm);
33964 }
33965 }
33966 }
33967
33968-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33969+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33970 {
33971- pud_t *pud;
33972+ pyd_t *pyd;
33973 int i;
33974
33975- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33976+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33977 return;
33978
33979- pud = pud_offset(pgd, 0);
33980+#ifdef CONFIG_X86_64
33981+ pyd = pyd_offset(mm, 0L);
33982+#else
33983+ pyd = pyd_offset(pgd, 0L);
33984+#endif
33985
33986- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33987- pmd_t *pmd = pmds[i];
33988+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33989+ pxd_t *pxd = pxds[i];
33990
33991 if (i >= KERNEL_PGD_BOUNDARY)
33992- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33993- sizeof(pmd_t) * PTRS_PER_PMD);
33994+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33995+ sizeof(pxd_t) * PTRS_PER_PMD);
33996
33997- pud_populate(mm, pud, pmd);
33998+ pyd_populate(mm, pyd, pxd);
33999 }
34000 }
34001
34002 pgd_t *pgd_alloc(struct mm_struct *mm)
34003 {
34004 pgd_t *pgd;
34005- pmd_t *pmds[PREALLOCATED_PMDS];
34006+ pxd_t *pxds[PREALLOCATED_PXDS];
34007
34008 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
34009
34010@@ -287,11 +359,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34011
34012 mm->pgd = pgd;
34013
34014- if (preallocate_pmds(mm, pmds) != 0)
34015+ if (preallocate_pxds(mm, pxds) != 0)
34016 goto out_free_pgd;
34017
34018 if (paravirt_pgd_alloc(mm) != 0)
34019- goto out_free_pmds;
34020+ goto out_free_pxds;
34021
34022 /*
34023 * Make sure that pre-populating the pmds is atomic with
34024@@ -301,14 +373,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34025 spin_lock(&pgd_lock);
34026
34027 pgd_ctor(mm, pgd);
34028- pgd_prepopulate_pmd(mm, pgd, pmds);
34029+ pgd_prepopulate_pxd(mm, pgd, pxds);
34030
34031 spin_unlock(&pgd_lock);
34032
34033 return pgd;
34034
34035-out_free_pmds:
34036- free_pmds(mm, pmds);
34037+out_free_pxds:
34038+ free_pxds(mm, pxds);
34039 out_free_pgd:
34040 free_page((unsigned long)pgd);
34041 out:
34042@@ -317,7 +389,7 @@ out:
34043
34044 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
34045 {
34046- pgd_mop_up_pmds(mm, pgd);
34047+ pgd_mop_up_pxds(mm, pgd);
34048 pgd_dtor(pgd);
34049 paravirt_pgd_free(mm, pgd);
34050 free_page((unsigned long)pgd);
34051diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
34052index 75cc097..79a097f 100644
34053--- a/arch/x86/mm/pgtable_32.c
34054+++ b/arch/x86/mm/pgtable_32.c
34055@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
34056 return;
34057 }
34058 pte = pte_offset_kernel(pmd, vaddr);
34059+
34060+ pax_open_kernel();
34061 if (pte_val(pteval))
34062 set_pte_at(&init_mm, vaddr, pte, pteval);
34063 else
34064 pte_clear(&init_mm, vaddr, pte);
34065+ pax_close_kernel();
34066
34067 /*
34068 * It's enough to flush this one mapping.
34069diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34070index e666cbb..61788c45 100644
34071--- a/arch/x86/mm/physaddr.c
34072+++ b/arch/x86/mm/physaddr.c
34073@@ -10,7 +10,7 @@
34074 #ifdef CONFIG_X86_64
34075
34076 #ifdef CONFIG_DEBUG_VIRTUAL
34077-unsigned long __phys_addr(unsigned long x)
34078+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34079 {
34080 unsigned long y = x - __START_KERNEL_map;
34081
34082@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34083 #else
34084
34085 #ifdef CONFIG_DEBUG_VIRTUAL
34086-unsigned long __phys_addr(unsigned long x)
34087+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34088 {
34089 unsigned long phys_addr = x - PAGE_OFFSET;
34090 /* VMALLOC_* aren't constants */
34091diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34092index 90555bf..f5f1828 100644
34093--- a/arch/x86/mm/setup_nx.c
34094+++ b/arch/x86/mm/setup_nx.c
34095@@ -5,8 +5,10 @@
34096 #include <asm/pgtable.h>
34097 #include <asm/proto.h>
34098
34099+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34100 static int disable_nx;
34101
34102+#ifndef CONFIG_PAX_PAGEEXEC
34103 /*
34104 * noexec = on|off
34105 *
34106@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34107 return 0;
34108 }
34109 early_param("noexec", noexec_setup);
34110+#endif
34111+
34112+#endif
34113
34114 void x86_configure_nx(void)
34115 {
34116+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34117 if (cpu_has_nx && !disable_nx)
34118 __supported_pte_mask |= _PAGE_NX;
34119 else
34120+#endif
34121 __supported_pte_mask &= ~_PAGE_NX;
34122 }
34123
34124diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34125index 3250f23..7a97ba2 100644
34126--- a/arch/x86/mm/tlb.c
34127+++ b/arch/x86/mm/tlb.c
34128@@ -45,7 +45,11 @@ void leave_mm(int cpu)
34129 BUG();
34130 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34131 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34132+
34133+#ifndef CONFIG_PAX_PER_CPU_PGD
34134 load_cr3(swapper_pg_dir);
34135+#endif
34136+
34137 /*
34138 * This gets called in the idle path where RCU
34139 * functions differently. Tracing normally
34140diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34141new file mode 100644
34142index 0000000..dace51c
34143--- /dev/null
34144+++ b/arch/x86/mm/uderef_64.c
34145@@ -0,0 +1,37 @@
34146+#include <linux/mm.h>
34147+#include <asm/pgtable.h>
34148+#include <asm/uaccess.h>
34149+
34150+#ifdef CONFIG_PAX_MEMORY_UDEREF
34151+/* PaX: due to the special call convention these functions must
34152+ * - remain leaf functions under all configurations,
34153+ * - never be called directly, only dereferenced from the wrappers.
34154+ */
34155+void __pax_open_userland(void)
34156+{
34157+ unsigned int cpu;
34158+
34159+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34160+ return;
34161+
34162+ cpu = raw_get_cpu();
34163+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34164+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34165+ raw_put_cpu_no_resched();
34166+}
34167+EXPORT_SYMBOL(__pax_open_userland);
34168+
34169+void __pax_close_userland(void)
34170+{
34171+ unsigned int cpu;
34172+
34173+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34174+ return;
34175+
34176+ cpu = raw_get_cpu();
34177+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34178+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34179+ raw_put_cpu_no_resched();
34180+}
34181+EXPORT_SYMBOL(__pax_close_userland);
34182+#endif
34183diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34184index 6440221..f84b5c7 100644
34185--- a/arch/x86/net/bpf_jit.S
34186+++ b/arch/x86/net/bpf_jit.S
34187@@ -9,6 +9,7 @@
34188 */
34189 #include <linux/linkage.h>
34190 #include <asm/dwarf2.h>
34191+#include <asm/alternative-asm.h>
34192
34193 /*
34194 * Calling convention :
34195@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34196 jle bpf_slow_path_word
34197 mov (SKBDATA,%rsi),%eax
34198 bswap %eax /* ntohl() */
34199+ pax_force_retaddr
34200 ret
34201
34202 sk_load_half:
34203@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34204 jle bpf_slow_path_half
34205 movzwl (SKBDATA,%rsi),%eax
34206 rol $8,%ax # ntohs()
34207+ pax_force_retaddr
34208 ret
34209
34210 sk_load_byte:
34211@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34212 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34213 jle bpf_slow_path_byte
34214 movzbl (SKBDATA,%rsi),%eax
34215+ pax_force_retaddr
34216 ret
34217
34218 /* rsi contains offset and can be scratched */
34219@@ -90,6 +94,7 @@ bpf_slow_path_word:
34220 js bpf_error
34221 mov - MAX_BPF_STACK + 32(%rbp),%eax
34222 bswap %eax
34223+ pax_force_retaddr
34224 ret
34225
34226 bpf_slow_path_half:
34227@@ -98,12 +103,14 @@ bpf_slow_path_half:
34228 mov - MAX_BPF_STACK + 32(%rbp),%ax
34229 rol $8,%ax
34230 movzwl %ax,%eax
34231+ pax_force_retaddr
34232 ret
34233
34234 bpf_slow_path_byte:
34235 bpf_slow_path_common(1)
34236 js bpf_error
34237 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34238+ pax_force_retaddr
34239 ret
34240
34241 #define sk_negative_common(SIZE) \
34242@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34243 sk_negative_common(4)
34244 mov (%rax), %eax
34245 bswap %eax
34246+ pax_force_retaddr
34247 ret
34248
34249 bpf_slow_path_half_neg:
34250@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34251 mov (%rax),%ax
34252 rol $8,%ax
34253 movzwl %ax,%eax
34254+ pax_force_retaddr
34255 ret
34256
34257 bpf_slow_path_byte_neg:
34258@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34259 .globl sk_load_byte_negative_offset
34260 sk_negative_common(1)
34261 movzbl (%rax), %eax
34262+ pax_force_retaddr
34263 ret
34264
34265 bpf_error:
34266@@ -156,4 +166,5 @@ bpf_error:
34267 mov - MAX_BPF_STACK + 16(%rbp),%r14
34268 mov - MAX_BPF_STACK + 24(%rbp),%r15
34269 leaveq
34270+ pax_force_retaddr
34271 ret
34272diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34273index 9875143..36776ae 100644
34274--- a/arch/x86/net/bpf_jit_comp.c
34275+++ b/arch/x86/net/bpf_jit_comp.c
34276@@ -13,7 +13,11 @@
34277 #include <linux/if_vlan.h>
34278 #include <asm/cacheflush.h>
34279
34280+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34281+int bpf_jit_enable __read_only;
34282+#else
34283 int bpf_jit_enable __read_mostly;
34284+#endif
34285
34286 /*
34287 * assembly code in arch/x86/net/bpf_jit.S
34288@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34289 static void jit_fill_hole(void *area, unsigned int size)
34290 {
34291 /* fill whole space with int3 instructions */
34292+ pax_open_kernel();
34293 memset(area, 0xcc, size);
34294+ pax_close_kernel();
34295 }
34296
34297 struct jit_context {
34298@@ -559,6 +565,13 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
34299 if (is_ereg(dst_reg))
34300 EMIT1(0x41);
34301 EMIT3(0xC1, add_1reg(0xC8, dst_reg), 8);
34302+
34303+ /* emit 'movzwl eax, ax' */
34304+ if (is_ereg(dst_reg))
34305+ EMIT3(0x45, 0x0F, 0xB7);
34306+ else
34307+ EMIT2(0x0F, 0xB7);
34308+ EMIT1(add_2reg(0xC0, dst_reg, dst_reg));
34309 break;
34310 case 32:
34311 /* emit 'bswap eax' to swap lower 4 bytes */
34312@@ -577,6 +590,27 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
34313 break;
34314
34315 case BPF_ALU | BPF_END | BPF_FROM_LE:
34316+ switch (imm32) {
34317+ case 16:
34318+ /* emit 'movzwl eax, ax' to zero extend 16-bit
34319+ * into 64 bit
34320+ */
34321+ if (is_ereg(dst_reg))
34322+ EMIT3(0x45, 0x0F, 0xB7);
34323+ else
34324+ EMIT2(0x0F, 0xB7);
34325+ EMIT1(add_2reg(0xC0, dst_reg, dst_reg));
34326+ break;
34327+ case 32:
34328+ /* emit 'mov eax, eax' to clear upper 32-bits */
34329+ if (is_ereg(dst_reg))
34330+ EMIT1(0x45);
34331+ EMIT2(0x89, add_2reg(0xC0, dst_reg, dst_reg));
34332+ break;
34333+ case 64:
34334+ /* nop */
34335+ break;
34336+ }
34337 break;
34338
34339 /* ST: *(u8*)(dst_reg + off) = imm */
34340@@ -896,7 +930,9 @@ common_load:
34341 pr_err("bpf_jit_compile fatal error\n");
34342 return -EFAULT;
34343 }
34344+ pax_open_kernel();
34345 memcpy(image + proglen, temp, ilen);
34346+ pax_close_kernel();
34347 }
34348 proglen += ilen;
34349 addrs[i] = proglen;
34350@@ -968,7 +1004,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34351
34352 if (image) {
34353 bpf_flush_icache(header, image + proglen);
34354- set_memory_ro((unsigned long)header, header->pages);
34355 prog->bpf_func = (void *)image;
34356 prog->jited = true;
34357 }
34358@@ -981,12 +1016,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34359 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34360 struct bpf_binary_header *header = (void *)addr;
34361
34362- if (!fp->jited)
34363- goto free_filter;
34364+ if (fp->jited)
34365+ bpf_jit_binary_free(header);
34366
34367- set_memory_rw(addr, header->pages);
34368- bpf_jit_binary_free(header);
34369-
34370-free_filter:
34371 bpf_prog_unlock_free(fp);
34372 }
34373diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34374index 5d04be5..2beeaa2 100644
34375--- a/arch/x86/oprofile/backtrace.c
34376+++ b/arch/x86/oprofile/backtrace.c
34377@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34378 struct stack_frame_ia32 *fp;
34379 unsigned long bytes;
34380
34381- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34382+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34383 if (bytes != 0)
34384 return NULL;
34385
34386- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34387+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34388
34389 oprofile_add_trace(bufhead[0].return_address);
34390
34391@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34392 struct stack_frame bufhead[2];
34393 unsigned long bytes;
34394
34395- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34396+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34397 if (bytes != 0)
34398 return NULL;
34399
34400@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34401 {
34402 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34403
34404- if (!user_mode_vm(regs)) {
34405+ if (!user_mode(regs)) {
34406 unsigned long stack = kernel_stack_pointer(regs);
34407 if (depth)
34408 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34409diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34410index 1d2e639..f6ef82a 100644
34411--- a/arch/x86/oprofile/nmi_int.c
34412+++ b/arch/x86/oprofile/nmi_int.c
34413@@ -23,6 +23,7 @@
34414 #include <asm/nmi.h>
34415 #include <asm/msr.h>
34416 #include <asm/apic.h>
34417+#include <asm/pgtable.h>
34418
34419 #include "op_counter.h"
34420 #include "op_x86_model.h"
34421@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34422 if (ret)
34423 return ret;
34424
34425- if (!model->num_virt_counters)
34426- model->num_virt_counters = model->num_counters;
34427+ if (!model->num_virt_counters) {
34428+ pax_open_kernel();
34429+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34430+ pax_close_kernel();
34431+ }
34432
34433 mux_init(ops);
34434
34435diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34436index 50d86c0..7985318 100644
34437--- a/arch/x86/oprofile/op_model_amd.c
34438+++ b/arch/x86/oprofile/op_model_amd.c
34439@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34440 num_counters = AMD64_NUM_COUNTERS;
34441 }
34442
34443- op_amd_spec.num_counters = num_counters;
34444- op_amd_spec.num_controls = num_counters;
34445- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34446+ pax_open_kernel();
34447+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34448+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34449+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34450+ pax_close_kernel();
34451
34452 return 0;
34453 }
34454diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34455index d90528e..0127e2b 100644
34456--- a/arch/x86/oprofile/op_model_ppro.c
34457+++ b/arch/x86/oprofile/op_model_ppro.c
34458@@ -19,6 +19,7 @@
34459 #include <asm/msr.h>
34460 #include <asm/apic.h>
34461 #include <asm/nmi.h>
34462+#include <asm/pgtable.h>
34463
34464 #include "op_x86_model.h"
34465 #include "op_counter.h"
34466@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34467
34468 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34469
34470- op_arch_perfmon_spec.num_counters = num_counters;
34471- op_arch_perfmon_spec.num_controls = num_counters;
34472+ pax_open_kernel();
34473+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34474+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34475+ pax_close_kernel();
34476 }
34477
34478 static int arch_perfmon_init(struct oprofile_operations *ignore)
34479diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34480index 71e8a67..6a313bb 100644
34481--- a/arch/x86/oprofile/op_x86_model.h
34482+++ b/arch/x86/oprofile/op_x86_model.h
34483@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34484 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34485 struct op_msrs const * const msrs);
34486 #endif
34487-};
34488+} __do_const;
34489
34490 struct op_counter_config;
34491
34492diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34493index 852aa4c..71613f2 100644
34494--- a/arch/x86/pci/intel_mid_pci.c
34495+++ b/arch/x86/pci/intel_mid_pci.c
34496@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34497 pci_mmcfg_late_init();
34498 pcibios_enable_irq = intel_mid_pci_irq_enable;
34499 pcibios_disable_irq = intel_mid_pci_irq_disable;
34500- pci_root_ops = intel_mid_pci_ops;
34501+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34502 pci_soc_mode = 1;
34503 /* Continue with standard init */
34504 return 1;
34505diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34506index 5dc6ca5..25c03f5 100644
34507--- a/arch/x86/pci/irq.c
34508+++ b/arch/x86/pci/irq.c
34509@@ -51,7 +51,7 @@ struct irq_router {
34510 struct irq_router_handler {
34511 u16 vendor;
34512 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34513-};
34514+} __do_const;
34515
34516 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34517 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34518@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34519 return 0;
34520 }
34521
34522-static __initdata struct irq_router_handler pirq_routers[] = {
34523+static __initconst const struct irq_router_handler pirq_routers[] = {
34524 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34525 { PCI_VENDOR_ID_AL, ali_router_probe },
34526 { PCI_VENDOR_ID_ITE, ite_router_probe },
34527@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34528 static void __init pirq_find_router(struct irq_router *r)
34529 {
34530 struct irq_routing_table *rt = pirq_table;
34531- struct irq_router_handler *h;
34532+ const struct irq_router_handler *h;
34533
34534 #ifdef CONFIG_PCI_BIOS
34535 if (!rt->signature) {
34536@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34537 return 0;
34538 }
34539
34540-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34541+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34542 {
34543 .callback = fix_broken_hp_bios_irq9,
34544 .ident = "HP Pavilion N5400 Series Laptop",
34545diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34546index 9b83b90..4112152 100644
34547--- a/arch/x86/pci/pcbios.c
34548+++ b/arch/x86/pci/pcbios.c
34549@@ -79,7 +79,7 @@ union bios32 {
34550 static struct {
34551 unsigned long address;
34552 unsigned short segment;
34553-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34554+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34555
34556 /*
34557 * Returns the entry point for the given service, NULL on error
34558@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34559 unsigned long length; /* %ecx */
34560 unsigned long entry; /* %edx */
34561 unsigned long flags;
34562+ struct desc_struct d, *gdt;
34563
34564 local_irq_save(flags);
34565- __asm__("lcall *(%%edi); cld"
34566+
34567+ gdt = get_cpu_gdt_table(smp_processor_id());
34568+
34569+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34570+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34571+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34572+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34573+
34574+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34575 : "=a" (return_code),
34576 "=b" (address),
34577 "=c" (length),
34578 "=d" (entry)
34579 : "0" (service),
34580 "1" (0),
34581- "D" (&bios32_indirect));
34582+ "D" (&bios32_indirect),
34583+ "r"(__PCIBIOS_DS)
34584+ : "memory");
34585+
34586+ pax_open_kernel();
34587+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34588+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34589+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34590+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34591+ pax_close_kernel();
34592+
34593 local_irq_restore(flags);
34594
34595 switch (return_code) {
34596- case 0:
34597- return address + entry;
34598- case 0x80: /* Not present */
34599- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34600- return 0;
34601- default: /* Shouldn't happen */
34602- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34603- service, return_code);
34604+ case 0: {
34605+ int cpu;
34606+ unsigned char flags;
34607+
34608+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34609+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34610+ printk(KERN_WARNING "bios32_service: not valid\n");
34611 return 0;
34612+ }
34613+ address = address + PAGE_OFFSET;
34614+ length += 16UL; /* some BIOSs underreport this... */
34615+ flags = 4;
34616+ if (length >= 64*1024*1024) {
34617+ length >>= PAGE_SHIFT;
34618+ flags |= 8;
34619+ }
34620+
34621+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34622+ gdt = get_cpu_gdt_table(cpu);
34623+ pack_descriptor(&d, address, length, 0x9b, flags);
34624+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34625+ pack_descriptor(&d, address, length, 0x93, flags);
34626+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34627+ }
34628+ return entry;
34629+ }
34630+ case 0x80: /* Not present */
34631+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34632+ return 0;
34633+ default: /* Shouldn't happen */
34634+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34635+ service, return_code);
34636+ return 0;
34637 }
34638 }
34639
34640 static struct {
34641 unsigned long address;
34642 unsigned short segment;
34643-} pci_indirect = { 0, __KERNEL_CS };
34644+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34645
34646-static int pci_bios_present;
34647+static int pci_bios_present __read_only;
34648
34649 static int __init check_pcibios(void)
34650 {
34651@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34652 unsigned long flags, pcibios_entry;
34653
34654 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34655- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34656+ pci_indirect.address = pcibios_entry;
34657
34658 local_irq_save(flags);
34659- __asm__(
34660- "lcall *(%%edi); cld\n\t"
34661+ __asm__("movw %w6, %%ds\n\t"
34662+ "lcall *%%ss:(%%edi); cld\n\t"
34663+ "push %%ss\n\t"
34664+ "pop %%ds\n\t"
34665 "jc 1f\n\t"
34666 "xor %%ah, %%ah\n"
34667 "1:"
34668@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34669 "=b" (ebx),
34670 "=c" (ecx)
34671 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34672- "D" (&pci_indirect)
34673+ "D" (&pci_indirect),
34674+ "r" (__PCIBIOS_DS)
34675 : "memory");
34676 local_irq_restore(flags);
34677
34678@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34679
34680 switch (len) {
34681 case 1:
34682- __asm__("lcall *(%%esi); cld\n\t"
34683+ __asm__("movw %w6, %%ds\n\t"
34684+ "lcall *%%ss:(%%esi); cld\n\t"
34685+ "push %%ss\n\t"
34686+ "pop %%ds\n\t"
34687 "jc 1f\n\t"
34688 "xor %%ah, %%ah\n"
34689 "1:"
34690@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34691 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34692 "b" (bx),
34693 "D" ((long)reg),
34694- "S" (&pci_indirect));
34695+ "S" (&pci_indirect),
34696+ "r" (__PCIBIOS_DS));
34697 /*
34698 * Zero-extend the result beyond 8 bits, do not trust the
34699 * BIOS having done it:
34700@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34701 *value &= 0xff;
34702 break;
34703 case 2:
34704- __asm__("lcall *(%%esi); cld\n\t"
34705+ __asm__("movw %w6, %%ds\n\t"
34706+ "lcall *%%ss:(%%esi); cld\n\t"
34707+ "push %%ss\n\t"
34708+ "pop %%ds\n\t"
34709 "jc 1f\n\t"
34710 "xor %%ah, %%ah\n"
34711 "1:"
34712@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34713 : "1" (PCIBIOS_READ_CONFIG_WORD),
34714 "b" (bx),
34715 "D" ((long)reg),
34716- "S" (&pci_indirect));
34717+ "S" (&pci_indirect),
34718+ "r" (__PCIBIOS_DS));
34719 /*
34720 * Zero-extend the result beyond 16 bits, do not trust the
34721 * BIOS having done it:
34722@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34723 *value &= 0xffff;
34724 break;
34725 case 4:
34726- __asm__("lcall *(%%esi); cld\n\t"
34727+ __asm__("movw %w6, %%ds\n\t"
34728+ "lcall *%%ss:(%%esi); cld\n\t"
34729+ "push %%ss\n\t"
34730+ "pop %%ds\n\t"
34731 "jc 1f\n\t"
34732 "xor %%ah, %%ah\n"
34733 "1:"
34734@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34735 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34736 "b" (bx),
34737 "D" ((long)reg),
34738- "S" (&pci_indirect));
34739+ "S" (&pci_indirect),
34740+ "r" (__PCIBIOS_DS));
34741 break;
34742 }
34743
34744@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34745
34746 switch (len) {
34747 case 1:
34748- __asm__("lcall *(%%esi); cld\n\t"
34749+ __asm__("movw %w6, %%ds\n\t"
34750+ "lcall *%%ss:(%%esi); cld\n\t"
34751+ "push %%ss\n\t"
34752+ "pop %%ds\n\t"
34753 "jc 1f\n\t"
34754 "xor %%ah, %%ah\n"
34755 "1:"
34756@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34757 "c" (value),
34758 "b" (bx),
34759 "D" ((long)reg),
34760- "S" (&pci_indirect));
34761+ "S" (&pci_indirect),
34762+ "r" (__PCIBIOS_DS));
34763 break;
34764 case 2:
34765- __asm__("lcall *(%%esi); cld\n\t"
34766+ __asm__("movw %w6, %%ds\n\t"
34767+ "lcall *%%ss:(%%esi); cld\n\t"
34768+ "push %%ss\n\t"
34769+ "pop %%ds\n\t"
34770 "jc 1f\n\t"
34771 "xor %%ah, %%ah\n"
34772 "1:"
34773@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34774 "c" (value),
34775 "b" (bx),
34776 "D" ((long)reg),
34777- "S" (&pci_indirect));
34778+ "S" (&pci_indirect),
34779+ "r" (__PCIBIOS_DS));
34780 break;
34781 case 4:
34782- __asm__("lcall *(%%esi); cld\n\t"
34783+ __asm__("movw %w6, %%ds\n\t"
34784+ "lcall *%%ss:(%%esi); cld\n\t"
34785+ "push %%ss\n\t"
34786+ "pop %%ds\n\t"
34787 "jc 1f\n\t"
34788 "xor %%ah, %%ah\n"
34789 "1:"
34790@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34791 "c" (value),
34792 "b" (bx),
34793 "D" ((long)reg),
34794- "S" (&pci_indirect));
34795+ "S" (&pci_indirect),
34796+ "r" (__PCIBIOS_DS));
34797 break;
34798 }
34799
34800@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34801
34802 DBG("PCI: Fetching IRQ routing table... ");
34803 __asm__("push %%es\n\t"
34804+ "movw %w8, %%ds\n\t"
34805 "push %%ds\n\t"
34806 "pop %%es\n\t"
34807- "lcall *(%%esi); cld\n\t"
34808+ "lcall *%%ss:(%%esi); cld\n\t"
34809 "pop %%es\n\t"
34810+ "push %%ss\n\t"
34811+ "pop %%ds\n"
34812 "jc 1f\n\t"
34813 "xor %%ah, %%ah\n"
34814 "1:"
34815@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34816 "1" (0),
34817 "D" ((long) &opt),
34818 "S" (&pci_indirect),
34819- "m" (opt)
34820+ "m" (opt),
34821+ "r" (__PCIBIOS_DS)
34822 : "memory");
34823 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34824 if (ret & 0xff00)
34825@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34826 {
34827 int ret;
34828
34829- __asm__("lcall *(%%esi); cld\n\t"
34830+ __asm__("movw %w5, %%ds\n\t"
34831+ "lcall *%%ss:(%%esi); cld\n\t"
34832+ "push %%ss\n\t"
34833+ "pop %%ds\n"
34834 "jc 1f\n\t"
34835 "xor %%ah, %%ah\n"
34836 "1:"
34837@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34838 : "0" (PCIBIOS_SET_PCI_HW_INT),
34839 "b" ((dev->bus->number << 8) | dev->devfn),
34840 "c" ((irq << 8) | (pin + 10)),
34841- "S" (&pci_indirect));
34842+ "S" (&pci_indirect),
34843+ "r" (__PCIBIOS_DS));
34844 return !(ret & 0xff00);
34845 }
34846 EXPORT_SYMBOL(pcibios_set_irq_routing);
34847diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34848index 40e7cda..c7e6672 100644
34849--- a/arch/x86/platform/efi/efi_32.c
34850+++ b/arch/x86/platform/efi/efi_32.c
34851@@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34852 {
34853 struct desc_ptr gdt_descr;
34854
34855+#ifdef CONFIG_PAX_KERNEXEC
34856+ struct desc_struct d;
34857+#endif
34858+
34859 local_irq_save(efi_rt_eflags);
34860
34861 load_cr3(initial_page_table);
34862 __flush_tlb_all();
34863
34864+#ifdef CONFIG_PAX_KERNEXEC
34865+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34866+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34867+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34868+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34869+#endif
34870+
34871 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34872 gdt_descr.size = GDT_SIZE - 1;
34873 load_gdt(&gdt_descr);
34874@@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34875 {
34876 struct desc_ptr gdt_descr;
34877
34878+#ifdef CONFIG_PAX_KERNEXEC
34879+ struct desc_struct d;
34880+
34881+ memset(&d, 0, sizeof d);
34882+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34883+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34884+#endif
34885+
34886 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34887 gdt_descr.size = GDT_SIZE - 1;
34888 load_gdt(&gdt_descr);
34889
34890+#ifdef CONFIG_PAX_PER_CPU_PGD
34891+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34892+#else
34893 load_cr3(swapper_pg_dir);
34894+#endif
34895+
34896 __flush_tlb_all();
34897
34898 local_irq_restore(efi_rt_eflags);
34899diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34900index 17e80d8..9fa6e41 100644
34901--- a/arch/x86/platform/efi/efi_64.c
34902+++ b/arch/x86/platform/efi/efi_64.c
34903@@ -98,6 +98,11 @@ void __init efi_call_phys_prolog(void)
34904 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34905 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34906 }
34907+
34908+#ifdef CONFIG_PAX_PER_CPU_PGD
34909+ load_cr3(swapper_pg_dir);
34910+#endif
34911+
34912 __flush_tlb_all();
34913 }
34914
34915@@ -115,6 +120,11 @@ void __init efi_call_phys_epilog(void)
34916 for (pgd = 0; pgd < n_pgds; pgd++)
34917 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34918 kfree(save_pgd);
34919+
34920+#ifdef CONFIG_PAX_PER_CPU_PGD
34921+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34922+#endif
34923+
34924 __flush_tlb_all();
34925 local_irq_restore(efi_flags);
34926 early_code_mapping_set_exec(0);
34927@@ -145,8 +155,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34928 unsigned npages;
34929 pgd_t *pgd;
34930
34931- if (efi_enabled(EFI_OLD_MEMMAP))
34932+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34933+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34934+ * able to execute the EFI services.
34935+ */
34936+ if (__supported_pte_mask & _PAGE_NX) {
34937+ unsigned long addr = (unsigned long) __va(0);
34938+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34939+
34940+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34941+#ifdef CONFIG_PAX_PER_CPU_PGD
34942+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34943+#endif
34944+ set_pgd(pgd_offset_k(addr), pe);
34945+ }
34946+
34947 return 0;
34948+ }
34949
34950 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34951 pgd = __va(efi_scratch.efi_pgt);
34952diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34953index 040192b..7d3300f 100644
34954--- a/arch/x86/platform/efi/efi_stub_32.S
34955+++ b/arch/x86/platform/efi/efi_stub_32.S
34956@@ -6,7 +6,9 @@
34957 */
34958
34959 #include <linux/linkage.h>
34960+#include <linux/init.h>
34961 #include <asm/page_types.h>
34962+#include <asm/segment.h>
34963
34964 /*
34965 * efi_call_phys(void *, ...) is a function with variable parameters.
34966@@ -20,7 +22,7 @@
34967 * service functions will comply with gcc calling convention, too.
34968 */
34969
34970-.text
34971+__INIT
34972 ENTRY(efi_call_phys)
34973 /*
34974 * 0. The function can only be called in Linux kernel. So CS has been
34975@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34976 * The mapping of lower virtual memory has been created in prolog and
34977 * epilog.
34978 */
34979- movl $1f, %edx
34980- subl $__PAGE_OFFSET, %edx
34981- jmp *%edx
34982+#ifdef CONFIG_PAX_KERNEXEC
34983+ movl $(__KERNEXEC_EFI_DS), %edx
34984+ mov %edx, %ds
34985+ mov %edx, %es
34986+ mov %edx, %ss
34987+ addl $2f,(1f)
34988+ ljmp *(1f)
34989+
34990+__INITDATA
34991+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34992+.previous
34993+
34994+2:
34995+ subl $2b,(1b)
34996+#else
34997+ jmp 1f-__PAGE_OFFSET
34998 1:
34999+#endif
35000
35001 /*
35002 * 2. Now on the top of stack is the return
35003@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
35004 * parameter 2, ..., param n. To make things easy, we save the return
35005 * address of efi_call_phys in a global variable.
35006 */
35007- popl %edx
35008- movl %edx, saved_return_addr
35009- /* get the function pointer into ECX*/
35010- popl %ecx
35011- movl %ecx, efi_rt_function_ptr
35012- movl $2f, %edx
35013- subl $__PAGE_OFFSET, %edx
35014- pushl %edx
35015+ popl (saved_return_addr)
35016+ popl (efi_rt_function_ptr)
35017
35018 /*
35019 * 3. Clear PG bit in %CR0.
35020@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
35021 /*
35022 * 5. Call the physical function.
35023 */
35024- jmp *%ecx
35025+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
35026
35027-2:
35028 /*
35029 * 6. After EFI runtime service returns, control will return to
35030 * following instruction. We'd better readjust stack pointer first.
35031@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
35032 movl %cr0, %edx
35033 orl $0x80000000, %edx
35034 movl %edx, %cr0
35035- jmp 1f
35036-1:
35037+
35038 /*
35039 * 8. Now restore the virtual mode from flat mode by
35040 * adding EIP with PAGE_OFFSET.
35041 */
35042- movl $1f, %edx
35043- jmp *%edx
35044+#ifdef CONFIG_PAX_KERNEXEC
35045+ movl $(__KERNEL_DS), %edx
35046+ mov %edx, %ds
35047+ mov %edx, %es
35048+ mov %edx, %ss
35049+ ljmp $(__KERNEL_CS),$1f
35050+#else
35051+ jmp 1f+__PAGE_OFFSET
35052+#endif
35053 1:
35054
35055 /*
35056 * 9. Balance the stack. And because EAX contain the return value,
35057 * we'd better not clobber it.
35058 */
35059- leal efi_rt_function_ptr, %edx
35060- movl (%edx), %ecx
35061- pushl %ecx
35062+ pushl (efi_rt_function_ptr)
35063
35064 /*
35065- * 10. Push the saved return address onto the stack and return.
35066+ * 10. Return to the saved return address.
35067 */
35068- leal saved_return_addr, %edx
35069- movl (%edx), %ecx
35070- pushl %ecx
35071- ret
35072+ jmpl *(saved_return_addr)
35073 ENDPROC(efi_call_phys)
35074 .previous
35075
35076-.data
35077+__INITDATA
35078 saved_return_addr:
35079 .long 0
35080 efi_rt_function_ptr:
35081diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
35082index 86d0f9e..6d499f4 100644
35083--- a/arch/x86/platform/efi/efi_stub_64.S
35084+++ b/arch/x86/platform/efi/efi_stub_64.S
35085@@ -11,6 +11,7 @@
35086 #include <asm/msr.h>
35087 #include <asm/processor-flags.h>
35088 #include <asm/page_types.h>
35089+#include <asm/alternative-asm.h>
35090
35091 #define SAVE_XMM \
35092 mov %rsp, %rax; \
35093@@ -88,6 +89,7 @@ ENTRY(efi_call)
35094 RESTORE_PGT
35095 addq $48, %rsp
35096 RESTORE_XMM
35097+ pax_force_retaddr 0, 1
35098 ret
35099 ENDPROC(efi_call)
35100
35101diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35102index 3005f0c..d06aeb0 100644
35103--- a/arch/x86/platform/intel-mid/intel-mid.c
35104+++ b/arch/x86/platform/intel-mid/intel-mid.c
35105@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
35106 /* intel_mid_ops to store sub arch ops */
35107 struct intel_mid_ops *intel_mid_ops;
35108 /* getter function for sub arch ops*/
35109-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35110+static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35111 enum intel_mid_cpu_type __intel_mid_cpu_chip;
35112 EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
35113
35114@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35115 {
35116 };
35117
35118-static void intel_mid_reboot(void)
35119+static void __noreturn intel_mid_reboot(void)
35120 {
35121 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35122+ BUG();
35123 }
35124
35125 static unsigned long __init intel_mid_calibrate_tsc(void)
35126diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35127index 3c1c386..59a68ed 100644
35128--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35129+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35130@@ -13,6 +13,6 @@
35131 /* For every CPU addition a new get_<cpuname>_ops interface needs
35132 * to be added.
35133 */
35134-extern void *get_penwell_ops(void);
35135-extern void *get_cloverview_ops(void);
35136-extern void *get_tangier_ops(void);
35137+extern const void *get_penwell_ops(void);
35138+extern const void *get_cloverview_ops(void);
35139+extern const void *get_tangier_ops(void);
35140diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35141index 23381d2..8ddc10e 100644
35142--- a/arch/x86/platform/intel-mid/mfld.c
35143+++ b/arch/x86/platform/intel-mid/mfld.c
35144@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35145 pm_power_off = mfld_power_off;
35146 }
35147
35148-void *get_penwell_ops(void)
35149+const void *get_penwell_ops(void)
35150 {
35151 return &penwell_ops;
35152 }
35153
35154-void *get_cloverview_ops(void)
35155+const void *get_cloverview_ops(void)
35156 {
35157 return &penwell_ops;
35158 }
35159diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35160index aaca917..66eadbc 100644
35161--- a/arch/x86/platform/intel-mid/mrfl.c
35162+++ b/arch/x86/platform/intel-mid/mrfl.c
35163@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35164 .arch_setup = tangier_arch_setup,
35165 };
35166
35167-void *get_tangier_ops(void)
35168+const void *get_tangier_ops(void)
35169 {
35170 return &tangier_ops;
35171 }
35172diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
35173index c9a0838..fae0977 100644
35174--- a/arch/x86/platform/intel-quark/imr_selftest.c
35175+++ b/arch/x86/platform/intel-quark/imr_selftest.c
35176@@ -54,7 +54,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
35177 */
35178 static void __init imr_self_test(void)
35179 {
35180- phys_addr_t base = virt_to_phys(&_text);
35181+ phys_addr_t base = virt_to_phys(ktla_ktva(_text));
35182 size_t size = virt_to_phys(&__end_rodata) - base;
35183 const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
35184 int ret;
35185diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35186index d6ee929..3637cb5 100644
35187--- a/arch/x86/platform/olpc/olpc_dt.c
35188+++ b/arch/x86/platform/olpc/olpc_dt.c
35189@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35190 return res;
35191 }
35192
35193-static struct of_pdt_ops prom_olpc_ops __initdata = {
35194+static struct of_pdt_ops prom_olpc_ops __initconst = {
35195 .nextprop = olpc_dt_nextprop,
35196 .getproplen = olpc_dt_getproplen,
35197 .getproperty = olpc_dt_getproperty,
35198diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35199index 3e32ed5..cc0adc5 100644
35200--- a/arch/x86/power/cpu.c
35201+++ b/arch/x86/power/cpu.c
35202@@ -134,11 +134,8 @@ static void do_fpu_end(void)
35203 static void fix_processor_context(void)
35204 {
35205 int cpu = smp_processor_id();
35206- struct tss_struct *t = &per_cpu(init_tss, cpu);
35207-#ifdef CONFIG_X86_64
35208- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35209- tss_desc tss;
35210-#endif
35211+ struct tss_struct *t = init_tss + cpu;
35212+
35213 set_tss_desc(cpu, t); /*
35214 * This just modifies memory; should not be
35215 * necessary. But... This is necessary, because
35216@@ -147,10 +144,6 @@ static void fix_processor_context(void)
35217 */
35218
35219 #ifdef CONFIG_X86_64
35220- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35221- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35222- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35223-
35224 syscall_init(); /* This sets MSR_*STAR and related */
35225 #endif
35226 load_TR_desc(); /* This does ltr */
35227diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35228index 0b7a63d..0d0f2c2 100644
35229--- a/arch/x86/realmode/init.c
35230+++ b/arch/x86/realmode/init.c
35231@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35232 __va(real_mode_header->trampoline_header);
35233
35234 #ifdef CONFIG_X86_32
35235- trampoline_header->start = __pa_symbol(startup_32_smp);
35236+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35237+
35238+#ifdef CONFIG_PAX_KERNEXEC
35239+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35240+#endif
35241+
35242+ trampoline_header->boot_cs = __BOOT_CS;
35243 trampoline_header->gdt_limit = __BOOT_DS + 7;
35244 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35245 #else
35246@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35247 *trampoline_cr4_features = __read_cr4();
35248
35249 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35250- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35251+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35252 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35253 #endif
35254 }
35255diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35256index 2730d77..2e4cd19 100644
35257--- a/arch/x86/realmode/rm/Makefile
35258+++ b/arch/x86/realmode/rm/Makefile
35259@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35260
35261 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35262 -I$(srctree)/arch/x86/boot
35263+ifdef CONSTIFY_PLUGIN
35264+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35265+endif
35266 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35267 GCOV_PROFILE := n
35268diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35269index a28221d..93c40f1 100644
35270--- a/arch/x86/realmode/rm/header.S
35271+++ b/arch/x86/realmode/rm/header.S
35272@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35273 #endif
35274 /* APM/BIOS reboot */
35275 .long pa_machine_real_restart_asm
35276-#ifdef CONFIG_X86_64
35277+#ifdef CONFIG_X86_32
35278+ .long __KERNEL_CS
35279+#else
35280 .long __KERNEL32_CS
35281 #endif
35282 END(real_mode_header)
35283diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
35284index d66c607..3def845 100644
35285--- a/arch/x86/realmode/rm/reboot.S
35286+++ b/arch/x86/realmode/rm/reboot.S
35287@@ -27,6 +27,10 @@ ENTRY(machine_real_restart_asm)
35288 lgdtl pa_tr_gdt
35289
35290 /* Disable paging to drop us out of long mode */
35291+ movl %cr4, %eax
35292+ andl $~X86_CR4_PCIDE, %eax
35293+ movl %eax, %cr4
35294+
35295 movl %cr0, %eax
35296 andl $~X86_CR0_PG, %eax
35297 movl %eax, %cr0
35298diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35299index 48ddd76..c26749f 100644
35300--- a/arch/x86/realmode/rm/trampoline_32.S
35301+++ b/arch/x86/realmode/rm/trampoline_32.S
35302@@ -24,6 +24,12 @@
35303 #include <asm/page_types.h>
35304 #include "realmode.h"
35305
35306+#ifdef CONFIG_PAX_KERNEXEC
35307+#define ta(X) (X)
35308+#else
35309+#define ta(X) (pa_ ## X)
35310+#endif
35311+
35312 .text
35313 .code16
35314
35315@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35316
35317 cli # We should be safe anyway
35318
35319- movl tr_start, %eax # where we need to go
35320-
35321 movl $0xA5A5A5A5, trampoline_status
35322 # write marker for master knows we're running
35323
35324@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35325 movw $1, %dx # protected mode (PE) bit
35326 lmsw %dx # into protected mode
35327
35328- ljmpl $__BOOT_CS, $pa_startup_32
35329+ ljmpl *(trampoline_header)
35330
35331 .section ".text32","ax"
35332 .code32
35333@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35334 .balign 8
35335 GLOBAL(trampoline_header)
35336 tr_start: .space 4
35337- tr_gdt_pad: .space 2
35338+ tr_boot_cs: .space 2
35339 tr_gdt: .space 6
35340 END(trampoline_header)
35341
35342diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35343index dac7b20..72dbaca 100644
35344--- a/arch/x86/realmode/rm/trampoline_64.S
35345+++ b/arch/x86/realmode/rm/trampoline_64.S
35346@@ -93,6 +93,7 @@ ENTRY(startup_32)
35347 movl %edx, %gs
35348
35349 movl pa_tr_cr4, %eax
35350+ andl $~X86_CR4_PCIDE, %eax
35351 movl %eax, %cr4 # Enable PAE mode
35352
35353 # Setup trampoline 4 level pagetables
35354@@ -106,7 +107,7 @@ ENTRY(startup_32)
35355 wrmsr
35356
35357 # Enable paging and in turn activate Long Mode
35358- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35359+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35360 movl %eax, %cr0
35361
35362 /*
35363diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35364index 9e7e147..25a4158 100644
35365--- a/arch/x86/realmode/rm/wakeup_asm.S
35366+++ b/arch/x86/realmode/rm/wakeup_asm.S
35367@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35368 lgdtl pmode_gdt
35369
35370 /* This really couldn't... */
35371- movl pmode_entry, %eax
35372 movl pmode_cr0, %ecx
35373 movl %ecx, %cr0
35374- ljmpl $__KERNEL_CS, $pa_startup_32
35375- /* -> jmp *%eax in trampoline_32.S */
35376+
35377+ ljmpl *pmode_entry
35378 #else
35379 jmp trampoline_start
35380 #endif
35381diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35382index 604a37e..e49702a 100644
35383--- a/arch/x86/tools/Makefile
35384+++ b/arch/x86/tools/Makefile
35385@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35386
35387 $(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
35388
35389-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35390+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35391 hostprogs-y += relocs
35392 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35393 PHONY += relocs
35394diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35395index 0c2fae8..88036b7 100644
35396--- a/arch/x86/tools/relocs.c
35397+++ b/arch/x86/tools/relocs.c
35398@@ -1,5 +1,7 @@
35399 /* This is included from relocs_32/64.c */
35400
35401+#include "../../../include/generated/autoconf.h"
35402+
35403 #define ElfW(type) _ElfW(ELF_BITS, type)
35404 #define _ElfW(bits, type) __ElfW(bits, type)
35405 #define __ElfW(bits, type) Elf##bits##_##type
35406@@ -11,6 +13,7 @@
35407 #define Elf_Sym ElfW(Sym)
35408
35409 static Elf_Ehdr ehdr;
35410+static Elf_Phdr *phdr;
35411
35412 struct relocs {
35413 uint32_t *offset;
35414@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35415 }
35416 }
35417
35418+static void read_phdrs(FILE *fp)
35419+{
35420+ unsigned int i;
35421+
35422+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35423+ if (!phdr) {
35424+ die("Unable to allocate %d program headers\n",
35425+ ehdr.e_phnum);
35426+ }
35427+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35428+ die("Seek to %d failed: %s\n",
35429+ ehdr.e_phoff, strerror(errno));
35430+ }
35431+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35432+ die("Cannot read ELF program headers: %s\n",
35433+ strerror(errno));
35434+ }
35435+ for(i = 0; i < ehdr.e_phnum; i++) {
35436+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35437+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35438+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35439+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35440+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35441+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35442+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35443+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35444+ }
35445+
35446+}
35447+
35448 static void read_shdrs(FILE *fp)
35449 {
35450- int i;
35451+ unsigned int i;
35452 Elf_Shdr shdr;
35453
35454 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35455@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35456
35457 static void read_strtabs(FILE *fp)
35458 {
35459- int i;
35460+ unsigned int i;
35461 for (i = 0; i < ehdr.e_shnum; i++) {
35462 struct section *sec = &secs[i];
35463 if (sec->shdr.sh_type != SHT_STRTAB) {
35464@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35465
35466 static void read_symtabs(FILE *fp)
35467 {
35468- int i,j;
35469+ unsigned int i,j;
35470 for (i = 0; i < ehdr.e_shnum; i++) {
35471 struct section *sec = &secs[i];
35472 if (sec->shdr.sh_type != SHT_SYMTAB) {
35473@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35474 }
35475
35476
35477-static void read_relocs(FILE *fp)
35478+static void read_relocs(FILE *fp, int use_real_mode)
35479 {
35480- int i,j;
35481+ unsigned int i,j;
35482+ uint32_t base;
35483+
35484 for (i = 0; i < ehdr.e_shnum; i++) {
35485 struct section *sec = &secs[i];
35486 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35487@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35488 die("Cannot read symbol table: %s\n",
35489 strerror(errno));
35490 }
35491+ base = 0;
35492+
35493+#ifdef CONFIG_X86_32
35494+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35495+ if (phdr[j].p_type != PT_LOAD )
35496+ continue;
35497+ 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)
35498+ continue;
35499+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35500+ break;
35501+ }
35502+#endif
35503+
35504 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35505 Elf_Rel *rel = &sec->reltab[j];
35506- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35507+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35508 rel->r_info = elf_xword_to_cpu(rel->r_info);
35509 #if (SHT_REL_TYPE == SHT_RELA)
35510 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35511@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35512
35513 static void print_absolute_symbols(void)
35514 {
35515- int i;
35516+ unsigned int i;
35517 const char *format;
35518
35519 if (ELF_BITS == 64)
35520@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35521 for (i = 0; i < ehdr.e_shnum; i++) {
35522 struct section *sec = &secs[i];
35523 char *sym_strtab;
35524- int j;
35525+ unsigned int j;
35526
35527 if (sec->shdr.sh_type != SHT_SYMTAB) {
35528 continue;
35529@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35530
35531 static void print_absolute_relocs(void)
35532 {
35533- int i, printed = 0;
35534+ unsigned int i, printed = 0;
35535 const char *format;
35536
35537 if (ELF_BITS == 64)
35538@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35539 struct section *sec_applies, *sec_symtab;
35540 char *sym_strtab;
35541 Elf_Sym *sh_symtab;
35542- int j;
35543+ unsigned int j;
35544 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35545 continue;
35546 }
35547@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35548 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35549 Elf_Sym *sym, const char *symname))
35550 {
35551- int i;
35552+ unsigned int i;
35553 /* Walk through the relocations */
35554 for (i = 0; i < ehdr.e_shnum; i++) {
35555 char *sym_strtab;
35556 Elf_Sym *sh_symtab;
35557 struct section *sec_applies, *sec_symtab;
35558- int j;
35559+ unsigned int j;
35560 struct section *sec = &secs[i];
35561
35562 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35563@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35564 {
35565 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35566 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35567+ char *sym_strtab = sec->link->link->strtab;
35568+
35569+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35570+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35571+ return 0;
35572+
35573+#ifdef CONFIG_PAX_KERNEXEC
35574+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35575+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35576+ return 0;
35577+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35578+ return 0;
35579+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35580+ return 0;
35581+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35582+ return 0;
35583+#endif
35584
35585 switch (r_type) {
35586 case R_386_NONE:
35587@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35588
35589 static void emit_relocs(int as_text, int use_real_mode)
35590 {
35591- int i;
35592+ unsigned int i;
35593 int (*write_reloc)(uint32_t, FILE *) = write32;
35594 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35595 const char *symname);
35596@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35597 {
35598 regex_init(use_real_mode);
35599 read_ehdr(fp);
35600+ read_phdrs(fp);
35601 read_shdrs(fp);
35602 read_strtabs(fp);
35603 read_symtabs(fp);
35604- read_relocs(fp);
35605+ read_relocs(fp, use_real_mode);
35606 if (ELF_BITS == 64)
35607 percpu_init();
35608 if (show_absolute_syms) {
35609diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35610index f40281e..92728c9 100644
35611--- a/arch/x86/um/mem_32.c
35612+++ b/arch/x86/um/mem_32.c
35613@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35614 gate_vma.vm_start = FIXADDR_USER_START;
35615 gate_vma.vm_end = FIXADDR_USER_END;
35616 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35617- gate_vma.vm_page_prot = __P101;
35618+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35619
35620 return 0;
35621 }
35622diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35623index 80ffa5b..a33bd15 100644
35624--- a/arch/x86/um/tls_32.c
35625+++ b/arch/x86/um/tls_32.c
35626@@ -260,7 +260,7 @@ out:
35627 if (unlikely(task == current &&
35628 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35629 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35630- "without flushed TLS.", current->pid);
35631+ "without flushed TLS.", task_pid_nr(current));
35632 }
35633
35634 return 0;
35635diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35636index 7b9be98..39bb57f 100644
35637--- a/arch/x86/vdso/Makefile
35638+++ b/arch/x86/vdso/Makefile
35639@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO $@
35640 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35641 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35642
35643-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35644+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35645 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35646 GCOV_PROFILE := n
35647
35648diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35649index 0224987..c7d65a5 100644
35650--- a/arch/x86/vdso/vdso2c.h
35651+++ b/arch/x86/vdso/vdso2c.h
35652@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35653 unsigned long load_size = -1; /* Work around bogus warning */
35654 unsigned long mapping_size;
35655 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35656- int i;
35657+ unsigned int i;
35658 unsigned long j;
35659 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35660 *alt_sec = NULL;
35661diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35662index e904c27..b9eaa03 100644
35663--- a/arch/x86/vdso/vdso32-setup.c
35664+++ b/arch/x86/vdso/vdso32-setup.c
35665@@ -14,6 +14,7 @@
35666 #include <asm/cpufeature.h>
35667 #include <asm/processor.h>
35668 #include <asm/vdso.h>
35669+#include <asm/mman.h>
35670
35671 #ifdef CONFIG_COMPAT_VDSO
35672 #define VDSO_DEFAULT 0
35673diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35674index 1c9f750..cfddb1a 100644
35675--- a/arch/x86/vdso/vma.c
35676+++ b/arch/x86/vdso/vma.c
35677@@ -19,10 +19,7 @@
35678 #include <asm/page.h>
35679 #include <asm/hpet.h>
35680 #include <asm/desc.h>
35681-
35682-#if defined(CONFIG_X86_64)
35683-unsigned int __read_mostly vdso64_enabled = 1;
35684-#endif
35685+#include <asm/mman.h>
35686
35687 void __init init_vdso_image(const struct vdso_image *image)
35688 {
35689@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35690 .pages = no_pages,
35691 };
35692
35693+#ifdef CONFIG_PAX_RANDMMAP
35694+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35695+ calculate_addr = false;
35696+#endif
35697+
35698 if (calculate_addr) {
35699 addr = vdso_addr(current->mm->start_stack,
35700 image->size - image->sym_vvar_start);
35701@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35702 down_write(&mm->mmap_sem);
35703
35704 addr = get_unmapped_area(NULL, addr,
35705- image->size - image->sym_vvar_start, 0, 0);
35706+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35707 if (IS_ERR_VALUE(addr)) {
35708 ret = addr;
35709 goto up_fail;
35710 }
35711
35712 text_start = addr - image->sym_vvar_start;
35713- current->mm->context.vdso = (void __user *)text_start;
35714+ mm->context.vdso = text_start;
35715
35716 /*
35717 * MAYWRITE to allow gdb to COW and set breakpoints
35718@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35719 hpet_address >> PAGE_SHIFT,
35720 PAGE_SIZE,
35721 pgprot_noncached(PAGE_READONLY));
35722-
35723- if (ret)
35724- goto up_fail;
35725 }
35726 #endif
35727
35728 up_fail:
35729 if (ret)
35730- current->mm->context.vdso = NULL;
35731+ current->mm->context.vdso = 0;
35732
35733 up_write(&mm->mmap_sem);
35734 return ret;
35735@@ -191,8 +190,8 @@ static int load_vdso32(void)
35736
35737 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35738 current_thread_info()->sysenter_return =
35739- current->mm->context.vdso +
35740- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35741+ (void __force_user *)(current->mm->context.vdso +
35742+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35743
35744 return 0;
35745 }
35746@@ -201,9 +200,6 @@ static int load_vdso32(void)
35747 #ifdef CONFIG_X86_64
35748 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35749 {
35750- if (!vdso64_enabled)
35751- return 0;
35752-
35753 return map_vdso(&vdso_image_64, true);
35754 }
35755
35756@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35757 int uses_interp)
35758 {
35759 #ifdef CONFIG_X86_X32_ABI
35760- if (test_thread_flag(TIF_X32)) {
35761- if (!vdso64_enabled)
35762- return 0;
35763-
35764+ if (test_thread_flag(TIF_X32))
35765 return map_vdso(&vdso_image_x32, true);
35766- }
35767 #endif
35768
35769 return load_vdso32();
35770@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35771 #endif
35772
35773 #ifdef CONFIG_X86_64
35774-static __init int vdso_setup(char *s)
35775-{
35776- vdso64_enabled = simple_strtoul(s, NULL, 0);
35777- return 0;
35778-}
35779-__setup("vdso=", vdso_setup);
35780-#endif
35781-
35782-#ifdef CONFIG_X86_64
35783 static void vgetcpu_cpu_init(void *arg)
35784 {
35785 int cpu = smp_processor_id();
35786diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35787index e88fda8..76ce7ce 100644
35788--- a/arch/x86/xen/Kconfig
35789+++ b/arch/x86/xen/Kconfig
35790@@ -9,6 +9,7 @@ config XEN
35791 select XEN_HAVE_PVMMU
35792 depends on X86_64 || (X86_32 && X86_PAE)
35793 depends on X86_TSC
35794+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35795 help
35796 This is the Linux Xen port. Enabling this will allow the
35797 kernel to boot in a paravirtualized environment under the
35798diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35799index 5240f56..0c12163 100644
35800--- a/arch/x86/xen/enlighten.c
35801+++ b/arch/x86/xen/enlighten.c
35802@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35803
35804 struct shared_info xen_dummy_shared_info;
35805
35806-void *xen_initial_gdt;
35807-
35808 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35809 __read_mostly int xen_have_vector_callback;
35810 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35811@@ -544,8 +542,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35812 {
35813 unsigned long va = dtr->address;
35814 unsigned int size = dtr->size + 1;
35815- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35816- unsigned long frames[pages];
35817+ unsigned long frames[65536 / PAGE_SIZE];
35818 int f;
35819
35820 /*
35821@@ -593,8 +590,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35822 {
35823 unsigned long va = dtr->address;
35824 unsigned int size = dtr->size + 1;
35825- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35826- unsigned long frames[pages];
35827+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35828 int f;
35829
35830 /*
35831@@ -602,7 +598,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35832 * 8-byte entries, or 16 4k pages..
35833 */
35834
35835- BUG_ON(size > 65536);
35836+ BUG_ON(size > GDT_SIZE);
35837 BUG_ON(va & ~PAGE_MASK);
35838
35839 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35840@@ -991,7 +987,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35841 return 0;
35842 }
35843
35844-static void set_xen_basic_apic_ops(void)
35845+static void __init set_xen_basic_apic_ops(void)
35846 {
35847 apic->read = xen_apic_read;
35848 apic->write = xen_apic_write;
35849@@ -1308,30 +1304,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35850 #endif
35851 };
35852
35853-static void xen_reboot(int reason)
35854+static __noreturn void xen_reboot(int reason)
35855 {
35856 struct sched_shutdown r = { .reason = reason };
35857
35858- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35859- BUG();
35860+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35861+ BUG();
35862 }
35863
35864-static void xen_restart(char *msg)
35865+static __noreturn void xen_restart(char *msg)
35866 {
35867 xen_reboot(SHUTDOWN_reboot);
35868 }
35869
35870-static void xen_emergency_restart(void)
35871+static __noreturn void xen_emergency_restart(void)
35872 {
35873 xen_reboot(SHUTDOWN_reboot);
35874 }
35875
35876-static void xen_machine_halt(void)
35877+static __noreturn void xen_machine_halt(void)
35878 {
35879 xen_reboot(SHUTDOWN_poweroff);
35880 }
35881
35882-static void xen_machine_power_off(void)
35883+static __noreturn void xen_machine_power_off(void)
35884 {
35885 if (pm_power_off)
35886 pm_power_off();
35887@@ -1484,8 +1480,11 @@ static void __ref xen_setup_gdt(int cpu)
35888 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35889 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35890
35891- setup_stack_canary_segment(0);
35892- switch_to_new_gdt(0);
35893+ setup_stack_canary_segment(cpu);
35894+#ifdef CONFIG_X86_64
35895+ load_percpu_segment(cpu);
35896+#endif
35897+ switch_to_new_gdt(cpu);
35898
35899 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35900 pv_cpu_ops.load_gdt = xen_load_gdt;
35901@@ -1600,7 +1599,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35902 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35903
35904 /* Work out if we support NX */
35905- x86_configure_nx();
35906+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35907+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35908+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35909+ unsigned l, h;
35910+
35911+ __supported_pte_mask |= _PAGE_NX;
35912+ rdmsr(MSR_EFER, l, h);
35913+ l |= EFER_NX;
35914+ wrmsr(MSR_EFER, l, h);
35915+ }
35916+#endif
35917
35918 /* Get mfn list */
35919 xen_build_dynamic_phys_to_machine();
35920@@ -1628,13 +1637,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35921
35922 machine_ops = xen_machine_ops;
35923
35924- /*
35925- * The only reliable way to retain the initial address of the
35926- * percpu gdt_page is to remember it here, so we can go and
35927- * mark it RW later, when the initial percpu area is freed.
35928- */
35929- xen_initial_gdt = &per_cpu(gdt_page, 0);
35930-
35931 xen_smp_init();
35932
35933 #ifdef CONFIG_ACPI_NUMA
35934diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35935index adca9e2..cdba9d1 100644
35936--- a/arch/x86/xen/mmu.c
35937+++ b/arch/x86/xen/mmu.c
35938@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35939 return val;
35940 }
35941
35942-static pteval_t pte_pfn_to_mfn(pteval_t val)
35943+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35944 {
35945 if (val & _PAGE_PRESENT) {
35946 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35947@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35948 * L3_k[511] -> level2_fixmap_pgt */
35949 convert_pfn_mfn(level3_kernel_pgt);
35950
35951+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35952+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35953+ convert_pfn_mfn(level3_vmemmap_pgt);
35954 /* L3_k[511][506] -> level1_fixmap_pgt */
35955+ /* L3_k[511][507] -> level1_vsyscall_pgt */
35956 convert_pfn_mfn(level2_fixmap_pgt);
35957 }
35958 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35959@@ -1860,11 +1864,18 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35960 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35961 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35962 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35963+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35964+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35965+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35966 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35967 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35968+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35969 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35970 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35971- set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35972+ set_page_prot(level1_fixmap_pgt[0], PAGE_KERNEL_RO);
35973+ set_page_prot(level1_fixmap_pgt[1], PAGE_KERNEL_RO);
35974+ set_page_prot(level1_fixmap_pgt[2], PAGE_KERNEL_RO);
35975+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35976
35977 /* Pin down new L4 */
35978 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35979@@ -2048,6 +2059,7 @@ static void __init xen_post_allocator_init(void)
35980 pv_mmu_ops.set_pud = xen_set_pud;
35981 #if PAGETABLE_LEVELS == 4
35982 pv_mmu_ops.set_pgd = xen_set_pgd;
35983+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35984 #endif
35985
35986 /* This will work as long as patching hasn't happened yet
35987@@ -2126,6 +2138,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35988 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35989 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35990 .set_pgd = xen_set_pgd_hyper,
35991+ .set_pgd_batched = xen_set_pgd_hyper,
35992
35993 .alloc_pud = xen_alloc_pmd_init,
35994 .release_pud = xen_release_pmd_init,
35995diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35996index 08e8489..b1e182f 100644
35997--- a/arch/x86/xen/smp.c
35998+++ b/arch/x86/xen/smp.c
35999@@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
36000
36001 if (xen_pv_domain()) {
36002 if (!xen_feature(XENFEAT_writable_page_tables))
36003- /* We've switched to the "real" per-cpu gdt, so make
36004- * sure the old memory can be recycled. */
36005- make_lowmem_page_readwrite(xen_initial_gdt);
36006-
36007 #ifdef CONFIG_X86_32
36008 /*
36009 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
36010 * expects __USER_DS
36011 */
36012- loadsegment(ds, __USER_DS);
36013- loadsegment(es, __USER_DS);
36014+ loadsegment(ds, __KERNEL_DS);
36015+ loadsegment(es, __KERNEL_DS);
36016 #endif
36017
36018 xen_filter_cpu_maps();
36019@@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36020 #ifdef CONFIG_X86_32
36021 /* Note: PVH is not yet supported on x86_32. */
36022 ctxt->user_regs.fs = __KERNEL_PERCPU;
36023- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
36024+ savesegment(gs, ctxt->user_regs.gs);
36025 #endif
36026 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
36027
36028@@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36029 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
36030 ctxt->flags = VGCF_IN_KERNEL;
36031 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
36032- ctxt->user_regs.ds = __USER_DS;
36033- ctxt->user_regs.es = __USER_DS;
36034+ ctxt->user_regs.ds = __KERNEL_DS;
36035+ ctxt->user_regs.es = __KERNEL_DS;
36036 ctxt->user_regs.ss = __KERNEL_DS;
36037
36038 xen_copy_trap_info(ctxt->trap_ctxt);
36039@@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
36040 int rc;
36041
36042 per_cpu(current_task, cpu) = idle;
36043+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
36044 #ifdef CONFIG_X86_32
36045 irq_ctx_init(cpu);
36046 #else
36047 clear_tsk_thread_flag(idle, TIF_FORK);
36048 #endif
36049- per_cpu(kernel_stack, cpu) =
36050- (unsigned long)task_stack_page(idle) -
36051- KERNEL_STACK_OFFSET + THREAD_SIZE;
36052+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
36053
36054 xen_setup_runstate_info(cpu);
36055 xen_setup_timer(cpu);
36056@@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
36057
36058 void __init xen_smp_init(void)
36059 {
36060- smp_ops = xen_smp_ops;
36061+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
36062 xen_fill_possible_map();
36063 }
36064
36065diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
36066index fd92a64..1f72641 100644
36067--- a/arch/x86/xen/xen-asm_32.S
36068+++ b/arch/x86/xen/xen-asm_32.S
36069@@ -99,7 +99,7 @@ ENTRY(xen_iret)
36070 pushw %fs
36071 movl $(__KERNEL_PERCPU), %eax
36072 movl %eax, %fs
36073- movl %fs:xen_vcpu, %eax
36074+ mov PER_CPU_VAR(xen_vcpu), %eax
36075 POP_FS
36076 #else
36077 movl %ss:xen_vcpu, %eax
36078diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
36079index 674b2225..f1f5dc1 100644
36080--- a/arch/x86/xen/xen-head.S
36081+++ b/arch/x86/xen/xen-head.S
36082@@ -39,6 +39,17 @@ ENTRY(startup_xen)
36083 #ifdef CONFIG_X86_32
36084 mov %esi,xen_start_info
36085 mov $init_thread_union+THREAD_SIZE,%esp
36086+#ifdef CONFIG_SMP
36087+ movl $cpu_gdt_table,%edi
36088+ movl $__per_cpu_load,%eax
36089+ movw %ax,__KERNEL_PERCPU + 2(%edi)
36090+ rorl $16,%eax
36091+ movb %al,__KERNEL_PERCPU + 4(%edi)
36092+ movb %ah,__KERNEL_PERCPU + 7(%edi)
36093+ movl $__per_cpu_end - 1,%eax
36094+ subl $__per_cpu_start,%eax
36095+ movw %ax,__KERNEL_PERCPU + 0(%edi)
36096+#endif
36097 #else
36098 mov %rsi,xen_start_info
36099 mov $init_thread_union+THREAD_SIZE,%rsp
36100diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
36101index 9e195c6..523ed36 100644
36102--- a/arch/x86/xen/xen-ops.h
36103+++ b/arch/x86/xen/xen-ops.h
36104@@ -16,8 +16,6 @@ void xen_syscall_target(void);
36105 void xen_syscall32_target(void);
36106 #endif
36107
36108-extern void *xen_initial_gdt;
36109-
36110 struct trap_info;
36111 void xen_copy_trap_info(struct trap_info *traps);
36112
36113diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
36114index 525bd3d..ef888b1 100644
36115--- a/arch/xtensa/variants/dc232b/include/variant/core.h
36116+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
36117@@ -119,9 +119,9 @@
36118 ----------------------------------------------------------------------*/
36119
36120 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
36121-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
36122 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
36123 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
36124+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36125
36126 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
36127 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
36128diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
36129index 2f33760..835e50a 100644
36130--- a/arch/xtensa/variants/fsf/include/variant/core.h
36131+++ b/arch/xtensa/variants/fsf/include/variant/core.h
36132@@ -11,6 +11,7 @@
36133 #ifndef _XTENSA_CORE_H
36134 #define _XTENSA_CORE_H
36135
36136+#include <linux/const.h>
36137
36138 /****************************************************************************
36139 Parameters Useful for Any Code, USER or PRIVILEGED
36140@@ -112,9 +113,9 @@
36141 ----------------------------------------------------------------------*/
36142
36143 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36144-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36145 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36146 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36147+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36148
36149 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
36150 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
36151diff --git a/block/bio.c b/block/bio.c
36152index f66a4ea..73ddf55 100644
36153--- a/block/bio.c
36154+++ b/block/bio.c
36155@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36156 /*
36157 * Overflow, abort
36158 */
36159- if (end < start)
36160+ if (end < start || end - start > INT_MAX - nr_pages)
36161 return ERR_PTR(-EINVAL);
36162
36163 nr_pages += end - start;
36164@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
36165 /*
36166 * Overflow, abort
36167 */
36168- if (end < start)
36169+ if (end < start || end - start > INT_MAX - nr_pages)
36170 return ERR_PTR(-EINVAL);
36171
36172 nr_pages += end - start;
36173diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36174index 0736729..2ec3b48 100644
36175--- a/block/blk-iopoll.c
36176+++ b/block/blk-iopoll.c
36177@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36178 }
36179 EXPORT_SYMBOL(blk_iopoll_complete);
36180
36181-static void blk_iopoll_softirq(struct softirq_action *h)
36182+static __latent_entropy void blk_iopoll_softirq(void)
36183 {
36184 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36185 int rearm = 0, budget = blk_iopoll_budget;
36186diff --git a/block/blk-map.c b/block/blk-map.c
36187index b8d2725..08c52b0 100644
36188--- a/block/blk-map.c
36189+++ b/block/blk-map.c
36190@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36191 if (!len || !kbuf)
36192 return -EINVAL;
36193
36194- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36195+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36196 if (do_copy)
36197 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36198 else
36199diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36200index 53b1737..08177d2e 100644
36201--- a/block/blk-softirq.c
36202+++ b/block/blk-softirq.c
36203@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36204 * Softirq action handler - move entries to local list and loop over them
36205 * while passing them to the queue registered handler.
36206 */
36207-static void blk_done_softirq(struct softirq_action *h)
36208+static __latent_entropy void blk_done_softirq(void)
36209 {
36210 struct list_head *cpu_list, local_list;
36211
36212diff --git a/block/bsg.c b/block/bsg.c
36213index d214e92..9649863 100644
36214--- a/block/bsg.c
36215+++ b/block/bsg.c
36216@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36217 struct sg_io_v4 *hdr, struct bsg_device *bd,
36218 fmode_t has_write_perm)
36219 {
36220+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36221+ unsigned char *cmdptr;
36222+
36223 if (hdr->request_len > BLK_MAX_CDB) {
36224 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36225 if (!rq->cmd)
36226 return -ENOMEM;
36227- }
36228+ cmdptr = rq->cmd;
36229+ } else
36230+ cmdptr = tmpcmd;
36231
36232- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36233+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36234 hdr->request_len))
36235 return -EFAULT;
36236
36237+ if (cmdptr != rq->cmd)
36238+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36239+
36240 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36241 if (blk_verify_command(rq->cmd, has_write_perm))
36242 return -EPERM;
36243diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36244index f678c73..f35aa18 100644
36245--- a/block/compat_ioctl.c
36246+++ b/block/compat_ioctl.c
36247@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36248 cgc = compat_alloc_user_space(sizeof(*cgc));
36249 cgc32 = compat_ptr(arg);
36250
36251- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36252+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36253 get_user(data, &cgc32->buffer) ||
36254 put_user(compat_ptr(data), &cgc->buffer) ||
36255 copy_in_user(&cgc->buflen, &cgc32->buflen,
36256@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36257 err |= __get_user(f->spec1, &uf->spec1);
36258 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36259 err |= __get_user(name, &uf->name);
36260- f->name = compat_ptr(name);
36261+ f->name = (void __force_kernel *)compat_ptr(name);
36262 if (err) {
36263 err = -EFAULT;
36264 goto out;
36265diff --git a/block/genhd.c b/block/genhd.c
36266index 0a536dc..b8f7aca 100644
36267--- a/block/genhd.c
36268+++ b/block/genhd.c
36269@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36270
36271 /*
36272 * Register device numbers dev..(dev+range-1)
36273- * range must be nonzero
36274+ * Noop if @range is zero.
36275 * The hash chain is sorted on range, so that subranges can override.
36276 */
36277 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36278 struct kobject *(*probe)(dev_t, int *, void *),
36279 int (*lock)(dev_t, void *), void *data)
36280 {
36281- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36282+ if (range)
36283+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36284 }
36285
36286 EXPORT_SYMBOL(blk_register_region);
36287
36288+/* undo blk_register_region(), noop if @range is zero */
36289 void blk_unregister_region(dev_t devt, unsigned long range)
36290 {
36291- kobj_unmap(bdev_map, devt, range);
36292+ if (range)
36293+ kobj_unmap(bdev_map, devt, range);
36294 }
36295
36296 EXPORT_SYMBOL(blk_unregister_region);
36297diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36298index 26cb624..a49c3a5 100644
36299--- a/block/partitions/efi.c
36300+++ b/block/partitions/efi.c
36301@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36302 if (!gpt)
36303 return NULL;
36304
36305+ if (!le32_to_cpu(gpt->num_partition_entries))
36306+ return NULL;
36307+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36308+ if (!pte)
36309+ return NULL;
36310+
36311 count = le32_to_cpu(gpt->num_partition_entries) *
36312 le32_to_cpu(gpt->sizeof_partition_entry);
36313- if (!count)
36314- return NULL;
36315- pte = kmalloc(count, GFP_KERNEL);
36316- if (!pte)
36317- return NULL;
36318-
36319 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36320 (u8 *) pte, count) < count) {
36321 kfree(pte);
36322diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36323index e1f71c3..02d295a 100644
36324--- a/block/scsi_ioctl.c
36325+++ b/block/scsi_ioctl.c
36326@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36327 return put_user(0, p);
36328 }
36329
36330-static int sg_get_timeout(struct request_queue *q)
36331+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36332 {
36333 return jiffies_to_clock_t(q->sg_timeout);
36334 }
36335@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36336 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36337 struct sg_io_hdr *hdr, fmode_t mode)
36338 {
36339- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36340+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36341+ unsigned char *cmdptr;
36342+
36343+ if (rq->cmd != rq->__cmd)
36344+ cmdptr = rq->cmd;
36345+ else
36346+ cmdptr = tmpcmd;
36347+
36348+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36349 return -EFAULT;
36350+
36351+ if (cmdptr != rq->cmd)
36352+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36353+
36354 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36355 return -EPERM;
36356
36357@@ -422,6 +434,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36358 int err;
36359 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36360 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36361+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36362+ unsigned char *cmdptr;
36363
36364 if (!sic)
36365 return -EINVAL;
36366@@ -460,9 +474,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36367 */
36368 err = -EFAULT;
36369 rq->cmd_len = cmdlen;
36370- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36371+
36372+ if (rq->cmd != rq->__cmd)
36373+ cmdptr = rq->cmd;
36374+ else
36375+ cmdptr = tmpcmd;
36376+
36377+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36378 goto error;
36379
36380+ if (rq->cmd != cmdptr)
36381+ memcpy(rq->cmd, cmdptr, cmdlen);
36382+
36383 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36384 goto error;
36385
36386diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36387index 650afac1..f3307de 100644
36388--- a/crypto/cryptd.c
36389+++ b/crypto/cryptd.c
36390@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36391
36392 struct cryptd_blkcipher_request_ctx {
36393 crypto_completion_t complete;
36394-};
36395+} __no_const;
36396
36397 struct cryptd_hash_ctx {
36398 struct crypto_shash *child;
36399@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36400
36401 struct cryptd_aead_request_ctx {
36402 crypto_completion_t complete;
36403-};
36404+} __no_const;
36405
36406 static void cryptd_queue_worker(struct work_struct *work);
36407
36408diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36409index c305d41..a96de79 100644
36410--- a/crypto/pcrypt.c
36411+++ b/crypto/pcrypt.c
36412@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36413 int ret;
36414
36415 pinst->kobj.kset = pcrypt_kset;
36416- ret = kobject_add(&pinst->kobj, NULL, name);
36417+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36418 if (!ret)
36419 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36420
36421diff --git a/crypto/zlib.c b/crypto/zlib.c
36422index 0eefa9d..0fa3d29 100644
36423--- a/crypto/zlib.c
36424+++ b/crypto/zlib.c
36425@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36426 zlib_comp_exit(ctx);
36427
36428 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36429- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36430+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36431 : MAX_WBITS;
36432 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36433- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36434+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36435 : DEF_MEM_LEVEL;
36436
36437 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36438diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36439index 3b37676..898edfa 100644
36440--- a/drivers/acpi/acpica/hwxfsleep.c
36441+++ b/drivers/acpi/acpica/hwxfsleep.c
36442@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36443 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36444
36445 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36446- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36447- acpi_hw_extended_sleep},
36448- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36449- acpi_hw_extended_wake_prep},
36450- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36451+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36452+ .extended_function = acpi_hw_extended_sleep},
36453+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36454+ .extended_function = acpi_hw_extended_wake_prep},
36455+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36456+ .extended_function = acpi_hw_extended_wake}
36457 };
36458
36459 /*
36460diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36461index 16129c7..8b675cd 100644
36462--- a/drivers/acpi/apei/apei-internal.h
36463+++ b/drivers/acpi/apei/apei-internal.h
36464@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36465 struct apei_exec_ins_type {
36466 u32 flags;
36467 apei_exec_ins_func_t run;
36468-};
36469+} __do_const;
36470
36471 struct apei_exec_context {
36472 u32 ip;
36473diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36474index e82d097..0c855c1 100644
36475--- a/drivers/acpi/apei/ghes.c
36476+++ b/drivers/acpi/apei/ghes.c
36477@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36478 const struct acpi_hest_generic *generic,
36479 const struct acpi_hest_generic_status *estatus)
36480 {
36481- static atomic_t seqno;
36482+ static atomic_unchecked_t seqno;
36483 unsigned int curr_seqno;
36484 char pfx_seq[64];
36485
36486@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36487 else
36488 pfx = KERN_ERR;
36489 }
36490- curr_seqno = atomic_inc_return(&seqno);
36491+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36492 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36493 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36494 pfx_seq, generic->header.source_id);
36495diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36496index a83e3c6..c3d617f 100644
36497--- a/drivers/acpi/bgrt.c
36498+++ b/drivers/acpi/bgrt.c
36499@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36500 if (!bgrt_image)
36501 return -ENODEV;
36502
36503- bin_attr_image.private = bgrt_image;
36504- bin_attr_image.size = bgrt_image_size;
36505+ pax_open_kernel();
36506+ *(void **)&bin_attr_image.private = bgrt_image;
36507+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36508+ pax_close_kernel();
36509
36510 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36511 if (!bgrt_kobj)
36512diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36513index 9b693d5..8953d54 100644
36514--- a/drivers/acpi/blacklist.c
36515+++ b/drivers/acpi/blacklist.c
36516@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36517 u32 is_critical_error;
36518 };
36519
36520-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36521+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36522
36523 /*
36524 * POLICY: If *anything* doesn't work, put it on the blacklist.
36525@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36526 return 0;
36527 }
36528
36529-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36530+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36531 {
36532 .callback = dmi_disable_osi_vista,
36533 .ident = "Fujitsu Siemens",
36534diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36535index 8b67bd0..b59593e 100644
36536--- a/drivers/acpi/bus.c
36537+++ b/drivers/acpi/bus.c
36538@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36539 }
36540 #endif
36541
36542-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36543+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36544 /*
36545 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36546 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36547@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36548 {}
36549 };
36550 #else
36551-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36552+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36553 {}
36554 };
36555 #endif
36556diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36557index c68e724..e863008 100644
36558--- a/drivers/acpi/custom_method.c
36559+++ b/drivers/acpi/custom_method.c
36560@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36561 struct acpi_table_header table;
36562 acpi_status status;
36563
36564+#ifdef CONFIG_GRKERNSEC_KMEM
36565+ return -EPERM;
36566+#endif
36567+
36568 if (!(*ppos)) {
36569 /* parse the table header to get the table length */
36570 if (count <= sizeof(struct acpi_table_header))
36571diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36572index 735db11..91e07ff 100644
36573--- a/drivers/acpi/device_pm.c
36574+++ b/drivers/acpi/device_pm.c
36575@@ -1025,6 +1025,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36576
36577 #endif /* CONFIG_PM_SLEEP */
36578
36579+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36580+
36581 static struct dev_pm_domain acpi_general_pm_domain = {
36582 .ops = {
36583 .runtime_suspend = acpi_subsys_runtime_suspend,
36584@@ -1041,6 +1043,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36585 .restore_early = acpi_subsys_resume_early,
36586 #endif
36587 },
36588+ .detach = acpi_dev_pm_detach
36589 };
36590
36591 /**
36592@@ -1110,7 +1113,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36593 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36594 }
36595
36596- dev->pm_domain->detach = acpi_dev_pm_detach;
36597 return 0;
36598 }
36599 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36600diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36601index a8dd2f7..e15950e 100644
36602--- a/drivers/acpi/ec.c
36603+++ b/drivers/acpi/ec.c
36604@@ -1242,7 +1242,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36605 return 0;
36606 }
36607
36608-static struct dmi_system_id ec_dmi_table[] __initdata = {
36609+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36610 {
36611 ec_skip_dsdt_scan, "Compal JFL92", {
36612 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36613diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36614index 139d9e4..9a9d799 100644
36615--- a/drivers/acpi/pci_slot.c
36616+++ b/drivers/acpi/pci_slot.c
36617@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36618 return 0;
36619 }
36620
36621-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36622+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36623 /*
36624 * Fujitsu Primequest machines will return 1023 to indicate an
36625 * error if the _SUN method is evaluated on SxFy objects that
36626diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36627index d9f7158..168e742 100644
36628--- a/drivers/acpi/processor_driver.c
36629+++ b/drivers/acpi/processor_driver.c
36630@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36631 return NOTIFY_OK;
36632 }
36633
36634-static struct notifier_block __refdata acpi_cpu_notifier = {
36635+static struct notifier_block __refconst acpi_cpu_notifier = {
36636 .notifier_call = acpi_cpu_soft_notify,
36637 };
36638
36639diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36640index f98db0b..8309c83 100644
36641--- a/drivers/acpi/processor_idle.c
36642+++ b/drivers/acpi/processor_idle.c
36643@@ -912,7 +912,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36644 {
36645 int i, count = CPUIDLE_DRIVER_STATE_START;
36646 struct acpi_processor_cx *cx;
36647- struct cpuidle_state *state;
36648+ cpuidle_state_no_const *state;
36649 struct cpuidle_driver *drv = &acpi_idle_driver;
36650
36651 if (!pr->flags.power_setup_done)
36652diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36653index e5dd808..1eceed1 100644
36654--- a/drivers/acpi/processor_pdc.c
36655+++ b/drivers/acpi/processor_pdc.c
36656@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36657 return 0;
36658 }
36659
36660-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36661+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36662 {
36663 set_no_mwait, "Extensa 5220", {
36664 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36665diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36666index 7f251dd..47b262c 100644
36667--- a/drivers/acpi/sleep.c
36668+++ b/drivers/acpi/sleep.c
36669@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36670 return 0;
36671 }
36672
36673-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36674+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36675 {
36676 .callback = init_old_suspend_ordering,
36677 .ident = "Abit KN9 (nForce4 variant)",
36678diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36679index 13e577c..cef11ee 100644
36680--- a/drivers/acpi/sysfs.c
36681+++ b/drivers/acpi/sysfs.c
36682@@ -423,11 +423,11 @@ static u32 num_counters;
36683 static struct attribute **all_attrs;
36684 static u32 acpi_gpe_count;
36685
36686-static struct attribute_group interrupt_stats_attr_group = {
36687+static attribute_group_no_const interrupt_stats_attr_group = {
36688 .name = "interrupts",
36689 };
36690
36691-static struct kobj_attribute *counter_attrs;
36692+static kobj_attribute_no_const *counter_attrs;
36693
36694 static void delete_gpe_attr_array(void)
36695 {
36696diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36697index d24fa19..782f1e6 100644
36698--- a/drivers/acpi/thermal.c
36699+++ b/drivers/acpi/thermal.c
36700@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36701 return 0;
36702 }
36703
36704-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36705+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36706 /*
36707 * Award BIOS on this AOpen makes thermal control almost worthless.
36708 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36709diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36710index 26eb70c..4d66ddf 100644
36711--- a/drivers/acpi/video.c
36712+++ b/drivers/acpi/video.c
36713@@ -418,7 +418,7 @@ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
36714 return 0;
36715 }
36716
36717-static struct dmi_system_id video_dmi_table[] __initdata = {
36718+static const struct dmi_system_id video_dmi_table[] __initconst = {
36719 /*
36720 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36721 */
36722diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36723index 287c4ba..6a600bc 100644
36724--- a/drivers/ata/libahci.c
36725+++ b/drivers/ata/libahci.c
36726@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36727 }
36728 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36729
36730-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36731+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36732 struct ata_taskfile *tf, int is_cmd, u16 flags,
36733 unsigned long timeout_msec)
36734 {
36735diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36736index 87b4b7f..d876fbd 100644
36737--- a/drivers/ata/libata-core.c
36738+++ b/drivers/ata/libata-core.c
36739@@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36740 static void ata_dev_xfermask(struct ata_device *dev);
36741 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36742
36743-atomic_t ata_print_id = ATOMIC_INIT(0);
36744+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36745
36746 struct ata_force_param {
36747 const char *name;
36748@@ -4780,7 +4780,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36749 struct ata_port *ap;
36750 unsigned int tag;
36751
36752- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36753+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36754 ap = qc->ap;
36755
36756 qc->flags = 0;
36757@@ -4797,7 +4797,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36758 struct ata_port *ap;
36759 struct ata_link *link;
36760
36761- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36762+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36763 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36764 ap = qc->ap;
36765 link = qc->dev->link;
36766@@ -5901,6 +5901,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36767 return;
36768
36769 spin_lock(&lock);
36770+ pax_open_kernel();
36771
36772 for (cur = ops->inherits; cur; cur = cur->inherits) {
36773 void **inherit = (void **)cur;
36774@@ -5914,8 +5915,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36775 if (IS_ERR(*pp))
36776 *pp = NULL;
36777
36778- ops->inherits = NULL;
36779+ *(struct ata_port_operations **)&ops->inherits = NULL;
36780
36781+ pax_close_kernel();
36782 spin_unlock(&lock);
36783 }
36784
36785@@ -6111,7 +6113,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36786
36787 /* give ports names and add SCSI hosts */
36788 for (i = 0; i < host->n_ports; i++) {
36789- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36790+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36791 host->ports[i]->local_port_no = i + 1;
36792 }
36793
36794diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36795index b061ba2..fdcd85f 100644
36796--- a/drivers/ata/libata-scsi.c
36797+++ b/drivers/ata/libata-scsi.c
36798@@ -4172,7 +4172,7 @@ int ata_sas_port_init(struct ata_port *ap)
36799
36800 if (rc)
36801 return rc;
36802- ap->print_id = atomic_inc_return(&ata_print_id);
36803+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36804 return 0;
36805 }
36806 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36807diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36808index f840ca1..edd6ef3 100644
36809--- a/drivers/ata/libata.h
36810+++ b/drivers/ata/libata.h
36811@@ -53,7 +53,7 @@ enum {
36812 ATA_DNXFER_QUIET = (1 << 31),
36813 };
36814
36815-extern atomic_t ata_print_id;
36816+extern atomic_unchecked_t ata_print_id;
36817 extern int atapi_passthru16;
36818 extern int libata_fua;
36819 extern int libata_noacpi;
36820diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36821index a9b0c82..207d97d 100644
36822--- a/drivers/ata/pata_arasan_cf.c
36823+++ b/drivers/ata/pata_arasan_cf.c
36824@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36825 /* Handle platform specific quirks */
36826 if (quirk) {
36827 if (quirk & CF_BROKEN_PIO) {
36828- ap->ops->set_piomode = NULL;
36829+ pax_open_kernel();
36830+ *(void **)&ap->ops->set_piomode = NULL;
36831+ pax_close_kernel();
36832 ap->pio_mask = 0;
36833 }
36834 if (quirk & CF_BROKEN_MWDMA)
36835diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36836index f9b983a..887b9d8 100644
36837--- a/drivers/atm/adummy.c
36838+++ b/drivers/atm/adummy.c
36839@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36840 vcc->pop(vcc, skb);
36841 else
36842 dev_kfree_skb_any(skb);
36843- atomic_inc(&vcc->stats->tx);
36844+ atomic_inc_unchecked(&vcc->stats->tx);
36845
36846 return 0;
36847 }
36848diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36849index f1a9198..f466a4a 100644
36850--- a/drivers/atm/ambassador.c
36851+++ b/drivers/atm/ambassador.c
36852@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36853 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36854
36855 // VC layer stats
36856- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36857+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36858
36859 // free the descriptor
36860 kfree (tx_descr);
36861@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36862 dump_skb ("<<<", vc, skb);
36863
36864 // VC layer stats
36865- atomic_inc(&atm_vcc->stats->rx);
36866+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36867 __net_timestamp(skb);
36868 // end of our responsibility
36869 atm_vcc->push (atm_vcc, skb);
36870@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36871 } else {
36872 PRINTK (KERN_INFO, "dropped over-size frame");
36873 // should we count this?
36874- atomic_inc(&atm_vcc->stats->rx_drop);
36875+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36876 }
36877
36878 } else {
36879@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36880 }
36881
36882 if (check_area (skb->data, skb->len)) {
36883- atomic_inc(&atm_vcc->stats->tx_err);
36884+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36885 return -ENOMEM; // ?
36886 }
36887
36888diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36889index 480fa6f..947067c 100644
36890--- a/drivers/atm/atmtcp.c
36891+++ b/drivers/atm/atmtcp.c
36892@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36893 if (vcc->pop) vcc->pop(vcc,skb);
36894 else dev_kfree_skb(skb);
36895 if (dev_data) return 0;
36896- atomic_inc(&vcc->stats->tx_err);
36897+ atomic_inc_unchecked(&vcc->stats->tx_err);
36898 return -ENOLINK;
36899 }
36900 size = skb->len+sizeof(struct atmtcp_hdr);
36901@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36902 if (!new_skb) {
36903 if (vcc->pop) vcc->pop(vcc,skb);
36904 else dev_kfree_skb(skb);
36905- atomic_inc(&vcc->stats->tx_err);
36906+ atomic_inc_unchecked(&vcc->stats->tx_err);
36907 return -ENOBUFS;
36908 }
36909 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36910@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36911 if (vcc->pop) vcc->pop(vcc,skb);
36912 else dev_kfree_skb(skb);
36913 out_vcc->push(out_vcc,new_skb);
36914- atomic_inc(&vcc->stats->tx);
36915- atomic_inc(&out_vcc->stats->rx);
36916+ atomic_inc_unchecked(&vcc->stats->tx);
36917+ atomic_inc_unchecked(&out_vcc->stats->rx);
36918 return 0;
36919 }
36920
36921@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36922 read_unlock(&vcc_sklist_lock);
36923 if (!out_vcc) {
36924 result = -EUNATCH;
36925- atomic_inc(&vcc->stats->tx_err);
36926+ atomic_inc_unchecked(&vcc->stats->tx_err);
36927 goto done;
36928 }
36929 skb_pull(skb,sizeof(struct atmtcp_hdr));
36930@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36931 __net_timestamp(new_skb);
36932 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36933 out_vcc->push(out_vcc,new_skb);
36934- atomic_inc(&vcc->stats->tx);
36935- atomic_inc(&out_vcc->stats->rx);
36936+ atomic_inc_unchecked(&vcc->stats->tx);
36937+ atomic_inc_unchecked(&out_vcc->stats->rx);
36938 done:
36939 if (vcc->pop) vcc->pop(vcc,skb);
36940 else dev_kfree_skb(skb);
36941diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36942index 6339efd..2b441d5 100644
36943--- a/drivers/atm/eni.c
36944+++ b/drivers/atm/eni.c
36945@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36946 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36947 vcc->dev->number);
36948 length = 0;
36949- atomic_inc(&vcc->stats->rx_err);
36950+ atomic_inc_unchecked(&vcc->stats->rx_err);
36951 }
36952 else {
36953 length = ATM_CELL_SIZE-1; /* no HEC */
36954@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36955 size);
36956 }
36957 eff = length = 0;
36958- atomic_inc(&vcc->stats->rx_err);
36959+ atomic_inc_unchecked(&vcc->stats->rx_err);
36960 }
36961 else {
36962 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36963@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36964 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36965 vcc->dev->number,vcc->vci,length,size << 2,descr);
36966 length = eff = 0;
36967- atomic_inc(&vcc->stats->rx_err);
36968+ atomic_inc_unchecked(&vcc->stats->rx_err);
36969 }
36970 }
36971 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36972@@ -770,7 +770,7 @@ rx_dequeued++;
36973 vcc->push(vcc,skb);
36974 pushed++;
36975 }
36976- atomic_inc(&vcc->stats->rx);
36977+ atomic_inc_unchecked(&vcc->stats->rx);
36978 }
36979 wake_up(&eni_dev->rx_wait);
36980 }
36981@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
36982 DMA_TO_DEVICE);
36983 if (vcc->pop) vcc->pop(vcc,skb);
36984 else dev_kfree_skb_irq(skb);
36985- atomic_inc(&vcc->stats->tx);
36986+ atomic_inc_unchecked(&vcc->stats->tx);
36987 wake_up(&eni_dev->tx_wait);
36988 dma_complete++;
36989 }
36990diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36991index 82f2ae0..f205c02 100644
36992--- a/drivers/atm/firestream.c
36993+++ b/drivers/atm/firestream.c
36994@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36995 }
36996 }
36997
36998- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36999+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37000
37001 fs_dprintk (FS_DEBUG_TXMEM, "i");
37002 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
37003@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37004 #endif
37005 skb_put (skb, qe->p1 & 0xffff);
37006 ATM_SKB(skb)->vcc = atm_vcc;
37007- atomic_inc(&atm_vcc->stats->rx);
37008+ atomic_inc_unchecked(&atm_vcc->stats->rx);
37009 __net_timestamp(skb);
37010 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
37011 atm_vcc->push (atm_vcc, skb);
37012@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37013 kfree (pe);
37014 }
37015 if (atm_vcc)
37016- atomic_inc(&atm_vcc->stats->rx_drop);
37017+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37018 break;
37019 case 0x1f: /* Reassembly abort: no buffers. */
37020 /* Silently increment error counter. */
37021 if (atm_vcc)
37022- atomic_inc(&atm_vcc->stats->rx_drop);
37023+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37024 break;
37025 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
37026 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
37027diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
37028index 75dde90..4309ead 100644
37029--- a/drivers/atm/fore200e.c
37030+++ b/drivers/atm/fore200e.c
37031@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
37032 #endif
37033 /* check error condition */
37034 if (*entry->status & STATUS_ERROR)
37035- atomic_inc(&vcc->stats->tx_err);
37036+ atomic_inc_unchecked(&vcc->stats->tx_err);
37037 else
37038- atomic_inc(&vcc->stats->tx);
37039+ atomic_inc_unchecked(&vcc->stats->tx);
37040 }
37041 }
37042
37043@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37044 if (skb == NULL) {
37045 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
37046
37047- atomic_inc(&vcc->stats->rx_drop);
37048+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37049 return -ENOMEM;
37050 }
37051
37052@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37053
37054 dev_kfree_skb_any(skb);
37055
37056- atomic_inc(&vcc->stats->rx_drop);
37057+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37058 return -ENOMEM;
37059 }
37060
37061 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37062
37063 vcc->push(vcc, skb);
37064- atomic_inc(&vcc->stats->rx);
37065+ atomic_inc_unchecked(&vcc->stats->rx);
37066
37067 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37068
37069@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
37070 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
37071 fore200e->atm_dev->number,
37072 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
37073- atomic_inc(&vcc->stats->rx_err);
37074+ atomic_inc_unchecked(&vcc->stats->rx_err);
37075 }
37076 }
37077
37078@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
37079 goto retry_here;
37080 }
37081
37082- atomic_inc(&vcc->stats->tx_err);
37083+ atomic_inc_unchecked(&vcc->stats->tx_err);
37084
37085 fore200e->tx_sat++;
37086 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
37087diff --git a/drivers/atm/he.c b/drivers/atm/he.c
37088index 93dca2e..c5daa69 100644
37089--- a/drivers/atm/he.c
37090+++ b/drivers/atm/he.c
37091@@ -1692,7 +1692,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37092
37093 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
37094 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
37095- atomic_inc(&vcc->stats->rx_drop);
37096+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37097 goto return_host_buffers;
37098 }
37099
37100@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37101 RBRQ_LEN_ERR(he_dev->rbrq_head)
37102 ? "LEN_ERR" : "",
37103 vcc->vpi, vcc->vci);
37104- atomic_inc(&vcc->stats->rx_err);
37105+ atomic_inc_unchecked(&vcc->stats->rx_err);
37106 goto return_host_buffers;
37107 }
37108
37109@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37110 vcc->push(vcc, skb);
37111 spin_lock(&he_dev->global_lock);
37112
37113- atomic_inc(&vcc->stats->rx);
37114+ atomic_inc_unchecked(&vcc->stats->rx);
37115
37116 return_host_buffers:
37117 ++pdus_assembled;
37118@@ -2097,7 +2097,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
37119 tpd->vcc->pop(tpd->vcc, tpd->skb);
37120 else
37121 dev_kfree_skb_any(tpd->skb);
37122- atomic_inc(&tpd->vcc->stats->tx_err);
37123+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
37124 }
37125 dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
37126 return;
37127@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37128 vcc->pop(vcc, skb);
37129 else
37130 dev_kfree_skb_any(skb);
37131- atomic_inc(&vcc->stats->tx_err);
37132+ atomic_inc_unchecked(&vcc->stats->tx_err);
37133 return -EINVAL;
37134 }
37135
37136@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37137 vcc->pop(vcc, skb);
37138 else
37139 dev_kfree_skb_any(skb);
37140- atomic_inc(&vcc->stats->tx_err);
37141+ atomic_inc_unchecked(&vcc->stats->tx_err);
37142 return -EINVAL;
37143 }
37144 #endif
37145@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37146 vcc->pop(vcc, skb);
37147 else
37148 dev_kfree_skb_any(skb);
37149- atomic_inc(&vcc->stats->tx_err);
37150+ atomic_inc_unchecked(&vcc->stats->tx_err);
37151 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37152 return -ENOMEM;
37153 }
37154@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37155 vcc->pop(vcc, skb);
37156 else
37157 dev_kfree_skb_any(skb);
37158- atomic_inc(&vcc->stats->tx_err);
37159+ atomic_inc_unchecked(&vcc->stats->tx_err);
37160 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37161 return -ENOMEM;
37162 }
37163@@ -2605,7 +2605,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37164 __enqueue_tpd(he_dev, tpd, cid);
37165 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37166
37167- atomic_inc(&vcc->stats->tx);
37168+ atomic_inc_unchecked(&vcc->stats->tx);
37169
37170 return 0;
37171 }
37172diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
37173index 527bbd5..96570c8 100644
37174--- a/drivers/atm/horizon.c
37175+++ b/drivers/atm/horizon.c
37176@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
37177 {
37178 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
37179 // VC layer stats
37180- atomic_inc(&vcc->stats->rx);
37181+ atomic_inc_unchecked(&vcc->stats->rx);
37182 __net_timestamp(skb);
37183 // end of our responsibility
37184 vcc->push (vcc, skb);
37185@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37186 dev->tx_iovec = NULL;
37187
37188 // VC layer stats
37189- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37190+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37191
37192 // free the skb
37193 hrz_kfree_skb (skb);
37194diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37195index 074616b..d6b3d5f 100644
37196--- a/drivers/atm/idt77252.c
37197+++ b/drivers/atm/idt77252.c
37198@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37199 else
37200 dev_kfree_skb(skb);
37201
37202- atomic_inc(&vcc->stats->tx);
37203+ atomic_inc_unchecked(&vcc->stats->tx);
37204 }
37205
37206 atomic_dec(&scq->used);
37207@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37208 if ((sb = dev_alloc_skb(64)) == NULL) {
37209 printk("%s: Can't allocate buffers for aal0.\n",
37210 card->name);
37211- atomic_add(i, &vcc->stats->rx_drop);
37212+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37213 break;
37214 }
37215 if (!atm_charge(vcc, sb->truesize)) {
37216 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37217 card->name);
37218- atomic_add(i - 1, &vcc->stats->rx_drop);
37219+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37220 dev_kfree_skb(sb);
37221 break;
37222 }
37223@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37224 ATM_SKB(sb)->vcc = vcc;
37225 __net_timestamp(sb);
37226 vcc->push(vcc, sb);
37227- atomic_inc(&vcc->stats->rx);
37228+ atomic_inc_unchecked(&vcc->stats->rx);
37229
37230 cell += ATM_CELL_PAYLOAD;
37231 }
37232@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37233 "(CDC: %08x)\n",
37234 card->name, len, rpp->len, readl(SAR_REG_CDC));
37235 recycle_rx_pool_skb(card, rpp);
37236- atomic_inc(&vcc->stats->rx_err);
37237+ atomic_inc_unchecked(&vcc->stats->rx_err);
37238 return;
37239 }
37240 if (stat & SAR_RSQE_CRC) {
37241 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37242 recycle_rx_pool_skb(card, rpp);
37243- atomic_inc(&vcc->stats->rx_err);
37244+ atomic_inc_unchecked(&vcc->stats->rx_err);
37245 return;
37246 }
37247 if (skb_queue_len(&rpp->queue) > 1) {
37248@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37249 RXPRINTK("%s: Can't alloc RX skb.\n",
37250 card->name);
37251 recycle_rx_pool_skb(card, rpp);
37252- atomic_inc(&vcc->stats->rx_err);
37253+ atomic_inc_unchecked(&vcc->stats->rx_err);
37254 return;
37255 }
37256 if (!atm_charge(vcc, skb->truesize)) {
37257@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37258 __net_timestamp(skb);
37259
37260 vcc->push(vcc, skb);
37261- atomic_inc(&vcc->stats->rx);
37262+ atomic_inc_unchecked(&vcc->stats->rx);
37263
37264 return;
37265 }
37266@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37267 __net_timestamp(skb);
37268
37269 vcc->push(vcc, skb);
37270- atomic_inc(&vcc->stats->rx);
37271+ atomic_inc_unchecked(&vcc->stats->rx);
37272
37273 if (skb->truesize > SAR_FB_SIZE_3)
37274 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37275@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37276 if (vcc->qos.aal != ATM_AAL0) {
37277 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37278 card->name, vpi, vci);
37279- atomic_inc(&vcc->stats->rx_drop);
37280+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37281 goto drop;
37282 }
37283
37284 if ((sb = dev_alloc_skb(64)) == NULL) {
37285 printk("%s: Can't allocate buffers for AAL0.\n",
37286 card->name);
37287- atomic_inc(&vcc->stats->rx_err);
37288+ atomic_inc_unchecked(&vcc->stats->rx_err);
37289 goto drop;
37290 }
37291
37292@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37293 ATM_SKB(sb)->vcc = vcc;
37294 __net_timestamp(sb);
37295 vcc->push(vcc, sb);
37296- atomic_inc(&vcc->stats->rx);
37297+ atomic_inc_unchecked(&vcc->stats->rx);
37298
37299 drop:
37300 skb_pull(queue, 64);
37301@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37302
37303 if (vc == NULL) {
37304 printk("%s: NULL connection in send().\n", card->name);
37305- atomic_inc(&vcc->stats->tx_err);
37306+ atomic_inc_unchecked(&vcc->stats->tx_err);
37307 dev_kfree_skb(skb);
37308 return -EINVAL;
37309 }
37310 if (!test_bit(VCF_TX, &vc->flags)) {
37311 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37312- atomic_inc(&vcc->stats->tx_err);
37313+ atomic_inc_unchecked(&vcc->stats->tx_err);
37314 dev_kfree_skb(skb);
37315 return -EINVAL;
37316 }
37317@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37318 break;
37319 default:
37320 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37321- atomic_inc(&vcc->stats->tx_err);
37322+ atomic_inc_unchecked(&vcc->stats->tx_err);
37323 dev_kfree_skb(skb);
37324 return -EINVAL;
37325 }
37326
37327 if (skb_shinfo(skb)->nr_frags != 0) {
37328 printk("%s: No scatter-gather yet.\n", card->name);
37329- atomic_inc(&vcc->stats->tx_err);
37330+ atomic_inc_unchecked(&vcc->stats->tx_err);
37331 dev_kfree_skb(skb);
37332 return -EINVAL;
37333 }
37334@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37335
37336 err = queue_skb(card, vc, skb, oam);
37337 if (err) {
37338- atomic_inc(&vcc->stats->tx_err);
37339+ atomic_inc_unchecked(&vcc->stats->tx_err);
37340 dev_kfree_skb(skb);
37341 return err;
37342 }
37343@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37344 skb = dev_alloc_skb(64);
37345 if (!skb) {
37346 printk("%s: Out of memory in send_oam().\n", card->name);
37347- atomic_inc(&vcc->stats->tx_err);
37348+ atomic_inc_unchecked(&vcc->stats->tx_err);
37349 return -ENOMEM;
37350 }
37351 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37352diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37353index 924f8e2..3375a3e 100644
37354--- a/drivers/atm/iphase.c
37355+++ b/drivers/atm/iphase.c
37356@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37357 status = (u_short) (buf_desc_ptr->desc_mode);
37358 if (status & (RX_CER | RX_PTE | RX_OFL))
37359 {
37360- atomic_inc(&vcc->stats->rx_err);
37361+ atomic_inc_unchecked(&vcc->stats->rx_err);
37362 IF_ERR(printk("IA: bad packet, dropping it");)
37363 if (status & RX_CER) {
37364 IF_ERR(printk(" cause: packet CRC error\n");)
37365@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37366 len = dma_addr - buf_addr;
37367 if (len > iadev->rx_buf_sz) {
37368 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37369- atomic_inc(&vcc->stats->rx_err);
37370+ atomic_inc_unchecked(&vcc->stats->rx_err);
37371 goto out_free_desc;
37372 }
37373
37374@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37375 ia_vcc = INPH_IA_VCC(vcc);
37376 if (ia_vcc == NULL)
37377 {
37378- atomic_inc(&vcc->stats->rx_err);
37379+ atomic_inc_unchecked(&vcc->stats->rx_err);
37380 atm_return(vcc, skb->truesize);
37381 dev_kfree_skb_any(skb);
37382 goto INCR_DLE;
37383@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37384 if ((length > iadev->rx_buf_sz) || (length >
37385 (skb->len - sizeof(struct cpcs_trailer))))
37386 {
37387- atomic_inc(&vcc->stats->rx_err);
37388+ atomic_inc_unchecked(&vcc->stats->rx_err);
37389 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37390 length, skb->len);)
37391 atm_return(vcc, skb->truesize);
37392@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37393
37394 IF_RX(printk("rx_dle_intr: skb push");)
37395 vcc->push(vcc,skb);
37396- atomic_inc(&vcc->stats->rx);
37397+ atomic_inc_unchecked(&vcc->stats->rx);
37398 iadev->rx_pkt_cnt++;
37399 }
37400 INCR_DLE:
37401@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37402 {
37403 struct k_sonet_stats *stats;
37404 stats = &PRIV(_ia_dev[board])->sonet_stats;
37405- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37406- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37407- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37408- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37409- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37410- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37411- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37412- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37413- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37414+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37415+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37416+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37417+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37418+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37419+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37420+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37421+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37422+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37423 }
37424 ia_cmds.status = 0;
37425 break;
37426@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37427 if ((desc == 0) || (desc > iadev->num_tx_desc))
37428 {
37429 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37430- atomic_inc(&vcc->stats->tx);
37431+ atomic_inc_unchecked(&vcc->stats->tx);
37432 if (vcc->pop)
37433 vcc->pop(vcc, skb);
37434 else
37435@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37436 ATM_DESC(skb) = vcc->vci;
37437 skb_queue_tail(&iadev->tx_dma_q, skb);
37438
37439- atomic_inc(&vcc->stats->tx);
37440+ atomic_inc_unchecked(&vcc->stats->tx);
37441 iadev->tx_pkt_cnt++;
37442 /* Increment transaction counter */
37443 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37444
37445 #if 0
37446 /* add flow control logic */
37447- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37448+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37449 if (iavcc->vc_desc_cnt > 10) {
37450 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37451 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37452diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37453index ce43ae3..969de38 100644
37454--- a/drivers/atm/lanai.c
37455+++ b/drivers/atm/lanai.c
37456@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37457 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37458 lanai_endtx(lanai, lvcc);
37459 lanai_free_skb(lvcc->tx.atmvcc, skb);
37460- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37461+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37462 }
37463
37464 /* Try to fill the buffer - don't call unless there is backlog */
37465@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37466 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37467 __net_timestamp(skb);
37468 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37469- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37470+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37471 out:
37472 lvcc->rx.buf.ptr = end;
37473 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37474@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37475 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37476 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37477 lanai->stats.service_rxnotaal5++;
37478- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37479+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37480 return 0;
37481 }
37482 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37483@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37484 int bytes;
37485 read_unlock(&vcc_sklist_lock);
37486 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37487- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37488+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37489 lvcc->stats.x.aal5.service_trash++;
37490 bytes = (SERVICE_GET_END(s) * 16) -
37491 (((unsigned long) lvcc->rx.buf.ptr) -
37492@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37493 }
37494 if (s & SERVICE_STREAM) {
37495 read_unlock(&vcc_sklist_lock);
37496- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37497+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37498 lvcc->stats.x.aal5.service_stream++;
37499 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37500 "PDU on VCI %d!\n", lanai->number, vci);
37501@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37502 return 0;
37503 }
37504 DPRINTK("got rx crc error on vci %d\n", vci);
37505- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37506+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37507 lvcc->stats.x.aal5.service_rxcrc++;
37508 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37509 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37510diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37511index b7e1cc0..eb336bfe 100644
37512--- a/drivers/atm/nicstar.c
37513+++ b/drivers/atm/nicstar.c
37514@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37515 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37516 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37517 card->index);
37518- atomic_inc(&vcc->stats->tx_err);
37519+ atomic_inc_unchecked(&vcc->stats->tx_err);
37520 dev_kfree_skb_any(skb);
37521 return -EINVAL;
37522 }
37523@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37524 if (!vc->tx) {
37525 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37526 card->index);
37527- atomic_inc(&vcc->stats->tx_err);
37528+ atomic_inc_unchecked(&vcc->stats->tx_err);
37529 dev_kfree_skb_any(skb);
37530 return -EINVAL;
37531 }
37532@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37533 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37534 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37535 card->index);
37536- atomic_inc(&vcc->stats->tx_err);
37537+ atomic_inc_unchecked(&vcc->stats->tx_err);
37538 dev_kfree_skb_any(skb);
37539 return -EINVAL;
37540 }
37541
37542 if (skb_shinfo(skb)->nr_frags != 0) {
37543 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37544- atomic_inc(&vcc->stats->tx_err);
37545+ atomic_inc_unchecked(&vcc->stats->tx_err);
37546 dev_kfree_skb_any(skb);
37547 return -EINVAL;
37548 }
37549@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37550 }
37551
37552 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37553- atomic_inc(&vcc->stats->tx_err);
37554+ atomic_inc_unchecked(&vcc->stats->tx_err);
37555 dev_kfree_skb_any(skb);
37556 return -EIO;
37557 }
37558- atomic_inc(&vcc->stats->tx);
37559+ atomic_inc_unchecked(&vcc->stats->tx);
37560
37561 return 0;
37562 }
37563@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37564 printk
37565 ("nicstar%d: Can't allocate buffers for aal0.\n",
37566 card->index);
37567- atomic_add(i, &vcc->stats->rx_drop);
37568+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37569 break;
37570 }
37571 if (!atm_charge(vcc, sb->truesize)) {
37572 RXPRINTK
37573 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37574 card->index);
37575- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37576+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37577 dev_kfree_skb_any(sb);
37578 break;
37579 }
37580@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37581 ATM_SKB(sb)->vcc = vcc;
37582 __net_timestamp(sb);
37583 vcc->push(vcc, sb);
37584- atomic_inc(&vcc->stats->rx);
37585+ atomic_inc_unchecked(&vcc->stats->rx);
37586 cell += ATM_CELL_PAYLOAD;
37587 }
37588
37589@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37590 if (iovb == NULL) {
37591 printk("nicstar%d: Out of iovec buffers.\n",
37592 card->index);
37593- atomic_inc(&vcc->stats->rx_drop);
37594+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37595 recycle_rx_buf(card, skb);
37596 return;
37597 }
37598@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37599 small or large buffer itself. */
37600 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37601 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37602- atomic_inc(&vcc->stats->rx_err);
37603+ atomic_inc_unchecked(&vcc->stats->rx_err);
37604 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37605 NS_MAX_IOVECS);
37606 NS_PRV_IOVCNT(iovb) = 0;
37607@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37608 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37609 card->index);
37610 which_list(card, skb);
37611- atomic_inc(&vcc->stats->rx_err);
37612+ atomic_inc_unchecked(&vcc->stats->rx_err);
37613 recycle_rx_buf(card, skb);
37614 vc->rx_iov = NULL;
37615 recycle_iov_buf(card, iovb);
37616@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37617 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37618 card->index);
37619 which_list(card, skb);
37620- atomic_inc(&vcc->stats->rx_err);
37621+ atomic_inc_unchecked(&vcc->stats->rx_err);
37622 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37623 NS_PRV_IOVCNT(iovb));
37624 vc->rx_iov = NULL;
37625@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37626 printk(" - PDU size mismatch.\n");
37627 else
37628 printk(".\n");
37629- atomic_inc(&vcc->stats->rx_err);
37630+ atomic_inc_unchecked(&vcc->stats->rx_err);
37631 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37632 NS_PRV_IOVCNT(iovb));
37633 vc->rx_iov = NULL;
37634@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37635 /* skb points to a small buffer */
37636 if (!atm_charge(vcc, skb->truesize)) {
37637 push_rxbufs(card, skb);
37638- atomic_inc(&vcc->stats->rx_drop);
37639+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37640 } else {
37641 skb_put(skb, len);
37642 dequeue_sm_buf(card, skb);
37643@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37644 ATM_SKB(skb)->vcc = vcc;
37645 __net_timestamp(skb);
37646 vcc->push(vcc, skb);
37647- atomic_inc(&vcc->stats->rx);
37648+ atomic_inc_unchecked(&vcc->stats->rx);
37649 }
37650 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37651 struct sk_buff *sb;
37652@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37653 if (len <= NS_SMBUFSIZE) {
37654 if (!atm_charge(vcc, sb->truesize)) {
37655 push_rxbufs(card, sb);
37656- atomic_inc(&vcc->stats->rx_drop);
37657+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37658 } else {
37659 skb_put(sb, len);
37660 dequeue_sm_buf(card, sb);
37661@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37662 ATM_SKB(sb)->vcc = vcc;
37663 __net_timestamp(sb);
37664 vcc->push(vcc, sb);
37665- atomic_inc(&vcc->stats->rx);
37666+ atomic_inc_unchecked(&vcc->stats->rx);
37667 }
37668
37669 push_rxbufs(card, skb);
37670@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37671
37672 if (!atm_charge(vcc, skb->truesize)) {
37673 push_rxbufs(card, skb);
37674- atomic_inc(&vcc->stats->rx_drop);
37675+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37676 } else {
37677 dequeue_lg_buf(card, skb);
37678 #ifdef NS_USE_DESTRUCTORS
37679@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37680 ATM_SKB(skb)->vcc = vcc;
37681 __net_timestamp(skb);
37682 vcc->push(vcc, skb);
37683- atomic_inc(&vcc->stats->rx);
37684+ atomic_inc_unchecked(&vcc->stats->rx);
37685 }
37686
37687 push_rxbufs(card, sb);
37688@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37689 printk
37690 ("nicstar%d: Out of huge buffers.\n",
37691 card->index);
37692- atomic_inc(&vcc->stats->rx_drop);
37693+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37694 recycle_iovec_rx_bufs(card,
37695 (struct iovec *)
37696 iovb->data,
37697@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37698 card->hbpool.count++;
37699 } else
37700 dev_kfree_skb_any(hb);
37701- atomic_inc(&vcc->stats->rx_drop);
37702+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37703 } else {
37704 /* Copy the small buffer to the huge buffer */
37705 sb = (struct sk_buff *)iov->iov_base;
37706@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37707 #endif /* NS_USE_DESTRUCTORS */
37708 __net_timestamp(hb);
37709 vcc->push(vcc, hb);
37710- atomic_inc(&vcc->stats->rx);
37711+ atomic_inc_unchecked(&vcc->stats->rx);
37712 }
37713 }
37714
37715diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37716index 74e18b0..f16afa0 100644
37717--- a/drivers/atm/solos-pci.c
37718+++ b/drivers/atm/solos-pci.c
37719@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37720 }
37721 atm_charge(vcc, skb->truesize);
37722 vcc->push(vcc, skb);
37723- atomic_inc(&vcc->stats->rx);
37724+ atomic_inc_unchecked(&vcc->stats->rx);
37725 break;
37726
37727 case PKT_STATUS:
37728@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37729 vcc = SKB_CB(oldskb)->vcc;
37730
37731 if (vcc) {
37732- atomic_inc(&vcc->stats->tx);
37733+ atomic_inc_unchecked(&vcc->stats->tx);
37734 solos_pop(vcc, oldskb);
37735 } else {
37736 dev_kfree_skb_irq(oldskb);
37737diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37738index 0215934..ce9f5b1 100644
37739--- a/drivers/atm/suni.c
37740+++ b/drivers/atm/suni.c
37741@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37742
37743
37744 #define ADD_LIMITED(s,v) \
37745- atomic_add((v),&stats->s); \
37746- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37747+ atomic_add_unchecked((v),&stats->s); \
37748+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37749
37750
37751 static void suni_hz(unsigned long from_timer)
37752diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37753index 5120a96..e2572bd 100644
37754--- a/drivers/atm/uPD98402.c
37755+++ b/drivers/atm/uPD98402.c
37756@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37757 struct sonet_stats tmp;
37758 int error = 0;
37759
37760- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37761+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37762 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37763 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37764 if (zero && !error) {
37765@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37766
37767
37768 #define ADD_LIMITED(s,v) \
37769- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37770- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37771- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37772+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37773+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37774+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37775
37776
37777 static void stat_event(struct atm_dev *dev)
37778@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37779 if (reason & uPD98402_INT_PFM) stat_event(dev);
37780 if (reason & uPD98402_INT_PCO) {
37781 (void) GET(PCOCR); /* clear interrupt cause */
37782- atomic_add(GET(HECCT),
37783+ atomic_add_unchecked(GET(HECCT),
37784 &PRIV(dev)->sonet_stats.uncorr_hcs);
37785 }
37786 if ((reason & uPD98402_INT_RFO) &&
37787@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37788 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37789 uPD98402_INT_LOS),PIMR); /* enable them */
37790 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37791- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37792- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37793- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37794+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37795+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37796+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37797 return 0;
37798 }
37799
37800diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37801index cecfb94..87009ec 100644
37802--- a/drivers/atm/zatm.c
37803+++ b/drivers/atm/zatm.c
37804@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37805 }
37806 if (!size) {
37807 dev_kfree_skb_irq(skb);
37808- if (vcc) atomic_inc(&vcc->stats->rx_err);
37809+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37810 continue;
37811 }
37812 if (!atm_charge(vcc,skb->truesize)) {
37813@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37814 skb->len = size;
37815 ATM_SKB(skb)->vcc = vcc;
37816 vcc->push(vcc,skb);
37817- atomic_inc(&vcc->stats->rx);
37818+ atomic_inc_unchecked(&vcc->stats->rx);
37819 }
37820 zout(pos & 0xffff,MTA(mbx));
37821 #if 0 /* probably a stupid idea */
37822@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37823 skb_queue_head(&zatm_vcc->backlog,skb);
37824 break;
37825 }
37826- atomic_inc(&vcc->stats->tx);
37827+ atomic_inc_unchecked(&vcc->stats->tx);
37828 wake_up(&zatm_vcc->tx_wait);
37829 }
37830
37831diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37832index 79bc203..fa3945b 100644
37833--- a/drivers/base/bus.c
37834+++ b/drivers/base/bus.c
37835@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37836 return -EINVAL;
37837
37838 mutex_lock(&subsys->p->mutex);
37839- list_add_tail(&sif->node, &subsys->p->interfaces);
37840+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37841 if (sif->add_dev) {
37842 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37843 while ((dev = subsys_dev_iter_next(&iter)))
37844@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37845 subsys = sif->subsys;
37846
37847 mutex_lock(&subsys->p->mutex);
37848- list_del_init(&sif->node);
37849+ pax_list_del_init((struct list_head *)&sif->node);
37850 if (sif->remove_dev) {
37851 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37852 while ((dev = subsys_dev_iter_next(&iter)))
37853diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37854index 25798db..15f130e 100644
37855--- a/drivers/base/devtmpfs.c
37856+++ b/drivers/base/devtmpfs.c
37857@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37858 if (!thread)
37859 return 0;
37860
37861- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37862+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37863 if (err)
37864 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37865 else
37866@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37867 *err = sys_unshare(CLONE_NEWNS);
37868 if (*err)
37869 goto out;
37870- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37871+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37872 if (*err)
37873 goto out;
37874- sys_chdir("/.."); /* will traverse into overmounted root */
37875- sys_chroot(".");
37876+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37877+ sys_chroot((char __force_user *)".");
37878 complete(&setup_done);
37879 while (1) {
37880 spin_lock(&req_lock);
37881diff --git a/drivers/base/node.c b/drivers/base/node.c
37882index 36fabe43..8cfc112 100644
37883--- a/drivers/base/node.c
37884+++ b/drivers/base/node.c
37885@@ -615,7 +615,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37886 struct node_attr {
37887 struct device_attribute attr;
37888 enum node_states state;
37889-};
37890+} __do_const;
37891
37892 static ssize_t show_node_state(struct device *dev,
37893 struct device_attribute *attr, char *buf)
37894diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37895index 45937f8..b9a342e 100644
37896--- a/drivers/base/power/domain.c
37897+++ b/drivers/base/power/domain.c
37898@@ -1698,7 +1698,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37899 {
37900 struct cpuidle_driver *cpuidle_drv;
37901 struct gpd_cpuidle_data *cpuidle_data;
37902- struct cpuidle_state *idle_state;
37903+ cpuidle_state_no_const *idle_state;
37904 int ret = 0;
37905
37906 if (IS_ERR_OR_NULL(genpd) || state < 0)
37907@@ -1766,7 +1766,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37908 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37909 {
37910 struct gpd_cpuidle_data *cpuidle_data;
37911- struct cpuidle_state *idle_state;
37912+ cpuidle_state_no_const *idle_state;
37913 int ret = 0;
37914
37915 if (IS_ERR_OR_NULL(genpd))
37916@@ -2195,7 +2195,10 @@ int genpd_dev_pm_attach(struct device *dev)
37917 return ret;
37918 }
37919
37920- dev->pm_domain->detach = genpd_dev_pm_detach;
37921+ pax_open_kernel();
37922+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37923+ pax_close_kernel();
37924+
37925 pm_genpd_poweron(pd);
37926
37927 return 0;
37928diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37929index d2be3f9..0a3167a 100644
37930--- a/drivers/base/power/sysfs.c
37931+++ b/drivers/base/power/sysfs.c
37932@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37933 return -EIO;
37934 }
37935 }
37936- return sprintf(buf, p);
37937+ return sprintf(buf, "%s", p);
37938 }
37939
37940 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37941diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37942index aab7158..b172db2 100644
37943--- a/drivers/base/power/wakeup.c
37944+++ b/drivers/base/power/wakeup.c
37945@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37946 * They need to be modified together atomically, so it's better to use one
37947 * atomic variable to hold them both.
37948 */
37949-static atomic_t combined_event_count = ATOMIC_INIT(0);
37950+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37951
37952 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37953 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37954
37955 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37956 {
37957- unsigned int comb = atomic_read(&combined_event_count);
37958+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37959
37960 *cnt = (comb >> IN_PROGRESS_BITS);
37961 *inpr = comb & MAX_IN_PROGRESS;
37962@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37963 ws->start_prevent_time = ws->last_time;
37964
37965 /* Increment the counter of events in progress. */
37966- cec = atomic_inc_return(&combined_event_count);
37967+ cec = atomic_inc_return_unchecked(&combined_event_count);
37968
37969 trace_wakeup_source_activate(ws->name, cec);
37970 }
37971@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37972 * Increment the counter of registered wakeup events and decrement the
37973 * couter of wakeup events in progress simultaneously.
37974 */
37975- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37976+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37977 trace_wakeup_source_deactivate(ws->name, cec);
37978
37979 split_counters(&cnt, &inpr);
37980diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37981index 8d98a32..61d3165 100644
37982--- a/drivers/base/syscore.c
37983+++ b/drivers/base/syscore.c
37984@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37985 void register_syscore_ops(struct syscore_ops *ops)
37986 {
37987 mutex_lock(&syscore_ops_lock);
37988- list_add_tail(&ops->node, &syscore_ops_list);
37989+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37990 mutex_unlock(&syscore_ops_lock);
37991 }
37992 EXPORT_SYMBOL_GPL(register_syscore_ops);
37993@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37994 void unregister_syscore_ops(struct syscore_ops *ops)
37995 {
37996 mutex_lock(&syscore_ops_lock);
37997- list_del(&ops->node);
37998+ pax_list_del((struct list_head *)&ops->node);
37999 mutex_unlock(&syscore_ops_lock);
38000 }
38001 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
38002diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
38003index ff20f19..018f1da 100644
38004--- a/drivers/block/cciss.c
38005+++ b/drivers/block/cciss.c
38006@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
38007 while (!list_empty(&h->reqQ)) {
38008 c = list_entry(h->reqQ.next, CommandList_struct, list);
38009 /* can't do anything if fifo is full */
38010- if ((h->access.fifo_full(h))) {
38011+ if ((h->access->fifo_full(h))) {
38012 dev_warn(&h->pdev->dev, "fifo full\n");
38013 break;
38014 }
38015@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
38016 h->Qdepth--;
38017
38018 /* Tell the controller execute command */
38019- h->access.submit_command(h, c);
38020+ h->access->submit_command(h, c);
38021
38022 /* Put job onto the completed Q */
38023 addQ(&h->cmpQ, c);
38024@@ -3444,17 +3444,17 @@ startio:
38025
38026 static inline unsigned long get_next_completion(ctlr_info_t *h)
38027 {
38028- return h->access.command_completed(h);
38029+ return h->access->command_completed(h);
38030 }
38031
38032 static inline int interrupt_pending(ctlr_info_t *h)
38033 {
38034- return h->access.intr_pending(h);
38035+ return h->access->intr_pending(h);
38036 }
38037
38038 static inline long interrupt_not_for_us(ctlr_info_t *h)
38039 {
38040- return ((h->access.intr_pending(h) == 0) ||
38041+ return ((h->access->intr_pending(h) == 0) ||
38042 (h->interrupts_enabled == 0));
38043 }
38044
38045@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
38046 u32 a;
38047
38048 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
38049- return h->access.command_completed(h);
38050+ return h->access->command_completed(h);
38051
38052 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
38053 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
38054@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
38055 trans_support & CFGTBL_Trans_use_short_tags);
38056
38057 /* Change the access methods to the performant access methods */
38058- h->access = SA5_performant_access;
38059+ h->access = &SA5_performant_access;
38060 h->transMethod = CFGTBL_Trans_Performant;
38061
38062 return;
38063@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
38064 if (prod_index < 0)
38065 return -ENODEV;
38066 h->product_name = products[prod_index].product_name;
38067- h->access = *(products[prod_index].access);
38068+ h->access = products[prod_index].access;
38069
38070 if (cciss_board_disabled(h)) {
38071 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
38072@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
38073 }
38074
38075 /* make sure the board interrupts are off */
38076- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38077+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38078 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
38079 if (rc)
38080 goto clean2;
38081@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
38082 * fake ones to scoop up any residual completions.
38083 */
38084 spin_lock_irqsave(&h->lock, flags);
38085- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38086+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38087 spin_unlock_irqrestore(&h->lock, flags);
38088 free_irq(h->intr[h->intr_mode], h);
38089 rc = cciss_request_irq(h, cciss_msix_discard_completions,
38090@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
38091 dev_info(&h->pdev->dev, "Board READY.\n");
38092 dev_info(&h->pdev->dev,
38093 "Waiting for stale completions to drain.\n");
38094- h->access.set_intr_mask(h, CCISS_INTR_ON);
38095+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38096 msleep(10000);
38097- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38098+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38099
38100 rc = controller_reset_failed(h->cfgtable);
38101 if (rc)
38102@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
38103 cciss_scsi_setup(h);
38104
38105 /* Turn the interrupts on so we can service requests */
38106- h->access.set_intr_mask(h, CCISS_INTR_ON);
38107+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38108
38109 /* Get the firmware version */
38110 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
38111@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
38112 kfree(flush_buf);
38113 if (return_code != IO_OK)
38114 dev_warn(&h->pdev->dev, "Error flushing cache\n");
38115- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38116+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38117 free_irq(h->intr[h->intr_mode], h);
38118 }
38119
38120diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
38121index 7fda30e..2f27946 100644
38122--- a/drivers/block/cciss.h
38123+++ b/drivers/block/cciss.h
38124@@ -101,7 +101,7 @@ struct ctlr_info
38125 /* information about each logical volume */
38126 drive_info_struct *drv[CISS_MAX_LUN];
38127
38128- struct access_method access;
38129+ struct access_method *access;
38130
38131 /* queue and queue Info */
38132 struct list_head reqQ;
38133@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
38134 }
38135
38136 static struct access_method SA5_access = {
38137- SA5_submit_command,
38138- SA5_intr_mask,
38139- SA5_fifo_full,
38140- SA5_intr_pending,
38141- SA5_completed,
38142+ .submit_command = SA5_submit_command,
38143+ .set_intr_mask = SA5_intr_mask,
38144+ .fifo_full = SA5_fifo_full,
38145+ .intr_pending = SA5_intr_pending,
38146+ .command_completed = SA5_completed,
38147 };
38148
38149 static struct access_method SA5B_access = {
38150- SA5_submit_command,
38151- SA5B_intr_mask,
38152- SA5_fifo_full,
38153- SA5B_intr_pending,
38154- SA5_completed,
38155+ .submit_command = SA5_submit_command,
38156+ .set_intr_mask = SA5B_intr_mask,
38157+ .fifo_full = SA5_fifo_full,
38158+ .intr_pending = SA5B_intr_pending,
38159+ .command_completed = SA5_completed,
38160 };
38161
38162 static struct access_method SA5_performant_access = {
38163- SA5_submit_command,
38164- SA5_performant_intr_mask,
38165- SA5_fifo_full,
38166- SA5_performant_intr_pending,
38167- SA5_performant_completed,
38168+ .submit_command = SA5_submit_command,
38169+ .set_intr_mask = SA5_performant_intr_mask,
38170+ .fifo_full = SA5_fifo_full,
38171+ .intr_pending = SA5_performant_intr_pending,
38172+ .command_completed = SA5_performant_completed,
38173 };
38174
38175 struct board_type {
38176diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
38177index 2b94403..fd6ad1f 100644
38178--- a/drivers/block/cpqarray.c
38179+++ b/drivers/block/cpqarray.c
38180@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38181 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38182 goto Enomem4;
38183 }
38184- hba[i]->access.set_intr_mask(hba[i], 0);
38185+ hba[i]->access->set_intr_mask(hba[i], 0);
38186 if (request_irq(hba[i]->intr, do_ida_intr,
38187 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
38188 {
38189@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38190 add_timer(&hba[i]->timer);
38191
38192 /* Enable IRQ now that spinlock and rate limit timer are set up */
38193- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38194+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38195
38196 for(j=0; j<NWD; j++) {
38197 struct gendisk *disk = ida_gendisk[i][j];
38198@@ -694,7 +694,7 @@ DBGINFO(
38199 for(i=0; i<NR_PRODUCTS; i++) {
38200 if (board_id == products[i].board_id) {
38201 c->product_name = products[i].product_name;
38202- c->access = *(products[i].access);
38203+ c->access = products[i].access;
38204 break;
38205 }
38206 }
38207@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38208 hba[ctlr]->intr = intr;
38209 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38210 hba[ctlr]->product_name = products[j].product_name;
38211- hba[ctlr]->access = *(products[j].access);
38212+ hba[ctlr]->access = products[j].access;
38213 hba[ctlr]->ctlr = ctlr;
38214 hba[ctlr]->board_id = board_id;
38215 hba[ctlr]->pci_dev = NULL; /* not PCI */
38216@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38217
38218 while((c = h->reqQ) != NULL) {
38219 /* Can't do anything if we're busy */
38220- if (h->access.fifo_full(h) == 0)
38221+ if (h->access->fifo_full(h) == 0)
38222 return;
38223
38224 /* Get the first entry from the request Q */
38225@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38226 h->Qdepth--;
38227
38228 /* Tell the controller to do our bidding */
38229- h->access.submit_command(h, c);
38230+ h->access->submit_command(h, c);
38231
38232 /* Get onto the completion Q */
38233 addQ(&h->cmpQ, c);
38234@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38235 unsigned long flags;
38236 __u32 a,a1;
38237
38238- istat = h->access.intr_pending(h);
38239+ istat = h->access->intr_pending(h);
38240 /* Is this interrupt for us? */
38241 if (istat == 0)
38242 return IRQ_NONE;
38243@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38244 */
38245 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38246 if (istat & FIFO_NOT_EMPTY) {
38247- while((a = h->access.command_completed(h))) {
38248+ while((a = h->access->command_completed(h))) {
38249 a1 = a; a &= ~3;
38250 if ((c = h->cmpQ) == NULL)
38251 {
38252@@ -1448,11 +1448,11 @@ static int sendcmd(
38253 /*
38254 * Disable interrupt
38255 */
38256- info_p->access.set_intr_mask(info_p, 0);
38257+ info_p->access->set_intr_mask(info_p, 0);
38258 /* Make sure there is room in the command FIFO */
38259 /* Actually it should be completely empty at this time. */
38260 for (i = 200000; i > 0; i--) {
38261- temp = info_p->access.fifo_full(info_p);
38262+ temp = info_p->access->fifo_full(info_p);
38263 if (temp != 0) {
38264 break;
38265 }
38266@@ -1465,7 +1465,7 @@ DBG(
38267 /*
38268 * Send the cmd
38269 */
38270- info_p->access.submit_command(info_p, c);
38271+ info_p->access->submit_command(info_p, c);
38272 complete = pollcomplete(ctlr);
38273
38274 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38275@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38276 * we check the new geometry. Then turn interrupts back on when
38277 * we're done.
38278 */
38279- host->access.set_intr_mask(host, 0);
38280+ host->access->set_intr_mask(host, 0);
38281 getgeometry(ctlr);
38282- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38283+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38284
38285 for(i=0; i<NWD; i++) {
38286 struct gendisk *disk = ida_gendisk[ctlr][i];
38287@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38288 /* Wait (up to 2 seconds) for a command to complete */
38289
38290 for (i = 200000; i > 0; i--) {
38291- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38292+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38293 if (done == 0) {
38294 udelay(10); /* a short fixed delay */
38295 } else
38296diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38297index be73e9d..7fbf140 100644
38298--- a/drivers/block/cpqarray.h
38299+++ b/drivers/block/cpqarray.h
38300@@ -99,7 +99,7 @@ struct ctlr_info {
38301 drv_info_t drv[NWD];
38302 struct proc_dir_entry *proc;
38303
38304- struct access_method access;
38305+ struct access_method *access;
38306
38307 cmdlist_t *reqQ;
38308 cmdlist_t *cmpQ;
38309diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38310index 434c77d..6d3219a 100644
38311--- a/drivers/block/drbd/drbd_bitmap.c
38312+++ b/drivers/block/drbd/drbd_bitmap.c
38313@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38314 submit_bio(rw, bio);
38315 /* this should not count as user activity and cause the
38316 * resync to throttle -- see drbd_rs_should_slow_down(). */
38317- atomic_add(len >> 9, &device->rs_sect_ev);
38318+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38319 }
38320 }
38321
38322diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38323index b905e98..0812ed8 100644
38324--- a/drivers/block/drbd/drbd_int.h
38325+++ b/drivers/block/drbd/drbd_int.h
38326@@ -385,7 +385,7 @@ struct drbd_epoch {
38327 struct drbd_connection *connection;
38328 struct list_head list;
38329 unsigned int barrier_nr;
38330- atomic_t epoch_size; /* increased on every request added. */
38331+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38332 atomic_t active; /* increased on every req. added, and dec on every finished. */
38333 unsigned long flags;
38334 };
38335@@ -946,7 +946,7 @@ struct drbd_device {
38336 unsigned int al_tr_number;
38337 int al_tr_cycle;
38338 wait_queue_head_t seq_wait;
38339- atomic_t packet_seq;
38340+ atomic_unchecked_t packet_seq;
38341 unsigned int peer_seq;
38342 spinlock_t peer_seq_lock;
38343 unsigned long comm_bm_set; /* communicated number of set bits. */
38344@@ -955,8 +955,8 @@ struct drbd_device {
38345 struct mutex own_state_mutex;
38346 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38347 char congestion_reason; /* Why we where congested... */
38348- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38349- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38350+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38351+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38352 int rs_last_sect_ev; /* counter to compare with */
38353 int rs_last_events; /* counter of read or write "events" (unit sectors)
38354 * on the lower level device when we last looked. */
38355diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38356index 1fc8342..7e7742b 100644
38357--- a/drivers/block/drbd/drbd_main.c
38358+++ b/drivers/block/drbd/drbd_main.c
38359@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38360 p->sector = sector;
38361 p->block_id = block_id;
38362 p->blksize = blksize;
38363- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38364+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38365 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38366 }
38367
38368@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38369 return -EIO;
38370 p->sector = cpu_to_be64(req->i.sector);
38371 p->block_id = (unsigned long)req;
38372- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38373+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38374 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38375 if (device->state.conn >= C_SYNC_SOURCE &&
38376 device->state.conn <= C_PAUSED_SYNC_T)
38377@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38378 atomic_set(&device->unacked_cnt, 0);
38379 atomic_set(&device->local_cnt, 0);
38380 atomic_set(&device->pp_in_use_by_net, 0);
38381- atomic_set(&device->rs_sect_in, 0);
38382- atomic_set(&device->rs_sect_ev, 0);
38383+ atomic_set_unchecked(&device->rs_sect_in, 0);
38384+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38385 atomic_set(&device->ap_in_flight, 0);
38386 atomic_set(&device->md_io.in_use, 0);
38387
38388@@ -2684,8 +2684,8 @@ void drbd_destroy_connection(struct kref *kref)
38389 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38390 struct drbd_resource *resource = connection->resource;
38391
38392- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38393- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38394+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38395+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38396 kfree(connection->current_epoch);
38397
38398 idr_destroy(&connection->peer_devices);
38399diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38400index 74df8cf..e41fc24 100644
38401--- a/drivers/block/drbd/drbd_nl.c
38402+++ b/drivers/block/drbd/drbd_nl.c
38403@@ -3637,13 +3637,13 @@ finish:
38404
38405 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38406 {
38407- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38408+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38409 struct sk_buff *msg;
38410 struct drbd_genlmsghdr *d_out;
38411 unsigned seq;
38412 int err = -ENOMEM;
38413
38414- seq = atomic_inc_return(&drbd_genl_seq);
38415+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38416 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38417 if (!msg)
38418 goto failed;
38419diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38420index cee2035..22f66bd 100644
38421--- a/drivers/block/drbd/drbd_receiver.c
38422+++ b/drivers/block/drbd/drbd_receiver.c
38423@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38424 struct drbd_device *device = peer_device->device;
38425 int err;
38426
38427- atomic_set(&device->packet_seq, 0);
38428+ atomic_set_unchecked(&device->packet_seq, 0);
38429 device->peer_seq = 0;
38430
38431 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38432@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38433 do {
38434 next_epoch = NULL;
38435
38436- epoch_size = atomic_read(&epoch->epoch_size);
38437+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38438
38439 switch (ev & ~EV_CLEANUP) {
38440 case EV_PUT:
38441@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38442 rv = FE_DESTROYED;
38443 } else {
38444 epoch->flags = 0;
38445- atomic_set(&epoch->epoch_size, 0);
38446+ atomic_set_unchecked(&epoch->epoch_size, 0);
38447 /* atomic_set(&epoch->active, 0); is already zero */
38448 if (rv == FE_STILL_LIVE)
38449 rv = FE_RECYCLED;
38450@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38451 conn_wait_active_ee_empty(connection);
38452 drbd_flush(connection);
38453
38454- if (atomic_read(&connection->current_epoch->epoch_size)) {
38455+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38456 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38457 if (epoch)
38458 break;
38459@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38460 }
38461
38462 epoch->flags = 0;
38463- atomic_set(&epoch->epoch_size, 0);
38464+ atomic_set_unchecked(&epoch->epoch_size, 0);
38465 atomic_set(&epoch->active, 0);
38466
38467 spin_lock(&connection->epoch_lock);
38468- if (atomic_read(&connection->current_epoch->epoch_size)) {
38469+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38470 list_add(&epoch->list, &connection->current_epoch->list);
38471 connection->current_epoch = epoch;
38472 connection->epochs++;
38473@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38474 list_add_tail(&peer_req->w.list, &device->sync_ee);
38475 spin_unlock_irq(&device->resource->req_lock);
38476
38477- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38478+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38479 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38480 return 0;
38481
38482@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38483 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38484 }
38485
38486- atomic_add(pi->size >> 9, &device->rs_sect_in);
38487+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38488
38489 return err;
38490 }
38491@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38492
38493 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38494 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38495- atomic_inc(&connection->current_epoch->epoch_size);
38496+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38497 err2 = drbd_drain_block(peer_device, pi->size);
38498 if (!err)
38499 err = err2;
38500@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38501
38502 spin_lock(&connection->epoch_lock);
38503 peer_req->epoch = connection->current_epoch;
38504- atomic_inc(&peer_req->epoch->epoch_size);
38505+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38506 atomic_inc(&peer_req->epoch->active);
38507 spin_unlock(&connection->epoch_lock);
38508
38509@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38510
38511 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38512 (int)part_stat_read(&disk->part0, sectors[1]) -
38513- atomic_read(&device->rs_sect_ev);
38514+ atomic_read_unchecked(&device->rs_sect_ev);
38515
38516 if (atomic_read(&device->ap_actlog_cnt)
38517 || curr_events - device->rs_last_events > 64) {
38518@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38519 device->use_csums = true;
38520 } else if (pi->cmd == P_OV_REPLY) {
38521 /* track progress, we may need to throttle */
38522- atomic_add(size >> 9, &device->rs_sect_in);
38523+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38524 peer_req->w.cb = w_e_end_ov_reply;
38525 dec_rs_pending(device);
38526 /* drbd_rs_begin_io done when we sent this request,
38527@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38528 goto out_free_e;
38529
38530 submit_for_resync:
38531- atomic_add(size >> 9, &device->rs_sect_ev);
38532+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38533
38534 submit:
38535 update_receiver_timing_details(connection, drbd_submit_peer_request);
38536@@ -4564,7 +4564,7 @@ struct data_cmd {
38537 int expect_payload;
38538 size_t pkt_size;
38539 int (*fn)(struct drbd_connection *, struct packet_info *);
38540-};
38541+} __do_const;
38542
38543 static struct data_cmd drbd_cmd_handler[] = {
38544 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38545@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38546 if (!list_empty(&connection->current_epoch->list))
38547 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38548 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38549- atomic_set(&connection->current_epoch->epoch_size, 0);
38550+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38551 connection->send.seen_any_write_yet = false;
38552
38553 drbd_info(connection, "Connection closed\n");
38554@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38555 put_ldev(device);
38556 }
38557 dec_rs_pending(device);
38558- atomic_add(blksize >> 9, &device->rs_sect_in);
38559+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38560
38561 return 0;
38562 }
38563@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38564 struct asender_cmd {
38565 size_t pkt_size;
38566 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38567-};
38568+} __do_const;
38569
38570 static struct asender_cmd asender_tbl[] = {
38571 [P_PING] = { 0, got_Ping },
38572diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38573index d0fae55..4469096 100644
38574--- a/drivers/block/drbd/drbd_worker.c
38575+++ b/drivers/block/drbd/drbd_worker.c
38576@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38577 list_add_tail(&peer_req->w.list, &device->read_ee);
38578 spin_unlock_irq(&device->resource->req_lock);
38579
38580- atomic_add(size >> 9, &device->rs_sect_ev);
38581+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38582 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38583 return 0;
38584
38585@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38586 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38587 int number, mxb;
38588
38589- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38590+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38591 device->rs_in_flight -= sect_in;
38592
38593 rcu_read_lock();
38594@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38595 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38596 struct fifo_buffer *plan;
38597
38598- atomic_set(&device->rs_sect_in, 0);
38599- atomic_set(&device->rs_sect_ev, 0);
38600+ atomic_set_unchecked(&device->rs_sect_in, 0);
38601+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38602 device->rs_in_flight = 0;
38603 device->rs_last_events =
38604 (int)part_stat_read(&disk->part0, sectors[0]) +
38605diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38606index 773e964..e85af00 100644
38607--- a/drivers/block/loop.c
38608+++ b/drivers/block/loop.c
38609@@ -234,7 +234,7 @@ static int __do_lo_send_write(struct file *file,
38610
38611 file_start_write(file);
38612 set_fs(get_ds());
38613- bw = file->f_op->write(file, buf, len, &pos);
38614+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38615 set_fs(old_fs);
38616 file_end_write(file);
38617 if (likely(bw == len))
38618diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38619index 09e628da..7607aaa 100644
38620--- a/drivers/block/pktcdvd.c
38621+++ b/drivers/block/pktcdvd.c
38622@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38623
38624 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38625 {
38626- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38627+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38628 }
38629
38630 /*
38631@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38632 return -EROFS;
38633 }
38634 pd->settings.fp = ti.fp;
38635- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38636+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38637
38638 if (ti.nwa_v) {
38639 pd->nwa = be32_to_cpu(ti.next_writable);
38640diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38641index b67066d..515b7f4 100644
38642--- a/drivers/block/rbd.c
38643+++ b/drivers/block/rbd.c
38644@@ -64,7 +64,7 @@
38645 * If the counter is already at its maximum value returns
38646 * -EINVAL without updating it.
38647 */
38648-static int atomic_inc_return_safe(atomic_t *v)
38649+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38650 {
38651 unsigned int counter;
38652
38653diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38654index e5565fb..71be10b4 100644
38655--- a/drivers/block/smart1,2.h
38656+++ b/drivers/block/smart1,2.h
38657@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38658 }
38659
38660 static struct access_method smart4_access = {
38661- smart4_submit_command,
38662- smart4_intr_mask,
38663- smart4_fifo_full,
38664- smart4_intr_pending,
38665- smart4_completed,
38666+ .submit_command = smart4_submit_command,
38667+ .set_intr_mask = smart4_intr_mask,
38668+ .fifo_full = smart4_fifo_full,
38669+ .intr_pending = smart4_intr_pending,
38670+ .command_completed = smart4_completed,
38671 };
38672
38673 /*
38674@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38675 }
38676
38677 static struct access_method smart2_access = {
38678- smart2_submit_command,
38679- smart2_intr_mask,
38680- smart2_fifo_full,
38681- smart2_intr_pending,
38682- smart2_completed,
38683+ .submit_command = smart2_submit_command,
38684+ .set_intr_mask = smart2_intr_mask,
38685+ .fifo_full = smart2_fifo_full,
38686+ .intr_pending = smart2_intr_pending,
38687+ .command_completed = smart2_completed,
38688 };
38689
38690 /*
38691@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38692 }
38693
38694 static struct access_method smart2e_access = {
38695- smart2e_submit_command,
38696- smart2e_intr_mask,
38697- smart2e_fifo_full,
38698- smart2e_intr_pending,
38699- smart2e_completed,
38700+ .submit_command = smart2e_submit_command,
38701+ .set_intr_mask = smart2e_intr_mask,
38702+ .fifo_full = smart2e_fifo_full,
38703+ .intr_pending = smart2e_intr_pending,
38704+ .command_completed = smart2e_completed,
38705 };
38706
38707 /*
38708@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38709 }
38710
38711 static struct access_method smart1_access = {
38712- smart1_submit_command,
38713- smart1_intr_mask,
38714- smart1_fifo_full,
38715- smart1_intr_pending,
38716- smart1_completed,
38717+ .submit_command = smart1_submit_command,
38718+ .set_intr_mask = smart1_intr_mask,
38719+ .fifo_full = smart1_fifo_full,
38720+ .intr_pending = smart1_intr_pending,
38721+ .command_completed = smart1_completed,
38722 };
38723diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38724index 55c135b..9f8d60c 100644
38725--- a/drivers/bluetooth/btwilink.c
38726+++ b/drivers/bluetooth/btwilink.c
38727@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38728
38729 static int bt_ti_probe(struct platform_device *pdev)
38730 {
38731- static struct ti_st *hst;
38732+ struct ti_st *hst;
38733 struct hci_dev *hdev;
38734 int err;
38735
38736diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38737index 5d28a45..a538f90 100644
38738--- a/drivers/cdrom/cdrom.c
38739+++ b/drivers/cdrom/cdrom.c
38740@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38741 ENSURE(reset, CDC_RESET);
38742 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38743 cdi->mc_flags = 0;
38744- cdo->n_minors = 0;
38745 cdi->options = CDO_USE_FFLAGS;
38746
38747 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38748@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38749 else
38750 cdi->cdda_method = CDDA_OLD;
38751
38752- if (!cdo->generic_packet)
38753- cdo->generic_packet = cdrom_dummy_generic_packet;
38754+ if (!cdo->generic_packet) {
38755+ pax_open_kernel();
38756+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38757+ pax_close_kernel();
38758+ }
38759
38760 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38761 mutex_lock(&cdrom_mutex);
38762@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38763 if (cdi->exit)
38764 cdi->exit(cdi);
38765
38766- cdi->ops->n_minors--;
38767 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38768 }
38769
38770@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38771 */
38772 nr = nframes;
38773 do {
38774- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38775+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38776 if (cgc.buffer)
38777 break;
38778
38779@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38780 struct cdrom_device_info *cdi;
38781 int ret;
38782
38783- ret = scnprintf(info + *pos, max_size - *pos, header);
38784+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38785 if (!ret)
38786 return 1;
38787
38788diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38789index 584bc31..e64a12c 100644
38790--- a/drivers/cdrom/gdrom.c
38791+++ b/drivers/cdrom/gdrom.c
38792@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38793 .audio_ioctl = gdrom_audio_ioctl,
38794 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38795 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38796- .n_minors = 1,
38797 };
38798
38799 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38800diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38801index a4af822..ed58cd1 100644
38802--- a/drivers/char/Kconfig
38803+++ b/drivers/char/Kconfig
38804@@ -17,7 +17,8 @@ config DEVMEM
38805
38806 config DEVKMEM
38807 bool "/dev/kmem virtual device support"
38808- default y
38809+ default n
38810+ depends on !GRKERNSEC_KMEM
38811 help
38812 Say Y here if you want to support the /dev/kmem device. The
38813 /dev/kmem device is rarely used, but can be used for certain
38814@@ -586,6 +587,7 @@ config DEVPORT
38815 bool
38816 depends on !M68K
38817 depends on ISA || PCI
38818+ depends on !GRKERNSEC_KMEM
38819 default y
38820
38821 source "drivers/s390/char/Kconfig"
38822diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38823index a48e05b..6bac831 100644
38824--- a/drivers/char/agp/compat_ioctl.c
38825+++ b/drivers/char/agp/compat_ioctl.c
38826@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38827 return -ENOMEM;
38828 }
38829
38830- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38831+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38832 sizeof(*usegment) * ureserve.seg_count)) {
38833 kfree(usegment);
38834 kfree(ksegment);
38835diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38836index 09f17eb..8531d2f 100644
38837--- a/drivers/char/agp/frontend.c
38838+++ b/drivers/char/agp/frontend.c
38839@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38840 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38841 return -EFAULT;
38842
38843- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38844+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38845 return -EFAULT;
38846
38847 client = agp_find_client_by_pid(reserve.pid);
38848@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38849 if (segment == NULL)
38850 return -ENOMEM;
38851
38852- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38853+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38854 sizeof(struct agp_segment) * reserve.seg_count)) {
38855 kfree(segment);
38856 return -EFAULT;
38857diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38858index 4f94375..413694e 100644
38859--- a/drivers/char/genrtc.c
38860+++ b/drivers/char/genrtc.c
38861@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38862 switch (cmd) {
38863
38864 case RTC_PLL_GET:
38865+ memset(&pll, 0, sizeof(pll));
38866 if (get_rtc_pll(&pll))
38867 return -EINVAL;
38868 else
38869diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38870index 5c0baa9..44011b1 100644
38871--- a/drivers/char/hpet.c
38872+++ b/drivers/char/hpet.c
38873@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38874 }
38875
38876 static int
38877-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38878+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38879 struct hpet_info *info)
38880 {
38881 struct hpet_timer __iomem *timer;
38882diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
38883index 24cc4ed..f9807cf 100644
38884--- a/drivers/char/i8k.c
38885+++ b/drivers/char/i8k.c
38886@@ -788,7 +788,7 @@ static const struct i8k_config_data i8k_config_data[] = {
38887 },
38888 };
38889
38890-static struct dmi_system_id i8k_dmi_table[] __initdata = {
38891+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
38892 {
38893 .ident = "Dell Inspiron",
38894 .matches = {
38895diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38896index 9bb5928..57a7801 100644
38897--- a/drivers/char/ipmi/ipmi_msghandler.c
38898+++ b/drivers/char/ipmi/ipmi_msghandler.c
38899@@ -436,7 +436,7 @@ struct ipmi_smi {
38900 struct proc_dir_entry *proc_dir;
38901 char proc_dir_name[10];
38902
38903- atomic_t stats[IPMI_NUM_STATS];
38904+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38905
38906 /*
38907 * run_to_completion duplicate of smb_info, smi_info
38908@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
38909 static DEFINE_MUTEX(smi_watchers_mutex);
38910
38911 #define ipmi_inc_stat(intf, stat) \
38912- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38913+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38914 #define ipmi_get_stat(intf, stat) \
38915- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38916+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38917
38918 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
38919 "ACPI", "SMBIOS", "PCI",
38920@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38921 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38922 init_waitqueue_head(&intf->waitq);
38923 for (i = 0; i < IPMI_NUM_STATS; i++)
38924- atomic_set(&intf->stats[i], 0);
38925+ atomic_set_unchecked(&intf->stats[i], 0);
38926
38927 intf->proc_dir = NULL;
38928
38929diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38930index 518585c..6c985cef 100644
38931--- a/drivers/char/ipmi/ipmi_si_intf.c
38932+++ b/drivers/char/ipmi/ipmi_si_intf.c
38933@@ -289,7 +289,7 @@ struct smi_info {
38934 unsigned char slave_addr;
38935
38936 /* Counters and things for the proc filesystem. */
38937- atomic_t stats[SI_NUM_STATS];
38938+ atomic_unchecked_t stats[SI_NUM_STATS];
38939
38940 struct task_struct *thread;
38941
38942@@ -298,9 +298,9 @@ struct smi_info {
38943 };
38944
38945 #define smi_inc_stat(smi, stat) \
38946- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38947+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38948 #define smi_get_stat(smi, stat) \
38949- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38950+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38951
38952 #define SI_MAX_PARMS 4
38953
38954@@ -3498,7 +3498,7 @@ static int try_smi_init(struct smi_info *new_smi)
38955 atomic_set(&new_smi->req_events, 0);
38956 new_smi->run_to_completion = false;
38957 for (i = 0; i < SI_NUM_STATS; i++)
38958- atomic_set(&new_smi->stats[i], 0);
38959+ atomic_set_unchecked(&new_smi->stats[i], 0);
38960
38961 new_smi->interrupt_disabled = true;
38962 atomic_set(&new_smi->need_watch, 0);
38963diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38964index 297110c..3f69b43 100644
38965--- a/drivers/char/mem.c
38966+++ b/drivers/char/mem.c
38967@@ -18,6 +18,7 @@
38968 #include <linux/raw.h>
38969 #include <linux/tty.h>
38970 #include <linux/capability.h>
38971+#include <linux/security.h>
38972 #include <linux/ptrace.h>
38973 #include <linux/device.h>
38974 #include <linux/highmem.h>
38975@@ -36,6 +37,10 @@
38976
38977 #define DEVPORT_MINOR 4
38978
38979+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38980+extern const struct file_operations grsec_fops;
38981+#endif
38982+
38983 static inline unsigned long size_inside_page(unsigned long start,
38984 unsigned long size)
38985 {
38986@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38987
38988 while (cursor < to) {
38989 if (!devmem_is_allowed(pfn)) {
38990+#ifdef CONFIG_GRKERNSEC_KMEM
38991+ gr_handle_mem_readwrite(from, to);
38992+#else
38993 printk(KERN_INFO
38994 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38995 current->comm, from, to);
38996+#endif
38997 return 0;
38998 }
38999 cursor += PAGE_SIZE;
39000@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39001 }
39002 return 1;
39003 }
39004+#elif defined(CONFIG_GRKERNSEC_KMEM)
39005+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39006+{
39007+ return 0;
39008+}
39009 #else
39010 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39011 {
39012@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39013 #endif
39014
39015 while (count > 0) {
39016- unsigned long remaining;
39017+ unsigned long remaining = 0;
39018+ char *temp;
39019
39020 sz = size_inside_page(p, count);
39021
39022@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39023 if (!ptr)
39024 return -EFAULT;
39025
39026- remaining = copy_to_user(buf, ptr, sz);
39027+#ifdef CONFIG_PAX_USERCOPY
39028+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39029+ if (!temp) {
39030+ unxlate_dev_mem_ptr(p, ptr);
39031+ return -ENOMEM;
39032+ }
39033+ remaining = probe_kernel_read(temp, ptr, sz);
39034+#else
39035+ temp = ptr;
39036+#endif
39037+
39038+ if (!remaining)
39039+ remaining = copy_to_user(buf, temp, sz);
39040+
39041+#ifdef CONFIG_PAX_USERCOPY
39042+ kfree(temp);
39043+#endif
39044+
39045 unxlate_dev_mem_ptr(p, ptr);
39046 if (remaining)
39047 return -EFAULT;
39048@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39049 size_t count, loff_t *ppos)
39050 {
39051 unsigned long p = *ppos;
39052- ssize_t low_count, read, sz;
39053+ ssize_t low_count, read, sz, err = 0;
39054 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
39055- int err = 0;
39056
39057 read = 0;
39058 if (p < (unsigned long) high_memory) {
39059@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39060 }
39061 #endif
39062 while (low_count > 0) {
39063+ char *temp;
39064+
39065 sz = size_inside_page(p, low_count);
39066
39067 /*
39068@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39069 */
39070 kbuf = xlate_dev_kmem_ptr((void *)p);
39071
39072- if (copy_to_user(buf, kbuf, sz))
39073+#ifdef CONFIG_PAX_USERCOPY
39074+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39075+ if (!temp)
39076+ return -ENOMEM;
39077+ err = probe_kernel_read(temp, kbuf, sz);
39078+#else
39079+ temp = kbuf;
39080+#endif
39081+
39082+ if (!err)
39083+ err = copy_to_user(buf, temp, sz);
39084+
39085+#ifdef CONFIG_PAX_USERCOPY
39086+ kfree(temp);
39087+#endif
39088+
39089+ if (err)
39090 return -EFAULT;
39091 buf += sz;
39092 p += sz;
39093@@ -804,6 +853,9 @@ static const struct memdev {
39094 #ifdef CONFIG_PRINTK
39095 [11] = { "kmsg", 0644, &kmsg_fops, 0 },
39096 #endif
39097+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39098+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
39099+#endif
39100 };
39101
39102 static int memory_open(struct inode *inode, struct file *filp)
39103@@ -865,7 +917,7 @@ static int __init chr_dev_init(void)
39104 continue;
39105
39106 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
39107- NULL, devlist[minor].name);
39108+ NULL, "%s", devlist[minor].name);
39109 }
39110
39111 return tty_init();
39112diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
39113index 9df78e2..01ba9ae 100644
39114--- a/drivers/char/nvram.c
39115+++ b/drivers/char/nvram.c
39116@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
39117
39118 spin_unlock_irq(&rtc_lock);
39119
39120- if (copy_to_user(buf, contents, tmp - contents))
39121+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
39122 return -EFAULT;
39123
39124 *ppos = i;
39125diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
39126index 0ea9986..e7b07e4 100644
39127--- a/drivers/char/pcmcia/synclink_cs.c
39128+++ b/drivers/char/pcmcia/synclink_cs.c
39129@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39130
39131 if (debug_level >= DEBUG_LEVEL_INFO)
39132 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
39133- __FILE__, __LINE__, info->device_name, port->count);
39134+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
39135
39136 if (tty_port_close_start(port, tty, filp) == 0)
39137 goto cleanup;
39138@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39139 cleanup:
39140 if (debug_level >= DEBUG_LEVEL_INFO)
39141 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
39142- tty->driver->name, port->count);
39143+ tty->driver->name, atomic_read(&port->count));
39144 }
39145
39146 /* Wait until the transmitter is empty.
39147@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39148
39149 if (debug_level >= DEBUG_LEVEL_INFO)
39150 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
39151- __FILE__, __LINE__, tty->driver->name, port->count);
39152+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
39153
39154 /* If port is closing, signal caller to try again */
39155 if (port->flags & ASYNC_CLOSING){
39156@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39157 goto cleanup;
39158 }
39159 spin_lock(&port->lock);
39160- port->count++;
39161+ atomic_inc(&port->count);
39162 spin_unlock(&port->lock);
39163 spin_unlock_irqrestore(&info->netlock, flags);
39164
39165- if (port->count == 1) {
39166+ if (atomic_read(&port->count) == 1) {
39167 /* 1st open on this device, init hardware */
39168 retval = startup(info, tty);
39169 if (retval < 0)
39170@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39171 unsigned short new_crctype;
39172
39173 /* return error if TTY interface open */
39174- if (info->port.count)
39175+ if (atomic_read(&info->port.count))
39176 return -EBUSY;
39177
39178 switch (encoding)
39179@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
39180
39181 /* arbitrate between network and tty opens */
39182 spin_lock_irqsave(&info->netlock, flags);
39183- if (info->port.count != 0 || info->netcount != 0) {
39184+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39185 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39186 spin_unlock_irqrestore(&info->netlock, flags);
39187 return -EBUSY;
39188@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39189 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
39190
39191 /* return error if TTY interface open */
39192- if (info->port.count)
39193+ if (atomic_read(&info->port.count))
39194 return -EBUSY;
39195
39196 if (cmd != SIOCWANDEV)
39197diff --git a/drivers/char/random.c b/drivers/char/random.c
39198index 9cd6968..6416f00 100644
39199--- a/drivers/char/random.c
39200+++ b/drivers/char/random.c
39201@@ -289,9 +289,6 @@
39202 /*
39203 * To allow fractional bits to be tracked, the entropy_count field is
39204 * denominated in units of 1/8th bits.
39205- *
39206- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39207- * credit_entropy_bits() needs to be 64 bits wide.
39208 */
39209 #define ENTROPY_SHIFT 3
39210 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39211@@ -439,9 +436,9 @@ struct entropy_store {
39212 };
39213
39214 static void push_to_pool(struct work_struct *work);
39215-static __u32 input_pool_data[INPUT_POOL_WORDS];
39216-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39217-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39218+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39219+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39220+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39221
39222 static struct entropy_store input_pool = {
39223 .poolinfo = &poolinfo_table[0],
39224@@ -635,7 +632,7 @@ retry:
39225 /* The +2 corresponds to the /4 in the denominator */
39226
39227 do {
39228- unsigned int anfrac = min(pnfrac, pool_size/2);
39229+ u64 anfrac = min(pnfrac, pool_size/2);
39230 unsigned int add =
39231 ((pool_size - entropy_count)*anfrac*3) >> s;
39232
39233@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39234
39235 extract_buf(r, tmp);
39236 i = min_t(int, nbytes, EXTRACT_SIZE);
39237- if (copy_to_user(buf, tmp, i)) {
39238+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39239 ret = -EFAULT;
39240 break;
39241 }
39242@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39243 static int proc_do_uuid(struct ctl_table *table, int write,
39244 void __user *buffer, size_t *lenp, loff_t *ppos)
39245 {
39246- struct ctl_table fake_table;
39247+ ctl_table_no_const fake_table;
39248 unsigned char buf[64], tmp_uuid[16], *uuid;
39249
39250 uuid = table->data;
39251@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39252 static int proc_do_entropy(struct ctl_table *table, int write,
39253 void __user *buffer, size_t *lenp, loff_t *ppos)
39254 {
39255- struct ctl_table fake_table;
39256+ ctl_table_no_const fake_table;
39257 int entropy_count;
39258
39259 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39260diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39261index e496dae..3db53b6 100644
39262--- a/drivers/char/sonypi.c
39263+++ b/drivers/char/sonypi.c
39264@@ -54,6 +54,7 @@
39265
39266 #include <asm/uaccess.h>
39267 #include <asm/io.h>
39268+#include <asm/local.h>
39269
39270 #include <linux/sonypi.h>
39271
39272@@ -490,7 +491,7 @@ static struct sonypi_device {
39273 spinlock_t fifo_lock;
39274 wait_queue_head_t fifo_proc_list;
39275 struct fasync_struct *fifo_async;
39276- int open_count;
39277+ local_t open_count;
39278 int model;
39279 struct input_dev *input_jog_dev;
39280 struct input_dev *input_key_dev;
39281@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39282 static int sonypi_misc_release(struct inode *inode, struct file *file)
39283 {
39284 mutex_lock(&sonypi_device.lock);
39285- sonypi_device.open_count--;
39286+ local_dec(&sonypi_device.open_count);
39287 mutex_unlock(&sonypi_device.lock);
39288 return 0;
39289 }
39290@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39291 {
39292 mutex_lock(&sonypi_device.lock);
39293 /* Flush input queue on first open */
39294- if (!sonypi_device.open_count)
39295+ if (!local_read(&sonypi_device.open_count))
39296 kfifo_reset(&sonypi_device.fifo);
39297- sonypi_device.open_count++;
39298+ local_inc(&sonypi_device.open_count);
39299 mutex_unlock(&sonypi_device.lock);
39300
39301 return 0;
39302@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39303
39304 static struct platform_device *sonypi_platform_device;
39305
39306-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39307+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39308 {
39309 .ident = "Sony Vaio",
39310 .matches = {
39311diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39312index 565a947..dcdc06e 100644
39313--- a/drivers/char/tpm/tpm_acpi.c
39314+++ b/drivers/char/tpm/tpm_acpi.c
39315@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39316 virt = acpi_os_map_iomem(start, len);
39317 if (!virt) {
39318 kfree(log->bios_event_log);
39319+ log->bios_event_log = NULL;
39320 printk("%s: ERROR - Unable to map memory\n", __func__);
39321 return -EIO;
39322 }
39323
39324- memcpy_fromio(log->bios_event_log, virt, len);
39325+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39326
39327 acpi_os_unmap_iomem(virt, len);
39328 return 0;
39329diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39330index 3a56a13..f8cbd25 100644
39331--- a/drivers/char/tpm/tpm_eventlog.c
39332+++ b/drivers/char/tpm/tpm_eventlog.c
39333@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39334 event = addr;
39335
39336 if ((event->event_type == 0 && event->event_size == 0) ||
39337- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39338+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39339 return NULL;
39340
39341 return addr;
39342@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39343 return NULL;
39344
39345 if ((event->event_type == 0 && event->event_size == 0) ||
39346- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39347+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39348 return NULL;
39349
39350 (*pos)++;
39351@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39352 int i;
39353
39354 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39355- seq_putc(m, data[i]);
39356+ if (!seq_putc(m, data[i]))
39357+ return -EFAULT;
39358
39359 return 0;
39360 }
39361diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39362index 72d7028..1586601 100644
39363--- a/drivers/char/virtio_console.c
39364+++ b/drivers/char/virtio_console.c
39365@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39366 if (to_user) {
39367 ssize_t ret;
39368
39369- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39370+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39371 if (ret)
39372 return -EFAULT;
39373 } else {
39374@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39375 if (!port_has_data(port) && !port->host_connected)
39376 return 0;
39377
39378- return fill_readbuf(port, ubuf, count, true);
39379+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39380 }
39381
39382 static int wait_port_writable(struct port *port, bool nonblock)
39383diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39384index 956b7e5..b655045 100644
39385--- a/drivers/clk/clk-composite.c
39386+++ b/drivers/clk/clk-composite.c
39387@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39388 struct clk *clk;
39389 struct clk_init_data init;
39390 struct clk_composite *composite;
39391- struct clk_ops *clk_composite_ops;
39392+ clk_ops_no_const *clk_composite_ops;
39393
39394 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39395 if (!composite) {
39396diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c
39397index 2e4f6d4..b4cf487 100644
39398--- a/drivers/clk/hisilicon/clk-hi3620.c
39399+++ b/drivers/clk/hisilicon/clk-hi3620.c
39400@@ -38,44 +38,44 @@
39401 #include "clk.h"
39402
39403 /* clock parent list */
39404-static const char *timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
39405-static const char *timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
39406-static const char *timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
39407-static const char *timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
39408-static const char *timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
39409-static const char *timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
39410-static const char *timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
39411-static const char *timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
39412-static const char *timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
39413-static const char *timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
39414-static const char *uart0_mux_p[] __initconst = { "osc26m", "pclk", };
39415-static const char *uart1_mux_p[] __initconst = { "osc26m", "pclk", };
39416-static const char *uart2_mux_p[] __initconst = { "osc26m", "pclk", };
39417-static const char *uart3_mux_p[] __initconst = { "osc26m", "pclk", };
39418-static const char *uart4_mux_p[] __initconst = { "osc26m", "pclk", };
39419-static const char *spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39420-static const char *spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39421-static const char *spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39422+static const char * const timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
39423+static const char * const timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
39424+static const char * const timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
39425+static const char * const timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
39426+static const char * const timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
39427+static const char * const timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
39428+static const char * const timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
39429+static const char * const timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
39430+static const char * const timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
39431+static const char * const timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
39432+static const char * const uart0_mux_p[] __initconst = { "osc26m", "pclk", };
39433+static const char * const uart1_mux_p[] __initconst = { "osc26m", "pclk", };
39434+static const char * const uart2_mux_p[] __initconst = { "osc26m", "pclk", };
39435+static const char * const uart3_mux_p[] __initconst = { "osc26m", "pclk", };
39436+static const char * const uart4_mux_p[] __initconst = { "osc26m", "pclk", };
39437+static const char * const spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39438+static const char * const spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39439+static const char * const spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39440 /* share axi parent */
39441-static const char *saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
39442-static const char *pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
39443-static const char *pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
39444-static const char *sd_mux_p[] __initconst = { "armpll2", "armpll3", };
39445-static const char *mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39446-static const char *mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
39447-static const char *g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
39448-static const char *venc_mux_p[] __initconst = { "armpll2", "armpll3", };
39449-static const char *vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
39450-static const char *vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
39451-static const char *edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
39452-static const char *ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
39453+static const char * const saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
39454+static const char * const pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
39455+static const char * const pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
39456+static const char * const sd_mux_p[] __initconst = { "armpll2", "armpll3", };
39457+static const char * const mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39458+static const char * const mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
39459+static const char * const g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
39460+static const char * const venc_mux_p[] __initconst = { "armpll2", "armpll3", };
39461+static const char * const vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
39462+static const char * const vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
39463+static const char * const edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
39464+static const char * const ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
39465 "armpll3", "armpll5", };
39466-static const char *edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39467-static const char *ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
39468+static const char * const edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39469+static const char * const ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
39470 "armpll3", "armpll5", };
39471-static const char *rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
39472-static const char *mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
39473-static const char *mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
39474+static const char * const rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
39475+static const char * const mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
39476+static const char * const mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
39477
39478
39479 /* fixed rate clocks */
39480diff --git a/drivers/clk/hisilicon/clk-hix5hd2.c b/drivers/clk/hisilicon/clk-hix5hd2.c
39481index 3f369c6..05f9ffd 100644
39482--- a/drivers/clk/hisilicon/clk-hix5hd2.c
39483+++ b/drivers/clk/hisilicon/clk-hix5hd2.c
39484@@ -46,15 +46,15 @@ static struct hisi_fixed_rate_clock hix5hd2_fixed_rate_clks[] __initdata = {
39485 { HIX5HD2_FIXED_83M, "83m", NULL, CLK_IS_ROOT, 83333333, },
39486 };
39487
39488-static const char *sfc_mux_p[] __initconst = {
39489+static const char * const sfc_mux_p[] __initconst = {
39490 "24m", "150m", "200m", "100m", "75m", };
39491 static u32 sfc_mux_table[] = {0, 4, 5, 6, 7};
39492
39493-static const char *sdio_mux_p[] __initconst = {
39494+static const char * const sdio_mux_p[] __initconst = {
39495 "75m", "100m", "50m", "15m", };
39496 static u32 sdio_mux_table[] = {0, 1, 2, 3};
39497
39498-static const char *fephy_mux_p[] __initconst = { "25m", "125m"};
39499+static const char * const fephy_mux_p[] __initconst = { "25m", "125m"};
39500 static u32 fephy_mux_table[] = {0, 1};
39501
39502
39503diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
39504index 7eb684c..147c6fc 100644
39505--- a/drivers/clk/rockchip/clk-rk3188.c
39506+++ b/drivers/clk/rockchip/clk-rk3188.c
39507@@ -704,7 +704,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = {
39508 GATE(ACLK_GPS, "aclk_gps", "aclk_peri", 0, RK2928_CLKGATE_CON(8), 13, GFLAGS),
39509 };
39510
39511-static const char *rk3188_critical_clocks[] __initconst = {
39512+static const char * const rk3188_critical_clocks[] __initconst = {
39513 "aclk_cpu",
39514 "aclk_peri",
39515 "hclk_peri",
39516diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
39517index 05d7a0b..4fc131c 100644
39518--- a/drivers/clk/rockchip/clk-rk3288.c
39519+++ b/drivers/clk/rockchip/clk-rk3288.c
39520@@ -771,7 +771,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
39521 GATE(0, "pclk_isp_in", "ext_isp", 0, RK3288_CLKGATE_CON(16), 3, GFLAGS),
39522 };
39523
39524-static const char *rk3288_critical_clocks[] __initconst = {
39525+static const char * const rk3288_critical_clocks[] __initconst = {
39526 "aclk_cpu",
39527 "aclk_peri",
39528 "hclk_peri",
39529diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
39530index 58d2e3b..0c21b0d 100644
39531--- a/drivers/clk/rockchip/clk.h
39532+++ b/drivers/clk/rockchip/clk.h
39533@@ -182,7 +182,7 @@ struct clk *rockchip_clk_register_mmc(const char *name,
39534 const char **parent_names, u8 num_parents,
39535 void __iomem *reg, int shift);
39536
39537-#define PNAME(x) static const char *x[] __initconst
39538+#define PNAME(x) static const char * const x[] __initconst
39539
39540 enum rockchip_clk_branch_type {
39541 branch_composite,
39542diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
39543index e4c7538..99c50cd 100644
39544--- a/drivers/clk/samsung/clk.h
39545+++ b/drivers/clk/samsung/clk.h
39546@@ -260,7 +260,7 @@ struct samsung_gate_clock {
39547 #define GATE_DA(_id, dname, cname, pname, o, b, f, gf, a) \
39548 __GATE(_id, dname, cname, pname, o, b, f, gf, a)
39549
39550-#define PNAME(x) static const char *x[] __initdata
39551+#define PNAME(x) static const char * const x[] __initconst
39552
39553 /**
39554 * struct samsung_clk_reg_dump: register dump of clock controller registers.
39555diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39556index dd3a78c..386d49c 100644
39557--- a/drivers/clk/socfpga/clk-gate.c
39558+++ b/drivers/clk/socfpga/clk-gate.c
39559@@ -22,6 +22,7 @@
39560 #include <linux/mfd/syscon.h>
39561 #include <linux/of.h>
39562 #include <linux/regmap.h>
39563+#include <asm/pgtable.h>
39564
39565 #include "clk.h"
39566
39567@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39568 return 0;
39569 }
39570
39571-static struct clk_ops gateclk_ops = {
39572+static clk_ops_no_const gateclk_ops __read_only = {
39573 .prepare = socfpga_clk_prepare,
39574 .recalc_rate = socfpga_clk_recalc_rate,
39575 .get_parent = socfpga_clk_get_parent,
39576@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39577 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39578 socfpga_clk->hw.bit_idx = clk_gate[1];
39579
39580- gateclk_ops.enable = clk_gate_ops.enable;
39581- gateclk_ops.disable = clk_gate_ops.disable;
39582+ pax_open_kernel();
39583+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39584+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39585+ pax_close_kernel();
39586 }
39587
39588 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39589diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39590index de6da95..c98278b 100644
39591--- a/drivers/clk/socfpga/clk-pll.c
39592+++ b/drivers/clk/socfpga/clk-pll.c
39593@@ -21,6 +21,7 @@
39594 #include <linux/io.h>
39595 #include <linux/of.h>
39596 #include <linux/of_address.h>
39597+#include <asm/pgtable.h>
39598
39599 #include "clk.h"
39600
39601@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39602 CLK_MGR_PLL_CLK_SRC_MASK;
39603 }
39604
39605-static struct clk_ops clk_pll_ops = {
39606+static clk_ops_no_const clk_pll_ops __read_only = {
39607 .recalc_rate = clk_pll_recalc_rate,
39608 .get_parent = clk_pll_get_parent,
39609 };
39610@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39611 pll_clk->hw.hw.init = &init;
39612
39613 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39614- clk_pll_ops.enable = clk_gate_ops.enable;
39615- clk_pll_ops.disable = clk_gate_ops.disable;
39616+ pax_open_kernel();
39617+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39618+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39619+ pax_close_kernel();
39620
39621 clk = clk_register(NULL, &pll_clk->hw.hw);
39622 if (WARN_ON(IS_ERR(clk))) {
39623diff --git a/drivers/clk/ti/composite.c b/drivers/clk/ti/composite.c
39624index 3654f61..81abe81 100644
39625--- a/drivers/clk/ti/composite.c
39626+++ b/drivers/clk/ti/composite.c
39627@@ -69,7 +69,7 @@ struct component_clk {
39628 struct list_head link;
39629 };
39630
39631-static const char * __initconst component_clk_types[] = {
39632+static const char * const __initconst component_clk_types[] = {
39633 "gate", "divider", "mux"
39634 };
39635
39636diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
39637index f870aad..04ba1e4 100644
39638--- a/drivers/clk/zynq/clkc.c
39639+++ b/drivers/clk/zynq/clkc.c
39640@@ -85,22 +85,22 @@ static DEFINE_SPINLOCK(canmioclk_lock);
39641 static DEFINE_SPINLOCK(dbgclk_lock);
39642 static DEFINE_SPINLOCK(aperclk_lock);
39643
39644-static const char *armpll_parents[] __initconst = {"armpll_int", "ps_clk"};
39645-static const char *ddrpll_parents[] __initconst = {"ddrpll_int", "ps_clk"};
39646-static const char *iopll_parents[] __initconst = {"iopll_int", "ps_clk"};
39647-static const char *gem0_mux_parents[] __initconst = {"gem0_div1", "dummy_name"};
39648-static const char *gem1_mux_parents[] __initconst = {"gem1_div1", "dummy_name"};
39649-static const char *can0_mio_mux2_parents[] __initconst = {"can0_gate",
39650+static const char * const armpll_parents[] __initconst = {"armpll_int", "ps_clk"};
39651+static const char * const ddrpll_parents[] __initconst = {"ddrpll_int", "ps_clk"};
39652+static const char * const iopll_parents[] __initconst = {"iopll_int", "ps_clk"};
39653+static const char * gem0_mux_parents[] __initdata = {"gem0_div1", "dummy_name"};
39654+static const char * gem1_mux_parents[] __initdata = {"gem1_div1", "dummy_name"};
39655+static const char * const can0_mio_mux2_parents[] __initconst = {"can0_gate",
39656 "can0_mio_mux"};
39657-static const char *can1_mio_mux2_parents[] __initconst = {"can1_gate",
39658+static const char * const can1_mio_mux2_parents[] __initconst = {"can1_gate",
39659 "can1_mio_mux"};
39660-static const char *dbg_emio_mux_parents[] __initconst = {"dbg_div",
39661+static const char * dbg_emio_mux_parents[] __initdata = {"dbg_div",
39662 "dummy_name"};
39663
39664-static const char *dbgtrc_emio_input_names[] __initconst = {"trace_emio_clk"};
39665-static const char *gem0_emio_input_names[] __initconst = {"gem0_emio_clk"};
39666-static const char *gem1_emio_input_names[] __initconst = {"gem1_emio_clk"};
39667-static const char *swdt_ext_clk_input_names[] __initconst = {"swdt_ext_clk"};
39668+static const char * const dbgtrc_emio_input_names[] __initconst = {"trace_emio_clk"};
39669+static const char * const gem0_emio_input_names[] __initconst = {"gem0_emio_clk"};
39670+static const char * const gem1_emio_input_names[] __initconst = {"gem1_emio_clk"};
39671+static const char * const swdt_ext_clk_input_names[] __initconst = {"swdt_ext_clk"};
39672
39673 static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
39674 const char *clk_name, void __iomem *fclk_ctrl_reg,
39675diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39676index b0c18ed..1713a80 100644
39677--- a/drivers/cpufreq/acpi-cpufreq.c
39678+++ b/drivers/cpufreq/acpi-cpufreq.c
39679@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39680 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39681 per_cpu(acfreq_data, cpu) = data;
39682
39683- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39684- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39685+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39686+ pax_open_kernel();
39687+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39688+ pax_close_kernel();
39689+ }
39690
39691 result = acpi_processor_register_performance(data->acpi_data, cpu);
39692 if (result)
39693@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39694 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39695 break;
39696 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39697- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39698+ pax_open_kernel();
39699+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39700+ pax_close_kernel();
39701 break;
39702 default:
39703 break;
39704@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39705 if (!msrs)
39706 return;
39707
39708- acpi_cpufreq_driver.boost_supported = true;
39709- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39710+ pax_open_kernel();
39711+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39712+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39713+ pax_close_kernel();
39714
39715 cpu_notifier_register_begin();
39716
39717diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39718index bab67db..91af7e3 100644
39719--- a/drivers/cpufreq/cpufreq-dt.c
39720+++ b/drivers/cpufreq/cpufreq-dt.c
39721@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39722 if (!IS_ERR(cpu_reg))
39723 regulator_put(cpu_reg);
39724
39725- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39726+ pax_open_kernel();
39727+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39728+ pax_close_kernel();
39729
39730 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39731 if (ret)
39732diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39733index 8ae655c..3141442 100644
39734--- a/drivers/cpufreq/cpufreq.c
39735+++ b/drivers/cpufreq/cpufreq.c
39736@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39737 }
39738
39739 mutex_lock(&cpufreq_governor_mutex);
39740- list_del(&governor->governor_list);
39741+ pax_list_del(&governor->governor_list);
39742 mutex_unlock(&cpufreq_governor_mutex);
39743 return;
39744 }
39745@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39746 return NOTIFY_OK;
39747 }
39748
39749-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39750+static struct notifier_block cpufreq_cpu_notifier = {
39751 .notifier_call = cpufreq_cpu_callback,
39752 };
39753
39754@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
39755 return 0;
39756
39757 write_lock_irqsave(&cpufreq_driver_lock, flags);
39758- cpufreq_driver->boost_enabled = state;
39759+ pax_open_kernel();
39760+ *(bool *)&cpufreq_driver->boost_enabled = state;
39761+ pax_close_kernel();
39762 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39763
39764 ret = cpufreq_driver->set_boost(state);
39765 if (ret) {
39766 write_lock_irqsave(&cpufreq_driver_lock, flags);
39767- cpufreq_driver->boost_enabled = !state;
39768+ pax_open_kernel();
39769+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39770+ pax_close_kernel();
39771 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39772
39773 pr_err("%s: Cannot %s BOOST\n",
39774@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39775 cpufreq_driver = driver_data;
39776 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39777
39778- if (driver_data->setpolicy)
39779- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39780+ if (driver_data->setpolicy) {
39781+ pax_open_kernel();
39782+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39783+ pax_close_kernel();
39784+ }
39785
39786 if (cpufreq_boost_supported()) {
39787 /*
39788 * Check if driver provides function to enable boost -
39789 * if not, use cpufreq_boost_set_sw as default
39790 */
39791- if (!cpufreq_driver->set_boost)
39792- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39793+ if (!cpufreq_driver->set_boost) {
39794+ pax_open_kernel();
39795+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39796+ pax_close_kernel();
39797+ }
39798
39799 ret = cpufreq_sysfs_create_file(&boost.attr);
39800 if (ret) {
39801diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39802index 1b44496..b80ff5e 100644
39803--- a/drivers/cpufreq/cpufreq_governor.c
39804+++ b/drivers/cpufreq/cpufreq_governor.c
39805@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39806 struct dbs_data *dbs_data;
39807 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39808 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39809- struct od_ops *od_ops = NULL;
39810+ const struct od_ops *od_ops = NULL;
39811 struct od_dbs_tuners *od_tuners = NULL;
39812 struct cs_dbs_tuners *cs_tuners = NULL;
39813 struct cpu_dbs_common_info *cpu_cdbs;
39814@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39815
39816 if ((cdata->governor == GOV_CONSERVATIVE) &&
39817 (!policy->governor->initialized)) {
39818- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39819+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39820
39821 cpufreq_register_notifier(cs_ops->notifier_block,
39822 CPUFREQ_TRANSITION_NOTIFIER);
39823@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39824
39825 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39826 (policy->governor->initialized == 1)) {
39827- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39828+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39829
39830 cpufreq_unregister_notifier(cs_ops->notifier_block,
39831 CPUFREQ_TRANSITION_NOTIFIER);
39832diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39833index cc401d1..8197340 100644
39834--- a/drivers/cpufreq/cpufreq_governor.h
39835+++ b/drivers/cpufreq/cpufreq_governor.h
39836@@ -212,7 +212,7 @@ struct common_dbs_data {
39837 void (*exit)(struct dbs_data *dbs_data);
39838
39839 /* Governor specific ops, see below */
39840- void *gov_ops;
39841+ const void *gov_ops;
39842 };
39843
39844 /* Governor Per policy data */
39845@@ -232,7 +232,7 @@ struct od_ops {
39846 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39847 unsigned int freq_next, unsigned int relation);
39848 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39849-};
39850+} __no_const;
39851
39852 struct cs_ops {
39853 struct notifier_block *notifier_block;
39854diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39855index ad3f38f..8f086cd 100644
39856--- a/drivers/cpufreq/cpufreq_ondemand.c
39857+++ b/drivers/cpufreq/cpufreq_ondemand.c
39858@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39859
39860 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39861
39862-static struct od_ops od_ops = {
39863+static struct od_ops od_ops __read_only = {
39864 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39865 .powersave_bias_target = generic_powersave_bias_target,
39866 .freq_increase = dbs_freq_increase,
39867@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39868 (struct cpufreq_policy *, unsigned int, unsigned int),
39869 unsigned int powersave_bias)
39870 {
39871- od_ops.powersave_bias_target = f;
39872+ pax_open_kernel();
39873+ *(void **)&od_ops.powersave_bias_target = f;
39874+ pax_close_kernel();
39875 od_set_powersave_bias(powersave_bias);
39876 }
39877 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39878
39879 void od_unregister_powersave_bias_handler(void)
39880 {
39881- od_ops.powersave_bias_target = generic_powersave_bias_target;
39882+ pax_open_kernel();
39883+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39884+ pax_close_kernel();
39885 od_set_powersave_bias(0);
39886 }
39887 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39888diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39889index 872c577..5fb3c20 100644
39890--- a/drivers/cpufreq/intel_pstate.c
39891+++ b/drivers/cpufreq/intel_pstate.c
39892@@ -133,10 +133,10 @@ struct pstate_funcs {
39893 struct cpu_defaults {
39894 struct pstate_adjust_policy pid_policy;
39895 struct pstate_funcs funcs;
39896-};
39897+} __do_const;
39898
39899 static struct pstate_adjust_policy pid_params;
39900-static struct pstate_funcs pstate_funcs;
39901+static struct pstate_funcs *pstate_funcs;
39902 static int hwp_active;
39903
39904 struct perf_limits {
39905@@ -690,18 +690,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39906
39907 cpu->pstate.current_pstate = pstate;
39908
39909- pstate_funcs.set(cpu, pstate);
39910+ pstate_funcs->set(cpu, pstate);
39911 }
39912
39913 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39914 {
39915- cpu->pstate.min_pstate = pstate_funcs.get_min();
39916- cpu->pstate.max_pstate = pstate_funcs.get_max();
39917- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39918- cpu->pstate.scaling = pstate_funcs.get_scaling();
39919+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39920+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39921+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39922+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39923
39924- if (pstate_funcs.get_vid)
39925- pstate_funcs.get_vid(cpu);
39926+ if (pstate_funcs->get_vid)
39927+ pstate_funcs->get_vid(cpu);
39928 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39929 }
39930
39931@@ -1030,9 +1030,9 @@ static int intel_pstate_msrs_not_valid(void)
39932 rdmsrl(MSR_IA32_APERF, aperf);
39933 rdmsrl(MSR_IA32_MPERF, mperf);
39934
39935- if (!pstate_funcs.get_max() ||
39936- !pstate_funcs.get_min() ||
39937- !pstate_funcs.get_turbo())
39938+ if (!pstate_funcs->get_max() ||
39939+ !pstate_funcs->get_min() ||
39940+ !pstate_funcs->get_turbo())
39941 return -ENODEV;
39942
39943 rdmsrl(MSR_IA32_APERF, tmp);
39944@@ -1046,7 +1046,7 @@ static int intel_pstate_msrs_not_valid(void)
39945 return 0;
39946 }
39947
39948-static void copy_pid_params(struct pstate_adjust_policy *policy)
39949+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39950 {
39951 pid_params.sample_rate_ms = policy->sample_rate_ms;
39952 pid_params.p_gain_pct = policy->p_gain_pct;
39953@@ -1058,12 +1058,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39954
39955 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39956 {
39957- pstate_funcs.get_max = funcs->get_max;
39958- pstate_funcs.get_min = funcs->get_min;
39959- pstate_funcs.get_turbo = funcs->get_turbo;
39960- pstate_funcs.get_scaling = funcs->get_scaling;
39961- pstate_funcs.set = funcs->set;
39962- pstate_funcs.get_vid = funcs->get_vid;
39963+ pstate_funcs = funcs;
39964 }
39965
39966 #if IS_ENABLED(CONFIG_ACPI)
39967diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39968index 529cfd9..0e28fff 100644
39969--- a/drivers/cpufreq/p4-clockmod.c
39970+++ b/drivers/cpufreq/p4-clockmod.c
39971@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39972 case 0x0F: /* Core Duo */
39973 case 0x16: /* Celeron Core */
39974 case 0x1C: /* Atom */
39975- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39976+ pax_open_kernel();
39977+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39978+ pax_close_kernel();
39979 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39980 case 0x0D: /* Pentium M (Dothan) */
39981- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39982+ pax_open_kernel();
39983+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39984+ pax_close_kernel();
39985 /* fall through */
39986 case 0x09: /* Pentium M (Banias) */
39987 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39988@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39989
39990 /* on P-4s, the TSC runs with constant frequency independent whether
39991 * throttling is active or not. */
39992- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39993+ pax_open_kernel();
39994+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39995+ pax_close_kernel();
39996
39997 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39998 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39999diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
40000index 9bb42ba..b01b4a2 100644
40001--- a/drivers/cpufreq/sparc-us3-cpufreq.c
40002+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
40003@@ -18,14 +18,12 @@
40004 #include <asm/head.h>
40005 #include <asm/timer.h>
40006
40007-static struct cpufreq_driver *cpufreq_us3_driver;
40008-
40009 struct us3_freq_percpu_info {
40010 struct cpufreq_frequency_table table[4];
40011 };
40012
40013 /* Indexed by cpu number. */
40014-static struct us3_freq_percpu_info *us3_freq_table;
40015+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
40016
40017 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
40018 * in the Safari config register.
40019@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
40020
40021 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
40022 {
40023- if (cpufreq_us3_driver)
40024- us3_freq_target(policy, 0);
40025+ us3_freq_target(policy, 0);
40026
40027 return 0;
40028 }
40029
40030+static int __init us3_freq_init(void);
40031+static void __exit us3_freq_exit(void);
40032+
40033+static struct cpufreq_driver cpufreq_us3_driver = {
40034+ .init = us3_freq_cpu_init,
40035+ .verify = cpufreq_generic_frequency_table_verify,
40036+ .target_index = us3_freq_target,
40037+ .get = us3_freq_get,
40038+ .exit = us3_freq_cpu_exit,
40039+ .name = "UltraSPARC-III",
40040+
40041+};
40042+
40043 static int __init us3_freq_init(void)
40044 {
40045 unsigned long manuf, impl, ver;
40046- int ret;
40047
40048 if (tlb_type != cheetah && tlb_type != cheetah_plus)
40049 return -ENODEV;
40050@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
40051 (impl == CHEETAH_IMPL ||
40052 impl == CHEETAH_PLUS_IMPL ||
40053 impl == JAGUAR_IMPL ||
40054- impl == PANTHER_IMPL)) {
40055- struct cpufreq_driver *driver;
40056-
40057- ret = -ENOMEM;
40058- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
40059- if (!driver)
40060- goto err_out;
40061-
40062- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
40063- GFP_KERNEL);
40064- if (!us3_freq_table)
40065- goto err_out;
40066-
40067- driver->init = us3_freq_cpu_init;
40068- driver->verify = cpufreq_generic_frequency_table_verify;
40069- driver->target_index = us3_freq_target;
40070- driver->get = us3_freq_get;
40071- driver->exit = us3_freq_cpu_exit;
40072- strcpy(driver->name, "UltraSPARC-III");
40073-
40074- cpufreq_us3_driver = driver;
40075- ret = cpufreq_register_driver(driver);
40076- if (ret)
40077- goto err_out;
40078-
40079- return 0;
40080-
40081-err_out:
40082- if (driver) {
40083- kfree(driver);
40084- cpufreq_us3_driver = NULL;
40085- }
40086- kfree(us3_freq_table);
40087- us3_freq_table = NULL;
40088- return ret;
40089- }
40090+ impl == PANTHER_IMPL))
40091+ return cpufreq_register_driver(&cpufreq_us3_driver);
40092
40093 return -ENODEV;
40094 }
40095
40096 static void __exit us3_freq_exit(void)
40097 {
40098- if (cpufreq_us3_driver) {
40099- cpufreq_unregister_driver(cpufreq_us3_driver);
40100- kfree(cpufreq_us3_driver);
40101- cpufreq_us3_driver = NULL;
40102- kfree(us3_freq_table);
40103- us3_freq_table = NULL;
40104- }
40105+ cpufreq_unregister_driver(&cpufreq_us3_driver);
40106 }
40107
40108 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
40109diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
40110index 7d4a315..21bb886 100644
40111--- a/drivers/cpufreq/speedstep-centrino.c
40112+++ b/drivers/cpufreq/speedstep-centrino.c
40113@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
40114 !cpu_has(cpu, X86_FEATURE_EST))
40115 return -ENODEV;
40116
40117- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
40118- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40119+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
40120+ pax_open_kernel();
40121+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40122+ pax_close_kernel();
40123+ }
40124
40125 if (policy->cpu != 0)
40126 return -ENODEV;
40127diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
40128index 2697e87..c32476c 100644
40129--- a/drivers/cpuidle/driver.c
40130+++ b/drivers/cpuidle/driver.c
40131@@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
40132
40133 static void poll_idle_init(struct cpuidle_driver *drv)
40134 {
40135- struct cpuidle_state *state = &drv->states[0];
40136+ cpuidle_state_no_const *state = &drv->states[0];
40137
40138 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
40139 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
40140diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
40141index fb9f511..213e6cc 100644
40142--- a/drivers/cpuidle/governor.c
40143+++ b/drivers/cpuidle/governor.c
40144@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
40145 mutex_lock(&cpuidle_lock);
40146 if (__cpuidle_find_governor(gov->name) == NULL) {
40147 ret = 0;
40148- list_add_tail(&gov->governor_list, &cpuidle_governors);
40149+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
40150 if (!cpuidle_curr_governor ||
40151 cpuidle_curr_governor->rating < gov->rating)
40152 cpuidle_switch_governor(gov);
40153diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
40154index 832a2c3..1794080 100644
40155--- a/drivers/cpuidle/sysfs.c
40156+++ b/drivers/cpuidle/sysfs.c
40157@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
40158 NULL
40159 };
40160
40161-static struct attribute_group cpuidle_attr_group = {
40162+static attribute_group_no_const cpuidle_attr_group = {
40163 .attrs = cpuidle_default_attrs,
40164 .name = "cpuidle",
40165 };
40166diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
40167index 8d2a772..33826c9 100644
40168--- a/drivers/crypto/hifn_795x.c
40169+++ b/drivers/crypto/hifn_795x.c
40170@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
40171 MODULE_PARM_DESC(hifn_pll_ref,
40172 "PLL reference clock (pci[freq] or ext[freq], default ext)");
40173
40174-static atomic_t hifn_dev_number;
40175+static atomic_unchecked_t hifn_dev_number;
40176
40177 #define ACRYPTO_OP_DECRYPT 0
40178 #define ACRYPTO_OP_ENCRYPT 1
40179@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
40180 goto err_out_disable_pci_device;
40181
40182 snprintf(name, sizeof(name), "hifn%d",
40183- atomic_inc_return(&hifn_dev_number)-1);
40184+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
40185
40186 err = pci_request_regions(pdev, name);
40187 if (err)
40188diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
40189index 30b538d8..1610d75 100644
40190--- a/drivers/devfreq/devfreq.c
40191+++ b/drivers/devfreq/devfreq.c
40192@@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
40193 goto err_out;
40194 }
40195
40196- list_add(&governor->node, &devfreq_governor_list);
40197+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
40198
40199 list_for_each_entry(devfreq, &devfreq_list, node) {
40200 int ret = 0;
40201@@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
40202 }
40203 }
40204
40205- list_del(&governor->node);
40206+ pax_list_del((struct list_head *)&governor->node);
40207 err_out:
40208 mutex_unlock(&devfreq_list_lock);
40209
40210diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
40211index 8ee383d..736b5de 100644
40212--- a/drivers/dma/sh/shdma-base.c
40213+++ b/drivers/dma/sh/shdma-base.c
40214@@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
40215 schan->slave_id = -EINVAL;
40216 }
40217
40218- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
40219- sdev->desc_size, GFP_KERNEL);
40220+ schan->desc = kcalloc(sdev->desc_size,
40221+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
40222 if (!schan->desc) {
40223 ret = -ENOMEM;
40224 goto edescalloc;
40225diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
40226index 9f1d4c7..fceff78 100644
40227--- a/drivers/dma/sh/shdmac.c
40228+++ b/drivers/dma/sh/shdmac.c
40229@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
40230 return ret;
40231 }
40232
40233-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
40234+static struct notifier_block sh_dmae_nmi_notifier = {
40235 .notifier_call = sh_dmae_nmi_handler,
40236
40237 /* Run before NMI debug handler and KGDB */
40238diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
40239index 592af5f..bb1d583 100644
40240--- a/drivers/edac/edac_device.c
40241+++ b/drivers/edac/edac_device.c
40242@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
40243 */
40244 int edac_device_alloc_index(void)
40245 {
40246- static atomic_t device_indexes = ATOMIC_INIT(0);
40247+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
40248
40249- return atomic_inc_return(&device_indexes) - 1;
40250+ return atomic_inc_return_unchecked(&device_indexes) - 1;
40251 }
40252 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
40253
40254diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
40255index c84eecb..4d7381d 100644
40256--- a/drivers/edac/edac_mc_sysfs.c
40257+++ b/drivers/edac/edac_mc_sysfs.c
40258@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
40259 struct dev_ch_attribute {
40260 struct device_attribute attr;
40261 int channel;
40262-};
40263+} __do_const;
40264
40265 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
40266 static struct dev_ch_attribute dev_attr_legacy_##_name = \
40267@@ -1009,15 +1009,17 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
40268 }
40269
40270 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
40271+ pax_open_kernel();
40272 if (mci->get_sdram_scrub_rate) {
40273- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40274- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40275+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40276+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40277 }
40278
40279 if (mci->set_sdram_scrub_rate) {
40280- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40281- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40282+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40283+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40284 }
40285+ pax_close_kernel();
40286
40287 err = device_create_file(&mci->dev, &dev_attr_sdram_scrub_rate);
40288 if (err) {
40289diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
40290index 2cf44b4d..6dd2dc7 100644
40291--- a/drivers/edac/edac_pci.c
40292+++ b/drivers/edac/edac_pci.c
40293@@ -29,7 +29,7 @@
40294
40295 static DEFINE_MUTEX(edac_pci_ctls_mutex);
40296 static LIST_HEAD(edac_pci_list);
40297-static atomic_t pci_indexes = ATOMIC_INIT(0);
40298+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
40299
40300 /*
40301 * edac_pci_alloc_ctl_info
40302@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
40303 */
40304 int edac_pci_alloc_index(void)
40305 {
40306- return atomic_inc_return(&pci_indexes) - 1;
40307+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
40308 }
40309 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
40310
40311diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
40312index 24d877f..4e30133 100644
40313--- a/drivers/edac/edac_pci_sysfs.c
40314+++ b/drivers/edac/edac_pci_sysfs.c
40315@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
40316 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
40317 static int edac_pci_poll_msec = 1000; /* one second workq period */
40318
40319-static atomic_t pci_parity_count = ATOMIC_INIT(0);
40320-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
40321+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
40322+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
40323
40324 static struct kobject *edac_pci_top_main_kobj;
40325 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
40326@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
40327 void *value;
40328 ssize_t(*show) (void *, char *);
40329 ssize_t(*store) (void *, const char *, size_t);
40330-};
40331+} __do_const;
40332
40333 /* Set of show/store abstract level functions for PCI Parity object */
40334 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
40335@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40336 edac_printk(KERN_CRIT, EDAC_PCI,
40337 "Signaled System Error on %s\n",
40338 pci_name(dev));
40339- atomic_inc(&pci_nonparity_count);
40340+ atomic_inc_unchecked(&pci_nonparity_count);
40341 }
40342
40343 if (status & (PCI_STATUS_PARITY)) {
40344@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40345 "Master Data Parity Error on %s\n",
40346 pci_name(dev));
40347
40348- atomic_inc(&pci_parity_count);
40349+ atomic_inc_unchecked(&pci_parity_count);
40350 }
40351
40352 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40353@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40354 "Detected Parity Error on %s\n",
40355 pci_name(dev));
40356
40357- atomic_inc(&pci_parity_count);
40358+ atomic_inc_unchecked(&pci_parity_count);
40359 }
40360 }
40361
40362@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40363 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
40364 "Signaled System Error on %s\n",
40365 pci_name(dev));
40366- atomic_inc(&pci_nonparity_count);
40367+ atomic_inc_unchecked(&pci_nonparity_count);
40368 }
40369
40370 if (status & (PCI_STATUS_PARITY)) {
40371@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40372 "Master Data Parity Error on "
40373 "%s\n", pci_name(dev));
40374
40375- atomic_inc(&pci_parity_count);
40376+ atomic_inc_unchecked(&pci_parity_count);
40377 }
40378
40379 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40380@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40381 "Detected Parity Error on %s\n",
40382 pci_name(dev));
40383
40384- atomic_inc(&pci_parity_count);
40385+ atomic_inc_unchecked(&pci_parity_count);
40386 }
40387 }
40388 }
40389@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40390 if (!check_pci_errors)
40391 return;
40392
40393- before_count = atomic_read(&pci_parity_count);
40394+ before_count = atomic_read_unchecked(&pci_parity_count);
40395
40396 /* scan all PCI devices looking for a Parity Error on devices and
40397 * bridges.
40398@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40399 /* Only if operator has selected panic on PCI Error */
40400 if (edac_pci_get_panic_on_pe()) {
40401 /* If the count is different 'after' from 'before' */
40402- if (before_count != atomic_read(&pci_parity_count))
40403+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40404 panic("EDAC: PCI Parity Error");
40405 }
40406 }
40407diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40408index c2359a1..8bd119d 100644
40409--- a/drivers/edac/mce_amd.h
40410+++ b/drivers/edac/mce_amd.h
40411@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40412 bool (*mc0_mce)(u16, u8);
40413 bool (*mc1_mce)(u16, u8);
40414 bool (*mc2_mce)(u16, u8);
40415-};
40416+} __no_const;
40417
40418 void amd_report_gart_errors(bool);
40419 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40420diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40421index 57ea7f4..af06b76 100644
40422--- a/drivers/firewire/core-card.c
40423+++ b/drivers/firewire/core-card.c
40424@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40425 const struct fw_card_driver *driver,
40426 struct device *device)
40427 {
40428- static atomic_t index = ATOMIC_INIT(-1);
40429+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40430
40431- card->index = atomic_inc_return(&index);
40432+ card->index = atomic_inc_return_unchecked(&index);
40433 card->driver = driver;
40434 card->device = device;
40435 card->current_tlabel = 0;
40436@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40437
40438 void fw_core_remove_card(struct fw_card *card)
40439 {
40440- struct fw_card_driver dummy_driver = dummy_driver_template;
40441+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40442
40443 card->driver->update_phy_reg(card, 4,
40444 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40445diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40446index f9e3aee..269dbdb 100644
40447--- a/drivers/firewire/core-device.c
40448+++ b/drivers/firewire/core-device.c
40449@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40450 struct config_rom_attribute {
40451 struct device_attribute attr;
40452 u32 key;
40453-};
40454+} __do_const;
40455
40456 static ssize_t show_immediate(struct device *dev,
40457 struct device_attribute *dattr, char *buf)
40458diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40459index d6a09b9..18e90dd 100644
40460--- a/drivers/firewire/core-transaction.c
40461+++ b/drivers/firewire/core-transaction.c
40462@@ -38,6 +38,7 @@
40463 #include <linux/timer.h>
40464 #include <linux/types.h>
40465 #include <linux/workqueue.h>
40466+#include <linux/sched.h>
40467
40468 #include <asm/byteorder.h>
40469
40470diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40471index e1480ff6..1a429bd 100644
40472--- a/drivers/firewire/core.h
40473+++ b/drivers/firewire/core.h
40474@@ -111,6 +111,7 @@ struct fw_card_driver {
40475
40476 int (*stop_iso)(struct fw_iso_context *ctx);
40477 };
40478+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40479
40480 void fw_card_initialize(struct fw_card *card,
40481 const struct fw_card_driver *driver, struct device *device);
40482diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40483index f51d376..b118e40 100644
40484--- a/drivers/firewire/ohci.c
40485+++ b/drivers/firewire/ohci.c
40486@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
40487 be32_to_cpu(ohci->next_header));
40488 }
40489
40490+#ifndef CONFIG_GRKERNSEC
40491 if (param_remote_dma) {
40492 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40493 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40494 }
40495+#endif
40496
40497 spin_unlock_irq(&ohci->lock);
40498
40499@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40500 unsigned long flags;
40501 int n, ret = 0;
40502
40503+#ifndef CONFIG_GRKERNSEC
40504 if (param_remote_dma)
40505 return 0;
40506+#endif
40507
40508 /*
40509 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40510diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40511index 94a58a0..f5eba42 100644
40512--- a/drivers/firmware/dmi-id.c
40513+++ b/drivers/firmware/dmi-id.c
40514@@ -16,7 +16,7 @@
40515 struct dmi_device_attribute{
40516 struct device_attribute dev_attr;
40517 int field;
40518-};
40519+} __do_const;
40520 #define to_dmi_dev_attr(_dev_attr) \
40521 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40522
40523diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40524index 4fd9961..52d60ce 100644
40525--- a/drivers/firmware/efi/cper.c
40526+++ b/drivers/firmware/efi/cper.c
40527@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40528 */
40529 u64 cper_next_record_id(void)
40530 {
40531- static atomic64_t seq;
40532+ static atomic64_unchecked_t seq;
40533
40534- if (!atomic64_read(&seq))
40535- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40536+ if (!atomic64_read_unchecked(&seq))
40537+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40538
40539- return atomic64_inc_return(&seq);
40540+ return atomic64_inc_return_unchecked(&seq);
40541 }
40542 EXPORT_SYMBOL_GPL(cper_next_record_id);
40543
40544diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40545index 3061bb8..92b5fcc 100644
40546--- a/drivers/firmware/efi/efi.c
40547+++ b/drivers/firmware/efi/efi.c
40548@@ -160,14 +160,16 @@ static struct attribute_group efi_subsys_attr_group = {
40549 };
40550
40551 static struct efivars generic_efivars;
40552-static struct efivar_operations generic_ops;
40553+static efivar_operations_no_const generic_ops __read_only;
40554
40555 static int generic_ops_register(void)
40556 {
40557- generic_ops.get_variable = efi.get_variable;
40558- generic_ops.set_variable = efi.set_variable;
40559- generic_ops.get_next_variable = efi.get_next_variable;
40560- generic_ops.query_variable_store = efi_query_variable_store;
40561+ pax_open_kernel();
40562+ *(void **)&generic_ops.get_variable = efi.get_variable;
40563+ *(void **)&generic_ops.set_variable = efi.set_variable;
40564+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40565+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40566+ pax_close_kernel();
40567
40568 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40569 }
40570diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40571index 7b2e049..a253334 100644
40572--- a/drivers/firmware/efi/efivars.c
40573+++ b/drivers/firmware/efi/efivars.c
40574@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40575 static int
40576 create_efivars_bin_attributes(void)
40577 {
40578- struct bin_attribute *attr;
40579+ bin_attribute_no_const *attr;
40580 int error;
40581
40582 /* new_var */
40583diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40584index 87b8e3b..c4afb35 100644
40585--- a/drivers/firmware/efi/runtime-map.c
40586+++ b/drivers/firmware/efi/runtime-map.c
40587@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40588 kfree(entry);
40589 }
40590
40591-static struct kobj_type __refdata map_ktype = {
40592+static const struct kobj_type __refconst map_ktype = {
40593 .sysfs_ops = &map_attr_ops,
40594 .default_attrs = def_attrs,
40595 .release = map_release,
40596diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40597index f1ab05e..ab51228 100644
40598--- a/drivers/firmware/google/gsmi.c
40599+++ b/drivers/firmware/google/gsmi.c
40600@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40601 return local_hash_64(input, 32);
40602 }
40603
40604-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40605+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40606 {
40607 .ident = "Google Board",
40608 .matches = {
40609diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40610index 2f569aa..26e4f39 100644
40611--- a/drivers/firmware/google/memconsole.c
40612+++ b/drivers/firmware/google/memconsole.c
40613@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40614 return false;
40615 }
40616
40617-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40618+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40619 {
40620 .ident = "Google Board",
40621 .matches = {
40622@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40623 if (!found_memconsole())
40624 return -ENODEV;
40625
40626- memconsole_bin_attr.size = memconsole_length;
40627+ pax_open_kernel();
40628+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40629+ pax_close_kernel();
40630+
40631 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40632 }
40633
40634diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40635index cc016c61..d35279e 100644
40636--- a/drivers/firmware/memmap.c
40637+++ b/drivers/firmware/memmap.c
40638@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40639 kfree(entry);
40640 }
40641
40642-static struct kobj_type __refdata memmap_ktype = {
40643+static const struct kobj_type __refconst memmap_ktype = {
40644 .release = release_firmware_map_entry,
40645 .sysfs_ops = &memmap_attr_ops,
40646 .default_attrs = def_attrs,
40647diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40648index 3cfcfc6..09d6f117 100644
40649--- a/drivers/gpio/gpio-em.c
40650+++ b/drivers/gpio/gpio-em.c
40651@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40652 struct em_gio_priv *p;
40653 struct resource *io[2], *irq[2];
40654 struct gpio_chip *gpio_chip;
40655- struct irq_chip *irq_chip;
40656+ irq_chip_no_const *irq_chip;
40657 const char *name = dev_name(&pdev->dev);
40658 int ret;
40659
40660diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40661index 7818cd1..1be40e5 100644
40662--- a/drivers/gpio/gpio-ich.c
40663+++ b/drivers/gpio/gpio-ich.c
40664@@ -94,7 +94,7 @@ struct ichx_desc {
40665 * this option allows driver caching written output values
40666 */
40667 bool use_outlvl_cache;
40668-};
40669+} __do_const;
40670
40671 static struct {
40672 spinlock_t lock;
40673diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40674index f476ae2..05e1bdd 100644
40675--- a/drivers/gpio/gpio-omap.c
40676+++ b/drivers/gpio/gpio-omap.c
40677@@ -1188,7 +1188,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40678 const struct omap_gpio_platform_data *pdata;
40679 struct resource *res;
40680 struct gpio_bank *bank;
40681- struct irq_chip *irqc;
40682+ irq_chip_no_const *irqc;
40683 int ret;
40684
40685 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40686diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40687index c49522e..9a7ee54 100644
40688--- a/drivers/gpio/gpio-rcar.c
40689+++ b/drivers/gpio/gpio-rcar.c
40690@@ -348,7 +348,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40691 struct gpio_rcar_priv *p;
40692 struct resource *io, *irq;
40693 struct gpio_chip *gpio_chip;
40694- struct irq_chip *irq_chip;
40695+ irq_chip_no_const *irq_chip;
40696 struct device *dev = &pdev->dev;
40697 const char *name = dev_name(dev);
40698 int ret;
40699diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40700index c1caa45..f0f97d2 100644
40701--- a/drivers/gpio/gpio-vr41xx.c
40702+++ b/drivers/gpio/gpio-vr41xx.c
40703@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40704 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40705 maskl, pendl, maskh, pendh);
40706
40707- atomic_inc(&irq_err_count);
40708+ atomic_inc_unchecked(&irq_err_count);
40709
40710 return -EINVAL;
40711 }
40712diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40713index 1ca9295..9f3d481 100644
40714--- a/drivers/gpio/gpiolib.c
40715+++ b/drivers/gpio/gpiolib.c
40716@@ -554,8 +554,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40717 }
40718
40719 if (gpiochip->irqchip) {
40720- gpiochip->irqchip->irq_request_resources = NULL;
40721- gpiochip->irqchip->irq_release_resources = NULL;
40722+ pax_open_kernel();
40723+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40724+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40725+ pax_close_kernel();
40726 gpiochip->irqchip = NULL;
40727 }
40728 }
40729@@ -621,8 +623,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40730 gpiochip->irqchip = NULL;
40731 return -EINVAL;
40732 }
40733- irqchip->irq_request_resources = gpiochip_irq_reqres;
40734- irqchip->irq_release_resources = gpiochip_irq_relres;
40735+
40736+ pax_open_kernel();
40737+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40738+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40739+ pax_close_kernel();
40740
40741 /*
40742 * Prepare the mapping since the irqchip shall be orthogonal to
40743diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40744index 488f51d..301d462 100644
40745--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40746+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40747@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
40748 enum cache_policy alternate_policy,
40749 void __user *alternate_aperture_base,
40750 uint64_t alternate_aperture_size);
40751-};
40752+} __no_const;
40753
40754 /**
40755 * struct device_queue_manager
40756diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40757index 5940531..a75b0e5 100644
40758--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40759+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40760@@ -62,7 +62,7 @@ struct kernel_queue_ops {
40761
40762 void (*submit_packet)(struct kernel_queue *kq);
40763 void (*rollback_packet)(struct kernel_queue *kq);
40764-};
40765+} __no_const;
40766
40767 struct kernel_queue {
40768 struct kernel_queue_ops ops;
40769diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
40770index 9b23525..65f4110 100644
40771--- a/drivers/gpu/drm/drm_context.c
40772+++ b/drivers/gpu/drm/drm_context.c
40773@@ -53,6 +53,9 @@ struct drm_ctx_list {
40774 */
40775 void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
40776 {
40777+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40778+ return;
40779+
40780 mutex_lock(&dev->struct_mutex);
40781 idr_remove(&dev->ctx_idr, ctx_handle);
40782 mutex_unlock(&dev->struct_mutex);
40783@@ -87,6 +90,9 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev)
40784 */
40785 int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40786 {
40787+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40788+ return -EINVAL;
40789+
40790 idr_init(&dev->ctx_idr);
40791 return 0;
40792 }
40793@@ -101,6 +107,9 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40794 */
40795 void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)
40796 {
40797+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40798+ return;
40799+
40800 mutex_lock(&dev->struct_mutex);
40801 idr_destroy(&dev->ctx_idr);
40802 mutex_unlock(&dev->struct_mutex);
40803@@ -119,11 +128,14 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)
40804 {
40805 struct drm_ctx_list *pos, *tmp;
40806
40807+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40808+ return;
40809+
40810 mutex_lock(&dev->ctxlist_mutex);
40811
40812 list_for_each_entry_safe(pos, tmp, &dev->ctxlist, head) {
40813 if (pos->tag == file &&
40814- pos->handle != DRM_KERNEL_CONTEXT) {
40815+ _DRM_LOCKING_CONTEXT(pos->handle) != DRM_KERNEL_CONTEXT) {
40816 if (dev->driver->context_dtor)
40817 dev->driver->context_dtor(dev, pos->handle);
40818
40819@@ -161,6 +173,9 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data,
40820 struct drm_local_map *map;
40821 struct drm_map_list *_entry;
40822
40823+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40824+ return -EINVAL;
40825+
40826 mutex_lock(&dev->struct_mutex);
40827
40828 map = idr_find(&dev->ctx_idr, request->ctx_id);
40829@@ -205,6 +220,9 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data,
40830 struct drm_local_map *map = NULL;
40831 struct drm_map_list *r_list = NULL;
40832
40833+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40834+ return -EINVAL;
40835+
40836 mutex_lock(&dev->struct_mutex);
40837 list_for_each_entry(r_list, &dev->maplist, head) {
40838 if (r_list->map
40839@@ -277,7 +295,13 @@ static int drm_context_switch_complete(struct drm_device *dev,
40840 {
40841 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */
40842
40843- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40844+ if (file_priv->master->lock.hw_lock == NULL) {
40845+ DRM_ERROR(
40846+ "Device has been unregistered. Hard exit. Process %d\n",
40847+ task_pid_nr(current));
40848+ send_sig(SIGTERM, current, 0);
40849+ return -EPERM;
40850+ } else if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40851 DRM_ERROR("Lock isn't held after context switch\n");
40852 }
40853
40854@@ -305,6 +329,9 @@ int drm_legacy_resctx(struct drm_device *dev, void *data,
40855 struct drm_ctx ctx;
40856 int i;
40857
40858+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40859+ return -EINVAL;
40860+
40861 if (res->count >= DRM_RESERVED_CONTEXTS) {
40862 memset(&ctx, 0, sizeof(ctx));
40863 for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
40864@@ -335,8 +362,11 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
40865 struct drm_ctx_list *ctx_entry;
40866 struct drm_ctx *ctx = data;
40867
40868+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40869+ return -EINVAL;
40870+
40871 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40872- if (ctx->handle == DRM_KERNEL_CONTEXT) {
40873+ if (_DRM_LOCKING_CONTEXT(ctx->handle) == DRM_KERNEL_CONTEXT) {
40874 /* Skip kernel's context and get a new one. */
40875 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40876 }
40877@@ -378,6 +408,9 @@ int drm_legacy_getctx(struct drm_device *dev, void *data,
40878 {
40879 struct drm_ctx *ctx = data;
40880
40881+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40882+ return -EINVAL;
40883+
40884 /* This is 0, because we don't handle any context flags */
40885 ctx->flags = 0;
40886
40887@@ -400,6 +433,9 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data,
40888 {
40889 struct drm_ctx *ctx = data;
40890
40891+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40892+ return -EINVAL;
40893+
40894 DRM_DEBUG("%d\n", ctx->handle);
40895 return drm_context_switch(dev, dev->last_context, ctx->handle);
40896 }
40897@@ -420,6 +456,9 @@ int drm_legacy_newctx(struct drm_device *dev, void *data,
40898 {
40899 struct drm_ctx *ctx = data;
40900
40901+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40902+ return -EINVAL;
40903+
40904 DRM_DEBUG("%d\n", ctx->handle);
40905 drm_context_switch_complete(dev, file_priv, ctx->handle);
40906
40907@@ -442,8 +481,11 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data,
40908 {
40909 struct drm_ctx *ctx = data;
40910
40911+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40912+ return -EINVAL;
40913+
40914 DRM_DEBUG("%d\n", ctx->handle);
40915- if (ctx->handle != DRM_KERNEL_CONTEXT) {
40916+ if (_DRM_LOCKING_CONTEXT(ctx->handle) != DRM_KERNEL_CONTEXT) {
40917 if (dev->driver->context_dtor)
40918 dev->driver->context_dtor(dev, ctx->handle);
40919 drm_legacy_ctxbitmap_free(dev, ctx->handle);
40920diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40921index b6f076b..2918de2 100644
40922--- a/drivers/gpu/drm/drm_crtc.c
40923+++ b/drivers/gpu/drm/drm_crtc.c
40924@@ -4118,7 +4118,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40925 goto done;
40926 }
40927
40928- if (copy_to_user(&enum_ptr[copied].name,
40929+ if (copy_to_user(enum_ptr[copied].name,
40930 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40931 ret = -EFAULT;
40932 goto done;
40933diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40934index d512134..a80a8e4 100644
40935--- a/drivers/gpu/drm/drm_drv.c
40936+++ b/drivers/gpu/drm/drm_drv.c
40937@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
40938
40939 drm_device_set_unplugged(dev);
40940
40941- if (dev->open_count == 0) {
40942+ if (local_read(&dev->open_count) == 0) {
40943 drm_put_dev(dev);
40944 }
40945 mutex_unlock(&drm_global_mutex);
40946@@ -596,10 +596,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
40947 if (drm_ht_create(&dev->map_hash, 12))
40948 goto err_minors;
40949
40950- ret = drm_legacy_ctxbitmap_init(dev);
40951- if (ret) {
40952- DRM_ERROR("Cannot allocate memory for context bitmap.\n");
40953- goto err_ht;
40954+ if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) {
40955+ ret = drm_legacy_ctxbitmap_init(dev);
40956+ if (ret) {
40957+ DRM_ERROR(
40958+ "Cannot allocate memory for context bitmap.\n");
40959+ goto err_ht;
40960+ }
40961 }
40962
40963 if (drm_core_check_feature(dev, DRIVER_GEM)) {
40964diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40965index 076dd60..e4a4ba7 100644
40966--- a/drivers/gpu/drm/drm_fops.c
40967+++ b/drivers/gpu/drm/drm_fops.c
40968@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40969 return PTR_ERR(minor);
40970
40971 dev = minor->dev;
40972- if (!dev->open_count++)
40973+ if (local_inc_return(&dev->open_count) == 1)
40974 need_setup = 1;
40975
40976 /* share address_space across all char-devs of a single device */
40977@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40978 return 0;
40979
40980 err_undo:
40981- dev->open_count--;
40982+ local_dec(&dev->open_count);
40983 drm_minor_release(minor);
40984 return retcode;
40985 }
40986@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40987
40988 mutex_lock(&drm_global_mutex);
40989
40990- DRM_DEBUG("open_count = %d\n", dev->open_count);
40991+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40992
40993 mutex_lock(&dev->struct_mutex);
40994 list_del(&file_priv->lhead);
40995@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40996 * Begin inline drm_release
40997 */
40998
40999- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
41000+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
41001 task_pid_nr(current),
41002 (long)old_encode_dev(file_priv->minor->kdev->devt),
41003- dev->open_count);
41004+ local_read(&dev->open_count));
41005
41006 /* Release any auth tokens that might point to this file_priv,
41007 (do that under the drm_global_mutex) */
41008@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
41009 * End inline drm_release
41010 */
41011
41012- if (!--dev->open_count) {
41013+ if (local_dec_and_test(&dev->open_count)) {
41014 retcode = drm_lastclose(dev);
41015 if (drm_device_is_unplugged(dev))
41016 drm_put_dev(dev);
41017diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
41018index 3d2e91c..d31c4c9 100644
41019--- a/drivers/gpu/drm/drm_global.c
41020+++ b/drivers/gpu/drm/drm_global.c
41021@@ -36,7 +36,7 @@
41022 struct drm_global_item {
41023 struct mutex mutex;
41024 void *object;
41025- int refcount;
41026+ atomic_t refcount;
41027 };
41028
41029 static struct drm_global_item glob[DRM_GLOBAL_NUM];
41030@@ -49,7 +49,7 @@ void drm_global_init(void)
41031 struct drm_global_item *item = &glob[i];
41032 mutex_init(&item->mutex);
41033 item->object = NULL;
41034- item->refcount = 0;
41035+ atomic_set(&item->refcount, 0);
41036 }
41037 }
41038
41039@@ -59,7 +59,7 @@ void drm_global_release(void)
41040 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
41041 struct drm_global_item *item = &glob[i];
41042 BUG_ON(item->object != NULL);
41043- BUG_ON(item->refcount != 0);
41044+ BUG_ON(atomic_read(&item->refcount) != 0);
41045 }
41046 }
41047
41048@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41049 struct drm_global_item *item = &glob[ref->global_type];
41050
41051 mutex_lock(&item->mutex);
41052- if (item->refcount == 0) {
41053+ if (atomic_read(&item->refcount) == 0) {
41054 item->object = kzalloc(ref->size, GFP_KERNEL);
41055 if (unlikely(item->object == NULL)) {
41056 ret = -ENOMEM;
41057@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41058 goto out_err;
41059
41060 }
41061- ++item->refcount;
41062+ atomic_inc(&item->refcount);
41063 ref->object = item->object;
41064 mutex_unlock(&item->mutex);
41065 return 0;
41066@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
41067 struct drm_global_item *item = &glob[ref->global_type];
41068
41069 mutex_lock(&item->mutex);
41070- BUG_ON(item->refcount == 0);
41071+ BUG_ON(atomic_read(&item->refcount) == 0);
41072 BUG_ON(ref->object != item->object);
41073- if (--item->refcount == 0) {
41074+ if (atomic_dec_and_test(&item->refcount)) {
41075 ref->release(ref);
41076 item->object = NULL;
41077 }
41078diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
41079index f1b32f9..394f791 100644
41080--- a/drivers/gpu/drm/drm_info.c
41081+++ b/drivers/gpu/drm/drm_info.c
41082@@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
41083 struct drm_local_map *map;
41084 struct drm_map_list *r_list;
41085
41086- /* Hardcoded from _DRM_FRAME_BUFFER,
41087- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
41088- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
41089- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
41090+ static const char * const types[] = {
41091+ [_DRM_FRAME_BUFFER] = "FB",
41092+ [_DRM_REGISTERS] = "REG",
41093+ [_DRM_SHM] = "SHM",
41094+ [_DRM_AGP] = "AGP",
41095+ [_DRM_SCATTER_GATHER] = "SG",
41096+ [_DRM_CONSISTENT] = "PCI"};
41097 const char *type;
41098 int i;
41099
41100@@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
41101 map = r_list->map;
41102 if (!map)
41103 continue;
41104- if (map->type < 0 || map->type > 5)
41105+ if (map->type >= ARRAY_SIZE(types))
41106 type = "??";
41107 else
41108 type = types[map->type];
41109diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
41110index 2f4c4343..dd12cd2 100644
41111--- a/drivers/gpu/drm/drm_ioc32.c
41112+++ b/drivers/gpu/drm/drm_ioc32.c
41113@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
41114 request = compat_alloc_user_space(nbytes);
41115 if (!access_ok(VERIFY_WRITE, request, nbytes))
41116 return -EFAULT;
41117- list = (struct drm_buf_desc *) (request + 1);
41118+ list = (struct drm_buf_desc __user *) (request + 1);
41119
41120 if (__put_user(count, &request->count)
41121 || __put_user(list, &request->list))
41122@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
41123 request = compat_alloc_user_space(nbytes);
41124 if (!access_ok(VERIFY_WRITE, request, nbytes))
41125 return -EFAULT;
41126- list = (struct drm_buf_pub *) (request + 1);
41127+ list = (struct drm_buf_pub __user *) (request + 1);
41128
41129 if (__put_user(count, &request->count)
41130 || __put_user(list, &request->list))
41131@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
41132 return 0;
41133 }
41134
41135-drm_ioctl_compat_t *drm_compat_ioctls[] = {
41136+drm_ioctl_compat_t drm_compat_ioctls[] = {
41137 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
41138 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
41139 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
41140@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
41141 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41142 {
41143 unsigned int nr = DRM_IOCTL_NR(cmd);
41144- drm_ioctl_compat_t *fn;
41145 int ret;
41146
41147 /* Assume that ioctls without an explicit compat routine will just
41148@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41149 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
41150 return drm_ioctl(filp, cmd, arg);
41151
41152- fn = drm_compat_ioctls[nr];
41153-
41154- if (fn != NULL)
41155- ret = (*fn) (filp, cmd, arg);
41156+ if (drm_compat_ioctls[nr] != NULL)
41157+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
41158 else
41159 ret = drm_ioctl(filp, cmd, arg);
41160
41161diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
41162index 3785d66..1c489ef 100644
41163--- a/drivers/gpu/drm/drm_ioctl.c
41164+++ b/drivers/gpu/drm/drm_ioctl.c
41165@@ -655,7 +655,7 @@ long drm_ioctl(struct file *filp,
41166 struct drm_file *file_priv = filp->private_data;
41167 struct drm_device *dev;
41168 const struct drm_ioctl_desc *ioctl = NULL;
41169- drm_ioctl_t *func;
41170+ drm_ioctl_no_const_t func;
41171 unsigned int nr = DRM_IOCTL_NR(cmd);
41172 int retcode = -EINVAL;
41173 char stack_kdata[128];
41174diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
41175index f861361..b61d4c7 100644
41176--- a/drivers/gpu/drm/drm_lock.c
41177+++ b/drivers/gpu/drm/drm_lock.c
41178@@ -61,9 +61,12 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
41179 struct drm_master *master = file_priv->master;
41180 int ret = 0;
41181
41182+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41183+ return -EINVAL;
41184+
41185 ++file_priv->lock_count;
41186
41187- if (lock->context == DRM_KERNEL_CONTEXT) {
41188+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41189 DRM_ERROR("Process %d using kernel context %d\n",
41190 task_pid_nr(current), lock->context);
41191 return -EINVAL;
41192@@ -153,12 +156,23 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
41193 struct drm_lock *lock = data;
41194 struct drm_master *master = file_priv->master;
41195
41196- if (lock->context == DRM_KERNEL_CONTEXT) {
41197+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41198+ return -EINVAL;
41199+
41200+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41201 DRM_ERROR("Process %d using kernel context %d\n",
41202 task_pid_nr(current), lock->context);
41203 return -EINVAL;
41204 }
41205
41206+ if (!master->lock.hw_lock) {
41207+ DRM_ERROR(
41208+ "Device has been unregistered. Hard exit. Process %d\n",
41209+ task_pid_nr(current));
41210+ send_sig(SIGTERM, current, 0);
41211+ return -EPERM;
41212+ }
41213+
41214 if (drm_legacy_lock_free(&master->lock, lock->context)) {
41215 /* FIXME: Should really bail out here. */
41216 }
41217diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41218index d4813e0..6c1ab4d 100644
41219--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41220+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41221@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
41222 u32 pipeconf_reg = PIPEACONF;
41223 u32 dspcntr_reg = DSPACNTR;
41224
41225- u32 pipeconf = dev_priv->pipeconf[pipe];
41226- u32 dspcntr = dev_priv->dspcntr[pipe];
41227+ u32 pipeconf;
41228+ u32 dspcntr;
41229 u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
41230
41231+ if (pipe == -1)
41232+ return;
41233+
41234+ pipeconf = dev_priv->pipeconf[pipe];
41235+ dspcntr = dev_priv->dspcntr[pipe];
41236+
41237 if (pipe) {
41238 pipeconf_reg = PIPECCONF;
41239 dspcntr_reg = DSPCCNTR;
41240diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
41241index 93ec5dc..82acbaf 100644
41242--- a/drivers/gpu/drm/i810/i810_drv.h
41243+++ b/drivers/gpu/drm/i810/i810_drv.h
41244@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
41245 int page_flipping;
41246
41247 wait_queue_head_t irq_queue;
41248- atomic_t irq_received;
41249- atomic_t irq_emitted;
41250+ atomic_unchecked_t irq_received;
41251+ atomic_unchecked_t irq_emitted;
41252
41253 int front_offset;
41254 } drm_i810_private_t;
41255diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
41256index 1a46787..7fb387c 100644
41257--- a/drivers/gpu/drm/i915/i915_dma.c
41258+++ b/drivers/gpu/drm/i915/i915_dma.c
41259@@ -149,6 +149,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
41260 case I915_PARAM_MMAP_VERSION:
41261 value = 1;
41262 break;
41263+ case I915_PARAM_HAS_LEGACY_CONTEXT:
41264+ value = drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT);
41265+ break;
41266 default:
41267 DRM_DEBUG("Unknown parameter %d\n", param->param);
41268 return -EINVAL;
41269@@ -362,7 +365,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
41270 * locking inversion with the driver load path. And the access here is
41271 * completely racy anyway. So don't bother with locking for now.
41272 */
41273- return dev->open_count == 0;
41274+ return local_read(&dev->open_count) == 0;
41275 }
41276
41277 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
41278diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41279index 38a7425..5322b16 100644
41280--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41281+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41282@@ -872,12 +872,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
41283 static int
41284 validate_exec_list(struct drm_device *dev,
41285 struct drm_i915_gem_exec_object2 *exec,
41286- int count)
41287+ unsigned int count)
41288 {
41289 unsigned relocs_total = 0;
41290 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
41291 unsigned invalid_flags;
41292- int i;
41293+ unsigned int i;
41294
41295 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
41296 if (USES_FULL_PPGTT(dev))
41297diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
41298index 176de63..b50b66a 100644
41299--- a/drivers/gpu/drm/i915/i915_ioc32.c
41300+++ b/drivers/gpu/drm/i915/i915_ioc32.c
41301@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
41302 || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
41303 || __put_user(batchbuffer32.num_cliprects,
41304 &batchbuffer->num_cliprects)
41305- || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
41306+ || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
41307 &batchbuffer->cliprects))
41308 return -EFAULT;
41309
41310@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
41311
41312 cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
41313 if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
41314- || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
41315+ || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
41316 &cmdbuffer->buf)
41317 || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
41318 || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
41319 || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
41320 || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
41321- || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
41322+ || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
41323 &cmdbuffer->cliprects))
41324 return -EFAULT;
41325
41326@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
41327 (unsigned long)request);
41328 }
41329
41330-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41331+static drm_ioctl_compat_t i915_compat_ioctls[] = {
41332 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
41333 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
41334 [DRM_I915_GETPARAM] = compat_i915_getparam,
41335@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41336 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41337 {
41338 unsigned int nr = DRM_IOCTL_NR(cmd);
41339- drm_ioctl_compat_t *fn = NULL;
41340 int ret;
41341
41342 if (nr < DRM_COMMAND_BASE)
41343 return drm_compat_ioctl(filp, cmd, arg);
41344
41345- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
41346- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
41347-
41348- if (fn != NULL)
41349- ret = (*fn) (filp, cmd, arg);
41350+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
41351+ ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
41352 else
41353 ret = drm_ioctl(filp, cmd, arg);
41354
41355diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
41356index f75173c..f283e45 100644
41357--- a/drivers/gpu/drm/i915/intel_display.c
41358+++ b/drivers/gpu/drm/i915/intel_display.c
41359@@ -13056,13 +13056,13 @@ struct intel_quirk {
41360 int subsystem_vendor;
41361 int subsystem_device;
41362 void (*hook)(struct drm_device *dev);
41363-};
41364+} __do_const;
41365
41366 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
41367 struct intel_dmi_quirk {
41368 void (*hook)(struct drm_device *dev);
41369 const struct dmi_system_id (*dmi_id_list)[];
41370-};
41371+} __do_const;
41372
41373 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41374 {
41375@@ -13070,18 +13070,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41376 return 1;
41377 }
41378
41379-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41380+static const struct dmi_system_id intel_dmi_quirks_table[] = {
41381 {
41382- .dmi_id_list = &(const struct dmi_system_id[]) {
41383- {
41384- .callback = intel_dmi_reverse_brightness,
41385- .ident = "NCR Corporation",
41386- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41387- DMI_MATCH(DMI_PRODUCT_NAME, ""),
41388- },
41389- },
41390- { } /* terminating entry */
41391+ .callback = intel_dmi_reverse_brightness,
41392+ .ident = "NCR Corporation",
41393+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41394+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
41395 },
41396+ },
41397+ { } /* terminating entry */
41398+};
41399+
41400+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41401+ {
41402+ .dmi_id_list = &intel_dmi_quirks_table,
41403 .hook = quirk_invert_brightness,
41404 },
41405 };
41406diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
41407index a002f53..0d60514 100644
41408--- a/drivers/gpu/drm/imx/imx-drm-core.c
41409+++ b/drivers/gpu/drm/imx/imx-drm-core.c
41410@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
41411 if (imxdrm->pipes >= MAX_CRTC)
41412 return -EINVAL;
41413
41414- if (imxdrm->drm->open_count)
41415+ if (local_read(&imxdrm->drm->open_count))
41416 return -EBUSY;
41417
41418 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
41419diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
41420index b4a20149..219ab78 100644
41421--- a/drivers/gpu/drm/mga/mga_drv.h
41422+++ b/drivers/gpu/drm/mga/mga_drv.h
41423@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
41424 u32 clear_cmd;
41425 u32 maccess;
41426
41427- atomic_t vbl_received; /**< Number of vblanks received. */
41428+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
41429 wait_queue_head_t fence_queue;
41430- atomic_t last_fence_retired;
41431+ atomic_unchecked_t last_fence_retired;
41432 u32 next_fence_to_post;
41433
41434 unsigned int fb_cpp;
41435diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
41436index 729bfd5..14bae78 100644
41437--- a/drivers/gpu/drm/mga/mga_ioc32.c
41438+++ b/drivers/gpu/drm/mga/mga_ioc32.c
41439@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
41440 return 0;
41441 }
41442
41443-drm_ioctl_compat_t *mga_compat_ioctls[] = {
41444+drm_ioctl_compat_t mga_compat_ioctls[] = {
41445 [DRM_MGA_INIT] = compat_mga_init,
41446 [DRM_MGA_GETPARAM] = compat_mga_getparam,
41447 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
41448@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
41449 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41450 {
41451 unsigned int nr = DRM_IOCTL_NR(cmd);
41452- drm_ioctl_compat_t *fn = NULL;
41453 int ret;
41454
41455 if (nr < DRM_COMMAND_BASE)
41456 return drm_compat_ioctl(filp, cmd, arg);
41457
41458- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
41459- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41460-
41461- if (fn != NULL)
41462- ret = (*fn) (filp, cmd, arg);
41463+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
41464+ ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41465 else
41466 ret = drm_ioctl(filp, cmd, arg);
41467
41468diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
41469index 1b071b8..de8601a 100644
41470--- a/drivers/gpu/drm/mga/mga_irq.c
41471+++ b/drivers/gpu/drm/mga/mga_irq.c
41472@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
41473 if (crtc != 0)
41474 return 0;
41475
41476- return atomic_read(&dev_priv->vbl_received);
41477+ return atomic_read_unchecked(&dev_priv->vbl_received);
41478 }
41479
41480
41481@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41482 /* VBLANK interrupt */
41483 if (status & MGA_VLINEPEN) {
41484 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
41485- atomic_inc(&dev_priv->vbl_received);
41486+ atomic_inc_unchecked(&dev_priv->vbl_received);
41487 drm_handle_vblank(dev, 0);
41488 handled = 1;
41489 }
41490@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41491 if ((prim_start & ~0x03) != (prim_end & ~0x03))
41492 MGA_WRITE(MGA_PRIMEND, prim_end);
41493
41494- atomic_inc(&dev_priv->last_fence_retired);
41495+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
41496 wake_up(&dev_priv->fence_queue);
41497 handled = 1;
41498 }
41499@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41500 * using fences.
41501 */
41502 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41503- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41504+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41505 - *sequence) <= (1 << 23)));
41506
41507 *sequence = cur_fence;
41508diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41509index 0190b69..60c3eaf 100644
41510--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41511+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41512@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41513 struct bit_table {
41514 const char id;
41515 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41516-};
41517+} __no_const;
41518
41519 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41520
41521diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
41522index 8763deb..936b423 100644
41523--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
41524+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
41525@@ -940,7 +940,8 @@ static struct drm_driver
41526 driver_stub = {
41527 .driver_features =
41528 DRIVER_USE_AGP |
41529- DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER,
41530+ DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER |
41531+ DRIVER_KMS_LEGACY_CONTEXT,
41532
41533 .load = nouveau_drm_load,
41534 .unload = nouveau_drm_unload,
41535diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41536index fc68f09..0511d71 100644
41537--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41538+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41539@@ -121,7 +121,6 @@ struct nouveau_drm {
41540 struct drm_global_reference mem_global_ref;
41541 struct ttm_bo_global_ref bo_global_ref;
41542 struct ttm_bo_device bdev;
41543- atomic_t validate_sequence;
41544 int (*move)(struct nouveau_channel *,
41545 struct ttm_buffer_object *,
41546 struct ttm_mem_reg *, struct ttm_mem_reg *);
41547diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41548index 462679a..88e32a7 100644
41549--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41550+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41551@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41552 unsigned long arg)
41553 {
41554 unsigned int nr = DRM_IOCTL_NR(cmd);
41555- drm_ioctl_compat_t *fn = NULL;
41556+ drm_ioctl_compat_t fn = NULL;
41557 int ret;
41558
41559 if (nr < DRM_COMMAND_BASE)
41560diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41561index 273e501..3b6c0a2 100644
41562--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41563+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41564@@ -127,11 +127,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41565 }
41566
41567 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41568- nouveau_vram_manager_init,
41569- nouveau_vram_manager_fini,
41570- nouveau_vram_manager_new,
41571- nouveau_vram_manager_del,
41572- nouveau_vram_manager_debug
41573+ .init = nouveau_vram_manager_init,
41574+ .takedown = nouveau_vram_manager_fini,
41575+ .get_node = nouveau_vram_manager_new,
41576+ .put_node = nouveau_vram_manager_del,
41577+ .debug = nouveau_vram_manager_debug
41578 };
41579
41580 static int
41581@@ -195,11 +195,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41582 }
41583
41584 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41585- nouveau_gart_manager_init,
41586- nouveau_gart_manager_fini,
41587- nouveau_gart_manager_new,
41588- nouveau_gart_manager_del,
41589- nouveau_gart_manager_debug
41590+ .init = nouveau_gart_manager_init,
41591+ .takedown = nouveau_gart_manager_fini,
41592+ .get_node = nouveau_gart_manager_new,
41593+ .put_node = nouveau_gart_manager_del,
41594+ .debug = nouveau_gart_manager_debug
41595 };
41596
41597 /*XXX*/
41598@@ -268,11 +268,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41599 }
41600
41601 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41602- nv04_gart_manager_init,
41603- nv04_gart_manager_fini,
41604- nv04_gart_manager_new,
41605- nv04_gart_manager_del,
41606- nv04_gart_manager_debug
41607+ .init = nv04_gart_manager_init,
41608+ .takedown = nv04_gart_manager_fini,
41609+ .get_node = nv04_gart_manager_new,
41610+ .put_node = nv04_gart_manager_del,
41611+ .debug = nv04_gart_manager_debug
41612 };
41613
41614 int
41615diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41616index c7592ec..dd45ebc 100644
41617--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41618+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41619@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41620 * locking inversion with the driver load path. And the access here is
41621 * completely racy anyway. So don't bother with locking for now.
41622 */
41623- return dev->open_count == 0;
41624+ return local_read(&dev->open_count) == 0;
41625 }
41626
41627 static const struct vga_switcheroo_client_ops
41628diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41629index 9782364..89bd954 100644
41630--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41631+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41632@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41633 int ret;
41634
41635 mutex_lock(&qdev->async_io_mutex);
41636- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41637+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41638 if (qdev->last_sent_io_cmd > irq_num) {
41639 if (intr)
41640 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41641- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41642+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41643 else
41644 ret = wait_event_timeout(qdev->io_cmd_event,
41645- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41646+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41647 /* 0 is timeout, just bail the "hw" has gone away */
41648 if (ret <= 0)
41649 goto out;
41650- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41651+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41652 }
41653 outb(val, addr);
41654 qdev->last_sent_io_cmd = irq_num + 1;
41655 if (intr)
41656 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41657- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41658+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41659 else
41660 ret = wait_event_timeout(qdev->io_cmd_event,
41661- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41662+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41663 out:
41664 if (ret > 0)
41665 ret = 0;
41666diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41667index 6911b8c..89d6867 100644
41668--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41669+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41670@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41671 struct drm_info_node *node = (struct drm_info_node *) m->private;
41672 struct qxl_device *qdev = node->minor->dev->dev_private;
41673
41674- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41675- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41676- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41677- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41678+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41679+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41680+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41681+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41682 seq_printf(m, "%d\n", qdev->irq_received_error);
41683 return 0;
41684 }
41685diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41686index 7c6cafe..460f542 100644
41687--- a/drivers/gpu/drm/qxl/qxl_drv.h
41688+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41689@@ -290,10 +290,10 @@ struct qxl_device {
41690 unsigned int last_sent_io_cmd;
41691
41692 /* interrupt handling */
41693- atomic_t irq_received;
41694- atomic_t irq_received_display;
41695- atomic_t irq_received_cursor;
41696- atomic_t irq_received_io_cmd;
41697+ atomic_unchecked_t irq_received;
41698+ atomic_unchecked_t irq_received_display;
41699+ atomic_unchecked_t irq_received_cursor;
41700+ atomic_unchecked_t irq_received_io_cmd;
41701 unsigned irq_received_error;
41702 wait_queue_head_t display_event;
41703 wait_queue_head_t cursor_event;
41704diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41705index b110883..dd06418 100644
41706--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41707+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41708@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41709
41710 /* TODO copy slow path code from i915 */
41711 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41712- 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);
41713+ 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);
41714
41715 {
41716 struct qxl_drawable *draw = fb_cmd;
41717@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41718 struct drm_qxl_reloc reloc;
41719
41720 if (copy_from_user(&reloc,
41721- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41722+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41723 sizeof(reloc))) {
41724 ret = -EFAULT;
41725 goto out_free_bos;
41726@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41727
41728 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41729
41730- struct drm_qxl_command *commands =
41731- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41732+ struct drm_qxl_command __user *commands =
41733+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41734
41735- if (copy_from_user(&user_cmd, &commands[cmd_num],
41736+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41737 sizeof(user_cmd)))
41738 return -EFAULT;
41739
41740diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41741index 0bf1e20..42a7310 100644
41742--- a/drivers/gpu/drm/qxl/qxl_irq.c
41743+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41744@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41745 if (!pending)
41746 return IRQ_NONE;
41747
41748- atomic_inc(&qdev->irq_received);
41749+ atomic_inc_unchecked(&qdev->irq_received);
41750
41751 if (pending & QXL_INTERRUPT_DISPLAY) {
41752- atomic_inc(&qdev->irq_received_display);
41753+ atomic_inc_unchecked(&qdev->irq_received_display);
41754 wake_up_all(&qdev->display_event);
41755 qxl_queue_garbage_collect(qdev, false);
41756 }
41757 if (pending & QXL_INTERRUPT_CURSOR) {
41758- atomic_inc(&qdev->irq_received_cursor);
41759+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41760 wake_up_all(&qdev->cursor_event);
41761 }
41762 if (pending & QXL_INTERRUPT_IO_CMD) {
41763- atomic_inc(&qdev->irq_received_io_cmd);
41764+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41765 wake_up_all(&qdev->io_cmd_event);
41766 }
41767 if (pending & QXL_INTERRUPT_ERROR) {
41768@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41769 init_waitqueue_head(&qdev->io_cmd_event);
41770 INIT_WORK(&qdev->client_monitors_config_work,
41771 qxl_client_monitors_config_work_func);
41772- atomic_set(&qdev->irq_received, 0);
41773- atomic_set(&qdev->irq_received_display, 0);
41774- atomic_set(&qdev->irq_received_cursor, 0);
41775- atomic_set(&qdev->irq_received_io_cmd, 0);
41776+ atomic_set_unchecked(&qdev->irq_received, 0);
41777+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41778+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41779+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41780 qdev->irq_received_error = 0;
41781 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41782 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41783diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41784index 0cbc4c9..0e46686 100644
41785--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41786+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41787@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41788 }
41789 }
41790
41791-static struct vm_operations_struct qxl_ttm_vm_ops;
41792+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41793 static const struct vm_operations_struct *ttm_vm_ops;
41794
41795 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41796@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41797 return r;
41798 if (unlikely(ttm_vm_ops == NULL)) {
41799 ttm_vm_ops = vma->vm_ops;
41800+ pax_open_kernel();
41801 qxl_ttm_vm_ops = *ttm_vm_ops;
41802 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41803+ pax_close_kernel();
41804 }
41805 vma->vm_ops = &qxl_ttm_vm_ops;
41806 return 0;
41807@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41808 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41809 {
41810 #if defined(CONFIG_DEBUG_FS)
41811- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41812- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41813- unsigned i;
41814+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41815+ {
41816+ .name = "qxl_mem_mm",
41817+ .show = &qxl_mm_dump_table,
41818+ },
41819+ {
41820+ .name = "qxl_surf_mm",
41821+ .show = &qxl_mm_dump_table,
41822+ }
41823+ };
41824
41825- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41826- if (i == 0)
41827- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41828- else
41829- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41830- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41831- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41832- qxl_mem_types_list[i].driver_features = 0;
41833- if (i == 0)
41834- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41835- else
41836- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41837+ pax_open_kernel();
41838+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41839+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41840+ pax_close_kernel();
41841
41842- }
41843- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41844+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41845 #else
41846 return 0;
41847 #endif
41848diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41849index 2c45ac9..5d740f8 100644
41850--- a/drivers/gpu/drm/r128/r128_cce.c
41851+++ b/drivers/gpu/drm/r128/r128_cce.c
41852@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41853
41854 /* GH: Simple idle check.
41855 */
41856- atomic_set(&dev_priv->idle_count, 0);
41857+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41858
41859 /* We don't support anything other than bus-mastering ring mode,
41860 * but the ring can be in either AGP or PCI space for the ring
41861diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41862index 723e5d6..102dbaf 100644
41863--- a/drivers/gpu/drm/r128/r128_drv.h
41864+++ b/drivers/gpu/drm/r128/r128_drv.h
41865@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41866 int is_pci;
41867 unsigned long cce_buffers_offset;
41868
41869- atomic_t idle_count;
41870+ atomic_unchecked_t idle_count;
41871
41872 int page_flipping;
41873 int current_page;
41874 u32 crtc_offset;
41875 u32 crtc_offset_cntl;
41876
41877- atomic_t vbl_received;
41878+ atomic_unchecked_t vbl_received;
41879
41880 u32 color_fmt;
41881 unsigned int front_offset;
41882diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41883index 663f38c..ec159a1 100644
41884--- a/drivers/gpu/drm/r128/r128_ioc32.c
41885+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41886@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41887 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41888 }
41889
41890-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41891+drm_ioctl_compat_t r128_compat_ioctls[] = {
41892 [DRM_R128_INIT] = compat_r128_init,
41893 [DRM_R128_DEPTH] = compat_r128_depth,
41894 [DRM_R128_STIPPLE] = compat_r128_stipple,
41895@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41896 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41897 {
41898 unsigned int nr = DRM_IOCTL_NR(cmd);
41899- drm_ioctl_compat_t *fn = NULL;
41900 int ret;
41901
41902 if (nr < DRM_COMMAND_BASE)
41903 return drm_compat_ioctl(filp, cmd, arg);
41904
41905- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41906- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41907-
41908- if (fn != NULL)
41909- ret = (*fn) (filp, cmd, arg);
41910+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
41911+ ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41912 else
41913 ret = drm_ioctl(filp, cmd, arg);
41914
41915diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41916index c2ae496..30b5993 100644
41917--- a/drivers/gpu/drm/r128/r128_irq.c
41918+++ b/drivers/gpu/drm/r128/r128_irq.c
41919@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41920 if (crtc != 0)
41921 return 0;
41922
41923- return atomic_read(&dev_priv->vbl_received);
41924+ return atomic_read_unchecked(&dev_priv->vbl_received);
41925 }
41926
41927 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41928@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41929 /* VBLANK interrupt */
41930 if (status & R128_CRTC_VBLANK_INT) {
41931 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41932- atomic_inc(&dev_priv->vbl_received);
41933+ atomic_inc_unchecked(&dev_priv->vbl_received);
41934 drm_handle_vblank(dev, 0);
41935 return IRQ_HANDLED;
41936 }
41937diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41938index 8fd2d9f..18c9660 100644
41939--- a/drivers/gpu/drm/r128/r128_state.c
41940+++ b/drivers/gpu/drm/r128/r128_state.c
41941@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41942
41943 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41944 {
41945- if (atomic_read(&dev_priv->idle_count) == 0)
41946+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41947 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41948 else
41949- atomic_set(&dev_priv->idle_count, 0);
41950+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41951 }
41952
41953 #endif
41954diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41955index b928c17..e5d9400 100644
41956--- a/drivers/gpu/drm/radeon/mkregtable.c
41957+++ b/drivers/gpu/drm/radeon/mkregtable.c
41958@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41959 regex_t mask_rex;
41960 regmatch_t match[4];
41961 char buf[1024];
41962- size_t end;
41963+ long end;
41964 int len;
41965 int done = 0;
41966 int r;
41967 unsigned o;
41968 struct offset *offset;
41969 char last_reg_s[10];
41970- int last_reg;
41971+ unsigned long last_reg;
41972
41973 if (regcomp
41974 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41975diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41976index bd7519f..e1c2cd95 100644
41977--- a/drivers/gpu/drm/radeon/radeon_device.c
41978+++ b/drivers/gpu/drm/radeon/radeon_device.c
41979@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41980 * locking inversion with the driver load path. And the access here is
41981 * completely racy anyway. So don't bother with locking for now.
41982 */
41983- return dev->open_count == 0;
41984+ return local_read(&dev->open_count) == 0;
41985 }
41986
41987 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41988diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41989index 46bd393..6ae4719 100644
41990--- a/drivers/gpu/drm/radeon/radeon_drv.h
41991+++ b/drivers/gpu/drm/radeon/radeon_drv.h
41992@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41993
41994 /* SW interrupt */
41995 wait_queue_head_t swi_queue;
41996- atomic_t swi_emitted;
41997+ atomic_unchecked_t swi_emitted;
41998 int vblank_crtc;
41999 uint32_t irq_enable_reg;
42000 uint32_t r500_disp_irq_reg;
42001diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
42002index 0b98ea1..a3c770f 100644
42003--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
42004+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
42005@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42006 request = compat_alloc_user_space(sizeof(*request));
42007 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
42008 || __put_user(req32.param, &request->param)
42009- || __put_user((void __user *)(unsigned long)req32.value,
42010+ || __put_user((unsigned long)req32.value,
42011 &request->value))
42012 return -EFAULT;
42013
42014@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42015 #define compat_radeon_cp_setparam NULL
42016 #endif /* X86_64 || IA64 */
42017
42018-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42019+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
42020 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
42021 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
42022 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
42023@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42024 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
42025 {
42026 unsigned int nr = DRM_IOCTL_NR(cmd);
42027- drm_ioctl_compat_t *fn = NULL;
42028 int ret;
42029
42030 if (nr < DRM_COMMAND_BASE)
42031 return drm_compat_ioctl(filp, cmd, arg);
42032
42033- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
42034- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
42035-
42036- if (fn != NULL)
42037- ret = (*fn) (filp, cmd, arg);
42038+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
42039+ ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
42040 else
42041 ret = drm_ioctl(filp, cmd, arg);
42042
42043diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
42044index 244b19b..c19226d 100644
42045--- a/drivers/gpu/drm/radeon/radeon_irq.c
42046+++ b/drivers/gpu/drm/radeon/radeon_irq.c
42047@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
42048 unsigned int ret;
42049 RING_LOCALS;
42050
42051- atomic_inc(&dev_priv->swi_emitted);
42052- ret = atomic_read(&dev_priv->swi_emitted);
42053+ atomic_inc_unchecked(&dev_priv->swi_emitted);
42054+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
42055
42056 BEGIN_RING(4);
42057 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
42058@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
42059 drm_radeon_private_t *dev_priv =
42060 (drm_radeon_private_t *) dev->dev_private;
42061
42062- atomic_set(&dev_priv->swi_emitted, 0);
42063+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
42064 init_waitqueue_head(&dev_priv->swi_queue);
42065
42066 dev->max_vblank_count = 0x001fffff;
42067diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
42068index 15aee72..cda326e 100644
42069--- a/drivers/gpu/drm/radeon/radeon_state.c
42070+++ b/drivers/gpu/drm/radeon/radeon_state.c
42071@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
42072 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
42073 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
42074
42075- if (copy_from_user(&depth_boxes, clear->depth_boxes,
42076+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
42077 sarea_priv->nbox * sizeof(depth_boxes[0])))
42078 return -EFAULT;
42079
42080@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
42081 {
42082 drm_radeon_private_t *dev_priv = dev->dev_private;
42083 drm_radeon_getparam_t *param = data;
42084- int value;
42085+ int value = 0;
42086
42087 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
42088
42089diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
42090index edafd3c..3af7c9c 100644
42091--- a/drivers/gpu/drm/radeon/radeon_ttm.c
42092+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
42093@@ -961,7 +961,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
42094 man->size = size >> PAGE_SHIFT;
42095 }
42096
42097-static struct vm_operations_struct radeon_ttm_vm_ops;
42098+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
42099 static const struct vm_operations_struct *ttm_vm_ops = NULL;
42100
42101 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
42102@@ -1002,8 +1002,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
42103 }
42104 if (unlikely(ttm_vm_ops == NULL)) {
42105 ttm_vm_ops = vma->vm_ops;
42106+ pax_open_kernel();
42107 radeon_ttm_vm_ops = *ttm_vm_ops;
42108 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
42109+ pax_close_kernel();
42110 }
42111 vma->vm_ops = &radeon_ttm_vm_ops;
42112 return 0;
42113diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
42114index 1a52522..8e78043 100644
42115--- a/drivers/gpu/drm/tegra/dc.c
42116+++ b/drivers/gpu/drm/tegra/dc.c
42117@@ -1585,7 +1585,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
42118 }
42119
42120 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
42121- dc->debugfs_files[i].data = dc;
42122+ *(void **)&dc->debugfs_files[i].data = dc;
42123
42124 err = drm_debugfs_create_files(dc->debugfs_files,
42125 ARRAY_SIZE(debugfs_files),
42126diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
42127index ed970f6..4eeea42 100644
42128--- a/drivers/gpu/drm/tegra/dsi.c
42129+++ b/drivers/gpu/drm/tegra/dsi.c
42130@@ -62,7 +62,7 @@ struct tegra_dsi {
42131 struct clk *clk_lp;
42132 struct clk *clk;
42133
42134- struct drm_info_list *debugfs_files;
42135+ drm_info_list_no_const *debugfs_files;
42136 struct drm_minor *minor;
42137 struct dentry *debugfs;
42138
42139diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
42140index 7eaaee74..cc2bc04 100644
42141--- a/drivers/gpu/drm/tegra/hdmi.c
42142+++ b/drivers/gpu/drm/tegra/hdmi.c
42143@@ -64,7 +64,7 @@ struct tegra_hdmi {
42144 bool stereo;
42145 bool dvi;
42146
42147- struct drm_info_list *debugfs_files;
42148+ drm_info_list_no_const *debugfs_files;
42149 struct drm_minor *minor;
42150 struct dentry *debugfs;
42151 };
42152diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42153index aa0bd054..aea6a01 100644
42154--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
42155+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42156@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
42157 }
42158
42159 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
42160- ttm_bo_man_init,
42161- ttm_bo_man_takedown,
42162- ttm_bo_man_get_node,
42163- ttm_bo_man_put_node,
42164- ttm_bo_man_debug
42165+ .init = ttm_bo_man_init,
42166+ .takedown = ttm_bo_man_takedown,
42167+ .get_node = ttm_bo_man_get_node,
42168+ .put_node = ttm_bo_man_put_node,
42169+ .debug = ttm_bo_man_debug
42170 };
42171 EXPORT_SYMBOL(ttm_bo_manager_func);
42172diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
42173index a1803fb..c53f6b0 100644
42174--- a/drivers/gpu/drm/ttm/ttm_memory.c
42175+++ b/drivers/gpu/drm/ttm/ttm_memory.c
42176@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
42177 zone->glob = glob;
42178 glob->zone_kernel = zone;
42179 ret = kobject_init_and_add(
42180- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42181+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42182 if (unlikely(ret != 0)) {
42183 kobject_put(&zone->kobj);
42184 return ret;
42185@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
42186 zone->glob = glob;
42187 glob->zone_dma32 = zone;
42188 ret = kobject_init_and_add(
42189- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42190+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42191 if (unlikely(ret != 0)) {
42192 kobject_put(&zone->kobj);
42193 return ret;
42194diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42195index 025c429..314062f 100644
42196--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
42197+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42198@@ -54,7 +54,7 @@
42199
42200 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42201 #define SMALL_ALLOCATION 16
42202-#define FREE_ALL_PAGES (~0U)
42203+#define FREE_ALL_PAGES (~0UL)
42204 /* times are in msecs */
42205 #define PAGE_FREE_INTERVAL 1000
42206
42207@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
42208 * @free_all: If set to true will free all pages in pool
42209 * @use_static: Safe to use static buffer
42210 **/
42211-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
42212+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
42213 bool use_static)
42214 {
42215 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42216 unsigned long irq_flags;
42217 struct page *p;
42218 struct page **pages_to_free;
42219- unsigned freed_pages = 0,
42220- npages_to_free = nr_free;
42221+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42222
42223 if (NUM_PAGES_TO_ALLOC < nr_free)
42224 npages_to_free = NUM_PAGES_TO_ALLOC;
42225@@ -371,7 +370,8 @@ restart:
42226 __list_del(&p->lru, &pool->list);
42227
42228 ttm_pool_update_free_locked(pool, freed_pages);
42229- nr_free -= freed_pages;
42230+ if (likely(nr_free != FREE_ALL_PAGES))
42231+ nr_free -= freed_pages;
42232 }
42233
42234 spin_unlock_irqrestore(&pool->lock, irq_flags);
42235@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42236 unsigned i;
42237 unsigned pool_offset;
42238 struct ttm_page_pool *pool;
42239- int shrink_pages = sc->nr_to_scan;
42240+ unsigned long shrink_pages = sc->nr_to_scan;
42241 unsigned long freed = 0;
42242
42243 if (!mutex_trylock(&lock))
42244@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42245 pool_offset = ++start_pool % NUM_POOLS;
42246 /* select start pool in round robin fashion */
42247 for (i = 0; i < NUM_POOLS; ++i) {
42248- unsigned nr_free = shrink_pages;
42249+ unsigned long nr_free = shrink_pages;
42250 if (shrink_pages == 0)
42251 break;
42252 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
42253@@ -673,7 +673,7 @@ out:
42254 }
42255
42256 /* Put all pages in pages list to correct pool to wait for reuse */
42257-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
42258+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
42259 enum ttm_caching_state cstate)
42260 {
42261 unsigned long irq_flags;
42262@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
42263 struct list_head plist;
42264 struct page *p = NULL;
42265 gfp_t gfp_flags = GFP_USER;
42266- unsigned count;
42267+ unsigned long count;
42268 int r;
42269
42270 /* set zero flag for page allocation if required */
42271diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42272index 01e1d27..aaa018a 100644
42273--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42274+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42275@@ -56,7 +56,7 @@
42276
42277 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42278 #define SMALL_ALLOCATION 4
42279-#define FREE_ALL_PAGES (~0U)
42280+#define FREE_ALL_PAGES (~0UL)
42281 /* times are in msecs */
42282 #define IS_UNDEFINED (0)
42283 #define IS_WC (1<<1)
42284@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
42285 * @nr_free: If set to true will free all pages in pool
42286 * @use_static: Safe to use static buffer
42287 **/
42288-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42289+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
42290 bool use_static)
42291 {
42292 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42293@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42294 struct dma_page *dma_p, *tmp;
42295 struct page **pages_to_free;
42296 struct list_head d_pages;
42297- unsigned freed_pages = 0,
42298- npages_to_free = nr_free;
42299+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42300
42301 if (NUM_PAGES_TO_ALLOC < nr_free)
42302 npages_to_free = NUM_PAGES_TO_ALLOC;
42303@@ -499,7 +498,8 @@ restart:
42304 /* remove range of pages from the pool */
42305 if (freed_pages) {
42306 ttm_pool_update_free_locked(pool, freed_pages);
42307- nr_free -= freed_pages;
42308+ if (likely(nr_free != FREE_ALL_PAGES))
42309+ nr_free -= freed_pages;
42310 }
42311
42312 spin_unlock_irqrestore(&pool->lock, irq_flags);
42313@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
42314 struct dma_page *d_page, *next;
42315 enum pool_type type;
42316 bool is_cached = false;
42317- unsigned count = 0, i, npages = 0;
42318+ unsigned long count = 0, i, npages = 0;
42319 unsigned long irq_flags;
42320
42321 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
42322@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42323 static unsigned start_pool;
42324 unsigned idx = 0;
42325 unsigned pool_offset;
42326- unsigned shrink_pages = sc->nr_to_scan;
42327+ unsigned long shrink_pages = sc->nr_to_scan;
42328 struct device_pools *p;
42329 unsigned long freed = 0;
42330
42331@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42332 goto out;
42333 pool_offset = ++start_pool % _manager->npools;
42334 list_for_each_entry(p, &_manager->pools, pools) {
42335- unsigned nr_free;
42336+ unsigned long nr_free;
42337
42338 if (!p->dev)
42339 continue;
42340@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42341 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
42342 freed += nr_free - shrink_pages;
42343
42344- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
42345+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
42346 p->pool->dev_name, p->pool->name, current->pid,
42347 nr_free, shrink_pages);
42348 }
42349diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
42350index 5fc16ce..1bd84ec 100644
42351--- a/drivers/gpu/drm/udl/udl_fb.c
42352+++ b/drivers/gpu/drm/udl/udl_fb.c
42353@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
42354 fb_deferred_io_cleanup(info);
42355 kfree(info->fbdefio);
42356 info->fbdefio = NULL;
42357- info->fbops->fb_mmap = udl_fb_mmap;
42358 }
42359
42360 pr_warn("released /dev/fb%d user=%d count=%d\n",
42361diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
42362index ef8c500..01030c8 100644
42363--- a/drivers/gpu/drm/via/via_drv.h
42364+++ b/drivers/gpu/drm/via/via_drv.h
42365@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
42366 typedef uint32_t maskarray_t[5];
42367
42368 typedef struct drm_via_irq {
42369- atomic_t irq_received;
42370+ atomic_unchecked_t irq_received;
42371 uint32_t pending_mask;
42372 uint32_t enable_mask;
42373 wait_queue_head_t irq_queue;
42374@@ -77,7 +77,7 @@ typedef struct drm_via_private {
42375 struct timeval last_vblank;
42376 int last_vblank_valid;
42377 unsigned usec_per_vblank;
42378- atomic_t vbl_received;
42379+ atomic_unchecked_t vbl_received;
42380 drm_via_state_t hc_state;
42381 char pci_buf[VIA_PCI_BUF_SIZE];
42382 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
42383diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
42384index 1319433..a993b0c 100644
42385--- a/drivers/gpu/drm/via/via_irq.c
42386+++ b/drivers/gpu/drm/via/via_irq.c
42387@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
42388 if (crtc != 0)
42389 return 0;
42390
42391- return atomic_read(&dev_priv->vbl_received);
42392+ return atomic_read_unchecked(&dev_priv->vbl_received);
42393 }
42394
42395 irqreturn_t via_driver_irq_handler(int irq, void *arg)
42396@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42397
42398 status = VIA_READ(VIA_REG_INTERRUPT);
42399 if (status & VIA_IRQ_VBLANK_PENDING) {
42400- atomic_inc(&dev_priv->vbl_received);
42401- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
42402+ atomic_inc_unchecked(&dev_priv->vbl_received);
42403+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
42404 do_gettimeofday(&cur_vblank);
42405 if (dev_priv->last_vblank_valid) {
42406 dev_priv->usec_per_vblank =
42407@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42408 dev_priv->last_vblank = cur_vblank;
42409 dev_priv->last_vblank_valid = 1;
42410 }
42411- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
42412+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
42413 DRM_DEBUG("US per vblank is: %u\n",
42414 dev_priv->usec_per_vblank);
42415 }
42416@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42417
42418 for (i = 0; i < dev_priv->num_irqs; ++i) {
42419 if (status & cur_irq->pending_mask) {
42420- atomic_inc(&cur_irq->irq_received);
42421+ atomic_inc_unchecked(&cur_irq->irq_received);
42422 wake_up(&cur_irq->irq_queue);
42423 handled = 1;
42424 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
42425@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
42426 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42427 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
42428 masks[irq][4]));
42429- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
42430+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
42431 } else {
42432 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42433 (((cur_irq_sequence =
42434- atomic_read(&cur_irq->irq_received)) -
42435+ atomic_read_unchecked(&cur_irq->irq_received)) -
42436 *sequence) <= (1 << 23)));
42437 }
42438 *sequence = cur_irq_sequence;
42439@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
42440 }
42441
42442 for (i = 0; i < dev_priv->num_irqs; ++i) {
42443- atomic_set(&cur_irq->irq_received, 0);
42444+ atomic_set_unchecked(&cur_irq->irq_received, 0);
42445 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
42446 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
42447 init_waitqueue_head(&cur_irq->irq_queue);
42448@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
42449 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
42450 case VIA_IRQ_RELATIVE:
42451 irqwait->request.sequence +=
42452- atomic_read(&cur_irq->irq_received);
42453+ atomic_read_unchecked(&cur_irq->irq_received);
42454 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
42455 case VIA_IRQ_ABSOLUTE:
42456 break;
42457diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42458index d26a6da..5fa41ed 100644
42459--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42460+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42461@@ -447,7 +447,7 @@ struct vmw_private {
42462 * Fencing and IRQs.
42463 */
42464
42465- atomic_t marker_seq;
42466+ atomic_unchecked_t marker_seq;
42467 wait_queue_head_t fence_queue;
42468 wait_queue_head_t fifo_queue;
42469 spinlock_t waiter_lock;
42470diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42471index 39f2b03..d1b0a64 100644
42472--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42473+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42474@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
42475 (unsigned int) min,
42476 (unsigned int) fifo->capabilities);
42477
42478- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42479+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42480 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
42481 vmw_marker_queue_init(&fifo->marker_queue);
42482 return vmw_fifo_send_fence(dev_priv, &dummy);
42483@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
42484 if (reserveable)
42485 iowrite32(bytes, fifo_mem +
42486 SVGA_FIFO_RESERVED);
42487- return fifo_mem + (next_cmd >> 2);
42488+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
42489 } else {
42490 need_bounce = true;
42491 }
42492@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42493
42494 fm = vmw_fifo_reserve(dev_priv, bytes);
42495 if (unlikely(fm == NULL)) {
42496- *seqno = atomic_read(&dev_priv->marker_seq);
42497+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42498 ret = -ENOMEM;
42499 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
42500 false, 3*HZ);
42501@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42502 }
42503
42504 do {
42505- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
42506+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
42507 } while (*seqno == 0);
42508
42509 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
42510diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42511index 170b61b..fec7348 100644
42512--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42513+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42514@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42515 }
42516
42517 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42518- vmw_gmrid_man_init,
42519- vmw_gmrid_man_takedown,
42520- vmw_gmrid_man_get_node,
42521- vmw_gmrid_man_put_node,
42522- vmw_gmrid_man_debug
42523+ .init = vmw_gmrid_man_init,
42524+ .takedown = vmw_gmrid_man_takedown,
42525+ .get_node = vmw_gmrid_man_get_node,
42526+ .put_node = vmw_gmrid_man_put_node,
42527+ .debug = vmw_gmrid_man_debug
42528 };
42529diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42530index 69c8ce2..cacb0ab 100644
42531--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42532+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42533@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42534 int ret;
42535
42536 num_clips = arg->num_clips;
42537- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42538+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42539
42540 if (unlikely(num_clips == 0))
42541 return 0;
42542@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42543 int ret;
42544
42545 num_clips = arg->num_clips;
42546- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42547+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42548
42549 if (unlikely(num_clips == 0))
42550 return 0;
42551diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42552index 9fe9827..0aa2fc0 100644
42553--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42554+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42555@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42556 * emitted. Then the fence is stale and signaled.
42557 */
42558
42559- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42560+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42561 > VMW_FENCE_WRAP);
42562
42563 return ret;
42564@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42565
42566 if (fifo_idle)
42567 down_read(&fifo_state->rwsem);
42568- signal_seq = atomic_read(&dev_priv->marker_seq);
42569+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42570 ret = 0;
42571
42572 for (;;) {
42573diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42574index efd1ffd..0ae13ca 100644
42575--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42576+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42577@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42578 while (!vmw_lag_lt(queue, us)) {
42579 spin_lock(&queue->lock);
42580 if (list_empty(&queue->head))
42581- seqno = atomic_read(&dev_priv->marker_seq);
42582+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42583 else {
42584 marker = list_first_entry(&queue->head,
42585 struct vmw_marker, head);
42586diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42587index 37ac7b5..d52a5c9 100644
42588--- a/drivers/gpu/vga/vga_switcheroo.c
42589+++ b/drivers/gpu/vga/vga_switcheroo.c
42590@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42591
42592 /* this version is for the case where the power switch is separate
42593 to the device being powered down. */
42594-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42595+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42596 {
42597 /* copy over all the bus versions */
42598 if (dev->bus && dev->bus->pm) {
42599@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42600 return ret;
42601 }
42602
42603-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42604+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42605 {
42606 /* copy over all the bus versions */
42607 if (dev->bus && dev->bus->pm) {
42608diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42609index 56ce8c2..32ce524 100644
42610--- a/drivers/hid/hid-core.c
42611+++ b/drivers/hid/hid-core.c
42612@@ -2531,7 +2531,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42613
42614 int hid_add_device(struct hid_device *hdev)
42615 {
42616- static atomic_t id = ATOMIC_INIT(0);
42617+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42618 int ret;
42619
42620 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42621@@ -2574,7 +2574,7 @@ int hid_add_device(struct hid_device *hdev)
42622 /* XXX hack, any other cleaner solution after the driver core
42623 * is converted to allow more than 20 bytes as the device name? */
42624 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42625- hdev->vendor, hdev->product, atomic_inc_return(&id));
42626+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42627
42628 hid_debug_register(hdev, dev_name(&hdev->dev));
42629 ret = device_add(&hdev->dev);
42630diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42631index c13fb5b..55a3802 100644
42632--- a/drivers/hid/hid-wiimote-debug.c
42633+++ b/drivers/hid/hid-wiimote-debug.c
42634@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42635 else if (size == 0)
42636 return -EIO;
42637
42638- if (copy_to_user(u, buf, size))
42639+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42640 return -EFAULT;
42641
42642 *off += size;
42643diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42644index 00bc30e..d8e5097 100644
42645--- a/drivers/hv/channel.c
42646+++ b/drivers/hv/channel.c
42647@@ -370,7 +370,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42648 int ret = 0;
42649
42650 next_gpadl_handle =
42651- (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
42652+ (atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
42653
42654 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42655 if (ret)
42656diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42657index 50e51a5..b0bfd78 100644
42658--- a/drivers/hv/hv.c
42659+++ b/drivers/hv/hv.c
42660@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42661 u64 output_address = (output) ? virt_to_phys(output) : 0;
42662 u32 output_address_hi = output_address >> 32;
42663 u32 output_address_lo = output_address & 0xFFFFFFFF;
42664- void *hypercall_page = hv_context.hypercall_page;
42665+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42666
42667 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42668 "=a"(hv_status_lo) : "d" (control_hi),
42669@@ -164,7 +164,7 @@ int hv_init(void)
42670 /* See if the hypercall page is already set */
42671 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42672
42673- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42674+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42675
42676 if (!virtaddr)
42677 goto cleanup;
42678diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42679index ff16938..e60879c 100644
42680--- a/drivers/hv/hv_balloon.c
42681+++ b/drivers/hv/hv_balloon.c
42682@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42683
42684 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42685 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42686-static atomic_t trans_id = ATOMIC_INIT(0);
42687+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42688
42689 static int dm_ring_size = (5 * PAGE_SIZE);
42690
42691@@ -947,7 +947,7 @@ static void hot_add_req(struct work_struct *dummy)
42692 pr_info("Memory hot add failed\n");
42693
42694 dm->state = DM_INITIALIZED;
42695- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42696+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42697 vmbus_sendpacket(dm->dev->channel, &resp,
42698 sizeof(struct dm_hot_add_response),
42699 (unsigned long)NULL,
42700@@ -1028,7 +1028,7 @@ static void post_status(struct hv_dynmem_device *dm)
42701 memset(&status, 0, sizeof(struct dm_status));
42702 status.hdr.type = DM_STATUS_REPORT;
42703 status.hdr.size = sizeof(struct dm_status);
42704- status.hdr.trans_id = atomic_inc_return(&trans_id);
42705+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42706
42707 /*
42708 * The host expects the guest to report free memory.
42709@@ -1048,7 +1048,7 @@ static void post_status(struct hv_dynmem_device *dm)
42710 * send the status. This can happen if we were interrupted
42711 * after we picked our transaction ID.
42712 */
42713- if (status.hdr.trans_id != atomic_read(&trans_id))
42714+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42715 return;
42716
42717 /*
42718@@ -1188,7 +1188,7 @@ static void balloon_up(struct work_struct *dummy)
42719 */
42720
42721 do {
42722- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42723+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42724 ret = vmbus_sendpacket(dm_device.dev->channel,
42725 bl_resp,
42726 bl_resp->hdr.size,
42727@@ -1234,7 +1234,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42728
42729 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42730 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42731- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42732+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42733 resp.hdr.size = sizeof(struct dm_unballoon_response);
42734
42735 vmbus_sendpacket(dm_device.dev->channel, &resp,
42736@@ -1295,7 +1295,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42737 memset(&version_req, 0, sizeof(struct dm_version_request));
42738 version_req.hdr.type = DM_VERSION_REQUEST;
42739 version_req.hdr.size = sizeof(struct dm_version_request);
42740- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42741+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42742 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42743 version_req.is_last_attempt = 1;
42744
42745@@ -1468,7 +1468,7 @@ static int balloon_probe(struct hv_device *dev,
42746 memset(&version_req, 0, sizeof(struct dm_version_request));
42747 version_req.hdr.type = DM_VERSION_REQUEST;
42748 version_req.hdr.size = sizeof(struct dm_version_request);
42749- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42750+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42751 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42752 version_req.is_last_attempt = 0;
42753
42754@@ -1499,7 +1499,7 @@ static int balloon_probe(struct hv_device *dev,
42755 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42756 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42757 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42758- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42759+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42760
42761 cap_msg.caps.cap_bits.balloon = 1;
42762 cap_msg.caps.cap_bits.hot_add = 1;
42763diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42764index 44b1c94..6dccc2c 100644
42765--- a/drivers/hv/hyperv_vmbus.h
42766+++ b/drivers/hv/hyperv_vmbus.h
42767@@ -632,7 +632,7 @@ enum vmbus_connect_state {
42768 struct vmbus_connection {
42769 enum vmbus_connect_state conn_state;
42770
42771- atomic_t next_gpadl_handle;
42772+ atomic_unchecked_t next_gpadl_handle;
42773
42774 /*
42775 * Represents channel interrupts. Each bit position represents a
42776diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42777index f518b8d7..4bc0b64 100644
42778--- a/drivers/hv/vmbus_drv.c
42779+++ b/drivers/hv/vmbus_drv.c
42780@@ -840,10 +840,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42781 {
42782 int ret = 0;
42783
42784- static atomic_t device_num = ATOMIC_INIT(0);
42785+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42786
42787 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42788- atomic_inc_return(&device_num));
42789+ atomic_inc_return_unchecked(&device_num));
42790
42791 child_device_obj->device.bus = &hv_bus;
42792 child_device_obj->device.parent = &hv_acpi_dev->dev;
42793diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42794index 579bdf9..0dac21d5 100644
42795--- a/drivers/hwmon/acpi_power_meter.c
42796+++ b/drivers/hwmon/acpi_power_meter.c
42797@@ -116,7 +116,7 @@ struct sensor_template {
42798 struct device_attribute *devattr,
42799 const char *buf, size_t count);
42800 int index;
42801-};
42802+} __do_const;
42803
42804 /* Averaging interval */
42805 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42806@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42807 struct sensor_template *attrs)
42808 {
42809 struct device *dev = &resource->acpi_dev->dev;
42810- struct sensor_device_attribute *sensors =
42811+ sensor_device_attribute_no_const *sensors =
42812 &resource->sensors[resource->num_sensors];
42813 int res = 0;
42814
42815@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42816 return 0;
42817 }
42818
42819-static struct dmi_system_id __initdata pm_dmi_table[] = {
42820+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42821 {
42822 enable_cap_knobs, "IBM Active Energy Manager",
42823 {
42824diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42825index 0af63da..05a183a 100644
42826--- a/drivers/hwmon/applesmc.c
42827+++ b/drivers/hwmon/applesmc.c
42828@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42829 {
42830 struct applesmc_node_group *grp;
42831 struct applesmc_dev_attr *node;
42832- struct attribute *attr;
42833+ attribute_no_const *attr;
42834 int ret, i;
42835
42836 for (grp = groups; grp->format; grp++) {
42837diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42838index cccef87..06ce8ec 100644
42839--- a/drivers/hwmon/asus_atk0110.c
42840+++ b/drivers/hwmon/asus_atk0110.c
42841@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42842 struct atk_sensor_data {
42843 struct list_head list;
42844 struct atk_data *data;
42845- struct device_attribute label_attr;
42846- struct device_attribute input_attr;
42847- struct device_attribute limit1_attr;
42848- struct device_attribute limit2_attr;
42849+ device_attribute_no_const label_attr;
42850+ device_attribute_no_const input_attr;
42851+ device_attribute_no_const limit1_attr;
42852+ device_attribute_no_const limit2_attr;
42853 char label_attr_name[ATTR_NAME_SIZE];
42854 char input_attr_name[ATTR_NAME_SIZE];
42855 char limit1_attr_name[ATTR_NAME_SIZE];
42856@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42857 static struct device_attribute atk_name_attr =
42858 __ATTR(name, 0444, atk_name_show, NULL);
42859
42860-static void atk_init_attribute(struct device_attribute *attr, char *name,
42861+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42862 sysfs_show_func show)
42863 {
42864 sysfs_attr_init(&attr->attr);
42865diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42866index 5b7fec8..05c957a 100644
42867--- a/drivers/hwmon/coretemp.c
42868+++ b/drivers/hwmon/coretemp.c
42869@@ -783,7 +783,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42870 return NOTIFY_OK;
42871 }
42872
42873-static struct notifier_block coretemp_cpu_notifier __refdata = {
42874+static struct notifier_block coretemp_cpu_notifier = {
42875 .notifier_call = coretemp_cpu_callback,
42876 };
42877
42878diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42879index 7a8a6fb..015c1fd 100644
42880--- a/drivers/hwmon/ibmaem.c
42881+++ b/drivers/hwmon/ibmaem.c
42882@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42883 struct aem_rw_sensor_template *rw)
42884 {
42885 struct device *dev = &data->pdev->dev;
42886- struct sensor_device_attribute *sensors = data->sensors;
42887+ sensor_device_attribute_no_const *sensors = data->sensors;
42888 int err;
42889
42890 /* Set up read-only sensors */
42891diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42892index 17ae2eb..21b71dd 100644
42893--- a/drivers/hwmon/iio_hwmon.c
42894+++ b/drivers/hwmon/iio_hwmon.c
42895@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42896 {
42897 struct device *dev = &pdev->dev;
42898 struct iio_hwmon_state *st;
42899- struct sensor_device_attribute *a;
42900+ sensor_device_attribute_no_const *a;
42901 int ret, i;
42902 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42903 enum iio_chan_type type;
42904diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42905index 37f0170..414ec2c 100644
42906--- a/drivers/hwmon/nct6683.c
42907+++ b/drivers/hwmon/nct6683.c
42908@@ -397,11 +397,11 @@ static struct attribute_group *
42909 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42910 int repeat)
42911 {
42912- struct sensor_device_attribute_2 *a2;
42913- struct sensor_device_attribute *a;
42914+ sensor_device_attribute_2_no_const *a2;
42915+ sensor_device_attribute_no_const *a;
42916 struct sensor_device_template **t;
42917 struct sensor_device_attr_u *su;
42918- struct attribute_group *group;
42919+ attribute_group_no_const *group;
42920 struct attribute **attrs;
42921 int i, j, count;
42922
42923diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42924index 0773930..6f04305 100644
42925--- a/drivers/hwmon/nct6775.c
42926+++ b/drivers/hwmon/nct6775.c
42927@@ -952,10 +952,10 @@ static struct attribute_group *
42928 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42929 int repeat)
42930 {
42931- struct attribute_group *group;
42932+ attribute_group_no_const *group;
42933 struct sensor_device_attr_u *su;
42934- struct sensor_device_attribute *a;
42935- struct sensor_device_attribute_2 *a2;
42936+ sensor_device_attribute_no_const *a;
42937+ sensor_device_attribute_2_no_const *a2;
42938 struct attribute **attrs;
42939 struct sensor_device_template **t;
42940 int i, count;
42941diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42942index f2e47c7..45d7941 100644
42943--- a/drivers/hwmon/pmbus/pmbus_core.c
42944+++ b/drivers/hwmon/pmbus/pmbus_core.c
42945@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42946 return 0;
42947 }
42948
42949-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42950+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42951 const char *name,
42952 umode_t mode,
42953 ssize_t (*show)(struct device *dev,
42954@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42955 dev_attr->store = store;
42956 }
42957
42958-static void pmbus_attr_init(struct sensor_device_attribute *a,
42959+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42960 const char *name,
42961 umode_t mode,
42962 ssize_t (*show)(struct device *dev,
42963@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42964 u16 reg, u8 mask)
42965 {
42966 struct pmbus_boolean *boolean;
42967- struct sensor_device_attribute *a;
42968+ sensor_device_attribute_no_const *a;
42969
42970 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42971 if (!boolean)
42972@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42973 bool update, bool readonly)
42974 {
42975 struct pmbus_sensor *sensor;
42976- struct device_attribute *a;
42977+ device_attribute_no_const *a;
42978
42979 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42980 if (!sensor)
42981@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42982 const char *lstring, int index)
42983 {
42984 struct pmbus_label *label;
42985- struct device_attribute *a;
42986+ device_attribute_no_const *a;
42987
42988 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42989 if (!label)
42990diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42991index d4f0935..7420593 100644
42992--- a/drivers/hwmon/sht15.c
42993+++ b/drivers/hwmon/sht15.c
42994@@ -169,7 +169,7 @@ struct sht15_data {
42995 int supply_uv;
42996 bool supply_uv_valid;
42997 struct work_struct update_supply_work;
42998- atomic_t interrupt_handled;
42999+ atomic_unchecked_t interrupt_handled;
43000 };
43001
43002 /**
43003@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
43004 ret = gpio_direction_input(data->pdata->gpio_data);
43005 if (ret)
43006 return ret;
43007- atomic_set(&data->interrupt_handled, 0);
43008+ atomic_set_unchecked(&data->interrupt_handled, 0);
43009
43010 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43011 if (gpio_get_value(data->pdata->gpio_data) == 0) {
43012 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
43013 /* Only relevant if the interrupt hasn't occurred. */
43014- if (!atomic_read(&data->interrupt_handled))
43015+ if (!atomic_read_unchecked(&data->interrupt_handled))
43016 schedule_work(&data->read_work);
43017 }
43018 ret = wait_event_timeout(data->wait_queue,
43019@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
43020
43021 /* First disable the interrupt */
43022 disable_irq_nosync(irq);
43023- atomic_inc(&data->interrupt_handled);
43024+ atomic_inc_unchecked(&data->interrupt_handled);
43025 /* Then schedule a reading work struct */
43026 if (data->state != SHT15_READING_NOTHING)
43027 schedule_work(&data->read_work);
43028@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
43029 * If not, then start the interrupt again - care here as could
43030 * have gone low in meantime so verify it hasn't!
43031 */
43032- atomic_set(&data->interrupt_handled, 0);
43033+ atomic_set_unchecked(&data->interrupt_handled, 0);
43034 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43035 /* If still not occurred or another handler was scheduled */
43036 if (gpio_get_value(data->pdata->gpio_data)
43037- || atomic_read(&data->interrupt_handled))
43038+ || atomic_read_unchecked(&data->interrupt_handled))
43039 return;
43040 }
43041
43042diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
43043index ac91c07..8e69663 100644
43044--- a/drivers/hwmon/via-cputemp.c
43045+++ b/drivers/hwmon/via-cputemp.c
43046@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
43047 return NOTIFY_OK;
43048 }
43049
43050-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
43051+static struct notifier_block via_cputemp_cpu_notifier = {
43052 .notifier_call = via_cputemp_cpu_callback,
43053 };
43054
43055diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
43056index 65e3240..e6c511d 100644
43057--- a/drivers/i2c/busses/i2c-amd756-s4882.c
43058+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
43059@@ -39,7 +39,7 @@
43060 extern struct i2c_adapter amd756_smbus;
43061
43062 static struct i2c_adapter *s4882_adapter;
43063-static struct i2c_algorithm *s4882_algo;
43064+static i2c_algorithm_no_const *s4882_algo;
43065
43066 /* Wrapper access functions for multiplexed SMBus */
43067 static DEFINE_MUTEX(amd756_lock);
43068diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
43069index b19a310..d6eece0 100644
43070--- a/drivers/i2c/busses/i2c-diolan-u2c.c
43071+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
43072@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
43073 /* usb layer */
43074
43075 /* Send command to device, and get response. */
43076-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43077+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43078 {
43079 int ret = 0;
43080 int actual;
43081diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
43082index 88eda09..cf40434 100644
43083--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
43084+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
43085@@ -37,7 +37,7 @@
43086 extern struct i2c_adapter *nforce2_smbus;
43087
43088 static struct i2c_adapter *s4985_adapter;
43089-static struct i2c_algorithm *s4985_algo;
43090+static i2c_algorithm_no_const *s4985_algo;
43091
43092 /* Wrapper access functions for multiplexed SMBus */
43093 static DEFINE_MUTEX(nforce2_lock);
43094diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
43095index 71c7a39..71dd3e0 100644
43096--- a/drivers/i2c/i2c-dev.c
43097+++ b/drivers/i2c/i2c-dev.c
43098@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
43099 break;
43100 }
43101
43102- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
43103+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
43104 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
43105 if (IS_ERR(rdwr_pa[i].buf)) {
43106 res = PTR_ERR(rdwr_pa[i].buf);
43107diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
43108index 0b510ba..4fbb5085 100644
43109--- a/drivers/ide/ide-cd.c
43110+++ b/drivers/ide/ide-cd.c
43111@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
43112 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
43113 if ((unsigned long)buf & alignment
43114 || blk_rq_bytes(rq) & q->dma_pad_mask
43115- || object_is_on_stack(buf))
43116+ || object_starts_on_stack(buf))
43117 drive->dma = 0;
43118 }
43119 }
43120diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
43121index 4df97f6..c751151 100644
43122--- a/drivers/iio/industrialio-core.c
43123+++ b/drivers/iio/industrialio-core.c
43124@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
43125 }
43126
43127 static
43128-int __iio_device_attr_init(struct device_attribute *dev_attr,
43129+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
43130 const char *postfix,
43131 struct iio_chan_spec const *chan,
43132 ssize_t (*readfunc)(struct device *dev,
43133diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
43134index e28a494..f7c2671 100644
43135--- a/drivers/infiniband/core/cm.c
43136+++ b/drivers/infiniband/core/cm.c
43137@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
43138
43139 struct cm_counter_group {
43140 struct kobject obj;
43141- atomic_long_t counter[CM_ATTR_COUNT];
43142+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
43143 };
43144
43145 struct cm_counter_attribute {
43146@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
43147 struct ib_mad_send_buf *msg = NULL;
43148 int ret;
43149
43150- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43151+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43152 counter[CM_REQ_COUNTER]);
43153
43154 /* Quick state check to discard duplicate REQs. */
43155@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
43156 if (!cm_id_priv)
43157 return;
43158
43159- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43160+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43161 counter[CM_REP_COUNTER]);
43162 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
43163 if (ret)
43164@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
43165 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
43166 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
43167 spin_unlock_irq(&cm_id_priv->lock);
43168- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43169+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43170 counter[CM_RTU_COUNTER]);
43171 goto out;
43172 }
43173@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
43174 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
43175 dreq_msg->local_comm_id);
43176 if (!cm_id_priv) {
43177- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43178+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43179 counter[CM_DREQ_COUNTER]);
43180 cm_issue_drep(work->port, work->mad_recv_wc);
43181 return -EINVAL;
43182@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
43183 case IB_CM_MRA_REP_RCVD:
43184 break;
43185 case IB_CM_TIMEWAIT:
43186- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43187+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43188 counter[CM_DREQ_COUNTER]);
43189 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43190 goto unlock;
43191@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
43192 cm_free_msg(msg);
43193 goto deref;
43194 case IB_CM_DREQ_RCVD:
43195- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43196+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43197 counter[CM_DREQ_COUNTER]);
43198 goto unlock;
43199 default:
43200@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
43201 ib_modify_mad(cm_id_priv->av.port->mad_agent,
43202 cm_id_priv->msg, timeout)) {
43203 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
43204- atomic_long_inc(&work->port->
43205+ atomic_long_inc_unchecked(&work->port->
43206 counter_group[CM_RECV_DUPLICATES].
43207 counter[CM_MRA_COUNTER]);
43208 goto out;
43209@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
43210 break;
43211 case IB_CM_MRA_REQ_RCVD:
43212 case IB_CM_MRA_REP_RCVD:
43213- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43214+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43215 counter[CM_MRA_COUNTER]);
43216 /* fall through */
43217 default:
43218@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
43219 case IB_CM_LAP_IDLE:
43220 break;
43221 case IB_CM_MRA_LAP_SENT:
43222- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43223+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43224 counter[CM_LAP_COUNTER]);
43225 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43226 goto unlock;
43227@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
43228 cm_free_msg(msg);
43229 goto deref;
43230 case IB_CM_LAP_RCVD:
43231- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43232+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43233 counter[CM_LAP_COUNTER]);
43234 goto unlock;
43235 default:
43236@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
43237 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
43238 if (cur_cm_id_priv) {
43239 spin_unlock_irq(&cm.lock);
43240- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43241+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43242 counter[CM_SIDR_REQ_COUNTER]);
43243 goto out; /* Duplicate message. */
43244 }
43245@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
43246 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
43247 msg->retries = 1;
43248
43249- atomic_long_add(1 + msg->retries,
43250+ atomic_long_add_unchecked(1 + msg->retries,
43251 &port->counter_group[CM_XMIT].counter[attr_index]);
43252 if (msg->retries)
43253- atomic_long_add(msg->retries,
43254+ atomic_long_add_unchecked(msg->retries,
43255 &port->counter_group[CM_XMIT_RETRIES].
43256 counter[attr_index]);
43257
43258@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
43259 }
43260
43261 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
43262- atomic_long_inc(&port->counter_group[CM_RECV].
43263+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
43264 counter[attr_id - CM_ATTR_ID_OFFSET]);
43265
43266 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
43267@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
43268 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
43269
43270 return sprintf(buf, "%ld\n",
43271- atomic_long_read(&group->counter[cm_attr->index]));
43272+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
43273 }
43274
43275 static const struct sysfs_ops cm_counter_ops = {
43276diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
43277index 9f5ad7c..588cd84 100644
43278--- a/drivers/infiniband/core/fmr_pool.c
43279+++ b/drivers/infiniband/core/fmr_pool.c
43280@@ -98,8 +98,8 @@ struct ib_fmr_pool {
43281
43282 struct task_struct *thread;
43283
43284- atomic_t req_ser;
43285- atomic_t flush_ser;
43286+ atomic_unchecked_t req_ser;
43287+ atomic_unchecked_t flush_ser;
43288
43289 wait_queue_head_t force_wait;
43290 };
43291@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43292 struct ib_fmr_pool *pool = pool_ptr;
43293
43294 do {
43295- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
43296+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
43297 ib_fmr_batch_release(pool);
43298
43299- atomic_inc(&pool->flush_ser);
43300+ atomic_inc_unchecked(&pool->flush_ser);
43301 wake_up_interruptible(&pool->force_wait);
43302
43303 if (pool->flush_function)
43304@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43305 }
43306
43307 set_current_state(TASK_INTERRUPTIBLE);
43308- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
43309+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
43310 !kthread_should_stop())
43311 schedule();
43312 __set_current_state(TASK_RUNNING);
43313@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
43314 pool->dirty_watermark = params->dirty_watermark;
43315 pool->dirty_len = 0;
43316 spin_lock_init(&pool->pool_lock);
43317- atomic_set(&pool->req_ser, 0);
43318- atomic_set(&pool->flush_ser, 0);
43319+ atomic_set_unchecked(&pool->req_ser, 0);
43320+ atomic_set_unchecked(&pool->flush_ser, 0);
43321 init_waitqueue_head(&pool->force_wait);
43322
43323 pool->thread = kthread_run(ib_fmr_cleanup_thread,
43324@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
43325 }
43326 spin_unlock_irq(&pool->pool_lock);
43327
43328- serial = atomic_inc_return(&pool->req_ser);
43329+ serial = atomic_inc_return_unchecked(&pool->req_ser);
43330 wake_up_process(pool->thread);
43331
43332 if (wait_event_interruptible(pool->force_wait,
43333- atomic_read(&pool->flush_ser) - serial >= 0))
43334+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
43335 return -EINTR;
43336
43337 return 0;
43338@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
43339 } else {
43340 list_add_tail(&fmr->list, &pool->dirty_list);
43341 if (++pool->dirty_len >= pool->dirty_watermark) {
43342- atomic_inc(&pool->req_ser);
43343+ atomic_inc_unchecked(&pool->req_ser);
43344 wake_up_process(pool->thread);
43345 }
43346 }
43347diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
43348index a9f0489..27a161b 100644
43349--- a/drivers/infiniband/core/uverbs_cmd.c
43350+++ b/drivers/infiniband/core/uverbs_cmd.c
43351@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
43352 if (copy_from_user(&cmd, buf, sizeof cmd))
43353 return -EFAULT;
43354
43355+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
43356+ return -EFAULT;
43357+
43358 INIT_UDATA(&udata, buf + sizeof cmd,
43359 (unsigned long) cmd.response + sizeof resp,
43360 in_len - sizeof cmd, out_len - sizeof resp);
43361diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
43362index 6791fd1..78bdcdf 100644
43363--- a/drivers/infiniband/hw/cxgb4/mem.c
43364+++ b/drivers/infiniband/hw/cxgb4/mem.c
43365@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43366 int err;
43367 struct fw_ri_tpte tpt;
43368 u32 stag_idx;
43369- static atomic_t key;
43370+ static atomic_unchecked_t key;
43371
43372 if (c4iw_fatal_error(rdev))
43373 return -EIO;
43374@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43375 if (rdev->stats.stag.cur > rdev->stats.stag.max)
43376 rdev->stats.stag.max = rdev->stats.stag.cur;
43377 mutex_unlock(&rdev->stats.lock);
43378- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
43379+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
43380 }
43381 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
43382 __func__, stag_state, type, pdid, stag_idx);
43383diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
43384index 79b3dbc..96e5fcc 100644
43385--- a/drivers/infiniband/hw/ipath/ipath_rc.c
43386+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
43387@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43388 struct ib_atomic_eth *ateth;
43389 struct ipath_ack_entry *e;
43390 u64 vaddr;
43391- atomic64_t *maddr;
43392+ atomic64_unchecked_t *maddr;
43393 u64 sdata;
43394 u32 rkey;
43395 u8 next;
43396@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43397 IB_ACCESS_REMOTE_ATOMIC)))
43398 goto nack_acc_unlck;
43399 /* Perform atomic OP and save result. */
43400- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43401+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43402 sdata = be64_to_cpu(ateth->swap_data);
43403 e = &qp->s_ack_queue[qp->r_head_ack_queue];
43404 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
43405- (u64) atomic64_add_return(sdata, maddr) - sdata :
43406+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43407 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43408 be64_to_cpu(ateth->compare_data),
43409 sdata);
43410diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
43411index 1f95bba..9530f87 100644
43412--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
43413+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
43414@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
43415 unsigned long flags;
43416 struct ib_wc wc;
43417 u64 sdata;
43418- atomic64_t *maddr;
43419+ atomic64_unchecked_t *maddr;
43420 enum ib_wc_status send_status;
43421
43422 /*
43423@@ -382,11 +382,11 @@ again:
43424 IB_ACCESS_REMOTE_ATOMIC)))
43425 goto acc_err;
43426 /* Perform atomic OP and save result. */
43427- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43428+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43429 sdata = wqe->wr.wr.atomic.compare_add;
43430 *(u64 *) sqp->s_sge.sge.vaddr =
43431 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
43432- (u64) atomic64_add_return(sdata, maddr) - sdata :
43433+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43434 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43435 sdata, wqe->wr.wr.atomic.swap);
43436 goto send_comp;
43437diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
43438index 5904026..f1c30e5 100644
43439--- a/drivers/infiniband/hw/mlx4/mad.c
43440+++ b/drivers/infiniband/hw/mlx4/mad.c
43441@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
43442
43443 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
43444 {
43445- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
43446+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
43447 cpu_to_be64(0xff00000000000000LL);
43448 }
43449
43450diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
43451index ed327e6..ca1739e0 100644
43452--- a/drivers/infiniband/hw/mlx4/mcg.c
43453+++ b/drivers/infiniband/hw/mlx4/mcg.c
43454@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
43455 {
43456 char name[20];
43457
43458- atomic_set(&ctx->tid, 0);
43459+ atomic_set_unchecked(&ctx->tid, 0);
43460 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
43461 ctx->mcg_wq = create_singlethread_workqueue(name);
43462 if (!ctx->mcg_wq)
43463diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43464index f829fd9..1a8d436 100644
43465--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43466+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43467@@ -439,7 +439,7 @@ struct mlx4_ib_demux_ctx {
43468 struct list_head mcg_mgid0_list;
43469 struct workqueue_struct *mcg_wq;
43470 struct mlx4_ib_demux_pv_ctx **tun;
43471- atomic_t tid;
43472+ atomic_unchecked_t tid;
43473 int flushing; /* flushing the work queue */
43474 };
43475
43476diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43477index 9d3e5c1..6f166df 100644
43478--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43479+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43480@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43481 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43482 }
43483
43484-int mthca_QUERY_FW(struct mthca_dev *dev)
43485+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43486 {
43487 struct mthca_mailbox *mailbox;
43488 u32 *outbox;
43489@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43490 CMD_TIME_CLASS_B);
43491 }
43492
43493-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43494+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43495 int num_mtt)
43496 {
43497 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43498@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43499 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43500 }
43501
43502-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43503+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43504 int eq_num)
43505 {
43506 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43507@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43508 CMD_TIME_CLASS_B);
43509 }
43510
43511-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43512+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43513 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43514 void *in_mad, void *response_mad)
43515 {
43516diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43517index ded76c1..0cf0a08 100644
43518--- a/drivers/infiniband/hw/mthca/mthca_main.c
43519+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43520@@ -692,7 +692,7 @@ err_close:
43521 return err;
43522 }
43523
43524-static int mthca_setup_hca(struct mthca_dev *dev)
43525+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43526 {
43527 int err;
43528
43529diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43530index ed9a989..6aa5dc2 100644
43531--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43532+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43533@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43534 * through the bitmaps)
43535 */
43536
43537-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43538+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43539 {
43540 int o;
43541 int m;
43542@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43543 return key;
43544 }
43545
43546-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43547+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43548 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43549 {
43550 struct mthca_mailbox *mailbox;
43551@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43552 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43553 }
43554
43555-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43556+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43557 u64 *buffer_list, int buffer_size_shift,
43558 int list_len, u64 iova, u64 total_size,
43559 u32 access, struct mthca_mr *mr)
43560diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43561index 415f8e1..e34214e 100644
43562--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43563+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43564@@ -764,7 +764,7 @@ unlock:
43565 return 0;
43566 }
43567
43568-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43569+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43570 {
43571 struct mthca_dev *dev = to_mdev(ibcq->device);
43572 struct mthca_cq *cq = to_mcq(ibcq);
43573diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43574index 3b2a6dc..bce26ff 100644
43575--- a/drivers/infiniband/hw/nes/nes.c
43576+++ b/drivers/infiniband/hw/nes/nes.c
43577@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43578 LIST_HEAD(nes_adapter_list);
43579 static LIST_HEAD(nes_dev_list);
43580
43581-atomic_t qps_destroyed;
43582+atomic_unchecked_t qps_destroyed;
43583
43584 static unsigned int ee_flsh_adapter;
43585 static unsigned int sysfs_nonidx_addr;
43586@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43587 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43588 struct nes_adapter *nesadapter = nesdev->nesadapter;
43589
43590- atomic_inc(&qps_destroyed);
43591+ atomic_inc_unchecked(&qps_destroyed);
43592
43593 /* Free the control structures */
43594
43595diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43596index bd9d132..70d84f4 100644
43597--- a/drivers/infiniband/hw/nes/nes.h
43598+++ b/drivers/infiniband/hw/nes/nes.h
43599@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43600 extern unsigned int wqm_quanta;
43601 extern struct list_head nes_adapter_list;
43602
43603-extern atomic_t cm_connects;
43604-extern atomic_t cm_accepts;
43605-extern atomic_t cm_disconnects;
43606-extern atomic_t cm_closes;
43607-extern atomic_t cm_connecteds;
43608-extern atomic_t cm_connect_reqs;
43609-extern atomic_t cm_rejects;
43610-extern atomic_t mod_qp_timouts;
43611-extern atomic_t qps_created;
43612-extern atomic_t qps_destroyed;
43613-extern atomic_t sw_qps_destroyed;
43614+extern atomic_unchecked_t cm_connects;
43615+extern atomic_unchecked_t cm_accepts;
43616+extern atomic_unchecked_t cm_disconnects;
43617+extern atomic_unchecked_t cm_closes;
43618+extern atomic_unchecked_t cm_connecteds;
43619+extern atomic_unchecked_t cm_connect_reqs;
43620+extern atomic_unchecked_t cm_rejects;
43621+extern atomic_unchecked_t mod_qp_timouts;
43622+extern atomic_unchecked_t qps_created;
43623+extern atomic_unchecked_t qps_destroyed;
43624+extern atomic_unchecked_t sw_qps_destroyed;
43625 extern u32 mh_detected;
43626 extern u32 mh_pauses_sent;
43627 extern u32 cm_packets_sent;
43628@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43629 extern u32 cm_packets_received;
43630 extern u32 cm_packets_dropped;
43631 extern u32 cm_packets_retrans;
43632-extern atomic_t cm_listens_created;
43633-extern atomic_t cm_listens_destroyed;
43634+extern atomic_unchecked_t cm_listens_created;
43635+extern atomic_unchecked_t cm_listens_destroyed;
43636 extern u32 cm_backlog_drops;
43637-extern atomic_t cm_loopbacks;
43638-extern atomic_t cm_nodes_created;
43639-extern atomic_t cm_nodes_destroyed;
43640-extern atomic_t cm_accel_dropped_pkts;
43641-extern atomic_t cm_resets_recvd;
43642-extern atomic_t pau_qps_created;
43643-extern atomic_t pau_qps_destroyed;
43644+extern atomic_unchecked_t cm_loopbacks;
43645+extern atomic_unchecked_t cm_nodes_created;
43646+extern atomic_unchecked_t cm_nodes_destroyed;
43647+extern atomic_unchecked_t cm_accel_dropped_pkts;
43648+extern atomic_unchecked_t cm_resets_recvd;
43649+extern atomic_unchecked_t pau_qps_created;
43650+extern atomic_unchecked_t pau_qps_destroyed;
43651
43652 extern u32 int_mod_timer_init;
43653 extern u32 int_mod_cq_depth_256;
43654diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43655index 6f09a72..cf4399d 100644
43656--- a/drivers/infiniband/hw/nes/nes_cm.c
43657+++ b/drivers/infiniband/hw/nes/nes_cm.c
43658@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43659 u32 cm_packets_retrans;
43660 u32 cm_packets_created;
43661 u32 cm_packets_received;
43662-atomic_t cm_listens_created;
43663-atomic_t cm_listens_destroyed;
43664+atomic_unchecked_t cm_listens_created;
43665+atomic_unchecked_t cm_listens_destroyed;
43666 u32 cm_backlog_drops;
43667-atomic_t cm_loopbacks;
43668-atomic_t cm_nodes_created;
43669-atomic_t cm_nodes_destroyed;
43670-atomic_t cm_accel_dropped_pkts;
43671-atomic_t cm_resets_recvd;
43672+atomic_unchecked_t cm_loopbacks;
43673+atomic_unchecked_t cm_nodes_created;
43674+atomic_unchecked_t cm_nodes_destroyed;
43675+atomic_unchecked_t cm_accel_dropped_pkts;
43676+atomic_unchecked_t cm_resets_recvd;
43677
43678 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43679 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43680@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43681 /* instance of function pointers for client API */
43682 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43683 static struct nes_cm_ops nes_cm_api = {
43684- mini_cm_accelerated,
43685- mini_cm_listen,
43686- mini_cm_del_listen,
43687- mini_cm_connect,
43688- mini_cm_close,
43689- mini_cm_accept,
43690- mini_cm_reject,
43691- mini_cm_recv_pkt,
43692- mini_cm_dealloc_core,
43693- mini_cm_get,
43694- mini_cm_set
43695+ .accelerated = mini_cm_accelerated,
43696+ .listen = mini_cm_listen,
43697+ .stop_listener = mini_cm_del_listen,
43698+ .connect = mini_cm_connect,
43699+ .close = mini_cm_close,
43700+ .accept = mini_cm_accept,
43701+ .reject = mini_cm_reject,
43702+ .recv_pkt = mini_cm_recv_pkt,
43703+ .destroy_cm_core = mini_cm_dealloc_core,
43704+ .get = mini_cm_get,
43705+ .set = mini_cm_set
43706 };
43707
43708 static struct nes_cm_core *g_cm_core;
43709
43710-atomic_t cm_connects;
43711-atomic_t cm_accepts;
43712-atomic_t cm_disconnects;
43713-atomic_t cm_closes;
43714-atomic_t cm_connecteds;
43715-atomic_t cm_connect_reqs;
43716-atomic_t cm_rejects;
43717+atomic_unchecked_t cm_connects;
43718+atomic_unchecked_t cm_accepts;
43719+atomic_unchecked_t cm_disconnects;
43720+atomic_unchecked_t cm_closes;
43721+atomic_unchecked_t cm_connecteds;
43722+atomic_unchecked_t cm_connect_reqs;
43723+atomic_unchecked_t cm_rejects;
43724
43725 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43726 {
43727@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43728 kfree(listener);
43729 listener = NULL;
43730 ret = 0;
43731- atomic_inc(&cm_listens_destroyed);
43732+ atomic_inc_unchecked(&cm_listens_destroyed);
43733 } else {
43734 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43735 }
43736@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43737 cm_node->rem_mac);
43738
43739 add_hte_node(cm_core, cm_node);
43740- atomic_inc(&cm_nodes_created);
43741+ atomic_inc_unchecked(&cm_nodes_created);
43742
43743 return cm_node;
43744 }
43745@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43746 }
43747
43748 atomic_dec(&cm_core->node_cnt);
43749- atomic_inc(&cm_nodes_destroyed);
43750+ atomic_inc_unchecked(&cm_nodes_destroyed);
43751 nesqp = cm_node->nesqp;
43752 if (nesqp) {
43753 nesqp->cm_node = NULL;
43754@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43755
43756 static void drop_packet(struct sk_buff *skb)
43757 {
43758- atomic_inc(&cm_accel_dropped_pkts);
43759+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43760 dev_kfree_skb_any(skb);
43761 }
43762
43763@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43764 {
43765
43766 int reset = 0; /* whether to send reset in case of err.. */
43767- atomic_inc(&cm_resets_recvd);
43768+ atomic_inc_unchecked(&cm_resets_recvd);
43769 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43770 " refcnt=%d\n", cm_node, cm_node->state,
43771 atomic_read(&cm_node->ref_count));
43772@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43773 rem_ref_cm_node(cm_node->cm_core, cm_node);
43774 return NULL;
43775 }
43776- atomic_inc(&cm_loopbacks);
43777+ atomic_inc_unchecked(&cm_loopbacks);
43778 loopbackremotenode->loopbackpartner = cm_node;
43779 loopbackremotenode->tcp_cntxt.rcv_wscale =
43780 NES_CM_DEFAULT_RCV_WND_SCALE;
43781@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43782 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43783 else {
43784 rem_ref_cm_node(cm_core, cm_node);
43785- atomic_inc(&cm_accel_dropped_pkts);
43786+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43787 dev_kfree_skb_any(skb);
43788 }
43789 break;
43790@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43791
43792 if ((cm_id) && (cm_id->event_handler)) {
43793 if (issue_disconn) {
43794- atomic_inc(&cm_disconnects);
43795+ atomic_inc_unchecked(&cm_disconnects);
43796 cm_event.event = IW_CM_EVENT_DISCONNECT;
43797 cm_event.status = disconn_status;
43798 cm_event.local_addr = cm_id->local_addr;
43799@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43800 }
43801
43802 if (issue_close) {
43803- atomic_inc(&cm_closes);
43804+ atomic_inc_unchecked(&cm_closes);
43805 nes_disconnect(nesqp, 1);
43806
43807 cm_id->provider_data = nesqp;
43808@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43809
43810 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43811 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43812- atomic_inc(&cm_accepts);
43813+ atomic_inc_unchecked(&cm_accepts);
43814
43815 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43816 netdev_refcnt_read(nesvnic->netdev));
43817@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43818 struct nes_cm_core *cm_core;
43819 u8 *start_buff;
43820
43821- atomic_inc(&cm_rejects);
43822+ atomic_inc_unchecked(&cm_rejects);
43823 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43824 loopback = cm_node->loopbackpartner;
43825 cm_core = cm_node->cm_core;
43826@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43827 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43828 ntohs(laddr->sin_port));
43829
43830- atomic_inc(&cm_connects);
43831+ atomic_inc_unchecked(&cm_connects);
43832 nesqp->active_conn = 1;
43833
43834 /* cache the cm_id in the qp */
43835@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43836 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43837 return err;
43838 }
43839- atomic_inc(&cm_listens_created);
43840+ atomic_inc_unchecked(&cm_listens_created);
43841 }
43842
43843 cm_id->add_ref(cm_id);
43844@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43845
43846 if (nesqp->destroyed)
43847 return;
43848- atomic_inc(&cm_connecteds);
43849+ atomic_inc_unchecked(&cm_connecteds);
43850 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43851 " local port 0x%04X. jiffies = %lu.\n",
43852 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43853@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43854
43855 cm_id->add_ref(cm_id);
43856 ret = cm_id->event_handler(cm_id, &cm_event);
43857- atomic_inc(&cm_closes);
43858+ atomic_inc_unchecked(&cm_closes);
43859 cm_event.event = IW_CM_EVENT_CLOSE;
43860 cm_event.status = 0;
43861 cm_event.provider_data = cm_id->provider_data;
43862@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43863 return;
43864 cm_id = cm_node->cm_id;
43865
43866- atomic_inc(&cm_connect_reqs);
43867+ atomic_inc_unchecked(&cm_connect_reqs);
43868 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43869 cm_node, cm_id, jiffies);
43870
43871@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43872 return;
43873 cm_id = cm_node->cm_id;
43874
43875- atomic_inc(&cm_connect_reqs);
43876+ atomic_inc_unchecked(&cm_connect_reqs);
43877 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43878 cm_node, cm_id, jiffies);
43879
43880diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43881index 4166452..fc952c3 100644
43882--- a/drivers/infiniband/hw/nes/nes_mgt.c
43883+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43884@@ -40,8 +40,8 @@
43885 #include "nes.h"
43886 #include "nes_mgt.h"
43887
43888-atomic_t pau_qps_created;
43889-atomic_t pau_qps_destroyed;
43890+atomic_unchecked_t pau_qps_created;
43891+atomic_unchecked_t pau_qps_destroyed;
43892
43893 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43894 {
43895@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43896 {
43897 struct sk_buff *skb;
43898 unsigned long flags;
43899- atomic_inc(&pau_qps_destroyed);
43900+ atomic_inc_unchecked(&pau_qps_destroyed);
43901
43902 /* Free packets that have not yet been forwarded */
43903 /* Lock is acquired by skb_dequeue when removing the skb */
43904@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43905 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43906 skb_queue_head_init(&nesqp->pau_list);
43907 spin_lock_init(&nesqp->pau_lock);
43908- atomic_inc(&pau_qps_created);
43909+ atomic_inc_unchecked(&pau_qps_created);
43910 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43911 }
43912
43913diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43914index 70acda9..a96de9d 100644
43915--- a/drivers/infiniband/hw/nes/nes_nic.c
43916+++ b/drivers/infiniband/hw/nes/nes_nic.c
43917@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43918 target_stat_values[++index] = mh_detected;
43919 target_stat_values[++index] = mh_pauses_sent;
43920 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43921- target_stat_values[++index] = atomic_read(&cm_connects);
43922- target_stat_values[++index] = atomic_read(&cm_accepts);
43923- target_stat_values[++index] = atomic_read(&cm_disconnects);
43924- target_stat_values[++index] = atomic_read(&cm_connecteds);
43925- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43926- target_stat_values[++index] = atomic_read(&cm_rejects);
43927- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43928- target_stat_values[++index] = atomic_read(&qps_created);
43929- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43930- target_stat_values[++index] = atomic_read(&qps_destroyed);
43931- target_stat_values[++index] = atomic_read(&cm_closes);
43932+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43933+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43934+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43935+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43936+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43937+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43938+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43939+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43940+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43941+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43942+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43943 target_stat_values[++index] = cm_packets_sent;
43944 target_stat_values[++index] = cm_packets_bounced;
43945 target_stat_values[++index] = cm_packets_created;
43946 target_stat_values[++index] = cm_packets_received;
43947 target_stat_values[++index] = cm_packets_dropped;
43948 target_stat_values[++index] = cm_packets_retrans;
43949- target_stat_values[++index] = atomic_read(&cm_listens_created);
43950- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43951+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43952+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43953 target_stat_values[++index] = cm_backlog_drops;
43954- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43955- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43956- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43957- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43958- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43959+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43960+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43961+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43962+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43963+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43964 target_stat_values[++index] = nesadapter->free_4kpbl;
43965 target_stat_values[++index] = nesadapter->free_256pbl;
43966 target_stat_values[++index] = int_mod_timer_init;
43967 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43968 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43969 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43970- target_stat_values[++index] = atomic_read(&pau_qps_created);
43971- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43972+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43973+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43974 }
43975
43976 /**
43977diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43978index c0d0296..3185f57 100644
43979--- a/drivers/infiniband/hw/nes/nes_verbs.c
43980+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43981@@ -46,9 +46,9 @@
43982
43983 #include <rdma/ib_umem.h>
43984
43985-atomic_t mod_qp_timouts;
43986-atomic_t qps_created;
43987-atomic_t sw_qps_destroyed;
43988+atomic_unchecked_t mod_qp_timouts;
43989+atomic_unchecked_t qps_created;
43990+atomic_unchecked_t sw_qps_destroyed;
43991
43992 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43993
43994@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43995 if (init_attr->create_flags)
43996 return ERR_PTR(-EINVAL);
43997
43998- atomic_inc(&qps_created);
43999+ atomic_inc_unchecked(&qps_created);
44000 switch (init_attr->qp_type) {
44001 case IB_QPT_RC:
44002 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
44003@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
44004 struct iw_cm_event cm_event;
44005 int ret = 0;
44006
44007- atomic_inc(&sw_qps_destroyed);
44008+ atomic_inc_unchecked(&sw_qps_destroyed);
44009 nesqp->destroyed = 1;
44010
44011 /* Blow away the connection if it exists. */
44012diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
44013index ffd48bf..83cdb56 100644
44014--- a/drivers/infiniband/hw/qib/qib.h
44015+++ b/drivers/infiniband/hw/qib/qib.h
44016@@ -52,6 +52,7 @@
44017 #include <linux/kref.h>
44018 #include <linux/sched.h>
44019 #include <linux/kthread.h>
44020+#include <linux/slab.h>
44021
44022 #include "qib_common.h"
44023 #include "qib_verbs.h"
44024diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44025index cdc7df4..a2fdfdb 100644
44026--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44027+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44028@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
44029 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
44030 }
44031
44032-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
44033+static struct rtnl_link_ops ipoib_link_ops = {
44034 .kind = "ipoib",
44035 .maxtype = IFLA_IPOIB_MAX,
44036 .policy = ipoib_policy,
44037diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
44038index e853a21..56fc5a8 100644
44039--- a/drivers/input/gameport/gameport.c
44040+++ b/drivers/input/gameport/gameport.c
44041@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
44042 */
44043 static void gameport_init_port(struct gameport *gameport)
44044 {
44045- static atomic_t gameport_no = ATOMIC_INIT(-1);
44046+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
44047
44048 __module_get(THIS_MODULE);
44049
44050 mutex_init(&gameport->drv_mutex);
44051 device_initialize(&gameport->dev);
44052 dev_set_name(&gameport->dev, "gameport%lu",
44053- (unsigned long)atomic_inc_return(&gameport_no));
44054+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
44055 gameport->dev.bus = &gameport_bus;
44056 gameport->dev.release = gameport_release_port;
44057 if (gameport->parent)
44058diff --git a/drivers/input/input.c b/drivers/input/input.c
44059index cc357f1..ee42fbc 100644
44060--- a/drivers/input/input.c
44061+++ b/drivers/input/input.c
44062@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
44063 */
44064 struct input_dev *input_allocate_device(void)
44065 {
44066- static atomic_t input_no = ATOMIC_INIT(-1);
44067+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
44068 struct input_dev *dev;
44069
44070 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
44071@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
44072 INIT_LIST_HEAD(&dev->node);
44073
44074 dev_set_name(&dev->dev, "input%lu",
44075- (unsigned long)atomic_inc_return(&input_no));
44076+ (unsigned long)atomic_inc_return_unchecked(&input_no));
44077
44078 __module_get(THIS_MODULE);
44079 }
44080diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
44081index 4a95b22..874c182 100644
44082--- a/drivers/input/joystick/sidewinder.c
44083+++ b/drivers/input/joystick/sidewinder.c
44084@@ -30,6 +30,7 @@
44085 #include <linux/kernel.h>
44086 #include <linux/module.h>
44087 #include <linux/slab.h>
44088+#include <linux/sched.h>
44089 #include <linux/input.h>
44090 #include <linux/gameport.h>
44091 #include <linux/jiffies.h>
44092diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
44093index 3aa2f3f..53c00ea 100644
44094--- a/drivers/input/joystick/xpad.c
44095+++ b/drivers/input/joystick/xpad.c
44096@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
44097
44098 static int xpad_led_probe(struct usb_xpad *xpad)
44099 {
44100- static atomic_t led_seq = ATOMIC_INIT(-1);
44101+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
44102 unsigned long led_no;
44103 struct xpad_led *led;
44104 struct led_classdev *led_cdev;
44105@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
44106 if (!led)
44107 return -ENOMEM;
44108
44109- led_no = atomic_inc_return(&led_seq);
44110+ led_no = atomic_inc_return_unchecked(&led_seq);
44111
44112 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
44113 led->xpad = xpad;
44114diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
44115index ac1fa5f..5f7502c 100644
44116--- a/drivers/input/misc/ims-pcu.c
44117+++ b/drivers/input/misc/ims-pcu.c
44118@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
44119
44120 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44121 {
44122- static atomic_t device_no = ATOMIC_INIT(-1);
44123+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
44124
44125 const struct ims_pcu_device_info *info;
44126 int error;
44127@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44128 }
44129
44130 /* Device appears to be operable, complete initialization */
44131- pcu->device_no = atomic_inc_return(&device_no);
44132+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
44133
44134 /*
44135 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
44136diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
44137index d02e1bd..d719719 100644
44138--- a/drivers/input/mouse/psmouse.h
44139+++ b/drivers/input/mouse/psmouse.h
44140@@ -124,7 +124,7 @@ struct psmouse_attribute {
44141 ssize_t (*set)(struct psmouse *psmouse, void *data,
44142 const char *buf, size_t count);
44143 bool protect;
44144-};
44145+} __do_const;
44146 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
44147
44148 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
44149diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
44150index b604564..3f14ae4 100644
44151--- a/drivers/input/mousedev.c
44152+++ b/drivers/input/mousedev.c
44153@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
44154
44155 spin_unlock_irq(&client->packet_lock);
44156
44157- if (copy_to_user(buffer, data, count))
44158+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
44159 return -EFAULT;
44160
44161 return count;
44162diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
44163index a05a517..323a2fd 100644
44164--- a/drivers/input/serio/serio.c
44165+++ b/drivers/input/serio/serio.c
44166@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
44167 */
44168 static void serio_init_port(struct serio *serio)
44169 {
44170- static atomic_t serio_no = ATOMIC_INIT(-1);
44171+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
44172
44173 __module_get(THIS_MODULE);
44174
44175@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
44176 mutex_init(&serio->drv_mutex);
44177 device_initialize(&serio->dev);
44178 dev_set_name(&serio->dev, "serio%lu",
44179- (unsigned long)atomic_inc_return(&serio_no));
44180+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
44181 serio->dev.bus = &serio_bus;
44182 serio->dev.release = serio_release_port;
44183 serio->dev.groups = serio_device_attr_groups;
44184diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
44185index 71ef5d6..93380a9 100644
44186--- a/drivers/input/serio/serio_raw.c
44187+++ b/drivers/input/serio/serio_raw.c
44188@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
44189
44190 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44191 {
44192- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
44193+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
44194 struct serio_raw *serio_raw;
44195 int err;
44196
44197@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44198 }
44199
44200 snprintf(serio_raw->name, sizeof(serio_raw->name),
44201- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
44202+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
44203 kref_init(&serio_raw->kref);
44204 INIT_LIST_HEAD(&serio_raw->client_list);
44205 init_waitqueue_head(&serio_raw->wait);
44206diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
44207index 92e2243..8fd9092 100644
44208--- a/drivers/input/touchscreen/htcpen.c
44209+++ b/drivers/input/touchscreen/htcpen.c
44210@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
44211 }
44212 };
44213
44214-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
44215+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
44216 {
44217 .ident = "Shift",
44218 .matches = {
44219diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
44220index 48882c1..93e0987 100644
44221--- a/drivers/iommu/amd_iommu.c
44222+++ b/drivers/iommu/amd_iommu.c
44223@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
44224
44225 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
44226 {
44227+ phys_addr_t physaddr;
44228 WARN_ON(address & 0x7ULL);
44229
44230 memset(cmd, 0, sizeof(*cmd));
44231- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
44232- cmd->data[1] = upper_32_bits(__pa(address));
44233+
44234+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
44235+ if (object_starts_on_stack((void *)address)) {
44236+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
44237+ physaddr = __pa((u64)adjbuf);
44238+ } else
44239+#endif
44240+ physaddr = __pa(address);
44241+
44242+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
44243+ cmd->data[1] = upper_32_bits(physaddr);
44244 cmd->data[2] = 1;
44245 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
44246 }
44247diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
44248index bd6252b..0716605 100644
44249--- a/drivers/iommu/arm-smmu.c
44250+++ b/drivers/iommu/arm-smmu.c
44251@@ -331,7 +331,7 @@ enum arm_smmu_domain_stage {
44252
44253 struct arm_smmu_domain {
44254 struct arm_smmu_device *smmu;
44255- struct io_pgtable_ops *pgtbl_ops;
44256+ struct io_pgtable *pgtbl;
44257 spinlock_t pgtbl_lock;
44258 struct arm_smmu_cfg cfg;
44259 enum arm_smmu_domain_stage stage;
44260@@ -807,7 +807,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44261 {
44262 int irq, start, ret = 0;
44263 unsigned long ias, oas;
44264- struct io_pgtable_ops *pgtbl_ops;
44265+ struct io_pgtable *pgtbl;
44266 struct io_pgtable_cfg pgtbl_cfg;
44267 enum io_pgtable_fmt fmt;
44268 struct arm_smmu_domain *smmu_domain = domain->priv;
44269@@ -892,14 +892,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44270 };
44271
44272 smmu_domain->smmu = smmu;
44273- pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);
44274- if (!pgtbl_ops) {
44275+ pgtbl = alloc_io_pgtable(fmt, &pgtbl_cfg, smmu_domain);
44276+ if (!pgtbl) {
44277 ret = -ENOMEM;
44278 goto out_clear_smmu;
44279 }
44280
44281 /* Update our support page sizes to reflect the page table format */
44282- arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44283+ pax_open_kernel();
44284+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44285+ pax_close_kernel();
44286
44287 /* Initialise the context bank with our page table cfg */
44288 arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);
44289@@ -920,7 +922,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44290 mutex_unlock(&smmu_domain->init_mutex);
44291
44292 /* Publish page table ops for map/unmap */
44293- smmu_domain->pgtbl_ops = pgtbl_ops;
44294+ smmu_domain->pgtbl = pgtbl;
44295 return 0;
44296
44297 out_clear_smmu:
44298@@ -953,8 +955,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
44299 free_irq(irq, domain);
44300 }
44301
44302- if (smmu_domain->pgtbl_ops)
44303- free_io_pgtable_ops(smmu_domain->pgtbl_ops);
44304+ free_io_pgtable(smmu_domain->pgtbl);
44305
44306 __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
44307 }
44308@@ -1178,13 +1179,13 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
44309 int ret;
44310 unsigned long flags;
44311 struct arm_smmu_domain *smmu_domain = domain->priv;
44312- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44313+ struct io_pgtable *iop = smmu_domain->pgtbl;
44314
44315- if (!ops)
44316+ if (!iop)
44317 return -ENODEV;
44318
44319 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44320- ret = ops->map(ops, iova, paddr, size, prot);
44321+ ret = iop->ops->map(iop, iova, paddr, size, prot);
44322 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44323 return ret;
44324 }
44325@@ -1195,13 +1196,13 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
44326 size_t ret;
44327 unsigned long flags;
44328 struct arm_smmu_domain *smmu_domain = domain->priv;
44329- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44330+ struct io_pgtable *iop = smmu_domain->pgtbl;
44331
44332- if (!ops)
44333+ if (!iop)
44334 return 0;
44335
44336 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44337- ret = ops->unmap(ops, iova, size);
44338+ ret = iop->ops->unmap(iop, iova, size);
44339 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44340 return ret;
44341 }
44342@@ -1212,7 +1213,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44343 struct arm_smmu_domain *smmu_domain = domain->priv;
44344 struct arm_smmu_device *smmu = smmu_domain->smmu;
44345 struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
44346- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44347+ struct io_pgtable *iop = smmu_domain->pgtbl;
44348 struct device *dev = smmu->dev;
44349 void __iomem *cb_base;
44350 u32 tmp;
44351@@ -1235,7 +1236,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44352 dev_err(dev,
44353 "iova to phys timed out on 0x%pad. Falling back to software table walk.\n",
44354 &iova);
44355- return ops->iova_to_phys(ops, iova);
44356+ return iop->ops->iova_to_phys(iop, iova);
44357 }
44358
44359 phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO);
44360@@ -1256,9 +1257,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44361 phys_addr_t ret;
44362 unsigned long flags;
44363 struct arm_smmu_domain *smmu_domain = domain->priv;
44364- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44365+ struct io_pgtable *iop = smmu_domain->pgtbl;
44366
44367- if (!ops)
44368+ if (!iop)
44369 return 0;
44370
44371 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44372@@ -1266,7 +1267,7 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44373 smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
44374 ret = arm_smmu_iova_to_phys_hard(domain, iova);
44375 } else {
44376- ret = ops->iova_to_phys(ops, iova);
44377+ ret = iop->ops->iova_to_phys(iop, iova);
44378 }
44379
44380 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44381@@ -1625,7 +1626,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
44382 size |= SZ_64K | SZ_512M;
44383 }
44384
44385- arm_smmu_ops.pgsize_bitmap &= size;
44386+ pax_open_kernel();
44387+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap &= size;
44388+ pax_close_kernel();
44389 dev_notice(smmu->dev, "\tSupported page sizes: 0x%08lx\n", size);
44390
44391 if (smmu->features & ARM_SMMU_FEAT_TRANS_S1)
44392diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
44393index b610a8d..08eb879 100644
44394--- a/drivers/iommu/io-pgtable-arm.c
44395+++ b/drivers/iommu/io-pgtable-arm.c
44396@@ -36,12 +36,6 @@
44397 #define io_pgtable_to_data(x) \
44398 container_of((x), struct arm_lpae_io_pgtable, iop)
44399
44400-#define io_pgtable_ops_to_pgtable(x) \
44401- container_of((x), struct io_pgtable, ops)
44402-
44403-#define io_pgtable_ops_to_data(x) \
44404- io_pgtable_to_data(io_pgtable_ops_to_pgtable(x))
44405-
44406 /*
44407 * For consistency with the architecture, we always consider
44408 * ARM_LPAE_MAX_LEVELS levels, with the walk starting at level n >=0
44409@@ -302,10 +296,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
44410 return pte;
44411 }
44412
44413-static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
44414+static int arm_lpae_map(struct io_pgtable *iop, unsigned long iova,
44415 phys_addr_t paddr, size_t size, int iommu_prot)
44416 {
44417- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44418+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44419 arm_lpae_iopte *ptep = data->pgd;
44420 int lvl = ARM_LPAE_START_LVL(data);
44421 arm_lpae_iopte prot;
44422@@ -445,12 +439,11 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
44423 return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
44424 }
44425
44426-static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44427+static int arm_lpae_unmap(struct io_pgtable *iop, unsigned long iova,
44428 size_t size)
44429 {
44430 size_t unmapped;
44431- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44432- struct io_pgtable *iop = &data->iop;
44433+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44434 arm_lpae_iopte *ptep = data->pgd;
44435 int lvl = ARM_LPAE_START_LVL(data);
44436
44437@@ -461,10 +454,10 @@ static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44438 return unmapped;
44439 }
44440
44441-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
44442+static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable *iop,
44443 unsigned long iova)
44444 {
44445- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44446+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44447 arm_lpae_iopte pte, *ptep = data->pgd;
44448 int lvl = ARM_LPAE_START_LVL(data);
44449
44450@@ -531,6 +524,12 @@ static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg)
44451 }
44452 }
44453
44454+static struct io_pgtable_ops arm_lpae_io_pgtable_ops = {
44455+ .map = arm_lpae_map,
44456+ .unmap = arm_lpae_unmap,
44457+ .iova_to_phys = arm_lpae_iova_to_phys,
44458+};
44459+
44460 static struct arm_lpae_io_pgtable *
44461 arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44462 {
44463@@ -562,11 +561,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44464 pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
44465 data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
44466
44467- data->iop.ops = (struct io_pgtable_ops) {
44468- .map = arm_lpae_map,
44469- .unmap = arm_lpae_unmap,
44470- .iova_to_phys = arm_lpae_iova_to_phys,
44471- };
44472+ data->iop.ops = &arm_lpae_io_pgtable_ops;
44473
44474 return data;
44475 }
44476@@ -825,9 +820,9 @@ static struct iommu_gather_ops dummy_tlb_ops __initdata = {
44477 .flush_pgtable = dummy_flush_pgtable,
44478 };
44479
44480-static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44481+static void __init arm_lpae_dump_ops(struct io_pgtable *iop)
44482 {
44483- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44484+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44485 struct io_pgtable_cfg *cfg = &data->iop.cfg;
44486
44487 pr_err("cfg: pgsize_bitmap 0x%lx, ias %u-bit\n",
44488@@ -837,9 +832,9 @@ static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44489 data->bits_per_level, data->pgd);
44490 }
44491
44492-#define __FAIL(ops, i) ({ \
44493+#define __FAIL(iop, i) ({ \
44494 WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \
44495- arm_lpae_dump_ops(ops); \
44496+ arm_lpae_dump_ops(iop); \
44497 selftest_running = false; \
44498 -EFAULT; \
44499 })
44500@@ -854,30 +849,32 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44501 int i, j;
44502 unsigned long iova;
44503 size_t size;
44504- struct io_pgtable_ops *ops;
44505+ struct io_pgtable *iop;
44506+ const struct io_pgtable_ops *ops;
44507
44508 selftest_running = true;
44509
44510 for (i = 0; i < ARRAY_SIZE(fmts); ++i) {
44511 cfg_cookie = cfg;
44512- ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg);
44513- if (!ops) {
44514+ iop = alloc_io_pgtable(fmts[i], cfg, cfg);
44515+ if (!iop) {
44516 pr_err("selftest: failed to allocate io pgtable ops\n");
44517 return -ENOMEM;
44518 }
44519+ ops = iop->ops;
44520
44521 /*
44522 * Initial sanity checks.
44523 * Empty page tables shouldn't provide any translations.
44524 */
44525- if (ops->iova_to_phys(ops, 42))
44526- return __FAIL(ops, i);
44527+ if (ops->iova_to_phys(iop, 42))
44528+ return __FAIL(iop, i);
44529
44530- if (ops->iova_to_phys(ops, SZ_1G + 42))
44531- return __FAIL(ops, i);
44532+ if (ops->iova_to_phys(iop, SZ_1G + 42))
44533+ return __FAIL(iop, i);
44534
44535- if (ops->iova_to_phys(ops, SZ_2G + 42))
44536- return __FAIL(ops, i);
44537+ if (ops->iova_to_phys(iop, SZ_2G + 42))
44538+ return __FAIL(iop, i);
44539
44540 /*
44541 * Distinct mappings of different granule sizes.
44542@@ -887,19 +884,19 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44543 while (j != BITS_PER_LONG) {
44544 size = 1UL << j;
44545
44546- if (ops->map(ops, iova, iova, size, IOMMU_READ |
44547+ if (ops->map(iop, iova, iova, size, IOMMU_READ |
44548 IOMMU_WRITE |
44549 IOMMU_NOEXEC |
44550 IOMMU_CACHE))
44551- return __FAIL(ops, i);
44552+ return __FAIL(iop, i);
44553
44554 /* Overlapping mappings */
44555- if (!ops->map(ops, iova, iova + size, size,
44556+ if (!ops->map(iop, iova, iova + size, size,
44557 IOMMU_READ | IOMMU_NOEXEC))
44558- return __FAIL(ops, i);
44559+ return __FAIL(iop, i);
44560
44561- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44562- return __FAIL(ops, i);
44563+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44564+ return __FAIL(iop, i);
44565
44566 iova += SZ_1G;
44567 j++;
44568@@ -908,15 +905,15 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44569
44570 /* Partial unmap */
44571 size = 1UL << __ffs(cfg->pgsize_bitmap);
44572- if (ops->unmap(ops, SZ_1G + size, size) != size)
44573- return __FAIL(ops, i);
44574+ if (ops->unmap(iop, SZ_1G + size, size) != size)
44575+ return __FAIL(iop, i);
44576
44577 /* Remap of partial unmap */
44578- if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
44579- return __FAIL(ops, i);
44580+ if (ops->map(iop, SZ_1G + size, size, size, IOMMU_READ))
44581+ return __FAIL(iop, i);
44582
44583- if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
44584- return __FAIL(ops, i);
44585+ if (ops->iova_to_phys(iop, SZ_1G + size + 42) != (size + 42))
44586+ return __FAIL(iop, i);
44587
44588 /* Full unmap */
44589 iova = 0;
44590@@ -924,25 +921,25 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44591 while (j != BITS_PER_LONG) {
44592 size = 1UL << j;
44593
44594- if (ops->unmap(ops, iova, size) != size)
44595- return __FAIL(ops, i);
44596+ if (ops->unmap(iop, iova, size) != size)
44597+ return __FAIL(iop, i);
44598
44599- if (ops->iova_to_phys(ops, iova + 42))
44600- return __FAIL(ops, i);
44601+ if (ops->iova_to_phys(iop, iova + 42))
44602+ return __FAIL(iop, i);
44603
44604 /* Remap full block */
44605- if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
44606- return __FAIL(ops, i);
44607+ if (ops->map(iop, iova, iova, size, IOMMU_WRITE))
44608+ return __FAIL(iop, i);
44609
44610- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44611- return __FAIL(ops, i);
44612+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44613+ return __FAIL(iop, i);
44614
44615 iova += SZ_1G;
44616 j++;
44617 j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
44618 }
44619
44620- free_io_pgtable_ops(ops);
44621+ free_io_pgtable(iop);
44622 }
44623
44624 selftest_running = false;
44625diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
44626index 6436fe2..088c965 100644
44627--- a/drivers/iommu/io-pgtable.c
44628+++ b/drivers/iommu/io-pgtable.c
44629@@ -40,7 +40,7 @@ io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =
44630 #endif
44631 };
44632
44633-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44634+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44635 struct io_pgtable_cfg *cfg,
44636 void *cookie)
44637 {
44638@@ -62,21 +62,18 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44639 iop->cookie = cookie;
44640 iop->cfg = *cfg;
44641
44642- return &iop->ops;
44643+ return iop;
44644 }
44645
44646 /*
44647 * It is the IOMMU driver's responsibility to ensure that the page table
44648 * is no longer accessible to the walker by this point.
44649 */
44650-void free_io_pgtable_ops(struct io_pgtable_ops *ops)
44651+void free_io_pgtable(struct io_pgtable *iop)
44652 {
44653- struct io_pgtable *iop;
44654-
44655- if (!ops)
44656+ if (!iop)
44657 return;
44658
44659- iop = container_of(ops, struct io_pgtable, ops);
44660 iop->cfg.tlb->tlb_flush_all(iop->cookie);
44661 io_pgtable_init_table[iop->fmt]->free(iop);
44662 }
44663diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
44664index 10e32f6..0b276c8 100644
44665--- a/drivers/iommu/io-pgtable.h
44666+++ b/drivers/iommu/io-pgtable.h
44667@@ -75,17 +75,18 @@ struct io_pgtable_cfg {
44668 * These functions map directly onto the iommu_ops member functions with
44669 * the same names.
44670 */
44671+struct io_pgtable;
44672 struct io_pgtable_ops {
44673- int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
44674+ int (*map)(struct io_pgtable *iop, unsigned long iova,
44675 phys_addr_t paddr, size_t size, int prot);
44676- int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
44677+ int (*unmap)(struct io_pgtable *iop, unsigned long iova,
44678 size_t size);
44679- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
44680+ phys_addr_t (*iova_to_phys)(struct io_pgtable *iop,
44681 unsigned long iova);
44682 };
44683
44684 /**
44685- * alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
44686+ * alloc_io_pgtable() - Allocate a page table allocator for use by an IOMMU.
44687 *
44688 * @fmt: The page table format.
44689 * @cfg: The page table configuration. This will be modified to represent
44690@@ -94,9 +95,9 @@ struct io_pgtable_ops {
44691 * @cookie: An opaque token provided by the IOMMU driver and passed back to
44692 * the callback routines in cfg->tlb.
44693 */
44694-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44695- struct io_pgtable_cfg *cfg,
44696- void *cookie);
44697+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44698+ struct io_pgtable_cfg *cfg,
44699+ void *cookie);
44700
44701 /**
44702 * free_io_pgtable_ops() - Free an io_pgtable_ops structure. The caller
44703@@ -105,7 +106,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44704 *
44705 * @ops: The ops returned from alloc_io_pgtable_ops.
44706 */
44707-void free_io_pgtable_ops(struct io_pgtable_ops *ops);
44708+void free_io_pgtable(struct io_pgtable *iop);
44709
44710
44711 /*
44712@@ -125,7 +126,7 @@ struct io_pgtable {
44713 enum io_pgtable_fmt fmt;
44714 void *cookie;
44715 struct io_pgtable_cfg cfg;
44716- struct io_pgtable_ops ops;
44717+ const struct io_pgtable_ops *ops;
44718 };
44719
44720 /**
44721diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
44722index 72e683d..c9db262 100644
44723--- a/drivers/iommu/iommu.c
44724+++ b/drivers/iommu/iommu.c
44725@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
44726 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
44727 {
44728 int err;
44729- struct notifier_block *nb;
44730+ notifier_block_no_const *nb;
44731 struct iommu_callback_data cb = {
44732 .ops = ops,
44733 };
44734diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
44735index bc39bdf..e2de272 100644
44736--- a/drivers/iommu/ipmmu-vmsa.c
44737+++ b/drivers/iommu/ipmmu-vmsa.c
44738@@ -41,7 +41,7 @@ struct ipmmu_vmsa_domain {
44739 struct iommu_domain *io_domain;
44740
44741 struct io_pgtable_cfg cfg;
44742- struct io_pgtable_ops *iop;
44743+ struct io_pgtable *iop;
44744
44745 unsigned int context_id;
44746 spinlock_t lock; /* Protects mappings */
44747@@ -323,8 +323,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
44748 domain->cfg.oas = 40;
44749 domain->cfg.tlb = &ipmmu_gather_ops;
44750
44751- domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
44752- domain);
44753+ domain->iop = alloc_io_pgtable(ARM_32_LPAE_S1, &domain->cfg, domain);
44754 if (!domain->iop)
44755 return -EINVAL;
44756
44757@@ -482,7 +481,7 @@ static void ipmmu_domain_destroy(struct iommu_domain *io_domain)
44758 * been detached.
44759 */
44760 ipmmu_domain_destroy_context(domain);
44761- free_io_pgtable_ops(domain->iop);
44762+ free_io_pgtable(domain->iop);
44763 kfree(domain);
44764 }
44765
44766@@ -551,7 +550,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
44767 if (!domain)
44768 return -ENODEV;
44769
44770- return domain->iop->map(domain->iop, iova, paddr, size, prot);
44771+ return domain->iop->ops->map(domain->iop, iova, paddr, size, prot);
44772 }
44773
44774 static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44775@@ -559,7 +558,7 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44776 {
44777 struct ipmmu_vmsa_domain *domain = io_domain->priv;
44778
44779- return domain->iop->unmap(domain->iop, iova, size);
44780+ return domain->iop->ops->unmap(domain->iop, iova, size);
44781 }
44782
44783 static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44784@@ -569,7 +568,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44785
44786 /* TODO: Is locking needed ? */
44787
44788- return domain->iop->iova_to_phys(domain->iop, iova);
44789+ return domain->iop->ops->iova_to_phys(domain->iop, iova);
44790 }
44791
44792 static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
44793diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
44794index 390079e..1da9d6c 100644
44795--- a/drivers/iommu/irq_remapping.c
44796+++ b/drivers/iommu/irq_remapping.c
44797@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
44798 void panic_if_irq_remap(const char *msg)
44799 {
44800 if (irq_remapping_enabled)
44801- panic(msg);
44802+ panic("%s", msg);
44803 }
44804
44805 static void ir_ack_apic_edge(struct irq_data *data)
44806@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
44807
44808 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
44809 {
44810- chip->irq_print_chip = ir_print_prefix;
44811- chip->irq_ack = ir_ack_apic_edge;
44812- chip->irq_eoi = ir_ack_apic_level;
44813- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44814+ pax_open_kernel();
44815+ *(void **)&chip->irq_print_chip = ir_print_prefix;
44816+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
44817+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
44818+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44819+ pax_close_kernel();
44820 }
44821
44822 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
44823diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
44824index 471e1cd..b53b870 100644
44825--- a/drivers/irqchip/irq-gic.c
44826+++ b/drivers/irqchip/irq-gic.c
44827@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
44828 * Supported arch specific GIC irq extension.
44829 * Default make them NULL.
44830 */
44831-struct irq_chip gic_arch_extn = {
44832+irq_chip_no_const gic_arch_extn = {
44833 .irq_eoi = NULL,
44834 .irq_mask = NULL,
44835 .irq_unmask = NULL,
44836@@ -318,7 +318,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
44837 chained_irq_exit(chip, desc);
44838 }
44839
44840-static struct irq_chip gic_chip = {
44841+static irq_chip_no_const gic_chip __read_only = {
44842 .name = "GIC",
44843 .irq_mask = gic_mask_irq,
44844 .irq_unmask = gic_unmask_irq,
44845diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
44846index 9a0767b..5e5f86f 100644
44847--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
44848+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
44849@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
44850 struct intc_irqpin_iomem *i;
44851 struct resource *io[INTC_IRQPIN_REG_NR];
44852 struct resource *irq;
44853- struct irq_chip *irq_chip;
44854+ irq_chip_no_const *irq_chip;
44855 void (*enable_fn)(struct irq_data *d);
44856 void (*disable_fn)(struct irq_data *d);
44857 const char *name = dev_name(dev);
44858diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
44859index 384e6ed..7a771b2 100644
44860--- a/drivers/irqchip/irq-renesas-irqc.c
44861+++ b/drivers/irqchip/irq-renesas-irqc.c
44862@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
44863 struct irqc_priv *p;
44864 struct resource *io;
44865 struct resource *irq;
44866- struct irq_chip *irq_chip;
44867+ irq_chip_no_const *irq_chip;
44868 const char *name = dev_name(&pdev->dev);
44869 int ret;
44870 int k;
44871diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
44872index 6a2df32..dc962f1 100644
44873--- a/drivers/isdn/capi/capi.c
44874+++ b/drivers/isdn/capi/capi.c
44875@@ -81,8 +81,8 @@ struct capiminor {
44876
44877 struct capi20_appl *ap;
44878 u32 ncci;
44879- atomic_t datahandle;
44880- atomic_t msgid;
44881+ atomic_unchecked_t datahandle;
44882+ atomic_unchecked_t msgid;
44883
44884 struct tty_port port;
44885 int ttyinstop;
44886@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
44887 capimsg_setu16(s, 2, mp->ap->applid);
44888 capimsg_setu8 (s, 4, CAPI_DATA_B3);
44889 capimsg_setu8 (s, 5, CAPI_RESP);
44890- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
44891+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
44892 capimsg_setu32(s, 8, mp->ncci);
44893 capimsg_setu16(s, 12, datahandle);
44894 }
44895@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
44896 mp->outbytes -= len;
44897 spin_unlock_bh(&mp->outlock);
44898
44899- datahandle = atomic_inc_return(&mp->datahandle);
44900+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
44901 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
44902 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44903 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44904 capimsg_setu16(skb->data, 2, mp->ap->applid);
44905 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
44906 capimsg_setu8 (skb->data, 5, CAPI_REQ);
44907- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
44908+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
44909 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
44910 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
44911 capimsg_setu16(skb->data, 16, len); /* Data length */
44912diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
44913index aecec6d..11e13c5 100644
44914--- a/drivers/isdn/gigaset/bas-gigaset.c
44915+++ b/drivers/isdn/gigaset/bas-gigaset.c
44916@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
44917
44918
44919 static const struct gigaset_ops gigops = {
44920- gigaset_write_cmd,
44921- gigaset_write_room,
44922- gigaset_chars_in_buffer,
44923- gigaset_brkchars,
44924- gigaset_init_bchannel,
44925- gigaset_close_bchannel,
44926- gigaset_initbcshw,
44927- gigaset_freebcshw,
44928- gigaset_reinitbcshw,
44929- gigaset_initcshw,
44930- gigaset_freecshw,
44931- gigaset_set_modem_ctrl,
44932- gigaset_baud_rate,
44933- gigaset_set_line_ctrl,
44934- gigaset_isoc_send_skb,
44935- gigaset_isoc_input,
44936+ .write_cmd = gigaset_write_cmd,
44937+ .write_room = gigaset_write_room,
44938+ .chars_in_buffer = gigaset_chars_in_buffer,
44939+ .brkchars = gigaset_brkchars,
44940+ .init_bchannel = gigaset_init_bchannel,
44941+ .close_bchannel = gigaset_close_bchannel,
44942+ .initbcshw = gigaset_initbcshw,
44943+ .freebcshw = gigaset_freebcshw,
44944+ .reinitbcshw = gigaset_reinitbcshw,
44945+ .initcshw = gigaset_initcshw,
44946+ .freecshw = gigaset_freecshw,
44947+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44948+ .baud_rate = gigaset_baud_rate,
44949+ .set_line_ctrl = gigaset_set_line_ctrl,
44950+ .send_skb = gigaset_isoc_send_skb,
44951+ .handle_input = gigaset_isoc_input,
44952 };
44953
44954 /* bas_gigaset_init
44955diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
44956index 600c79b..3752bab 100644
44957--- a/drivers/isdn/gigaset/interface.c
44958+++ b/drivers/isdn/gigaset/interface.c
44959@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
44960 }
44961 tty->driver_data = cs;
44962
44963- ++cs->port.count;
44964+ atomic_inc(&cs->port.count);
44965
44966- if (cs->port.count == 1) {
44967+ if (atomic_read(&cs->port.count) == 1) {
44968 tty_port_tty_set(&cs->port, tty);
44969 cs->port.low_latency = 1;
44970 }
44971@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
44972
44973 if (!cs->connected)
44974 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
44975- else if (!cs->port.count)
44976+ else if (!atomic_read(&cs->port.count))
44977 dev_warn(cs->dev, "%s: device not opened\n", __func__);
44978- else if (!--cs->port.count)
44979+ else if (!atomic_dec_return(&cs->port.count))
44980 tty_port_tty_set(&cs->port, NULL);
44981
44982 mutex_unlock(&cs->mutex);
44983diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
44984index 8c91fd5..14f13ce 100644
44985--- a/drivers/isdn/gigaset/ser-gigaset.c
44986+++ b/drivers/isdn/gigaset/ser-gigaset.c
44987@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
44988 }
44989
44990 static const struct gigaset_ops ops = {
44991- gigaset_write_cmd,
44992- gigaset_write_room,
44993- gigaset_chars_in_buffer,
44994- gigaset_brkchars,
44995- gigaset_init_bchannel,
44996- gigaset_close_bchannel,
44997- gigaset_initbcshw,
44998- gigaset_freebcshw,
44999- gigaset_reinitbcshw,
45000- gigaset_initcshw,
45001- gigaset_freecshw,
45002- gigaset_set_modem_ctrl,
45003- gigaset_baud_rate,
45004- gigaset_set_line_ctrl,
45005- gigaset_m10x_send_skb, /* asyncdata.c */
45006- gigaset_m10x_input, /* asyncdata.c */
45007+ .write_cmd = gigaset_write_cmd,
45008+ .write_room = gigaset_write_room,
45009+ .chars_in_buffer = gigaset_chars_in_buffer,
45010+ .brkchars = gigaset_brkchars,
45011+ .init_bchannel = gigaset_init_bchannel,
45012+ .close_bchannel = gigaset_close_bchannel,
45013+ .initbcshw = gigaset_initbcshw,
45014+ .freebcshw = gigaset_freebcshw,
45015+ .reinitbcshw = gigaset_reinitbcshw,
45016+ .initcshw = gigaset_initcshw,
45017+ .freecshw = gigaset_freecshw,
45018+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45019+ .baud_rate = gigaset_baud_rate,
45020+ .set_line_ctrl = gigaset_set_line_ctrl,
45021+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
45022+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
45023 };
45024
45025
45026diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
45027index 5f306e2..5342f88 100644
45028--- a/drivers/isdn/gigaset/usb-gigaset.c
45029+++ b/drivers/isdn/gigaset/usb-gigaset.c
45030@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
45031 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
45032 memcpy(cs->hw.usb->bchars, buf, 6);
45033 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
45034- 0, 0, &buf, 6, 2000);
45035+ 0, 0, buf, 6, 2000);
45036 }
45037
45038 static void gigaset_freebcshw(struct bc_state *bcs)
45039@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
45040 }
45041
45042 static const struct gigaset_ops ops = {
45043- gigaset_write_cmd,
45044- gigaset_write_room,
45045- gigaset_chars_in_buffer,
45046- gigaset_brkchars,
45047- gigaset_init_bchannel,
45048- gigaset_close_bchannel,
45049- gigaset_initbcshw,
45050- gigaset_freebcshw,
45051- gigaset_reinitbcshw,
45052- gigaset_initcshw,
45053- gigaset_freecshw,
45054- gigaset_set_modem_ctrl,
45055- gigaset_baud_rate,
45056- gigaset_set_line_ctrl,
45057- gigaset_m10x_send_skb,
45058- gigaset_m10x_input,
45059+ .write_cmd = gigaset_write_cmd,
45060+ .write_room = gigaset_write_room,
45061+ .chars_in_buffer = gigaset_chars_in_buffer,
45062+ .brkchars = gigaset_brkchars,
45063+ .init_bchannel = gigaset_init_bchannel,
45064+ .close_bchannel = gigaset_close_bchannel,
45065+ .initbcshw = gigaset_initbcshw,
45066+ .freebcshw = gigaset_freebcshw,
45067+ .reinitbcshw = gigaset_reinitbcshw,
45068+ .initcshw = gigaset_initcshw,
45069+ .freecshw = gigaset_freecshw,
45070+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45071+ .baud_rate = gigaset_baud_rate,
45072+ .set_line_ctrl = gigaset_set_line_ctrl,
45073+ .send_skb = gigaset_m10x_send_skb,
45074+ .handle_input = gigaset_m10x_input,
45075 };
45076
45077 /*
45078diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
45079index 4d9b195..455075c 100644
45080--- a/drivers/isdn/hardware/avm/b1.c
45081+++ b/drivers/isdn/hardware/avm/b1.c
45082@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
45083 }
45084 if (left) {
45085 if (t4file->user) {
45086- if (copy_from_user(buf, dp, left))
45087+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45088 return -EFAULT;
45089 } else {
45090 memcpy(buf, dp, left);
45091@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
45092 }
45093 if (left) {
45094 if (config->user) {
45095- if (copy_from_user(buf, dp, left))
45096+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45097 return -EFAULT;
45098 } else {
45099 memcpy(buf, dp, left);
45100diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
45101index 9b856e1..fa03c92 100644
45102--- a/drivers/isdn/i4l/isdn_common.c
45103+++ b/drivers/isdn/i4l/isdn_common.c
45104@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
45105 } else
45106 return -EINVAL;
45107 case IIOCDBGVAR:
45108+ if (!capable(CAP_SYS_RAWIO))
45109+ return -EPERM;
45110 if (arg) {
45111 if (copy_to_user(argp, &dev, sizeof(ulong)))
45112 return -EFAULT;
45113diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
45114index 91d5730..336523e 100644
45115--- a/drivers/isdn/i4l/isdn_concap.c
45116+++ b/drivers/isdn/i4l/isdn_concap.c
45117@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
45118 }
45119
45120 struct concap_device_ops isdn_concap_reliable_dl_dops = {
45121- &isdn_concap_dl_data_req,
45122- &isdn_concap_dl_connect_req,
45123- &isdn_concap_dl_disconn_req
45124+ .data_req = &isdn_concap_dl_data_req,
45125+ .connect_req = &isdn_concap_dl_connect_req,
45126+ .disconn_req = &isdn_concap_dl_disconn_req
45127 };
45128
45129 /* The following should better go into a dedicated source file such that
45130diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
45131index bc91261..2ef7e36 100644
45132--- a/drivers/isdn/i4l/isdn_tty.c
45133+++ b/drivers/isdn/i4l/isdn_tty.c
45134@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
45135
45136 #ifdef ISDN_DEBUG_MODEM_OPEN
45137 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
45138- port->count);
45139+ atomic_read(&port->count));
45140 #endif
45141- port->count++;
45142+ atomic_inc(&port->count);
45143 port->tty = tty;
45144 /*
45145 * Start up serial port
45146@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45147 #endif
45148 return;
45149 }
45150- if ((tty->count == 1) && (port->count != 1)) {
45151+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
45152 /*
45153 * Uh, oh. tty->count is 1, which means that the tty
45154 * structure will be freed. Info->count should always
45155@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45156 * serial port won't be shutdown.
45157 */
45158 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
45159- "info->count is %d\n", port->count);
45160- port->count = 1;
45161+ "info->count is %d\n", atomic_read(&port->count));
45162+ atomic_set(&port->count, 1);
45163 }
45164- if (--port->count < 0) {
45165+ if (atomic_dec_return(&port->count) < 0) {
45166 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
45167- info->line, port->count);
45168- port->count = 0;
45169+ info->line, atomic_read(&port->count));
45170+ atomic_set(&port->count, 0);
45171 }
45172- if (port->count) {
45173+ if (atomic_read(&port->count)) {
45174 #ifdef ISDN_DEBUG_MODEM_OPEN
45175 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
45176 #endif
45177@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
45178 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
45179 return;
45180 isdn_tty_shutdown(info);
45181- port->count = 0;
45182+ atomic_set(&port->count, 0);
45183 port->flags &= ~ASYNC_NORMAL_ACTIVE;
45184 port->tty = NULL;
45185 wake_up_interruptible(&port->open_wait);
45186@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
45187 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
45188 modem_info *info = &dev->mdm.info[i];
45189
45190- if (info->port.count == 0)
45191+ if (atomic_read(&info->port.count) == 0)
45192 continue;
45193 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
45194 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
45195diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
45196index e2d4e58..40cd045 100644
45197--- a/drivers/isdn/i4l/isdn_x25iface.c
45198+++ b/drivers/isdn/i4l/isdn_x25iface.c
45199@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
45200
45201
45202 static struct concap_proto_ops ix25_pops = {
45203- &isdn_x25iface_proto_new,
45204- &isdn_x25iface_proto_del,
45205- &isdn_x25iface_proto_restart,
45206- &isdn_x25iface_proto_close,
45207- &isdn_x25iface_xmit,
45208- &isdn_x25iface_receive,
45209- &isdn_x25iface_connect_ind,
45210- &isdn_x25iface_disconn_ind
45211+ .proto_new = &isdn_x25iface_proto_new,
45212+ .proto_del = &isdn_x25iface_proto_del,
45213+ .restart = &isdn_x25iface_proto_restart,
45214+ .close = &isdn_x25iface_proto_close,
45215+ .encap_and_xmit = &isdn_x25iface_xmit,
45216+ .data_ind = &isdn_x25iface_receive,
45217+ .connect_ind = &isdn_x25iface_connect_ind,
45218+ .disconn_ind = &isdn_x25iface_disconn_ind
45219 };
45220
45221 /* error message helper function */
45222diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
45223index 358a574..b4987ea 100644
45224--- a/drivers/isdn/icn/icn.c
45225+++ b/drivers/isdn/icn/icn.c
45226@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
45227 if (count > len)
45228 count = len;
45229 if (user) {
45230- if (copy_from_user(msg, buf, count))
45231+ if (count > sizeof msg || copy_from_user(msg, buf, count))
45232 return -EFAULT;
45233 } else
45234 memcpy(msg, buf, count);
45235diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
45236index 87f7dff..7300125 100644
45237--- a/drivers/isdn/mISDN/dsp_cmx.c
45238+++ b/drivers/isdn/mISDN/dsp_cmx.c
45239@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
45240 static u16 dsp_count; /* last sample count */
45241 static int dsp_count_valid; /* if we have last sample count */
45242
45243-void
45244+void __intentional_overflow(-1)
45245 dsp_cmx_send(void *arg)
45246 {
45247 struct dsp_conf *conf;
45248diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
45249index 312ffd3..9263d05 100644
45250--- a/drivers/lguest/core.c
45251+++ b/drivers/lguest/core.c
45252@@ -96,9 +96,17 @@ static __init int map_switcher(void)
45253 * The end address needs +1 because __get_vm_area allocates an
45254 * extra guard page, so we need space for that.
45255 */
45256+
45257+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
45258+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45259+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
45260+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45261+#else
45262 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45263 VM_ALLOC, switcher_addr, switcher_addr
45264 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45265+#endif
45266+
45267 if (!switcher_vma) {
45268 err = -ENOMEM;
45269 printk("lguest: could not map switcher pages high\n");
45270@@ -121,7 +129,7 @@ static __init int map_switcher(void)
45271 * Now the Switcher is mapped at the right address, we can't fail!
45272 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
45273 */
45274- memcpy(switcher_vma->addr, start_switcher_text,
45275+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
45276 end_switcher_text - start_switcher_text);
45277
45278 printk(KERN_INFO "lguest: mapped switcher at %p\n",
45279diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
45280index e3abebc9..6a35328 100644
45281--- a/drivers/lguest/page_tables.c
45282+++ b/drivers/lguest/page_tables.c
45283@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
45284 /*:*/
45285
45286 #ifdef CONFIG_X86_PAE
45287-static void release_pmd(pmd_t *spmd)
45288+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
45289 {
45290 /* If the entry's not present, there's nothing to release. */
45291 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
45292diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
45293index 30f2aef..391c748 100644
45294--- a/drivers/lguest/x86/core.c
45295+++ b/drivers/lguest/x86/core.c
45296@@ -60,7 +60,7 @@ static struct {
45297 /* Offset from where switcher.S was compiled to where we've copied it */
45298 static unsigned long switcher_offset(void)
45299 {
45300- return switcher_addr - (unsigned long)start_switcher_text;
45301+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
45302 }
45303
45304 /* This cpu's struct lguest_pages (after the Switcher text page) */
45305@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
45306 * These copies are pretty cheap, so we do them unconditionally: */
45307 /* Save the current Host top-level page directory.
45308 */
45309+
45310+#ifdef CONFIG_PAX_PER_CPU_PGD
45311+ pages->state.host_cr3 = read_cr3();
45312+#else
45313 pages->state.host_cr3 = __pa(current->mm->pgd);
45314+#endif
45315+
45316 /*
45317 * Set up the Guest's page tables to see this CPU's pages (and no
45318 * other CPU's pages).
45319@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
45320 * compiled-in switcher code and the high-mapped copy we just made.
45321 */
45322 for (i = 0; i < IDT_ENTRIES; i++)
45323- default_idt_entries[i] += switcher_offset();
45324+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
45325
45326 /*
45327 * Set up the Switcher's per-cpu areas.
45328@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
45329 * it will be undisturbed when we switch. To change %cs and jump we
45330 * need this structure to feed to Intel's "lcall" instruction.
45331 */
45332- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
45333+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
45334 lguest_entry.segment = LGUEST_CS;
45335
45336 /*
45337diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
45338index 40634b0..4f5855e 100644
45339--- a/drivers/lguest/x86/switcher_32.S
45340+++ b/drivers/lguest/x86/switcher_32.S
45341@@ -87,6 +87,7 @@
45342 #include <asm/page.h>
45343 #include <asm/segment.h>
45344 #include <asm/lguest.h>
45345+#include <asm/processor-flags.h>
45346
45347 // We mark the start of the code to copy
45348 // It's placed in .text tho it's never run here
45349@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
45350 // Changes type when we load it: damn Intel!
45351 // For after we switch over our page tables
45352 // That entry will be read-only: we'd crash.
45353+
45354+#ifdef CONFIG_PAX_KERNEXEC
45355+ mov %cr0, %edx
45356+ xor $X86_CR0_WP, %edx
45357+ mov %edx, %cr0
45358+#endif
45359+
45360 movl $(GDT_ENTRY_TSS*8), %edx
45361 ltr %dx
45362
45363@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
45364 // Let's clear it again for our return.
45365 // The GDT descriptor of the Host
45366 // Points to the table after two "size" bytes
45367- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
45368+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
45369 // Clear "used" from type field (byte 5, bit 2)
45370- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
45371+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
45372+
45373+#ifdef CONFIG_PAX_KERNEXEC
45374+ mov %cr0, %eax
45375+ xor $X86_CR0_WP, %eax
45376+ mov %eax, %cr0
45377+#endif
45378
45379 // Once our page table's switched, the Guest is live!
45380 // The Host fades as we run this final step.
45381@@ -295,13 +309,12 @@ deliver_to_host:
45382 // I consulted gcc, and it gave
45383 // These instructions, which I gladly credit:
45384 leal (%edx,%ebx,8), %eax
45385- movzwl (%eax),%edx
45386- movl 4(%eax), %eax
45387- xorw %ax, %ax
45388- orl %eax, %edx
45389+ movl 4(%eax), %edx
45390+ movw (%eax), %dx
45391 // Now the address of the handler's in %edx
45392 // We call it now: its "iret" drops us home.
45393- jmp *%edx
45394+ ljmp $__KERNEL_CS, $1f
45395+1: jmp *%edx
45396
45397 // Every interrupt can come to us here
45398 // But we must truly tell each apart.
45399diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
45400index a08e3ee..df8ade2 100644
45401--- a/drivers/md/bcache/closure.h
45402+++ b/drivers/md/bcache/closure.h
45403@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
45404 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
45405 struct workqueue_struct *wq)
45406 {
45407- BUG_ON(object_is_on_stack(cl));
45408+ BUG_ON(object_starts_on_stack(cl));
45409 closure_set_ip(cl);
45410 cl->fn = fn;
45411 cl->wq = wq;
45412diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
45413index 3a57679..c58cdaf 100644
45414--- a/drivers/md/bitmap.c
45415+++ b/drivers/md/bitmap.c
45416@@ -1786,7 +1786,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
45417 chunk_kb ? "KB" : "B");
45418 if (bitmap->storage.file) {
45419 seq_printf(seq, ", file: ");
45420- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
45421+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
45422 }
45423
45424 seq_printf(seq, "\n");
45425diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
45426index c8a18e4..0ab43e5 100644
45427--- a/drivers/md/dm-ioctl.c
45428+++ b/drivers/md/dm-ioctl.c
45429@@ -1772,7 +1772,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
45430 cmd == DM_LIST_VERSIONS_CMD)
45431 return 0;
45432
45433- if ((cmd == DM_DEV_CREATE_CMD)) {
45434+ if (cmd == DM_DEV_CREATE_CMD) {
45435 if (!*param->name) {
45436 DMWARN("name not supplied when creating device");
45437 return -EINVAL;
45438diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
45439index 089d627..ef7352e 100644
45440--- a/drivers/md/dm-raid1.c
45441+++ b/drivers/md/dm-raid1.c
45442@@ -40,7 +40,7 @@ enum dm_raid1_error {
45443
45444 struct mirror {
45445 struct mirror_set *ms;
45446- atomic_t error_count;
45447+ atomic_unchecked_t error_count;
45448 unsigned long error_type;
45449 struct dm_dev *dev;
45450 sector_t offset;
45451@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
45452 struct mirror *m;
45453
45454 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
45455- if (!atomic_read(&m->error_count))
45456+ if (!atomic_read_unchecked(&m->error_count))
45457 return m;
45458
45459 return NULL;
45460@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
45461 * simple way to tell if a device has encountered
45462 * errors.
45463 */
45464- atomic_inc(&m->error_count);
45465+ atomic_inc_unchecked(&m->error_count);
45466
45467 if (test_and_set_bit(error_type, &m->error_type))
45468 return;
45469@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
45470 struct mirror *m = get_default_mirror(ms);
45471
45472 do {
45473- if (likely(!atomic_read(&m->error_count)))
45474+ if (likely(!atomic_read_unchecked(&m->error_count)))
45475 return m;
45476
45477 if (m-- == ms->mirror)
45478@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
45479 {
45480 struct mirror *default_mirror = get_default_mirror(m->ms);
45481
45482- return !atomic_read(&default_mirror->error_count);
45483+ return !atomic_read_unchecked(&default_mirror->error_count);
45484 }
45485
45486 static int mirror_available(struct mirror_set *ms, struct bio *bio)
45487@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
45488 */
45489 if (likely(region_in_sync(ms, region, 1)))
45490 m = choose_mirror(ms, bio->bi_iter.bi_sector);
45491- else if (m && atomic_read(&m->error_count))
45492+ else if (m && atomic_read_unchecked(&m->error_count))
45493 m = NULL;
45494
45495 if (likely(m))
45496@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
45497 }
45498
45499 ms->mirror[mirror].ms = ms;
45500- atomic_set(&(ms->mirror[mirror].error_count), 0);
45501+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
45502 ms->mirror[mirror].error_type = 0;
45503 ms->mirror[mirror].offset = offset;
45504
45505@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
45506 */
45507 static char device_status_char(struct mirror *m)
45508 {
45509- if (!atomic_read(&(m->error_count)))
45510+ if (!atomic_read_unchecked(&(m->error_count)))
45511 return 'A';
45512
45513 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
45514diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
45515index f478a4c..4b8e5ef 100644
45516--- a/drivers/md/dm-stats.c
45517+++ b/drivers/md/dm-stats.c
45518@@ -382,7 +382,7 @@ do_sync_free:
45519 synchronize_rcu_expedited();
45520 dm_stat_free(&s->rcu_head);
45521 } else {
45522- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
45523+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
45524 call_rcu(&s->rcu_head, dm_stat_free);
45525 }
45526 return 0;
45527@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
45528 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
45529 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
45530 ));
45531- ACCESS_ONCE(last->last_sector) = end_sector;
45532- ACCESS_ONCE(last->last_rw) = bi_rw;
45533+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
45534+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
45535 }
45536
45537 rcu_read_lock();
45538diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
45539index f8b37d4..5c5cafd 100644
45540--- a/drivers/md/dm-stripe.c
45541+++ b/drivers/md/dm-stripe.c
45542@@ -21,7 +21,7 @@ struct stripe {
45543 struct dm_dev *dev;
45544 sector_t physical_start;
45545
45546- atomic_t error_count;
45547+ atomic_unchecked_t error_count;
45548 };
45549
45550 struct stripe_c {
45551@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
45552 kfree(sc);
45553 return r;
45554 }
45555- atomic_set(&(sc->stripe[i].error_count), 0);
45556+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
45557 }
45558
45559 ti->private = sc;
45560@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
45561 DMEMIT("%d ", sc->stripes);
45562 for (i = 0; i < sc->stripes; i++) {
45563 DMEMIT("%s ", sc->stripe[i].dev->name);
45564- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
45565+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
45566 'D' : 'A';
45567 }
45568 buffer[i] = '\0';
45569@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
45570 */
45571 for (i = 0; i < sc->stripes; i++)
45572 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
45573- atomic_inc(&(sc->stripe[i].error_count));
45574- if (atomic_read(&(sc->stripe[i].error_count)) <
45575+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
45576+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
45577 DM_IO_ERROR_THRESHOLD)
45578 schedule_work(&sc->trigger_event);
45579 }
45580diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
45581index 757f1ba..bf9ec8f 100644
45582--- a/drivers/md/dm-table.c
45583+++ b/drivers/md/dm-table.c
45584@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
45585 if (!dev_size)
45586 return 0;
45587
45588- if ((start >= dev_size) || (start + len > dev_size)) {
45589+ if ((start >= dev_size) || (len > dev_size - start)) {
45590 DMWARN("%s: %s too small for target: "
45591 "start=%llu, len=%llu, dev_size=%llu",
45592 dm_device_name(ti->table->md), bdevname(bdev, b),
45593diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
45594index 79f6941..b33b4e0 100644
45595--- a/drivers/md/dm-thin-metadata.c
45596+++ b/drivers/md/dm-thin-metadata.c
45597@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45598 {
45599 pmd->info.tm = pmd->tm;
45600 pmd->info.levels = 2;
45601- pmd->info.value_type.context = pmd->data_sm;
45602+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45603 pmd->info.value_type.size = sizeof(__le64);
45604 pmd->info.value_type.inc = data_block_inc;
45605 pmd->info.value_type.dec = data_block_dec;
45606@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45607
45608 pmd->bl_info.tm = pmd->tm;
45609 pmd->bl_info.levels = 1;
45610- pmd->bl_info.value_type.context = pmd->data_sm;
45611+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45612 pmd->bl_info.value_type.size = sizeof(__le64);
45613 pmd->bl_info.value_type.inc = data_block_inc;
45614 pmd->bl_info.value_type.dec = data_block_dec;
45615diff --git a/drivers/md/dm.c b/drivers/md/dm.c
45616index 9b4e30a..83c927d 100644
45617--- a/drivers/md/dm.c
45618+++ b/drivers/md/dm.c
45619@@ -188,9 +188,9 @@ struct mapped_device {
45620 /*
45621 * Event handling.
45622 */
45623- atomic_t event_nr;
45624+ atomic_unchecked_t event_nr;
45625 wait_queue_head_t eventq;
45626- atomic_t uevent_seq;
45627+ atomic_unchecked_t uevent_seq;
45628 struct list_head uevent_list;
45629 spinlock_t uevent_lock; /* Protect access to uevent_list */
45630
45631@@ -2170,8 +2170,8 @@ static struct mapped_device *alloc_dev(int minor)
45632 spin_lock_init(&md->deferred_lock);
45633 atomic_set(&md->holders, 1);
45634 atomic_set(&md->open_count, 0);
45635- atomic_set(&md->event_nr, 0);
45636- atomic_set(&md->uevent_seq, 0);
45637+ atomic_set_unchecked(&md->event_nr, 0);
45638+ atomic_set_unchecked(&md->uevent_seq, 0);
45639 INIT_LIST_HEAD(&md->uevent_list);
45640 INIT_LIST_HEAD(&md->table_devices);
45641 spin_lock_init(&md->uevent_lock);
45642@@ -2336,7 +2336,7 @@ static void event_callback(void *context)
45643
45644 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
45645
45646- atomic_inc(&md->event_nr);
45647+ atomic_inc_unchecked(&md->event_nr);
45648 wake_up(&md->eventq);
45649 }
45650
45651@@ -3182,18 +3182,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
45652
45653 uint32_t dm_next_uevent_seq(struct mapped_device *md)
45654 {
45655- return atomic_add_return(1, &md->uevent_seq);
45656+ return atomic_add_return_unchecked(1, &md->uevent_seq);
45657 }
45658
45659 uint32_t dm_get_event_nr(struct mapped_device *md)
45660 {
45661- return atomic_read(&md->event_nr);
45662+ return atomic_read_unchecked(&md->event_nr);
45663 }
45664
45665 int dm_wait_event(struct mapped_device *md, int event_nr)
45666 {
45667 return wait_event_interruptible(md->eventq,
45668- (event_nr != atomic_read(&md->event_nr)));
45669+ (event_nr != atomic_read_unchecked(&md->event_nr)));
45670 }
45671
45672 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
45673diff --git a/drivers/md/md.c b/drivers/md/md.c
45674index 907534b..8b3554e 100644
45675--- a/drivers/md/md.c
45676+++ b/drivers/md/md.c
45677@@ -191,10 +191,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
45678 * start build, activate spare
45679 */
45680 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
45681-static atomic_t md_event_count;
45682+static atomic_unchecked_t md_event_count;
45683 void md_new_event(struct mddev *mddev)
45684 {
45685- atomic_inc(&md_event_count);
45686+ atomic_inc_unchecked(&md_event_count);
45687 wake_up(&md_event_waiters);
45688 }
45689 EXPORT_SYMBOL_GPL(md_new_event);
45690@@ -204,7 +204,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
45691 */
45692 static void md_new_event_inintr(struct mddev *mddev)
45693 {
45694- atomic_inc(&md_event_count);
45695+ atomic_inc_unchecked(&md_event_count);
45696 wake_up(&md_event_waiters);
45697 }
45698
45699@@ -1442,7 +1442,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
45700 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
45701 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
45702 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
45703- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45704+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45705
45706 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
45707 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
45708@@ -1693,7 +1693,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
45709 else
45710 sb->resync_offset = cpu_to_le64(0);
45711
45712- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
45713+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
45714
45715 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
45716 sb->size = cpu_to_le64(mddev->dev_sectors);
45717@@ -2564,7 +2564,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
45718 static ssize_t
45719 errors_show(struct md_rdev *rdev, char *page)
45720 {
45721- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
45722+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
45723 }
45724
45725 static ssize_t
45726@@ -2573,7 +2573,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
45727 char *e;
45728 unsigned long n = simple_strtoul(buf, &e, 10);
45729 if (*buf && (*e == 0 || *e == '\n')) {
45730- atomic_set(&rdev->corrected_errors, n);
45731+ atomic_set_unchecked(&rdev->corrected_errors, n);
45732 return len;
45733 }
45734 return -EINVAL;
45735@@ -3009,8 +3009,8 @@ int md_rdev_init(struct md_rdev *rdev)
45736 rdev->sb_loaded = 0;
45737 rdev->bb_page = NULL;
45738 atomic_set(&rdev->nr_pending, 0);
45739- atomic_set(&rdev->read_errors, 0);
45740- atomic_set(&rdev->corrected_errors, 0);
45741+ atomic_set_unchecked(&rdev->read_errors, 0);
45742+ atomic_set_unchecked(&rdev->corrected_errors, 0);
45743
45744 INIT_LIST_HEAD(&rdev->same_set);
45745 init_waitqueue_head(&rdev->blocked_wait);
45746@@ -7085,7 +7085,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
45747
45748 spin_unlock(&pers_lock);
45749 seq_printf(seq, "\n");
45750- seq->poll_event = atomic_read(&md_event_count);
45751+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45752 return 0;
45753 }
45754 if (v == (void*)2) {
45755@@ -7188,7 +7188,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
45756 return error;
45757
45758 seq = file->private_data;
45759- seq->poll_event = atomic_read(&md_event_count);
45760+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45761 return error;
45762 }
45763
45764@@ -7205,7 +7205,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
45765 /* always allow read */
45766 mask = POLLIN | POLLRDNORM;
45767
45768- if (seq->poll_event != atomic_read(&md_event_count))
45769+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
45770 mask |= POLLERR | POLLPRI;
45771 return mask;
45772 }
45773@@ -7252,7 +7252,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
45774 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
45775 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
45776 (int)part_stat_read(&disk->part0, sectors[1]) -
45777- atomic_read(&disk->sync_io);
45778+ atomic_read_unchecked(&disk->sync_io);
45779 /* sync IO will cause sync_io to increase before the disk_stats
45780 * as sync_io is counted when a request starts, and
45781 * disk_stats is counted when it completes.
45782diff --git a/drivers/md/md.h b/drivers/md/md.h
45783index 318ca8f..31e4478 100644
45784--- a/drivers/md/md.h
45785+++ b/drivers/md/md.h
45786@@ -94,13 +94,13 @@ struct md_rdev {
45787 * only maintained for arrays that
45788 * support hot removal
45789 */
45790- atomic_t read_errors; /* number of consecutive read errors that
45791+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
45792 * we have tried to ignore.
45793 */
45794 struct timespec last_read_error; /* monotonic time since our
45795 * last read error
45796 */
45797- atomic_t corrected_errors; /* number of corrected read errors,
45798+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
45799 * for reporting to userspace and storing
45800 * in superblock.
45801 */
45802@@ -476,7 +476,7 @@ extern void mddev_unlock(struct mddev *mddev);
45803
45804 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
45805 {
45806- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45807+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45808 }
45809
45810 struct md_personality
45811diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
45812index e8a9042..35bd145 100644
45813--- a/drivers/md/persistent-data/dm-space-map-metadata.c
45814+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
45815@@ -683,7 +683,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
45816 * Flick into a mode where all blocks get allocated in the new area.
45817 */
45818 smm->begin = old_len;
45819- memcpy(sm, &bootstrap_ops, sizeof(*sm));
45820+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
45821
45822 /*
45823 * Extend.
45824@@ -714,7 +714,7 @@ out:
45825 /*
45826 * Switch back to normal behaviour.
45827 */
45828- memcpy(sm, &ops, sizeof(*sm));
45829+ memcpy((void *)sm, &ops, sizeof(*sm));
45830 return r;
45831 }
45832
45833diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
45834index 3e6d115..ffecdeb 100644
45835--- a/drivers/md/persistent-data/dm-space-map.h
45836+++ b/drivers/md/persistent-data/dm-space-map.h
45837@@ -71,6 +71,7 @@ struct dm_space_map {
45838 dm_sm_threshold_fn fn,
45839 void *context);
45840 };
45841+typedef struct dm_space_map __no_const dm_space_map_no_const;
45842
45843 /*----------------------------------------------------------------*/
45844
45845diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
45846index d34e238..34f8d98 100644
45847--- a/drivers/md/raid1.c
45848+++ b/drivers/md/raid1.c
45849@@ -1922,7 +1922,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
45850 if (r1_sync_page_io(rdev, sect, s,
45851 bio->bi_io_vec[idx].bv_page,
45852 READ) != 0)
45853- atomic_add(s, &rdev->corrected_errors);
45854+ atomic_add_unchecked(s, &rdev->corrected_errors);
45855 }
45856 sectors -= s;
45857 sect += s;
45858@@ -2155,7 +2155,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
45859 !test_bit(Faulty, &rdev->flags)) {
45860 if (r1_sync_page_io(rdev, sect, s,
45861 conf->tmppage, READ)) {
45862- atomic_add(s, &rdev->corrected_errors);
45863+ atomic_add_unchecked(s, &rdev->corrected_errors);
45864 printk(KERN_INFO
45865 "md/raid1:%s: read error corrected "
45866 "(%d sectors at %llu on %s)\n",
45867diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
45868index a7196c4..439f012 100644
45869--- a/drivers/md/raid10.c
45870+++ b/drivers/md/raid10.c
45871@@ -1934,7 +1934,7 @@ static void end_sync_read(struct bio *bio, int error)
45872 /* The write handler will notice the lack of
45873 * R10BIO_Uptodate and record any errors etc
45874 */
45875- atomic_add(r10_bio->sectors,
45876+ atomic_add_unchecked(r10_bio->sectors,
45877 &conf->mirrors[d].rdev->corrected_errors);
45878
45879 /* for reconstruct, we always reschedule after a read.
45880@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45881 {
45882 struct timespec cur_time_mon;
45883 unsigned long hours_since_last;
45884- unsigned int read_errors = atomic_read(&rdev->read_errors);
45885+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
45886
45887 ktime_get_ts(&cur_time_mon);
45888
45889@@ -2313,9 +2313,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45890 * overflowing the shift of read_errors by hours_since_last.
45891 */
45892 if (hours_since_last >= 8 * sizeof(read_errors))
45893- atomic_set(&rdev->read_errors, 0);
45894+ atomic_set_unchecked(&rdev->read_errors, 0);
45895 else
45896- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
45897+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
45898 }
45899
45900 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
45901@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45902 return;
45903
45904 check_decay_read_errors(mddev, rdev);
45905- atomic_inc(&rdev->read_errors);
45906- if (atomic_read(&rdev->read_errors) > max_read_errors) {
45907+ atomic_inc_unchecked(&rdev->read_errors);
45908+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
45909 char b[BDEVNAME_SIZE];
45910 bdevname(rdev->bdev, b);
45911
45912@@ -2378,7 +2378,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45913 "md/raid10:%s: %s: Raid device exceeded "
45914 "read_error threshold [cur %d:max %d]\n",
45915 mdname(mddev), b,
45916- atomic_read(&rdev->read_errors), max_read_errors);
45917+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
45918 printk(KERN_NOTICE
45919 "md/raid10:%s: %s: Failing raid device\n",
45920 mdname(mddev), b);
45921@@ -2533,7 +2533,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45922 sect +
45923 choose_data_offset(r10_bio, rdev)),
45924 bdevname(rdev->bdev, b));
45925- atomic_add(s, &rdev->corrected_errors);
45926+ atomic_add_unchecked(s, &rdev->corrected_errors);
45927 }
45928
45929 rdev_dec_pending(rdev, mddev);
45930diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
45931index 007ab86..d11593d 100644
45932--- a/drivers/md/raid5.c
45933+++ b/drivers/md/raid5.c
45934@@ -947,23 +947,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
45935 struct bio_vec bvl;
45936 struct bvec_iter iter;
45937 struct page *bio_page;
45938- int page_offset;
45939+ s64 page_offset;
45940 struct async_submit_ctl submit;
45941 enum async_tx_flags flags = 0;
45942
45943 if (bio->bi_iter.bi_sector >= sector)
45944- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
45945+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
45946 else
45947- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
45948+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
45949
45950 if (frombio)
45951 flags |= ASYNC_TX_FENCE;
45952 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
45953
45954 bio_for_each_segment(bvl, bio, iter) {
45955- int len = bvl.bv_len;
45956- int clen;
45957- int b_offset = 0;
45958+ s64 len = bvl.bv_len;
45959+ s64 clen;
45960+ s64 b_offset = 0;
45961
45962 if (page_offset < 0) {
45963 b_offset = -page_offset;
45964@@ -1727,6 +1727,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
45965 return 1;
45966 }
45967
45968+#ifdef CONFIG_GRKERNSEC_HIDESYM
45969+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
45970+#endif
45971+
45972 static int grow_stripes(struct r5conf *conf, int num)
45973 {
45974 struct kmem_cache *sc;
45975@@ -1738,7 +1742,11 @@ static int grow_stripes(struct r5conf *conf, int num)
45976 "raid%d-%s", conf->level, mdname(conf->mddev));
45977 else
45978 sprintf(conf->cache_name[0],
45979+#ifdef CONFIG_GRKERNSEC_HIDESYM
45980+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
45981+#else
45982 "raid%d-%p", conf->level, conf->mddev);
45983+#endif
45984 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
45985
45986 conf->active_name = 0;
45987@@ -2015,21 +2023,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
45988 mdname(conf->mddev), STRIPE_SECTORS,
45989 (unsigned long long)s,
45990 bdevname(rdev->bdev, b));
45991- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
45992+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
45993 clear_bit(R5_ReadError, &sh->dev[i].flags);
45994 clear_bit(R5_ReWrite, &sh->dev[i].flags);
45995 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
45996 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
45997
45998- if (atomic_read(&rdev->read_errors))
45999- atomic_set(&rdev->read_errors, 0);
46000+ if (atomic_read_unchecked(&rdev->read_errors))
46001+ atomic_set_unchecked(&rdev->read_errors, 0);
46002 } else {
46003 const char *bdn = bdevname(rdev->bdev, b);
46004 int retry = 0;
46005 int set_bad = 0;
46006
46007 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
46008- atomic_inc(&rdev->read_errors);
46009+ atomic_inc_unchecked(&rdev->read_errors);
46010 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
46011 printk_ratelimited(
46012 KERN_WARNING
46013@@ -2057,7 +2065,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
46014 mdname(conf->mddev),
46015 (unsigned long long)s,
46016 bdn);
46017- } else if (atomic_read(&rdev->read_errors)
46018+ } else if (atomic_read_unchecked(&rdev->read_errors)
46019 > conf->max_nr_stripes)
46020 printk(KERN_WARNING
46021 "md/raid:%s: Too many read errors, failing device %s.\n",
46022diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
46023index 983db75..ef9248c 100644
46024--- a/drivers/media/dvb-core/dvbdev.c
46025+++ b/drivers/media/dvb-core/dvbdev.c
46026@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
46027 const struct dvb_device *template, void *priv, int type)
46028 {
46029 struct dvb_device *dvbdev;
46030- struct file_operations *dvbdevfops;
46031+ file_operations_no_const *dvbdevfops;
46032 struct device *clsdev;
46033 int minor;
46034 int id;
46035diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
46036index 6ad22b6..6e90e2a 100644
46037--- a/drivers/media/dvb-frontends/af9033.h
46038+++ b/drivers/media/dvb-frontends/af9033.h
46039@@ -96,6 +96,6 @@ struct af9033_ops {
46040 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
46041 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
46042 int onoff);
46043-};
46044+} __no_const;
46045
46046 #endif /* AF9033_H */
46047diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
46048index 9b6c3bb..baeb5c7 100644
46049--- a/drivers/media/dvb-frontends/dib3000.h
46050+++ b/drivers/media/dvb-frontends/dib3000.h
46051@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
46052 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
46053 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
46054 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
46055-};
46056+} __no_const;
46057
46058 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
46059 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
46060diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
46061index 1fea0e9..321ce8f 100644
46062--- a/drivers/media/dvb-frontends/dib7000p.h
46063+++ b/drivers/media/dvb-frontends/dib7000p.h
46064@@ -64,7 +64,7 @@ struct dib7000p_ops {
46065 int (*get_adc_power)(struct dvb_frontend *fe);
46066 int (*slave_reset)(struct dvb_frontend *fe);
46067 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
46068-};
46069+} __no_const;
46070
46071 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
46072 void *dib7000p_attach(struct dib7000p_ops *ops);
46073diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
46074index 84cc103..5780c54 100644
46075--- a/drivers/media/dvb-frontends/dib8000.h
46076+++ b/drivers/media/dvb-frontends/dib8000.h
46077@@ -61,7 +61,7 @@ struct dib8000_ops {
46078 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
46079 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
46080 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
46081-};
46082+} __no_const;
46083
46084 #if IS_ENABLED(CONFIG_DVB_DIB8000)
46085 void *dib8000_attach(struct dib8000_ops *ops);
46086diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
46087index 860c98fc..497fa25 100644
46088--- a/drivers/media/pci/cx88/cx88-video.c
46089+++ b/drivers/media/pci/cx88/cx88-video.c
46090@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
46091
46092 /* ------------------------------------------------------------------ */
46093
46094-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46095-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46096-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46097+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46098+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46099+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46100
46101 module_param_array(video_nr, int, NULL, 0444);
46102 module_param_array(vbi_nr, int, NULL, 0444);
46103diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
46104index 802642d..5534900 100644
46105--- a/drivers/media/pci/ivtv/ivtv-driver.c
46106+++ b/drivers/media/pci/ivtv/ivtv-driver.c
46107@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
46108 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
46109
46110 /* ivtv instance counter */
46111-static atomic_t ivtv_instance = ATOMIC_INIT(0);
46112+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
46113
46114 /* Parameter declarations */
46115 static int cardtype[IVTV_MAX_CARDS];
46116diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
46117index 570d119..ed25830 100644
46118--- a/drivers/media/pci/solo6x10/solo6x10-core.c
46119+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
46120@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
46121
46122 static int solo_sysfs_init(struct solo_dev *solo_dev)
46123 {
46124- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
46125+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
46126 struct device *dev = &solo_dev->dev;
46127 const char *driver;
46128 int i;
46129diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
46130index 7ddc767..1c24361 100644
46131--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
46132+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
46133@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
46134
46135 int solo_g723_init(struct solo_dev *solo_dev)
46136 {
46137- static struct snd_device_ops ops = { NULL };
46138+ static struct snd_device_ops ops = { };
46139 struct snd_card *card;
46140 struct snd_kcontrol_new kctl;
46141 char name[32];
46142diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46143index 8c84846..27b4f83 100644
46144--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
46145+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46146@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
46147
46148 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
46149 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
46150- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
46151+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
46152 if (p2m_id < 0)
46153 p2m_id = -p2m_id;
46154 }
46155diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
46156index 1ca54b0..7d7cb9a 100644
46157--- a/drivers/media/pci/solo6x10/solo6x10.h
46158+++ b/drivers/media/pci/solo6x10/solo6x10.h
46159@@ -218,7 +218,7 @@ struct solo_dev {
46160
46161 /* P2M DMA Engine */
46162 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
46163- atomic_t p2m_count;
46164+ atomic_unchecked_t p2m_count;
46165 int p2m_jiffies;
46166 unsigned int p2m_timeouts;
46167
46168diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
46169index c135165..dc69499 100644
46170--- a/drivers/media/pci/tw68/tw68-core.c
46171+++ b/drivers/media/pci/tw68/tw68-core.c
46172@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
46173 module_param_array(card, int, NULL, 0444);
46174 MODULE_PARM_DESC(card, "card type");
46175
46176-static atomic_t tw68_instance = ATOMIC_INIT(0);
46177+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
46178
46179 /* ------------------------------------------------------------------ */
46180
46181diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
46182index ba2d8f9..1566684 100644
46183--- a/drivers/media/platform/omap/omap_vout.c
46184+++ b/drivers/media/platform/omap/omap_vout.c
46185@@ -63,7 +63,6 @@ enum omap_vout_channels {
46186 OMAP_VIDEO2,
46187 };
46188
46189-static struct videobuf_queue_ops video_vbq_ops;
46190 /* Variables configurable through module params*/
46191 static u32 video1_numbuffers = 3;
46192 static u32 video2_numbuffers = 3;
46193@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
46194 {
46195 struct videobuf_queue *q;
46196 struct omap_vout_device *vout = NULL;
46197+ static struct videobuf_queue_ops video_vbq_ops = {
46198+ .buf_setup = omap_vout_buffer_setup,
46199+ .buf_prepare = omap_vout_buffer_prepare,
46200+ .buf_release = omap_vout_buffer_release,
46201+ .buf_queue = omap_vout_buffer_queue,
46202+ };
46203
46204 vout = video_drvdata(file);
46205 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
46206@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
46207 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
46208
46209 q = &vout->vbq;
46210- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
46211- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
46212- video_vbq_ops.buf_release = omap_vout_buffer_release;
46213- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
46214 spin_lock_init(&vout->vbq_lock);
46215
46216 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
46217diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
46218index fb2acc5..a2fcbdc4 100644
46219--- a/drivers/media/platform/s5p-tv/mixer.h
46220+++ b/drivers/media/platform/s5p-tv/mixer.h
46221@@ -156,7 +156,7 @@ struct mxr_layer {
46222 /** layer index (unique identifier) */
46223 int idx;
46224 /** callbacks for layer methods */
46225- struct mxr_layer_ops ops;
46226+ struct mxr_layer_ops *ops;
46227 /** format array */
46228 const struct mxr_format **fmt_array;
46229 /** size of format array */
46230diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46231index 74344c7..a39e70e 100644
46232--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46233+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46234@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
46235 {
46236 struct mxr_layer *layer;
46237 int ret;
46238- struct mxr_layer_ops ops = {
46239+ static struct mxr_layer_ops ops = {
46240 .release = mxr_graph_layer_release,
46241 .buffer_set = mxr_graph_buffer_set,
46242 .stream_set = mxr_graph_stream_set,
46243diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
46244index b713403..53cb5ad 100644
46245--- a/drivers/media/platform/s5p-tv/mixer_reg.c
46246+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
46247@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
46248 layer->update_buf = next;
46249 }
46250
46251- layer->ops.buffer_set(layer, layer->update_buf);
46252+ layer->ops->buffer_set(layer, layer->update_buf);
46253
46254 if (done && done != layer->shadow_buf)
46255 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
46256diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
46257index 72d4f2e..4b2ea0d 100644
46258--- a/drivers/media/platform/s5p-tv/mixer_video.c
46259+++ b/drivers/media/platform/s5p-tv/mixer_video.c
46260@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
46261 layer->geo.src.height = layer->geo.src.full_height;
46262
46263 mxr_geometry_dump(mdev, &layer->geo);
46264- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46265+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46266 mxr_geometry_dump(mdev, &layer->geo);
46267 }
46268
46269@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
46270 layer->geo.dst.full_width = mbus_fmt.width;
46271 layer->geo.dst.full_height = mbus_fmt.height;
46272 layer->geo.dst.field = mbus_fmt.field;
46273- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46274+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46275
46276 mxr_geometry_dump(mdev, &layer->geo);
46277 }
46278@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
46279 /* set source size to highest accepted value */
46280 geo->src.full_width = max(geo->dst.full_width, pix->width);
46281 geo->src.full_height = max(geo->dst.full_height, pix->height);
46282- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46283+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46284 mxr_geometry_dump(mdev, &layer->geo);
46285 /* set cropping to total visible screen */
46286 geo->src.width = pix->width;
46287@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
46288 geo->src.x_offset = 0;
46289 geo->src.y_offset = 0;
46290 /* assure consistency of geometry */
46291- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46292+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46293 mxr_geometry_dump(mdev, &layer->geo);
46294 /* set full size to lowest possible value */
46295 geo->src.full_width = 0;
46296 geo->src.full_height = 0;
46297- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46298+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46299 mxr_geometry_dump(mdev, &layer->geo);
46300
46301 /* returning results */
46302@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
46303 target->width = s->r.width;
46304 target->height = s->r.height;
46305
46306- layer->ops.fix_geometry(layer, stage, s->flags);
46307+ layer->ops->fix_geometry(layer, stage, s->flags);
46308
46309 /* retrieve update selection rectangle */
46310 res.left = target->x_offset;
46311@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
46312 mxr_output_get(mdev);
46313
46314 mxr_layer_update_output(layer);
46315- layer->ops.format_set(layer);
46316+ layer->ops->format_set(layer);
46317 /* enabling layer in hardware */
46318 spin_lock_irqsave(&layer->enq_slock, flags);
46319 layer->state = MXR_LAYER_STREAMING;
46320 spin_unlock_irqrestore(&layer->enq_slock, flags);
46321
46322- layer->ops.stream_set(layer, MXR_ENABLE);
46323+ layer->ops->stream_set(layer, MXR_ENABLE);
46324 mxr_streamer_get(mdev);
46325
46326 return 0;
46327@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
46328 spin_unlock_irqrestore(&layer->enq_slock, flags);
46329
46330 /* disabling layer in hardware */
46331- layer->ops.stream_set(layer, MXR_DISABLE);
46332+ layer->ops->stream_set(layer, MXR_DISABLE);
46333 /* remove one streamer */
46334 mxr_streamer_put(mdev);
46335 /* allow changes in output configuration */
46336@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
46337
46338 void mxr_layer_release(struct mxr_layer *layer)
46339 {
46340- if (layer->ops.release)
46341- layer->ops.release(layer);
46342+ if (layer->ops->release)
46343+ layer->ops->release(layer);
46344 }
46345
46346 void mxr_base_layer_release(struct mxr_layer *layer)
46347@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
46348
46349 layer->mdev = mdev;
46350 layer->idx = idx;
46351- layer->ops = *ops;
46352+ layer->ops = ops;
46353
46354 spin_lock_init(&layer->enq_slock);
46355 INIT_LIST_HEAD(&layer->enq_list);
46356diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46357index c9388c4..ce71ece 100644
46358--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46359+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46360@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
46361 {
46362 struct mxr_layer *layer;
46363 int ret;
46364- struct mxr_layer_ops ops = {
46365+ static struct mxr_layer_ops ops = {
46366 .release = mxr_vp_layer_release,
46367 .buffer_set = mxr_vp_buffer_set,
46368 .stream_set = mxr_vp_stream_set,
46369diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
46370index 82affae..42833ec 100644
46371--- a/drivers/media/radio/radio-cadet.c
46372+++ b/drivers/media/radio/radio-cadet.c
46373@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46374 unsigned char readbuf[RDS_BUFFER];
46375 int i = 0;
46376
46377+ if (count > RDS_BUFFER)
46378+ return -EFAULT;
46379 mutex_lock(&dev->lock);
46380 if (dev->rdsstat == 0)
46381 cadet_start_rds(dev);
46382@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46383 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
46384 mutex_unlock(&dev->lock);
46385
46386- if (i && copy_to_user(data, readbuf, i))
46387- return -EFAULT;
46388+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
46389+ i = -EFAULT;
46390+
46391 return i;
46392 }
46393
46394diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
46395index 5236035..c622c74 100644
46396--- a/drivers/media/radio/radio-maxiradio.c
46397+++ b/drivers/media/radio/radio-maxiradio.c
46398@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
46399 /* TEA5757 pin mappings */
46400 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
46401
46402-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
46403+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
46404
46405 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
46406 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
46407diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
46408index 050b3bb..79f62b9 100644
46409--- a/drivers/media/radio/radio-shark.c
46410+++ b/drivers/media/radio/radio-shark.c
46411@@ -79,7 +79,7 @@ struct shark_device {
46412 u32 last_val;
46413 };
46414
46415-static atomic_t shark_instance = ATOMIC_INIT(0);
46416+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46417
46418 static void shark_write_val(struct snd_tea575x *tea, u32 val)
46419 {
46420diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
46421index 8654e0d..0608a64 100644
46422--- a/drivers/media/radio/radio-shark2.c
46423+++ b/drivers/media/radio/radio-shark2.c
46424@@ -74,7 +74,7 @@ struct shark_device {
46425 u8 *transfer_buffer;
46426 };
46427
46428-static atomic_t shark_instance = ATOMIC_INIT(0);
46429+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46430
46431 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
46432 {
46433diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
46434index dccf586..d5db411 100644
46435--- a/drivers/media/radio/radio-si476x.c
46436+++ b/drivers/media/radio/radio-si476x.c
46437@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
46438 struct si476x_radio *radio;
46439 struct v4l2_ctrl *ctrl;
46440
46441- static atomic_t instance = ATOMIC_INIT(0);
46442+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
46443
46444 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
46445 if (!radio)
46446diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
46447index 704397f..4d05977 100644
46448--- a/drivers/media/radio/wl128x/fmdrv_common.c
46449+++ b/drivers/media/radio/wl128x/fmdrv_common.c
46450@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
46451 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
46452
46453 /* Radio Nr */
46454-static u32 radio_nr = -1;
46455+static int radio_nr = -1;
46456 module_param(radio_nr, int, 0444);
46457 MODULE_PARM_DESC(radio_nr, "Radio Nr");
46458
46459diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46460index 9fd1527..8927230 100644
46461--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
46462+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46463@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
46464
46465 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
46466 {
46467- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
46468- char result[64];
46469- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
46470- sizeof(result), 0);
46471+ char *buf;
46472+ char *result;
46473+ int retval;
46474+
46475+ buf = kmalloc(2, GFP_KERNEL);
46476+ if (buf == NULL)
46477+ return -ENOMEM;
46478+ result = kmalloc(64, GFP_KERNEL);
46479+ if (result == NULL) {
46480+ kfree(buf);
46481+ return -ENOMEM;
46482+ }
46483+
46484+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
46485+ buf[1] = enable ? 1 : 0;
46486+
46487+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
46488+
46489+ kfree(buf);
46490+ kfree(result);
46491+ return retval;
46492 }
46493
46494 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
46495 {
46496- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
46497- char state[3];
46498- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
46499+ char *buf;
46500+ char *state;
46501+ int retval;
46502+
46503+ buf = kmalloc(2, GFP_KERNEL);
46504+ if (buf == NULL)
46505+ return -ENOMEM;
46506+ state = kmalloc(3, GFP_KERNEL);
46507+ if (state == NULL) {
46508+ kfree(buf);
46509+ return -ENOMEM;
46510+ }
46511+
46512+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
46513+ buf[1] = enable ? 1 : 0;
46514+
46515+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
46516+
46517+ kfree(buf);
46518+ kfree(state);
46519+ return retval;
46520 }
46521
46522 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46523 {
46524- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
46525- char state[3];
46526+ char *query;
46527+ char *state;
46528 int ret;
46529+ query = kmalloc(1, GFP_KERNEL);
46530+ if (query == NULL)
46531+ return -ENOMEM;
46532+ state = kmalloc(3, GFP_KERNEL);
46533+ if (state == NULL) {
46534+ kfree(query);
46535+ return -ENOMEM;
46536+ }
46537+
46538+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
46539
46540 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
46541
46542- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
46543- sizeof(state), 0);
46544+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
46545 if (ret < 0) {
46546 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
46547 "state info\n");
46548@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46549
46550 /* Copy this pointer as we are gonna need it in the release phase */
46551 cinergyt2_usb_device = adap->dev;
46552-
46553+ kfree(query);
46554+ kfree(state);
46555 return 0;
46556 }
46557
46558@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
46559 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46560 {
46561 struct cinergyt2_state *st = d->priv;
46562- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
46563+ u8 *key, *cmd;
46564 int i;
46565
46566+ cmd = kmalloc(1, GFP_KERNEL);
46567+ if (cmd == NULL)
46568+ return -EINVAL;
46569+ key = kzalloc(5, GFP_KERNEL);
46570+ if (key == NULL) {
46571+ kfree(cmd);
46572+ return -EINVAL;
46573+ }
46574+
46575+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
46576+
46577 *state = REMOTE_NO_KEY_PRESSED;
46578
46579- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
46580+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
46581 if (key[4] == 0xff) {
46582 /* key repeat */
46583 st->rc_counter++;
46584@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46585 *event = d->last_event;
46586 deb_rc("repeat key, event %x\n",
46587 *event);
46588- return 0;
46589+ goto out;
46590 }
46591 }
46592 deb_rc("repeated key (non repeatable)\n");
46593 }
46594- return 0;
46595+ goto out;
46596 }
46597
46598 /* hack to pass checksum on the custom field */
46599@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46600
46601 deb_rc("key: %*ph\n", 5, key);
46602 }
46603+out:
46604+ kfree(cmd);
46605+ kfree(key);
46606 return 0;
46607 }
46608
46609diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46610index c890fe4..f9b2ae6 100644
46611--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46612+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46613@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
46614 fe_status_t *status)
46615 {
46616 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46617- struct dvbt_get_status_msg result;
46618- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46619+ struct dvbt_get_status_msg *result;
46620+ u8 *cmd;
46621 int ret;
46622
46623- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
46624- sizeof(result), 0);
46625+ cmd = kmalloc(1, GFP_KERNEL);
46626+ if (cmd == NULL)
46627+ return -ENOMEM;
46628+ result = kmalloc(sizeof(*result), GFP_KERNEL);
46629+ if (result == NULL) {
46630+ kfree(cmd);
46631+ return -ENOMEM;
46632+ }
46633+
46634+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46635+
46636+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
46637+ sizeof(*result), 0);
46638 if (ret < 0)
46639- return ret;
46640+ goto out;
46641
46642 *status = 0;
46643
46644- if (0xffff - le16_to_cpu(result.gain) > 30)
46645+ if (0xffff - le16_to_cpu(result->gain) > 30)
46646 *status |= FE_HAS_SIGNAL;
46647- if (result.lock_bits & (1 << 6))
46648+ if (result->lock_bits & (1 << 6))
46649 *status |= FE_HAS_LOCK;
46650- if (result.lock_bits & (1 << 5))
46651+ if (result->lock_bits & (1 << 5))
46652 *status |= FE_HAS_SYNC;
46653- if (result.lock_bits & (1 << 4))
46654+ if (result->lock_bits & (1 << 4))
46655 *status |= FE_HAS_CARRIER;
46656- if (result.lock_bits & (1 << 1))
46657+ if (result->lock_bits & (1 << 1))
46658 *status |= FE_HAS_VITERBI;
46659
46660 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
46661 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
46662 *status &= ~FE_HAS_LOCK;
46663
46664- return 0;
46665+out:
46666+ kfree(cmd);
46667+ kfree(result);
46668+ return ret;
46669 }
46670
46671 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
46672 {
46673 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46674- struct dvbt_get_status_msg status;
46675- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46676+ struct dvbt_get_status_msg *status;
46677+ char *cmd;
46678 int ret;
46679
46680- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46681- sizeof(status), 0);
46682+ cmd = kmalloc(1, GFP_KERNEL);
46683+ if (cmd == NULL)
46684+ return -ENOMEM;
46685+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46686+ if (status == NULL) {
46687+ kfree(cmd);
46688+ return -ENOMEM;
46689+ }
46690+
46691+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46692+
46693+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46694+ sizeof(*status), 0);
46695 if (ret < 0)
46696- return ret;
46697+ goto out;
46698
46699- *ber = le32_to_cpu(status.viterbi_error_rate);
46700+ *ber = le32_to_cpu(status->viterbi_error_rate);
46701+out:
46702+ kfree(cmd);
46703+ kfree(status);
46704 return 0;
46705 }
46706
46707 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
46708 {
46709 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46710- struct dvbt_get_status_msg status;
46711- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46712+ struct dvbt_get_status_msg *status;
46713+ u8 *cmd;
46714 int ret;
46715
46716- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
46717- sizeof(status), 0);
46718+ cmd = kmalloc(1, GFP_KERNEL);
46719+ if (cmd == NULL)
46720+ return -ENOMEM;
46721+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46722+ if (status == NULL) {
46723+ kfree(cmd);
46724+ return -ENOMEM;
46725+ }
46726+
46727+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46728+
46729+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
46730+ sizeof(*status), 0);
46731 if (ret < 0) {
46732 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
46733 ret);
46734- return ret;
46735+ goto out;
46736 }
46737- *unc = le32_to_cpu(status.uncorrected_block_count);
46738- return 0;
46739+ *unc = le32_to_cpu(status->uncorrected_block_count);
46740+
46741+out:
46742+ kfree(cmd);
46743+ kfree(status);
46744+ return ret;
46745 }
46746
46747 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
46748 u16 *strength)
46749 {
46750 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46751- struct dvbt_get_status_msg status;
46752- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46753+ struct dvbt_get_status_msg *status;
46754+ char *cmd;
46755 int ret;
46756
46757- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46758- sizeof(status), 0);
46759+ cmd = kmalloc(1, GFP_KERNEL);
46760+ if (cmd == NULL)
46761+ return -ENOMEM;
46762+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46763+ if (status == NULL) {
46764+ kfree(cmd);
46765+ return -ENOMEM;
46766+ }
46767+
46768+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46769+
46770+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46771+ sizeof(*status), 0);
46772 if (ret < 0) {
46773 err("cinergyt2_fe_read_signal_strength() Failed!"
46774 " (Error=%d)\n", ret);
46775- return ret;
46776+ goto out;
46777 }
46778- *strength = (0xffff - le16_to_cpu(status.gain));
46779+ *strength = (0xffff - le16_to_cpu(status->gain));
46780+
46781+out:
46782+ kfree(cmd);
46783+ kfree(status);
46784 return 0;
46785 }
46786
46787 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
46788 {
46789 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46790- struct dvbt_get_status_msg status;
46791- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46792+ struct dvbt_get_status_msg *status;
46793+ char *cmd;
46794 int ret;
46795
46796- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46797- sizeof(status), 0);
46798+ cmd = kmalloc(1, GFP_KERNEL);
46799+ if (cmd == NULL)
46800+ return -ENOMEM;
46801+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46802+ if (status == NULL) {
46803+ kfree(cmd);
46804+ return -ENOMEM;
46805+ }
46806+
46807+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46808+
46809+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46810+ sizeof(*status), 0);
46811 if (ret < 0) {
46812 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
46813- return ret;
46814+ goto out;
46815 }
46816- *snr = (status.snr << 8) | status.snr;
46817- return 0;
46818+ *snr = (status->snr << 8) | status->snr;
46819+
46820+out:
46821+ kfree(cmd);
46822+ kfree(status);
46823+ return ret;
46824 }
46825
46826 static int cinergyt2_fe_init(struct dvb_frontend *fe)
46827@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
46828 {
46829 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
46830 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46831- struct dvbt_set_parameters_msg param;
46832- char result[2];
46833+ struct dvbt_set_parameters_msg *param;
46834+ char *result;
46835 int err;
46836
46837- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46838- param.tps = cpu_to_le16(compute_tps(fep));
46839- param.freq = cpu_to_le32(fep->frequency / 1000);
46840- param.flags = 0;
46841+ result = kmalloc(2, GFP_KERNEL);
46842+ if (result == NULL)
46843+ return -ENOMEM;
46844+ param = kmalloc(sizeof(*param), GFP_KERNEL);
46845+ if (param == NULL) {
46846+ kfree(result);
46847+ return -ENOMEM;
46848+ }
46849+
46850+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46851+ param->tps = cpu_to_le16(compute_tps(fep));
46852+ param->freq = cpu_to_le32(fep->frequency / 1000);
46853+ param->flags = 0;
46854
46855 switch (fep->bandwidth_hz) {
46856 default:
46857 case 8000000:
46858- param.bandwidth = 8;
46859+ param->bandwidth = 8;
46860 break;
46861 case 7000000:
46862- param.bandwidth = 7;
46863+ param->bandwidth = 7;
46864 break;
46865 case 6000000:
46866- param.bandwidth = 6;
46867+ param->bandwidth = 6;
46868 break;
46869 }
46870
46871 err = dvb_usb_generic_rw(state->d,
46872- (char *)&param, sizeof(param),
46873- result, sizeof(result), 0);
46874+ (char *)param, sizeof(*param),
46875+ result, 2, 0);
46876 if (err < 0)
46877 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
46878
46879- return (err < 0) ? err : 0;
46880+ kfree(result);
46881+ kfree(param);
46882+ return err;
46883 }
46884
46885 static void cinergyt2_fe_release(struct dvb_frontend *fe)
46886diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46887index 733a7ff..f8b52e3 100644
46888--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46889+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46890@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
46891
46892 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
46893 {
46894- struct hexline hx;
46895- u8 reset;
46896+ struct hexline *hx;
46897+ u8 *reset;
46898 int ret,pos=0;
46899
46900+ reset = kmalloc(1, GFP_KERNEL);
46901+ if (reset == NULL)
46902+ return -ENOMEM;
46903+
46904+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
46905+ if (hx == NULL) {
46906+ kfree(reset);
46907+ return -ENOMEM;
46908+ }
46909+
46910 /* stop the CPU */
46911- reset = 1;
46912- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
46913+ reset[0] = 1;
46914+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
46915 err("could not stop the USB controller CPU.");
46916
46917- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
46918- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
46919- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
46920+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
46921+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
46922+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
46923
46924- if (ret != hx.len) {
46925+ if (ret != hx->len) {
46926 err("error while transferring firmware "
46927 "(transferred size: %d, block size: %d)",
46928- ret,hx.len);
46929+ ret,hx->len);
46930 ret = -EINVAL;
46931 break;
46932 }
46933 }
46934 if (ret < 0) {
46935 err("firmware download failed at %d with %d",pos,ret);
46936+ kfree(reset);
46937+ kfree(hx);
46938 return ret;
46939 }
46940
46941 if (ret == 0) {
46942 /* restart the CPU */
46943- reset = 0;
46944- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
46945+ reset[0] = 0;
46946+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
46947 err("could not restart the USB controller CPU.");
46948 ret = -EINVAL;
46949 }
46950 } else
46951 ret = -EIO;
46952
46953+ kfree(reset);
46954+ kfree(hx);
46955+
46956 return ret;
46957 }
46958 EXPORT_SYMBOL(usb_cypress_load_firmware);
46959diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
46960index 1a3df10..57997a5 100644
46961--- a/drivers/media/usb/dvb-usb/dw2102.c
46962+++ b/drivers/media/usb/dvb-usb/dw2102.c
46963@@ -118,7 +118,7 @@ struct su3000_state {
46964
46965 struct s6x0_state {
46966 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
46967-};
46968+} __no_const;
46969
46970 /* debug */
46971 static int dvb_usb_dw2102_debug;
46972diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
46973index 5801ae7..83f71fa 100644
46974--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
46975+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
46976@@ -87,8 +87,11 @@ struct technisat_usb2_state {
46977 static int technisat_usb2_i2c_access(struct usb_device *udev,
46978 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
46979 {
46980- u8 b[64];
46981- int ret, actual_length;
46982+ u8 *b = kmalloc(64, GFP_KERNEL);
46983+ int ret, actual_length, error = 0;
46984+
46985+ if (b == NULL)
46986+ return -ENOMEM;
46987
46988 deb_i2c("i2c-access: %02x, tx: ", device_addr);
46989 debug_dump(tx, txlen, deb_i2c);
46990@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46991
46992 if (ret < 0) {
46993 err("i2c-error: out failed %02x = %d", device_addr, ret);
46994- return -ENODEV;
46995+ error = -ENODEV;
46996+ goto out;
46997 }
46998
46999 ret = usb_bulk_msg(udev,
47000@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47001 b, 64, &actual_length, 1000);
47002 if (ret < 0) {
47003 err("i2c-error: in failed %02x = %d", device_addr, ret);
47004- return -ENODEV;
47005+ error = -ENODEV;
47006+ goto out;
47007 }
47008
47009 if (b[0] != I2C_STATUS_OK) {
47010@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47011 /* handle tuner-i2c-nak */
47012 if (!(b[0] == I2C_STATUS_NAK &&
47013 device_addr == 0x60
47014- /* && device_is_technisat_usb2 */))
47015- return -ENODEV;
47016+ /* && device_is_technisat_usb2 */)) {
47017+ error = -ENODEV;
47018+ goto out;
47019+ }
47020 }
47021
47022 deb_i2c("status: %d, ", b[0]);
47023@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47024
47025 deb_i2c("\n");
47026
47027- return 0;
47028+out:
47029+ kfree(b);
47030+ return error;
47031 }
47032
47033 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
47034@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47035 {
47036 int ret;
47037
47038- u8 led[8] = {
47039- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47040- 0
47041- };
47042+ u8 *led = kzalloc(8, GFP_KERNEL);
47043+
47044+ if (led == NULL)
47045+ return -ENOMEM;
47046
47047 if (disable_led_control && state != TECH_LED_OFF)
47048 return 0;
47049
47050+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
47051+
47052 switch (state) {
47053 case TECH_LED_ON:
47054 led[1] = 0x82;
47055@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47056 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47057 USB_TYPE_VENDOR | USB_DIR_OUT,
47058 0, 0,
47059- led, sizeof(led), 500);
47060+ led, 8, 500);
47061
47062 mutex_unlock(&d->i2c_mutex);
47063+
47064+ kfree(led);
47065+
47066 return ret;
47067 }
47068
47069 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
47070 {
47071 int ret;
47072- u8 b = 0;
47073+ u8 *b = kzalloc(1, GFP_KERNEL);
47074+
47075+ if (b == NULL)
47076+ return -ENOMEM;
47077
47078 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
47079 return -EAGAIN;
47080@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
47081 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
47082 USB_TYPE_VENDOR | USB_DIR_OUT,
47083 (red << 8) | green, 0,
47084- &b, 1, 500);
47085+ b, 1, 500);
47086
47087 mutex_unlock(&d->i2c_mutex);
47088
47089+ kfree(b);
47090+
47091 return ret;
47092 }
47093
47094@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47095 struct dvb_usb_device_description **desc, int *cold)
47096 {
47097 int ret;
47098- u8 version[3];
47099+ u8 *version = kmalloc(3, GFP_KERNEL);
47100
47101 /* first select the interface */
47102 if (usb_set_interface(udev, 0, 1) != 0)
47103@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47104
47105 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
47106
47107+ if (version == NULL)
47108+ return 0;
47109+
47110 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
47111 GET_VERSION_INFO_VENDOR_REQUEST,
47112 USB_TYPE_VENDOR | USB_DIR_IN,
47113 0, 0,
47114- version, sizeof(version), 500);
47115+ version, 3, 500);
47116
47117 if (ret < 0)
47118 *cold = 1;
47119@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47120 *cold = 0;
47121 }
47122
47123+ kfree(version);
47124+
47125 return 0;
47126 }
47127
47128@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
47129
47130 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47131 {
47132- u8 buf[62], *b;
47133+ u8 *buf, *b;
47134 int ret;
47135 struct ir_raw_event ev;
47136
47137+ buf = kmalloc(62, GFP_KERNEL);
47138+
47139+ if (buf == NULL)
47140+ return -ENOMEM;
47141+
47142 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
47143 buf[1] = 0x08;
47144 buf[2] = 0x8f;
47145@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47146 GET_IR_DATA_VENDOR_REQUEST,
47147 USB_TYPE_VENDOR | USB_DIR_IN,
47148 0x8080, 0,
47149- buf, sizeof(buf), 500);
47150+ buf, 62, 500);
47151
47152 unlock:
47153 mutex_unlock(&d->i2c_mutex);
47154
47155- if (ret < 0)
47156+ if (ret < 0) {
47157+ kfree(buf);
47158 return ret;
47159+ }
47160
47161- if (ret == 1)
47162+ if (ret == 1) {
47163+ kfree(buf);
47164 return 0; /* no key pressed */
47165+ }
47166
47167 /* decoding */
47168 b = buf+1;
47169@@ -656,6 +689,8 @@ unlock:
47170
47171 ir_raw_event_handle(d->rc_dev);
47172
47173+ kfree(buf);
47174+
47175 return 1;
47176 }
47177
47178diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47179index af63543..0436f20 100644
47180--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47181+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47182@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47183 * by passing a very big num_planes value */
47184 uplane = compat_alloc_user_space(num_planes *
47185 sizeof(struct v4l2_plane));
47186- kp->m.planes = (__force struct v4l2_plane *)uplane;
47187+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
47188
47189 while (--num_planes >= 0) {
47190 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
47191@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47192 if (num_planes == 0)
47193 return 0;
47194
47195- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
47196+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
47197 if (get_user(p, &up->m.planes))
47198 return -EFAULT;
47199 uplane32 = compat_ptr(p);
47200@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
47201 get_user(kp->flags, &up->flags) ||
47202 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
47203 return -EFAULT;
47204- kp->base = (__force void *)compat_ptr(tmp);
47205+ kp->base = (__force_kernel void *)compat_ptr(tmp);
47206 return 0;
47207 }
47208
47209@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47210 n * sizeof(struct v4l2_ext_control32)))
47211 return -EFAULT;
47212 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
47213- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
47214+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
47215 while (--n >= 0) {
47216 u32 id;
47217
47218@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47219 {
47220 struct v4l2_ext_control32 __user *ucontrols;
47221 struct v4l2_ext_control __user *kcontrols =
47222- (__force struct v4l2_ext_control __user *)kp->controls;
47223+ (struct v4l2_ext_control __force_user *)kp->controls;
47224 int n = kp->count;
47225 compat_caddr_t p;
47226
47227@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
47228 get_user(tmp, &up->edid) ||
47229 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
47230 return -EFAULT;
47231- kp->edid = (__force u8 *)compat_ptr(tmp);
47232+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
47233 return 0;
47234 }
47235
47236diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
47237index 015f92a..59e311e 100644
47238--- a/drivers/media/v4l2-core/v4l2-device.c
47239+++ b/drivers/media/v4l2-core/v4l2-device.c
47240@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
47241 EXPORT_SYMBOL_GPL(v4l2_device_put);
47242
47243 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
47244- atomic_t *instance)
47245+ atomic_unchecked_t *instance)
47246 {
47247- int num = atomic_inc_return(instance) - 1;
47248+ int num = atomic_inc_return_unchecked(instance) - 1;
47249 int len = strlen(basename);
47250
47251 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
47252diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
47253index b084072..36706d7 100644
47254--- a/drivers/media/v4l2-core/v4l2-ioctl.c
47255+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
47256@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
47257 struct file *file, void *fh, void *p);
47258 } u;
47259 void (*debug)(const void *arg, bool write_only);
47260-};
47261+} __do_const;
47262+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
47263
47264 /* This control needs a priority check */
47265 #define INFO_FL_PRIO (1 << 0)
47266@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
47267 struct video_device *vfd = video_devdata(file);
47268 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
47269 bool write_only = false;
47270- struct v4l2_ioctl_info default_info;
47271+ v4l2_ioctl_info_no_const default_info;
47272 const struct v4l2_ioctl_info *info;
47273 void *fh = file->private_data;
47274 struct v4l2_fh *vfh = NULL;
47275@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47276 ret = -EINVAL;
47277 break;
47278 }
47279- *user_ptr = (void __user *)buf->m.planes;
47280+ *user_ptr = (void __force_user *)buf->m.planes;
47281 *kernel_ptr = (void **)&buf->m.planes;
47282 *array_size = sizeof(struct v4l2_plane) * buf->length;
47283 ret = 1;
47284@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47285 ret = -EINVAL;
47286 break;
47287 }
47288- *user_ptr = (void __user *)edid->edid;
47289+ *user_ptr = (void __force_user *)edid->edid;
47290 *kernel_ptr = (void **)&edid->edid;
47291 *array_size = edid->blocks * 128;
47292 ret = 1;
47293@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47294 ret = -EINVAL;
47295 break;
47296 }
47297- *user_ptr = (void __user *)ctrls->controls;
47298+ *user_ptr = (void __force_user *)ctrls->controls;
47299 *kernel_ptr = (void **)&ctrls->controls;
47300 *array_size = sizeof(struct v4l2_ext_control)
47301 * ctrls->count;
47302@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
47303 }
47304
47305 if (has_array_args) {
47306- *kernel_ptr = (void __force *)user_ptr;
47307+ *kernel_ptr = (void __force_kernel *)user_ptr;
47308 if (copy_to_user(user_ptr, mbuf, array_size))
47309 err = -EFAULT;
47310 goto out_array_args;
47311diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
47312index 24696f5..3637780 100644
47313--- a/drivers/memory/omap-gpmc.c
47314+++ b/drivers/memory/omap-gpmc.c
47315@@ -211,7 +211,6 @@ struct omap3_gpmc_regs {
47316 };
47317
47318 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
47319-static struct irq_chip gpmc_irq_chip;
47320 static int gpmc_irq_start;
47321
47322 static struct resource gpmc_mem_root;
47323@@ -939,6 +938,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
47324
47325 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
47326
47327+static struct irq_chip gpmc_irq_chip = {
47328+ .name = "gpmc",
47329+ .irq_startup = gpmc_irq_noop_ret,
47330+ .irq_enable = gpmc_irq_enable,
47331+ .irq_disable = gpmc_irq_disable,
47332+ .irq_shutdown = gpmc_irq_noop,
47333+ .irq_ack = gpmc_irq_noop,
47334+ .irq_mask = gpmc_irq_noop,
47335+ .irq_unmask = gpmc_irq_noop,
47336+};
47337+
47338 static int gpmc_setup_irq(void)
47339 {
47340 int i;
47341@@ -953,15 +963,6 @@ static int gpmc_setup_irq(void)
47342 return gpmc_irq_start;
47343 }
47344
47345- gpmc_irq_chip.name = "gpmc";
47346- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
47347- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
47348- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
47349- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
47350- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
47351- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
47352- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
47353-
47354 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
47355 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
47356
47357diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
47358index 187f836..679544b 100644
47359--- a/drivers/message/fusion/mptbase.c
47360+++ b/drivers/message/fusion/mptbase.c
47361@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47362 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
47363 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
47364
47365+#ifdef CONFIG_GRKERNSEC_HIDESYM
47366+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
47367+#else
47368 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
47369 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
47370+#endif
47371+
47372 /*
47373 * Rounding UP to nearest 4-kB boundary here...
47374 */
47375@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47376 ioc->facts.GlobalCredits);
47377
47378 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
47379+#ifdef CONFIG_GRKERNSEC_HIDESYM
47380+ NULL, NULL);
47381+#else
47382 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
47383+#endif
47384 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
47385 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
47386 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
47387diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
47388index 5bdaae1..eced16f 100644
47389--- a/drivers/message/fusion/mptsas.c
47390+++ b/drivers/message/fusion/mptsas.c
47391@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
47392 return 0;
47393 }
47394
47395+static inline void
47396+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47397+{
47398+ if (phy_info->port_details) {
47399+ phy_info->port_details->rphy = rphy;
47400+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47401+ ioc->name, rphy));
47402+ }
47403+
47404+ if (rphy) {
47405+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47406+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47407+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47408+ ioc->name, rphy, rphy->dev.release));
47409+ }
47410+}
47411+
47412 /* no mutex */
47413 static void
47414 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
47415@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
47416 return NULL;
47417 }
47418
47419-static inline void
47420-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47421-{
47422- if (phy_info->port_details) {
47423- phy_info->port_details->rphy = rphy;
47424- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47425- ioc->name, rphy));
47426- }
47427-
47428- if (rphy) {
47429- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47430- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47431- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47432- ioc->name, rphy, rphy->dev.release));
47433- }
47434-}
47435-
47436 static inline struct sas_port *
47437 mptsas_get_port(struct mptsas_phyinfo *phy_info)
47438 {
47439diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
47440index 9a8e185..27ff17d 100644
47441--- a/drivers/mfd/ab8500-debugfs.c
47442+++ b/drivers/mfd/ab8500-debugfs.c
47443@@ -100,7 +100,7 @@ static int irq_last;
47444 static u32 *irq_count;
47445 static int num_irqs;
47446
47447-static struct device_attribute **dev_attr;
47448+static device_attribute_no_const **dev_attr;
47449 static char **event_name;
47450
47451 static u8 avg_sample = SAMPLE_16;
47452diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
47453index 5615522..1eb6f3dc 100644
47454--- a/drivers/mfd/kempld-core.c
47455+++ b/drivers/mfd/kempld-core.c
47456@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
47457 .remove = kempld_remove,
47458 };
47459
47460-static struct dmi_system_id kempld_dmi_table[] __initdata = {
47461+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
47462 {
47463 .ident = "BHL6",
47464 .matches = {
47465diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
47466index c880c89..45a7c68 100644
47467--- a/drivers/mfd/max8925-i2c.c
47468+++ b/drivers/mfd/max8925-i2c.c
47469@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
47470 const struct i2c_device_id *id)
47471 {
47472 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
47473- static struct max8925_chip *chip;
47474+ struct max8925_chip *chip;
47475 struct device_node *node = client->dev.of_node;
47476
47477 if (node && !pdata) {
47478diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
47479index 7612d89..70549c2 100644
47480--- a/drivers/mfd/tps65910.c
47481+++ b/drivers/mfd/tps65910.c
47482@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
47483 struct tps65910_platform_data *pdata)
47484 {
47485 int ret = 0;
47486- static struct regmap_irq_chip *tps6591x_irqs_chip;
47487+ struct regmap_irq_chip *tps6591x_irqs_chip;
47488
47489 if (!irq) {
47490 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
47491diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
47492index 1b772ef..01e77d33 100644
47493--- a/drivers/mfd/twl4030-irq.c
47494+++ b/drivers/mfd/twl4030-irq.c
47495@@ -34,6 +34,7 @@
47496 #include <linux/of.h>
47497 #include <linux/irqdomain.h>
47498 #include <linux/i2c/twl.h>
47499+#include <asm/pgtable.h>
47500
47501 #include "twl-core.h"
47502
47503@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
47504 * Install an irq handler for each of the SIH modules;
47505 * clone dummy irq_chip since PIH can't *do* anything
47506 */
47507- twl4030_irq_chip = dummy_irq_chip;
47508- twl4030_irq_chip.name = "twl4030";
47509+ pax_open_kernel();
47510+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
47511+ *(const char **)&twl4030_irq_chip.name = "twl4030";
47512
47513- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47514+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47515+ pax_close_kernel();
47516
47517 for (i = irq_base; i < irq_end; i++) {
47518 irq_set_chip_and_handler(i, &twl4030_irq_chip,
47519diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
47520index 464419b..64bae8d 100644
47521--- a/drivers/misc/c2port/core.c
47522+++ b/drivers/misc/c2port/core.c
47523@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
47524 goto error_idr_alloc;
47525 c2dev->id = ret;
47526
47527- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47528+ pax_open_kernel();
47529+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47530+ pax_close_kernel();
47531
47532 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
47533 "c2port%d", c2dev->id);
47534diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
47535index 8385177..2f54635 100644
47536--- a/drivers/misc/eeprom/sunxi_sid.c
47537+++ b/drivers/misc/eeprom/sunxi_sid.c
47538@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
47539
47540 platform_set_drvdata(pdev, sid_data);
47541
47542- sid_bin_attr.size = sid_data->keysize;
47543+ pax_open_kernel();
47544+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
47545+ pax_close_kernel();
47546 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
47547 return -ENODEV;
47548
47549diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
47550index 36f5d52..32311c3 100644
47551--- a/drivers/misc/kgdbts.c
47552+++ b/drivers/misc/kgdbts.c
47553@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
47554 char before[BREAK_INSTR_SIZE];
47555 char after[BREAK_INSTR_SIZE];
47556
47557- probe_kernel_read(before, (char *)kgdbts_break_test,
47558+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
47559 BREAK_INSTR_SIZE);
47560 init_simple_test();
47561 ts.tst = plant_and_detach_test;
47562@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
47563 /* Activate test with initial breakpoint */
47564 if (!is_early)
47565 kgdb_breakpoint();
47566- probe_kernel_read(after, (char *)kgdbts_break_test,
47567+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
47568 BREAK_INSTR_SIZE);
47569 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
47570 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
47571diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
47572index 3ef4627..8d00486 100644
47573--- a/drivers/misc/lis3lv02d/lis3lv02d.c
47574+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
47575@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
47576 * the lid is closed. This leads to interrupts as soon as a little move
47577 * is done.
47578 */
47579- atomic_inc(&lis3->count);
47580+ atomic_inc_unchecked(&lis3->count);
47581
47582 wake_up_interruptible(&lis3->misc_wait);
47583 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
47584@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
47585 if (lis3->pm_dev)
47586 pm_runtime_get_sync(lis3->pm_dev);
47587
47588- atomic_set(&lis3->count, 0);
47589+ atomic_set_unchecked(&lis3->count, 0);
47590 return 0;
47591 }
47592
47593@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
47594 add_wait_queue(&lis3->misc_wait, &wait);
47595 while (true) {
47596 set_current_state(TASK_INTERRUPTIBLE);
47597- data = atomic_xchg(&lis3->count, 0);
47598+ data = atomic_xchg_unchecked(&lis3->count, 0);
47599 if (data)
47600 break;
47601
47602@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
47603 struct lis3lv02d, miscdev);
47604
47605 poll_wait(file, &lis3->misc_wait, wait);
47606- if (atomic_read(&lis3->count))
47607+ if (atomic_read_unchecked(&lis3->count))
47608 return POLLIN | POLLRDNORM;
47609 return 0;
47610 }
47611diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
47612index c439c82..1f20f57 100644
47613--- a/drivers/misc/lis3lv02d/lis3lv02d.h
47614+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
47615@@ -297,7 +297,7 @@ struct lis3lv02d {
47616 struct input_polled_dev *idev; /* input device */
47617 struct platform_device *pdev; /* platform device */
47618 struct regulator_bulk_data regulators[2];
47619- atomic_t count; /* interrupt count after last read */
47620+ atomic_unchecked_t count; /* interrupt count after last read */
47621 union axis_conversion ac; /* hw -> logical axis */
47622 int mapped_btns[3];
47623
47624diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
47625index 2f30bad..c4c13d0 100644
47626--- a/drivers/misc/sgi-gru/gruhandles.c
47627+++ b/drivers/misc/sgi-gru/gruhandles.c
47628@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
47629 unsigned long nsec;
47630
47631 nsec = CLKS2NSEC(clks);
47632- atomic_long_inc(&mcs_op_statistics[op].count);
47633- atomic_long_add(nsec, &mcs_op_statistics[op].total);
47634+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
47635+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
47636 if (mcs_op_statistics[op].max < nsec)
47637 mcs_op_statistics[op].max = nsec;
47638 }
47639diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
47640index 4f76359..cdfcb2e 100644
47641--- a/drivers/misc/sgi-gru/gruprocfs.c
47642+++ b/drivers/misc/sgi-gru/gruprocfs.c
47643@@ -32,9 +32,9 @@
47644
47645 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
47646
47647-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
47648+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
47649 {
47650- unsigned long val = atomic_long_read(v);
47651+ unsigned long val = atomic_long_read_unchecked(v);
47652
47653 seq_printf(s, "%16lu %s\n", val, id);
47654 }
47655@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
47656
47657 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
47658 for (op = 0; op < mcsop_last; op++) {
47659- count = atomic_long_read(&mcs_op_statistics[op].count);
47660- total = atomic_long_read(&mcs_op_statistics[op].total);
47661+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
47662+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
47663 max = mcs_op_statistics[op].max;
47664 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
47665 count ? total / count : 0, max);
47666diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
47667index 5c3ce24..4915ccb 100644
47668--- a/drivers/misc/sgi-gru/grutables.h
47669+++ b/drivers/misc/sgi-gru/grutables.h
47670@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
47671 * GRU statistics.
47672 */
47673 struct gru_stats_s {
47674- atomic_long_t vdata_alloc;
47675- atomic_long_t vdata_free;
47676- atomic_long_t gts_alloc;
47677- atomic_long_t gts_free;
47678- atomic_long_t gms_alloc;
47679- atomic_long_t gms_free;
47680- atomic_long_t gts_double_allocate;
47681- atomic_long_t assign_context;
47682- atomic_long_t assign_context_failed;
47683- atomic_long_t free_context;
47684- atomic_long_t load_user_context;
47685- atomic_long_t load_kernel_context;
47686- atomic_long_t lock_kernel_context;
47687- atomic_long_t unlock_kernel_context;
47688- atomic_long_t steal_user_context;
47689- atomic_long_t steal_kernel_context;
47690- atomic_long_t steal_context_failed;
47691- atomic_long_t nopfn;
47692- atomic_long_t asid_new;
47693- atomic_long_t asid_next;
47694- atomic_long_t asid_wrap;
47695- atomic_long_t asid_reuse;
47696- atomic_long_t intr;
47697- atomic_long_t intr_cbr;
47698- atomic_long_t intr_tfh;
47699- atomic_long_t intr_spurious;
47700- atomic_long_t intr_mm_lock_failed;
47701- atomic_long_t call_os;
47702- atomic_long_t call_os_wait_queue;
47703- atomic_long_t user_flush_tlb;
47704- atomic_long_t user_unload_context;
47705- atomic_long_t user_exception;
47706- atomic_long_t set_context_option;
47707- atomic_long_t check_context_retarget_intr;
47708- atomic_long_t check_context_unload;
47709- atomic_long_t tlb_dropin;
47710- atomic_long_t tlb_preload_page;
47711- atomic_long_t tlb_dropin_fail_no_asid;
47712- atomic_long_t tlb_dropin_fail_upm;
47713- atomic_long_t tlb_dropin_fail_invalid;
47714- atomic_long_t tlb_dropin_fail_range_active;
47715- atomic_long_t tlb_dropin_fail_idle;
47716- atomic_long_t tlb_dropin_fail_fmm;
47717- atomic_long_t tlb_dropin_fail_no_exception;
47718- atomic_long_t tfh_stale_on_fault;
47719- atomic_long_t mmu_invalidate_range;
47720- atomic_long_t mmu_invalidate_page;
47721- atomic_long_t flush_tlb;
47722- atomic_long_t flush_tlb_gru;
47723- atomic_long_t flush_tlb_gru_tgh;
47724- atomic_long_t flush_tlb_gru_zero_asid;
47725+ atomic_long_unchecked_t vdata_alloc;
47726+ atomic_long_unchecked_t vdata_free;
47727+ atomic_long_unchecked_t gts_alloc;
47728+ atomic_long_unchecked_t gts_free;
47729+ atomic_long_unchecked_t gms_alloc;
47730+ atomic_long_unchecked_t gms_free;
47731+ atomic_long_unchecked_t gts_double_allocate;
47732+ atomic_long_unchecked_t assign_context;
47733+ atomic_long_unchecked_t assign_context_failed;
47734+ atomic_long_unchecked_t free_context;
47735+ atomic_long_unchecked_t load_user_context;
47736+ atomic_long_unchecked_t load_kernel_context;
47737+ atomic_long_unchecked_t lock_kernel_context;
47738+ atomic_long_unchecked_t unlock_kernel_context;
47739+ atomic_long_unchecked_t steal_user_context;
47740+ atomic_long_unchecked_t steal_kernel_context;
47741+ atomic_long_unchecked_t steal_context_failed;
47742+ atomic_long_unchecked_t nopfn;
47743+ atomic_long_unchecked_t asid_new;
47744+ atomic_long_unchecked_t asid_next;
47745+ atomic_long_unchecked_t asid_wrap;
47746+ atomic_long_unchecked_t asid_reuse;
47747+ atomic_long_unchecked_t intr;
47748+ atomic_long_unchecked_t intr_cbr;
47749+ atomic_long_unchecked_t intr_tfh;
47750+ atomic_long_unchecked_t intr_spurious;
47751+ atomic_long_unchecked_t intr_mm_lock_failed;
47752+ atomic_long_unchecked_t call_os;
47753+ atomic_long_unchecked_t call_os_wait_queue;
47754+ atomic_long_unchecked_t user_flush_tlb;
47755+ atomic_long_unchecked_t user_unload_context;
47756+ atomic_long_unchecked_t user_exception;
47757+ atomic_long_unchecked_t set_context_option;
47758+ atomic_long_unchecked_t check_context_retarget_intr;
47759+ atomic_long_unchecked_t check_context_unload;
47760+ atomic_long_unchecked_t tlb_dropin;
47761+ atomic_long_unchecked_t tlb_preload_page;
47762+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47763+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47764+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47765+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47766+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47767+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47768+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47769+ atomic_long_unchecked_t tfh_stale_on_fault;
47770+ atomic_long_unchecked_t mmu_invalidate_range;
47771+ atomic_long_unchecked_t mmu_invalidate_page;
47772+ atomic_long_unchecked_t flush_tlb;
47773+ atomic_long_unchecked_t flush_tlb_gru;
47774+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47775+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47776
47777- atomic_long_t copy_gpa;
47778- atomic_long_t read_gpa;
47779+ atomic_long_unchecked_t copy_gpa;
47780+ atomic_long_unchecked_t read_gpa;
47781
47782- atomic_long_t mesq_receive;
47783- atomic_long_t mesq_receive_none;
47784- atomic_long_t mesq_send;
47785- atomic_long_t mesq_send_failed;
47786- atomic_long_t mesq_noop;
47787- atomic_long_t mesq_send_unexpected_error;
47788- atomic_long_t mesq_send_lb_overflow;
47789- atomic_long_t mesq_send_qlimit_reached;
47790- atomic_long_t mesq_send_amo_nacked;
47791- atomic_long_t mesq_send_put_nacked;
47792- atomic_long_t mesq_page_overflow;
47793- atomic_long_t mesq_qf_locked;
47794- atomic_long_t mesq_qf_noop_not_full;
47795- atomic_long_t mesq_qf_switch_head_failed;
47796- atomic_long_t mesq_qf_unexpected_error;
47797- atomic_long_t mesq_noop_unexpected_error;
47798- atomic_long_t mesq_noop_lb_overflow;
47799- atomic_long_t mesq_noop_qlimit_reached;
47800- atomic_long_t mesq_noop_amo_nacked;
47801- atomic_long_t mesq_noop_put_nacked;
47802- atomic_long_t mesq_noop_page_overflow;
47803+ atomic_long_unchecked_t mesq_receive;
47804+ atomic_long_unchecked_t mesq_receive_none;
47805+ atomic_long_unchecked_t mesq_send;
47806+ atomic_long_unchecked_t mesq_send_failed;
47807+ atomic_long_unchecked_t mesq_noop;
47808+ atomic_long_unchecked_t mesq_send_unexpected_error;
47809+ atomic_long_unchecked_t mesq_send_lb_overflow;
47810+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47811+ atomic_long_unchecked_t mesq_send_amo_nacked;
47812+ atomic_long_unchecked_t mesq_send_put_nacked;
47813+ atomic_long_unchecked_t mesq_page_overflow;
47814+ atomic_long_unchecked_t mesq_qf_locked;
47815+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47816+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47817+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47818+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47819+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47820+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47821+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47822+ atomic_long_unchecked_t mesq_noop_put_nacked;
47823+ atomic_long_unchecked_t mesq_noop_page_overflow;
47824
47825 };
47826
47827@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47828 tghop_invalidate, mcsop_last};
47829
47830 struct mcs_op_statistic {
47831- atomic_long_t count;
47832- atomic_long_t total;
47833+ atomic_long_unchecked_t count;
47834+ atomic_long_unchecked_t total;
47835 unsigned long max;
47836 };
47837
47838@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47839
47840 #define STAT(id) do { \
47841 if (gru_options & OPT_STATS) \
47842- atomic_long_inc(&gru_stats.id); \
47843+ atomic_long_inc_unchecked(&gru_stats.id); \
47844 } while (0)
47845
47846 #ifdef CONFIG_SGI_GRU_DEBUG
47847diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47848index c862cd4..0d176fe 100644
47849--- a/drivers/misc/sgi-xp/xp.h
47850+++ b/drivers/misc/sgi-xp/xp.h
47851@@ -288,7 +288,7 @@ struct xpc_interface {
47852 xpc_notify_func, void *);
47853 void (*received) (short, int, void *);
47854 enum xp_retval (*partid_to_nasids) (short, void *);
47855-};
47856+} __no_const;
47857
47858 extern struct xpc_interface xpc_interface;
47859
47860diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47861index 01be66d..e3a0c7e 100644
47862--- a/drivers/misc/sgi-xp/xp_main.c
47863+++ b/drivers/misc/sgi-xp/xp_main.c
47864@@ -78,13 +78,13 @@ xpc_notloaded(void)
47865 }
47866
47867 struct xpc_interface xpc_interface = {
47868- (void (*)(int))xpc_notloaded,
47869- (void (*)(int))xpc_notloaded,
47870- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47871- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47872+ .connect = (void (*)(int))xpc_notloaded,
47873+ .disconnect = (void (*)(int))xpc_notloaded,
47874+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47875+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47876 void *))xpc_notloaded,
47877- (void (*)(short, int, void *))xpc_notloaded,
47878- (enum xp_retval(*)(short, void *))xpc_notloaded
47879+ .received = (void (*)(short, int, void *))xpc_notloaded,
47880+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47881 };
47882 EXPORT_SYMBOL_GPL(xpc_interface);
47883
47884diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47885index b94d5f7..7f494c5 100644
47886--- a/drivers/misc/sgi-xp/xpc.h
47887+++ b/drivers/misc/sgi-xp/xpc.h
47888@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47889 void (*received_payload) (struct xpc_channel *, void *);
47890 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47891 };
47892+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47893
47894 /* struct xpc_partition act_state values (for XPC HB) */
47895
47896@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47897 /* found in xpc_main.c */
47898 extern struct device *xpc_part;
47899 extern struct device *xpc_chan;
47900-extern struct xpc_arch_operations xpc_arch_ops;
47901+extern xpc_arch_operations_no_const xpc_arch_ops;
47902 extern int xpc_disengage_timelimit;
47903 extern int xpc_disengage_timedout;
47904 extern int xpc_activate_IRQ_rcvd;
47905diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47906index 82dc574..8539ab2 100644
47907--- a/drivers/misc/sgi-xp/xpc_main.c
47908+++ b/drivers/misc/sgi-xp/xpc_main.c
47909@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47910 .notifier_call = xpc_system_die,
47911 };
47912
47913-struct xpc_arch_operations xpc_arch_ops;
47914+xpc_arch_operations_no_const xpc_arch_ops;
47915
47916 /*
47917 * Timer function to enforce the timelimit on the partition disengage.
47918@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
47919
47920 if (((die_args->trapnr == X86_TRAP_MF) ||
47921 (die_args->trapnr == X86_TRAP_XF)) &&
47922- !user_mode_vm(die_args->regs))
47923+ !user_mode(die_args->regs))
47924 xpc_die_deactivate();
47925
47926 break;
47927diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47928index ed2e71a..54c498e 100644
47929--- a/drivers/mmc/card/block.c
47930+++ b/drivers/mmc/card/block.c
47931@@ -577,7 +577,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47932 if (idata->ic.postsleep_min_us)
47933 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47934
47935- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47936+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47937 err = -EFAULT;
47938 goto cmd_rel_host;
47939 }
47940diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
47941index 18c4afe..43be71e 100644
47942--- a/drivers/mmc/host/dw_mmc.h
47943+++ b/drivers/mmc/host/dw_mmc.h
47944@@ -271,5 +271,5 @@ struct dw_mci_drv_data {
47945 void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
47946 int (*parse_dt)(struct dw_mci *host);
47947 int (*execute_tuning)(struct dw_mci_slot *slot);
47948-};
47949+} __do_const;
47950 #endif /* _DW_MMC_H_ */
47951diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
47952index 7fe1619..ae0781b 100644
47953--- a/drivers/mmc/host/mmci.c
47954+++ b/drivers/mmc/host/mmci.c
47955@@ -1630,7 +1630,9 @@ static int mmci_probe(struct amba_device *dev,
47956 mmc->caps |= MMC_CAP_CMD23;
47957
47958 if (variant->busy_detect) {
47959- mmci_ops.card_busy = mmci_card_busy;
47960+ pax_open_kernel();
47961+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
47962+ pax_close_kernel();
47963 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47964 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47965 mmc->max_busy_timeout = 0;
47966diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47967index f84cfb0..aebe5d6 100644
47968--- a/drivers/mmc/host/omap_hsmmc.c
47969+++ b/drivers/mmc/host/omap_hsmmc.c
47970@@ -2054,7 +2054,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47971
47972 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47973 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47974- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47975+ pax_open_kernel();
47976+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47977+ pax_close_kernel();
47978 }
47979
47980 pm_runtime_enable(host->dev);
47981diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47982index 10ef824..88461a2 100644
47983--- a/drivers/mmc/host/sdhci-esdhc-imx.c
47984+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47985@@ -989,9 +989,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47986 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47987 }
47988
47989- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47990- sdhci_esdhc_ops.platform_execute_tuning =
47991+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47992+ pax_open_kernel();
47993+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47994 esdhc_executing_tuning;
47995+ pax_close_kernel();
47996+ }
47997
47998 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47999 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
48000diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
48001index c6d2dd7..81b1ca3 100644
48002--- a/drivers/mmc/host/sdhci-s3c.c
48003+++ b/drivers/mmc/host/sdhci-s3c.c
48004@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
48005 * we can use overriding functions instead of default.
48006 */
48007 if (sc->no_divider) {
48008- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48009- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48010- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48011+ pax_open_kernel();
48012+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48013+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48014+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48015+ pax_close_kernel();
48016 }
48017
48018 /* It supports additional host capabilities if needed */
48019diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
48020index 423666b..81ff5eb 100644
48021--- a/drivers/mtd/chips/cfi_cmdset_0020.c
48022+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
48023@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
48024 size_t totlen = 0, thislen;
48025 int ret = 0;
48026 size_t buflen = 0;
48027- static char *buffer;
48028+ char *buffer;
48029
48030 if (!ECCBUF_SIZE) {
48031 /* We should fall back to a general writev implementation.
48032diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
48033index f44c606..aa4e804 100644
48034--- a/drivers/mtd/nand/denali.c
48035+++ b/drivers/mtd/nand/denali.c
48036@@ -24,6 +24,7 @@
48037 #include <linux/slab.h>
48038 #include <linux/mtd/mtd.h>
48039 #include <linux/module.h>
48040+#include <linux/slab.h>
48041
48042 #include "denali.h"
48043
48044diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48045index 33f3c3c..d6bbe6a 100644
48046--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48047+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48048@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
48049
48050 /* first try to map the upper buffer directly */
48051 if (virt_addr_valid(this->upper_buf) &&
48052- !object_is_on_stack(this->upper_buf)) {
48053+ !object_starts_on_stack(this->upper_buf)) {
48054 sg_init_one(sgl, this->upper_buf, this->upper_len);
48055 ret = dma_map_sg(this->dev, sgl, 1, dr);
48056 if (ret == 0)
48057diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
48058index a5dfbfb..8042ab4 100644
48059--- a/drivers/mtd/nftlmount.c
48060+++ b/drivers/mtd/nftlmount.c
48061@@ -24,6 +24,7 @@
48062 #include <asm/errno.h>
48063 #include <linux/delay.h>
48064 #include <linux/slab.h>
48065+#include <linux/sched.h>
48066 #include <linux/mtd/mtd.h>
48067 #include <linux/mtd/nand.h>
48068 #include <linux/mtd/nftl.h>
48069diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
48070index c23184a..4115c41 100644
48071--- a/drivers/mtd/sm_ftl.c
48072+++ b/drivers/mtd/sm_ftl.c
48073@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
48074 #define SM_CIS_VENDOR_OFFSET 0x59
48075 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
48076 {
48077- struct attribute_group *attr_group;
48078+ attribute_group_no_const *attr_group;
48079 struct attribute **attributes;
48080 struct sm_sysfs_attribute *vendor_attribute;
48081 char *vendor;
48082diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
48083index 7b11243..b3278a3 100644
48084--- a/drivers/net/bonding/bond_netlink.c
48085+++ b/drivers/net/bonding/bond_netlink.c
48086@@ -585,7 +585,7 @@ nla_put_failure:
48087 return -EMSGSIZE;
48088 }
48089
48090-struct rtnl_link_ops bond_link_ops __read_mostly = {
48091+struct rtnl_link_ops bond_link_ops = {
48092 .kind = "bond",
48093 .priv_size = sizeof(struct bonding),
48094 .setup = bond_setup,
48095diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
48096index b3b922a..80bba38 100644
48097--- a/drivers/net/caif/caif_hsi.c
48098+++ b/drivers/net/caif/caif_hsi.c
48099@@ -1444,7 +1444,7 @@ err:
48100 return -ENODEV;
48101 }
48102
48103-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
48104+static struct rtnl_link_ops caif_hsi_link_ops = {
48105 .kind = "cfhsi",
48106 .priv_size = sizeof(struct cfhsi),
48107 .setup = cfhsi_setup,
48108diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
48109index 58808f65..0bdc7b3 100644
48110--- a/drivers/net/can/Kconfig
48111+++ b/drivers/net/can/Kconfig
48112@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
48113
48114 config CAN_FLEXCAN
48115 tristate "Support for Freescale FLEXCAN based chips"
48116- depends on ARM || PPC
48117+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
48118 ---help---
48119 Say Y here if you want to support for Freescale FlexCAN.
48120
48121diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
48122index b0f6924..59e9640 100644
48123--- a/drivers/net/can/dev.c
48124+++ b/drivers/net/can/dev.c
48125@@ -959,7 +959,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
48126 return -EOPNOTSUPP;
48127 }
48128
48129-static struct rtnl_link_ops can_link_ops __read_mostly = {
48130+static struct rtnl_link_ops can_link_ops = {
48131 .kind = "can",
48132 .maxtype = IFLA_CAN_MAX,
48133 .policy = can_policy,
48134diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
48135index 674f367..ec3a31f 100644
48136--- a/drivers/net/can/vcan.c
48137+++ b/drivers/net/can/vcan.c
48138@@ -163,7 +163,7 @@ static void vcan_setup(struct net_device *dev)
48139 dev->destructor = free_netdev;
48140 }
48141
48142-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
48143+static struct rtnl_link_ops vcan_link_ops = {
48144 .kind = "vcan",
48145 .setup = vcan_setup,
48146 };
48147diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
48148index 49adbf1..fff7ff8 100644
48149--- a/drivers/net/dummy.c
48150+++ b/drivers/net/dummy.c
48151@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
48152 return 0;
48153 }
48154
48155-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
48156+static struct rtnl_link_ops dummy_link_ops = {
48157 .kind = DRV_NAME,
48158 .setup = dummy_setup,
48159 .validate = dummy_validate,
48160diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
48161index 0443654..4f0aa18 100644
48162--- a/drivers/net/ethernet/8390/ax88796.c
48163+++ b/drivers/net/ethernet/8390/ax88796.c
48164@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
48165 if (ax->plat->reg_offsets)
48166 ei_local->reg_offset = ax->plat->reg_offsets;
48167 else {
48168+ resource_size_t _mem_size = mem_size;
48169+ do_div(_mem_size, 0x18);
48170 ei_local->reg_offset = ax->reg_offsets;
48171 for (ret = 0; ret < 0x18; ret++)
48172- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
48173+ ax->reg_offsets[ret] = _mem_size * ret;
48174 }
48175
48176 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
48177diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
48178index 6725dc0..163549c 100644
48179--- a/drivers/net/ethernet/altera/altera_tse_main.c
48180+++ b/drivers/net/ethernet/altera/altera_tse_main.c
48181@@ -1216,7 +1216,7 @@ static int tse_shutdown(struct net_device *dev)
48182 return 0;
48183 }
48184
48185-static struct net_device_ops altera_tse_netdev_ops = {
48186+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
48187 .ndo_open = tse_open,
48188 .ndo_stop = tse_shutdown,
48189 .ndo_start_xmit = tse_start_xmit,
48190@@ -1453,11 +1453,13 @@ static int altera_tse_probe(struct platform_device *pdev)
48191 ndev->netdev_ops = &altera_tse_netdev_ops;
48192 altera_tse_set_ethtool_ops(ndev);
48193
48194+ pax_open_kernel();
48195 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
48196
48197 if (priv->hash_filter)
48198 altera_tse_netdev_ops.ndo_set_rx_mode =
48199 tse_set_rx_mode_hashfilter;
48200+ pax_close_kernel();
48201
48202 /* Scatter/gather IO is not supported,
48203 * so it is turned off
48204diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48205index 29a0927..5a348e24 100644
48206--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48207+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48208@@ -1122,14 +1122,14 @@ do { \
48209 * operations, everything works on mask values.
48210 */
48211 #define XMDIO_READ(_pdata, _mmd, _reg) \
48212- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
48213+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
48214 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
48215
48216 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
48217 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
48218
48219 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
48220- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
48221+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
48222 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
48223
48224 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
48225diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48226index 8a50b01..39c1ad0 100644
48227--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48228+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48229@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
48230
48231 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
48232
48233- pdata->hw_if.config_dcb_tc(pdata);
48234+ pdata->hw_if->config_dcb_tc(pdata);
48235
48236 return 0;
48237 }
48238@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
48239
48240 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
48241
48242- pdata->hw_if.config_dcb_pfc(pdata);
48243+ pdata->hw_if->config_dcb_pfc(pdata);
48244
48245 return 0;
48246 }
48247diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48248index d81fc6b..6f8ab25 100644
48249--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48250+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48251@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
48252
48253 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48254 {
48255- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48256+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48257 struct xgbe_channel *channel;
48258 struct xgbe_ring *ring;
48259 struct xgbe_ring_data *rdata;
48260@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48261
48262 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
48263 {
48264- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48265+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48266 struct xgbe_channel *channel;
48267 struct xgbe_ring *ring;
48268 struct xgbe_ring_desc *rdesc;
48269@@ -620,17 +620,12 @@ err_out:
48270 return 0;
48271 }
48272
48273-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
48274-{
48275- DBGPR("-->xgbe_init_function_ptrs_desc\n");
48276-
48277- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
48278- desc_if->free_ring_resources = xgbe_free_ring_resources;
48279- desc_if->map_tx_skb = xgbe_map_tx_skb;
48280- desc_if->map_rx_buffer = xgbe_map_rx_buffer;
48281- desc_if->unmap_rdata = xgbe_unmap_rdata;
48282- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
48283- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
48284-
48285- DBGPR("<--xgbe_init_function_ptrs_desc\n");
48286-}
48287+const struct xgbe_desc_if default_xgbe_desc_if = {
48288+ .alloc_ring_resources = xgbe_alloc_ring_resources,
48289+ .free_ring_resources = xgbe_free_ring_resources,
48290+ .map_tx_skb = xgbe_map_tx_skb,
48291+ .map_rx_buffer = xgbe_map_rx_buffer,
48292+ .unmap_rdata = xgbe_unmap_rdata,
48293+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
48294+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
48295+};
48296diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48297index 400757b..d8c53f6 100644
48298--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48299+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48300@@ -2748,7 +2748,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
48301
48302 static int xgbe_init(struct xgbe_prv_data *pdata)
48303 {
48304- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48305+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48306 int ret;
48307
48308 DBGPR("-->xgbe_init\n");
48309@@ -2813,108 +2813,103 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
48310 return 0;
48311 }
48312
48313-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
48314-{
48315- DBGPR("-->xgbe_init_function_ptrs\n");
48316-
48317- hw_if->tx_complete = xgbe_tx_complete;
48318-
48319- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
48320- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
48321- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
48322- hw_if->set_mac_address = xgbe_set_mac_address;
48323-
48324- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
48325- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
48326-
48327- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
48328- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
48329- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
48330- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
48331- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
48332-
48333- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
48334- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
48335-
48336- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
48337- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
48338- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
48339-
48340- hw_if->enable_tx = xgbe_enable_tx;
48341- hw_if->disable_tx = xgbe_disable_tx;
48342- hw_if->enable_rx = xgbe_enable_rx;
48343- hw_if->disable_rx = xgbe_disable_rx;
48344-
48345- hw_if->powerup_tx = xgbe_powerup_tx;
48346- hw_if->powerdown_tx = xgbe_powerdown_tx;
48347- hw_if->powerup_rx = xgbe_powerup_rx;
48348- hw_if->powerdown_rx = xgbe_powerdown_rx;
48349-
48350- hw_if->dev_xmit = xgbe_dev_xmit;
48351- hw_if->dev_read = xgbe_dev_read;
48352- hw_if->enable_int = xgbe_enable_int;
48353- hw_if->disable_int = xgbe_disable_int;
48354- hw_if->init = xgbe_init;
48355- hw_if->exit = xgbe_exit;
48356+const struct xgbe_hw_if default_xgbe_hw_if = {
48357+ .tx_complete = xgbe_tx_complete,
48358+
48359+ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
48360+ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
48361+ .add_mac_addresses = xgbe_add_mac_addresses,
48362+ .set_mac_address = xgbe_set_mac_address,
48363+
48364+ .enable_rx_csum = xgbe_enable_rx_csum,
48365+ .disable_rx_csum = xgbe_disable_rx_csum,
48366+
48367+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
48368+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
48369+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
48370+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
48371+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
48372+
48373+ .read_mmd_regs = xgbe_read_mmd_regs,
48374+ .write_mmd_regs = xgbe_write_mmd_regs,
48375+
48376+ .set_gmii_speed = xgbe_set_gmii_speed,
48377+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
48378+ .set_xgmii_speed = xgbe_set_xgmii_speed,
48379+
48380+ .enable_tx = xgbe_enable_tx,
48381+ .disable_tx = xgbe_disable_tx,
48382+ .enable_rx = xgbe_enable_rx,
48383+ .disable_rx = xgbe_disable_rx,
48384+
48385+ .powerup_tx = xgbe_powerup_tx,
48386+ .powerdown_tx = xgbe_powerdown_tx,
48387+ .powerup_rx = xgbe_powerup_rx,
48388+ .powerdown_rx = xgbe_powerdown_rx,
48389+
48390+ .dev_xmit = xgbe_dev_xmit,
48391+ .dev_read = xgbe_dev_read,
48392+ .enable_int = xgbe_enable_int,
48393+ .disable_int = xgbe_disable_int,
48394+ .init = xgbe_init,
48395+ .exit = xgbe_exit,
48396
48397 /* Descriptor related Sequences have to be initialized here */
48398- hw_if->tx_desc_init = xgbe_tx_desc_init;
48399- hw_if->rx_desc_init = xgbe_rx_desc_init;
48400- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
48401- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
48402- hw_if->is_last_desc = xgbe_is_last_desc;
48403- hw_if->is_context_desc = xgbe_is_context_desc;
48404- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
48405+ .tx_desc_init = xgbe_tx_desc_init,
48406+ .rx_desc_init = xgbe_rx_desc_init,
48407+ .tx_desc_reset = xgbe_tx_desc_reset,
48408+ .rx_desc_reset = xgbe_rx_desc_reset,
48409+ .is_last_desc = xgbe_is_last_desc,
48410+ .is_context_desc = xgbe_is_context_desc,
48411+ .tx_start_xmit = xgbe_tx_start_xmit,
48412
48413 /* For FLOW ctrl */
48414- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
48415- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
48416+ .config_tx_flow_control = xgbe_config_tx_flow_control,
48417+ .config_rx_flow_control = xgbe_config_rx_flow_control,
48418
48419 /* For RX coalescing */
48420- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
48421- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
48422- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
48423- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
48424+ .config_rx_coalesce = xgbe_config_rx_coalesce,
48425+ .config_tx_coalesce = xgbe_config_tx_coalesce,
48426+ .usec_to_riwt = xgbe_usec_to_riwt,
48427+ .riwt_to_usec = xgbe_riwt_to_usec,
48428
48429 /* For RX and TX threshold config */
48430- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
48431- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
48432+ .config_rx_threshold = xgbe_config_rx_threshold,
48433+ .config_tx_threshold = xgbe_config_tx_threshold,
48434
48435 /* For RX and TX Store and Forward Mode config */
48436- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
48437- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
48438+ .config_rsf_mode = xgbe_config_rsf_mode,
48439+ .config_tsf_mode = xgbe_config_tsf_mode,
48440
48441 /* For TX DMA Operating on Second Frame config */
48442- hw_if->config_osp_mode = xgbe_config_osp_mode;
48443+ .config_osp_mode = xgbe_config_osp_mode,
48444
48445 /* For RX and TX PBL config */
48446- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
48447- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
48448- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
48449- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
48450- hw_if->config_pblx8 = xgbe_config_pblx8;
48451+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
48452+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
48453+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
48454+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
48455+ .config_pblx8 = xgbe_config_pblx8,
48456
48457 /* For MMC statistics support */
48458- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
48459- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
48460- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
48461+ .tx_mmc_int = xgbe_tx_mmc_int,
48462+ .rx_mmc_int = xgbe_rx_mmc_int,
48463+ .read_mmc_stats = xgbe_read_mmc_stats,
48464
48465 /* For PTP config */
48466- hw_if->config_tstamp = xgbe_config_tstamp;
48467- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
48468- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
48469- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
48470- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
48471+ .config_tstamp = xgbe_config_tstamp,
48472+ .update_tstamp_addend = xgbe_update_tstamp_addend,
48473+ .set_tstamp_time = xgbe_set_tstamp_time,
48474+ .get_tstamp_time = xgbe_get_tstamp_time,
48475+ .get_tx_tstamp = xgbe_get_tx_tstamp,
48476
48477 /* For Data Center Bridging config */
48478- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
48479- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
48480+ .config_dcb_tc = xgbe_config_dcb_tc,
48481+ .config_dcb_pfc = xgbe_config_dcb_pfc,
48482
48483 /* For Receive Side Scaling */
48484- hw_if->enable_rss = xgbe_enable_rss;
48485- hw_if->disable_rss = xgbe_disable_rss;
48486- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
48487- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
48488-
48489- DBGPR("<--xgbe_init_function_ptrs\n");
48490-}
48491+ .enable_rss = xgbe_enable_rss,
48492+ .disable_rss = xgbe_disable_rss,
48493+ .set_rss_hash_key = xgbe_set_rss_hash_key,
48494+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
48495+};
48496diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48497index 885b02b..4b31a4c 100644
48498--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48499+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48500@@ -244,7 +244,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
48501 * support, tell it now
48502 */
48503 if (ring->tx.xmit_more)
48504- pdata->hw_if.tx_start_xmit(channel, ring);
48505+ pdata->hw_if->tx_start_xmit(channel, ring);
48506
48507 return NETDEV_TX_BUSY;
48508 }
48509@@ -272,7 +272,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
48510
48511 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48512 {
48513- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48514+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48515 struct xgbe_channel *channel;
48516 enum xgbe_int int_id;
48517 unsigned int i;
48518@@ -294,7 +294,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48519
48520 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48521 {
48522- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48523+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48524 struct xgbe_channel *channel;
48525 enum xgbe_int int_id;
48526 unsigned int i;
48527@@ -317,7 +317,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48528 static irqreturn_t xgbe_isr(int irq, void *data)
48529 {
48530 struct xgbe_prv_data *pdata = data;
48531- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48532+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48533 struct xgbe_channel *channel;
48534 unsigned int dma_isr, dma_ch_isr;
48535 unsigned int mac_isr, mac_tssr;
48536@@ -673,7 +673,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
48537
48538 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48539 {
48540- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48541+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48542
48543 DBGPR("-->xgbe_init_tx_coalesce\n");
48544
48545@@ -687,7 +687,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48546
48547 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48548 {
48549- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48550+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48551
48552 DBGPR("-->xgbe_init_rx_coalesce\n");
48553
48554@@ -701,7 +701,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48555
48556 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48557 {
48558- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48559+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48560 struct xgbe_channel *channel;
48561 struct xgbe_ring *ring;
48562 struct xgbe_ring_data *rdata;
48563@@ -726,7 +726,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48564
48565 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48566 {
48567- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48568+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48569 struct xgbe_channel *channel;
48570 struct xgbe_ring *ring;
48571 struct xgbe_ring_data *rdata;
48572@@ -752,7 +752,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48573 static void xgbe_adjust_link(struct net_device *netdev)
48574 {
48575 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48576- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48577+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48578 struct phy_device *phydev = pdata->phydev;
48579 int new_state = 0;
48580
48581@@ -860,7 +860,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
48582 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48583 {
48584 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48585- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48586+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48587 unsigned long flags;
48588
48589 DBGPR("-->xgbe_powerdown\n");
48590@@ -898,7 +898,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48591 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48592 {
48593 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48594- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48595+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48596 unsigned long flags;
48597
48598 DBGPR("-->xgbe_powerup\n");
48599@@ -935,7 +935,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48600
48601 static int xgbe_start(struct xgbe_prv_data *pdata)
48602 {
48603- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48604+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48605 struct net_device *netdev = pdata->netdev;
48606 int ret;
48607
48608@@ -976,7 +976,7 @@ err_napi:
48609
48610 static void xgbe_stop(struct xgbe_prv_data *pdata)
48611 {
48612- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48613+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48614 struct xgbe_channel *channel;
48615 struct net_device *netdev = pdata->netdev;
48616 struct netdev_queue *txq;
48617@@ -1203,7 +1203,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
48618 return -ERANGE;
48619 }
48620
48621- pdata->hw_if.config_tstamp(pdata, mac_tscr);
48622+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
48623
48624 memcpy(&pdata->tstamp_config, &config, sizeof(config));
48625
48626@@ -1352,7 +1352,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
48627 static int xgbe_open(struct net_device *netdev)
48628 {
48629 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48630- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48631+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48632 int ret;
48633
48634 DBGPR("-->xgbe_open\n");
48635@@ -1424,7 +1424,7 @@ err_phy_init:
48636 static int xgbe_close(struct net_device *netdev)
48637 {
48638 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48639- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48640+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48641
48642 DBGPR("-->xgbe_close\n");
48643
48644@@ -1452,8 +1452,8 @@ static int xgbe_close(struct net_device *netdev)
48645 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
48646 {
48647 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48648- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48649- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48650+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48651+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48652 struct xgbe_channel *channel;
48653 struct xgbe_ring *ring;
48654 struct xgbe_packet_data *packet;
48655@@ -1521,7 +1521,7 @@ tx_netdev_return:
48656 static void xgbe_set_rx_mode(struct net_device *netdev)
48657 {
48658 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48659- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48660+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48661 unsigned int pr_mode, am_mode;
48662
48663 DBGPR("-->xgbe_set_rx_mode\n");
48664@@ -1540,7 +1540,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
48665 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
48666 {
48667 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48668- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48669+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48670 struct sockaddr *saddr = addr;
48671
48672 DBGPR("-->xgbe_set_mac_address\n");
48673@@ -1607,7 +1607,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
48674
48675 DBGPR("-->%s\n", __func__);
48676
48677- pdata->hw_if.read_mmc_stats(pdata);
48678+ pdata->hw_if->read_mmc_stats(pdata);
48679
48680 s->rx_packets = pstats->rxframecount_gb;
48681 s->rx_bytes = pstats->rxoctetcount_gb;
48682@@ -1634,7 +1634,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
48683 u16 vid)
48684 {
48685 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48686- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48687+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48688
48689 DBGPR("-->%s\n", __func__);
48690
48691@@ -1650,7 +1650,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
48692 u16 vid)
48693 {
48694 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48695- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48696+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48697
48698 DBGPR("-->%s\n", __func__);
48699
48700@@ -1716,7 +1716,7 @@ static int xgbe_set_features(struct net_device *netdev,
48701 netdev_features_t features)
48702 {
48703 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48704- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48705+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48706 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
48707 int ret = 0;
48708
48709@@ -1781,8 +1781,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
48710 static void xgbe_rx_refresh(struct xgbe_channel *channel)
48711 {
48712 struct xgbe_prv_data *pdata = channel->pdata;
48713- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48714- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48715+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48716+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48717 struct xgbe_ring *ring = channel->rx_ring;
48718 struct xgbe_ring_data *rdata;
48719
48720@@ -1835,8 +1835,8 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata,
48721 static int xgbe_tx_poll(struct xgbe_channel *channel)
48722 {
48723 struct xgbe_prv_data *pdata = channel->pdata;
48724- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48725- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48726+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48727+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48728 struct xgbe_ring *ring = channel->tx_ring;
48729 struct xgbe_ring_data *rdata;
48730 struct xgbe_ring_desc *rdesc;
48731@@ -1901,7 +1901,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
48732 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48733 {
48734 struct xgbe_prv_data *pdata = channel->pdata;
48735- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48736+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48737 struct xgbe_ring *ring = channel->rx_ring;
48738 struct xgbe_ring_data *rdata;
48739 struct xgbe_packet_data *packet;
48740diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48741index ebf4893..a8f51c6 100644
48742--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48743+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48744@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48745
48746 DBGPR("-->%s\n", __func__);
48747
48748- pdata->hw_if.read_mmc_stats(pdata);
48749+ pdata->hw_if->read_mmc_stats(pdata);
48750 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48751 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48752 *data++ = *(u64 *)stat;
48753@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
48754 struct ethtool_coalesce *ec)
48755 {
48756 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48757- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48758+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48759 unsigned int riwt;
48760
48761 DBGPR("-->xgbe_get_coalesce\n");
48762@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48763 struct ethtool_coalesce *ec)
48764 {
48765 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48766- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48767+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48768 unsigned int rx_frames, rx_riwt, rx_usecs;
48769 unsigned int tx_frames, tx_usecs;
48770
48771@@ -536,7 +536,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
48772 const u8 *key, const u8 hfunc)
48773 {
48774 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48775- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48776+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48777 unsigned int ret;
48778
48779 if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
48780diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48781index 32dd651..225cca3 100644
48782--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48783+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48784@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48785 DBGPR("<--xgbe_default_config\n");
48786 }
48787
48788-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48789-{
48790- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48791- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48792-}
48793-
48794 #ifdef CONFIG_ACPI
48795 static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
48796 {
48797@@ -396,9 +390,8 @@ static int xgbe_probe(struct platform_device *pdev)
48798 memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
48799
48800 /* Set all the function pointers */
48801- xgbe_init_all_fptrs(pdata);
48802- hw_if = &pdata->hw_if;
48803- desc_if = &pdata->desc_if;
48804+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48805+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48806
48807 /* Issue software reset to device */
48808 hw_if->exit(pdata);
48809diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48810index 59e267f..0842a88 100644
48811--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48812+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48813@@ -126,7 +126,7 @@
48814 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48815 {
48816 struct xgbe_prv_data *pdata = mii->priv;
48817- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48818+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48819 int mmd_data;
48820
48821 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48822@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48823 u16 mmd_val)
48824 {
48825 struct xgbe_prv_data *pdata = mii->priv;
48826- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48827+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48828 int mmd_data = mmd_val;
48829
48830 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48831diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48832index f326178..8bd7daf 100644
48833--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48834+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48835@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48836 tstamp_cc);
48837 u64 nsec;
48838
48839- nsec = pdata->hw_if.get_tstamp_time(pdata);
48840+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48841
48842 return nsec;
48843 }
48844@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48845
48846 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48847
48848- pdata->hw_if.update_tstamp_addend(pdata, addend);
48849+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48850
48851 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48852
48853diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48854index 13e8f95..1d8beef 100644
48855--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48856+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48857@@ -675,8 +675,8 @@ struct xgbe_prv_data {
48858 int dev_irq;
48859 unsigned int per_channel_irq;
48860
48861- struct xgbe_hw_if hw_if;
48862- struct xgbe_desc_if desc_if;
48863+ struct xgbe_hw_if *hw_if;
48864+ struct xgbe_desc_if *desc_if;
48865
48866 /* AXI DMA settings */
48867 unsigned int coherent;
48868@@ -798,6 +798,9 @@ struct xgbe_prv_data {
48869 #endif
48870 };
48871
48872+extern const struct xgbe_hw_if default_xgbe_hw_if;
48873+extern const struct xgbe_desc_if default_xgbe_desc_if;
48874+
48875 /* Function prototypes*/
48876
48877 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48878diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48879index adcacda..fa6e0ae 100644
48880--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48881+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48882@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48883 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48884 {
48885 /* RX_MODE controlling object */
48886- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48887+ bnx2x_init_rx_mode_obj(bp);
48888
48889 /* multicast configuration controlling object */
48890 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48891diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48892index 07cdf9b..b08ecc7 100644
48893--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48894+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48895@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48896 return rc;
48897 }
48898
48899-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48900- struct bnx2x_rx_mode_obj *o)
48901+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48902 {
48903 if (CHIP_IS_E1x(bp)) {
48904- o->wait_comp = bnx2x_empty_rx_mode_wait;
48905- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48906+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48907+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48908 } else {
48909- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48910- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48911+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48912+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48913 }
48914 }
48915
48916diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48917index 86baecb..ff3bb46 100644
48918--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48919+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48920@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48921
48922 /********************* RX MODE ****************/
48923
48924-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48925- struct bnx2x_rx_mode_obj *o);
48926+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48927
48928 /**
48929 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48930diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48931index 31c9f82..e65e986 100644
48932--- a/drivers/net/ethernet/broadcom/tg3.h
48933+++ b/drivers/net/ethernet/broadcom/tg3.h
48934@@ -150,6 +150,7 @@
48935 #define CHIPREV_ID_5750_A0 0x4000
48936 #define CHIPREV_ID_5750_A1 0x4001
48937 #define CHIPREV_ID_5750_A3 0x4003
48938+#define CHIPREV_ID_5750_C1 0x4201
48939 #define CHIPREV_ID_5750_C2 0x4202
48940 #define CHIPREV_ID_5752_A0_HW 0x5000
48941 #define CHIPREV_ID_5752_A0 0x6000
48942diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
48943index 903466e..b285864 100644
48944--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
48945+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
48946@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
48947 }
48948
48949 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
48950- bna_cb_ioceth_enable,
48951- bna_cb_ioceth_disable,
48952- bna_cb_ioceth_hbfail,
48953- bna_cb_ioceth_reset
48954+ .enable_cbfn = bna_cb_ioceth_enable,
48955+ .disable_cbfn = bna_cb_ioceth_disable,
48956+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
48957+ .reset_cbfn = bna_cb_ioceth_reset
48958 };
48959
48960 static void bna_attr_init(struct bna_ioceth *ioceth)
48961diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48962index 8cffcdf..aadf043 100644
48963--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48964+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48965@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48966 */
48967 struct l2t_skb_cb {
48968 arp_failure_handler_func arp_failure_handler;
48969-};
48970+} __no_const;
48971
48972 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48973
48974diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48975index d929951..a2c23f5 100644
48976--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48977+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48978@@ -2215,7 +2215,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
48979
48980 int i;
48981 struct adapter *ap = netdev2adap(dev);
48982- static const unsigned int *reg_ranges;
48983+ const unsigned int *reg_ranges;
48984 int arr_size = 0, buf_size = 0;
48985
48986 if (is_t4(ap->params.chip)) {
48987diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48988index badff18..e15c4ec 100644
48989--- a/drivers/net/ethernet/dec/tulip/de4x5.c
48990+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48991@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48992 for (i=0; i<ETH_ALEN; i++) {
48993 tmp.addr[i] = dev->dev_addr[i];
48994 }
48995- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48996+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48997 break;
48998
48999 case DE4X5_SET_HWADDR: /* Set the hardware address */
49000@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
49001 spin_lock_irqsave(&lp->lock, flags);
49002 memcpy(&statbuf, &lp->pktStats, ioc->len);
49003 spin_unlock_irqrestore(&lp->lock, flags);
49004- if (copy_to_user(ioc->data, &statbuf, ioc->len))
49005+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
49006 return -EFAULT;
49007 break;
49008 }
49009diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
49010index e6b790f..051ba2d 100644
49011--- a/drivers/net/ethernet/emulex/benet/be_main.c
49012+++ b/drivers/net/ethernet/emulex/benet/be_main.c
49013@@ -536,7 +536,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
49014
49015 if (wrapped)
49016 newacc += 65536;
49017- ACCESS_ONCE(*acc) = newacc;
49018+ ACCESS_ONCE_RW(*acc) = newacc;
49019 }
49020
49021 static void populate_erx_stats(struct be_adapter *adapter,
49022diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
49023index 6d0c5d5..55be363 100644
49024--- a/drivers/net/ethernet/faraday/ftgmac100.c
49025+++ b/drivers/net/ethernet/faraday/ftgmac100.c
49026@@ -30,6 +30,8 @@
49027 #include <linux/netdevice.h>
49028 #include <linux/phy.h>
49029 #include <linux/platform_device.h>
49030+#include <linux/interrupt.h>
49031+#include <linux/irqreturn.h>
49032 #include <net/ip.h>
49033
49034 #include "ftgmac100.h"
49035diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
49036index dce5f7b..2433466 100644
49037--- a/drivers/net/ethernet/faraday/ftmac100.c
49038+++ b/drivers/net/ethernet/faraday/ftmac100.c
49039@@ -31,6 +31,8 @@
49040 #include <linux/module.h>
49041 #include <linux/netdevice.h>
49042 #include <linux/platform_device.h>
49043+#include <linux/interrupt.h>
49044+#include <linux/irqreturn.h>
49045
49046 #include "ftmac100.h"
49047
49048diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49049index fabcfa1..188fd22 100644
49050--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49051+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49052@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
49053 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
49054
49055 /* Update the base adjustement value. */
49056- ACCESS_ONCE(pf->ptp_base_adj) = incval;
49057+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
49058 smp_mb(); /* Force the above update. */
49059 }
49060
49061diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49062index 79c00f5..8da39f6 100644
49063--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49064+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49065@@ -785,7 +785,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
49066 }
49067
49068 /* update the base incval used to calculate frequency adjustment */
49069- ACCESS_ONCE(adapter->base_incval) = incval;
49070+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
49071 smp_mb();
49072
49073 /* need lock to prevent incorrect read while modifying cyclecounter */
49074diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49075index 8c234ec..757331f 100644
49076--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49077+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49078@@ -468,8 +468,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
49079 wmb();
49080
49081 /* we want to dirty this cache line once */
49082- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
49083- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
49084+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
49085+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
49086
49087 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
49088
49089diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49090index 6223930..975033d 100644
49091--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
49092+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49093@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49094 struct __vxge_hw_fifo *fifo;
49095 struct vxge_hw_fifo_config *config;
49096 u32 txdl_size, txdl_per_memblock;
49097- struct vxge_hw_mempool_cbs fifo_mp_callback;
49098+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
49099+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
49100+ };
49101+
49102 struct __vxge_hw_virtualpath *vpath;
49103
49104 if ((vp == NULL) || (attr == NULL)) {
49105@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49106 goto exit;
49107 }
49108
49109- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
49110-
49111 fifo->mempool =
49112 __vxge_hw_mempool_create(vpath->hldev,
49113 fifo->config->memblock_size,
49114diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49115index 2bb48d5..d1a865d 100644
49116--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49117+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49118@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
49119 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
49120 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
49121 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
49122- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49123+ pax_open_kernel();
49124+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49125+ pax_close_kernel();
49126 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49127 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
49128 max_tx_rings = QLCNIC_MAX_TX_RINGS;
49129diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49130index be7d7a6..a8983f8 100644
49131--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49132+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49133@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
49134 case QLCNIC_NON_PRIV_FUNC:
49135 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
49136 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49137- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49138+ pax_open_kernel();
49139+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49140+ pax_close_kernel();
49141 break;
49142 case QLCNIC_PRIV_FUNC:
49143 ahw->op_mode = QLCNIC_PRIV_FUNC;
49144 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
49145- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49146+ pax_open_kernel();
49147+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49148+ pax_close_kernel();
49149 break;
49150 case QLCNIC_MGMT_FUNC:
49151 ahw->op_mode = QLCNIC_MGMT_FUNC;
49152 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49153- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49154+ pax_open_kernel();
49155+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49156+ pax_close_kernel();
49157 break;
49158 default:
49159 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
49160diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49161index 332bb8a..e6adcd1 100644
49162--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49163+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49164@@ -1285,7 +1285,7 @@ flash_temp:
49165 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
49166 {
49167 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
49168- static const struct qlcnic_dump_operations *fw_dump_ops;
49169+ const struct qlcnic_dump_operations *fw_dump_ops;
49170 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
49171 u32 entry_offset, dump, no_entries, buf_offset = 0;
49172 int i, k, ops_cnt, ops_index, dump_size = 0;
49173diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
49174index c70ab40..00b28e0 100644
49175--- a/drivers/net/ethernet/realtek/r8169.c
49176+++ b/drivers/net/ethernet/realtek/r8169.c
49177@@ -788,22 +788,22 @@ struct rtl8169_private {
49178 struct mdio_ops {
49179 void (*write)(struct rtl8169_private *, int, int);
49180 int (*read)(struct rtl8169_private *, int);
49181- } mdio_ops;
49182+ } __no_const mdio_ops;
49183
49184 struct pll_power_ops {
49185 void (*down)(struct rtl8169_private *);
49186 void (*up)(struct rtl8169_private *);
49187- } pll_power_ops;
49188+ } __no_const pll_power_ops;
49189
49190 struct jumbo_ops {
49191 void (*enable)(struct rtl8169_private *);
49192 void (*disable)(struct rtl8169_private *);
49193- } jumbo_ops;
49194+ } __no_const jumbo_ops;
49195
49196 struct csi_ops {
49197 void (*write)(struct rtl8169_private *, int, int);
49198 u32 (*read)(struct rtl8169_private *, int);
49199- } csi_ops;
49200+ } __no_const csi_ops;
49201
49202 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
49203 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
49204diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
49205index 6b861e3..204ac86 100644
49206--- a/drivers/net/ethernet/sfc/ptp.c
49207+++ b/drivers/net/ethernet/sfc/ptp.c
49208@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
49209 ptp->start.dma_addr);
49210
49211 /* Clear flag that signals MC ready */
49212- ACCESS_ONCE(*start) = 0;
49213+ ACCESS_ONCE_RW(*start) = 0;
49214 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
49215 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
49216 EFX_BUG_ON_PARANOID(rc);
49217diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
49218index 10b6173..b605dfd5 100644
49219--- a/drivers/net/ethernet/sfc/selftest.c
49220+++ b/drivers/net/ethernet/sfc/selftest.c
49221@@ -46,7 +46,7 @@ struct efx_loopback_payload {
49222 struct iphdr ip;
49223 struct udphdr udp;
49224 __be16 iteration;
49225- const char msg[64];
49226+ char msg[64];
49227 } __packed;
49228
49229 /* Loopback test source MAC address */
49230diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49231index 08c483b..2c4a553 100644
49232--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49233+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49234@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
49235
49236 writel(value, ioaddr + MMC_CNTRL);
49237
49238- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49239- MMC_CNTRL, value);
49240+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49241+// MMC_CNTRL, value);
49242 }
49243
49244 /* To mask all all interrupts.*/
49245diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
49246index 17e2766..c332f1e 100644
49247--- a/drivers/net/ethernet/via/via-rhine.c
49248+++ b/drivers/net/ethernet/via/via-rhine.c
49249@@ -2514,7 +2514,7 @@ static struct platform_driver rhine_driver_platform = {
49250 }
49251 };
49252
49253-static struct dmi_system_id rhine_dmi_table[] __initdata = {
49254+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
49255 {
49256 .ident = "EPIA-M",
49257 .matches = {
49258diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
49259index 384ca4f..dd7d4f9 100644
49260--- a/drivers/net/hyperv/hyperv_net.h
49261+++ b/drivers/net/hyperv/hyperv_net.h
49262@@ -171,7 +171,7 @@ struct rndis_device {
49263 enum rndis_device_state state;
49264 bool link_state;
49265 bool link_change;
49266- atomic_t new_req_id;
49267+ atomic_unchecked_t new_req_id;
49268
49269 spinlock_t request_lock;
49270 struct list_head req_list;
49271diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
49272index 7816d98..7890614 100644
49273--- a/drivers/net/hyperv/rndis_filter.c
49274+++ b/drivers/net/hyperv/rndis_filter.c
49275@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
49276 * template
49277 */
49278 set = &rndis_msg->msg.set_req;
49279- set->req_id = atomic_inc_return(&dev->new_req_id);
49280+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49281
49282 /* Add to the request list */
49283 spin_lock_irqsave(&dev->request_lock, flags);
49284@@ -918,7 +918,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
49285
49286 /* Setup the rndis set */
49287 halt = &request->request_msg.msg.halt_req;
49288- halt->req_id = atomic_inc_return(&dev->new_req_id);
49289+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49290
49291 /* Ignore return since this msg is optional. */
49292 rndis_filter_send_request(dev, request);
49293diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
49294index 34f846b..4a0d5b1 100644
49295--- a/drivers/net/ifb.c
49296+++ b/drivers/net/ifb.c
49297@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
49298 return 0;
49299 }
49300
49301-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
49302+static struct rtnl_link_ops ifb_link_ops = {
49303 .kind = "ifb",
49304 .priv_size = sizeof(struct ifb_private),
49305 .setup = ifb_setup,
49306diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
49307index 1df38bd..4bc20b0 100644
49308--- a/drivers/net/macvlan.c
49309+++ b/drivers/net/macvlan.c
49310@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
49311 free_nskb:
49312 kfree_skb(nskb);
49313 err:
49314- atomic_long_inc(&skb->dev->rx_dropped);
49315+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
49316 }
49317
49318 static void macvlan_flush_sources(struct macvlan_port *port,
49319@@ -1459,13 +1459,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
49320 int macvlan_link_register(struct rtnl_link_ops *ops)
49321 {
49322 /* common fields */
49323- ops->priv_size = sizeof(struct macvlan_dev);
49324- ops->validate = macvlan_validate;
49325- ops->maxtype = IFLA_MACVLAN_MAX;
49326- ops->policy = macvlan_policy;
49327- ops->changelink = macvlan_changelink;
49328- ops->get_size = macvlan_get_size;
49329- ops->fill_info = macvlan_fill_info;
49330+ pax_open_kernel();
49331+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
49332+ *(void **)&ops->validate = macvlan_validate;
49333+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
49334+ *(const void **)&ops->policy = macvlan_policy;
49335+ *(void **)&ops->changelink = macvlan_changelink;
49336+ *(void **)&ops->get_size = macvlan_get_size;
49337+ *(void **)&ops->fill_info = macvlan_fill_info;
49338+ pax_close_kernel();
49339
49340 return rtnl_link_register(ops);
49341 };
49342@@ -1551,7 +1553,7 @@ static int macvlan_device_event(struct notifier_block *unused,
49343 return NOTIFY_DONE;
49344 }
49345
49346-static struct notifier_block macvlan_notifier_block __read_mostly = {
49347+static struct notifier_block macvlan_notifier_block = {
49348 .notifier_call = macvlan_device_event,
49349 };
49350
49351diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
49352index 27ecc5c..f636328 100644
49353--- a/drivers/net/macvtap.c
49354+++ b/drivers/net/macvtap.c
49355@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
49356 dev->tx_queue_len = TUN_READQ_SIZE;
49357 }
49358
49359-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
49360+static struct rtnl_link_ops macvtap_link_ops = {
49361 .kind = "macvtap",
49362 .setup = macvtap_setup,
49363 .newlink = macvtap_newlink,
49364@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
49365
49366 ret = 0;
49367 u = q->flags;
49368- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49369+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49370 put_user(u, &ifr->ifr_flags))
49371 ret = -EFAULT;
49372 macvtap_put_vlan(vlan);
49373@@ -1217,7 +1217,7 @@ static int macvtap_device_event(struct notifier_block *unused,
49374 return NOTIFY_DONE;
49375 }
49376
49377-static struct notifier_block macvtap_notifier_block __read_mostly = {
49378+static struct notifier_block macvtap_notifier_block = {
49379 .notifier_call = macvtap_device_event,
49380 };
49381
49382diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
49383index 34924df..a747360 100644
49384--- a/drivers/net/nlmon.c
49385+++ b/drivers/net/nlmon.c
49386@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
49387 return 0;
49388 }
49389
49390-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
49391+static struct rtnl_link_ops nlmon_link_ops = {
49392 .kind = "nlmon",
49393 .priv_size = sizeof(struct nlmon),
49394 .setup = nlmon_setup,
49395diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
49396index bdfe51f..e7845c7 100644
49397--- a/drivers/net/phy/phy_device.c
49398+++ b/drivers/net/phy/phy_device.c
49399@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
49400 * zero on success.
49401 *
49402 */
49403-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49404+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
49405 struct phy_c45_device_ids *c45_ids) {
49406 int phy_reg;
49407 int i, reg_addr;
49408@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49409 * its return value is in turn returned.
49410 *
49411 */
49412-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49413+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
49414 bool is_c45, struct phy_c45_device_ids *c45_ids)
49415 {
49416 int phy_reg;
49417@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49418 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
49419 {
49420 struct phy_c45_device_ids c45_ids = {0};
49421- u32 phy_id = 0;
49422+ int phy_id = 0;
49423 int r;
49424
49425 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
49426diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
49427index 9d15566..5ad4ef6 100644
49428--- a/drivers/net/ppp/ppp_generic.c
49429+++ b/drivers/net/ppp/ppp_generic.c
49430@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49431 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
49432 struct ppp_stats stats;
49433 struct ppp_comp_stats cstats;
49434- char *vers;
49435
49436 switch (cmd) {
49437 case SIOCGPPPSTATS:
49438@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49439 break;
49440
49441 case SIOCGPPPVER:
49442- vers = PPP_VERSION;
49443- if (copy_to_user(addr, vers, strlen(vers) + 1))
49444+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
49445 break;
49446 err = 0;
49447 break;
49448diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
49449index 079f7ad..b2a2bfa7 100644
49450--- a/drivers/net/slip/slhc.c
49451+++ b/drivers/net/slip/slhc.c
49452@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
49453 register struct tcphdr *thp;
49454 register struct iphdr *ip;
49455 register struct cstate *cs;
49456- int len, hdrlen;
49457+ long len, hdrlen;
49458 unsigned char *cp = icp;
49459
49460 /* We've got a compressed packet; read the change byte */
49461diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
49462index 7d39484..d58499d 100644
49463--- a/drivers/net/team/team.c
49464+++ b/drivers/net/team/team.c
49465@@ -2099,7 +2099,7 @@ static unsigned int team_get_num_rx_queues(void)
49466 return TEAM_DEFAULT_NUM_RX_QUEUES;
49467 }
49468
49469-static struct rtnl_link_ops team_link_ops __read_mostly = {
49470+static struct rtnl_link_ops team_link_ops = {
49471 .kind = DRV_NAME,
49472 .priv_size = sizeof(struct team),
49473 .setup = team_setup,
49474@@ -2889,7 +2889,7 @@ static int team_device_event(struct notifier_block *unused,
49475 return NOTIFY_DONE;
49476 }
49477
49478-static struct notifier_block team_notifier_block __read_mostly = {
49479+static struct notifier_block team_notifier_block = {
49480 .notifier_call = team_device_event,
49481 };
49482
49483diff --git a/drivers/net/tun.c b/drivers/net/tun.c
49484index 857dca4..642f532 100644
49485--- a/drivers/net/tun.c
49486+++ b/drivers/net/tun.c
49487@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
49488 return -EINVAL;
49489 }
49490
49491-static struct rtnl_link_ops tun_link_ops __read_mostly = {
49492+static struct rtnl_link_ops tun_link_ops = {
49493 .kind = DRV_NAME,
49494 .priv_size = sizeof(struct tun_struct),
49495 .setup = tun_setup,
49496@@ -1830,7 +1830,7 @@ unlock:
49497 }
49498
49499 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49500- unsigned long arg, int ifreq_len)
49501+ unsigned long arg, size_t ifreq_len)
49502 {
49503 struct tun_file *tfile = file->private_data;
49504 struct tun_struct *tun;
49505@@ -1844,6 +1844,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49506 int le;
49507 int ret;
49508
49509+ if (ifreq_len > sizeof ifr)
49510+ return -EFAULT;
49511+
49512 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
49513 if (copy_from_user(&ifr, argp, ifreq_len))
49514 return -EFAULT;
49515diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
49516index 778e915..58c4d95 100644
49517--- a/drivers/net/usb/hso.c
49518+++ b/drivers/net/usb/hso.c
49519@@ -70,7 +70,7 @@
49520 #include <asm/byteorder.h>
49521 #include <linux/serial_core.h>
49522 #include <linux/serial.h>
49523-
49524+#include <asm/local.h>
49525
49526 #define MOD_AUTHOR "Option Wireless"
49527 #define MOD_DESCRIPTION "USB High Speed Option driver"
49528@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
49529 struct urb *urb;
49530
49531 urb = serial->rx_urb[0];
49532- if (serial->port.count > 0) {
49533+ if (atomic_read(&serial->port.count) > 0) {
49534 count = put_rxbuf_data(urb, serial);
49535 if (count == -1)
49536 return;
49537@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
49538 DUMP1(urb->transfer_buffer, urb->actual_length);
49539
49540 /* Anyone listening? */
49541- if (serial->port.count == 0)
49542+ if (atomic_read(&serial->port.count) == 0)
49543 return;
49544
49545 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
49546@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49547 tty_port_tty_set(&serial->port, tty);
49548
49549 /* check for port already opened, if not set the termios */
49550- serial->port.count++;
49551- if (serial->port.count == 1) {
49552+ if (atomic_inc_return(&serial->port.count) == 1) {
49553 serial->rx_state = RX_IDLE;
49554 /* Force default termio settings */
49555 _hso_serial_set_termios(tty, NULL);
49556@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49557 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
49558 if (result) {
49559 hso_stop_serial_device(serial->parent);
49560- serial->port.count--;
49561+ atomic_dec(&serial->port.count);
49562 } else {
49563 kref_get(&serial->parent->ref);
49564 }
49565@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
49566
49567 /* reset the rts and dtr */
49568 /* do the actual close */
49569- serial->port.count--;
49570+ atomic_dec(&serial->port.count);
49571
49572- if (serial->port.count <= 0) {
49573- serial->port.count = 0;
49574+ if (atomic_read(&serial->port.count) <= 0) {
49575+ atomic_set(&serial->port.count, 0);
49576 tty_port_tty_set(&serial->port, NULL);
49577 if (!usb_gone)
49578 hso_stop_serial_device(serial->parent);
49579@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
49580
49581 /* the actual setup */
49582 spin_lock_irqsave(&serial->serial_lock, flags);
49583- if (serial->port.count)
49584+ if (atomic_read(&serial->port.count))
49585 _hso_serial_set_termios(tty, old);
49586 else
49587 tty->termios = *old;
49588@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
49589 D1("Pending read interrupt on port %d\n", i);
49590 spin_lock(&serial->serial_lock);
49591 if (serial->rx_state == RX_IDLE &&
49592- serial->port.count > 0) {
49593+ atomic_read(&serial->port.count) > 0) {
49594 /* Setup and send a ctrl req read on
49595 * port i */
49596 if (!serial->rx_urb_filled[0]) {
49597@@ -3053,7 +3052,7 @@ static int hso_resume(struct usb_interface *iface)
49598 /* Start all serial ports */
49599 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
49600 if (serial_table[i] && (serial_table[i]->interface == iface)) {
49601- if (dev2ser(serial_table[i])->port.count) {
49602+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
49603 result =
49604 hso_start_serial_device(serial_table[i], GFP_NOIO);
49605 hso_kick_transmit(dev2ser(serial_table[i]));
49606diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
49607index 9f7c0ab..1577b4a 100644
49608--- a/drivers/net/usb/r8152.c
49609+++ b/drivers/net/usb/r8152.c
49610@@ -601,7 +601,7 @@ struct r8152 {
49611 void (*unload)(struct r8152 *);
49612 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
49613 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
49614- } rtl_ops;
49615+ } __no_const rtl_ops;
49616
49617 int intr_interval;
49618 u32 saved_wolopts;
49619diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
49620index a2515887..6d13233 100644
49621--- a/drivers/net/usb/sierra_net.c
49622+++ b/drivers/net/usb/sierra_net.c
49623@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
49624 /* atomic counter partially included in MAC address to make sure 2 devices
49625 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
49626 */
49627-static atomic_t iface_counter = ATOMIC_INIT(0);
49628+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
49629
49630 /*
49631 * SYNC Timer Delay definition used to set the expiry time
49632@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
49633 dev->net->netdev_ops = &sierra_net_device_ops;
49634
49635 /* change MAC addr to include, ifacenum, and to be unique */
49636- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
49637+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
49638 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
49639
49640 /* we will have to manufacture ethernet headers, prepare template */
49641diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
49642index 777757a..395a767 100644
49643--- a/drivers/net/usb/usbnet.c
49644+++ b/drivers/net/usb/usbnet.c
49645@@ -1285,7 +1285,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
49646 struct net_device *net)
49647 {
49648 struct usbnet *dev = netdev_priv(net);
49649- int length;
49650+ unsigned int length;
49651 struct urb *urb = NULL;
49652 struct skb_data *entry;
49653 struct driver_info *info = dev->driver_info;
49654@@ -1413,7 +1413,7 @@ not_drop:
49655 }
49656 } else
49657 netif_dbg(dev, tx_queued, dev->net,
49658- "> tx, len %d, type 0x%x\n", length, skb->protocol);
49659+ "> tx, len %u, type 0x%x\n", length, skb->protocol);
49660 #ifdef CONFIG_PM
49661 deferred:
49662 #endif
49663diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
49664index 59b0e97..a6ed579 100644
49665--- a/drivers/net/virtio_net.c
49666+++ b/drivers/net/virtio_net.c
49667@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
49668 #define RECEIVE_AVG_WEIGHT 64
49669
49670 /* Minimum alignment for mergeable packet buffers. */
49671-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
49672+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
49673
49674 #define VIRTNET_DRIVER_VERSION "1.0.0"
49675
49676diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
49677index fceb637..37c70fd 100644
49678--- a/drivers/net/vxlan.c
49679+++ b/drivers/net/vxlan.c
49680@@ -2935,7 +2935,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
49681 return vxlan->net;
49682 }
49683
49684-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
49685+static struct rtnl_link_ops vxlan_link_ops = {
49686 .kind = "vxlan",
49687 .maxtype = IFLA_VXLAN_MAX,
49688 .policy = vxlan_policy,
49689@@ -2983,7 +2983,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
49690 return NOTIFY_DONE;
49691 }
49692
49693-static struct notifier_block vxlan_notifier_block __read_mostly = {
49694+static struct notifier_block vxlan_notifier_block = {
49695 .notifier_call = vxlan_lowerdev_event,
49696 };
49697
49698diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
49699index 5920c99..ff2e4a5 100644
49700--- a/drivers/net/wan/lmc/lmc_media.c
49701+++ b/drivers/net/wan/lmc/lmc_media.c
49702@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
49703 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
49704
49705 lmc_media_t lmc_ds3_media = {
49706- lmc_ds3_init, /* special media init stuff */
49707- lmc_ds3_default, /* reset to default state */
49708- lmc_ds3_set_status, /* reset status to state provided */
49709- lmc_dummy_set_1, /* set clock source */
49710- lmc_dummy_set2_1, /* set line speed */
49711- lmc_ds3_set_100ft, /* set cable length */
49712- lmc_ds3_set_scram, /* set scrambler */
49713- lmc_ds3_get_link_status, /* get link status */
49714- lmc_dummy_set_1, /* set link status */
49715- lmc_ds3_set_crc_length, /* set CRC length */
49716- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49717- lmc_ds3_watchdog
49718+ .init = lmc_ds3_init, /* special media init stuff */
49719+ .defaults = lmc_ds3_default, /* reset to default state */
49720+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
49721+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
49722+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49723+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
49724+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
49725+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
49726+ .set_link_status = lmc_dummy_set_1, /* set link status */
49727+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
49728+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49729+ .watchdog = lmc_ds3_watchdog
49730 };
49731
49732 lmc_media_t lmc_hssi_media = {
49733- lmc_hssi_init, /* special media init stuff */
49734- lmc_hssi_default, /* reset to default state */
49735- lmc_hssi_set_status, /* reset status to state provided */
49736- lmc_hssi_set_clock, /* set clock source */
49737- lmc_dummy_set2_1, /* set line speed */
49738- lmc_dummy_set_1, /* set cable length */
49739- lmc_dummy_set_1, /* set scrambler */
49740- lmc_hssi_get_link_status, /* get link status */
49741- lmc_hssi_set_link_status, /* set link status */
49742- lmc_hssi_set_crc_length, /* set CRC length */
49743- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49744- lmc_hssi_watchdog
49745+ .init = lmc_hssi_init, /* special media init stuff */
49746+ .defaults = lmc_hssi_default, /* reset to default state */
49747+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
49748+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
49749+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49750+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49751+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49752+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49753+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49754+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49755+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49756+ .watchdog = lmc_hssi_watchdog
49757 };
49758
49759-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49760- lmc_ssi_default, /* reset to default state */
49761- lmc_ssi_set_status, /* reset status to state provided */
49762- lmc_ssi_set_clock, /* set clock source */
49763- lmc_ssi_set_speed, /* set line speed */
49764- lmc_dummy_set_1, /* set cable length */
49765- lmc_dummy_set_1, /* set scrambler */
49766- lmc_ssi_get_link_status, /* get link status */
49767- lmc_ssi_set_link_status, /* set link status */
49768- lmc_ssi_set_crc_length, /* set CRC length */
49769- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49770- lmc_ssi_watchdog
49771+lmc_media_t lmc_ssi_media = {
49772+ .init = lmc_ssi_init, /* special media init stuff */
49773+ .defaults = lmc_ssi_default, /* reset to default state */
49774+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49775+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49776+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49777+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49778+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49779+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49780+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49781+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49782+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49783+ .watchdog = lmc_ssi_watchdog
49784 };
49785
49786 lmc_media_t lmc_t1_media = {
49787- lmc_t1_init, /* special media init stuff */
49788- lmc_t1_default, /* reset to default state */
49789- lmc_t1_set_status, /* reset status to state provided */
49790- lmc_t1_set_clock, /* set clock source */
49791- lmc_dummy_set2_1, /* set line speed */
49792- lmc_dummy_set_1, /* set cable length */
49793- lmc_dummy_set_1, /* set scrambler */
49794- lmc_t1_get_link_status, /* get link status */
49795- lmc_dummy_set_1, /* set link status */
49796- lmc_t1_set_crc_length, /* set CRC length */
49797- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49798- lmc_t1_watchdog
49799+ .init = lmc_t1_init, /* special media init stuff */
49800+ .defaults = lmc_t1_default, /* reset to default state */
49801+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49802+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49803+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49804+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49805+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49806+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49807+ .set_link_status = lmc_dummy_set_1, /* set link status */
49808+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49809+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49810+ .watchdog = lmc_t1_watchdog
49811 };
49812
49813 static void
49814diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49815index feacc3b..5bac0de 100644
49816--- a/drivers/net/wan/z85230.c
49817+++ b/drivers/net/wan/z85230.c
49818@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49819
49820 struct z8530_irqhandler z8530_sync =
49821 {
49822- z8530_rx,
49823- z8530_tx,
49824- z8530_status
49825+ .rx = z8530_rx,
49826+ .tx = z8530_tx,
49827+ .status = z8530_status
49828 };
49829
49830 EXPORT_SYMBOL(z8530_sync);
49831@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49832 }
49833
49834 static struct z8530_irqhandler z8530_dma_sync = {
49835- z8530_dma_rx,
49836- z8530_dma_tx,
49837- z8530_dma_status
49838+ .rx = z8530_dma_rx,
49839+ .tx = z8530_dma_tx,
49840+ .status = z8530_dma_status
49841 };
49842
49843 static struct z8530_irqhandler z8530_txdma_sync = {
49844- z8530_rx,
49845- z8530_dma_tx,
49846- z8530_dma_status
49847+ .rx = z8530_rx,
49848+ .tx = z8530_dma_tx,
49849+ .status = z8530_dma_status
49850 };
49851
49852 /**
49853@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49854
49855 struct z8530_irqhandler z8530_nop=
49856 {
49857- z8530_rx_clear,
49858- z8530_tx_clear,
49859- z8530_status_clear
49860+ .rx = z8530_rx_clear,
49861+ .tx = z8530_tx_clear,
49862+ .status = z8530_status_clear
49863 };
49864
49865
49866diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49867index 0b60295..b8bfa5b 100644
49868--- a/drivers/net/wimax/i2400m/rx.c
49869+++ b/drivers/net/wimax/i2400m/rx.c
49870@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49871 if (i2400m->rx_roq == NULL)
49872 goto error_roq_alloc;
49873
49874- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49875+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49876 GFP_KERNEL);
49877 if (rd == NULL) {
49878 result = -ENOMEM;
49879diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49880index e71a2ce..2268d61 100644
49881--- a/drivers/net/wireless/airo.c
49882+++ b/drivers/net/wireless/airo.c
49883@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49884 struct airo_info *ai = dev->ml_priv;
49885 int ridcode;
49886 int enabled;
49887- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49888+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49889 unsigned char *iobuf;
49890
49891 /* Only super-user can write RIDs */
49892diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
49893index da92bfa..5a9001a 100644
49894--- a/drivers/net/wireless/at76c50x-usb.c
49895+++ b/drivers/net/wireless/at76c50x-usb.c
49896@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
49897 }
49898
49899 /* Convert timeout from the DFU status to jiffies */
49900-static inline unsigned long at76_get_timeout(struct dfu_status *s)
49901+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
49902 {
49903 return msecs_to_jiffies((s->poll_timeout[2] << 16)
49904 | (s->poll_timeout[1] << 8)
49905diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
49906index 2fd9e18..3f55bdd 100644
49907--- a/drivers/net/wireless/ath/ath10k/htc.c
49908+++ b/drivers/net/wireless/ath/ath10k/htc.c
49909@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
49910 /* registered target arrival callback from the HIF layer */
49911 int ath10k_htc_init(struct ath10k *ar)
49912 {
49913- struct ath10k_hif_cb htc_callbacks;
49914+ static struct ath10k_hif_cb htc_callbacks = {
49915+ .rx_completion = ath10k_htc_rx_completion_handler,
49916+ .tx_completion = ath10k_htc_tx_completion_handler,
49917+ };
49918 struct ath10k_htc_ep *ep = NULL;
49919 struct ath10k_htc *htc = &ar->htc;
49920
49921@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
49922 ath10k_htc_reset_endpoint_states(htc);
49923
49924 /* setup HIF layer callbacks */
49925- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
49926- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
49927 htc->ar = ar;
49928
49929 /* Get HIF default pipe for HTC message exchange */
49930diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49931index 527179c..a890150 100644
49932--- a/drivers/net/wireless/ath/ath10k/htc.h
49933+++ b/drivers/net/wireless/ath/ath10k/htc.h
49934@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
49935
49936 struct ath10k_htc_ops {
49937 void (*target_send_suspend_complete)(struct ath10k *ar);
49938-};
49939+} __no_const;
49940
49941 struct ath10k_htc_ep_ops {
49942 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
49943 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
49944 void (*ep_tx_credits)(struct ath10k *);
49945-};
49946+} __no_const;
49947
49948 /* service connection information */
49949 struct ath10k_htc_svc_conn_req {
49950diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49951index f816909..e56cd8b 100644
49952--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49953+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49954@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49955 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
49956 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
49957
49958- ACCESS_ONCE(ads->ds_link) = i->link;
49959- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
49960+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
49961+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
49962
49963 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
49964 ctl6 = SM(i->keytype, AR_EncrType);
49965@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49966
49967 if ((i->is_first || i->is_last) &&
49968 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
49969- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
49970+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
49971 | set11nTries(i->rates, 1)
49972 | set11nTries(i->rates, 2)
49973 | set11nTries(i->rates, 3)
49974 | (i->dur_update ? AR_DurUpdateEna : 0)
49975 | SM(0, AR_BurstDur);
49976
49977- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
49978+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
49979 | set11nRate(i->rates, 1)
49980 | set11nRate(i->rates, 2)
49981 | set11nRate(i->rates, 3);
49982 } else {
49983- ACCESS_ONCE(ads->ds_ctl2) = 0;
49984- ACCESS_ONCE(ads->ds_ctl3) = 0;
49985+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
49986+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
49987 }
49988
49989 if (!i->is_first) {
49990- ACCESS_ONCE(ads->ds_ctl0) = 0;
49991- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49992- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49993+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
49994+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49995+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49996 return;
49997 }
49998
49999@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50000 break;
50001 }
50002
50003- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50004+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50005 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50006 | SM(i->txpower[0], AR_XmitPower0)
50007 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50008@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50009 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
50010 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
50011
50012- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50013- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50014+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50015+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50016
50017 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
50018 return;
50019
50020- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50021+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50022 | set11nPktDurRTSCTS(i->rates, 1);
50023
50024- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50025+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50026 | set11nPktDurRTSCTS(i->rates, 3);
50027
50028- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50029+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50030 | set11nRateFlags(i->rates, 1)
50031 | set11nRateFlags(i->rates, 2)
50032 | set11nRateFlags(i->rates, 3)
50033 | SM(i->rtscts_rate, AR_RTSCTSRate);
50034
50035- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50036- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50037- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50038+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50039+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50040+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50041 }
50042
50043 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
50044diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50045index da84b70..83e4978 100644
50046--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50047+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50048@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50049 (i->qcu << AR_TxQcuNum_S) | desc_len;
50050
50051 checksum += val;
50052- ACCESS_ONCE(ads->info) = val;
50053+ ACCESS_ONCE_RW(ads->info) = val;
50054
50055 checksum += i->link;
50056- ACCESS_ONCE(ads->link) = i->link;
50057+ ACCESS_ONCE_RW(ads->link) = i->link;
50058
50059 checksum += i->buf_addr[0];
50060- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
50061+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
50062 checksum += i->buf_addr[1];
50063- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
50064+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
50065 checksum += i->buf_addr[2];
50066- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
50067+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
50068 checksum += i->buf_addr[3];
50069- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
50070+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
50071
50072 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
50073- ACCESS_ONCE(ads->ctl3) = val;
50074+ ACCESS_ONCE_RW(ads->ctl3) = val;
50075 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
50076- ACCESS_ONCE(ads->ctl5) = val;
50077+ ACCESS_ONCE_RW(ads->ctl5) = val;
50078 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
50079- ACCESS_ONCE(ads->ctl7) = val;
50080+ ACCESS_ONCE_RW(ads->ctl7) = val;
50081 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
50082- ACCESS_ONCE(ads->ctl9) = val;
50083+ ACCESS_ONCE_RW(ads->ctl9) = val;
50084
50085 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
50086- ACCESS_ONCE(ads->ctl10) = checksum;
50087+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
50088
50089 if (i->is_first || i->is_last) {
50090- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
50091+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
50092 | set11nTries(i->rates, 1)
50093 | set11nTries(i->rates, 2)
50094 | set11nTries(i->rates, 3)
50095 | (i->dur_update ? AR_DurUpdateEna : 0)
50096 | SM(0, AR_BurstDur);
50097
50098- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
50099+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
50100 | set11nRate(i->rates, 1)
50101 | set11nRate(i->rates, 2)
50102 | set11nRate(i->rates, 3);
50103 } else {
50104- ACCESS_ONCE(ads->ctl13) = 0;
50105- ACCESS_ONCE(ads->ctl14) = 0;
50106+ ACCESS_ONCE_RW(ads->ctl13) = 0;
50107+ ACCESS_ONCE_RW(ads->ctl14) = 0;
50108 }
50109
50110 ads->ctl20 = 0;
50111@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50112
50113 ctl17 = SM(i->keytype, AR_EncrType);
50114 if (!i->is_first) {
50115- ACCESS_ONCE(ads->ctl11) = 0;
50116- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50117- ACCESS_ONCE(ads->ctl15) = 0;
50118- ACCESS_ONCE(ads->ctl16) = 0;
50119- ACCESS_ONCE(ads->ctl17) = ctl17;
50120- ACCESS_ONCE(ads->ctl18) = 0;
50121- ACCESS_ONCE(ads->ctl19) = 0;
50122+ ACCESS_ONCE_RW(ads->ctl11) = 0;
50123+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50124+ ACCESS_ONCE_RW(ads->ctl15) = 0;
50125+ ACCESS_ONCE_RW(ads->ctl16) = 0;
50126+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50127+ ACCESS_ONCE_RW(ads->ctl18) = 0;
50128+ ACCESS_ONCE_RW(ads->ctl19) = 0;
50129 return;
50130 }
50131
50132- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50133+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50134 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50135 | SM(i->txpower[0], AR_XmitPower0)
50136 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50137@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50138 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
50139 ctl12 |= SM(val, AR_PAPRDChainMask);
50140
50141- ACCESS_ONCE(ads->ctl12) = ctl12;
50142- ACCESS_ONCE(ads->ctl17) = ctl17;
50143+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
50144+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50145
50146- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50147+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50148 | set11nPktDurRTSCTS(i->rates, 1);
50149
50150- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50151+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50152 | set11nPktDurRTSCTS(i->rates, 3);
50153
50154- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
50155+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
50156 | set11nRateFlags(i->rates, 1)
50157 | set11nRateFlags(i->rates, 2)
50158 | set11nRateFlags(i->rates, 3)
50159 | SM(i->rtscts_rate, AR_RTSCTSRate);
50160
50161- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
50162+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
50163
50164- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50165- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50166- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50167+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50168+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50169+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50170 }
50171
50172 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
50173diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
50174index e82e570..8c3cf90 100644
50175--- a/drivers/net/wireless/ath/ath9k/hw.h
50176+++ b/drivers/net/wireless/ath/ath9k/hw.h
50177@@ -646,7 +646,7 @@ struct ath_hw_private_ops {
50178
50179 /* ANI */
50180 void (*ani_cache_ini_regs)(struct ath_hw *ah);
50181-};
50182+} __no_const;
50183
50184 /**
50185 * struct ath_spec_scan - parameters for Atheros spectral scan
50186@@ -722,7 +722,7 @@ struct ath_hw_ops {
50187 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50188 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
50189 #endif
50190-};
50191+} __no_const;
50192
50193 struct ath_nf_limits {
50194 s16 max;
50195diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
50196index 9ede991..a8f08fb 100644
50197--- a/drivers/net/wireless/ath/ath9k/main.c
50198+++ b/drivers/net/wireless/ath/ath9k/main.c
50199@@ -2537,16 +2537,18 @@ void ath9k_fill_chanctx_ops(void)
50200 if (!ath9k_is_chanctx_enabled())
50201 return;
50202
50203- ath9k_ops.hw_scan = ath9k_hw_scan;
50204- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50205- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50206- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50207- ath9k_ops.add_chanctx = ath9k_add_chanctx;
50208- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50209- ath9k_ops.change_chanctx = ath9k_change_chanctx;
50210- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50211- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50212- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50213+ pax_open_kernel();
50214+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
50215+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50216+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50217+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50218+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
50219+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50220+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
50221+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50222+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50223+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50224+ pax_close_kernel();
50225 }
50226
50227 #endif
50228diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
50229index 058a9f2..d5cb1ba 100644
50230--- a/drivers/net/wireless/b43/phy_lp.c
50231+++ b/drivers/net/wireless/b43/phy_lp.c
50232@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
50233 {
50234 struct ssb_bus *bus = dev->dev->sdev->bus;
50235
50236- static const struct b206x_channel *chandata = NULL;
50237+ const struct b206x_channel *chandata = NULL;
50238 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
50239 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
50240 u16 old_comm15, scale;
50241diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
50242index e566580..2c218ca 100644
50243--- a/drivers/net/wireless/iwlegacy/3945-mac.c
50244+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
50245@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
50246 */
50247 if (il3945_mod_params.disable_hw_scan) {
50248 D_INFO("Disabling hw_scan\n");
50249- il3945_mac_ops.hw_scan = NULL;
50250+ pax_open_kernel();
50251+ *(void **)&il3945_mac_ops.hw_scan = NULL;
50252+ pax_close_kernel();
50253 }
50254
50255 D_INFO("*** LOAD DRIVER ***\n");
50256diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50257index 0ffb6ff..c0b7f0e 100644
50258--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50259+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50260@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
50261 {
50262 struct iwl_priv *priv = file->private_data;
50263 char buf[64];
50264- int buf_size;
50265+ size_t buf_size;
50266 u32 offset, len;
50267
50268 memset(buf, 0, sizeof(buf));
50269@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
50270 struct iwl_priv *priv = file->private_data;
50271
50272 char buf[8];
50273- int buf_size;
50274+ size_t buf_size;
50275 u32 reset_flag;
50276
50277 memset(buf, 0, sizeof(buf));
50278@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
50279 {
50280 struct iwl_priv *priv = file->private_data;
50281 char buf[8];
50282- int buf_size;
50283+ size_t buf_size;
50284 int ht40;
50285
50286 memset(buf, 0, sizeof(buf));
50287@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
50288 {
50289 struct iwl_priv *priv = file->private_data;
50290 char buf[8];
50291- int buf_size;
50292+ size_t buf_size;
50293 int value;
50294
50295 memset(buf, 0, sizeof(buf));
50296@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
50297 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
50298 DEBUGFS_READ_FILE_OPS(current_sleep_command);
50299
50300-static const char *fmt_value = " %-30s %10u\n";
50301-static const char *fmt_hex = " %-30s 0x%02X\n";
50302-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
50303-static const char *fmt_header =
50304+static const char fmt_value[] = " %-30s %10u\n";
50305+static const char fmt_hex[] = " %-30s 0x%02X\n";
50306+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
50307+static const char fmt_header[] =
50308 "%-32s current cumulative delta max\n";
50309
50310 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
50311@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
50312 {
50313 struct iwl_priv *priv = file->private_data;
50314 char buf[8];
50315- int buf_size;
50316+ size_t buf_size;
50317 int clear;
50318
50319 memset(buf, 0, sizeof(buf));
50320@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
50321 {
50322 struct iwl_priv *priv = file->private_data;
50323 char buf[8];
50324- int buf_size;
50325+ size_t buf_size;
50326 int trace;
50327
50328 memset(buf, 0, sizeof(buf));
50329@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
50330 {
50331 struct iwl_priv *priv = file->private_data;
50332 char buf[8];
50333- int buf_size;
50334+ size_t buf_size;
50335 int missed;
50336
50337 memset(buf, 0, sizeof(buf));
50338@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
50339
50340 struct iwl_priv *priv = file->private_data;
50341 char buf[8];
50342- int buf_size;
50343+ size_t buf_size;
50344 int plcp;
50345
50346 memset(buf, 0, sizeof(buf));
50347@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
50348
50349 struct iwl_priv *priv = file->private_data;
50350 char buf[8];
50351- int buf_size;
50352+ size_t buf_size;
50353 int flush;
50354
50355 memset(buf, 0, sizeof(buf));
50356@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
50357
50358 struct iwl_priv *priv = file->private_data;
50359 char buf[8];
50360- int buf_size;
50361+ size_t buf_size;
50362 int rts;
50363
50364 if (!priv->cfg->ht_params)
50365@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
50366 {
50367 struct iwl_priv *priv = file->private_data;
50368 char buf[8];
50369- int buf_size;
50370+ size_t buf_size;
50371
50372 memset(buf, 0, sizeof(buf));
50373 buf_size = min(count, sizeof(buf) - 1);
50374@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
50375 struct iwl_priv *priv = file->private_data;
50376 u32 event_log_flag;
50377 char buf[8];
50378- int buf_size;
50379+ size_t buf_size;
50380
50381 /* check that the interface is up */
50382 if (!iwl_is_ready(priv))
50383@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
50384 struct iwl_priv *priv = file->private_data;
50385 char buf[8];
50386 u32 calib_disabled;
50387- int buf_size;
50388+ size_t buf_size;
50389
50390 memset(buf, 0, sizeof(buf));
50391 buf_size = min(count, sizeof(buf) - 1);
50392diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
50393index cb72edb..242b24f 100644
50394--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
50395+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
50396@@ -1837,7 +1837,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
50397 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
50398
50399 char buf[8];
50400- int buf_size;
50401+ size_t buf_size;
50402 u32 reset_flag;
50403
50404 memset(buf, 0, sizeof(buf));
50405@@ -1858,7 +1858,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
50406 {
50407 struct iwl_trans *trans = file->private_data;
50408 char buf[8];
50409- int buf_size;
50410+ size_t buf_size;
50411 int csr;
50412
50413 memset(buf, 0, sizeof(buf));
50414diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
50415index 8908be6..fe97ddd 100644
50416--- a/drivers/net/wireless/mac80211_hwsim.c
50417+++ b/drivers/net/wireless/mac80211_hwsim.c
50418@@ -3070,20 +3070,20 @@ static int __init init_mac80211_hwsim(void)
50419 if (channels < 1)
50420 return -EINVAL;
50421
50422- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
50423- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50424- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50425- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50426- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50427- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50428- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50429- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50430- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50431- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50432- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
50433- mac80211_hwsim_assign_vif_chanctx;
50434- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
50435- mac80211_hwsim_unassign_vif_chanctx;
50436+ pax_open_kernel();
50437+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
50438+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50439+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50440+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50441+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50442+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50443+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50444+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50445+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50446+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50447+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
50448+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
50449+ pax_close_kernel();
50450
50451 spin_lock_init(&hwsim_radio_lock);
50452 INIT_LIST_HEAD(&hwsim_radios);
50453diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
50454index 60d44ce..884dd1c 100644
50455--- a/drivers/net/wireless/rndis_wlan.c
50456+++ b/drivers/net/wireless/rndis_wlan.c
50457@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
50458
50459 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
50460
50461- if (rts_threshold < 0 || rts_threshold > 2347)
50462+ if (rts_threshold > 2347)
50463 rts_threshold = 2347;
50464
50465 tmp = cpu_to_le32(rts_threshold);
50466diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
50467index 9bb398b..b0cc047 100644
50468--- a/drivers/net/wireless/rt2x00/rt2x00.h
50469+++ b/drivers/net/wireless/rt2x00/rt2x00.h
50470@@ -375,7 +375,7 @@ struct rt2x00_intf {
50471 * for hardware which doesn't support hardware
50472 * sequence counting.
50473 */
50474- atomic_t seqno;
50475+ atomic_unchecked_t seqno;
50476 };
50477
50478 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
50479diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
50480index 68b620b..92ecd9e 100644
50481--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
50482+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
50483@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
50484 * sequence counter given by mac80211.
50485 */
50486 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
50487- seqno = atomic_add_return(0x10, &intf->seqno);
50488+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
50489 else
50490- seqno = atomic_read(&intf->seqno);
50491+ seqno = atomic_read_unchecked(&intf->seqno);
50492
50493 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
50494 hdr->seq_ctrl |= cpu_to_le16(seqno);
50495diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
50496index b661f896..ddf7d2b 100644
50497--- a/drivers/net/wireless/ti/wl1251/sdio.c
50498+++ b/drivers/net/wireless/ti/wl1251/sdio.c
50499@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
50500
50501 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
50502
50503- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50504- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50505+ pax_open_kernel();
50506+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50507+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50508+ pax_close_kernel();
50509
50510 wl1251_info("using dedicated interrupt line");
50511 } else {
50512- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50513- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50514+ pax_open_kernel();
50515+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50516+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50517+ pax_close_kernel();
50518
50519 wl1251_info("using SDIO interrupt");
50520 }
50521diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
50522index 144d1f8..7030936 100644
50523--- a/drivers/net/wireless/ti/wl12xx/main.c
50524+++ b/drivers/net/wireless/ti/wl12xx/main.c
50525@@ -657,7 +657,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50526 sizeof(wl->conf.mem));
50527
50528 /* read data preparation is only needed by wl127x */
50529- wl->ops->prepare_read = wl127x_prepare_read;
50530+ pax_open_kernel();
50531+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50532+ pax_close_kernel();
50533
50534 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50535 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50536@@ -682,7 +684,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50537 sizeof(wl->conf.mem));
50538
50539 /* read data preparation is only needed by wl127x */
50540- wl->ops->prepare_read = wl127x_prepare_read;
50541+ pax_open_kernel();
50542+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50543+ pax_close_kernel();
50544
50545 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50546 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50547diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
50548index 717c4f5..a813aeb 100644
50549--- a/drivers/net/wireless/ti/wl18xx/main.c
50550+++ b/drivers/net/wireless/ti/wl18xx/main.c
50551@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
50552 }
50553
50554 if (!checksum_param) {
50555- wl18xx_ops.set_rx_csum = NULL;
50556- wl18xx_ops.init_vif = NULL;
50557+ pax_open_kernel();
50558+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
50559+ *(void **)&wl18xx_ops.init_vif = NULL;
50560+ pax_close_kernel();
50561 }
50562
50563 /* Enable 11a Band only if we have 5G antennas */
50564diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
50565index a912dc0..a8225ba 100644
50566--- a/drivers/net/wireless/zd1211rw/zd_usb.c
50567+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
50568@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
50569 {
50570 struct zd_usb *usb = urb->context;
50571 struct zd_usb_interrupt *intr = &usb->intr;
50572- int len;
50573+ unsigned int len;
50574 u16 int_num;
50575
50576 ZD_ASSERT(in_interrupt());
50577diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
50578index ce2e2cf..f81e500 100644
50579--- a/drivers/nfc/nfcwilink.c
50580+++ b/drivers/nfc/nfcwilink.c
50581@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
50582
50583 static int nfcwilink_probe(struct platform_device *pdev)
50584 {
50585- static struct nfcwilink *drv;
50586+ struct nfcwilink *drv;
50587 int rc;
50588 __u32 protocols;
50589
50590diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
50591index 24d3d24..ff70d28 100644
50592--- a/drivers/nfc/st21nfca/st21nfca.c
50593+++ b/drivers/nfc/st21nfca/st21nfca.c
50594@@ -588,7 +588,7 @@ static int st21nfca_get_iso14443_3_uid(struct nfc_hci_dev *hdev, u8 *gate,
50595 goto exit;
50596 }
50597
50598- gate = uid_skb->data;
50599+ memcpy(gate, uid_skb->data, uid_skb->len);
50600 *len = uid_skb->len;
50601 exit:
50602 kfree_skb(uid_skb);
50603diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
50604index 3a896c9..ac7b1c8 100644
50605--- a/drivers/of/fdt.c
50606+++ b/drivers/of/fdt.c
50607@@ -1118,7 +1118,9 @@ static int __init of_fdt_raw_init(void)
50608 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
50609 return 0;
50610 }
50611- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50612+ pax_open_kernel();
50613+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50614+ pax_close_kernel();
50615 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
50616 }
50617 late_initcall(of_fdt_raw_init);
50618diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
50619index d93b2b6..ae50401 100644
50620--- a/drivers/oprofile/buffer_sync.c
50621+++ b/drivers/oprofile/buffer_sync.c
50622@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
50623 if (cookie == NO_COOKIE)
50624 offset = pc;
50625 if (cookie == INVALID_COOKIE) {
50626- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50627+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50628 offset = pc;
50629 }
50630 if (cookie != last_cookie) {
50631@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
50632 /* add userspace sample */
50633
50634 if (!mm) {
50635- atomic_inc(&oprofile_stats.sample_lost_no_mm);
50636+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
50637 return 0;
50638 }
50639
50640 cookie = lookup_dcookie(mm, s->eip, &offset);
50641
50642 if (cookie == INVALID_COOKIE) {
50643- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50644+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50645 return 0;
50646 }
50647
50648@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
50649 /* ignore backtraces if failed to add a sample */
50650 if (state == sb_bt_start) {
50651 state = sb_bt_ignore;
50652- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
50653+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
50654 }
50655 }
50656 release_mm(mm);
50657diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
50658index c0cc4e7..44d4e54 100644
50659--- a/drivers/oprofile/event_buffer.c
50660+++ b/drivers/oprofile/event_buffer.c
50661@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
50662 }
50663
50664 if (buffer_pos == buffer_size) {
50665- atomic_inc(&oprofile_stats.event_lost_overflow);
50666+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
50667 return;
50668 }
50669
50670diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
50671index ed2c3ec..deda85a 100644
50672--- a/drivers/oprofile/oprof.c
50673+++ b/drivers/oprofile/oprof.c
50674@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
50675 if (oprofile_ops.switch_events())
50676 return;
50677
50678- atomic_inc(&oprofile_stats.multiplex_counter);
50679+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
50680 start_switch_worker();
50681 }
50682
50683diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
50684index ee2cfce..7f8f699 100644
50685--- a/drivers/oprofile/oprofile_files.c
50686+++ b/drivers/oprofile/oprofile_files.c
50687@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
50688
50689 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
50690
50691-static ssize_t timeout_read(struct file *file, char __user *buf,
50692+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
50693 size_t count, loff_t *offset)
50694 {
50695 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
50696diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
50697index 59659ce..6c860a0 100644
50698--- a/drivers/oprofile/oprofile_stats.c
50699+++ b/drivers/oprofile/oprofile_stats.c
50700@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
50701 cpu_buf->sample_invalid_eip = 0;
50702 }
50703
50704- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
50705- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
50706- atomic_set(&oprofile_stats.event_lost_overflow, 0);
50707- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
50708- atomic_set(&oprofile_stats.multiplex_counter, 0);
50709+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
50710+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
50711+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
50712+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
50713+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
50714 }
50715
50716
50717diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
50718index 1fc622b..8c48fc3 100644
50719--- a/drivers/oprofile/oprofile_stats.h
50720+++ b/drivers/oprofile/oprofile_stats.h
50721@@ -13,11 +13,11 @@
50722 #include <linux/atomic.h>
50723
50724 struct oprofile_stat_struct {
50725- atomic_t sample_lost_no_mm;
50726- atomic_t sample_lost_no_mapping;
50727- atomic_t bt_lost_no_mapping;
50728- atomic_t event_lost_overflow;
50729- atomic_t multiplex_counter;
50730+ atomic_unchecked_t sample_lost_no_mm;
50731+ atomic_unchecked_t sample_lost_no_mapping;
50732+ atomic_unchecked_t bt_lost_no_mapping;
50733+ atomic_unchecked_t event_lost_overflow;
50734+ atomic_unchecked_t multiplex_counter;
50735 };
50736
50737 extern struct oprofile_stat_struct oprofile_stats;
50738diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
50739index 3f49345..c750d0b 100644
50740--- a/drivers/oprofile/oprofilefs.c
50741+++ b/drivers/oprofile/oprofilefs.c
50742@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
50743
50744 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
50745 {
50746- atomic_t *val = file->private_data;
50747- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
50748+ atomic_unchecked_t *val = file->private_data;
50749+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50750 }
50751
50752
50753@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50754
50755
50756 int oprofilefs_create_ro_atomic(struct dentry *root,
50757- char const *name, atomic_t *val)
50758+ char const *name, atomic_unchecked_t *val)
50759 {
50760 return __oprofilefs_create_file(root, name,
50761 &atomic_ro_fops, 0444, val);
50762diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50763index bdef916..88c7dee 100644
50764--- a/drivers/oprofile/timer_int.c
50765+++ b/drivers/oprofile/timer_int.c
50766@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50767 return NOTIFY_OK;
50768 }
50769
50770-static struct notifier_block __refdata oprofile_cpu_notifier = {
50771+static struct notifier_block oprofile_cpu_notifier = {
50772 .notifier_call = oprofile_cpu_notify,
50773 };
50774
50775diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50776index 3b47080..6cd05dd 100644
50777--- a/drivers/parport/procfs.c
50778+++ b/drivers/parport/procfs.c
50779@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50780
50781 *ppos += len;
50782
50783- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50784+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50785 }
50786
50787 #ifdef CONFIG_PARPORT_1284
50788@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50789
50790 *ppos += len;
50791
50792- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50793+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50794 }
50795 #endif /* IEEE1284.3 support. */
50796
50797diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
50798index ba46e58..90cfc24 100644
50799--- a/drivers/pci/host/pci-host-generic.c
50800+++ b/drivers/pci/host/pci-host-generic.c
50801@@ -26,9 +26,9 @@
50802 #include <linux/platform_device.h>
50803
50804 struct gen_pci_cfg_bus_ops {
50805+ struct pci_ops ops;
50806 u32 bus_shift;
50807- void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
50808-};
50809+} __do_const;
50810
50811 struct gen_pci_cfg_windows {
50812 struct resource res;
50813@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
50814 }
50815
50816 static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
50817+ .ops = {
50818+ .map_bus = gen_pci_map_cfg_bus_cam,
50819+ .read = pci_generic_config_read,
50820+ .write = pci_generic_config_write,
50821+ },
50822 .bus_shift = 16,
50823- .map_bus = gen_pci_map_cfg_bus_cam,
50824 };
50825
50826 static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50827@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50828 }
50829
50830 static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
50831+ .ops = {
50832+ .map_bus = gen_pci_map_cfg_bus_ecam,
50833+ .read = pci_generic_config_read,
50834+ .write = pci_generic_config_write,
50835+ },
50836 .bus_shift = 20,
50837- .map_bus = gen_pci_map_cfg_bus_ecam,
50838-};
50839-
50840-static struct pci_ops gen_pci_ops = {
50841- .read = pci_generic_config_read,
50842- .write = pci_generic_config_write,
50843 };
50844
50845 static const struct of_device_id gen_pci_of_match[] = {
50846@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
50847 .private_data = (void **)&pci,
50848 .setup = gen_pci_setup,
50849 .map_irq = of_irq_parse_and_map_pci,
50850- .ops = &gen_pci_ops,
50851 };
50852
50853 if (!pci)
50854@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
50855
50856 of_id = of_match_node(gen_pci_of_match, np);
50857 pci->cfg.ops = of_id->data;
50858- gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
50859+ hw.ops = &pci->cfg.ops->ops;
50860 pci->host.dev.parent = dev;
50861 INIT_LIST_HEAD(&pci->host.windows);
50862 INIT_LIST_HEAD(&pci->resources);
50863diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50864index 6ca2399..68d866b 100644
50865--- a/drivers/pci/hotplug/acpiphp_ibm.c
50866+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50867@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50868 goto init_cleanup;
50869 }
50870
50871- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50872+ pax_open_kernel();
50873+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50874+ pax_close_kernel();
50875 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
50876
50877 return retval;
50878diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
50879index 66b7bbe..26bee78 100644
50880--- a/drivers/pci/hotplug/cpcihp_generic.c
50881+++ b/drivers/pci/hotplug/cpcihp_generic.c
50882@@ -73,7 +73,6 @@ static u16 port;
50883 static unsigned int enum_bit;
50884 static u8 enum_mask;
50885
50886-static struct cpci_hp_controller_ops generic_hpc_ops;
50887 static struct cpci_hp_controller generic_hpc;
50888
50889 static int __init validate_parameters(void)
50890@@ -139,6 +138,10 @@ static int query_enum(void)
50891 return ((value & enum_mask) == enum_mask);
50892 }
50893
50894+static struct cpci_hp_controller_ops generic_hpc_ops = {
50895+ .query_enum = query_enum,
50896+};
50897+
50898 static int __init cpcihp_generic_init(void)
50899 {
50900 int status;
50901@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
50902 pci_dev_put(dev);
50903
50904 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
50905- generic_hpc_ops.query_enum = query_enum;
50906 generic_hpc.ops = &generic_hpc_ops;
50907
50908 status = cpci_hp_register_controller(&generic_hpc);
50909diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
50910index 7ecf34e..effed62 100644
50911--- a/drivers/pci/hotplug/cpcihp_zt5550.c
50912+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
50913@@ -59,7 +59,6 @@
50914 /* local variables */
50915 static bool debug;
50916 static bool poll;
50917-static struct cpci_hp_controller_ops zt5550_hpc_ops;
50918 static struct cpci_hp_controller zt5550_hpc;
50919
50920 /* Primary cPCI bus bridge device */
50921@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
50922 return 0;
50923 }
50924
50925+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
50926+ .query_enum = zt5550_hc_query_enum,
50927+};
50928+
50929 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
50930 {
50931 int status;
50932@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
50933 dbg("returned from zt5550_hc_config");
50934
50935 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
50936- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
50937 zt5550_hpc.ops = &zt5550_hpc_ops;
50938 if (!poll) {
50939 zt5550_hpc.irq = hc_dev->irq;
50940 zt5550_hpc.irq_flags = IRQF_SHARED;
50941 zt5550_hpc.dev_id = hc_dev;
50942
50943- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50944- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50945- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50946+ pax_open_kernel();
50947+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50948+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50949+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50950+ pax_open_kernel();
50951 } else {
50952 info("using ENUM# polling mode");
50953 }
50954diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
50955index 1e08ff8c..3cd145f 100644
50956--- a/drivers/pci/hotplug/cpqphp_nvram.c
50957+++ b/drivers/pci/hotplug/cpqphp_nvram.c
50958@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
50959
50960 void compaq_nvram_init (void __iomem *rom_start)
50961 {
50962+#ifndef CONFIG_PAX_KERNEXEC
50963 if (rom_start)
50964 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
50965+#endif
50966
50967 dbg("int15 entry = %p\n", compaq_int15_entry_point);
50968
50969diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
50970index 56d8486..f26113f 100644
50971--- a/drivers/pci/hotplug/pci_hotplug_core.c
50972+++ b/drivers/pci/hotplug/pci_hotplug_core.c
50973@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
50974 return -EINVAL;
50975 }
50976
50977- slot->ops->owner = owner;
50978- slot->ops->mod_name = mod_name;
50979+ pax_open_kernel();
50980+ *(struct module **)&slot->ops->owner = owner;
50981+ *(const char **)&slot->ops->mod_name = mod_name;
50982+ pax_close_kernel();
50983
50984 mutex_lock(&pci_hp_mutex);
50985 /*
50986diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
50987index 07aa722..84514b4 100644
50988--- a/drivers/pci/hotplug/pciehp_core.c
50989+++ b/drivers/pci/hotplug/pciehp_core.c
50990@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
50991 struct slot *slot = ctrl->slot;
50992 struct hotplug_slot *hotplug = NULL;
50993 struct hotplug_slot_info *info = NULL;
50994- struct hotplug_slot_ops *ops = NULL;
50995+ hotplug_slot_ops_no_const *ops = NULL;
50996 char name[SLOT_NAME_SIZE];
50997 int retval = -ENOMEM;
50998
50999diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
51000index c3e7dfc..cbd9625 100644
51001--- a/drivers/pci/msi.c
51002+++ b/drivers/pci/msi.c
51003@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
51004 {
51005 struct attribute **msi_attrs;
51006 struct attribute *msi_attr;
51007- struct device_attribute *msi_dev_attr;
51008- struct attribute_group *msi_irq_group;
51009+ device_attribute_no_const *msi_dev_attr;
51010+ attribute_group_no_const *msi_irq_group;
51011 const struct attribute_group **msi_irq_groups;
51012 struct msi_desc *entry;
51013 int ret = -ENOMEM;
51014@@ -573,7 +573,7 @@ error_attrs:
51015 count = 0;
51016 msi_attr = msi_attrs[count];
51017 while (msi_attr) {
51018- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
51019+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
51020 kfree(msi_attr->name);
51021 kfree(msi_dev_attr);
51022 ++count;
51023diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
51024index 312f23a..d21181c 100644
51025--- a/drivers/pci/pci-sysfs.c
51026+++ b/drivers/pci/pci-sysfs.c
51027@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
51028 {
51029 /* allocate attribute structure, piggyback attribute name */
51030 int name_len = write_combine ? 13 : 10;
51031- struct bin_attribute *res_attr;
51032+ bin_attribute_no_const *res_attr;
51033 int retval;
51034
51035 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
51036@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
51037 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
51038 {
51039 int retval;
51040- struct bin_attribute *attr;
51041+ bin_attribute_no_const *attr;
51042
51043 /* If the device has VPD, try to expose it in sysfs. */
51044 if (dev->vpd) {
51045@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
51046 {
51047 int retval;
51048 int rom_size = 0;
51049- struct bin_attribute *attr;
51050+ bin_attribute_no_const *attr;
51051
51052 if (!sysfs_initialized)
51053 return -EACCES;
51054diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
51055index 4091f82..7d98eef 100644
51056--- a/drivers/pci/pci.h
51057+++ b/drivers/pci/pci.h
51058@@ -99,7 +99,7 @@ struct pci_vpd_ops {
51059 struct pci_vpd {
51060 unsigned int len;
51061 const struct pci_vpd_ops *ops;
51062- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
51063+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
51064 };
51065
51066 int pci_vpd_pci22_init(struct pci_dev *dev);
51067diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
51068index 820740a..8b1c673 100644
51069--- a/drivers/pci/pcie/aspm.c
51070+++ b/drivers/pci/pcie/aspm.c
51071@@ -27,9 +27,9 @@
51072 #define MODULE_PARAM_PREFIX "pcie_aspm."
51073
51074 /* Note: those are not register definitions */
51075-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
51076-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
51077-#define ASPM_STATE_L1 (4) /* L1 state */
51078+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
51079+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
51080+#define ASPM_STATE_L1 (4U) /* L1 state */
51081 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
51082 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
51083
51084diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
51085index be35da2..ec16cdb 100644
51086--- a/drivers/pci/pcie/portdrv_pci.c
51087+++ b/drivers/pci/pcie/portdrv_pci.c
51088@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
51089 return 0;
51090 }
51091
51092-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
51093+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
51094 /*
51095 * Boxes that should not use MSI for PCIe PME signaling.
51096 */
51097diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
51098index 8d2f400..c97cc91 100644
51099--- a/drivers/pci/probe.c
51100+++ b/drivers/pci/probe.c
51101@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
51102 u16 orig_cmd;
51103 struct pci_bus_region region, inverted_region;
51104
51105- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
51106+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
51107
51108 /* No printks while decoding is disabled! */
51109 if (!dev->mmio_always_on) {
51110diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
51111index 3f155e7..0f4b1f0 100644
51112--- a/drivers/pci/proc.c
51113+++ b/drivers/pci/proc.c
51114@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
51115 static int __init pci_proc_init(void)
51116 {
51117 struct pci_dev *dev = NULL;
51118+
51119+#ifdef CONFIG_GRKERNSEC_PROC_ADD
51120+#ifdef CONFIG_GRKERNSEC_PROC_USER
51121+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
51122+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
51123+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
51124+#endif
51125+#else
51126 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
51127+#endif
51128 proc_create("devices", 0, proc_bus_pci_dir,
51129 &proc_bus_pci_dev_operations);
51130 proc_initialized = 1;
51131diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
51132index 3474920..acc9581 100644
51133--- a/drivers/platform/chrome/chromeos_pstore.c
51134+++ b/drivers/platform/chrome/chromeos_pstore.c
51135@@ -13,7 +13,7 @@
51136 #include <linux/platform_device.h>
51137 #include <linux/pstore_ram.h>
51138
51139-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
51140+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
51141 {
51142 /*
51143 * Today all Chromebooks/boxes ship with Google_* as version and
51144diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
51145index 1e1e594..8fe59c5 100644
51146--- a/drivers/platform/x86/alienware-wmi.c
51147+++ b/drivers/platform/x86/alienware-wmi.c
51148@@ -150,7 +150,7 @@ struct wmax_led_args {
51149 } __packed;
51150
51151 static struct platform_device *platform_device;
51152-static struct device_attribute *zone_dev_attrs;
51153+static device_attribute_no_const *zone_dev_attrs;
51154 static struct attribute **zone_attrs;
51155 static struct platform_zone *zone_data;
51156
51157@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
51158 }
51159 };
51160
51161-static struct attribute_group zone_attribute_group = {
51162+static attribute_group_no_const zone_attribute_group = {
51163 .name = "rgb_zones",
51164 };
51165
51166diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
51167index 7543a56..367ca8ed 100644
51168--- a/drivers/platform/x86/asus-wmi.c
51169+++ b/drivers/platform/x86/asus-wmi.c
51170@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
51171 int err;
51172 u32 retval = -1;
51173
51174+#ifdef CONFIG_GRKERNSEC_KMEM
51175+ return -EPERM;
51176+#endif
51177+
51178 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
51179
51180 if (err < 0)
51181@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
51182 int err;
51183 u32 retval = -1;
51184
51185+#ifdef CONFIG_GRKERNSEC_KMEM
51186+ return -EPERM;
51187+#endif
51188+
51189 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
51190 &retval);
51191
51192@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
51193 union acpi_object *obj;
51194 acpi_status status;
51195
51196+#ifdef CONFIG_GRKERNSEC_KMEM
51197+ return -EPERM;
51198+#endif
51199+
51200 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
51201 1, asus->debug.method_id,
51202 &input, &output);
51203diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
51204index bceb30b..bf063d4 100644
51205--- a/drivers/platform/x86/compal-laptop.c
51206+++ b/drivers/platform/x86/compal-laptop.c
51207@@ -766,7 +766,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
51208 return 1;
51209 }
51210
51211-static struct dmi_system_id __initdata compal_dmi_table[] = {
51212+static const struct dmi_system_id __initconst compal_dmi_table[] = {
51213 {
51214 .ident = "FL90/IFL90",
51215 .matches = {
51216diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
51217index 458e6c9..089aee7 100644
51218--- a/drivers/platform/x86/hdaps.c
51219+++ b/drivers/platform/x86/hdaps.c
51220@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
51221 "ThinkPad T42p", so the order of the entries matters.
51222 If your ThinkPad is not recognized, please update to latest
51223 BIOS. This is especially the case for some R52 ThinkPads. */
51224-static struct dmi_system_id __initdata hdaps_whitelist[] = {
51225+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
51226 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
51227 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
51228 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
51229diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
51230index 97c2be1..2ee50ce 100644
51231--- a/drivers/platform/x86/ibm_rtl.c
51232+++ b/drivers/platform/x86/ibm_rtl.c
51233@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
51234 }
51235
51236
51237-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
51238+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
51239 { \
51240 .matches = { \
51241 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
51242diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
51243index a4a4258..a58a04c 100644
51244--- a/drivers/platform/x86/intel_oaktrail.c
51245+++ b/drivers/platform/x86/intel_oaktrail.c
51246@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
51247 return 0;
51248 }
51249
51250-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
51251+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
51252 {
51253 .ident = "OakTrail platform",
51254 .matches = {
51255diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
51256index 0859877..59d596d 100644
51257--- a/drivers/platform/x86/msi-laptop.c
51258+++ b/drivers/platform/x86/msi-laptop.c
51259@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
51260 return 1;
51261 }
51262
51263-static struct dmi_system_id __initdata msi_dmi_table[] = {
51264+static const struct dmi_system_id __initconst msi_dmi_table[] = {
51265 {
51266 .ident = "MSI S270",
51267 .matches = {
51268@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
51269
51270 if (!quirks->ec_read_only) {
51271 /* allow userland write sysfs file */
51272- dev_attr_bluetooth.store = store_bluetooth;
51273- dev_attr_wlan.store = store_wlan;
51274- dev_attr_threeg.store = store_threeg;
51275- dev_attr_bluetooth.attr.mode |= S_IWUSR;
51276- dev_attr_wlan.attr.mode |= S_IWUSR;
51277- dev_attr_threeg.attr.mode |= S_IWUSR;
51278+ pax_open_kernel();
51279+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
51280+ *(void **)&dev_attr_wlan.store = store_wlan;
51281+ *(void **)&dev_attr_threeg.store = store_threeg;
51282+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
51283+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
51284+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
51285+ pax_close_kernel();
51286 }
51287
51288 /* disable hardware control by fn key */
51289diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
51290index 6d2bac0..ec2b029 100644
51291--- a/drivers/platform/x86/msi-wmi.c
51292+++ b/drivers/platform/x86/msi-wmi.c
51293@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
51294 static void msi_wmi_notify(u32 value, void *context)
51295 {
51296 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
51297- static struct key_entry *key;
51298+ struct key_entry *key;
51299 union acpi_object *obj;
51300 acpi_status status;
51301
51302diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
51303index 9e701b2..c68a7b5 100644
51304--- a/drivers/platform/x86/samsung-laptop.c
51305+++ b/drivers/platform/x86/samsung-laptop.c
51306@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
51307 return 0;
51308 }
51309
51310-static struct dmi_system_id __initdata samsung_dmi_table[] = {
51311+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
51312 {
51313 .matches = {
51314 DMI_MATCH(DMI_SYS_VENDOR,
51315diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
51316index e6aac72..e11ff24 100644
51317--- a/drivers/platform/x86/samsung-q10.c
51318+++ b/drivers/platform/x86/samsung-q10.c
51319@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
51320 return 1;
51321 }
51322
51323-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
51324+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
51325 {
51326 .ident = "Samsung Q10",
51327 .matches = {
51328diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
51329index e51c1e7..71bb385 100644
51330--- a/drivers/platform/x86/sony-laptop.c
51331+++ b/drivers/platform/x86/sony-laptop.c
51332@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
51333 }
51334
51335 /* High speed charging function */
51336-static struct device_attribute *hsc_handle;
51337+static device_attribute_no_const *hsc_handle;
51338
51339 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
51340 struct device_attribute *attr,
51341@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
51342 }
51343
51344 /* low battery function */
51345-static struct device_attribute *lowbatt_handle;
51346+static device_attribute_no_const *lowbatt_handle;
51347
51348 static ssize_t sony_nc_lowbatt_store(struct device *dev,
51349 struct device_attribute *attr,
51350@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
51351 }
51352
51353 /* fan speed function */
51354-static struct device_attribute *fan_handle, *hsf_handle;
51355+static device_attribute_no_const *fan_handle, *hsf_handle;
51356
51357 static ssize_t sony_nc_hsfan_store(struct device *dev,
51358 struct device_attribute *attr,
51359@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
51360 }
51361
51362 /* USB charge function */
51363-static struct device_attribute *uc_handle;
51364+static device_attribute_no_const *uc_handle;
51365
51366 static ssize_t sony_nc_usb_charge_store(struct device *dev,
51367 struct device_attribute *attr,
51368@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
51369 }
51370
51371 /* Panel ID function */
51372-static struct device_attribute *panel_handle;
51373+static device_attribute_no_const *panel_handle;
51374
51375 static ssize_t sony_nc_panelid_show(struct device *dev,
51376 struct device_attribute *attr, char *buffer)
51377@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
51378 }
51379
51380 /* smart connect function */
51381-static struct device_attribute *sc_handle;
51382+static device_attribute_no_const *sc_handle;
51383
51384 static ssize_t sony_nc_smart_conn_store(struct device *dev,
51385 struct device_attribute *attr,
51386@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
51387 .drv.pm = &sony_pic_pm,
51388 };
51389
51390-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
51391+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
51392 {
51393 .ident = "Sony Vaio",
51394 .matches = {
51395diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
51396index 3b8ceee..e18652c 100644
51397--- a/drivers/platform/x86/thinkpad_acpi.c
51398+++ b/drivers/platform/x86/thinkpad_acpi.c
51399@@ -2093,7 +2093,7 @@ static int hotkey_mask_get(void)
51400 return 0;
51401 }
51402
51403-void static hotkey_mask_warn_incomplete_mask(void)
51404+static void hotkey_mask_warn_incomplete_mask(void)
51405 {
51406 /* log only what the user can fix... */
51407 const u32 wantedmask = hotkey_driver_mask &
51408@@ -2437,10 +2437,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
51409 && !tp_features.bright_unkfw)
51410 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
51411 }
51412+}
51413
51414 #undef TPACPI_COMPARE_KEY
51415 #undef TPACPI_MAY_SEND_KEY
51416-}
51417
51418 /*
51419 * Polling driver
51420diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
51421index 438d4c7..ca8a2fb 100644
51422--- a/drivers/pnp/pnpbios/bioscalls.c
51423+++ b/drivers/pnp/pnpbios/bioscalls.c
51424@@ -59,7 +59,7 @@ do { \
51425 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
51426 } while(0)
51427
51428-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
51429+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
51430 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
51431
51432 /*
51433@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51434
51435 cpu = get_cpu();
51436 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
51437+
51438+ pax_open_kernel();
51439 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
51440+ pax_close_kernel();
51441
51442 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
51443 spin_lock_irqsave(&pnp_bios_lock, flags);
51444@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51445 :"memory");
51446 spin_unlock_irqrestore(&pnp_bios_lock, flags);
51447
51448+ pax_open_kernel();
51449 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
51450+ pax_close_kernel();
51451+
51452 put_cpu();
51453
51454 /* If we get here and this is set then the PnP BIOS faulted on us. */
51455@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
51456 return status;
51457 }
51458
51459-void pnpbios_calls_init(union pnp_bios_install_struct *header)
51460+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
51461 {
51462 int i;
51463
51464@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51465 pnp_bios_callpoint.offset = header->fields.pm16offset;
51466 pnp_bios_callpoint.segment = PNP_CS16;
51467
51468+ pax_open_kernel();
51469+
51470 for_each_possible_cpu(i) {
51471 struct desc_struct *gdt = get_cpu_gdt_table(i);
51472 if (!gdt)
51473@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51474 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
51475 (unsigned long)__va(header->fields.pm16dseg));
51476 }
51477+
51478+ pax_close_kernel();
51479 }
51480diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
51481index facd43b..b291260 100644
51482--- a/drivers/pnp/pnpbios/core.c
51483+++ b/drivers/pnp/pnpbios/core.c
51484@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
51485 return 0;
51486 }
51487
51488-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
51489+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
51490 { /* PnPBIOS GPF on boot */
51491 .callback = exploding_pnp_bios,
51492 .ident = "Higraded P14H",
51493diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
51494index 0c52e2a..3421ab7 100644
51495--- a/drivers/power/pda_power.c
51496+++ b/drivers/power/pda_power.c
51497@@ -37,7 +37,11 @@ static int polling;
51498
51499 #if IS_ENABLED(CONFIG_USB_PHY)
51500 static struct usb_phy *transceiver;
51501-static struct notifier_block otg_nb;
51502+static int otg_handle_notification(struct notifier_block *nb,
51503+ unsigned long event, void *unused);
51504+static struct notifier_block otg_nb = {
51505+ .notifier_call = otg_handle_notification
51506+};
51507 #endif
51508
51509 static struct regulator *ac_draw;
51510@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
51511
51512 #if IS_ENABLED(CONFIG_USB_PHY)
51513 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
51514- otg_nb.notifier_call = otg_handle_notification;
51515 ret = usb_register_notifier(transceiver, &otg_nb);
51516 if (ret) {
51517 dev_err(dev, "failure to register otg notifier\n");
51518diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
51519index cc439fd..8fa30df 100644
51520--- a/drivers/power/power_supply.h
51521+++ b/drivers/power/power_supply.h
51522@@ -16,12 +16,12 @@ struct power_supply;
51523
51524 #ifdef CONFIG_SYSFS
51525
51526-extern void power_supply_init_attrs(struct device_type *dev_type);
51527+extern void power_supply_init_attrs(void);
51528 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
51529
51530 #else
51531
51532-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
51533+static inline void power_supply_init_attrs(void) {}
51534 #define power_supply_uevent NULL
51535
51536 #endif /* CONFIG_SYSFS */
51537diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
51538index 694e8cd..9f03483 100644
51539--- a/drivers/power/power_supply_core.c
51540+++ b/drivers/power/power_supply_core.c
51541@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
51542 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
51543 EXPORT_SYMBOL_GPL(power_supply_notifier);
51544
51545-static struct device_type power_supply_dev_type;
51546+extern const struct attribute_group *power_supply_attr_groups[];
51547+static struct device_type power_supply_dev_type = {
51548+ .groups = power_supply_attr_groups,
51549+};
51550
51551 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
51552 struct power_supply *supply)
51553@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
51554 return PTR_ERR(power_supply_class);
51555
51556 power_supply_class->dev_uevent = power_supply_uevent;
51557- power_supply_init_attrs(&power_supply_dev_type);
51558+ power_supply_init_attrs();
51559
51560 return 0;
51561 }
51562diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
51563index 62653f5..d0bb485 100644
51564--- a/drivers/power/power_supply_sysfs.c
51565+++ b/drivers/power/power_supply_sysfs.c
51566@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
51567 .is_visible = power_supply_attr_is_visible,
51568 };
51569
51570-static const struct attribute_group *power_supply_attr_groups[] = {
51571+const struct attribute_group *power_supply_attr_groups[] = {
51572 &power_supply_attr_group,
51573 NULL,
51574 };
51575
51576-void power_supply_init_attrs(struct device_type *dev_type)
51577+void power_supply_init_attrs(void)
51578 {
51579 int i;
51580
51581- dev_type->groups = power_supply_attr_groups;
51582-
51583 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
51584 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
51585 }
51586diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
51587index 84419af..268ede8 100644
51588--- a/drivers/powercap/powercap_sys.c
51589+++ b/drivers/powercap/powercap_sys.c
51590@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
51591 struct device_attribute name_attr;
51592 };
51593
51594+static ssize_t show_constraint_name(struct device *dev,
51595+ struct device_attribute *dev_attr,
51596+ char *buf);
51597+
51598 static struct powercap_constraint_attr
51599- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
51600+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
51601+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
51602+ .power_limit_attr = {
51603+ .attr = {
51604+ .name = NULL,
51605+ .mode = S_IWUSR | S_IRUGO
51606+ },
51607+ .show = show_constraint_power_limit_uw,
51608+ .store = store_constraint_power_limit_uw
51609+ },
51610+
51611+ .time_window_attr = {
51612+ .attr = {
51613+ .name = NULL,
51614+ .mode = S_IWUSR | S_IRUGO
51615+ },
51616+ .show = show_constraint_time_window_us,
51617+ .store = store_constraint_time_window_us
51618+ },
51619+
51620+ .max_power_attr = {
51621+ .attr = {
51622+ .name = NULL,
51623+ .mode = S_IRUGO
51624+ },
51625+ .show = show_constraint_max_power_uw,
51626+ .store = NULL
51627+ },
51628+
51629+ .min_power_attr = {
51630+ .attr = {
51631+ .name = NULL,
51632+ .mode = S_IRUGO
51633+ },
51634+ .show = show_constraint_min_power_uw,
51635+ .store = NULL
51636+ },
51637+
51638+ .max_time_window_attr = {
51639+ .attr = {
51640+ .name = NULL,
51641+ .mode = S_IRUGO
51642+ },
51643+ .show = show_constraint_max_time_window_us,
51644+ .store = NULL
51645+ },
51646+
51647+ .min_time_window_attr = {
51648+ .attr = {
51649+ .name = NULL,
51650+ .mode = S_IRUGO
51651+ },
51652+ .show = show_constraint_min_time_window_us,
51653+ .store = NULL
51654+ },
51655+
51656+ .name_attr = {
51657+ .attr = {
51658+ .name = NULL,
51659+ .mode = S_IRUGO
51660+ },
51661+ .show = show_constraint_name,
51662+ .store = NULL
51663+ }
51664+ }
51665+};
51666
51667 /* A list of powercap control_types */
51668 static LIST_HEAD(powercap_cntrl_list);
51669@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
51670 }
51671
51672 static int create_constraint_attribute(int id, const char *name,
51673- int mode,
51674- struct device_attribute *dev_attr,
51675- ssize_t (*show)(struct device *,
51676- struct device_attribute *, char *),
51677- ssize_t (*store)(struct device *,
51678- struct device_attribute *,
51679- const char *, size_t)
51680- )
51681+ struct device_attribute *dev_attr)
51682 {
51683+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
51684
51685- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
51686- id, name);
51687- if (!dev_attr->attr.name)
51688+ if (!name)
51689 return -ENOMEM;
51690- dev_attr->attr.mode = mode;
51691- dev_attr->show = show;
51692- dev_attr->store = store;
51693+
51694+ pax_open_kernel();
51695+ *(const char **)&dev_attr->attr.name = name;
51696+ pax_close_kernel();
51697
51698 return 0;
51699 }
51700@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
51701
51702 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
51703 ret = create_constraint_attribute(i, "power_limit_uw",
51704- S_IWUSR | S_IRUGO,
51705- &constraint_attrs[i].power_limit_attr,
51706- show_constraint_power_limit_uw,
51707- store_constraint_power_limit_uw);
51708+ &constraint_attrs[i].power_limit_attr);
51709 if (ret)
51710 goto err_alloc;
51711 ret = create_constraint_attribute(i, "time_window_us",
51712- S_IWUSR | S_IRUGO,
51713- &constraint_attrs[i].time_window_attr,
51714- show_constraint_time_window_us,
51715- store_constraint_time_window_us);
51716+ &constraint_attrs[i].time_window_attr);
51717 if (ret)
51718 goto err_alloc;
51719- ret = create_constraint_attribute(i, "name", S_IRUGO,
51720- &constraint_attrs[i].name_attr,
51721- show_constraint_name,
51722- NULL);
51723+ ret = create_constraint_attribute(i, "name",
51724+ &constraint_attrs[i].name_attr);
51725 if (ret)
51726 goto err_alloc;
51727- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
51728- &constraint_attrs[i].max_power_attr,
51729- show_constraint_max_power_uw,
51730- NULL);
51731+ ret = create_constraint_attribute(i, "max_power_uw",
51732+ &constraint_attrs[i].max_power_attr);
51733 if (ret)
51734 goto err_alloc;
51735- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
51736- &constraint_attrs[i].min_power_attr,
51737- show_constraint_min_power_uw,
51738- NULL);
51739+ ret = create_constraint_attribute(i, "min_power_uw",
51740+ &constraint_attrs[i].min_power_attr);
51741 if (ret)
51742 goto err_alloc;
51743 ret = create_constraint_attribute(i, "max_time_window_us",
51744- S_IRUGO,
51745- &constraint_attrs[i].max_time_window_attr,
51746- show_constraint_max_time_window_us,
51747- NULL);
51748+ &constraint_attrs[i].max_time_window_attr);
51749 if (ret)
51750 goto err_alloc;
51751 ret = create_constraint_attribute(i, "min_time_window_us",
51752- S_IRUGO,
51753- &constraint_attrs[i].min_time_window_attr,
51754- show_constraint_min_time_window_us,
51755- NULL);
51756+ &constraint_attrs[i].min_time_window_attr);
51757 if (ret)
51758 goto err_alloc;
51759
51760@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
51761 power_zone->zone_dev_attrs[count++] =
51762 &dev_attr_max_energy_range_uj.attr;
51763 if (power_zone->ops->get_energy_uj) {
51764+ pax_open_kernel();
51765 if (power_zone->ops->reset_energy_uj)
51766- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51767+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51768 else
51769- dev_attr_energy_uj.attr.mode = S_IRUGO;
51770+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
51771+ pax_close_kernel();
51772 power_zone->zone_dev_attrs[count++] =
51773 &dev_attr_energy_uj.attr;
51774 }
51775diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
51776index 9c5d414..c7900ce 100644
51777--- a/drivers/ptp/ptp_private.h
51778+++ b/drivers/ptp/ptp_private.h
51779@@ -51,7 +51,7 @@ struct ptp_clock {
51780 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
51781 wait_queue_head_t tsev_wq;
51782 int defunct; /* tells readers to go away when clock is being removed */
51783- struct device_attribute *pin_dev_attr;
51784+ device_attribute_no_const *pin_dev_attr;
51785 struct attribute **pin_attr;
51786 struct attribute_group pin_attr_group;
51787 };
51788diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
51789index 302e626..12579af 100644
51790--- a/drivers/ptp/ptp_sysfs.c
51791+++ b/drivers/ptp/ptp_sysfs.c
51792@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
51793 goto no_pin_attr;
51794
51795 for (i = 0; i < n_pins; i++) {
51796- struct device_attribute *da = &ptp->pin_dev_attr[i];
51797+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
51798 sysfs_attr_init(&da->attr);
51799 da->attr.name = info->pin_config[i].name;
51800 da->attr.mode = 0644;
51801diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
51802index a4a8a6d..a3456f4 100644
51803--- a/drivers/regulator/core.c
51804+++ b/drivers/regulator/core.c
51805@@ -3529,7 +3529,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51806 const struct regulation_constraints *constraints = NULL;
51807 const struct regulator_init_data *init_data;
51808 struct regulator_config *config = NULL;
51809- static atomic_t regulator_no = ATOMIC_INIT(-1);
51810+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
51811 struct regulator_dev *rdev;
51812 struct device *dev;
51813 int ret, i;
51814@@ -3613,7 +3613,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51815 rdev->dev.class = &regulator_class;
51816 rdev->dev.parent = dev;
51817 dev_set_name(&rdev->dev, "regulator.%lu",
51818- (unsigned long) atomic_inc_return(&regulator_no));
51819+ (unsigned long) atomic_inc_return_unchecked(&regulator_no));
51820 ret = device_register(&rdev->dev);
51821 if (ret != 0) {
51822 put_device(&rdev->dev);
51823diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51824index 7eee2ca..4024513 100644
51825--- a/drivers/regulator/max8660.c
51826+++ b/drivers/regulator/max8660.c
51827@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
51828 max8660->shadow_regs[MAX8660_OVER1] = 5;
51829 } else {
51830 /* Otherwise devices can be toggled via software */
51831- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51832- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51833+ pax_open_kernel();
51834+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51835+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51836+ pax_close_kernel();
51837 }
51838
51839 /*
51840diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51841index c3d55c2..0dddfe6 100644
51842--- a/drivers/regulator/max8973-regulator.c
51843+++ b/drivers/regulator/max8973-regulator.c
51844@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51845 if (!pdata || !pdata->enable_ext_control) {
51846 max->desc.enable_reg = MAX8973_VOUT;
51847 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51848- max->ops.enable = regulator_enable_regmap;
51849- max->ops.disable = regulator_disable_regmap;
51850- max->ops.is_enabled = regulator_is_enabled_regmap;
51851+ pax_open_kernel();
51852+ *(void **)&max->ops.enable = regulator_enable_regmap;
51853+ *(void **)&max->ops.disable = regulator_disable_regmap;
51854+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51855+ pax_close_kernel();
51856 }
51857
51858 if (pdata) {
51859diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51860index 0d17c92..a29f627 100644
51861--- a/drivers/regulator/mc13892-regulator.c
51862+++ b/drivers/regulator/mc13892-regulator.c
51863@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51864 mc13xxx_unlock(mc13892);
51865
51866 /* update mc13892_vcam ops */
51867- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51868+ pax_open_kernel();
51869+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51870 sizeof(struct regulator_ops));
51871- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51872- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51873+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51874+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51875+ pax_close_kernel();
51876 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51877
51878 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51879diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51880index 5b2e761..c8c8a4a 100644
51881--- a/drivers/rtc/rtc-cmos.c
51882+++ b/drivers/rtc/rtc-cmos.c
51883@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
51884 hpet_rtc_timer_init();
51885
51886 /* export at least the first block of NVRAM */
51887- nvram.size = address_space - NVRAM_OFFSET;
51888+ pax_open_kernel();
51889+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
51890+ pax_close_kernel();
51891 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
51892 if (retval < 0) {
51893 dev_dbg(dev, "can't create nvram file? %d\n", retval);
51894diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
51895index 799c34b..8e9786a 100644
51896--- a/drivers/rtc/rtc-dev.c
51897+++ b/drivers/rtc/rtc-dev.c
51898@@ -16,6 +16,7 @@
51899 #include <linux/module.h>
51900 #include <linux/rtc.h>
51901 #include <linux/sched.h>
51902+#include <linux/grsecurity.h>
51903 #include "rtc-core.h"
51904
51905 static dev_t rtc_devt;
51906@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
51907 if (copy_from_user(&tm, uarg, sizeof(tm)))
51908 return -EFAULT;
51909
51910+ gr_log_timechange();
51911+
51912 return rtc_set_time(rtc, &tm);
51913
51914 case RTC_PIE_ON:
51915diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
51916index 4ffabb3..1f87fca 100644
51917--- a/drivers/rtc/rtc-ds1307.c
51918+++ b/drivers/rtc/rtc-ds1307.c
51919@@ -107,7 +107,7 @@ struct ds1307 {
51920 u8 offset; /* register's offset */
51921 u8 regs[11];
51922 u16 nvram_offset;
51923- struct bin_attribute *nvram;
51924+ bin_attribute_no_const *nvram;
51925 enum ds_type type;
51926 unsigned long flags;
51927 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
51928diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
51929index 90abb5b..e0bf6dd 100644
51930--- a/drivers/rtc/rtc-m48t59.c
51931+++ b/drivers/rtc/rtc-m48t59.c
51932@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
51933 if (IS_ERR(m48t59->rtc))
51934 return PTR_ERR(m48t59->rtc);
51935
51936- m48t59_nvram_attr.size = pdata->offset;
51937+ pax_open_kernel();
51938+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
51939+ pax_close_kernel();
51940
51941 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
51942 if (ret)
51943diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
51944index e693af6..2e525b6 100644
51945--- a/drivers/scsi/bfa/bfa_fcpim.h
51946+++ b/drivers/scsi/bfa/bfa_fcpim.h
51947@@ -36,7 +36,7 @@ struct bfa_iotag_s {
51948
51949 struct bfa_itn_s {
51950 bfa_isr_func_t isr;
51951-};
51952+} __no_const;
51953
51954 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
51955 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
51956diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
51957index 0f19455..ef7adb5 100644
51958--- a/drivers/scsi/bfa/bfa_fcs.c
51959+++ b/drivers/scsi/bfa/bfa_fcs.c
51960@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
51961 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
51962
51963 static struct bfa_fcs_mod_s fcs_modules[] = {
51964- { bfa_fcs_port_attach, NULL, NULL },
51965- { bfa_fcs_uf_attach, NULL, NULL },
51966- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
51967- bfa_fcs_fabric_modexit },
51968+ {
51969+ .attach = bfa_fcs_port_attach,
51970+ .modinit = NULL,
51971+ .modexit = NULL
51972+ },
51973+ {
51974+ .attach = bfa_fcs_uf_attach,
51975+ .modinit = NULL,
51976+ .modexit = NULL
51977+ },
51978+ {
51979+ .attach = bfa_fcs_fabric_attach,
51980+ .modinit = bfa_fcs_fabric_modinit,
51981+ .modexit = bfa_fcs_fabric_modexit
51982+ },
51983 };
51984
51985 /*
51986diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
51987index ff75ef8..2dfe00a 100644
51988--- a/drivers/scsi/bfa/bfa_fcs_lport.c
51989+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
51990@@ -89,15 +89,26 @@ static struct {
51991 void (*offline) (struct bfa_fcs_lport_s *port);
51992 } __port_action[] = {
51993 {
51994- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
51995- bfa_fcs_lport_unknown_offline}, {
51996- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
51997- bfa_fcs_lport_fab_offline}, {
51998- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
51999- bfa_fcs_lport_n2n_offline}, {
52000- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
52001- bfa_fcs_lport_loop_offline},
52002- };
52003+ .init = bfa_fcs_lport_unknown_init,
52004+ .online = bfa_fcs_lport_unknown_online,
52005+ .offline = bfa_fcs_lport_unknown_offline
52006+ },
52007+ {
52008+ .init = bfa_fcs_lport_fab_init,
52009+ .online = bfa_fcs_lport_fab_online,
52010+ .offline = bfa_fcs_lport_fab_offline
52011+ },
52012+ {
52013+ .init = bfa_fcs_lport_n2n_init,
52014+ .online = bfa_fcs_lport_n2n_online,
52015+ .offline = bfa_fcs_lport_n2n_offline
52016+ },
52017+ {
52018+ .init = bfa_fcs_lport_loop_init,
52019+ .online = bfa_fcs_lport_loop_online,
52020+ .offline = bfa_fcs_lport_loop_offline
52021+ },
52022+};
52023
52024 /*
52025 * fcs_port_sm FCS logical port state machine
52026diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
52027index a38aafa0..fe8f03b 100644
52028--- a/drivers/scsi/bfa/bfa_ioc.h
52029+++ b/drivers/scsi/bfa/bfa_ioc.h
52030@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
52031 bfa_ioc_disable_cbfn_t disable_cbfn;
52032 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
52033 bfa_ioc_reset_cbfn_t reset_cbfn;
52034-};
52035+} __no_const;
52036
52037 /*
52038 * IOC event notification mechanism.
52039@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
52040 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
52041 enum bfi_ioc_state fwstate);
52042 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
52043-};
52044+} __no_const;
52045
52046 /*
52047 * Queue element to wait for room in request queue. FIFO order is
52048diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
52049index a14c784..6de6790 100644
52050--- a/drivers/scsi/bfa/bfa_modules.h
52051+++ b/drivers/scsi/bfa/bfa_modules.h
52052@@ -78,12 +78,12 @@ enum {
52053 \
52054 extern struct bfa_module_s hal_mod_ ## __mod; \
52055 struct bfa_module_s hal_mod_ ## __mod = { \
52056- bfa_ ## __mod ## _meminfo, \
52057- bfa_ ## __mod ## _attach, \
52058- bfa_ ## __mod ## _detach, \
52059- bfa_ ## __mod ## _start, \
52060- bfa_ ## __mod ## _stop, \
52061- bfa_ ## __mod ## _iocdisable, \
52062+ .meminfo = bfa_ ## __mod ## _meminfo, \
52063+ .attach = bfa_ ## __mod ## _attach, \
52064+ .detach = bfa_ ## __mod ## _detach, \
52065+ .start = bfa_ ## __mod ## _start, \
52066+ .stop = bfa_ ## __mod ## _stop, \
52067+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
52068 }
52069
52070 #define BFA_CACHELINE_SZ (256)
52071diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
52072index 045c4e1..13de803 100644
52073--- a/drivers/scsi/fcoe/fcoe_sysfs.c
52074+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
52075@@ -33,8 +33,8 @@
52076 */
52077 #include "libfcoe.h"
52078
52079-static atomic_t ctlr_num;
52080-static atomic_t fcf_num;
52081+static atomic_unchecked_t ctlr_num;
52082+static atomic_unchecked_t fcf_num;
52083
52084 /*
52085 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
52086@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
52087 if (!ctlr)
52088 goto out;
52089
52090- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
52091+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
52092 ctlr->f = f;
52093 ctlr->mode = FIP_CONN_TYPE_FABRIC;
52094 INIT_LIST_HEAD(&ctlr->fcfs);
52095@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
52096 fcf->dev.parent = &ctlr->dev;
52097 fcf->dev.bus = &fcoe_bus_type;
52098 fcf->dev.type = &fcoe_fcf_device_type;
52099- fcf->id = atomic_inc_return(&fcf_num) - 1;
52100+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
52101 fcf->state = FCOE_FCF_STATE_UNKNOWN;
52102
52103 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
52104@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
52105 {
52106 int error;
52107
52108- atomic_set(&ctlr_num, 0);
52109- atomic_set(&fcf_num, 0);
52110+ atomic_set_unchecked(&ctlr_num, 0);
52111+ atomic_set_unchecked(&fcf_num, 0);
52112
52113 error = bus_register(&fcoe_bus_type);
52114 if (error)
52115diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
52116index 8bb173e..20236b4 100644
52117--- a/drivers/scsi/hosts.c
52118+++ b/drivers/scsi/hosts.c
52119@@ -42,7 +42,7 @@
52120 #include "scsi_logging.h"
52121
52122
52123-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52124+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52125
52126
52127 static void scsi_host_cls_release(struct device *dev)
52128@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
52129 * subtract one because we increment first then return, but we need to
52130 * know what the next host number was before increment
52131 */
52132- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
52133+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
52134 shost->dma_channel = 0xff;
52135
52136 /* These three are default values which can be overridden */
52137diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
52138index a1cfbd3..d7f8ebc 100644
52139--- a/drivers/scsi/hpsa.c
52140+++ b/drivers/scsi/hpsa.c
52141@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
52142 struct reply_queue_buffer *rq = &h->reply_queue[q];
52143
52144 if (h->transMethod & CFGTBL_Trans_io_accel1)
52145- return h->access.command_completed(h, q);
52146+ return h->access->command_completed(h, q);
52147
52148 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
52149- return h->access.command_completed(h, q);
52150+ return h->access->command_completed(h, q);
52151
52152 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
52153 a = rq->head[rq->current_entry];
52154@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
52155 break;
52156 default:
52157 set_performant_mode(h, c);
52158- h->access.submit_command(h, c);
52159+ h->access->submit_command(h, c);
52160 }
52161 }
52162
52163@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
52164
52165 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
52166 {
52167- return h->access.command_completed(h, q);
52168+ return h->access->command_completed(h, q);
52169 }
52170
52171 static inline bool interrupt_pending(struct ctlr_info *h)
52172 {
52173- return h->access.intr_pending(h);
52174+ return h->access->intr_pending(h);
52175 }
52176
52177 static inline long interrupt_not_for_us(struct ctlr_info *h)
52178 {
52179- return (h->access.intr_pending(h) == 0) ||
52180+ return (h->access->intr_pending(h) == 0) ||
52181 (h->interrupts_enabled == 0);
52182 }
52183
52184@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
52185 if (prod_index < 0)
52186 return prod_index;
52187 h->product_name = products[prod_index].product_name;
52188- h->access = *(products[prod_index].access);
52189+ h->access = products[prod_index].access;
52190
52191 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
52192 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
52193@@ -6649,7 +6649,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
52194 unsigned long flags;
52195 u32 lockup_detected;
52196
52197- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52198+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52199 spin_lock_irqsave(&h->lock, flags);
52200 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
52201 if (!lockup_detected) {
52202@@ -6924,7 +6924,7 @@ reinit_after_soft_reset:
52203 }
52204
52205 /* make sure the board interrupts are off */
52206- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52207+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52208
52209 if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
52210 goto clean2;
52211@@ -6960,7 +6960,7 @@ reinit_after_soft_reset:
52212 * fake ones to scoop up any residual completions.
52213 */
52214 spin_lock_irqsave(&h->lock, flags);
52215- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52216+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52217 spin_unlock_irqrestore(&h->lock, flags);
52218 hpsa_free_irqs(h);
52219 rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
52220@@ -6979,9 +6979,9 @@ reinit_after_soft_reset:
52221 dev_info(&h->pdev->dev, "Board READY.\n");
52222 dev_info(&h->pdev->dev,
52223 "Waiting for stale completions to drain.\n");
52224- h->access.set_intr_mask(h, HPSA_INTR_ON);
52225+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52226 msleep(10000);
52227- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52228+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52229
52230 rc = controller_reset_failed(h->cfgtable);
52231 if (rc)
52232@@ -7006,7 +7006,7 @@ reinit_after_soft_reset:
52233
52234
52235 /* Turn the interrupts on so we can service requests */
52236- h->access.set_intr_mask(h, HPSA_INTR_ON);
52237+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52238
52239 hpsa_hba_inquiry(h);
52240 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
52241@@ -7079,7 +7079,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
52242 * To write all data in the battery backed cache to disks
52243 */
52244 hpsa_flush_cache(h);
52245- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52246+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52247 hpsa_free_irqs_and_disable_msix(h);
52248 }
52249
52250@@ -7200,7 +7200,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52251 CFGTBL_Trans_enable_directed_msix |
52252 (trans_support & (CFGTBL_Trans_io_accel1 |
52253 CFGTBL_Trans_io_accel2));
52254- struct access_method access = SA5_performant_access;
52255+ struct access_method *access = &SA5_performant_access;
52256
52257 /* This is a bit complicated. There are 8 registers on
52258 * the controller which we write to to tell it 8 different
52259@@ -7242,7 +7242,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52260 * perform the superfluous readl() after each command submission.
52261 */
52262 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
52263- access = SA5_performant_access_no_read;
52264+ access = &SA5_performant_access_no_read;
52265
52266 /* Controller spec: zero out this buffer. */
52267 for (i = 0; i < h->nreply_queues; i++)
52268@@ -7272,12 +7272,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52269 * enable outbound interrupt coalescing in accelerator mode;
52270 */
52271 if (trans_support & CFGTBL_Trans_io_accel1) {
52272- access = SA5_ioaccel_mode1_access;
52273+ access = &SA5_ioaccel_mode1_access;
52274 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52275 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52276 } else {
52277 if (trans_support & CFGTBL_Trans_io_accel2) {
52278- access = SA5_ioaccel_mode2_access;
52279+ access = &SA5_ioaccel_mode2_access;
52280 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52281 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52282 }
52283diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
52284index 6577130..955f9a4 100644
52285--- a/drivers/scsi/hpsa.h
52286+++ b/drivers/scsi/hpsa.h
52287@@ -143,7 +143,7 @@ struct ctlr_info {
52288 unsigned int msix_vector;
52289 unsigned int msi_vector;
52290 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
52291- struct access_method access;
52292+ struct access_method *access;
52293 char hba_mode_enabled;
52294
52295 /* queue and queue Info */
52296@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
52297 }
52298
52299 static struct access_method SA5_access = {
52300- SA5_submit_command,
52301- SA5_intr_mask,
52302- SA5_intr_pending,
52303- SA5_completed,
52304+ .submit_command = SA5_submit_command,
52305+ .set_intr_mask = SA5_intr_mask,
52306+ .intr_pending = SA5_intr_pending,
52307+ .command_completed = SA5_completed,
52308 };
52309
52310 static struct access_method SA5_ioaccel_mode1_access = {
52311- SA5_submit_command,
52312- SA5_performant_intr_mask,
52313- SA5_ioaccel_mode1_intr_pending,
52314- SA5_ioaccel_mode1_completed,
52315+ .submit_command = SA5_submit_command,
52316+ .set_intr_mask = SA5_performant_intr_mask,
52317+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
52318+ .command_completed = SA5_ioaccel_mode1_completed,
52319 };
52320
52321 static struct access_method SA5_ioaccel_mode2_access = {
52322- SA5_submit_command_ioaccel2,
52323- SA5_performant_intr_mask,
52324- SA5_performant_intr_pending,
52325- SA5_performant_completed,
52326+ .submit_command = SA5_submit_command_ioaccel2,
52327+ .set_intr_mask = SA5_performant_intr_mask,
52328+ .intr_pending = SA5_performant_intr_pending,
52329+ .command_completed = SA5_performant_completed,
52330 };
52331
52332 static struct access_method SA5_performant_access = {
52333- SA5_submit_command,
52334- SA5_performant_intr_mask,
52335- SA5_performant_intr_pending,
52336- SA5_performant_completed,
52337+ .submit_command = SA5_submit_command,
52338+ .set_intr_mask = SA5_performant_intr_mask,
52339+ .intr_pending = SA5_performant_intr_pending,
52340+ .command_completed = SA5_performant_completed,
52341 };
52342
52343 static struct access_method SA5_performant_access_no_read = {
52344- SA5_submit_command_no_read,
52345- SA5_performant_intr_mask,
52346- SA5_performant_intr_pending,
52347- SA5_performant_completed,
52348+ .submit_command = SA5_submit_command_no_read,
52349+ .set_intr_mask = SA5_performant_intr_mask,
52350+ .intr_pending = SA5_performant_intr_pending,
52351+ .command_completed = SA5_performant_completed,
52352 };
52353
52354 struct board_type {
52355diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
52356index 1b3a094..068e683 100644
52357--- a/drivers/scsi/libfc/fc_exch.c
52358+++ b/drivers/scsi/libfc/fc_exch.c
52359@@ -101,12 +101,12 @@ struct fc_exch_mgr {
52360 u16 pool_max_index;
52361
52362 struct {
52363- atomic_t no_free_exch;
52364- atomic_t no_free_exch_xid;
52365- atomic_t xid_not_found;
52366- atomic_t xid_busy;
52367- atomic_t seq_not_found;
52368- atomic_t non_bls_resp;
52369+ atomic_unchecked_t no_free_exch;
52370+ atomic_unchecked_t no_free_exch_xid;
52371+ atomic_unchecked_t xid_not_found;
52372+ atomic_unchecked_t xid_busy;
52373+ atomic_unchecked_t seq_not_found;
52374+ atomic_unchecked_t non_bls_resp;
52375 } stats;
52376 };
52377
52378@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
52379 /* allocate memory for exchange */
52380 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
52381 if (!ep) {
52382- atomic_inc(&mp->stats.no_free_exch);
52383+ atomic_inc_unchecked(&mp->stats.no_free_exch);
52384 goto out;
52385 }
52386 memset(ep, 0, sizeof(*ep));
52387@@ -874,7 +874,7 @@ out:
52388 return ep;
52389 err:
52390 spin_unlock_bh(&pool->lock);
52391- atomic_inc(&mp->stats.no_free_exch_xid);
52392+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
52393 mempool_free(ep, mp->ep_pool);
52394 return NULL;
52395 }
52396@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52397 xid = ntohs(fh->fh_ox_id); /* we originated exch */
52398 ep = fc_exch_find(mp, xid);
52399 if (!ep) {
52400- atomic_inc(&mp->stats.xid_not_found);
52401+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52402 reject = FC_RJT_OX_ID;
52403 goto out;
52404 }
52405@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52406 ep = fc_exch_find(mp, xid);
52407 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
52408 if (ep) {
52409- atomic_inc(&mp->stats.xid_busy);
52410+ atomic_inc_unchecked(&mp->stats.xid_busy);
52411 reject = FC_RJT_RX_ID;
52412 goto rel;
52413 }
52414@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52415 }
52416 xid = ep->xid; /* get our XID */
52417 } else if (!ep) {
52418- atomic_inc(&mp->stats.xid_not_found);
52419+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52420 reject = FC_RJT_RX_ID; /* XID not found */
52421 goto out;
52422 }
52423@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52424 } else {
52425 sp = &ep->seq;
52426 if (sp->id != fh->fh_seq_id) {
52427- atomic_inc(&mp->stats.seq_not_found);
52428+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52429 if (f_ctl & FC_FC_END_SEQ) {
52430 /*
52431 * Update sequence_id based on incoming last
52432@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52433
52434 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
52435 if (!ep) {
52436- atomic_inc(&mp->stats.xid_not_found);
52437+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52438 goto out;
52439 }
52440 if (ep->esb_stat & ESB_ST_COMPLETE) {
52441- atomic_inc(&mp->stats.xid_not_found);
52442+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52443 goto rel;
52444 }
52445 if (ep->rxid == FC_XID_UNKNOWN)
52446 ep->rxid = ntohs(fh->fh_rx_id);
52447 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
52448- atomic_inc(&mp->stats.xid_not_found);
52449+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52450 goto rel;
52451 }
52452 if (ep->did != ntoh24(fh->fh_s_id) &&
52453 ep->did != FC_FID_FLOGI) {
52454- atomic_inc(&mp->stats.xid_not_found);
52455+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52456 goto rel;
52457 }
52458 sof = fr_sof(fp);
52459@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52460 sp->ssb_stat |= SSB_ST_RESP;
52461 sp->id = fh->fh_seq_id;
52462 } else if (sp->id != fh->fh_seq_id) {
52463- atomic_inc(&mp->stats.seq_not_found);
52464+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52465 goto rel;
52466 }
52467
52468@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52469 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
52470
52471 if (!sp)
52472- atomic_inc(&mp->stats.xid_not_found);
52473+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52474 else
52475- atomic_inc(&mp->stats.non_bls_resp);
52476+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
52477
52478 fc_frame_free(fp);
52479 }
52480@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
52481
52482 list_for_each_entry(ema, &lport->ema_list, ema_list) {
52483 mp = ema->mp;
52484- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
52485+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
52486 st->fc_no_free_exch_xid +=
52487- atomic_read(&mp->stats.no_free_exch_xid);
52488- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
52489- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
52490- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
52491- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
52492+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
52493+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
52494+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
52495+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
52496+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
52497 }
52498 }
52499 EXPORT_SYMBOL(fc_exch_update_stats);
52500diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
52501index 9c706d8..d3e3ed2 100644
52502--- a/drivers/scsi/libsas/sas_ata.c
52503+++ b/drivers/scsi/libsas/sas_ata.c
52504@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
52505 .postreset = ata_std_postreset,
52506 .error_handler = ata_std_error_handler,
52507 .post_internal_cmd = sas_ata_post_internal,
52508- .qc_defer = ata_std_qc_defer,
52509+ .qc_defer = ata_std_qc_defer,
52510 .qc_prep = ata_noop_qc_prep,
52511 .qc_issue = sas_ata_qc_issue,
52512 .qc_fill_rtf = sas_ata_qc_fill_rtf,
52513diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
52514index 434e903..5a4a79b 100644
52515--- a/drivers/scsi/lpfc/lpfc.h
52516+++ b/drivers/scsi/lpfc/lpfc.h
52517@@ -430,7 +430,7 @@ struct lpfc_vport {
52518 struct dentry *debug_nodelist;
52519 struct dentry *vport_debugfs_root;
52520 struct lpfc_debugfs_trc *disc_trc;
52521- atomic_t disc_trc_cnt;
52522+ atomic_unchecked_t disc_trc_cnt;
52523 #endif
52524 uint8_t stat_data_enabled;
52525 uint8_t stat_data_blocked;
52526@@ -880,8 +880,8 @@ struct lpfc_hba {
52527 struct timer_list fabric_block_timer;
52528 unsigned long bit_flags;
52529 #define FABRIC_COMANDS_BLOCKED 0
52530- atomic_t num_rsrc_err;
52531- atomic_t num_cmd_success;
52532+ atomic_unchecked_t num_rsrc_err;
52533+ atomic_unchecked_t num_cmd_success;
52534 unsigned long last_rsrc_error_time;
52535 unsigned long last_ramp_down_time;
52536 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
52537@@ -916,7 +916,7 @@ struct lpfc_hba {
52538
52539 struct dentry *debug_slow_ring_trc;
52540 struct lpfc_debugfs_trc *slow_ring_trc;
52541- atomic_t slow_ring_trc_cnt;
52542+ atomic_unchecked_t slow_ring_trc_cnt;
52543 /* iDiag debugfs sub-directory */
52544 struct dentry *idiag_root;
52545 struct dentry *idiag_pci_cfg;
52546diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
52547index 5633e7d..8272114 100644
52548--- a/drivers/scsi/lpfc/lpfc_debugfs.c
52549+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
52550@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
52551
52552 #include <linux/debugfs.h>
52553
52554-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52555+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52556 static unsigned long lpfc_debugfs_start_time = 0L;
52557
52558 /* iDiag */
52559@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
52560 lpfc_debugfs_enable = 0;
52561
52562 len = 0;
52563- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
52564+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
52565 (lpfc_debugfs_max_disc_trc - 1);
52566 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
52567 dtp = vport->disc_trc + i;
52568@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
52569 lpfc_debugfs_enable = 0;
52570
52571 len = 0;
52572- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
52573+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
52574 (lpfc_debugfs_max_slow_ring_trc - 1);
52575 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
52576 dtp = phba->slow_ring_trc + i;
52577@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
52578 !vport || !vport->disc_trc)
52579 return;
52580
52581- index = atomic_inc_return(&vport->disc_trc_cnt) &
52582+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
52583 (lpfc_debugfs_max_disc_trc - 1);
52584 dtp = vport->disc_trc + index;
52585 dtp->fmt = fmt;
52586 dtp->data1 = data1;
52587 dtp->data2 = data2;
52588 dtp->data3 = data3;
52589- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52590+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52591 dtp->jif = jiffies;
52592 #endif
52593 return;
52594@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
52595 !phba || !phba->slow_ring_trc)
52596 return;
52597
52598- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
52599+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
52600 (lpfc_debugfs_max_slow_ring_trc - 1);
52601 dtp = phba->slow_ring_trc + index;
52602 dtp->fmt = fmt;
52603 dtp->data1 = data1;
52604 dtp->data2 = data2;
52605 dtp->data3 = data3;
52606- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52607+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52608 dtp->jif = jiffies;
52609 #endif
52610 return;
52611@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52612 "slow_ring buffer\n");
52613 goto debug_failed;
52614 }
52615- atomic_set(&phba->slow_ring_trc_cnt, 0);
52616+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
52617 memset(phba->slow_ring_trc, 0,
52618 (sizeof(struct lpfc_debugfs_trc) *
52619 lpfc_debugfs_max_slow_ring_trc));
52620@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52621 "buffer\n");
52622 goto debug_failed;
52623 }
52624- atomic_set(&vport->disc_trc_cnt, 0);
52625+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
52626
52627 snprintf(name, sizeof(name), "discovery_trace");
52628 vport->debug_disc_trc =
52629diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
52630index 0b2c53a..aec2b45 100644
52631--- a/drivers/scsi/lpfc/lpfc_init.c
52632+++ b/drivers/scsi/lpfc/lpfc_init.c
52633@@ -11290,8 +11290,10 @@ lpfc_init(void)
52634 "misc_register returned with status %d", error);
52635
52636 if (lpfc_enable_npiv) {
52637- lpfc_transport_functions.vport_create = lpfc_vport_create;
52638- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52639+ pax_open_kernel();
52640+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
52641+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52642+ pax_close_kernel();
52643 }
52644 lpfc_transport_template =
52645 fc_attach_transport(&lpfc_transport_functions);
52646diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
52647index 4f9222e..f1850e3 100644
52648--- a/drivers/scsi/lpfc/lpfc_scsi.c
52649+++ b/drivers/scsi/lpfc/lpfc_scsi.c
52650@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
52651 unsigned long expires;
52652
52653 spin_lock_irqsave(&phba->hbalock, flags);
52654- atomic_inc(&phba->num_rsrc_err);
52655+ atomic_inc_unchecked(&phba->num_rsrc_err);
52656 phba->last_rsrc_error_time = jiffies;
52657
52658 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
52659@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52660 unsigned long num_rsrc_err, num_cmd_success;
52661 int i;
52662
52663- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
52664- num_cmd_success = atomic_read(&phba->num_cmd_success);
52665+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
52666+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
52667
52668 /*
52669 * The error and success command counters are global per
52670@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52671 }
52672 }
52673 lpfc_destroy_vport_work_array(phba, vports);
52674- atomic_set(&phba->num_rsrc_err, 0);
52675- atomic_set(&phba->num_cmd_success, 0);
52676+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
52677+ atomic_set_unchecked(&phba->num_cmd_success, 0);
52678 }
52679
52680 /**
52681diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52682index 3f26147..ee8efd1 100644
52683--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52684+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52685@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
52686 {
52687 struct scsi_device *sdev = to_scsi_device(dev);
52688 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52689- static struct _raid_device *raid_device;
52690+ struct _raid_device *raid_device;
52691 unsigned long flags;
52692 Mpi2RaidVolPage0_t vol_pg0;
52693 Mpi2ConfigReply_t mpi_reply;
52694@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
52695 {
52696 struct scsi_device *sdev = to_scsi_device(dev);
52697 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52698- static struct _raid_device *raid_device;
52699+ struct _raid_device *raid_device;
52700 unsigned long flags;
52701 Mpi2RaidVolPage0_t vol_pg0;
52702 Mpi2ConfigReply_t mpi_reply;
52703@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
52704 Mpi2EventDataIrOperationStatus_t *event_data =
52705 (Mpi2EventDataIrOperationStatus_t *)
52706 fw_event->event_data;
52707- static struct _raid_device *raid_device;
52708+ struct _raid_device *raid_device;
52709 unsigned long flags;
52710 u16 handle;
52711
52712@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
52713 u64 sas_address;
52714 struct _sas_device *sas_device;
52715 struct _sas_node *expander_device;
52716- static struct _raid_device *raid_device;
52717+ struct _raid_device *raid_device;
52718 u8 retry_count;
52719 unsigned long flags;
52720
52721diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
52722index ed31d8c..ab856b3 100644
52723--- a/drivers/scsi/pmcraid.c
52724+++ b/drivers/scsi/pmcraid.c
52725@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
52726 res->scsi_dev = scsi_dev;
52727 scsi_dev->hostdata = res;
52728 res->change_detected = 0;
52729- atomic_set(&res->read_failures, 0);
52730- atomic_set(&res->write_failures, 0);
52731+ atomic_set_unchecked(&res->read_failures, 0);
52732+ atomic_set_unchecked(&res->write_failures, 0);
52733 rc = 0;
52734 }
52735 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
52736@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
52737
52738 /* If this was a SCSI read/write command keep count of errors */
52739 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
52740- atomic_inc(&res->read_failures);
52741+ atomic_inc_unchecked(&res->read_failures);
52742 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
52743- atomic_inc(&res->write_failures);
52744+ atomic_inc_unchecked(&res->write_failures);
52745
52746 if (!RES_IS_GSCSI(res->cfg_entry) &&
52747 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
52748@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
52749 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52750 * hrrq_id assigned here in queuecommand
52751 */
52752- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52753+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52754 pinstance->num_hrrq;
52755 cmd->cmd_done = pmcraid_io_done;
52756
52757@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
52758 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52759 * hrrq_id assigned here in queuecommand
52760 */
52761- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52762+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52763 pinstance->num_hrrq;
52764
52765 if (request_size) {
52766@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
52767
52768 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
52769 /* add resources only after host is added into system */
52770- if (!atomic_read(&pinstance->expose_resources))
52771+ if (!atomic_read_unchecked(&pinstance->expose_resources))
52772 return;
52773
52774 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
52775@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
52776 init_waitqueue_head(&pinstance->reset_wait_q);
52777
52778 atomic_set(&pinstance->outstanding_cmds, 0);
52779- atomic_set(&pinstance->last_message_id, 0);
52780- atomic_set(&pinstance->expose_resources, 0);
52781+ atomic_set_unchecked(&pinstance->last_message_id, 0);
52782+ atomic_set_unchecked(&pinstance->expose_resources, 0);
52783
52784 INIT_LIST_HEAD(&pinstance->free_res_q);
52785 INIT_LIST_HEAD(&pinstance->used_res_q);
52786@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
52787 /* Schedule worker thread to handle CCN and take care of adding and
52788 * removing devices to OS
52789 */
52790- atomic_set(&pinstance->expose_resources, 1);
52791+ atomic_set_unchecked(&pinstance->expose_resources, 1);
52792 schedule_work(&pinstance->worker_q);
52793 return rc;
52794
52795diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
52796index e1d150f..6c6df44 100644
52797--- a/drivers/scsi/pmcraid.h
52798+++ b/drivers/scsi/pmcraid.h
52799@@ -748,7 +748,7 @@ struct pmcraid_instance {
52800 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52801
52802 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52803- atomic_t last_message_id;
52804+ atomic_unchecked_t last_message_id;
52805
52806 /* configuration table */
52807 struct pmcraid_config_table *cfg_table;
52808@@ -777,7 +777,7 @@ struct pmcraid_instance {
52809 atomic_t outstanding_cmds;
52810
52811 /* should add/delete resources to mid-layer now ?*/
52812- atomic_t expose_resources;
52813+ atomic_unchecked_t expose_resources;
52814
52815
52816
52817@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52818 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52819 };
52820 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52821- atomic_t read_failures; /* count of failed READ commands */
52822- atomic_t write_failures; /* count of failed WRITE commands */
52823+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52824+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52825
52826 /* To indicate add/delete/modify during CCN */
52827 u8 change_detected;
52828diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52829index 82b92c4..3178171 100644
52830--- a/drivers/scsi/qla2xxx/qla_attr.c
52831+++ b/drivers/scsi/qla2xxx/qla_attr.c
52832@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52833 return 0;
52834 }
52835
52836-struct fc_function_template qla2xxx_transport_functions = {
52837+fc_function_template_no_const qla2xxx_transport_functions = {
52838
52839 .show_host_node_name = 1,
52840 .show_host_port_name = 1,
52841@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52842 .bsg_timeout = qla24xx_bsg_timeout,
52843 };
52844
52845-struct fc_function_template qla2xxx_transport_vport_functions = {
52846+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52847
52848 .show_host_node_name = 1,
52849 .show_host_port_name = 1,
52850diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52851index 7686bfe..4710893 100644
52852--- a/drivers/scsi/qla2xxx/qla_gbl.h
52853+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52854@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52855 struct device_attribute;
52856 extern struct device_attribute *qla2x00_host_attrs[];
52857 struct fc_function_template;
52858-extern struct fc_function_template qla2xxx_transport_functions;
52859-extern struct fc_function_template qla2xxx_transport_vport_functions;
52860+extern fc_function_template_no_const qla2xxx_transport_functions;
52861+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52862 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52863 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52864 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
52865diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52866index cce1cbc..5b9f0fe 100644
52867--- a/drivers/scsi/qla2xxx/qla_os.c
52868+++ b/drivers/scsi/qla2xxx/qla_os.c
52869@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
52870 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
52871 /* Ok, a 64bit DMA mask is applicable. */
52872 ha->flags.enable_64bit_addressing = 1;
52873- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52874- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52875+ pax_open_kernel();
52876+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52877+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52878+ pax_close_kernel();
52879 return;
52880 }
52881 }
52882diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
52883index 8f6d0fb..1b21097 100644
52884--- a/drivers/scsi/qla4xxx/ql4_def.h
52885+++ b/drivers/scsi/qla4xxx/ql4_def.h
52886@@ -305,7 +305,7 @@ struct ddb_entry {
52887 * (4000 only) */
52888 atomic_t relogin_timer; /* Max Time to wait for
52889 * relogin to complete */
52890- atomic_t relogin_retry_count; /* Num of times relogin has been
52891+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
52892 * retried */
52893 uint32_t default_time2wait; /* Default Min time between
52894 * relogins (+aens) */
52895diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
52896index 6d25879..3031a9f 100644
52897--- a/drivers/scsi/qla4xxx/ql4_os.c
52898+++ b/drivers/scsi/qla4xxx/ql4_os.c
52899@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
52900 */
52901 if (!iscsi_is_session_online(cls_sess)) {
52902 /* Reset retry relogin timer */
52903- atomic_inc(&ddb_entry->relogin_retry_count);
52904+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
52905 DEBUG2(ql4_printk(KERN_INFO, ha,
52906 "%s: index[%d] relogin timed out-retrying"
52907 " relogin (%d), retry (%d)\n", __func__,
52908 ddb_entry->fw_ddb_index,
52909- atomic_read(&ddb_entry->relogin_retry_count),
52910+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
52911 ddb_entry->default_time2wait + 4));
52912 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
52913 atomic_set(&ddb_entry->retry_relogin_timer,
52914@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
52915
52916 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
52917 atomic_set(&ddb_entry->relogin_timer, 0);
52918- atomic_set(&ddb_entry->relogin_retry_count, 0);
52919+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
52920 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
52921 ddb_entry->default_relogin_timeout =
52922 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
52923diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
52924index c9c3b57..22a8e41 100644
52925--- a/drivers/scsi/scsi.c
52926+++ b/drivers/scsi/scsi.c
52927@@ -637,7 +637,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
52928
52929 good_bytes = scsi_bufflen(cmd);
52930 if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
52931- int old_good_bytes = good_bytes;
52932+ unsigned int old_good_bytes = good_bytes;
52933 drv = scsi_cmd_to_driver(cmd);
52934 if (drv->done)
52935 good_bytes = drv->done(cmd);
52936diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
52937index b1a2631..5bcd9c8 100644
52938--- a/drivers/scsi/scsi_lib.c
52939+++ b/drivers/scsi/scsi_lib.c
52940@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
52941 shost = sdev->host;
52942 scsi_init_cmd_errh(cmd);
52943 cmd->result = DID_NO_CONNECT << 16;
52944- atomic_inc(&cmd->device->iorequest_cnt);
52945+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52946
52947 /*
52948 * SCSI request completion path will do scsi_device_unbusy(),
52949@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
52950
52951 INIT_LIST_HEAD(&cmd->eh_entry);
52952
52953- atomic_inc(&cmd->device->iodone_cnt);
52954+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
52955 if (cmd->result)
52956- atomic_inc(&cmd->device->ioerr_cnt);
52957+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
52958
52959 disposition = scsi_decide_disposition(cmd);
52960 if (disposition != SUCCESS &&
52961@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
52962 struct Scsi_Host *host = cmd->device->host;
52963 int rtn = 0;
52964
52965- atomic_inc(&cmd->device->iorequest_cnt);
52966+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52967
52968 /* check if the device is still usable */
52969 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
52970diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
52971index 1ac38e7..6acc656 100644
52972--- a/drivers/scsi/scsi_sysfs.c
52973+++ b/drivers/scsi/scsi_sysfs.c
52974@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
52975 char *buf) \
52976 { \
52977 struct scsi_device *sdev = to_scsi_device(dev); \
52978- unsigned long long count = atomic_read(&sdev->field); \
52979+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
52980 return snprintf(buf, 20, "0x%llx\n", count); \
52981 } \
52982 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
52983diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
52984index 5d6f348..18778a6b 100644
52985--- a/drivers/scsi/scsi_transport_fc.c
52986+++ b/drivers/scsi/scsi_transport_fc.c
52987@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
52988 * Netlink Infrastructure
52989 */
52990
52991-static atomic_t fc_event_seq;
52992+static atomic_unchecked_t fc_event_seq;
52993
52994 /**
52995 * fc_get_event_number - Obtain the next sequential FC event number
52996@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
52997 u32
52998 fc_get_event_number(void)
52999 {
53000- return atomic_add_return(1, &fc_event_seq);
53001+ return atomic_add_return_unchecked(1, &fc_event_seq);
53002 }
53003 EXPORT_SYMBOL(fc_get_event_number);
53004
53005@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
53006 {
53007 int error;
53008
53009- atomic_set(&fc_event_seq, 0);
53010+ atomic_set_unchecked(&fc_event_seq, 0);
53011
53012 error = transport_class_register(&fc_host_class);
53013 if (error)
53014@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
53015 char *cp;
53016
53017 *val = simple_strtoul(buf, &cp, 0);
53018- if ((*cp && (*cp != '\n')) || (*val < 0))
53019+ if (*cp && (*cp != '\n'))
53020 return -EINVAL;
53021 /*
53022 * Check for overflow; dev_loss_tmo is u32
53023diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
53024index 67d43e3..8cee73c 100644
53025--- a/drivers/scsi/scsi_transport_iscsi.c
53026+++ b/drivers/scsi/scsi_transport_iscsi.c
53027@@ -79,7 +79,7 @@ struct iscsi_internal {
53028 struct transport_container session_cont;
53029 };
53030
53031-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
53032+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
53033 static struct workqueue_struct *iscsi_eh_timer_workq;
53034
53035 static DEFINE_IDA(iscsi_sess_ida);
53036@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
53037 int err;
53038
53039 ihost = shost->shost_data;
53040- session->sid = atomic_add_return(1, &iscsi_session_nr);
53041+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
53042
53043 if (target_id == ISCSI_MAX_TARGET) {
53044 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
53045@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
53046 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
53047 ISCSI_TRANSPORT_VERSION);
53048
53049- atomic_set(&iscsi_session_nr, 0);
53050+ atomic_set_unchecked(&iscsi_session_nr, 0);
53051
53052 err = class_register(&iscsi_transport_class);
53053 if (err)
53054diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
53055index ae45bd9..c32a586 100644
53056--- a/drivers/scsi/scsi_transport_srp.c
53057+++ b/drivers/scsi/scsi_transport_srp.c
53058@@ -35,7 +35,7 @@
53059 #include "scsi_priv.h"
53060
53061 struct srp_host_attrs {
53062- atomic_t next_port_id;
53063+ atomic_unchecked_t next_port_id;
53064 };
53065 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
53066
53067@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
53068 struct Scsi_Host *shost = dev_to_shost(dev);
53069 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
53070
53071- atomic_set(&srp_host->next_port_id, 0);
53072+ atomic_set_unchecked(&srp_host->next_port_id, 0);
53073 return 0;
53074 }
53075
53076@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
53077 rport_fast_io_fail_timedout);
53078 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
53079
53080- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
53081+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
53082 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
53083
53084 transport_setup_device(&rport->dev);
53085diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
53086index a661d33..1b233fa 100644
53087--- a/drivers/scsi/sd.c
53088+++ b/drivers/scsi/sd.c
53089@@ -111,7 +111,7 @@ static int sd_resume(struct device *);
53090 static void sd_rescan(struct device *);
53091 static int sd_init_command(struct scsi_cmnd *SCpnt);
53092 static void sd_uninit_command(struct scsi_cmnd *SCpnt);
53093-static int sd_done(struct scsi_cmnd *);
53094+static unsigned int sd_done(struct scsi_cmnd *);
53095 static int sd_eh_action(struct scsi_cmnd *, int);
53096 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
53097 static void scsi_disk_release(struct device *cdev);
53098@@ -1670,7 +1670,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
53099 *
53100 * Note: potentially run from within an ISR. Must not block.
53101 **/
53102-static int sd_done(struct scsi_cmnd *SCpnt)
53103+static unsigned int sd_done(struct scsi_cmnd *SCpnt)
53104 {
53105 int result = SCpnt->result;
53106 unsigned int good_bytes = result ? 0 : scsi_bufflen(SCpnt);
53107@@ -2997,7 +2997,7 @@ static int sd_probe(struct device *dev)
53108 sdkp->disk = gd;
53109 sdkp->index = index;
53110 atomic_set(&sdkp->openers, 0);
53111- atomic_set(&sdkp->device->ioerr_cnt, 0);
53112+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
53113
53114 if (!sdp->request_queue->rq_timeout) {
53115 if (sdp->type != TYPE_MOD)
53116diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
53117index 2270bd5..98408a5 100644
53118--- a/drivers/scsi/sg.c
53119+++ b/drivers/scsi/sg.c
53120@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
53121 sdp->disk->disk_name,
53122 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
53123 NULL,
53124- (char *)arg);
53125+ (char __user *)arg);
53126 case BLKTRACESTART:
53127 return blk_trace_startstop(sdp->device->request_queue, 1);
53128 case BLKTRACESTOP:
53129diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
53130index c0d660f..24a5854 100644
53131--- a/drivers/soc/tegra/fuse/fuse-tegra.c
53132+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
53133@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
53134 return i;
53135 }
53136
53137-static struct bin_attribute fuse_bin_attr = {
53138+static bin_attribute_no_const fuse_bin_attr = {
53139 .attr = { .name = "fuse", .mode = S_IRUGO, },
53140 .read = fuse_read,
53141 };
53142diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
53143index 57a1950..ae54e21 100644
53144--- a/drivers/spi/spi.c
53145+++ b/drivers/spi/spi.c
53146@@ -2307,7 +2307,7 @@ int spi_bus_unlock(struct spi_master *master)
53147 EXPORT_SYMBOL_GPL(spi_bus_unlock);
53148
53149 /* portable code must never pass more than 32 bytes */
53150-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
53151+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
53152
53153 static u8 *buf;
53154
53155diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
53156index b41429f..2de5373 100644
53157--- a/drivers/staging/android/timed_output.c
53158+++ b/drivers/staging/android/timed_output.c
53159@@ -25,7 +25,7 @@
53160 #include "timed_output.h"
53161
53162 static struct class *timed_output_class;
53163-static atomic_t device_count;
53164+static atomic_unchecked_t device_count;
53165
53166 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
53167 char *buf)
53168@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
53169 timed_output_class = class_create(THIS_MODULE, "timed_output");
53170 if (IS_ERR(timed_output_class))
53171 return PTR_ERR(timed_output_class);
53172- atomic_set(&device_count, 0);
53173+ atomic_set_unchecked(&device_count, 0);
53174 timed_output_class->dev_groups = timed_output_groups;
53175 }
53176
53177@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
53178 if (ret < 0)
53179 return ret;
53180
53181- tdev->index = atomic_inc_return(&device_count);
53182+ tdev->index = atomic_inc_return_unchecked(&device_count);
53183 tdev->dev = device_create(timed_output_class, NULL,
53184 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
53185 if (IS_ERR(tdev->dev))
53186diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
53187index 727640e..55bf61c 100644
53188--- a/drivers/staging/comedi/comedi_fops.c
53189+++ b/drivers/staging/comedi/comedi_fops.c
53190@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
53191 }
53192 cfp->last_attached = dev->attached;
53193 cfp->last_detach_count = dev->detach_count;
53194- ACCESS_ONCE(cfp->read_subdev) = read_s;
53195- ACCESS_ONCE(cfp->write_subdev) = write_s;
53196+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
53197+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
53198 }
53199
53200 static void comedi_file_check(struct file *file)
53201@@ -1924,7 +1924,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53202 !(s_old->async->cmd.flags & CMDF_WRITE))
53203 return -EBUSY;
53204
53205- ACCESS_ONCE(cfp->read_subdev) = s_new;
53206+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
53207 return 0;
53208 }
53209
53210@@ -1966,7 +1966,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53211 (s_old->async->cmd.flags & CMDF_WRITE))
53212 return -EBUSY;
53213
53214- ACCESS_ONCE(cfp->write_subdev) = s_new;
53215+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
53216 return 0;
53217 }
53218
53219diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
53220index 37dcf7e..f3c2016 100644
53221--- a/drivers/staging/fbtft/fbtft-core.c
53222+++ b/drivers/staging/fbtft/fbtft-core.c
53223@@ -689,7 +689,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
53224 {
53225 struct fb_info *info;
53226 struct fbtft_par *par;
53227- struct fb_ops *fbops = NULL;
53228+ fb_ops_no_const *fbops = NULL;
53229 struct fb_deferred_io *fbdefio = NULL;
53230 struct fbtft_platform_data *pdata = dev->platform_data;
53231 u8 *vmem = NULL;
53232diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
53233index 0dbf3f9..fed0063 100644
53234--- a/drivers/staging/fbtft/fbtft.h
53235+++ b/drivers/staging/fbtft/fbtft.h
53236@@ -106,7 +106,7 @@ struct fbtft_ops {
53237
53238 int (*set_var)(struct fbtft_par *par);
53239 int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
53240-};
53241+} __no_const;
53242
53243 /**
53244 * struct fbtft_display - Describes the display properties
53245diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
53246index 001348c..cfaac8a 100644
53247--- a/drivers/staging/gdm724x/gdm_tty.c
53248+++ b/drivers/staging/gdm724x/gdm_tty.c
53249@@ -44,7 +44,7 @@
53250 #define gdm_tty_send_control(n, r, v, d, l) (\
53251 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
53252
53253-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
53254+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
53255
53256 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
53257 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
53258diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
53259index d23c3c2..eb63c81 100644
53260--- a/drivers/staging/i2o/i2o.h
53261+++ b/drivers/staging/i2o/i2o.h
53262@@ -565,7 +565,7 @@ struct i2o_controller {
53263 struct i2o_device *exec; /* Executive */
53264 #if BITS_PER_LONG == 64
53265 spinlock_t context_list_lock; /* lock for context_list */
53266- atomic_t context_list_counter; /* needed for unique contexts */
53267+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
53268 struct list_head context_list; /* list of context id's
53269 and pointers */
53270 #endif
53271diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
53272index ad84f33..c5bdf65 100644
53273--- a/drivers/staging/i2o/i2o_proc.c
53274+++ b/drivers/staging/i2o/i2o_proc.c
53275@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
53276 "Array Controller Device"
53277 };
53278
53279-static char *chtostr(char *tmp, u8 *chars, int n)
53280-{
53281- tmp[0] = 0;
53282- return strncat(tmp, (char *)chars, n);
53283-}
53284-
53285 static int i2o_report_query_status(struct seq_file *seq, int block_status,
53286 char *group)
53287 {
53288@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
53289 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
53290 {
53291 struct i2o_controller *c = (struct i2o_controller *)seq->private;
53292- static u32 work32[5];
53293- static u8 *work8 = (u8 *) work32;
53294- static u16 *work16 = (u16 *) work32;
53295+ u32 work32[5];
53296+ u8 *work8 = (u8 *) work32;
53297+ u16 *work16 = (u16 *) work32;
53298 int token;
53299 u32 hwcap;
53300
53301@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53302 } *result;
53303
53304 i2o_exec_execute_ddm_table ddm_table;
53305- char tmp[28 + 1];
53306
53307 result = kmalloc(sizeof(*result), GFP_KERNEL);
53308 if (!result)
53309@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53310
53311 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
53312 seq_printf(seq, "%-#8x", ddm_table.module_id);
53313- seq_printf(seq, "%-29s",
53314- chtostr(tmp, ddm_table.module_name_version, 28));
53315+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
53316 seq_printf(seq, "%9d ", ddm_table.data_size);
53317 seq_printf(seq, "%8d", ddm_table.code_size);
53318
53319@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53320
53321 i2o_driver_result_table *result;
53322 i2o_driver_store_table *dst;
53323- char tmp[28 + 1];
53324
53325 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
53326 if (result == NULL)
53327@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53328
53329 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
53330 seq_printf(seq, "%-#8x", dst->module_id);
53331- seq_printf(seq, "%-29s",
53332- chtostr(tmp, dst->module_name_version, 28));
53333- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
53334+ seq_printf(seq, "%-.28s", dst->module_name_version);
53335+ seq_printf(seq, "%-.8s", dst->date);
53336 seq_printf(seq, "%8d ", dst->module_size);
53337 seq_printf(seq, "%8d ", dst->mpb_size);
53338 seq_printf(seq, "0x%04x", dst->module_flags);
53339@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
53340 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53341 {
53342 struct i2o_device *d = (struct i2o_device *)seq->private;
53343- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53344+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53345 // == (allow) 512d bytes (max)
53346- static u16 *work16 = (u16 *) work32;
53347+ u16 *work16 = (u16 *) work32;
53348 int token;
53349- char tmp[16 + 1];
53350
53351 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
53352
53353@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53354 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
53355 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
53356 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
53357- seq_printf(seq, "Vendor info : %s\n",
53358- chtostr(tmp, (u8 *) (work32 + 2), 16));
53359- seq_printf(seq, "Product info : %s\n",
53360- chtostr(tmp, (u8 *) (work32 + 6), 16));
53361- seq_printf(seq, "Description : %s\n",
53362- chtostr(tmp, (u8 *) (work32 + 10), 16));
53363- seq_printf(seq, "Product rev. : %s\n",
53364- chtostr(tmp, (u8 *) (work32 + 14), 8));
53365+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
53366+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
53367+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
53368+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
53369
53370 seq_printf(seq, "Serial number : ");
53371 print_serial_number(seq, (u8 *) (work32 + 16),
53372@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53373 u8 pad[256]; // allow up to 256 byte (max) serial number
53374 } result;
53375
53376- char tmp[24 + 1];
53377-
53378 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
53379
53380 if (token < 0) {
53381@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53382 }
53383
53384 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
53385- seq_printf(seq, "Module name : %s\n",
53386- chtostr(tmp, result.module_name, 24));
53387- seq_printf(seq, "Module revision : %s\n",
53388- chtostr(tmp, result.module_rev, 8));
53389+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
53390+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
53391
53392 seq_printf(seq, "Serial number : ");
53393 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
53394@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53395 u8 instance_number[4];
53396 } result;
53397
53398- char tmp[64 + 1];
53399-
53400 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
53401
53402 if (token < 0) {
53403@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53404 return 0;
53405 }
53406
53407- seq_printf(seq, "Device name : %s\n",
53408- chtostr(tmp, result.device_name, 64));
53409- seq_printf(seq, "Service name : %s\n",
53410- chtostr(tmp, result.service_name, 64));
53411- seq_printf(seq, "Physical name : %s\n",
53412- chtostr(tmp, result.physical_location, 64));
53413- seq_printf(seq, "Instance number : %s\n",
53414- chtostr(tmp, result.instance_number, 4));
53415+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
53416+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
53417+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
53418+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
53419
53420 return 0;
53421 }
53422@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53423 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
53424 {
53425 struct i2o_device *d = (struct i2o_device *)seq->private;
53426- static u32 work32[12];
53427- static u16 *work16 = (u16 *) work32;
53428- static u8 *work8 = (u8 *) work32;
53429+ u32 work32[12];
53430+ u16 *work16 = (u16 *) work32;
53431+ u8 *work8 = (u8 *) work32;
53432 int token;
53433
53434 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
53435diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
53436index 52334fc..d7f40b3 100644
53437--- a/drivers/staging/i2o/iop.c
53438+++ b/drivers/staging/i2o/iop.c
53439@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
53440
53441 spin_lock_irqsave(&c->context_list_lock, flags);
53442
53443- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
53444- atomic_inc(&c->context_list_counter);
53445+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
53446+ atomic_inc_unchecked(&c->context_list_counter);
53447
53448- entry->context = atomic_read(&c->context_list_counter);
53449+ entry->context = atomic_read_unchecked(&c->context_list_counter);
53450
53451 list_add(&entry->list, &c->context_list);
53452
53453@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
53454
53455 #if BITS_PER_LONG == 64
53456 spin_lock_init(&c->context_list_lock);
53457- atomic_set(&c->context_list_counter, 0);
53458+ atomic_set_unchecked(&c->context_list_counter, 0);
53459 INIT_LIST_HEAD(&c->context_list);
53460 #endif
53461
53462diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
53463index 463da07..e791ce9 100644
53464--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
53465+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
53466@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
53467 return 0;
53468 }
53469
53470-sfw_test_client_ops_t brw_test_client;
53471-void brw_init_test_client(void)
53472-{
53473- brw_test_client.tso_init = brw_client_init;
53474- brw_test_client.tso_fini = brw_client_fini;
53475- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
53476- brw_test_client.tso_done_rpc = brw_client_done_rpc;
53477+sfw_test_client_ops_t brw_test_client = {
53478+ .tso_init = brw_client_init,
53479+ .tso_fini = brw_client_fini,
53480+ .tso_prep_rpc = brw_client_prep_rpc,
53481+ .tso_done_rpc = brw_client_done_rpc,
53482 };
53483
53484 srpc_service_t brw_test_service;
53485diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
53486index 5709148..ccd9e0d 100644
53487--- a/drivers/staging/lustre/lnet/selftest/framework.c
53488+++ b/drivers/staging/lustre/lnet/selftest/framework.c
53489@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
53490
53491 extern sfw_test_client_ops_t ping_test_client;
53492 extern srpc_service_t ping_test_service;
53493-extern void ping_init_test_client(void);
53494 extern void ping_init_test_service(void);
53495
53496 extern sfw_test_client_ops_t brw_test_client;
53497 extern srpc_service_t brw_test_service;
53498-extern void brw_init_test_client(void);
53499 extern void brw_init_test_service(void);
53500
53501
53502@@ -1675,12 +1673,10 @@ sfw_startup (void)
53503 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
53504 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
53505
53506- brw_init_test_client();
53507 brw_init_test_service();
53508 rc = sfw_register_test(&brw_test_service, &brw_test_client);
53509 LASSERT (rc == 0);
53510
53511- ping_init_test_client();
53512 ping_init_test_service();
53513 rc = sfw_register_test(&ping_test_service, &ping_test_client);
53514 LASSERT (rc == 0);
53515diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
53516index d8c0df6..5041cbb 100644
53517--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
53518+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
53519@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
53520 return 0;
53521 }
53522
53523-sfw_test_client_ops_t ping_test_client;
53524-void ping_init_test_client(void)
53525-{
53526- ping_test_client.tso_init = ping_client_init;
53527- ping_test_client.tso_fini = ping_client_fini;
53528- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
53529- ping_test_client.tso_done_rpc = ping_client_done_rpc;
53530-}
53531+sfw_test_client_ops_t ping_test_client = {
53532+ .tso_init = ping_client_init,
53533+ .tso_fini = ping_client_fini,
53534+ .tso_prep_rpc = ping_client_prep_rpc,
53535+ .tso_done_rpc = ping_client_done_rpc,
53536+};
53537
53538 srpc_service_t ping_test_service;
53539 void ping_init_test_service(void)
53540diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53541index 83bc0a9..12ba00a 100644
53542--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
53543+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53544@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
53545 ldlm_completion_callback lcs_completion;
53546 ldlm_blocking_callback lcs_blocking;
53547 ldlm_glimpse_callback lcs_glimpse;
53548-};
53549+} __no_const;
53550
53551 /* ldlm_lockd.c */
53552 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
53553diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
53554index 2a88b80..62e7e5f 100644
53555--- a/drivers/staging/lustre/lustre/include/obd.h
53556+++ b/drivers/staging/lustre/lustre/include/obd.h
53557@@ -1362,7 +1362,7 @@ struct md_ops {
53558 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
53559 * wrapper function in include/linux/obd_class.h.
53560 */
53561-};
53562+} __no_const;
53563
53564 struct lsm_operations {
53565 void (*lsm_free)(struct lov_stripe_md *);
53566diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53567index a4c252f..b21acac 100644
53568--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53569+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53570@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
53571 int added = (mode == LCK_NL);
53572 int overlaps = 0;
53573 int splitted = 0;
53574- const struct ldlm_callback_suite null_cbs = { NULL };
53575+ const struct ldlm_callback_suite null_cbs = { };
53576
53577 CDEBUG(D_DLMTRACE,
53578 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
53579diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53580index c539e37..743b213 100644
53581--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53582+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53583@@ -237,7 +237,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
53584 loff_t *ppos)
53585 {
53586 int rc, max_delay_cs;
53587- struct ctl_table dummy = *table;
53588+ ctl_table_no_const dummy = *table;
53589 long d;
53590
53591 dummy.data = &max_delay_cs;
53592@@ -270,7 +270,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
53593 loff_t *ppos)
53594 {
53595 int rc, min_delay_cs;
53596- struct ctl_table dummy = *table;
53597+ ctl_table_no_const dummy = *table;
53598 long d;
53599
53600 dummy.data = &min_delay_cs;
53601@@ -302,7 +302,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
53602 void __user *buffer, size_t *lenp, loff_t *ppos)
53603 {
53604 int rc, backoff;
53605- struct ctl_table dummy = *table;
53606+ ctl_table_no_const dummy = *table;
53607
53608 dummy.data = &backoff;
53609 dummy.proc_handler = &proc_dointvec;
53610diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
53611index 7dc77dd..289d03e 100644
53612--- a/drivers/staging/lustre/lustre/libcfs/module.c
53613+++ b/drivers/staging/lustre/lustre/libcfs/module.c
53614@@ -313,11 +313,11 @@ out:
53615
53616
53617 struct cfs_psdev_ops libcfs_psdev_ops = {
53618- libcfs_psdev_open,
53619- libcfs_psdev_release,
53620- NULL,
53621- NULL,
53622- libcfs_ioctl
53623+ .p_open = libcfs_psdev_open,
53624+ .p_close = libcfs_psdev_release,
53625+ .p_read = NULL,
53626+ .p_write = NULL,
53627+ .p_ioctl = libcfs_ioctl
53628 };
53629
53630 extern int insert_proc(void);
53631diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
53632index 22667db..8b703b6 100644
53633--- a/drivers/staging/octeon/ethernet-rx.c
53634+++ b/drivers/staging/octeon/ethernet-rx.c
53635@@ -354,14 +354,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53636 /* Increment RX stats for virtual ports */
53637 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
53638 #ifdef CONFIG_64BIT
53639- atomic64_add(1,
53640+ atomic64_add_unchecked(1,
53641 (atomic64_t *)&priv->stats.rx_packets);
53642- atomic64_add(skb->len,
53643+ atomic64_add_unchecked(skb->len,
53644 (atomic64_t *)&priv->stats.rx_bytes);
53645 #else
53646- atomic_add(1,
53647+ atomic_add_unchecked(1,
53648 (atomic_t *)&priv->stats.rx_packets);
53649- atomic_add(skb->len,
53650+ atomic_add_unchecked(skb->len,
53651 (atomic_t *)&priv->stats.rx_bytes);
53652 #endif
53653 }
53654@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53655 dev->name);
53656 */
53657 #ifdef CONFIG_64BIT
53658- atomic64_add(1,
53659+ atomic64_add_unchecked(1,
53660 (atomic64_t *)&priv->stats.rx_dropped);
53661 #else
53662- atomic_add(1,
53663+ atomic_add_unchecked(1,
53664 (atomic_t *)&priv->stats.rx_dropped);
53665 #endif
53666 dev_kfree_skb_irq(skb);
53667diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
53668index 460e854..f926452 100644
53669--- a/drivers/staging/octeon/ethernet.c
53670+++ b/drivers/staging/octeon/ethernet.c
53671@@ -241,11 +241,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
53672 * since the RX tasklet also increments it.
53673 */
53674 #ifdef CONFIG_64BIT
53675- atomic64_add(rx_status.dropped_packets,
53676- (atomic64_t *)&priv->stats.rx_dropped);
53677+ atomic64_add_unchecked(rx_status.dropped_packets,
53678+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
53679 #else
53680- atomic_add(rx_status.dropped_packets,
53681- (atomic_t *)&priv->stats.rx_dropped);
53682+ atomic_add_unchecked(rx_status.dropped_packets,
53683+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
53684 #endif
53685 }
53686
53687diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
53688index 3b476d8..f522d68 100644
53689--- a/drivers/staging/rtl8188eu/include/hal_intf.h
53690+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
53691@@ -225,7 +225,7 @@ struct hal_ops {
53692
53693 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
53694 void (*hal_reset_security_engine)(struct adapter *adapter);
53695-};
53696+} __no_const;
53697
53698 enum rt_eeprom_type {
53699 EEPROM_93C46,
53700diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
53701index 070cc03..6806e37 100644
53702--- a/drivers/staging/rtl8712/rtl871x_io.h
53703+++ b/drivers/staging/rtl8712/rtl871x_io.h
53704@@ -108,7 +108,7 @@ struct _io_ops {
53705 u8 *pmem);
53706 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
53707 u8 *pmem);
53708-};
53709+} __no_const;
53710
53711 struct io_req {
53712 struct list_head list;
53713diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
53714index 98f3ba4..c6a7fce 100644
53715--- a/drivers/staging/unisys/visorchipset/visorchipset.h
53716+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
53717@@ -171,7 +171,7 @@ struct visorchipset_busdev_notifiers {
53718 void (*device_resume)(ulong bus_no, ulong dev_no);
53719 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
53720 ulong *max_size);
53721-};
53722+} __no_const;
53723
53724 /* These functions live inside visorchipset, and will be called to indicate
53725 * responses to specific events (by code outside of visorchipset).
53726@@ -186,7 +186,7 @@ struct visorchipset_busdev_responders {
53727 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
53728 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
53729 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
53730-};
53731+} __no_const;
53732
53733 /** Register functions (in the bus driver) to get called by visorchipset
53734 * whenever a bus or device appears for which this service partition is
53735diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
53736index 9512af6..045bf5a 100644
53737--- a/drivers/target/sbp/sbp_target.c
53738+++ b/drivers/target/sbp/sbp_target.c
53739@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
53740
53741 #define SESSION_MAINTENANCE_INTERVAL HZ
53742
53743-static atomic_t login_id = ATOMIC_INIT(0);
53744+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
53745
53746 static void session_maintenance_work(struct work_struct *);
53747 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
53748@@ -444,7 +444,7 @@ static void sbp_management_request_login(
53749 login->lun = se_lun;
53750 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
53751 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
53752- login->login_id = atomic_inc_return(&login_id);
53753+ login->login_id = atomic_inc_return_unchecked(&login_id);
53754
53755 login->tgt_agt = sbp_target_agent_register(login);
53756 if (IS_ERR(login->tgt_agt)) {
53757diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
53758index 7faa6ae..ae6c410 100644
53759--- a/drivers/target/target_core_device.c
53760+++ b/drivers/target/target_core_device.c
53761@@ -1495,7 +1495,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
53762 spin_lock_init(&dev->se_tmr_lock);
53763 spin_lock_init(&dev->qf_cmd_lock);
53764 sema_init(&dev->caw_sem, 1);
53765- atomic_set(&dev->dev_ordered_id, 0);
53766+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
53767 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
53768 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
53769 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
53770diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
53771index f786de0..04b643e 100644
53772--- a/drivers/target/target_core_transport.c
53773+++ b/drivers/target/target_core_transport.c
53774@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
53775 * Used to determine when ORDERED commands should go from
53776 * Dormant to Active status.
53777 */
53778- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
53779+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
53780 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
53781 cmd->se_ordered_id, cmd->sam_task_attr,
53782 dev->transport->name);
53783diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
53784index 031018e..90981a1 100644
53785--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
53786+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
53787@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
53788 platform_set_drvdata(pdev, priv);
53789
53790 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
53791- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53792- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53793+ pax_open_kernel();
53794+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53795+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53796+ pax_close_kernel();
53797 }
53798 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
53799 priv, &int3400_thermal_ops,
53800diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
53801index 668fb1b..2737bbe 100644
53802--- a/drivers/thermal/of-thermal.c
53803+++ b/drivers/thermal/of-thermal.c
53804@@ -31,6 +31,7 @@
53805 #include <linux/export.h>
53806 #include <linux/string.h>
53807 #include <linux/thermal.h>
53808+#include <linux/mm.h>
53809
53810 #include "thermal_core.h"
53811
53812@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
53813 tz->ops = ops;
53814 tz->sensor_data = data;
53815
53816- tzd->ops->get_temp = of_thermal_get_temp;
53817- tzd->ops->get_trend = of_thermal_get_trend;
53818- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53819+ pax_open_kernel();
53820+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
53821+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
53822+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53823+ pax_close_kernel();
53824 mutex_unlock(&tzd->lock);
53825
53826 return tzd;
53827@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
53828 return;
53829
53830 mutex_lock(&tzd->lock);
53831- tzd->ops->get_temp = NULL;
53832- tzd->ops->get_trend = NULL;
53833- tzd->ops->set_emul_temp = NULL;
53834+ pax_open_kernel();
53835+ *(void **)&tzd->ops->get_temp = NULL;
53836+ *(void **)&tzd->ops->get_trend = NULL;
53837+ *(void **)&tzd->ops->set_emul_temp = NULL;
53838+ pax_close_kernel();
53839
53840 tz->ops = NULL;
53841 tz->sensor_data = NULL;
53842diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
53843index 9ea3d9d..53e8792 100644
53844--- a/drivers/thermal/x86_pkg_temp_thermal.c
53845+++ b/drivers/thermal/x86_pkg_temp_thermal.c
53846@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
53847 return NOTIFY_OK;
53848 }
53849
53850-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
53851+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
53852 .notifier_call = pkg_temp_thermal_cpu_callback,
53853 };
53854
53855diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
53856index fd66f57..48e6376 100644
53857--- a/drivers/tty/cyclades.c
53858+++ b/drivers/tty/cyclades.c
53859@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
53860 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
53861 info->port.count);
53862 #endif
53863- info->port.count++;
53864+ atomic_inc(&info->port.count);
53865 #ifdef CY_DEBUG_COUNT
53866 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
53867- current->pid, info->port.count);
53868+ current->pid, atomic_read(&info->port.count));
53869 #endif
53870
53871 /*
53872@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
53873 for (j = 0; j < cy_card[i].nports; j++) {
53874 info = &cy_card[i].ports[j];
53875
53876- if (info->port.count) {
53877+ if (atomic_read(&info->port.count)) {
53878 /* XXX is the ldisc num worth this? */
53879 struct tty_struct *tty;
53880 struct tty_ldisc *ld;
53881diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
53882index 4fcec1d..5a036f7 100644
53883--- a/drivers/tty/hvc/hvc_console.c
53884+++ b/drivers/tty/hvc/hvc_console.c
53885@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
53886
53887 spin_lock_irqsave(&hp->port.lock, flags);
53888 /* Check and then increment for fast path open. */
53889- if (hp->port.count++ > 0) {
53890+ if (atomic_inc_return(&hp->port.count) > 1) {
53891 spin_unlock_irqrestore(&hp->port.lock, flags);
53892 hvc_kick();
53893 return 0;
53894@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53895
53896 spin_lock_irqsave(&hp->port.lock, flags);
53897
53898- if (--hp->port.count == 0) {
53899+ if (atomic_dec_return(&hp->port.count) == 0) {
53900 spin_unlock_irqrestore(&hp->port.lock, flags);
53901 /* We are done with the tty pointer now. */
53902 tty_port_tty_set(&hp->port, NULL);
53903@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53904 */
53905 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
53906 } else {
53907- if (hp->port.count < 0)
53908+ if (atomic_read(&hp->port.count) < 0)
53909 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
53910- hp->vtermno, hp->port.count);
53911+ hp->vtermno, atomic_read(&hp->port.count));
53912 spin_unlock_irqrestore(&hp->port.lock, flags);
53913 }
53914 }
53915@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
53916 * open->hangup case this can be called after the final close so prevent
53917 * that from happening for now.
53918 */
53919- if (hp->port.count <= 0) {
53920+ if (atomic_read(&hp->port.count) <= 0) {
53921 spin_unlock_irqrestore(&hp->port.lock, flags);
53922 return;
53923 }
53924
53925- hp->port.count = 0;
53926+ atomic_set(&hp->port.count, 0);
53927 spin_unlock_irqrestore(&hp->port.lock, flags);
53928 tty_port_tty_set(&hp->port, NULL);
53929
53930@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
53931 return -EPIPE;
53932
53933 /* FIXME what's this (unprotected) check for? */
53934- if (hp->port.count <= 0)
53935+ if (atomic_read(&hp->port.count) <= 0)
53936 return -EIO;
53937
53938 spin_lock_irqsave(&hp->lock, flags);
53939diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
53940index 81ff7e1..dfb7b71 100644
53941--- a/drivers/tty/hvc/hvcs.c
53942+++ b/drivers/tty/hvc/hvcs.c
53943@@ -83,6 +83,7 @@
53944 #include <asm/hvcserver.h>
53945 #include <asm/uaccess.h>
53946 #include <asm/vio.h>
53947+#include <asm/local.h>
53948
53949 /*
53950 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
53951@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
53952
53953 spin_lock_irqsave(&hvcsd->lock, flags);
53954
53955- if (hvcsd->port.count > 0) {
53956+ if (atomic_read(&hvcsd->port.count) > 0) {
53957 spin_unlock_irqrestore(&hvcsd->lock, flags);
53958 printk(KERN_INFO "HVCS: vterm state unchanged. "
53959 "The hvcs device node is still in use.\n");
53960@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
53961 }
53962 }
53963
53964- hvcsd->port.count = 0;
53965+ atomic_set(&hvcsd->port.count, 0);
53966 hvcsd->port.tty = tty;
53967 tty->driver_data = hvcsd;
53968
53969@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
53970 unsigned long flags;
53971
53972 spin_lock_irqsave(&hvcsd->lock, flags);
53973- hvcsd->port.count++;
53974+ atomic_inc(&hvcsd->port.count);
53975 hvcsd->todo_mask |= HVCS_SCHED_READ;
53976 spin_unlock_irqrestore(&hvcsd->lock, flags);
53977
53978@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
53979 hvcsd = tty->driver_data;
53980
53981 spin_lock_irqsave(&hvcsd->lock, flags);
53982- if (--hvcsd->port.count == 0) {
53983+ if (atomic_dec_and_test(&hvcsd->port.count)) {
53984
53985 vio_disable_interrupts(hvcsd->vdev);
53986
53987@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
53988
53989 free_irq(irq, hvcsd);
53990 return;
53991- } else if (hvcsd->port.count < 0) {
53992+ } else if (atomic_read(&hvcsd->port.count) < 0) {
53993 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
53994 " is missmanaged.\n",
53995- hvcsd->vdev->unit_address, hvcsd->port.count);
53996+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
53997 }
53998
53999 spin_unlock_irqrestore(&hvcsd->lock, flags);
54000@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54001
54002 spin_lock_irqsave(&hvcsd->lock, flags);
54003 /* Preserve this so that we know how many kref refs to put */
54004- temp_open_count = hvcsd->port.count;
54005+ temp_open_count = atomic_read(&hvcsd->port.count);
54006
54007 /*
54008 * Don't kref put inside the spinlock because the destruction
54009@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54010 tty->driver_data = NULL;
54011 hvcsd->port.tty = NULL;
54012
54013- hvcsd->port.count = 0;
54014+ atomic_set(&hvcsd->port.count, 0);
54015
54016 /* This will drop any buffered data on the floor which is OK in a hangup
54017 * scenario. */
54018@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
54019 * the middle of a write operation? This is a crummy place to do this
54020 * but we want to keep it all in the spinlock.
54021 */
54022- if (hvcsd->port.count <= 0) {
54023+ if (atomic_read(&hvcsd->port.count) <= 0) {
54024 spin_unlock_irqrestore(&hvcsd->lock, flags);
54025 return -ENODEV;
54026 }
54027@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
54028 {
54029 struct hvcs_struct *hvcsd = tty->driver_data;
54030
54031- if (!hvcsd || hvcsd->port.count <= 0)
54032+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
54033 return 0;
54034
54035 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
54036diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
54037index 4190199..06d5bfa 100644
54038--- a/drivers/tty/hvc/hvsi.c
54039+++ b/drivers/tty/hvc/hvsi.c
54040@@ -85,7 +85,7 @@ struct hvsi_struct {
54041 int n_outbuf;
54042 uint32_t vtermno;
54043 uint32_t virq;
54044- atomic_t seqno; /* HVSI packet sequence number */
54045+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
54046 uint16_t mctrl;
54047 uint8_t state; /* HVSI protocol state */
54048 uint8_t flags;
54049@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
54050
54051 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
54052 packet.hdr.len = sizeof(struct hvsi_query_response);
54053- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54054+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54055 packet.verb = VSV_SEND_VERSION_NUMBER;
54056 packet.u.version = HVSI_VERSION;
54057 packet.query_seqno = query_seqno+1;
54058@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
54059
54060 packet.hdr.type = VS_QUERY_PACKET_HEADER;
54061 packet.hdr.len = sizeof(struct hvsi_query);
54062- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54063+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54064 packet.verb = verb;
54065
54066 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
54067@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
54068 int wrote;
54069
54070 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
54071- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54072+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54073 packet.hdr.len = sizeof(struct hvsi_control);
54074 packet.verb = VSV_SET_MODEM_CTL;
54075 packet.mask = HVSI_TSDTR;
54076@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
54077 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
54078
54079 packet.hdr.type = VS_DATA_PACKET_HEADER;
54080- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54081+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54082 packet.hdr.len = count + sizeof(struct hvsi_header);
54083 memcpy(&packet.data, buf, count);
54084
54085@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
54086 struct hvsi_control packet __ALIGNED__;
54087
54088 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
54089- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54090+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54091 packet.hdr.len = 6;
54092 packet.verb = VSV_CLOSE_PROTOCOL;
54093
54094@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
54095
54096 tty_port_tty_set(&hp->port, tty);
54097 spin_lock_irqsave(&hp->lock, flags);
54098- hp->port.count++;
54099+ atomic_inc(&hp->port.count);
54100 atomic_set(&hp->seqno, 0);
54101 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
54102 spin_unlock_irqrestore(&hp->lock, flags);
54103@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54104
54105 spin_lock_irqsave(&hp->lock, flags);
54106
54107- if (--hp->port.count == 0) {
54108+ if (atomic_dec_return(&hp->port.count) == 0) {
54109 tty_port_tty_set(&hp->port, NULL);
54110 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
54111
54112@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54113
54114 spin_lock_irqsave(&hp->lock, flags);
54115 }
54116- } else if (hp->port.count < 0)
54117+ } else if (atomic_read(&hp->port.count) < 0)
54118 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
54119- hp - hvsi_ports, hp->port.count);
54120+ hp - hvsi_ports, atomic_read(&hp->port.count));
54121
54122 spin_unlock_irqrestore(&hp->lock, flags);
54123 }
54124@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
54125 tty_port_tty_set(&hp->port, NULL);
54126
54127 spin_lock_irqsave(&hp->lock, flags);
54128- hp->port.count = 0;
54129+ atomic_set(&hp->port.count, 0);
54130 hp->n_outbuf = 0;
54131 spin_unlock_irqrestore(&hp->lock, flags);
54132 }
54133diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
54134index a270f04..7c77b5d 100644
54135--- a/drivers/tty/hvc/hvsi_lib.c
54136+++ b/drivers/tty/hvc/hvsi_lib.c
54137@@ -8,7 +8,7 @@
54138
54139 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
54140 {
54141- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
54142+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
54143
54144 /* Assumes that always succeeds, works in practice */
54145 return pv->put_chars(pv->termno, (char *)packet, packet->len);
54146@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
54147
54148 /* Reset state */
54149 pv->established = 0;
54150- atomic_set(&pv->seqno, 0);
54151+ atomic_set_unchecked(&pv->seqno, 0);
54152
54153 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
54154
54155diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
54156index 345cebb..d5a1e9e 100644
54157--- a/drivers/tty/ipwireless/tty.c
54158+++ b/drivers/tty/ipwireless/tty.c
54159@@ -28,6 +28,7 @@
54160 #include <linux/tty_driver.h>
54161 #include <linux/tty_flip.h>
54162 #include <linux/uaccess.h>
54163+#include <asm/local.h>
54164
54165 #include "tty.h"
54166 #include "network.h"
54167@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54168 return -ENODEV;
54169
54170 mutex_lock(&tty->ipw_tty_mutex);
54171- if (tty->port.count == 0)
54172+ if (atomic_read(&tty->port.count) == 0)
54173 tty->tx_bytes_queued = 0;
54174
54175- tty->port.count++;
54176+ atomic_inc(&tty->port.count);
54177
54178 tty->port.tty = linux_tty;
54179 linux_tty->driver_data = tty;
54180@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54181
54182 static void do_ipw_close(struct ipw_tty *tty)
54183 {
54184- tty->port.count--;
54185-
54186- if (tty->port.count == 0) {
54187+ if (atomic_dec_return(&tty->port.count) == 0) {
54188 struct tty_struct *linux_tty = tty->port.tty;
54189
54190 if (linux_tty != NULL) {
54191@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
54192 return;
54193
54194 mutex_lock(&tty->ipw_tty_mutex);
54195- if (tty->port.count == 0) {
54196+ if (atomic_read(&tty->port.count) == 0) {
54197 mutex_unlock(&tty->ipw_tty_mutex);
54198 return;
54199 }
54200@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
54201
54202 mutex_lock(&tty->ipw_tty_mutex);
54203
54204- if (!tty->port.count) {
54205+ if (!atomic_read(&tty->port.count)) {
54206 mutex_unlock(&tty->ipw_tty_mutex);
54207 return;
54208 }
54209@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
54210 return -ENODEV;
54211
54212 mutex_lock(&tty->ipw_tty_mutex);
54213- if (!tty->port.count) {
54214+ if (!atomic_read(&tty->port.count)) {
54215 mutex_unlock(&tty->ipw_tty_mutex);
54216 return -EINVAL;
54217 }
54218@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
54219 if (!tty)
54220 return -ENODEV;
54221
54222- if (!tty->port.count)
54223+ if (!atomic_read(&tty->port.count))
54224 return -EINVAL;
54225
54226 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
54227@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
54228 if (!tty)
54229 return 0;
54230
54231- if (!tty->port.count)
54232+ if (!atomic_read(&tty->port.count))
54233 return 0;
54234
54235 return tty->tx_bytes_queued;
54236@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
54237 if (!tty)
54238 return -ENODEV;
54239
54240- if (!tty->port.count)
54241+ if (!atomic_read(&tty->port.count))
54242 return -EINVAL;
54243
54244 return get_control_lines(tty);
54245@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
54246 if (!tty)
54247 return -ENODEV;
54248
54249- if (!tty->port.count)
54250+ if (!atomic_read(&tty->port.count))
54251 return -EINVAL;
54252
54253 return set_control_lines(tty, set, clear);
54254@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
54255 if (!tty)
54256 return -ENODEV;
54257
54258- if (!tty->port.count)
54259+ if (!atomic_read(&tty->port.count))
54260 return -EINVAL;
54261
54262 /* FIXME: Exactly how is the tty object locked here .. */
54263@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
54264 * are gone */
54265 mutex_lock(&ttyj->ipw_tty_mutex);
54266 }
54267- while (ttyj->port.count)
54268+ while (atomic_read(&ttyj->port.count))
54269 do_ipw_close(ttyj);
54270 ipwireless_disassociate_network_ttys(network,
54271 ttyj->channel_idx);
54272diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
54273index 14c54e0..1efd4f2 100644
54274--- a/drivers/tty/moxa.c
54275+++ b/drivers/tty/moxa.c
54276@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
54277 }
54278
54279 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
54280- ch->port.count++;
54281+ atomic_inc(&ch->port.count);
54282 tty->driver_data = ch;
54283 tty_port_tty_set(&ch->port, tty);
54284 mutex_lock(&ch->port.mutex);
54285diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
54286index bce16e4..1120a85 100644
54287--- a/drivers/tty/n_gsm.c
54288+++ b/drivers/tty/n_gsm.c
54289@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
54290 spin_lock_init(&dlci->lock);
54291 mutex_init(&dlci->mutex);
54292 dlci->fifo = &dlci->_fifo;
54293- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
54294+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
54295 kfree(dlci);
54296 return NULL;
54297 }
54298@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
54299 struct gsm_dlci *dlci = tty->driver_data;
54300 struct tty_port *port = &dlci->port;
54301
54302- port->count++;
54303+ atomic_inc(&port->count);
54304 tty_port_tty_set(port, tty);
54305
54306 dlci->modem_rx = 0;
54307diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
54308index cc57a3a..b39622b 100644
54309--- a/drivers/tty/n_tty.c
54310+++ b/drivers/tty/n_tty.c
54311@@ -116,7 +116,7 @@ struct n_tty_data {
54312 int minimum_to_wake;
54313
54314 /* consumer-published */
54315- size_t read_tail;
54316+ size_t read_tail __intentional_overflow(-1);
54317 size_t line_start;
54318
54319 /* protected by output lock */
54320@@ -2561,6 +2561,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
54321 {
54322 *ops = tty_ldisc_N_TTY;
54323 ops->owner = NULL;
54324- ops->refcount = ops->flags = 0;
54325+ atomic_set(&ops->refcount, 0);
54326+ ops->flags = 0;
54327 }
54328 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
54329diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
54330index 4d5e840..a2340a6 100644
54331--- a/drivers/tty/pty.c
54332+++ b/drivers/tty/pty.c
54333@@ -849,8 +849,10 @@ static void __init unix98_pty_init(void)
54334 panic("Couldn't register Unix98 pts driver");
54335
54336 /* Now create the /dev/ptmx special device */
54337+ pax_open_kernel();
54338 tty_default_fops(&ptmx_fops);
54339- ptmx_fops.open = ptmx_open;
54340+ *(void **)&ptmx_fops.open = ptmx_open;
54341+ pax_close_kernel();
54342
54343 cdev_init(&ptmx_cdev, &ptmx_fops);
54344 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
54345diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
54346index c8dd8dc..dca6cfd 100644
54347--- a/drivers/tty/rocket.c
54348+++ b/drivers/tty/rocket.c
54349@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54350 tty->driver_data = info;
54351 tty_port_tty_set(port, tty);
54352
54353- if (port->count++ == 0) {
54354+ if (atomic_inc_return(&port->count) == 1) {
54355 atomic_inc(&rp_num_ports_open);
54356
54357 #ifdef ROCKET_DEBUG_OPEN
54358@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54359 #endif
54360 }
54361 #ifdef ROCKET_DEBUG_OPEN
54362- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
54363+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
54364 #endif
54365
54366 /*
54367@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
54368 spin_unlock_irqrestore(&info->port.lock, flags);
54369 return;
54370 }
54371- if (info->port.count)
54372+ if (atomic_read(&info->port.count))
54373 atomic_dec(&rp_num_ports_open);
54374 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
54375 spin_unlock_irqrestore(&info->port.lock, flags);
54376diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
54377index aa28209..e08fb85 100644
54378--- a/drivers/tty/serial/ioc4_serial.c
54379+++ b/drivers/tty/serial/ioc4_serial.c
54380@@ -437,7 +437,7 @@ struct ioc4_soft {
54381 } is_intr_info[MAX_IOC4_INTR_ENTS];
54382
54383 /* Number of entries active in the above array */
54384- atomic_t is_num_intrs;
54385+ atomic_unchecked_t is_num_intrs;
54386 } is_intr_type[IOC4_NUM_INTR_TYPES];
54387
54388 /* is_ir_lock must be held while
54389@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
54390 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
54391 || (type == IOC4_OTHER_INTR_TYPE)));
54392
54393- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
54394+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
54395 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
54396
54397 /* Save off the lower level interrupt handler */
54398@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
54399
54400 soft = arg;
54401 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
54402- num_intrs = (int)atomic_read(
54403+ num_intrs = (int)atomic_read_unchecked(
54404 &soft->is_intr_type[intr_type].is_num_intrs);
54405
54406 this_mir = this_ir = pending_intrs(soft, intr_type);
54407diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
54408index 129dc5b..1da5bb8 100644
54409--- a/drivers/tty/serial/kgdb_nmi.c
54410+++ b/drivers/tty/serial/kgdb_nmi.c
54411@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
54412 * I/O utilities that messages sent to the console will automatically
54413 * be displayed on the dbg_io.
54414 */
54415- dbg_io_ops->is_console = true;
54416+ pax_open_kernel();
54417+ *(int *)&dbg_io_ops->is_console = true;
54418+ pax_close_kernel();
54419
54420 return 0;
54421 }
54422diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
54423index a260cde..6b2b5ce 100644
54424--- a/drivers/tty/serial/kgdboc.c
54425+++ b/drivers/tty/serial/kgdboc.c
54426@@ -24,8 +24,9 @@
54427 #define MAX_CONFIG_LEN 40
54428
54429 static struct kgdb_io kgdboc_io_ops;
54430+static struct kgdb_io kgdboc_io_ops_console;
54431
54432-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
54433+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
54434 static int configured = -1;
54435
54436 static char config[MAX_CONFIG_LEN];
54437@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
54438 kgdboc_unregister_kbd();
54439 if (configured == 1)
54440 kgdb_unregister_io_module(&kgdboc_io_ops);
54441+ else if (configured == 2)
54442+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
54443 }
54444
54445 static int configure_kgdboc(void)
54446@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
54447 int err;
54448 char *cptr = config;
54449 struct console *cons;
54450+ int is_console = 0;
54451
54452 err = kgdboc_option_setup(config);
54453 if (err || !strlen(config) || isspace(config[0]))
54454 goto noconfig;
54455
54456 err = -ENODEV;
54457- kgdboc_io_ops.is_console = 0;
54458 kgdb_tty_driver = NULL;
54459
54460 kgdboc_use_kms = 0;
54461@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
54462 int idx;
54463 if (cons->device && cons->device(cons, &idx) == p &&
54464 idx == tty_line) {
54465- kgdboc_io_ops.is_console = 1;
54466+ is_console = 1;
54467 break;
54468 }
54469 cons = cons->next;
54470@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
54471 kgdb_tty_line = tty_line;
54472
54473 do_register:
54474- err = kgdb_register_io_module(&kgdboc_io_ops);
54475+ if (is_console) {
54476+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
54477+ configured = 2;
54478+ } else {
54479+ err = kgdb_register_io_module(&kgdboc_io_ops);
54480+ configured = 1;
54481+ }
54482 if (err)
54483 goto noconfig;
54484
54485@@ -205,8 +214,6 @@ do_register:
54486 if (err)
54487 goto nmi_con_failed;
54488
54489- configured = 1;
54490-
54491 return 0;
54492
54493 nmi_con_failed:
54494@@ -223,7 +230,7 @@ noconfig:
54495 static int __init init_kgdboc(void)
54496 {
54497 /* Already configured? */
54498- if (configured == 1)
54499+ if (configured >= 1)
54500 return 0;
54501
54502 return configure_kgdboc();
54503@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
54504 if (config[len - 1] == '\n')
54505 config[len - 1] = '\0';
54506
54507- if (configured == 1)
54508+ if (configured >= 1)
54509 cleanup_kgdboc();
54510
54511 /* Go and configure with the new params. */
54512@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
54513 .post_exception = kgdboc_post_exp_handler,
54514 };
54515
54516+static struct kgdb_io kgdboc_io_ops_console = {
54517+ .name = "kgdboc",
54518+ .read_char = kgdboc_get_char,
54519+ .write_char = kgdboc_put_char,
54520+ .pre_exception = kgdboc_pre_exp_handler,
54521+ .post_exception = kgdboc_post_exp_handler,
54522+ .is_console = 1
54523+};
54524+
54525 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
54526 /* This is only available if kgdboc is a built in for early debugging */
54527 static int __init kgdboc_early_init(char *opt)
54528diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
54529index b73889c..9f74f0a 100644
54530--- a/drivers/tty/serial/msm_serial.c
54531+++ b/drivers/tty/serial/msm_serial.c
54532@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
54533 .cons = MSM_CONSOLE,
54534 };
54535
54536-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
54537+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
54538
54539 static const struct of_device_id msm_uartdm_table[] = {
54540 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
54541@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
54542 line = pdev->id;
54543
54544 if (line < 0)
54545- line = atomic_inc_return(&msm_uart_next_id) - 1;
54546+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
54547
54548 if (unlikely(line < 0 || line >= UART_NR))
54549 return -ENXIO;
54550diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
54551index cf08876..711e0bf 100644
54552--- a/drivers/tty/serial/samsung.c
54553+++ b/drivers/tty/serial/samsung.c
54554@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
54555 ourport->tx_in_progress = 0;
54556 }
54557
54558+static int s3c64xx_serial_startup(struct uart_port *port);
54559 static int s3c24xx_serial_startup(struct uart_port *port)
54560 {
54561 struct s3c24xx_uart_port *ourport = to_ourport(port);
54562 int ret;
54563
54564+ /* Startup sequence is different for s3c64xx and higher SoC's */
54565+ if (s3c24xx_serial_has_interrupt_mask(port))
54566+ return s3c64xx_serial_startup(port);
54567+
54568 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
54569 port, (unsigned long long)port->mapbase, port->membase);
54570
54571@@ -1697,10 +1702,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
54572 /* setup info for port */
54573 port->dev = &platdev->dev;
54574
54575- /* Startup sequence is different for s3c64xx and higher SoC's */
54576- if (s3c24xx_serial_has_interrupt_mask(port))
54577- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
54578-
54579 port->uartclk = 1;
54580
54581 if (cfg->uart_flags & UPF_CONS_FLOW) {
54582diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
54583index 6a1055a..5ca9ad9 100644
54584--- a/drivers/tty/serial/serial_core.c
54585+++ b/drivers/tty/serial/serial_core.c
54586@@ -1377,7 +1377,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54587 state = drv->state + tty->index;
54588 port = &state->port;
54589 spin_lock_irq(&port->lock);
54590- --port->count;
54591+ atomic_dec(&port->count);
54592 spin_unlock_irq(&port->lock);
54593 return;
54594 }
54595@@ -1387,7 +1387,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54596
54597 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
54598
54599- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
54600+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
54601 return;
54602
54603 /*
54604@@ -1511,7 +1511,7 @@ static void uart_hangup(struct tty_struct *tty)
54605 uart_flush_buffer(tty);
54606 uart_shutdown(tty, state);
54607 spin_lock_irqsave(&port->lock, flags);
54608- port->count = 0;
54609+ atomic_set(&port->count, 0);
54610 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
54611 spin_unlock_irqrestore(&port->lock, flags);
54612 tty_port_tty_set(port, NULL);
54613@@ -1598,7 +1598,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
54614 pr_debug("uart_open(%d) called\n", line);
54615
54616 spin_lock_irq(&port->lock);
54617- ++port->count;
54618+ atomic_inc(&port->count);
54619 spin_unlock_irq(&port->lock);
54620
54621 /*
54622diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
54623index b799170..87dafd5 100644
54624--- a/drivers/tty/synclink.c
54625+++ b/drivers/tty/synclink.c
54626@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54627
54628 if (debug_level >= DEBUG_LEVEL_INFO)
54629 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
54630- __FILE__,__LINE__, info->device_name, info->port.count);
54631+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54632
54633 if (tty_port_close_start(&info->port, tty, filp) == 0)
54634 goto cleanup;
54635@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54636 cleanup:
54637 if (debug_level >= DEBUG_LEVEL_INFO)
54638 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
54639- tty->driver->name, info->port.count);
54640+ tty->driver->name, atomic_read(&info->port.count));
54641
54642 } /* end of mgsl_close() */
54643
54644@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
54645
54646 mgsl_flush_buffer(tty);
54647 shutdown(info);
54648-
54649- info->port.count = 0;
54650+
54651+ atomic_set(&info->port.count, 0);
54652 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54653 info->port.tty = NULL;
54654
54655@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54656
54657 if (debug_level >= DEBUG_LEVEL_INFO)
54658 printk("%s(%d):block_til_ready before block on %s count=%d\n",
54659- __FILE__,__LINE__, tty->driver->name, port->count );
54660+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54661
54662 spin_lock_irqsave(&info->irq_spinlock, flags);
54663- port->count--;
54664+ atomic_dec(&port->count);
54665 spin_unlock_irqrestore(&info->irq_spinlock, flags);
54666 port->blocked_open++;
54667
54668@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54669
54670 if (debug_level >= DEBUG_LEVEL_INFO)
54671 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
54672- __FILE__,__LINE__, tty->driver->name, port->count );
54673+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54674
54675 tty_unlock(tty);
54676 schedule();
54677@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54678
54679 /* FIXME: Racy on hangup during close wait */
54680 if (!tty_hung_up_p(filp))
54681- port->count++;
54682+ atomic_inc(&port->count);
54683 port->blocked_open--;
54684
54685 if (debug_level >= DEBUG_LEVEL_INFO)
54686 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
54687- __FILE__,__LINE__, tty->driver->name, port->count );
54688+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54689
54690 if (!retval)
54691 port->flags |= ASYNC_NORMAL_ACTIVE;
54692@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54693
54694 if (debug_level >= DEBUG_LEVEL_INFO)
54695 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
54696- __FILE__,__LINE__,tty->driver->name, info->port.count);
54697+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54698
54699 /* If port is closing, signal caller to try again */
54700 if (info->port.flags & ASYNC_CLOSING){
54701@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54702 spin_unlock_irqrestore(&info->netlock, flags);
54703 goto cleanup;
54704 }
54705- info->port.count++;
54706+ atomic_inc(&info->port.count);
54707 spin_unlock_irqrestore(&info->netlock, flags);
54708
54709- if (info->port.count == 1) {
54710+ if (atomic_read(&info->port.count) == 1) {
54711 /* 1st open on this device, init hardware */
54712 retval = startup(info);
54713 if (retval < 0)
54714@@ -3442,8 +3442,8 @@ cleanup:
54715 if (retval) {
54716 if (tty->count == 1)
54717 info->port.tty = NULL; /* tty layer will release tty struct */
54718- if(info->port.count)
54719- info->port.count--;
54720+ if (atomic_read(&info->port.count))
54721+ atomic_dec(&info->port.count);
54722 }
54723
54724 return retval;
54725@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54726 unsigned short new_crctype;
54727
54728 /* return error if TTY interface open */
54729- if (info->port.count)
54730+ if (atomic_read(&info->port.count))
54731 return -EBUSY;
54732
54733 switch (encoding)
54734@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
54735
54736 /* arbitrate between network and tty opens */
54737 spin_lock_irqsave(&info->netlock, flags);
54738- if (info->port.count != 0 || info->netcount != 0) {
54739+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54740 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54741 spin_unlock_irqrestore(&info->netlock, flags);
54742 return -EBUSY;
54743@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54744 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54745
54746 /* return error if TTY interface open */
54747- if (info->port.count)
54748+ if (atomic_read(&info->port.count))
54749 return -EBUSY;
54750
54751 if (cmd != SIOCWANDEV)
54752diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
54753index 0e8c39b..e0cb171 100644
54754--- a/drivers/tty/synclink_gt.c
54755+++ b/drivers/tty/synclink_gt.c
54756@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54757 tty->driver_data = info;
54758 info->port.tty = tty;
54759
54760- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
54761+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
54762
54763 /* If port is closing, signal caller to try again */
54764 if (info->port.flags & ASYNC_CLOSING){
54765@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54766 mutex_unlock(&info->port.mutex);
54767 goto cleanup;
54768 }
54769- info->port.count++;
54770+ atomic_inc(&info->port.count);
54771 spin_unlock_irqrestore(&info->netlock, flags);
54772
54773- if (info->port.count == 1) {
54774+ if (atomic_read(&info->port.count) == 1) {
54775 /* 1st open on this device, init hardware */
54776 retval = startup(info);
54777 if (retval < 0) {
54778@@ -715,8 +715,8 @@ cleanup:
54779 if (retval) {
54780 if (tty->count == 1)
54781 info->port.tty = NULL; /* tty layer will release tty struct */
54782- if(info->port.count)
54783- info->port.count--;
54784+ if(atomic_read(&info->port.count))
54785+ atomic_dec(&info->port.count);
54786 }
54787
54788 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
54789@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54790
54791 if (sanity_check(info, tty->name, "close"))
54792 return;
54793- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
54794+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
54795
54796 if (tty_port_close_start(&info->port, tty, filp) == 0)
54797 goto cleanup;
54798@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54799 tty_port_close_end(&info->port, tty);
54800 info->port.tty = NULL;
54801 cleanup:
54802- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
54803+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
54804 }
54805
54806 static void hangup(struct tty_struct *tty)
54807@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
54808 shutdown(info);
54809
54810 spin_lock_irqsave(&info->port.lock, flags);
54811- info->port.count = 0;
54812+ atomic_set(&info->port.count, 0);
54813 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54814 info->port.tty = NULL;
54815 spin_unlock_irqrestore(&info->port.lock, flags);
54816@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54817 unsigned short new_crctype;
54818
54819 /* return error if TTY interface open */
54820- if (info->port.count)
54821+ if (atomic_read(&info->port.count))
54822 return -EBUSY;
54823
54824 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
54825@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
54826
54827 /* arbitrate between network and tty opens */
54828 spin_lock_irqsave(&info->netlock, flags);
54829- if (info->port.count != 0 || info->netcount != 0) {
54830+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54831 DBGINFO(("%s hdlc_open busy\n", dev->name));
54832 spin_unlock_irqrestore(&info->netlock, flags);
54833 return -EBUSY;
54834@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54835 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
54836
54837 /* return error if TTY interface open */
54838- if (info->port.count)
54839+ if (atomic_read(&info->port.count))
54840 return -EBUSY;
54841
54842 if (cmd != SIOCWANDEV)
54843@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
54844 if (port == NULL)
54845 continue;
54846 spin_lock(&port->lock);
54847- if ((port->port.count || port->netcount) &&
54848+ if ((atomic_read(&port->port.count) || port->netcount) &&
54849 port->pending_bh && !port->bh_running &&
54850 !port->bh_requested) {
54851 DBGISR(("%s bh queued\n", port->device_name));
54852@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54853 add_wait_queue(&port->open_wait, &wait);
54854
54855 spin_lock_irqsave(&info->lock, flags);
54856- port->count--;
54857+ atomic_dec(&port->count);
54858 spin_unlock_irqrestore(&info->lock, flags);
54859 port->blocked_open++;
54860
54861@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54862 remove_wait_queue(&port->open_wait, &wait);
54863
54864 if (!tty_hung_up_p(filp))
54865- port->count++;
54866+ atomic_inc(&port->count);
54867 port->blocked_open--;
54868
54869 if (!retval)
54870diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
54871index c3f9091..abe4601 100644
54872--- a/drivers/tty/synclinkmp.c
54873+++ b/drivers/tty/synclinkmp.c
54874@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54875
54876 if (debug_level >= DEBUG_LEVEL_INFO)
54877 printk("%s(%d):%s open(), old ref count = %d\n",
54878- __FILE__,__LINE__,tty->driver->name, info->port.count);
54879+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54880
54881 /* If port is closing, signal caller to try again */
54882 if (info->port.flags & ASYNC_CLOSING){
54883@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54884 spin_unlock_irqrestore(&info->netlock, flags);
54885 goto cleanup;
54886 }
54887- info->port.count++;
54888+ atomic_inc(&info->port.count);
54889 spin_unlock_irqrestore(&info->netlock, flags);
54890
54891- if (info->port.count == 1) {
54892+ if (atomic_read(&info->port.count) == 1) {
54893 /* 1st open on this device, init hardware */
54894 retval = startup(info);
54895 if (retval < 0)
54896@@ -796,8 +796,8 @@ cleanup:
54897 if (retval) {
54898 if (tty->count == 1)
54899 info->port.tty = NULL; /* tty layer will release tty struct */
54900- if(info->port.count)
54901- info->port.count--;
54902+ if(atomic_read(&info->port.count))
54903+ atomic_dec(&info->port.count);
54904 }
54905
54906 return retval;
54907@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54908
54909 if (debug_level >= DEBUG_LEVEL_INFO)
54910 printk("%s(%d):%s close() entry, count=%d\n",
54911- __FILE__,__LINE__, info->device_name, info->port.count);
54912+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54913
54914 if (tty_port_close_start(&info->port, tty, filp) == 0)
54915 goto cleanup;
54916@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54917 cleanup:
54918 if (debug_level >= DEBUG_LEVEL_INFO)
54919 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
54920- tty->driver->name, info->port.count);
54921+ tty->driver->name, atomic_read(&info->port.count));
54922 }
54923
54924 /* Called by tty_hangup() when a hangup is signaled.
54925@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
54926 shutdown(info);
54927
54928 spin_lock_irqsave(&info->port.lock, flags);
54929- info->port.count = 0;
54930+ atomic_set(&info->port.count, 0);
54931 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54932 info->port.tty = NULL;
54933 spin_unlock_irqrestore(&info->port.lock, flags);
54934@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54935 unsigned short new_crctype;
54936
54937 /* return error if TTY interface open */
54938- if (info->port.count)
54939+ if (atomic_read(&info->port.count))
54940 return -EBUSY;
54941
54942 switch (encoding)
54943@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
54944
54945 /* arbitrate between network and tty opens */
54946 spin_lock_irqsave(&info->netlock, flags);
54947- if (info->port.count != 0 || info->netcount != 0) {
54948+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54949 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54950 spin_unlock_irqrestore(&info->netlock, flags);
54951 return -EBUSY;
54952@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54953 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54954
54955 /* return error if TTY interface open */
54956- if (info->port.count)
54957+ if (atomic_read(&info->port.count))
54958 return -EBUSY;
54959
54960 if (cmd != SIOCWANDEV)
54961@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
54962 * do not request bottom half processing if the
54963 * device is not open in a normal mode.
54964 */
54965- if ( port && (port->port.count || port->netcount) &&
54966+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
54967 port->pending_bh && !port->bh_running &&
54968 !port->bh_requested ) {
54969 if ( debug_level >= DEBUG_LEVEL_ISR )
54970@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54971
54972 if (debug_level >= DEBUG_LEVEL_INFO)
54973 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
54974- __FILE__,__LINE__, tty->driver->name, port->count );
54975+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54976
54977 spin_lock_irqsave(&info->lock, flags);
54978- port->count--;
54979+ atomic_dec(&port->count);
54980 spin_unlock_irqrestore(&info->lock, flags);
54981 port->blocked_open++;
54982
54983@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54984
54985 if (debug_level >= DEBUG_LEVEL_INFO)
54986 printk("%s(%d):%s block_til_ready() count=%d\n",
54987- __FILE__,__LINE__, tty->driver->name, port->count );
54988+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54989
54990 tty_unlock(tty);
54991 schedule();
54992@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54993 set_current_state(TASK_RUNNING);
54994 remove_wait_queue(&port->open_wait, &wait);
54995 if (!tty_hung_up_p(filp))
54996- port->count++;
54997+ atomic_inc(&port->count);
54998 port->blocked_open--;
54999
55000 if (debug_level >= DEBUG_LEVEL_INFO)
55001 printk("%s(%d):%s block_til_ready() after, count=%d\n",
55002- __FILE__,__LINE__, tty->driver->name, port->count );
55003+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55004
55005 if (!retval)
55006 port->flags |= ASYNC_NORMAL_ACTIVE;
55007diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
55008index 259a4d5..9b0c9e7 100644
55009--- a/drivers/tty/sysrq.c
55010+++ b/drivers/tty/sysrq.c
55011@@ -1085,7 +1085,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
55012 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
55013 size_t count, loff_t *ppos)
55014 {
55015- if (count) {
55016+ if (count && capable(CAP_SYS_ADMIN)) {
55017 char c;
55018
55019 if (get_user(c, buf))
55020diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
55021index 2bb4dfc..a7f6e86 100644
55022--- a/drivers/tty/tty_io.c
55023+++ b/drivers/tty/tty_io.c
55024@@ -3503,7 +3503,7 @@ EXPORT_SYMBOL(tty_devnum);
55025
55026 void tty_default_fops(struct file_operations *fops)
55027 {
55028- *fops = tty_fops;
55029+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
55030 }
55031
55032 /*
55033diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
55034index 3737f55..7cef448 100644
55035--- a/drivers/tty/tty_ldisc.c
55036+++ b/drivers/tty/tty_ldisc.c
55037@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
55038 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55039 tty_ldiscs[disc] = new_ldisc;
55040 new_ldisc->num = disc;
55041- new_ldisc->refcount = 0;
55042+ atomic_set(&new_ldisc->refcount, 0);
55043 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55044
55045 return ret;
55046@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
55047 return -EINVAL;
55048
55049 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55050- if (tty_ldiscs[disc]->refcount)
55051+ if (atomic_read(&tty_ldiscs[disc]->refcount))
55052 ret = -EBUSY;
55053 else
55054 tty_ldiscs[disc] = NULL;
55055@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
55056 if (ldops) {
55057 ret = ERR_PTR(-EAGAIN);
55058 if (try_module_get(ldops->owner)) {
55059- ldops->refcount++;
55060+ atomic_inc(&ldops->refcount);
55061 ret = ldops;
55062 }
55063 }
55064@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
55065 unsigned long flags;
55066
55067 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55068- ldops->refcount--;
55069+ atomic_dec(&ldops->refcount);
55070 module_put(ldops->owner);
55071 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55072 }
55073diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
55074index 40b31835..94d92ae 100644
55075--- a/drivers/tty/tty_port.c
55076+++ b/drivers/tty/tty_port.c
55077@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
55078 unsigned long flags;
55079
55080 spin_lock_irqsave(&port->lock, flags);
55081- port->count = 0;
55082+ atomic_set(&port->count, 0);
55083 port->flags &= ~ASYNC_NORMAL_ACTIVE;
55084 tty = port->tty;
55085 if (tty)
55086@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55087
55088 /* The port lock protects the port counts */
55089 spin_lock_irqsave(&port->lock, flags);
55090- port->count--;
55091+ atomic_dec(&port->count);
55092 port->blocked_open++;
55093 spin_unlock_irqrestore(&port->lock, flags);
55094
55095@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55096 we must not mess that up further */
55097 spin_lock_irqsave(&port->lock, flags);
55098 if (!tty_hung_up_p(filp))
55099- port->count++;
55100+ atomic_inc(&port->count);
55101 port->blocked_open--;
55102 if (retval == 0)
55103 port->flags |= ASYNC_NORMAL_ACTIVE;
55104@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
55105 return 0;
55106
55107 spin_lock_irqsave(&port->lock, flags);
55108- if (tty->count == 1 && port->count != 1) {
55109+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
55110 printk(KERN_WARNING
55111 "tty_port_close_start: tty->count = 1 port count = %d.\n",
55112- port->count);
55113- port->count = 1;
55114+ atomic_read(&port->count));
55115+ atomic_set(&port->count, 1);
55116 }
55117- if (--port->count < 0) {
55118+ if (atomic_dec_return(&port->count) < 0) {
55119 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
55120- port->count);
55121- port->count = 0;
55122+ atomic_read(&port->count));
55123+ atomic_set(&port->count, 0);
55124 }
55125
55126- if (port->count) {
55127+ if (atomic_read(&port->count)) {
55128 spin_unlock_irqrestore(&port->lock, flags);
55129 return 0;
55130 }
55131@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
55132 struct file *filp)
55133 {
55134 spin_lock_irq(&port->lock);
55135- ++port->count;
55136+ atomic_inc(&port->count);
55137 spin_unlock_irq(&port->lock);
55138 tty_port_tty_set(port, tty);
55139
55140diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
55141index 8a89f6e..50b32af 100644
55142--- a/drivers/tty/vt/keyboard.c
55143+++ b/drivers/tty/vt/keyboard.c
55144@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
55145 kbd->kbdmode == VC_OFF) &&
55146 value != KVAL(K_SAK))
55147 return; /* SAK is allowed even in raw mode */
55148+
55149+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
55150+ {
55151+ void *func = fn_handler[value];
55152+ if (func == fn_show_state || func == fn_show_ptregs ||
55153+ func == fn_show_mem)
55154+ return;
55155+ }
55156+#endif
55157+
55158 fn_handler[value](vc);
55159 }
55160
55161@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55162 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
55163 return -EFAULT;
55164
55165- if (!capable(CAP_SYS_TTY_CONFIG))
55166- perm = 0;
55167-
55168 switch (cmd) {
55169 case KDGKBENT:
55170 /* Ensure another thread doesn't free it under us */
55171@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55172 spin_unlock_irqrestore(&kbd_event_lock, flags);
55173 return put_user(val, &user_kbe->kb_value);
55174 case KDSKBENT:
55175+ if (!capable(CAP_SYS_TTY_CONFIG))
55176+ perm = 0;
55177+
55178 if (!perm)
55179 return -EPERM;
55180 if (!i && v == K_NOSUCHMAP) {
55181@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55182 int i, j, k;
55183 int ret;
55184
55185- if (!capable(CAP_SYS_TTY_CONFIG))
55186- perm = 0;
55187-
55188 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
55189 if (!kbs) {
55190 ret = -ENOMEM;
55191@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55192 kfree(kbs);
55193 return ((p && *p) ? -EOVERFLOW : 0);
55194 case KDSKBSENT:
55195+ if (!capable(CAP_SYS_TTY_CONFIG))
55196+ perm = 0;
55197+
55198 if (!perm) {
55199 ret = -EPERM;
55200 goto reterr;
55201diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
55202index 6276f13..84f2449 100644
55203--- a/drivers/uio/uio.c
55204+++ b/drivers/uio/uio.c
55205@@ -25,6 +25,7 @@
55206 #include <linux/kobject.h>
55207 #include <linux/cdev.h>
55208 #include <linux/uio_driver.h>
55209+#include <asm/local.h>
55210
55211 #define UIO_MAX_DEVICES (1U << MINORBITS)
55212
55213@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
55214 struct device_attribute *attr, char *buf)
55215 {
55216 struct uio_device *idev = dev_get_drvdata(dev);
55217- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
55218+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
55219 }
55220 static DEVICE_ATTR_RO(event);
55221
55222@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
55223 {
55224 struct uio_device *idev = info->uio_dev;
55225
55226- atomic_inc(&idev->event);
55227+ atomic_inc_unchecked(&idev->event);
55228 wake_up_interruptible(&idev->wait);
55229 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
55230 }
55231@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
55232 }
55233
55234 listener->dev = idev;
55235- listener->event_count = atomic_read(&idev->event);
55236+ listener->event_count = atomic_read_unchecked(&idev->event);
55237 filep->private_data = listener;
55238
55239 if (idev->info->open) {
55240@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
55241 return -EIO;
55242
55243 poll_wait(filep, &idev->wait, wait);
55244- if (listener->event_count != atomic_read(&idev->event))
55245+ if (listener->event_count != atomic_read_unchecked(&idev->event))
55246 return POLLIN | POLLRDNORM;
55247 return 0;
55248 }
55249@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
55250 do {
55251 set_current_state(TASK_INTERRUPTIBLE);
55252
55253- event_count = atomic_read(&idev->event);
55254+ event_count = atomic_read_unchecked(&idev->event);
55255 if (event_count != listener->event_count) {
55256 if (copy_to_user(buf, &event_count, count))
55257 retval = -EFAULT;
55258@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
55259 static int uio_find_mem_index(struct vm_area_struct *vma)
55260 {
55261 struct uio_device *idev = vma->vm_private_data;
55262+ unsigned long size;
55263
55264 if (vma->vm_pgoff < MAX_UIO_MAPS) {
55265- if (idev->info->mem[vma->vm_pgoff].size == 0)
55266+ size = idev->info->mem[vma->vm_pgoff].size;
55267+ if (size == 0)
55268+ return -1;
55269+ if (vma->vm_end - vma->vm_start > size)
55270 return -1;
55271 return (int)vma->vm_pgoff;
55272 }
55273@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
55274 idev->owner = owner;
55275 idev->info = info;
55276 init_waitqueue_head(&idev->wait);
55277- atomic_set(&idev->event, 0);
55278+ atomic_set_unchecked(&idev->event, 0);
55279
55280 ret = uio_get_minor(idev);
55281 if (ret)
55282diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
55283index 813d4d3..a71934f 100644
55284--- a/drivers/usb/atm/cxacru.c
55285+++ b/drivers/usb/atm/cxacru.c
55286@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
55287 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
55288 if (ret < 2)
55289 return -EINVAL;
55290- if (index < 0 || index > 0x7f)
55291+ if (index > 0x7f)
55292 return -EINVAL;
55293 pos += tmp;
55294
55295diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
55296index dada014..1d0d517 100644
55297--- a/drivers/usb/atm/usbatm.c
55298+++ b/drivers/usb/atm/usbatm.c
55299@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55300 if (printk_ratelimit())
55301 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
55302 __func__, vpi, vci);
55303- atomic_inc(&vcc->stats->rx_err);
55304+ atomic_inc_unchecked(&vcc->stats->rx_err);
55305 return;
55306 }
55307
55308@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55309 if (length > ATM_MAX_AAL5_PDU) {
55310 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
55311 __func__, length, vcc);
55312- atomic_inc(&vcc->stats->rx_err);
55313+ atomic_inc_unchecked(&vcc->stats->rx_err);
55314 goto out;
55315 }
55316
55317@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55318 if (sarb->len < pdu_length) {
55319 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
55320 __func__, pdu_length, sarb->len, vcc);
55321- atomic_inc(&vcc->stats->rx_err);
55322+ atomic_inc_unchecked(&vcc->stats->rx_err);
55323 goto out;
55324 }
55325
55326 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
55327 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
55328 __func__, vcc);
55329- atomic_inc(&vcc->stats->rx_err);
55330+ atomic_inc_unchecked(&vcc->stats->rx_err);
55331 goto out;
55332 }
55333
55334@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55335 if (printk_ratelimit())
55336 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
55337 __func__, length);
55338- atomic_inc(&vcc->stats->rx_drop);
55339+ atomic_inc_unchecked(&vcc->stats->rx_drop);
55340 goto out;
55341 }
55342
55343@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55344
55345 vcc->push(vcc, skb);
55346
55347- atomic_inc(&vcc->stats->rx);
55348+ atomic_inc_unchecked(&vcc->stats->rx);
55349 out:
55350 skb_trim(sarb, 0);
55351 }
55352@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
55353 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
55354
55355 usbatm_pop(vcc, skb);
55356- atomic_inc(&vcc->stats->tx);
55357+ atomic_inc_unchecked(&vcc->stats->tx);
55358
55359 skb = skb_dequeue(&instance->sndqueue);
55360 }
55361@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
55362 if (!left--)
55363 return sprintf(page,
55364 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
55365- atomic_read(&atm_dev->stats.aal5.tx),
55366- atomic_read(&atm_dev->stats.aal5.tx_err),
55367- atomic_read(&atm_dev->stats.aal5.rx),
55368- atomic_read(&atm_dev->stats.aal5.rx_err),
55369- atomic_read(&atm_dev->stats.aal5.rx_drop));
55370+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
55371+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
55372+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
55373+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
55374+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
55375
55376 if (!left--) {
55377 if (instance->disconnected)
55378diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
55379index 2a3bbdf..91d72cf 100644
55380--- a/drivers/usb/core/devices.c
55381+++ b/drivers/usb/core/devices.c
55382@@ -126,7 +126,7 @@ static const char format_endpt[] =
55383 * time it gets called.
55384 */
55385 static struct device_connect_event {
55386- atomic_t count;
55387+ atomic_unchecked_t count;
55388 wait_queue_head_t wait;
55389 } device_event = {
55390 .count = ATOMIC_INIT(1),
55391@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
55392
55393 void usbfs_conn_disc_event(void)
55394 {
55395- atomic_add(2, &device_event.count);
55396+ atomic_add_unchecked(2, &device_event.count);
55397 wake_up(&device_event.wait);
55398 }
55399
55400@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
55401
55402 poll_wait(file, &device_event.wait, wait);
55403
55404- event_count = atomic_read(&device_event.count);
55405+ event_count = atomic_read_unchecked(&device_event.count);
55406 if (file->f_version != event_count) {
55407 file->f_version = event_count;
55408 return POLLIN | POLLRDNORM;
55409diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
55410index 1163553..f292679 100644
55411--- a/drivers/usb/core/devio.c
55412+++ b/drivers/usb/core/devio.c
55413@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55414 struct usb_dev_state *ps = file->private_data;
55415 struct usb_device *dev = ps->dev;
55416 ssize_t ret = 0;
55417- unsigned len;
55418+ size_t len;
55419 loff_t pos;
55420 int i;
55421
55422@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55423 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
55424 struct usb_config_descriptor *config =
55425 (struct usb_config_descriptor *)dev->rawdescriptors[i];
55426- unsigned int length = le16_to_cpu(config->wTotalLength);
55427+ size_t length = le16_to_cpu(config->wTotalLength);
55428
55429 if (*ppos < pos + length) {
55430
55431 /* The descriptor may claim to be longer than it
55432 * really is. Here is the actual allocated length. */
55433- unsigned alloclen =
55434+ size_t alloclen =
55435 le16_to_cpu(dev->config[i].desc.wTotalLength);
55436
55437- len = length - (*ppos - pos);
55438+ len = length + pos - *ppos;
55439 if (len > nbytes)
55440 len = nbytes;
55441
55442 /* Simply don't write (skip over) unallocated parts */
55443 if (alloclen > (*ppos - pos)) {
55444- alloclen -= (*ppos - pos);
55445+ alloclen = alloclen + pos - *ppos;
55446 if (copy_to_user(buf,
55447 dev->rawdescriptors[i] + (*ppos - pos),
55448 min(len, alloclen))) {
55449diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
55450index 45a915c..09f9735 100644
55451--- a/drivers/usb/core/hcd.c
55452+++ b/drivers/usb/core/hcd.c
55453@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55454 */
55455 usb_get_urb(urb);
55456 atomic_inc(&urb->use_count);
55457- atomic_inc(&urb->dev->urbnum);
55458+ atomic_inc_unchecked(&urb->dev->urbnum);
55459 usbmon_urb_submit(&hcd->self, urb);
55460
55461 /* NOTE requirements on root-hub callers (usbfs and the hub
55462@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55463 urb->hcpriv = NULL;
55464 INIT_LIST_HEAD(&urb->urb_list);
55465 atomic_dec(&urb->use_count);
55466- atomic_dec(&urb->dev->urbnum);
55467+ atomic_dec_unchecked(&urb->dev->urbnum);
55468 if (atomic_read(&urb->reject))
55469 wake_up(&usb_kill_urb_queue);
55470 usb_put_urb(urb);
55471diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
55472index 3b71516..1f26579 100644
55473--- a/drivers/usb/core/hub.c
55474+++ b/drivers/usb/core/hub.c
55475@@ -26,6 +26,7 @@
55476 #include <linux/mutex.h>
55477 #include <linux/random.h>
55478 #include <linux/pm_qos.h>
55479+#include <linux/grsecurity.h>
55480
55481 #include <asm/uaccess.h>
55482 #include <asm/byteorder.h>
55483@@ -4665,6 +4666,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
55484 goto done;
55485 return;
55486 }
55487+
55488+ if (gr_handle_new_usb())
55489+ goto done;
55490+
55491 if (hub_is_superspeed(hub->hdev))
55492 unit_load = 150;
55493 else
55494diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
55495index f368d20..0c30ac5 100644
55496--- a/drivers/usb/core/message.c
55497+++ b/drivers/usb/core/message.c
55498@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
55499 * Return: If successful, the number of bytes transferred. Otherwise, a negative
55500 * error number.
55501 */
55502-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55503+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55504 __u8 requesttype, __u16 value, __u16 index, void *data,
55505 __u16 size, int timeout)
55506 {
55507@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
55508 * If successful, 0. Otherwise a negative error number. The number of actual
55509 * bytes transferred will be stored in the @actual_length parameter.
55510 */
55511-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55512+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55513 void *data, int len, int *actual_length, int timeout)
55514 {
55515 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
55516@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
55517 * bytes transferred will be stored in the @actual_length parameter.
55518 *
55519 */
55520-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55521+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55522 void *data, int len, int *actual_length, int timeout)
55523 {
55524 struct urb *urb;
55525diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
55526index d269738..7340cd7 100644
55527--- a/drivers/usb/core/sysfs.c
55528+++ b/drivers/usb/core/sysfs.c
55529@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
55530 struct usb_device *udev;
55531
55532 udev = to_usb_device(dev);
55533- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
55534+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
55535 }
55536 static DEVICE_ATTR_RO(urbnum);
55537
55538diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
55539index b1fb9ae..4224885 100644
55540--- a/drivers/usb/core/usb.c
55541+++ b/drivers/usb/core/usb.c
55542@@ -431,7 +431,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
55543 set_dev_node(&dev->dev, dev_to_node(bus->controller));
55544 dev->state = USB_STATE_ATTACHED;
55545 dev->lpm_disable_count = 1;
55546- atomic_set(&dev->urbnum, 0);
55547+ atomic_set_unchecked(&dev->urbnum, 0);
55548
55549 INIT_LIST_HEAD(&dev->ep0.urb_list);
55550 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
55551diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
55552index 8cfc319..4868255 100644
55553--- a/drivers/usb/early/ehci-dbgp.c
55554+++ b/drivers/usb/early/ehci-dbgp.c
55555@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
55556
55557 #ifdef CONFIG_KGDB
55558 static struct kgdb_io kgdbdbgp_io_ops;
55559-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
55560+static struct kgdb_io kgdbdbgp_io_ops_console;
55561+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
55562 #else
55563 #define dbgp_kgdb_mode (0)
55564 #endif
55565@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
55566 .write_char = kgdbdbgp_write_char,
55567 };
55568
55569+static struct kgdb_io kgdbdbgp_io_ops_console = {
55570+ .name = "kgdbdbgp",
55571+ .read_char = kgdbdbgp_read_char,
55572+ .write_char = kgdbdbgp_write_char,
55573+ .is_console = 1
55574+};
55575+
55576 static int kgdbdbgp_wait_time;
55577
55578 static int __init kgdbdbgp_parse_config(char *str)
55579@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
55580 ptr++;
55581 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
55582 }
55583- kgdb_register_io_module(&kgdbdbgp_io_ops);
55584- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
55585+ if (early_dbgp_console.index != -1)
55586+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
55587+ else
55588+ kgdb_register_io_module(&kgdbdbgp_io_ops);
55589
55590 return 0;
55591 }
55592diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
55593index 9719abf..789d5d9 100644
55594--- a/drivers/usb/gadget/function/f_uac1.c
55595+++ b/drivers/usb/gadget/function/f_uac1.c
55596@@ -14,6 +14,7 @@
55597 #include <linux/module.h>
55598 #include <linux/device.h>
55599 #include <linux/atomic.h>
55600+#include <linux/module.h>
55601
55602 #include "u_uac1.h"
55603
55604diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
55605index 491082a..dfd7d17 100644
55606--- a/drivers/usb/gadget/function/u_serial.c
55607+++ b/drivers/usb/gadget/function/u_serial.c
55608@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55609 spin_lock_irq(&port->port_lock);
55610
55611 /* already open? Great. */
55612- if (port->port.count) {
55613+ if (atomic_read(&port->port.count)) {
55614 status = 0;
55615- port->port.count++;
55616+ atomic_inc(&port->port.count);
55617
55618 /* currently opening/closing? wait ... */
55619 } else if (port->openclose) {
55620@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55621 tty->driver_data = port;
55622 port->port.tty = tty;
55623
55624- port->port.count = 1;
55625+ atomic_set(&port->port.count, 1);
55626 port->openclose = false;
55627
55628 /* if connected, start the I/O stream */
55629@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55630
55631 spin_lock_irq(&port->port_lock);
55632
55633- if (port->port.count != 1) {
55634- if (port->port.count == 0)
55635+ if (atomic_read(&port->port.count) != 1) {
55636+ if (atomic_read(&port->port.count) == 0)
55637 WARN_ON(1);
55638 else
55639- --port->port.count;
55640+ atomic_dec(&port->port.count);
55641 goto exit;
55642 }
55643
55644@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55645 * and sleep if necessary
55646 */
55647 port->openclose = true;
55648- port->port.count = 0;
55649+ atomic_set(&port->port.count, 0);
55650
55651 gser = port->port_usb;
55652 if (gser && gser->disconnect)
55653@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
55654 int cond;
55655
55656 spin_lock_irq(&port->port_lock);
55657- cond = (port->port.count == 0) && !port->openclose;
55658+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
55659 spin_unlock_irq(&port->port_lock);
55660 return cond;
55661 }
55662@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
55663 /* if it's already open, start I/O ... and notify the serial
55664 * protocol about open/close status (connect/disconnect).
55665 */
55666- if (port->port.count) {
55667+ if (atomic_read(&port->port.count)) {
55668 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
55669 gs_start_io(port);
55670 if (gser->connect)
55671@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
55672
55673 port->port_usb = NULL;
55674 gser->ioport = NULL;
55675- if (port->port.count > 0 || port->openclose) {
55676+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
55677 wake_up_interruptible(&port->drain_wait);
55678 if (port->port.tty)
55679 tty_hangup(port->port.tty);
55680@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
55681
55682 /* finally, free any unused/unusable I/O buffers */
55683 spin_lock_irqsave(&port->port_lock, flags);
55684- if (port->port.count == 0 && !port->openclose)
55685+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
55686 gs_buf_free(&port->port_write_buf);
55687 gs_free_requests(gser->out, &port->read_pool, NULL);
55688 gs_free_requests(gser->out, &port->read_queue, NULL);
55689diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
55690index c78c841..48fd281 100644
55691--- a/drivers/usb/gadget/function/u_uac1.c
55692+++ b/drivers/usb/gadget/function/u_uac1.c
55693@@ -17,6 +17,7 @@
55694 #include <linux/ctype.h>
55695 #include <linux/random.h>
55696 #include <linux/syscalls.h>
55697+#include <linux/module.h>
55698
55699 #include "u_uac1.h"
55700
55701diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
55702index 7354d01..299478e 100644
55703--- a/drivers/usb/host/ehci-hub.c
55704+++ b/drivers/usb/host/ehci-hub.c
55705@@ -772,7 +772,7 @@ static struct urb *request_single_step_set_feature_urb(
55706 urb->transfer_flags = URB_DIR_IN;
55707 usb_get_urb(urb);
55708 atomic_inc(&urb->use_count);
55709- atomic_inc(&urb->dev->urbnum);
55710+ atomic_inc_unchecked(&urb->dev->urbnum);
55711 urb->setup_dma = dma_map_single(
55712 hcd->self.controller,
55713 urb->setup_packet,
55714@@ -839,7 +839,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
55715 urb->status = -EINPROGRESS;
55716 usb_get_urb(urb);
55717 atomic_inc(&urb->use_count);
55718- atomic_inc(&urb->dev->urbnum);
55719+ atomic_inc_unchecked(&urb->dev->urbnum);
55720 retval = submit_single_step_set_feature(hcd, urb, 0);
55721 if (!retval && !wait_for_completion_timeout(&done,
55722 msecs_to_jiffies(2000))) {
55723diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
55724index 1db0626..4948782 100644
55725--- a/drivers/usb/host/hwa-hc.c
55726+++ b/drivers/usb/host/hwa-hc.c
55727@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55728 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
55729 struct wahc *wa = &hwahc->wa;
55730 struct device *dev = &wa->usb_iface->dev;
55731- u8 mas_le[UWB_NUM_MAS/8];
55732+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
55733+
55734+ if (mas_le == NULL)
55735+ return -ENOMEM;
55736
55737 /* Set the stream index */
55738 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
55739@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55740 WUSB_REQ_SET_WUSB_MAS,
55741 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
55742 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
55743- mas_le, 32, USB_CTRL_SET_TIMEOUT);
55744+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
55745 if (result < 0)
55746 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
55747 out:
55748+ kfree(mas_le);
55749+
55750 return result;
55751 }
55752
55753diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
55754index b3d245e..99549ed 100644
55755--- a/drivers/usb/misc/appledisplay.c
55756+++ b/drivers/usb/misc/appledisplay.c
55757@@ -84,7 +84,7 @@ struct appledisplay {
55758 struct mutex sysfslock; /* concurrent read and write */
55759 };
55760
55761-static atomic_t count_displays = ATOMIC_INIT(0);
55762+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
55763 static struct workqueue_struct *wq;
55764
55765 static void appledisplay_complete(struct urb *urb)
55766@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
55767
55768 /* Register backlight device */
55769 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
55770- atomic_inc_return(&count_displays) - 1);
55771+ atomic_inc_return_unchecked(&count_displays) - 1);
55772 memset(&props, 0, sizeof(struct backlight_properties));
55773 props.type = BACKLIGHT_RAW;
55774 props.max_brightness = 0xff;
55775diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
55776index 3806e70..55c508b 100644
55777--- a/drivers/usb/serial/console.c
55778+++ b/drivers/usb/serial/console.c
55779@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
55780
55781 info->port = port;
55782
55783- ++port->port.count;
55784+ atomic_inc(&port->port.count);
55785 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
55786 if (serial->type->set_termios) {
55787 /*
55788@@ -175,7 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
55789 }
55790 /* Now that any required fake tty operations are completed restore
55791 * the tty port count */
55792- --port->port.count;
55793+ atomic_dec(&port->port.count);
55794 /* The console is special in terms of closing the device so
55795 * indicate this port is now acting as a system console. */
55796 port->port.console = 1;
55797@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
55798 put_tty:
55799 tty_kref_put(tty);
55800 reset_open_count:
55801- port->port.count = 0;
55802+ atomic_set(&port->port.count, 0);
55803 usb_autopm_put_interface(serial->interface);
55804 error_get_interface:
55805 usb_serial_put(serial);
55806@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
55807 static void usb_console_write(struct console *co,
55808 const char *buf, unsigned count)
55809 {
55810- static struct usbcons_info *info = &usbcons_info;
55811+ struct usbcons_info *info = &usbcons_info;
55812 struct usb_serial_port *port = info->port;
55813 struct usb_serial *serial;
55814 int retval = -ENODEV;
55815diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
55816index 307e339..6aa97cb 100644
55817--- a/drivers/usb/storage/usb.h
55818+++ b/drivers/usb/storage/usb.h
55819@@ -63,7 +63,7 @@ struct us_unusual_dev {
55820 __u8 useProtocol;
55821 __u8 useTransport;
55822 int (*initFunction)(struct us_data *);
55823-};
55824+} __do_const;
55825
55826
55827 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
55828diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
55829index a863a98..d272795 100644
55830--- a/drivers/usb/usbip/vhci.h
55831+++ b/drivers/usb/usbip/vhci.h
55832@@ -83,7 +83,7 @@ struct vhci_hcd {
55833 unsigned resuming:1;
55834 unsigned long re_timeout;
55835
55836- atomic_t seqnum;
55837+ atomic_unchecked_t seqnum;
55838
55839 /*
55840 * NOTE:
55841diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
55842index 11f6f61..1087910 100644
55843--- a/drivers/usb/usbip/vhci_hcd.c
55844+++ b/drivers/usb/usbip/vhci_hcd.c
55845@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
55846
55847 spin_lock(&vdev->priv_lock);
55848
55849- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
55850+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55851 if (priv->seqnum == 0xffff)
55852 dev_info(&urb->dev->dev, "seqnum max\n");
55853
55854@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
55855 return -ENOMEM;
55856 }
55857
55858- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
55859+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55860 if (unlink->seqnum == 0xffff)
55861 pr_info("seqnum max\n");
55862
55863@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
55864 vdev->rhport = rhport;
55865 }
55866
55867- atomic_set(&vhci->seqnum, 0);
55868+ atomic_set_unchecked(&vhci->seqnum, 0);
55869 spin_lock_init(&vhci->lock);
55870
55871 hcd->power_budget = 0; /* no limit */
55872diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
55873index 00e4a54..d676f85 100644
55874--- a/drivers/usb/usbip/vhci_rx.c
55875+++ b/drivers/usb/usbip/vhci_rx.c
55876@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
55877 if (!urb) {
55878 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
55879 pr_info("max seqnum %d\n",
55880- atomic_read(&the_controller->seqnum));
55881+ atomic_read_unchecked(&the_controller->seqnum));
55882 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
55883 return;
55884 }
55885diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
55886index edc7267..9f65ce2 100644
55887--- a/drivers/usb/wusbcore/wa-hc.h
55888+++ b/drivers/usb/wusbcore/wa-hc.h
55889@@ -240,7 +240,7 @@ struct wahc {
55890 spinlock_t xfer_list_lock;
55891 struct work_struct xfer_enqueue_work;
55892 struct work_struct xfer_error_work;
55893- atomic_t xfer_id_count;
55894+ atomic_unchecked_t xfer_id_count;
55895
55896 kernel_ulong_t quirks;
55897 };
55898@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
55899 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
55900 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
55901 wa->dto_in_use = 0;
55902- atomic_set(&wa->xfer_id_count, 1);
55903+ atomic_set_unchecked(&wa->xfer_id_count, 1);
55904 /* init the buf in URBs */
55905 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
55906 usb_init_urb(&(wa->buf_in_urbs[index]));
55907diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
55908index 69af4fd..da390d7 100644
55909--- a/drivers/usb/wusbcore/wa-xfer.c
55910+++ b/drivers/usb/wusbcore/wa-xfer.c
55911@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
55912 */
55913 static void wa_xfer_id_init(struct wa_xfer *xfer)
55914 {
55915- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
55916+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
55917 }
55918
55919 /* Return the xfer's ID. */
55920diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
55921index 837d177..170724af 100644
55922--- a/drivers/vfio/vfio.c
55923+++ b/drivers/vfio/vfio.c
55924@@ -518,7 +518,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
55925 return 0;
55926
55927 /* TODO Prevent device auto probing */
55928- WARN("Device %s added to live group %d!\n", dev_name(dev),
55929+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
55930 iommu_group_id(group->iommu_group));
55931
55932 return 0;
55933diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
55934index 3bb02c6..a01ff38 100644
55935--- a/drivers/vhost/vringh.c
55936+++ b/drivers/vhost/vringh.c
55937@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
55938 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
55939 {
55940 __virtio16 v = 0;
55941- int rc = get_user(v, (__force __virtio16 __user *)p);
55942+ int rc = get_user(v, (__force_user __virtio16 *)p);
55943 *val = vringh16_to_cpu(vrh, v);
55944 return rc;
55945 }
55946@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
55947 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
55948 {
55949 __virtio16 v = cpu_to_vringh16(vrh, val);
55950- return put_user(v, (__force __virtio16 __user *)p);
55951+ return put_user(v, (__force_user __virtio16 *)p);
55952 }
55953
55954 static inline int copydesc_user(void *dst, const void *src, size_t len)
55955 {
55956- return copy_from_user(dst, (__force void __user *)src, len) ?
55957+ return copy_from_user(dst, (void __force_user *)src, len) ?
55958 -EFAULT : 0;
55959 }
55960
55961@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
55962 const struct vring_used_elem *src,
55963 unsigned int num)
55964 {
55965- return copy_to_user((__force void __user *)dst, src,
55966+ return copy_to_user((void __force_user *)dst, src,
55967 sizeof(*dst) * num) ? -EFAULT : 0;
55968 }
55969
55970 static inline int xfer_from_user(void *src, void *dst, size_t len)
55971 {
55972- return copy_from_user(dst, (__force void __user *)src, len) ?
55973+ return copy_from_user(dst, (void __force_user *)src, len) ?
55974 -EFAULT : 0;
55975 }
55976
55977 static inline int xfer_to_user(void *dst, void *src, size_t len)
55978 {
55979- return copy_to_user((__force void __user *)dst, src, len) ?
55980+ return copy_to_user((void __force_user *)dst, src, len) ?
55981 -EFAULT : 0;
55982 }
55983
55984@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
55985 vrh->last_used_idx = 0;
55986 vrh->vring.num = num;
55987 /* vring expects kernel addresses, but only used via accessors. */
55988- vrh->vring.desc = (__force struct vring_desc *)desc;
55989- vrh->vring.avail = (__force struct vring_avail *)avail;
55990- vrh->vring.used = (__force struct vring_used *)used;
55991+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
55992+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
55993+ vrh->vring.used = (__force_kernel struct vring_used *)used;
55994 return 0;
55995 }
55996 EXPORT_SYMBOL(vringh_init_user);
55997@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
55998
55999 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
56000 {
56001- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
56002+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
56003 return 0;
56004 }
56005
56006diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
56007index 84a110a..96312c3 100644
56008--- a/drivers/video/backlight/kb3886_bl.c
56009+++ b/drivers/video/backlight/kb3886_bl.c
56010@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
56011 static unsigned long kb3886bl_flags;
56012 #define KB3886BL_SUSPENDED 0x01
56013
56014-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
56015+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
56016 {
56017 .ident = "Sahara Touch-iT",
56018 .matches = {
56019diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
56020index 1b0b233..6f34c2c 100644
56021--- a/drivers/video/fbdev/arcfb.c
56022+++ b/drivers/video/fbdev/arcfb.c
56023@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
56024 return -ENOSPC;
56025
56026 err = 0;
56027- if ((count + p) > fbmemlength) {
56028+ if (count > (fbmemlength - p)) {
56029 count = fbmemlength - p;
56030 err = -ENOSPC;
56031 }
56032diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
56033index aedf2fb..47c9aca 100644
56034--- a/drivers/video/fbdev/aty/aty128fb.c
56035+++ b/drivers/video/fbdev/aty/aty128fb.c
56036@@ -149,7 +149,7 @@ enum {
56037 };
56038
56039 /* Must match above enum */
56040-static char * const r128_family[] = {
56041+static const char * const r128_family[] = {
56042 "AGP",
56043 "PCI",
56044 "PRO AGP",
56045diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
56046index 8789e48..698fe4c 100644
56047--- a/drivers/video/fbdev/aty/atyfb_base.c
56048+++ b/drivers/video/fbdev/aty/atyfb_base.c
56049@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
56050 par->accel_flags = var->accel_flags; /* hack */
56051
56052 if (var->accel_flags) {
56053- info->fbops->fb_sync = atyfb_sync;
56054+ pax_open_kernel();
56055+ *(void **)&info->fbops->fb_sync = atyfb_sync;
56056+ pax_close_kernel();
56057 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56058 } else {
56059- info->fbops->fb_sync = NULL;
56060+ pax_open_kernel();
56061+ *(void **)&info->fbops->fb_sync = NULL;
56062+ pax_close_kernel();
56063 info->flags |= FBINFO_HWACCEL_DISABLED;
56064 }
56065
56066diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
56067index 2fa0317..4983f2a 100644
56068--- a/drivers/video/fbdev/aty/mach64_cursor.c
56069+++ b/drivers/video/fbdev/aty/mach64_cursor.c
56070@@ -8,6 +8,7 @@
56071 #include "../core/fb_draw.h"
56072
56073 #include <asm/io.h>
56074+#include <asm/pgtable.h>
56075
56076 #ifdef __sparc__
56077 #include <asm/fbio.h>
56078@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
56079 info->sprite.buf_align = 16; /* and 64 lines tall. */
56080 info->sprite.flags = FB_PIXMAP_IO;
56081
56082- info->fbops->fb_cursor = atyfb_cursor;
56083+ pax_open_kernel();
56084+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
56085+ pax_close_kernel();
56086
56087 return 0;
56088 }
56089diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
56090index d6cab1f..112f680 100644
56091--- a/drivers/video/fbdev/core/fb_defio.c
56092+++ b/drivers/video/fbdev/core/fb_defio.c
56093@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
56094
56095 BUG_ON(!fbdefio);
56096 mutex_init(&fbdefio->lock);
56097- info->fbops->fb_mmap = fb_deferred_io_mmap;
56098+ pax_open_kernel();
56099+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
56100+ pax_close_kernel();
56101 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
56102 INIT_LIST_HEAD(&fbdefio->pagelist);
56103 if (fbdefio->delay == 0) /* set a default of 1 s */
56104@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
56105 page->mapping = NULL;
56106 }
56107
56108- info->fbops->fb_mmap = NULL;
56109+ *(void **)&info->fbops->fb_mmap = NULL;
56110 mutex_destroy(&fbdefio->lock);
56111 }
56112 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
56113diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
56114index 0705d88..d9429bf 100644
56115--- a/drivers/video/fbdev/core/fbmem.c
56116+++ b/drivers/video/fbdev/core/fbmem.c
56117@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
56118 __u32 data;
56119 int err;
56120
56121- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
56122+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
56123
56124 data = (__u32) (unsigned long) fix->smem_start;
56125 err |= put_user(data, &fix32->smem_start);
56126diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
56127index 4254336..282567e 100644
56128--- a/drivers/video/fbdev/hyperv_fb.c
56129+++ b/drivers/video/fbdev/hyperv_fb.c
56130@@ -240,7 +240,7 @@ static uint screen_fb_size;
56131 static inline int synthvid_send(struct hv_device *hdev,
56132 struct synthvid_msg *msg)
56133 {
56134- static atomic64_t request_id = ATOMIC64_INIT(0);
56135+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
56136 int ret;
56137
56138 msg->pipe_hdr.type = PIPE_MSG_DATA;
56139@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
56140
56141 ret = vmbus_sendpacket(hdev->channel, msg,
56142 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
56143- atomic64_inc_return(&request_id),
56144+ atomic64_inc_return_unchecked(&request_id),
56145 VM_PKT_DATA_INBAND, 0);
56146
56147 if (ret)
56148diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
56149index 7672d2e..b56437f 100644
56150--- a/drivers/video/fbdev/i810/i810_accel.c
56151+++ b/drivers/video/fbdev/i810/i810_accel.c
56152@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
56153 }
56154 }
56155 printk("ringbuffer lockup!!!\n");
56156+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
56157 i810_report_error(mmio);
56158 par->dev_flags |= LOCKUP;
56159 info->pixmap.scan_align = 1;
56160diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56161index a01147f..5d896f8 100644
56162--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56163+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56164@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
56165
56166 #ifdef CONFIG_FB_MATROX_MYSTIQUE
56167 struct matrox_switch matrox_mystique = {
56168- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
56169+ .preinit = MGA1064_preinit,
56170+ .reset = MGA1064_reset,
56171+ .init = MGA1064_init,
56172+ .restore = MGA1064_restore,
56173 };
56174 EXPORT_SYMBOL(matrox_mystique);
56175 #endif
56176
56177 #ifdef CONFIG_FB_MATROX_G
56178 struct matrox_switch matrox_G100 = {
56179- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
56180+ .preinit = MGAG100_preinit,
56181+ .reset = MGAG100_reset,
56182+ .init = MGAG100_init,
56183+ .restore = MGAG100_restore,
56184 };
56185 EXPORT_SYMBOL(matrox_G100);
56186 #endif
56187diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56188index 195ad7c..09743fc 100644
56189--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56190+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56191@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
56192 }
56193
56194 struct matrox_switch matrox_millennium = {
56195- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
56196+ .preinit = Ti3026_preinit,
56197+ .reset = Ti3026_reset,
56198+ .init = Ti3026_init,
56199+ .restore = Ti3026_restore
56200 };
56201 EXPORT_SYMBOL(matrox_millennium);
56202 #endif
56203diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56204index fe92eed..106e085 100644
56205--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56206+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56207@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
56208 struct mb862xxfb_par *par = info->par;
56209
56210 if (info->var.bits_per_pixel == 32) {
56211- info->fbops->fb_fillrect = cfb_fillrect;
56212- info->fbops->fb_copyarea = cfb_copyarea;
56213- info->fbops->fb_imageblit = cfb_imageblit;
56214+ pax_open_kernel();
56215+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56216+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56217+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56218+ pax_close_kernel();
56219 } else {
56220 outreg(disp, GC_L0EM, 3);
56221- info->fbops->fb_fillrect = mb86290fb_fillrect;
56222- info->fbops->fb_copyarea = mb86290fb_copyarea;
56223- info->fbops->fb_imageblit = mb86290fb_imageblit;
56224+ pax_open_kernel();
56225+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
56226+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
56227+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
56228+ pax_close_kernel();
56229 }
56230 outreg(draw, GDC_REG_DRAW_BASE, 0);
56231 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
56232diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
56233index def0412..fed6529 100644
56234--- a/drivers/video/fbdev/nvidia/nvidia.c
56235+++ b/drivers/video/fbdev/nvidia/nvidia.c
56236@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
56237 info->fix.line_length = (info->var.xres_virtual *
56238 info->var.bits_per_pixel) >> 3;
56239 if (info->var.accel_flags) {
56240- info->fbops->fb_imageblit = nvidiafb_imageblit;
56241- info->fbops->fb_fillrect = nvidiafb_fillrect;
56242- info->fbops->fb_copyarea = nvidiafb_copyarea;
56243- info->fbops->fb_sync = nvidiafb_sync;
56244+ pax_open_kernel();
56245+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
56246+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
56247+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
56248+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
56249+ pax_close_kernel();
56250 info->pixmap.scan_align = 4;
56251 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56252 info->flags |= FBINFO_READS_FAST;
56253 NVResetGraphics(info);
56254 } else {
56255- info->fbops->fb_imageblit = cfb_imageblit;
56256- info->fbops->fb_fillrect = cfb_fillrect;
56257- info->fbops->fb_copyarea = cfb_copyarea;
56258- info->fbops->fb_sync = NULL;
56259+ pax_open_kernel();
56260+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56261+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56262+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56263+ *(void **)&info->fbops->fb_sync = NULL;
56264+ pax_close_kernel();
56265 info->pixmap.scan_align = 1;
56266 info->flags |= FBINFO_HWACCEL_DISABLED;
56267 info->flags &= ~FBINFO_READS_FAST;
56268@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
56269 info->pixmap.size = 8 * 1024;
56270 info->pixmap.flags = FB_PIXMAP_SYSTEM;
56271
56272- if (!hwcur)
56273- info->fbops->fb_cursor = NULL;
56274+ if (!hwcur) {
56275+ pax_open_kernel();
56276+ *(void **)&info->fbops->fb_cursor = NULL;
56277+ pax_close_kernel();
56278+ }
56279
56280 info->var.accel_flags = (!noaccel);
56281
56282diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
56283index 2412a0d..294215b 100644
56284--- a/drivers/video/fbdev/omap2/dss/display.c
56285+++ b/drivers/video/fbdev/omap2/dss/display.c
56286@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
56287 if (dssdev->name == NULL)
56288 dssdev->name = dssdev->alias;
56289
56290+ pax_open_kernel();
56291 if (drv && drv->get_resolution == NULL)
56292- drv->get_resolution = omapdss_default_get_resolution;
56293+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
56294 if (drv && drv->get_recommended_bpp == NULL)
56295- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56296+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56297 if (drv && drv->get_timings == NULL)
56298- drv->get_timings = omapdss_default_get_timings;
56299+ *(void **)&drv->get_timings = omapdss_default_get_timings;
56300+ pax_close_kernel();
56301
56302 mutex_lock(&panel_list_mutex);
56303 list_add_tail(&dssdev->panel_list, &panel_list);
56304diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
56305index 83433cb..71e9b98 100644
56306--- a/drivers/video/fbdev/s1d13xxxfb.c
56307+++ b/drivers/video/fbdev/s1d13xxxfb.c
56308@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
56309
56310 switch(prod_id) {
56311 case S1D13506_PROD_ID: /* activate acceleration */
56312- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56313- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56314+ pax_open_kernel();
56315+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56316+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56317+ pax_close_kernel();
56318 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
56319 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
56320 break;
56321diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56322index d3013cd..95b8285 100644
56323--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
56324+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56325@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
56326 }
56327
56328 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
56329- lcdc_sys_write_index,
56330- lcdc_sys_write_data,
56331- lcdc_sys_read_data,
56332+ .write_index = lcdc_sys_write_index,
56333+ .write_data = lcdc_sys_write_data,
56334+ .read_data = lcdc_sys_read_data,
56335 };
56336
56337 static int sh_mobile_lcdc_sginit(struct fb_info *info,
56338diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
56339index 9279e5f..d5f5276 100644
56340--- a/drivers/video/fbdev/smscufx.c
56341+++ b/drivers/video/fbdev/smscufx.c
56342@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
56343 fb_deferred_io_cleanup(info);
56344 kfree(info->fbdefio);
56345 info->fbdefio = NULL;
56346- info->fbops->fb_mmap = ufx_ops_mmap;
56347+ pax_open_kernel();
56348+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
56349+ pax_close_kernel();
56350 }
56351
56352 pr_debug("released /dev/fb%d user=%d count=%d",
56353diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
56354index ff2b873..626a8d5 100644
56355--- a/drivers/video/fbdev/udlfb.c
56356+++ b/drivers/video/fbdev/udlfb.c
56357@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
56358 dlfb_urb_completion(urb);
56359
56360 error:
56361- atomic_add(bytes_sent, &dev->bytes_sent);
56362- atomic_add(bytes_identical, &dev->bytes_identical);
56363- atomic_add(width*height*2, &dev->bytes_rendered);
56364+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56365+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56366+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
56367 end_cycles = get_cycles();
56368- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56369+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56370 >> 10)), /* Kcycles */
56371 &dev->cpu_kcycles_used);
56372
56373@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
56374 dlfb_urb_completion(urb);
56375
56376 error:
56377- atomic_add(bytes_sent, &dev->bytes_sent);
56378- atomic_add(bytes_identical, &dev->bytes_identical);
56379- atomic_add(bytes_rendered, &dev->bytes_rendered);
56380+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56381+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56382+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
56383 end_cycles = get_cycles();
56384- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56385+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56386 >> 10)), /* Kcycles */
56387 &dev->cpu_kcycles_used);
56388 }
56389@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
56390 fb_deferred_io_cleanup(info);
56391 kfree(info->fbdefio);
56392 info->fbdefio = NULL;
56393- info->fbops->fb_mmap = dlfb_ops_mmap;
56394+ pax_open_kernel();
56395+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
56396+ pax_close_kernel();
56397 }
56398
56399 pr_warn("released /dev/fb%d user=%d count=%d\n",
56400@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
56401 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56402 struct dlfb_data *dev = fb_info->par;
56403 return snprintf(buf, PAGE_SIZE, "%u\n",
56404- atomic_read(&dev->bytes_rendered));
56405+ atomic_read_unchecked(&dev->bytes_rendered));
56406 }
56407
56408 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56409@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56410 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56411 struct dlfb_data *dev = fb_info->par;
56412 return snprintf(buf, PAGE_SIZE, "%u\n",
56413- atomic_read(&dev->bytes_identical));
56414+ atomic_read_unchecked(&dev->bytes_identical));
56415 }
56416
56417 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56418@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56419 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56420 struct dlfb_data *dev = fb_info->par;
56421 return snprintf(buf, PAGE_SIZE, "%u\n",
56422- atomic_read(&dev->bytes_sent));
56423+ atomic_read_unchecked(&dev->bytes_sent));
56424 }
56425
56426 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56427@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56428 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56429 struct dlfb_data *dev = fb_info->par;
56430 return snprintf(buf, PAGE_SIZE, "%u\n",
56431- atomic_read(&dev->cpu_kcycles_used));
56432+ atomic_read_unchecked(&dev->cpu_kcycles_used));
56433 }
56434
56435 static ssize_t edid_show(
56436@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
56437 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56438 struct dlfb_data *dev = fb_info->par;
56439
56440- atomic_set(&dev->bytes_rendered, 0);
56441- atomic_set(&dev->bytes_identical, 0);
56442- atomic_set(&dev->bytes_sent, 0);
56443- atomic_set(&dev->cpu_kcycles_used, 0);
56444+ atomic_set_unchecked(&dev->bytes_rendered, 0);
56445+ atomic_set_unchecked(&dev->bytes_identical, 0);
56446+ atomic_set_unchecked(&dev->bytes_sent, 0);
56447+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
56448
56449 return count;
56450 }
56451diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
56452index d32d1c4..46722e6 100644
56453--- a/drivers/video/fbdev/uvesafb.c
56454+++ b/drivers/video/fbdev/uvesafb.c
56455@@ -19,6 +19,7 @@
56456 #include <linux/io.h>
56457 #include <linux/mutex.h>
56458 #include <linux/slab.h>
56459+#include <linux/moduleloader.h>
56460 #include <video/edid.h>
56461 #include <video/uvesafb.h>
56462 #ifdef CONFIG_X86
56463@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
56464 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
56465 par->pmi_setpal = par->ypan = 0;
56466 } else {
56467+
56468+#ifdef CONFIG_PAX_KERNEXEC
56469+#ifdef CONFIG_MODULES
56470+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
56471+#endif
56472+ if (!par->pmi_code) {
56473+ par->pmi_setpal = par->ypan = 0;
56474+ return 0;
56475+ }
56476+#endif
56477+
56478 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
56479 + task->t.regs.edi);
56480+
56481+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56482+ pax_open_kernel();
56483+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
56484+ pax_close_kernel();
56485+
56486+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
56487+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
56488+#else
56489 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
56490 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
56491+#endif
56492+
56493 printk(KERN_INFO "uvesafb: protected mode interface info at "
56494 "%04x:%04x\n",
56495 (u16)task->t.regs.es, (u16)task->t.regs.edi);
56496@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
56497 par->ypan = ypan;
56498
56499 if (par->pmi_setpal || par->ypan) {
56500+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
56501 if (__supported_pte_mask & _PAGE_NX) {
56502 par->pmi_setpal = par->ypan = 0;
56503 printk(KERN_WARNING "uvesafb: NX protection is active, "
56504 "better not use the PMI.\n");
56505- } else {
56506+ } else
56507+#endif
56508 uvesafb_vbe_getpmi(task, par);
56509- }
56510 }
56511 #else
56512 /* The protected mode interface is not available on non-x86. */
56513@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56514 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
56515
56516 /* Disable blanking if the user requested so. */
56517- if (!blank)
56518- info->fbops->fb_blank = NULL;
56519+ if (!blank) {
56520+ pax_open_kernel();
56521+ *(void **)&info->fbops->fb_blank = NULL;
56522+ pax_close_kernel();
56523+ }
56524
56525 /*
56526 * Find out how much IO memory is required for the mode with
56527@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56528 info->flags = FBINFO_FLAG_DEFAULT |
56529 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
56530
56531- if (!par->ypan)
56532- info->fbops->fb_pan_display = NULL;
56533+ if (!par->ypan) {
56534+ pax_open_kernel();
56535+ *(void **)&info->fbops->fb_pan_display = NULL;
56536+ pax_close_kernel();
56537+ }
56538 }
56539
56540 static void uvesafb_init_mtrr(struct fb_info *info)
56541@@ -1786,6 +1816,11 @@ out_mode:
56542 out:
56543 kfree(par->vbe_modes);
56544
56545+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56546+ if (par->pmi_code)
56547+ module_memfree_exec(par->pmi_code);
56548+#endif
56549+
56550 framebuffer_release(info);
56551 return err;
56552 }
56553@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
56554 kfree(par->vbe_state_orig);
56555 kfree(par->vbe_state_saved);
56556
56557+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56558+ if (par->pmi_code)
56559+ module_memfree_exec(par->pmi_code);
56560+#endif
56561+
56562 framebuffer_release(info);
56563 }
56564 return 0;
56565diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
56566index d79a0ac..2d0c3d4 100644
56567--- a/drivers/video/fbdev/vesafb.c
56568+++ b/drivers/video/fbdev/vesafb.c
56569@@ -9,6 +9,7 @@
56570 */
56571
56572 #include <linux/module.h>
56573+#include <linux/moduleloader.h>
56574 #include <linux/kernel.h>
56575 #include <linux/errno.h>
56576 #include <linux/string.h>
56577@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
56578 static int vram_total; /* Set total amount of memory */
56579 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
56580 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56581-static void (*pmi_start)(void) __read_mostly;
56582-static void (*pmi_pal) (void) __read_mostly;
56583+static void (*pmi_start)(void) __read_only;
56584+static void (*pmi_pal) (void) __read_only;
56585 static int depth __read_mostly;
56586 static int vga_compat __read_mostly;
56587 /* --------------------------------------------------------------------- */
56588@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
56589 unsigned int size_remap;
56590 unsigned int size_total;
56591 char *option = NULL;
56592+ void *pmi_code = NULL;
56593
56594 /* ignore error return of fb_get_options */
56595 fb_get_options("vesafb", &option);
56596@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
56597 size_remap = size_total;
56598 vesafb_fix.smem_len = size_remap;
56599
56600-#ifndef __i386__
56601- screen_info.vesapm_seg = 0;
56602-#endif
56603-
56604 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
56605 printk(KERN_WARNING
56606 "vesafb: cannot reserve video memory at 0x%lx\n",
56607@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
56608 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
56609 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
56610
56611+#ifdef __i386__
56612+
56613+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56614+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
56615+ if (!pmi_code)
56616+#elif !defined(CONFIG_PAX_KERNEXEC)
56617+ if (0)
56618+#endif
56619+
56620+#endif
56621+ screen_info.vesapm_seg = 0;
56622+
56623 if (screen_info.vesapm_seg) {
56624- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
56625- screen_info.vesapm_seg,screen_info.vesapm_off);
56626+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
56627+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
56628 }
56629
56630 if (screen_info.vesapm_seg < 0xc000)
56631@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
56632
56633 if (ypan || pmi_setpal) {
56634 unsigned short *pmi_base;
56635+
56636 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
56637- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
56638- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
56639+
56640+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56641+ pax_open_kernel();
56642+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
56643+#else
56644+ pmi_code = pmi_base;
56645+#endif
56646+
56647+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
56648+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
56649+
56650+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56651+ pmi_start = ktva_ktla(pmi_start);
56652+ pmi_pal = ktva_ktla(pmi_pal);
56653+ pax_close_kernel();
56654+#endif
56655+
56656 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
56657 if (pmi_base[3]) {
56658 printk(KERN_INFO "vesafb: pmi: ports = ");
56659@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
56660 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
56661 (ypan ? FBINFO_HWACCEL_YPAN : 0);
56662
56663- if (!ypan)
56664- info->fbops->fb_pan_display = NULL;
56665+ if (!ypan) {
56666+ pax_open_kernel();
56667+ *(void **)&info->fbops->fb_pan_display = NULL;
56668+ pax_close_kernel();
56669+ }
56670
56671 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
56672 err = -ENOMEM;
56673@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
56674 fb_info(info, "%s frame buffer device\n", info->fix.id);
56675 return 0;
56676 err:
56677+
56678+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56679+ module_memfree_exec(pmi_code);
56680+#endif
56681+
56682 if (info->screen_base)
56683 iounmap(info->screen_base);
56684 framebuffer_release(info);
56685diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
56686index 88714ae..16c2e11 100644
56687--- a/drivers/video/fbdev/via/via_clock.h
56688+++ b/drivers/video/fbdev/via/via_clock.h
56689@@ -56,7 +56,7 @@ struct via_clock {
56690
56691 void (*set_engine_pll_state)(u8 state);
56692 void (*set_engine_pll)(struct via_pll_config config);
56693-};
56694+} __no_const;
56695
56696
56697 static inline u32 get_pll_internal_frequency(u32 ref_freq,
56698diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
56699index 3c14e43..2630570 100644
56700--- a/drivers/video/logo/logo_linux_clut224.ppm
56701+++ b/drivers/video/logo/logo_linux_clut224.ppm
56702@@ -2,1603 +2,1123 @@ P3
56703 # Standard 224-color Linux logo
56704 80 80
56705 255
56706- 0 0 0 0 0 0 0 0 0 0 0 0
56707- 0 0 0 0 0 0 0 0 0 0 0 0
56708- 0 0 0 0 0 0 0 0 0 0 0 0
56709- 0 0 0 0 0 0 0 0 0 0 0 0
56710- 0 0 0 0 0 0 0 0 0 0 0 0
56711- 0 0 0 0 0 0 0 0 0 0 0 0
56712- 0 0 0 0 0 0 0 0 0 0 0 0
56713- 0 0 0 0 0 0 0 0 0 0 0 0
56714- 0 0 0 0 0 0 0 0 0 0 0 0
56715- 6 6 6 6 6 6 10 10 10 10 10 10
56716- 10 10 10 6 6 6 6 6 6 6 6 6
56717- 0 0 0 0 0 0 0 0 0 0 0 0
56718- 0 0 0 0 0 0 0 0 0 0 0 0
56719- 0 0 0 0 0 0 0 0 0 0 0 0
56720- 0 0 0 0 0 0 0 0 0 0 0 0
56721- 0 0 0 0 0 0 0 0 0 0 0 0
56722- 0 0 0 0 0 0 0 0 0 0 0 0
56723- 0 0 0 0 0 0 0 0 0 0 0 0
56724- 0 0 0 0 0 0 0 0 0 0 0 0
56725- 0 0 0 0 0 0 0 0 0 0 0 0
56726- 0 0 0 0 0 0 0 0 0 0 0 0
56727- 0 0 0 0 0 0 0 0 0 0 0 0
56728- 0 0 0 0 0 0 0 0 0 0 0 0
56729- 0 0 0 0 0 0 0 0 0 0 0 0
56730- 0 0 0 0 0 0 0 0 0 0 0 0
56731- 0 0 0 0 0 0 0 0 0 0 0 0
56732- 0 0 0 0 0 0 0 0 0 0 0 0
56733- 0 0 0 0 0 0 0 0 0 0 0 0
56734- 0 0 0 6 6 6 10 10 10 14 14 14
56735- 22 22 22 26 26 26 30 30 30 34 34 34
56736- 30 30 30 30 30 30 26 26 26 18 18 18
56737- 14 14 14 10 10 10 6 6 6 0 0 0
56738- 0 0 0 0 0 0 0 0 0 0 0 0
56739- 0 0 0 0 0 0 0 0 0 0 0 0
56740- 0 0 0 0 0 0 0 0 0 0 0 0
56741- 0 0 0 0 0 0 0 0 0 0 0 0
56742- 0 0 0 0 0 0 0 0 0 0 0 0
56743- 0 0 0 0 0 0 0 0 0 0 0 0
56744- 0 0 0 0 0 0 0 0 0 0 0 0
56745- 0 0 0 0 0 0 0 0 0 0 0 0
56746- 0 0 0 0 0 0 0 0 0 0 0 0
56747- 0 0 0 0 0 1 0 0 1 0 0 0
56748- 0 0 0 0 0 0 0 0 0 0 0 0
56749- 0 0 0 0 0 0 0 0 0 0 0 0
56750- 0 0 0 0 0 0 0 0 0 0 0 0
56751- 0 0 0 0 0 0 0 0 0 0 0 0
56752- 0 0 0 0 0 0 0 0 0 0 0 0
56753- 0 0 0 0 0 0 0 0 0 0 0 0
56754- 6 6 6 14 14 14 26 26 26 42 42 42
56755- 54 54 54 66 66 66 78 78 78 78 78 78
56756- 78 78 78 74 74 74 66 66 66 54 54 54
56757- 42 42 42 26 26 26 18 18 18 10 10 10
56758- 6 6 6 0 0 0 0 0 0 0 0 0
56759- 0 0 0 0 0 0 0 0 0 0 0 0
56760- 0 0 0 0 0 0 0 0 0 0 0 0
56761- 0 0 0 0 0 0 0 0 0 0 0 0
56762- 0 0 0 0 0 0 0 0 0 0 0 0
56763- 0 0 0 0 0 0 0 0 0 0 0 0
56764- 0 0 0 0 0 0 0 0 0 0 0 0
56765- 0 0 0 0 0 0 0 0 0 0 0 0
56766- 0 0 0 0 0 0 0 0 0 0 0 0
56767- 0 0 1 0 0 0 0 0 0 0 0 0
56768- 0 0 0 0 0 0 0 0 0 0 0 0
56769- 0 0 0 0 0 0 0 0 0 0 0 0
56770- 0 0 0 0 0 0 0 0 0 0 0 0
56771- 0 0 0 0 0 0 0 0 0 0 0 0
56772- 0 0 0 0 0 0 0 0 0 0 0 0
56773- 0 0 0 0 0 0 0 0 0 10 10 10
56774- 22 22 22 42 42 42 66 66 66 86 86 86
56775- 66 66 66 38 38 38 38 38 38 22 22 22
56776- 26 26 26 34 34 34 54 54 54 66 66 66
56777- 86 86 86 70 70 70 46 46 46 26 26 26
56778- 14 14 14 6 6 6 0 0 0 0 0 0
56779- 0 0 0 0 0 0 0 0 0 0 0 0
56780- 0 0 0 0 0 0 0 0 0 0 0 0
56781- 0 0 0 0 0 0 0 0 0 0 0 0
56782- 0 0 0 0 0 0 0 0 0 0 0 0
56783- 0 0 0 0 0 0 0 0 0 0 0 0
56784- 0 0 0 0 0 0 0 0 0 0 0 0
56785- 0 0 0 0 0 0 0 0 0 0 0 0
56786- 0 0 0 0 0 0 0 0 0 0 0 0
56787- 0 0 1 0 0 1 0 0 1 0 0 0
56788- 0 0 0 0 0 0 0 0 0 0 0 0
56789- 0 0 0 0 0 0 0 0 0 0 0 0
56790- 0 0 0 0 0 0 0 0 0 0 0 0
56791- 0 0 0 0 0 0 0 0 0 0 0 0
56792- 0 0 0 0 0 0 0 0 0 0 0 0
56793- 0 0 0 0 0 0 10 10 10 26 26 26
56794- 50 50 50 82 82 82 58 58 58 6 6 6
56795- 2 2 6 2 2 6 2 2 6 2 2 6
56796- 2 2 6 2 2 6 2 2 6 2 2 6
56797- 6 6 6 54 54 54 86 86 86 66 66 66
56798- 38 38 38 18 18 18 6 6 6 0 0 0
56799- 0 0 0 0 0 0 0 0 0 0 0 0
56800- 0 0 0 0 0 0 0 0 0 0 0 0
56801- 0 0 0 0 0 0 0 0 0 0 0 0
56802- 0 0 0 0 0 0 0 0 0 0 0 0
56803- 0 0 0 0 0 0 0 0 0 0 0 0
56804- 0 0 0 0 0 0 0 0 0 0 0 0
56805- 0 0 0 0 0 0 0 0 0 0 0 0
56806- 0 0 0 0 0 0 0 0 0 0 0 0
56807- 0 0 0 0 0 0 0 0 0 0 0 0
56808- 0 0 0 0 0 0 0 0 0 0 0 0
56809- 0 0 0 0 0 0 0 0 0 0 0 0
56810- 0 0 0 0 0 0 0 0 0 0 0 0
56811- 0 0 0 0 0 0 0 0 0 0 0 0
56812- 0 0 0 0 0 0 0 0 0 0 0 0
56813- 0 0 0 6 6 6 22 22 22 50 50 50
56814- 78 78 78 34 34 34 2 2 6 2 2 6
56815- 2 2 6 2 2 6 2 2 6 2 2 6
56816- 2 2 6 2 2 6 2 2 6 2 2 6
56817- 2 2 6 2 2 6 6 6 6 70 70 70
56818- 78 78 78 46 46 46 22 22 22 6 6 6
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- 0 0 0 0 0 0 0 0 0 0 0 0
56825- 0 0 0 0 0 0 0 0 0 0 0 0
56826- 0 0 0 0 0 0 0 0 0 0 0 0
56827- 0 0 1 0 0 1 0 0 1 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- 6 6 6 18 18 18 42 42 42 82 82 82
56834- 26 26 26 2 2 6 2 2 6 2 2 6
56835- 2 2 6 2 2 6 2 2 6 2 2 6
56836- 2 2 6 2 2 6 2 2 6 14 14 14
56837- 46 46 46 34 34 34 6 6 6 2 2 6
56838- 42 42 42 78 78 78 42 42 42 18 18 18
56839- 6 6 6 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 0 0 0 0 0 0 0 0 0
56844- 0 0 0 0 0 0 0 0 0 0 0 0
56845- 0 0 0 0 0 0 0 0 0 0 0 0
56846- 0 0 0 0 0 0 0 0 0 0 0 0
56847- 0 0 1 0 0 0 0 0 1 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- 10 10 10 30 30 30 66 66 66 58 58 58
56854- 2 2 6 2 2 6 2 2 6 2 2 6
56855- 2 2 6 2 2 6 2 2 6 2 2 6
56856- 2 2 6 2 2 6 2 2 6 26 26 26
56857- 86 86 86 101 101 101 46 46 46 10 10 10
56858- 2 2 6 58 58 58 70 70 70 34 34 34
56859- 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
56864- 0 0 0 0 0 0 0 0 0 0 0 0
56865- 0 0 0 0 0 0 0 0 0 0 0 0
56866- 0 0 0 0 0 0 0 0 0 0 0 0
56867- 0 0 1 0 0 1 0 0 1 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- 14 14 14 42 42 42 86 86 86 10 10 10
56874- 2 2 6 2 2 6 2 2 6 2 2 6
56875- 2 2 6 2 2 6 2 2 6 2 2 6
56876- 2 2 6 2 2 6 2 2 6 30 30 30
56877- 94 94 94 94 94 94 58 58 58 26 26 26
56878- 2 2 6 6 6 6 78 78 78 54 54 54
56879- 22 22 22 6 6 6 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 0 0 0
56883- 0 0 0 0 0 0 0 0 0 0 0 0
56884- 0 0 0 0 0 0 0 0 0 0 0 0
56885- 0 0 0 0 0 0 0 0 0 0 0 0
56886- 0 0 0 0 0 0 0 0 0 0 0 0
56887- 0 0 0 0 0 0 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 6 6 6
56893- 22 22 22 62 62 62 62 62 62 2 2 6
56894- 2 2 6 2 2 6 2 2 6 2 2 6
56895- 2 2 6 2 2 6 2 2 6 2 2 6
56896- 2 2 6 2 2 6 2 2 6 26 26 26
56897- 54 54 54 38 38 38 18 18 18 10 10 10
56898- 2 2 6 2 2 6 34 34 34 82 82 82
56899- 38 38 38 14 14 14 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 0 0 0 0 0 0
56903- 0 0 0 0 0 0 0 0 0 0 0 0
56904- 0 0 0 0 0 0 0 0 0 0 0 0
56905- 0 0 0 0 0 0 0 0 0 0 0 0
56906- 0 0 0 0 0 0 0 0 0 0 0 0
56907- 0 0 0 0 0 1 0 0 1 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 6 6 6
56913- 30 30 30 78 78 78 30 30 30 2 2 6
56914- 2 2 6 2 2 6 2 2 6 2 2 6
56915- 2 2 6 2 2 6 2 2 6 2 2 6
56916- 2 2 6 2 2 6 2 2 6 10 10 10
56917- 10 10 10 2 2 6 2 2 6 2 2 6
56918- 2 2 6 2 2 6 2 2 6 78 78 78
56919- 50 50 50 18 18 18 6 6 6 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 0 0 0 0 0 0 0 0 0
56923- 0 0 0 0 0 0 0 0 0 0 0 0
56924- 0 0 0 0 0 0 0 0 0 0 0 0
56925- 0 0 0 0 0 0 0 0 0 0 0 0
56926- 0 0 0 0 0 0 0 0 0 0 0 0
56927- 0 0 1 0 0 0 0 0 0 0 0 0
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 10 10 10
56933- 38 38 38 86 86 86 14 14 14 2 2 6
56934- 2 2 6 2 2 6 2 2 6 2 2 6
56935- 2 2 6 2 2 6 2 2 6 2 2 6
56936- 2 2 6 2 2 6 2 2 6 2 2 6
56937- 2 2 6 2 2 6 2 2 6 2 2 6
56938- 2 2 6 2 2 6 2 2 6 54 54 54
56939- 66 66 66 26 26 26 6 6 6 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- 0 0 0 0 0 0 0 0 0 0 0 0
56943- 0 0 0 0 0 0 0 0 0 0 0 0
56944- 0 0 0 0 0 0 0 0 0 0 0 0
56945- 0 0 0 0 0 0 0 0 0 0 0 0
56946- 0 0 0 0 0 0 0 0 0 0 0 0
56947- 0 0 0 0 0 1 0 0 1 0 0 0
56948- 0 0 0 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 14 14 14
56953- 42 42 42 82 82 82 2 2 6 2 2 6
56954- 2 2 6 6 6 6 10 10 10 2 2 6
56955- 2 2 6 2 2 6 2 2 6 2 2 6
56956- 2 2 6 2 2 6 2 2 6 6 6 6
56957- 14 14 14 10 10 10 2 2 6 2 2 6
56958- 2 2 6 2 2 6 2 2 6 18 18 18
56959- 82 82 82 34 34 34 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
56963- 0 0 0 0 0 0 0 0 0 0 0 0
56964- 0 0 0 0 0 0 0 0 0 0 0 0
56965- 0 0 0 0 0 0 0 0 0 0 0 0
56966- 0 0 0 0 0 0 0 0 0 0 0 0
56967- 0 0 1 0 0 0 0 0 0 0 0 0
56968- 0 0 0 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 14 14 14
56973- 46 46 46 86 86 86 2 2 6 2 2 6
56974- 6 6 6 6 6 6 22 22 22 34 34 34
56975- 6 6 6 2 2 6 2 2 6 2 2 6
56976- 2 2 6 2 2 6 18 18 18 34 34 34
56977- 10 10 10 50 50 50 22 22 22 2 2 6
56978- 2 2 6 2 2 6 2 2 6 10 10 10
56979- 86 86 86 42 42 42 14 14 14 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- 0 0 0 0 0 0 0 0 0 0 0 0
56983- 0 0 0 0 0 0 0 0 0 0 0 0
56984- 0 0 0 0 0 0 0 0 0 0 0 0
56985- 0 0 0 0 0 0 0 0 0 0 0 0
56986- 0 0 0 0 0 0 0 0 0 0 0 0
56987- 0 0 1 0 0 1 0 0 1 0 0 0
56988- 0 0 0 0 0 0 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 14 14 14
56993- 46 46 46 86 86 86 2 2 6 2 2 6
56994- 38 38 38 116 116 116 94 94 94 22 22 22
56995- 22 22 22 2 2 6 2 2 6 2 2 6
56996- 14 14 14 86 86 86 138 138 138 162 162 162
56997-154 154 154 38 38 38 26 26 26 6 6 6
56998- 2 2 6 2 2 6 2 2 6 2 2 6
56999- 86 86 86 46 46 46 14 14 14 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 0 0 0
57002- 0 0 0 0 0 0 0 0 0 0 0 0
57003- 0 0 0 0 0 0 0 0 0 0 0 0
57004- 0 0 0 0 0 0 0 0 0 0 0 0
57005- 0 0 0 0 0 0 0 0 0 0 0 0
57006- 0 0 0 0 0 0 0 0 0 0 0 0
57007- 0 0 0 0 0 0 0 0 0 0 0 0
57008- 0 0 0 0 0 0 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 14 14 14
57013- 46 46 46 86 86 86 2 2 6 14 14 14
57014-134 134 134 198 198 198 195 195 195 116 116 116
57015- 10 10 10 2 2 6 2 2 6 6 6 6
57016-101 98 89 187 187 187 210 210 210 218 218 218
57017-214 214 214 134 134 134 14 14 14 6 6 6
57018- 2 2 6 2 2 6 2 2 6 2 2 6
57019- 86 86 86 50 50 50 18 18 18 6 6 6
57020- 0 0 0 0 0 0 0 0 0 0 0 0
57021- 0 0 0 0 0 0 0 0 0 0 0 0
57022- 0 0 0 0 0 0 0 0 0 0 0 0
57023- 0 0 0 0 0 0 0 0 0 0 0 0
57024- 0 0 0 0 0 0 0 0 0 0 0 0
57025- 0 0 0 0 0 0 0 0 0 0 0 0
57026- 0 0 0 0 0 0 0 0 1 0 0 0
57027- 0 0 1 0 0 1 0 0 1 0 0 0
57028- 0 0 0 0 0 0 0 0 0 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 14 14 14
57033- 46 46 46 86 86 86 2 2 6 54 54 54
57034-218 218 218 195 195 195 226 226 226 246 246 246
57035- 58 58 58 2 2 6 2 2 6 30 30 30
57036-210 210 210 253 253 253 174 174 174 123 123 123
57037-221 221 221 234 234 234 74 74 74 2 2 6
57038- 2 2 6 2 2 6 2 2 6 2 2 6
57039- 70 70 70 58 58 58 22 22 22 6 6 6
57040- 0 0 0 0 0 0 0 0 0 0 0 0
57041- 0 0 0 0 0 0 0 0 0 0 0 0
57042- 0 0 0 0 0 0 0 0 0 0 0 0
57043- 0 0 0 0 0 0 0 0 0 0 0 0
57044- 0 0 0 0 0 0 0 0 0 0 0 0
57045- 0 0 0 0 0 0 0 0 0 0 0 0
57046- 0 0 0 0 0 0 0 0 0 0 0 0
57047- 0 0 0 0 0 0 0 0 0 0 0 0
57048- 0 0 0 0 0 0 0 0 0 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 14 14 14
57053- 46 46 46 82 82 82 2 2 6 106 106 106
57054-170 170 170 26 26 26 86 86 86 226 226 226
57055-123 123 123 10 10 10 14 14 14 46 46 46
57056-231 231 231 190 190 190 6 6 6 70 70 70
57057- 90 90 90 238 238 238 158 158 158 2 2 6
57058- 2 2 6 2 2 6 2 2 6 2 2 6
57059- 70 70 70 58 58 58 22 22 22 6 6 6
57060- 0 0 0 0 0 0 0 0 0 0 0 0
57061- 0 0 0 0 0 0 0 0 0 0 0 0
57062- 0 0 0 0 0 0 0 0 0 0 0 0
57063- 0 0 0 0 0 0 0 0 0 0 0 0
57064- 0 0 0 0 0 0 0 0 0 0 0 0
57065- 0 0 0 0 0 0 0 0 0 0 0 0
57066- 0 0 0 0 0 0 0 0 1 0 0 0
57067- 0 0 1 0 0 1 0 0 1 0 0 0
57068- 0 0 0 0 0 0 0 0 0 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 14 14 14
57073- 42 42 42 86 86 86 6 6 6 116 116 116
57074-106 106 106 6 6 6 70 70 70 149 149 149
57075-128 128 128 18 18 18 38 38 38 54 54 54
57076-221 221 221 106 106 106 2 2 6 14 14 14
57077- 46 46 46 190 190 190 198 198 198 2 2 6
57078- 2 2 6 2 2 6 2 2 6 2 2 6
57079- 74 74 74 62 62 62 22 22 22 6 6 6
57080- 0 0 0 0 0 0 0 0 0 0 0 0
57081- 0 0 0 0 0 0 0 0 0 0 0 0
57082- 0 0 0 0 0 0 0 0 0 0 0 0
57083- 0 0 0 0 0 0 0 0 0 0 0 0
57084- 0 0 0 0 0 0 0 0 0 0 0 0
57085- 0 0 0 0 0 0 0 0 0 0 0 0
57086- 0 0 0 0 0 0 0 0 1 0 0 0
57087- 0 0 1 0 0 0 0 0 1 0 0 0
57088- 0 0 0 0 0 0 0 0 0 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 14 14 14
57093- 42 42 42 94 94 94 14 14 14 101 101 101
57094-128 128 128 2 2 6 18 18 18 116 116 116
57095-118 98 46 121 92 8 121 92 8 98 78 10
57096-162 162 162 106 106 106 2 2 6 2 2 6
57097- 2 2 6 195 195 195 195 195 195 6 6 6
57098- 2 2 6 2 2 6 2 2 6 2 2 6
57099- 74 74 74 62 62 62 22 22 22 6 6 6
57100- 0 0 0 0 0 0 0 0 0 0 0 0
57101- 0 0 0 0 0 0 0 0 0 0 0 0
57102- 0 0 0 0 0 0 0 0 0 0 0 0
57103- 0 0 0 0 0 0 0 0 0 0 0 0
57104- 0 0 0 0 0 0 0 0 0 0 0 0
57105- 0 0 0 0 0 0 0 0 0 0 0 0
57106- 0 0 0 0 0 0 0 0 1 0 0 1
57107- 0 0 1 0 0 0 0 0 1 0 0 0
57108- 0 0 0 0 0 0 0 0 0 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 10 10 10
57113- 38 38 38 90 90 90 14 14 14 58 58 58
57114-210 210 210 26 26 26 54 38 6 154 114 10
57115-226 170 11 236 186 11 225 175 15 184 144 12
57116-215 174 15 175 146 61 37 26 9 2 2 6
57117- 70 70 70 246 246 246 138 138 138 2 2 6
57118- 2 2 6 2 2 6 2 2 6 2 2 6
57119- 70 70 70 66 66 66 26 26 26 6 6 6
57120- 0 0 0 0 0 0 0 0 0 0 0 0
57121- 0 0 0 0 0 0 0 0 0 0 0 0
57122- 0 0 0 0 0 0 0 0 0 0 0 0
57123- 0 0 0 0 0 0 0 0 0 0 0 0
57124- 0 0 0 0 0 0 0 0 0 0 0 0
57125- 0 0 0 0 0 0 0 0 0 0 0 0
57126- 0 0 0 0 0 0 0 0 0 0 0 0
57127- 0 0 0 0 0 0 0 0 0 0 0 0
57128- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
57133- 38 38 38 86 86 86 14 14 14 10 10 10
57134-195 195 195 188 164 115 192 133 9 225 175 15
57135-239 182 13 234 190 10 232 195 16 232 200 30
57136-245 207 45 241 208 19 232 195 16 184 144 12
57137-218 194 134 211 206 186 42 42 42 2 2 6
57138- 2 2 6 2 2 6 2 2 6 2 2 6
57139- 50 50 50 74 74 74 30 30 30 6 6 6
57140- 0 0 0 0 0 0 0 0 0 0 0 0
57141- 0 0 0 0 0 0 0 0 0 0 0 0
57142- 0 0 0 0 0 0 0 0 0 0 0 0
57143- 0 0 0 0 0 0 0 0 0 0 0 0
57144- 0 0 0 0 0 0 0 0 0 0 0 0
57145- 0 0 0 0 0 0 0 0 0 0 0 0
57146- 0 0 0 0 0 0 0 0 0 0 0 0
57147- 0 0 0 0 0 0 0 0 0 0 0 0
57148- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
57153- 34 34 34 86 86 86 14 14 14 2 2 6
57154-121 87 25 192 133 9 219 162 10 239 182 13
57155-236 186 11 232 195 16 241 208 19 244 214 54
57156-246 218 60 246 218 38 246 215 20 241 208 19
57157-241 208 19 226 184 13 121 87 25 2 2 6
57158- 2 2 6 2 2 6 2 2 6 2 2 6
57159- 50 50 50 82 82 82 34 34 34 10 10 10
57160- 0 0 0 0 0 0 0 0 0 0 0 0
57161- 0 0 0 0 0 0 0 0 0 0 0 0
57162- 0 0 0 0 0 0 0 0 0 0 0 0
57163- 0 0 0 0 0 0 0 0 0 0 0 0
57164- 0 0 0 0 0 0 0 0 0 0 0 0
57165- 0 0 0 0 0 0 0 0 0 0 0 0
57166- 0 0 0 0 0 0 0 0 0 0 0 0
57167- 0 0 0 0 0 0 0 0 0 0 0 0
57168- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
57173- 34 34 34 82 82 82 30 30 30 61 42 6
57174-180 123 7 206 145 10 230 174 11 239 182 13
57175-234 190 10 238 202 15 241 208 19 246 218 74
57176-246 218 38 246 215 20 246 215 20 246 215 20
57177-226 184 13 215 174 15 184 144 12 6 6 6
57178- 2 2 6 2 2 6 2 2 6 2 2 6
57179- 26 26 26 94 94 94 42 42 42 14 14 14
57180- 0 0 0 0 0 0 0 0 0 0 0 0
57181- 0 0 0 0 0 0 0 0 0 0 0 0
57182- 0 0 0 0 0 0 0 0 0 0 0 0
57183- 0 0 0 0 0 0 0 0 0 0 0 0
57184- 0 0 0 0 0 0 0 0 0 0 0 0
57185- 0 0 0 0 0 0 0 0 0 0 0 0
57186- 0 0 0 0 0 0 0 0 0 0 0 0
57187- 0 0 0 0 0 0 0 0 0 0 0 0
57188- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
57193- 30 30 30 78 78 78 50 50 50 104 69 6
57194-192 133 9 216 158 10 236 178 12 236 186 11
57195-232 195 16 241 208 19 244 214 54 245 215 43
57196-246 215 20 246 215 20 241 208 19 198 155 10
57197-200 144 11 216 158 10 156 118 10 2 2 6
57198- 2 2 6 2 2 6 2 2 6 2 2 6
57199- 6 6 6 90 90 90 54 54 54 18 18 18
57200- 6 6 6 0 0 0 0 0 0 0 0 0
57201- 0 0 0 0 0 0 0 0 0 0 0 0
57202- 0 0 0 0 0 0 0 0 0 0 0 0
57203- 0 0 0 0 0 0 0 0 0 0 0 0
57204- 0 0 0 0 0 0 0 0 0 0 0 0
57205- 0 0 0 0 0 0 0 0 0 0 0 0
57206- 0 0 0 0 0 0 0 0 0 0 0 0
57207- 0 0 0 0 0 0 0 0 0 0 0 0
57208- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
57213- 30 30 30 78 78 78 46 46 46 22 22 22
57214-137 92 6 210 162 10 239 182 13 238 190 10
57215-238 202 15 241 208 19 246 215 20 246 215 20
57216-241 208 19 203 166 17 185 133 11 210 150 10
57217-216 158 10 210 150 10 102 78 10 2 2 6
57218- 6 6 6 54 54 54 14 14 14 2 2 6
57219- 2 2 6 62 62 62 74 74 74 30 30 30
57220- 10 10 10 0 0 0 0 0 0 0 0 0
57221- 0 0 0 0 0 0 0 0 0 0 0 0
57222- 0 0 0 0 0 0 0 0 0 0 0 0
57223- 0 0 0 0 0 0 0 0 0 0 0 0
57224- 0 0 0 0 0 0 0 0 0 0 0 0
57225- 0 0 0 0 0 0 0 0 0 0 0 0
57226- 0 0 0 0 0 0 0 0 0 0 0 0
57227- 0 0 0 0 0 0 0 0 0 0 0 0
57228- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
57233- 34 34 34 78 78 78 50 50 50 6 6 6
57234- 94 70 30 139 102 15 190 146 13 226 184 13
57235-232 200 30 232 195 16 215 174 15 190 146 13
57236-168 122 10 192 133 9 210 150 10 213 154 11
57237-202 150 34 182 157 106 101 98 89 2 2 6
57238- 2 2 6 78 78 78 116 116 116 58 58 58
57239- 2 2 6 22 22 22 90 90 90 46 46 46
57240- 18 18 18 6 6 6 0 0 0 0 0 0
57241- 0 0 0 0 0 0 0 0 0 0 0 0
57242- 0 0 0 0 0 0 0 0 0 0 0 0
57243- 0 0 0 0 0 0 0 0 0 0 0 0
57244- 0 0 0 0 0 0 0 0 0 0 0 0
57245- 0 0 0 0 0 0 0 0 0 0 0 0
57246- 0 0 0 0 0 0 0 0 0 0 0 0
57247- 0 0 0 0 0 0 0 0 0 0 0 0
57248- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
57253- 38 38 38 86 86 86 50 50 50 6 6 6
57254-128 128 128 174 154 114 156 107 11 168 122 10
57255-198 155 10 184 144 12 197 138 11 200 144 11
57256-206 145 10 206 145 10 197 138 11 188 164 115
57257-195 195 195 198 198 198 174 174 174 14 14 14
57258- 2 2 6 22 22 22 116 116 116 116 116 116
57259- 22 22 22 2 2 6 74 74 74 70 70 70
57260- 30 30 30 10 10 10 0 0 0 0 0 0
57261- 0 0 0 0 0 0 0 0 0 0 0 0
57262- 0 0 0 0 0 0 0 0 0 0 0 0
57263- 0 0 0 0 0 0 0 0 0 0 0 0
57264- 0 0 0 0 0 0 0 0 0 0 0 0
57265- 0 0 0 0 0 0 0 0 0 0 0 0
57266- 0 0 0 0 0 0 0 0 0 0 0 0
57267- 0 0 0 0 0 0 0 0 0 0 0 0
57268- 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6 18 18 18
57273- 50 50 50 101 101 101 26 26 26 10 10 10
57274-138 138 138 190 190 190 174 154 114 156 107 11
57275-197 138 11 200 144 11 197 138 11 192 133 9
57276-180 123 7 190 142 34 190 178 144 187 187 187
57277-202 202 202 221 221 221 214 214 214 66 66 66
57278- 2 2 6 2 2 6 50 50 50 62 62 62
57279- 6 6 6 2 2 6 10 10 10 90 90 90
57280- 50 50 50 18 18 18 6 6 6 0 0 0
57281- 0 0 0 0 0 0 0 0 0 0 0 0
57282- 0 0 0 0 0 0 0 0 0 0 0 0
57283- 0 0 0 0 0 0 0 0 0 0 0 0
57284- 0 0 0 0 0 0 0 0 0 0 0 0
57285- 0 0 0 0 0 0 0 0 0 0 0 0
57286- 0 0 0 0 0 0 0 0 0 0 0 0
57287- 0 0 0 0 0 0 0 0 0 0 0 0
57288- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10 34 34 34
57293- 74 74 74 74 74 74 2 2 6 6 6 6
57294-144 144 144 198 198 198 190 190 190 178 166 146
57295-154 121 60 156 107 11 156 107 11 168 124 44
57296-174 154 114 187 187 187 190 190 190 210 210 210
57297-246 246 246 253 253 253 253 253 253 182 182 182
57298- 6 6 6 2 2 6 2 2 6 2 2 6
57299- 2 2 6 2 2 6 2 2 6 62 62 62
57300- 74 74 74 34 34 34 14 14 14 0 0 0
57301- 0 0 0 0 0 0 0 0 0 0 0 0
57302- 0 0 0 0 0 0 0 0 0 0 0 0
57303- 0 0 0 0 0 0 0 0 0 0 0 0
57304- 0 0 0 0 0 0 0 0 0 0 0 0
57305- 0 0 0 0 0 0 0 0 0 0 0 0
57306- 0 0 0 0 0 0 0 0 0 0 0 0
57307- 0 0 0 0 0 0 0 0 0 0 0 0
57308- 0 0 0 0 0 0 0 0 0 0 0 0
57309- 0 0 0 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 10 10 10 22 22 22 54 54 54
57313- 94 94 94 18 18 18 2 2 6 46 46 46
57314-234 234 234 221 221 221 190 190 190 190 190 190
57315-190 190 190 187 187 187 187 187 187 190 190 190
57316-190 190 190 195 195 195 214 214 214 242 242 242
57317-253 253 253 253 253 253 253 253 253 253 253 253
57318- 82 82 82 2 2 6 2 2 6 2 2 6
57319- 2 2 6 2 2 6 2 2 6 14 14 14
57320- 86 86 86 54 54 54 22 22 22 6 6 6
57321- 0 0 0 0 0 0 0 0 0 0 0 0
57322- 0 0 0 0 0 0 0 0 0 0 0 0
57323- 0 0 0 0 0 0 0 0 0 0 0 0
57324- 0 0 0 0 0 0 0 0 0 0 0 0
57325- 0 0 0 0 0 0 0 0 0 0 0 0
57326- 0 0 0 0 0 0 0 0 0 0 0 0
57327- 0 0 0 0 0 0 0 0 0 0 0 0
57328- 0 0 0 0 0 0 0 0 0 0 0 0
57329- 0 0 0 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- 6 6 6 18 18 18 46 46 46 90 90 90
57333- 46 46 46 18 18 18 6 6 6 182 182 182
57334-253 253 253 246 246 246 206 206 206 190 190 190
57335-190 190 190 190 190 190 190 190 190 190 190 190
57336-206 206 206 231 231 231 250 250 250 253 253 253
57337-253 253 253 253 253 253 253 253 253 253 253 253
57338-202 202 202 14 14 14 2 2 6 2 2 6
57339- 2 2 6 2 2 6 2 2 6 2 2 6
57340- 42 42 42 86 86 86 42 42 42 18 18 18
57341- 6 6 6 0 0 0 0 0 0 0 0 0
57342- 0 0 0 0 0 0 0 0 0 0 0 0
57343- 0 0 0 0 0 0 0 0 0 0 0 0
57344- 0 0 0 0 0 0 0 0 0 0 0 0
57345- 0 0 0 0 0 0 0 0 0 0 0 0
57346- 0 0 0 0 0 0 0 0 0 0 0 0
57347- 0 0 0 0 0 0 0 0 0 0 0 0
57348- 0 0 0 0 0 0 0 0 0 0 0 0
57349- 0 0 0 0 0 0 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 6 6 6
57352- 14 14 14 38 38 38 74 74 74 66 66 66
57353- 2 2 6 6 6 6 90 90 90 250 250 250
57354-253 253 253 253 253 253 238 238 238 198 198 198
57355-190 190 190 190 190 190 195 195 195 221 221 221
57356-246 246 246 253 253 253 253 253 253 253 253 253
57357-253 253 253 253 253 253 253 253 253 253 253 253
57358-253 253 253 82 82 82 2 2 6 2 2 6
57359- 2 2 6 2 2 6 2 2 6 2 2 6
57360- 2 2 6 78 78 78 70 70 70 34 34 34
57361- 14 14 14 6 6 6 0 0 0 0 0 0
57362- 0 0 0 0 0 0 0 0 0 0 0 0
57363- 0 0 0 0 0 0 0 0 0 0 0 0
57364- 0 0 0 0 0 0 0 0 0 0 0 0
57365- 0 0 0 0 0 0 0 0 0 0 0 0
57366- 0 0 0 0 0 0 0 0 0 0 0 0
57367- 0 0 0 0 0 0 0 0 0 0 0 0
57368- 0 0 0 0 0 0 0 0 0 0 0 0
57369- 0 0 0 0 0 0 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 14 14 14
57372- 34 34 34 66 66 66 78 78 78 6 6 6
57373- 2 2 6 18 18 18 218 218 218 253 253 253
57374-253 253 253 253 253 253 253 253 253 246 246 246
57375-226 226 226 231 231 231 246 246 246 253 253 253
57376-253 253 253 253 253 253 253 253 253 253 253 253
57377-253 253 253 253 253 253 253 253 253 253 253 253
57378-253 253 253 178 178 178 2 2 6 2 2 6
57379- 2 2 6 2 2 6 2 2 6 2 2 6
57380- 2 2 6 18 18 18 90 90 90 62 62 62
57381- 30 30 30 10 10 10 0 0 0 0 0 0
57382- 0 0 0 0 0 0 0 0 0 0 0 0
57383- 0 0 0 0 0 0 0 0 0 0 0 0
57384- 0 0 0 0 0 0 0 0 0 0 0 0
57385- 0 0 0 0 0 0 0 0 0 0 0 0
57386- 0 0 0 0 0 0 0 0 0 0 0 0
57387- 0 0 0 0 0 0 0 0 0 0 0 0
57388- 0 0 0 0 0 0 0 0 0 0 0 0
57389- 0 0 0 0 0 0 0 0 0 0 0 0
57390- 0 0 0 0 0 0 0 0 0 0 0 0
57391- 0 0 0 0 0 0 10 10 10 26 26 26
57392- 58 58 58 90 90 90 18 18 18 2 2 6
57393- 2 2 6 110 110 110 253 253 253 253 253 253
57394-253 253 253 253 253 253 253 253 253 253 253 253
57395-250 250 250 253 253 253 253 253 253 253 253 253
57396-253 253 253 253 253 253 253 253 253 253 253 253
57397-253 253 253 253 253 253 253 253 253 253 253 253
57398-253 253 253 231 231 231 18 18 18 2 2 6
57399- 2 2 6 2 2 6 2 2 6 2 2 6
57400- 2 2 6 2 2 6 18 18 18 94 94 94
57401- 54 54 54 26 26 26 10 10 10 0 0 0
57402- 0 0 0 0 0 0 0 0 0 0 0 0
57403- 0 0 0 0 0 0 0 0 0 0 0 0
57404- 0 0 0 0 0 0 0 0 0 0 0 0
57405- 0 0 0 0 0 0 0 0 0 0 0 0
57406- 0 0 0 0 0 0 0 0 0 0 0 0
57407- 0 0 0 0 0 0 0 0 0 0 0 0
57408- 0 0 0 0 0 0 0 0 0 0 0 0
57409- 0 0 0 0 0 0 0 0 0 0 0 0
57410- 0 0 0 0 0 0 0 0 0 0 0 0
57411- 0 0 0 6 6 6 22 22 22 50 50 50
57412- 90 90 90 26 26 26 2 2 6 2 2 6
57413- 14 14 14 195 195 195 250 250 250 253 253 253
57414-253 253 253 253 253 253 253 253 253 253 253 253
57415-253 253 253 253 253 253 253 253 253 253 253 253
57416-253 253 253 253 253 253 253 253 253 253 253 253
57417-253 253 253 253 253 253 253 253 253 253 253 253
57418-250 250 250 242 242 242 54 54 54 2 2 6
57419- 2 2 6 2 2 6 2 2 6 2 2 6
57420- 2 2 6 2 2 6 2 2 6 38 38 38
57421- 86 86 86 50 50 50 22 22 22 6 6 6
57422- 0 0 0 0 0 0 0 0 0 0 0 0
57423- 0 0 0 0 0 0 0 0 0 0 0 0
57424- 0 0 0 0 0 0 0 0 0 0 0 0
57425- 0 0 0 0 0 0 0 0 0 0 0 0
57426- 0 0 0 0 0 0 0 0 0 0 0 0
57427- 0 0 0 0 0 0 0 0 0 0 0 0
57428- 0 0 0 0 0 0 0 0 0 0 0 0
57429- 0 0 0 0 0 0 0 0 0 0 0 0
57430- 0 0 0 0 0 0 0 0 0 0 0 0
57431- 6 6 6 14 14 14 38 38 38 82 82 82
57432- 34 34 34 2 2 6 2 2 6 2 2 6
57433- 42 42 42 195 195 195 246 246 246 253 253 253
57434-253 253 253 253 253 253 253 253 253 250 250 250
57435-242 242 242 242 242 242 250 250 250 253 253 253
57436-253 253 253 253 253 253 253 253 253 253 253 253
57437-253 253 253 250 250 250 246 246 246 238 238 238
57438-226 226 226 231 231 231 101 101 101 6 6 6
57439- 2 2 6 2 2 6 2 2 6 2 2 6
57440- 2 2 6 2 2 6 2 2 6 2 2 6
57441- 38 38 38 82 82 82 42 42 42 14 14 14
57442- 6 6 6 0 0 0 0 0 0 0 0 0
57443- 0 0 0 0 0 0 0 0 0 0 0 0
57444- 0 0 0 0 0 0 0 0 0 0 0 0
57445- 0 0 0 0 0 0 0 0 0 0 0 0
57446- 0 0 0 0 0 0 0 0 0 0 0 0
57447- 0 0 0 0 0 0 0 0 0 0 0 0
57448- 0 0 0 0 0 0 0 0 0 0 0 0
57449- 0 0 0 0 0 0 0 0 0 0 0 0
57450- 0 0 0 0 0 0 0 0 0 0 0 0
57451- 10 10 10 26 26 26 62 62 62 66 66 66
57452- 2 2 6 2 2 6 2 2 6 6 6 6
57453- 70 70 70 170 170 170 206 206 206 234 234 234
57454-246 246 246 250 250 250 250 250 250 238 238 238
57455-226 226 226 231 231 231 238 238 238 250 250 250
57456-250 250 250 250 250 250 246 246 246 231 231 231
57457-214 214 214 206 206 206 202 202 202 202 202 202
57458-198 198 198 202 202 202 182 182 182 18 18 18
57459- 2 2 6 2 2 6 2 2 6 2 2 6
57460- 2 2 6 2 2 6 2 2 6 2 2 6
57461- 2 2 6 62 62 62 66 66 66 30 30 30
57462- 10 10 10 0 0 0 0 0 0 0 0 0
57463- 0 0 0 0 0 0 0 0 0 0 0 0
57464- 0 0 0 0 0 0 0 0 0 0 0 0
57465- 0 0 0 0 0 0 0 0 0 0 0 0
57466- 0 0 0 0 0 0 0 0 0 0 0 0
57467- 0 0 0 0 0 0 0 0 0 0 0 0
57468- 0 0 0 0 0 0 0 0 0 0 0 0
57469- 0 0 0 0 0 0 0 0 0 0 0 0
57470- 0 0 0 0 0 0 0 0 0 0 0 0
57471- 14 14 14 42 42 42 82 82 82 18 18 18
57472- 2 2 6 2 2 6 2 2 6 10 10 10
57473- 94 94 94 182 182 182 218 218 218 242 242 242
57474-250 250 250 253 253 253 253 253 253 250 250 250
57475-234 234 234 253 253 253 253 253 253 253 253 253
57476-253 253 253 253 253 253 253 253 253 246 246 246
57477-238 238 238 226 226 226 210 210 210 202 202 202
57478-195 195 195 195 195 195 210 210 210 158 158 158
57479- 6 6 6 14 14 14 50 50 50 14 14 14
57480- 2 2 6 2 2 6 2 2 6 2 2 6
57481- 2 2 6 6 6 6 86 86 86 46 46 46
57482- 18 18 18 6 6 6 0 0 0 0 0 0
57483- 0 0 0 0 0 0 0 0 0 0 0 0
57484- 0 0 0 0 0 0 0 0 0 0 0 0
57485- 0 0 0 0 0 0 0 0 0 0 0 0
57486- 0 0 0 0 0 0 0 0 0 0 0 0
57487- 0 0 0 0 0 0 0 0 0 0 0 0
57488- 0 0 0 0 0 0 0 0 0 0 0 0
57489- 0 0 0 0 0 0 0 0 0 0 0 0
57490- 0 0 0 0 0 0 0 0 0 6 6 6
57491- 22 22 22 54 54 54 70 70 70 2 2 6
57492- 2 2 6 10 10 10 2 2 6 22 22 22
57493-166 166 166 231 231 231 250 250 250 253 253 253
57494-253 253 253 253 253 253 253 253 253 250 250 250
57495-242 242 242 253 253 253 253 253 253 253 253 253
57496-253 253 253 253 253 253 253 253 253 253 253 253
57497-253 253 253 253 253 253 253 253 253 246 246 246
57498-231 231 231 206 206 206 198 198 198 226 226 226
57499- 94 94 94 2 2 6 6 6 6 38 38 38
57500- 30 30 30 2 2 6 2 2 6 2 2 6
57501- 2 2 6 2 2 6 62 62 62 66 66 66
57502- 26 26 26 10 10 10 0 0 0 0 0 0
57503- 0 0 0 0 0 0 0 0 0 0 0 0
57504- 0 0 0 0 0 0 0 0 0 0 0 0
57505- 0 0 0 0 0 0 0 0 0 0 0 0
57506- 0 0 0 0 0 0 0 0 0 0 0 0
57507- 0 0 0 0 0 0 0 0 0 0 0 0
57508- 0 0 0 0 0 0 0 0 0 0 0 0
57509- 0 0 0 0 0 0 0 0 0 0 0 0
57510- 0 0 0 0 0 0 0 0 0 10 10 10
57511- 30 30 30 74 74 74 50 50 50 2 2 6
57512- 26 26 26 26 26 26 2 2 6 106 106 106
57513-238 238 238 253 253 253 253 253 253 253 253 253
57514-253 253 253 253 253 253 253 253 253 253 253 253
57515-253 253 253 253 253 253 253 253 253 253 253 253
57516-253 253 253 253 253 253 253 253 253 253 253 253
57517-253 253 253 253 253 253 253 253 253 253 253 253
57518-253 253 253 246 246 246 218 218 218 202 202 202
57519-210 210 210 14 14 14 2 2 6 2 2 6
57520- 30 30 30 22 22 22 2 2 6 2 2 6
57521- 2 2 6 2 2 6 18 18 18 86 86 86
57522- 42 42 42 14 14 14 0 0 0 0 0 0
57523- 0 0 0 0 0 0 0 0 0 0 0 0
57524- 0 0 0 0 0 0 0 0 0 0 0 0
57525- 0 0 0 0 0 0 0 0 0 0 0 0
57526- 0 0 0 0 0 0 0 0 0 0 0 0
57527- 0 0 0 0 0 0 0 0 0 0 0 0
57528- 0 0 0 0 0 0 0 0 0 0 0 0
57529- 0 0 0 0 0 0 0 0 0 0 0 0
57530- 0 0 0 0 0 0 0 0 0 14 14 14
57531- 42 42 42 90 90 90 22 22 22 2 2 6
57532- 42 42 42 2 2 6 18 18 18 218 218 218
57533-253 253 253 253 253 253 253 253 253 253 253 253
57534-253 253 253 253 253 253 253 253 253 253 253 253
57535-253 253 253 253 253 253 253 253 253 253 253 253
57536-253 253 253 253 253 253 253 253 253 253 253 253
57537-253 253 253 253 253 253 253 253 253 253 253 253
57538-253 253 253 253 253 253 250 250 250 221 221 221
57539-218 218 218 101 101 101 2 2 6 14 14 14
57540- 18 18 18 38 38 38 10 10 10 2 2 6
57541- 2 2 6 2 2 6 2 2 6 78 78 78
57542- 58 58 58 22 22 22 6 6 6 0 0 0
57543- 0 0 0 0 0 0 0 0 0 0 0 0
57544- 0 0 0 0 0 0 0 0 0 0 0 0
57545- 0 0 0 0 0 0 0 0 0 0 0 0
57546- 0 0 0 0 0 0 0 0 0 0 0 0
57547- 0 0 0 0 0 0 0 0 0 0 0 0
57548- 0 0 0 0 0 0 0 0 0 0 0 0
57549- 0 0 0 0 0 0 0 0 0 0 0 0
57550- 0 0 0 0 0 0 6 6 6 18 18 18
57551- 54 54 54 82 82 82 2 2 6 26 26 26
57552- 22 22 22 2 2 6 123 123 123 253 253 253
57553-253 253 253 253 253 253 253 253 253 253 253 253
57554-253 253 253 253 253 253 253 253 253 253 253 253
57555-253 253 253 253 253 253 253 253 253 253 253 253
57556-253 253 253 253 253 253 253 253 253 253 253 253
57557-253 253 253 253 253 253 253 253 253 253 253 253
57558-253 253 253 253 253 253 253 253 253 250 250 250
57559-238 238 238 198 198 198 6 6 6 38 38 38
57560- 58 58 58 26 26 26 38 38 38 2 2 6
57561- 2 2 6 2 2 6 2 2 6 46 46 46
57562- 78 78 78 30 30 30 10 10 10 0 0 0
57563- 0 0 0 0 0 0 0 0 0 0 0 0
57564- 0 0 0 0 0 0 0 0 0 0 0 0
57565- 0 0 0 0 0 0 0 0 0 0 0 0
57566- 0 0 0 0 0 0 0 0 0 0 0 0
57567- 0 0 0 0 0 0 0 0 0 0 0 0
57568- 0 0 0 0 0 0 0 0 0 0 0 0
57569- 0 0 0 0 0 0 0 0 0 0 0 0
57570- 0 0 0 0 0 0 10 10 10 30 30 30
57571- 74 74 74 58 58 58 2 2 6 42 42 42
57572- 2 2 6 22 22 22 231 231 231 253 253 253
57573-253 253 253 253 253 253 253 253 253 253 253 253
57574-253 253 253 253 253 253 253 253 253 250 250 250
57575-253 253 253 253 253 253 253 253 253 253 253 253
57576-253 253 253 253 253 253 253 253 253 253 253 253
57577-253 253 253 253 253 253 253 253 253 253 253 253
57578-253 253 253 253 253 253 253 253 253 253 253 253
57579-253 253 253 246 246 246 46 46 46 38 38 38
57580- 42 42 42 14 14 14 38 38 38 14 14 14
57581- 2 2 6 2 2 6 2 2 6 6 6 6
57582- 86 86 86 46 46 46 14 14 14 0 0 0
57583- 0 0 0 0 0 0 0 0 0 0 0 0
57584- 0 0 0 0 0 0 0 0 0 0 0 0
57585- 0 0 0 0 0 0 0 0 0 0 0 0
57586- 0 0 0 0 0 0 0 0 0 0 0 0
57587- 0 0 0 0 0 0 0 0 0 0 0 0
57588- 0 0 0 0 0 0 0 0 0 0 0 0
57589- 0 0 0 0 0 0 0 0 0 0 0 0
57590- 0 0 0 6 6 6 14 14 14 42 42 42
57591- 90 90 90 18 18 18 18 18 18 26 26 26
57592- 2 2 6 116 116 116 253 253 253 253 253 253
57593-253 253 253 253 253 253 253 253 253 253 253 253
57594-253 253 253 253 253 253 250 250 250 238 238 238
57595-253 253 253 253 253 253 253 253 253 253 253 253
57596-253 253 253 253 253 253 253 253 253 253 253 253
57597-253 253 253 253 253 253 253 253 253 253 253 253
57598-253 253 253 253 253 253 253 253 253 253 253 253
57599-253 253 253 253 253 253 94 94 94 6 6 6
57600- 2 2 6 2 2 6 10 10 10 34 34 34
57601- 2 2 6 2 2 6 2 2 6 2 2 6
57602- 74 74 74 58 58 58 22 22 22 6 6 6
57603- 0 0 0 0 0 0 0 0 0 0 0 0
57604- 0 0 0 0 0 0 0 0 0 0 0 0
57605- 0 0 0 0 0 0 0 0 0 0 0 0
57606- 0 0 0 0 0 0 0 0 0 0 0 0
57607- 0 0 0 0 0 0 0 0 0 0 0 0
57608- 0 0 0 0 0 0 0 0 0 0 0 0
57609- 0 0 0 0 0 0 0 0 0 0 0 0
57610- 0 0 0 10 10 10 26 26 26 66 66 66
57611- 82 82 82 2 2 6 38 38 38 6 6 6
57612- 14 14 14 210 210 210 253 253 253 253 253 253
57613-253 253 253 253 253 253 253 253 253 253 253 253
57614-253 253 253 253 253 253 246 246 246 242 242 242
57615-253 253 253 253 253 253 253 253 253 253 253 253
57616-253 253 253 253 253 253 253 253 253 253 253 253
57617-253 253 253 253 253 253 253 253 253 253 253 253
57618-253 253 253 253 253 253 253 253 253 253 253 253
57619-253 253 253 253 253 253 144 144 144 2 2 6
57620- 2 2 6 2 2 6 2 2 6 46 46 46
57621- 2 2 6 2 2 6 2 2 6 2 2 6
57622- 42 42 42 74 74 74 30 30 30 10 10 10
57623- 0 0 0 0 0 0 0 0 0 0 0 0
57624- 0 0 0 0 0 0 0 0 0 0 0 0
57625- 0 0 0 0 0 0 0 0 0 0 0 0
57626- 0 0 0 0 0 0 0 0 0 0 0 0
57627- 0 0 0 0 0 0 0 0 0 0 0 0
57628- 0 0 0 0 0 0 0 0 0 0 0 0
57629- 0 0 0 0 0 0 0 0 0 0 0 0
57630- 6 6 6 14 14 14 42 42 42 90 90 90
57631- 26 26 26 6 6 6 42 42 42 2 2 6
57632- 74 74 74 250 250 250 253 253 253 253 253 253
57633-253 253 253 253 253 253 253 253 253 253 253 253
57634-253 253 253 253 253 253 242 242 242 242 242 242
57635-253 253 253 253 253 253 253 253 253 253 253 253
57636-253 253 253 253 253 253 253 253 253 253 253 253
57637-253 253 253 253 253 253 253 253 253 253 253 253
57638-253 253 253 253 253 253 253 253 253 253 253 253
57639-253 253 253 253 253 253 182 182 182 2 2 6
57640- 2 2 6 2 2 6 2 2 6 46 46 46
57641- 2 2 6 2 2 6 2 2 6 2 2 6
57642- 10 10 10 86 86 86 38 38 38 10 10 10
57643- 0 0 0 0 0 0 0 0 0 0 0 0
57644- 0 0 0 0 0 0 0 0 0 0 0 0
57645- 0 0 0 0 0 0 0 0 0 0 0 0
57646- 0 0 0 0 0 0 0 0 0 0 0 0
57647- 0 0 0 0 0 0 0 0 0 0 0 0
57648- 0 0 0 0 0 0 0 0 0 0 0 0
57649- 0 0 0 0 0 0 0 0 0 0 0 0
57650- 10 10 10 26 26 26 66 66 66 82 82 82
57651- 2 2 6 22 22 22 18 18 18 2 2 6
57652-149 149 149 253 253 253 253 253 253 253 253 253
57653-253 253 253 253 253 253 253 253 253 253 253 253
57654-253 253 253 253 253 253 234 234 234 242 242 242
57655-253 253 253 253 253 253 253 253 253 253 253 253
57656-253 253 253 253 253 253 253 253 253 253 253 253
57657-253 253 253 253 253 253 253 253 253 253 253 253
57658-253 253 253 253 253 253 253 253 253 253 253 253
57659-253 253 253 253 253 253 206 206 206 2 2 6
57660- 2 2 6 2 2 6 2 2 6 38 38 38
57661- 2 2 6 2 2 6 2 2 6 2 2 6
57662- 6 6 6 86 86 86 46 46 46 14 14 14
57663- 0 0 0 0 0 0 0 0 0 0 0 0
57664- 0 0 0 0 0 0 0 0 0 0 0 0
57665- 0 0 0 0 0 0 0 0 0 0 0 0
57666- 0 0 0 0 0 0 0 0 0 0 0 0
57667- 0 0 0 0 0 0 0 0 0 0 0 0
57668- 0 0 0 0 0 0 0 0 0 0 0 0
57669- 0 0 0 0 0 0 0 0 0 6 6 6
57670- 18 18 18 46 46 46 86 86 86 18 18 18
57671- 2 2 6 34 34 34 10 10 10 6 6 6
57672-210 210 210 253 253 253 253 253 253 253 253 253
57673-253 253 253 253 253 253 253 253 253 253 253 253
57674-253 253 253 253 253 253 234 234 234 242 242 242
57675-253 253 253 253 253 253 253 253 253 253 253 253
57676-253 253 253 253 253 253 253 253 253 253 253 253
57677-253 253 253 253 253 253 253 253 253 253 253 253
57678-253 253 253 253 253 253 253 253 253 253 253 253
57679-253 253 253 253 253 253 221 221 221 6 6 6
57680- 2 2 6 2 2 6 6 6 6 30 30 30
57681- 2 2 6 2 2 6 2 2 6 2 2 6
57682- 2 2 6 82 82 82 54 54 54 18 18 18
57683- 6 6 6 0 0 0 0 0 0 0 0 0
57684- 0 0 0 0 0 0 0 0 0 0 0 0
57685- 0 0 0 0 0 0 0 0 0 0 0 0
57686- 0 0 0 0 0 0 0 0 0 0 0 0
57687- 0 0 0 0 0 0 0 0 0 0 0 0
57688- 0 0 0 0 0 0 0 0 0 0 0 0
57689- 0 0 0 0 0 0 0 0 0 10 10 10
57690- 26 26 26 66 66 66 62 62 62 2 2 6
57691- 2 2 6 38 38 38 10 10 10 26 26 26
57692-238 238 238 253 253 253 253 253 253 253 253 253
57693-253 253 253 253 253 253 253 253 253 253 253 253
57694-253 253 253 253 253 253 231 231 231 238 238 238
57695-253 253 253 253 253 253 253 253 253 253 253 253
57696-253 253 253 253 253 253 253 253 253 253 253 253
57697-253 253 253 253 253 253 253 253 253 253 253 253
57698-253 253 253 253 253 253 253 253 253 253 253 253
57699-253 253 253 253 253 253 231 231 231 6 6 6
57700- 2 2 6 2 2 6 10 10 10 30 30 30
57701- 2 2 6 2 2 6 2 2 6 2 2 6
57702- 2 2 6 66 66 66 58 58 58 22 22 22
57703- 6 6 6 0 0 0 0 0 0 0 0 0
57704- 0 0 0 0 0 0 0 0 0 0 0 0
57705- 0 0 0 0 0 0 0 0 0 0 0 0
57706- 0 0 0 0 0 0 0 0 0 0 0 0
57707- 0 0 0 0 0 0 0 0 0 0 0 0
57708- 0 0 0 0 0 0 0 0 0 0 0 0
57709- 0 0 0 0 0 0 0 0 0 10 10 10
57710- 38 38 38 78 78 78 6 6 6 2 2 6
57711- 2 2 6 46 46 46 14 14 14 42 42 42
57712-246 246 246 253 253 253 253 253 253 253 253 253
57713-253 253 253 253 253 253 253 253 253 253 253 253
57714-253 253 253 253 253 253 231 231 231 242 242 242
57715-253 253 253 253 253 253 253 253 253 253 253 253
57716-253 253 253 253 253 253 253 253 253 253 253 253
57717-253 253 253 253 253 253 253 253 253 253 253 253
57718-253 253 253 253 253 253 253 253 253 253 253 253
57719-253 253 253 253 253 253 234 234 234 10 10 10
57720- 2 2 6 2 2 6 22 22 22 14 14 14
57721- 2 2 6 2 2 6 2 2 6 2 2 6
57722- 2 2 6 66 66 66 62 62 62 22 22 22
57723- 6 6 6 0 0 0 0 0 0 0 0 0
57724- 0 0 0 0 0 0 0 0 0 0 0 0
57725- 0 0 0 0 0 0 0 0 0 0 0 0
57726- 0 0 0 0 0 0 0 0 0 0 0 0
57727- 0 0 0 0 0 0 0 0 0 0 0 0
57728- 0 0 0 0 0 0 0 0 0 0 0 0
57729- 0 0 0 0 0 0 6 6 6 18 18 18
57730- 50 50 50 74 74 74 2 2 6 2 2 6
57731- 14 14 14 70 70 70 34 34 34 62 62 62
57732-250 250 250 253 253 253 253 253 253 253 253 253
57733-253 253 253 253 253 253 253 253 253 253 253 253
57734-253 253 253 253 253 253 231 231 231 246 246 246
57735-253 253 253 253 253 253 253 253 253 253 253 253
57736-253 253 253 253 253 253 253 253 253 253 253 253
57737-253 253 253 253 253 253 253 253 253 253 253 253
57738-253 253 253 253 253 253 253 253 253 253 253 253
57739-253 253 253 253 253 253 234 234 234 14 14 14
57740- 2 2 6 2 2 6 30 30 30 2 2 6
57741- 2 2 6 2 2 6 2 2 6 2 2 6
57742- 2 2 6 66 66 66 62 62 62 22 22 22
57743- 6 6 6 0 0 0 0 0 0 0 0 0
57744- 0 0 0 0 0 0 0 0 0 0 0 0
57745- 0 0 0 0 0 0 0 0 0 0 0 0
57746- 0 0 0 0 0 0 0 0 0 0 0 0
57747- 0 0 0 0 0 0 0 0 0 0 0 0
57748- 0 0 0 0 0 0 0 0 0 0 0 0
57749- 0 0 0 0 0 0 6 6 6 18 18 18
57750- 54 54 54 62 62 62 2 2 6 2 2 6
57751- 2 2 6 30 30 30 46 46 46 70 70 70
57752-250 250 250 253 253 253 253 253 253 253 253 253
57753-253 253 253 253 253 253 253 253 253 253 253 253
57754-253 253 253 253 253 253 231 231 231 246 246 246
57755-253 253 253 253 253 253 253 253 253 253 253 253
57756-253 253 253 253 253 253 253 253 253 253 253 253
57757-253 253 253 253 253 253 253 253 253 253 253 253
57758-253 253 253 253 253 253 253 253 253 253 253 253
57759-253 253 253 253 253 253 226 226 226 10 10 10
57760- 2 2 6 6 6 6 30 30 30 2 2 6
57761- 2 2 6 2 2 6 2 2 6 2 2 6
57762- 2 2 6 66 66 66 58 58 58 22 22 22
57763- 6 6 6 0 0 0 0 0 0 0 0 0
57764- 0 0 0 0 0 0 0 0 0 0 0 0
57765- 0 0 0 0 0 0 0 0 0 0 0 0
57766- 0 0 0 0 0 0 0 0 0 0 0 0
57767- 0 0 0 0 0 0 0 0 0 0 0 0
57768- 0 0 0 0 0 0 0 0 0 0 0 0
57769- 0 0 0 0 0 0 6 6 6 22 22 22
57770- 58 58 58 62 62 62 2 2 6 2 2 6
57771- 2 2 6 2 2 6 30 30 30 78 78 78
57772-250 250 250 253 253 253 253 253 253 253 253 253
57773-253 253 253 253 253 253 253 253 253 253 253 253
57774-253 253 253 253 253 253 231 231 231 246 246 246
57775-253 253 253 253 253 253 253 253 253 253 253 253
57776-253 253 253 253 253 253 253 253 253 253 253 253
57777-253 253 253 253 253 253 253 253 253 253 253 253
57778-253 253 253 253 253 253 253 253 253 253 253 253
57779-253 253 253 253 253 253 206 206 206 2 2 6
57780- 22 22 22 34 34 34 18 14 6 22 22 22
57781- 26 26 26 18 18 18 6 6 6 2 2 6
57782- 2 2 6 82 82 82 54 54 54 18 18 18
57783- 6 6 6 0 0 0 0 0 0 0 0 0
57784- 0 0 0 0 0 0 0 0 0 0 0 0
57785- 0 0 0 0 0 0 0 0 0 0 0 0
57786- 0 0 0 0 0 0 0 0 0 0 0 0
57787- 0 0 0 0 0 0 0 0 0 0 0 0
57788- 0 0 0 0 0 0 0 0 0 0 0 0
57789- 0 0 0 0 0 0 6 6 6 26 26 26
57790- 62 62 62 106 106 106 74 54 14 185 133 11
57791-210 162 10 121 92 8 6 6 6 62 62 62
57792-238 238 238 253 253 253 253 253 253 253 253 253
57793-253 253 253 253 253 253 253 253 253 253 253 253
57794-253 253 253 253 253 253 231 231 231 246 246 246
57795-253 253 253 253 253 253 253 253 253 253 253 253
57796-253 253 253 253 253 253 253 253 253 253 253 253
57797-253 253 253 253 253 253 253 253 253 253 253 253
57798-253 253 253 253 253 253 253 253 253 253 253 253
57799-253 253 253 253 253 253 158 158 158 18 18 18
57800- 14 14 14 2 2 6 2 2 6 2 2 6
57801- 6 6 6 18 18 18 66 66 66 38 38 38
57802- 6 6 6 94 94 94 50 50 50 18 18 18
57803- 6 6 6 0 0 0 0 0 0 0 0 0
57804- 0 0 0 0 0 0 0 0 0 0 0 0
57805- 0 0 0 0 0 0 0 0 0 0 0 0
57806- 0 0 0 0 0 0 0 0 0 0 0 0
57807- 0 0 0 0 0 0 0 0 0 0 0 0
57808- 0 0 0 0 0 0 0 0 0 6 6 6
57809- 10 10 10 10 10 10 18 18 18 38 38 38
57810- 78 78 78 142 134 106 216 158 10 242 186 14
57811-246 190 14 246 190 14 156 118 10 10 10 10
57812- 90 90 90 238 238 238 253 253 253 253 253 253
57813-253 253 253 253 253 253 253 253 253 253 253 253
57814-253 253 253 253 253 253 231 231 231 250 250 250
57815-253 253 253 253 253 253 253 253 253 253 253 253
57816-253 253 253 253 253 253 253 253 253 253 253 253
57817-253 253 253 253 253 253 253 253 253 253 253 253
57818-253 253 253 253 253 253 253 253 253 246 230 190
57819-238 204 91 238 204 91 181 142 44 37 26 9
57820- 2 2 6 2 2 6 2 2 6 2 2 6
57821- 2 2 6 2 2 6 38 38 38 46 46 46
57822- 26 26 26 106 106 106 54 54 54 18 18 18
57823- 6 6 6 0 0 0 0 0 0 0 0 0
57824- 0 0 0 0 0 0 0 0 0 0 0 0
57825- 0 0 0 0 0 0 0 0 0 0 0 0
57826- 0 0 0 0 0 0 0 0 0 0 0 0
57827- 0 0 0 0 0 0 0 0 0 0 0 0
57828- 0 0 0 6 6 6 14 14 14 22 22 22
57829- 30 30 30 38 38 38 50 50 50 70 70 70
57830-106 106 106 190 142 34 226 170 11 242 186 14
57831-246 190 14 246 190 14 246 190 14 154 114 10
57832- 6 6 6 74 74 74 226 226 226 253 253 253
57833-253 253 253 253 253 253 253 253 253 253 253 253
57834-253 253 253 253 253 253 231 231 231 250 250 250
57835-253 253 253 253 253 253 253 253 253 253 253 253
57836-253 253 253 253 253 253 253 253 253 253 253 253
57837-253 253 253 253 253 253 253 253 253 253 253 253
57838-253 253 253 253 253 253 253 253 253 228 184 62
57839-241 196 14 241 208 19 232 195 16 38 30 10
57840- 2 2 6 2 2 6 2 2 6 2 2 6
57841- 2 2 6 6 6 6 30 30 30 26 26 26
57842-203 166 17 154 142 90 66 66 66 26 26 26
57843- 6 6 6 0 0 0 0 0 0 0 0 0
57844- 0 0 0 0 0 0 0 0 0 0 0 0
57845- 0 0 0 0 0 0 0 0 0 0 0 0
57846- 0 0 0 0 0 0 0 0 0 0 0 0
57847- 0 0 0 0 0 0 0 0 0 0 0 0
57848- 6 6 6 18 18 18 38 38 38 58 58 58
57849- 78 78 78 86 86 86 101 101 101 123 123 123
57850-175 146 61 210 150 10 234 174 13 246 186 14
57851-246 190 14 246 190 14 246 190 14 238 190 10
57852-102 78 10 2 2 6 46 46 46 198 198 198
57853-253 253 253 253 253 253 253 253 253 253 253 253
57854-253 253 253 253 253 253 234 234 234 242 242 242
57855-253 253 253 253 253 253 253 253 253 253 253 253
57856-253 253 253 253 253 253 253 253 253 253 253 253
57857-253 253 253 253 253 253 253 253 253 253 253 253
57858-253 253 253 253 253 253 253 253 253 224 178 62
57859-242 186 14 241 196 14 210 166 10 22 18 6
57860- 2 2 6 2 2 6 2 2 6 2 2 6
57861- 2 2 6 2 2 6 6 6 6 121 92 8
57862-238 202 15 232 195 16 82 82 82 34 34 34
57863- 10 10 10 0 0 0 0 0 0 0 0 0
57864- 0 0 0 0 0 0 0 0 0 0 0 0
57865- 0 0 0 0 0 0 0 0 0 0 0 0
57866- 0 0 0 0 0 0 0 0 0 0 0 0
57867- 0 0 0 0 0 0 0 0 0 0 0 0
57868- 14 14 14 38 38 38 70 70 70 154 122 46
57869-190 142 34 200 144 11 197 138 11 197 138 11
57870-213 154 11 226 170 11 242 186 14 246 190 14
57871-246 190 14 246 190 14 246 190 14 246 190 14
57872-225 175 15 46 32 6 2 2 6 22 22 22
57873-158 158 158 250 250 250 253 253 253 253 253 253
57874-253 253 253 253 253 253 253 253 253 253 253 253
57875-253 253 253 253 253 253 253 253 253 253 253 253
57876-253 253 253 253 253 253 253 253 253 253 253 253
57877-253 253 253 253 253 253 253 253 253 253 253 253
57878-253 253 253 250 250 250 242 242 242 224 178 62
57879-239 182 13 236 186 11 213 154 11 46 32 6
57880- 2 2 6 2 2 6 2 2 6 2 2 6
57881- 2 2 6 2 2 6 61 42 6 225 175 15
57882-238 190 10 236 186 11 112 100 78 42 42 42
57883- 14 14 14 0 0 0 0 0 0 0 0 0
57884- 0 0 0 0 0 0 0 0 0 0 0 0
57885- 0 0 0 0 0 0 0 0 0 0 0 0
57886- 0 0 0 0 0 0 0 0 0 0 0 0
57887- 0 0 0 0 0 0 0 0 0 6 6 6
57888- 22 22 22 54 54 54 154 122 46 213 154 11
57889-226 170 11 230 174 11 226 170 11 226 170 11
57890-236 178 12 242 186 14 246 190 14 246 190 14
57891-246 190 14 246 190 14 246 190 14 246 190 14
57892-241 196 14 184 144 12 10 10 10 2 2 6
57893- 6 6 6 116 116 116 242 242 242 253 253 253
57894-253 253 253 253 253 253 253 253 253 253 253 253
57895-253 253 253 253 253 253 253 253 253 253 253 253
57896-253 253 253 253 253 253 253 253 253 253 253 253
57897-253 253 253 253 253 253 253 253 253 253 253 253
57898-253 253 253 231 231 231 198 198 198 214 170 54
57899-236 178 12 236 178 12 210 150 10 137 92 6
57900- 18 14 6 2 2 6 2 2 6 2 2 6
57901- 6 6 6 70 47 6 200 144 11 236 178 12
57902-239 182 13 239 182 13 124 112 88 58 58 58
57903- 22 22 22 6 6 6 0 0 0 0 0 0
57904- 0 0 0 0 0 0 0 0 0 0 0 0
57905- 0 0 0 0 0 0 0 0 0 0 0 0
57906- 0 0 0 0 0 0 0 0 0 0 0 0
57907- 0 0 0 0 0 0 0 0 0 10 10 10
57908- 30 30 30 70 70 70 180 133 36 226 170 11
57909-239 182 13 242 186 14 242 186 14 246 186 14
57910-246 190 14 246 190 14 246 190 14 246 190 14
57911-246 190 14 246 190 14 246 190 14 246 190 14
57912-246 190 14 232 195 16 98 70 6 2 2 6
57913- 2 2 6 2 2 6 66 66 66 221 221 221
57914-253 253 253 253 253 253 253 253 253 253 253 253
57915-253 253 253 253 253 253 253 253 253 253 253 253
57916-253 253 253 253 253 253 253 253 253 253 253 253
57917-253 253 253 253 253 253 253 253 253 253 253 253
57918-253 253 253 206 206 206 198 198 198 214 166 58
57919-230 174 11 230 174 11 216 158 10 192 133 9
57920-163 110 8 116 81 8 102 78 10 116 81 8
57921-167 114 7 197 138 11 226 170 11 239 182 13
57922-242 186 14 242 186 14 162 146 94 78 78 78
57923- 34 34 34 14 14 14 6 6 6 0 0 0
57924- 0 0 0 0 0 0 0 0 0 0 0 0
57925- 0 0 0 0 0 0 0 0 0 0 0 0
57926- 0 0 0 0 0 0 0 0 0 0 0 0
57927- 0 0 0 0 0 0 0 0 0 6 6 6
57928- 30 30 30 78 78 78 190 142 34 226 170 11
57929-239 182 13 246 190 14 246 190 14 246 190 14
57930-246 190 14 246 190 14 246 190 14 246 190 14
57931-246 190 14 246 190 14 246 190 14 246 190 14
57932-246 190 14 241 196 14 203 166 17 22 18 6
57933- 2 2 6 2 2 6 2 2 6 38 38 38
57934-218 218 218 253 253 253 253 253 253 253 253 253
57935-253 253 253 253 253 253 253 253 253 253 253 253
57936-253 253 253 253 253 253 253 253 253 253 253 253
57937-253 253 253 253 253 253 253 253 253 253 253 253
57938-250 250 250 206 206 206 198 198 198 202 162 69
57939-226 170 11 236 178 12 224 166 10 210 150 10
57940-200 144 11 197 138 11 192 133 9 197 138 11
57941-210 150 10 226 170 11 242 186 14 246 190 14
57942-246 190 14 246 186 14 225 175 15 124 112 88
57943- 62 62 62 30 30 30 14 14 14 6 6 6
57944- 0 0 0 0 0 0 0 0 0 0 0 0
57945- 0 0 0 0 0 0 0 0 0 0 0 0
57946- 0 0 0 0 0 0 0 0 0 0 0 0
57947- 0 0 0 0 0 0 0 0 0 10 10 10
57948- 30 30 30 78 78 78 174 135 50 224 166 10
57949-239 182 13 246 190 14 246 190 14 246 190 14
57950-246 190 14 246 190 14 246 190 14 246 190 14
57951-246 190 14 246 190 14 246 190 14 246 190 14
57952-246 190 14 246 190 14 241 196 14 139 102 15
57953- 2 2 6 2 2 6 2 2 6 2 2 6
57954- 78 78 78 250 250 250 253 253 253 253 253 253
57955-253 253 253 253 253 253 253 253 253 253 253 253
57956-253 253 253 253 253 253 253 253 253 253 253 253
57957-253 253 253 253 253 253 253 253 253 253 253 253
57958-250 250 250 214 214 214 198 198 198 190 150 46
57959-219 162 10 236 178 12 234 174 13 224 166 10
57960-216 158 10 213 154 11 213 154 11 216 158 10
57961-226 170 11 239 182 13 246 190 14 246 190 14
57962-246 190 14 246 190 14 242 186 14 206 162 42
57963-101 101 101 58 58 58 30 30 30 14 14 14
57964- 6 6 6 0 0 0 0 0 0 0 0 0
57965- 0 0 0 0 0 0 0 0 0 0 0 0
57966- 0 0 0 0 0 0 0 0 0 0 0 0
57967- 0 0 0 0 0 0 0 0 0 10 10 10
57968- 30 30 30 74 74 74 174 135 50 216 158 10
57969-236 178 12 246 190 14 246 190 14 246 190 14
57970-246 190 14 246 190 14 246 190 14 246 190 14
57971-246 190 14 246 190 14 246 190 14 246 190 14
57972-246 190 14 246 190 14 241 196 14 226 184 13
57973- 61 42 6 2 2 6 2 2 6 2 2 6
57974- 22 22 22 238 238 238 253 253 253 253 253 253
57975-253 253 253 253 253 253 253 253 253 253 253 253
57976-253 253 253 253 253 253 253 253 253 253 253 253
57977-253 253 253 253 253 253 253 253 253 253 253 253
57978-253 253 253 226 226 226 187 187 187 180 133 36
57979-216 158 10 236 178 12 239 182 13 236 178 12
57980-230 174 11 226 170 11 226 170 11 230 174 11
57981-236 178 12 242 186 14 246 190 14 246 190 14
57982-246 190 14 246 190 14 246 186 14 239 182 13
57983-206 162 42 106 106 106 66 66 66 34 34 34
57984- 14 14 14 6 6 6 0 0 0 0 0 0
57985- 0 0 0 0 0 0 0 0 0 0 0 0
57986- 0 0 0 0 0 0 0 0 0 0 0 0
57987- 0 0 0 0 0 0 0 0 0 6 6 6
57988- 26 26 26 70 70 70 163 133 67 213 154 11
57989-236 178 12 246 190 14 246 190 14 246 190 14
57990-246 190 14 246 190 14 246 190 14 246 190 14
57991-246 190 14 246 190 14 246 190 14 246 190 14
57992-246 190 14 246 190 14 246 190 14 241 196 14
57993-190 146 13 18 14 6 2 2 6 2 2 6
57994- 46 46 46 246 246 246 253 253 253 253 253 253
57995-253 253 253 253 253 253 253 253 253 253 253 253
57996-253 253 253 253 253 253 253 253 253 253 253 253
57997-253 253 253 253 253 253 253 253 253 253 253 253
57998-253 253 253 221 221 221 86 86 86 156 107 11
57999-216 158 10 236 178 12 242 186 14 246 186 14
58000-242 186 14 239 182 13 239 182 13 242 186 14
58001-242 186 14 246 186 14 246 190 14 246 190 14
58002-246 190 14 246 190 14 246 190 14 246 190 14
58003-242 186 14 225 175 15 142 122 72 66 66 66
58004- 30 30 30 10 10 10 0 0 0 0 0 0
58005- 0 0 0 0 0 0 0 0 0 0 0 0
58006- 0 0 0 0 0 0 0 0 0 0 0 0
58007- 0 0 0 0 0 0 0 0 0 6 6 6
58008- 26 26 26 70 70 70 163 133 67 210 150 10
58009-236 178 12 246 190 14 246 190 14 246 190 14
58010-246 190 14 246 190 14 246 190 14 246 190 14
58011-246 190 14 246 190 14 246 190 14 246 190 14
58012-246 190 14 246 190 14 246 190 14 246 190 14
58013-232 195 16 121 92 8 34 34 34 106 106 106
58014-221 221 221 253 253 253 253 253 253 253 253 253
58015-253 253 253 253 253 253 253 253 253 253 253 253
58016-253 253 253 253 253 253 253 253 253 253 253 253
58017-253 253 253 253 253 253 253 253 253 253 253 253
58018-242 242 242 82 82 82 18 14 6 163 110 8
58019-216 158 10 236 178 12 242 186 14 246 190 14
58020-246 190 14 246 190 14 246 190 14 246 190 14
58021-246 190 14 246 190 14 246 190 14 246 190 14
58022-246 190 14 246 190 14 246 190 14 246 190 14
58023-246 190 14 246 190 14 242 186 14 163 133 67
58024- 46 46 46 18 18 18 6 6 6 0 0 0
58025- 0 0 0 0 0 0 0 0 0 0 0 0
58026- 0 0 0 0 0 0 0 0 0 0 0 0
58027- 0 0 0 0 0 0 0 0 0 10 10 10
58028- 30 30 30 78 78 78 163 133 67 210 150 10
58029-236 178 12 246 186 14 246 190 14 246 190 14
58030-246 190 14 246 190 14 246 190 14 246 190 14
58031-246 190 14 246 190 14 246 190 14 246 190 14
58032-246 190 14 246 190 14 246 190 14 246 190 14
58033-241 196 14 215 174 15 190 178 144 253 253 253
58034-253 253 253 253 253 253 253 253 253 253 253 253
58035-253 253 253 253 253 253 253 253 253 253 253 253
58036-253 253 253 253 253 253 253 253 253 253 253 253
58037-253 253 253 253 253 253 253 253 253 218 218 218
58038- 58 58 58 2 2 6 22 18 6 167 114 7
58039-216 158 10 236 178 12 246 186 14 246 190 14
58040-246 190 14 246 190 14 246 190 14 246 190 14
58041-246 190 14 246 190 14 246 190 14 246 190 14
58042-246 190 14 246 190 14 246 190 14 246 190 14
58043-246 190 14 246 186 14 242 186 14 190 150 46
58044- 54 54 54 22 22 22 6 6 6 0 0 0
58045- 0 0 0 0 0 0 0 0 0 0 0 0
58046- 0 0 0 0 0 0 0 0 0 0 0 0
58047- 0 0 0 0 0 0 0 0 0 14 14 14
58048- 38 38 38 86 86 86 180 133 36 213 154 11
58049-236 178 12 246 186 14 246 190 14 246 190 14
58050-246 190 14 246 190 14 246 190 14 246 190 14
58051-246 190 14 246 190 14 246 190 14 246 190 14
58052-246 190 14 246 190 14 246 190 14 246 190 14
58053-246 190 14 232 195 16 190 146 13 214 214 214
58054-253 253 253 253 253 253 253 253 253 253 253 253
58055-253 253 253 253 253 253 253 253 253 253 253 253
58056-253 253 253 253 253 253 253 253 253 253 253 253
58057-253 253 253 250 250 250 170 170 170 26 26 26
58058- 2 2 6 2 2 6 37 26 9 163 110 8
58059-219 162 10 239 182 13 246 186 14 246 190 14
58060-246 190 14 246 190 14 246 190 14 246 190 14
58061-246 190 14 246 190 14 246 190 14 246 190 14
58062-246 190 14 246 190 14 246 190 14 246 190 14
58063-246 186 14 236 178 12 224 166 10 142 122 72
58064- 46 46 46 18 18 18 6 6 6 0 0 0
58065- 0 0 0 0 0 0 0 0 0 0 0 0
58066- 0 0 0 0 0 0 0 0 0 0 0 0
58067- 0 0 0 0 0 0 6 6 6 18 18 18
58068- 50 50 50 109 106 95 192 133 9 224 166 10
58069-242 186 14 246 190 14 246 190 14 246 190 14
58070-246 190 14 246 190 14 246 190 14 246 190 14
58071-246 190 14 246 190 14 246 190 14 246 190 14
58072-246 190 14 246 190 14 246 190 14 246 190 14
58073-242 186 14 226 184 13 210 162 10 142 110 46
58074-226 226 226 253 253 253 253 253 253 253 253 253
58075-253 253 253 253 253 253 253 253 253 253 253 253
58076-253 253 253 253 253 253 253 253 253 253 253 253
58077-198 198 198 66 66 66 2 2 6 2 2 6
58078- 2 2 6 2 2 6 50 34 6 156 107 11
58079-219 162 10 239 182 13 246 186 14 246 190 14
58080-246 190 14 246 190 14 246 190 14 246 190 14
58081-246 190 14 246 190 14 246 190 14 246 190 14
58082-246 190 14 246 190 14 246 190 14 242 186 14
58083-234 174 13 213 154 11 154 122 46 66 66 66
58084- 30 30 30 10 10 10 0 0 0 0 0 0
58085- 0 0 0 0 0 0 0 0 0 0 0 0
58086- 0 0 0 0 0 0 0 0 0 0 0 0
58087- 0 0 0 0 0 0 6 6 6 22 22 22
58088- 58 58 58 154 121 60 206 145 10 234 174 13
58089-242 186 14 246 186 14 246 190 14 246 190 14
58090-246 190 14 246 190 14 246 190 14 246 190 14
58091-246 190 14 246 190 14 246 190 14 246 190 14
58092-246 190 14 246 190 14 246 190 14 246 190 14
58093-246 186 14 236 178 12 210 162 10 163 110 8
58094- 61 42 6 138 138 138 218 218 218 250 250 250
58095-253 253 253 253 253 253 253 253 253 250 250 250
58096-242 242 242 210 210 210 144 144 144 66 66 66
58097- 6 6 6 2 2 6 2 2 6 2 2 6
58098- 2 2 6 2 2 6 61 42 6 163 110 8
58099-216 158 10 236 178 12 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 246 190 14
58102-246 190 14 239 182 13 230 174 11 216 158 10
58103-190 142 34 124 112 88 70 70 70 38 38 38
58104- 18 18 18 6 6 6 0 0 0 0 0 0
58105- 0 0 0 0 0 0 0 0 0 0 0 0
58106- 0 0 0 0 0 0 0 0 0 0 0 0
58107- 0 0 0 0 0 0 6 6 6 22 22 22
58108- 62 62 62 168 124 44 206 145 10 224 166 10
58109-236 178 12 239 182 13 242 186 14 242 186 14
58110-246 186 14 246 190 14 246 190 14 246 190 14
58111-246 190 14 246 190 14 246 190 14 246 190 14
58112-246 190 14 246 190 14 246 190 14 246 190 14
58113-246 190 14 236 178 12 216 158 10 175 118 6
58114- 80 54 7 2 2 6 6 6 6 30 30 30
58115- 54 54 54 62 62 62 50 50 50 38 38 38
58116- 14 14 14 2 2 6 2 2 6 2 2 6
58117- 2 2 6 2 2 6 2 2 6 2 2 6
58118- 2 2 6 6 6 6 80 54 7 167 114 7
58119-213 154 11 236 178 12 246 190 14 246 190 14
58120-246 190 14 246 190 14 246 190 14 246 190 14
58121-246 190 14 242 186 14 239 182 13 239 182 13
58122-230 174 11 210 150 10 174 135 50 124 112 88
58123- 82 82 82 54 54 54 34 34 34 18 18 18
58124- 6 6 6 0 0 0 0 0 0 0 0 0
58125- 0 0 0 0 0 0 0 0 0 0 0 0
58126- 0 0 0 0 0 0 0 0 0 0 0 0
58127- 0 0 0 0 0 0 6 6 6 18 18 18
58128- 50 50 50 158 118 36 192 133 9 200 144 11
58129-216 158 10 219 162 10 224 166 10 226 170 11
58130-230 174 11 236 178 12 239 182 13 239 182 13
58131-242 186 14 246 186 14 246 190 14 246 190 14
58132-246 190 14 246 190 14 246 190 14 246 190 14
58133-246 186 14 230 174 11 210 150 10 163 110 8
58134-104 69 6 10 10 10 2 2 6 2 2 6
58135- 2 2 6 2 2 6 2 2 6 2 2 6
58136- 2 2 6 2 2 6 2 2 6 2 2 6
58137- 2 2 6 2 2 6 2 2 6 2 2 6
58138- 2 2 6 6 6 6 91 60 6 167 114 7
58139-206 145 10 230 174 11 242 186 14 246 190 14
58140-246 190 14 246 190 14 246 186 14 242 186 14
58141-239 182 13 230 174 11 224 166 10 213 154 11
58142-180 133 36 124 112 88 86 86 86 58 58 58
58143- 38 38 38 22 22 22 10 10 10 6 6 6
58144- 0 0 0 0 0 0 0 0 0 0 0 0
58145- 0 0 0 0 0 0 0 0 0 0 0 0
58146- 0 0 0 0 0 0 0 0 0 0 0 0
58147- 0 0 0 0 0 0 0 0 0 14 14 14
58148- 34 34 34 70 70 70 138 110 50 158 118 36
58149-167 114 7 180 123 7 192 133 9 197 138 11
58150-200 144 11 206 145 10 213 154 11 219 162 10
58151-224 166 10 230 174 11 239 182 13 242 186 14
58152-246 186 14 246 186 14 246 186 14 246 186 14
58153-239 182 13 216 158 10 185 133 11 152 99 6
58154-104 69 6 18 14 6 2 2 6 2 2 6
58155- 2 2 6 2 2 6 2 2 6 2 2 6
58156- 2 2 6 2 2 6 2 2 6 2 2 6
58157- 2 2 6 2 2 6 2 2 6 2 2 6
58158- 2 2 6 6 6 6 80 54 7 152 99 6
58159-192 133 9 219 162 10 236 178 12 239 182 13
58160-246 186 14 242 186 14 239 182 13 236 178 12
58161-224 166 10 206 145 10 192 133 9 154 121 60
58162- 94 94 94 62 62 62 42 42 42 22 22 22
58163- 14 14 14 6 6 6 0 0 0 0 0 0
58164- 0 0 0 0 0 0 0 0 0 0 0 0
58165- 0 0 0 0 0 0 0 0 0 0 0 0
58166- 0 0 0 0 0 0 0 0 0 0 0 0
58167- 0 0 0 0 0 0 0 0 0 6 6 6
58168- 18 18 18 34 34 34 58 58 58 78 78 78
58169-101 98 89 124 112 88 142 110 46 156 107 11
58170-163 110 8 167 114 7 175 118 6 180 123 7
58171-185 133 11 197 138 11 210 150 10 219 162 10
58172-226 170 11 236 178 12 236 178 12 234 174 13
58173-219 162 10 197 138 11 163 110 8 130 83 6
58174- 91 60 6 10 10 10 2 2 6 2 2 6
58175- 18 18 18 38 38 38 38 38 38 38 38 38
58176- 38 38 38 38 38 38 38 38 38 38 38 38
58177- 38 38 38 38 38 38 26 26 26 2 2 6
58178- 2 2 6 6 6 6 70 47 6 137 92 6
58179-175 118 6 200 144 11 219 162 10 230 174 11
58180-234 174 13 230 174 11 219 162 10 210 150 10
58181-192 133 9 163 110 8 124 112 88 82 82 82
58182- 50 50 50 30 30 30 14 14 14 6 6 6
58183- 0 0 0 0 0 0 0 0 0 0 0 0
58184- 0 0 0 0 0 0 0 0 0 0 0 0
58185- 0 0 0 0 0 0 0 0 0 0 0 0
58186- 0 0 0 0 0 0 0 0 0 0 0 0
58187- 0 0 0 0 0 0 0 0 0 0 0 0
58188- 6 6 6 14 14 14 22 22 22 34 34 34
58189- 42 42 42 58 58 58 74 74 74 86 86 86
58190-101 98 89 122 102 70 130 98 46 121 87 25
58191-137 92 6 152 99 6 163 110 8 180 123 7
58192-185 133 11 197 138 11 206 145 10 200 144 11
58193-180 123 7 156 107 11 130 83 6 104 69 6
58194- 50 34 6 54 54 54 110 110 110 101 98 89
58195- 86 86 86 82 82 82 78 78 78 78 78 78
58196- 78 78 78 78 78 78 78 78 78 78 78 78
58197- 78 78 78 82 82 82 86 86 86 94 94 94
58198-106 106 106 101 101 101 86 66 34 124 80 6
58199-156 107 11 180 123 7 192 133 9 200 144 11
58200-206 145 10 200 144 11 192 133 9 175 118 6
58201-139 102 15 109 106 95 70 70 70 42 42 42
58202- 22 22 22 10 10 10 0 0 0 0 0 0
58203- 0 0 0 0 0 0 0 0 0 0 0 0
58204- 0 0 0 0 0 0 0 0 0 0 0 0
58205- 0 0 0 0 0 0 0 0 0 0 0 0
58206- 0 0 0 0 0 0 0 0 0 0 0 0
58207- 0 0 0 0 0 0 0 0 0 0 0 0
58208- 0 0 0 0 0 0 6 6 6 10 10 10
58209- 14 14 14 22 22 22 30 30 30 38 38 38
58210- 50 50 50 62 62 62 74 74 74 90 90 90
58211-101 98 89 112 100 78 121 87 25 124 80 6
58212-137 92 6 152 99 6 152 99 6 152 99 6
58213-138 86 6 124 80 6 98 70 6 86 66 30
58214-101 98 89 82 82 82 58 58 58 46 46 46
58215- 38 38 38 34 34 34 34 34 34 34 34 34
58216- 34 34 34 34 34 34 34 34 34 34 34 34
58217- 34 34 34 34 34 34 38 38 38 42 42 42
58218- 54 54 54 82 82 82 94 86 76 91 60 6
58219-134 86 6 156 107 11 167 114 7 175 118 6
58220-175 118 6 167 114 7 152 99 6 121 87 25
58221-101 98 89 62 62 62 34 34 34 18 18 18
58222- 6 6 6 0 0 0 0 0 0 0 0 0
58223- 0 0 0 0 0 0 0 0 0 0 0 0
58224- 0 0 0 0 0 0 0 0 0 0 0 0
58225- 0 0 0 0 0 0 0 0 0 0 0 0
58226- 0 0 0 0 0 0 0 0 0 0 0 0
58227- 0 0 0 0 0 0 0 0 0 0 0 0
58228- 0 0 0 0 0 0 0 0 0 0 0 0
58229- 0 0 0 6 6 6 6 6 6 10 10 10
58230- 18 18 18 22 22 22 30 30 30 42 42 42
58231- 50 50 50 66 66 66 86 86 86 101 98 89
58232-106 86 58 98 70 6 104 69 6 104 69 6
58233-104 69 6 91 60 6 82 62 34 90 90 90
58234- 62 62 62 38 38 38 22 22 22 14 14 14
58235- 10 10 10 10 10 10 10 10 10 10 10 10
58236- 10 10 10 10 10 10 6 6 6 10 10 10
58237- 10 10 10 10 10 10 10 10 10 14 14 14
58238- 22 22 22 42 42 42 70 70 70 89 81 66
58239- 80 54 7 104 69 6 124 80 6 137 92 6
58240-134 86 6 116 81 8 100 82 52 86 86 86
58241- 58 58 58 30 30 30 14 14 14 6 6 6
58242- 0 0 0 0 0 0 0 0 0 0 0 0
58243- 0 0 0 0 0 0 0 0 0 0 0 0
58244- 0 0 0 0 0 0 0 0 0 0 0 0
58245- 0 0 0 0 0 0 0 0 0 0 0 0
58246- 0 0 0 0 0 0 0 0 0 0 0 0
58247- 0 0 0 0 0 0 0 0 0 0 0 0
58248- 0 0 0 0 0 0 0 0 0 0 0 0
58249- 0 0 0 0 0 0 0 0 0 0 0 0
58250- 0 0 0 6 6 6 10 10 10 14 14 14
58251- 18 18 18 26 26 26 38 38 38 54 54 54
58252- 70 70 70 86 86 86 94 86 76 89 81 66
58253- 89 81 66 86 86 86 74 74 74 50 50 50
58254- 30 30 30 14 14 14 6 6 6 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 0 0 0
58257- 0 0 0 0 0 0 0 0 0 0 0 0
58258- 6 6 6 18 18 18 34 34 34 58 58 58
58259- 82 82 82 89 81 66 89 81 66 89 81 66
58260- 94 86 66 94 86 76 74 74 74 50 50 50
58261- 26 26 26 14 14 14 6 6 6 0 0 0
58262- 0 0 0 0 0 0 0 0 0 0 0 0
58263- 0 0 0 0 0 0 0 0 0 0 0 0
58264- 0 0 0 0 0 0 0 0 0 0 0 0
58265- 0 0 0 0 0 0 0 0 0 0 0 0
58266- 0 0 0 0 0 0 0 0 0 0 0 0
58267- 0 0 0 0 0 0 0 0 0 0 0 0
58268- 0 0 0 0 0 0 0 0 0 0 0 0
58269- 0 0 0 0 0 0 0 0 0 0 0 0
58270- 0 0 0 0 0 0 0 0 0 0 0 0
58271- 6 6 6 6 6 6 14 14 14 18 18 18
58272- 30 30 30 38 38 38 46 46 46 54 54 54
58273- 50 50 50 42 42 42 30 30 30 18 18 18
58274- 10 10 10 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 0 0 0
58277- 0 0 0 0 0 0 0 0 0 0 0 0
58278- 0 0 0 6 6 6 14 14 14 26 26 26
58279- 38 38 38 50 50 50 58 58 58 58 58 58
58280- 54 54 54 42 42 42 30 30 30 18 18 18
58281- 10 10 10 0 0 0 0 0 0 0 0 0
58282- 0 0 0 0 0 0 0 0 0 0 0 0
58283- 0 0 0 0 0 0 0 0 0 0 0 0
58284- 0 0 0 0 0 0 0 0 0 0 0 0
58285- 0 0 0 0 0 0 0 0 0 0 0 0
58286- 0 0 0 0 0 0 0 0 0 0 0 0
58287- 0 0 0 0 0 0 0 0 0 0 0 0
58288- 0 0 0 0 0 0 0 0 0 0 0 0
58289- 0 0 0 0 0 0 0 0 0 0 0 0
58290- 0 0 0 0 0 0 0 0 0 0 0 0
58291- 0 0 0 0 0 0 0 0 0 6 6 6
58292- 6 6 6 10 10 10 14 14 14 18 18 18
58293- 18 18 18 14 14 14 10 10 10 6 6 6
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- 0 0 0 0 0 0 0 0 0 0 0 0
58298- 0 0 0 0 0 0 0 0 0 6 6 6
58299- 14 14 14 18 18 18 22 22 22 22 22 22
58300- 18 18 18 14 14 14 10 10 10 6 6 6
58301- 0 0 0 0 0 0 0 0 0 0 0 0
58302- 0 0 0 0 0 0 0 0 0 0 0 0
58303- 0 0 0 0 0 0 0 0 0 0 0 0
58304- 0 0 0 0 0 0 0 0 0 0 0 0
58305- 0 0 0 0 0 0 0 0 0 0 0 0
58306+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58307+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58308+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58309+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58310+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58311+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58312+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58313+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58314+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58315+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58316+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58317+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58318+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58319+4 4 4 4 4 4
58320+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58321+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58322+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58323+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58324+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58325+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58326+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58327+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58328+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58329+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58330+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58331+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58332+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58333+4 4 4 4 4 4
58334+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58335+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58336+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58337+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58338+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58339+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58340+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58341+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58342+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58343+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58344+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58345+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58346+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58347+4 4 4 4 4 4
58348+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58349+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58350+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58351+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58352+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58353+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58354+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58355+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58356+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58357+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58358+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58359+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58360+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58361+4 4 4 4 4 4
58362+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58363+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58364+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58365+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58366+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58367+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58368+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58369+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58370+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58371+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58372+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58374+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58375+4 4 4 4 4 4
58376+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58377+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58378+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58379+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58380+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58381+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58382+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58383+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58384+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58385+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58386+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58388+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58389+4 4 4 4 4 4
58390+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58391+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58392+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58394+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
58395+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
58396+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58397+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58398+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58399+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
58400+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58401+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
58402+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58403+4 4 4 4 4 4
58404+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58405+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58406+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58407+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58408+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
58409+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
58410+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58411+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58412+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58413+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
58414+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
58415+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
58416+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58417+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+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
58423+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
58424+0 0 0 3 3 3 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 0 0 0 4 4 4 41 54 63 125 124 125
58428+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
58429+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
58430+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
58431+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 5 5 5 5 5 5 2 2 2 0 0 0
58436+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
58437+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
58438+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 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 5 5 5 5 5 5
58441+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
58442+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
58443+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
58444+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
58445+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 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
58450+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
58451+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
58452+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
58453+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58454+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
58455+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
58456+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
58457+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
58458+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
58459+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 5 5 5
58463+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
58464+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
58465+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
58466+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
58467+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58468+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
58469+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
58470+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
58471+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
58472+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
58473+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 5 5 5 3 3 3
58477+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
58478+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
58479+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
58480+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
58481+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
58482+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
58483+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
58484+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
58485+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
58486+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
58487+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 2 2 2 0 0 0 4 0 0
58491+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
58492+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
58493+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
58494+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
58495+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
58496+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
58497+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
58498+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
58499+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
58500+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
58501+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 4 4 4 4 4 4 4 4 4
58504+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
58505+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
58506+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
58507+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
58508+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
58509+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
58510+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
58511+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
58512+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
58513+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
58514+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58515+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 4 4 4 4 4 4 4 4 4 4 4 4
58518+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
58519+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
58520+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
58521+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
58522+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
58523+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
58524+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
58525+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
58526+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
58527+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
58528+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
58529+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+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
58532+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
58533+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
58534+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
58535+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
58536+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
58537+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
58538+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
58539+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
58540+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
58541+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
58542+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
58543+4 4 4 4 4 4
58544+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58545+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
58546+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
58547+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
58548+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58549+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
58550+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
58551+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
58552+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
58553+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
58554+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
58555+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
58556+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
58557+0 0 0 4 4 4
58558+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58559+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
58560+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
58561+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
58562+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
58563+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
58564+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
58565+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
58566+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
58567+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
58568+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
58569+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
58570+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
58571+2 0 0 0 0 0
58572+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
58573+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
58574+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
58575+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
58576+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
58577+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
58578+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
58579+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
58580+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
58581+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
58582+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
58583+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
58584+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
58585+37 38 37 0 0 0
58586+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58587+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
58588+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
58589+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
58590+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
58591+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
58592+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
58593+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
58594+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
58595+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
58596+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
58597+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
58598+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
58599+85 115 134 4 0 0
58600+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
58601+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
58602+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
58603+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
58604+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
58605+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
58606+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
58607+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
58608+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
58609+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
58610+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
58611+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
58612+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
58613+60 73 81 4 0 0
58614+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
58615+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
58616+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
58617+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
58618+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
58619+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
58620+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
58621+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
58622+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
58623+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
58624+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
58625+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
58626+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
58627+16 19 21 4 0 0
58628+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
58629+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
58630+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
58631+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
58632+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
58633+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
58634+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
58635+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
58636+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
58637+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
58638+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
58639+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
58640+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
58641+4 0 0 4 3 3
58642+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
58643+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
58644+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
58645+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
58646+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
58647+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
58648+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
58649+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
58650+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
58651+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
58652+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
58653+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
58654+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
58655+3 2 2 4 4 4
58656+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
58657+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
58658+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
58659+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58660+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
58661+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
58662+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
58663+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
58664+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
58665+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
58666+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
58667+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
58668+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
58669+4 4 4 4 4 4
58670+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
58671+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
58672+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
58673+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
58674+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
58675+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
58676+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
58677+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
58678+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
58679+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
58680+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
58681+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
58682+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
58683+4 4 4 4 4 4
58684+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
58685+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
58686+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
58687+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
58688+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
58689+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58690+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
58691+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
58692+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
58693+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
58694+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
58695+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
58696+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
58697+5 5 5 5 5 5
58698+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
58699+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
58700+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
58701+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
58702+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
58703+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58704+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
58705+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
58706+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
58707+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
58708+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
58709+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
58710+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58711+5 5 5 4 4 4
58712+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
58713+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
58714+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
58715+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
58716+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58717+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
58718+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
58719+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
58720+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
58721+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
58722+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
58723+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
58724+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58725+4 4 4 4 4 4
58726+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
58727+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
58728+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
58729+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
58730+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
58731+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58732+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58733+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
58734+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
58735+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
58736+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
58737+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
58738+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58739+4 4 4 4 4 4
58740+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
58741+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
58742+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
58743+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
58744+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58745+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
58746+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
58747+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
58748+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
58749+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
58750+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
58751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58752+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58753+4 4 4 4 4 4
58754+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
58755+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
58756+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
58757+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
58758+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58759+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58760+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58761+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
58762+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
58763+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
58764+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
58765+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58766+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58767+4 4 4 4 4 4
58768+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
58769+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
58770+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
58771+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
58772+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58773+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
58774+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58775+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
58776+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
58777+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
58778+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58779+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58780+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58781+4 4 4 4 4 4
58782+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
58783+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
58784+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
58785+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
58786+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58787+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
58788+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
58789+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
58790+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
58791+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
58792+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
58793+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58794+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58795+4 4 4 4 4 4
58796+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
58797+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
58798+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
58799+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
58800+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58801+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
58802+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
58803+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
58804+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
58805+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
58806+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
58807+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58808+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58809+4 4 4 4 4 4
58810+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
58811+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
58812+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
58813+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58814+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
58815+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
58816+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
58817+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
58818+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
58819+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
58820+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58821+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58822+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58823+4 4 4 4 4 4
58824+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
58825+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
58826+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
58827+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58828+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58829+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
58830+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
58831+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
58832+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
58833+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
58834+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58835+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58837+4 4 4 4 4 4
58838+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
58839+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
58840+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58841+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58842+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58843+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
58844+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
58845+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
58846+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
58847+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
58848+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58849+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58850+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58851+4 4 4 4 4 4
58852+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
58853+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
58854+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58855+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58856+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58857+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
58858+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
58859+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
58860+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58861+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58862+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58863+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58864+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58865+4 4 4 4 4 4
58866+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58867+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
58868+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58869+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
58870+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
58871+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
58872+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
58873+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
58874+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58875+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58876+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58877+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58878+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58879+4 4 4 4 4 4
58880+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58881+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
58882+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58883+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
58884+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58885+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
58886+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
58887+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
58888+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58889+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58890+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58891+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58892+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58893+4 4 4 4 4 4
58894+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
58895+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
58896+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58897+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
58898+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
58899+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
58900+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
58901+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
58902+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58903+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58904+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58905+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58906+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58907+4 4 4 4 4 4
58908+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
58909+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
58910+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58911+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
58912+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
58913+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
58914+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
58915+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
58916+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58917+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58918+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58919+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58920+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58921+4 4 4 4 4 4
58922+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
58923+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
58924+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58925+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
58926+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
58927+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
58928+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
58929+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
58930+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58931+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58932+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58933+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58934+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58935+4 4 4 4 4 4
58936+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
58937+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
58938+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58939+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
58940+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
58941+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
58942+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
58943+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
58944+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
58945+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58946+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58947+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58948+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58949+4 4 4 4 4 4
58950+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
58951+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
58952+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
58953+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
58954+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
58955+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
58956+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
58957+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
58958+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58959+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58960+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58961+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58962+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58963+4 4 4 4 4 4
58964+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58965+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
58966+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58967+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
58968+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
58969+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
58970+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
58971+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
58972+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58973+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58974+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58975+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58976+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58977+4 4 4 4 4 4
58978+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
58979+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
58980+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
58981+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
58982+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
58983+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
58984+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58985+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
58986+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58987+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58988+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58989+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58990+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58991+4 4 4 4 4 4
58992+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58993+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
58994+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
58995+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
58996+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
58997+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
58998+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58999+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
59000+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59001+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59002+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59003+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59004+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59005+4 4 4 4 4 4
59006+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59007+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
59008+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
59009+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
59010+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
59011+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
59012+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
59013+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
59014+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
59015+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59016+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59017+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59018+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59019+4 4 4 4 4 4
59020+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59021+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
59022+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
59023+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
59024+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
59025+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
59026+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
59027+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
59028+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
59029+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59030+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59031+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59032+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59033+4 4 4 4 4 4
59034+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
59035+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
59036+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
59037+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
59038+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59039+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
59040+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
59041+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
59042+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
59043+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59044+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59045+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59046+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59047+4 4 4 4 4 4
59048+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59049+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
59050+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
59051+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
59052+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
59053+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
59054+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
59055+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
59056+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
59057+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59058+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59059+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59060+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59061+4 4 4 4 4 4
59062+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
59063+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
59064+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
59065+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
59066+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
59067+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
59068+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
59069+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
59070+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
59071+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
59072+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59073+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59074+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59075+4 4 4 4 4 4
59076+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
59077+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59078+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
59079+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
59080+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
59081+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
59082+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
59083+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
59084+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
59085+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
59086+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59087+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59088+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59089+4 4 4 4 4 4
59090+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
59091+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59092+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
59093+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
59094+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
59095+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
59096+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59097+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
59098+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
59099+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
59100+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59101+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59102+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59103+4 4 4 4 4 4
59104+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
59105+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
59106+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
59107+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
59108+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
59109+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
59110+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
59111+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
59112+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
59113+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
59114+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59115+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59116+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59117+4 4 4 4 4 4
59118+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
59119+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
59120+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59121+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
59122+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
59123+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
59124+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
59125+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
59126+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
59127+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
59128+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59129+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59130+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59131+4 4 4 4 4 4
59132+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59133+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
59134+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
59135+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
59136+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
59137+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
59138+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
59139+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
59140+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
59141+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59142+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59143+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59144+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59145+4 4 4 4 4 4
59146+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
59147+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
59148+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
59149+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
59150+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
59151+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
59152+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
59153+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
59154+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
59155+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
59156+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59157+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59158+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59159+4 4 4 4 4 4
59160+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
59161+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
59162+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
59163+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
59164+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
59165+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
59166+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
59167+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
59168+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
59169+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59170+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59171+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59172+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59173+4 4 4 4 4 4
59174+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
59175+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59176+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
59177+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59178+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
59179+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
59180+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
59181+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
59182+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
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 4 4 4 4 4 4 4 4 4 4 4 4
59185+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59186+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59187+4 4 4 4 4 4
59188+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
59189+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
59190+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
59191+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
59192+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
59193+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
59194+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
59195+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
59196+4 0 0 4 0 0 4 0 0 6 6 6 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 4 4 4 4 4 4 4 4 4 4 4 4
59199+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59200+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59201+4 4 4 4 4 4
59202+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59203+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
59204+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
59205+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
59206+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
59207+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
59208+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
59209+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
59210+4 0 0 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 4 4 4 4 4 4 4 4 4 4 4 4
59213+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59214+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59215+4 4 4 4 4 4
59216+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
59217+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
59218+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59219+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
59220+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
59221+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
59222+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
59223+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
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 4 4 4 4 4 4 4 4 4 4 4 4
59227+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59228+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59229+4 4 4 4 4 4
59230+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59231+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
59232+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
59233+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
59234+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
59235+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
59236+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
59237+6 6 6 4 0 0 4 0 0 4 3 3 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 4 4 4 4 4 4 4 4 4 4 4 4
59241+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59242+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59243+4 4 4 4 4 4
59244+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59245+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
59246+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59247+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
59248+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
59249+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
59250+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
59251+4 0 0 4 3 3 6 6 6 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 4 4 4 4 4 4 4 4 4 4 4 4
59255+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59256+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59257+4 4 4 4 4 4
59258+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59259+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
59260+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
59261+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
59262+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
59263+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
59264+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
59265+6 6 6 6 6 6 4 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
59269+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59270+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59271+4 4 4 4 4 4
59272+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59273+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
59274+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
59275+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59276+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
59277+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
59278+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
59279+5 5 5 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
59283+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59284+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59285+4 4 4 4 4 4
59286+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59287+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59288+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59289+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
59290+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
59291+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
59292+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
59293+4 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
59297+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59298+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59299+4 4 4 4 4 4
59300+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59301+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59302+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59303+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59304+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
59305+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
59306+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
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 4 4 4 4 4 4 4 4 4 4 4 4
59311+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59312+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59313+4 4 4 4 4 4
59314+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59315+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59316+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59317+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59318+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59319+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
59320+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
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 4 4 4 4 4 4 4 4 4 4 4 4
59325+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59326+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59327+4 4 4 4 4 4
59328+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59329+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59330+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59331+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59332+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59333+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59334+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
59339+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59340+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59341+4 4 4 4 4 4
59342+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59343+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59344+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59345+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
59346+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
59347+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
59348+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
59353+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59354+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59355+4 4 4 4 4 4
59356+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59357+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59358+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59359+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59360+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
59361+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59362+6 6 6 4 3 3 5 5 5 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 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59369+4 4 4 4 4 4
59370+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59371+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59372+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59374+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
59375+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
59376+4 3 3 5 5 5 5 5 5 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 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4
59383+4 4 4 4 4 4
59384+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59385+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59386+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59388+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
59389+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
59390+5 5 5 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 4 4 4 4 4 4 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 4 4 4
59398+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59399+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59400+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59401+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59402+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
59403+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
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 4 4 4 4 4 4 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
59412+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59413+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59414+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59416+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59417+5 5 5 4 3 3 5 5 5 5 5 5 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 4 4 4 4 4 4 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
59426diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
59427index 3838795..0d48d61 100644
59428--- a/drivers/xen/events/events_base.c
59429+++ b/drivers/xen/events/events_base.c
59430@@ -1568,7 +1568,7 @@ void xen_irq_resume(void)
59431 restore_pirqs();
59432 }
59433
59434-static struct irq_chip xen_dynamic_chip __read_mostly = {
59435+static struct irq_chip xen_dynamic_chip = {
59436 .name = "xen-dyn",
59437
59438 .irq_disable = disable_dynirq,
59439@@ -1582,7 +1582,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
59440 .irq_retrigger = retrigger_dynirq,
59441 };
59442
59443-static struct irq_chip xen_pirq_chip __read_mostly = {
59444+static struct irq_chip xen_pirq_chip = {
59445 .name = "xen-pirq",
59446
59447 .irq_startup = startup_pirq,
59448@@ -1602,7 +1602,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
59449 .irq_retrigger = retrigger_dynirq,
59450 };
59451
59452-static struct irq_chip xen_percpu_chip __read_mostly = {
59453+static struct irq_chip xen_percpu_chip = {
59454 .name = "xen-percpu",
59455
59456 .irq_disable = disable_dynirq,
59457diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
59458index fef20db..d28b1ab 100644
59459--- a/drivers/xen/xenfs/xenstored.c
59460+++ b/drivers/xen/xenfs/xenstored.c
59461@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
59462 static int xsd_kva_open(struct inode *inode, struct file *file)
59463 {
59464 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
59465+#ifdef CONFIG_GRKERNSEC_HIDESYM
59466+ NULL);
59467+#else
59468 xen_store_interface);
59469+#endif
59470+
59471 if (!file->private_data)
59472 return -ENOMEM;
59473 return 0;
59474diff --git a/firmware/Makefile b/firmware/Makefile
59475index e297e1b..6900c31 100644
59476--- a/firmware/Makefile
59477+++ b/firmware/Makefile
59478@@ -35,6 +35,7 @@ fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.9.0.fw \
59479 bnx2x/bnx2x-e1h-6.2.9.0.fw \
59480 bnx2x/bnx2x-e2-6.2.9.0.fw
59481 fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \
59482+ bnx2/bnx2-mips-09-6.2.1b.fw \
59483 bnx2/bnx2-rv2p-09-6.0.17.fw \
59484 bnx2/bnx2-rv2p-09ax-6.0.17.fw \
59485 bnx2/bnx2-mips-06-6.2.1.fw \
59486diff --git a/firmware/WHENCE b/firmware/WHENCE
59487index 0c4d96d..7563083 100644
59488--- a/firmware/WHENCE
59489+++ b/firmware/WHENCE
59490@@ -655,19 +655,20 @@ Driver: BNX2 - Broadcom NetXtremeII
59491 File: bnx2/bnx2-mips-06-6.2.1.fw
59492 File: bnx2/bnx2-rv2p-06-6.0.15.fw
59493 File: bnx2/bnx2-mips-09-6.2.1a.fw
59494+File: bnx2/bnx2-mips-09-6.2.1b.fw
59495 File: bnx2/bnx2-rv2p-09-6.0.17.fw
59496 File: bnx2/bnx2-rv2p-09ax-6.0.17.fw
59497
59498 Licence:
59499-
59500- This file contains firmware data derived from proprietary unpublished
59501- source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59502-
59503- Permission is hereby granted for the distribution of this firmware data
59504- in hexadecimal or equivalent format, provided this copyright notice is
59505- accompanying it.
59506-
59507-Found in hex form in kernel source.
59508+
59509+ This file contains firmware data derived from proprietary unpublished
59510+ source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59511+
59512+ Permission is hereby granted for the distribution of this firmware data
59513+ in hexadecimal or equivalent format, provided this copyright notice is
59514+ accompanying it.
59515+
59516+Found in hex form in kernel source.
59517
59518 --------------------------------------------------------------------------
59519
59520diff --git a/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
59521new file mode 100644
59522index 0000000..43d7c4f
59523--- /dev/null
59524+++ b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
59525@@ -0,0 +1,6496 @@
59526+:10000000080001180800000000005594000000C816
59527+:1000100000000000000000000000000008005594EF
59528+:10002000000000380000565C080000A00800000036
59529+:100030000000574400005694080059200000008436
59530+:100040000000ADD808005744000001C00000AE5CBD
59531+:100050000800321008000000000092580000B01C98
59532+:10006000000000000000000000000000080092589E
59533+:100070000000033C000142740800049008000400E2
59534+:10008000000012FC000145B000000000000000006C
59535+:1000900000000000080016FC00000004000158AC3D
59536+:1000A000080000A80800000000003D00000158B052
59537+:1000B00000000000000000000000000008003D00FB
59538+:1000C00000000030000195B00A000046000000006A
59539+:1000D000000000000000000D636F6D362E322E31DF
59540+:1000E00062000000060201020000000000000003A0
59541+:1000F000000000C800000032000000030000000003
59542+:1001000000000000000000000000000000000000EF
59543+:1001100000000010000001360000EA600000000549
59544+:1001200000000000000000000000000000000008C7
59545+:1001300000000000000000000000000000000000BF
59546+:1001400000000000000000000000000000000000AF
59547+:10015000000000000000000000000000000000009F
59548+:10016000000000020000000000000000000000008D
59549+:10017000000000000000000000000000000000007F
59550+:10018000000000000000000000000010000000005F
59551+:10019000000000000000000000000000000000005F
59552+:1001A000000000000000000000000000000000004F
59553+:1001B000000000000000000000000000000000003F
59554+:1001C000000000000000000000000000000000002F
59555+:1001D000000000000000000000000000000000001F
59556+:1001E0000000000010000003000000000000000DEF
59557+:1001F0000000000D3C020800244256083C030800A1
59558+:1002000024635754AC4000000043202B1480FFFDB2
59559+:10021000244200043C1D080037BD9FFC03A0F021D0
59560+:100220003C100800261001183C1C0800279C5608AA
59561+:100230000E000256000000000000000D27BDFFB4B4
59562+:10024000AFA10000AFA20004AFA30008AFA4000C50
59563+:10025000AFA50010AFA60014AFA70018AFA8001CF0
59564+:10026000AFA90020AFAA0024AFAB0028AFAC002C90
59565+:10027000AFAD0030AFAE0034AFAF0038AFB8003C28
59566+:10028000AFB90040AFBC0044AFBF00480E001544FA
59567+:10029000000000008FBF00488FBC00448FB90040B1
59568+:1002A0008FB8003C8FAF00388FAE00348FAD003078
59569+:1002B0008FAC002C8FAB00288FAA00248FA90020C0
59570+:1002C0008FA8001C8FA700188FA600148FA5001000
59571+:1002D0008FA4000C8FA300088FA200048FA1000040
59572+:1002E00027BD004C3C1B60108F7A5030377B502864
59573+:1002F00003400008AF7A00008F82002427BDFFE092
59574+:10030000AFB00010AFBF0018AFB100148C42000CAA
59575+:100310003C1080008E110100104000348FBF001887
59576+:100320000E000D84000000008F85002024047FFF54
59577+:100330000091202BACB100008E030104960201084D
59578+:1003400000031C003042FFFF00621825ACA300042C
59579+:100350009202010A96030114304200FF3063FFFF4E
59580+:100360000002140000431025ACA200089603010C03
59581+:100370009602010E00031C003042FFFF00621825A8
59582+:10038000ACA3000C960301109602011200031C009E
59583+:100390003042FFFF00621825ACA300108E02011846
59584+:1003A000ACA200148E02011CACA20018148000083C
59585+:1003B0008F820024978200003C0420050044182509
59586+:1003C00024420001ACA3001C0A0000C6A782000062
59587+:1003D0003C0340189442001E00431025ACA2001CB0
59588+:1003E0000E000DB8240400018FBF00188FB1001457
59589+:1003F0008FB000100000102103E0000827BD00208E
59590+:100400003C0780008CE202B834E50100044100089A
59591+:10041000240300013C0208008C42006024420001D9
59592+:100420003C010800AC22006003E0000800601021DD
59593+:100430003C0208008C42005C8CA4002094A30016AF
59594+:100440008CA6000494A5000E24420001ACE40280B6
59595+:100450002463FFFC3C010800AC22005C3C0210005D
59596+:10046000A4E30284A4E5028600001821ACE6028819
59597+:10047000ACE202B803E000080060102127BDFFE0F5
59598+:100480003C028000AFB0001034420100AFBF001C3E
59599+:10049000AFB20018AFB100148C43000094450008BF
59600+:1004A0002462FE002C42038110400003000381C23D
59601+:1004B0000A00010226100004240201001462000553
59602+:1004C0003C1180003C02800890420004305000FF44
59603+:1004D0003C11800036320100964300143202000FB6
59604+:1004E00000021500004310253C0308008C63004403
59605+:1004F00030A40004AE220080246300013C01080007
59606+:10050000AC2300441080000730A200028FBF001C03
59607+:100510008FB200188FB100148FB000100A0000CE07
59608+:1005200027BD00201040002D0000182130A20080BF
59609+:1005300010400005362200708E44001C0E000C672F
59610+:10054000240500A0362200708C4400008F82000C2D
59611+:10055000008210232C43012C10600004AF82001095
59612+:10056000240300010A000145AF84000C8E42000400
59613+:100570003C036020AF84000CAC6200143C02080015
59614+:100580008C42005850400015000018218C62000475
59615+:10059000240301FE304203FF144300100000182121
59616+:1005A0002E020004104000032E0200080A00014041
59617+:1005B0000000802114400003000000000A000140F8
59618+:1005C0002610FFF90000000D2402000202021004B0
59619+:1005D0003C036000AC626914000018218FBF001C4E
59620+:1005E0008FB200188FB100148FB00010006010217E
59621+:1005F00003E0000827BD00203C0480008C8301003C
59622+:1006000024020100506200033C0280080000000D3B
59623+:100610003C02800890430004000010213063000F6A
59624+:1006200000031D0003E00008AC8300800004188074
59625+:100630002782FF9C00621821000410C00044102390
59626+:100640008C640000000210C03C030800246356E4E0
59627+:10065000004310213C038000AC64009003E00008DC
59628+:10066000AF8200243C0208008C42011410400019A3
59629+:100670003084400030A2007F000231C03C02020002
59630+:100680001080001400A218253C026020AC43001426
59631+:100690003C0408008C8456B83C0308008C630110AD
59632+:1006A0003C02800024050900AC4500200086202182
59633+:1006B000246300013C028008AC4400643C01080053
59634+:1006C000AC2301103C010800AC2456B803E000083C
59635+:1006D000000000003C02602003E00008AC4500146C
59636+:1006E00003E000080000102103E0000800001021D2
59637+:1006F00030A2000810400008240201003C0208005B
59638+:100700008C42010C244200013C010800AC22010C87
59639+:1007100003E0000800000000148200080000000050
59640+:100720003C0208008C4200FC244200013C0108000D
59641+:10073000AC2200FC0A0001A330A200203C02080009
59642+:100740008C420084244200013C010800AC22008459
59643+:1007500030A200201040000830A200103C02080027
59644+:100760008C420108244200013C010800AC2201082F
59645+:1007700003E0000800000000104000080000000036
59646+:100780003C0208008C420104244200013C010800A4
59647+:10079000AC22010403E00008000000003C02080055
59648+:1007A0008C420100244200013C010800AC220100FF
59649+:1007B00003E000080000000027BDFFE0AFB1001417
59650+:1007C0003C118000AFB20018AFBF001CAFB00010EA
59651+:1007D0003632010096500008320200041040000733
59652+:1007E000320300028FBF001C8FB200188FB10014BB
59653+:1007F0008FB000100A0000CE27BD00201060000B53
59654+:10080000020028218E2401000E00018A0000000051
59655+:100810003202008010400003240500A10E000C6786
59656+:100820008E44001C0A0001E3240200018E2301040F
59657+:100830008F82000810430006020028218E24010048
59658+:100840000E00018A000000008E220104AF82000821
59659+:10085000000010218FBF001C8FB200188FB1001450
59660+:100860008FB0001003E0000827BD00202C82000498
59661+:1008700014400002000018212483FFFD240200021E
59662+:10088000006210043C03600003E00008AC626914DD
59663+:1008900027BDFFE0AFBF001CAFB20018AFB100141E
59664+:1008A000AFB000103C048000948201083043700017
59665+:1008B000240220001062000A2862200154400052E5
59666+:1008C0008FBF001C24024000106200482402600018
59667+:1008D0001062004A8FBF001C0A0002518FB200183C
59668+:1008E00034820100904300098C5000189451000C90
59669+:1008F000240200091062001C0000902128620009F7
59670+:10090000144000218F8200242402000A5062001249
59671+:10091000323100FF2402000B1062000F00000000C3
59672+:100920002402000C146200188F8200243C0208008C
59673+:100930008C4256B824030900AC83002000501021DB
59674+:100940003C038008AC6200643C010800AC2256B84D
59675+:100950000A0002508FBF001C0E0001E900102602A1
59676+:100960000A0002308F8200240E0001E900102602E6
59677+:100970003C0380089462001A8C72000C3042FFFF26
59678+:10098000020280258F8200248C42000C5040001E01
59679+:100990008FBF001C0E000D84000000003C02800090
59680+:1009A00034420100944300088F82002400031C009D
59681+:1009B0009444001E8F82002000641825AC50000073
59682+:1009C00024040001AC510004AC520008AC40000CFF
59683+:1009D000AC400010AC400014AC4000180E000DB844
59684+:1009E000AC43001C0A0002508FBF001C0E000440E4
59685+:1009F000000000000A0002508FBF001C0E000C9F78
59686+:100A0000000000008FBF001C8FB200188FB10014CF
59687+:100A10008FB000100000102103E0000827BD002067
59688+:100A200027BDFFD8AFB400203C036010AFBF002447
59689+:100A3000AFB3001CAFB20018AFB10014AFB00010DC
59690+:100A40008C6450002402FF7F3C1408002694563822
59691+:100A5000008220243484380CAC6450003C028000B6
59692+:100A6000240300370E0014B0AC4300083C07080014
59693+:100A700024E70618028010212404001D2484FFFFAF
59694+:100A8000AC4700000481FFFD244200043C02080042
59695+:100A9000244207C83C010800AC2256403C02080032
59696+:100AA000244202303C030800246306203C04080072
59697+:100AB000248403B43C05080024A506F03C06080085
59698+:100AC00024C62C9C3C010800AC2256803C02080045
59699+:100AD000244205303C010800AC2756843C01080044
59700+:100AE000AC2656943C010800AC23569C3C010800FF
59701+:100AF000AC2456A03C010800AC2556A43C010800DB
59702+:100B0000AC2256A83C010800AC23563C3C0108002E
59703+:100B1000AC2456443C010800AC2056603C0108005F
59704+:100B2000AC2556643C010800AC2056703C0108001E
59705+:100B3000AC27567C3C010800AC2656903C010800CE
59706+:100B4000AC2356980E00056E00000000AF80000C2C
59707+:100B50003C0280008C5300008F8300043C0208009C
59708+:100B60008C420020106200213262000700008821C0
59709+:100B70002792FF9C3C100800261056E43C02080017
59710+:100B80008C42002024050001022518040043202483
59711+:100B90008F820004004310245044000C26310001D1
59712+:100BA00010800008AF9000248E4300003C028000BB
59713+:100BB000AC4300900E000D4BAE05000C0A0002C1C4
59714+:100BC00026310001AE00000C263100012E22000269
59715+:100BD000261000381440FFE9265200043C020800A9
59716+:100BE0008C420020AF820004326200071040FFD91F
59717+:100BF0003C028000326200011040002D326200028F
59718+:100C00003C0580008CA2010000002021ACA2002045
59719+:100C10008CA301042C42078110400008ACA300A85B
59720+:100C200094A2010824032000304270001443000302
59721+:100C30003C02800890420005304400FF0E0001593C
59722+:100C4000000000003C0280009042010B304300FF96
59723+:100C50002C62001E54400004000310800E00018628
59724+:100C60000A0002EC00000000005410218C42000039
59725+:100C70000040F80900000000104000043C02800021
59726+:100C80008C4301043C026020AC4300143C02080089
59727+:100C90008C4200343C0440003C03800024420001AC
59728+:100CA000AC6401383C010800AC220034326200021E
59729+:100CB00010400010326200043C1080008E0201409F
59730+:100CC000000020210E000159AE0200200E00038317
59731+:100CD000000000003C024000AE0201783C02080027
59732+:100CE0008C420038244200013C010800AC2200384C
59733+:100CF000326200041040FF973C0280003C108000EC
59734+:100D00008E020180000020210E000159AE02002059
59735+:100D10008E03018024020F00546200073C02800809
59736+:100D20008E0201883C0300E03042FFFF00431025A3
59737+:100D30000A000328AE020080344200809042000086
59738+:100D400024030050304200FF14430007000000005D
59739+:100D50000E000362000000001440000300000000C9
59740+:100D60000E000971000000003C0208008C42003CAB
59741+:100D70003C0440003C03800024420001AC6401B804
59742+:100D80003C010800AC22003C0A0002A33C028000A7
59743+:100D90003C02900034420001008220253C02800089
59744+:100DA000AC4400203C0380008C6200200440FFFE25
59745+:100DB0000000000003E00008000000003C0280008A
59746+:100DC000344300010083202503E00008AC440020E8
59747+:100DD00027BDFFE0AFB10014AFB000100080882144
59748+:100DE000AFBF00180E00033230B000FF8F83FF94B6
59749+:100DF000022020219062002502028025A07000259B
59750+:100E00008C7000183C0280000E00033D020280241A
59751+:100E10001600000B8FBF00183C0480008C8201F884
59752+:100E20000440FFFE348201C024030002AC510000E4
59753+:100E3000A04300043C021000AC8201F88FBF0018F0
59754+:100E40008FB100148FB0001003E0000827BD002010
59755+:100E500027BDFFE83C028000AFBF00103442018094
59756+:100E6000944300048C4400083063020010600005C5
59757+:100E7000000028210E00100C000000000A0003787A
59758+:100E8000240500013C02FF000480000700821824B2
59759+:100E90003C02040014620004240500018F82FF94C8
59760+:100EA00090420008240500018FBF001000A010210F
59761+:100EB00003E0000827BD00188F82FF982405000179
59762+:100EC000A040001A3C028000344201400A00034264
59763+:100ED0008C4400008F85FF9427BDFFE0AFBF001C4E
59764+:100EE000AFB20018AFB10014AFB0001090A2000074
59765+:100EF000304400FF38830020388200300003182B74
59766+:100F00000002102B0062182410600003240200501D
59767+:100F1000148200A88FBF001C90A20005304200017F
59768+:100F2000104000A48FBF001C3C02800034420140EE
59769+:100F3000904200082443FFFF2C6200051040009EF1
59770+:100F40008FB20018000310803C030800246355ACE6
59771+:100F5000004310218C420000004000080000000007
59772+:100F60003C028000345101400E0003328E24000008
59773+:100F70008F92FF948E2200048E50000C1602000205
59774+:100F800024020001AE42000C0E00033D8E2400003E
59775+:100F90008E220004145000068FBF001C8FB2001870
59776+:100FA0008FB100148FB000100A000F7827BD002009
59777+:100FB0008E42000C0A000419000000003C0480006E
59778+:100FC0003482014094A300108C4200043063FFFF80
59779+:100FD0001443001C0000000024020001A4A2001021
59780+:100FE0008C8202380441000F3C0380003C02003F29
59781+:100FF0003448F0003C0760003C06FFC08CE22BBC8C
59782+:1010000000461824004810240002130200031D8229
59783+:10101000106200583C0280008C8202380440FFF7C6
59784+:101020003C038000346201408C44000034620200C2
59785+:10103000AC4400003C021000AC6202380A00043BE1
59786+:101040008FBF001C94A200100A00041900000000C9
59787+:10105000240200201482000F3C0280003C03800028
59788+:1010600094A20012346301408C6300043042FFFFFD
59789+:10107000146200050000000024020001A4A2001276
59790+:101080000A0004028FBF001C94A200120A00041977
59791+:1010900000000000345101400E0003328E24000095
59792+:1010A0008F92FF948E230004964200123050FFFF6F
59793+:1010B0001603000224020001A64200120E00033DA6
59794+:1010C0008E2400008E220004160200068FBF001C32
59795+:1010D0008FB200188FB100148FB000100A00037C8B
59796+:1010E00027BD0020964200120A00041900000000EB
59797+:1010F0003C03800094A20014346301408C6300041C
59798+:101100003042FFFF14620008240200018FBF001C60
59799+:101110008FB200188FB100148FB00010A4A2001479
59800+:101120000A00146327BD002094A20014144000217B
59801+:101130008FBF001C0A000435000000003C03800043
59802+:1011400094A20016346301408C6300043042FFFF18
59803+:101150001462000D240200018FBF001C8FB2001822
59804+:101160008FB100148FB00010A4A200160A000B1457
59805+:1011700027BD00209442007824420004A4A200105D
59806+:101180000A00043B8FBF001C94A200162403000138
59807+:101190003042FFFF144300078FBF001C3C020800D1
59808+:1011A0008C420070244200013C010800AC22007017
59809+:1011B0008FBF001C8FB200188FB100148FB00010C9
59810+:1011C00003E0000827BD002027BDFFD8AFB20018FC
59811+:1011D0008F92FF94AFB10014AFBF0020AFB3001CDB
59812+:1011E000AFB000103C028000345101008C5001006F
59813+:1011F0009242000092230009304400FF2402001FA5
59814+:10120000106200AB28620020104000192402003850
59815+:101210002862000A1040000D2402000B286200081A
59816+:101220001040002E8F820024046001042862000216
59817+:101230001440002A8F820024240200061062002637
59818+:101240008FBF00200A00055F8FB3001C1062006092
59819+:101250002862000B144000FA8FBF00202402000E09
59820+:10126000106200788F8200240A00055F8FB3001C93
59821+:10127000106200D2286200391040000A2402008067
59822+:1012800024020036106200E528620037104000C3D7
59823+:1012900024020035106200D98FBF00200A00055FCC
59824+:1012A0008FB3001C1062002D2862008110400006E0
59825+:1012B000240200C824020039106200C98FBF002038
59826+:1012C0000A00055F8FB3001C106200A28FBF0020D0
59827+:1012D0000A00055F8FB3001C8F8200248C42000C33
59828+:1012E000104000D78FBF00200E000D8400000000CA
59829+:1012F0003C038000346301008C6200008F85002075
59830+:10130000946700089466000CACA200008C64000492
59831+:101310008F82002400063400ACA400049448001E10
59832+:101320008C62001800073C0000E83825ACA20008D9
59833+:101330008C62001C24040001ACA2000C9062000A24
59834+:1013400000C23025ACA60010ACA00014ACA0001860
59835+:10135000ACA7001C0A00051D8FBF00208F8200244F
59836+:101360008C42000C104000B68FBF00200E000D8490
59837+:10137000000000008F820024962400089625000CAF
59838+:101380009443001E000422029626000E8F82002045
59839+:10139000000426000083202500052C003C0300806B
59840+:1013A00000A6282500832025AC400000AC400004A6
59841+:1013B000AC400008AC40000CAC450010AC40001440
59842+:1013C000AC400018AC44001C0A00051C24040001B9
59843+:1013D0009622000C14400018000000009242000504
59844+:1013E0003042001014400014000000000E000332D0
59845+:1013F0000200202192420005020020213442001008
59846+:101400000E00033DA242000592420000240300208A
59847+:10141000304200FF10430089020020218FBF0020CE
59848+:101420008FB3001C8FB200188FB100148FB0001062
59849+:101430000A00107527BD00280000000D0A00055E97
59850+:101440008FBF00208C42000C1040007D8FBF002019
59851+:101450000E000D84000000008E2200048F84002006
59852+:101460009623000CAC8200003C0280089445002CBE
59853+:101470008F82002400031C0030A5FFFF9446001E4D
59854+:101480003C02400E0065182500C23025AC830004E4
59855+:10149000AC800008AC80000CAC800010AC80001464
59856+:1014A000AC800018AC86001C0A00051C2404000156
59857+:1014B0000E000332020020218F93FF9802002021AA
59858+:1014C0000E00033DA660000C020020210E00034226
59859+:1014D000240500018F8200248C42000C104000582B
59860+:1014E0008FBF00200E000D84000000009622000C2B
59861+:1014F0008F83002000021400AC700000AC62000476
59862+:10150000AC6000088E4400388F820024AC64000C6C
59863+:101510008E46003C9445001E3C02401FAC66001005
59864+:1015200000A228258E62000424040001AC6200148D
59865+:10153000AC600018AC65001C8FBF00208FB3001C8E
59866+:101540008FB200188FB100148FB000100A000DB8D0
59867+:1015500027BD0028240200201082003A8FB3001C0F
59868+:101560000E000F5E00000000104000358FBF00200D
59869+:101570003C0480008C8201F80440FFFE348201C0EC
59870+:1015800024030002AC500000A04300043C02100001
59871+:10159000AC8201F80A00055E8FBF00200200202106
59872+:1015A0008FBF00208FB3001C8FB200188FB10014C2
59873+:1015B0008FB000100A000EA727BD00289625000C4A
59874+:1015C000020020218FBF00208FB3001C8FB20018B3
59875+:1015D0008FB100148FB000100A000ECC27BD002878
59876+:1015E000020020218FB3001C8FB200188FB10014AD
59877+:1015F0008FB000100A000EF727BD00289225000DBD
59878+:10160000020020218FB3001C8FB200188FB100148C
59879+:101610008FB000100A000F4827BD002802002021CB
59880+:101620008FBF00208FB3001C8FB200188FB1001441
59881+:101630008FB000100A000F1F27BD00288FBF0020A9
59882+:101640008FB3001C8FB200188FB100148FB0001040
59883+:1016500003E0000827BD00283C0580008CA202782A
59884+:101660000440FFFE34A2024024030002AC44000008
59885+:10167000A04300043C02100003E00008ACA2027882
59886+:10168000A380001803E00008A38000193C03800039
59887+:101690008C6202780440FFFE8F82001CAC62024024
59888+:1016A00024020002A06202443C02100003E0000891
59889+:1016B000AC6202783C02600003E000088C425404F3
59890+:1016C0009083003024020005008040213063003FF9
59891+:1016D0000000482114620005000050219082004C57
59892+:1016E0009483004E304900FF306AFFFFAD00000CCC
59893+:1016F000AD000010AD000024950200148D05001C03
59894+:101700008D0400183042FFFF004910230002110031
59895+:10171000000237C3004038210086202300A2102B8E
59896+:101720000082202300A72823AD05001CAD0400186B
59897+:10173000A5090014A5090020A50A001603E0000869
59898+:10174000A50A002203E000080000000027BDFFD822
59899+:10175000AFB200183C128008AFB40020AFB3001C39
59900+:10176000AFB10014AFBF0024AFB00010365101007C
59901+:101770003C0260008C4254049222000C3C1408008D
59902+:10178000929400F7304300FF2402000110620032FF
59903+:101790000080982124020002146200353650008037
59904+:1017A0000E00143D000000009202004C2403FF8054
59905+:1017B0003C0480003042007F000211C024420240FD
59906+:1017C0000262102100431824AC8300949245000863
59907+:1017D0009204004C3042007F3C03800614850007D1
59908+:1017E000004380212402FFFFA22200112402FFFFF8
59909+:1017F000A62200120A0005D22402FFFF9602002052
59910+:10180000A222001196020022A62200128E020024BB
59911+:101810003C048008AE2200143485008090A2004C65
59912+:1018200034830100A06200108CA2003CAC6200185E
59913+:101830008C820068AC6200F48C820064AC6200F0C0
59914+:101840008C82006CAC6200F824020001A0A2006847
59915+:101850000A0005EE3C0480080E001456000000004B
59916+:1018600036420080A04000680A0005EE3C04800873
59917+:10187000A2000068A20000690A0006293C02800854
59918+:10188000348300808C62003834850100AC62006CC7
59919+:1018900024020001A062006990A200D59083000894
59920+:1018A000305100FF3072007F12320019001111C058
59921+:1018B00024420240026210212403FF8000431824C6
59922+:1018C0003C048000AC8300943042007F3C038006DF
59923+:1018D000004380218E02000C1040000D02002021E8
59924+:1018E0000E00057E0000000026220001305100FF9E
59925+:1018F0009203003C023410260002102B0002102339
59926+:101900003063007F022288240A0005F8A203003C0D
59927+:101910003C088008350401008C8200E03507008017
59928+:10192000ACE2003C8C8200E0AD02000090E5004C8F
59929+:10193000908600D590E3004C908400D52402FF806F
59930+:1019400000A228243063007F308400FF00A62825F1
59931+:101950000064182A1060000230A500FF38A500803E
59932+:10196000A0E5004CA10500093C0280089043000E50
59933+:10197000344400803C058000A043000A8C8300189A
59934+:101980003C027FFF3442FFFF00621824AC83001842
59935+:101990008CA201F80440FFFE00000000ACB301C0BF
59936+:1019A0008FBF00248FB400208FB3001C8FB20018AB
59937+:1019B0008FB100148FB0001024020002A0A201C455
59938+:1019C00027BD00283C02100003E00008ACA201F88B
59939+:1019D00090A2000024420001A0A200003C030800E5
59940+:1019E0008C6300F4304200FF144300020080302179
59941+:1019F000A0A0000090A200008F84001C000211C073
59942+:101A00002442024024830040008220212402FF80DF
59943+:101A1000008220243063007F3C02800A006218218B
59944+:101A20003C028000AC44002403E00008ACC300008A
59945+:101A300094820006908300058C85000C8C86001033
59946+:101A40008C8700188C88001C8C8400203C010800C6
59947+:101A5000A42256C63C010800A02356C53C0108003C
59948+:101A6000AC2556CC3C010800AC2656D03C01080001
59949+:101A7000AC2756D83C010800AC2856DC3C010800D5
59950+:101A8000AC2456E003E00008000000003C0280089F
59951+:101A9000344201008C4400343C038000346504006F
59952+:101AA000AC6400388C420038AF850028AC62003C42
59953+:101AB0003C020005AC6200300000000000000000A5
59954+:101AC00003E00008000000003C020006308400FF34
59955+:101AD000008220253C028000AC4400300000000061
59956+:101AE00000000000000000003C0380008C62000049
59957+:101AF000304200101040FFFD3462040003E0000893
59958+:101B0000AF82002894C200003C080800950800CA73
59959+:101B100030E7FFFF0080482101021021A4C200002D
59960+:101B200094C200003042FFFF00E2102B544000013D
59961+:101B3000A4C7000094A200003C0308008C6300CC02
59962+:101B400024420001A4A2000094A200003042FFFF42
59963+:101B5000144300073C0280080107102BA4A00000DA
59964+:101B60005440000101003821A4C700003C02800855
59965+:101B7000344601008CC3002894A200003C0480007D
59966+:101B80003042FFFE000210C000621021AC82003C17
59967+:101B90008C82003C006218231860000400000000E2
59968+:101BA0008CC200240A0006BA244200018CC2002420
59969+:101BB000AC8200383C020050344200103C038000EC
59970+:101BC000AC620030000000000000000000000000D7
59971+:101BD0008C620000304200201040FFFD0000000039
59972+:101BE00094A200003C04800030420001000210C0BA
59973+:101BF000004410218C430400AD2300008C420404F7
59974+:101C0000AD2200043C02002003E00008AC8200305A
59975+:101C100027BDFFE0AFB20018AFB10014AFB00010A5
59976+:101C2000AFBF001C94C2000000C080213C1208001D
59977+:101C3000965200C624420001A6020000960300004E
59978+:101C400094E2000000E03021144300058FB1003021
59979+:101C50000E00068F024038210A0006F10000000045
59980+:101C60008C8300048C82000424420040046100073D
59981+:101C7000AC8200048C8200040440000400000000D8
59982+:101C80008C82000024420001AC8200009602000019
59983+:101C90003042FFFF50520001A600000096220000D3
59984+:101CA00024420001A62200003C02800834420100C8
59985+:101CB000962300009442003C144300048FBF001C94
59986+:101CC00024020001A62200008FBF001C8FB2001862
59987+:101CD0008FB100148FB0001003E0000827BD002072
59988+:101CE00027BDFFE03C028008AFBF0018344201006E
59989+:101CF0008C4800343C03800034690400AC68003830
59990+:101D00008C42003830E700FFAF890028AC62003C0D
59991+:101D10003C020005AC620030000000000000000042
59992+:101D200000000000000000000000000000000000B3
59993+:101D30008C82000C8C82000C97830016AD22000070
59994+:101D40008C82001000604021AD2200048C820018BB
59995+:101D5000AD2200088C82001CAD22000C8CA2001465
59996+:101D6000AD2200108C820020AD220014908200056C
59997+:101D7000304200FF00021200AD2200188CA20018B1
59998+:101D8000AD22001C8CA2000CAD2200208CA2001001
59999+:101D9000AD2200248CA2001CAD2200288CA20020C1
60000+:101DA000AD22002C3402FFFFAD260030AD20003400
60001+:101DB000506200013408FFFFAD28003850E00011E8
60002+:101DC0003C0280083C048008348401009482005066
60003+:101DD0003042FFFFAD22003C9483004494850044D0
60004+:101DE000240200013063FFFF000318C200641821C1
60005+:101DF0009064006430A5000700A210040A00075C8C
60006+:101E00000044102534420100AD20003C94430044BE
60007+:101E1000944400443063FFFF000318C2006218219D
60008+:101E200030840007906500642402000100821004E1
60009+:101E30000002102700451024A0620064000000008A
60010+:101E400000000000000000003C0200063442004098
60011+:101E50003C038000AC620030000000000000000085
60012+:101E6000000000008C620000304200101040FFFDB6
60013+:101E70003C06800834C201503463040034C7014A70
60014+:101E800034C4013434C5014034C60144AFA200104B
60015+:101E90000E0006D2AF8300288FBF001803E00008B1
60016+:101EA00027BD00208F8300143C0608008CC600E884
60017+:101EB0008F82001C30633FFF000319800046102111
60018+:101EC000004310212403FF80004318243C068000B7
60019+:101ED000ACC300283042007F3C03800C004330211B
60020+:101EE00090C2000D30A500FF0000382134420010E0
60021+:101EF000A0C2000D8F8900143C028008344201000A
60022+:101F00009443004400091382304800032402000176
60023+:101F1000A4C3000E1102000B2902000210400005AC
60024+:101F2000240200021100000C240300010A0007A48F
60025+:101F30000000182111020006000000000A0007A49A
60026+:101F4000000018218CC2002C0A0007A424430001C1
60027+:101F50008CC20014244300018CC200180043102BD3
60028+:101F60005040000A240700012402002714A20003A5
60029+:101F70003C0380080A0007B1240700013463010014
60030+:101F80009462004C24420001A462004C00091382B8
60031+:101F9000304300032C620002104000090080282119
60032+:101FA000146000040000000094C200340A0007C15D
60033+:101FB0003046FFFF8CC600380A0007C10080282188
60034+:101FC000000030213C040800248456C00A000706A3
60035+:101FD0000000000027BDFF90AFB60068AFB50064F9
60036+:101FE000AFB40060AFB3005CAFB20058AFB1005403
60037+:101FF000AFBF006CAFB000508C9000000080B021EB
60038+:102000003C0208008C4200E8960400328F83001CDA
60039+:102010002414FF8030843FFF0062182100042180D7
60040+:1020200000641821007410243C13800000A090214B
60041+:1020300090A50000AE620028920400323C02800CA1
60042+:102040003063007F00628821308400C02402004099
60043+:10205000148200320000A8218E3500388E2200182C
60044+:102060001440000224020001AE2200189202003C3B
60045+:10207000304200201440000E8F83001C000511C068
60046+:102080002442024000621821306400783C02008043
60047+:102090000082202500741824AE630800AE64081086
60048+:1020A0008E2200188E03000800431021AE22001873
60049+:1020B0008E22002C8E230018244200010062182B6F
60050+:1020C0001060004300000000924200002442000122
60051+:1020D000A24200003C0308008C6300F4304200FF81
60052+:1020E00050430001A2400000924200008F84001C77
60053+:1020F000000211C024420240248300403063007F6C
60054+:10210000008220213C02800A0094202400621821D1
60055+:10211000AE6400240A0008D2AEC30000920300326D
60056+:102120002402FFC000431024304200FF1440000589
60057+:1021300024020001AE220018962200340A00084250
60058+:102140003055FFFF8E22001424420001AE220018F9
60059+:102150009202003000021600000216030441001C27
60060+:10216000000000009602003227A400100080282101
60061+:10217000A7A20016960200320000302124070001B9
60062+:102180003042FFFFAF8200140E000706AFA0001C14
60063+:10219000960200328F83001C3C0408008C8400E807
60064+:1021A00030423FFF000211800064182100621821B4
60065+:1021B00000741024AE62002C3063007F3C02800E5D
60066+:1021C000006218219062000D3042007FA062000D75
60067+:1021D0009222000D304200105040007892420000E0
60068+:1021E0003C028008344401009482004C8EC30000FD
60069+:1021F0003C130800967300C62442FFFFA482004CE3
60070+:10220000946200329623000E3054FFFF3070FFFFBF
60071+:102210003C0308008C6300D000701807A7A30038A7
60072+:102220009482003E3063FFFF3042FFFF14620007DC
60073+:10223000000000008C8200303C038000244200300B
60074+:10224000AC62003C0A00086A8C82002C9482004038
60075+:102250003042FFFF5462000927A400408C820038FE
60076+:102260003C03800024420030AC62003C8C8200348D
60077+:10227000AC6200380A0008793C03800027A50038CA
60078+:1022800027A60048026038210E00068FA7A000484C
60079+:102290008FA300403C02800024630030AC43003830
60080+:1022A0008FA30044AC43003C3C0380003C0200058B
60081+:1022B000AC6200303C028008344401009482004249
60082+:1022C000346304003042FFFF0202102B1440000769
60083+:1022D000AF8300289482004E9483004202021021B2
60084+:1022E000004310230A00088F3043FFFF9483004E01
60085+:1022F00094820042026318210050102300621823C8
60086+:102300003063FFFF3C028008344401009482003CAB
60087+:102310003042FFFF14430003000000000A00089F42
60088+:10232000240300019482003C3042FFFF0062102B26
60089+:10233000144000058F8200289482003C0062102324
60090+:102340003043FFFF8F820028AC550000AC400004F2
60091+:10235000AC540008AC43000C3C02000634420010B0
60092+:102360003C038000AC620030000000000000000070
60093+:10237000000000008C620000304200101040FFFDA1
60094+:102380003C04800834840100001018C20064182145
60095+:102390009065006432020007240600010046100424
60096+:1023A00000451025A0620064948300429622000E2E
60097+:1023B00050430001A386001892420000244200010D
60098+:1023C000A24200003C0308008C6300F4304200FF8E
60099+:1023D00050430001A2400000924200008F84001C84
60100+:1023E000000211C0244202402483004000822021C8
60101+:1023F0002402FF80008220243063007F3C02800A98
60102+:10240000006218213C028000AC440024AEC30000EE
60103+:102410008FBF006C8FB600688FB500648FB400600A
60104+:102420008FB3005C8FB200588FB100548FB0005052
60105+:1024300003E0000827BD007027BDFFD8AFB3001C24
60106+:10244000AFB20018AFB10014AFB00010AFBF0020A2
60107+:102450000080982100E0802130B1FFFF0E000D8444
60108+:1024600030D200FF0000000000000000000000006B
60109+:102470008F8200208F830024AC510000AC520004F6
60110+:10248000AC530008AC40000CAC400010AC40001451
60111+:10249000AC4000189463001E02038025AC50001C61
60112+:1024A0000000000000000000000000002404000103
60113+:1024B0008FBF00208FB3001C8FB200188FB10014A3
60114+:1024C0008FB000100A000DB827BD002830A5FFFF0F
60115+:1024D0000A0008DC30C600FF3C02800834430100DB
60116+:1024E0009462000E3C080800950800C63046FFFFC5
60117+:1024F00014C000043402FFFF946500EA0A000929B1
60118+:102500008F84001C10C20027000000009462004E5F
60119+:102510009464003C3045FFFF00A6102300A6182B52
60120+:102520003087FFFF106000043044FFFF00C5102318
60121+:1025300000E210233044FFFF0088102B1040000EF3
60122+:1025400000E810233C028008344401002403000109
60123+:1025500034420080A44300162402FFFFA482000E30
60124+:10256000948500EA8F84001C0000302130A5FFFF15
60125+:102570000A0009013C0760200044102A10400009AD
60126+:102580003C0280083443008094620016304200010F
60127+:10259000104000043C0280009442007E244200145B
60128+:1025A000A462001603E000080000000027BDFFE061
60129+:1025B0003C028008AFBF001CAFB0001834420100DD
60130+:1025C000944300429442004C104000193068FFFFD1
60131+:1025D0009383001824020001146200298FBF001C9D
60132+:1025E0003C06800834D00100000810C200501021C1
60133+:1025F000904200643103000734C70148304200FFB5
60134+:10260000006210073042000134C9014E34C4012C6D
60135+:1026100034C5013E1040001634C601420E0006D2F9
60136+:10262000AFA90010960200420A0009463048FFFF99
60137+:102630003C028008344401009483004494820042A8
60138+:102640001043000F8FBF001C94820044A4820042FC
60139+:1026500094820050A482004E8C820038AC820030FC
60140+:1026600094820040A482003E9482004AA4820048E2
60141+:102670008FBF001C8FB000180A00090427BD00207E
60142+:102680008FB0001803E0000827BD002027BDFFA081
60143+:10269000AFB1004C3C118000AFBF0058AFB3005445
60144+:1026A000AFB20050AFB000483626018890C2000398
60145+:1026B0003044007FA3A400108E32018090C200003D
60146+:1026C0003043007F240200031062003BAF92001CE5
60147+:1026D00028620004104000062402000424020002C4
60148+:1026E000106200098FBF00580A000B0F8FB300540F
60149+:1026F0001062004D240200051062014E8FBF005889
60150+:102700000A000B0F8FB30054000411C002421021C5
60151+:102710002404FF8024420240004410242643004049
60152+:10272000AE2200243063007F3C02800A0062182140
60153+:102730009062003CAFA3003C00441025A062003C26
60154+:102740008FA3003C9062003C304200401040016C7E
60155+:102750008FBF00583C108008A3800018361001007D
60156+:102760008E0200E08C63003427A4003C27A50010F3
60157+:10277000004310210E0007C3AE0200E093A2001038
60158+:102780003C038000A20200D58C6202780440FFFE68
60159+:102790008F82001CAC62024024020002A06202444C
60160+:1027A0003C021000AC6202780E0009390000000003
60161+:1027B0000A000B0E8FBF00583C05800890C3000133
60162+:1027C00090A2000B1443014E8FBF005834A4008028
60163+:1027D0008C8200189082004C90A200083C0260009D
60164+:1027E0008C4254048C8300183C027FFF3442FFFF6C
60165+:1027F000006218243C0208008C4200B4AC8300182C
60166+:102800003C038000244200013C010800AC2200B4DB
60167+:102810008C6201F80440FFFE8F82001CAC6201C094
60168+:102820000A000AD6240200023C10800890C300016E
60169+:102830009202000B144301328FBF005827A40018E6
60170+:1028400036050110240600033C0260008C4254044B
60171+:102850000E000E470000000027A40028360501F0F6
60172+:102860000E000E47240600038FA200283603010045
60173+:10287000AE0200648FA2002CAE0200688FA200306E
60174+:10288000AE02006C93A40018906300D52402FF8070
60175+:102890000082102400431025304900FF3084007F5F
60176+:1028A0003122007F0082102A544000013929008023
60177+:1028B000000411C0244202402403FF800242102180
60178+:1028C00000431024AE220094264200403042007F94
60179+:1028D0003C038006004340218FA3001C2402FFFF1D
60180+:1028E000AFA800403C130800927300F71062003359
60181+:1028F00093A2001995030014304400FF3063FFFFDA
60182+:102900000064182B106000100000000095040014F3
60183+:102910008D07001C8D0600183084FFFF0044202323
60184+:102920000004210000E438210000102100E4202BE5
60185+:1029300000C2302100C43021AD07001CAD060018D4
60186+:102940000A000A2F93A20019950400148D07001C99
60187+:102950008D0600183084FFFF008220230004210030
60188+:10296000000010210080182100C2302300E4202B39
60189+:1029700000C4302300E33823AD07001CAD06001867
60190+:1029800093A200198FA30040A462001497A2001A1A
60191+:10299000A46200168FA2001CAC6200108FA2001C63
60192+:1029A000AC62000C93A20019A462002097A2001A46
60193+:1029B000A46200228FA2001CAC6200243C048008A8
60194+:1029C000348300808C6200388FA20020012088218F
60195+:1029D000AC62003C8FA20020AC82000093A20018E1
60196+:1029E000A062004C93A20018A0820009A0600068B9
60197+:1029F00093A20018105100512407FF803229007F54
60198+:102A0000000911C024420240024210213046007FDA
60199+:102A10003C03800000471024AC6200943C02800616
60200+:102A200000C2302190C2003CAFA60040000020212F
60201+:102A300000471025A0C2003C8FA80040950200026C
60202+:102A4000950300148D07001C3042FFFF3063FFFF29
60203+:102A50008D060018004310230002110000E2382107
60204+:102A600000E2102B00C4302100C23021AD07001C51
60205+:102A7000AD06001895020002A5020014A50000167C
60206+:102A80008D020008AD0200108D020008AD02000C9E
60207+:102A900095020002A5020020A50000228D02000878
60208+:102AA000AD0200249102003C304200401040001A68
60209+:102AB000262200013C108008A3A90038A38000183A
60210+:102AC000361001008E0200E08D03003427A4004080
60211+:102AD00027A50038004310210E0007C3AE0200E016
60212+:102AE00093A200383C038000A20200D58C620278D9
60213+:102AF0000440FFFE8F82001CAC62024024020002F0
60214+:102B0000A06202443C021000AC6202780E00093957
60215+:102B100000000000262200013043007F14730004EF
60216+:102B2000004020212403FF8002231024004320269C
60217+:102B300093A200180A000A4B309100FF93A40018DA
60218+:102B40008FA3001C2402FFFF1062000A308900FFDF
60219+:102B500024820001248300013042007F14530005C9
60220+:102B6000306900FF2403FF800083102400431026F7
60221+:102B7000304900FF3C028008904200080120882173
60222+:102B8000305000FF123000193222007F000211C0C5
60223+:102B900002421021244202402403FF8000431824F3
60224+:102BA0003C048000AC8300943042007F3C038006EC
60225+:102BB000004310218C43000C004020211060000BCA
60226+:102BC000AFA200400E00057E000000002623000199
60227+:102BD0002405FF803062007F145300020225202468
60228+:102BE000008518260A000AAF307100FF3C048008F7
60229+:102BF000348400808C8300183C027FFF3442FFFF46
60230+:102C000000621824AC8300183C0380008C6201F839
60231+:102C10000440FFFE00000000AC7201C0240200026C
60232+:102C2000A06201C43C021000AC6201F80A000B0E65
60233+:102C30008FBF00583C04800890C300019082000BB5
60234+:102C40001443002F8FBF0058349000809202000878
60235+:102C500030420040104000200000000092020008B6
60236+:102C60000002160000021603044100050240202164
60237+:102C70000E000ECC240500930A000B0E8FBF0058E7
60238+:102C80009202000924030018304200FF1443000D93
60239+:102C900002402021240500390E000E64000030217E
60240+:102CA0000E0003328F84001C8F82FF9424030012D5
60241+:102CB000A04300090E00033D8F84001C0A000B0E88
60242+:102CC0008FBF0058240500360E000E64000030212E
60243+:102CD0000A000B0E8FBF00580E0003320240202165
60244+:102CE000920200058F84001C344200200E00033D38
60245+:102CF000A20200050E0010758F84001C8FBF0058C3
60246+:102D00008FB300548FB200508FB1004C8FB0004889
60247+:102D100003E0000827BD00603C0280083445010044
60248+:102D20003C0280008C42014094A3000E0000302140
60249+:102D300000402021AF82001C3063FFFF3402FFFF00
60250+:102D4000106200063C0760202402FFFFA4A2000ED0
60251+:102D500094A500EA0A00090130A5FFFF03E000087E
60252+:102D60000000000027BDFFC83C0280003C06800830
60253+:102D7000AFB5002CAFB1001CAFBF0030AFB400281E
60254+:102D8000AFB30024AFB20020AFB00018345101003F
60255+:102D900034C501008C4301008E2200148CA400E491
60256+:102DA0000000A821AF83001C0044102318400052EB
60257+:102DB000A38000188E22001400005021ACA200E471
60258+:102DC00090C3000890A200D53073007FA3A200102A
60259+:102DD0008CB200E08CB400E4304200FF1053003BA2
60260+:102DE00093A200108F83001C2407FF80000211C0F3
60261+:102DF0000062102124420240246300400047102456
60262+:102E00003063007F3C0980003C08800A006818217C
60263+:102E1000AD2200248C62003427A4001427A50010E2
60264+:102E2000024280210290102304400028AFA3001426
60265+:102E30009062003C00E21024304200FF1440001970
60266+:102E4000020090219062003C34420040A062003CAD
60267+:102E50008F86001C93A3001024C200403042007FE4
60268+:102E6000004828213C0208008C4200F42463000141
60269+:102E7000306400FF14820002A3A30010A3A000107E
60270+:102E800093A20010AFA50014000211C0244202401A
60271+:102E900000C2102100471024AD2200240A000B4577
60272+:102EA00093A200100E0007C3000000003C0280083F
60273+:102EB00034420100AC5000E093A30010240A00014A
60274+:102EC000A04300D50A000B4593A200102402000184
60275+:102ED000154200093C0380008C6202780440FFFE2A
60276+:102EE0008F82001CAC62024024020002A0620244F5
60277+:102EF0003C021000AC6202789222000B2403000214
60278+:102F0000304200FF144300720000000096220008C7
60279+:102F1000304300FF24020082146200402402008437
60280+:102F20003C028000344901008D22000C95230006EC
60281+:102F3000000216023063FFFF3045003F24020027E5
60282+:102F400010A2000FAF83001428A200281040000830
60283+:102F5000240200312402002110A2000924020025CD
60284+:102F600010A20007938200190A000BBD00000000A8
60285+:102F700010A20007938200190A000BBD0000000098
60286+:102F80000E000777012020210A000C3D0000000000
60287+:102F90003C0380008C6202780440FFFE8F82001C9C
60288+:102FA000AC62024024020002A06202443C02100013
60289+:102FB000AC6202780A000C3D000000009523000678
60290+:102FC000912400058D25000C8D2600108D270018FA
60291+:102FD0008D28001C8D290020244200013C0108009E
60292+:102FE000A42356C63C010800A02456C53C01080095
60293+:102FF000AC2556CC3C010800AC2656D03C0108005C
60294+:10300000AC2756D83C010800AC2856DC3C0108002F
60295+:10301000AC2956E00A000C3DA38200191462000A94
60296+:10302000240200813C02800834420100944500EAF9
60297+:10303000922600058F84001C30A5FFFF30C600FFDC
60298+:103040000A000BFE3C0760211462005C00000000D7
60299+:103050009222000A304300FF306200201040000737
60300+:10306000306200403C02800834420100944500EA8E
60301+:103070008F84001C0A000BFC24060040104000074F
60302+:10308000000316003C02800834420100944500EA27
60303+:103090008F84001C0A000BFC24060041000216036A
60304+:1030A000044100463C02800834420100944500EA95
60305+:1030B0008F84001C2406004230A5FFFF3C076019E6
60306+:1030C0000E000901000000000A000C3D0000000095
60307+:1030D0009222000B24040016304200FF1044000628
60308+:1030E0003C0680009222000B24030017304200FFB0
60309+:1030F000144300320000000034C5010090A2000B10
60310+:10310000304200FF1444000B000080218CA20020FC
60311+:103110008CA400202403FF800043102400021140EF
60312+:103120003084007F004410253C032000004310251C
60313+:10313000ACC2083094A2000800021400000214037C
60314+:10314000044200012410000194A2000830420080D3
60315+:103150005040001A0200A82194A20008304220002A
60316+:10316000504000160200A8218CA300183C021C2D20
60317+:10317000344219ED106200110200A8213C0208003F
60318+:103180008C4200D4104000053C0280082403000457
60319+:1031900034420100A04300FC3C028008344201009C
60320+:1031A000944500EA8F84001C2406000630A5FFFF2A
60321+:1031B0000E0009013C0760210200A8210E00093918
60322+:1031C000000000009222000A304200081040000473
60323+:1031D00002A010210E0013790000000002A01021AF
60324+:1031E0008FBF00308FB5002C8FB400288FB3002420
60325+:1031F0008FB200208FB1001C8FB0001803E00008D0
60326+:1032000027BD00382402FF80008220243C02900069
60327+:1032100034420007008220253C028000AC4400209C
60328+:103220003C0380008C6200200440FFFE0000000090
60329+:1032300003E00008000000003C0380002402FF803F
60330+:10324000008220243462000700822025AC64002024
60331+:103250008C6200200440FFFE0000000003E0000834
60332+:103260000000000027BDFFD8AFB3001CAFB10014B1
60333+:10327000AFB00010AFBF0020AFB200183C1180000B
60334+:103280003C0280088E32002034530100AE2400201E
60335+:10329000966300EA000514003C074000004738250B
60336+:1032A00000A08021000030210E0009013065FFFFE1
60337+:1032B000240200A1160200022402FFFFA2620009FC
60338+:1032C000AE3200208FBF00208FB3001C8FB20018D9
60339+:1032D0008FB100148FB0001003E0000827BD002854
60340+:1032E0003C0280082403000527BDFFE834420100AA
60341+:1032F000A04300FCAFBF00103C0280008C420100E4
60342+:10330000240500A1004020210E000C67AF82001CA4
60343+:103310003C0380008C6202780440FFFE8F82001C18
60344+:103320008FBF001027BD0018AC62024024020002CB
60345+:10333000A06202443C021000AC62027803E0000884
60346+:103340000000000027BDFFE83C068000AFBF001072
60347+:1033500034C7010094E20008304400FF3883008243
60348+:10336000388200842C6300012C4200010062182581
60349+:103370001060002D24020083938200195040003B0E
60350+:103380008FBF00103C020800904256CC8CC4010054
60351+:103390003C06080094C656C63045003F38A30032AC
60352+:1033A00038A2003F2C6300012C4200010062182566
60353+:1033B000AF84001CAF860014A380001914600007BE
60354+:1033C00000E020212402002014A2001200000000CE
60355+:1033D0003402FFFF14C2000F00000000240200208E
60356+:1033E00014A2000500E028218CE300142402FFFF52
60357+:1033F0005062000B8FBF00103C040800248456C0AC
60358+:10340000000030210E000706240700010A000CD638
60359+:103410008FBF00100E000777000000008FBF001064
60360+:103420000A00093927BD001814820004240200850F
60361+:103430008CC501040A000CE1000020211482000662
60362+:103440002482FF808CC50104240440008FBF00103B
60363+:103450000A00016727BD0018304200FF2C4200021D
60364+:1034600010400004240200228FBF00100A000B2726
60365+:1034700027BD0018148200048F8200248FBF001023
60366+:103480000A000C8627BD00188C42000C1040001E5C
60367+:1034900000E0282190E300092402001814620003D0
60368+:1034A000240200160A000CFC240300081462000722
60369+:1034B00024020017240300123C02800834420080DA
60370+:1034C000A04300090A000D0994A7000854620007F0
60371+:1034D00094A700088F82FF942404FFFE9043000508
60372+:1034E00000641824A043000594A7000890A6001BC0
60373+:1034F0008CA4000094A500068FBF001000073C00BC
60374+:103500000A0008DC27BD00188FBF001003E0000888
60375+:1035100027BD00188F8500243C04800094A2002A57
60376+:103520008CA30034000230C02402FFF000C210243B
60377+:1035300000621821AC83003C8CA200303C03800068
60378+:10354000AC8200383C02005034420010AC620030C3
60379+:103550000000000000000000000000008C6200007D
60380+:10356000304200201040FFFD30C20008104000062D
60381+:103570003C0280008C620408ACA200208C62040C27
60382+:103580000A000D34ACA200248C430400ACA300203C
60383+:103590008C420404ACA200243C0300203C028000C6
60384+:1035A000AC4300303C0480008C8200300043102487
60385+:1035B0001440FFFD8F8600243C020040AC820030A6
60386+:1035C00094C3002A94C2002894C4002C94C5002EF1
60387+:1035D00024630001004410213064FFFFA4C20028CE
60388+:1035E00014850002A4C3002AA4C0002A03E0000836
60389+:1035F000000000008F84002427BDFFE83C05800404
60390+:1036000024840010AFBF00100E000E472406000AED
60391+:103610008F840024948200129483002E3042000F85
60392+:10362000244200030043180424027FFF0043102BB0
60393+:1036300010400002AC8300000000000D0E000D13CE
60394+:10364000000000008F8300248FBF001027BD0018EA
60395+:10365000946200149463001A3042000F00021500B7
60396+:10366000006218253C02800003E00008AC4300A083
60397+:103670008F8300243C028004944400069462001A64
60398+:103680008C650000A4640016004410233042FFFF44
60399+:103690000045102B03E00008384200018F8400240D
60400+:1036A0003C0780049486001A8C85000094E2000692
60401+:1036B000A482001694E3000600C310233042FFFFEB
60402+:1036C0000045102B384200011440FFF8A483001677
60403+:1036D00003E00008000000008F8400243C02800406
60404+:1036E000944200069483001A8C850000A482001680
60405+:1036F000006210233042FFFF0045102B38420001CA
60406+:103700005040000D8F850024006030213C0780046C
60407+:1037100094E20006A482001694E3000600C310237E
60408+:103720003042FFFF0045102B384200011440FFF8E3
60409+:10373000A48300168F8500243C03800034620400BB
60410+:103740008CA40020AF820020AC6400388CA200243E
60411+:10375000AC62003C3C020005AC62003003E00008B3
60412+:10376000ACA000048F8400243C0300068C8200047B
60413+:1037700000021140004310253C038000AC62003081
60414+:103780000000000000000000000000008C6200004B
60415+:10379000304200101040FFFD34620400AC80000491
60416+:1037A00003E00008AF8200208F86002427BDFFE0E1
60417+:1037B000AFB10014AFB00010AFBF00188CC300044D
60418+:1037C0008CC500248F820020309000FF94C4001A22
60419+:1037D00024630001244200202484000124A7002047
60420+:1037E000ACC30004AF820020A4C4001AACC70024FC
60421+:1037F00004A100060000882104E2000594C2001A1A
60422+:103800008CC2002024420001ACC2002094C2001AE5
60423+:1038100094C300282E040001004310262C4200010E
60424+:10382000004410245040000594C2001A24020001F4
60425+:10383000ACC2000894C2001A94C300280010202BC8
60426+:10384000004310262C4200010044102514400007BC
60427+:10385000000000008CC20008144000042402001084
60428+:103860008CC300041462000F8F8500240E000DA786
60429+:10387000241100018F820024944300289442001AEE
60430+:1038800014430003000000000E000D1300000000B0
60431+:10389000160000048F8500240E000D840000000037
60432+:1038A0008F85002494A2001E94A4001C24420001D1
60433+:1038B0003043FFFF14640002A4A2001EA4A0001E57
60434+:1038C0001200000A3C02800494A2001494A3001A7F
60435+:1038D0003042000F00021500006218253C028000F3
60436+:1038E000AC4300A00A000E1EACA0000894420006E3
60437+:1038F00094A3001A8CA40000A4A200160062102356
60438+:103900003042FFFF0044102B384200011040000DF0
60439+:1039100002201021006030213C07800494E2000660
60440+:10392000A4A2001694E3000600C310233042FFFF58
60441+:103930000044102B384200011440FFF8A4A30016E5
60442+:10394000022010218FBF00188FB100148FB000101B
60443+:1039500003E0000827BD002003E00008000000008D
60444+:103960008F82002C3C03000600021140004310250A
60445+:103970003C038000AC62003000000000000000004A
60446+:10398000000000008C620000304200101040FFFD7B
60447+:1039900034620400AF82002803E00008AF80002CEE
60448+:1039A00003E000080000102103E000080000000010
60449+:1039B0003084FFFF30A5FFFF0000182110800007B2
60450+:1039C000000000003082000110400002000420428C
60451+:1039D000006518210A000E3D0005284003E000089C
60452+:1039E0000060102110C0000624C6FFFF8CA200005A
60453+:1039F00024A50004AC8200000A000E4724840004C1
60454+:103A000003E000080000000010A0000824A3FFFF4E
60455+:103A1000AC86000000000000000000002402FFFF50
60456+:103A20002463FFFF1462FFFA2484000403E000080B
60457+:103A3000000000003C0280083442008024030001A2
60458+:103A4000AC43000CA4430010A4430012A443001490
60459+:103A500003E00008A44300168F82002427BDFFD88E
60460+:103A6000AFB3001CAFB20018AFB10014AFB000107C
60461+:103A7000AFBF00208C47000C248200802409FF8007
60462+:103A80003C08800E3043007F008080213C0A80008B
60463+:103A9000004920240068182130B100FF30D200FF17
60464+:103AA00010E000290000982126020100AD44002CFE
60465+:103AB000004928243042007F004820219062000005
60466+:103AC00024030050304200FF1443000400000000B3
60467+:103AD000AD45002C948200EA3053FFFF0E000D84A8
60468+:103AE000000000008F8200248F83002000112C0032
60469+:103AF0009442001E001224003484000100A22825F4
60470+:103B00003C02400000A22825AC7000008FBF0020BE
60471+:103B1000AC6000048FB20018AC7300088FB10014C1
60472+:103B2000AC60000C8FB3001CAC6400108FB00010B0
60473+:103B3000AC60001424040001AC60001827BD00280C
60474+:103B40000A000DB8AC65001C8FBF00208FB3001CAD
60475+:103B50008FB200188FB100148FB0001003E000087E
60476+:103B600027BD00283C06800034C201009043000FAE
60477+:103B7000240200101062000E2865001110A000073A
60478+:103B800024020012240200082405003A10620006F4
60479+:103B90000000302103E0000800000000240500358B
60480+:103BA0001462FFFC000030210A000E6400000000D7
60481+:103BB0008CC200748F83FF9424420FA003E000089E
60482+:103BC000AC62000C27BDFFE8AFBF00100E0003423F
60483+:103BD000240500013C0480088FBF0010240200016E
60484+:103BE00034830080A462001227BD00182402000163
60485+:103BF00003E00008A080001A27BDFFE0AFB2001864
60486+:103C0000AFB10014AFB00010AFBF001C30B2FFFF67
60487+:103C10000E000332008088213C028008345000806E
60488+:103C20009202000924030004304200FF1443000CF8
60489+:103C30003C028008124000082402000A0E000E5BBD
60490+:103C400000000000920200052403FFFE0043102440
60491+:103C5000A202000524020012A20200093C02800810
60492+:103C600034420080022020210E00033DA0400027A6
60493+:103C700016400003022020210E000EBF00000000AD
60494+:103C800002202021324600FF8FBF001C8FB2001897
60495+:103C90008FB100148FB00010240500380A000E64A4
60496+:103CA00027BD002027BDFFE0AFBF001CAFB200184A
60497+:103CB000AFB10014AFB000100E00033200808021BD
60498+:103CC0000E000E5B000000003C02800834450080BE
60499+:103CD00090A2000924120018305100FF1232000394
60500+:103CE0000200202124020012A0A2000990A20005D7
60501+:103CF0002403FFFE004310240E00033DA0A2000594
60502+:103D00000200202124050020163200070000302187
60503+:103D10008FBF001C8FB200188FB100148FB000103D
60504+:103D20000A00034227BD00208FBF001C8FB200187D
60505+:103D30008FB100148FB00010240500390A000E6402
60506+:103D400027BD002027BDFFE83C028000AFB0001077
60507+:103D5000AFBF0014344201009442000C2405003629
60508+:103D60000080802114400012304600FF0E00033214
60509+:103D7000000000003C02800834420080240300124E
60510+:103D8000A043000990430005346300100E000E5B51
60511+:103D9000A04300050E00033D020020210200202167
60512+:103DA0000E000342240500200A000F3C0000000022
60513+:103DB0000E000E64000000000E00033202002021FD
60514+:103DC0003C0280089043001B2405FF9F0200202135
60515+:103DD000006518248FBF00148FB00010A043001B93
60516+:103DE0000A00033D27BD001827BDFFE0AFBF001844
60517+:103DF000AFB10014AFB0001030B100FF0E000332BD
60518+:103E0000008080213C02800824030012344200809C
60519+:103E10000E000E5BA04300090E00033D02002021AE
60520+:103E200002002021022030218FBF00188FB1001422
60521+:103E30008FB00010240500350A000E6427BD002055
60522+:103E40003C0480089083000E9082000A1443000B0B
60523+:103E5000000028218F82FF942403005024050001D4
60524+:103E600090420000304200FF1443000400000000B4
60525+:103E70009082000E24420001A082000E03E00008A0
60526+:103E800000A010213C0380008C6201F80440FFFE7A
60527+:103E900024020002AC6401C0A06201C43C02100014
60528+:103EA00003E00008AC6201F827BDFFE0AFB20018E4
60529+:103EB0003C128008AFB10014AFBF001CAFB00010BF
60530+:103EC00036510080922200092403000A304200FF8C
60531+:103ED0001443003E000000008E4300048E22003890
60532+:103EE000506200808FBF001C92220000240300500B
60533+:103EF000304200FF144300253C0280008C42014008
60534+:103F00008E4300043642010002202821AC43001CED
60535+:103F10009622005C8E2300383042FFFF00021040E2
60536+:103F200000621821AE23001C8E4300048E2400384A
60537+:103F30009622005C006418233042FFFF0003184300
60538+:103F4000000210400043102A10400006000000004C
60539+:103F50008E4200048E230038004310230A000FAA6B
60540+:103F6000000220439622005C3042FFFF0002204006
60541+:103F70003C0280083443010034420080ACA4002C91
60542+:103F8000A040002424020001A062000C0E000F5E7D
60543+:103F900000000000104000538FBF001C3C02800056
60544+:103FA0008C4401403C0380008C6201F80440FFFE19
60545+:103FB00024020002AC6401C0A06201C43C021000F3
60546+:103FC000AC6201F80A0010078FBF001C92220009A2
60547+:103FD00024030010304200FF144300043C02800020
60548+:103FE0008C4401400A000FEE0000282192220009B3
60549+:103FF00024030016304200FF14430006240200147C
60550+:10400000A22200093C0280008C4401400A001001F9
60551+:104010008FBF001C8E2200388E23003C00431023EB
60552+:10402000044100308FBF001C92220027244200016F
60553+:10403000A2220027922200272C42000414400016DE
60554+:104040003C1080009222000924030004304200FF4B
60555+:10405000144300093C0280008C4401408FBF001CC7
60556+:104060008FB200188FB100148FB000102405009398
60557+:104070000A000ECC27BD00208C440140240500938B
60558+:104080008FBF001C8FB200188FB100148FB00010CA
60559+:104090000A000F4827BD00208E0401400E000332A5
60560+:1040A000000000008E4200042442FFFFAE420004E4
60561+:1040B0008E22003C2442FFFFAE22003C0E00033D56
60562+:1040C0008E0401408E0401408FBF001C8FB2001887
60563+:1040D0008FB100148FB00010240500040A000342C1
60564+:1040E00027BD00208FB200188FB100148FB00010D0
60565+:1040F00003E0000827BD00203C0680008CC2018838
60566+:104100003C038008346500809063000E00021402B6
60567+:10411000304400FF306300FF1464000E3C0280084E
60568+:1041200090A20026304200FF104400098F82FF94C5
60569+:10413000A0A400262403005090420000304200FF5B
60570+:1041400014430006000000000A0005A18CC4018091
60571+:104150003C02800834420080A044002603E00008AE
60572+:104160000000000027BDFFE030E700FFAFB20018FD
60573+:10417000AFBF001CAFB10014AFB0001000809021A1
60574+:1041800014E0000630C600FF000000000000000D33
60575+:10419000000000000A001060240001163C038008A3
60576+:1041A0009062000E304200FF14460023346200800B
60577+:1041B00090420026304200FF1446001F000000001D
60578+:1041C0009062000F304200FF1446001B0000000008
60579+:1041D0009062000A304200FF144600038F90FF9463
60580+:1041E0000000000D8F90FF948F82FF983C1180009B
60581+:1041F000AE05003CAC450000A066000A0E0003328C
60582+:104200008E240100A20000240E00033D8E24010034
60583+:104210003C0380008C6201F80440FFFE240200028F
60584+:10422000AC7201C0A06201C43C021000AC6201F893
60585+:104230000A0010618FBF001C000000000000000D8C
60586+:10424000000000002400013F8FBF001C8FB2001847
60587+:104250008FB100148FB0001003E0000827BD0020CC
60588+:104260008F83FF943C0280008C44010034420100A3
60589+:104270008C65003C9046001B0A00102724070001B3
60590+:104280003C0280089043000E9042000A0043102632
60591+:10429000304200FF03E000080002102B27BDFFE0C2
60592+:1042A0003C028008AFB10014AFB00010AFBF0018DF
60593+:1042B0003450008092020005240300303042003068
60594+:1042C00014430085008088218F8200248C42000CDA
60595+:1042D000104000828FBF00180E000D840000000007
60596+:1042E0008F860020ACD100009202000892030009E2
60597+:1042F000304200FF00021200306300FF004310252F
60598+:10430000ACC200049202004D000216000002160327
60599+:1043100004410005000000003C0308008C630048D5
60600+:104320000A00109F3C1080089202000830420040B2
60601+:10433000144000030000182192020027304300FFC0
60602+:104340003C108008361100809222004D00031E00B0
60603+:10435000304200FF0002140000621825ACC30008C0
60604+:104360008E2400308F820024ACC4000C8E250034D3
60605+:104370009443001E3C02C00BACC50010006218251F
60606+:104380008E22003800002021ACC200148E22003C96
60607+:10439000ACC200180E000DB8ACC3001C8E020004A5
60608+:1043A0008F8400203C058000AC8200008E2200201B
60609+:1043B000AC8200048E22001CAC8200088E220058C1
60610+:1043C0008CA3007400431021AC82000C8E22002CC0
60611+:1043D000AC8200108E2200408E23004400021400A4
60612+:1043E00000431025AC8200149222004D240300806B
60613+:1043F000304200FF1443000400000000AC800018AD
60614+:104400000A0010E38F8200248E23000C2402000196
60615+:104410001062000E2402FFFF92220008304200408A
60616+:104420001440000A2402FFFF8E23000C8CA20074AB
60617+:10443000006218233C0208000062102414400002AD
60618+:10444000000028210060282100051043AC820018DC
60619+:104450008F820024000020219443001E3C02C00CE7
60620+:10446000006218258F8200200E000DB8AC43001C9E
60621+:104470003C038008346201008C4200008F850020DC
60622+:10448000346300808FBF0018ACA20000ACA0000411
60623+:104490008C6400488F8200248FB10014ACA4000803
60624+:1044A000ACA0000CACA00010906300059446001E68
60625+:1044B0003C02400D00031E0000C23025ACA30014D6
60626+:1044C0008FB00010ACA0001824040001ACA6001CA2
60627+:1044D0000A000DB827BD00208FBF00188FB100144F
60628+:1044E0008FB0001003E0000827BD00203C028000D0
60629+:1044F0009443007C3C02800834460100308400FF75
60630+:104500003065FFFF2402000524A34650A0C4000C20
60631+:104510005482000C3065FFFF90C2000D2C42000752
60632+:104520001040000724A30A0090C3000D24020014C9
60633+:104530000062100400A210210A00111F3045FFFF85
60634+:104540003065FFFF3C0280083442008003E0000831
60635+:10455000A44500143C03800834680080AD05003891
60636+:10456000346701008CE2001C308400FF00A210239D
60637+:104570001840000330C600FF24A2FFFCACE2001C80
60638+:1045800030820001504000083C0380088D02003C4E
60639+:1045900000A2102304410012240400058C620004D0
60640+:1045A00010A2000F3C0380088C62000414A2001EBD
60641+:1045B000000000003C0208008C4200D8304200207D
60642+:1045C000104000093C0280083462008090630008BB
60643+:1045D0009042004C144300043C0280082404000470
60644+:1045E0000A00110900000000344300803442010039
60645+:1045F000A040000C24020001A462001410C0000AB4
60646+:104600003C0280008C4401003C0380008C6201F875
60647+:104610000440FFFE24020002AC6401C0A06201C499
60648+:104620003C021000AC6201F803E00008000000004A
60649+:1046300027BDFFE800A61823AFBF00101860008058
60650+:10464000308800FF3C02800834470080A0E000244E
60651+:1046500034440100A0E000278C82001C00A210233B
60652+:1046600004400056000000008CE2003C94E3005C33
60653+:104670008CE4002C004530233063FFFF00C3182179
60654+:104680000083202B1080000400E018218CE2002C15
60655+:104690000A00117800A2102194E2005C3042FFFF72
60656+:1046A00000C2102100A21021AC62001C3C02800854
60657+:1046B000344400809482005C8C83001C3042FFFFF5
60658+:1046C0000002104000A210210043102B10400004F3
60659+:1046D000000000008C82001C0A00118B3C06800840
60660+:1046E0009482005C3042FFFF0002104000A21021C3
60661+:1046F0003C06800834C3010034C70080AC82001C33
60662+:10470000A060000CACE500388C62001C00A21023F5
60663+:104710001840000224A2FFFCAC62001C3102000120
60664+:10472000104000083C0380088CE2003C00A21023EB
60665+:1047300004410012240400058CC2000410A20010E1
60666+:104740008FBF00108C62000414A2004F8FBF0010B6
60667+:104750003C0208008C4200D8304200201040000A81
60668+:104760003C02800834620080906300089042004C54
60669+:10477000144300053C028008240400048FBF00108D
60670+:104780000A00110927BD001834430080344201009B
60671+:10479000A040000C24020001A46200143C0280002E
60672+:1047A0008C4401003C0380008C6201F80440FFFE51
60673+:1047B000240200020A0011D8000000008CE2001C54
60674+:1047C000004610230043102B54400001ACE5001CB0
60675+:1047D00094E2005C3042FFFF0062102B144000079F
60676+:1047E0002402000294E2005C8CE3001C3042FFFFD4
60677+:1047F00000621821ACE3001C24020002ACE5003882
60678+:104800000E000F5EA082000C1040001F8FBF001032
60679+:104810003C0280008C4401003C0380008C6201F863
60680+:104820000440FFFE24020002AC6401C0A06201C487
60681+:104830003C021000AC6201F80A0011F08FBF0010BA
60682+:1048400031020010104000108FBF00103C028008A1
60683+:10485000344500808CA3001C94A2005C00661823E1
60684+:104860003042FFFF006218213C023FFF3444FFFF4B
60685+:104870000083102B544000010080182100C3102138
60686+:10488000ACA2001C8FBF001003E0000827BD001879
60687+:1048900027BDFFE800C0402100A63023AFBF0010B5
60688+:1048A00018C00026308A00FF3C028008344900808E
60689+:1048B0008D24001C8D23002C008820230064182BDD
60690+:1048C0001060000F344701008CE2002000461021E8
60691+:1048D000ACE200208CE200200044102B1440000BBE
60692+:1048E0003C023FFF8CE2002000441023ACE2002099
60693+:1048F0009522005C3042FFFF0A0012100082202146
60694+:10490000ACE00020008620213C023FFF3443FFFF43
60695+:104910000064102B54400001006020213C028008FC
60696+:104920003442008000851821AC43001CA0400024C4
60697+:10493000A04000270A0012623C03800831420010A8
60698+:10494000104000433C0380083C06800834C40080CB
60699+:104950008C82003C004810235840003E34660080A2
60700+:104960009082002424420001A0820024908200242E
60701+:104970003C0308008C630024304200FF0043102BEE
60702+:10498000144000688FBF001034C201008C42001C2C
60703+:1049900000A2102318400063000000008CC3000434
60704+:1049A0009482005C006818233042FFFF0003184324
60705+:1049B000000210400043102A1040000500000000D3
60706+:1049C0008CC20004004810230A0012450002104364
60707+:1049D0009482005C3042FFFF000210403C068008D9
60708+:1049E000AC82002C34C5008094A2005C8CA4002C06
60709+:1049F00094A3005C3042FFFF00021040008220219F
60710+:104A00003063FFFF0083202101041021ACA2001CB1
60711+:104A10008CC2000434C60100ACC2001C2402000297
60712+:104A20000E000F5EA0C2000C1040003E8FBF0010B1
60713+:104A30003C0280008C4401003C0380008C6201F841
60714+:104A40000440FFFE240200020A001292000000004F
60715+:104A500034660080ACC50038346401008C82001CD0
60716+:104A600000A210231840000224A2FFFCAC82001C0C
60717+:104A7000314200015040000A3C0380088CC2003CD7
60718+:104A800000A2102304430014240400058C620004D7
60719+:104A900014A200033C0380080A00128424040005C9
60720+:104AA0008C62000414A2001F8FBF00103C0208009B
60721+:104AB0008C4200D8304200201040000A3C0280089E
60722+:104AC00034620080906300089042004C144300055B
60723+:104AD0003C028008240400048FBF00100A00110962
60724+:104AE00027BD00183443008034420100A040000C70
60725+:104AF00024020001A46200143C0280008C440100E6
60726+:104B00003C0380008C6201F80440FFFE2402000296
60727+:104B1000AC6401C0A06201C43C021000AC6201F8A8
60728+:104B20008FBF001003E0000827BD001827BDFFE875
60729+:104B30003C0A8008AFBF0010354900808D22003C40
60730+:104B400000C04021308400FF004610231840009D23
60731+:104B500030E700FF354701002402000100A63023A2
60732+:104B6000A0E0000CA0E0000DA522001418C0002455
60733+:104B7000308200108D23001C8D22002C0068182329
60734+:104B80000043102B1040000F000000008CE20020BA
60735+:104B900000461021ACE200208CE200200043102BE4
60736+:104BA0001440000B3C023FFF8CE200200043102326
60737+:104BB000ACE200209522005C3042FFFF0A0012C1E7
60738+:104BC00000621821ACE00020006618213C023FFF83
60739+:104BD0003446FFFF00C3102B5440000100C01821D1
60740+:104BE0003C0280083442008000651821AC43001C60
60741+:104BF000A0400024A04000270A00130F3C038008B7
60742+:104C0000104000403C0380088D22003C00481023E7
60743+:104C10005840003D34670080912200242442000166
60744+:104C2000A1220024912200243C0308008C6300246C
60745+:104C3000304200FF0043102B1440009A8FBF001039
60746+:104C40008CE2001C00A21023184000960000000017
60747+:104C50008D4300049522005C006818233042FFFF5A
60748+:104C600000031843000210400043102A10400005C2
60749+:104C7000012020218D420004004810230A0012F276
60750+:104C8000000210439522005C3042FFFF00021040FA
60751+:104C90003C068008AC82002C34C5008094A2005CE5
60752+:104CA0008CA4002C94A3005C3042FFFF0002104053
60753+:104CB000008220213063FFFF0083182101031021AF
60754+:104CC000ACA2001C8CC2000434C60100ACC2001CA3
60755+:104CD000240200020E000F5EA0C2000C1040007102
60756+:104CE0008FBF00103C0280008C4401003C03800018
60757+:104CF0008C6201F80440FFFE240200020A0013390E
60758+:104D00000000000034670080ACE500383466010024
60759+:104D10008CC2001C00A210231840000224A2FFFC39
60760+:104D2000ACC2001C30820001504000083C038008E7
60761+:104D30008CE2003C00A2102304430051240400052F
60762+:104D40008C62000410A2003E3C0380088C620004C8
60763+:104D500054A200548FBF00103C0208008C4200D8BF
60764+:104D600030420020104000063C028008346200807F
60765+:104D7000906300089042004C104300403C028008C1
60766+:104D80003443008034420100A040000C24020001A2
60767+:104D9000A46200143C0280008C4401003C038000AB
60768+:104DA0008C6201F80440FFFE24020002AC6401C0E2
60769+:104DB000A06201C43C021000AC6201F80A00137743
60770+:104DC0008FBF001024020005A120002714E2000A72
60771+:104DD0003C038008354301009062000D2C42000620
60772+:104DE000504000053C0380089062000D2442000101
60773+:104DF000A062000D3C03800834670080ACE50038F9
60774+:104E0000346601008CC2001C00A21023184000026E
60775+:104E100024A2FFFCACC2001C308200015040000AFA
60776+:104E20003C0380088CE2003C00A2102304410014E3
60777+:104E3000240400058C62000414A200033C038008D3
60778+:104E40000A00136E240400058C62000414A20015ED
60779+:104E50008FBF00103C0208008C4200D83042002076
60780+:104E60001040000A3C028008346200809063000811
60781+:104E70009042004C144300053C02800824040004C6
60782+:104E80008FBF00100A00110927BD001834430080AD
60783+:104E900034420100A040000C24020001A46200146E
60784+:104EA0008FBF001003E0000827BD00183C0B8008EE
60785+:104EB00027BDFFE83C028000AFBF00103442010074
60786+:104EC000356A00809044000A356901008C45001461
60787+:104ED0008D4800389123000C308400FF0105102319
60788+:104EE0001C4000B3306700FF2CE20006504000B1C8
60789+:104EF0008FBF00102402000100E2300430C2000322
60790+:104F00005440000800A8302330C2000C144000A117
60791+:104F100030C20030144000A38FBF00100A00143BC1
60792+:104F20000000000018C00024308200108D43001CD7
60793+:104F30008D42002C006818230043102B1040000FF6
60794+:104F4000000000008D22002000461021AD2200202C
60795+:104F50008D2200200043102B1440000B3C023FFF29
60796+:104F60008D22002000431023AD2200209542005CDA
60797+:104F70003042FFFF0A0013AF00621821AD2000206D
60798+:104F8000006618213C023FFF3446FFFF00C3102B90
60799+:104F90005440000100C018213C02800834420080C7
60800+:104FA00000651821AC43001CA0400024A04000274D
60801+:104FB0000A0013FD3C038008104000403C038008B9
60802+:104FC0008D42003C004810231840003D34670080AB
60803+:104FD0009142002424420001A14200249142002475
60804+:104FE0003C0308008C630024304200FF0043102B78
60805+:104FF000144000708FBF00108D22001C00A21023EF
60806+:105000001840006C000000008D6300049542005CB5
60807+:10501000006818233042FFFF0003184300021040CD
60808+:105020000043102A10400005014020218D62000439
60809+:10503000004810230A0013E0000210439542005C70
60810+:105040003042FFFF000210403C068008AC82002C7A
60811+:1050500034C5008094A2005C8CA4002C94A3005C56
60812+:105060003042FFFF00021040008220213063FFFF2A
60813+:105070000083182101031021ACA2001C8CC2000483
60814+:1050800034C60100ACC2001C240200020E000F5EF8
60815+:10509000A0C2000C104000478FBF00103C028000EF
60816+:1050A0008C4401003C0380008C6201F80440FFFE48
60817+:1050B000240200020A00142D000000003467008062
60818+:1050C000ACE50038346601008CC2001C00A210233D
60819+:1050D0001840000224A2FFFCACC2001C3082000178
60820+:1050E0005040000A3C0380088CE2003C00A21023E0
60821+:1050F00004430014240400058C62000414A200037D
60822+:105100003C0380080A00141F240400058C6200047C
60823+:1051100014A200288FBF00103C0208008C4200D867
60824+:10512000304200201040000A3C02800834620080B7
60825+:10513000906300089042004C144300053C02800834
60826+:10514000240400048FBF00100A00110927BD0018B5
60827+:105150003443008034420100A040000C24020001CE
60828+:10516000A46200143C0280008C4401003C038000D7
60829+:105170008C6201F80440FFFE24020002AC6401C00E
60830+:10518000A06201C43C021000AC6201F80A00143BAA
60831+:105190008FBF00108FBF0010010030210A00115A8C
60832+:1051A00027BD0018010030210A00129927BD001800
60833+:1051B0008FBF001003E0000827BD00183C038008E3
60834+:1051C0003464010024020003A082000C8C620004FD
60835+:1051D00003E00008AC82001C3C05800834A300807A
60836+:1051E0009062002734A501002406004324420001F8
60837+:1051F000A0620027906300273C0208008C42004810
60838+:10520000306300FF146200043C07602194A500EAAB
60839+:105210000A00090130A5FFFF03E0000800000000BC
60840+:1052200027BDFFE8AFBF00103C0280000E00144411
60841+:105230008C4401803C02800834430100A060000CD3
60842+:105240008C4200048FBF001027BD001803E0000847
60843+:10525000AC62001C27BDFFE03C028008AFBF001815
60844+:10526000AFB10014AFB000103445008034460100E7
60845+:105270003C0880008D09014090C3000C8CA4003CC8
60846+:105280008CA200381482003B306700FF9502007C3E
60847+:1052900090A30027146000093045FFFF2402000599
60848+:1052A00054E200083C04800890C2000D2442000132
60849+:1052B000A0C2000D0A00147F3C048008A0C0000DAD
60850+:1052C0003C048008348201009042000C2403000555
60851+:1052D000304200FF1443000A24A205DC348300801E
60852+:1052E000906200272C4200075040000524A20A00CB
60853+:1052F00090630027240200140062100400A2102111
60854+:105300003C108008361000803045FFFF012020212E
60855+:105310000E001444A60500149602005C8E030038AB
60856+:105320003C1180003042FFFF000210400062182153
60857+:10533000AE03001C0E0003328E24014092020025B1
60858+:1053400034420040A20200250E00033D8E2401409D
60859+:105350008E2401403C0380008C6201F80440FFFE73
60860+:1053600024020002AC6401C0A06201C43C0210002F
60861+:10537000AC6201F88FBF00188FB100148FB000101D
60862+:1053800003E0000827BD00203C0360103C02080039
60863+:1053900024420174AC62502C8C6250003C048000AA
60864+:1053A00034420080AC6250003C0208002442547C2D
60865+:1053B0003C010800AC2256003C020800244254384C
60866+:1053C0003C010800AC2256043C020002AC840008F8
60867+:1053D000AC82000C03E000082402000100A0302190
60868+:1053E0003C1C0800279C56083C0200023C050400B7
60869+:1053F00000852826008220260004102B2CA5000101
60870+:105400002C840001000210803C0308002463560035
60871+:105410000085202500431821108000030000102182
60872+:10542000AC6600002402000103E000080000000058
60873+:105430003C1C0800279C56083C0200023C05040066
60874+:1054400000852826008220260004102B2CA50001B0
60875+:105450002C840001000210803C03080024635600E5
60876+:105460000085202500431821108000050000102130
60877+:105470003C02080024425438AC62000024020001BF
60878+:1054800003E00008000000003C0200023C030400AE
60879+:1054900000821026008318262C4200012C63000194
60880+:1054A000004310251040000B000028213C1C080080
60881+:1054B000279C56083C0380008C62000824050001EC
60882+:1054C00000431025AC6200088C62000C00441025DB
60883+:1054D000AC62000C03E0000800A010213C1C080096
60884+:1054E000279C56083C0580008CA3000C0004202754
60885+:1054F000240200010064182403E00008ACA3000C9F
60886+:105500003C020002148200063C0560008CA208D018
60887+:105510002403FFFE0043102403E00008ACA208D0DF
60888+:105520003C02040014820005000000008CA208D098
60889+:105530002403FFFD00431024ACA208D003E00008C0
60890+:10554000000000003C02601A344200108C430080CE
60891+:1055500027BDFFF88C440084AFA3000093A3000094
60892+:10556000240200041462001AAFA4000493A20001F4
60893+:105570001040000797A300023062FFFC3C0380004C
60894+:10558000004310218C4200000A001536AFA200042F
60895+:105590003062FFFC3C03800000431021AC4400005B
60896+:1055A000A3A000003C0560008CA208D02403FFFEED
60897+:1055B0003C04601A00431024ACA208D08FA300045E
60898+:1055C0008FA2000034840010AC830084AC82008081
60899+:1055D00003E0000827BD000827BDFFE8AFBF0010AB
60900+:1055E0003C1C0800279C56083C0280008C43000CA1
60901+:1055F0008C420004004318243C0200021060001496
60902+:10560000006228243C0204003C04000210A00005B3
60903+:10561000006210243C0208008C4256000A00155B10
60904+:1056200000000000104000073C0404003C02080099
60905+:105630008C4256040040F809000000000A00156082
60906+:10564000000000000000000D3C1C0800279C5608CC
60907+:105650008FBF001003E0000827BD0018800802403B
60908+:1056600080080100800800808008000000000C8095
60909+:105670000000320008000E9808000EF408000F88A1
60910+:1056800008001028080010748008010080080080BD
60911+:10569000800800000A000028000000000000000050
60912+:1056A0000000000D6370362E322E316200000000C3
60913+:1056B00006020104000000000000000000000000DD
60914+:1056C000000000000000000038003C000000000066
60915+:1056D00000000000000000000000000000000020AA
60916+:1056E00000000000000000000000000000000000BA
60917+:1056F00000000000000000000000000000000000AA
60918+:10570000000000000000000021003800000000013F
60919+:105710000000002B000000000000000400030D400A
60920+:105720000000000000000000000000000000000079
60921+:105730000000000000000000100000030000000056
60922+:105740000000000D0000000D3C020800244259AC8E
60923+:105750003C03080024635BF4AC4000000043202BB2
60924+:105760001480FFFD244200043C1D080037BD9FFC4F
60925+:1057700003A0F0213C100800261000A03C1C0800EB
60926+:10578000279C59AC0E0002F6000000000000000D3E
60927+:1057900027BDFFB4AFA10000AFA20004AFA3000873
60928+:1057A000AFA4000CAFA50010AFA60014AFA700185F
60929+:1057B000AFA8001CAFA90020AFAA0024AFAB0028FF
60930+:1057C000AFAC002CAFAD0030AFAE0034AFAF00389F
60931+:1057D000AFB8003CAFB90040AFBC0044AFBF004819
60932+:1057E0000E000820000000008FBF00488FBC00445E
60933+:1057F0008FB900408FB8003C8FAF00388FAE0034B7
60934+:105800008FAD00308FAC002C8FAB00288FAA002406
60935+:105810008FA900208FA8001C8FA700188FA6001446
60936+:105820008FA500108FA4000C8FA300088FA2000486
60937+:105830008FA1000027BD004C3C1B60188F7A5030B0
60938+:10584000377B502803400008AF7A000000A01821E1
60939+:1058500000801021008028213C0460003C0760008B
60940+:105860002406000810600006348420788C42000072
60941+:10587000ACE220088C63000003E00008ACE3200CDD
60942+:105880000A000F8100000000240300403C02600079
60943+:1058900003E00008AC4320003C0760008F86000452
60944+:1058A0008CE520740086102100A2182B14600007DC
60945+:1058B000000028218F8AFDA024050001A1440013C7
60946+:1058C0008F89000401244021AF88000403E0000810
60947+:1058D00000A010218F84FDA08F8500049086001306
60948+:1058E00030C300FF00A31023AF82000403E00008D0
60949+:1058F000A08000138F84FDA027BDFFE8AFB000108B
60950+:10590000AFBF001490890011908700112402002875
60951+:10591000312800FF3906002830E300FF2485002CE1
60952+:105920002CD00001106200162484001C0E00006EB2
60953+:10593000000000008F8FFDA03C05600024020204DF
60954+:1059400095EE003E95ED003C000E5C0031ACFFFF93
60955+:10595000016C5025ACAA2010520000012402000462
60956+:10596000ACA22000000000000000000000000000C9
60957+:105970008FBF00148FB0001003E0000827BD00188F
60958+:105980000A0000A6000028218F85FDA027BDFFD8B2
60959+:10599000AFBF0020AFB3001CAFB20018AFB100140E
60960+:1059A000AFB000100080982190A4001124B0001C1A
60961+:1059B00024B1002C308300FF386200280E000090D4
60962+:1059C0002C5200010E00009800000000020020216F
60963+:1059D0001240000202202821000028210E00006E43
60964+:1059E000000000008F8DFDA03C0880003C05600099
60965+:1059F00095AC003E95AB003C02683025000C4C0095
60966+:105A0000316AFFFF012A3825ACA7201024020202C8
60967+:105A1000ACA6201452400001240200028FBF0020D7
60968+:105A20008FB3001C8FB200188FB100148FB000101C
60969+:105A300027BD002803E00008ACA2200027BDFFE03E
60970+:105A4000AFB20018AFB10014AFB00010AFBF001C70
60971+:105A50003C1160008E2320748F82000430D0FFFF41
60972+:105A600030F2FFFF1062000C2406008F0E00006E63
60973+:105A7000000000003C06801F0010440034C5FF00F9
60974+:105A80000112382524040002AE2720100000302126
60975+:105A9000AE252014AE2420008FBF001C8FB200184A
60976+:105AA0008FB100148FB0001000C0102103E0000877
60977+:105AB00027BD002027BDFFE0AFB0001030D0FFFFB2
60978+:105AC000AFBF0018AFB100140E00006E30F1FFFF41
60979+:105AD00000102400009180253C036000AC70201071
60980+:105AE0008FBF00188FB100148FB000102402000483
60981+:105AF000AC62200027BD002003E000080000102158
60982+:105B000027BDFFE03C046018AFBF0018AFB1001420
60983+:105B1000AFB000108C8850002403FF7F34028071E6
60984+:105B20000103382434E5380C241F00313C1980006F
60985+:105B3000AC8550003C11800AAC8253BCAF3F0008DA
60986+:105B40000E00054CAF9100400E00050A3C116000AC
60987+:105B50000E00007D000000008E3008083C0F570941
60988+:105B60002418FFF00218602435EEE00035EDF00057
60989+:105B7000018E5026018D58262D4600012D69000109
60990+:105B8000AF86004C0E000D09AF8900503C06601630
60991+:105B90008CC700003C0860148D0500A03C03FFFF8B
60992+:105BA00000E320243C02535300052FC2108200550D
60993+:105BB00034D07C00960201F2A780006C10400003F4
60994+:105BC000A780007C384B1E1EA78B006C960201F844
60995+:105BD000104000048F8D0050384C1E1EA78C007C96
60996+:105BE0008F8D005011A000058F83004C240E0020E3
60997+:105BF000A78E007CA78E006C8F83004C1060000580
60998+:105C00009785007C240F0020A78F007CA78F006C55
60999+:105C10009785007C2CB8008153000001240500808A
61000+:105C20009784006C2C91040152200001240404008C
61001+:105C30001060000B3C0260008FBF00188FB1001491
61002+:105C40008FB0001027BD0020A784006CA785007CC2
61003+:105C5000A380007EA780007403E00008A780009264
61004+:105C60008C4704382419103C30FFFFFF13F9000360
61005+:105C700030A8FFFF1100004624030050A380007EDF
61006+:105C80009386007E50C00024A785007CA780007CFE
61007+:105C90009798007CA780006CA7800074A780009272
61008+:105CA0003C010800AC3800800E00078700000000AF
61009+:105CB0003C0F60008DED0808240EFFF03C0B600ED9
61010+:105CC000260C0388356A00100000482100002821B6
61011+:105CD00001AE20243C105709AF8C0010AF8A004859
61012+:105CE000AF89001810900023AF8500148FBF0018F3
61013+:105CF0008FB100148FB0001027BD002003E0000812
61014+:105D0000AF80005400055080014648218D260004D4
61015+:105D10000A00014800D180219798007CA784006C7C
61016+:105D2000A7800074A78000923C010800AC38008076
61017+:105D30000E000787000000003C0F60008DED080892
61018+:105D4000240EFFF03C0B600E260C0388356A001011
61019+:105D5000000048210000282101AE20243C105709F2
61020+:105D6000AF8C0010AF8A0048AF8900181490FFDF95
61021+:105D7000AF85001424110001AF9100548FBF0018AB
61022+:105D80008FB100148FB0001003E0000827BD002081
61023+:105D90000A00017BA383007E3083FFFF8F880040D1
61024+:105DA0008F87003C000321403C0580003C020050EE
61025+:105DB000008248253C0660003C0A010034AC040027
61026+:105DC0008CCD08E001AA58241160000500000000F5
61027+:105DD0008CCF08E024E7000101EA7025ACCE08E092
61028+:105DE0008D19001001805821ACB900388D180014AD
61029+:105DF000ACB8003CACA9003000000000000000007E
61030+:105E00000000000000000000000000000000000092
61031+:105E100000000000000000003C0380008C640000D3
61032+:105E2000308200201040FFFD3C0F60008DED08E047
61033+:105E30003C0E010001AE18241460FFE100000000D8
61034+:105E4000AF87003C03E00008AF8B00588F8500400F
61035+:105E5000240BFFF03C06800094A7001A8CA90024B4
61036+:105E600030ECFFFF000C38C000EB5024012A402129
61037+:105E7000ACC8003C8CA400248CC3003C00831023DD
61038+:105E800018400033000000008CAD002025A2000166
61039+:105E90003C0F0050ACC2003835EE00103C068000CC
61040+:105EA000ACCE003000000000000000000000000048
61041+:105EB00000000000000000000000000000000000E2
61042+:105EC000000000003C0480008C9900003338002062
61043+:105ED0001300FFFD30E20008104000173C0980006D
61044+:105EE0008C880408ACA800108C83040CACA30014AC
61045+:105EF0003C1900203C188000AF19003094AE001807
61046+:105F000094AF001C01CF3021A4A6001894AD001A54
61047+:105F100025A70001A4A7001A94AB001A94AC001E98
61048+:105F2000118B00030000000003E0000800000000E7
61049+:105F300003E00008A4A0001A8D2A0400ACAA0010F7
61050+:105F40008D240404ACA400140A0002183C1900209B
61051+:105F50008CA200200A0002003C0F00500A0001EE53
61052+:105F60000000000027BDFFE8AFBF00100E000232A6
61053+:105F7000000000008F8900408FBF00103C038000AC
61054+:105F8000A520000A9528000A9527000427BD0018BF
61055+:105F90003105FFFF30E6000F0006150000A22025A6
61056+:105FA00003E00008AC6400803C0508008CA50020DC
61057+:105FB0008F83000C27BDFFE8AFB00010AFBF001407
61058+:105FC00010A300100000802124040001020430040A
61059+:105FD00000A6202400C3102450440006261000010F
61060+:105FE000001018802787FDA41480000A006718217C
61061+:105FF000261000012E0900025520FFF38F83000CAC
61062+:10600000AF85000C8FBF00148FB0001003E00008B4
61063+:1060100027BD00188C6800003C058000ACA8002457
61064+:106020000E000234261000013C0508008CA500205B
61065+:106030000A0002592E0900022405000100851804F7
61066+:106040003C0408008C84002027BDFFC8AFBF00348B
61067+:1060500000831024AFBE0030AFB7002CAFB60028CD
61068+:10606000AFB50024AFB40020AFB3001CAFB200182E
61069+:10607000AFB1001410400051AFB000108F84004049
61070+:10608000948700069488000A00E8302330D5FFFF8B
61071+:1060900012A0004B8FBF0034948B0018948C000A20
61072+:1060A000016C50233142FFFF02A2482B1520000251
61073+:1060B00002A02021004020212C8F000515E00002C5
61074+:1060C00000809821241300040E0001C102602021E9
61075+:1060D0008F87004002609021AF80004494F4000A52
61076+:1060E000026080211260004E3291FFFF3C1670006A
61077+:1060F0003C1440003C1E20003C1760008F99005863
61078+:106100008F380000031618241074004F0283F82BF8
61079+:1061100017E0003600000000107E00478F86004424
61080+:1061200014C0003A2403000102031023022320219B
61081+:106130003050FFFF1600FFF13091FFFF8F870040C6
61082+:106140003C1100203C108000AE11003094EB000A9E
61083+:106150003C178000024B5021A4EA000A94E9000A8F
61084+:1061600094E800043123FFFF3106000F00062D00E4
61085+:106170000065F025AEFE008094F3000A94F6001846
61086+:1061800012D30036001221408CFF00148CF4001052
61087+:1061900003E468210000C02101A4782B029870213B
61088+:1061A00001CF6021ACED0014ACEC001002B238233A
61089+:1061B00030F5FFFF16A0FFB88F8400408FBF00347A
61090+:1061C0008FBE00308FB7002C8FB600288FB500240B
61091+:1061D0008FB400208FB3001C8FB200188FB1001451
61092+:1061E0008FB0001003E0000827BD00381477FFCC03
61093+:1061F0008F8600440E000EE202002021004018218C
61094+:106200008F86004410C0FFC9020310230270702360
61095+:106210008F87004001C368210A0002E431B2FFFF0A
61096+:106220008F86004414C0FFC93C1100203C10800040
61097+:106230000A0002AEAE1100300E00046602002021FA
61098+:106240000A0002DB00401821020020210E0009395B
61099+:10625000022028210A0002DB004018210E0001EE76
61100+:10626000000000000A0002C702B2382327BDFFC8A1
61101+:10627000AFB7002CAFB60028AFB50024AFB40020F4
61102+:10628000AFB3001CAFB20018AFB10014AFB0001034
61103+:10629000AFBF00300E00011B241300013C047FFF40
61104+:1062A0003C0380083C0220003C010800AC20007048
61105+:1062B0003496FFFF34770080345200033C1512C03F
61106+:1062C000241400013C1080002411FF800E000245C0
61107+:1062D000000000008F8700488F8B00188F89001402
61108+:1062E0008CEA00EC8CE800E8014B302B01092823F4
61109+:1062F00000A6102314400006014B18231440000E82
61110+:106300003C05800002A3602B1180000B0000000000
61111+:106310003C0560008CEE00EC8CED00E88CA4180CC1
61112+:10632000AF8E001804800053AF8D00148F8F0010C3
61113+:10633000ADF400003C0580008CBF00003BF900017B
61114+:10634000333800011700FFE13C0380008C6201003C
61115+:1063500024060C0010460009000000008C680100B3
61116+:106360002D043080548000103C0480008C690100B2
61117+:106370002D2331811060000C3C0480008CAA0100A8
61118+:1063800011460004000020218CA6010024C5FF81D5
61119+:1063900030A400FF8E0B01000E000269AE0B00243A
61120+:1063A0000A00034F3C0480008C8D01002DAC3300AB
61121+:1063B00011800022000000003C0708008CE70098D4
61122+:1063C00024EE00013C010800AC2E00983C04800043
61123+:1063D0008C8201001440000300000000566000148D
61124+:1063E0003C0440008C9F01008C9801000000982123
61125+:1063F00003F1C82400193940330F007F00EF7025E6
61126+:1064000001D26825AC8D08308C8C01008C85010090
61127+:10641000258B0100017130240006514030A3007F1C
61128+:106420000143482501324025AC8808303C04400037
61129+:10643000AE0401380A00030E000000008C99010030
61130+:10644000240F0020AC99002092F80000330300FFD5
61131+:10645000106F000C241F0050547FFFDD3C048000AF
61132+:106460008C8401000E00154E000000000A00034F4E
61133+:106470003C04800000963824ACA7180C0A000327BF
61134+:106480008F8F00108C8501000E0008F72404008017
61135+:106490000A00034F3C04800000A4102B24030001D9
61136+:1064A00010400009000030210005284000A4102BF6
61137+:1064B00004A00003000318405440FFFC00052840DE
61138+:1064C0005060000A0004182B0085382B54E00004AB
61139+:1064D0000003184200C33025008520230003184222
61140+:1064E0001460FFF9000528420004182B03E000089F
61141+:1064F00000C310213084FFFF30C600FF3C0780003E
61142+:106500008CE201B80440FFFE00064C000124302557
61143+:106510003C08200000C820253C031000ACE00180AE
61144+:10652000ACE50184ACE4018803E00008ACE301B809
61145+:106530003C0660008CC5201C2402FFF03083020062
61146+:10654000308601001060000E00A2282434A500014E
61147+:106550003087300010E0000530830C0034A50004C3
61148+:106560003C04600003E00008AC85201C1060FFFDC7
61149+:106570003C04600034A5000803E00008AC85201C42
61150+:1065800054C0FFF334A500020A0003B03087300086
61151+:1065900027BDFFE8AFB00010AFBF00143C0760009C
61152+:1065A000240600021080001100A080218F83005873
61153+:1065B0000E0003A78C6400188F8200580000202171
61154+:1065C000240600018C45000C0E000398000000001A
61155+:1065D0001600000224020003000010218FBF0014E7
61156+:1065E0008FB0001003E0000827BD00188CE8201CC5
61157+:1065F0002409FFF001092824ACE5201C8F870058EE
61158+:106600000A0003CD8CE5000C3C02600E00804021A6
61159+:1066100034460100240900180000000000000000BA
61160+:10662000000000003C0A00503C0380003547020097
61161+:10663000AC68003834640400AC65003CAC670030E2
61162+:106640008C6C0000318B00201160FFFD2407FFFFE0
61163+:106650002403007F8C8D00002463FFFF248400044A
61164+:10666000ACCD00001467FFFB24C60004000000004E
61165+:10667000000000000000000024A402000085282B78
61166+:106680003C0300203C0E80002529FFFF010540212E
61167+:10669000ADC300301520FFE00080282103E0000892
61168+:1066A000000000008F82005827BDFFD8AFB3001C48
61169+:1066B000AFBF0020AFB20018AFB10014AFB00010F0
61170+:1066C00094460002008098218C5200182CC300814F
61171+:1066D0008C4800048C4700088C51000C8C49001039
61172+:1066E000106000078C4A00142CC4000414800013AE
61173+:1066F00030EB000730C5000310A0001000000000C0
61174+:106700002410008B02002021022028210E00039873
61175+:10671000240600031660000224020003000010217A
61176+:106720008FBF00208FB3001C8FB200188FB10014F0
61177+:106730008FB0001003E0000827BD00281560FFF1AE
61178+:106740002410008B3C0C80003C030020241F00011F
61179+:10675000AD830030AF9F0044000000000000000047
61180+:10676000000000002419FFF024D8000F031978243A
61181+:106770003C1000D0AD88003801F0702524CD000316
61182+:106780003C08600EAD87003C35850400AD8E0030BE
61183+:10679000000D38823504003C3C0380008C6B000007
61184+:1067A000316200201040FFFD0000000010E00008F2
61185+:1067B00024E3FFFF2407FFFF8CA800002463FFFFF2
61186+:1067C00024A50004AC8800001467FFFB24840004A7
61187+:1067D0003C05600EACA60038000000000000000080
61188+:1067E000000000008F8600543C0400203C0780001D
61189+:1067F000ACE4003054C000060120202102402021DA
61190+:106800000E0003A7000080210A00041D02002021C1
61191+:106810000E0003DD01402821024020210E0003A7C5
61192+:10682000000080210A00041D0200202127BDFFE096
61193+:10683000AFB200183092FFFFAFB10014AFBF001C21
61194+:10684000AFB000101640000D000088210A0004932C
61195+:106850000220102124050003508500278CE5000C40
61196+:106860000000000D262800013111FFFF24E2002066
61197+:106870000232802B12000019AF8200588F82004430
61198+:10688000144000168F8700583C0670003C0320001F
61199+:106890008CE5000000A62024148300108F84006083
61200+:1068A000000544023C09800000A980241480FFE90F
61201+:1068B000310600FF2CCA000B5140FFEB26280001D7
61202+:1068C000000668803C0E080025CE575801AE6021B6
61203+:1068D0008D8B0000016000080000000002201021E4
61204+:1068E0008FBF001C8FB200188FB100148FB0001042
61205+:1068F00003E0000827BD00200E0003982404008454
61206+:106900001600FFD88F8700580A000474AF8000601B
61207+:10691000020028210E0003BF240400018F870058C5
61208+:106920000A000474AF820060020028210E0003BF39
61209+:10693000000020210A0004A38F8700580E000404E1
61210+:10694000020020218F8700580A000474AF82006083
61211+:1069500030AFFFFF000F19C03C0480008C9001B8DD
61212+:106960000600FFFE3C1920043C181000AC83018097
61213+:10697000AC800184AC990188AC9801B80A00047518
61214+:106980002628000190E2000390E30002000020218D
61215+:106990000002FE0000033A0000FF2825240600083C
61216+:1069A0000E000398000000001600FFDC2402000324
61217+:1069B0008F870058000010210A000474AF82006025
61218+:1069C00090E8000200002021240600090A0004C308
61219+:1069D00000082E0090E4000C240900FF308500FF21
61220+:1069E00010A900150000302190F9000290F8000372
61221+:1069F000308F00FF94EB000400196E000018740043
61222+:106A0000000F62000186202501AE5025014B28258C
61223+:106A10003084FF8B0A0004C32406000A90E30002BE
61224+:106A200090FF0004000020210003360000DF28252D
61225+:106A30000A0004C32406000B0A0004D52406008BB8
61226+:106A4000000449C23127003F000443423C02800059
61227+:106A500000082040240316802CE60020AC43002CC4
61228+:106A600024EAFFE02482000114C0000330A900FFE3
61229+:106A700000801021314700FF000260803C0D800043
61230+:106A8000240A0001018D20213C0B000E00EA28049D
61231+:106A9000008B302111200005000538278CCE000026
61232+:106AA00001C5382503E00008ACC700008CD8000001
61233+:106AB0000307782403E00008ACCF000027BDFFE007
61234+:106AC000AFB10014AFB00010AFBF00183C076000BA
61235+:106AD0008CE408083402F0003C1160003083F000C0
61236+:106AE000240501C03C04800E000030211062000625
61237+:106AF000241000018CEA08083149F0003928E00030
61238+:106B00000008382B000780403C0D0200AE2D081411
61239+:106B1000240C16803C0B80008E2744000E000F8B47
61240+:106B2000AD6C002C120000043C02169124050001FB
61241+:106B3000120500103C023D2C345800E0AE384408E9
61242+:106B40003C1108008E31007C8FBF00183C066000AD
61243+:106B500000118540360F16808FB100148FB00010E1
61244+:106B60003C0E020027BD0020ACCF442003E000080B
61245+:106B7000ACCE08103C0218DA345800E0AE384408B5
61246+:106B80003C1108008E31007C8FBF00183C0660006D
61247+:106B900000118540360F16808FB100148FB00010A1
61248+:106BA0003C0E020027BD0020ACCF442003E00008CB
61249+:106BB000ACCE08100A0004EB240500010A0004EB27
61250+:106BC0000000282124020400A7820024A780001CC2
61251+:106BD000000020213C06080024C65A582405FFFF67
61252+:106BE00024890001000440803124FFFF01061821A0
61253+:106BF0002C87002014E0FFFAAC6500002404040098
61254+:106C0000A7840026A780001E000020213C06080063
61255+:106C100024C65AD82405FFFF248D0001000460809B
61256+:106C200031A4FFFF018658212C8A00201540FFFA6D
61257+:106C3000AD650000A7800028A7800020A780002263
61258+:106C4000000020213C06080024C65B582405FFFFF5
61259+:106C5000249900010004C0803324FFFF030678213B
61260+:106C60002C8E000415C0FFFAADE500003C05600065
61261+:106C70008CA73D002403E08F00E31024344601403C
61262+:106C800003E00008ACA63D002487007F000731C266
61263+:106C900024C5FFFF000518C2246400013082FFFFF5
61264+:106CA000000238C0A78400303C010800AC27003047
61265+:106CB000AF80002C0000282100002021000030219E
61266+:106CC0002489000100A728213124FFFF2CA81701E7
61267+:106CD000110000032C8300801460FFF924C600011A
61268+:106CE00000C02821AF86002C10C0001DA786002AF6
61269+:106CF00024CAFFFF000A11423C08080025085B581F
61270+:106D00001040000A00002021004030212407FFFF2E
61271+:106D1000248E00010004688031C4FFFF01A86021B7
61272+:106D20000086582B1560FFFAAD87000030A2001FC7
61273+:106D30005040000800043080240300010043C804D0
61274+:106D400000041080004878212738FFFF03E0000886
61275+:106D5000ADF8000000C820212405FFFFAC8500002D
61276+:106D600003E000080000000030A5FFFF30C6FFFF71
61277+:106D700030A8001F0080602130E700FF0005294295
61278+:106D80000000502110C0001D24090001240B000147
61279+:106D900025180001010B2004330800FF0126782686
61280+:106DA000390E00202DED00012DC2000101A2182591
61281+:106DB0001060000D014450250005C880032C4021BF
61282+:106DC0000100182110E0000F000A20278D040000A8
61283+:106DD000008A1825AD03000024AD00010000402109
61284+:106DE0000000502131A5FFFF252E000131C9FFFF12
61285+:106DF00000C9102B1040FFE72518000103E0000830
61286+:106E0000000000008D0A0000014440240A0005D162
61287+:106E1000AC68000027BDFFE830A5FFFF30C6FFFFCC
61288+:106E2000AFB00010AFBF001430E7FFFF00005021EB
61289+:106E30003410FFFF0000602124AF001F00C0482174
61290+:106E4000241800012419002005E0001601E010219B
61291+:106E50000002F943019F682A0009702B01AE40240B
61292+:106E600011000017000C18800064102110E00005CC
61293+:106E70008C4B000000F840040008382301675824B8
61294+:106E800000003821154000410000402155600016E7
61295+:106E90003169FFFF258B0001316CFFFF05E1FFEC3D
61296+:106EA00001E0102124A2003E0002F943019F682A5C
61297+:106EB0000009702B01AE40241500FFEB000C188078
61298+:106EC000154600053402FFFF020028210E0005B51B
61299+:106ED00000003821020010218FBF00148FB0001075
61300+:106EE00003E0000827BD00181520000301601821E9
61301+:106EF000000B1C0224080010306A00FF154000053A
61302+:106F0000306E000F250D000800031A0231A800FFA3
61303+:106F1000306E000F15C00005307F000325100004FF
61304+:106F200000031902320800FF307F000317E000055C
61305+:106F3000386900012502000200031882304800FF72
61306+:106F4000386900013123000110600004310300FFA3
61307+:106F5000250A0001314800FF310300FF000C6940A1
61308+:106F600001A34021240A000110CAFFD53110FFFF00
61309+:106F7000246E000131C800FF1119FFC638C9000195
61310+:106F80002D1F002053E0001C258B0001240D000163
61311+:106F90000A000648240E002051460017258B0001E8
61312+:106FA00025090001312800FF2D0900205120001281
61313+:106FB000258B000125430001010D5004014B1024D5
61314+:106FC000250900011440FFF4306AFFFF3127FFFF5D
61315+:106FD00010EE000C2582FFFF304CFFFF0000502117
61316+:106FE0003410FFFF312800FF2D0900205520FFF24B
61317+:106FF00025430001258B0001014648260A000602B0
61318+:10700000316CFFFF00003821000050210A000654B7
61319+:107010003410FFFF27BDFFD8AFB0001030F0FFFFE6
61320+:10702000AFB10014001039423211FFE000071080A8
61321+:10703000AFB3001C00B1282330D3FFFFAFB200185C
61322+:1070400030A5FFFF00809021026030210044202104
61323+:10705000AFBF00200E0005E03207001F022288218A
61324+:107060003403FFFF0240202102002821026030216A
61325+:1070700000003821104300093231FFFF02201021A7
61326+:107080008FBF00208FB3001C8FB200188FB1001487
61327+:107090008FB0001003E0000827BD00280E0005E0B7
61328+:1070A0000000000000408821022010218FBF002036
61329+:1070B0008FB3001C8FB200188FB100148FB0001076
61330+:1070C00003E0000827BD0028000424003C03600002
61331+:1070D000AC603D0810A00002348210063482101605
61332+:1070E00003E00008AC623D0427BDFFE0AFB0001034
61333+:1070F000309000FF2E020006AFBF001810400008BD
61334+:10710000AFB10014001030803C03080024635784A2
61335+:1071100000C328218CA400000080000800000000AB
61336+:10712000000020218FBF00188FB100148FB0001015
61337+:107130000080102103E0000827BD00209791002A5D
61338+:1071400016200051000020213C020800904200332C
61339+:107150000A0006BB00000000978D002615A0003134
61340+:10716000000020210A0006BB2402000897870024A3
61341+:1071700014E0001A00001821006020212402000100
61342+:107180001080FFE98FBF0018000429C2004530219C
61343+:1071900000A6582B1160FFE43C0880003C0720004B
61344+:1071A000000569C001A76025AD0C00203C038008E4
61345+:1071B0002402001F2442FFFFAC6000000441FFFDD9
61346+:1071C0002463000424A5000100A6702B15C0FFF560
61347+:1071D000000569C00A0006A58FBF00189787001C2C
61348+:1071E0003C04080024845A58240504000E0006605C
61349+:1071F00024060001978B002424440001308AFFFFFD
61350+:107200002569FFFF2D48040000402821150000409B
61351+:10721000A789002424AC3800000C19C00A0006B964
61352+:10722000A780001C9787001E3C04080024845AD8BD
61353+:10723000240504000E00066024060001979900262C
61354+:10724000244400013098FFFF272FFFFF2F0E04007A
61355+:107250000040882115C0002CA78F0026A780001EA3
61356+:107260003A020003262401003084FFFF0E00068D41
61357+:107270002C4500010011F8C027F00100001021C0CA
61358+:107280000A0006BB240200089785002E978700227B
61359+:107290003C04080024845B580E00066024060001AC
61360+:1072A0009787002A8F89002C2445000130A8FFFF12
61361+:1072B00024E3FFFF0109302B0040802114C0001897
61362+:1072C000A783002AA7800022978500300E000F7543
61363+:1072D00002002021244A05003144FFFF0E00068DE4
61364+:1072E000240500013C05080094A500320E000F752E
61365+:1072F00002002021244521003C0208009042003376
61366+:107300000A0006BB000521C00A0006F3A784001E80
61367+:1073100024AC3800000C19C00A0006B9A784001C70
61368+:107320000A00070DA7850022308400FF27BDFFE873
61369+:107330002C820006AFBF0014AFB000101040001543
61370+:1073400000A03821000440803C0308002463579CBF
61371+:10735000010328218CA40000008000080000000028
61372+:1073600024CC007F000751C2000C59C23170FFFFCE
61373+:107370002547C40030E5FFFF2784001C02003021B0
61374+:107380000E0005B52407000197860028020620217B
61375+:10739000A78400288FBF00148FB0001003E00008FE
61376+:1073A00027BD00183C0508008CA50030000779C2F5
61377+:1073B0000E00038125E4DF003045FFFF3C04080098
61378+:1073C00024845B58240600010E0005B52407000143
61379+:1073D000978E002A8FBF00148FB0001025CD0001BA
61380+:1073E00027BD001803E00008A78D002A0007C9C2C6
61381+:1073F0002738FF00001878C231F0FFFF3C04080076
61382+:1074000024845AD802002821240600010E0005B564
61383+:1074100024070001978D0026260E0100000E84002F
61384+:1074200025AC00013C0B6000A78C0026AD603D0838
61385+:1074300036040006000030213C0760008CE23D0469
61386+:10744000305F000617E0FFFD24C9000100061B00A5
61387+:10745000312600FF006440252CC50004ACE83D0443
61388+:1074600014A0FFF68FBF00148FB0001003E00008D7
61389+:1074700027BD0018000751C22549C8002406000195
61390+:10748000240700013C04080024845A580E0005B566
61391+:107490003125FFFF978700248FBF00148FB00010A5
61392+:1074A00024E6000127BD001803E00008A786002499
61393+:1074B0003C0660183C090800252900FCACC9502C8A
61394+:1074C0008CC850003C0580003C020002350700805B
61395+:1074D000ACC750003C04080024841FE03C030800B3
61396+:1074E00024631F98ACA50008ACA2000C3C01080066
61397+:1074F000AC2459A43C010800AC2359A803E00008BF
61398+:107500002402000100A030213C1C0800279C59AC3B
61399+:107510003C0C04003C0B0002008B3826008C4026FB
61400+:107520002CE200010007502B2D050001000A4880C5
61401+:107530003C030800246359A4004520250123182199
61402+:107540001080000300001021AC660000240200013E
61403+:1075500003E00008000000003C1C0800279C59AC18
61404+:107560003C0B04003C0A0002008A3026008B3826BF
61405+:107570002CC200010006482B2CE5000100094080C8
61406+:107580003C030800246359A4004520250103182169
61407+:1075900010800005000010213C0C0800258C1F986D
61408+:1075A000AC6C00002402000103E0000800000000B1
61409+:1075B0003C0900023C080400008830260089382677
61410+:1075C0002CC30001008028212CE400010083102539
61411+:1075D0001040000B000030213C1C0800279C59ACD7
61412+:1075E0003C0A80008D4E00082406000101CA68256F
61413+:1075F000AD4D00088D4C000C01855825AD4B000C9D
61414+:1076000003E0000800C010213C1C0800279C59AC76
61415+:107610003C0580008CA6000C0004202724020001F9
61416+:1076200000C4182403E00008ACA3000C3C020002D4
61417+:107630001082000B3C0560003C070400108700032B
61418+:107640000000000003E00008000000008CA908D042
61419+:10765000240AFFFD012A402403E00008ACA808D05A
61420+:107660008CA408D02406FFFE0086182403E000083E
61421+:10767000ACA308D03C05601A34A600108CC300806F
61422+:1076800027BDFFF88CC50084AFA3000093A40000C1
61423+:107690002402001010820003AFA5000403E00008DC
61424+:1076A00027BD000893A7000114E0001497AC000266
61425+:1076B00097B800023C0F8000330EFFFC01CF682119
61426+:1076C000ADA50000A3A000003C0660008CC708D058
61427+:1076D0002408FFFE3C04601A00E82824ACC508D04A
61428+:1076E0008FA300048FA200003499001027BD00086A
61429+:1076F000AF22008003E00008AF2300843C0B800031
61430+:10770000318AFFFC014B48218D2800000A00080C3B
61431+:10771000AFA8000427BDFFE8AFBF00103C1C080065
61432+:10772000279C59AC3C0580008CA4000C8CA2000462
61433+:107730003C0300020044282410A0000A00A31824DF
61434+:107740003C0604003C0400021460000900A610245A
61435+:107750001440000F3C0404000000000D3C1C080015
61436+:10776000279C59AC8FBF001003E0000827BD00180C
61437+:107770003C0208008C4259A40040F80900000000B7
61438+:107780003C1C0800279C59AC0A0008358FBF00102C
61439+:107790003C0208008C4259A80040F8090000000093
61440+:1077A0000A00083B000000003C0880008D0201B880
61441+:1077B0000440FFFE35090180AD2400003C031000A9
61442+:1077C00024040040AD250004A1240008A1260009DE
61443+:1077D000A527000A03E00008AD0301B83084FFFFCD
61444+:1077E0000080382130A5FFFF000020210A00084555
61445+:1077F000240600803087FFFF8CA400002406003898
61446+:107800000A000845000028218F8300788F860070C9
61447+:107810001066000B008040213C07080024E75B68ED
61448+:10782000000328C000A710218C440000246300013D
61449+:10783000108800053063000F5466FFFA000328C06B
61450+:1078400003E00008000010213C07080024E75B6CFF
61451+:1078500000A7302103E000088CC200003C03900028
61452+:1078600034620001008220253C038000AC640020CB
61453+:107870008C65002004A0FFFE0000000003E000086B
61454+:10788000000000003C0280003443000100832025FA
61455+:1078900003E00008AC44002027BDFFE0AFB10014B6
61456+:1078A0003091FFFFAFB00010AFBF001812200013DF
61457+:1078B00000A080218CA20000240400022406020003
61458+:1078C0001040000F004028210E0007250000000096
61459+:1078D00000001021AE000000022038218FBF0018E8
61460+:1078E0008FB100148FB0001000402021000028212B
61461+:1078F000000030210A00084527BD00208CA20000AE
61462+:10790000022038218FBF00188FB100148FB00010F3
61463+:107910000040202100002821000030210A000845F5
61464+:1079200027BD002000A010213087FFFF8CA5000498
61465+:107930008C4400000A000845240600068F83FD9C45
61466+:1079400027BDFFE8AFBF0014AFB00010906700087C
61467+:10795000008010210080282130E600400000202116
61468+:1079600010C000088C5000000E0000BD0200202155
61469+:10797000020020218FBF00148FB000100A000548BC
61470+:1079800027BD00180E0008A4000000000E0000BD76
61471+:1079900002002021020020218FBF00148FB00010B0
61472+:1079A0000A00054827BD001827BDFFE0AFB0001052
61473+:1079B0008F90FD9CAFBF001CAFB20018AFB1001498
61474+:1079C00092060001008088210E00087230D2000467
61475+:1079D00092040005001129C2A6050000348300406E
61476+:1079E000A20300050E00087C022020210E00054A9B
61477+:1079F0000220202124020001AE02000C02202821D6
61478+:107A0000A602001024040002A602001224060200AE
61479+:107A1000A60200140E000725A60200161640000F4D
61480+:107A20008FBF001C978C00743C0B08008D6B007896
61481+:107A30002588FFFF3109FFFF256A0001012A382B45
61482+:107A400010E00006A78800743C0F6006240E0016A4
61483+:107A500035ED0010ADAE00508FBF001C8FB2001886
61484+:107A60008FB100148FB0001003E0000827BD002084
61485+:107A700027BDFFE0AFB10014AFBF0018AFB00010DA
61486+:107A80001080000400A088212402008010820007DA
61487+:107A9000000000000000000D8FBF00188FB100141F
61488+:107AA0008FB0001003E0000827BD00200E00087210
61489+:107AB00000A020218F86FD9C0220202190C500057A
61490+:107AC0000E00087C30B000FF2403003E1603FFF1D7
61491+:107AD0003C0680008CC401780480FFFE34C801405D
61492+:107AE000240900073C071000AD11000002202021EE
61493+:107AF000A10900048FBF00188FB100148FB00010CF
61494+:107B0000ACC701780A0008C527BD002027BDFFE0EB
61495+:107B1000AFB00010AFBF0018AFB100143C10800030
61496+:107B20008E110020000000000E00054AAE04002067
61497+:107B3000AE1100208FBF00188FB100148FB000105D
61498+:107B400003E0000827BD00203084FFFF00803821BB
61499+:107B50002406003500A020210A0008450000282145
61500+:107B60003084FFFF008038212406003600A0202149
61501+:107B70000A0008450000282127BDFFD0AFB500242A
61502+:107B80003095FFFFAFB60028AFB40020AFBF002C88
61503+:107B9000AFB3001CAFB20018AFB10014AFB000100B
61504+:107BA00030B6FFFF12A000270000A0218F920058DE
61505+:107BB0008E4300003C0680002402004000033E0289
61506+:107BC00000032C0230E4007F006698241482001D1C
61507+:107BD00030A500FF8F8300682C68000A1100001098
61508+:107BE0008F8D0044000358803C0C0800258C57B84A
61509+:107BF000016C50218D4900000120000800000000A8
61510+:107C000002D4302130C5FFFF0E0008522404008446
61511+:107C1000166000028F920058AF8000688F8D00447C
61512+:107C20002659002026980001032090213314FFFFDD
61513+:107C300015A00004AF9900580295202B1480FFDC9A
61514+:107C400000000000028010218FBF002C8FB600289A
61515+:107C50008FB500248FB400208FB3001C8FB20018A2
61516+:107C60008FB100148FB0001003E0000827BD003072
61517+:107C70002407003414A70149000000009247000EB9
61518+:107C80008F9FFDA08F90FD9C24181600A3E700197C
61519+:107C90009242000D3C0880003C07800CA3E20018D3
61520+:107CA000964A00123C0D60003C117FFFA60A005C62
61521+:107CB000964400103623FFFF240200053099FFFF91
61522+:107CC000AE1900548E46001CAD1800288CEF000041
61523+:107CD0008DAE444801E6482601C93021AE06003881
61524+:107CE0008E05003824CB00013C0E7F00AE05003C21
61525+:107CF0008E0C003CAFEC0004AE0B00208E13002075
61526+:107D0000AE13001CA3E0001BAE03002CA3E2001284
61527+:107D10008E4A001424130050AE0A00348E0400343E
61528+:107D2000AFE400148E590018AE1900489258000CA8
61529+:107D3000A218004E920D000835AF0020A20F0008D7
61530+:107D40008E090018012E282434AC4000AE0C001817
61531+:107D5000920B0000317200FF1253027F2403FF8058
61532+:107D60003C04080024845BE80E0008AA0000000020
61533+:107D70003C1108008E315BE80E00087202202021C1
61534+:107D80002405000424080001A2050025022020216A
61535+:107D90000E00087CA20800053C0580008CB001782C
61536+:107DA0000600FFFE8F92005834AE0140240F0002FF
61537+:107DB0003C091000ADD10000A1CF0004ACA90178AE
61538+:107DC0000A000962AF8000682CAD003751A0FF9413
61539+:107DD0008F8D0044000580803C110800263157E05B
61540+:107DE000021178218DEE000001C0000800000000A3
61541+:107DF0002411000414B1008C3C0780003C080800EA
61542+:107E00008D085BE88F86FD9CACE800208E4500085D
61543+:107E10008F99FDA0240D0050ACC500308E4C000899
61544+:107E2000ACCC00508E4B000CACCB00348E43001019
61545+:107E3000ACC300388E4A0010ACCA00548E42001405
61546+:107E4000ACC2003C8E5F0018AF3F00048E50001C97
61547+:107E5000ACD0002090C40000309800FF130D024AFF
61548+:107E6000000000008CC400348CD00030009030231F
61549+:107E700004C000F12404008C126000EE2402000310
61550+:107E80000A000962AF8200682419000514B900666F
61551+:107E90003C0580003C0808008D085BE88F86FD9C4F
61552+:107EA000ACA800208E4C00048F8AFDA0240720007F
61553+:107EB000ACCC001C924B000824120008A14B001906
61554+:107EC0008F82005890430009A14300188F85005805
61555+:107ED00090BF000A33E400FF1092001028890009C7
61556+:107EE000152000BA240E0002240D0020108D000B76
61557+:107EF000340780002898002117000008240740005C
61558+:107F000024100040109000053C0700012419008057
61559+:107F1000109900023C070002240740008CC20018A0
61560+:107F20003C03FF00004350240147F825ACDF001854
61561+:107F300090B2000BA0D200278F8300589464000CED
61562+:107F4000108001FE000000009467000C3C1F8000C0
61563+:107F50002405FFBFA4C7005C9063000E2407000443
61564+:107F6000A0C300088F820058904A000FA0CA0009E1
61565+:107F70008F8900588D3200108FE400740244C823AA
61566+:107F8000ACD900588D300014ACD0002C95380018B6
61567+:107F9000330DFFFFACCD00409531001A322FFFFFAB
61568+:107FA000ACCF00448D2E001CACCE00489128000EB2
61569+:107FB000A0C8000890CC000801855824126001B6C2
61570+:107FC000A0CB00088F9200580A000962AF870068B2
61571+:107FD0002406000614A600143C0E80003C0F080086
61572+:107FE0008DEF5BE88F85FD98ADCF00208E4900189E
61573+:107FF0008F86FD9C8F8BFDA0ACA900008CC800383B
61574+:1080000024040005ACA800048CCC003C1260008164
61575+:10801000AD6C00000A000962AF84006824110007FB
61576+:1080200010B1004B240400063C05080024A55BE8C1
61577+:108030000E000881240400818F9200580013102B39
61578+:108040000A000962AF820068241F002314BFFFF6F4
61579+:108050003C0C80003C0508008CA55BE88F8BFDA0E4
61580+:10806000AD8500208F91FD9C8E4600042564002084
61581+:1080700026450014AE260028240600030E000F81BA
61582+:10808000257000308F87005802002021240600034D
61583+:108090000E000F8124E500083C04080024845BE8FE
61584+:1080A0000E0008AA0000000092230000240A0050DD
61585+:1080B000306200FF544AFFE18F9200580E000F6CAF
61586+:1080C000000000000A000A6A8F920058240800335A
61587+:1080D00014A800323C0380003C1108008E315BE89C
61588+:1080E0008F8FFDA0AC7100208E420008240D002867
61589+:1080F0008F89FD9CADE200308E4A000C24060009F9
61590+:10810000ADEA00348E5F0010ADFF00388E440014DD
61591+:10811000ADE400208E590018ADF900248E58001CE3
61592+:10812000ADF80028A1ED00118E4E00041260003160
61593+:10813000AD2E00288F9200580A000962AF860068B1
61594+:10814000240D002214ADFFB8000000002404000735
61595+:108150003C1008008E105BE83C188000AF10002037
61596+:108160005660FEAEAF8400683C04080024845BE8DF
61597+:108170000E0008AA241300508F84FD9C90920000EA
61598+:10818000325900FF1333014B000000008F9200585A
61599+:10819000000020210A000962AF8400683C05080045
61600+:1081A00024A55BE80E000858240400810A000A6A2E
61601+:1081B0008F92005802D498213265FFFF0E000852BA
61602+:1081C000240400840A0009628F920058108EFF5325
61603+:1081D000240704002887000310E00179241100041B
61604+:1081E000240F0001548FFF4D240740000A000A228B
61605+:1081F000240701003C05080024A55BE80E0008A444
61606+:10820000240400828F920058000030210A00096285
61607+:10821000AF8600683C04080024845BE88CC2003808
61608+:108220000E0008AA8CC3003C8F9200580A000AC0B6
61609+:1082300000002021240400823C05080024A55BE8FE
61610+:108240000E0008A4000000008F92005800001021CA
61611+:108250000A000962AF8200688E5000048F91FD9C75
61612+:108260003C078000ACF00020922C00050200282181
61613+:10827000318B0002156001562404008A8F92FDA004
61614+:108280002404008D9245001B30A6002014C001502C
61615+:1082900002002821922E00092408001231C900FF93
61616+:1082A0001128014B240400810E00087202002021D5
61617+:1082B0009258001B240F000402002021370D0042B9
61618+:1082C000A24D001B0E00087CA22F00253C0580005B
61619+:1082D0008CA401780480FFFE34B90140241F000201
61620+:1082E000AF300000A33F00048F9200583C101000F4
61621+:1082F000ACB001780A000A6B0013102B8E500004FA
61622+:108300008F91FD9C3C038000AC700020922A0005F8
61623+:108310000200282131420002144000172404008A80
61624+:10832000922C00092412000402002821318B00FF46
61625+:1083300011720011240400810E0008720200202135
61626+:108340008F89FDA0240800122405FFFE912F001B39
61627+:108350000200202135EE0020A12E001BA2280009DA
61628+:108360009226000500C538240E00087CA2270005CF
61629+:1083700002002821000020210E0009330000000027
61630+:108380000A000A6A8F9200588E4C00043C07800055
61631+:108390003C10080026105BE8ACEC00203C01080013
61632+:1083A000AC2C5BE8924B0003317100041220013BBE
61633+:1083B0008F84FD9C24020006A0820009924F001BBE
61634+:1083C000240EFFC031E9003F012E4025A08800089F
61635+:1083D0009245000330A6000114C0013200000000E5
61636+:1083E0008E420008AE0200083C0208008C425BF09E
61637+:1083F000104001318F90FDA0000219C28F8DFD9CAD
61638+:10840000A603000C8E4A000C24180001240400145A
61639+:10841000AE0A002C8E420010AE02001C965F0016C1
61640+:10842000A61F003C96590014A619003EADB8000CDA
61641+:10843000A5B80010A5B80012A5B80014A5B800167C
61642+:1084400012600144A2040011925100033232000272
61643+:108450002E5300018F920058266200080A0009621C
61644+:10846000AF8200688E4400043C1980003C068008FE
61645+:10847000AF2400208E45000890D80000240D005045
61646+:10848000331100FF122D009C2407008824060009E8
61647+:108490000E000845000000000A000A6A8F9200588A
61648+:1084A0008E5000043C0980003C118008AD30002053
61649+:1084B0009228000024050050310400FF10850110AF
61650+:1084C0002407008802002021000028210E00084512
61651+:1084D0002406000E922D00002418FF80020028219F
61652+:1084E00001B8802524040004240600300E0007256E
61653+:1084F000A23000000A000A6A8F9200588E500004D1
61654+:108500008F91FDA03C028000AC500020923F001BE8
61655+:1085100033F900101320006C240700810200202191
61656+:10852000000028212406001F0E000845000000005E
61657+:108530000A000A6A8F9200588E44001C0E00085DE3
61658+:1085400000000000104000E3004048218F880058E0
61659+:1085500024070089012020218D05001C240600012C
61660+:108560000E000845000000000A000A6A8F920058B9
61661+:10857000964900023C10080026105BE831280004F0
61662+:10858000110000973C0460008E4E001C3C0F8000E0
61663+:10859000ADEE00203C010800AC2E5BE896470002DF
61664+:1085A00030E40001148000E6000000008E42000468
61665+:1085B000AE0200083C1008008E105BF0120000ECC8
61666+:1085C0003C0F80008F92FD9C241000018E4E0018FD
61667+:1085D0008F8DFDA08F9FFD9801CF4825AE490018D3
61668+:1085E000A2400005AE50000C3C0808008D085BF06E
61669+:1085F0008F840058A6500010000839C2A6500012FF
61670+:10860000A6500014A6500016A5A7000C8C8C0008DC
61671+:108610008F8B00588F8A0058ADAC002C8D63000CF6
61672+:1086200024070002ADA3001C91460010A1A6001172
61673+:108630008F82005890450011A3E500088F990058DB
61674+:1086400093380012A258004E8F910058922F0013B9
61675+:10865000A1AF00128F920058964E0014A5AE003CB8
61676+:1086600096490016A5A9003E8E480018ADA8001432
61677+:108670005660FD6AAF8700683C05080024A55BE8EA
61678+:108680000E000881000020218F9200580000382140
61679+:108690000A000962AF8700683C05080024A55BE872
61680+:1086A0000E0008A4240400828F9200580A000A4D8C
61681+:1086B000000038210E000F6C000000008F9200585F
61682+:1086C0000A000AC0000020210E00087202002021CA
61683+:1086D0009223001B02002021346A00100E00087C47
61684+:1086E000A22A001B000038210200202100002821BE
61685+:1086F0000A000BA52406001F9242000C305F000107
61686+:1087000013E0000300000000964A000EA4CA002CEB
61687+:10871000924B000C316300025060000600003821CB
61688+:108720008E470014964C0012ACC7001CA4CC001A53
61689+:10873000000038210A000B7F240600093C050800D0
61690+:1087400024A55BE80E0008A42404008B8F92005837
61691+:108750000A000A4D0013382B3C0C08008D8C5BE896
61692+:1087600024DFFFFE25930100326B007F016790211B
61693+:1087700002638824AD110028AE4600E0AE4000E45C
61694+:108780000A0009B3AE5F001CACC000543C0D0800E9
61695+:108790008DAD5BE83C18800C37090100ACED00287A
61696+:1087A0008E510014AD3100E08E4F0014AD2F00E467
61697+:1087B0008E4E001025C7FFFE0A0009F4AD27001CED
61698+:1087C0005491FDD6240740000A000A222407100015
61699+:1087D0000E00092D000000000A000A6A8F9200585E
61700+:1087E0008C83442C3C12DEAD3651BEEF3C010800B8
61701+:1087F000AC205BE810710062000000003C196C6264
61702+:1088000037387970147800082404000297850074C2
61703+:108810009782006C2404009200A2F82B13E0001948
61704+:1088200002002821240400020E00069524050200FF
61705+:108830003C068000ACC200203C010800AC225BE892
61706+:108840001040000D8F8C0058240A002824040003D7
61707+:10885000918B0010316300FF546A00012404000171
61708+:108860000E0000810000000010400004240400837A
61709+:108870000A000BC28F920058240400833C050800B4
61710+:1088800024A55BE80E000881000000008F920058CC
61711+:108890000013382B0A000962AF8700680A000B49F1
61712+:1088A000240200128E4400080E00085D0000000043
61713+:1088B0000A000B55AE0200083C05080024A55BE841
61714+:1088C0000E000858240400878F9200580A000B728B
61715+:1088D0000013102B240400040E000695240500301C
61716+:1088E0001440002A004048218F8800582407008344
61717+:1088F000012020218D05001C0A000BB32406000175
61718+:108900008F8300788F8600701066FEEE000038219D
61719+:108910003C07080024E75B6C000320C00087282187
61720+:108920008CAE000011D0005D246F000131E3000F18
61721+:108930005466FFFA000320C00A000B8C00003821A7
61722+:108940008E4400040E00085D000000000A000BC801
61723+:10895000AE0200083C05080024A55BE80E0008A450
61724+:10896000240400828F9200580A000B72000010212C
61725+:108970003C05080024A55BE80A000C7C2404008761
61726+:108980008C83442C0A000C5B3C196C628F88005865
61727+:108990003C0780083C0C8000240B0050240A000196
61728+:1089A000AD820020A0EB0000A0EA000191030004CA
61729+:1089B000A0E3001891040005A0E400199106000648
61730+:1089C0003C04080024845B6CA0E6001A91020007B6
61731+:1089D0003C06080024C65B68A0E2001B9105000865
61732+:1089E000A0E5001C911F0009A0FF001D9119000ABD
61733+:1089F000A0F9001E9118000BA0F8001F9112000CA6
61734+:108A0000A0F200209111000DA0F100219110000EA4
61735+:108A1000A0F00022910F000FA0EF0023910E001094
61736+:108A2000A0EE0024910D0011A0ED0025950C00147E
61737+:108A3000A4EC0028950B00168F8A00708F920078A6
61738+:108A4000A4EB002A95030018000A10C02545000178
61739+:108A5000A4E3002C8D1F001C0044C0210046C82147
61740+:108A600030A5000FAF3F0000AF09000010B20006B4
61741+:108A7000AF850070000038218D05001C01202021E9
61742+:108A80000A000BB32406000124AD000131A7000F3A
61743+:108A9000AF8700780A000CF9000038213C06080076
61744+:108AA00024C65B680086902100003821ACA000003D
61745+:108AB0000A000B8CAE4000003C0482013C036000C5
61746+:108AC00034820E02AC603D68AF80009803E000087D
61747+:108AD000AC623D6C27BDFFE8AFB000103090FFFFE7
61748+:108AE000001018422C620041AFBF00141440000275
61749+:108AF00024040080240300403C010800AC300060E6
61750+:108B00003C010800AC2300640E000F7500602821B2
61751+:108B1000244802BF2409FF8001092824001039805D
61752+:108B2000001030408FBF00148FB0001000A720212C
61753+:108B300000861821AF8300803C010800AC25005856
61754+:108B40003C010800AC24005C03E0000827BD0018CD
61755+:108B5000308300FF30C6FFFF30E400FF3C08800098
61756+:108B60008D0201B80440FFFE000354000144382583
61757+:108B70003C09600000E920253C031000AD050180A0
61758+:108B8000AD060184AD04018803E00008AD0301B81F
61759+:108B90008F8500583C0A6012354800108CAC0004E8
61760+:108BA0003C0D600E35A60010318B00062D690001CA
61761+:108BB000AD0900C48CA70004ACC731808CA20008AA
61762+:108BC00094A40002ACC231848CA3001C0460000396
61763+:108BD000A784009003E00008000000008CAF00189C
61764+:108BE000ACCF31D08CAE001C03E00008ACCE31D449
61765+:108BF0008F8500588F87FF288F86FF308CAE00044A
61766+:108C00003C0F601235E80010ACEE00788CAD000827
61767+:108C1000ACED007C8CAC0010ACCC004C8CAB000CF0
61768+:108C2000ACCB004894CA00543C0208008C4200447B
61769+:108C300025490001A4C9005494C400543083FFFFA7
61770+:108C400010620017000000003C0208008C42004047
61771+:108C5000A4C200528CA30018ACE300308CA2001414
61772+:108C6000ACE2002C8CB90018ACF900388CB80014B8
61773+:108C700024050001ACF800348D0600BC50C5001975
61774+:108C80008D0200B48D0200B8A4E2004894E40048CC
61775+:108C9000A4E4004A94E800EA03E000083102FFFF80
61776+:108CA0003C0208008C420024A4C00054A4C200521C
61777+:108CB0008CA30018ACE300308CA20014ACE2002CB2
61778+:108CC0008CB90018ACF900388CB8001424050001E8
61779+:108CD000ACF800348D0600BC54C5FFEB8D0200B823
61780+:108CE0008D0200B4A4E2004894E40048A4E4004AE1
61781+:108CF00094E800EA03E000083102FFFF8F86005885
61782+:108D00003C0480008CC900088CC80008000929C0F8
61783+:108D1000000839C0AC87002090C30007306200040F
61784+:108D20001040003EAF85009490CB0007316A0008E8
61785+:108D30001140003D8F87FF2C8CCD000C8CCE001491
61786+:108D400001AE602B11800036000000008CC2000CC8
61787+:108D5000ACE200708CCB00188F85FF288F88FF3025
61788+:108D6000ACEB00748CCA00102402FFF8ACAA00D847
61789+:108D70008CC9000CAD0900608CC4001CACA400D0F0
61790+:108D800090E3007C0062C824A0F9007C90D8000722
61791+:108D9000330F000811E000040000000090ED007C9B
61792+:108DA00035AC0001A0EC007C90CF000731EE000153
61793+:108DB00011C000060000000090E3007C241800347D
61794+:108DC00034790002A0F9007CACB800DC90C2000746
61795+:108DD0003046000210C000040000000090E8007C53
61796+:108DE00035040004A0E4007C90ED007D3C0B600E97
61797+:108DF000356A001031AC003FA0EC007D8D4931D4C4
61798+:108E00003127000110E00002240E0001A0AE00098D
61799+:108E100094AF00EA03E0000831E2FFFF8F87FF2CE8
61800+:108E20000A000DAF8CC200140A000DB0ACE0007057
61801+:108E30008F8C005827BDFFD8AFB3001CAFB200180D
61802+:108E4000AFB00010AFBF0020AFB10014918F00157C
61803+:108E50003C13600E3673001031EB000FA38B009CA7
61804+:108E60008D8F00048D8B0008959F0012959900103E
61805+:108E70009584001A9598001E958E001C33EDFFFF17
61806+:108E8000332AFFFF3089FFFF3308FFFF31C7FFFFA1
61807+:108E90003C010800AC2D00243C010800AC29004432
61808+:108EA0003C010800AC2A0040AE683178AE67317CE6
61809+:108EB00091850015959100163C12601236520010F3
61810+:108EC00030A200FF3230FFFFAE623188AE5000B4F6
61811+:108ED00091830014959F0018240600010066C804C1
61812+:108EE00033F8FFFFAE5900B8AE5800BC918E0014A5
61813+:108EF000AF8F00843C08600631CD00FFAE4D00C04E
61814+:108F0000918A00159584000E3C07600A314900FFE4
61815+:108F1000AF8B00883084FFFFAE4900C835110010C8
61816+:108F20000E000D1034F004103C0208008C4200606A
61817+:108F30003C0308008C6300643C0608008CC60058A3
61818+:108F40003C0508008CA5005C8F8400808FBF00204A
61819+:108F5000AE23004CAE65319CAE030054AE4500DC40
61820+:108F6000AE6231A0AE6331A4AE663198AE22004845
61821+:108F70008FB3001CAE0200508FB10014AE4200E06F
61822+:108F8000AE4300E4AE4600D88FB000108FB2001898
61823+:108F90000A00057D27BD0028978500929783007CF5
61824+:108FA00027BDFFE8AFB0001000A3102BAFBF001427
61825+:108FB000240400058F900058104000552409000239
61826+:108FC0000E0006958F850080AF8200942404000374
61827+:108FD0001040004F240900023C0680000E00008172
61828+:108FE000ACC2002024070001240820001040004DDE
61829+:108FF00024040005978E00928F8AFF2C24090050CC
61830+:1090000025C50001A7850092A14900003C0D08007C
61831+:109010008DAD0064240380008F84FF28000D66005E
61832+:10902000AD4C0018A5400006954B000A8F85FF3017
61833+:109030002402FF8001633024A546000A915F000AE4
61834+:109040000000482103E2C825A159000AA0A0000899
61835+:10905000A140004CA08000D5961800029783009094
61836+:109060003C020004A49800EA960F00022418FFBFF7
61837+:1090700025EE2401A48E00BE8E0D0004ACAD00448C
61838+:109080008E0C0008ACAC0040A4A00050A4A000547A
61839+:109090008E0B000C240C0030AC8B00288E060010C8
61840+:1090A000AC860024A480003EA487004EA487005014
61841+:1090B000A483003CAD420074AC8800D8ACA800602A
61842+:1090C000A08700FC909F00D433F9007FA09900D4C2
61843+:1090D000909000D402187824A08F00D4914E007C88
61844+:1090E00035CD0001A14D007C938B009CAD480070F4
61845+:1090F000AC8C00DCA08B00D68F8800888F87008422
61846+:10910000AC8800C4AC8700C8A5400078A540007AB0
61847+:109110008FBF00148FB000100120102103E0000861
61848+:1091200027BD00188F8500940E0007258F860080CC
61849+:109130000A000E9F2409000227BDFFE0AFB0001017
61850+:109140008F900058AFB10014AFBF00188E09000413
61851+:109150000E00054A000921C08E0800048F84FF28F4
61852+:109160008F82FF30000839C03C068000ACC7002069
61853+:10917000948500EA904300131460001C30B1FFFF97
61854+:109180008F8CFF2C918B0008316A00401540000B3A
61855+:10919000000000008E0D0004022030218FBF001857
61856+:1091A0008FB100148FB00010240400220000382179
61857+:1091B000000D29C00A000D2F27BD00200E000098C9
61858+:1091C000000000008E0D0004022030218FBF001827
61859+:1091D0008FB100148FB00010240400220000382149
61860+:1091E000000D29C00A000D2F27BD00200E000090A1
61861+:1091F000000000008E0D0004022030218FBF0018F7
61862+:109200008FB100148FB00010240400220000382118
61863+:10921000000D29C00A000D2F27BD002027BDFFE04B
61864+:10922000AFB200183092FFFFAFB00010AFBF001C0C
61865+:10923000AFB100141240001E000080218F8600583C
61866+:109240008CC500002403000600053F02000514023F
61867+:1092500030E4000714830016304500FF2CA80006F8
61868+:1092600011000040000558803C0C0800258C58BCBB
61869+:10927000016C50218D490000012000080000000011
61870+:109280008F8E0098240D000111CD005024020002A1
61871+:10929000AF820098260900013130FFFF24C800206A
61872+:1092A0000212202B010030211480FFE5AF88005806
61873+:1092B000020010218FBF001C8FB200188FB1001464
61874+:1092C0008FB0001003E0000827BD00209387007EC8
61875+:1092D00054E00034000030210E000DE700000000D3
61876+:1092E0008F8600580A000EFF240200018F87009825
61877+:1092F0002405000210E50031240400130000282199
61878+:1093000000003021240700010E000D2F0000000096
61879+:109310000A000F008F8600588F83009824020002F5
61880+:109320001462FFF6240400120E000D9A00000000E3
61881+:109330008F85009400403021240400120E000D2F70
61882+:10934000000038210A000F008F8600588F83009894
61883+:109350002411000310710029241F0002107FFFCE8A
61884+:1093600026090001240400100000282100003021FB
61885+:109370000A000F1D240700018F91009824060002A7
61886+:109380001626FFF9240400100E000E410000000014
61887+:10939000144000238F9800588F8600580A000EFF53
61888+:1093A00024020003240400140E000D2F00002821C5
61889+:1093B0008F8600580A000EFF240200020E000EA93C
61890+:1093C000000000000A000F008F8600580E000D3FBD
61891+:1093D00000000000241900022404001400002821C9
61892+:1093E0000000302100003821AF9900980E000D2FA9
61893+:1093F000000000000A000F008F8600580E000D5775
61894+:10940000000000008F8500942419000200403021E4
61895+:1094100024040010000038210A000F56AF9900986C
61896+:109420000040382124040010970F0002000028217A
61897+:109430000E000D2F31E6FFFF8F8600580A000F0047
61898+:10944000AF9100988F84FF2C3C077FFF34E6FFFF2D
61899+:109450008C8500182402000100A61824AC83001893
61900+:1094600003E00008A08200053084FFFF30A5FFFF65
61901+:109470001080000700001821308200011040000217
61902+:1094800000042042006518211480FFFB00052840DD
61903+:1094900003E000080060102110C000070000000079
61904+:1094A0008CA2000024C6FFFF24A50004AC820000AB
61905+:1094B00014C0FFFB2484000403E000080000000047
61906+:1094C00010A0000824A3FFFFAC86000000000000ED
61907+:1094D000000000002402FFFF2463FFFF1462FFFA74
61908+:1094E0002484000403E0000800000000000411C010
61909+:1094F00003E000082442024027BDFFE8AFB000109F
61910+:1095000000808021AFBF00140E000F9600A0202124
61911+:1095100000504821240AFF808FBF00148FB0001034
61912+:10952000012A30243127007F3C08800A3C042100B6
61913+:1095300000E8102100C428253C03800027BD001846
61914+:10954000AC650024AF820038AC400000AC6500245C
61915+:1095500003E00008AC4000403C0D08008DAD005811
61916+:1095600000056180240AFF8001A45821016C482174
61917+:10957000012A30243127007F3C08800C3C04210064
61918+:1095800000E8102100C428253C038000AC650028B9
61919+:10959000AF82003403E00008AC40002430A5FFFF98
61920+:1095A0003C0680008CC201B80440FFFE3C086015F8
61921+:1095B00000A838253C031000ACC40180ACC0018475
61922+:1095C000ACC7018803E00008ACC301B83C0D08003B
61923+:1095D0008DAD005800056180240AFF8001A4582148
61924+:1095E000016C4021010A4824000931403107007F05
61925+:1095F00000C728253C04200000A418253C02800058
61926+:10960000AC43083003E00008AF80003427BDFFE81A
61927+:10961000AFB0001000808021AFBF00140E000F9685
61928+:1096200000A0202100504821240BFF80012B502452
61929+:10963000000A39403128007F3C0620008FBF00140B
61930+:109640008FB0001000E8282534C2000100A21825C0
61931+:109650003C04800027BD0018AC83083003E00008FC
61932+:10966000AF8000383C0580088CA700603C0680086D
61933+:109670000087102B144000112C8340008CA8006040
61934+:109680002D0340001060000F240340008CC90060CF
61935+:109690000089282B14A00002008018218CC30060D0
61936+:1096A00000035A42000B30803C0A0800254A59202A
61937+:1096B00000CA202103E000088C8200001460FFF340
61938+:1096C0002403400000035A42000B30803C0A08008B
61939+:1096D000254A592000CA202103E000088C8200009E
61940+:1096E0003C05800890A60008938400AB24C20001CA
61941+:1096F000304200FF3043007F1064000C0002382726
61942+:10970000A0A200083C0480008C85017804A0FFFE24
61943+:109710008F8A00A0240900023C081000AC8A014096
61944+:10972000A089014403E00008AC8801780A00101BFE
61945+:1097300030E2008027BDFFD8AFB200188F9200A49E
61946+:10974000AFBF0020AFB3001CAFB00010AFB100142A
61947+:109750008F9300348E5900283C1000803C0EFFEFA0
61948+:10976000AE7900008E580024A260000A35CDFFFFBC
61949+:10977000AE7800049251002C3C0BFF9F356AFFFF2E
61950+:10978000A271000C8E6F000C3C080040A271000B0F
61951+:1097900001F06025018D4824012A382400E8302595
61952+:1097A000AE66000C8E450004AE6000183C0400FF5D
61953+:1097B000AE6500148E43002C3482FFFFA6600008C3
61954+:1097C0000062F824AE7F00108E5900088F9000A030
61955+:1097D000964E0012AE7900208E51000C31D83FFF1A
61956+:1097E00000187980AE7100248E4D001401F06021C4
61957+:1097F00031CB0001AE6D00288E4A0018000C41C22A
61958+:10980000000B4B80AE6A002C8E46001C01093821EB
61959+:10981000A667001CAE660030964500028E4400200C
61960+:10982000A665001EAE64003492430033306200042B
61961+:1098300054400006924700003C0280083443010077
61962+:109840008C7F00D0AE7F0030924700008F860038BA
61963+:10985000A0C700309245003330A4000250800007BA
61964+:10986000925100018F880038240BFF80910A00304C
61965+:10987000014B4825A1090030925100018F9000381A
61966+:10988000240CFFBF2404FFDFA21100318F8D0038AC
61967+:109890003C1880083711008091AF003C31EE007F0A
61968+:1098A000A1AE003C8F890038912B003C016C502404
61969+:1098B000A12A003C8F9F00388E68001493E6003C7C
61970+:1098C0002D0700010007114000C4282400A218251C
61971+:1098D000A3E3003C8F87003896590012A4F90032A8
61972+:1098E0008E450004922E007C30B0000300107823D7
61973+:1098F00031ED000300AD102131CC000215800002D3
61974+:1099000024460034244600303C0280083443008062
61975+:10991000907F007C00BFC824333800041700000289
61976+:1099200024C2000400C010218F98003824190002BE
61977+:10993000ACE20034A3190000924F003F8F8E003834
61978+:109940003C0C8008358B0080A1CF00018F9100383E
61979+:10995000924D003F8E440004A62D0002956A005CE3
61980+:109960000E000FF43150FFFF00024B800209382532
61981+:109970003C08420000E82825AE2500048E4400384B
61982+:109980008F850038ACA400188E460034ACA6001CAD
61983+:10999000ACA0000CACA00010A4A00014A4A0001661
61984+:1099A000A4A00020A4A00022ACA000248E62001479
61985+:1099B00050400001240200018FBF00208FB3001C23
61986+:1099C0008FB200188FB100148FB00010ACA2000845
61987+:1099D0000A00101327BD002827BDFFC83C058008DA
61988+:1099E00034A40080AFBF0034AFBE0030AFB7002C4E
61989+:1099F000AFB60028AFB50024AFB40020AFB3001C51
61990+:109A0000AFB20018AFB10014AFB00010948300786B
61991+:109A10009482007A104300512405FFFF0080F0215A
61992+:109A20000A0011230080B821108B004D8FBF003435
61993+:109A30008F8600A03C1808008F18005C2411FF805E
61994+:109A40003C1680000306782101F18024AED0002C62
61995+:109A500096EE007A31EC007F3C0D800E31CB7FFF1B
61996+:109A6000018D5021000B4840012AA82196A4000036
61997+:109A70003C0808008D0800582405FF8030953FFF02
61998+:109A800001061821001539800067C8210325F82434
61999+:109A90003C02010003E290253338007F3C11800C2A
62000+:109AA000AED20028031190219250000D320F000415
62001+:109AB00011E0003702E0982196E3007A96E8007AF8
62002+:109AC00096E5007A2404800031077FFF24E300013B
62003+:109AD00030627FFF00A4F82403E2C825A6F9007ACB
62004+:109AE00096E6007A3C1408008E94006030D67FFF22
62005+:109AF00012D400C1000000008E5800188F8400A00E
62006+:109B000002A028212713FFFF0E000FCEAE53002C1A
62007+:109B100097D5007897D4007A12950010000028217C
62008+:109B20003C098008352401003C0A8008914800085F
62009+:109B3000908700D53114007F30E400FF0284302B81
62010+:109B400014C0FFB9268B0001938E00AB268C000158
62011+:109B5000008E682115ACFFB78F8600A08FBF003440
62012+:109B60008FBE00308FB7002C8FB600288FB5002431
62013+:109B70008FB400208FB3001C8FB200188FB1001477
62014+:109B80008FB0001000A0102103E0000827BD0038AE
62015+:109B900000C020210E000F99028028218E4B00105A
62016+:109BA0008E4C00308F84003824090002016C502351
62017+:109BB000AE4A0010A089000096E3005C8E4400309D
62018+:109BC0008F9100380E000FF43070FFFF00024380C9
62019+:109BD000020838253C02420000E22825AE25000498
62020+:109BE0008E5F00048F8A00388E590000240B000815
62021+:109BF000AD5F001CAD590018AD40000CAD40001029
62022+:109C00009246000A240400052408C00030D000FF5A
62023+:109C1000A550001496580008A55800169251000A45
62024+:109C20003C188008322F00FFA54F0020964E0008F8
62025+:109C300037110100A54E0022AD400024924D000BCB
62026+:109C400031AC00FFA54C0002A14B00018E49003051
62027+:109C50008F830038240BFFBFAC690008A06400307C
62028+:109C60008F9000382403FFDF9607003200E8282495
62029+:109C700000B51025A6020032921F003233F9003FD2
62030+:109C800037260040A20600328F8C0038AD800034A9
62031+:109C90008E2F00D0AD8F0038918E003C3C0F7FFF9F
62032+:109CA00031CD007FA18D003C8F84003835EEFFFF61
62033+:109CB000908A003C014B4824A089003C8F850038E5
62034+:109CC00090A8003C01033824A0A7003C8E42003439
62035+:109CD0008F9100383C038008AE2200408E59002C42
62036+:109CE0008E5F0030033F3023AE26004492300048A0
62037+:109CF0003218007FA23800488F8800388E4D00301F
62038+:109D00008D0C004801AE582401965024014B482583
62039+:109D1000AD0900489244000AA104004C964700088F
62040+:109D20008F850038A4A7004E8E5000308E4400303E
62041+:109D30000E0003818C65006092F9007C0002F940FE
62042+:109D4000004028210002110003E2302133360002D6
62043+:109D500012C00003020680210005B0800216802197
62044+:109D6000926D007C31B30004126000020005708027
62045+:109D7000020E80218E4B00308F8800382405800031
62046+:109D8000316A0003000A4823312400030204182129
62047+:109D9000AD03003496E4007A96F0007A96F1007AEA
62048+:109DA00032027FFF2447000130FF7FFF0225C824D5
62049+:109DB000033F3025A6E6007A96F8007A3C120800A8
62050+:109DC0008E520060330F7FFF11F200180000000078
62051+:109DD0008F8400A00E000FCE02A028218F8400A047
62052+:109DE0000E000FDE028028210E001013000000007C
62053+:109DF0000A00111F0000000096F1007A022480245E
62054+:109E0000A6F0007A92EF007A92EB007A31EE00FF32
62055+:109E1000000E69C2000D6027000C51C03169007F3F
62056+:109E2000012A20250A001119A2E4007A96E6007A98
62057+:109E300000C5C024A6F8007A92EF007A92F3007A67
62058+:109E400031F200FF001271C2000E6827000DB1C090
62059+:109E5000326C007F01962825A2E5007A0A0011D015
62060+:109E60008F8400A03C0380003084FFFF30A5FFFFFB
62061+:109E7000AC640018AC65001C03E000088C620014A0
62062+:109E800027BDFFA03C068008AFBF005CAFBE0058F6
62063+:109E9000AFB70054AFB60050AFB5004CAFB40048F8
62064+:109EA000AFB30044AFB20040AFB1003CAFB0003838
62065+:109EB00034C80100910500D590C700083084FFFF29
62066+:109EC00030A500FF30E2007F0045182AAFA4001043
62067+:109ED000A7A00018A7A0002610600055AFA000148E
62068+:109EE00090CA00083149007F00A9302324D3FFFF26
62069+:109EF0000013802B8FB400100014902B02128824C2
62070+:109F0000522000888FB300143C03800894790052DB
62071+:109F1000947E00508FB60010033EC0230018BC0092
62072+:109F2000001714030016FC0002C2A82A16A00002A3
62073+:109F3000001F2C030040282100133C0000072403CD
62074+:109F400000A4102A5440000100A020212885000907
62075+:109F500014A000020080A021241400083C0C8008FA
62076+:109F60008D860048001459808D88004C3C03800089
62077+:109F70003169FFFF3C0A0010012A202534710400DA
62078+:109F8000AC660038AF9100A4AC68003CAC64003013
62079+:109F900000000000000000000000000000000000C1
62080+:109FA00000000000000000000000000000000000B1
62081+:109FB0008C6E000031CD002011A0FFFD0014782A26
62082+:109FC00001F01024104000390000A8213C16800840
62083+:109FD00092D700083C1280008E44010032F6007FC8
62084+:109FE0000E000F9902C028218E3900108E44010006
62085+:109FF0000000902133373FFF0E000FB102E028210F
62086+:10A00000923800003302003F2C500008520000102C
62087+:10A0100000008821000210803C030800246358E4FB
62088+:10A020000043F8218FFE000003C00008000000007C
62089+:10A0300090CF0008938C00AB31EE007F00AE682318
62090+:10A04000018D58210A0012172573FFFF0000882197
62091+:10A050003C1E80008FC401000E000FCE02E02821BC
62092+:10A060008FC401000E000FDE02C028211220000F55
62093+:10A070000013802B8F8B00A426A400010004AC00E9
62094+:10A08000027298230015AC032578004002B4B02A70
62095+:10A090000013802B241700010300882102D0102414
62096+:10A0A000AF9800A41440FFC9AFB700143C07800864
62097+:10A0B00094E200508FAE00103C05800002A288217F
62098+:10A0C0003C060020A4F10050ACA6003094F40050EF
62099+:10A0D00094EF005201D51823306CFFFF11F4001EDD
62100+:10A0E000AFAC00108CEF004C001561808CF500487F
62101+:10A0F00001EC28210000202100AC582B02A4C02133
62102+:10A10000030BB021ACE5004CACF600488FB4001056
62103+:10A110000014902B021288241620FF7C3C03800838
62104+:10A120008FB300148FBF005C8FBE00583A620001ED
62105+:10A130008FB700548FB600508FB5004C8FB40048D5
62106+:10A140008FB300448FB200408FB1003C8FB0003815
62107+:10A1500003E0000827BD006094FE00548CF2004428
62108+:10A1600033C9FFFE0009C8C00259F821ACBF003C4A
62109+:10A170008CE800448CAD003C010D50231940003B9D
62110+:10A18000000000008CF7004026E20001ACA200387D
62111+:10A190003C05005034A700103C038000AC67003041
62112+:10A1A00000000000000000000000000000000000AF
62113+:10A1B000000000000000000000000000000000009F
62114+:10A1C0008C7800003316002012C0FFFD3C1180087F
62115+:10A1D000962200543C1580003C068008304E000159
62116+:10A1E000000E18C0007578218DEC04003C070800B3
62117+:10A1F0008CE700443C040020ACCC00488DF40404FF
62118+:10A20000240B0001ACD4004C10EB0260AEA4003073
62119+:10A21000963900523C0508008CA5004000B99021F9
62120+:10A22000A6320052963F005427ED0001A62D00549F
62121+:10A230009626005430C4FFFF5487FF2F8FB40010C0
62122+:10A2400030A5FFFF0E0011F4A62000543C070800C3
62123+:10A250008CE70024963E00520047B82303D74823DA
62124+:10A26000A62900520A0012198FB400108CE2004097
62125+:10A270000A0012BE00000000922400012407000121
62126+:10A280003085007F14A7001C97AD00268E2B00148C
62127+:10A29000240CC000316A3FFF01AC48243C06080092
62128+:10A2A0008CC60060012A402531043FFF0086882BC0
62129+:10A2B00012200011A7A800263C0508008CA5005814
62130+:10A2C0008F9100A0000439802402FF8000B1182182
62131+:10A2D0000067F82103E2F02433F8007F3C1280008D
62132+:10A2E0003C19800EAE5E002C0319702191D0000D38
62133+:10A2F000360F0004A1CF000D0E001028241200011B
62134+:10A30000241100013C1E80008FC401000E000FCEFE
62135+:10A3100002E028218FC401000E000FDE02C02821B8
62136+:10A320001620FF558F8B00A40A0012860013802B85
62137+:10A330008F8600A490C80001310400201080019194
62138+:10A34000241000013C048008348B0080916A007C5A
62139+:10A350008F9E0034AFA0002C314900011120000F66
62140+:10A36000AFB000288CCD00148C8E006001AE602B45
62141+:10A370001580000201A038218C8700603C188008FD
62142+:10A38000370300808C70007000F0782B15E000021D
62143+:10A3900000E020218C640070AFA4002C3C028008F7
62144+:10A3A000344500808CD200148CBF0070025FC82B33
62145+:10A3B00017200002024020218CA400708FA7002CDF
62146+:10A3C0000087182310600003AFA3003024050002AB
62147+:10A3D000AFA500288FA400280264882B162000BA9D
62148+:10A3E000000018218CD000388FCE000C3C0F00806C
62149+:10A3F000AFD000008CCD00343C0CFF9F01CF58251E
62150+:10A40000AFCD000490CA003F3586FFFF01662024CF
62151+:10A410003C0900203C08FFEFA3CA000B0089382547
62152+:10A420003511FFFF00F118243C0500088F8700A4B8
62153+:10A430000065C825AFD9000C8CE20014AFC000182D
62154+:10A440008FA60030AFC200148CF800188FB0002C1B
62155+:10A450003C1FFFFBAFD8001C8CEF000837F2FFFF5A
62156+:10A4600003326824AFCF00248CEC000C020670216C
62157+:10A47000AFCD000CA7C00038A7C0003AAFCE002C6B
62158+:10A48000AFCC0020AFC000288CEA00148FAB002CAA
62159+:10A49000014B48230126402311000011AFC80010D2
62160+:10A4A00090EB003D8FC900048FC80000000B5100E5
62161+:10A4B000012A28210000102100AA882B010218215E
62162+:10A4C0000071F821AFC50004AFDF000090F2003D3D
62163+:10A4D000A3D2000A8F9900A497380006A7D80008D5
62164+:10A4E0008F910038240800023C038008A228000055
62165+:10A4F0003465008094BF005C8FA4002C33F0FFFF14
62166+:10A500000E000FF48F9200380002CB808F8500A4DC
62167+:10A51000021978253C18420001F87025AE4E00045F
62168+:10A520008F8400388CAD0038AC8D00188CAC0034B2
62169+:10A53000AC8C001CAC80000CAC800010A48000141B
62170+:10A54000A4800016A4800020A4800022AC800024F7
62171+:10A5500090A6003F8FA7002CA486000250E0019235
62172+:10A56000240700018FA200305040000290A2003D5D
62173+:10A5700090A2003E244A0001A08A00018F84003886
62174+:10A580008FA9002CAC8900083C128008364D008051
62175+:10A5900091AC007C3186000214C000022407003414
62176+:10A5A000240700308F8500A43C198008373F0080C5
62177+:10A5B00090B0000093F9007C240E0004A0900030BD
62178+:10A5C0008F8F00A48FB8002C8F8D003891F200017E
62179+:10A5D0003304000301C46023A1B200318F8E003820
62180+:10A5E0008F8600A42402C00095CA003294C90012CC
62181+:10A5F0008FAB002C0142402431233FFF010388250B
62182+:10A60000A5D1003291D000323185000300EBF82152
62183+:10A610003218003F370F0040A1CF00328FA4002C2A
62184+:10A6200003E5382133280004108000028F850038AC
62185+:10A6300000E838213C0A8008ACA700343549010005
62186+:10A640008D2800D08FA3002C2419FFBFACA80038A0
62187+:10A6500090B1003C2C640001240FFFDF3227007F03
62188+:10A66000A0A7003C8F98003800049140931F003C45
62189+:10A6700003F98024A310003C8F8C0038918E003C9D
62190+:10A6800001CF682401B23025A186003C8F8900A447
62191+:10A690008F8800388D2B0020AD0B00408D220024C8
62192+:10A6A000AD0200448D2A0028AD0A00488D23002CFD
62193+:10A6B0000E001013AD03004C8FB1002824070002D8
62194+:10A6C000122700118FA300280003282B00058023E8
62195+:10A6D0000270982400608021006090210A00126FAF
62196+:10A6E0000010882B962900128F8400A00000902172
62197+:10A6F0003125FFFFA7A900180E000FC22411000189
62198+:10A700000A00131D3C1E80003C0B80003C12800898
62199+:10A710008D640100924900088F92FF340E000F995A
62200+:10A720003125007F8F9900388FA700288FA4003033
62201+:10A73000A3270000965F005C33F0FFFF0E000FF4CC
62202+:10A740008F91003800026B80020D80253C0842008A
62203+:10A750008F8D00A402085025AE2A00048DA5003874
62204+:10A760008F8A003800007821000F1100AD450018D5
62205+:10A770008DB800343C047FFF3488FFFFAD58001CC7
62206+:10A7800091A6003E8D4C001C8D4900180006190052
62207+:10A79000000677020183C821004E58250323882B29
62208+:10A7A000012B382100F1F821AD59001CAD5F0018D4
62209+:10A7B000AD40000CAD40001091B0003E8FA40030C1
62210+:10A7C00024090005A550001495A500042419C00013
62211+:10A7D00000884024A545001691B8003EA5580020E9
62212+:10A7E00095AF0004A54F0022AD40002491AE003F7C
62213+:10A7F000A54E000291A6003E91AC003D01861023BB
62214+:10A80000244B0001A14B00018F9100388FA3003031
62215+:10A810003C028008344B0100AE230008A22900301E
62216+:10A820008F8C00388F8700A4959F003294F000121F
62217+:10A830002407FFBF033FC02432053FFF03057825EF
62218+:10A84000A58F0032918E00322418FFDF31CD003FFA
62219+:10A8500035A60040A18600328F910038240DFFFFFD
62220+:10A86000240CFF80AE2000348D6A00D0AE2A003860
62221+:10A870009223003C3069007FA229003C8F90003871
62222+:10A880003C0380009219003C0327F824A21F003CDF
62223+:10A890008F8E003891C5003C00B87824A1CF003CD1
62224+:10A8A0008F8A00383C0E8008AD4D00408FA6002CEA
62225+:10A8B000AD46004491420048004C5825A14B004849
62226+:10A8C0008F9000388F9900A48E09004801238824B6
62227+:10A8D00002283825AE070048933F003EA21F004CD7
62228+:10A8E0008F9800A48F8F003897050004A5E5004ECF
62229+:10A8F0000E0003818DC500609246007C8FAC003055
62230+:10A9000000026940000291000040282130CB000283
62231+:10A9100001B21021156000AA018230213C0E80088E
62232+:10A9200035C20080904C007C31830004106000032D
62233+:10A930008FB900300005788000CF3021241F00043B
62234+:10A940008F910038332D000303ED8023320800037C
62235+:10A9500000C85021AE2A00343C188000A7C500383A
62236+:10A960003C0680088F04010090DE00080E000FDE18
62237+:10A9700033C5007F0E001013000000000A00140D04
62238+:10A980008FA300288F9800348CC90038241F00033F
62239+:10A99000A7000008AF0900008CC50034A300000A1E
62240+:10A9A0008F9900A4AF0500043C080080932D003F60
62241+:10A9B000A31F000C8F0A000C3C02FF9FA30D000B8D
62242+:10A9C0000148F0253451FFFF3C12FFEF8F9900A49E
62243+:10A9D00003D170243646FFFF01C61824AF03000CD4
62244+:10A9E0008F2C0014972900128F8400A0AF0C001048
62245+:10A9F0008F2F0014AF000018AF000020AF0F00141D
62246+:10AA0000AF0000248F270018312F3FFF000F59801F
62247+:10AA1000AF0700288F2500080164F821312D0001BF
62248+:10AA2000AF0500308F31000C8F920038001F51C2EB
62249+:10AA3000000D438001481021241E00023C068008BE
62250+:10AA4000A702001CA7000034AF11002CA25E00007A
62251+:10AA500034D20080964E005C8F9900383C0342004F
62252+:10AA600031CCFFFF01833825AF2700048F8B00A472
62253+:10AA7000240500012402C0008D640038240700343E
62254+:10AA8000AF2400188D690034AF29001CAF20000CE2
62255+:10AA9000AF200010A7200014A7200016A720002038
62256+:10AAA000A7200022AF200024A7300002A325000128
62257+:10AAB0008F8800388F9F00A4AD10000893ED000030
62258+:10AAC000A10D00308F8A00A48F98003891510001A9
62259+:10AAD000A31100318F8B0038957E003203C27024A1
62260+:10AAE00001CF6025A56C0032916300323064003FD5
62261+:10AAF000A16400329249007C3125000214A00002BA
62262+:10AB00008F840038240700303C198008AC8700345B
62263+:10AB1000373201008E5F00D0240AFFBF020090216F
62264+:10AB2000AC9F0038908D003C31A8007FA088003C8D
62265+:10AB30008F9E003893C2003C004A8824A3D1003C79
62266+:10AB40008F8300380010882B9066003C34CE0020A4
62267+:10AB5000A06E003C8F8400A48F9800388C8C00205D
62268+:10AB6000AF0C00408C8F0024AF0F00448C8700286E
62269+:10AB7000AF0700488C8B002CAF0B004C0E0010135D
62270+:10AB80003C1E80000A0012700000000094C80052B1
62271+:10AB90003C0A08008D4A002401488821A4D10052B3
62272+:10ABA0000A0012198FB40010A08700018F840038AA
62273+:10ABB000240B0001AC8B00080A0013BE3C12800875
62274+:10ABC000000520800A0014A200C4302127BDFFE048
62275+:10ABD0003C0D8008AFB20018AFB00010AFBF001C32
62276+:10ABE000AFB1001435B200808E4C001835A80100BA
62277+:10ABF000964B000695A70050910900FC000C5602E8
62278+:10AC0000016728233143007F312600FF240200031F
62279+:10AC1000AF8300A8AF8400A010C2001B30B0FFFFBC
62280+:10AC2000910600FC2412000530C200FF10520033D0
62281+:10AC300000000000160000098FBF001C8FB2001832
62282+:10AC40008FB100148FB00010240D0C003C0C80005C
62283+:10AC500027BD002003E00008AD8D00240E0011FB8D
62284+:10AC6000020020218FBF001C8FB200188FB100148A
62285+:10AC70008FB00010240D0C003C0C800027BD00207C
62286+:10AC800003E00008AD8D0024965800789651007AB4
62287+:10AC9000924E007D0238782631E8FFFF31C400C0B3
62288+:10ACA000148000092D11000116000037000000007B
62289+:10ACB0005620FFE28FBF001C0E0010D100000000E4
62290+:10ACC0000A00156A8FBF001C1620FFDA0000000082
62291+:10ACD0000E0010D1000000001440FFD88FBF001CF0
62292+:10ACE0001600002200000000925F007D33E2003F6A
62293+:10ACF000A242007D0A00156A8FBF001C950900EA78
62294+:10AD00008F86008000802821240400050E0007257E
62295+:10AD10003130FFFF978300923C0480002465FFFFE1
62296+:10AD2000A78500928C8A01B80540FFFE0000000054
62297+:10AD3000AC8001808FBF001CAC9001848FB20018E2
62298+:10AD40008FB100148FB000103C0760133C0B100053
62299+:10AD5000240D0C003C0C800027BD0020AC8701882E
62300+:10AD6000AC8B01B803E00008AD8D00240E0011FB90
62301+:10AD7000020020215040FFB18FBF001C925F007D78
62302+:10AD80000A00159733E2003F0E0011FB020020215C
62303+:10AD90001440FFAA8FBF001C122000070000000013
62304+:10ADA0009259007D3330003F36020040A242007DC0
62305+:10ADB0000A00156A8FBF001C0E0010D100000000B1
62306+:10ADC0005040FF9E8FBF001C9259007D3330003FE2
62307+:10ADD0000A0015C636020040000000000000001BFB
62308+:10ADE0000000000F0000000A00000008000000063C
62309+:10ADF0000000000500000005000000040000000441
62310+:10AE00000000000300000003000000030000000336
62311+:10AE10000000000300000002000000020000000229
62312+:10AE2000000000020000000200000002000000021A
62313+:10AE3000000000020000000200000002000000020A
62314+:10AE400000000002000000020000000200000002FA
62315+:10AE50000000000100000001000000018008010066
62316+:10AE6000800800808008000000000C000000308096
62317+:10AE7000080011D00800127C08001294080012A8E3
62318+:10AE8000080012BC080011D0080011D0080012F010
62319+:10AE90000800132C080013400800138808001A8CBF
62320+:10AEA00008001A8C08001AC408001AC408001AD82E
62321+:10AEB00008001AA808001D0008001CCC08001D5836
62322+:10AEC00008001D5808001DE008001D108008024001
62323+:10AED000080027340800256C0800275C080027F4C8
62324+:10AEE0000800293C0800298808002AAC080029B479
62325+:10AEF00008002A38080025DC08002EDC08002EA4F3
62326+:10AF000008002588080025880800258808002B20CF
62327+:10AF100008002B20080025880800258808002DD06F
62328+:10AF2000080025880800258808002588080025884D
62329+:10AF300008002E0C080025880800258808002588B0
62330+:10AF4000080025880800258808002588080025882D
62331+:10AF5000080025880800258808002588080025881D
62332+:10AF6000080025880800258808002588080029A8E9
62333+:10AF7000080025880800258808002E680800258814
62334+:10AF800008002588080025880800258808002588ED
62335+:10AF900008002588080025880800258808002588DD
62336+:10AFA00008002588080025880800258808002588CD
62337+:10AFB00008002588080025880800258808002588BD
62338+:10AFC00008002CF4080025880800258808002C6853
62339+:10AFD00008002BC408003CE408003CB808003C848E
62340+:10AFE00008003C5808003C3808003BEC8008010091
62341+:10AFF00080080080800800008008008008004C6401
62342+:10B0000008004C9C08004BE408004C6408004C64A9
62343+:10B01000080049B808004C64080050500A000C842D
62344+:10B0200000000000000000000000000D7278703683
62345+:10B030002E322E31620000000602010300000000E3
62346+:10B0400000000001000000000000000000000000FF
62347+:10B0500000000000000000000000000000000000F0
62348+:10B0600000000000000000000000000000000000E0
62349+:10B0700000000000000000000000000000000000D0
62350+:10B0800000000000000000000000000000000000C0
62351+:10B0900000000000000000000000000000000000B0
62352+:10B0A00000000000000000000000000000000000A0
62353+:10B0B0000000000000000000000000000000000090
62354+:10B0C0000000000000000000000000000000000080
62355+:10B0D0000000000000000000000000000000000070
62356+:10B0E0000000000000000000000000000000000060
62357+:10B0F0000000000000000000000000000000000050
62358+:10B10000000000000000000000000000000000003F
62359+:10B11000000000000000000000000000000000002F
62360+:10B12000000000000000000000000000000000001F
62361+:10B13000000000000000000000000000000000000F
62362+:10B1400000000000000000000000000000000000FF
62363+:10B1500000000000000000000000000000000000EF
62364+:10B1600000000000000000000000000000000000DF
62365+:10B1700000000000000000000000000000000000CF
62366+:10B1800000000000000000000000000000000000BF
62367+:10B1900000000000000000000000000000000000AF
62368+:10B1A000000000000000000000000000000000009F
62369+:10B1B000000000000000000000000000000000008F
62370+:10B1C000000000000000000000000000000000007F
62371+:10B1D000000000000000000000000000000000006F
62372+:10B1E000000000000000000000000000000000005F
62373+:10B1F000000000000000000000000000000000004F
62374+:10B20000000000000000000000000000000000003E
62375+:10B21000000000000000000000000000000000002E
62376+:10B22000000000000000000000000000000000001E
62377+:10B23000000000000000000000000000000000000E
62378+:10B2400000000000000000000000000000000000FE
62379+:10B2500000000000000000000000000000000000EE
62380+:10B2600000000000000000000000000000000000DE
62381+:10B2700000000000000000000000000000000000CE
62382+:10B2800000000000000000000000000000000000BE
62383+:10B2900000000000000000000000000000000000AE
62384+:10B2A000000000000000000000000000000000009E
62385+:10B2B000000000000000000000000000000000008E
62386+:10B2C000000000000000000000000000000000007E
62387+:10B2D000000000000000000000000000000000006E
62388+:10B2E000000000000000000000000000000000005E
62389+:10B2F000000000000000000000000000000000004E
62390+:10B30000000000000000000000000000000000003D
62391+:10B31000000000000000000000000000000000002D
62392+:10B32000000000000000000000000000000000001D
62393+:10B33000000000000000000000000000000000000D
62394+:10B3400000000000000000000000000000000000FD
62395+:10B3500000000000000000000000000000000000ED
62396+:10B3600000000000000000000000000000000000DD
62397+:10B3700000000000000000000000000000000000CD
62398+:10B3800000000000000000000000000000000000BD
62399+:10B3900000000000000000000000000000000000AD
62400+:10B3A000000000000000000000000000000000009D
62401+:10B3B000000000000000000000000000000000008D
62402+:10B3C000000000000000000000000000000000007D
62403+:10B3D000000000000000000000000000000000006D
62404+:10B3E000000000000000000000000000000000005D
62405+:10B3F000000000000000000000000000000000004D
62406+:10B40000000000000000000000000000000000003C
62407+:10B41000000000000000000000000000000000002C
62408+:10B42000000000000000000000000000000000001C
62409+:10B43000000000000000000000000000000000000C
62410+:10B4400000000000000000000000000000000000FC
62411+:10B4500000000000000000000000000000000000EC
62412+:10B4600000000000000000000000000000000000DC
62413+:10B4700000000000000000000000000000000000CC
62414+:10B4800000000000000000000000000000000000BC
62415+:10B4900000000000000000000000000000000000AC
62416+:10B4A000000000000000000000000000000000009C
62417+:10B4B000000000000000000000000000000000008C
62418+:10B4C000000000000000000000000000000000007C
62419+:10B4D000000000000000000000000000000000006C
62420+:10B4E000000000000000000000000000000000005C
62421+:10B4F000000000000000000000000000000000004C
62422+:10B50000000000000000000000000000000000003B
62423+:10B51000000000000000000000000000000000002B
62424+:10B52000000000000000000000000000000000001B
62425+:10B53000000000000000000000000000000000000B
62426+:10B5400000000000000000000000000000000000FB
62427+:10B5500000000000000000000000000000000000EB
62428+:10B5600000000000000000000000000000000000DB
62429+:10B5700000000000000000000000000000000000CB
62430+:10B5800000000000000000000000000000000000BB
62431+:10B5900000000000000000000000000000000000AB
62432+:10B5A000000000000000000000000000000000009B
62433+:10B5B000000000000000000000000000000000008B
62434+:10B5C000000000000000000000000000000000007B
62435+:10B5D000000000000000000000000000000000006B
62436+:10B5E000000000000000000000000000000000005B
62437+:10B5F000000000000000000000000000000000004B
62438+:10B60000000000000000000000000000000000003A
62439+:10B61000000000000000000000000000000000002A
62440+:10B62000000000000000000000000000000000001A
62441+:10B63000000000000000000000000000000000000A
62442+:10B6400000000000000000000000000000000000FA
62443+:10B6500000000000000000000000000000000000EA
62444+:10B6600000000000000000000000000000000000DA
62445+:10B6700000000000000000000000000000000000CA
62446+:10B6800000000000000000000000000000000000BA
62447+:10B6900000000000000000000000000000000000AA
62448+:10B6A000000000000000000000000000000000009A
62449+:10B6B000000000000000000000000000000000008A
62450+:10B6C000000000000000000000000000000000007A
62451+:10B6D000000000000000000000000000000000006A
62452+:10B6E000000000000000000000000000000000005A
62453+:10B6F000000000000000000000000000000000004A
62454+:10B700000000000000000000000000000000000039
62455+:10B710000000000000000000000000000000000029
62456+:10B720000000000000000000000000000000000019
62457+:10B730000000000000000000000000000000000009
62458+:10B7400000000000000000000000000000000000F9
62459+:10B7500000000000000000000000000000000000E9
62460+:10B7600000000000000000000000000000000000D9
62461+:10B7700000000000000000000000000000000000C9
62462+:10B7800000000000000000000000000000000000B9
62463+:10B7900000000000000000000000000000000000A9
62464+:10B7A0000000000000000000000000000000000099
62465+:10B7B0000000000000000000000000000000000089
62466+:10B7C0000000000000000000000000000000000079
62467+:10B7D0000000000000000000000000000000000069
62468+:10B7E0000000000000000000000000000000000059
62469+:10B7F0000000000000000000000000000000000049
62470+:10B800000000000000000000000000000000000038
62471+:10B810000000000000000000000000000000000028
62472+:10B820000000000000000000000000000000000018
62473+:10B830000000000000000000000000000000000008
62474+:10B8400000000000000000000000000000000000F8
62475+:10B8500000000000000000000000000000000000E8
62476+:10B8600000000000000000000000000000000000D8
62477+:10B8700000000000000000000000000000000000C8
62478+:10B8800000000000000000000000000000000000B8
62479+:10B8900000000000000000000000000000000000A8
62480+:10B8A0000000000000000000000000000000000098
62481+:10B8B0000000000000000000000000000000000088
62482+:10B8C0000000000000000000000000000000000078
62483+:10B8D0000000000000000000000000000000000068
62484+:10B8E0000000000000000000000000000000000058
62485+:10B8F0000000000000000000000000000000000048
62486+:10B900000000000000000000000000000000000037
62487+:10B910000000000000000000000000000000000027
62488+:10B920000000000000000000000000000000000017
62489+:10B930000000000000000000000000000000000007
62490+:10B9400000000000000000000000000000000000F7
62491+:10B9500000000000000000000000000000000000E7
62492+:10B9600000000000000000000000000000000000D7
62493+:10B9700000000000000000000000000000000000C7
62494+:10B9800000000000000000000000000000000000B7
62495+:10B9900000000000000000000000000000000000A7
62496+:10B9A0000000000000000000000000000000000097
62497+:10B9B0000000000000000000000000000000000087
62498+:10B9C0000000000000000000000000000000000077
62499+:10B9D0000000000000000000000000000000000067
62500+:10B9E0000000000000000000000000000000000057
62501+:10B9F0000000000000000000000000000000000047
62502+:10BA00000000000000000000000000000000000036
62503+:10BA10000000000000000000000000000000000026
62504+:10BA20000000000000000000000000000000000016
62505+:10BA30000000000000000000000000000000000006
62506+:10BA400000000000000000000000000000000000F6
62507+:10BA500000000000000000000000000000000000E6
62508+:10BA600000000000000000000000000000000000D6
62509+:10BA700000000000000000000000000000000000C6
62510+:10BA800000000000000000000000000000000000B6
62511+:10BA900000000000000000000000000000000000A6
62512+:10BAA0000000000000000000000000000000000096
62513+:10BAB0000000000000000000000000000000000086
62514+:10BAC0000000000000000000000000000000000076
62515+:10BAD0000000000000000000000000000000000066
62516+:10BAE0000000000000000000000000000000000056
62517+:10BAF0000000000000000000000000000000000046
62518+:10BB00000000000000000000000000000000000035
62519+:10BB10000000000000000000000000000000000025
62520+:10BB20000000000000000000000000000000000015
62521+:10BB30000000000000000000000000000000000005
62522+:10BB400000000000000000000000000000000000F5
62523+:10BB500000000000000000000000000000000000E5
62524+:10BB600000000000000000000000000000000000D5
62525+:10BB700000000000000000000000000000000000C5
62526+:10BB800000000000000000000000000000000000B5
62527+:10BB900000000000000000000000000000000000A5
62528+:10BBA0000000000000000000000000000000000095
62529+:10BBB0000000000000000000000000000000000085
62530+:10BBC0000000000000000000000000000000000075
62531+:10BBD0000000000000000000000000000000000065
62532+:10BBE0000000000000000000000000000000000055
62533+:10BBF0000000000000000000000000000000000045
62534+:10BC00000000000000000000000000000000000034
62535+:10BC10000000000000000000000000000000000024
62536+:10BC20000000000000000000000000000000000014
62537+:10BC30000000000000000000000000000000000004
62538+:10BC400000000000000000000000000000000000F4
62539+:10BC500000000000000000000000000000000000E4
62540+:10BC600000000000000000000000000000000000D4
62541+:10BC700000000000000000000000000000000000C4
62542+:10BC800000000000000000000000000000000000B4
62543+:10BC900000000000000000000000000000000000A4
62544+:10BCA0000000000000000000000000000000000094
62545+:10BCB0000000000000000000000000000000000084
62546+:10BCC0000000000000000000000000000000000074
62547+:10BCD0000000000000000000000000000000000064
62548+:10BCE0000000000000000000000000000000000054
62549+:10BCF0000000000000000000000000000000000044
62550+:10BD00000000000000000000000000000000000033
62551+:10BD10000000000000000000000000000000000023
62552+:10BD20000000000000000000000000000000000013
62553+:10BD30000000000000000000000000000000000003
62554+:10BD400000000000000000000000000000000000F3
62555+:10BD500000000000000000000000000000000000E3
62556+:10BD600000000000000000000000000000000000D3
62557+:10BD700000000000000000000000000000000000C3
62558+:10BD800000000000000000000000000000000000B3
62559+:10BD900000000000000000000000000000000000A3
62560+:10BDA0000000000000000000000000000000000093
62561+:10BDB0000000000000000000000000000000000083
62562+:10BDC0000000000000000000000000000000000073
62563+:10BDD0000000000000000000000000000000000063
62564+:10BDE0000000000000000000000000000000000053
62565+:10BDF0000000000000000000000000000000000043
62566+:10BE00000000000000000000000000000000000032
62567+:10BE10000000000000000000000000000000000022
62568+:10BE20000000000000000000000000000000000012
62569+:10BE30000000000000000000000000000000000002
62570+:10BE400000000000000000000000000000000000F2
62571+:10BE500000000000000000000000000000000000E2
62572+:10BE600000000000000000000000000000000000D2
62573+:10BE700000000000000000000000000000000000C2
62574+:10BE800000000000000000000000000000000000B2
62575+:10BE900000000000000000000000000000000000A2
62576+:10BEA0000000000000000000000000000000000092
62577+:10BEB0000000000000000000000000000000000082
62578+:10BEC0000000000000000000000000000000000072
62579+:10BED0000000000000000000000000000000000062
62580+:10BEE0000000000000000000000000000000000052
62581+:10BEF0000000000000000000000000000000000042
62582+:10BF00000000000000000000000000000000000031
62583+:10BF10000000000000000000000000000000000021
62584+:10BF20000000000000000000000000000000000011
62585+:10BF30000000000000000000000000000000000001
62586+:10BF400000000000000000000000000000000000F1
62587+:10BF500000000000000000000000000000000000E1
62588+:10BF600000000000000000000000000000000000D1
62589+:10BF700000000000000000000000000000000000C1
62590+:10BF800000000000000000000000000000000000B1
62591+:10BF900000000000000000000000000000000000A1
62592+:10BFA0000000000000000000000000000000000091
62593+:10BFB0000000000000000000000000000000000081
62594+:10BFC0000000000000000000000000000000000071
62595+:10BFD0000000000000000000000000000000000061
62596+:10BFE0000000000000000000000000000000000051
62597+:10BFF0000000000000000000000000000000000041
62598+:10C000000000000000000000000000000000000030
62599+:10C010000000000000000000000000000000000020
62600+:10C020000000000000000000000000000000000010
62601+:10C030000000000000000000000000000000000000
62602+:10C0400000000000000000000000000000000000F0
62603+:10C0500000000000000000000000000000000000E0
62604+:10C0600000000000000000000000000000000000D0
62605+:10C0700000000000000000000000000000000000C0
62606+:10C0800000000000000000000000000000000000B0
62607+:10C0900000000000000000000000000000000000A0
62608+:10C0A0000000000000000000000000000000000090
62609+:10C0B0000000000000000000000000000000000080
62610+:10C0C0000000000000000000000000000000000070
62611+:10C0D0000000000000000000000000000000000060
62612+:10C0E0000000000000000000000000000000000050
62613+:10C0F0000000000000000000000000000000000040
62614+:10C10000000000000000000000000000000000002F
62615+:10C11000000000000000000000000000000000001F
62616+:10C12000000000000000000000000000000000000F
62617+:10C1300000000000000000000000000000000000FF
62618+:10C1400000000000000000000000000000000000EF
62619+:10C1500000000000000000000000000000000000DF
62620+:10C1600000000000000000000000000000000000CF
62621+:10C1700000000000000000000000000000000000BF
62622+:10C1800000000000000000000000000000000000AF
62623+:10C19000000000000000000000000000000000009F
62624+:10C1A000000000000000000000000000000000008F
62625+:10C1B000000000000000000000000000000000007F
62626+:10C1C000000000000000000000000000000000006F
62627+:10C1D000000000000000000000000000000000005F
62628+:10C1E000000000000000000000000000000000004F
62629+:10C1F000000000000000000000000000000000003F
62630+:10C20000000000000000000000000000000000002E
62631+:10C21000000000000000000000000000000000001E
62632+:10C22000000000000000000000000000000000000E
62633+:10C2300000000000000000000000000000000000FE
62634+:10C2400000000000000000000000000000000000EE
62635+:10C2500000000000000000000000000000000000DE
62636+:10C2600000000000000000000000000000000000CE
62637+:10C2700000000000000000000000000000000000BE
62638+:10C2800000000000000000000000000000000000AE
62639+:10C29000000000000000000000000000000000009E
62640+:10C2A000000000000000000000000000000000008E
62641+:10C2B000000000000000000000000000000000007E
62642+:10C2C000000000000000000000000000000000006E
62643+:10C2D000000000000000000000000000000000005E
62644+:10C2E000000000000000000000000000000000004E
62645+:10C2F000000000000000000000000000000000003E
62646+:10C30000000000000000000000000000000000002D
62647+:10C31000000000000000000000000000000000001D
62648+:10C32000000000000000000000000000000000000D
62649+:10C3300000000000000000000000000000000000FD
62650+:10C3400000000000000000000000000000000000ED
62651+:10C3500000000000000000000000000000000000DD
62652+:10C3600000000000000000000000000000000000CD
62653+:10C3700000000000000000000000000000000000BD
62654+:10C3800000000000000000000000000000000000AD
62655+:10C39000000000000000000000000000000000009D
62656+:10C3A000000000000000000000000000000000008D
62657+:10C3B000000000000000000000000000000000007D
62658+:10C3C000000000000000000000000000000000006D
62659+:10C3D000000000000000000000000000000000005D
62660+:10C3E000000000000000000000000000000000004D
62661+:10C3F000000000000000000000000000000000003D
62662+:10C40000000000000000000000000000000000002C
62663+:10C41000000000000000000000000000000000001C
62664+:10C42000000000000000000000000000000000000C
62665+:10C4300000000000000000000000000000000000FC
62666+:10C4400000000000000000000000000000000000EC
62667+:10C4500000000000000000000000000000000000DC
62668+:10C4600000000000000000000000000000000000CC
62669+:10C4700000000000000000000000000000000000BC
62670+:10C4800000000000000000000000000000000000AC
62671+:10C49000000000000000000000000000000000009C
62672+:10C4A000000000000000000000000000000000008C
62673+:10C4B000000000000000000000000000000000007C
62674+:10C4C000000000000000000000000000000000006C
62675+:10C4D000000000000000000000000000000000005C
62676+:10C4E000000000000000000000000000000000004C
62677+:10C4F000000000000000000000000000000000003C
62678+:10C50000000000000000000000000000000000002B
62679+:10C51000000000000000000000000000000000001B
62680+:10C52000000000000000000000000000000000000B
62681+:10C5300000000000000000000000000000000000FB
62682+:10C5400000000000000000000000000000000000EB
62683+:10C5500000000000000000000000000000000000DB
62684+:10C5600000000000000000000000000000000000CB
62685+:10C5700000000000000000000000000000000000BB
62686+:10C5800000000000000000000000000000000000AB
62687+:10C59000000000000000000000000000000000009B
62688+:10C5A000000000000000000000000000000000008B
62689+:10C5B000000000000000000000000000000000007B
62690+:10C5C000000000000000000000000000000000006B
62691+:10C5D000000000000000000000000000000000005B
62692+:10C5E000000000000000000000000000000000004B
62693+:10C5F000000000000000000000000000000000003B
62694+:10C60000000000000000000000000000000000002A
62695+:10C61000000000000000000000000000000000001A
62696+:10C62000000000000000000000000000000000000A
62697+:10C6300000000000000000000000000000000000FA
62698+:10C6400000000000000000000000000000000000EA
62699+:10C6500000000000000000000000000000000000DA
62700+:10C6600000000000000000000000000000000000CA
62701+:10C6700000000000000000000000000000000000BA
62702+:10C6800000000000000000000000000000000000AA
62703+:10C69000000000000000000000000000000000009A
62704+:10C6A000000000000000000000000000000000008A
62705+:10C6B000000000000000000000000000000000007A
62706+:10C6C000000000000000000000000000000000006A
62707+:10C6D000000000000000000000000000000000005A
62708+:10C6E000000000000000000000000000000000004A
62709+:10C6F000000000000000000000000000000000003A
62710+:10C700000000000000000000000000000000000029
62711+:10C710000000000000000000000000000000000019
62712+:10C720000000000000000000000000000000000009
62713+:10C7300000000000000000000000000000000000F9
62714+:10C7400000000000000000000000000000000000E9
62715+:10C7500000000000000000000000000000000000D9
62716+:10C7600000000000000000000000000000000000C9
62717+:10C7700000000000000000000000000000000000B9
62718+:10C7800000000000000000000000000000000000A9
62719+:10C790000000000000000000000000000000000099
62720+:10C7A0000000000000000000000000000000000089
62721+:10C7B0000000000000000000000000000000000079
62722+:10C7C0000000000000000000000000000000000069
62723+:10C7D0000000000000000000000000000000000059
62724+:10C7E0000000000000000000000000000000000049
62725+:10C7F0000000000000000000000000000000000039
62726+:10C800000000000000000000000000000000000028
62727+:10C810000000000000000000000000000000000018
62728+:10C820000000000000000000000000000000000008
62729+:10C8300000000000000000000000000000000000F8
62730+:10C8400000000000000000000000000000000000E8
62731+:10C8500000000000000000000000000000000000D8
62732+:10C8600000000000000000000000000000000000C8
62733+:10C8700000000000000000000000000000000000B8
62734+:10C8800000000000000000000000000000000000A8
62735+:10C890000000000000000000000000000000000098
62736+:10C8A0000000000000000000000000000000000088
62737+:10C8B0000000000000000000000000000000000078
62738+:10C8C0000000000000000000000000000000000068
62739+:10C8D0000000000000000000000000000000000058
62740+:10C8E0000000000000000000000000000000000048
62741+:10C8F0000000000000000000000000000000000038
62742+:10C900000000000000000000000000000000000027
62743+:10C910000000000000000000000000000000000017
62744+:10C920000000000000000000000000000000000007
62745+:10C9300000000000000000000000000000000000F7
62746+:10C9400000000000000000000000000000000000E7
62747+:10C9500000000000000000000000000000000000D7
62748+:10C9600000000000000000000000000000000000C7
62749+:10C9700000000000000000000000000000000000B7
62750+:10C9800000000000000000000000000000000000A7
62751+:10C990000000000000000000000000000000000097
62752+:10C9A0000000000000000000000000000000000087
62753+:10C9B0000000000000000000000000000000000077
62754+:10C9C0000000000000000000000000000000000067
62755+:10C9D0000000000000000000000000000000000057
62756+:10C9E0000000000000000000000000000000000047
62757+:10C9F0000000000000000000000000000000000037
62758+:10CA00000000000000000000000000000000000026
62759+:10CA10000000000000000000000000000000000016
62760+:10CA20000000000000000000000000000000000006
62761+:10CA300000000000000000000000000000000000F6
62762+:10CA400000000000000000000000000000000000E6
62763+:10CA500000000000000000000000000000000000D6
62764+:10CA600000000000000000000000000000000000C6
62765+:10CA700000000000000000000000000000000000B6
62766+:10CA800000000000000000000000000000000000A6
62767+:10CA90000000000000000000000000000000000096
62768+:10CAA0000000000000000000000000000000000086
62769+:10CAB0000000000000000000000000000000000076
62770+:10CAC0000000000000000000000000000000000066
62771+:10CAD0000000000000000000000000000000000056
62772+:10CAE0000000000000000000000000000000000046
62773+:10CAF0000000000000000000000000000000000036
62774+:10CB00000000000000000000000000000000000025
62775+:10CB10000000000000000000000000000000000015
62776+:10CB20000000000000000000000000000000000005
62777+:10CB300000000000000000000000000000000000F5
62778+:10CB400000000000000000000000000000000000E5
62779+:10CB500000000000000000000000000000000000D5
62780+:10CB600000000000000000000000000000000000C5
62781+:10CB700000000000000000000000000000000000B5
62782+:10CB800000000000000000000000000000000000A5
62783+:10CB90000000000000000000000000000000000095
62784+:10CBA0000000000000000000000000000000000085
62785+:10CBB0000000000000000000000000000000000075
62786+:10CBC0000000000000000000000000000000000065
62787+:10CBD0000000000000000000000000000000000055
62788+:10CBE0000000000000000000000000000000000045
62789+:10CBF0000000000000000000000000000000000035
62790+:10CC00000000000000000000000000000000000024
62791+:10CC10000000000000000000000000000000000014
62792+:10CC20000000000000000000000000000000000004
62793+:10CC300000000000000000000000000000000000F4
62794+:10CC400000000000000000000000000000000000E4
62795+:10CC500000000000000000000000000000000000D4
62796+:10CC600000000000000000000000000000000000C4
62797+:10CC700000000000000000000000000000000000B4
62798+:10CC800000000000000000000000000000000000A4
62799+:10CC90000000000000000000000000000000000094
62800+:10CCA0000000000000000000000000000000000084
62801+:10CCB0000000000000000000000000000000000074
62802+:10CCC0000000000000000000000000000000000064
62803+:10CCD0000000000000000000000000000000000054
62804+:10CCE0000000000000000000000000000000000044
62805+:10CCF0000000000000000000000000000000000034
62806+:10CD00000000000000000000000000000000000023
62807+:10CD10000000000000000000000000000000000013
62808+:10CD20000000000000000000000000000000000003
62809+:10CD300000000000000000000000000000000000F3
62810+:10CD400000000000000000000000000000000000E3
62811+:10CD500000000000000000000000000000000000D3
62812+:10CD600000000000000000000000000000000000C3
62813+:10CD700000000000000000000000000000000000B3
62814+:10CD800000000000000000000000000000000000A3
62815+:10CD90000000000000000000000000000000000093
62816+:10CDA0000000000000000000000000000000000083
62817+:10CDB0000000000000000000000000000000000073
62818+:10CDC0000000000000000000000000000000000063
62819+:10CDD0000000000000000000000000000000000053
62820+:10CDE0000000000000000000000000000000000043
62821+:10CDF0000000000000000000000000000000000033
62822+:10CE00000000000000000000000000000000000022
62823+:10CE10000000000000000000000000000000000012
62824+:10CE20000000000000000000000000000000000002
62825+:10CE300000000000000000000000000000000000F2
62826+:10CE400000000000000000000000000000000000E2
62827+:10CE500000000000000000000000000000000000D2
62828+:10CE600000000000000000000000000000000000C2
62829+:10CE700000000000000000000000000000000000B2
62830+:10CE800000000000000000000000000000000000A2
62831+:10CE90000000000000000000000000000000000092
62832+:10CEA0000000000000000000000000000000000082
62833+:10CEB0000000000000000000000000000000000072
62834+:10CEC0000000000000000000000000000000000062
62835+:10CED0000000000000000000000000000000000052
62836+:10CEE0000000000000000000000000000000000042
62837+:10CEF0000000000000000000000000000000000032
62838+:10CF00000000000000000000000000000000000021
62839+:10CF10000000000000000000000000000000000011
62840+:10CF20000000000000000000000000000000000001
62841+:10CF300000000000000000000000000000000000F1
62842+:10CF400000000000000000000000000000000000E1
62843+:10CF500000000000000000000000000000000000D1
62844+:10CF600000000000000000000000000000000000C1
62845+:10CF700000000000000000000000000000000000B1
62846+:10CF800000000000000000000000000000000000A1
62847+:10CF90000000000000000000000000000000000091
62848+:10CFA0000000000000000000000000000000000081
62849+:10CFB0000000000000000000000000000000000071
62850+:10CFC0000000000000000000000000000000000061
62851+:10CFD0000000000000000000000000000000000051
62852+:10CFE0000000000000000000000000000000000041
62853+:10CFF0000000000000000000000000000000000031
62854+:10D000000000000000000000000000000000000020
62855+:10D010000000000000000000000000000000000010
62856+:10D020000000000000000000000000000000000000
62857+:10D0300000000000000000000000000000000000F0
62858+:10D0400000000000000000000000000000000000E0
62859+:10D0500000000000000000000000000000000000D0
62860+:10D0600000000000000000000000000000000000C0
62861+:10D0700000000000000000000000000000000000B0
62862+:10D0800000000000000000000000000000000000A0
62863+:10D090000000000000000000000000000000000090
62864+:10D0A0000000000000000000000000000000000080
62865+:10D0B0000000000000000000000000000000000070
62866+:10D0C0000000000000000000000000000000000060
62867+:10D0D0000000000000000000000000000000000050
62868+:10D0E0000000000000000000000000000000000040
62869+:10D0F0000000000000000000000000000000000030
62870+:10D10000000000000000000000000000000000001F
62871+:10D11000000000000000000000000000000000000F
62872+:10D1200000000000000000000000000000000000FF
62873+:10D1300000000000000000000000000000000000EF
62874+:10D1400000000000000000000000000000000000DF
62875+:10D1500000000000000000000000000000000000CF
62876+:10D1600000000000000000000000000000000000BF
62877+:10D1700000000000000000000000000000000000AF
62878+:10D18000000000000000000000000000000000009F
62879+:10D19000000000000000000000000000000000008F
62880+:10D1A000000000000000000000000000000000007F
62881+:10D1B000000000000000000000000000000000006F
62882+:10D1C000000000000000000000000000000000005F
62883+:10D1D000000000000000000000000000000000004F
62884+:10D1E000000000000000000000000000000000003F
62885+:10D1F000000000000000000000000000000000002F
62886+:10D20000000000000000000000000000000000001E
62887+:10D21000000000000000000000000000000000000E
62888+:10D2200000000000000000000000000000000000FE
62889+:10D2300000000000000000000000000000000000EE
62890+:10D2400000000000000000000000000000000000DE
62891+:10D2500000000000000000000000000000000000CE
62892+:10D2600000000000000000000000000000000000BE
62893+:10D2700000000000000000000000000000000000AE
62894+:10D28000000000000000000000000000000000009E
62895+:10D29000000000000000000000000000000000008E
62896+:10D2A000000000000000000000000000000000007E
62897+:10D2B000000000000000000000000000000000006E
62898+:10D2C000000000000000000000000000000000005E
62899+:10D2D000000000000000000000000000000000004E
62900+:10D2E000000000000000000000000000000000003E
62901+:10D2F000000000000000000000000000000000002E
62902+:10D30000000000000000000000000000000000001D
62903+:10D31000000000000000000000000000000000000D
62904+:10D3200000000000000000000000000000000000FD
62905+:10D3300000000000000000000000000000000000ED
62906+:10D3400000000000000000000000000000000000DD
62907+:10D3500000000000000000000000000000000000CD
62908+:10D3600000000000000000000000000000000000BD
62909+:10D3700000000000000000000000000000000000AD
62910+:10D38000000000000000000000000000000000009D
62911+:10D39000000000000000000000000000000000008D
62912+:10D3A000000000000000000000000000000000007D
62913+:10D3B000000000000000000000000000000000006D
62914+:10D3C000000000000000000000000000000000005D
62915+:10D3D000000000000000000000000000000000004D
62916+:10D3E000000000000000000000000000000000003D
62917+:10D3F000000000000000000000000000000000002D
62918+:10D40000000000000000000000000000000000001C
62919+:10D41000000000000000000000000000000000000C
62920+:10D4200000000000000000000000000000000000FC
62921+:10D4300000000000000000000000000000000000EC
62922+:10D4400000000000000000000000000000000000DC
62923+:10D4500000000000000000000000000000000000CC
62924+:10D4600000000000000000000000000000000000BC
62925+:10D4700000000000000000000000000000000000AC
62926+:10D48000000000000000000000000000000000009C
62927+:10D49000000000000000000000000000000000008C
62928+:10D4A000000000000000000000000000000000007C
62929+:10D4B000000000000000000000000000000000006C
62930+:10D4C000000000000000000000000000000000005C
62931+:10D4D000000000000000000000000000000000004C
62932+:10D4E000000000000000000000000000000000003C
62933+:10D4F000000000000000000000000000000000002C
62934+:10D50000000000000000000000000000000000001B
62935+:10D51000000000000000000000000000000000000B
62936+:10D5200000000000000000000000000000000000FB
62937+:10D5300000000000000000000000000000000000EB
62938+:10D5400000000000000000000000000000000000DB
62939+:10D5500000000000000000000000000000000000CB
62940+:10D5600000000000000000000000000000000000BB
62941+:10D5700000000000000000000000000000000000AB
62942+:10D58000000000000000000000000000000000009B
62943+:10D59000000000000000000000000000000000008B
62944+:10D5A000000000000000000000000000000000007B
62945+:10D5B000000000000000000000000000000000006B
62946+:10D5C000000000000000000000000000000000005B
62947+:10D5D000000000000000000000000000000000004B
62948+:10D5E000000000000000000000000000000000003B
62949+:10D5F000000000000000000000000000000000002B
62950+:10D60000000000000000000000000000000000001A
62951+:10D61000000000000000000000000000000000000A
62952+:10D6200000000000000000000000000000000000FA
62953+:10D6300000000000000000000000000000000000EA
62954+:10D6400000000000000000000000000000000000DA
62955+:10D6500000000000000000000000000000000000CA
62956+:10D6600000000000000000000000000000000000BA
62957+:10D6700000000000000000000000000000000000AA
62958+:10D68000000000000000000000000000000000009A
62959+:10D69000000000000000000000000000000000008A
62960+:10D6A000000000000000000000000000000000007A
62961+:10D6B000000000000000000000000000000000006A
62962+:10D6C000000000000000000000000000000000005A
62963+:10D6D000000000000000000000000000000000004A
62964+:10D6E000000000000000000000000000000000003A
62965+:10D6F000000000000000000000000000000000002A
62966+:10D700000000000000000000000000000000000019
62967+:10D710000000000000000000000000000000000009
62968+:10D7200000000000000000000000000000000000F9
62969+:10D7300000000000000000000000000000000000E9
62970+:10D7400000000000000000000000000000000000D9
62971+:10D7500000000000000000000000000000000000C9
62972+:10D7600000000000000000000000000000000000B9
62973+:10D7700000000000000000000000000000000000A9
62974+:10D780000000000000000000000000000000000099
62975+:10D790000000000000000000000000000000000089
62976+:10D7A0000000000000000000000000000000000079
62977+:10D7B0000000000000000000000000000000000069
62978+:10D7C0000000000000000000000000000000000059
62979+:10D7D0000000000000000000000000000000000049
62980+:10D7E0000000000000000000000000000000000039
62981+:10D7F0000000000000000000000000000000000029
62982+:10D800000000000000000000000000000000000018
62983+:10D810000000000000000000000000000000000008
62984+:10D8200000000000000000000000000000000000F8
62985+:10D8300000000000000000000000000000000000E8
62986+:10D8400000000000000000000000000000000000D8
62987+:10D8500000000000000000000000000000000000C8
62988+:10D8600000000000000000000000000000000000B8
62989+:10D8700000000000000000000000000000000000A8
62990+:10D880000000000000000000000000000000000098
62991+:10D890000000000000000000000000000000000088
62992+:10D8A0000000000000000000000000000000000078
62993+:10D8B0000000000000000000000000000000000068
62994+:10D8C0000000000000000000000000000000000058
62995+:10D8D0000000000000000000000000000000000048
62996+:10D8E0000000000000000000000000000000000038
62997+:10D8F0000000000000000000000000000000000028
62998+:10D900000000000000000000000000000000000017
62999+:10D910000000000000000000000000000000000007
63000+:10D9200000000000000000000000000000000000F7
63001+:10D9300000000000000000000000000000000000E7
63002+:10D9400000000000000000000000000000000000D7
63003+:10D9500000000000000000000000000000000000C7
63004+:10D9600000000000000000000000000000000000B7
63005+:10D9700000000000000000000000000000000000A7
63006+:10D980000000000000000000000000000000000097
63007+:10D990000000000000000000000000000000000087
63008+:10D9A0000000000000000000000000000000000077
63009+:10D9B0000000000000000000000000000000000067
63010+:10D9C0000000000000000000000000000000000057
63011+:10D9D0000000000000000000000000000000000047
63012+:10D9E0000000000000000000000000000000000037
63013+:10D9F0000000000000000000000000000000000027
63014+:10DA00000000000000000000000000000000000016
63015+:10DA10000000000000000000000000000000000006
63016+:10DA200000000000000000000000000000000000F6
63017+:10DA300000000000000000000000000000000000E6
63018+:10DA400000000000000000000000000000000000D6
63019+:10DA500000000000000000000000000000000000C6
63020+:10DA600000000000000000000000000000000000B6
63021+:10DA700000000000000000000000000000000000A6
63022+:10DA80000000000000000000000000000000000096
63023+:10DA90000000000000000000000000000000000086
63024+:10DAA0000000000000000000000000000000000076
63025+:10DAB0000000000000000000000000000000000066
63026+:10DAC0000000000000000000000000000000000056
63027+:10DAD0000000000000000000000000000000000046
63028+:10DAE0000000000000000000000000000000000036
63029+:10DAF0000000000000000000000000000000000026
63030+:10DB00000000000000000000000000000000000015
63031+:10DB10000000000000000000000000000000000005
63032+:10DB200000000000000000000000000000000000F5
63033+:10DB300000000000000000000000000000000000E5
63034+:10DB400000000000000000000000000000000000D5
63035+:10DB500000000000000000000000000000000000C5
63036+:10DB600000000000000000000000000000000000B5
63037+:10DB700000000000000000000000000000000000A5
63038+:10DB80000000000000000000000000000000000095
63039+:10DB90000000000000000000000000000000000085
63040+:10DBA0000000000000000000000000000000000075
63041+:10DBB0000000000000000000000000000000000065
63042+:10DBC0000000000000000000000000000000000055
63043+:10DBD0000000000000000000000000000000000045
63044+:10DBE0000000000000000000000000000000000035
63045+:10DBF0000000000000000000000000000000000025
63046+:10DC00000000000000000000000000000000000014
63047+:10DC10000000000000000000000000000000000004
63048+:10DC200000000000000000000000000000000000F4
63049+:10DC300000000000000000000000000000000000E4
63050+:10DC400000000000000000000000000000000000D4
63051+:10DC500000000000000000000000000000000000C4
63052+:10DC600000000000000000000000000000000000B4
63053+:10DC700000000000000000000000000000000000A4
63054+:10DC80000000000000000000000000000000000094
63055+:10DC90000000000000000000000000000000000084
63056+:10DCA0000000000000000000000000000000000074
63057+:10DCB0000000000000000000000000000000000064
63058+:10DCC0000000000000000000000000000000000054
63059+:10DCD0000000000000000000000000000000000044
63060+:10DCE0000000000000000000000000000000000034
63061+:10DCF0000000000000000000000000000000000024
63062+:10DD00000000000000000000000000000000000013
63063+:10DD10000000000000000000000000000000000003
63064+:10DD200000000000000000000000000000000000F3
63065+:10DD300000000000000000000000000000000000E3
63066+:10DD400000000000000000000000000000000000D3
63067+:10DD500000000000000000000000000000000000C3
63068+:10DD600000000000000000000000000000000000B3
63069+:10DD700000000000000000000000000000000000A3
63070+:10DD80000000000000000000000000000000000093
63071+:10DD90000000000000000000000000000000000083
63072+:10DDA0000000000000000000000000000000000073
63073+:10DDB0000000000000000000000000000000000063
63074+:10DDC0000000000000000000000000000000000053
63075+:10DDD0000000000000000000000000000000000043
63076+:10DDE0000000000000000000000000000000000033
63077+:10DDF0000000000000000000000000000000000023
63078+:10DE00000000000000000000000000000000000012
63079+:10DE10000000000000000000000000000000000002
63080+:10DE200000000000000000000000000000000000F2
63081+:10DE300000000000000000000000000000000000E2
63082+:10DE400000000000000000000000000000000000D2
63083+:10DE500000000000000000000000000000000000C2
63084+:10DE600000000000000000000000000000000000B2
63085+:10DE700000000000000000000000000000000000A2
63086+:10DE80000000000000000000000000000000000092
63087+:10DE90000000000000000000000000000000000082
63088+:10DEA0000000000000000000000000000000000072
63089+:10DEB0000000000000000000000000000000000062
63090+:10DEC0000000000000000000000000000000000052
63091+:10DED0000000000000000000000000000000000042
63092+:10DEE0000000000000000000000000000000000032
63093+:10DEF0000000000000000000000000000000000022
63094+:10DF00000000000000000000000000000000000011
63095+:10DF10000000000000000000000000000000000001
63096+:10DF200000000000000000000000000000000000F1
63097+:10DF300000000000000000000000000000000000E1
63098+:10DF400000000000000000000000000000000000D1
63099+:10DF500000000000000000000000000000000000C1
63100+:10DF600000000000000000000000000000000000B1
63101+:10DF700000000000000000000000000000000000A1
63102+:10DF80000000000000000000000000000000000091
63103+:10DF90000000000000000000000000000000000081
63104+:10DFA0000000000000000000000000000000000071
63105+:10DFB0000000000000000000000000000000000061
63106+:10DFC0000000000000000000000000000000000051
63107+:10DFD0000000000000000000000000000000000041
63108+:10DFE0000000000000000000000000000000000031
63109+:10DFF0000000000000000000000000000000000021
63110+:10E000000000000000000000000000000000000010
63111+:10E010000000000000000000000000000000000000
63112+:10E0200000000000000000000000000000000000F0
63113+:10E0300000000000000000000000000000000000E0
63114+:10E0400000000000000000000000000000000000D0
63115+:10E0500000000000000000000000000000000000C0
63116+:10E0600000000000000000000000000000000000B0
63117+:10E0700000000000000000000000000000000000A0
63118+:10E080000000000000000000000000000000000090
63119+:10E090000000000000000000000000000000000080
63120+:10E0A0000000000000000000000000000000000070
63121+:10E0B0000000000000000000000000000000000060
63122+:10E0C0000000000000000000000000000000000050
63123+:10E0D0000000000000000000000000000000000040
63124+:10E0E0000000000000000000000000000000000030
63125+:10E0F0000000000000000000000000000000000020
63126+:10E10000000000000000000000000000000000000F
63127+:10E1100000000000000000000000000000000000FF
63128+:10E1200000000000000000000000000000000000EF
63129+:10E1300000000000000000000000000000000000DF
63130+:10E1400000000000000000000000000000000000CF
63131+:10E1500000000000000000000000000000000000BF
63132+:10E1600000000000000000000000000000000000AF
63133+:10E17000000000000000000000000000000000009F
63134+:10E18000000000000000000000000000000000008F
63135+:10E19000000000000000000000000000000000007F
63136+:10E1A000000000000000000000000000000000006F
63137+:10E1B000000000000000000000000000000000005F
63138+:10E1C000000000000000000000000000000000004F
63139+:10E1D000000000000000000000000000000000003F
63140+:10E1E000000000000000000000000000000000002F
63141+:10E1F000000000000000000000000000000000809F
63142+:10E20000000000000000000000000000000000000E
63143+:10E2100000000000000000000000000000000000FE
63144+:10E220000000000A000000000000000000000000E4
63145+:10E2300010000003000000000000000D0000000DB1
63146+:10E240003C020801244295C03C030801246397FC6A
63147+:10E25000AC4000000043202B1480FFFD244200044A
63148+:10E260003C1D080037BD9FFC03A0F0213C100800B6
63149+:10E27000261032103C1C0801279C95C00E0012BECF
63150+:10E28000000000000000000D3C02800030A5FFFFF0
63151+:10E2900030C600FF344301803C0880008D0901B87E
63152+:10E2A0000520FFFE00000000AC6400002404000212
63153+:10E2B000A4650008A066000AA064000BAC67001803
63154+:10E2C0003C03100003E00008AD0301B83C0560000A
63155+:10E2D0008CA24FF80440FFFE00000000ACA44FC029
63156+:10E2E0003C0310003C040200ACA44FC403E000084F
63157+:10E2F000ACA34FF89486000C00A050212488001491
63158+:10E3000000062B0200051080004448210109182B4B
63159+:10E310001060001100000000910300002C6400094F
63160+:10E320005080000991190001000360803C0D080134
63161+:10E3300025AD9258018D58218D67000000E000083E
63162+:10E340000000000091190001011940210109302B42
63163+:10E3500054C0FFF29103000003E000080000102108
63164+:10E360000A000CCC25080001910F0001240E000AC0
63165+:10E3700015EE00400128C8232F38000A1700003D81
63166+:10E38000250D00028D580000250F0006370E0100F4
63167+:10E39000AD4E0000910C000291AB000191A400026F
63168+:10E3A00091A60003000C2E00000B3C0000A71025D6
63169+:10E3B00000041A000043C8250326C025AD580004F8
63170+:10E3C000910E000691ED000191E7000291E5000336
63171+:10E3D000000E5E00000D6400016C30250007220075
63172+:10E3E00000C41025004518252508000A0A000CCC99
63173+:10E3F000AD430008910F000125040002240800022B
63174+:10E4000055E80001012020210A000CCC00804021A9
63175+:10E41000910C0001240B0003158B00160000000076
63176+:10E420008D580000910E000225080003370D0008EA
63177+:10E43000A14E00100A000CCCAD4D00009119000156
63178+:10E44000240F0004172F000B0000000091070002AA
63179+:10E45000910400038D43000000072A0000A410254A
63180+:10E460003466000425080004AD42000C0A000CCC00
63181+:10E47000AD46000003E000082402000127BDFFE8CC
63182+:10E48000AFBF0014AFB000100E00164E0080802108
63183+:10E490003C0480083485008090A600052403FFFE1C
63184+:10E4A0000200202100C310248FBF00148FB0001081
63185+:10E4B000A0A200050A00165827BD001827BDFFE8D6
63186+:10E4C000AFB00010AFBF00140E000FD40080802149
63187+:10E4D0003C06800834C5008090A40000240200504F
63188+:10E4E000308300FF106200073C09800002002021F9
63189+:10E4F0008FBF00148FB00010AD2001800A00108F74
63190+:10E5000027BD0018240801003C07800002002021DC
63191+:10E510008FBF00148FB00010ACE801800A00108F8C
63192+:10E5200027BD001827BDFF783C058008AFBE0080DE
63193+:10E53000AFB7007CAFB3006CAFB10064AFBF008475
63194+:10E54000AFB60078AFB50074AFB40070AFB200687A
63195+:10E55000AFB0006034A600803C0580008CB201287A
63196+:10E5600090C400098CA701043C020001309100FF17
63197+:10E5700000E218240000B8210000F021106000071C
63198+:10E58000000098213C0908008D2931F02413000176
63199+:10E59000252800013C010800AC2831F0ACA0008423
63200+:10E5A00090CC0005000C5827316A0001154000721C
63201+:10E5B000AFA0005090CD00002406002031A400FF41
63202+:10E5C00010860018240E0050108E009300000000EA
63203+:10E5D0003C1008008E1000DC260F00013C010800F2
63204+:10E5E000AC2F00DC0E0016C7000000000040182110
63205+:10E5F0008FBF00848FBE00808FB7007C8FB60078FD
63206+:10E600008FB500748FB400708FB3006C8FB2006848
63207+:10E610008FB100648FB000600060102103E000083B
63208+:10E6200027BD00880000000D3C1F8000AFA0003017
63209+:10E6300097E501168FE201043C04002030B9FFFF8A
63210+:10E64000004438240007182B00033140AFA60030E7
63211+:10E650008FF5010437F80C003C1600400338802188
63212+:10E6600002B6A02434C40040128000479215000D69
63213+:10E6700032A800201500000234860080008030217E
63214+:10E6800014C0009FAFA600303C0D800835A6008066
63215+:10E6900090CC0008318B0040516000063C06800899
63216+:10E6A000240E0004122E00A8240F0012122F003294
63217+:10E6B0003C06800834C401003C0280009447011AE3
63218+:10E6C0009619000E909F00088E18000830E3FFFF97
63219+:10E6D00003F9B00432B40004AFB6005CAFA3005835
63220+:10E6E0008E1600041280002EAFB8005434C3008090
63221+:10E6F000906800083105004014A0002500000000CB
63222+:10E700008C70005002D090230640000500000000ED
63223+:10E710008C71003402D1A82306A201678EE20008A2
63224+:10E72000126000063C1280003C1508008EB531F4E2
63225+:10E7300026B600013C010800AC3631F4AE4000447E
63226+:10E74000240300018FBF00848FBE00808FB7007C40
63227+:10E750008FB600788FB500748FB400708FB3006CE3
63228+:10E760008FB200688FB100648FB00060006010212C
63229+:10E7700003E0000827BD00880E000D2800002021BE
63230+:10E780000A000D75004018210A000D9500C02021D7
63231+:10E790000E00171702C020211440FFE10000000006
63232+:10E7A0003C0B8008356400808C8A003402CA482300
63233+:10E7B0000520001D000000003C1E08008FDE310017
63234+:10E7C00027D700013C010800AC3731001260000679
63235+:10E7D000024020213C1408008E9431F42690000160
63236+:10E7E0003C010800AC3031F40E00164E3C1E80088F
63237+:10E7F00037CD008091B700250240202136EE00047D
63238+:10E800000E001658A1AE00250E000CAC02402021CF
63239+:10E810000A000DCA240300013C17080126F796C020
63240+:10E820000A000D843C1F80008C86003002C66023E5
63241+:10E830001980000C2419000C908F004F3C14080024
63242+:10E840008E94310032B500FC35ED0001268E0001BA
63243+:10E850003C010800AC2E3100A08D004FAFA0005845
63244+:10E860002419000CAFB900308C9800300316A02397
63245+:10E870001A80010B8FA300580074F82A17E0FFD309
63246+:10E88000000000001074002A8FA5005802D4B021A7
63247+:10E8900000B410233044FFFFAFA4005832A8000298
63248+:10E8A0001100002E32AB00103C15800836B00080FD
63249+:10E8B0009216000832D30040526000FB8EE200083E
63250+:10E8C0000E00164E02402021240A0018A20A000958
63251+:10E8D000921100052409FFFE024020210229902404
63252+:10E8E0000E001658A2120005240400390000282149
63253+:10E8F0000E0016F2240600180A000DCA24030001B7
63254+:10E9000092FE000C3C0A800835490080001EBB00C6
63255+:10E910008D27003836F10081024020213225F08118
63256+:10E920000E000C9B30C600FF0A000DC10000000065
63257+:10E930003AA7000130E300011460FFA402D4B02123
63258+:10E940000A000E1D00000000024020210E001734B6
63259+:10E95000020028210A000D75004018211160FF7087
63260+:10E960003C0F80083C0D800835EE00808DC40038D7
63261+:10E970008FA300548DA60004006660231D80FF68ED
63262+:10E98000000000000064C02307020001AFA400548F
63263+:10E990003C1F08008FFF31E433F9000113200015FC
63264+:10E9A0008FAC00583C07800094E3011A10600012FD
63265+:10E9B0003C0680080E00216A024020213C03080129
63266+:10E9C000906396F13064000214800145000000005D
63267+:10E9D000306C0004118000078FAC0058306600FBDB
63268+:10E9E0003C010801A02696F132B500FCAFA000580A
63269+:10E9F0008FAC00583C06800834D30080AFB40018B8
63270+:10EA0000AFB60010AFAC00143C088000950B01209D
63271+:10EA10008E6F0030966A005C8FA3005C8FBF003061
63272+:10EA20003169FFFF3144FFFF8FAE005401341021E4
63273+:10EA3000350540000064382B0045C82103E7C02598
63274+:10EA4000AFB90020AFAF0028AFB80030AFAF00249F
63275+:10EA5000AFA0002CAFAE0034926D000831B40008B6
63276+:10EA6000168000BB020020218EE200040040F8095D
63277+:10EA700027A400108FAF003031F300025660000170
63278+:10EA800032B500FE3C048008349F008093F90008F2
63279+:10EA900033380040530000138FA400248C850004F9
63280+:10EAA0008FA7005410A700D52404001432B0000131
63281+:10EAB0001200000C8FA400242414000C1234011A3C
63282+:10EAC0002A2D000D11A001022413000E240E000AAD
63283+:10EAD000522E0001241E00088FAF002425E40001FF
63284+:10EAE000AFA400248FAA00143C0B80083565008079
63285+:10EAF000008A48218CB10030ACA9003090A4004EAF
63286+:10EB00008CA700303408FFFF0088180400E3F821C8
63287+:10EB1000ACBF00348FA600308FB900548FB8005CB2
63288+:10EB200030C200081040000B033898218CAC002044
63289+:10EB3000119300D330C600FF92EE000C8FA7003473
63290+:10EB400002402021000E6B0035B400800E000C9BAB
63291+:10EB50003285F0803C028008345000808E0F0030F7
63292+:10EB600001F1302318C00097264800803C070800B8
63293+:10EB70008CE731E42404FF80010418243118007F5D
63294+:10EB80003C1F80003C19800430F10001AFE300908D
63295+:10EB900012200006031928213C030801906396F116
63296+:10EBA00030690008152000C6306A00F73C10800864
63297+:10EBB00036040080908C004F318B000115600042BC
63298+:10EBC000000000003C0608008CC6319830CE0010D2
63299+:10EBD00051C0004230F9000190AF006B55E0003F9A
63300+:10EBE00030F9000124180001A0B8006B3C1180002E
63301+:10EBF0009622007A24470064A48700123C0D800806
63302+:10EC000035A5008090B40008329000401600000442
63303+:10EC10003C03800832AE000115C0008B00000000EC
63304+:10EC2000346400808C86002010D3000A3463010015
63305+:10EC30008C67000002C7782319E000978FBF00544B
63306+:10EC4000AC93002024130001AC760000AFB3005059
63307+:10EC5000AC7F000417C0004E000000008FA90050D8
63308+:10EC60001520000B000000003C030801906396F1A2
63309+:10EC7000306A00011140002E8FAB0058306400FE56
63310+:10EC80003C010801A02496F10A000D75000018212E
63311+:10EC90000E000CAC024020210A000F1300000000FF
63312+:10ECA0000A000E200000A0210040F80924040017EB
63313+:10ECB0000A000DCA240300010040F80924040016CC
63314+:10ECC0000A000DCA240300019094004F240DFFFE9A
63315+:10ECD000028D2824A085004F30F900011320000682
63316+:10ECE0003C0480083C030801906396F1307F0010DB
63317+:10ECF00017E00051306800EF34900080240A0001D2
63318+:10ED0000024020210E00164EA60A00129203002592
63319+:10ED100024090001AFA90050346200010240202103
63320+:10ED20000E001658A20200250A000EF93C0D8008BC
63321+:10ED30001160FE83000018218FA5003030AC000464
63322+:10ED40001180FE2C8FBF00840A000DCB240300012C
63323+:10ED500027A500380E000CB6AFA000385440FF4382
63324+:10ED60008EE200048FB40038329001005200FF3F61
63325+:10ED70008EE200048FA3003C8E6E0058006E682364
63326+:10ED800005A3FF39AE6300580A000E948EE200041A
63327+:10ED90000E00164E024020213C038008346800809B
63328+:10EDA000024020210E001658A11E000903C0302188
63329+:10EDB000240400370E0016F2000028210A000F116B
63330+:10EDC0008FA900508FAB00185960FF8D3C0D800853
63331+:10EDD0000E00164E02402021920C00252405000151
63332+:10EDE000AFA5005035820004024020210E001658C5
63333+:10EDF000A20200250A000EF93C0D800812240059D9
63334+:10EE00002A2300151060004D240900162408000C68
63335+:10EE10005628FF2732B000013C0A8008914C001BA5
63336+:10EE20002406FFBD241E000E01865824A14B001BA2
63337+:10EE30000A000EA532B000013C010801A02896F19D
63338+:10EE40000A000EF93C0D80088CB500308EFE0008DB
63339+:10EE50002404001826B6000103C0F809ACB600303F
63340+:10EE60003C030801906396F13077000116E0FF81C2
63341+:10EE7000306A00018FB200300A000D753243000481
63342+:10EE80003C1080009605011A50A0FF2B34C60010DC
63343+:10EE90000A000EC892EE000C8C6200001456FF6D42
63344+:10EEA000000000008C7800048FB9005403388823D8
63345+:10EEB0000621FF638FBF00540A000F0E0000000000
63346+:10EEC0003C010801A02A96F10A000F3030F9000138
63347+:10EED0001633FF028FAF00240A000EB0241E00106C
63348+:10EEE0000E00164E024020213C0B80083568008041
63349+:10EEF00091090025240A0001AFAA0050353300040F
63350+:10EF0000024020210E001658A11300253C050801DF
63351+:10EF100090A596F130A200FD3C010801A02296F1D7
63352+:10EF20000A000E6D004018212411000E53D1FEEA94
63353+:10EF3000241E00100A000EAF241E00165629FEDC07
63354+:10EF400032B000013C0A8008914C001B2406FFBD32
63355+:10EF5000241E001001865824A14B001B0A000EA598
63356+:10EF600032B000010A000EA4241E00123C038000EF
63357+:10EF70008C6201B80440FFFE24040800AC6401B8B0
63358+:10EF800003E000080000000030A5FFFF30C6FFFFCF
63359+:10EF90003C0780008CE201B80440FFFE34EA0180A7
63360+:10EFA000AD440000ACE400203C0480089483004899
63361+:10EFB0003068FFFF11000016AF88000824AB001274
63362+:10EFC000010B482B512000133C04800034EF01005A
63363+:10EFD00095EE00208F890000240D001A31CCFFFF30
63364+:10EFE00031274000A14D000B10E000362583FFFEC5
63365+:10EFF0000103C02B170000348F9900048F88000490
63366+:10F00000A5430014350700010A001003AF87000470
63367+:10F010003C04800024030003348201808F890000B7
63368+:10F020008F870004A043000B3C088000350C018052
63369+:10F03000A585000EA585001A8F85000C30EB800099
63370+:10F04000A5890010AD850028A58600081160000F75
63371+:10F050008F85001435190100972A00163158FFFCDE
63372+:10F06000270F000401E870218DCD400031A6FFFF7D
63373+:10F0700014C000072403BFFF3C02FFFF34487FFF9A
63374+:10F0800000E83824AF8700048F8500142403BFFFF5
63375+:10F090003C04800000E3582434830180A46B0026E4
63376+:10F0A000AC69002C10A0000300054C02A465001000
63377+:10F0B000A46900263C071000AC8701B803E00008F3
63378+:10F0C000000000008F990004240AFFFE032A382460
63379+:10F0D0000A001003AF87000427BDFFE88FA20028B5
63380+:10F0E00030A5FFFF30C6FFFFAFBF0010AF87000C99
63381+:10F0F000AF820014AF8000040E000FDBAF80000071
63382+:10F100008FBF001027BD001803E00008AF80001477
63383+:10F110003C06800034C4007034C701008C8A0000B3
63384+:10F1200090E500128F84000027BDFFF030A300FFA0
63385+:10F13000000318823082400010400037246500032D
63386+:10F140000005C8800326C0218F0E4000246F0004F4
63387+:10F15000000F6880AFAE000001A660218D8B4000DB
63388+:10F16000AFAB000494E900163128FFFC01063821FA
63389+:10F170008CE64000AFA600088FA9000800003021EF
63390+:10F18000000028213C07080024E701000A0010675E
63391+:10F19000240800089059000024A500012CAC000CA4
63392+:10F1A0000079C0210018788001E770218DCD000022
63393+:10F1B0001180000600CD302603A5102114A8FFF50C
63394+:10F1C00000051A005520FFF4905900003C0480000F
63395+:10F1D000348700703C0508008CA531048CE30000E6
63396+:10F1E0002CA2002010400009006A38230005488046
63397+:10F1F0003C0B0800256B3108012B402124AA00019B
63398+:10F20000AD0700003C010800AC2A310400C0102109
63399+:10F2100003E0000827BD0010308220001040000BE2
63400+:10F2200000055880016648218D24400024680004B0
63401+:10F2300000083880AFA4000000E618218C6540006B
63402+:10F24000AFA000080A001057AFA500040000000D91
63403+:10F250000A0010588FA9000827BDFFE03C07800076
63404+:10F2600034E60100AFBF001CAFB20018AFB100140C
63405+:10F27000AFB0001094C5000E8F87000030A4FFFFD0
63406+:10F280002483000430E2400010400010AF830028C7
63407+:10F290003C09002000E940241100000D30EC800002
63408+:10F2A0008F8A0004240BBFFF00EB38243543100085
63409+:10F2B000AF87000030F220001640000B3C1900041C
63410+:10F2C000241FFFBF0A0010B7007F102430EC80001D
63411+:10F2D000158000423C0E002030F220001240FFF862
63412+:10F2E0008F8300043C19000400F9C0241300FFF5CB
63413+:10F2F000241FFFBF34620040AF82000430E20100EF
63414+:10F300001040001130F010008F83002C10600006B8
63415+:10F310003C0F80003C05002000E52024148000C044
63416+:10F320003C0800043C0F800035EE010095CD001E26
63417+:10F3300095CC001C31AAFFFF000C5C00014B482556
63418+:10F34000AF89000C30F010001200000824110001F9
63419+:10F3500030F100201620008B3C18100000F890249B
63420+:10F36000164000823C040C002411000130E801002A
63421+:10F370001500000B3C0900018F85000430A94000F6
63422+:10F38000152000073C0900013C0C1F0100EC58242B
63423+:10F390003C0A1000116A01183C1080003C09000171
63424+:10F3A00000E9302410C000173C0B10003C18080086
63425+:10F3B0008F1800243307000214E0014024030001E9
63426+:10F3C0008FBF001C8FB200188FB100148FB00010D7
63427+:10F3D0000060102103E0000827BD002000EE682433
63428+:10F3E00011A0FFBE30F220008F8F00043C11FFFF00
63429+:10F3F00036307FFF00F0382435E380000A0010A685
63430+:10F40000AF87000000EB102450400065AF8000245F
63431+:10F410008F8C002C3C0D0F0000ED18241580008807
63432+:10F42000AF83001030E8010011000086938F0010B8
63433+:10F430003C0A0200106A00833C1280003650010032
63434+:10F44000920500139789002A3626000230AF00FF8C
63435+:10F4500025EE0004000E19C03C0480008C9801B811
63436+:10F460000700FFFE34880180AD0300003C198008CE
63437+:10F47000AC830020973100483225FFFF10A0015CCB
63438+:10F48000AF8500082523001200A3F82B53E0015993
63439+:10F490008F850004348D010095AC00202402001AF1
63440+:10F4A00030E44000318BFFFFA102000B108001927D
63441+:10F4B0002563FFFE00A3502B154001908F8F0004A1
63442+:10F4C000A50300148F88000435050001AF850004F2
63443+:10F4D0003C08800035190180A729000EA729001AD1
63444+:10F4E0008F89000C30B18000A7270010AF290028B9
63445+:10F4F000A72600081220000E3C04800035020100FF
63446+:10F50000944C0016318BFFFC256400040088182100
63447+:10F510008C7F400033E6FFFF14C000053C048000F0
63448+:10F520003C0AFFFF354D7FFF00AD2824AF85000466
63449+:10F53000240EBFFF00AE402434850180A4A800261D
63450+:10F54000ACA7002C3C071000AC8701B800001821C4
63451+:10F550008FBF001C8FB200188FB100148FB0001045
63452+:10F560000060102103E0000827BD00203C020BFFD3
63453+:10F5700000E41824345FFFFF03E3C82B5320FF7B14
63454+:10F58000241100013C0608008CC6002C24C5000193
63455+:10F590003C010800AC25002C0A0010D42411000501
63456+:10F5A0008F85002410A0002FAF80001090A30000D2
63457+:10F5B000146000792419000310A0002A30E601002D
63458+:10F5C00010C000CC8F860010241F000210DF00C97D
63459+:10F5D0008F8B000C3C0708008CE7003824E4FFFF09
63460+:10F5E00014E0000201641824000018213C0D0800FA
63461+:10F5F00025AD0038006D1021904C00048F85002847
63462+:10F6000025830004000321C030A5FFFF3626000239
63463+:10F610000E000FDB000000000A00114D0000182151
63464+:10F6200000E8302414C0FF403C0F80000E00103D65
63465+:10F63000000000008F8700000A0010CAAF82000C93
63466+:10F64000938F00103C18080127189640000F90C0B7
63467+:10F6500002588021AF9000248F85002414A0FFD38E
63468+:10F66000AF8F00103C0480008C86400030C5010044
63469+:10F6700010A000BC322300043C0C08008D8C002438
63470+:10F6800024120004106000C23190000D3C04800080
63471+:10F690008C8D40003402FFFF11A201003231FFFBCC
63472+:10F6A0008C884000310A01005540000124110010EF
63473+:10F6B00030EE080011C000BE2419FFFB8F9800280F
63474+:10F6C0002F0F03EF51E000010219802430E90100FF
63475+:10F6D00011200014320800018F87002C14E000FB79
63476+:10F6E0008F8C000C3C05800034AB0100917F00132F
63477+:10F6F00033E300FF246A00042403FFFE0203802496
63478+:10F70000000A21C012000002023230253226FFFF1B
63479+:10F710000E000FDB9785002A1200FF290000182138
63480+:10F72000320800011100000D32180004240E0001FF
63481+:10F73000120E0002023230253226FFFF9785002A82
63482+:10F740000E000FDB00002021240FFFFE020F80249B
63483+:10F750001200FF1B00001821321800045300FF188C
63484+:10F760002403000102323025241200045612000145
63485+:10F770003226FFFF9785002A0E000FDB24040100CC
63486+:10F780002419FFFB021988241220FF0D0000182104
63487+:10F790000A0010E9240300011079009C00003021C8
63488+:10F7A00090AD00012402000211A200BE30EA004028
63489+:10F7B00090B90001241800011338007F30E900409F
63490+:10F7C0008CA600049785002A00C020210E000FDBC4
63491+:10F7D0003626000200004021010018218FBF001CC6
63492+:10F7E0008FB200188FB100148FB00010006010218C
63493+:10F7F00003E0000827BD0020360F010095EE000C45
63494+:10F8000031CD020015A0FEE63C0900013C1880083D
63495+:10F81000971200489789002A362600023248FFFFD7
63496+:10F82000AF8800083C0380008C7101B80620FFFE01
63497+:10F83000346A0180AD4000001100008E3C0F800052
63498+:10F84000253F0012011FC82B1320008B240E00033C
63499+:10F85000346C0100958B00202402001A30E4400033
63500+:10F860003163FFFFA142000B108000A72463FFFE5D
63501+:10F870000103682B15A000A52408FFFE34A5000194
63502+:10F88000A5430014AF8500043C0480002412BFFF90
63503+:10F8900000B2802434850180A4A9000EA4A9001A16
63504+:10F8A000A4A60008A4B00026A4A700103C071000DE
63505+:10F8B000AC8701B80A00114D000018213C038000FC
63506+:10F8C00034640100949F000E3C1908008F3900D861
63507+:10F8D0002404008033E5FFFF273100013C010800CC
63508+:10F8E000AC3100D80E000FDB240600030A00114DD6
63509+:10F8F00000001821240A000210CA00598F85002830
63510+:10F900003C0308008C6300D0240E0001106E005EE2
63511+:10F910002CCF000C24D2FFFC2E5000041600002136
63512+:10F9200000002021241800021078001B2CD9000CA4
63513+:10F9300024DFFFF82FE900041520FF330000202109
63514+:10F9400030EB020051600004000621C054C00022C8
63515+:10F9500030A5FFFF000621C030A5FFFF0A00117D82
63516+:10F96000362600023C0908008D29002431300001B0
63517+:10F970005200FEF7000018219785002A3626000263
63518+:10F980000E000FDB000020210A00114D000018219D
63519+:10F990000A00119C241200021320FFE624DFFFF866
63520+:10F9A0000000202130A5FFFF0A00117D362600024D
63521+:10F9B0000A0011AC021980245120FF828CA6000499
63522+:10F9C0003C05080190A5964110A0FF7E2408000187
63523+:10F9D0000A0011F0010018210E000FDB3226000191
63524+:10F9E0008F8600108F8500280A00124F000621C064
63525+:10F9F0008F8500043C18800024120003371001801A
63526+:10FA0000A212000B0A00112E3C08800090A30001F6
63527+:10FA1000241100011071FF70240800012409000264
63528+:10FA20005069000430E60040240800010A0011F08B
63529+:10FA30000100182150C0FFFD240800013C0C80008B
63530+:10FA4000358B01009563001094A40002307FFFFF06
63531+:10FA5000509FFF62010018210A001284240800014F
63532+:10FA60002CA803EF1100FE56240300010A001239EE
63533+:10FA700000000000240E000335EA0180A14E000BB7
63534+:10FA80000A00121C3C04800011E0FFA2000621C005
63535+:10FA900030A5FFFF0A00117D362600020A0011A5DD
63536+:10FAA000241100201140FFC63C1280003650010096
63537+:10FAB000960F001094AE000231E80FFF15C8FFC08A
63538+:10FAC000000000000A0011E690B900013C060800A1
63539+:10FAD0008CC6003824C4FFFF14C00002018418241F
63540+:10FAE000000018213C0D080025AD0038006D1021E4
63541+:10FAF0000A0011B6904300048F8F0004240EFFFE0D
63542+:10FB00000A00112C01EE28242408FFFE0A00121A14
63543+:10FB100000A8282427BDFFC8AFB00010AFBF003435
63544+:10FB20003C10600CAFBE0030AFB7002CAFB6002861
63545+:10FB3000AFB50024AFB40020AFB3001CAFB20018C3
63546+:10FB4000AFB100148E0E5000240FFF7F3C068000E2
63547+:10FB500001CF682435AC380C240B0003AE0C5000E8
63548+:10FB6000ACCB00083C010800AC2000200E001819A6
63549+:10FB7000000000003C0A0010354980513C06601628
63550+:10FB8000AE09537C8CC700003C0860148D0500A0B2
63551+:10FB90003C03FFFF00E320243C02535300051FC237
63552+:10FBA0001482000634C57C000003A08002869821E0
63553+:10FBB0008E7200043C116000025128218CBF007C31
63554+:10FBC0008CA200783C1E600037C420203C05080150
63555+:10FBD00024A59288AF820018AF9F001C0E0016DD8E
63556+:10FBE0002406000A3C190001273996403C01080010
63557+:10FBF000AC3931DC0E0020DDAF8000148FD708084F
63558+:10FC00002418FFF03C15570902F8B02412D502F56C
63559+:10FC100024040001AF80002C3C1480003697018042
63560+:10FC20003C1E080127DE9644369301008E900000AA
63561+:10FC30003205000310A0FFFD3207000110E000882C
63562+:10FC4000320600028E7100283C048000AE91002034
63563+:10FC50008E6500048E66000000A0382100C040219F
63564+:10FC60008C8301B80460FFFE3C0B0010240A0800DE
63565+:10FC700000AB4824AC8A01B8552000E0240BBFFF3C
63566+:10FC80009675000E3C1208008E52002030AC4000E9
63567+:10FC900032AFFFFF264E000125ED00043C010800B5
63568+:10FCA000AC2E0020118000E8AF8D00283C18002009
63569+:10FCB00000B8B02412C000E530B980002408BFFFAE
63570+:10FCC00000A8382434C81000AF87000030E62000B8
63571+:10FCD00010C000E92409FFBF3C03000400E328240E
63572+:10FCE00010A00002010910243502004030EA010092
63573+:10FCF00011400010AF8200048F8B002C11600007B0
63574+:10FD00003C0D002000ED6024118000043C0F000435
63575+:10FD100000EF702411C00239000000009668001E38
63576+:10FD20009678001C3115FFFF0018B40002B690252C
63577+:10FD3000AF92000C30F910001320001324150001BD
63578+:10FD400030FF002017E0000A3C04100000E41024FB
63579+:10FD50001040000D3C0A0C003C090BFF00EA18247F
63580+:10FD60003525FFFF00A3302B10C0000830ED010047
63581+:10FD70003C0C08008D8C002C24150005258B0001FF
63582+:10FD80003C010800AC2B002C30ED010015A0000B4D
63583+:10FD90003C0500018F85000430AE400055C00007CF
63584+:10FDA0003C0500013C161F0100F690243C0F10009A
63585+:10FDB000124F01CE000000003C05000100E5302498
63586+:10FDC00010C000AF3C0C10003C1F08008FFF002447
63587+:10FDD00033E90002152000712403000100601021A6
63588+:10FDE000104000083C0680003C08800035180100E7
63589+:10FDF0008F0F00243C056020ACAF00140000000011
63590+:10FE00003C0680003C194000ACD9013800000000DD
63591+:10FE10005220001332060002262B0140262C0080BF
63592+:10FE2000240EFF80016E2024018E6824000D1940ED
63593+:10FE3000318A007F0004A9403172007F3C16200007
63594+:10FE400036C20002006A482502B2382500E2882541
63595+:10FE50000122F825ACDF0830ACD1083032060002B0
63596+:10FE600010C0FF723C188000370501408CA80000CC
63597+:10FE700024100040AF08002090AF000831E300706C
63598+:10FE8000107000D428790041532000082405006038
63599+:10FE9000241100201071000E3C0A40003C09800033
63600+:10FEA000AD2A01780A001304000000001465FFFB6E
63601+:10FEB0003C0A40000E001FFA000000003C0A40000F
63602+:10FEC0003C098000AD2A01780A00130400000000FC
63603+:10FED00090A90009241F00048CA70000312800FF0E
63604+:10FEE000111F01B22503FFFA2C7200061240001404
63605+:10FEF0003C0680008CA9000494A4000A310500FF90
63606+:10FF000000095E022D6A00083086FFFF15400002DE
63607+:10FF10002567000424070003240C000910AC01FA33
63608+:10FF200028AD000A11A001DE2410000A240E0008EA
63609+:10FF300010AE0028000731C000C038213C06800008
63610+:10FF40008CD501B806A0FFFE34D20180AE47000078
63611+:10FF500034CB0140916E0008240300023C0A4000AB
63612+:10FF600031C400FF00046A0001A86025A64C000807
63613+:10FF7000A243000B9562000A3C0810003C09800077
63614+:10FF8000A64200108D670004AE470024ACC801B83B
63615+:10FF9000AD2A01780A001304000000003C0A80002A
63616+:10FFA000354401009483000E3C0208008C4200D8C6
63617+:10FFB000240400803065FFFF245500013C01080047
63618+:10FFC000AC3500D80E000FDB240600030A001370C6
63619+:10FFD000000018210009320230D900FF2418000166
63620+:10FFE0001738FFD5000731C08F910020262200016D
63621+:10FFF000AF8200200A0013C800C0382100CB2024A3
63622+:020000021000EC
63623+:10000000AF85000010800008AF860004240D87FF34
63624+:1000100000CD6024158000083C0E006000AE302446
63625+:1000200010C00005000000000E000D42000000009E
63626+:100030000A001371000000000E0016050000000009
63627+:100040000A0013710000000030B980005320FF1F28
63628+:10005000AF8500003C02002000A2F82453E0FF1B03
63629+:10006000AF8500003C07FFFF34E47FFF00A4382485
63630+:100070000A00132B34C880000A001334010910242D
63631+:1000800000EC58245160005AAF8000248F8D002C62
63632+:100090003C0E0F0000EE182415A00075AF83001071
63633+:1000A00030EF010011E00073939800103C12020041
63634+:1000B000107200703C06800034D9010093280013B0
63635+:1000C0009789002A36A60002311800FF271600047F
63636+:1000D000001619C03C0480008C8501B804A0FFFE06
63637+:1000E00034880180AD0300003C158008AC830020FB
63638+:1000F00096BF004833E5FFFF10A001BCAF850008A4
63639+:100100002523001200A3102B504001B98F85000455
63640+:10011000348D010095AC0020240B001A30E440001F
63641+:10012000318AFFFFA10B000B108001BA2543FFFEAF
63642+:1001300000A3702B15C001B88F9600048F8F0004A8
63643+:10014000A503001435E50001AF8500043C088000DC
63644+:1001500035150180A6A9000EA6A9001A8F89000CEA
63645+:1001600030BF8000A6A70010AEA90028A6A60008F0
63646+:1001700013E0000F3C0F8000350C0100958B00163A
63647+:10018000316AFFFC25440004008818218C6240007D
63648+:100190003046FFFF14C000072416BFFF3C0EFFFFD0
63649+:1001A00035CD7FFF00AD2824AF8500043C0F8000D3
63650+:1001B0002416BFFF00B6902435E50180A4B20026C6
63651+:1001C000ACA7002C3C071000ADE701B80A00137083
63652+:1001D000000018210E00165D000000003C0A4000DF
63653+:1001E0003C098000AD2A01780A00130400000000D9
63654+:1001F0008F85002410A00027AF80001090A300007E
63655+:10020000106000742409000310690101000030210E
63656+:1002100090AE0001240D000211CD014230EF0040EC
63657+:1002200090A90001241F0001113F000930E20040A5
63658+:100230008CA600049785002A00C020210E000FDB49
63659+:1002400036A60002000040210A00137001001821A8
63660+:100250005040FFF88CA600043C07080190E7964147
63661+:1002600010E0FFF4240800010A00137001001821B7
63662+:10027000939800103C1F080127FF96400018C8C043
63663+:10028000033F4021AF8800248F85002414A0FFDBAA
63664+:10029000AF9800103C0480008C86400030C50100FF
63665+:1002A00010A0008732AB00043C0C08008D8C0024A9
63666+:1002B00024160004156000033192000D241600027C
63667+:1002C0003C0480008C8E4000340DFFFF11CD0113E3
63668+:1002D00032B5FFFB8C984000330F010055E0000160
63669+:1002E0002415001030E80800110000382409FFFB35
63670+:1002F0008F9F00282FF903EF53200001024990241B
63671+:1003000030E2010010400014325F00018F87002CA2
63672+:1003100014E0010E8F8C000C3C0480003486010038
63673+:1003200090C5001330AA00FF25430004000321C03C
63674+:100330002419FFFE025990241240000202B6302513
63675+:1003400032A6FFFF0E000FDB9785002A1240FEA3A6
63676+:1003500000001821325F000113E0000D3247000455
63677+:10036000240900011249000202B6302532A6FFFF1F
63678+:100370009785002A0E000FDB000020212402FFFEDB
63679+:10038000024290241240FE950000182132470004DA
63680+:1003900050E0FE922403000102B63025241600042A
63681+:1003A0005656000132A6FFFF9785002A0E000FDB8C
63682+:1003B000240401002403FFFB0243A82412A0FE87AB
63683+:1003C000000018210A001370240300010A0014B968
63684+:1003D0000249902410A0FFAF30E5010010A00017E3
63685+:1003E0008F8600102403000210C300148F84000CB9
63686+:1003F0003C0608008CC6003824CAFFFF14C0000267
63687+:10040000008A1024000010213C0E080025CE003880
63688+:10041000004E682191AC00048F850028258B0004D4
63689+:10042000000B21C030A5FFFF36A600020E000FDB37
63690+:10043000000000000A00137000001821240F0002C1
63691+:1004400010CF0088241600013C0308008C6300D004
63692+:100450001076008D8F85002824D9FFFC2F280004FA
63693+:100460001500006300002021241F0002107F005DA2
63694+:100470002CC9000C24C3FFF82C6200041440FFE9CF
63695+:100480000000202130EA020051400004000621C093
63696+:1004900054C0000530A5FFFF000621C030A5FFFFB6
63697+:1004A0000A00150436A600020E000FDB32A600017A
63698+:1004B0008F8600108F8500280A001520000621C0B5
63699+:1004C0003C0A08008D4A0024315200015240FE438C
63700+:1004D000000018219785002A36A600020E000FDBC7
63701+:1004E000000020210A001370000018219668000CFB
63702+:1004F000311802005700FE313C0500013C1F800806
63703+:1005000097F900489789002A36A600023328FFFF92
63704+:10051000AF8800083C0380008C7501B806A0FFFE80
63705+:100520003C04800034820180AC400000110000B621
63706+:1005300024180003252A0012010A182B106000B2AB
63707+:1005400000000000966F00203C0E8000240D001A71
63708+:1005500031ECFFFF35CA018030EB4000A14D000BAC
63709+:10056000116000B02583FFFE0103902B164000AE02
63710+:100570002416FFFE34A50001A5430014AF85000436
63711+:100580002419BFFF00B94024A6E9000EA6E9001A0D
63712+:10059000A6E60008A6E80026A6E700103C07100023
63713+:1005A000AE8701B80A001370000018213C048000D7
63714+:1005B0008C8201B80440FFFE349601802415001C93
63715+:1005C000AEC70000A2D5000B3C071000AC8701B8F5
63716+:1005D0003C0A40003C098000AD2A01780A0013045F
63717+:1005E000000000005120FFA424C3FFF800002021D8
63718+:1005F00030A5FFFF0A00150436A600020E00103DCC
63719+:10060000000000008F8700000A001346AF82000C34
63720+:1006100090A30001241500011075FF0B24080001B0
63721+:10062000240600021066000430E2004024080001A5
63722+:100630000A001370010018215040FFFD240800013A
63723+:100640003C0C8000358B0100956A001094A40002D8
63724+:100650003143FFFF5083FDE1010018210A00158599
63725+:10066000240800018F8500282CB203EF1240FDDB27
63726+:10067000240300013C0308008C6300D02416000111
63727+:100680001476FF7624D9FFFC2CD8000C1300FF72DF
63728+:10069000000621C030A5FFFF0A00150436A600029F
63729+:1006A00010B00037240F000B14AFFE23000731C039
63730+:1006B000312600FF00065600000A4E0305220047BF
63731+:1006C00030C6007F0006F8C03C16080126D69640CA
63732+:1006D00003F68021A2000001A20000003C0F600090
63733+:1006E0008DF918202405000100C588040011302769
63734+:1006F0000326C024000731C000C03821ADF81820FF
63735+:100700000A0013C8A60000028F850020000731C030
63736+:1007100024A2FFFF0A0013F6AF8200200A0014B2E1
63737+:100720002415002011E0FECC3C1980003728010080
63738+:100730009518001094B6000233120FFF16D2FEC6B1
63739+:10074000000000000A00148290A900013C0B080080
63740+:100750008D6B0038256DFFFF15600002018D1024A0
63741+:10076000000010213C080800250800380048C0217E
63742+:10077000930F000425EE00040A0014C5000E21C0EA
63743+:1007800000065202241F00FF115FFDEB000731C07D
63744+:10079000000A20C03C0E080125CE9640008EA821FC
63745+:1007A000009E602100095C02240D00013C076000EE
63746+:1007B000A2AD0000AD860000A2AB00018CF21820B3
63747+:1007C00024030001014310040242B025ACF61820B6
63748+:1007D00000C038210A0013C8A6A900020A0015AA01
63749+:1007E000AF8000200A0012FFAF84002C8F85000428
63750+:1007F0003C1980002408000337380180A308000B4F
63751+:100800000A00144D3C088000A2F8000B0A00155A9B
63752+:100810002419BFFF8F9600042412FFFE0A00144B18
63753+:1008200002D228242416FFFE0A00155800B62824F8
63754+:100830003C038000346401008C85000030A2003E3F
63755+:100840001440000800000000AC6000488C870000E5
63756+:1008500030E607C010C0000500000000AC60004C8E
63757+:10086000AC60005003E0000824020001AC600054BA
63758+:10087000AC6000408C880000310438001080FFF923
63759+:10088000000000002402000103E00008AC60004406
63760+:100890003C0380008C6201B80440FFFE3467018095
63761+:1008A000ACE4000024080001ACE00004A4E500086A
63762+:1008B00024050002A0E8000A34640140A0E5000B12
63763+:1008C0009483000A14C00008A4E30010ACE00024E4
63764+:1008D0003C07800034E901803C041000AD20002872
63765+:1008E00003E00008ACE401B88C8600043C0410006E
63766+:1008F000ACE600243C07800034E90180AD200028EC
63767+:1009000003E00008ACE401B83C0680008CC201B8EA
63768+:100910000440FFFE34C7018024090002ACE400005B
63769+:10092000ACE40004A4E50008A0E9000A34C50140D5
63770+:10093000A0E9000B94A8000A3C041000A4E80010F1
63771+:10094000ACE000248CA30004ACE3002803E0000822
63772+:10095000ACC401B83C039000346200010082202541
63773+:100960003C038000AC6400208C65002004A0FFFEE6
63774+:100970000000000003E00008000000003C028000CE
63775+:10098000344300010083202503E00008AC4400202C
63776+:1009900027BDFFE03C098000AFBF0018AFB10014D5
63777+:1009A000AFB00010352801408D10000091040009FF
63778+:1009B0009107000891050008308400FF30E600FF31
63779+:1009C00000061A002C820081008330251040002A86
63780+:1009D00030A50080000460803C0D080125AD92B078
63781+:1009E000018D58218D6A00000140000800000000C0
63782+:1009F0003C038000346201409445000A14A0001EAC
63783+:100A00008F91FCC09227000530E6000414C0001A44
63784+:100A1000000000000E00164E02002021922A000560
63785+:100A200002002021354900040E001658A2290005B5
63786+:100A30009228000531040004148000020000000028
63787+:100A40000000000D922D0000240B002031AC00FFAF
63788+:100A5000158B00093C0580008CAE01B805C0FFFE77
63789+:100A600034B10180AE3000003C0F100024100005AE
63790+:100A7000A230000BACAF01B80000000D8FBF001812
63791+:100A80008FB100148FB0001003E0000827BD0020D4
63792+:100A90000200202100C028218FBF00188FB1001450
63793+:100AA0008FB00010240600010A00161D27BD00208B
63794+:100AB0000000000D0200202100C028218FBF001877
63795+:100AC0008FB100148FB00010000030210A00161DF5
63796+:100AD00027BD002014A0FFE8000000000200202134
63797+:100AE0008FBF00188FB100148FB0001000C02821F4
63798+:100AF0000A00163B27BD00203C0780008CEE01B8A1
63799+:100B000005C0FFFE34F00180241F0002A21F000B6D
63800+:100B100034F80140A60600089719000A3C0F10009F
63801+:100B2000A61900108F110004A6110012ACEF01B835
63802+:100B30000A0016998FBF001827BDFFE8AFBF00104D
63803+:100B40000E000FD4000000003C0280008FBF001098
63804+:100B500000002021AC4001800A00108F27BD001842
63805+:100B60003084FFFF30A5FFFF108000070000182130
63806+:100B7000308200011040000200042042006518216C
63807+:100B80001480FFFB0005284003E0000800601021EE
63808+:100B900010C00007000000008CA2000024C6FFFF68
63809+:100BA00024A50004AC82000014C0FFFB24840004D0
63810+:100BB00003E000080000000010A0000824A3FFFFCD
63811+:100BC000AC86000000000000000000002402FFFFCF
63812+:100BD0002463FFFF1462FFFA2484000403E000088A
63813+:100BE000000000003C03800027BDFFF83462018054
63814+:100BF000AFA20000308C00FF30AD00FF30CE00FF10
63815+:100C00003C0B80008D6401B80480FFFE00000000F2
63816+:100C10008FA900008D6801288FAA00008FA700000F
63817+:100C20008FA400002405000124020002A085000A10
63818+:100C30008FA30000359940003C051000A062000B16
63819+:100C40008FB800008FAC00008FA600008FAF0000AF
63820+:100C500027BD0008AD280000AD400004AD80002491
63821+:100C6000ACC00028A4F90008A70D0010A5EE0012E2
63822+:100C700003E00008AD6501B83C06800827BDFFE829
63823+:100C800034C50080AFBF001090A7000924020012F5
63824+:100C900030E300FF1062000B008030218CA8005070
63825+:100CA00000882023048000088FBF00108CAA003425
63826+:100CB000240400390000282100CA4823052000052B
63827+:100CC000240600128FBF00102402000103E0000878
63828+:100CD00027BD00180E0016F2000000008FBF0010A4
63829+:100CE0002402000103E0000827BD001827BDFFC84B
63830+:100CF000AFB20030AFB00028AFBF0034AFB1002CAE
63831+:100D000000A0802190A5000D30A6001010C000109A
63832+:100D1000008090213C0280088C4400048E0300086F
63833+:100D20001064000C30A7000530A6000510C0009329
63834+:100D3000240400018FBF00348FB200308FB1002C2B
63835+:100D40008FB000280080102103E0000827BD003884
63836+:100D500030A7000510E0000F30AB001210C00006F5
63837+:100D6000240400013C0980088E0800088D25000439
63838+:100D70005105009C240400388FBF00348FB200302E
63839+:100D80008FB1002C8FB000280080102103E00008F4
63840+:100D900027BD0038240A0012156AFFE6240400016A
63841+:100DA0000200202127A500100E000CB6AFA00010F5
63842+:100DB0001440007C3C19800837240080909800087B
63843+:100DC000331100081220000A8FA7001030FF010025
63844+:100DD00013E000A48FA300148C8600580066102333
63845+:100DE000044000043C0A8008AC8300588FA7001020
63846+:100DF0003C0A800835480080910900083124000829
63847+:100E00001480000224080003000040213C1F8008D9
63848+:100E100093F1001193F9001237E600808CCC005456
63849+:100E2000333800FF03087821322D00FF000F708057
63850+:100E300001AE282100AC582B1160006F00000000AB
63851+:100E400094CA005C8CC900543144FFFF0125102373
63852+:100E50000082182B14600068000000008CCB005446
63853+:100E60000165182330EC00041180006C000830800C
63854+:100E70008FA8001C0068102B1040006230ED0004A9
63855+:100E8000006610232C46008010C00002004088211C
63856+:100E9000241100800E00164E024020213C0D8008D7
63857+:100EA00035A6008024070001ACC7000C90C80008DC
63858+:100EB0000011484035A70100310C007FA0CC00088C
63859+:100EC0008E05000424AB0001ACCB0030A4D1005C43
63860+:100ED0008CCA003C9602000E01422021ACC40020C6
63861+:100EE0008CC3003C0069F821ACDF001C8E190004A3
63862+:100EF000ACF900008E180008ACF800048FB10010A7
63863+:100F0000322F000855E0004793A60020A0C0004EF5
63864+:100F100090D8004E2411FFDFA0F8000890CF000801
63865+:100F200001F17024A0CE00088E0500083C0B80085B
63866+:100F300035690080AD2500388D6A00148D2200309F
63867+:100F40002419005001422021AD24003491230000D7
63868+:100F5000307F00FF13F90036264F01000E001658AF
63869+:100F60000240202124040038000028210E0016F23F
63870+:100F70002406000A0A001757240400010E000D2859
63871+:100F8000000020218FBF00348FB200308FB1002CC1
63872+:100F90008FB00028004020210080102103E00008CD
63873+:100FA00027BD00388E0E00083C0F800835F0008009
63874+:100FB000AE0E005402402021AE0000300E00164E4E
63875+:100FC00000000000920D00250240202135AC0020D9
63876+:100FD0000E001658A20C00250E000CAC0240202179
63877+:100FE000240400382405008D0E0016F22406001299
63878+:100FF0000A0017572404000194C5005C0A001792E8
63879+:1010000030A3FFFF2407021811A0FF9E00E6102363
63880+:101010008FAE001C0A00179A01C610230A0017970A
63881+:101020002C620218A0E600080A0017C48E0500080A
63882+:101030002406FF8001E6C0243C118000AE38002861
63883+:101040008E0D000831E7007F3C0E800C00EE602121
63884+:10105000AD8D00E08E080008AF8C00380A0017D074
63885+:10106000AD8800E4AC800058908500082403FFF7A9
63886+:1010700000A33824A08700080A0017758FA7001066
63887+:101080003C05080024A560A83C04080024846FF4F3
63888+:101090003C020800244260B0240300063C01080121
63889+:1010A000AC2596C03C010801AC2496C43C01080163
63890+:1010B000AC2296C83C010801A02396CC03E00008AE
63891+:1010C0000000000003E00008240200013C02800050
63892+:1010D000308800FF344701803C0680008CC301B893
63893+:1010E0000460FFFE000000008CC501282418FF806A
63894+:1010F0003C0D800A24AF010001F8702431EC007F20
63895+:10110000ACCE0024018D2021ACE50000948B00EAD8
63896+:101110003509600024080002316AFFFFACEA0004D0
63897+:1011200024020001A4E90008A0E8000BACE00024C0
63898+:101130003C071000ACC701B8AF84003803E00008DA
63899+:10114000AF85006C938800488F8900608F820038DB
63900+:1011500030C600FF0109382330E900FF01221821C1
63901+:1011600030A500FF2468008810C000020124382147
63902+:101170000080382130E400031480000330AA00030B
63903+:101180001140000D312B000310A0000900001021B8
63904+:1011900090ED0000244E000131C200FF0045602B9D
63905+:1011A000A10D000024E700011580FFF925080001CA
63906+:1011B00003E00008000000001560FFF300000000DD
63907+:1011C00010A0FFFB000010218CF80000245900043F
63908+:1011D000332200FF0045782BAD18000024E70004FF
63909+:1011E00015E0FFF92508000403E0000800000000F6
63910+:1011F00093850048938800588F8700600004320070
63911+:101200003103007F00E5102B30C47F001040000F39
63912+:10121000006428258F8400383C0980008C8A00EC0B
63913+:10122000AD2A00A43C03800000A35825AC6B00A0AD
63914+:101230008C6C00A00580FFFE000000008C6D00ACEF
63915+:10124000AC8D00EC03E000088C6200A80A00188254
63916+:101250008F840038938800593C0280000080502120
63917+:10126000310300FEA383005930ABFFFF30CC00FFF9
63918+:1012700030E7FFFF344801803C0980008D2401B82D
63919+:101280000480FFFE8F8D006C24180016AD0D000049
63920+:101290008D2201248F8D0038AD0200048D5900206D
63921+:1012A000A5070008240201C4A119000AA118000B17
63922+:1012B000952F01208D4E00088D4700049783005C18
63923+:1012C0008D59002401CF302100C7282100A32023FD
63924+:1012D0002418FFFFA504000CA50B000EA5020010AA
63925+:1012E000A50C0012AD190018AD18002495AF00E848
63926+:1012F0003C0B10002407FFF731EEFFFFAD0E002876
63927+:101300008DAC0084AD0C002CAD2B01B88D460020B7
63928+:1013100000C7282403E00008AD4500208F8800386E
63929+:101320000080582130E7FFFF910900D63C02800081
63930+:1013300030A5FFFF312400FF00041A00006750258C
63931+:1013400030C600FF344701803C0980008D2C01B875
63932+:101350000580FFFE8F82006C240F0017ACE20000B6
63933+:101360008D390124ACF900048D780020A4EA00082E
63934+:10137000241901C4A0F8000AA0EF000B9523012056
63935+:101380008D6E00088D6D00049784005C01C35021B0
63936+:10139000014D602101841023A4E2000CA4E5000E9D
63937+:1013A000A4F90010A4E60012ACE000148D7800242B
63938+:1013B000240DFFFFACF800188D0F007CACEF001C73
63939+:1013C0008D0E00783C0F1000ACEE0020ACED002438
63940+:1013D000950A00BE240DFFF73146FFFFACE600285A
63941+:1013E000950C00809504008231837FFF0003CA00C2
63942+:1013F0003082FFFF0322C021ACF8002CAD2F01B8D2
63943+:10140000950E00828D6A002000AE3021014D282407
63944+:10141000A506008203E00008AD6500203C028000C4
63945+:10142000344501803C0480008C8301B80460FFFED9
63946+:101430008F8A0044240600199549001C3128FFFFBB
63947+:10144000000839C0ACA70000A0A6000B3C051000A6
63948+:1014500003E00008AC8501B88F87004C0080402174
63949+:1014600030C400FF3C0680008CC201B80440FFFE7F
63950+:101470008F89006C9383006834996000ACA90000E8
63951+:10148000A0A300058CE20010240F00022403FFF744
63952+:10149000A4A20006A4B900088D180020A0B8000A74
63953+:1014A000A0AF000B8CEE0000ACAE00108CED000481
63954+:1014B000ACAD00148CEC001CACAC00248CEB002018
63955+:1014C000ACAB00288CEA002C3C071000ACAA002C26
63956+:1014D0008D090024ACA90018ACC701B88D05002007
63957+:1014E00000A3202403E00008AD0400208F8600380C
63958+:1014F00027BDFFE0AFB10014AFBF0018AFB00010C0
63959+:1015000090C300D430A500FF3062002010400008D6
63960+:10151000008088218CCB00D02409FFDF256A0001E0
63961+:10152000ACCA00D090C800D401093824A0C700D4A8
63962+:1015300014A000403C0C80008F840038908700D4B9
63963+:101540002418FFBF2406FFEF30E3007FA08300D400
63964+:10155000979F005C8F8200608F8D003803E2C82364
63965+:10156000A799005CA5A000BC91AF00D401F870243D
63966+:10157000A1AE00D48F8C0038A18000D78F8A0038AC
63967+:10158000A5400082AD4000EC914500D400A658244F
63968+:10159000A14B00D48F9000348F8400609786005C4C
63969+:1015A0000204282110C0000FAF850034A38000582A
63970+:1015B0003C0780008E2C000894ED01208E2B000447
63971+:1015C000018D5021014B8021020620233086FFFF30
63972+:1015D00030C8000F3909000131310001162000091F
63973+:1015E000A3880058938600488FBF00188FB100145D
63974+:1015F0008FB0001027BD0020AF85006403E0000815
63975+:10160000AF86006000C870238FBF00189386004823
63976+:101610008FB100148FB0001034EF0C00010F28219F
63977+:1016200027BD0020ACEE0084AF85006403E0000815
63978+:10163000AF86006035900180020028210E00190F4E
63979+:10164000240600828F840038908600D430C5004084
63980+:1016500050A0FFBAA38000688F85004C3C06800034
63981+:101660008CCD01B805A0FFFE8F89006C2408608234
63982+:1016700024070002AE090000A6080008A207000B1C
63983+:101680008CA300083C0E1000AE0300108CA2000CCE
63984+:10169000AE0200148CBF0014AE1F00188CB90018E5
63985+:1016A000AE1900248CB80024AE1800288CAF002896
63986+:1016B000AE0F002CACCE01B80A001948A380006818
63987+:1016C0008F8A003827BDFFE0AFB10014AFB0001023
63988+:1016D0008F880060AFBF00189389003C954200BC22
63989+:1016E00030D100FF0109182B0080802130AC00FFB1
63990+:1016F0003047FFFF0000582114600003310600FF4F
63991+:1017000001203021010958239783005C0068202BB9
63992+:101710001480002700000000106800562419000102
63993+:101720001199006334E708803165FFFF0E0018C08F
63994+:10173000020020218F83006C3C07800034E601808A
63995+:101740003C0580008CAB01B80560FFFE240A001840
63996+:101750008F840038ACC30000A0CA000B948900BE7F
63997+:101760003C081000A4C90010ACC00030ACA801B8FF
63998+:101770009482008024430001A4830080949F008011
63999+:101780003C0608008CC6318833EC7FFF1186005E72
64000+:101790000000000002002021022028218FBF001835
64001+:1017A0008FB100148FB000100A00193427BD00203B
64002+:1017B000914400D42403FF8000838825A15100D4E4
64003+:1017C0009784005C3088FFFF51000023938C003C1D
64004+:1017D0008F8500382402EFFF008B782394AE00BC85
64005+:1017E0000168502B31E900FF01C26824A4AD00BCA0
64006+:1017F00051400039010058213C1F800037E60100AC
64007+:101800008CD800043C190001031940245500000144
64008+:1018100034E740008E0A00202403FFFB241100015E
64009+:1018200001432024AE0400201191002D34E78000F4
64010+:1018300002002021012030210E0018C03165FFFF79
64011+:101840009787005C8F890060A780005C0127802358
64012+:10185000AF900060938C003C8F8B00388FBF0018D6
64013+:101860008FB100148FB0001027BD002003E00008E6
64014+:10187000A16C00D73C0D800035AA01008D48000402
64015+:101880003C0900010109282454A0000134E740006C
64016+:101890008E0F00202418FFFB34E7800001F870242D
64017+:1018A00024190001AE0E00201599FF9F34E708802F
64018+:1018B000020020210E00188E3165FFFF020020215A
64019+:1018C000022028218FBF00188FB100148FB00010A4
64020+:1018D0000A00193427BD00200A0019F7000048212A
64021+:1018E00002002021012030210E00188E3165FFFFFB
64022+:1018F0009787005C8F890060A780005C01278023A8
64023+:101900000A001A0EAF900060948C0080241F8000A3
64024+:10191000019F3024A4860080908B0080908F0080EF
64025+:10192000316700FF0007C9C20019C027001871C045
64026+:1019300031ED007F01AE2825A08500800A0019DF67
64027+:1019400002002021938500682403000127BDFFE8E1
64028+:1019500000A330042CA20020AFB00010AFBF0014D1
64029+:1019600000C01821104000132410FFFE3C0708009F
64030+:101970008CE7319000E610243C088000350501809A
64031+:1019800014400005240600848F890038240A0004CE
64032+:101990002410FFFFA12A00FC0E00190F0000000018
64033+:1019A000020010218FBF00148FB0001003E0000868
64034+:1019B00027BD00183C0608008CC631940A001A574F
64035+:1019C00000C310248F87004427BDFFE0AFB200188A
64036+:1019D000AFB10014AFB00010AFBF001C30D000FF9B
64037+:1019E00090E6000D00A088210080902130C5007F86
64038+:1019F000A0E5000D8F8500388E2300188CA200D042
64039+:101A00001062002E240A000E0E001A4AA38A0068F3
64040+:101A10002409FFFF104900222404FFFF5200002088
64041+:101A2000000020218E2600003C0C001000CC582421
64042+:101A3000156000393C0E000800CE682455A0003F18
64043+:101A4000024020213C18000200D880241200001F10
64044+:101A50003C0A00048F8700448CE200148CE30010E1
64045+:101A60008CE500140043F82303E5C82B1320000580
64046+:101A7000024020218E24002C8CF1001010910031A6
64047+:101A80000240202124020012A38200680E001A4A9C
64048+:101A90002412FFFF105200022404FFFF0000202147
64049+:101AA0008FBF001C8FB200188FB100148FB00010D0
64050+:101AB0000080102103E0000827BD002090A800D47A
64051+:101AC000350400200A001A80A0A400D400CA4824CB
64052+:101AD0001520000B8F8B00448F8D00448DAC0010BF
64053+:101AE0001580000B024020218E2E002C51C0FFECEF
64054+:101AF00000002021024020210A001A9B2402001726
64055+:101B00008D66001050C0FFE6000020210240202119
64056+:101B10000A001A9B24020011024020212402001511
64057+:101B20000E001A4AA3820068240FFFFF104FFFDC4B
64058+:101B30002404FFFF0A001A8A8E2600000A001AC138
64059+:101B4000240200143C08000400C8382450E0FFD4EC
64060+:101B500000002021024020210A001A9B24020013C9
64061+:101B60008F85003827BDFFD8AFB3001CAFB2001877
64062+:101B7000AFB10014AFB00010AFBF002090A700D4E9
64063+:101B80008F90004C2412FFFF34E2004092060000C8
64064+:101B9000A0A200D48E0300100080982110720006CD
64065+:101BA00030D1003F2408000D0E001A4AA3880068B7
64066+:101BB000105200252404FFFF8F8A00388E09001878
64067+:101BC0008D4400D01124000702602021240C000E57
64068+:101BD0000E001A4AA38C0068240BFFFF104B001A5A
64069+:101BE0002404FFFF24040020122400048F8D0038F9
64070+:101BF00091AF00D435EE0020A1AE00D48F85005403
64071+:101C000010A00019000000001224004A8F9800382C
64072+:101C10008F92FCC0971000809651000A5230004805
64073+:101C20008F9300403C1F08008FFF318C03E5C82BC9
64074+:101C30001720001E02602021000028210E0019A993
64075+:101C400024060001000020218FBF00208FB3001C5C
64076+:101C50008FB200188FB100148FB0001000801021D7
64077+:101C600003E0000827BD00285224002A8E05001436
64078+:101C70008F840038948A008025490001A48900805F
64079+:101C8000948800803C0208008C42318831077FFF35
64080+:101C900010E2000E00000000026020210E00193446
64081+:101CA000240500010A001B0B000020212402002D46
64082+:101CB0000E001A4AA38200682403FFFF1443FFE1C9
64083+:101CC0002404FFFF0A001B0C8FBF002094990080A2
64084+:101CD000241F800024050001033FC024A498008035
64085+:101CE00090920080908E0080325100FF001181C2DE
64086+:101CF00000107827000F69C031CC007F018D582576
64087+:101D0000A08B00800E001934026020210A001B0BFA
64088+:101D1000000020212406FFFF54A6FFD68F84003840
64089+:101D2000026020210E001934240500010A001B0B5B
64090+:101D300000002021026020210A001B252402000A45
64091+:101D40002404FFFD0A001B0BAF9300608F8800384E
64092+:101D500027BDFFE8AFB00010AFBF0014910A00D458
64093+:101D60008F87004C00808021354900408CE60010B0
64094+:101D7000A10900D43C0208008C4231B030C53FFFBD
64095+:101D800000A2182B106000078F850050240DFF80E3
64096+:101D900090AE000D01AE6024318B00FF156000088D
64097+:101DA0000006C382020020212403000D8FBF00140F
64098+:101DB0008FB0001027BD00180A001A4AA3830068DC
64099+:101DC00033060003240F000254CFFFF70200202146
64100+:101DD00094A2001C8F85003824190023A4A200E8D7
64101+:101DE0008CE8000000081E02307F003F13F9003528
64102+:101DF0003C0A00838CE800188CA600D0110600086D
64103+:101E0000000000002405000E0E001A4AA385006899
64104+:101E10002407FFFF104700182404FFFF8F850038B8
64105+:101E200090A900D435240020A0A400D48F8C0044B5
64106+:101E3000918E000D31CD007FA18D000D8F83005458
64107+:101E40001060001C020020218F8400508C9800102C
64108+:101E50000303782B11E0000D241900180200202143
64109+:101E6000A39900680E001A4A2410FFFF10500002C8
64110+:101E70002404FFFF000020218FBF00148FB000104A
64111+:101E80000080102103E0000827BD00188C86001098
64112+:101E90008F9F00440200202100C31023AFE20010F6
64113+:101EA000240500010E0019A9240600010A001B9751
64114+:101EB000000020210E001934240500010A001B97A0
64115+:101EC00000002021010A5824156AFFD98F8C004494
64116+:101ED000A0A600FC0A001B84A386005A30A500FFC0
64117+:101EE0002406000124A9000100C9102B1040000C99
64118+:101EF00000004021240A000100A61823308B0001B5
64119+:101F000024C60001006A3804000420421160000267
64120+:101F100000C9182B010740251460FFF800A61823FC
64121+:101F200003E000080100102127BDFFD8AFB0001862
64122+:101F30008F90004CAFB1001CAFBF00202403FFFF07
64123+:101F40002411002FAFA30010920600002405000802
64124+:101F500026100001006620260E001BB0308400FF12
64125+:101F600000021E003C021EDC34466F410A001BD8F2
64126+:101F70000000102110A00009008018212445000154
64127+:101F800030A2FFFF2C4500080461FFFA0003204047
64128+:101F90000086202614A0FFF9008018210E001BB037
64129+:101FA000240500208FA300102629FFFF313100FFF8
64130+:101FB00000034202240700FF1627FFE20102182651
64131+:101FC00000035027AFAA0014AFAA00100000302170
64132+:101FD00027A8001027A7001400E6782391ED00033E
64133+:101FE00024CE000100C8602131C600FF2CCB0004C4
64134+:101FF0001560FFF9A18D00008FA200108FBF002097
64135+:102000008FB1001C8FB0001803E0000827BD002826
64136+:1020100027BDFFD0AFB3001CAFB00010AFBF00288A
64137+:10202000AFB50024AFB40020AFB20018AFB10014B8
64138+:102030003C0C80008D880128240FFF803C06800A1C
64139+:1020400025100100250B0080020F68243205007F57
64140+:10205000016F7024AD8E009000A62821AD8D002464
64141+:1020600090A600FC3169007F3C0A8004012A1821F7
64142+:10207000A386005A9067007C00809821AF830030CF
64143+:1020800030E20002AF88006CAF85003800A0182154
64144+:10209000144000022404003424040030A3840048C7
64145+:1020A0008C7200DC30D100FF24040004AF92006089
64146+:1020B00012240004A38000688E7400041680001EA1
64147+:1020C0003C0880009386005930C7000110E0000FE3
64148+:1020D0008F9300608CB000848CA800842404FF805F
64149+:1020E000020410240002F940310A007F03EA482567
64150+:1020F0003C0C2000012C902530CD00FE3C038000DC
64151+:10210000AC720830A38D00598F9300608FBF0028F8
64152+:102110008FB50024ACB300DC8FB400208FB3001C5B
64153+:102120008FB200188FB100148FB00010240200018C
64154+:1021300003E0000827BD00308E7F000895020120D3
64155+:102140008E67001003E2C8213326FFFF30D8000F4E
64156+:1021500033150001AF87003416A00058A39800582B
64157+:1021600035090C000309382100D81823AD03008479
64158+:10217000AF8700648E6A00043148FFFF1100007EC3
64159+:10218000A78A005C90AC00D42407FF8000EC3024C8
64160+:1021900030CB00FF1560004B9786005C938E005A91
64161+:1021A000240D000230D5FFFF11CD02A20000A021B6
64162+:1021B0008F85006002A5802B160000BC9388004824
64163+:1021C0003C11800096240120310400FF1485008812
64164+:1021D0008F8400648F9800343312000356400085CA
64165+:1021E00030A500FF8F900064310C00FF24060034FE
64166+:1021F00011860095AF90004C9204000414800118E1
64167+:102200008F8E0038A380003C8E0D00048DC800D84E
64168+:102210003C0600FF34CCFFFF01AC30240106182B34
64169+:1022200014600120AF8600548F8700609798005C8F
64170+:10223000AF8700400307402310C000C7A788005C99
64171+:102240008F91003030C3000300035823922A007C92
64172+:102250003171000302261021000A20823092000111
64173+:102260000012488000492821311FFFFF03E5C82BD9
64174+:10227000132001208F8800388F8500348F880064F8
64175+:102280001105025A3C0E3F018E0600003C0C250051
64176+:1022900000CE682411AC01638F84004C30E500FF50
64177+:1022A0000E00184A000030218F8800388F870060A8
64178+:1022B0008F8500340A001DB78F8600540A001C5613
64179+:1022C000AF87006490A400D400E48024320200FFB1
64180+:1022D000104000169386005990A6008890AE00D753
64181+:1022E00024A8008830D4003F2686FFE02CD10020AF
64182+:1022F000A38E003C1220000CAF88004C240B000180
64183+:1023000000CB20043095001916A0012B3C0680005C
64184+:1023100034CF0002008FC0241700022E3099002015
64185+:1023200017200234000000009386005930CB0001D2
64186+:102330001160000F9788005C8CBF00848CA900841A
64187+:10234000240AFF8003EA6024000C19403132007F28
64188+:10235000007238253C0D200000EDC82530D800FE65
64189+:102360003C0F8000ADF90830A39800599788005CB5
64190+:102370001500FF84000000008E630020306200041E
64191+:102380001040FF51938600592404FFFB0064802411
64192+:102390003C038000AE700020346601808C7301B86D
64193+:1023A0000660FFFE8F98006C347501003C1400013C
64194+:1023B000ACD800008C6B012424076085ACCB0004F2
64195+:1023C0008EAE000401D488245220000124076083CB
64196+:1023D00024190002A4C700083C0F1000A0D9000B6C
64197+:1023E0003C068000ACCF01B80A001C2B9386005934
64198+:1023F00030A500FF0E00184A240600018F88006CEB
64199+:102400003C05800034A90900250201889388004812
64200+:10241000304A0007304B00783C0340802407FF809F
64201+:102420000163C825014980210047F824310C00FFD1
64202+:1024300024060034ACBF0800AF90004CACB90810C3
64203+:102440005586FF6E920400048F8400388E11003090
64204+:10245000908E00D431CD001015A000108F83006045
64205+:102460002C6F000515E000E400000000909800D4F7
64206+:102470002465FFFC331200101640000830A400FF52
64207+:102480008F9F00648F99003413F90004388700018E
64208+:1024900030E20001144001C8000000000E001BC320
64209+:1024A000000000000A001DF8000000008F84006496
64210+:1024B00030C500FF0E00184A24060001939800481A
64211+:1024C000240B0034130B00A08F8500388F8600602A
64212+:1024D0009783005C306EFFFF00CE8823AF910060D1
64213+:1024E000A780005C1280FF90028018212414FFFD59
64214+:1024F0005474FFA28E6300208E6A00042403FFBF81
64215+:102500002408FFEF0155F823AE7F000490AC00D4FF
64216+:102510003189007FA0A900D48E7200208F8F0038EF
64217+:10252000A780005C364D0002AE6D0020A5E000BC27
64218+:1025300091E500D400A3C824A1F900D48F950038F8
64219+:10254000AEA000EC92B800D403085824A2AB00D48B
64220+:102550000A001CD78F8500388F910034AF8000604F
64221+:1025600002275821AF8B0034000020212403FFFFF5
64222+:10257000108301B48F8500388E0C00103C0D0800CC
64223+:102580008DAD31B09208000031843FFF008D802B6B
64224+:1025900012000023310D003F3C1908008F3931A88B
64225+:1025A0008F9F006C000479802408FF80033F202166
64226+:1025B000008FC821938500590328F8243C06008029
64227+:1025C0003C0F800034D80001001F91403331007F60
64228+:1025D0008F8600380251502535EE0940332B0078A4
64229+:1025E000333000073C0310003C02800C017890253A
64230+:1025F000020E48210143C0250222382134AE0001D9
64231+:10260000ADFF0804AF890050ADF20814AF87004455
64232+:10261000ADFF0028ACD90084ADF80830A38E005976
64233+:102620009383005A24070003106700272407000142
64234+:102630001467FFAC8F8500382411002311B1008589
64235+:1026400000000000240E000B026020210E001A4A38
64236+:10265000A38E00680040A0210A001D328F8500383B
64237+:1026600002602021240B000C0E001A4AA38B006884
64238+:10267000240AFFFF104AFFBD2404FFFF8F8E00389D
64239+:10268000A380003C8E0D00048DC800D83C0600FFDE
64240+:1026900034CCFFFF01AC30240106182B1060FEE2A1
64241+:1026A000AF86005402602021241200190E001A4A3D
64242+:1026B000A3920068240FFFFF104FFFAC2404FFFF1C
64243+:1026C0000A001C838F86005425A3FFE02C74002091
64244+:1026D0001280FFDD240E000B000328803C1108014E
64245+:1026E000263194B400B148218D2D000001A00008CE
64246+:1026F000000000008F85003400A710219385003C66
64247+:10270000AF82003402251821A383003C951F00BC32
64248+:102710000226282137F91000A51900BC5240FF926B
64249+:10272000AF850060246A0004A38A003C950900BCC0
64250+:1027300024A40004AF84006035322000A51200BC40
64251+:102740000A001D54000020218F8600602CC800055F
64252+:102750001500FF609783005C3065FFFF00C5C8234C
64253+:102760002F2F000511E00003306400FF24CDFFFC93
64254+:1027700031A400FF8F8900648F920034113200046D
64255+:10278000389F000133EC0001158001380000000083
64256+:102790008F840038908700D434E60010A08600D4DF
64257+:1027A0008F8500388F8600609783005CACA000ECBA
64258+:1027B0000A001D2F306EFFFF8CB500848CB400849E
64259+:1027C0003C04100002A7302400068940328E007FAE
64260+:1027D000022E8025020410253C08800024050001FB
64261+:1027E00002602021240600010E0019A9AD02083064
64262+:1027F0000A001CC38F8500388C8200EC1222FE7EFA
64263+:102800000260202124090005A38900680E001A4AED
64264+:102810002411FFFF1451FE782404FFFF0A001D5508
64265+:102820002403FFFF8F8F004C8F8800388DF8000045
64266+:10283000AD1800888DE70010AD0700988F87006005
64267+:102840000A001DB78F8600542406FFFF118600057D
64268+:10285000000000000E001B4C026020210A001D8FAA
64269+:102860000040A0210E001AD1026020210A001D8F15
64270+:102870000040A0218F90004C3C0208008C4231B0F7
64271+:102880008E110010322C3FFF0182282B10A0000C6B
64272+:10289000240BFF808F85005090A3000D01637024EE
64273+:1028A00031CA00FF1140000702602021001143825D
64274+:1028B000310600032418000110D8010600000000B2
64275+:1028C000026020212403000D0E001A4AA383006831
64276+:1028D000004020218F8500380A001D320080A02191
64277+:1028E0008F90004C3C0A08008D4A31B08F85005013
64278+:1028F0008E0400100000A0218CB1001430823FFF34
64279+:10290000004A602B8CB200205180FFEE0260202133
64280+:1029100090B8000D240BFF800178702431C300FFB4
64281+:102920005060FFE80260202100044382310600036A
64282+:1029300014C0FFE40260202194BF001C8F9900386E
64283+:102940008E060028A73F00E88CAF0010022F20233E
64284+:1029500014C4013A026020218F83005400C368210F
64285+:10296000022D382B14E00136240200188F8A00440F
64286+:102970008F820030024390218D4B00100163702341
64287+:10298000AD4E0010AD5200208C4C00740192282BEB
64288+:1029900014A0015F026020218F8400508E08002463
64289+:1029A0008C86002411060007026020212419001CD7
64290+:1029B0000E001A4AA3990068240FFFFF104FFFC5AD
64291+:1029C0002404FFFF8F8400448C87002424FF00012F
64292+:1029D000AC9F00241251012F8F8D00308DB10074F7
64293+:1029E0001232012C3C0B00808E0E000001CB5024D3
64294+:1029F00015400075000000008E0300142411FFFF35
64295+:102A0000107100073C0808003C0608008CC6319095
64296+:102A100000C8C0241300015202602021A380006876
64297+:102A20008E0300003C19000100792024108000135F
64298+:102A30003C1F0080007FA02416800009020028218E
64299+:102A4000026020212411001A0E001A4AA391006886
64300+:102A50002407FFFF1047FF9F2404FFFF02002821E7
64301+:102A6000026020210E001A6A240600012410FFFFD4
64302+:102A70001050FF982404FFFF241400018F8D0044A0
64303+:102A8000026020210280302195A900342405000134
64304+:102A9000253200010E0019A9A5B200340000202142
64305+:102AA0008F8500380A001D320080A0218F90004CD5
64306+:102AB0003C1408008E9431B08E07001030E53FFFC3
64307+:102AC00000B4C82B132000618F8600502412FF80B1
64308+:102AD00090C9000D0249682431A400FF5080005CB9
64309+:102AE000026020218F8C00541180000700078B8228
64310+:102AF0008F8500388F82FCC094BF0080944A000A02
64311+:102B0000515F00F78F8600403227000314E0006415
64312+:102B100000000000920E000211C000D8000000006A
64313+:102B20008E0B0024156000D902602021920400035E
64314+:102B300024190002308500FF14B90005308900FF18
64315+:102B40008F940054128000EA240D002C308900FF7D
64316+:102B5000392C00102D8400012D3200010244302553
64317+:102B6000020028210E001A6A026020212410FFFFB3
64318+:102B7000105000BF8F8500388F830054106000D341
64319+:102B8000240500013C0A08008D4A318C0143F82BD2
64320+:102B900017E000B22402002D02602021000028214D
64321+:102BA0000E0019A9240600018F85003800001821A5
64322+:102BB0000A001D320060A0210E0018750000000000
64323+:102BC0000A001DF800000000AC8000200A001E78FA
64324+:102BD0008E03001400002821026020210E0019A994
64325+:102BE000240600010A001CC38F8500380A001DB7A7
64326+:102BF0008F8800388CAA00848CAC00843C031000C1
64327+:102C00000147F824001F91403189007F024968255F
64328+:102C100001A32825ACC50830910700012405000157
64329+:102C2000026020210E0019A930E600010A001CC331
64330+:102C30008F850038938F00482403FFFD0A001D3460
64331+:102C4000AF8F00600A001D342403FFFF02602021C3
64332+:102C50002410000D0E001A4AA390006800401821AD
64333+:102C60008F8500380A001D320060A0210E00187503
64334+:102C7000000000009783005C8F86006000402021E8
64335+:102C80003070FFFF00D010232C4A00051140FE11C8
64336+:102C90008F850038ACA400EC0A001D2F306EFFFFBA
64337+:102CA00090CF000D31E300085460FFA192040003AF
64338+:102CB00002602021240200100E001A4AA38200683C
64339+:102CC0002403FFFF5443FF9A920400030A001F12DB
64340+:102CD0008F85003890A4000D308F000811E000951A
64341+:102CE0008F990054572000A6026020218E1F000CEF
64342+:102CF0008CB4002057F40005026020218E0D0008DE
64343+:102D00008CA7002411A7003A026020212402002091
64344+:102D1000A38200680E001A4A2412FFFF1052FEED33
64345+:102D20002404FFFF8F9F00442402FFF73C14800E11
64346+:102D300093EA000D2419FF803C03800001423824EF
64347+:102D4000A3E7000D8F9F00303C0908008D2931ACAE
64348+:102D50008F8C006C97F200788F870044012C302113
64349+:102D6000324D7FFF000D204000C4782131E5007F07
64350+:102D700000B4C02101F94024AC68002CA711000068
64351+:102D80008CEB0028256E0001ACEE00288CEA002CAC
64352+:102D90008E02002C01426021ACEC002C8E09002C2C
64353+:102DA000ACE900308E120014ACF2003494ED003A1D
64354+:102DB00025A40001A4E4003A97E600783C1108003D
64355+:102DC0008E3131B024C3000130707FFF1211005CDE
64356+:102DD000006030218F8F0030026020212405000127
64357+:102DE0000E001934A5E600780A001EA1000020217B
64358+:102DF0008E0900142412FFFF1132006B8F8A0038F5
64359+:102E00008E0200188D4C00D0144C00650260202109
64360+:102E10008E0B00248CAE0028116E005B2402002172
64361+:102E20000E001A4AA38200681452FFBE2404FFFF5A
64362+:102E30008F8500380A001D320080A0212402001F67
64363+:102E40000E001A4AA38200682409FFFF1049FEA160
64364+:102E50002404FFFF0A001E548F83005402602021C7
64365+:102E60000E001A4AA38200681450FF508F85003864
64366+:102E70002403FFFF0A001D320060A0218CD800242B
64367+:102E80008E0800241118FF29026020210A001F2744
64368+:102E90002402000F8E0900003C05008001259024CB
64369+:102EA0001640FF492402001A026020210E001A4A2F
64370+:102EB000A3820068240CFFFF144CFECF2404FFFF04
64371+:102EC0008F8500380A001D320080A0210E001934C1
64372+:102ED000026020218F8500380A001EE500001821BD
64373+:102EE0002403FFFD0060A0210A001D32AF860060B0
64374+:102EF000026020210E001A4AA38D00682403FFFF00
64375+:102F00001043FF588F8500380A001ECC920400033E
64376+:102F10002418001D0E001A4AA39800682403FFFF1E
64377+:102F20001443FE9D2404FFFF8F8500380A001D32E4
64378+:102F30000080A021026020210A001F3D24020024FD
64379+:102F4000240880000068C024330BFFFF000B73C20D
64380+:102F500031D000FF001088270A001F6E001133C017
64381+:102F6000240F001B0E001A4AA38F00681451FEACF8
64382+:102F70002404FFFF8F8500380A001D320080A02145
64383+:102F80000A001F3D240200278E0600288CA3002C77
64384+:102F900010C30008026020210A001F812402001FC4
64385+:102FA0000A001F812402000E026020210A001F81F6
64386+:102FB000240200258E04002C1080000D8F8F00301D
64387+:102FC0008DE800740104C02B5700000C0260202122
64388+:102FD0008CB900140086A0210334282B10A0FF52C6
64389+:102FE0008F9F0044026020210A001F8124020022DA
64390+:102FF000026020210A001F81240200230A001F8191
64391+:103000002402002627BDFFD8AFB3001CAFB10014C7
64392+:10301000AFBF0020AFB20018AFB000103C0280007C
64393+:103020008C5201408C4B01483C048000000B8C0208
64394+:10303000322300FF317300FF8C8501B804A0FFFE2E
64395+:1030400034900180AE1200008C8701442464FFF0AC
64396+:10305000240600022C830013AE070004A61100080A
64397+:10306000A206000BAE1300241060004F8FBF00209B
64398+:10307000000448803C0A0801254A9534012A402171
64399+:103080008D04000000800008000000003C030800E0
64400+:103090008C6331A831693FFF00099980007280215B
64401+:1030A000021370212405FF80264D0100264C00806C
64402+:1030B0003C02800031B1007F3198007F31CA007F2F
64403+:1030C0003C1F800A3C1980043C0F800C01C5202461
64404+:1030D00001A5302401853824014F1821AC46002475
64405+:1030E000023F402103194821AC470090AC4400281E
64406+:1030F000AF830044AF880038AF8900300E0019005C
64407+:10310000016080213C0380008C6B01B80560FFFEEC
64408+:103110008F8700448F8600383465018090E8000D69
64409+:10312000ACB20000A4B0000600082600000416039C
64410+:1031300000029027001227C21080008124C200885C
64411+:10314000241F6082A4BF0008A0A000052402000282
64412+:10315000A0A2000B8F8B0030000424003C08270045
64413+:1031600000889025ACB20010ACA00014ACA00024E4
64414+:10317000ACA00028ACA0002C8D6900382413FF807F
64415+:10318000ACA9001890E3000D02638024320500FF13
64416+:1031900010A000058FBF002090ED000D31AC007F26
64417+:1031A000A0EC000D8FBF00208FB3001C8FB2001861
64418+:1031B0008FB100148FB000103C0A10003C0E80004C
64419+:1031C00027BD002803E00008ADCA01B8265F010052
64420+:1031D0002405FF8033F8007F3C06800003E5782457
64421+:1031E0003C19800A03192021ACCF0024908E00D412
64422+:1031F00000AE682431AC00FF11800024AF84003899
64423+:10320000248E008895CD00123C0C08008D8C31A8CE
64424+:1032100031AB3FFF01924821000B5180012A402130
64425+:1032200001052024ACC400283107007F3C06800C37
64426+:1032300000E620219083000D00A31024304500FFFC
64427+:1032400010A0FFD8AF8400449098000D330F0010F9
64428+:1032500015E0FFD58FBF00200E0019000000000010
64429+:103260003C0380008C7901B80720FFFE00000000BD
64430+:10327000AE1200008C7F0144AE1F0004A6110008AE
64431+:1032800024110002A211000BAE1300243C1308010C
64432+:10329000927396F0327000015200FFC38FBF00207E
64433+:1032A0000E002146024020210A0020638FBF00202B
64434+:1032B0003C1260008E452C083C03F0033462FFFF93
64435+:1032C00000A2F824AE5F2C088E582C083C1901C0CF
64436+:1032D00003199825AE532C080A0020638FBF0020E5
64437+:1032E000264D010031AF007F3C10800A240EFF8084
64438+:1032F00001F0282101AE60243C0B8000AD6C00245D
64439+:103300001660FFA8AF85003824110003A0B100FCAF
64440+:103310000A0020638FBF002026480100310A007F89
64441+:103320003C0B800A2409FF80014B30210109202435
64442+:103330003C078000ACE400240A002062AF8600381D
64443+:10334000944E0012320C3FFF31CD3FFF15ACFF7D94
64444+:10335000241F608290D900D42418FF800319782498
64445+:1033600031EA00FF1140FF7700000000240700044D
64446+:10337000A0C700FC8F870044241160842406000D40
64447+:10338000A4B10008A0A600050A00204D24020002F6
64448+:103390003C040001248496DC24030014240200FE73
64449+:1033A0003C010800AC2431EC3C010800AC2331E8BE
64450+:1033B0003C010801A42296F83C040801248496F8F4
64451+:1033C0000000182100643021A0C300042463000120
64452+:1033D0002C6500FF54A0FFFC006430213C0708006E
64453+:1033E00024E7010003E00008AF87007800A058211F
64454+:1033F000008048210000102114A00012000050217C
64455+:103400000A002142000000003C010801A42096F8B7
64456+:103410003C05080194A596F88F8200783C0C0801C1
64457+:10342000258C96F800E2182100AC2021014B302BAE
64458+:10343000A089000400001021A460000810C0003919
64459+:10344000010048218F8600780009384000E94021BA
64460+:103450000008388000E6282190A8000B90B9000AE7
64461+:103460000008204000881021000218800066C0215A
64462+:10347000A319000A8F85007800E5782191EE000AF3
64463+:1034800091E6000B000E684001AE6021000C208028
64464+:1034900000851021A046000B3C030801906396F2C2
64465+:1034A000106000222462FFFF8F8300383C01080176
64466+:1034B000A02296F2906C00FF118000040000000032
64467+:1034C000906E00FF25CDFFFFA06D00FF3C190801A5
64468+:1034D000973996F8272300013078FFFF2F0F00FF60
64469+:1034E00011E0FFC9254A00013C010801A42396F818
64470+:1034F0003C05080194A596F88F8200783C0C0801E1
64471+:10350000258C96F800E2182100AC2021014B302BCD
64472+:10351000A089000400001021A460000814C0FFC9A5
64473+:103520000100482103E000080000000003E000085B
64474+:103530002402000227BDFFE0248501002407FF804C
64475+:10354000AFB00010AFBF0018AFB1001400A718242F
64476+:103550003C10800030A4007F3C06800A00862821B1
64477+:103560008E110024AE03002490A200FF1440000836
64478+:10357000AF850038A0A000098FBF0018AE1100244D
64479+:103580008FB100148FB0001003E0000827BD0020A9
64480+:1035900090A900FD90A800FF312400FF0E0020F448
64481+:1035A000310500FF8F8500388FBF0018A0A00009EB
64482+:1035B000AE1100248FB100148FB0001003E000089A
64483+:1035C00027BD002027BDFFD0AFB20020AFB1001C47
64484+:1035D000AFB00018AFBF002CAFB40028AFB30024C9
64485+:1035E0003C0980009533011635320C00952F011AE5
64486+:1035F0003271FFFF023280218E08000431EEFFFF9E
64487+:10360000248B0100010E6821240CFF8025A5FFFFFB
64488+:10361000016C50243166007F3C07800AAD2A0024EB
64489+:1036200000C73021AF850074AF8800703C010801ED
64490+:10363000A02096F190C300090200D02100809821BB
64491+:10364000306300FF2862000510400048AF86003854
64492+:10365000286400021480008E24140001240D00054B
64493+:103660003C010801A02D96D590CC00FD3C0108013D
64494+:10367000A02096D63C010801A02096D790CB000A46
64495+:10368000240AFF80318500FF014B4824312700FFC9
64496+:1036900010E0000C000058213C12800836510080D8
64497+:1036A0008E2F00308CD0005C01F0702305C0018E9D
64498+:1036B0008F87007090D4000A3284007FA0C4000A73
64499+:1036C0008F8600383C118008363000808E0F003025
64500+:1036D0008F87007000EF702319C000EE000000001B
64501+:1036E00090D4000924120002328400FF1092024795
64502+:1036F000000000008CC2005800E2F82327F9FFFF09
64503+:103700001B2001300000000090C5000924080004BF
64504+:1037100030A300FF10680057240A00013C01080193
64505+:10372000A02A96D590C900FF252700013C01080179
64506+:10373000A02796D43C030801906396D52406000583
64507+:103740001066006A2C780005130000C40000902168
64508+:103750000003F8803C0408012484958003E4C82118
64509+:103760008F25000000A0000800000000241800FFC2
64510+:103770001078005C0000000090CC000A90CA00099C
64511+:103780003C080801910896F13187008000EA48253D
64512+:103790003C010801A02996DC90C500FD3C140801FD
64513+:1037A000929496F2311100013C010801A02596DDAA
64514+:1037B00090DF00FE3C010801A03F96DE90D200FFA2
64515+:1037C0003C010801A03296DF8CD900543C0108016D
64516+:1037D000AC3996E08CD000583C010801AC3096E43E
64517+:1037E0008CC3005C3C010801AC3496EC3C01080140
64518+:1037F000AC2396E8162000088FBF002C8FB4002859
64519+:103800008FB300248FB200208FB1001C8FB000183E
64520+:1038100003E0000827BD00303C1180009624010E13
64521+:103820000E000FD43094FFFF3C0B08018D6B96F413
64522+:103830000260382102802821AE2B01803C13080150
64523+:103840008E7396D401602021240600830E00102F71
64524+:10385000AFB300108FBF002C8FB400288FB30024AB
64525+:103860008FB200208FB1001C8FB0001803E0000859
64526+:1038700027BD00303C1808008F1831FC270F0001CD
64527+:103880003C010800AC2F31FC0A0021D700000000E9
64528+:103890001474FFB900000000A0C000FF3C05080040
64529+:1038A0008CA531E43C0308008C6331E03C02080045
64530+:1038B0008C4232048F99003834A80001241F000282
64531+:1038C0003C010801AC2396F43C010801A02896F0C5
64532+:1038D0003C010801A02296F3A33F00090A002190B1
64533+:1038E0008F8600380E002146000000000A0021D714
64534+:1038F0008F8600383C1F080193FF96D424190001DD
64535+:1039000013F902298F8700703C100801921096D895
64536+:103910003C06080190C696D610C000050200A02102
64537+:103920003C040801908496D9109001E48F870078B8
64538+:10393000001088408F9F0078023048210009C8801D
64539+:10394000033F702195D80008270F0001A5CF00087C
64540+:103950003C040801908496D93C05080190A596D6B0
64541+:103960000E0020F4000000008F8700780230202134
64542+:103970000004308000C720218C8500048F820074F1
64543+:1039800000A2402305020006AC8200048C8A0000DD
64544+:103990008F830070014310235C400001AC83000062
64545+:1039A0008F86003890CB00FF2D6C00025580002DD3
64546+:1039B000241400010230F821001F40800107282153
64547+:1039C00090B9000B8CAE00040019C0400319782197
64548+:1039D000000F1880006710218C4D000001AE882375
64549+:1039E0002630FFFF5E00001F241400018C440004F9
64550+:1039F0008CAA0000008A482319200019240E000414
64551+:103A00003C010801A02E96D590AD000B8CAB0004B4
64552+:103A1000000D8840022D80210010108000471021E9
64553+:103A20008C44000401646023058202009443000872
64554+:103A300090DF00FE90B9000B33E500FF54B900049D
64555+:103A40000107A021A0D400FE8F8700780107A021E4
64556+:103A50009284000B0E0020F4240500018F860038AC
64557+:103A600024140001125400962E500001160000424A
64558+:103A70003C08FFFF241900021659FF3F0000000018
64559+:103A8000A0C000FF8F860038A0D200090A0021D70D
64560+:103A90008F86003890C700092404000230E300FF3D
64561+:103AA0001064016F24090004106901528F880074AA
64562+:103AB0008CCE0054010E682325B10001062001754B
64563+:103AC000241800043C010801A03896D53C010801E7
64564+:103AD000A02096D490D400FD90D200FF2E4F00027B
64565+:103AE00015E0FF14328400FF000438408F8900780D
64566+:103AF00090DF00FF00E41021000220800089C8212F
64567+:103B00002FE500029324000B14A0FF0A24070002F3
64568+:103B100000041840006480210010588001692821A9
64569+:103B20008CAC0004010C50230540FF020000000093
64570+:103B30003C030801906396D614600005246F0001D1
64571+:103B40003C010801A02496D93C010801A02796D782
64572+:103B50003C010801A02F96D690CE00FF24E700017B
64573+:103B600031CD00FF01A7882B1220FFE990A4000BA4
64574+:103B70000A0021C6000000003C0508018CA596D46F
64575+:103B80003C12000400A8F82413F2000624020005E9
64576+:103B90003C090801912996D5152000022402000352
64577+:103BA000240200053C010801A02296F190C700FF05
64578+:103BB00014E0012024020002A0C200090A0021D75B
64579+:103BC0008F86003890CC00FF1180FEDA240A0001B5
64580+:103BD0008F8C00748F890078240F00030180682186
64581+:103BE0001160001E240E0002000540400105A021C6
64582+:103BF00000142080008990218E51000401918023BF
64583+:103C00000600FECC000000003C020801904296D65F
64584+:103C100014400005245800013C010801A02A96D751
64585+:103C20003C010801A02596D93C010801A03896D690
64586+:103C300090DF00FF010510210002C88033E500FF7E
64587+:103C4000254A00010329202100AA402B1500FEB9B6
64588+:103C50009085000B1560FFE50005404000054040E1
64589+:103C600001051821000310803C010801A02A96D408
64590+:103C70003C010801A02596D8004918218C64000455
64591+:103C800000E4F82327F9FFFF1F20FFE900000000F0
64592+:103C90008C63000000E358230560013A01A38823E8
64593+:103CA00010E301170184C0231B00FEA200000000E6
64594+:103CB0003C010801A02E96D50A002305240B000123
64595+:103CC000240E0004A0CE00093C0D08008DAD31F893
64596+:103CD0008F86003825A200013C010800AC2231F893
64597+:103CE0000A0021D7000000008CD9005C00F9C02335
64598+:103CF0001F00FE7B000000008CDF005C10FFFF65F2
64599+:103D00008F8400748CC3005C008340232502000173
64600+:103D10001C40FF60000000008CC9005C248700018B
64601+:103D200000E9282B10A0FE943C0D80008DAB01040F
64602+:103D30003C0C0001016C50241140FE8F2402001045
64603+:103D40003C010801A02296F10A0021D700000000E2
64604+:103D50008F9100748F86003826220001ACC2005C6F
64605+:103D60000A002292241400018F8700382404FF8067
64606+:103D70000000882190E9000A241400010124302564
64607+:103D8000A0E6000A3C05080190A596D63C0408016F
64608+:103D9000908496D90E0020F4000000008F86003831
64609+:103DA0008F85007890C800FD310700FF0007404074
64610+:103DB0000107F821001FC0800305C8219323000BD1
64611+:103DC000A0C300FD8F8500788F8600380305602131
64612+:103DD000918F000B000F704001CF6821000D808093
64613+:103DE000020510218C4B0000ACCB00548D840004E4
64614+:103DF0008F83007400645023194000022482000164
64615+:103E00002462000101074821ACC2005C0009308037
64616+:103E100000C5402100E02021240500010E0020F40F
64617+:103E20009110000B8F86003890C500FF10A0FF0C8A
64618+:103E3000001070408F85007801D06821000D10803F
64619+:103E4000004558218D6400008F8C0074018450233C
64620+:103E50002547000104E0FF02263100013C03080170
64621+:103E6000906396D62E2F0002247800013C010801B1
64622+:103E7000A03896D63C010801A03496D711E0FEF890
64623+:103E8000020038210A002365000740408F84003873
64624+:103E90008F8300748C85005800A340230502FE9A8E
64625+:103EA000AC8300580A00223B000000003C070801D8
64626+:103EB00090E796F2240200FF10E200BE8F860038E1
64627+:103EC0003C110801963196FA3C030801246396F8E8
64628+:103ED000262500013230FFFF30ABFFFF02036021D7
64629+:103EE0002D6A00FF1540008D918700043C010801F8
64630+:103EF000A42096FA8F88003800074840012728211F
64631+:103F0000911800FF000530802405000127140001EE
64632+:103F1000A11400FF3C120801925296F28F8800789B
64633+:103F20008F8E0070264F000100C820213C0108013F
64634+:103F3000A02F96F2AC8E00008F8D0074A48500082F
64635+:103F4000AC8D00043C030801906396D414600077A4
64636+:103F5000000090213C010801A02596D4A087000B09
64637+:103F60008F8C007800CC5021A147000A8F82003846
64638+:103F7000A04700FD8F840038A08700FE8F860038A0
64639+:103F80008F9F0070ACDF00548F990074ACD900583B
64640+:103F90008F8D00780127C02100185880016DA02165
64641+:103FA000928F000A000F704001CF18210003888013
64642+:103FB000022D8021A207000B8F8600780166602108
64643+:103FC000918A000B000A1040004A2021000428803A
64644+:103FD00000A64021A107000A3C07800834E90080C0
64645+:103FE0008D2200308F860038ACC2005C0A0022921D
64646+:103FF0002414000190CA00FF1540FEAD8F880074A4
64647+:10400000A0C400090A0021D78F860038A0C000FD97
64648+:104010008F98003824060001A30000FE3C0108012F
64649+:10402000A02696D53C010801A02096D40A0021C6FE
64650+:104030000000000090CB00FF3C040801908496F340
64651+:10404000316C00FF0184502B1540000F2402000347
64652+:1040500024020004A0C200090A0021D78F8600387C
64653+:1040600090C3000A2410FF8002035824316C00FF23
64654+:104070001180FDC1000000003C010801A02096D580
64655+:104080000A0021C600000000A0C200090A0021D7D2
64656+:104090008F86003890D4000A2412FF8002544824EE
64657+:1040A000312800FF1500FFF4240200083C0108013C
64658+:1040B000A02296F10A0021D70000000000108840DD
64659+:1040C0008F8B0070023018210003688001A7202127
64660+:1040D000AC8B00008F8A0074240C0001A48C0008B3
64661+:1040E000AC8A00043C05080190A596D62402000184
64662+:1040F00010A2FE1E24A5FFFF0A0022519084000B8F
64663+:104100000184A0231A80FD8B000000003C010801FF
64664+:10411000A02E96D50A002305240B00013C010801BE
64665+:10412000A42596FA0A0023B78F880038240B0001D3
64666+:10413000106B00228F9800388F85003890BF00FFE9
64667+:1041400033F900FF1079002B000000003C1F08012C
64668+:1041500093FF96D8001FC840033FC0210018A080DD
64669+:104160000288782191EE000AA08E000A8F8D0078D7
64670+:104170003C030801906396D800CD88210A0023DD16
64671+:10418000A223000B263000010600003101A4902379
64672+:104190000640002B240200033C010801A02F96D505
64673+:1041A0000A002305240B00018F8900380A00223BF6
64674+:1041B000AD2700540A00229124120001931400FD3F
64675+:1041C000A094000B8F8800388F8F0078910E00FE2E
64676+:1041D00000CF6821A1AE000A8F910038A22700FD10
64677+:1041E0008F8300708F900038AE0300540A0023DEE6
64678+:1041F0008F8D007890B000FEA090000A8F8B003861
64679+:104200008F8C0078916A00FD00CC1021A04A000B31
64680+:104210008F840038A08700FE8F8600748F85003859
64681+:10422000ACA600580A0023DE8F8D007894B80008F1
64682+:10423000ACA40004030378210A002285A4AF00087F
64683+:104240003C010801A02296D50A0021C6000000000A
64684+:1042500090CF0009240D000431EE00FF11CDFD8543
64685+:10426000240200013C010801A02296D50A0021C6C3
64686+:1042700000000000080033440800334408003420E4
64687+:10428000080033F4080033D8080033280800332826
64688+:10429000080033280800334C8008010080080080A3
64689+:1042A000800800005F865437E4AC62CC50103A4579
64690+:1042B00036621985BF14C0E81BC27A1E84F4B55655
64691+:1042C000094EA6FE7DDA01E7C04D748108005A74DC
64692+:1042D00008005AB808005A5C08005A5C08005A5C8A
64693+:1042E00008005A5C08005A7408005A5C08005A5CBE
64694+:1042F00008005AC008005A5C080059D408005A5CEB
64695+:1043000008005A5C08005AC008005A5C08005A5C51
64696+:1043100008005A5C08005A5C08005A5C08005A5CA5
64697+:1043200008005A5C08005A5C08005A5C08005A5C95
64698+:1043300008005A9408005A5C08005A9408005A5C15
64699+:1043400008005A5C08005A5C08005A9808005A9401
64700+:1043500008005A5C08005A5C08005A5C08005A5C65
64701+:1043600008005A5C08005A5C08005A5C08005A5C55
64702+:1043700008005A5C08005A5C08005A5C08005A5C45
64703+:1043800008005A5C08005A5C08005A5C08005A5C35
64704+:1043900008005A5C08005A5C08005A5C08005A5C25
64705+:1043A00008005A9808005A9808005A5C08005A9861
64706+:1043B00008005A5C08005A5C08005A5C08005A5C05
64707+:1043C00008005A5C08005A5C08005A5C08005A5CF5
64708+:1043D00008005A5C08005A5C08005A5C08005A5CE5
64709+:1043E00008005A5C08005A5C08005A5C08005A5CD5
64710+:1043F00008005A5C08005A5C08005A5C08005A5CC5
64711+:1044000008005A5C08005A5C08005A5C08005A5CB4
64712+:1044100008005A5C08005A5C08005A5C08005A5CA4
64713+:1044200008005A5C08005A5C08005A5C08005A5C94
64714+:1044300008005A5C08005A5C08005A5C08005A5C84
64715+:1044400008005A5C08005A5C08005A5C08005A5C74
64716+:1044500008005A5C08005A5C08005A5C08005A5C64
64717+:1044600008005A5C08005A5C08005A5C08005A5C54
64718+:1044700008005A5C08005A5C08005A5C08005A5C44
64719+:1044800008005A5C08005A5C08005A5C08005A5C34
64720+:1044900008005A5C08005A5C08005A5C08005A5C24
64721+:1044A00008005A5C08005A5C08005A5C08005A5C14
64722+:1044B00008005A5C08005A5C08005A5C08005A5C04
64723+:1044C00008005A5C08005A5C08005A5C08005ADC74
64724+:1044D0000800782C08007A900800783808007628C0
64725+:1044E00008007838080078C4080078380800762872
64726+:1044F0000800762808007628080076280800762824
64727+:104500000800762808007628080076280800762813
64728+:1045100008007628080078580800784808007628AF
64729+:1045200008007628080076280800762808007628F3
64730+:1045300008007628080076280800762808007628E3
64731+:1045400008007628080076280800762808007848B1
64732+:10455000080082FC08008188080082C40800818865
64733+:104560000800829408008070080081880800818813
64734+:1045700008008188080081880800818808008188F7
64735+:1045800008008188080081880800818808008188E7
64736+:104590000800818808008188080081B008008D34F7
64737+:1045A00008008E9008008E70080088D808008D4C96
64738+:1045B0000A00012400000000000000000000000DBF
64739+:1045C000747061362E322E31620000000602010145
64740+:1045D00000000000000000000000000000000000DB
64741+:1045E00000000000000000000000000000000000CB
64742+:1045F00000000000000000000000000000000000BB
64743+:1046000000000000000000000000000000000000AA
64744+:10461000000000000000000000000000000000009A
64745+:10462000000000000000000000000000000000008A
64746+:10463000000000000000000000000000000000007A
64747+:104640000000000010000003000000000000000D4A
64748+:104650000000000D3C020800244217203C03080023
64749+:1046600024632A10AC4000000043202B1480FFFD7F
64750+:10467000244200043C1D080037BD2FFC03A0F0219C
64751+:104680003C100800261004903C1C0800279C1720B2
64752+:104690000E000262000000000000000D2402FF80F6
64753+:1046A00027BDFFE000821024AFB00010AF42002011
64754+:1046B000AFBF0018AFB10014936500043084007FD1
64755+:1046C000034418213C0200080062182130A5002094
64756+:1046D000036080213C080111277B000814A0000220
64757+:1046E0002466005C2466005892020004974301048B
64758+:1046F000920400043047000F3063FFFF3084004015
64759+:10470000006728231080000900004821920200055C
64760+:1047100030420004104000050000000010A000031B
64761+:104720000000000024A5FFFC2409000492020005FB
64762+:1047300030420004104000120000000010A00010E1
64763+:10474000000000009602000200A72021010440257D
64764+:104750002442FFFEA7421016920300042402FF80A9
64765+:1047600000431024304200FF104000033C020400CC
64766+:104770000A000174010240258CC20000AF421018EB
64767+:104780008F4201780440FFFE2402000AA742014044
64768+:1047900096020002240400093042000700021023A0
64769+:1047A00030420007A7420142960200022442FFFE67
64770+:1047B000A7420144A740014697420104A74201488D
64771+:1047C0008F420108304200205040000124040001C3
64772+:1047D00092020004304200101440000234830010A2
64773+:1047E00000801821A743014A0000000000000000DB
64774+:1047F0000000000000000000AF48100000000000B2
64775+:104800000000000000000000000000008F421000C7
64776+:104810000441FFFE3102FFFF1040000700000000CE
64777+:1048200092020004304200401440000300000000E7
64778+:104830008F421018ACC20000960200063042FFFF03
64779+:10484000244200020002104300021040036288214B
64780+:10485000962200001120000D3044FFFF00A7102118
64781+:104860008F8300388F45101C0002108200021080D8
64782+:1048700000431021AC45000030A6FFFF0E00058D5F
64783+:1048800000052C0200402021A62200009203000413
64784+:104890002402FF8000431024304200FF1040001F1C
64785+:1048A0000000000092020005304200021040001B90
64786+:1048B000000000009742100C2442FFFEA742101691
64787+:1048C000000000003C02040034420030AF421000FF
64788+:1048D00000000000000000000000000000000000D8
64789+:1048E0008F4210000441FFFE000000009742100CB0
64790+:1048F0008F45101C3042FFFF24420030000210821E
64791+:1049000000021080005B1021AC45000030A6FFFFC4
64792+:104910000E00058D00052C02A62200009604000260
64793+:10492000248400080E0001E93084FFFF974401044D
64794+:104930000E0001F73084FFFF8FBF00188FB1001405
64795+:104940008FB000103C02100027BD002003E00008DB
64796+:10495000AF4201783084FFFF308200078F8500244A
64797+:1049600010400002248300073064FFF800A41021E7
64798+:1049700030421FFF03421821247B4000AF850028EE
64799+:10498000AF82002403E00008AF4200843084FFFFC0
64800+:104990003082000F8F85002C8F860034104000027B
64801+:1049A0002483000F3064FFF000A410210046182B70
64802+:1049B000AF8500300046202314600002AF82002C37
64803+:1049C000AF84002C8F82002C340480000342182115
64804+:1049D00000641821AF83003803E00008AF42008074
64805+:1049E0008F820014104000088F8200048F82FFDC49
64806+:1049F000144000058F8200043C02FFBF3442FFFFD9
64807+:104A0000008220248F82000430430006240200022A
64808+:104A10001062000F3C0201012C62000350400005AF
64809+:104A2000240200041060000F3C0200010A00023062
64810+:104A30000000000010620005240200061462000C51
64811+:104A40003C0201110A000229008210253C020011DB
64812+:104A500000821025AF421000240200010A0002303B
64813+:104A6000AF82000C00821025AF421000AF80000C16
64814+:104A700000000000000000000000000003E000084B
64815+:104A8000000000008F82000C1040000400000000B5
64816+:104A90008F4210000441FFFE0000000003E0000808
64817+:104AA000000000008F8200102443F800000231C291
64818+:104AB00024C2FFF02C6303011060000300021042C7
64819+:104AC0000A000257AC8200008F85001800C5102B29
64820+:104AD0001440000B0000182100C5102324470001DA
64821+:104AE0008F82001C00A210212442FFFF0046102BE1
64822+:104AF000544000042402FFFF0A000257AC87000064
64823+:104B00002402FFFF0A000260AC8200008C820000D9
64824+:104B10000002194000621821000318800062182169
64825+:104B2000000318803C0208002442175C0062182130
64826+:104B300003E000080060102127BDFFD8AFBF0020B0
64827+:104B4000AFB1001CAFB000183C0460088C8250006C
64828+:104B50002403FF7F3C066000004310243442380CDD
64829+:104B6000AC8250008CC24C1C3C1A80000002160221
64830+:104B70003042000F10400007AF82001C8CC34C1C59
64831+:104B80003C02001F3442FC0000621824000319C2DA
64832+:104B9000AF8300188F420008275B400034420001B9
64833+:104BA000AF420008AF8000243C02601CAF40008090
64834+:104BB000AF4000848C4500088CC308083402800094
64835+:104BC000034220212402FFF0006218243C020080EE
64836+:104BD0003C010800AC2204203C025709AF84003895
64837+:104BE00014620004AF850034240200010A0002921E
64838+:104BF000AF820014AF8000148F42000038420001E1
64839+:104C0000304200011440FFFC8F8200141040001657
64840+:104C10000000000097420104104000058F8300004F
64841+:104C2000146000072462FFFF0A0002A72C62000A3A
64842+:104C30002C620010504000048F83000024620001A9
64843+:104C4000AF8200008F8300002C62000A1440000332
64844+:104C50002C6200070A0002AEAF80FFDC10400002A9
64845+:104C600024020001AF82FFDC8F4301088F44010062
64846+:104C700030622000AF83000410400008AF840010B1
64847+:104C80003C0208008C42042C244200013C01080034
64848+:104C9000AC22042C0A00058A3C0240003065020068
64849+:104CA00014A0000324020F001482026024020D00ED
64850+:104CB00097420104104002C83C02400030624000AC
64851+:104CC000144000AD8F8200388C4400088F42017878
64852+:104CD0000440FFFE24020800AF42017824020008CD
64853+:104CE000A7420140A7400142974201048F8400047B
64854+:104CF0003051FFFF30820001104000070220802168
64855+:104D00002623FFFE240200023070FFFFA742014667
64856+:104D10000A0002DBA7430148A74001463C02080005
64857+:104D20008C42043C1440000D8F8300103082002020
64858+:104D30001440000224030009240300010060202124
64859+:104D40008F830010240209005062000134840004A3
64860+:104D5000A744014A0A0002F60000000024020F00E6
64861+:104D60001462000530820020144000062403000D68
64862+:104D70000A0002F524030005144000022403000980
64863+:104D800024030001A743014A3C0208008C4204208E
64864+:104D90003C0400480E00020C004420250E000235A1
64865+:104DA000000000008F82000C1040003E0000000058
64866+:104DB0008F4210003C0300200043102410400039B3
64867+:104DC0008F820004304200021040003600000000D4
64868+:104DD000974210141440003300000000974210085E
64869+:104DE0008F8800383042FFFF2442000600021882FC
64870+:104DF0000003388000E83021304300018CC40000FB
64871+:104E000010600004304200030000000D0A00033768
64872+:104E100000E81021544000103084FFFF3C05FFFFE4
64873+:104E200000852024008518260003182B0004102B71
64874+:104E300000431024104000050000000000000000A6
64875+:104E40000000000D00000000240002228CC20000BF
64876+:104E50000A000336004520253883FFFF0003182B86
64877+:104E60000004102B00431024104000050000000037
64878+:104E7000000000000000000D000000002400022BD4
64879+:104E80008CC200003444FFFF00E81021AC44000055
64880+:104E90003C0208008C420430244200013C0108001E
64881+:104EA000AC2204308F6200008F840038AF8200088B
64882+:104EB0008C8300003402FFFF1462000F00001021F9
64883+:104EC0003C0508008CA504543C0408008C84045064
64884+:104ED00000B0282100B0302B008220210086202144
64885+:104EE0003C010800AC2504543C010800AC240450EB
64886+:104EF0000A000580240400088C8200003042010072
64887+:104F00001040000F000010213C0508008CA5044C47
64888+:104F10003C0408008C84044800B0282100B0302BE9
64889+:104F200000822021008620213C010800AC25044C91
64890+:104F30003C010800AC2404480A0005802404000851
64891+:104F40003C0508008CA504443C0408008C84044003
64892+:104F500000B0282100B0302B0082202100862021C3
64893+:104F60003C010800AC2504443C010800AC2404408A
64894+:104F70000A000580240400088F6200088F62000088
64895+:104F800000021602304300F02402003010620005D7
64896+:104F900024020040106200E08F8200200A00058891
64897+:104FA0002442000114A000050000000000000000E1
64898+:104FB0000000000D00000000240002568F4201781E
64899+:104FC0000440FFFE000000000E00023D27A4001078
64900+:104FD0001440000500408021000000000000000D8A
64901+:104FE000000000002400025D8E0200001040000559
64902+:104FF00000000000000000000000000D00000000A4
64903+:10500000240002608F62000C0443000324020001AC
64904+:105010000A00042EAE000000AE0200008F820038AD
64905+:105020008C480008A20000078F65000C8F64000404
64906+:1050300030A3FFFF0004240200852023308200FFFC
64907+:105040000043102124420005000230832CC200815D
64908+:10505000A605000A14400005A20400040000000098
64909+:105060000000000D00000000240002788F85003849
64910+:105070000E0005AB260400148F6200048F43010864
64911+:10508000A60200083C02100000621824106000080C
64912+:105090000000000097420104920300072442FFEC45
64913+:1050A000346300023045FFFF0A0003C3A203000778
64914+:1050B000974201042442FFF03045FFFF96060008A6
64915+:1050C0002CC200135440000592030007920200070F
64916+:1050D00034420001A20200079203000724020001EB
64917+:1050E00010620005240200031062000B8F8200385A
64918+:1050F0000A0003E030C6FFFF8F8200383C04FFFF48
64919+:105100008C43000C0064182400651825AC43000C87
64920+:105110000A0003E030C6FFFF3C04FFFF8C43001091
64921+:105120000064182400651825AC43001030C6FFFF4A
64922+:1051300024C2000200021083A20200058F830038FF
64923+:10514000304200FF00021080004328218CA800009C
64924+:105150008CA2000024030004000217021443001272
64925+:1051600000000000974201043C03FFFF01031824E4
64926+:105170003042FFFF004610232442FFFE006240251C
64927+:10518000ACA8000092030005306200FF000210800E
64928+:1051900000501021904200143042000F00431021B3
64929+:1051A0000A000415A20200068CA400049742010420
64930+:1051B0009603000A3088FFFF3042FFFF00461023AD
64931+:1051C0002442FFD60002140001024025ACA80004CE
64932+:1051D000920200079204000524630028000318834C
64933+:1051E0000064182134420004A2030006A202000752
64934+:1051F0008F8200042403FFFB34420002004310248A
64935+:10520000AF820004920300068F87003800031880E5
64936+:10521000007010218C4400203C02FFF63442FFFF56
64937+:105220000082402400671821AE04000CAC68000C1A
64938+:10523000920500063C03FF7F8E02000C00052880CB
64939+:1052400000B020213463FFFF01033024948800263E
64940+:1052500000A7282100431024AE02000CAC860020D9
64941+:10526000AC880024ACA8001024020010A742014022
64942+:1052700024020002A7400142A7400144A742014680
64943+:10528000974201043C0400082442FFFEA742014863
64944+:10529000240200010E00020CA742014A9603000AF4
64945+:1052A0009202000400431021244200023042000711
64946+:1052B00000021023304200070E000235AE0200103B
64947+:1052C0008F6200003C0308008C6304442404001037
64948+:1052D000AF820008974201043042FFFF2442FFFEE4
64949+:1052E00000403821000237C33C0208008C420440D1
64950+:1052F000006718210067282B004610210045102167
64951+:105300003C010800AC2304443C010800AC220440EA
64952+:105310000A0005150000000014A0000500000000B0
64953+:10532000000000000000000D000000002400030A3F
64954+:105330008F4201780440FFFE000000000E00023D95
64955+:1053400027A4001414400005004080210000000044
64956+:105350000000000D00000000240003118E02000078
64957+:105360005440000692020007000000000000000DFB
64958+:10537000000000002400031C9202000730420004D9
64959+:10538000104000058F8200042403FFFB344200021A
64960+:1053900000431024AF8200048F620004044300081D
64961+:1053A00092020007920200068E03000CAE0000007D
64962+:1053B0000002108000501021AC4300209202000730
64963+:1053C00030420004544000099602000A920200058F
64964+:1053D0003C03000100021080005010218C46001890
64965+:1053E00000C33021AC4600189602000A9206000461
64966+:1053F000277100080220202100C2302124C60005A8
64967+:10540000260500140E0005AB00063082920400064B
64968+:105410008F6500043C027FFF000420800091202162
64969+:105420008C8300043442FFFF00A228240065182169
64970+:10543000AC8300049202000792040005920300046A
64971+:10544000304200041040001496070008308400FF2A
64972+:1054500000042080009120218C86000497420104E2
64973+:105460009605000A306300FF3042FFFF0043102121
64974+:105470000045102130E3FFFF004310232442FFD8F2
64975+:1054800030C6FFFF0002140000C23025AC860004C5
64976+:105490000A0004C992030007308500FF0005288038
64977+:1054A00000B128218CA4000097420104306300FF62
64978+:1054B0003042FFFF00431021004710233C03FFFF51
64979+:1054C000008320243042FFFF00822025ACA400008E
64980+:1054D0009203000724020001106200060000000091
64981+:1054E0002402000310620011000000000A0004EC16
64982+:1054F0008E03001097420104920300049605000AEF
64983+:105500008E24000C00431021004510212442FFF29C
64984+:105510003C03FFFF008320243042FFFF0082202550
64985+:10552000AE24000C0A0004EC8E0300109742010424
64986+:10553000920300049605000A8E24001000431021F7
64987+:10554000004510212442FFEE3C03FFFF008320248E
64988+:105550003042FFFF00822025AE2400108E03001091
64989+:105560002402000AA7420140A74301429603000A11
64990+:10557000920200043C04004000431021A742014471
64991+:10558000A740014697420104A742014824020001B6
64992+:105590000E00020CA742014A0E0002350000000076
64993+:1055A0008F6200009203000400002021AF820008F7
64994+:1055B000974201049606000A3042FFFF006218215C
64995+:1055C000006028213C0308008C6304443C0208006E
64996+:1055D0008C42044000651821004410210065382BDE
64997+:1055E000004710213C010800AC2304443C010800A2
64998+:1055F000AC22044092040004008620212484000A86
64999+:105600003084FFFF0E0001E9000000009744010410
65000+:105610003084FFFF0E0001F7000000003C02100084
65001+:10562000AF4201780A0005878F820020148200278C
65002+:105630003062000697420104104000673C024000BF
65003+:105640003062400010400005000000000000000033
65004+:105650000000000D00000000240004208F420178AB
65005+:105660000440FFFE24020800AF4201782402000833
65006+:10567000A7420140A74001428F82000497430104E2
65007+:1056800030420001104000073070FFFF2603FFFE8C
65008+:1056900024020002A7420146A74301480A00053F31
65009+:1056A0002402000DA74001462402000DA742014A32
65010+:1056B0008F62000024040008AF8200080E0001E998
65011+:1056C000000000000A0005190200202110400042DD
65012+:1056D0003C02400093620000304300F024020010BE
65013+:1056E0001062000524020070106200358F820020D5
65014+:1056F0000A000588244200018F62000097430104DC
65015+:105700003050FFFF3071FFFF8F4201780440FFFEF1
65016+:105710003202000700021023304200072403000A6F
65017+:105720002604FFFEA7430140A7420142A7440144CB
65018+:10573000A7400146A75101488F420108304200208E
65019+:10574000144000022403000924030001A743014A76
65020+:105750000E00020C3C0400400E0002350000000068
65021+:105760003C0708008CE70444021110212442FFFE8C
65022+:105770003C0608008CC604400040182100E3382194
65023+:10578000000010218F65000000E3402B00C2302193
65024+:105790002604000800C830213084FFFFAF850008D0
65025+:1057A0003C010800AC2704443C010800AC2604403E
65026+:1057B0000E0001E9000000000A0005190220202166
65027+:1057C0000E00013B000000008F82002024420001F7
65028+:1057D000AF8200203C024000AF4201380A00029232
65029+:1057E000000000003084FFFF30C6FFFF00052C00E2
65030+:1057F00000A628253882FFFF004510210045282BF0
65031+:105800000045102100021C023042FFFF004310211E
65032+:1058100000021C023042FFFF004310213842FFFF0C
65033+:1058200003E000083042FFFF3084FFFF30A5FFFF98
65034+:1058300000001821108000070000000030820001E5
65035+:105840001040000200042042006518210A0005A152
65036+:105850000005284003E000080060102110C0000689
65037+:1058600024C6FFFF8CA2000024A50004AC82000027
65038+:105870000A0005AB2484000403E0000800000000D7
65039+:1058800010A0000824A3FFFFAC8600000000000069
65040+:10589000000000002402FFFF2463FFFF1462FFFAF0
65041+:1058A0002484000403E00008000000000000000160
65042+:1058B0000A00002A00000000000000000000000DA7
65043+:1058C000747870362E322E3162000000060201001C
65044+:1058D00000000000000001360000EA600000000047
65045+:1058E00000000000000000000000000000000000B8
65046+:1058F00000000000000000000000000000000000A8
65047+:105900000000000000000000000000000000000097
65048+:105910000000001600000000000000000000000071
65049+:105920000000000000000000000000000000000077
65050+:105930000000000000000000000000000000000067
65051+:1059400000000000000000000000138800000000BC
65052+:10595000000005DC00000000000000001000000353
65053+:10596000000000000000000D0000000D3C020800D7
65054+:1059700024423D683C0308002463401CAC40000006
65055+:105980000043202B1480FFFD244200043C1D08002E
65056+:1059900037BD7FFC03A0F0213C100800261000A8B2
65057+:1059A0003C1C0800279C3D680E00044E00000000CF
65058+:1059B0000000000D27BDFFB4AFA10000AFA200049E
65059+:1059C000AFA30008AFA4000CAFA50010AFA6001451
65060+:1059D000AFA70018AFA8001CAFA90020AFAA0024F1
65061+:1059E000AFAB0028AFAC002CAFAD0030AFAE003491
65062+:1059F000AFAF0038AFB8003CAFB90040AFBC004417
65063+:105A0000AFBF00480E000591000000008FBF0048A6
65064+:105A10008FBC00448FB900408FB8003C8FAF003876
65065+:105A20008FAE00348FAD00308FAC002C8FAB0028D0
65066+:105A30008FAA00248FA900208FA8001C8FA7001810
65067+:105A40008FA600148FA500108FA4000C8FA3000850
65068+:105A50008FA200048FA1000027BD004C3C1B6004F6
65069+:105A60008F7A5030377B502803400008AF7A00000F
65070+:105A70008F86003C3C0390003C0280000086282575
65071+:105A800000A32025AC4400203C0380008C6700204C
65072+:105A900004E0FFFE0000000003E00008000000003A
65073+:105AA0000A000070240400018F85003C3C04800043
65074+:105AB0003483000100A3102503E00008AC8200201D
65075+:105AC00003E00008000010213084FFFF30A5FFFF35
65076+:105AD00010800007000018213082000110400002F1
65077+:105AE00000042042006518211480FFFB00052840B7
65078+:105AF00003E000080060102110C000070000000053
65079+:105B00008CA2000024C6FFFF24A50004AC82000084
65080+:105B100014C0FFFB2484000403E000080000000020
65081+:105B200010A0000824A3FFFFAC86000000000000C6
65082+:105B3000000000002402FFFF2463FFFF1462FFFA4D
65083+:105B40002484000403E000080000000090AA003153
65084+:105B50008FAB00108CAC00403C0300FF8D6800044C
65085+:105B6000AD6C00208CAD004400E060213462FFFF8A
65086+:105B7000AD6D00248CA700483C09FF000109C0243A
65087+:105B8000AD6700288CAE004C0182C824031978252B
65088+:105B9000AD6F0004AD6E002C8CAD0038314A00FFB3
65089+:105BA000AD6D001C94A900323128FFFFAD680010D4
65090+:105BB00090A70030A5600002A1600004A16700006A
65091+:105BC00090A30032306200FF0002198210600005CD
65092+:105BD000240500011065000E0000000003E000082D
65093+:105BE000A16A00018CD80028354A0080AD780018E1
65094+:105BF0008CCF0014AD6F00148CCE0030AD6E000859
65095+:105C00008CC4002CA16A000103E00008AD64000C04
65096+:105C10008CCD001CAD6D00188CC90014AD6900144A
65097+:105C20008CC80024AD6800088CC70020AD67000C4C
65098+:105C30008CC200148C8300700043C82B1320000713
65099+:105C4000000000008CC20014144CFFE400000000AF
65100+:105C5000354A008003E00008A16A00018C820070D0
65101+:105C60000A0000E6000000009089003027BDFFF820
65102+:105C70008FA8001CA3A900008FA300003C0DFF808B
65103+:105C800035A2FFFF8CAC002C00625824AFAB0000A3
65104+:105C9000A100000400C05821A7A000028D06000446
65105+:105CA00000A048210167C8218FA500000080502175
65106+:105CB0003C18FF7F032C20263C0E00FF2C8C00019B
65107+:105CC000370FFFFF35CDFFFF3C02FF0000AFC824B8
65108+:105CD00000EDC02400C27824000C1DC003236825F9
65109+:105CE00001F87025AD0D0000AD0E00048D240024D8
65110+:105CF000AFAD0000AD0400088D2C00202404FFFF90
65111+:105D0000AD0C000C9547003230E6FFFFAD060010E9
65112+:105D10009145004830A200FF000219C25060000106
65113+:105D20008D240034AD0400148D4700388FAA00186C
65114+:105D300027BD0008AD0B0028AD0A0024AD07001CEC
65115+:105D4000AD00002CAD00001803E00008AD000020FD
65116+:105D500027BDFFE0AFB20018AFB10014AFB0001024
65117+:105D6000AFBF001C9098003000C088213C0D00FFA0
65118+:105D7000330F007FA0CF0000908E003135ACFFFFC5
65119+:105D80003C0AFF00A0CE000194A6001EA220000441
65120+:105D90008CAB00148E29000400A08021016C282403
65121+:105DA000012A40240080902101052025A62600021A
65122+:105DB000AE24000426050020262400080E000092D0
65123+:105DC00024060002924700302605002826240014ED
65124+:105DD00000071E000003160324060004044000030D
65125+:105DE0002403FFFF965900323323FFFF0E00009279
65126+:105DF000AE230010262400248FBF001C8FB2001891
65127+:105E00008FB100148FB00010240500030000302172
65128+:105E10000A00009C27BD002027BDFFD8AFB1001CA1
65129+:105E2000AFB00018AFBF002090A9003024020001DD
65130+:105E300000E050213123003F00A040218FB00040FE
65131+:105E40000080882100C04821106200148FA700380C
65132+:105E5000240B000500A0202100C02821106B001396
65133+:105E6000020030210E000128000000009225007C75
65134+:105E700030A400021080000326030030AE00003082
65135+:105E8000260300348FBF00208FB1001C8FB0001894
65136+:105E90000060102103E0000827BD00280E0000A7C5
65137+:105EA000AFB000100A00016F000000008FA3003C9B
65138+:105EB000010020210120282101403021AFA3001042
65139+:105EC0000E0000EEAFB000140A00016F00000000E9
65140+:105ED0003C06800034C20E008C4400108F850044C4
65141+:105EE000ACA400208C43001803E00008ACA30024FD
65142+:105EF0003C06800034C20E008C4400148F850044A0
65143+:105F0000ACA400208C43001C03E00008ACA30024D8
65144+:105F10009382000C1040001B2483000F2404FFF028
65145+:105F20000064382410E00019978B00109784000E4D
65146+:105F30009389000D3C0A601C0A0001AC01644023F7
65147+:105F400001037021006428231126000231C2FFFFE3
65148+:105F500030A2FFFF0047302B50C0000E00E4482164
65149+:105F60008D4D000C31A3FFFF00036400000C2C03D7
65150+:105F700004A1FFF30000302130637FFF0A0001A479
65151+:105F80002406000103E00008000000009784000ED2
65152+:105F900000E448213123FFFF3168FFFF0068382B00
65153+:105FA00054E0FFF8A783000E938A000D114000050E
65154+:105FB000240F0001006BC023A380000D03E0000844
65155+:105FC000A798000E006BC023A38F000D03E000080C
65156+:105FD000A798000E03E000080000000027BDFFE8BE
65157+:105FE000AFB000103C10800036030140308BFFFF43
65158+:105FF00093AA002BAFBF0014A46B000436040E005C
65159+:106000009488001630C600FF8FA90030A4680006EF
65160+:10601000AC650008A0660012A46A001AAC670020F4
65161+:106020008FA5002CA4690018012020210E000198E2
65162+:10603000AC6500143C021000AE0201788FBF001462
65163+:106040008FB0001003E0000827BD00188F85000006
65164+:106050002484000727BDFFF83084FFF83C06800049
65165+:1060600094CB008A316AFFFFAFAA00008FA900001D
65166+:10607000012540232507FFFF30E31FFF0064102B9D
65167+:106080001440FFF700056882000D288034CC4000E2
65168+:1060900000AC102103E0000827BD00088F8200003B
65169+:1060A0002486000730C5FFF800A2182130641FFFC6
65170+:1060B00003E00008AF8400008F87003C8F84004419
65171+:1060C00027BDFFB0AFB70044AFB40038AFB1002C6C
65172+:1060D000AFBF0048AFB60040AFB5003CAFB300342F
65173+:1060E000AFB20030AFB000283C0B80008C8600249B
65174+:1060F000AD6700808C8A002035670E00356901008D
65175+:10610000ACEA00108C8800248D2500040000B82122
65176+:10611000ACE800188CE3001000A688230000A02142
65177+:10612000ACE300148CE20018ACE2001C122000FE6C
65178+:1061300000E0B021936C0008118000F40000000022
65179+:10614000976F001031EEFFFF022E682B15A000EFB5
65180+:1061500000000000977200103250FFFFAED0000028
65181+:106160003C0380008C740000329300081260FFFD35
65182+:106170000000000096D800088EC700043305FFFF1A
65183+:1061800030B5000112A000E4000000000000000D86
65184+:1061900030BFA0402419004013F9011B30B4A00007
65185+:1061A000128000DF000000009373000812600008F6
65186+:1061B00000000000976D001031ACFFFF00EC202BB9
65187+:1061C0001080000330AE004011C000D50000000078
65188+:1061D000A7850040AF87003893630008022028217C
65189+:1061E000AFB10020146000F527B40020AF60000CB0
65190+:1061F000978F004031F14000162000022403001662
65191+:106200002403000E24054007A363000AAF650014B1
65192+:10621000938A00428F70001431550001001512401E
65193+:1062200002024825AF690014979F00408F78001440
65194+:1062300033F9001003194025AF680014979200400D
65195+:106240003247000810E0016E000000008F67001464
65196+:106250003C1210003C11800000F27825AF6F001452
65197+:1062600036230E00946E000A3C0D81002406000EB9
65198+:1062700031CCFFFF018D2025AF640004A36600022E
65199+:106280009373000A3406FFFC266B0004A36B000A1C
65200+:1062900097980040330820001100015F00000000C3
65201+:1062A0003C05800034A90E00979900409538000CF9
65202+:1062B00097870040001940423312C00031030003A9
65203+:1062C00000127B0330F11000006F6825001172038B
65204+:1062D00001AE6025000C20C0A76400129793004017
65205+:1062E000936A000A001359823175003C02AA1021FA
65206+:1062F0002450003CA3700009953F000C33F93FFF88
65207+:10630000A779001097700012936900090130F821F5
65208+:1063100027E5000230B900070019C0233308000741
65209+:10632000A368000B9371000997720012976F001019
65210+:10633000322700FF8F910038978D004000F218211E
65211+:10634000006F702101C6602131A6004010C0000519
65212+:106350003185FFFF00B1102B3C1280001040001768
65213+:10636000000098210225A82B56A0013E8FA50020F1
65214+:106370003C048000348A0E008D5300143C068000DB
65215+:10638000AD5300108D4B001CAD4B0018AD45000007
65216+:106390008CCD000031AC00081180FFFD34CE0E0022
65217+:1063A00095C3000800A0882100009021A783004029
65218+:1063B0008DC6000424130001AF860038976F0010CB
65219+:1063C00031F5FFFF8E9F000003F1282310A0011F6D
65220+:1063D000AE85000093620008144000DD000000005C
65221+:1063E0000E0001E7240400108F900048004028218F
65222+:1063F0003C023200320600FF000654000142F8253C
65223+:1064000026090001AF890048ACBF0000937900095C
65224+:1064100097780012936F000A332800FF3303FFFFC1
65225+:106420000103382100076C0031EE00FF01AE60254A
65226+:10643000ACAC00048F840048978B0040316A200088
65227+:106440001140010AACA4000897640012308BFFFFD2
65228+:1064500006400108ACAB000C978E004031C5000827
65229+:1064600014A0000226280006262800023C1F8000F7
65230+:1064700037E70E0094F900148CE5001C8F670004C8
65231+:10648000937800023324FFFF330300FFAFA3001013
65232+:106490008F6F0014AFA800180E0001CBAFAF00142F
65233+:1064A000240400100E0001FB000000008E9200008A
65234+:1064B00016400005000000008F7800142403FFBF81
65235+:1064C0000303A024AF7400148F67000C00F5C821EB
65236+:1064D000AF79000C9375000816A0000800000000BA
65237+:1064E00012600006000000008F6800143C0AEFFFF5
65238+:1064F0003549FFFE0109F824AF7F0014A37300089B
65239+:106500008FA500200A00034F02202021AED10000F9
65240+:106510000A00022D3C03800014E0FF1E30BFA040A3
65241+:106520000E0001900000A0212E9100010237B0253D
65242+:1065300012C000188FBF00488F87003C24170F003F
65243+:1065400010F700D43C0680008CD901780720FFFEAC
65244+:10655000241F0F0010FF00F634CA0E008D560014E1
65245+:1065600034C7014024080240ACF600048D49001CE9
65246+:106570003C141000ACE90008A0E00012A4E0001AEE
65247+:10658000ACE00020A4E00018ACE80014ACD4017822
65248+:106590008FBF00488FB700448FB600408FB5003CD6
65249+:1065A0008FB400388FB300348FB200308FB1002C1D
65250+:1065B0008FB0002803E0000827BD00508F910038FD
65251+:1065C000978800403C1280000220A821310700403B
65252+:1065D00014E0FF7C00009821977900108F9200381A
65253+:1065E0003338FFFF131200A8000020210080A021F3
65254+:1065F000108000F300A088211620FECE00000000CD
65255+:106600000A00031F2E9100013C0380008C62017878
65256+:106610000440FFFE240808008F860000AC68017863
65257+:106620003C038000946D008A31ACFFFF0186582343
65258+:10663000256AFFFF31441FFF2C8900081520FFF950
65259+:10664000000000008F8F0048347040008F83003CB2
65260+:1066500000E0A021240E0F0025E70001AF870048CD
65261+:1066600000D03021023488233C08800031F500FF3F
65262+:10667000106E0005240700019398004233130001B7
65263+:106680000013924036470001001524003C0A010027
65264+:10669000008A4825ACC900008F82004830BF003610
65265+:1066A00030B90008ACC200041320009900FF9825FF
65266+:1066B00035120E009650000A8F8700003C0F8100B3
65267+:1066C0003203FFFF24ED000835060140006F60250E
65268+:1066D0003C0E100031AB1FFF269200062405000E71
65269+:1066E000ACCC0020026E9825A4C5001AAF8B000028
65270+:1066F000A4D20018162000083C1080008F89003CAE
65271+:1067000024020F00512200022417000136730040BA
65272+:106710000E0001883C10800036060E008CCB001461
65273+:10672000360A014002402021AD4B00048CC5001CFC
65274+:10673000AD450008A1550012AD5300140E0001989C
65275+:106740003C151000AE1501780A000352000000004D
65276+:10675000936F0009976E0012936D000B31E500FFF7
65277+:1067600000AE202131AC00FF008C80212602000AFF
65278+:106770003050FFFF0E0001E7020020218F86004805
65279+:106780003C0341003C05800024CB0001AF8B004856
65280+:10679000936A00099769001230C600FF315F00FF5D
65281+:1067A0003128FFFF03E8382124F900020006C40065
65282+:1067B0000319782501E37025AC4E00008F6D000CA5
65283+:1067C00034A40E00948B001401B26025AC4C00047C
65284+:1067D0008C85001C8F670004936A00023164FFFF00
65285+:1067E000314900FFAFA900108F680014AFB1001845
65286+:1067F0000E0001CBAFA800140A0002FD0200202108
65287+:10680000AF600004A36000029798004033082000A6
65288+:106810001500FEA300003021A760001297840040FD
65289+:10682000936B000A3C10800030931F0000135183CB
65290+:10683000014BA82126A20028A362000936090E00F8
65291+:10684000953F000C0A000295A77F00108F7000147E
65292+:10685000360900400E000188AF6900140A0002C921
65293+:10686000000000000A00034F000020210641FEFA4C
65294+:10687000ACA0000C8CAC000C3C0D8000018D902570
65295+:106880000A0002EAACB2000C000090210A0002C526
65296+:1068900024130001128000073C028000344B0E00DC
65297+:1068A0009566000830D300401260004900000000E7
65298+:1068B0003C0680008CD001780600FFFE34C50E0037
65299+:1068C00094B500103C03050034CC014032B8FFFF02
65300+:1068D00003039025AD92000C8CAF0014240D200012
65301+:1068E0003C041000AD8F00048CAE001CAD8E00087F
65302+:1068F000A1800012A580001AAD800020A58000189C
65303+:10690000AD8D0014ACC401780A0003263C0680005B
65304+:106910008F9F0000351801402692000227F90008D9
65305+:1069200033281FFFA71200180A000391AF88000048
65306+:106930003C02800034450140ACA0000C1280001BDA
65307+:1069400034530E0034510E008E370010ACB70004E3
65308+:106950008E2400183C0B8000ACA400083570014068
65309+:1069600024040040A20000128FBF0048A600001AB5
65310+:106970008FB70044AE0000208FB60040A60000187C
65311+:106980008FB5003CAE0400148FB400388FB30034D0
65312+:106990008FB200308FB1002C8FB000283C02100065
65313+:1069A00027BD005003E00008AD6201788E66001438
65314+:1069B000ACA600048E64001C0A00042A3C0B800074
65315+:1069C0000E0001902E9100010A0003200237B0252D
65316+:1069D000000000000000000D00000000240003691A
65317+:1069E0000A0004013C06800027BDFFD8AFBF00208D
65318+:1069F0003C0980003C1F20FFAFB200183C0760003C
65319+:106A000035320E002402001037F9FFFDACE23008E9
65320+:106A1000AFB3001CAFB10014AFB00010AE5900000E
65321+:106A20000000000000000000000000000000000066
65322+:106A3000000000003C1800FF3713FFFDAE530000BC
65323+:106A40003C0B60048D7050002411FF7F3C0E00024F
65324+:106A50000211782435EC380C35CD0109ACED4C1819
65325+:106A6000240A0009AD6C50008CE80438AD2A0008F7
65326+:106A7000AD2000148CE54C1C3106FFFF38C42F718B
65327+:106A800000051E023062000F2486C0B310400007CC
65328+:106A9000AF8200088CE54C1C3C09001F3528FC0027
65329+:106AA00000A81824000321C2AF8400048CF1080858
65330+:106AB0003C0F57092412F0000232702435F0001008
65331+:106AC00001D0602601CF68262DAA00012D8B000180
65332+:106AD000014B382550E00009A380000C3C1F601CCE
65333+:106AE0008FF8000824190001A399000C33137C00CF
65334+:106AF000A7930010A780000EA380000DAF80004870
65335+:106B000014C00003AF8000003C066000ACC0442C01
65336+:106B10000E0005B93C1080000E000F1A361101005E
65337+:106B20003C12080026523DD03C13080026733E500C
65338+:106B30008E03000038640001308200011440FFFC25
65339+:106B40003C0B800A8E2600002407FF8024C90240E7
65340+:106B5000312A007F014B402101272824AE06002066
65341+:106B6000AF880044AE0500243C048000AF86003CA2
65342+:106B70008C8C01780580FFFE24180800922F0008F5
65343+:106B8000AC980178A38F0042938E004231CD000172
65344+:106B900011A0000F24050D0024DFF8002FF90301D8
65345+:106BA0001320001C000629C224A4FFF00004104298
65346+:106BB000000231400E00020200D2D8213C02400007
65347+:106BC0003C068000ACC201380A0004A000000000AE
65348+:106BD00010C50023240D0F0010CD00273C1F800896
65349+:106BE00037F9008093380000240E0050330F00FF67
65350+:106BF00015EEFFF33C0240000E000A3600000000D4
65351+:106C00003C0240003C068000ACC201380A0004A0EF
65352+:106C1000000000008F83000400A3402B1500000B30
65353+:106C20008F8B0008006B50212547FFFF00E5482BA4
65354+:106C30001520000600A36023000C19400E0002027C
65355+:106C40000073D8210A0004C43C0240000000000D7B
65356+:106C50000E000202000000000A0004C43C024000D2
65357+:106C60003C1B0800277B3F500E0002020000000082
65358+:106C70000A0004C43C0240003C1B0800277B3F7014
65359+:106C80000E000202000000000A0004C43C024000A2
65360+:106C90003C0660043C09080025290104ACC9502CBD
65361+:106CA0008CC850003C0580003C0200023507008083
65362+:106CB000ACC750003C040800248415A43C03080021
65363+:106CC0002463155CACA50008ACA2000C3C010800D4
65364+:106CD000AC243D603C010800AC233D6403E00008A7
65365+:106CE0002402000100A030213C1C0800279C3D68C4
65366+:106CF0003C0C04003C0B0002008B3826008C402624
65367+:106D00002CE200010007502B2D050001000A4880ED
65368+:106D10003C03080024633D60004520250123182121
65369+:106D20001080000300001021AC6600002402000166
65370+:106D300003E00008000000003C1C0800279C3D68A0
65371+:106D40003C0B04003C0A0002008A3026008B3826E7
65372+:106D50002CC200010006482B2CE5000100094080F0
65373+:106D60003C03080024633D600045202501031821F1
65374+:106D700010800005000010213C0C0800258C155CDB
65375+:106D8000AC6C00002402000103E0000800000000D9
65376+:106D90003C0900023C08040000883026008938269F
65377+:106DA0002CC30001008028212CE400010083102561
65378+:106DB0001040000B000030213C1C0800279C3D685F
65379+:106DC0003C0A80008D4E00082406000101CA682597
65380+:106DD000AD4D00088D4C000C01855825AD4B000CC5
65381+:106DE00003E0000800C010213C1C0800279C3D68FF
65382+:106DF0003C0580008CA6000C000420272402000122
65383+:106E000000C4182403E00008ACA3000C3C020002FC
65384+:106E10001082000B3C0560003C0704001087000353
65385+:106E20000000000003E00008000000008CA908D06A
65386+:106E3000240AFFFD012A402403E00008ACA808D082
65387+:106E40008CA408D02406FFFE0086182403E0000866
65388+:106E5000ACA308D03C05601A34A600108CC3008097
65389+:106E600027BDFFF88CC50084AFA3000093A40000E9
65390+:106E70002402000110820003AFA5000403E0000813
65391+:106E800027BD000893A7000114E0001497AC00028E
65392+:106E900097B800023C0F8000330EFFFC01CF682141
65393+:106EA000ADA50000A3A000003C0660008CC708D080
65394+:106EB0002408FFFE3C04601A00E82824ACC508D072
65395+:106EC0008FA300048FA200003499001027BD000892
65396+:106ED000AF22008003E00008AF2300843C0B800059
65397+:106EE000318AFFFC014B48218D2800000A00057DF6
65398+:106EF000AFA8000427BDFFE8AFBF00103C1C08008E
65399+:106F0000279C3D683C0580008CA4000C8CA20004EA
65400+:106F10003C0300020044282410A0000A00A3182407
65401+:106F20003C0604003C0400021460000900A6102482
65402+:106F30001440000F3C0404000000000D3C1C08003D
65403+:106F4000279C3D688FBF001003E0000827BD001894
65404+:106F50003C0208008C423D600040F809000000003F
65405+:106F60003C1C0800279C3D680A0005A68FBF001046
65406+:106F70003C0208008C423D640040F809000000001B
65407+:106F80000A0005AC00000000000411C003E0000886
65408+:106F9000244202403C04080024843FB42405001A23
65409+:106FA0000A00009C0000302127BDFFE0AFB00010B8
65410+:106FB0003C108000AFBF0018AFB1001436110100C3
65411+:106FC000922200090E0005B63044007F8E3F00007B
65412+:106FD0008F89003C3C0F008003E26021258800403F
65413+:106FE0000049F821240DFF80310E00783198007897
65414+:106FF00035F9000135F100020319382501D1482582
65415+:10700000010D302403ED5824018D2824240A00406A
65416+:1070100024040080240300C0AE0B0024AE0008103E
65417+:10702000AE0A0814AE040818AE03081CAE05080426
65418+:10703000AE070820AE060808AE0908243609090084
65419+:107040009539000C3605098033ED007F3338FFFF9A
65420+:10705000001889C0AE110800AE0F0828952C000C4E
65421+:107060008FBF00188FB10014318BFFFF000B51C090
65422+:10707000AE0A002C8CA400508FB000108CA3003CF2
65423+:107080008D2700048CA8001C8CA600383C0E800ABA
65424+:1070900001AE102127BD0020AF820044AF84005014
65425+:1070A000AF830054AF87004CAF88005C03E000085A
65426+:1070B000AF8600603C09080091293FD924A800024E
65427+:1070C0003C05110000093C0000E8302500C51825EA
65428+:1070D00024820008AC83000003E00008AC800004B8
65429+:1070E0003C098000352309009128010B906A0011AA
65430+:1070F0002402002800804821314700FF00A07021B1
65431+:1071000000C068213108004010E20002340C86DD26
65432+:10711000240C08003C0A800035420A9A944700007B
65433+:10712000354B0A9C35460AA030F9FFFFAD39000007
65434+:107130008D780000354B0A8024040001AD3800042E
65435+:107140008CCF0000AD2F00089165001930A300031B
65436+:107150001064009028640002148000AF240500022F
65437+:107160001065009E240F0003106F00B435450AA47B
65438+:10717000240A0800118A0048000000005100003D68
65439+:107180003C0B80003C0480003483090090670012AF
65440+:1071900030E200FF004D7821000FC8802724000155
65441+:1071A0003C0A8000354F090091E50019354C0980F3
65442+:1071B0008D87002830A300FF0003150000475825E5
65443+:1071C0000004C4003C19600001793025370806FF2F
65444+:1071D000AD260000AD2800048DEA002C25280028EB
65445+:1071E000AD2A00088DEC0030AD2C000C8DE500348C
65446+:1071F000AD2500108DE400383C05800034AC093C1E
65447+:10720000AD2400148DE3001CAD2300188DE7002091
65448+:10721000AD27001C8DE20024AD2200208DF900284E
65449+:1072200034A20100AD3900248D830000AD0E0004AE
65450+:1072300034B90900AD0300008C47000C250200148E
65451+:10724000AD070008932B00123C04080090843FD83F
65452+:10725000AD000010317800FF030D302100064F0013
65453+:1072600000047C00012F702535CDFFFC03E00008F1
65454+:10727000AD0D000C35780900930600123C0508009E
65455+:1072800094A53FC830C800FF010D5021000A60805E
65456+:107290000A00063C018520211500005B000000006B
65457+:1072A0003C08080095083FCE3C06080094C63FC83D
65458+:1072B000010610213C0B800035790900933800113C
65459+:1072C000932A001935660A80330800FF94CF002AFC
65460+:1072D00000086082314500FF978A0058000C1E00AC
65461+:1072E000000524003047FFFF006410250047C0253B
65462+:1072F00001EA30213C0B4000030B402500066400EE
65463+:10730000AD280000AD2C0004932500183C030006B6
65464+:107310002528001400053E0000E31025AD220008DA
65465+:107320008F24002C3C05800034AC093CAD24000CBB
65466+:107330008F38001C34A20100254F0001AD38001029
65467+:107340008D830000AD0E000431EB7FFFAD03000024
65468+:107350008C47000C34B90900A78B0058AD07000812
65469+:10736000932B00123C04080090843FD8250200149F
65470+:10737000317800FF030D302100064F0000047C002F
65471+:10738000012F702535CDFFFCAD00001003E0000893
65472+:10739000AD0D000C3C02080094423FD23C050800B1
65473+:1073A00094A53FC835440AA43C07080094E73FC4AD
65474+:1073B000948B00000045C8210327C023000B1C004C
65475+:1073C0002706FFF200665025AD2A000CAD20001004
65476+:1073D000AD2C00140A00063025290018354F0AA4E8
65477+:1073E00095E50000956400280005140000043C00A9
65478+:1073F0003459810000EC5825AD39000CAD2B00103C
65479+:107400000A000630252900143C0C0800958C3FCE5C
65480+:107410000A000681258200015460FF56240A0800F4
65481+:1074200035580AA49706000000061C00006C502581
65482+:10743000AD2A000C0A000630252900103C03080084
65483+:1074400094633FD23C07080094E73FC83C0F080014
65484+:1074500095EF3FC494A4000095790028006710219F
65485+:10746000004F582300041C00001934002578FFEE5B
65486+:1074700000D87825346A8100AD2A000CAD2F0010A9
65487+:10748000AD200014AD2C00180A0006302529001C80
65488+:1074900003E00008240207D027BDFFE0AFB20018C8
65489+:1074A000AFB10014AFB00010AFBF001C0E00007CE5
65490+:1074B000008088218F8800548F87004C3C0580080D
65491+:1074C00034B20080011128213C1080002402008089
65492+:1074D000240300C000A72023AE0208183C06800841
65493+:1074E000AE03081C18800004AF850054ACC500042E
65494+:1074F0008CC90004AF89004C1220000936040980B1
65495+:107500000E0006F800000000924C00278E0B00745D
65496+:1075100001825004014B3021AE46000C3604098034
65497+:107520008C8E001C8F8F005C01CF682319A0000493
65498+:107530008FBF001C8C90001CAF90005C8FBF001CA4
65499+:107540008FB200188FB100148FB000100A00007EB7
65500+:1075500027BD00208F8600508F8300548F82004CFF
65501+:107560003C05800834A40080AC860050AC83003C0D
65502+:1075700003E00008ACA200043C0308008C63005444
65503+:1075800027BDFFF8308400FF2462000130A500FF12
65504+:107590003C010800AC22005430C600FF3C078000CC
65505+:1075A0008CE801780500FFFE3C0C7FFFA3A40003DC
65506+:1075B0008FAA0000358BFFFF014B4824000627C02F
65507+:1075C00001244025AFA8000034E201009043000AE6
65508+:1075D000A3A000023C1980FFA3A300018FAF00000D
65509+:1075E00030AE007F3738FFFF01F86024000E6E00D8
65510+:1075F0003C0A002034E50140018D58253549200022
65511+:107600002406FF803C04100027BD0008ACAB000C32
65512+:10761000ACA90014A4A00018A0A6001203E0000862
65513+:10762000ACE40178308800FF30A700FF3C03800005
65514+:107630008C6201780440FFFE3C0C8000358A0A0011
65515+:107640008D4B00203584014035850980AC8B0004CA
65516+:107650008D4900240007302B00061540AC89000836
65517+:10766000A088001090A3004CA083002D03E0000828
65518+:10767000A480001827BDFFE8308400FFAFBF0010D2
65519+:107680000E00075D30A500FF8F8300548FBF0010F0
65520+:107690003C06800034C50140344700402404FF907C
65521+:1076A0003C02100027BD0018ACA3000CA0A40012DF
65522+:1076B000ACA7001403E00008ACC2017827BDFFE0CE
65523+:1076C0003C088008AFBF001CAFB20018AFB1001477
65524+:1076D000AFB00010351000808E0600183C07800007
65525+:1076E000309200FF00C72025AE0400180E00007C79
65526+:1076F00030B100FF92030005346200080E00007EE6
65527+:10770000A2020005024020210E000771022028215C
65528+:10771000024020218FBF001C8FB200188FB10014CF
65529+:107720008FB0001024050005240600010A0007326E
65530+:1077300027BD00203C05800034A309809066000826
65531+:1077400030C200081040000F3C0A01013549080A08
65532+:10775000AC8900008CA80074AC8800043C070800C9
65533+:1077600090E73FD830E5001050A00008AC8000083A
65534+:107770003C0D800835AC00808D8B0058AC8B000828
65535+:107780002484000C03E00008008010210A0007B5E3
65536+:107790002484000C27BDFFE83C098000AFB0001036
65537+:1077A000AFBF00143526098090C8000924020006E6
65538+:1077B00000A05821310300FF3527090000808021F7
65539+:1077C000240500041062007B2408000294CF005CB2
65540+:1077D0003C0E020431EDFFFF01AE6025AE0C00004F
65541+:1077E00090CA00083144002010800008000000000A
65542+:1077F00090C2004E3C1F010337F90300305800FFD0
65543+:107800000319302524050008AE06000490F9001184
65544+:1078100090E6001290E40011333800FF00187082E7
65545+:1078200030CF00FF01CF5021014B6821308900FF8C
65546+:1078300031AAFFFF39230028000A60801460002C61
65547+:10784000020C482390E400123C198000372F0100FD
65548+:10785000308C00FF018B1821000310800045F821B7
65549+:10786000001F8400360706FFAD270004373F0900DC
65550+:1078700093EC001193EE0012372609800005C082B8
65551+:107880008DE4000C8CC5003431CD00FF01AB10211C
65552+:107890000058182100A4F8230008840000033F00CA
65553+:1078A00000F0302533F9FFFF318F00FC00D970253F
65554+:1078B0000158202101E9682100045080ADAE000C80
65555+:1078C0000E00007C012A80213C088008240B000463
65556+:1078D000350500800E00007EA0AB000902001021DB
65557+:1078E0008FBF00148FB0001003E0000827BD001800
65558+:1078F00090EC001190E300193C18080097183FCE57
65559+:10790000318200FF0002F882307000FF001FCE00BD
65560+:1079100000103C000327302500D870253C0F4000A4
65561+:1079200001CF68253C198000AD2D0000373F0900CC
65562+:1079300093EC001193EE0012372F010037260980D7
65563+:107940000005C0828DE4000C8CC5003431CD00FFF1
65564+:1079500001AB10210058182100A4F823000884006E
65565+:1079600000033F0000F0302533F9FFFF318F00FCAA
65566+:1079700000D970250158202101E9682100045080B8
65567+:10798000ADAE000C0E00007C012A80213C0880086E
65568+:10799000240B0004350500800E00007EA0AB00091A
65569+:1079A000020010218FBF00148FB0001003E0000808
65570+:1079B00027BD00180A0007C72408001227BDFFD002
65571+:1079C0003C038000AFB60028AFB50024AFB4002060
65572+:1079D000AFB10014AFBF002CAFB3001CAFB20018A2
65573+:1079E000AFB000103467010090E6000B309400FF48
65574+:1079F00030B500FF30C200300000B02110400099C7
65575+:107A000000008821346409809088000800082E0056
65576+:107A100000051E03046000C0240400048F86005487
65577+:107A20003C010800A0243FD83C0C8000AD800048F9
65578+:107A30003C048000348E010091CD000B31A5002064
65579+:107A400010A000073C078000349309809272000860
65580+:107A50000012860000107E0305E000C43C1F800871
65581+:107A600034EC0100918A000B34EB09809169000825
65582+:107A7000314400400004402B3123000800C8982303
65583+:107A80001460000224120003000090213C108000CA
65584+:107A900036180A8036040900970E002C90830011D6
65585+:107AA0009089001293050018307F00FF312800FFF5
65586+:107AB000024810210002C880930D0018033F78216E
65587+:107AC00001F1302130B100FF00D11821A78E0058FC
65588+:107AD0003C010800A4263FCE3C010800A4233FD06F
65589+:107AE00015A00002000000000000000D920B010B29
65590+:107AF0003065FFFF3C010800A4233FD2316A0040FB
65591+:107B00003C010800A4203FC83C010800A4203FC459
65592+:107B10001140000224A4000A24A4000B3091FFFFAE
65593+:107B20000E0001E7022020219206010B3C0C080008
65594+:107B3000958C3FD2004020210006698231A70001C8
65595+:107B40000E00060101872821004020210260282123
65596+:107B50000E00060C024030210E0007A1004020213B
65597+:107B600016C00069004020219212010B32560040DD
65598+:107B700012C000053C0500FF8C93000034AEFFFFEF
65599+:107B8000026E8024AC9000000E0001FB0220202138
65600+:107B90003C0F080091EF3FD831F10003122000168E
65601+:107BA0003C1380088F8200543C09800835280080EF
65602+:107BB000245F0001AD1F003C3C0580088CB9000427
65603+:107BC00003E02021033FC0231B000002AF9F0054AD
65604+:107BD0008CA400040E0006F8ACA400043C0780004E
65605+:107BE0008CEB00743C04800834830080004B5021EF
65606+:107BF000AC6A000C3C1380083670008002802021A3
65607+:107C000002A02821A200006B0E00075D3C1480003A
65608+:107C10008F920054368C0140AD92000C8F86004844
65609+:107C20003C151000344D000624D60001AF960048E4
65610+:107C30008FBF002CA18600128FB60028AD8D0014D6
65611+:107C40008FB3001CAE9501788FB200188FB5002459
65612+:107C50008FB400208FB100148FB0001003E0000833
65613+:107C600027BD003034640980908F0008000F760033
65614+:107C7000000E6E0305A00033347F090093F8001B4B
65615+:107C8000241900103C010800A0393FD8331300022A
65616+:107C90001260FF678F8600548F8200601446FF6574
65617+:107CA0003C0480000E00007C000000003C048008C2
65618+:107CB0003485008090A8000924060016310300FFD7
65619+:107CC0001066000D0000000090AB00093C070800A2
65620+:107CD00090E73FD824090008316400FF34EA00012E
65621+:107CE0003C010800A02A3FD81089002F240C000A6C
65622+:107CF000108C00282402000C0E00007E0000000002
65623+:107D00000A0008608F8600540E0007B9024028213F
65624+:107D10000A0008AE004020213C0B8008356A008034
65625+:107D20008D4600548CE9000C1120FF3DAF860054B5
65626+:107D3000240700143C010800A0273FD80A00085F70
65627+:107D40003C0C800090910008241200023C010800C5
65628+:107D5000A0323FD8323000201200000B2416000160
65629+:107D60008F8600540A0008602411000837F800804C
65630+:107D70008F020038AFE200048FF90004AF19003C15
65631+:107D80000A00086C3C0780008F8600540A000860D7
65632+:107D900024110004A0A200090E00007E00000000D3
65633+:107DA0000A0008608F860054240200140A00093A71
65634+:107DB000A0A2000927BDFFE8AFB000103C10800072
65635+:107DC000AFBF001436020100904400090E00075DA9
65636+:107DD000240500013C0480089099000E3483008043
65637+:107DE000909F000F906F00269089000A33F800FFE3
65638+:107DF00000196E000018740031EC00FF01AE502530
65639+:107E0000000C5A00014B3825312800FF3603014091
65640+:107E10003445600000E830252402FF813C04100056
65641+:107E2000AC66000C8FBF0014AC650014A062001299
65642+:107E3000AE0401788FB0001003E0000827BD0018E1
65643+:107E400027BDFFE8308400FFAFBF00100E00075DC4
65644+:107E500030A500FF3C05800034A4014034470040B9
65645+:107E60002406FF92AC870014A08600128F83005472
65646+:107E70008FBF00103C02100027BD0018AC83000C1F
65647+:107E800003E00008ACA2017827BDFFD8AFB0001016
65648+:107E9000308400FF30B000FF3C058000AFB100141B
65649+:107EA000AFBF0020AFB3001CAFB20018000410C277
65650+:107EB00034A60100320300023051000114600007B3
65651+:107EC00090D200093C098008353300809268000593
65652+:107ED0003107000810E0000C308A00100240202119
65653+:107EE0000E00078302202821240200018FBF0020FA
65654+:107EF0008FB3001C8FB200188FB100148FB0001028
65655+:107F000003E0000827BD00281540003434A50A000E
65656+:107F10008CB800248CAF0008130F004B00003821F0
65657+:107F20003C0D800835B30080926C00682406000286
65658+:107F3000318B00FF116600843C06800034C20100D2
65659+:107F40009263004C90590009307F00FF53F9000400
65660+:107F50003213007C10E00069000000003213007C46
65661+:107F60005660005C0240202116200009320D0001FD
65662+:107F70003C0C800035840100358B0A008D6500249F
65663+:107F80008C86000414A6FFD900001021320D0001D8
65664+:107F900011A0000E024020213C1880003710010083
65665+:107FA0008E0F000C8F8E005011EE000800000000B4
65666+:107FB0000E000843022028218E19000C3C1F800867
65667+:107FC00037F00080AE190050024020210E000771EA
65668+:107FD000022028210A00098F240200013C05080024
65669+:107FE0008CA5006424A400013C010800AC240064BA
65670+:107FF0001600000D00000000022028210E0007716D
65671+:1080000002402021926E0068240C000231CD00FF56
65672+:1080100011AC0022024020210E00094100000000A6
65673+:108020000A00098F240200010E00007024040001E0
65674+:10803000926B0025020B30250E00007EA266002503
65675+:108040000A0009D3022028218E6200188CDF000468
65676+:108050008CB9002400021E0217F9FFB13065007FC1
65677+:108060009268004C264400013093007F1265004066
65678+:10807000310300FF1464FFAB3C0D8008264700016C
65679+:1080800030F1007F30E200FF1225000B24070001D1
65680+:10809000004090210A00099C2411000124050004DD
65681+:1080A0000E000732240600010E0009410000000006
65682+:1080B0000A00098F240200012405FF8002452024C4
65683+:1080C00000859026324200FF004090210A00099C62
65684+:1080D000241100010E00084302202821320700303D
65685+:1080E00010E0FFA132100082024020210E00078321
65686+:1080F000022028210A00098F240200018E6900183D
65687+:108100000240202102202821012640250E0009647A
65688+:10811000AE6800189264004C240500032406000198
65689+:108120000E000732308400FF0E00007024040001AE
65690+:1081300092710025021150250E00007EA26A0025D2
65691+:108140000A00098F240200018E6F00183C1880007D
65692+:108150000240202101F87025022028210E0007711D
65693+:10816000AE6E00189264004C0A000A1B240500043D
65694+:10817000324A0080394900801469FF6A3C0D80084A
65695+:108180000A0009F42647000127BDFFC0AFB0001860
65696+:108190003C108000AFBF0038AFB70034AFB600303E
65697+:1081A000AFB5002CAFB40028AFB30024AFB20020AD
65698+:1081B0000E0005BEAFB1001C360201009045000B59
65699+:1081C0000E00097690440008144000E78FBF003885
65700+:1081D0003C08800835070080A0E0006B3606098067
65701+:1081E00090C50000240300503C17080026F73F907C
65702+:1081F00030A400FF3C13080026733FA01083000347
65703+:108200003C1080000000B82100009821241F0010BD
65704+:108210003611010036120A00361509808E580024E6
65705+:108220008E3400048EAF00208F8C00543C01080077
65706+:10823000A03F3FD836190A80972B002C8EF60000FD
65707+:10824000932A00180298702301EC68233C0108006F
65708+:10825000AC2E3FB43C010800AC2D3FB83C010800F7
65709+:10826000AC2C3FDCA78B005802C0F809315400FF4A
65710+:1082700030490002152000E930420001504000C49E
65711+:108280009227000992A90008312800081500000271
65712+:10829000241500030000A8213C0A80003543090092
65713+:1082A00035440A008C8D00249072001190700012E9
65714+:1082B000907F0011325900FF321100FF02B11021EE
65715+:1082C0000002C08033EF00FF0319B021028F70213C
65716+:1082D00002D4602125CB00103C010800A4363FCE1B
65717+:1082E0003C010800AC2D3FE03C010800A42C3FD02D
65718+:1082F0003C010800A42B3FCC3556010035540980C1
65719+:1083000035510E008F8700548F89005C8E850020C8
65720+:1083100024080006012730233C010800AC283FD484
65721+:1083200000A7282304C000B50000902104A000B3DA
65722+:1083300000C5502B114000B5000000003C010800B2
65723+:10834000AC263FB88E6200000040F8090000000033
65724+:108350003046000214C0007400408021304B000100
65725+:10836000556000118E6200043C0D08008DAD3FBCCD
65726+:108370003C0EC0003C04800001AE6025AE2C000025
65727+:108380008C980000330F000811E0FFFD0000000092
65728+:10839000963F000824120001A79F00408E39000478
65729+:1083A000AF9900388E6200040040F8090000000018
65730+:1083B0000202802532030002146000B300000000B6
65731+:1083C0003C09080095293FC43C06080094C63FD0EC
65732+:1083D0003C0A0800954A3FC63C0708008CE73FBCB2
65733+:1083E000012670213C0308008C633FE03C08080034
65734+:1083F00095083FDA01CA20218ED9000C00E9282116
65735+:10840000249F000200A878210067C02133E4FFFF09
65736+:10841000AF9900503C010800AC383FE03C01080037
65737+:10842000A42F3FC83C010800A42E3FD20E0001E754
65738+:10843000000000008F8D0048004020213C01080012
65739+:10844000A02D3FD98E62000825AC0001AF8C0048FA
65740+:108450000040F809000000008F85005402A0302180
65741+:108460000E00060C004020210E0007A10040202134
65742+:108470008E6B000C0160F809004020213C0A0800C6
65743+:10848000954A3FD23C06080094C63FC601464821A3
65744+:10849000252800020E0001FB3104FFFF3C05080007
65745+:1084A0008CA53FB43C0708008CE73FBC00A7202305
65746+:1084B0003C010800AC243FB414800006000000001A
65747+:1084C0003C0208008C423FD4344B00403C01080081
65748+:1084D000AC2B3FD4124000438F8E00448E2D0010F1
65749+:1084E0008F920044AE4D00208E2C0018AE4C00241C
65750+:1084F0003C04080094843FC80E0006FA0000000007
65751+:108500008F9F00548E6700103C010800AC3F3FDC99
65752+:1085100000E0F809000000003C1908008F393FB462
65753+:108520001720FF798F870054979300583C11800ED5
65754+:10853000321601000E000729A633002C16C0004594
65755+:10854000320300105460004C8EE5000432080040F5
65756+:108550005500001D8EF000088EE4000C0080F80924
65757+:10856000000000008FBF00388FB700348FB6003096
65758+:108570008FB5002C8FB400288FB300248FB2002059
65759+:108580008FB1001C8FB0001803E0000827BD004029
65760+:108590008F86003C36110E0000072E0000A6202515
65761+:1085A000AE0400808E4300208E500024AFA3001044
65762+:1085B000AE2300148FB20010AE320010AE30001C9B
65763+:1085C0000A000A75AE3000180200F8090000000029
65764+:1085D0008EE4000C0080F809000000000A000B2E59
65765+:1085E0008FBF003824180001240F0001A5C000200F
65766+:1085F000A5D800220A000B10ADCF00243C010800D2
65767+:10860000AC203FB80A000AA68E6200003C010800B8
65768+:10861000AC253FB80A000AA68E6200009224000929
65769+:108620000E000771000028218FBF00388FB700347B
65770+:108630008FB600308FB5002C8FB400288FB3002484
65771+:108640008FB200208FB1001C8FB0001803E000082B
65772+:1086500027BD00403C1480009295010900002821AC
65773+:108660000E00084332A400FF320300105060FFB830
65774+:10867000320800408EE5000400A0F8090000000068
65775+:108680000A000B28320800405240FFA89793005878
65776+:108690008E3400148F930044AE7400208E35001C7D
65777+:1086A000AE7500240A000B1F979300588F820014A8
65778+:1086B0000004218003E00008008210213C078008AC
65779+:1086C00034E200809043006900804021106000097E
65780+:1086D0003C0401003C0708008CE73FDC8F8300303E
65781+:1086E00000E32023048000089389001C14E30003A6
65782+:1086F0000100202103E00008008010213C0401005B
65783+:1087000003E00008008010211120000B00673823CF
65784+:108710003C0D800035AC0980918B007C316A0002F1
65785+:10872000114000202409003400E9702B15C0FFF12E
65786+:108730000100202100E938232403FFFC00A3C82402
65787+:1087400000E3C02400F9782B15E0FFEA030820219C
65788+:1087500030C400030004102314C000143049000387
65789+:108760000000302100A9782101E6702100EE682B7D
65790+:1087700011A0FFE03C0401002D3800010006C82BC9
65791+:10878000010548210319382414E0FFDA2524FFFCF1
65792+:108790002402FFFC00A218240068202103E0000846
65793+:1087A000008010210A000B9E240900303C0C800040
65794+:1087B0003586098090CB007C316A00041540FFE9C2
65795+:1087C000240600040A000BAD000030213C03080021
65796+:1087D0008C63005C8F82001827BDFFE0AFBF0018DC
65797+:1087E000AFB1001410620005AFB00010000329C043
65798+:1087F00024A40280AF840014AF8300183C108000D2
65799+:1088000036020A0094450032361101000E000B7F3B
65800+:1088100030A43FFF8E240000241FFF803C11008005
65801+:108820000082C021031F60243309007F000CC9406F
65802+:1088300003294025330E0078362F00033C0D10002D
65803+:10884000010D502501CF5825AE0C002836080980AF
65804+:10885000AE0C080CAE0B082CAE0A08309103006970
65805+:108860003C06800C0126382110600006AF870034DA
65806+:108870008D09003C8D03006C0123382318E0008231
65807+:10888000000000003C0B8008356A00803C1080002E
65808+:10889000A1400069360609808CC200383C06800081
65809+:1088A00034C50A0090A8003C310C00201180001A49
65810+:1088B000AF820030240D00013C0E800035D10A004B
65811+:1088C000A38D001CAF8000248E2400248F850024FB
65812+:1088D000240D0008AF800020AF8000283C01080074
65813+:1088E000A42D3FC63C010800A4203FDA0E000B83F4
65814+:1088F000000030219228003C8FBF00188FB1001477
65815+:108900008FB0001000086142AF82002C27BD00200C
65816+:1089100003E000083182000190B80032240E00010B
65817+:10892000330F00FF000F2182108E00412419000236
65818+:108930001099006434C40AC03C03800034640A0007
65819+:108940008C8F002415E0001E34660900909F0030D3
65820+:108950002418000533F9003F1338004E24030001AA
65821+:108960008F860020A383001CAF860028AF860024DA
65822+:108970003C0E800035D10A008E2400248F8500240F
65823+:10898000240D00083C010800A42D3FC63C0108004E
65824+:10899000A4203FDA0E000B83000000009228003C68
65825+:1089A0008FBF00188FB100148FB000100008614213
65826+:1089B000AF82002C27BD002003E0000831820001B7
65827+:1089C0008C8A00088C8B00248CD000643C0E8000C4
65828+:1089D00035D10A00014B2823AF900024A380001C4E
65829+:1089E000AF8500288E2400248F8600208F850024E8
65830+:1089F000240D00083C010800A42D3FC63C010800DE
65831+:108A0000A4203FDA0E000B83000000009228003CF7
65832+:108A10008FBF00188FB100148FB0001000086142A2
65833+:108A2000AF82002C27BD002003E000083182000146
65834+:108A300090A200303051003F5224002834C50AC0B3
65835+:108A40008CB000241600002234CB09008CA600480C
65836+:108A50003C0A7FFF3545FFFF00C510243C0E800017
65837+:108A6000AF82002035C509008F8800208CAD0060E2
65838+:108A7000010D602B15800002010020218CA40060F4
65839+:108A80000A000C22AF8400208D02006C0A000BFC4F
65840+:108A90003C0680008C8200488F8600203C097FFFC6
65841+:108AA0003527FFFF004788243C0480082403000189
65842+:108AB000AF910028AC80006CA383001C0A000C302E
65843+:108AC000AF8600248C9F00140A000C22AF9F002068
65844+:108AD0008D6200680A000C6C3C0E800034C4098072
65845+:108AE0008C8900708CA300140123382B10E0000443
65846+:108AF000000000008C8200700A000C6C3C0E8000AC
65847+:108B00008CA200140A000C6C3C0E80008F8500249F
65848+:108B100027BDFFE0AFBF0018AFB1001414A00008DC
65849+:108B2000AFB000103C04800034870A0090E60030AB
65850+:108B30002402000530C3003F106200B934840900EC
65851+:108B40008F91002000A080213C048000348E0A0018
65852+:108B50008DCD00043C0608008CC63FB831A73FFF0E
65853+:108B600000E6602B5580000100E03021938F001C4F
65854+:108B700011E0007800D0282B349F098093F9007C05
65855+:108B800033380002130000792403003400C3102B93
65856+:108B9000144000D90000000000C3302300D0282B6F
65857+:108BA0003C010800A4233FC414A0006E0200182159
65858+:108BB0003C0408008C843FB40064402B5500000145
65859+:108BC000006020213C05800034A90A00912A003C65
65860+:108BD0003C010800AC243FBC31430020146000037A
65861+:108BE0000000482134AB0E008D6900188F88002CDE
65862+:108BF0000128202B1080005F000000003C050800C9
65863+:108C00008CA53FBC00A96821010D602B1180005C80
65864+:108C100000B0702B0109382300E028213C01080036
65865+:108C2000AC273FBC12000003240AFFFC10B0008DEB
65866+:108C30003224000300AA18243C010800A4203FDAD3
65867+:108C40003C010800AC233FBC006028218F84002435
65868+:108C5000120400063C0B80088D6C006C0200202181
65869+:108C6000AF91002025900001AD70006C8F8D002821
65870+:108C700000858823AF91002401A52023AF8400281C
65871+:108C80001220000224070018240700103C18800856
65872+:108C90003706008090CF00683C010800A0273FD82D
65873+:108CA0002407000131EE00FF11C70047000000005B
65874+:108CB00014800018000028213C06800034D109806F
65875+:108CC00034CD010091A600098E2C001824C40001A7
65876+:108CD000000C86023205007F308B007F1165007F1B
65877+:108CE0002407FF803C19800837290080A124004C0C
65878+:108CF0003C0808008D083FD4241800023C010800FD
65879+:108D0000A0384019350F00083C010800AC2F3FD4B3
65880+:108D1000240500103C02800034440A009083003C8B
65881+:108D2000307F002013E0000500A02021240A00016C
65882+:108D30003C010800AC2A3FBC34A400018FBF0018DE
65883+:108D40008FB100148FB000100080102103E00008E4
65884+:108D500027BD00203C010800A4203FC410A0FF94C0
65885+:108D6000020018210A000CC000C018210A000CB72C
65886+:108D7000240300303C0508008CA53FBC00B0702BDC
65887+:108D800011C0FFA8000000003C19080097393FC43B
65888+:108D90000325C0210307782B11E000072CAA00044B
65889+:108DA0003C0360008C625404305F003F17E0FFE337
65890+:108DB000240400422CAA00041140FF9A240400421B
65891+:108DC0000A000D248FBF00181528FFB9000000000D
65892+:108DD0008CCA00183C1F800024020002015F182585
65893+:108DE000ACC3001837F90A00A0C200689329003C00
65894+:108DF0002404000400A01021312800203C010800B8
65895+:108E0000A0244019110000022405001024020001D2
65896+:108E10003C010800AC223FB40A000D1A3C0280005D
65897+:108E20008F8800288C8900600109282B14A000027B
65898+:108E3000010088218C9100603C048000348B0E007E
65899+:108E40008D640018240A000102202821022030210C
65900+:108E5000A38A001C0E000B83022080210A000CA6AE
65901+:108E6000AF82002C00045823122000073164000355
65902+:108E70003C0E800035C7098090ED007C31AC0004C9
65903+:108E800015800019248F00043C010800A4243FDA57
65904+:108E90003C1F080097FF3FDA03E5C82100D9C02B2B
65905+:108EA0001300FF6B8F8400242CA6000514C0FFA3C1
65906+:108EB0002404004230A200031440000200A2182340
65907+:108EC00024A3FFFC3C010800AC233FBC3C0108008C
65908+:108ED000A4203FDA0A000CE70060282100C77024B4
65909+:108EE0000A000D0D01C720263C010800A42F3FDA1F
65910+:108EF0000A000D78000000003C010800AC203FBCD7
65911+:108F00000A000D23240400428F8300283C058000C2
65912+:108F100034AA0A00146000060000102191470030B6
65913+:108F20002406000530E400FF108600030000000066
65914+:108F300003E0000800000000914B0048316900FF89
65915+:108F4000000941C21500FFFA3C0680083C040800F5
65916+:108F500094843FC43C0308008C633FDC3C19080048
65917+:108F60008F393FBC3C0F080095EF3FDA0064C02109
65918+:108F70008CCD00040319702101CF602134AB0E00A9
65919+:108F8000018D282318A0001D00000000914F004C07
65920+:108F90008F8C0034956D001031EE00FF8D89000438
65921+:108FA00001AE30238D8A000030CEFFFF000E290075
65922+:108FB0000125C82100003821014720210325182B55
65923+:108FC0000083C021AD990004AD980000918F000A84
65924+:108FD00001CF6821A18D000A956500128F8A0034A7
65925+:108FE000A5450008954B003825690001A5490038C2
65926+:108FF0009148000D35070008A147000D03E0000867
65927+:109000000000000027BDFFD8AFB000189388001CF7
65928+:109010008FB000143C0A80003C197FFF8F8700242A
65929+:109020003738FFFFAFBF0020AFB1001C355F0A002B
65930+:109030000218182493EB003C00087FC03C02BFFFDD
65931+:10904000006F60252CF000013449FFFF3C1F080031
65932+:109050008FFF3FDC8F9900303C18080097183FD2F3
65933+:1090600001897824001047803C07EFFF3C05F0FFA2
65934+:1090700001E818253C1180003169002034E2FFFF2F
65935+:1090800034ADFFFF362E098027A50010240600020C
65936+:1090900003F96023270B0002354A0E0000621824F2
65937+:1090A0000080802115200002000040218D48001C16
65938+:1090B000A7AB0012058000392407000030E800FF4C
65939+:1090C00000083F00006758253C028008AFAB001441
65940+:1090D000344F008091EA00683C08080091083FD9AD
65941+:1090E0003C09DFFF352CFFFF000AF82B3C0208008B
65942+:1090F00094423FCCA3A80011016CC024001FCF40B4
65943+:10910000031918258FA70010AFA300143C0C08000A
65944+:10911000918C3FDBA7A200168FAB001400ED482412
65945+:109120003C0F01003C0A0FFF012FC82531980003B6
65946+:10913000355FFFFF016D40243C027000033F38247F
65947+:1091400000181E0000E2482501037825AFAF001487
65948+:10915000AFA9001091CC007C0E000092A3AC0015CA
65949+:10916000362D0A0091A6003C30C400201080000675
65950+:10917000260200083C11080096313FC8262EFFFF4A
65951+:109180003C010800A42E3FC88FBF00208FB1001CF7
65952+:109190008FB0001803E0000827BD00288F8B002C3B
65953+:1091A000010B502B5540FFC5240700010A000E0497
65954+:1091B00030E800FF9383001C3C02800027BDFFD8ED
65955+:1091C00034480A0000805021AFBF002034460AC056
65956+:1091D000010028211060000E3444098091070030FE
65957+:1091E000240B00058F89002030EC003F118B000B11
65958+:1091F00000003821AFA900103C0B80088D69006C7D
65959+:10920000AFAA00180E00015AAFA90014A380001CD9
65960+:109210008FBF002003E0000827BD00288D1F0048F5
65961+:109220003C1808008F183FBC8F9900283C027FFF34
65962+:109230008D0800443443FFFFAFA900103C0B8008A9
65963+:109240008D69006C03E370240319782101CF682332
65964+:1092500001A83821AFAA00180E00015AAFA90014C6
65965+:109260000A000E58A380001C3C05800034A60A00AA
65966+:1092700090C7003C3C06080094C63FDA3C02080058
65967+:109280008C423FD430E30020000624001060001E12
65968+:10929000004438253C0880083505008090A300680C
65969+:1092A00000004821240800010000282124040001B6
65970+:1092B0003C0680008CCD017805A0FFFE34CF014034
65971+:1092C000ADE800083C0208008C423FDCA5E5000444
65972+:1092D000A5E40006ADE2000C3C04080090843FD9F0
65973+:1092E0003C03800834790080A1E40012ADE700144B
65974+:1092F000A5E900189338004C3C0E1000A1F8002D91
65975+:1093000003E00008ACCE017834A90E008D28001CC3
65976+:109310003C0C08008D8C3FBC952B0016952A001440
65977+:10932000018648213164FFFF0A000E803145FFFFAE
65978+:109330003C04800034830A009065003C30A2002089
65979+:109340001040001934870E00000040210000382131
65980+:10935000000020213C0680008CC901780520FFFE1A
65981+:1093600034CA014034CF010091EB0009AD48000838
65982+:109370003C0E08008DCE3FDC240DFF91240C0040F4
65983+:109380003C081000A5440004A5470006AD4E000CA3
65984+:10939000A14D0012AD4C0014A5400018A14B002DAA
65985+:1093A00003E00008ACC801788CE8001894E60012CD
65986+:1093B00094E4001030C7FFFF0A000EA93084FFFFBD
65987+:1093C0003C04800034830A009065003C30A20020F9
65988+:1093D0001040002727BDFFF82409000100003821B4
65989+:1093E000240800013C0680008CCA01780540FFFE7D
65990+:1093F0003C0280FF34C40100908D00093C0C080041
65991+:10940000918C4019A3AD00038FAB00003185007F24
65992+:109410003459FFFF01665025AFAA00009083000A6F
65993+:10942000A3A0000200057E00A3A300018FB80000E6
65994+:1094300034CB0140240C30000319702401CF68257F
65995+:10944000AD6D000C27BD0008AD6C0014A5600018C0
65996+:10945000AD690008A56700042409FF80A56800061F
65997+:109460003C081000A169001203E00008ACC80178B4
65998+:1094700034870E008CE9001894E6001294E4001082
65999+:1094800030C8FFFF0A000ECD3087FFFF27BDFFE089
66000+:10949000AFB100143C118000AFB00010AFBF001896
66001+:1094A00036380A00970F0032363001000E000B7F6D
66002+:1094B00031E43FFF8E0E0000240DFF803C042000AD
66003+:1094C00001C25821016D6024000C4940316A007FBF
66004+:1094D000012A4025010438253C048008AE270830C5
66005+:1094E0003486008090C500682403000230A200FF8B
66006+:1094F000104300048F9F00208F990024AC9F0068C8
66007+:10950000AC9900648FBF00188FB100148FB00010A9
66008+:1095100003E0000827BD00203C0A0800254A3A80E5
66009+:109520003C09080025293B103C08080025082F1C91
66010+:109530003C07080024E73BDC3C06080024C639044D
66011+:109540003C05080024A536583C0408002484325CFD
66012+:109550003C030800246339B83C0208002442375415
66013+:109560003C010800AC2A3F983C010800AC293F941C
66014+:109570003C010800AC283F903C010800AC273F9C10
66015+:109580003C010800AC263FAC3C010800AC253FA4E0
66016+:109590003C010800AC243FA03C010800AC233FB0D4
66017+:1095A0003C010800AC223FA803E0000800000000D6
66018+:1095B00080000940800009008008010080080080C8
66019+:1095C00080080000800E00008008008080080000F5
66020+:1095D00080000A8080000A00800009808000090065
66021+:00000001FF
66022diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
66023index eb14e05..5156de7 100644
66024--- a/fs/9p/vfs_addr.c
66025+++ b/fs/9p/vfs_addr.c
66026@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
66027
66028 retval = v9fs_file_write_internal(inode,
66029 v9inode->writeback_fid,
66030- (__force const char __user *)buffer,
66031+ (const char __force_user *)buffer,
66032 len, &offset, 0);
66033 if (retval > 0)
66034 retval = 0;
66035diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
66036index 3662f1d..90558b5 100644
66037--- a/fs/9p/vfs_inode.c
66038+++ b/fs/9p/vfs_inode.c
66039@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
66040 void
66041 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
66042 {
66043- char *s = nd_get_link(nd);
66044+ const char *s = nd_get_link(nd);
66045
66046 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
66047 dentry, IS_ERR(s) ? "<error>" : s);
66048diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
66049index 270c481..0d8a962 100644
66050--- a/fs/Kconfig.binfmt
66051+++ b/fs/Kconfig.binfmt
66052@@ -106,7 +106,7 @@ config HAVE_AOUT
66053
66054 config BINFMT_AOUT
66055 tristate "Kernel support for a.out and ECOFF binaries"
66056- depends on HAVE_AOUT
66057+ depends on HAVE_AOUT && BROKEN
66058 ---help---
66059 A.out (Assembler.OUTput) is a set of formats for libraries and
66060 executables used in the earliest versions of UNIX. Linux used
66061diff --git a/fs/afs/inode.c b/fs/afs/inode.c
66062index 8a1d38e..300a14e 100644
66063--- a/fs/afs/inode.c
66064+++ b/fs/afs/inode.c
66065@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
66066 struct afs_vnode *vnode;
66067 struct super_block *sb;
66068 struct inode *inode;
66069- static atomic_t afs_autocell_ino;
66070+ static atomic_unchecked_t afs_autocell_ino;
66071
66072 _enter("{%x:%u},%*.*s,",
66073 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
66074@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
66075 data.fid.unique = 0;
66076 data.fid.vnode = 0;
66077
66078- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
66079+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
66080 afs_iget5_autocell_test, afs_iget5_set,
66081 &data);
66082 if (!inode) {
66083diff --git a/fs/aio.c b/fs/aio.c
66084index a793f70..46f45af 100644
66085--- a/fs/aio.c
66086+++ b/fs/aio.c
66087@@ -404,7 +404,7 @@ static int aio_setup_ring(struct kioctx *ctx)
66088 size += sizeof(struct io_event) * nr_events;
66089
66090 nr_pages = PFN_UP(size);
66091- if (nr_pages < 0)
66092+ if (nr_pages <= 0)
66093 return -EINVAL;
66094
66095 file = aio_private_file(ctx, nr_pages);
66096diff --git a/fs/attr.c b/fs/attr.c
66097index 6530ced..4a827e2 100644
66098--- a/fs/attr.c
66099+++ b/fs/attr.c
66100@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
66101 unsigned long limit;
66102
66103 limit = rlimit(RLIMIT_FSIZE);
66104+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
66105 if (limit != RLIM_INFINITY && offset > limit)
66106 goto out_sig;
66107 if (offset > inode->i_sb->s_maxbytes)
66108diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
66109index 116fd38..c04182da 100644
66110--- a/fs/autofs4/waitq.c
66111+++ b/fs/autofs4/waitq.c
66112@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
66113 {
66114 unsigned long sigpipe, flags;
66115 mm_segment_t fs;
66116- const char *data = (const char *)addr;
66117+ const char __user *data = (const char __force_user *)addr;
66118 ssize_t wr = 0;
66119
66120 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
66121@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
66122 return 1;
66123 }
66124
66125+#ifdef CONFIG_GRKERNSEC_HIDESYM
66126+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
66127+#endif
66128+
66129 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
66130 enum autofs_notify notify)
66131 {
66132@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
66133
66134 /* If this is a direct mount request create a dummy name */
66135 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
66136+#ifdef CONFIG_GRKERNSEC_HIDESYM
66137+ /* this name does get written to userland via autofs4_write() */
66138+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
66139+#else
66140 qstr.len = sprintf(name, "%p", dentry);
66141+#endif
66142 else {
66143 qstr.len = autofs4_getpath(sbi, dentry, &name);
66144 if (!qstr.len) {
66145diff --git a/fs/befs/endian.h b/fs/befs/endian.h
66146index 2722387..56059b5 100644
66147--- a/fs/befs/endian.h
66148+++ b/fs/befs/endian.h
66149@@ -11,7 +11,7 @@
66150
66151 #include <asm/byteorder.h>
66152
66153-static inline u64
66154+static inline u64 __intentional_overflow(-1)
66155 fs64_to_cpu(const struct super_block *sb, fs64 n)
66156 {
66157 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66158@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
66159 return (__force fs64)cpu_to_be64(n);
66160 }
66161
66162-static inline u32
66163+static inline u32 __intentional_overflow(-1)
66164 fs32_to_cpu(const struct super_block *sb, fs32 n)
66165 {
66166 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66167@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
66168 return (__force fs32)cpu_to_be32(n);
66169 }
66170
66171-static inline u16
66172+static inline u16 __intentional_overflow(-1)
66173 fs16_to_cpu(const struct super_block *sb, fs16 n)
66174 {
66175 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66176diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
66177index 4c55668..eeae150 100644
66178--- a/fs/binfmt_aout.c
66179+++ b/fs/binfmt_aout.c
66180@@ -16,6 +16,7 @@
66181 #include <linux/string.h>
66182 #include <linux/fs.h>
66183 #include <linux/file.h>
66184+#include <linux/security.h>
66185 #include <linux/stat.h>
66186 #include <linux/fcntl.h>
66187 #include <linux/ptrace.h>
66188@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
66189 #endif
66190 # define START_STACK(u) ((void __user *)u.start_stack)
66191
66192+ memset(&dump, 0, sizeof(dump));
66193+
66194 fs = get_fs();
66195 set_fs(KERNEL_DS);
66196 has_dumped = 1;
66197@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
66198
66199 /* If the size of the dump file exceeds the rlimit, then see what would happen
66200 if we wrote the stack, but not the data area. */
66201+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
66202 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
66203 dump.u_dsize = 0;
66204
66205 /* Make sure we have enough room to write the stack and data areas. */
66206+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
66207 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
66208 dump.u_ssize = 0;
66209
66210@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
66211 rlim = rlimit(RLIMIT_DATA);
66212 if (rlim >= RLIM_INFINITY)
66213 rlim = ~0;
66214+
66215+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
66216 if (ex.a_data + ex.a_bss > rlim)
66217 return -ENOMEM;
66218
66219@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
66220
66221 install_exec_creds(bprm);
66222
66223+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66224+ current->mm->pax_flags = 0UL;
66225+#endif
66226+
66227+#ifdef CONFIG_PAX_PAGEEXEC
66228+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
66229+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
66230+
66231+#ifdef CONFIG_PAX_EMUTRAMP
66232+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
66233+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
66234+#endif
66235+
66236+#ifdef CONFIG_PAX_MPROTECT
66237+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
66238+ current->mm->pax_flags |= MF_PAX_MPROTECT;
66239+#endif
66240+
66241+ }
66242+#endif
66243+
66244 if (N_MAGIC(ex) == OMAGIC) {
66245 unsigned long text_addr, map_size;
66246 loff_t pos;
66247@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
66248 return error;
66249
66250 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
66251- PROT_READ | PROT_WRITE | PROT_EXEC,
66252+ PROT_READ | PROT_WRITE,
66253 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
66254 fd_offset + ex.a_text);
66255 if (error != N_DATADDR(ex))
66256diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
66257index 8081aba..90a7bdd 100644
66258--- a/fs/binfmt_elf.c
66259+++ b/fs/binfmt_elf.c
66260@@ -34,6 +34,7 @@
66261 #include <linux/utsname.h>
66262 #include <linux/coredump.h>
66263 #include <linux/sched.h>
66264+#include <linux/xattr.h>
66265 #include <asm/uaccess.h>
66266 #include <asm/param.h>
66267 #include <asm/page.h>
66268@@ -47,7 +48,7 @@
66269
66270 static int load_elf_binary(struct linux_binprm *bprm);
66271 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
66272- int, int, unsigned long);
66273+ int, int, unsigned long) __intentional_overflow(-1);
66274
66275 #ifdef CONFIG_USELIB
66276 static int load_elf_library(struct file *);
66277@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
66278 #define elf_core_dump NULL
66279 #endif
66280
66281+#ifdef CONFIG_PAX_MPROTECT
66282+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
66283+#endif
66284+
66285+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
66286+static void elf_handle_mmap(struct file *file);
66287+#endif
66288+
66289 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
66290 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
66291 #else
66292@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
66293 .load_binary = load_elf_binary,
66294 .load_shlib = load_elf_library,
66295 .core_dump = elf_core_dump,
66296+
66297+#ifdef CONFIG_PAX_MPROTECT
66298+ .handle_mprotect= elf_handle_mprotect,
66299+#endif
66300+
66301+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
66302+ .handle_mmap = elf_handle_mmap,
66303+#endif
66304+
66305 .min_coredump = ELF_EXEC_PAGESIZE,
66306 };
66307
66308@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
66309
66310 static int set_brk(unsigned long start, unsigned long end)
66311 {
66312+ unsigned long e = end;
66313+
66314 start = ELF_PAGEALIGN(start);
66315 end = ELF_PAGEALIGN(end);
66316 if (end > start) {
66317@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
66318 if (BAD_ADDR(addr))
66319 return addr;
66320 }
66321- current->mm->start_brk = current->mm->brk = end;
66322+ current->mm->start_brk = current->mm->brk = e;
66323 return 0;
66324 }
66325
66326@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66327 elf_addr_t __user *u_rand_bytes;
66328 const char *k_platform = ELF_PLATFORM;
66329 const char *k_base_platform = ELF_BASE_PLATFORM;
66330- unsigned char k_rand_bytes[16];
66331+ u32 k_rand_bytes[4];
66332 int items;
66333 elf_addr_t *elf_info;
66334 int ei_index = 0;
66335 const struct cred *cred = current_cred();
66336 struct vm_area_struct *vma;
66337+ unsigned long saved_auxv[AT_VECTOR_SIZE];
66338
66339 /*
66340 * In some cases (e.g. Hyper-Threading), we want to avoid L1
66341@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66342 * Generate 16 random bytes for userspace PRNG seeding.
66343 */
66344 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
66345- u_rand_bytes = (elf_addr_t __user *)
66346- STACK_ALLOC(p, sizeof(k_rand_bytes));
66347+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
66348+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
66349+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
66350+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
66351+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
66352+ u_rand_bytes = (elf_addr_t __user *) p;
66353 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
66354 return -EFAULT;
66355
66356@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66357 return -EFAULT;
66358 current->mm->env_end = p;
66359
66360+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
66361+
66362 /* Put the elf_info on the stack in the right place. */
66363 sp = (elf_addr_t __user *)envp + 1;
66364- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
66365+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
66366 return -EFAULT;
66367 return 0;
66368 }
66369@@ -514,14 +541,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
66370 an ELF header */
66371
66372 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66373- struct file *interpreter, unsigned long *interp_map_addr,
66374+ struct file *interpreter,
66375 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
66376 {
66377 struct elf_phdr *eppnt;
66378- unsigned long load_addr = 0;
66379+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
66380 int load_addr_set = 0;
66381 unsigned long last_bss = 0, elf_bss = 0;
66382- unsigned long error = ~0UL;
66383+ unsigned long error = -EINVAL;
66384 unsigned long total_size;
66385 int i;
66386
66387@@ -541,6 +568,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66388 goto out;
66389 }
66390
66391+#ifdef CONFIG_PAX_SEGMEXEC
66392+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
66393+ pax_task_size = SEGMEXEC_TASK_SIZE;
66394+#endif
66395+
66396 eppnt = interp_elf_phdata;
66397 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
66398 if (eppnt->p_type == PT_LOAD) {
66399@@ -564,8 +596,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66400 map_addr = elf_map(interpreter, load_addr + vaddr,
66401 eppnt, elf_prot, elf_type, total_size);
66402 total_size = 0;
66403- if (!*interp_map_addr)
66404- *interp_map_addr = map_addr;
66405 error = map_addr;
66406 if (BAD_ADDR(map_addr))
66407 goto out;
66408@@ -584,8 +614,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66409 k = load_addr + eppnt->p_vaddr;
66410 if (BAD_ADDR(k) ||
66411 eppnt->p_filesz > eppnt->p_memsz ||
66412- eppnt->p_memsz > TASK_SIZE ||
66413- TASK_SIZE - eppnt->p_memsz < k) {
66414+ eppnt->p_memsz > pax_task_size ||
66415+ pax_task_size - eppnt->p_memsz < k) {
66416 error = -ENOMEM;
66417 goto out;
66418 }
66419@@ -624,9 +654,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66420 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
66421
66422 /* Map the last of the bss segment */
66423- error = vm_brk(elf_bss, last_bss - elf_bss);
66424- if (BAD_ADDR(error))
66425- goto out;
66426+ if (last_bss > elf_bss) {
66427+ error = vm_brk(elf_bss, last_bss - elf_bss);
66428+ if (BAD_ADDR(error))
66429+ goto out;
66430+ }
66431 }
66432
66433 error = load_addr;
66434@@ -634,6 +666,336 @@ out:
66435 return error;
66436 }
66437
66438+#ifdef CONFIG_PAX_PT_PAX_FLAGS
66439+#ifdef CONFIG_PAX_SOFTMODE
66440+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
66441+{
66442+ unsigned long pax_flags = 0UL;
66443+
66444+#ifdef CONFIG_PAX_PAGEEXEC
66445+ if (elf_phdata->p_flags & PF_PAGEEXEC)
66446+ pax_flags |= MF_PAX_PAGEEXEC;
66447+#endif
66448+
66449+#ifdef CONFIG_PAX_SEGMEXEC
66450+ if (elf_phdata->p_flags & PF_SEGMEXEC)
66451+ pax_flags |= MF_PAX_SEGMEXEC;
66452+#endif
66453+
66454+#ifdef CONFIG_PAX_EMUTRAMP
66455+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
66456+ pax_flags |= MF_PAX_EMUTRAMP;
66457+#endif
66458+
66459+#ifdef CONFIG_PAX_MPROTECT
66460+ if (elf_phdata->p_flags & PF_MPROTECT)
66461+ pax_flags |= MF_PAX_MPROTECT;
66462+#endif
66463+
66464+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66465+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
66466+ pax_flags |= MF_PAX_RANDMMAP;
66467+#endif
66468+
66469+ return pax_flags;
66470+}
66471+#endif
66472+
66473+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
66474+{
66475+ unsigned long pax_flags = 0UL;
66476+
66477+#ifdef CONFIG_PAX_PAGEEXEC
66478+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
66479+ pax_flags |= MF_PAX_PAGEEXEC;
66480+#endif
66481+
66482+#ifdef CONFIG_PAX_SEGMEXEC
66483+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
66484+ pax_flags |= MF_PAX_SEGMEXEC;
66485+#endif
66486+
66487+#ifdef CONFIG_PAX_EMUTRAMP
66488+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
66489+ pax_flags |= MF_PAX_EMUTRAMP;
66490+#endif
66491+
66492+#ifdef CONFIG_PAX_MPROTECT
66493+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
66494+ pax_flags |= MF_PAX_MPROTECT;
66495+#endif
66496+
66497+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66498+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
66499+ pax_flags |= MF_PAX_RANDMMAP;
66500+#endif
66501+
66502+ return pax_flags;
66503+}
66504+#endif
66505+
66506+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
66507+#ifdef CONFIG_PAX_SOFTMODE
66508+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
66509+{
66510+ unsigned long pax_flags = 0UL;
66511+
66512+#ifdef CONFIG_PAX_PAGEEXEC
66513+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
66514+ pax_flags |= MF_PAX_PAGEEXEC;
66515+#endif
66516+
66517+#ifdef CONFIG_PAX_SEGMEXEC
66518+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
66519+ pax_flags |= MF_PAX_SEGMEXEC;
66520+#endif
66521+
66522+#ifdef CONFIG_PAX_EMUTRAMP
66523+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
66524+ pax_flags |= MF_PAX_EMUTRAMP;
66525+#endif
66526+
66527+#ifdef CONFIG_PAX_MPROTECT
66528+ if (pax_flags_softmode & MF_PAX_MPROTECT)
66529+ pax_flags |= MF_PAX_MPROTECT;
66530+#endif
66531+
66532+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66533+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
66534+ pax_flags |= MF_PAX_RANDMMAP;
66535+#endif
66536+
66537+ return pax_flags;
66538+}
66539+#endif
66540+
66541+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
66542+{
66543+ unsigned long pax_flags = 0UL;
66544+
66545+#ifdef CONFIG_PAX_PAGEEXEC
66546+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
66547+ pax_flags |= MF_PAX_PAGEEXEC;
66548+#endif
66549+
66550+#ifdef CONFIG_PAX_SEGMEXEC
66551+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
66552+ pax_flags |= MF_PAX_SEGMEXEC;
66553+#endif
66554+
66555+#ifdef CONFIG_PAX_EMUTRAMP
66556+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
66557+ pax_flags |= MF_PAX_EMUTRAMP;
66558+#endif
66559+
66560+#ifdef CONFIG_PAX_MPROTECT
66561+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
66562+ pax_flags |= MF_PAX_MPROTECT;
66563+#endif
66564+
66565+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66566+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
66567+ pax_flags |= MF_PAX_RANDMMAP;
66568+#endif
66569+
66570+ return pax_flags;
66571+}
66572+#endif
66573+
66574+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66575+static unsigned long pax_parse_defaults(void)
66576+{
66577+ unsigned long pax_flags = 0UL;
66578+
66579+#ifdef CONFIG_PAX_SOFTMODE
66580+ if (pax_softmode)
66581+ return pax_flags;
66582+#endif
66583+
66584+#ifdef CONFIG_PAX_PAGEEXEC
66585+ pax_flags |= MF_PAX_PAGEEXEC;
66586+#endif
66587+
66588+#ifdef CONFIG_PAX_SEGMEXEC
66589+ pax_flags |= MF_PAX_SEGMEXEC;
66590+#endif
66591+
66592+#ifdef CONFIG_PAX_MPROTECT
66593+ pax_flags |= MF_PAX_MPROTECT;
66594+#endif
66595+
66596+#ifdef CONFIG_PAX_RANDMMAP
66597+ if (randomize_va_space)
66598+ pax_flags |= MF_PAX_RANDMMAP;
66599+#endif
66600+
66601+ return pax_flags;
66602+}
66603+
66604+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
66605+{
66606+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
66607+
66608+#ifdef CONFIG_PAX_EI_PAX
66609+
66610+#ifdef CONFIG_PAX_SOFTMODE
66611+ if (pax_softmode)
66612+ return pax_flags;
66613+#endif
66614+
66615+ pax_flags = 0UL;
66616+
66617+#ifdef CONFIG_PAX_PAGEEXEC
66618+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
66619+ pax_flags |= MF_PAX_PAGEEXEC;
66620+#endif
66621+
66622+#ifdef CONFIG_PAX_SEGMEXEC
66623+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
66624+ pax_flags |= MF_PAX_SEGMEXEC;
66625+#endif
66626+
66627+#ifdef CONFIG_PAX_EMUTRAMP
66628+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
66629+ pax_flags |= MF_PAX_EMUTRAMP;
66630+#endif
66631+
66632+#ifdef CONFIG_PAX_MPROTECT
66633+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
66634+ pax_flags |= MF_PAX_MPROTECT;
66635+#endif
66636+
66637+#ifdef CONFIG_PAX_ASLR
66638+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
66639+ pax_flags |= MF_PAX_RANDMMAP;
66640+#endif
66641+
66642+#endif
66643+
66644+ return pax_flags;
66645+
66646+}
66647+
66648+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
66649+{
66650+
66651+#ifdef CONFIG_PAX_PT_PAX_FLAGS
66652+ unsigned long i;
66653+
66654+ for (i = 0UL; i < elf_ex->e_phnum; i++)
66655+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
66656+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
66657+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
66658+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
66659+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
66660+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
66661+ return PAX_PARSE_FLAGS_FALLBACK;
66662+
66663+#ifdef CONFIG_PAX_SOFTMODE
66664+ if (pax_softmode)
66665+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
66666+ else
66667+#endif
66668+
66669+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
66670+ break;
66671+ }
66672+#endif
66673+
66674+ return PAX_PARSE_FLAGS_FALLBACK;
66675+}
66676+
66677+static unsigned long pax_parse_xattr_pax(struct file * const file)
66678+{
66679+
66680+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
66681+ ssize_t xattr_size, i;
66682+ unsigned char xattr_value[sizeof("pemrs") - 1];
66683+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
66684+
66685+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
66686+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
66687+ return PAX_PARSE_FLAGS_FALLBACK;
66688+
66689+ for (i = 0; i < xattr_size; i++)
66690+ switch (xattr_value[i]) {
66691+ default:
66692+ return PAX_PARSE_FLAGS_FALLBACK;
66693+
66694+#define parse_flag(option1, option2, flag) \
66695+ case option1: \
66696+ if (pax_flags_hardmode & MF_PAX_##flag) \
66697+ return PAX_PARSE_FLAGS_FALLBACK;\
66698+ pax_flags_hardmode |= MF_PAX_##flag; \
66699+ break; \
66700+ case option2: \
66701+ if (pax_flags_softmode & MF_PAX_##flag) \
66702+ return PAX_PARSE_FLAGS_FALLBACK;\
66703+ pax_flags_softmode |= MF_PAX_##flag; \
66704+ break;
66705+
66706+ parse_flag('p', 'P', PAGEEXEC);
66707+ parse_flag('e', 'E', EMUTRAMP);
66708+ parse_flag('m', 'M', MPROTECT);
66709+ parse_flag('r', 'R', RANDMMAP);
66710+ parse_flag('s', 'S', SEGMEXEC);
66711+
66712+#undef parse_flag
66713+ }
66714+
66715+ if (pax_flags_hardmode & pax_flags_softmode)
66716+ return PAX_PARSE_FLAGS_FALLBACK;
66717+
66718+#ifdef CONFIG_PAX_SOFTMODE
66719+ if (pax_softmode)
66720+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
66721+ else
66722+#endif
66723+
66724+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
66725+#else
66726+ return PAX_PARSE_FLAGS_FALLBACK;
66727+#endif
66728+
66729+}
66730+
66731+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
66732+{
66733+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
66734+
66735+ pax_flags = pax_parse_defaults();
66736+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
66737+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
66738+ xattr_pax_flags = pax_parse_xattr_pax(file);
66739+
66740+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
66741+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
66742+ pt_pax_flags != xattr_pax_flags)
66743+ return -EINVAL;
66744+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66745+ pax_flags = xattr_pax_flags;
66746+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66747+ pax_flags = pt_pax_flags;
66748+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66749+ pax_flags = ei_pax_flags;
66750+
66751+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
66752+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66753+ if ((__supported_pte_mask & _PAGE_NX))
66754+ pax_flags &= ~MF_PAX_SEGMEXEC;
66755+ else
66756+ pax_flags &= ~MF_PAX_PAGEEXEC;
66757+ }
66758+#endif
66759+
66760+ if (0 > pax_check_flags(&pax_flags))
66761+ return -EINVAL;
66762+
66763+ current->mm->pax_flags = pax_flags;
66764+ return 0;
66765+}
66766+#endif
66767+
66768 /*
66769 * These are the functions used to load ELF style executables and shared
66770 * libraries. There is no binary dependent code anywhere else.
66771@@ -647,6 +1009,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
66772 {
66773 unsigned long random_variable = 0;
66774
66775+#ifdef CONFIG_PAX_RANDUSTACK
66776+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
66777+ return stack_top - current->mm->delta_stack;
66778+#endif
66779+
66780 if ((current->flags & PF_RANDOMIZE) &&
66781 !(current->personality & ADDR_NO_RANDOMIZE)) {
66782 random_variable = (unsigned long) get_random_int();
66783@@ -666,7 +1033,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
66784 unsigned long load_addr = 0, load_bias = 0;
66785 int load_addr_set = 0;
66786 char * elf_interpreter = NULL;
66787- unsigned long error;
66788+ unsigned long error = 0;
66789 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
66790 unsigned long elf_bss, elf_brk;
66791 int retval, i;
66792@@ -681,6 +1048,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
66793 struct elfhdr interp_elf_ex;
66794 } *loc;
66795 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
66796+ unsigned long pax_task_size;
66797
66798 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
66799 if (!loc) {
66800@@ -839,6 +1207,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
66801 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
66802 may depend on the personality. */
66803 SET_PERSONALITY2(loc->elf_ex, &arch_state);
66804+
66805+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66806+ current->mm->pax_flags = 0UL;
66807+#endif
66808+
66809+#ifdef CONFIG_PAX_DLRESOLVE
66810+ current->mm->call_dl_resolve = 0UL;
66811+#endif
66812+
66813+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
66814+ current->mm->call_syscall = 0UL;
66815+#endif
66816+
66817+#ifdef CONFIG_PAX_ASLR
66818+ current->mm->delta_mmap = 0UL;
66819+ current->mm->delta_stack = 0UL;
66820+#endif
66821+
66822+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66823+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
66824+ send_sig(SIGKILL, current, 0);
66825+ goto out_free_dentry;
66826+ }
66827+#endif
66828+
66829+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
66830+ pax_set_initial_flags(bprm);
66831+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
66832+ if (pax_set_initial_flags_func)
66833+ (pax_set_initial_flags_func)(bprm);
66834+#endif
66835+
66836+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66837+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
66838+ current->mm->context.user_cs_limit = PAGE_SIZE;
66839+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
66840+ }
66841+#endif
66842+
66843+#ifdef CONFIG_PAX_SEGMEXEC
66844+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
66845+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
66846+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
66847+ pax_task_size = SEGMEXEC_TASK_SIZE;
66848+ current->mm->def_flags |= VM_NOHUGEPAGE;
66849+ } else
66850+#endif
66851+
66852+ pax_task_size = TASK_SIZE;
66853+
66854+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
66855+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66856+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
66857+ put_cpu();
66858+ }
66859+#endif
66860+
66861+#ifdef CONFIG_PAX_ASLR
66862+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
66863+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
66864+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
66865+ }
66866+#endif
66867+
66868+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
66869+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66870+ executable_stack = EXSTACK_DISABLE_X;
66871+ current->personality &= ~READ_IMPLIES_EXEC;
66872+ } else
66873+#endif
66874+
66875 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
66876 current->personality |= READ_IMPLIES_EXEC;
66877
66878@@ -925,8 +1364,21 @@ static int load_elf_binary(struct linux_binprm *bprm)
66879 #else
66880 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
66881 #endif
66882- total_size = total_mapping_size(elf_phdata,
66883- loc->elf_ex.e_phnum);
66884+
66885+#ifdef CONFIG_PAX_RANDMMAP
66886+ /* PaX: randomize base address at the default exe base if requested */
66887+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
66888+#ifdef CONFIG_SPARC64
66889+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
66890+#else
66891+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
66892+#endif
66893+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
66894+ elf_flags |= MAP_FIXED;
66895+ }
66896+#endif
66897+
66898+ total_size = total_mapping_size(elf_phdata, loc->elf_ex.e_phnum);
66899 if (!total_size) {
66900 retval = -EINVAL;
66901 goto out_free_dentry;
66902@@ -962,9 +1414,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
66903 * allowed task size. Note that p_filesz must always be
66904 * <= p_memsz so it is only necessary to check p_memsz.
66905 */
66906- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
66907- elf_ppnt->p_memsz > TASK_SIZE ||
66908- TASK_SIZE - elf_ppnt->p_memsz < k) {
66909+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
66910+ elf_ppnt->p_memsz > pax_task_size ||
66911+ pax_task_size - elf_ppnt->p_memsz < k) {
66912 /* set_brk can never work. Avoid overflows. */
66913 retval = -EINVAL;
66914 goto out_free_dentry;
66915@@ -1000,16 +1452,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
66916 if (retval)
66917 goto out_free_dentry;
66918 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
66919- retval = -EFAULT; /* Nobody gets to see this, but.. */
66920- goto out_free_dentry;
66921+ /*
66922+ * This bss-zeroing can fail if the ELF
66923+ * file specifies odd protections. So
66924+ * we don't check the return value
66925+ */
66926 }
66927
66928+#ifdef CONFIG_PAX_RANDMMAP
66929+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
66930+ unsigned long start, size, flags;
66931+ vm_flags_t vm_flags;
66932+
66933+ start = ELF_PAGEALIGN(elf_brk);
66934+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
66935+ flags = MAP_FIXED | MAP_PRIVATE;
66936+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
66937+
66938+ down_write(&current->mm->mmap_sem);
66939+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
66940+ retval = -ENOMEM;
66941+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
66942+// if (current->personality & ADDR_NO_RANDOMIZE)
66943+// vm_flags |= VM_READ | VM_MAYREAD;
66944+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
66945+ retval = IS_ERR_VALUE(start) ? start : 0;
66946+ }
66947+ up_write(&current->mm->mmap_sem);
66948+ if (retval == 0)
66949+ retval = set_brk(start + size, start + size + PAGE_SIZE);
66950+ if (retval < 0)
66951+ goto out_free_dentry;
66952+ }
66953+#endif
66954+
66955 if (elf_interpreter) {
66956- unsigned long interp_map_addr = 0;
66957-
66958 elf_entry = load_elf_interp(&loc->interp_elf_ex,
66959 interpreter,
66960- &interp_map_addr,
66961 load_bias, interp_elf_phdata);
66962 if (!IS_ERR((void *)elf_entry)) {
66963 /*
66964@@ -1237,7 +1716,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
66965 * Decide what to dump of a segment, part, all or none.
66966 */
66967 static unsigned long vma_dump_size(struct vm_area_struct *vma,
66968- unsigned long mm_flags)
66969+ unsigned long mm_flags, long signr)
66970 {
66971 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
66972
66973@@ -1275,7 +1754,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
66974 if (vma->vm_file == NULL)
66975 return 0;
66976
66977- if (FILTER(MAPPED_PRIVATE))
66978+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
66979 goto whole;
66980
66981 /*
66982@@ -1482,9 +1961,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
66983 {
66984 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
66985 int i = 0;
66986- do
66987+ do {
66988 i += 2;
66989- while (auxv[i - 2] != AT_NULL);
66990+ } while (auxv[i - 2] != AT_NULL);
66991 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
66992 }
66993
66994@@ -1493,7 +1972,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
66995 {
66996 mm_segment_t old_fs = get_fs();
66997 set_fs(KERNEL_DS);
66998- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
66999+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
67000 set_fs(old_fs);
67001 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
67002 }
67003@@ -2213,7 +2692,7 @@ static int elf_core_dump(struct coredump_params *cprm)
67004 vma = next_vma(vma, gate_vma)) {
67005 unsigned long dump_size;
67006
67007- dump_size = vma_dump_size(vma, cprm->mm_flags);
67008+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
67009 vma_filesz[i++] = dump_size;
67010 vma_data_size += dump_size;
67011 }
67012@@ -2321,6 +2800,167 @@ out:
67013
67014 #endif /* CONFIG_ELF_CORE */
67015
67016+#ifdef CONFIG_PAX_MPROTECT
67017+/* PaX: non-PIC ELF libraries need relocations on their executable segments
67018+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
67019+ * we'll remove VM_MAYWRITE for good on RELRO segments.
67020+ *
67021+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
67022+ * basis because we want to allow the common case and not the special ones.
67023+ */
67024+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
67025+{
67026+ struct elfhdr elf_h;
67027+ struct elf_phdr elf_p;
67028+ unsigned long i;
67029+ unsigned long oldflags;
67030+ bool is_textrel_rw, is_textrel_rx, is_relro;
67031+
67032+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
67033+ return;
67034+
67035+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
67036+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
67037+
67038+#ifdef CONFIG_PAX_ELFRELOCS
67039+ /* possible TEXTREL */
67040+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
67041+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
67042+#else
67043+ is_textrel_rw = false;
67044+ is_textrel_rx = false;
67045+#endif
67046+
67047+ /* possible RELRO */
67048+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
67049+
67050+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
67051+ return;
67052+
67053+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
67054+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
67055+
67056+#ifdef CONFIG_PAX_ETEXECRELOCS
67057+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
67058+#else
67059+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
67060+#endif
67061+
67062+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
67063+ !elf_check_arch(&elf_h) ||
67064+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
67065+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
67066+ return;
67067+
67068+ for (i = 0UL; i < elf_h.e_phnum; i++) {
67069+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
67070+ return;
67071+ switch (elf_p.p_type) {
67072+ case PT_DYNAMIC:
67073+ if (!is_textrel_rw && !is_textrel_rx)
67074+ continue;
67075+ i = 0UL;
67076+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
67077+ elf_dyn dyn;
67078+
67079+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
67080+ break;
67081+ if (dyn.d_tag == DT_NULL)
67082+ break;
67083+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
67084+ gr_log_textrel(vma);
67085+ if (is_textrel_rw)
67086+ vma->vm_flags |= VM_MAYWRITE;
67087+ else
67088+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
67089+ vma->vm_flags &= ~VM_MAYWRITE;
67090+ break;
67091+ }
67092+ i++;
67093+ }
67094+ is_textrel_rw = false;
67095+ is_textrel_rx = false;
67096+ continue;
67097+
67098+ case PT_GNU_RELRO:
67099+ if (!is_relro)
67100+ continue;
67101+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
67102+ vma->vm_flags &= ~VM_MAYWRITE;
67103+ is_relro = false;
67104+ continue;
67105+
67106+#ifdef CONFIG_PAX_PT_PAX_FLAGS
67107+ case PT_PAX_FLAGS: {
67108+ const char *msg_mprotect = "", *msg_emutramp = "";
67109+ char *buffer_lib, *buffer_exe;
67110+
67111+ if (elf_p.p_flags & PF_NOMPROTECT)
67112+ msg_mprotect = "MPROTECT disabled";
67113+
67114+#ifdef CONFIG_PAX_EMUTRAMP
67115+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
67116+ msg_emutramp = "EMUTRAMP enabled";
67117+#endif
67118+
67119+ if (!msg_mprotect[0] && !msg_emutramp[0])
67120+ continue;
67121+
67122+ if (!printk_ratelimit())
67123+ continue;
67124+
67125+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
67126+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
67127+ if (buffer_lib && buffer_exe) {
67128+ char *path_lib, *path_exe;
67129+
67130+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
67131+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
67132+
67133+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
67134+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
67135+
67136+ }
67137+ free_page((unsigned long)buffer_exe);
67138+ free_page((unsigned long)buffer_lib);
67139+ continue;
67140+ }
67141+#endif
67142+
67143+ }
67144+ }
67145+}
67146+#endif
67147+
67148+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
67149+
67150+extern int grsec_enable_log_rwxmaps;
67151+
67152+static void elf_handle_mmap(struct file *file)
67153+{
67154+ struct elfhdr elf_h;
67155+ struct elf_phdr elf_p;
67156+ unsigned long i;
67157+
67158+ if (!grsec_enable_log_rwxmaps)
67159+ return;
67160+
67161+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
67162+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
67163+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
67164+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
67165+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
67166+ return;
67167+
67168+ for (i = 0UL; i < elf_h.e_phnum; i++) {
67169+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
67170+ return;
67171+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
67172+ gr_log_ptgnustack(file);
67173+ }
67174+}
67175+#endif
67176+
67177 static int __init init_elf_binfmt(void)
67178 {
67179 register_binfmt(&elf_format);
67180diff --git a/fs/block_dev.c b/fs/block_dev.c
67181index 975266b..c3d1856 100644
67182--- a/fs/block_dev.c
67183+++ b/fs/block_dev.c
67184@@ -734,7 +734,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
67185 else if (bdev->bd_contains == bdev)
67186 return true; /* is a whole device which isn't held */
67187
67188- else if (whole->bd_holder == bd_may_claim)
67189+ else if (whole->bd_holder == (void *)bd_may_claim)
67190 return true; /* is a partition of a device that is being partitioned */
67191 else if (whole->bd_holder != NULL)
67192 return false; /* is a partition of a held device */
67193diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
67194index 6d67f32..8f33187 100644
67195--- a/fs/btrfs/ctree.c
67196+++ b/fs/btrfs/ctree.c
67197@@ -1181,9 +1181,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
67198 free_extent_buffer(buf);
67199 add_root_to_dirty_list(root);
67200 } else {
67201- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
67202- parent_start = parent->start;
67203- else
67204+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
67205+ if (parent)
67206+ parent_start = parent->start;
67207+ else
67208+ parent_start = 0;
67209+ } else
67210 parent_start = 0;
67211
67212 WARN_ON(trans->transid != btrfs_header_generation(parent));
67213diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
67214index 82f0c7c..dff78a8 100644
67215--- a/fs/btrfs/delayed-inode.c
67216+++ b/fs/btrfs/delayed-inode.c
67217@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
67218
67219 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
67220 {
67221- int seq = atomic_inc_return(&delayed_root->items_seq);
67222+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
67223 if ((atomic_dec_return(&delayed_root->items) <
67224 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
67225 waitqueue_active(&delayed_root->wait))
67226@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
67227
67228 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
67229 {
67230- int val = atomic_read(&delayed_root->items_seq);
67231+ int val = atomic_read_unchecked(&delayed_root->items_seq);
67232
67233 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
67234 return 1;
67235@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
67236 int seq;
67237 int ret;
67238
67239- seq = atomic_read(&delayed_root->items_seq);
67240+ seq = atomic_read_unchecked(&delayed_root->items_seq);
67241
67242 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
67243 if (ret)
67244diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
67245index f70119f..ab5894d 100644
67246--- a/fs/btrfs/delayed-inode.h
67247+++ b/fs/btrfs/delayed-inode.h
67248@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
67249 */
67250 struct list_head prepare_list;
67251 atomic_t items; /* for delayed items */
67252- atomic_t items_seq; /* for delayed items */
67253+ atomic_unchecked_t items_seq; /* for delayed items */
67254 int nodes; /* for delayed nodes */
67255 wait_queue_head_t wait;
67256 };
67257@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
67258 struct btrfs_delayed_root *delayed_root)
67259 {
67260 atomic_set(&delayed_root->items, 0);
67261- atomic_set(&delayed_root->items_seq, 0);
67262+ atomic_set_unchecked(&delayed_root->items_seq, 0);
67263 delayed_root->nodes = 0;
67264 spin_lock_init(&delayed_root->lock);
67265 init_waitqueue_head(&delayed_root->wait);
67266diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
67267index 05fef19..f3774b8 100644
67268--- a/fs/btrfs/super.c
67269+++ b/fs/btrfs/super.c
67270@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
67271 function, line, errstr);
67272 return;
67273 }
67274- ACCESS_ONCE(trans->transaction->aborted) = errno;
67275+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
67276 /* Wake up anybody who may be waiting on this transaction */
67277 wake_up(&root->fs_info->transaction_wait);
67278 wake_up(&root->fs_info->transaction_blocked_wait);
67279diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
67280index 94edb0a..e94dc93 100644
67281--- a/fs/btrfs/sysfs.c
67282+++ b/fs/btrfs/sysfs.c
67283@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
67284 for (set = 0; set < FEAT_MAX; set++) {
67285 int i;
67286 struct attribute *attrs[2];
67287- struct attribute_group agroup = {
67288+ attribute_group_no_const agroup = {
67289 .name = "features",
67290 .attrs = attrs,
67291 };
67292diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
67293index 2299bfd..4098e72 100644
67294--- a/fs/btrfs/tests/free-space-tests.c
67295+++ b/fs/btrfs/tests/free-space-tests.c
67296@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
67297 * extent entry.
67298 */
67299 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
67300- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
67301+ pax_open_kernel();
67302+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
67303+ pax_close_kernel();
67304
67305 /*
67306 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
67307@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
67308 if (ret)
67309 return ret;
67310
67311- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
67312+ pax_open_kernel();
67313+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
67314+ pax_close_kernel();
67315 __btrfs_remove_free_space_cache(cache->free_space_ctl);
67316
67317 return 0;
67318diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
67319index 154990c..d0cf699 100644
67320--- a/fs/btrfs/tree-log.h
67321+++ b/fs/btrfs/tree-log.h
67322@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
67323 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
67324 struct btrfs_trans_handle *trans)
67325 {
67326- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
67327+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
67328 }
67329
67330 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
67331diff --git a/fs/buffer.c b/fs/buffer.c
67332index 20805db..2e8fc69 100644
67333--- a/fs/buffer.c
67334+++ b/fs/buffer.c
67335@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
67336 bh_cachep = kmem_cache_create("buffer_head",
67337 sizeof(struct buffer_head), 0,
67338 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
67339- SLAB_MEM_SPREAD),
67340+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
67341 NULL);
67342
67343 /*
67344diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
67345index fbb08e9..0fda764 100644
67346--- a/fs/cachefiles/bind.c
67347+++ b/fs/cachefiles/bind.c
67348@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
67349 args);
67350
67351 /* start by checking things over */
67352- ASSERT(cache->fstop_percent >= 0 &&
67353- cache->fstop_percent < cache->fcull_percent &&
67354+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
67355 cache->fcull_percent < cache->frun_percent &&
67356 cache->frun_percent < 100);
67357
67358- ASSERT(cache->bstop_percent >= 0 &&
67359- cache->bstop_percent < cache->bcull_percent &&
67360+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
67361 cache->bcull_percent < cache->brun_percent &&
67362 cache->brun_percent < 100);
67363
67364diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
67365index f601def..b2cf704 100644
67366--- a/fs/cachefiles/daemon.c
67367+++ b/fs/cachefiles/daemon.c
67368@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
67369 if (n > buflen)
67370 return -EMSGSIZE;
67371
67372- if (copy_to_user(_buffer, buffer, n) != 0)
67373+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
67374 return -EFAULT;
67375
67376 return n;
67377@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
67378 if (test_bit(CACHEFILES_DEAD, &cache->flags))
67379 return -EIO;
67380
67381- if (datalen < 0 || datalen > PAGE_SIZE - 1)
67382+ if (datalen > PAGE_SIZE - 1)
67383 return -EOPNOTSUPP;
67384
67385 /* drag the command string into the kernel so we can parse it */
67386@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
67387 if (args[0] != '%' || args[1] != '\0')
67388 return -EINVAL;
67389
67390- if (fstop < 0 || fstop >= cache->fcull_percent)
67391+ if (fstop >= cache->fcull_percent)
67392 return cachefiles_daemon_range_error(cache, args);
67393
67394 cache->fstop_percent = fstop;
67395@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
67396 if (args[0] != '%' || args[1] != '\0')
67397 return -EINVAL;
67398
67399- if (bstop < 0 || bstop >= cache->bcull_percent)
67400+ if (bstop >= cache->bcull_percent)
67401 return cachefiles_daemon_range_error(cache, args);
67402
67403 cache->bstop_percent = bstop;
67404diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
67405index 8c52472..c4e3a69 100644
67406--- a/fs/cachefiles/internal.h
67407+++ b/fs/cachefiles/internal.h
67408@@ -66,7 +66,7 @@ struct cachefiles_cache {
67409 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
67410 struct rb_root active_nodes; /* active nodes (can't be culled) */
67411 rwlock_t active_lock; /* lock for active_nodes */
67412- atomic_t gravecounter; /* graveyard uniquifier */
67413+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
67414 unsigned frun_percent; /* when to stop culling (% files) */
67415 unsigned fcull_percent; /* when to start culling (% files) */
67416 unsigned fstop_percent; /* when to stop allocating (% files) */
67417@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
67418 * proc.c
67419 */
67420 #ifdef CONFIG_CACHEFILES_HISTOGRAM
67421-extern atomic_t cachefiles_lookup_histogram[HZ];
67422-extern atomic_t cachefiles_mkdir_histogram[HZ];
67423-extern atomic_t cachefiles_create_histogram[HZ];
67424+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
67425+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
67426+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
67427
67428 extern int __init cachefiles_proc_init(void);
67429 extern void cachefiles_proc_cleanup(void);
67430 static inline
67431-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
67432+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
67433 {
67434 unsigned long jif = jiffies - start_jif;
67435 if (jif >= HZ)
67436 jif = HZ - 1;
67437- atomic_inc(&histogram[jif]);
67438+ atomic_inc_unchecked(&histogram[jif]);
67439 }
67440
67441 #else
67442diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
67443index 1e51714..411eded 100644
67444--- a/fs/cachefiles/namei.c
67445+++ b/fs/cachefiles/namei.c
67446@@ -309,7 +309,7 @@ try_again:
67447 /* first step is to make up a grave dentry in the graveyard */
67448 sprintf(nbuffer, "%08x%08x",
67449 (uint32_t) get_seconds(),
67450- (uint32_t) atomic_inc_return(&cache->gravecounter));
67451+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
67452
67453 /* do the multiway lock magic */
67454 trap = lock_rename(cache->graveyard, dir);
67455diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
67456index eccd339..4c1d995 100644
67457--- a/fs/cachefiles/proc.c
67458+++ b/fs/cachefiles/proc.c
67459@@ -14,9 +14,9 @@
67460 #include <linux/seq_file.h>
67461 #include "internal.h"
67462
67463-atomic_t cachefiles_lookup_histogram[HZ];
67464-atomic_t cachefiles_mkdir_histogram[HZ];
67465-atomic_t cachefiles_create_histogram[HZ];
67466+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
67467+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
67468+atomic_unchecked_t cachefiles_create_histogram[HZ];
67469
67470 /*
67471 * display the latency histogram
67472@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
67473 return 0;
67474 default:
67475 index = (unsigned long) v - 3;
67476- x = atomic_read(&cachefiles_lookup_histogram[index]);
67477- y = atomic_read(&cachefiles_mkdir_histogram[index]);
67478- z = atomic_read(&cachefiles_create_histogram[index]);
67479+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
67480+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
67481+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
67482 if (x == 0 && y == 0 && z == 0)
67483 return 0;
67484
67485diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
67486index 83e9976..bfd1eee 100644
67487--- a/fs/ceph/dir.c
67488+++ b/fs/ceph/dir.c
67489@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
67490 struct dentry *dentry, *last;
67491 struct ceph_dentry_info *di;
67492 int err = 0;
67493+ char d_name[DNAME_INLINE_LEN];
67494+ const unsigned char *name;
67495
67496 /* claim ref on last dentry we returned */
67497 last = fi->dentry;
67498@@ -190,7 +192,12 @@ more:
67499
67500 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
67501 dentry, dentry, dentry->d_inode);
67502- if (!dir_emit(ctx, dentry->d_name.name,
67503+ name = dentry->d_name.name;
67504+ if (name == dentry->d_iname) {
67505+ memcpy(d_name, name, dentry->d_name.len);
67506+ name = d_name;
67507+ }
67508+ if (!dir_emit(ctx, name,
67509 dentry->d_name.len,
67510 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
67511 dentry->d_inode->i_mode >> 12)) {
67512@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
67513 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
67514 struct ceph_mds_client *mdsc = fsc->mdsc;
67515 unsigned frag = fpos_frag(ctx->pos);
67516- int off = fpos_off(ctx->pos);
67517+ unsigned int off = fpos_off(ctx->pos);
67518 int err;
67519 u32 ftype;
67520 struct ceph_mds_reply_info_parsed *rinfo;
67521diff --git a/fs/ceph/super.c b/fs/ceph/super.c
67522index a63997b..ddc0577 100644
67523--- a/fs/ceph/super.c
67524+++ b/fs/ceph/super.c
67525@@ -889,7 +889,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
67526 /*
67527 * construct our own bdi so we can control readahead, etc.
67528 */
67529-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
67530+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
67531
67532 static int ceph_register_bdi(struct super_block *sb,
67533 struct ceph_fs_client *fsc)
67534@@ -906,7 +906,7 @@ static int ceph_register_bdi(struct super_block *sb,
67535 VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
67536
67537 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
67538- atomic_long_inc_return(&bdi_seq));
67539+ atomic_long_inc_return_unchecked(&bdi_seq));
67540 if (!err)
67541 sb->s_bdi = &fsc->backing_dev_info;
67542 return err;
67543diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
67544index 7febcf2..62a5721 100644
67545--- a/fs/cifs/cifs_debug.c
67546+++ b/fs/cifs/cifs_debug.c
67547@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
67548
67549 if (strtobool(&c, &bv) == 0) {
67550 #ifdef CONFIG_CIFS_STATS2
67551- atomic_set(&totBufAllocCount, 0);
67552- atomic_set(&totSmBufAllocCount, 0);
67553+ atomic_set_unchecked(&totBufAllocCount, 0);
67554+ atomic_set_unchecked(&totSmBufAllocCount, 0);
67555 #endif /* CONFIG_CIFS_STATS2 */
67556 spin_lock(&cifs_tcp_ses_lock);
67557 list_for_each(tmp1, &cifs_tcp_ses_list) {
67558@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
67559 tcon = list_entry(tmp3,
67560 struct cifs_tcon,
67561 tcon_list);
67562- atomic_set(&tcon->num_smbs_sent, 0);
67563+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
67564 if (server->ops->clear_stats)
67565 server->ops->clear_stats(tcon);
67566 }
67567@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
67568 smBufAllocCount.counter, cifs_min_small);
67569 #ifdef CONFIG_CIFS_STATS2
67570 seq_printf(m, "Total Large %d Small %d Allocations\n",
67571- atomic_read(&totBufAllocCount),
67572- atomic_read(&totSmBufAllocCount));
67573+ atomic_read_unchecked(&totBufAllocCount),
67574+ atomic_read_unchecked(&totSmBufAllocCount));
67575 #endif /* CONFIG_CIFS_STATS2 */
67576
67577 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
67578@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
67579 if (tcon->need_reconnect)
67580 seq_puts(m, "\tDISCONNECTED ");
67581 seq_printf(m, "\nSMBs: %d",
67582- atomic_read(&tcon->num_smbs_sent));
67583+ atomic_read_unchecked(&tcon->num_smbs_sent));
67584 if (server->ops->print_stats)
67585 server->ops->print_stats(m, tcon);
67586 }
67587diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
67588index d72fe37..ded5511 100644
67589--- a/fs/cifs/cifsfs.c
67590+++ b/fs/cifs/cifsfs.c
67591@@ -1092,7 +1092,7 @@ cifs_init_request_bufs(void)
67592 */
67593 cifs_req_cachep = kmem_cache_create("cifs_request",
67594 CIFSMaxBufSize + max_hdr_size, 0,
67595- SLAB_HWCACHE_ALIGN, NULL);
67596+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
67597 if (cifs_req_cachep == NULL)
67598 return -ENOMEM;
67599
67600@@ -1119,7 +1119,7 @@ cifs_init_request_bufs(void)
67601 efficient to alloc 1 per page off the slab compared to 17K (5page)
67602 alloc of large cifs buffers even when page debugging is on */
67603 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
67604- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
67605+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
67606 NULL);
67607 if (cifs_sm_req_cachep == NULL) {
67608 mempool_destroy(cifs_req_poolp);
67609@@ -1204,8 +1204,8 @@ init_cifs(void)
67610 atomic_set(&bufAllocCount, 0);
67611 atomic_set(&smBufAllocCount, 0);
67612 #ifdef CONFIG_CIFS_STATS2
67613- atomic_set(&totBufAllocCount, 0);
67614- atomic_set(&totSmBufAllocCount, 0);
67615+ atomic_set_unchecked(&totBufAllocCount, 0);
67616+ atomic_set_unchecked(&totSmBufAllocCount, 0);
67617 #endif /* CONFIG_CIFS_STATS2 */
67618
67619 atomic_set(&midCount, 0);
67620diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
67621index 22b289a..bbbba082 100644
67622--- a/fs/cifs/cifsglob.h
67623+++ b/fs/cifs/cifsglob.h
67624@@ -823,35 +823,35 @@ struct cifs_tcon {
67625 __u16 Flags; /* optional support bits */
67626 enum statusEnum tidStatus;
67627 #ifdef CONFIG_CIFS_STATS
67628- atomic_t num_smbs_sent;
67629+ atomic_unchecked_t num_smbs_sent;
67630 union {
67631 struct {
67632- atomic_t num_writes;
67633- atomic_t num_reads;
67634- atomic_t num_flushes;
67635- atomic_t num_oplock_brks;
67636- atomic_t num_opens;
67637- atomic_t num_closes;
67638- atomic_t num_deletes;
67639- atomic_t num_mkdirs;
67640- atomic_t num_posixopens;
67641- atomic_t num_posixmkdirs;
67642- atomic_t num_rmdirs;
67643- atomic_t num_renames;
67644- atomic_t num_t2renames;
67645- atomic_t num_ffirst;
67646- atomic_t num_fnext;
67647- atomic_t num_fclose;
67648- atomic_t num_hardlinks;
67649- atomic_t num_symlinks;
67650- atomic_t num_locks;
67651- atomic_t num_acl_get;
67652- atomic_t num_acl_set;
67653+ atomic_unchecked_t num_writes;
67654+ atomic_unchecked_t num_reads;
67655+ atomic_unchecked_t num_flushes;
67656+ atomic_unchecked_t num_oplock_brks;
67657+ atomic_unchecked_t num_opens;
67658+ atomic_unchecked_t num_closes;
67659+ atomic_unchecked_t num_deletes;
67660+ atomic_unchecked_t num_mkdirs;
67661+ atomic_unchecked_t num_posixopens;
67662+ atomic_unchecked_t num_posixmkdirs;
67663+ atomic_unchecked_t num_rmdirs;
67664+ atomic_unchecked_t num_renames;
67665+ atomic_unchecked_t num_t2renames;
67666+ atomic_unchecked_t num_ffirst;
67667+ atomic_unchecked_t num_fnext;
67668+ atomic_unchecked_t num_fclose;
67669+ atomic_unchecked_t num_hardlinks;
67670+ atomic_unchecked_t num_symlinks;
67671+ atomic_unchecked_t num_locks;
67672+ atomic_unchecked_t num_acl_get;
67673+ atomic_unchecked_t num_acl_set;
67674 } cifs_stats;
67675 #ifdef CONFIG_CIFS_SMB2
67676 struct {
67677- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
67678- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
67679+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
67680+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
67681 } smb2_stats;
67682 #endif /* CONFIG_CIFS_SMB2 */
67683 } stats;
67684@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
67685 }
67686
67687 #ifdef CONFIG_CIFS_STATS
67688-#define cifs_stats_inc atomic_inc
67689+#define cifs_stats_inc atomic_inc_unchecked
67690
67691 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
67692 unsigned int bytes)
67693@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
67694 /* Various Debug counters */
67695 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
67696 #ifdef CONFIG_CIFS_STATS2
67697-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
67698-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
67699+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
67700+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
67701 #endif
67702 GLOBAL_EXTERN atomic_t smBufAllocCount;
67703 GLOBAL_EXTERN atomic_t midCount;
67704diff --git a/fs/cifs/file.c b/fs/cifs/file.c
67705index ca30c39..570fb94 100644
67706--- a/fs/cifs/file.c
67707+++ b/fs/cifs/file.c
67708@@ -2055,10 +2055,14 @@ static int cifs_writepages(struct address_space *mapping,
67709 index = mapping->writeback_index; /* Start from prev offset */
67710 end = -1;
67711 } else {
67712- index = wbc->range_start >> PAGE_CACHE_SHIFT;
67713- end = wbc->range_end >> PAGE_CACHE_SHIFT;
67714- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
67715+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
67716 range_whole = true;
67717+ index = 0;
67718+ end = ULONG_MAX;
67719+ } else {
67720+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
67721+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
67722+ }
67723 scanned = true;
67724 }
67725 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
67726diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
67727index 3379463..3af418a 100644
67728--- a/fs/cifs/misc.c
67729+++ b/fs/cifs/misc.c
67730@@ -170,7 +170,7 @@ cifs_buf_get(void)
67731 memset(ret_buf, 0, buf_size + 3);
67732 atomic_inc(&bufAllocCount);
67733 #ifdef CONFIG_CIFS_STATS2
67734- atomic_inc(&totBufAllocCount);
67735+ atomic_inc_unchecked(&totBufAllocCount);
67736 #endif /* CONFIG_CIFS_STATS2 */
67737 }
67738
67739@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
67740 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
67741 atomic_inc(&smBufAllocCount);
67742 #ifdef CONFIG_CIFS_STATS2
67743- atomic_inc(&totSmBufAllocCount);
67744+ atomic_inc_unchecked(&totSmBufAllocCount);
67745 #endif /* CONFIG_CIFS_STATS2 */
67746
67747 }
67748diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
67749index d297903..1cb7516 100644
67750--- a/fs/cifs/smb1ops.c
67751+++ b/fs/cifs/smb1ops.c
67752@@ -622,27 +622,27 @@ static void
67753 cifs_clear_stats(struct cifs_tcon *tcon)
67754 {
67755 #ifdef CONFIG_CIFS_STATS
67756- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
67757- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
67758- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
67759- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
67760- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
67761- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
67762- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
67763- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
67764- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
67765- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
67766- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
67767- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
67768- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
67769- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
67770- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
67771- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
67772- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
67773- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
67774- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
67775- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
67776- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
67777+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
67778+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
67779+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
67780+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
67781+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
67782+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
67783+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
67784+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
67785+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
67786+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
67787+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
67788+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
67789+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
67790+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
67791+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
67792+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
67793+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
67794+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
67795+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
67796+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
67797+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
67798 #endif
67799 }
67800
67801@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
67802 {
67803 #ifdef CONFIG_CIFS_STATS
67804 seq_printf(m, " Oplocks breaks: %d",
67805- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
67806+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
67807 seq_printf(m, "\nReads: %d Bytes: %llu",
67808- atomic_read(&tcon->stats.cifs_stats.num_reads),
67809+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
67810 (long long)(tcon->bytes_read));
67811 seq_printf(m, "\nWrites: %d Bytes: %llu",
67812- atomic_read(&tcon->stats.cifs_stats.num_writes),
67813+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
67814 (long long)(tcon->bytes_written));
67815 seq_printf(m, "\nFlushes: %d",
67816- atomic_read(&tcon->stats.cifs_stats.num_flushes));
67817+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
67818 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
67819- atomic_read(&tcon->stats.cifs_stats.num_locks),
67820- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
67821- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
67822+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
67823+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
67824+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
67825 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
67826- atomic_read(&tcon->stats.cifs_stats.num_opens),
67827- atomic_read(&tcon->stats.cifs_stats.num_closes),
67828- atomic_read(&tcon->stats.cifs_stats.num_deletes));
67829+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
67830+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
67831+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
67832 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
67833- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
67834- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
67835+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
67836+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
67837 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
67838- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
67839- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
67840+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
67841+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
67842 seq_printf(m, "\nRenames: %d T2 Renames %d",
67843- atomic_read(&tcon->stats.cifs_stats.num_renames),
67844- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
67845+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
67846+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
67847 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
67848- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
67849- atomic_read(&tcon->stats.cifs_stats.num_fnext),
67850- atomic_read(&tcon->stats.cifs_stats.num_fclose));
67851+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
67852+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
67853+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
67854 #endif
67855 }
67856
67857diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
67858index eab05e1..ffe5ea4 100644
67859--- a/fs/cifs/smb2ops.c
67860+++ b/fs/cifs/smb2ops.c
67861@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
67862 #ifdef CONFIG_CIFS_STATS
67863 int i;
67864 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
67865- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
67866- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
67867+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
67868+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
67869 }
67870 #endif
67871 }
67872@@ -459,65 +459,65 @@ static void
67873 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
67874 {
67875 #ifdef CONFIG_CIFS_STATS
67876- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
67877- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
67878+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
67879+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
67880 seq_printf(m, "\nNegotiates: %d sent %d failed",
67881- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
67882- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
67883+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
67884+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
67885 seq_printf(m, "\nSessionSetups: %d sent %d failed",
67886- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
67887- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
67888+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
67889+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
67890 seq_printf(m, "\nLogoffs: %d sent %d failed",
67891- atomic_read(&sent[SMB2_LOGOFF_HE]),
67892- atomic_read(&failed[SMB2_LOGOFF_HE]));
67893+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
67894+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
67895 seq_printf(m, "\nTreeConnects: %d sent %d failed",
67896- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
67897- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
67898+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
67899+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
67900 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
67901- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
67902- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
67903+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
67904+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
67905 seq_printf(m, "\nCreates: %d sent %d failed",
67906- atomic_read(&sent[SMB2_CREATE_HE]),
67907- atomic_read(&failed[SMB2_CREATE_HE]));
67908+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
67909+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
67910 seq_printf(m, "\nCloses: %d sent %d failed",
67911- atomic_read(&sent[SMB2_CLOSE_HE]),
67912- atomic_read(&failed[SMB2_CLOSE_HE]));
67913+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
67914+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
67915 seq_printf(m, "\nFlushes: %d sent %d failed",
67916- atomic_read(&sent[SMB2_FLUSH_HE]),
67917- atomic_read(&failed[SMB2_FLUSH_HE]));
67918+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
67919+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
67920 seq_printf(m, "\nReads: %d sent %d failed",
67921- atomic_read(&sent[SMB2_READ_HE]),
67922- atomic_read(&failed[SMB2_READ_HE]));
67923+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
67924+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
67925 seq_printf(m, "\nWrites: %d sent %d failed",
67926- atomic_read(&sent[SMB2_WRITE_HE]),
67927- atomic_read(&failed[SMB2_WRITE_HE]));
67928+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
67929+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
67930 seq_printf(m, "\nLocks: %d sent %d failed",
67931- atomic_read(&sent[SMB2_LOCK_HE]),
67932- atomic_read(&failed[SMB2_LOCK_HE]));
67933+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
67934+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
67935 seq_printf(m, "\nIOCTLs: %d sent %d failed",
67936- atomic_read(&sent[SMB2_IOCTL_HE]),
67937- atomic_read(&failed[SMB2_IOCTL_HE]));
67938+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
67939+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
67940 seq_printf(m, "\nCancels: %d sent %d failed",
67941- atomic_read(&sent[SMB2_CANCEL_HE]),
67942- atomic_read(&failed[SMB2_CANCEL_HE]));
67943+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
67944+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
67945 seq_printf(m, "\nEchos: %d sent %d failed",
67946- atomic_read(&sent[SMB2_ECHO_HE]),
67947- atomic_read(&failed[SMB2_ECHO_HE]));
67948+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
67949+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
67950 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
67951- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
67952- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
67953+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
67954+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
67955 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
67956- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
67957- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
67958+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
67959+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
67960 seq_printf(m, "\nQueryInfos: %d sent %d failed",
67961- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
67962- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
67963+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
67964+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
67965 seq_printf(m, "\nSetInfos: %d sent %d failed",
67966- atomic_read(&sent[SMB2_SET_INFO_HE]),
67967- atomic_read(&failed[SMB2_SET_INFO_HE]));
67968+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
67969+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
67970 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
67971- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
67972- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
67973+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
67974+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
67975 #endif
67976 }
67977
67978diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
67979index 65cd7a8..3518676 100644
67980--- a/fs/cifs/smb2pdu.c
67981+++ b/fs/cifs/smb2pdu.c
67982@@ -2147,8 +2147,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
67983 default:
67984 cifs_dbg(VFS, "info level %u isn't supported\n",
67985 srch_inf->info_level);
67986- rc = -EINVAL;
67987- goto qdir_exit;
67988+ return -EINVAL;
67989 }
67990
67991 req->FileIndex = cpu_to_le32(index);
67992diff --git a/fs/coda/cache.c b/fs/coda/cache.c
67993index 46ee6f2..89a9e7f 100644
67994--- a/fs/coda/cache.c
67995+++ b/fs/coda/cache.c
67996@@ -24,7 +24,7 @@
67997 #include "coda_linux.h"
67998 #include "coda_cache.h"
67999
68000-static atomic_t permission_epoch = ATOMIC_INIT(0);
68001+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
68002
68003 /* replace or extend an acl cache hit */
68004 void coda_cache_enter(struct inode *inode, int mask)
68005@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
68006 struct coda_inode_info *cii = ITOC(inode);
68007
68008 spin_lock(&cii->c_lock);
68009- cii->c_cached_epoch = atomic_read(&permission_epoch);
68010+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
68011 if (!uid_eq(cii->c_uid, current_fsuid())) {
68012 cii->c_uid = current_fsuid();
68013 cii->c_cached_perm = mask;
68014@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
68015 {
68016 struct coda_inode_info *cii = ITOC(inode);
68017 spin_lock(&cii->c_lock);
68018- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
68019+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
68020 spin_unlock(&cii->c_lock);
68021 }
68022
68023 /* remove all acl caches */
68024 void coda_cache_clear_all(struct super_block *sb)
68025 {
68026- atomic_inc(&permission_epoch);
68027+ atomic_inc_unchecked(&permission_epoch);
68028 }
68029
68030
68031@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
68032 spin_lock(&cii->c_lock);
68033 hit = (mask & cii->c_cached_perm) == mask &&
68034 uid_eq(cii->c_uid, current_fsuid()) &&
68035- cii->c_cached_epoch == atomic_read(&permission_epoch);
68036+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
68037 spin_unlock(&cii->c_lock);
68038
68039 return hit;
68040diff --git a/fs/compat.c b/fs/compat.c
68041index 6fd272d..dd34ba2 100644
68042--- a/fs/compat.c
68043+++ b/fs/compat.c
68044@@ -54,7 +54,7 @@
68045 #include <asm/ioctls.h>
68046 #include "internal.h"
68047
68048-int compat_log = 1;
68049+int compat_log = 0;
68050
68051 int compat_printk(const char *fmt, ...)
68052 {
68053@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
68054
68055 set_fs(KERNEL_DS);
68056 /* The __user pointer cast is valid because of the set_fs() */
68057- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
68058+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
68059 set_fs(oldfs);
68060 /* truncating is ok because it's a user address */
68061 if (!ret)
68062@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
68063 goto out;
68064
68065 ret = -EINVAL;
68066- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
68067+ if (nr_segs > UIO_MAXIOV)
68068 goto out;
68069 if (nr_segs > fast_segs) {
68070 ret = -ENOMEM;
68071@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
68072 struct compat_readdir_callback {
68073 struct dir_context ctx;
68074 struct compat_old_linux_dirent __user *dirent;
68075+ struct file * file;
68076 int result;
68077 };
68078
68079@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
68080 buf->result = -EOVERFLOW;
68081 return -EOVERFLOW;
68082 }
68083+
68084+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68085+ return 0;
68086+
68087 buf->result++;
68088 dirent = buf->dirent;
68089 if (!access_ok(VERIFY_WRITE, dirent,
68090@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
68091 if (!f.file)
68092 return -EBADF;
68093
68094+ buf.file = f.file;
68095 error = iterate_dir(f.file, &buf.ctx);
68096 if (buf.result)
68097 error = buf.result;
68098@@ -913,6 +919,7 @@ struct compat_getdents_callback {
68099 struct dir_context ctx;
68100 struct compat_linux_dirent __user *current_dir;
68101 struct compat_linux_dirent __user *previous;
68102+ struct file * file;
68103 int count;
68104 int error;
68105 };
68106@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
68107 buf->error = -EOVERFLOW;
68108 return -EOVERFLOW;
68109 }
68110+
68111+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68112+ return 0;
68113+
68114 dirent = buf->previous;
68115 if (dirent) {
68116 if (__put_user(offset, &dirent->d_off))
68117@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
68118 if (!f.file)
68119 return -EBADF;
68120
68121+ buf.file = f.file;
68122 error = iterate_dir(f.file, &buf.ctx);
68123 if (error >= 0)
68124 error = buf.error;
68125@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
68126 struct dir_context ctx;
68127 struct linux_dirent64 __user *current_dir;
68128 struct linux_dirent64 __user *previous;
68129+ struct file * file;
68130 int count;
68131 int error;
68132 };
68133@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
68134 buf->error = -EINVAL; /* only used if we fail.. */
68135 if (reclen > buf->count)
68136 return -EINVAL;
68137+
68138+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68139+ return 0;
68140+
68141 dirent = buf->previous;
68142
68143 if (dirent) {
68144@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
68145 if (!f.file)
68146 return -EBADF;
68147
68148+ buf.file = f.file;
68149 error = iterate_dir(f.file, &buf.ctx);
68150 if (error >= 0)
68151 error = buf.error;
68152diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
68153index 4d24d17..4f8c09e 100644
68154--- a/fs/compat_binfmt_elf.c
68155+++ b/fs/compat_binfmt_elf.c
68156@@ -30,11 +30,13 @@
68157 #undef elf_phdr
68158 #undef elf_shdr
68159 #undef elf_note
68160+#undef elf_dyn
68161 #undef elf_addr_t
68162 #define elfhdr elf32_hdr
68163 #define elf_phdr elf32_phdr
68164 #define elf_shdr elf32_shdr
68165 #define elf_note elf32_note
68166+#define elf_dyn Elf32_Dyn
68167 #define elf_addr_t Elf32_Addr
68168
68169 /*
68170diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
68171index afec645..9c65620 100644
68172--- a/fs/compat_ioctl.c
68173+++ b/fs/compat_ioctl.c
68174@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
68175 return -EFAULT;
68176 if (__get_user(udata, &ss32->iomem_base))
68177 return -EFAULT;
68178- ss.iomem_base = compat_ptr(udata);
68179+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
68180 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
68181 __get_user(ss.port_high, &ss32->port_high))
68182 return -EFAULT;
68183@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
68184 for (i = 0; i < nmsgs; i++) {
68185 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
68186 return -EFAULT;
68187- if (get_user(datap, &umsgs[i].buf) ||
68188- put_user(compat_ptr(datap), &tmsgs[i].buf))
68189+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
68190+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
68191 return -EFAULT;
68192 }
68193 return sys_ioctl(fd, cmd, (unsigned long)tdata);
68194@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
68195 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
68196 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
68197 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
68198- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
68199+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
68200 return -EFAULT;
68201
68202 return ioctl_preallocate(file, p);
68203@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
68204 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
68205 {
68206 unsigned int a, b;
68207- a = *(unsigned int *)p;
68208- b = *(unsigned int *)q;
68209+ a = *(const unsigned int *)p;
68210+ b = *(const unsigned int *)q;
68211 if (a > b)
68212 return 1;
68213 if (a < b)
68214diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
68215index cf0db00..c7f70e8 100644
68216--- a/fs/configfs/dir.c
68217+++ b/fs/configfs/dir.c
68218@@ -1540,7 +1540,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
68219 }
68220 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
68221 struct configfs_dirent *next;
68222- const char *name;
68223+ const unsigned char * name;
68224+ char d_name[sizeof(next->s_dentry->d_iname)];
68225 int len;
68226 struct inode *inode = NULL;
68227
68228@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
68229 continue;
68230
68231 name = configfs_get_name(next);
68232- len = strlen(name);
68233+ if (next->s_dentry && name == next->s_dentry->d_iname) {
68234+ len = next->s_dentry->d_name.len;
68235+ memcpy(d_name, name, len);
68236+ name = d_name;
68237+ } else
68238+ len = strlen(name);
68239
68240 /*
68241 * We'll have a dentry and an inode for
68242diff --git a/fs/coredump.c b/fs/coredump.c
68243index bbbe139..b76fae5 100644
68244--- a/fs/coredump.c
68245+++ b/fs/coredump.c
68246@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
68247 struct pipe_inode_info *pipe = file->private_data;
68248
68249 pipe_lock(pipe);
68250- pipe->readers++;
68251- pipe->writers--;
68252+ atomic_inc(&pipe->readers);
68253+ atomic_dec(&pipe->writers);
68254 wake_up_interruptible_sync(&pipe->wait);
68255 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
68256 pipe_unlock(pipe);
68257@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
68258 * We actually want wait_event_freezable() but then we need
68259 * to clear TIF_SIGPENDING and improve dump_interrupted().
68260 */
68261- wait_event_interruptible(pipe->wait, pipe->readers == 1);
68262+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
68263
68264 pipe_lock(pipe);
68265- pipe->readers--;
68266- pipe->writers++;
68267+ atomic_dec(&pipe->readers);
68268+ atomic_inc(&pipe->writers);
68269 pipe_unlock(pipe);
68270 }
68271
68272@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
68273 struct files_struct *displaced;
68274 bool need_nonrelative = false;
68275 bool core_dumped = false;
68276- static atomic_t core_dump_count = ATOMIC_INIT(0);
68277+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
68278+ long signr = siginfo->si_signo;
68279+ int dumpable;
68280 struct coredump_params cprm = {
68281 .siginfo = siginfo,
68282 .regs = signal_pt_regs(),
68283@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
68284 .mm_flags = mm->flags,
68285 };
68286
68287- audit_core_dumps(siginfo->si_signo);
68288+ audit_core_dumps(signr);
68289+
68290+ dumpable = __get_dumpable(cprm.mm_flags);
68291+
68292+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
68293+ gr_handle_brute_attach(dumpable);
68294
68295 binfmt = mm->binfmt;
68296 if (!binfmt || !binfmt->core_dump)
68297 goto fail;
68298- if (!__get_dumpable(cprm.mm_flags))
68299+ if (!dumpable)
68300 goto fail;
68301
68302 cred = prepare_creds();
68303@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
68304 need_nonrelative = true;
68305 }
68306
68307- retval = coredump_wait(siginfo->si_signo, &core_state);
68308+ retval = coredump_wait(signr, &core_state);
68309 if (retval < 0)
68310 goto fail_creds;
68311
68312@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
68313 }
68314 cprm.limit = RLIM_INFINITY;
68315
68316- dump_count = atomic_inc_return(&core_dump_count);
68317+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
68318 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
68319 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
68320 task_tgid_vnr(current), current->comm);
68321@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
68322 } else {
68323 struct inode *inode;
68324
68325+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
68326+
68327 if (cprm.limit < binfmt->min_coredump)
68328 goto fail_unlock;
68329
68330@@ -681,7 +690,7 @@ close_fail:
68331 filp_close(cprm.file, NULL);
68332 fail_dropcount:
68333 if (ispipe)
68334- atomic_dec(&core_dump_count);
68335+ atomic_dec_unchecked(&core_dump_count);
68336 fail_unlock:
68337 kfree(cn.corename);
68338 coredump_finish(mm, core_dumped);
68339@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
68340 struct file *file = cprm->file;
68341 loff_t pos = file->f_pos;
68342 ssize_t n;
68343+
68344+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
68345 if (cprm->written + nr > cprm->limit)
68346 return 0;
68347 while (nr) {
68348diff --git a/fs/dcache.c b/fs/dcache.c
68349index 922f23e..05e38ae 100644
68350--- a/fs/dcache.c
68351+++ b/fs/dcache.c
68352@@ -511,7 +511,7 @@ static void __dentry_kill(struct dentry *dentry)
68353 * dentry_iput drops the locks, at which point nobody (except
68354 * transient RCU lookups) can reach this dentry.
68355 */
68356- BUG_ON(dentry->d_lockref.count > 0);
68357+ BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
68358 this_cpu_dec(nr_dentry);
68359 if (dentry->d_op && dentry->d_op->d_release)
68360 dentry->d_op->d_release(dentry);
68361@@ -564,7 +564,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
68362 struct dentry *parent = dentry->d_parent;
68363 if (IS_ROOT(dentry))
68364 return NULL;
68365- if (unlikely(dentry->d_lockref.count < 0))
68366+ if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
68367 return NULL;
68368 if (likely(spin_trylock(&parent->d_lock)))
68369 return parent;
68370@@ -626,8 +626,8 @@ static inline bool fast_dput(struct dentry *dentry)
68371 */
68372 if (unlikely(ret < 0)) {
68373 spin_lock(&dentry->d_lock);
68374- if (dentry->d_lockref.count > 1) {
68375- dentry->d_lockref.count--;
68376+ if (__lockref_read(&dentry->d_lockref) > 1) {
68377+ __lockref_dec(&dentry->d_lockref);
68378 spin_unlock(&dentry->d_lock);
68379 return 1;
68380 }
68381@@ -682,7 +682,7 @@ static inline bool fast_dput(struct dentry *dentry)
68382 * else could have killed it and marked it dead. Either way, we
68383 * don't need to do anything else.
68384 */
68385- if (dentry->d_lockref.count) {
68386+ if (__lockref_read(&dentry->d_lockref)) {
68387 spin_unlock(&dentry->d_lock);
68388 return 1;
68389 }
68390@@ -692,7 +692,7 @@ static inline bool fast_dput(struct dentry *dentry)
68391 * lock, and we just tested that it was zero, so we can just
68392 * set it to 1.
68393 */
68394- dentry->d_lockref.count = 1;
68395+ __lockref_set(&dentry->d_lockref, 1);
68396 return 0;
68397 }
68398
68399@@ -751,7 +751,7 @@ repeat:
68400 dentry->d_flags |= DCACHE_REFERENCED;
68401 dentry_lru_add(dentry);
68402
68403- dentry->d_lockref.count--;
68404+ __lockref_dec(&dentry->d_lockref);
68405 spin_unlock(&dentry->d_lock);
68406 return;
68407
68408@@ -766,7 +766,7 @@ EXPORT_SYMBOL(dput);
68409 /* This must be called with d_lock held */
68410 static inline void __dget_dlock(struct dentry *dentry)
68411 {
68412- dentry->d_lockref.count++;
68413+ __lockref_inc(&dentry->d_lockref);
68414 }
68415
68416 static inline void __dget(struct dentry *dentry)
68417@@ -807,8 +807,8 @@ repeat:
68418 goto repeat;
68419 }
68420 rcu_read_unlock();
68421- BUG_ON(!ret->d_lockref.count);
68422- ret->d_lockref.count++;
68423+ BUG_ON(!__lockref_read(&ret->d_lockref));
68424+ __lockref_inc(&ret->d_lockref);
68425 spin_unlock(&ret->d_lock);
68426 return ret;
68427 }
68428@@ -886,9 +886,9 @@ restart:
68429 spin_lock(&inode->i_lock);
68430 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
68431 spin_lock(&dentry->d_lock);
68432- if (!dentry->d_lockref.count) {
68433+ if (!__lockref_read(&dentry->d_lockref)) {
68434 struct dentry *parent = lock_parent(dentry);
68435- if (likely(!dentry->d_lockref.count)) {
68436+ if (likely(!__lockref_read(&dentry->d_lockref))) {
68437 __dentry_kill(dentry);
68438 dput(parent);
68439 goto restart;
68440@@ -923,7 +923,7 @@ static void shrink_dentry_list(struct list_head *list)
68441 * We found an inuse dentry which was not removed from
68442 * the LRU because of laziness during lookup. Do not free it.
68443 */
68444- if (dentry->d_lockref.count > 0) {
68445+ if (__lockref_read(&dentry->d_lockref) > 0) {
68446 spin_unlock(&dentry->d_lock);
68447 if (parent)
68448 spin_unlock(&parent->d_lock);
68449@@ -961,8 +961,8 @@ static void shrink_dentry_list(struct list_head *list)
68450 dentry = parent;
68451 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
68452 parent = lock_parent(dentry);
68453- if (dentry->d_lockref.count != 1) {
68454- dentry->d_lockref.count--;
68455+ if (__lockref_read(&dentry->d_lockref) != 1) {
68456+ __lockref_inc(&dentry->d_lockref);
68457 spin_unlock(&dentry->d_lock);
68458 if (parent)
68459 spin_unlock(&parent->d_lock);
68460@@ -1002,7 +1002,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
68461 * counts, just remove them from the LRU. Otherwise give them
68462 * another pass through the LRU.
68463 */
68464- if (dentry->d_lockref.count) {
68465+ if (__lockref_read(&dentry->d_lockref)) {
68466 d_lru_isolate(lru, dentry);
68467 spin_unlock(&dentry->d_lock);
68468 return LRU_REMOVED;
68469@@ -1336,7 +1336,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
68470 } else {
68471 if (dentry->d_flags & DCACHE_LRU_LIST)
68472 d_lru_del(dentry);
68473- if (!dentry->d_lockref.count) {
68474+ if (!__lockref_read(&dentry->d_lockref)) {
68475 d_shrink_add(dentry, &data->dispose);
68476 data->found++;
68477 }
68478@@ -1384,7 +1384,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
68479 return D_WALK_CONTINUE;
68480
68481 /* root with refcount 1 is fine */
68482- if (dentry == _data && dentry->d_lockref.count == 1)
68483+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
68484 return D_WALK_CONTINUE;
68485
68486 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
68487@@ -1393,7 +1393,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
68488 dentry->d_inode ?
68489 dentry->d_inode->i_ino : 0UL,
68490 dentry,
68491- dentry->d_lockref.count,
68492+ __lockref_read(&dentry->d_lockref),
68493 dentry->d_sb->s_type->name,
68494 dentry->d_sb->s_id);
68495 WARN_ON(1);
68496@@ -1534,7 +1534,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68497 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
68498 if (name->len > DNAME_INLINE_LEN-1) {
68499 size_t size = offsetof(struct external_name, name[1]);
68500- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
68501+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
68502 if (!p) {
68503 kmem_cache_free(dentry_cache, dentry);
68504 return NULL;
68505@@ -1557,7 +1557,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68506 smp_wmb();
68507 dentry->d_name.name = dname;
68508
68509- dentry->d_lockref.count = 1;
68510+ __lockref_set(&dentry->d_lockref, 1);
68511 dentry->d_flags = 0;
68512 spin_lock_init(&dentry->d_lock);
68513 seqcount_init(&dentry->d_seq);
68514@@ -1566,6 +1566,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68515 dentry->d_sb = sb;
68516 dentry->d_op = NULL;
68517 dentry->d_fsdata = NULL;
68518+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
68519+ atomic_set(&dentry->chroot_refcnt, 0);
68520+#endif
68521 INIT_HLIST_BL_NODE(&dentry->d_hash);
68522 INIT_LIST_HEAD(&dentry->d_lru);
68523 INIT_LIST_HEAD(&dentry->d_subdirs);
68524@@ -2290,7 +2293,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
68525 goto next;
68526 }
68527
68528- dentry->d_lockref.count++;
68529+ __lockref_inc(&dentry->d_lockref);
68530 found = dentry;
68531 spin_unlock(&dentry->d_lock);
68532 break;
68533@@ -2358,7 +2361,7 @@ again:
68534 spin_lock(&dentry->d_lock);
68535 inode = dentry->d_inode;
68536 isdir = S_ISDIR(inode->i_mode);
68537- if (dentry->d_lockref.count == 1) {
68538+ if (__lockref_read(&dentry->d_lockref) == 1) {
68539 if (!spin_trylock(&inode->i_lock)) {
68540 spin_unlock(&dentry->d_lock);
68541 cpu_relax();
68542@@ -3311,7 +3314,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
68543
68544 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
68545 dentry->d_flags |= DCACHE_GENOCIDE;
68546- dentry->d_lockref.count--;
68547+ __lockref_dec(&dentry->d_lockref);
68548 }
68549 }
68550 return D_WALK_CONTINUE;
68551@@ -3427,7 +3430,8 @@ void __init vfs_caches_init(unsigned long mempages)
68552 mempages -= reserve;
68553
68554 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
68555- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
68556+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
68557+ SLAB_NO_SANITIZE, NULL);
68558
68559 dcache_init();
68560 inode_init();
68561diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
68562index 96400ab..906103d 100644
68563--- a/fs/debugfs/inode.c
68564+++ b/fs/debugfs/inode.c
68565@@ -386,6 +386,10 @@ struct dentry *debugfs_create_file_size(const char *name, umode_t mode,
68566 }
68567 EXPORT_SYMBOL_GPL(debugfs_create_file_size);
68568
68569+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68570+extern int grsec_enable_sysfs_restrict;
68571+#endif
68572+
68573 /**
68574 * debugfs_create_dir - create a directory in the debugfs filesystem
68575 * @name: a pointer to a string containing the name of the directory to
68576@@ -404,6 +408,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
68577 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
68578 * returned.
68579 */
68580+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68581+extern int grsec_enable_sysfs_restrict;
68582+#endif
68583+
68584 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
68585 {
68586 struct dentry *dentry = start_creating(name, parent);
68587@@ -416,7 +424,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
68588 if (unlikely(!inode))
68589 return failed_creating(dentry);
68590
68591- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
68592+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68593+ if (grsec_enable_sysfs_restrict)
68594+ inode->i_mode = S_IFDIR | S_IRWXU;
68595+ else
68596+#endif
68597+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
68598 inode->i_op = &simple_dir_inode_operations;
68599 inode->i_fop = &simple_dir_operations;
68600
68601diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
68602index b08b518..d6acffa 100644
68603--- a/fs/ecryptfs/inode.c
68604+++ b/fs/ecryptfs/inode.c
68605@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
68606 old_fs = get_fs();
68607 set_fs(get_ds());
68608 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
68609- (char __user *)lower_buf,
68610+ (char __force_user *)lower_buf,
68611 PATH_MAX);
68612 set_fs(old_fs);
68613 if (rc < 0)
68614diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
68615index e4141f2..d8263e8 100644
68616--- a/fs/ecryptfs/miscdev.c
68617+++ b/fs/ecryptfs/miscdev.c
68618@@ -304,7 +304,7 @@ check_list:
68619 goto out_unlock_msg_ctx;
68620 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
68621 if (msg_ctx->msg) {
68622- if (copy_to_user(&buf[i], packet_length, packet_length_size))
68623+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
68624 goto out_unlock_msg_ctx;
68625 i += packet_length_size;
68626 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
68627diff --git a/fs/exec.c b/fs/exec.c
68628index 1202445..7a6fde9 100644
68629--- a/fs/exec.c
68630+++ b/fs/exec.c
68631@@ -56,8 +56,20 @@
68632 #include <linux/pipe_fs_i.h>
68633 #include <linux/oom.h>
68634 #include <linux/compat.h>
68635+#include <linux/random.h>
68636+#include <linux/seq_file.h>
68637+#include <linux/coredump.h>
68638+#include <linux/mman.h>
68639+
68640+#ifdef CONFIG_PAX_REFCOUNT
68641+#include <linux/kallsyms.h>
68642+#include <linux/kdebug.h>
68643+#endif
68644+
68645+#include <trace/events/fs.h>
68646
68647 #include <asm/uaccess.h>
68648+#include <asm/sections.h>
68649 #include <asm/mmu_context.h>
68650 #include <asm/tlb.h>
68651
68652@@ -66,19 +78,34 @@
68653
68654 #include <trace/events/sched.h>
68655
68656+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
68657+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
68658+{
68659+ 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");
68660+}
68661+#endif
68662+
68663+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
68664+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
68665+EXPORT_SYMBOL(pax_set_initial_flags_func);
68666+#endif
68667+
68668 int suid_dumpable = 0;
68669
68670 static LIST_HEAD(formats);
68671 static DEFINE_RWLOCK(binfmt_lock);
68672
68673+extern int gr_process_kernel_exec_ban(void);
68674+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
68675+
68676 void __register_binfmt(struct linux_binfmt * fmt, int insert)
68677 {
68678 BUG_ON(!fmt);
68679 if (WARN_ON(!fmt->load_binary))
68680 return;
68681 write_lock(&binfmt_lock);
68682- insert ? list_add(&fmt->lh, &formats) :
68683- list_add_tail(&fmt->lh, &formats);
68684+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
68685+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
68686 write_unlock(&binfmt_lock);
68687 }
68688
68689@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
68690 void unregister_binfmt(struct linux_binfmt * fmt)
68691 {
68692 write_lock(&binfmt_lock);
68693- list_del(&fmt->lh);
68694+ pax_list_del((struct list_head *)&fmt->lh);
68695 write_unlock(&binfmt_lock);
68696 }
68697
68698@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
68699 int write)
68700 {
68701 struct page *page;
68702- int ret;
68703
68704-#ifdef CONFIG_STACK_GROWSUP
68705- if (write) {
68706- ret = expand_downwards(bprm->vma, pos);
68707- if (ret < 0)
68708- return NULL;
68709- }
68710-#endif
68711- ret = get_user_pages(current, bprm->mm, pos,
68712- 1, write, 1, &page, NULL);
68713- if (ret <= 0)
68714+ if (0 > expand_downwards(bprm->vma, pos))
68715+ return NULL;
68716+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
68717 return NULL;
68718
68719 if (write) {
68720@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
68721 if (size <= ARG_MAX)
68722 return page;
68723
68724+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68725+ // only allow 512KB for argv+env on suid/sgid binaries
68726+ // to prevent easy ASLR exhaustion
68727+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
68728+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
68729+ (size > (512 * 1024))) {
68730+ put_page(page);
68731+ return NULL;
68732+ }
68733+#endif
68734+
68735 /*
68736 * Limit to 1/4-th the stack size for the argv+env strings.
68737 * This ensures that:
68738@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
68739 vma->vm_end = STACK_TOP_MAX;
68740 vma->vm_start = vma->vm_end - PAGE_SIZE;
68741 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
68742+
68743+#ifdef CONFIG_PAX_SEGMEXEC
68744+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
68745+#endif
68746+
68747 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
68748 INIT_LIST_HEAD(&vma->anon_vma_chain);
68749
68750@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
68751 arch_bprm_mm_init(mm, vma);
68752 up_write(&mm->mmap_sem);
68753 bprm->p = vma->vm_end - sizeof(void *);
68754+
68755+#ifdef CONFIG_PAX_RANDUSTACK
68756+ if (randomize_va_space)
68757+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
68758+#endif
68759+
68760 return 0;
68761 err:
68762 up_write(&mm->mmap_sem);
68763@@ -396,7 +437,7 @@ struct user_arg_ptr {
68764 } ptr;
68765 };
68766
68767-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68768+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68769 {
68770 const char __user *native;
68771
68772@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68773 compat_uptr_t compat;
68774
68775 if (get_user(compat, argv.ptr.compat + nr))
68776- return ERR_PTR(-EFAULT);
68777+ return (const char __force_user *)ERR_PTR(-EFAULT);
68778
68779 return compat_ptr(compat);
68780 }
68781 #endif
68782
68783 if (get_user(native, argv.ptr.native + nr))
68784- return ERR_PTR(-EFAULT);
68785+ return (const char __force_user *)ERR_PTR(-EFAULT);
68786
68787 return native;
68788 }
68789@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
68790 if (!p)
68791 break;
68792
68793- if (IS_ERR(p))
68794+ if (IS_ERR((const char __force_kernel *)p))
68795 return -EFAULT;
68796
68797 if (i >= max)
68798@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
68799
68800 ret = -EFAULT;
68801 str = get_user_arg_ptr(argv, argc);
68802- if (IS_ERR(str))
68803+ if (IS_ERR((const char __force_kernel *)str))
68804 goto out;
68805
68806 len = strnlen_user(str, MAX_ARG_STRLEN);
68807@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
68808 int r;
68809 mm_segment_t oldfs = get_fs();
68810 struct user_arg_ptr argv = {
68811- .ptr.native = (const char __user *const __user *)__argv,
68812+ .ptr.native = (const char __user * const __force_user *)__argv,
68813 };
68814
68815 set_fs(KERNEL_DS);
68816@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
68817 unsigned long new_end = old_end - shift;
68818 struct mmu_gather tlb;
68819
68820- BUG_ON(new_start > new_end);
68821+ if (new_start >= new_end || new_start < mmap_min_addr)
68822+ return -ENOMEM;
68823
68824 /*
68825 * ensure there are no vmas between where we want to go
68826@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
68827 if (vma != find_vma(mm, new_start))
68828 return -EFAULT;
68829
68830+#ifdef CONFIG_PAX_SEGMEXEC
68831+ BUG_ON(pax_find_mirror_vma(vma));
68832+#endif
68833+
68834 /*
68835 * cover the whole range: [new_start, old_end)
68836 */
68837@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
68838 stack_top = arch_align_stack(stack_top);
68839 stack_top = PAGE_ALIGN(stack_top);
68840
68841- if (unlikely(stack_top < mmap_min_addr) ||
68842- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
68843- return -ENOMEM;
68844-
68845 stack_shift = vma->vm_end - stack_top;
68846
68847 bprm->p -= stack_shift;
68848@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
68849 bprm->exec -= stack_shift;
68850
68851 down_write(&mm->mmap_sem);
68852+
68853+ /* Move stack pages down in memory. */
68854+ if (stack_shift) {
68855+ ret = shift_arg_pages(vma, stack_shift);
68856+ if (ret)
68857+ goto out_unlock;
68858+ }
68859+
68860 vm_flags = VM_STACK_FLAGS;
68861
68862+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
68863+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
68864+ vm_flags &= ~VM_EXEC;
68865+
68866+#ifdef CONFIG_PAX_MPROTECT
68867+ if (mm->pax_flags & MF_PAX_MPROTECT)
68868+ vm_flags &= ~VM_MAYEXEC;
68869+#endif
68870+
68871+ }
68872+#endif
68873+
68874 /*
68875 * Adjust stack execute permissions; explicitly enable for
68876 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
68877@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
68878 goto out_unlock;
68879 BUG_ON(prev != vma);
68880
68881- /* Move stack pages down in memory. */
68882- if (stack_shift) {
68883- ret = shift_arg_pages(vma, stack_shift);
68884- if (ret)
68885- goto out_unlock;
68886- }
68887-
68888 /* mprotect_fixup is overkill to remove the temporary stack flags */
68889 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
68890
68891@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
68892 #endif
68893 current->mm->start_stack = bprm->p;
68894 ret = expand_stack(vma, stack_base);
68895+
68896+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
68897+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
68898+ unsigned long size;
68899+ vm_flags_t vm_flags;
68900+
68901+ size = STACK_TOP - vma->vm_end;
68902+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
68903+
68904+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
68905+
68906+#ifdef CONFIG_X86
68907+ if (!ret) {
68908+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
68909+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
68910+ }
68911+#endif
68912+
68913+ }
68914+#endif
68915+
68916 if (ret)
68917 ret = -EFAULT;
68918
68919@@ -784,8 +860,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
68920 if (err)
68921 goto exit;
68922
68923- if (name->name[0] != '\0')
68924+ if (name->name[0] != '\0') {
68925 fsnotify_open(file);
68926+ trace_open_exec(name->name);
68927+ }
68928
68929 out:
68930 return file;
68931@@ -818,7 +896,7 @@ int kernel_read(struct file *file, loff_t offset,
68932 old_fs = get_fs();
68933 set_fs(get_ds());
68934 /* The cast to a user pointer is valid due to the set_fs() */
68935- result = vfs_read(file, (void __user *)addr, count, &pos);
68936+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
68937 set_fs(old_fs);
68938 return result;
68939 }
68940@@ -863,6 +941,7 @@ static int exec_mmap(struct mm_struct *mm)
68941 tsk->mm = mm;
68942 tsk->active_mm = mm;
68943 activate_mm(active_mm, mm);
68944+ populate_stack();
68945 tsk->mm->vmacache_seqnum = 0;
68946 vmacache_flush(tsk);
68947 task_unlock(tsk);
68948@@ -929,10 +1008,14 @@ static int de_thread(struct task_struct *tsk)
68949 if (!thread_group_leader(tsk)) {
68950 struct task_struct *leader = tsk->group_leader;
68951
68952- sig->notify_count = -1; /* for exit_notify() */
68953 for (;;) {
68954 threadgroup_change_begin(tsk);
68955 write_lock_irq(&tasklist_lock);
68956+ /*
68957+ * Do this under tasklist_lock to ensure that
68958+ * exit_notify() can't miss ->group_exit_task
68959+ */
68960+ sig->notify_count = -1;
68961 if (likely(leader->exit_state))
68962 break;
68963 __set_current_state(TASK_KILLABLE);
68964@@ -1261,7 +1344,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
68965 }
68966 rcu_read_unlock();
68967
68968- if (p->fs->users > n_fs)
68969+ if (atomic_read(&p->fs->users) > n_fs)
68970 bprm->unsafe |= LSM_UNSAFE_SHARE;
68971 else
68972 p->fs->in_exec = 1;
68973@@ -1462,6 +1545,31 @@ static int exec_binprm(struct linux_binprm *bprm)
68974 return ret;
68975 }
68976
68977+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68978+static DEFINE_PER_CPU(u64, exec_counter);
68979+static int __init init_exec_counters(void)
68980+{
68981+ unsigned int cpu;
68982+
68983+ for_each_possible_cpu(cpu) {
68984+ per_cpu(exec_counter, cpu) = (u64)cpu;
68985+ }
68986+
68987+ return 0;
68988+}
68989+early_initcall(init_exec_counters);
68990+static inline void increment_exec_counter(void)
68991+{
68992+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
68993+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
68994+}
68995+#else
68996+static inline void increment_exec_counter(void) {}
68997+#endif
68998+
68999+extern void gr_handle_exec_args(struct linux_binprm *bprm,
69000+ struct user_arg_ptr argv);
69001+
69002 /*
69003 * sys_execve() executes a new program.
69004 */
69005@@ -1470,6 +1578,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69006 struct user_arg_ptr envp,
69007 int flags)
69008 {
69009+#ifdef CONFIG_GRKERNSEC
69010+ struct file *old_exec_file;
69011+ struct acl_subject_label *old_acl;
69012+ struct rlimit old_rlim[RLIM_NLIMITS];
69013+#endif
69014 char *pathbuf = NULL;
69015 struct linux_binprm *bprm;
69016 struct file *file;
69017@@ -1479,6 +1592,8 @@ static int do_execveat_common(int fd, struct filename *filename,
69018 if (IS_ERR(filename))
69019 return PTR_ERR(filename);
69020
69021+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
69022+
69023 /*
69024 * We move the actual failure in case of RLIMIT_NPROC excess from
69025 * set*uid() to execve() because too many poorly written programs
69026@@ -1516,6 +1631,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69027 if (IS_ERR(file))
69028 goto out_unmark;
69029
69030+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
69031+ retval = -EPERM;
69032+ goto out_unmark;
69033+ }
69034+
69035 sched_exec();
69036
69037 bprm->file = file;
69038@@ -1542,6 +1662,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69039 }
69040 bprm->interp = bprm->filename;
69041
69042+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
69043+ retval = -EACCES;
69044+ goto out_unmark;
69045+ }
69046+
69047 retval = bprm_mm_init(bprm);
69048 if (retval)
69049 goto out_unmark;
69050@@ -1558,24 +1683,70 @@ static int do_execveat_common(int fd, struct filename *filename,
69051 if (retval < 0)
69052 goto out;
69053
69054+#ifdef CONFIG_GRKERNSEC
69055+ old_acl = current->acl;
69056+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
69057+ old_exec_file = current->exec_file;
69058+ get_file(file);
69059+ current->exec_file = file;
69060+#endif
69061+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
69062+ /* limit suid stack to 8MB
69063+ * we saved the old limits above and will restore them if this exec fails
69064+ */
69065+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
69066+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
69067+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
69068+#endif
69069+
69070+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
69071+ retval = -EPERM;
69072+ goto out_fail;
69073+ }
69074+
69075+ if (!gr_tpe_allow(file)) {
69076+ retval = -EACCES;
69077+ goto out_fail;
69078+ }
69079+
69080+ if (gr_check_crash_exec(file)) {
69081+ retval = -EACCES;
69082+ goto out_fail;
69083+ }
69084+
69085+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
69086+ bprm->unsafe);
69087+ if (retval < 0)
69088+ goto out_fail;
69089+
69090 retval = copy_strings_kernel(1, &bprm->filename, bprm);
69091 if (retval < 0)
69092- goto out;
69093+ goto out_fail;
69094
69095 bprm->exec = bprm->p;
69096 retval = copy_strings(bprm->envc, envp, bprm);
69097 if (retval < 0)
69098- goto out;
69099+ goto out_fail;
69100
69101 retval = copy_strings(bprm->argc, argv, bprm);
69102 if (retval < 0)
69103- goto out;
69104+ goto out_fail;
69105+
69106+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
69107+
69108+ gr_handle_exec_args(bprm, argv);
69109
69110 retval = exec_binprm(bprm);
69111 if (retval < 0)
69112- goto out;
69113+ goto out_fail;
69114+#ifdef CONFIG_GRKERNSEC
69115+ if (old_exec_file)
69116+ fput(old_exec_file);
69117+#endif
69118
69119 /* execve succeeded */
69120+
69121+ increment_exec_counter();
69122 current->fs->in_exec = 0;
69123 current->in_execve = 0;
69124 acct_update_integrals(current);
69125@@ -1587,6 +1758,14 @@ static int do_execveat_common(int fd, struct filename *filename,
69126 put_files_struct(displaced);
69127 return retval;
69128
69129+out_fail:
69130+#ifdef CONFIG_GRKERNSEC
69131+ current->acl = old_acl;
69132+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
69133+ fput(current->exec_file);
69134+ current->exec_file = old_exec_file;
69135+#endif
69136+
69137 out:
69138 if (bprm->mm) {
69139 acct_arg_size(bprm, 0);
69140@@ -1733,3 +1912,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
69141 argv, envp, flags);
69142 }
69143 #endif
69144+
69145+int pax_check_flags(unsigned long *flags)
69146+{
69147+ int retval = 0;
69148+
69149+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
69150+ if (*flags & MF_PAX_SEGMEXEC)
69151+ {
69152+ *flags &= ~MF_PAX_SEGMEXEC;
69153+ retval = -EINVAL;
69154+ }
69155+#endif
69156+
69157+ if ((*flags & MF_PAX_PAGEEXEC)
69158+
69159+#ifdef CONFIG_PAX_PAGEEXEC
69160+ && (*flags & MF_PAX_SEGMEXEC)
69161+#endif
69162+
69163+ )
69164+ {
69165+ *flags &= ~MF_PAX_PAGEEXEC;
69166+ retval = -EINVAL;
69167+ }
69168+
69169+ if ((*flags & MF_PAX_MPROTECT)
69170+
69171+#ifdef CONFIG_PAX_MPROTECT
69172+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
69173+#endif
69174+
69175+ )
69176+ {
69177+ *flags &= ~MF_PAX_MPROTECT;
69178+ retval = -EINVAL;
69179+ }
69180+
69181+ if ((*flags & MF_PAX_EMUTRAMP)
69182+
69183+#ifdef CONFIG_PAX_EMUTRAMP
69184+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
69185+#endif
69186+
69187+ )
69188+ {
69189+ *flags &= ~MF_PAX_EMUTRAMP;
69190+ retval = -EINVAL;
69191+ }
69192+
69193+ return retval;
69194+}
69195+
69196+EXPORT_SYMBOL(pax_check_flags);
69197+
69198+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
69199+char *pax_get_path(const struct path *path, char *buf, int buflen)
69200+{
69201+ char *pathname = d_path(path, buf, buflen);
69202+
69203+ if (IS_ERR(pathname))
69204+ goto toolong;
69205+
69206+ pathname = mangle_path(buf, pathname, "\t\n\\");
69207+ if (!pathname)
69208+ goto toolong;
69209+
69210+ *pathname = 0;
69211+ return buf;
69212+
69213+toolong:
69214+ return "<path too long>";
69215+}
69216+EXPORT_SYMBOL(pax_get_path);
69217+
69218+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
69219+{
69220+ struct task_struct *tsk = current;
69221+ struct mm_struct *mm = current->mm;
69222+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
69223+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
69224+ char *path_exec = NULL;
69225+ char *path_fault = NULL;
69226+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
69227+ siginfo_t info = { };
69228+
69229+ if (buffer_exec && buffer_fault) {
69230+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
69231+
69232+ down_read(&mm->mmap_sem);
69233+ vma = mm->mmap;
69234+ while (vma && (!vma_exec || !vma_fault)) {
69235+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
69236+ vma_exec = vma;
69237+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
69238+ vma_fault = vma;
69239+ vma = vma->vm_next;
69240+ }
69241+ if (vma_exec)
69242+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
69243+ if (vma_fault) {
69244+ start = vma_fault->vm_start;
69245+ end = vma_fault->vm_end;
69246+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
69247+ if (vma_fault->vm_file)
69248+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
69249+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
69250+ path_fault = "<heap>";
69251+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
69252+ path_fault = "<stack>";
69253+ else
69254+ path_fault = "<anonymous mapping>";
69255+ }
69256+ up_read(&mm->mmap_sem);
69257+ }
69258+ if (tsk->signal->curr_ip)
69259+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
69260+ else
69261+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
69262+ 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),
69263+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
69264+ free_page((unsigned long)buffer_exec);
69265+ free_page((unsigned long)buffer_fault);
69266+ pax_report_insns(regs, pc, sp);
69267+ info.si_signo = SIGKILL;
69268+ info.si_errno = 0;
69269+ info.si_code = SI_KERNEL;
69270+ info.si_pid = 0;
69271+ info.si_uid = 0;
69272+ do_coredump(&info);
69273+}
69274+#endif
69275+
69276+#ifdef CONFIG_PAX_REFCOUNT
69277+void pax_report_refcount_overflow(struct pt_regs *regs)
69278+{
69279+ if (current->signal->curr_ip)
69280+ printk(KERN_EMERG "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
69281+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
69282+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
69283+ else
69284+ printk(KERN_EMERG "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
69285+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
69286+ print_symbol(KERN_EMERG "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
69287+ preempt_disable();
69288+ show_regs(regs);
69289+ preempt_enable();
69290+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
69291+}
69292+#endif
69293+
69294+#ifdef CONFIG_PAX_USERCOPY
69295+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
69296+static noinline int check_stack_object(const void *obj, unsigned long len)
69297+{
69298+ const void * const stack = task_stack_page(current);
69299+ const void * const stackend = stack + THREAD_SIZE;
69300+
69301+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
69302+ const void *frame = NULL;
69303+ const void *oldframe;
69304+#endif
69305+
69306+ if (obj + len < obj)
69307+ return -1;
69308+
69309+ if (obj + len <= stack || stackend <= obj)
69310+ return 0;
69311+
69312+ if (obj < stack || stackend < obj + len)
69313+ return -1;
69314+
69315+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
69316+ oldframe = __builtin_frame_address(1);
69317+ if (oldframe)
69318+ frame = __builtin_frame_address(2);
69319+ /*
69320+ low ----------------------------------------------> high
69321+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
69322+ ^----------------^
69323+ allow copies only within here
69324+ */
69325+ while (stack <= frame && frame < stackend) {
69326+ /* if obj + len extends past the last frame, this
69327+ check won't pass and the next frame will be 0,
69328+ causing us to bail out and correctly report
69329+ the copy as invalid
69330+ */
69331+ if (obj + len <= frame)
69332+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
69333+ oldframe = frame;
69334+ frame = *(const void * const *)frame;
69335+ }
69336+ return -1;
69337+#else
69338+ return 1;
69339+#endif
69340+}
69341+
69342+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
69343+{
69344+ if (current->signal->curr_ip)
69345+ printk(KERN_EMERG "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
69346+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
69347+ else
69348+ printk(KERN_EMERG "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
69349+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
69350+ dump_stack();
69351+ gr_handle_kernel_exploit();
69352+ do_group_exit(SIGKILL);
69353+}
69354+#endif
69355+
69356+#ifdef CONFIG_PAX_USERCOPY
69357+
69358+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
69359+{
69360+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
69361+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
69362+#ifdef CONFIG_MODULES
69363+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
69364+#else
69365+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
69366+#endif
69367+
69368+#else
69369+ unsigned long textlow = (unsigned long)_stext;
69370+ unsigned long texthigh = (unsigned long)_etext;
69371+
69372+#ifdef CONFIG_X86_64
69373+ /* check against linear mapping as well */
69374+ if (high > (unsigned long)__va(__pa(textlow)) &&
69375+ low < (unsigned long)__va(__pa(texthigh)))
69376+ return true;
69377+#endif
69378+
69379+#endif
69380+
69381+ if (high <= textlow || low >= texthigh)
69382+ return false;
69383+ else
69384+ return true;
69385+}
69386+#endif
69387+
69388+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
69389+{
69390+#ifdef CONFIG_PAX_USERCOPY
69391+ const char *type;
69392+#endif
69393+
69394+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
69395+ unsigned long stackstart = (unsigned long)task_stack_page(current);
69396+ unsigned long currentsp = (unsigned long)&stackstart;
69397+ if (unlikely((currentsp < stackstart + 512 ||
69398+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
69399+ BUG();
69400+#endif
69401+
69402+#ifndef CONFIG_PAX_USERCOPY_DEBUG
69403+ if (const_size)
69404+ return;
69405+#endif
69406+
69407+#ifdef CONFIG_PAX_USERCOPY
69408+ if (!n)
69409+ return;
69410+
69411+ type = check_heap_object(ptr, n);
69412+ if (!type) {
69413+ int ret = check_stack_object(ptr, n);
69414+ if (ret == 1 || ret == 2)
69415+ return;
69416+ if (ret == 0) {
69417+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
69418+ type = "<kernel text>";
69419+ else
69420+ return;
69421+ } else
69422+ type = "<process stack>";
69423+ }
69424+
69425+ pax_report_usercopy(ptr, n, to_user, type);
69426+#endif
69427+
69428+}
69429+EXPORT_SYMBOL(__check_object_size);
69430+
69431+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
69432+void pax_track_stack(void)
69433+{
69434+ unsigned long sp = (unsigned long)&sp;
69435+ if (sp < current_thread_info()->lowest_stack &&
69436+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
69437+ current_thread_info()->lowest_stack = sp;
69438+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
69439+ BUG();
69440+}
69441+EXPORT_SYMBOL(pax_track_stack);
69442+#endif
69443+
69444+#ifdef CONFIG_PAX_SIZE_OVERFLOW
69445+void __nocapture(1, 3, 4) report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
69446+{
69447+ printk(KERN_EMERG "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
69448+ dump_stack();
69449+ do_group_exit(SIGKILL);
69450+}
69451+EXPORT_SYMBOL(report_size_overflow);
69452+#endif
69453diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
69454index 9f9992b..8b59411 100644
69455--- a/fs/ext2/balloc.c
69456+++ b/fs/ext2/balloc.c
69457@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
69458
69459 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
69460 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
69461- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
69462+ if (free_blocks < root_blocks + 1 &&
69463 !uid_eq(sbi->s_resuid, current_fsuid()) &&
69464 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
69465- !in_group_p (sbi->s_resgid))) {
69466+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
69467 return 0;
69468 }
69469 return 1;
69470diff --git a/fs/ext2/super.c b/fs/ext2/super.c
69471index d0e746e..82e06f0 100644
69472--- a/fs/ext2/super.c
69473+++ b/fs/ext2/super.c
69474@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
69475 #ifdef CONFIG_EXT2_FS_XATTR
69476 if (test_opt(sb, XATTR_USER))
69477 seq_puts(seq, ",user_xattr");
69478- if (!test_opt(sb, XATTR_USER) &&
69479- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
69480+ if (!test_opt(sb, XATTR_USER))
69481 seq_puts(seq, ",nouser_xattr");
69482- }
69483 #endif
69484
69485 #ifdef CONFIG_EXT2_FS_POSIX_ACL
69486@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
69487 if (def_mount_opts & EXT2_DEFM_UID16)
69488 set_opt(sbi->s_mount_opt, NO_UID32);
69489 #ifdef CONFIG_EXT2_FS_XATTR
69490- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
69491- set_opt(sbi->s_mount_opt, XATTR_USER);
69492+ /* always enable user xattrs */
69493+ set_opt(sbi->s_mount_opt, XATTR_USER);
69494 #endif
69495 #ifdef CONFIG_EXT2_FS_POSIX_ACL
69496 if (def_mount_opts & EXT2_DEFM_ACL)
69497diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
69498index 9142614..97484fa 100644
69499--- a/fs/ext2/xattr.c
69500+++ b/fs/ext2/xattr.c
69501@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
69502 struct buffer_head *bh = NULL;
69503 struct ext2_xattr_entry *entry;
69504 char *end;
69505- size_t rest = buffer_size;
69506+ size_t rest = buffer_size, total_size = 0;
69507 int error;
69508
69509 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
69510@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
69511 buffer += size;
69512 }
69513 rest -= size;
69514+ total_size += size;
69515 }
69516 }
69517- error = buffer_size - rest; /* total size */
69518+ error = total_size;
69519
69520 cleanup:
69521 brelse(bh);
69522diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
69523index 158b5d4..2432610 100644
69524--- a/fs/ext3/balloc.c
69525+++ b/fs/ext3/balloc.c
69526@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
69527
69528 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
69529 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
69530- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
69531+ if (free_blocks < root_blocks + 1 &&
69532 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
69533 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
69534- !in_group_p (sbi->s_resgid))) {
69535+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
69536 return 0;
69537 }
69538 return 1;
69539diff --git a/fs/ext3/super.c b/fs/ext3/super.c
69540index d4dbf3c..906a6fb 100644
69541--- a/fs/ext3/super.c
69542+++ b/fs/ext3/super.c
69543@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
69544 #ifdef CONFIG_EXT3_FS_XATTR
69545 if (test_opt(sb, XATTR_USER))
69546 seq_puts(seq, ",user_xattr");
69547- if (!test_opt(sb, XATTR_USER) &&
69548- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
69549+ if (!test_opt(sb, XATTR_USER))
69550 seq_puts(seq, ",nouser_xattr");
69551- }
69552 #endif
69553 #ifdef CONFIG_EXT3_FS_POSIX_ACL
69554 if (test_opt(sb, POSIX_ACL))
69555@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
69556 if (def_mount_opts & EXT3_DEFM_UID16)
69557 set_opt(sbi->s_mount_opt, NO_UID32);
69558 #ifdef CONFIG_EXT3_FS_XATTR
69559- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
69560- set_opt(sbi->s_mount_opt, XATTR_USER);
69561+ /* always enable user xattrs */
69562+ set_opt(sbi->s_mount_opt, XATTR_USER);
69563 #endif
69564 #ifdef CONFIG_EXT3_FS_POSIX_ACL
69565 if (def_mount_opts & EXT3_DEFM_ACL)
69566diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
69567index c6874be..f8a6ae8 100644
69568--- a/fs/ext3/xattr.c
69569+++ b/fs/ext3/xattr.c
69570@@ -330,7 +330,7 @@ static int
69571 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
69572 char *buffer, size_t buffer_size)
69573 {
69574- size_t rest = buffer_size;
69575+ size_t rest = buffer_size, total_size = 0;
69576
69577 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
69578 const struct xattr_handler *handler =
69579@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
69580 buffer += size;
69581 }
69582 rest -= size;
69583+ total_size += size;
69584 }
69585 }
69586- return buffer_size - rest;
69587+ return total_size;
69588 }
69589
69590 static int
69591diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
69592index 83a6f49..d4e4d03 100644
69593--- a/fs/ext4/balloc.c
69594+++ b/fs/ext4/balloc.c
69595@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
69596 /* Hm, nope. Are (enough) root reserved clusters available? */
69597 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
69598 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
69599- capable(CAP_SYS_RESOURCE) ||
69600- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
69601+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
69602+ capable_nolog(CAP_SYS_RESOURCE)) {
69603
69604 if (free_clusters >= (nclusters + dirty_clusters +
69605 resv_clusters))
69606diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
69607index f63c3d5..3c1a033 100644
69608--- a/fs/ext4/ext4.h
69609+++ b/fs/ext4/ext4.h
69610@@ -1287,19 +1287,19 @@ struct ext4_sb_info {
69611 unsigned long s_mb_last_start;
69612
69613 /* stats for buddy allocator */
69614- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
69615- atomic_t s_bal_success; /* we found long enough chunks */
69616- atomic_t s_bal_allocated; /* in blocks */
69617- atomic_t s_bal_ex_scanned; /* total extents scanned */
69618- atomic_t s_bal_goals; /* goal hits */
69619- atomic_t s_bal_breaks; /* too long searches */
69620- atomic_t s_bal_2orders; /* 2^order hits */
69621+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
69622+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
69623+ atomic_unchecked_t s_bal_allocated; /* in blocks */
69624+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
69625+ atomic_unchecked_t s_bal_goals; /* goal hits */
69626+ atomic_unchecked_t s_bal_breaks; /* too long searches */
69627+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
69628 spinlock_t s_bal_lock;
69629 unsigned long s_mb_buddies_generated;
69630 unsigned long long s_mb_generation_time;
69631- atomic_t s_mb_lost_chunks;
69632- atomic_t s_mb_preallocated;
69633- atomic_t s_mb_discarded;
69634+ atomic_unchecked_t s_mb_lost_chunks;
69635+ atomic_unchecked_t s_mb_preallocated;
69636+ atomic_unchecked_t s_mb_discarded;
69637 atomic_t s_lock_busy;
69638
69639 /* locality groups */
69640diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
69641index 8d1e602..abf497b 100644
69642--- a/fs/ext4/mballoc.c
69643+++ b/fs/ext4/mballoc.c
69644@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
69645 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
69646
69647 if (EXT4_SB(sb)->s_mb_stats)
69648- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
69649+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
69650
69651 break;
69652 }
69653@@ -2211,7 +2211,7 @@ repeat:
69654 ac->ac_status = AC_STATUS_CONTINUE;
69655 ac->ac_flags |= EXT4_MB_HINT_FIRST;
69656 cr = 3;
69657- atomic_inc(&sbi->s_mb_lost_chunks);
69658+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
69659 goto repeat;
69660 }
69661 }
69662@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
69663 if (sbi->s_mb_stats) {
69664 ext4_msg(sb, KERN_INFO,
69665 "mballoc: %u blocks %u reqs (%u success)",
69666- atomic_read(&sbi->s_bal_allocated),
69667- atomic_read(&sbi->s_bal_reqs),
69668- atomic_read(&sbi->s_bal_success));
69669+ atomic_read_unchecked(&sbi->s_bal_allocated),
69670+ atomic_read_unchecked(&sbi->s_bal_reqs),
69671+ atomic_read_unchecked(&sbi->s_bal_success));
69672 ext4_msg(sb, KERN_INFO,
69673 "mballoc: %u extents scanned, %u goal hits, "
69674 "%u 2^N hits, %u breaks, %u lost",
69675- atomic_read(&sbi->s_bal_ex_scanned),
69676- atomic_read(&sbi->s_bal_goals),
69677- atomic_read(&sbi->s_bal_2orders),
69678- atomic_read(&sbi->s_bal_breaks),
69679- atomic_read(&sbi->s_mb_lost_chunks));
69680+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
69681+ atomic_read_unchecked(&sbi->s_bal_goals),
69682+ atomic_read_unchecked(&sbi->s_bal_2orders),
69683+ atomic_read_unchecked(&sbi->s_bal_breaks),
69684+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
69685 ext4_msg(sb, KERN_INFO,
69686 "mballoc: %lu generated and it took %Lu",
69687 sbi->s_mb_buddies_generated,
69688 sbi->s_mb_generation_time);
69689 ext4_msg(sb, KERN_INFO,
69690 "mballoc: %u preallocated, %u discarded",
69691- atomic_read(&sbi->s_mb_preallocated),
69692- atomic_read(&sbi->s_mb_discarded));
69693+ atomic_read_unchecked(&sbi->s_mb_preallocated),
69694+ atomic_read_unchecked(&sbi->s_mb_discarded));
69695 }
69696
69697 free_percpu(sbi->s_locality_groups);
69698@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
69699 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
69700
69701 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
69702- atomic_inc(&sbi->s_bal_reqs);
69703- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
69704+ atomic_inc_unchecked(&sbi->s_bal_reqs);
69705+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
69706 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
69707- atomic_inc(&sbi->s_bal_success);
69708- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
69709+ atomic_inc_unchecked(&sbi->s_bal_success);
69710+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
69711 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
69712 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
69713- atomic_inc(&sbi->s_bal_goals);
69714+ atomic_inc_unchecked(&sbi->s_bal_goals);
69715 if (ac->ac_found > sbi->s_mb_max_to_scan)
69716- atomic_inc(&sbi->s_bal_breaks);
69717+ atomic_inc_unchecked(&sbi->s_bal_breaks);
69718 }
69719
69720 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
69721@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
69722 trace_ext4_mb_new_inode_pa(ac, pa);
69723
69724 ext4_mb_use_inode_pa(ac, pa);
69725- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
69726+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
69727
69728 ei = EXT4_I(ac->ac_inode);
69729 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
69730@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
69731 trace_ext4_mb_new_group_pa(ac, pa);
69732
69733 ext4_mb_use_group_pa(ac, pa);
69734- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
69735+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
69736
69737 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
69738 lg = ac->ac_lg;
69739@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
69740 * from the bitmap and continue.
69741 */
69742 }
69743- atomic_add(free, &sbi->s_mb_discarded);
69744+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
69745
69746 return err;
69747 }
69748@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
69749 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
69750 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
69751 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
69752- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
69753+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
69754 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
69755
69756 return 0;
69757diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
69758index 8313ca3..8a37d08 100644
69759--- a/fs/ext4/mmp.c
69760+++ b/fs/ext4/mmp.c
69761@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
69762 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
69763 const char *function, unsigned int line, const char *msg)
69764 {
69765- __ext4_warning(sb, function, line, msg);
69766+ __ext4_warning(sb, function, line, "%s", msg);
69767 __ext4_warning(sb, function, line,
69768 "MMP failure info: last update time: %llu, last update "
69769 "node: %s, last update device: %s\n",
69770diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
69771index 8a8ec62..1b02de5 100644
69772--- a/fs/ext4/resize.c
69773+++ b/fs/ext4/resize.c
69774@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69775
69776 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
69777 for (count2 = count; count > 0; count -= count2, block += count2) {
69778- ext4_fsblk_t start;
69779+ ext4_fsblk_t start, diff;
69780 struct buffer_head *bh;
69781 ext4_group_t group;
69782 int err;
69783@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69784 start = ext4_group_first_block_no(sb, group);
69785 group -= flex_gd->groups[0].group;
69786
69787- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
69788- if (count2 > count)
69789- count2 = count;
69790-
69791 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
69792 BUG_ON(flex_gd->count > 1);
69793 continue;
69794@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69795 err = ext4_journal_get_write_access(handle, bh);
69796 if (err)
69797 return err;
69798+
69799+ diff = block - start;
69800+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
69801+ if (count2 > count)
69802+ count2 = count;
69803+
69804 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
69805- block - start, count2);
69806- ext4_set_bits(bh->b_data, block - start, count2);
69807+ diff, count2);
69808+ ext4_set_bits(bh->b_data, diff, count2);
69809
69810 err = ext4_handle_dirty_metadata(handle, NULL, bh);
69811 if (unlikely(err))
69812diff --git a/fs/ext4/super.c b/fs/ext4/super.c
69813index e061e66..87bc092 100644
69814--- a/fs/ext4/super.c
69815+++ b/fs/ext4/super.c
69816@@ -1243,7 +1243,7 @@ static ext4_fsblk_t get_sb_block(void **data)
69817 }
69818
69819 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
69820-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
69821+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
69822 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
69823
69824 #ifdef CONFIG_QUOTA
69825@@ -2443,7 +2443,7 @@ struct ext4_attr {
69826 int offset;
69827 int deprecated_val;
69828 } u;
69829-};
69830+} __do_const;
69831
69832 static int parse_strtoull(const char *buf,
69833 unsigned long long max, unsigned long long *value)
69834diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
69835index 1e09fc7..0400dd4 100644
69836--- a/fs/ext4/xattr.c
69837+++ b/fs/ext4/xattr.c
69838@@ -399,7 +399,7 @@ static int
69839 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
69840 char *buffer, size_t buffer_size)
69841 {
69842- size_t rest = buffer_size;
69843+ size_t rest = buffer_size, total_size = 0;
69844
69845 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
69846 const struct xattr_handler *handler =
69847@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
69848 buffer += size;
69849 }
69850 rest -= size;
69851+ total_size += size;
69852 }
69853 }
69854- return buffer_size - rest;
69855+ return total_size;
69856 }
69857
69858 static int
69859diff --git a/fs/fcntl.c b/fs/fcntl.c
69860index ee85cd4..9dd0d20 100644
69861--- a/fs/fcntl.c
69862+++ b/fs/fcntl.c
69863@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
69864 int force)
69865 {
69866 security_file_set_fowner(filp);
69867+ if (gr_handle_chroot_fowner(pid, type))
69868+ return;
69869+ if (gr_check_protected_task_fowner(pid, type))
69870+ return;
69871 f_modown(filp, pid, type, force);
69872 }
69873 EXPORT_SYMBOL(__f_setown);
69874diff --git a/fs/fhandle.c b/fs/fhandle.c
69875index d59712d..2281df9 100644
69876--- a/fs/fhandle.c
69877+++ b/fs/fhandle.c
69878@@ -8,6 +8,7 @@
69879 #include <linux/fs_struct.h>
69880 #include <linux/fsnotify.h>
69881 #include <linux/personality.h>
69882+#include <linux/grsecurity.h>
69883 #include <asm/uaccess.h>
69884 #include "internal.h"
69885 #include "mount.h"
69886@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
69887 } else
69888 retval = 0;
69889 /* copy the mount id */
69890- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
69891- sizeof(*mnt_id)) ||
69892+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
69893 copy_to_user(ufh, handle,
69894 sizeof(struct file_handle) + handle_bytes))
69895 retval = -EFAULT;
69896@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
69897 * the directory. Ideally we would like CAP_DAC_SEARCH.
69898 * But we don't have that
69899 */
69900- if (!capable(CAP_DAC_READ_SEARCH)) {
69901+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
69902 retval = -EPERM;
69903 goto out_err;
69904 }
69905diff --git a/fs/file.c b/fs/file.c
69906index ee738ea..f6c15629 100644
69907--- a/fs/file.c
69908+++ b/fs/file.c
69909@@ -16,6 +16,7 @@
69910 #include <linux/slab.h>
69911 #include <linux/vmalloc.h>
69912 #include <linux/file.h>
69913+#include <linux/security.h>
69914 #include <linux/fdtable.h>
69915 #include <linux/bitops.h>
69916 #include <linux/interrupt.h>
69917@@ -139,7 +140,7 @@ out:
69918 * Return <0 error code on error; 1 on successful completion.
69919 * The files->file_lock should be held on entry, and will be held on exit.
69920 */
69921-static int expand_fdtable(struct files_struct *files, int nr)
69922+static int expand_fdtable(struct files_struct *files, unsigned int nr)
69923 __releases(files->file_lock)
69924 __acquires(files->file_lock)
69925 {
69926@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
69927 * expanded and execution may have blocked.
69928 * The files->file_lock should be held on entry, and will be held on exit.
69929 */
69930-static int expand_files(struct files_struct *files, int nr)
69931+static int expand_files(struct files_struct *files, unsigned int nr)
69932 {
69933 struct fdtable *fdt;
69934
69935@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
69936 if (!file)
69937 return __close_fd(files, fd);
69938
69939+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
69940 if (fd >= rlimit(RLIMIT_NOFILE))
69941 return -EBADF;
69942
69943@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
69944 if (unlikely(oldfd == newfd))
69945 return -EINVAL;
69946
69947+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
69948 if (newfd >= rlimit(RLIMIT_NOFILE))
69949 return -EBADF;
69950
69951@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
69952 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
69953 {
69954 int err;
69955+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
69956 if (from >= rlimit(RLIMIT_NOFILE))
69957 return -EINVAL;
69958 err = alloc_fd(from, flags);
69959diff --git a/fs/filesystems.c b/fs/filesystems.c
69960index 5797d45..7d7d79a 100644
69961--- a/fs/filesystems.c
69962+++ b/fs/filesystems.c
69963@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
69964 int len = dot ? dot - name : strlen(name);
69965
69966 fs = __get_fs_type(name, len);
69967+#ifdef CONFIG_GRKERNSEC_MODHARDEN
69968+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
69969+#else
69970 if (!fs && (request_module("fs-%.*s", len, name) == 0))
69971+#endif
69972 fs = __get_fs_type(name, len);
69973
69974 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
69975diff --git a/fs/fs_struct.c b/fs/fs_struct.c
69976index 7dca743..1ff87ae 100644
69977--- a/fs/fs_struct.c
69978+++ b/fs/fs_struct.c
69979@@ -4,6 +4,7 @@
69980 #include <linux/path.h>
69981 #include <linux/slab.h>
69982 #include <linux/fs_struct.h>
69983+#include <linux/grsecurity.h>
69984 #include "internal.h"
69985
69986 /*
69987@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
69988 struct path old_root;
69989
69990 path_get(path);
69991+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
69992 spin_lock(&fs->lock);
69993 write_seqcount_begin(&fs->seq);
69994 old_root = fs->root;
69995 fs->root = *path;
69996+ gr_set_chroot_entries(current, path);
69997 write_seqcount_end(&fs->seq);
69998 spin_unlock(&fs->lock);
69999- if (old_root.dentry)
70000+ if (old_root.dentry) {
70001+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
70002 path_put(&old_root);
70003+ }
70004 }
70005
70006 /*
70007@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
70008 int hits = 0;
70009 spin_lock(&fs->lock);
70010 write_seqcount_begin(&fs->seq);
70011+ /* this root replacement is only done by pivot_root,
70012+ leave grsec's chroot tagging alone for this task
70013+ so that a pivoted root isn't treated as a chroot
70014+ */
70015 hits += replace_path(&fs->root, old_root, new_root);
70016 hits += replace_path(&fs->pwd, old_root, new_root);
70017 write_seqcount_end(&fs->seq);
70018@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
70019
70020 void free_fs_struct(struct fs_struct *fs)
70021 {
70022+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
70023 path_put(&fs->root);
70024 path_put(&fs->pwd);
70025 kmem_cache_free(fs_cachep, fs);
70026@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
70027 task_lock(tsk);
70028 spin_lock(&fs->lock);
70029 tsk->fs = NULL;
70030- kill = !--fs->users;
70031+ gr_clear_chroot_entries(tsk);
70032+ kill = !atomic_dec_return(&fs->users);
70033 spin_unlock(&fs->lock);
70034 task_unlock(tsk);
70035 if (kill)
70036@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
70037 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
70038 /* We don't need to lock fs - think why ;-) */
70039 if (fs) {
70040- fs->users = 1;
70041+ atomic_set(&fs->users, 1);
70042 fs->in_exec = 0;
70043 spin_lock_init(&fs->lock);
70044 seqcount_init(&fs->seq);
70045@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
70046 spin_lock(&old->lock);
70047 fs->root = old->root;
70048 path_get(&fs->root);
70049+ /* instead of calling gr_set_chroot_entries here,
70050+ we call it from every caller of this function
70051+ */
70052 fs->pwd = old->pwd;
70053 path_get(&fs->pwd);
70054 spin_unlock(&old->lock);
70055+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
70056 }
70057 return fs;
70058 }
70059@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
70060
70061 task_lock(current);
70062 spin_lock(&fs->lock);
70063- kill = !--fs->users;
70064+ kill = !atomic_dec_return(&fs->users);
70065 current->fs = new_fs;
70066+ gr_set_chroot_entries(current, &new_fs->root);
70067 spin_unlock(&fs->lock);
70068 task_unlock(current);
70069
70070@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
70071
70072 int current_umask(void)
70073 {
70074- return current->fs->umask;
70075+ return current->fs->umask | gr_acl_umask();
70076 }
70077 EXPORT_SYMBOL(current_umask);
70078
70079 /* to be mentioned only in INIT_TASK */
70080 struct fs_struct init_fs = {
70081- .users = 1,
70082+ .users = ATOMIC_INIT(1),
70083 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
70084 .seq = SEQCNT_ZERO(init_fs.seq),
70085 .umask = 0022,
70086diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
70087index 89acec7..a575262 100644
70088--- a/fs/fscache/cookie.c
70089+++ b/fs/fscache/cookie.c
70090@@ -19,7 +19,7 @@
70091
70092 struct kmem_cache *fscache_cookie_jar;
70093
70094-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
70095+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
70096
70097 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
70098 static int fscache_alloc_object(struct fscache_cache *cache,
70099@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
70100 parent ? (char *) parent->def->name : "<no-parent>",
70101 def->name, netfs_data, enable);
70102
70103- fscache_stat(&fscache_n_acquires);
70104+ fscache_stat_unchecked(&fscache_n_acquires);
70105
70106 /* if there's no parent cookie, then we don't create one here either */
70107 if (!parent) {
70108- fscache_stat(&fscache_n_acquires_null);
70109+ fscache_stat_unchecked(&fscache_n_acquires_null);
70110 _leave(" [no parent]");
70111 return NULL;
70112 }
70113@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70114 /* allocate and initialise a cookie */
70115 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
70116 if (!cookie) {
70117- fscache_stat(&fscache_n_acquires_oom);
70118+ fscache_stat_unchecked(&fscache_n_acquires_oom);
70119 _leave(" [ENOMEM]");
70120 return NULL;
70121 }
70122@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
70123
70124 switch (cookie->def->type) {
70125 case FSCACHE_COOKIE_TYPE_INDEX:
70126- fscache_stat(&fscache_n_cookie_index);
70127+ fscache_stat_unchecked(&fscache_n_cookie_index);
70128 break;
70129 case FSCACHE_COOKIE_TYPE_DATAFILE:
70130- fscache_stat(&fscache_n_cookie_data);
70131+ fscache_stat_unchecked(&fscache_n_cookie_data);
70132 break;
70133 default:
70134- fscache_stat(&fscache_n_cookie_special);
70135+ fscache_stat_unchecked(&fscache_n_cookie_special);
70136 break;
70137 }
70138
70139@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70140 } else {
70141 atomic_dec(&parent->n_children);
70142 __fscache_cookie_put(cookie);
70143- fscache_stat(&fscache_n_acquires_nobufs);
70144+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
70145 _leave(" = NULL");
70146 return NULL;
70147 }
70148@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70149 }
70150 }
70151
70152- fscache_stat(&fscache_n_acquires_ok);
70153+ fscache_stat_unchecked(&fscache_n_acquires_ok);
70154 _leave(" = %p", cookie);
70155 return cookie;
70156 }
70157@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
70158 cache = fscache_select_cache_for_object(cookie->parent);
70159 if (!cache) {
70160 up_read(&fscache_addremove_sem);
70161- fscache_stat(&fscache_n_acquires_no_cache);
70162+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
70163 _leave(" = -ENOMEDIUM [no cache]");
70164 return -ENOMEDIUM;
70165 }
70166@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
70167 object = cache->ops->alloc_object(cache, cookie);
70168 fscache_stat_d(&fscache_n_cop_alloc_object);
70169 if (IS_ERR(object)) {
70170- fscache_stat(&fscache_n_object_no_alloc);
70171+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
70172 ret = PTR_ERR(object);
70173 goto error;
70174 }
70175
70176- fscache_stat(&fscache_n_object_alloc);
70177+ fscache_stat_unchecked(&fscache_n_object_alloc);
70178
70179- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
70180+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
70181
70182 _debug("ALLOC OBJ%x: %s {%lx}",
70183 object->debug_id, cookie->def->name, object->events);
70184@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
70185
70186 _enter("{%s}", cookie->def->name);
70187
70188- fscache_stat(&fscache_n_invalidates);
70189+ fscache_stat_unchecked(&fscache_n_invalidates);
70190
70191 /* Only permit invalidation of data files. Invalidating an index will
70192 * require the caller to release all its attachments to the tree rooted
70193@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
70194 {
70195 struct fscache_object *object;
70196
70197- fscache_stat(&fscache_n_updates);
70198+ fscache_stat_unchecked(&fscache_n_updates);
70199
70200 if (!cookie) {
70201- fscache_stat(&fscache_n_updates_null);
70202+ fscache_stat_unchecked(&fscache_n_updates_null);
70203 _leave(" [no cookie]");
70204 return;
70205 }
70206@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
70207 */
70208 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
70209 {
70210- fscache_stat(&fscache_n_relinquishes);
70211+ fscache_stat_unchecked(&fscache_n_relinquishes);
70212 if (retire)
70213- fscache_stat(&fscache_n_relinquishes_retire);
70214+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
70215
70216 if (!cookie) {
70217- fscache_stat(&fscache_n_relinquishes_null);
70218+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
70219 _leave(" [no cookie]");
70220 return;
70221 }
70222@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
70223 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
70224 goto inconsistent;
70225
70226- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
70227+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
70228
70229 __fscache_use_cookie(cookie);
70230 if (fscache_submit_op(object, op) < 0)
70231diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
70232index 7872a62..d91b19f 100644
70233--- a/fs/fscache/internal.h
70234+++ b/fs/fscache/internal.h
70235@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
70236 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
70237 extern int fscache_wait_for_operation_activation(struct fscache_object *,
70238 struct fscache_operation *,
70239- atomic_t *,
70240- atomic_t *,
70241+ atomic_unchecked_t *,
70242+ atomic_unchecked_t *,
70243 void (*)(struct fscache_operation *));
70244 extern void fscache_invalidate_writes(struct fscache_cookie *);
70245
70246@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
70247 * stats.c
70248 */
70249 #ifdef CONFIG_FSCACHE_STATS
70250-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
70251-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
70252+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
70253+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
70254
70255-extern atomic_t fscache_n_op_pend;
70256-extern atomic_t fscache_n_op_run;
70257-extern atomic_t fscache_n_op_enqueue;
70258-extern atomic_t fscache_n_op_deferred_release;
70259-extern atomic_t fscache_n_op_release;
70260-extern atomic_t fscache_n_op_gc;
70261-extern atomic_t fscache_n_op_cancelled;
70262-extern atomic_t fscache_n_op_rejected;
70263+extern atomic_unchecked_t fscache_n_op_pend;
70264+extern atomic_unchecked_t fscache_n_op_run;
70265+extern atomic_unchecked_t fscache_n_op_enqueue;
70266+extern atomic_unchecked_t fscache_n_op_deferred_release;
70267+extern atomic_unchecked_t fscache_n_op_release;
70268+extern atomic_unchecked_t fscache_n_op_gc;
70269+extern atomic_unchecked_t fscache_n_op_cancelled;
70270+extern atomic_unchecked_t fscache_n_op_rejected;
70271
70272-extern atomic_t fscache_n_attr_changed;
70273-extern atomic_t fscache_n_attr_changed_ok;
70274-extern atomic_t fscache_n_attr_changed_nobufs;
70275-extern atomic_t fscache_n_attr_changed_nomem;
70276-extern atomic_t fscache_n_attr_changed_calls;
70277+extern atomic_unchecked_t fscache_n_attr_changed;
70278+extern atomic_unchecked_t fscache_n_attr_changed_ok;
70279+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
70280+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
70281+extern atomic_unchecked_t fscache_n_attr_changed_calls;
70282
70283-extern atomic_t fscache_n_allocs;
70284-extern atomic_t fscache_n_allocs_ok;
70285-extern atomic_t fscache_n_allocs_wait;
70286-extern atomic_t fscache_n_allocs_nobufs;
70287-extern atomic_t fscache_n_allocs_intr;
70288-extern atomic_t fscache_n_allocs_object_dead;
70289-extern atomic_t fscache_n_alloc_ops;
70290-extern atomic_t fscache_n_alloc_op_waits;
70291+extern atomic_unchecked_t fscache_n_allocs;
70292+extern atomic_unchecked_t fscache_n_allocs_ok;
70293+extern atomic_unchecked_t fscache_n_allocs_wait;
70294+extern atomic_unchecked_t fscache_n_allocs_nobufs;
70295+extern atomic_unchecked_t fscache_n_allocs_intr;
70296+extern atomic_unchecked_t fscache_n_allocs_object_dead;
70297+extern atomic_unchecked_t fscache_n_alloc_ops;
70298+extern atomic_unchecked_t fscache_n_alloc_op_waits;
70299
70300-extern atomic_t fscache_n_retrievals;
70301-extern atomic_t fscache_n_retrievals_ok;
70302-extern atomic_t fscache_n_retrievals_wait;
70303-extern atomic_t fscache_n_retrievals_nodata;
70304-extern atomic_t fscache_n_retrievals_nobufs;
70305-extern atomic_t fscache_n_retrievals_intr;
70306-extern atomic_t fscache_n_retrievals_nomem;
70307-extern atomic_t fscache_n_retrievals_object_dead;
70308-extern atomic_t fscache_n_retrieval_ops;
70309-extern atomic_t fscache_n_retrieval_op_waits;
70310+extern atomic_unchecked_t fscache_n_retrievals;
70311+extern atomic_unchecked_t fscache_n_retrievals_ok;
70312+extern atomic_unchecked_t fscache_n_retrievals_wait;
70313+extern atomic_unchecked_t fscache_n_retrievals_nodata;
70314+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
70315+extern atomic_unchecked_t fscache_n_retrievals_intr;
70316+extern atomic_unchecked_t fscache_n_retrievals_nomem;
70317+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
70318+extern atomic_unchecked_t fscache_n_retrieval_ops;
70319+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
70320
70321-extern atomic_t fscache_n_stores;
70322-extern atomic_t fscache_n_stores_ok;
70323-extern atomic_t fscache_n_stores_again;
70324-extern atomic_t fscache_n_stores_nobufs;
70325-extern atomic_t fscache_n_stores_oom;
70326-extern atomic_t fscache_n_store_ops;
70327-extern atomic_t fscache_n_store_calls;
70328-extern atomic_t fscache_n_store_pages;
70329-extern atomic_t fscache_n_store_radix_deletes;
70330-extern atomic_t fscache_n_store_pages_over_limit;
70331+extern atomic_unchecked_t fscache_n_stores;
70332+extern atomic_unchecked_t fscache_n_stores_ok;
70333+extern atomic_unchecked_t fscache_n_stores_again;
70334+extern atomic_unchecked_t fscache_n_stores_nobufs;
70335+extern atomic_unchecked_t fscache_n_stores_oom;
70336+extern atomic_unchecked_t fscache_n_store_ops;
70337+extern atomic_unchecked_t fscache_n_store_calls;
70338+extern atomic_unchecked_t fscache_n_store_pages;
70339+extern atomic_unchecked_t fscache_n_store_radix_deletes;
70340+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
70341
70342-extern atomic_t fscache_n_store_vmscan_not_storing;
70343-extern atomic_t fscache_n_store_vmscan_gone;
70344-extern atomic_t fscache_n_store_vmscan_busy;
70345-extern atomic_t fscache_n_store_vmscan_cancelled;
70346-extern atomic_t fscache_n_store_vmscan_wait;
70347+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
70348+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
70349+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
70350+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
70351+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
70352
70353-extern atomic_t fscache_n_marks;
70354-extern atomic_t fscache_n_uncaches;
70355+extern atomic_unchecked_t fscache_n_marks;
70356+extern atomic_unchecked_t fscache_n_uncaches;
70357
70358-extern atomic_t fscache_n_acquires;
70359-extern atomic_t fscache_n_acquires_null;
70360-extern atomic_t fscache_n_acquires_no_cache;
70361-extern atomic_t fscache_n_acquires_ok;
70362-extern atomic_t fscache_n_acquires_nobufs;
70363-extern atomic_t fscache_n_acquires_oom;
70364+extern atomic_unchecked_t fscache_n_acquires;
70365+extern atomic_unchecked_t fscache_n_acquires_null;
70366+extern atomic_unchecked_t fscache_n_acquires_no_cache;
70367+extern atomic_unchecked_t fscache_n_acquires_ok;
70368+extern atomic_unchecked_t fscache_n_acquires_nobufs;
70369+extern atomic_unchecked_t fscache_n_acquires_oom;
70370
70371-extern atomic_t fscache_n_invalidates;
70372-extern atomic_t fscache_n_invalidates_run;
70373+extern atomic_unchecked_t fscache_n_invalidates;
70374+extern atomic_unchecked_t fscache_n_invalidates_run;
70375
70376-extern atomic_t fscache_n_updates;
70377-extern atomic_t fscache_n_updates_null;
70378-extern atomic_t fscache_n_updates_run;
70379+extern atomic_unchecked_t fscache_n_updates;
70380+extern atomic_unchecked_t fscache_n_updates_null;
70381+extern atomic_unchecked_t fscache_n_updates_run;
70382
70383-extern atomic_t fscache_n_relinquishes;
70384-extern atomic_t fscache_n_relinquishes_null;
70385-extern atomic_t fscache_n_relinquishes_waitcrt;
70386-extern atomic_t fscache_n_relinquishes_retire;
70387+extern atomic_unchecked_t fscache_n_relinquishes;
70388+extern atomic_unchecked_t fscache_n_relinquishes_null;
70389+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
70390+extern atomic_unchecked_t fscache_n_relinquishes_retire;
70391
70392-extern atomic_t fscache_n_cookie_index;
70393-extern atomic_t fscache_n_cookie_data;
70394-extern atomic_t fscache_n_cookie_special;
70395+extern atomic_unchecked_t fscache_n_cookie_index;
70396+extern atomic_unchecked_t fscache_n_cookie_data;
70397+extern atomic_unchecked_t fscache_n_cookie_special;
70398
70399-extern atomic_t fscache_n_object_alloc;
70400-extern atomic_t fscache_n_object_no_alloc;
70401-extern atomic_t fscache_n_object_lookups;
70402-extern atomic_t fscache_n_object_lookups_negative;
70403-extern atomic_t fscache_n_object_lookups_positive;
70404-extern atomic_t fscache_n_object_lookups_timed_out;
70405-extern atomic_t fscache_n_object_created;
70406-extern atomic_t fscache_n_object_avail;
70407-extern atomic_t fscache_n_object_dead;
70408+extern atomic_unchecked_t fscache_n_object_alloc;
70409+extern atomic_unchecked_t fscache_n_object_no_alloc;
70410+extern atomic_unchecked_t fscache_n_object_lookups;
70411+extern atomic_unchecked_t fscache_n_object_lookups_negative;
70412+extern atomic_unchecked_t fscache_n_object_lookups_positive;
70413+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
70414+extern atomic_unchecked_t fscache_n_object_created;
70415+extern atomic_unchecked_t fscache_n_object_avail;
70416+extern atomic_unchecked_t fscache_n_object_dead;
70417
70418-extern atomic_t fscache_n_checkaux_none;
70419-extern atomic_t fscache_n_checkaux_okay;
70420-extern atomic_t fscache_n_checkaux_update;
70421-extern atomic_t fscache_n_checkaux_obsolete;
70422+extern atomic_unchecked_t fscache_n_checkaux_none;
70423+extern atomic_unchecked_t fscache_n_checkaux_okay;
70424+extern atomic_unchecked_t fscache_n_checkaux_update;
70425+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
70426
70427 extern atomic_t fscache_n_cop_alloc_object;
70428 extern atomic_t fscache_n_cop_lookup_object;
70429@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
70430 atomic_inc(stat);
70431 }
70432
70433+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
70434+{
70435+ atomic_inc_unchecked(stat);
70436+}
70437+
70438 static inline void fscache_stat_d(atomic_t *stat)
70439 {
70440 atomic_dec(stat);
70441@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
70442
70443 #define __fscache_stat(stat) (NULL)
70444 #define fscache_stat(stat) do {} while (0)
70445+#define fscache_stat_unchecked(stat) do {} while (0)
70446 #define fscache_stat_d(stat) do {} while (0)
70447 #endif
70448
70449diff --git a/fs/fscache/object.c b/fs/fscache/object.c
70450index da032da..0076ce7 100644
70451--- a/fs/fscache/object.c
70452+++ b/fs/fscache/object.c
70453@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
70454 _debug("LOOKUP \"%s\" in \"%s\"",
70455 cookie->def->name, object->cache->tag->name);
70456
70457- fscache_stat(&fscache_n_object_lookups);
70458+ fscache_stat_unchecked(&fscache_n_object_lookups);
70459 fscache_stat(&fscache_n_cop_lookup_object);
70460 ret = object->cache->ops->lookup_object(object);
70461 fscache_stat_d(&fscache_n_cop_lookup_object);
70462@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
70463 if (ret == -ETIMEDOUT) {
70464 /* probably stuck behind another object, so move this one to
70465 * the back of the queue */
70466- fscache_stat(&fscache_n_object_lookups_timed_out);
70467+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
70468 _leave(" [timeout]");
70469 return NO_TRANSIT;
70470 }
70471@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
70472 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
70473
70474 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
70475- fscache_stat(&fscache_n_object_lookups_negative);
70476+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
70477
70478 /* Allow write requests to begin stacking up and read requests to begin
70479 * returning ENODATA.
70480@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
70481 /* if we were still looking up, then we must have a positive lookup
70482 * result, in which case there may be data available */
70483 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
70484- fscache_stat(&fscache_n_object_lookups_positive);
70485+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
70486
70487 /* We do (presumably) have data */
70488 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
70489@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
70490 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
70491 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
70492 } else {
70493- fscache_stat(&fscache_n_object_created);
70494+ fscache_stat_unchecked(&fscache_n_object_created);
70495 }
70496
70497 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
70498@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
70499 fscache_stat_d(&fscache_n_cop_lookup_complete);
70500
70501 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
70502- fscache_stat(&fscache_n_object_avail);
70503+ fscache_stat_unchecked(&fscache_n_object_avail);
70504
70505 _leave("");
70506 return transit_to(JUMPSTART_DEPS);
70507@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
70508
70509 /* this just shifts the object release to the work processor */
70510 fscache_put_object(object);
70511- fscache_stat(&fscache_n_object_dead);
70512+ fscache_stat_unchecked(&fscache_n_object_dead);
70513
70514 _leave("");
70515 return transit_to(OBJECT_DEAD);
70516@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
70517 enum fscache_checkaux result;
70518
70519 if (!object->cookie->def->check_aux) {
70520- fscache_stat(&fscache_n_checkaux_none);
70521+ fscache_stat_unchecked(&fscache_n_checkaux_none);
70522 return FSCACHE_CHECKAUX_OKAY;
70523 }
70524
70525@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
70526 switch (result) {
70527 /* entry okay as is */
70528 case FSCACHE_CHECKAUX_OKAY:
70529- fscache_stat(&fscache_n_checkaux_okay);
70530+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
70531 break;
70532
70533 /* entry requires update */
70534 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
70535- fscache_stat(&fscache_n_checkaux_update);
70536+ fscache_stat_unchecked(&fscache_n_checkaux_update);
70537 break;
70538
70539 /* entry requires deletion */
70540 case FSCACHE_CHECKAUX_OBSOLETE:
70541- fscache_stat(&fscache_n_checkaux_obsolete);
70542+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
70543 break;
70544
70545 default:
70546@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
70547 {
70548 const struct fscache_state *s;
70549
70550- fscache_stat(&fscache_n_invalidates_run);
70551+ fscache_stat_unchecked(&fscache_n_invalidates_run);
70552 fscache_stat(&fscache_n_cop_invalidate_object);
70553 s = _fscache_invalidate_object(object, event);
70554 fscache_stat_d(&fscache_n_cop_invalidate_object);
70555@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
70556 {
70557 _enter("{OBJ%x},%d", object->debug_id, event);
70558
70559- fscache_stat(&fscache_n_updates_run);
70560+ fscache_stat_unchecked(&fscache_n_updates_run);
70561 fscache_stat(&fscache_n_cop_update_object);
70562 object->cache->ops->update_object(object);
70563 fscache_stat_d(&fscache_n_cop_update_object);
70564diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
70565index e7b87a0..a85d47a 100644
70566--- a/fs/fscache/operation.c
70567+++ b/fs/fscache/operation.c
70568@@ -17,7 +17,7 @@
70569 #include <linux/slab.h>
70570 #include "internal.h"
70571
70572-atomic_t fscache_op_debug_id;
70573+atomic_unchecked_t fscache_op_debug_id;
70574 EXPORT_SYMBOL(fscache_op_debug_id);
70575
70576 /**
70577@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
70578 ASSERTCMP(atomic_read(&op->usage), >, 0);
70579 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
70580
70581- fscache_stat(&fscache_n_op_enqueue);
70582+ fscache_stat_unchecked(&fscache_n_op_enqueue);
70583 switch (op->flags & FSCACHE_OP_TYPE) {
70584 case FSCACHE_OP_ASYNC:
70585 _debug("queue async");
70586@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
70587 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
70588 if (op->processor)
70589 fscache_enqueue_operation(op);
70590- fscache_stat(&fscache_n_op_run);
70591+ fscache_stat_unchecked(&fscache_n_op_run);
70592 }
70593
70594 /*
70595@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
70596 if (object->n_in_progress > 0) {
70597 atomic_inc(&op->usage);
70598 list_add_tail(&op->pend_link, &object->pending_ops);
70599- fscache_stat(&fscache_n_op_pend);
70600+ fscache_stat_unchecked(&fscache_n_op_pend);
70601 } else if (!list_empty(&object->pending_ops)) {
70602 atomic_inc(&op->usage);
70603 list_add_tail(&op->pend_link, &object->pending_ops);
70604- fscache_stat(&fscache_n_op_pend);
70605+ fscache_stat_unchecked(&fscache_n_op_pend);
70606 fscache_start_operations(object);
70607 } else {
70608 ASSERTCMP(object->n_in_progress, ==, 0);
70609@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
70610 object->n_exclusive++; /* reads and writes must wait */
70611 atomic_inc(&op->usage);
70612 list_add_tail(&op->pend_link, &object->pending_ops);
70613- fscache_stat(&fscache_n_op_pend);
70614+ fscache_stat_unchecked(&fscache_n_op_pend);
70615 ret = 0;
70616 } else {
70617 /* If we're in any other state, there must have been an I/O
70618@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
70619 if (object->n_exclusive > 0) {
70620 atomic_inc(&op->usage);
70621 list_add_tail(&op->pend_link, &object->pending_ops);
70622- fscache_stat(&fscache_n_op_pend);
70623+ fscache_stat_unchecked(&fscache_n_op_pend);
70624 } else if (!list_empty(&object->pending_ops)) {
70625 atomic_inc(&op->usage);
70626 list_add_tail(&op->pend_link, &object->pending_ops);
70627- fscache_stat(&fscache_n_op_pend);
70628+ fscache_stat_unchecked(&fscache_n_op_pend);
70629 fscache_start_operations(object);
70630 } else {
70631 ASSERTCMP(object->n_exclusive, ==, 0);
70632@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
70633 object->n_ops++;
70634 atomic_inc(&op->usage);
70635 list_add_tail(&op->pend_link, &object->pending_ops);
70636- fscache_stat(&fscache_n_op_pend);
70637+ fscache_stat_unchecked(&fscache_n_op_pend);
70638 ret = 0;
70639 } else if (fscache_object_is_dying(object)) {
70640- fscache_stat(&fscache_n_op_rejected);
70641+ fscache_stat_unchecked(&fscache_n_op_rejected);
70642 op->state = FSCACHE_OP_ST_CANCELLED;
70643 ret = -ENOBUFS;
70644 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
70645@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
70646 ret = -EBUSY;
70647 if (op->state == FSCACHE_OP_ST_PENDING) {
70648 ASSERT(!list_empty(&op->pend_link));
70649- fscache_stat(&fscache_n_op_cancelled);
70650+ fscache_stat_unchecked(&fscache_n_op_cancelled);
70651 list_del_init(&op->pend_link);
70652 if (do_cancel)
70653 do_cancel(op);
70654@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
70655 while (!list_empty(&object->pending_ops)) {
70656 op = list_entry(object->pending_ops.next,
70657 struct fscache_operation, pend_link);
70658- fscache_stat(&fscache_n_op_cancelled);
70659+ fscache_stat_unchecked(&fscache_n_op_cancelled);
70660 list_del_init(&op->pend_link);
70661
70662 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
70663@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
70664 op->state, ==, FSCACHE_OP_ST_CANCELLED);
70665 op->state = FSCACHE_OP_ST_DEAD;
70666
70667- fscache_stat(&fscache_n_op_release);
70668+ fscache_stat_unchecked(&fscache_n_op_release);
70669
70670 if (op->release) {
70671 op->release(op);
70672@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
70673 * lock, and defer it otherwise */
70674 if (!spin_trylock(&object->lock)) {
70675 _debug("defer put");
70676- fscache_stat(&fscache_n_op_deferred_release);
70677+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
70678
70679 cache = object->cache;
70680 spin_lock(&cache->op_gc_list_lock);
70681@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
70682
70683 _debug("GC DEFERRED REL OBJ%x OP%x",
70684 object->debug_id, op->debug_id);
70685- fscache_stat(&fscache_n_op_gc);
70686+ fscache_stat_unchecked(&fscache_n_op_gc);
70687
70688 ASSERTCMP(atomic_read(&op->usage), ==, 0);
70689 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
70690diff --git a/fs/fscache/page.c b/fs/fscache/page.c
70691index de33b3f..8be4d29 100644
70692--- a/fs/fscache/page.c
70693+++ b/fs/fscache/page.c
70694@@ -74,7 +74,7 @@ try_again:
70695 val = radix_tree_lookup(&cookie->stores, page->index);
70696 if (!val) {
70697 rcu_read_unlock();
70698- fscache_stat(&fscache_n_store_vmscan_not_storing);
70699+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
70700 __fscache_uncache_page(cookie, page);
70701 return true;
70702 }
70703@@ -104,11 +104,11 @@ try_again:
70704 spin_unlock(&cookie->stores_lock);
70705
70706 if (xpage) {
70707- fscache_stat(&fscache_n_store_vmscan_cancelled);
70708- fscache_stat(&fscache_n_store_radix_deletes);
70709+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
70710+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
70711 ASSERTCMP(xpage, ==, page);
70712 } else {
70713- fscache_stat(&fscache_n_store_vmscan_gone);
70714+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
70715 }
70716
70717 wake_up_bit(&cookie->flags, 0);
70718@@ -123,11 +123,11 @@ page_busy:
70719 * sleeping on memory allocation, so we may need to impose a timeout
70720 * too. */
70721 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
70722- fscache_stat(&fscache_n_store_vmscan_busy);
70723+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
70724 return false;
70725 }
70726
70727- fscache_stat(&fscache_n_store_vmscan_wait);
70728+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
70729 if (!release_page_wait_timeout(cookie, page))
70730 _debug("fscache writeout timeout page: %p{%lx}",
70731 page, page->index);
70732@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
70733 FSCACHE_COOKIE_STORING_TAG);
70734 if (!radix_tree_tag_get(&cookie->stores, page->index,
70735 FSCACHE_COOKIE_PENDING_TAG)) {
70736- fscache_stat(&fscache_n_store_radix_deletes);
70737+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
70738 xpage = radix_tree_delete(&cookie->stores, page->index);
70739 }
70740 spin_unlock(&cookie->stores_lock);
70741@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
70742
70743 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
70744
70745- fscache_stat(&fscache_n_attr_changed_calls);
70746+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
70747
70748 if (fscache_object_is_active(object)) {
70749 fscache_stat(&fscache_n_cop_attr_changed);
70750@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
70751
70752 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
70753
70754- fscache_stat(&fscache_n_attr_changed);
70755+ fscache_stat_unchecked(&fscache_n_attr_changed);
70756
70757 op = kzalloc(sizeof(*op), GFP_KERNEL);
70758 if (!op) {
70759- fscache_stat(&fscache_n_attr_changed_nomem);
70760+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
70761 _leave(" = -ENOMEM");
70762 return -ENOMEM;
70763 }
70764@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
70765 if (fscache_submit_exclusive_op(object, op) < 0)
70766 goto nobufs_dec;
70767 spin_unlock(&cookie->lock);
70768- fscache_stat(&fscache_n_attr_changed_ok);
70769+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
70770 fscache_put_operation(op);
70771 _leave(" = 0");
70772 return 0;
70773@@ -242,7 +242,7 @@ nobufs:
70774 kfree(op);
70775 if (wake_cookie)
70776 __fscache_wake_unused_cookie(cookie);
70777- fscache_stat(&fscache_n_attr_changed_nobufs);
70778+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
70779 _leave(" = %d", -ENOBUFS);
70780 return -ENOBUFS;
70781 }
70782@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
70783 /* allocate a retrieval operation and attempt to submit it */
70784 op = kzalloc(sizeof(*op), GFP_NOIO);
70785 if (!op) {
70786- fscache_stat(&fscache_n_retrievals_nomem);
70787+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70788 return NULL;
70789 }
70790
70791@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
70792 return 0;
70793 }
70794
70795- fscache_stat(&fscache_n_retrievals_wait);
70796+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
70797
70798 jif = jiffies;
70799 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
70800 TASK_INTERRUPTIBLE) != 0) {
70801- fscache_stat(&fscache_n_retrievals_intr);
70802+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
70803 _leave(" = -ERESTARTSYS");
70804 return -ERESTARTSYS;
70805 }
70806@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
70807 */
70808 int fscache_wait_for_operation_activation(struct fscache_object *object,
70809 struct fscache_operation *op,
70810- atomic_t *stat_op_waits,
70811- atomic_t *stat_object_dead,
70812+ atomic_unchecked_t *stat_op_waits,
70813+ atomic_unchecked_t *stat_object_dead,
70814 void (*do_cancel)(struct fscache_operation *))
70815 {
70816 int ret;
70817@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
70818
70819 _debug(">>> WT");
70820 if (stat_op_waits)
70821- fscache_stat(stat_op_waits);
70822+ fscache_stat_unchecked(stat_op_waits);
70823 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
70824 TASK_INTERRUPTIBLE) != 0) {
70825 ret = fscache_cancel_op(op, do_cancel);
70826@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
70827 check_if_dead:
70828 if (op->state == FSCACHE_OP_ST_CANCELLED) {
70829 if (stat_object_dead)
70830- fscache_stat(stat_object_dead);
70831+ fscache_stat_unchecked(stat_object_dead);
70832 _leave(" = -ENOBUFS [cancelled]");
70833 return -ENOBUFS;
70834 }
70835@@ -381,7 +381,7 @@ check_if_dead:
70836 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
70837 fscache_cancel_op(op, do_cancel);
70838 if (stat_object_dead)
70839- fscache_stat(stat_object_dead);
70840+ fscache_stat_unchecked(stat_object_dead);
70841 return -ENOBUFS;
70842 }
70843 return 0;
70844@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70845
70846 _enter("%p,%p,,,", cookie, page);
70847
70848- fscache_stat(&fscache_n_retrievals);
70849+ fscache_stat_unchecked(&fscache_n_retrievals);
70850
70851 if (hlist_empty(&cookie->backing_objects))
70852 goto nobufs;
70853@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70854 goto nobufs_unlock_dec;
70855 spin_unlock(&cookie->lock);
70856
70857- fscache_stat(&fscache_n_retrieval_ops);
70858+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
70859
70860 /* pin the netfs read context in case we need to do the actual netfs
70861 * read because we've encountered a cache read failure */
70862@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70863
70864 error:
70865 if (ret == -ENOMEM)
70866- fscache_stat(&fscache_n_retrievals_nomem);
70867+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70868 else if (ret == -ERESTARTSYS)
70869- fscache_stat(&fscache_n_retrievals_intr);
70870+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
70871 else if (ret == -ENODATA)
70872- fscache_stat(&fscache_n_retrievals_nodata);
70873+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
70874 else if (ret < 0)
70875- fscache_stat(&fscache_n_retrievals_nobufs);
70876+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70877 else
70878- fscache_stat(&fscache_n_retrievals_ok);
70879+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
70880
70881 fscache_put_retrieval(op);
70882 _leave(" = %d", ret);
70883@@ -505,7 +505,7 @@ nobufs_unlock:
70884 __fscache_wake_unused_cookie(cookie);
70885 kfree(op);
70886 nobufs:
70887- fscache_stat(&fscache_n_retrievals_nobufs);
70888+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70889 _leave(" = -ENOBUFS");
70890 return -ENOBUFS;
70891 }
70892@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
70893
70894 _enter("%p,,%d,,,", cookie, *nr_pages);
70895
70896- fscache_stat(&fscache_n_retrievals);
70897+ fscache_stat_unchecked(&fscache_n_retrievals);
70898
70899 if (hlist_empty(&cookie->backing_objects))
70900 goto nobufs;
70901@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
70902 goto nobufs_unlock_dec;
70903 spin_unlock(&cookie->lock);
70904
70905- fscache_stat(&fscache_n_retrieval_ops);
70906+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
70907
70908 /* pin the netfs read context in case we need to do the actual netfs
70909 * read because we've encountered a cache read failure */
70910@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
70911
70912 error:
70913 if (ret == -ENOMEM)
70914- fscache_stat(&fscache_n_retrievals_nomem);
70915+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70916 else if (ret == -ERESTARTSYS)
70917- fscache_stat(&fscache_n_retrievals_intr);
70918+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
70919 else if (ret == -ENODATA)
70920- fscache_stat(&fscache_n_retrievals_nodata);
70921+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
70922 else if (ret < 0)
70923- fscache_stat(&fscache_n_retrievals_nobufs);
70924+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70925 else
70926- fscache_stat(&fscache_n_retrievals_ok);
70927+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
70928
70929 fscache_put_retrieval(op);
70930 _leave(" = %d", ret);
70931@@ -636,7 +636,7 @@ nobufs_unlock:
70932 if (wake_cookie)
70933 __fscache_wake_unused_cookie(cookie);
70934 nobufs:
70935- fscache_stat(&fscache_n_retrievals_nobufs);
70936+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70937 _leave(" = -ENOBUFS");
70938 return -ENOBUFS;
70939 }
70940@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
70941
70942 _enter("%p,%p,,,", cookie, page);
70943
70944- fscache_stat(&fscache_n_allocs);
70945+ fscache_stat_unchecked(&fscache_n_allocs);
70946
70947 if (hlist_empty(&cookie->backing_objects))
70948 goto nobufs;
70949@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
70950 goto nobufs_unlock_dec;
70951 spin_unlock(&cookie->lock);
70952
70953- fscache_stat(&fscache_n_alloc_ops);
70954+ fscache_stat_unchecked(&fscache_n_alloc_ops);
70955
70956 ret = fscache_wait_for_operation_activation(
70957 object, &op->op,
70958@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
70959
70960 error:
70961 if (ret == -ERESTARTSYS)
70962- fscache_stat(&fscache_n_allocs_intr);
70963+ fscache_stat_unchecked(&fscache_n_allocs_intr);
70964 else if (ret < 0)
70965- fscache_stat(&fscache_n_allocs_nobufs);
70966+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
70967 else
70968- fscache_stat(&fscache_n_allocs_ok);
70969+ fscache_stat_unchecked(&fscache_n_allocs_ok);
70970
70971 fscache_put_retrieval(op);
70972 _leave(" = %d", ret);
70973@@ -730,7 +730,7 @@ nobufs_unlock:
70974 if (wake_cookie)
70975 __fscache_wake_unused_cookie(cookie);
70976 nobufs:
70977- fscache_stat(&fscache_n_allocs_nobufs);
70978+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
70979 _leave(" = -ENOBUFS");
70980 return -ENOBUFS;
70981 }
70982@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
70983
70984 spin_lock(&cookie->stores_lock);
70985
70986- fscache_stat(&fscache_n_store_calls);
70987+ fscache_stat_unchecked(&fscache_n_store_calls);
70988
70989 /* find a page to store */
70990 page = NULL;
70991@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
70992 page = results[0];
70993 _debug("gang %d [%lx]", n, page->index);
70994 if (page->index > op->store_limit) {
70995- fscache_stat(&fscache_n_store_pages_over_limit);
70996+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
70997 goto superseded;
70998 }
70999
71000@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
71001 spin_unlock(&cookie->stores_lock);
71002 spin_unlock(&object->lock);
71003
71004- fscache_stat(&fscache_n_store_pages);
71005+ fscache_stat_unchecked(&fscache_n_store_pages);
71006 fscache_stat(&fscache_n_cop_write_page);
71007 ret = object->cache->ops->write_page(op, page);
71008 fscache_stat_d(&fscache_n_cop_write_page);
71009@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71010 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
71011 ASSERT(PageFsCache(page));
71012
71013- fscache_stat(&fscache_n_stores);
71014+ fscache_stat_unchecked(&fscache_n_stores);
71015
71016 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
71017 _leave(" = -ENOBUFS [invalidating]");
71018@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71019 spin_unlock(&cookie->stores_lock);
71020 spin_unlock(&object->lock);
71021
71022- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
71023+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
71024 op->store_limit = object->store_limit;
71025
71026 __fscache_use_cookie(cookie);
71027@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71028
71029 spin_unlock(&cookie->lock);
71030 radix_tree_preload_end();
71031- fscache_stat(&fscache_n_store_ops);
71032- fscache_stat(&fscache_n_stores_ok);
71033+ fscache_stat_unchecked(&fscache_n_store_ops);
71034+ fscache_stat_unchecked(&fscache_n_stores_ok);
71035
71036 /* the work queue now carries its own ref on the object */
71037 fscache_put_operation(&op->op);
71038@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71039 return 0;
71040
71041 already_queued:
71042- fscache_stat(&fscache_n_stores_again);
71043+ fscache_stat_unchecked(&fscache_n_stores_again);
71044 already_pending:
71045 spin_unlock(&cookie->stores_lock);
71046 spin_unlock(&object->lock);
71047 spin_unlock(&cookie->lock);
71048 radix_tree_preload_end();
71049 kfree(op);
71050- fscache_stat(&fscache_n_stores_ok);
71051+ fscache_stat_unchecked(&fscache_n_stores_ok);
71052 _leave(" = 0");
71053 return 0;
71054
71055@@ -1039,14 +1039,14 @@ nobufs:
71056 kfree(op);
71057 if (wake_cookie)
71058 __fscache_wake_unused_cookie(cookie);
71059- fscache_stat(&fscache_n_stores_nobufs);
71060+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
71061 _leave(" = -ENOBUFS");
71062 return -ENOBUFS;
71063
71064 nomem_free:
71065 kfree(op);
71066 nomem:
71067- fscache_stat(&fscache_n_stores_oom);
71068+ fscache_stat_unchecked(&fscache_n_stores_oom);
71069 _leave(" = -ENOMEM");
71070 return -ENOMEM;
71071 }
71072@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
71073 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
71074 ASSERTCMP(page, !=, NULL);
71075
71076- fscache_stat(&fscache_n_uncaches);
71077+ fscache_stat_unchecked(&fscache_n_uncaches);
71078
71079 /* cache withdrawal may beat us to it */
71080 if (!PageFsCache(page))
71081@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
71082 struct fscache_cookie *cookie = op->op.object->cookie;
71083
71084 #ifdef CONFIG_FSCACHE_STATS
71085- atomic_inc(&fscache_n_marks);
71086+ atomic_inc_unchecked(&fscache_n_marks);
71087 #endif
71088
71089 _debug("- mark %p{%lx}", page, page->index);
71090diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
71091index 40d13c7..ddf52b9 100644
71092--- a/fs/fscache/stats.c
71093+++ b/fs/fscache/stats.c
71094@@ -18,99 +18,99 @@
71095 /*
71096 * operation counters
71097 */
71098-atomic_t fscache_n_op_pend;
71099-atomic_t fscache_n_op_run;
71100-atomic_t fscache_n_op_enqueue;
71101-atomic_t fscache_n_op_requeue;
71102-atomic_t fscache_n_op_deferred_release;
71103-atomic_t fscache_n_op_release;
71104-atomic_t fscache_n_op_gc;
71105-atomic_t fscache_n_op_cancelled;
71106-atomic_t fscache_n_op_rejected;
71107+atomic_unchecked_t fscache_n_op_pend;
71108+atomic_unchecked_t fscache_n_op_run;
71109+atomic_unchecked_t fscache_n_op_enqueue;
71110+atomic_unchecked_t fscache_n_op_requeue;
71111+atomic_unchecked_t fscache_n_op_deferred_release;
71112+atomic_unchecked_t fscache_n_op_release;
71113+atomic_unchecked_t fscache_n_op_gc;
71114+atomic_unchecked_t fscache_n_op_cancelled;
71115+atomic_unchecked_t fscache_n_op_rejected;
71116
71117-atomic_t fscache_n_attr_changed;
71118-atomic_t fscache_n_attr_changed_ok;
71119-atomic_t fscache_n_attr_changed_nobufs;
71120-atomic_t fscache_n_attr_changed_nomem;
71121-atomic_t fscache_n_attr_changed_calls;
71122+atomic_unchecked_t fscache_n_attr_changed;
71123+atomic_unchecked_t fscache_n_attr_changed_ok;
71124+atomic_unchecked_t fscache_n_attr_changed_nobufs;
71125+atomic_unchecked_t fscache_n_attr_changed_nomem;
71126+atomic_unchecked_t fscache_n_attr_changed_calls;
71127
71128-atomic_t fscache_n_allocs;
71129-atomic_t fscache_n_allocs_ok;
71130-atomic_t fscache_n_allocs_wait;
71131-atomic_t fscache_n_allocs_nobufs;
71132-atomic_t fscache_n_allocs_intr;
71133-atomic_t fscache_n_allocs_object_dead;
71134-atomic_t fscache_n_alloc_ops;
71135-atomic_t fscache_n_alloc_op_waits;
71136+atomic_unchecked_t fscache_n_allocs;
71137+atomic_unchecked_t fscache_n_allocs_ok;
71138+atomic_unchecked_t fscache_n_allocs_wait;
71139+atomic_unchecked_t fscache_n_allocs_nobufs;
71140+atomic_unchecked_t fscache_n_allocs_intr;
71141+atomic_unchecked_t fscache_n_allocs_object_dead;
71142+atomic_unchecked_t fscache_n_alloc_ops;
71143+atomic_unchecked_t fscache_n_alloc_op_waits;
71144
71145-atomic_t fscache_n_retrievals;
71146-atomic_t fscache_n_retrievals_ok;
71147-atomic_t fscache_n_retrievals_wait;
71148-atomic_t fscache_n_retrievals_nodata;
71149-atomic_t fscache_n_retrievals_nobufs;
71150-atomic_t fscache_n_retrievals_intr;
71151-atomic_t fscache_n_retrievals_nomem;
71152-atomic_t fscache_n_retrievals_object_dead;
71153-atomic_t fscache_n_retrieval_ops;
71154-atomic_t fscache_n_retrieval_op_waits;
71155+atomic_unchecked_t fscache_n_retrievals;
71156+atomic_unchecked_t fscache_n_retrievals_ok;
71157+atomic_unchecked_t fscache_n_retrievals_wait;
71158+atomic_unchecked_t fscache_n_retrievals_nodata;
71159+atomic_unchecked_t fscache_n_retrievals_nobufs;
71160+atomic_unchecked_t fscache_n_retrievals_intr;
71161+atomic_unchecked_t fscache_n_retrievals_nomem;
71162+atomic_unchecked_t fscache_n_retrievals_object_dead;
71163+atomic_unchecked_t fscache_n_retrieval_ops;
71164+atomic_unchecked_t fscache_n_retrieval_op_waits;
71165
71166-atomic_t fscache_n_stores;
71167-atomic_t fscache_n_stores_ok;
71168-atomic_t fscache_n_stores_again;
71169-atomic_t fscache_n_stores_nobufs;
71170-atomic_t fscache_n_stores_oom;
71171-atomic_t fscache_n_store_ops;
71172-atomic_t fscache_n_store_calls;
71173-atomic_t fscache_n_store_pages;
71174-atomic_t fscache_n_store_radix_deletes;
71175-atomic_t fscache_n_store_pages_over_limit;
71176+atomic_unchecked_t fscache_n_stores;
71177+atomic_unchecked_t fscache_n_stores_ok;
71178+atomic_unchecked_t fscache_n_stores_again;
71179+atomic_unchecked_t fscache_n_stores_nobufs;
71180+atomic_unchecked_t fscache_n_stores_oom;
71181+atomic_unchecked_t fscache_n_store_ops;
71182+atomic_unchecked_t fscache_n_store_calls;
71183+atomic_unchecked_t fscache_n_store_pages;
71184+atomic_unchecked_t fscache_n_store_radix_deletes;
71185+atomic_unchecked_t fscache_n_store_pages_over_limit;
71186
71187-atomic_t fscache_n_store_vmscan_not_storing;
71188-atomic_t fscache_n_store_vmscan_gone;
71189-atomic_t fscache_n_store_vmscan_busy;
71190-atomic_t fscache_n_store_vmscan_cancelled;
71191-atomic_t fscache_n_store_vmscan_wait;
71192+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
71193+atomic_unchecked_t fscache_n_store_vmscan_gone;
71194+atomic_unchecked_t fscache_n_store_vmscan_busy;
71195+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
71196+atomic_unchecked_t fscache_n_store_vmscan_wait;
71197
71198-atomic_t fscache_n_marks;
71199-atomic_t fscache_n_uncaches;
71200+atomic_unchecked_t fscache_n_marks;
71201+atomic_unchecked_t fscache_n_uncaches;
71202
71203-atomic_t fscache_n_acquires;
71204-atomic_t fscache_n_acquires_null;
71205-atomic_t fscache_n_acquires_no_cache;
71206-atomic_t fscache_n_acquires_ok;
71207-atomic_t fscache_n_acquires_nobufs;
71208-atomic_t fscache_n_acquires_oom;
71209+atomic_unchecked_t fscache_n_acquires;
71210+atomic_unchecked_t fscache_n_acquires_null;
71211+atomic_unchecked_t fscache_n_acquires_no_cache;
71212+atomic_unchecked_t fscache_n_acquires_ok;
71213+atomic_unchecked_t fscache_n_acquires_nobufs;
71214+atomic_unchecked_t fscache_n_acquires_oom;
71215
71216-atomic_t fscache_n_invalidates;
71217-atomic_t fscache_n_invalidates_run;
71218+atomic_unchecked_t fscache_n_invalidates;
71219+atomic_unchecked_t fscache_n_invalidates_run;
71220
71221-atomic_t fscache_n_updates;
71222-atomic_t fscache_n_updates_null;
71223-atomic_t fscache_n_updates_run;
71224+atomic_unchecked_t fscache_n_updates;
71225+atomic_unchecked_t fscache_n_updates_null;
71226+atomic_unchecked_t fscache_n_updates_run;
71227
71228-atomic_t fscache_n_relinquishes;
71229-atomic_t fscache_n_relinquishes_null;
71230-atomic_t fscache_n_relinquishes_waitcrt;
71231-atomic_t fscache_n_relinquishes_retire;
71232+atomic_unchecked_t fscache_n_relinquishes;
71233+atomic_unchecked_t fscache_n_relinquishes_null;
71234+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
71235+atomic_unchecked_t fscache_n_relinquishes_retire;
71236
71237-atomic_t fscache_n_cookie_index;
71238-atomic_t fscache_n_cookie_data;
71239-atomic_t fscache_n_cookie_special;
71240+atomic_unchecked_t fscache_n_cookie_index;
71241+atomic_unchecked_t fscache_n_cookie_data;
71242+atomic_unchecked_t fscache_n_cookie_special;
71243
71244-atomic_t fscache_n_object_alloc;
71245-atomic_t fscache_n_object_no_alloc;
71246-atomic_t fscache_n_object_lookups;
71247-atomic_t fscache_n_object_lookups_negative;
71248-atomic_t fscache_n_object_lookups_positive;
71249-atomic_t fscache_n_object_lookups_timed_out;
71250-atomic_t fscache_n_object_created;
71251-atomic_t fscache_n_object_avail;
71252-atomic_t fscache_n_object_dead;
71253+atomic_unchecked_t fscache_n_object_alloc;
71254+atomic_unchecked_t fscache_n_object_no_alloc;
71255+atomic_unchecked_t fscache_n_object_lookups;
71256+atomic_unchecked_t fscache_n_object_lookups_negative;
71257+atomic_unchecked_t fscache_n_object_lookups_positive;
71258+atomic_unchecked_t fscache_n_object_lookups_timed_out;
71259+atomic_unchecked_t fscache_n_object_created;
71260+atomic_unchecked_t fscache_n_object_avail;
71261+atomic_unchecked_t fscache_n_object_dead;
71262
71263-atomic_t fscache_n_checkaux_none;
71264-atomic_t fscache_n_checkaux_okay;
71265-atomic_t fscache_n_checkaux_update;
71266-atomic_t fscache_n_checkaux_obsolete;
71267+atomic_unchecked_t fscache_n_checkaux_none;
71268+atomic_unchecked_t fscache_n_checkaux_okay;
71269+atomic_unchecked_t fscache_n_checkaux_update;
71270+atomic_unchecked_t fscache_n_checkaux_obsolete;
71271
71272 atomic_t fscache_n_cop_alloc_object;
71273 atomic_t fscache_n_cop_lookup_object;
71274@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
71275 seq_puts(m, "FS-Cache statistics\n");
71276
71277 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
71278- atomic_read(&fscache_n_cookie_index),
71279- atomic_read(&fscache_n_cookie_data),
71280- atomic_read(&fscache_n_cookie_special));
71281+ atomic_read_unchecked(&fscache_n_cookie_index),
71282+ atomic_read_unchecked(&fscache_n_cookie_data),
71283+ atomic_read_unchecked(&fscache_n_cookie_special));
71284
71285 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
71286- atomic_read(&fscache_n_object_alloc),
71287- atomic_read(&fscache_n_object_no_alloc),
71288- atomic_read(&fscache_n_object_avail),
71289- atomic_read(&fscache_n_object_dead));
71290+ atomic_read_unchecked(&fscache_n_object_alloc),
71291+ atomic_read_unchecked(&fscache_n_object_no_alloc),
71292+ atomic_read_unchecked(&fscache_n_object_avail),
71293+ atomic_read_unchecked(&fscache_n_object_dead));
71294 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
71295- atomic_read(&fscache_n_checkaux_none),
71296- atomic_read(&fscache_n_checkaux_okay),
71297- atomic_read(&fscache_n_checkaux_update),
71298- atomic_read(&fscache_n_checkaux_obsolete));
71299+ atomic_read_unchecked(&fscache_n_checkaux_none),
71300+ atomic_read_unchecked(&fscache_n_checkaux_okay),
71301+ atomic_read_unchecked(&fscache_n_checkaux_update),
71302+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
71303
71304 seq_printf(m, "Pages : mrk=%u unc=%u\n",
71305- atomic_read(&fscache_n_marks),
71306- atomic_read(&fscache_n_uncaches));
71307+ atomic_read_unchecked(&fscache_n_marks),
71308+ atomic_read_unchecked(&fscache_n_uncaches));
71309
71310 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
71311 " oom=%u\n",
71312- atomic_read(&fscache_n_acquires),
71313- atomic_read(&fscache_n_acquires_null),
71314- atomic_read(&fscache_n_acquires_no_cache),
71315- atomic_read(&fscache_n_acquires_ok),
71316- atomic_read(&fscache_n_acquires_nobufs),
71317- atomic_read(&fscache_n_acquires_oom));
71318+ atomic_read_unchecked(&fscache_n_acquires),
71319+ atomic_read_unchecked(&fscache_n_acquires_null),
71320+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
71321+ atomic_read_unchecked(&fscache_n_acquires_ok),
71322+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
71323+ atomic_read_unchecked(&fscache_n_acquires_oom));
71324
71325 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
71326- atomic_read(&fscache_n_object_lookups),
71327- atomic_read(&fscache_n_object_lookups_negative),
71328- atomic_read(&fscache_n_object_lookups_positive),
71329- atomic_read(&fscache_n_object_created),
71330- atomic_read(&fscache_n_object_lookups_timed_out));
71331+ atomic_read_unchecked(&fscache_n_object_lookups),
71332+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
71333+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
71334+ atomic_read_unchecked(&fscache_n_object_created),
71335+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
71336
71337 seq_printf(m, "Invals : n=%u run=%u\n",
71338- atomic_read(&fscache_n_invalidates),
71339- atomic_read(&fscache_n_invalidates_run));
71340+ atomic_read_unchecked(&fscache_n_invalidates),
71341+ atomic_read_unchecked(&fscache_n_invalidates_run));
71342
71343 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
71344- atomic_read(&fscache_n_updates),
71345- atomic_read(&fscache_n_updates_null),
71346- atomic_read(&fscache_n_updates_run));
71347+ atomic_read_unchecked(&fscache_n_updates),
71348+ atomic_read_unchecked(&fscache_n_updates_null),
71349+ atomic_read_unchecked(&fscache_n_updates_run));
71350
71351 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
71352- atomic_read(&fscache_n_relinquishes),
71353- atomic_read(&fscache_n_relinquishes_null),
71354- atomic_read(&fscache_n_relinquishes_waitcrt),
71355- atomic_read(&fscache_n_relinquishes_retire));
71356+ atomic_read_unchecked(&fscache_n_relinquishes),
71357+ atomic_read_unchecked(&fscache_n_relinquishes_null),
71358+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
71359+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
71360
71361 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
71362- atomic_read(&fscache_n_attr_changed),
71363- atomic_read(&fscache_n_attr_changed_ok),
71364- atomic_read(&fscache_n_attr_changed_nobufs),
71365- atomic_read(&fscache_n_attr_changed_nomem),
71366- atomic_read(&fscache_n_attr_changed_calls));
71367+ atomic_read_unchecked(&fscache_n_attr_changed),
71368+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
71369+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
71370+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
71371+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
71372
71373 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
71374- atomic_read(&fscache_n_allocs),
71375- atomic_read(&fscache_n_allocs_ok),
71376- atomic_read(&fscache_n_allocs_wait),
71377- atomic_read(&fscache_n_allocs_nobufs),
71378- atomic_read(&fscache_n_allocs_intr));
71379+ atomic_read_unchecked(&fscache_n_allocs),
71380+ atomic_read_unchecked(&fscache_n_allocs_ok),
71381+ atomic_read_unchecked(&fscache_n_allocs_wait),
71382+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
71383+ atomic_read_unchecked(&fscache_n_allocs_intr));
71384 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
71385- atomic_read(&fscache_n_alloc_ops),
71386- atomic_read(&fscache_n_alloc_op_waits),
71387- atomic_read(&fscache_n_allocs_object_dead));
71388+ atomic_read_unchecked(&fscache_n_alloc_ops),
71389+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
71390+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
71391
71392 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
71393 " int=%u oom=%u\n",
71394- atomic_read(&fscache_n_retrievals),
71395- atomic_read(&fscache_n_retrievals_ok),
71396- atomic_read(&fscache_n_retrievals_wait),
71397- atomic_read(&fscache_n_retrievals_nodata),
71398- atomic_read(&fscache_n_retrievals_nobufs),
71399- atomic_read(&fscache_n_retrievals_intr),
71400- atomic_read(&fscache_n_retrievals_nomem));
71401+ atomic_read_unchecked(&fscache_n_retrievals),
71402+ atomic_read_unchecked(&fscache_n_retrievals_ok),
71403+ atomic_read_unchecked(&fscache_n_retrievals_wait),
71404+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
71405+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
71406+ atomic_read_unchecked(&fscache_n_retrievals_intr),
71407+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
71408 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
71409- atomic_read(&fscache_n_retrieval_ops),
71410- atomic_read(&fscache_n_retrieval_op_waits),
71411- atomic_read(&fscache_n_retrievals_object_dead));
71412+ atomic_read_unchecked(&fscache_n_retrieval_ops),
71413+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
71414+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
71415
71416 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
71417- atomic_read(&fscache_n_stores),
71418- atomic_read(&fscache_n_stores_ok),
71419- atomic_read(&fscache_n_stores_again),
71420- atomic_read(&fscache_n_stores_nobufs),
71421- atomic_read(&fscache_n_stores_oom));
71422+ atomic_read_unchecked(&fscache_n_stores),
71423+ atomic_read_unchecked(&fscache_n_stores_ok),
71424+ atomic_read_unchecked(&fscache_n_stores_again),
71425+ atomic_read_unchecked(&fscache_n_stores_nobufs),
71426+ atomic_read_unchecked(&fscache_n_stores_oom));
71427 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
71428- atomic_read(&fscache_n_store_ops),
71429- atomic_read(&fscache_n_store_calls),
71430- atomic_read(&fscache_n_store_pages),
71431- atomic_read(&fscache_n_store_radix_deletes),
71432- atomic_read(&fscache_n_store_pages_over_limit));
71433+ atomic_read_unchecked(&fscache_n_store_ops),
71434+ atomic_read_unchecked(&fscache_n_store_calls),
71435+ atomic_read_unchecked(&fscache_n_store_pages),
71436+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
71437+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
71438
71439 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
71440- atomic_read(&fscache_n_store_vmscan_not_storing),
71441- atomic_read(&fscache_n_store_vmscan_gone),
71442- atomic_read(&fscache_n_store_vmscan_busy),
71443- atomic_read(&fscache_n_store_vmscan_cancelled),
71444- atomic_read(&fscache_n_store_vmscan_wait));
71445+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
71446+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
71447+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
71448+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
71449+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
71450
71451 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
71452- atomic_read(&fscache_n_op_pend),
71453- atomic_read(&fscache_n_op_run),
71454- atomic_read(&fscache_n_op_enqueue),
71455- atomic_read(&fscache_n_op_cancelled),
71456- atomic_read(&fscache_n_op_rejected));
71457+ atomic_read_unchecked(&fscache_n_op_pend),
71458+ atomic_read_unchecked(&fscache_n_op_run),
71459+ atomic_read_unchecked(&fscache_n_op_enqueue),
71460+ atomic_read_unchecked(&fscache_n_op_cancelled),
71461+ atomic_read_unchecked(&fscache_n_op_rejected));
71462 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
71463- atomic_read(&fscache_n_op_deferred_release),
71464- atomic_read(&fscache_n_op_release),
71465- atomic_read(&fscache_n_op_gc));
71466+ atomic_read_unchecked(&fscache_n_op_deferred_release),
71467+ atomic_read_unchecked(&fscache_n_op_release),
71468+ atomic_read_unchecked(&fscache_n_op_gc));
71469
71470 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
71471 atomic_read(&fscache_n_cop_alloc_object),
71472diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
71473index 28d0c7a..04816b7 100644
71474--- a/fs/fuse/cuse.c
71475+++ b/fs/fuse/cuse.c
71476@@ -611,10 +611,12 @@ static int __init cuse_init(void)
71477 INIT_LIST_HEAD(&cuse_conntbl[i]);
71478
71479 /* inherit and extend fuse_dev_operations */
71480- cuse_channel_fops = fuse_dev_operations;
71481- cuse_channel_fops.owner = THIS_MODULE;
71482- cuse_channel_fops.open = cuse_channel_open;
71483- cuse_channel_fops.release = cuse_channel_release;
71484+ pax_open_kernel();
71485+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
71486+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
71487+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
71488+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
71489+ pax_close_kernel();
71490
71491 cuse_class = class_create(THIS_MODULE, "cuse");
71492 if (IS_ERR(cuse_class))
71493diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
71494index 39706c5..a803c71 100644
71495--- a/fs/fuse/dev.c
71496+++ b/fs/fuse/dev.c
71497@@ -1405,7 +1405,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
71498 ret = 0;
71499 pipe_lock(pipe);
71500
71501- if (!pipe->readers) {
71502+ if (!atomic_read(&pipe->readers)) {
71503 send_sig(SIGPIPE, current, 0);
71504 if (!ret)
71505 ret = -EPIPE;
71506@@ -1434,7 +1434,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
71507 page_nr++;
71508 ret += buf->len;
71509
71510- if (pipe->files)
71511+ if (atomic_read(&pipe->files))
71512 do_wakeup = 1;
71513 }
71514
71515diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
71516index 1545b71..7fabe47 100644
71517--- a/fs/fuse/dir.c
71518+++ b/fs/fuse/dir.c
71519@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
71520 return link;
71521 }
71522
71523-static void free_link(char *link)
71524+static void free_link(const char *link)
71525 {
71526 if (!IS_ERR(link))
71527 free_page((unsigned long) link);
71528diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
71529index f42dffb..4a4c435 100644
71530--- a/fs/gfs2/glock.c
71531+++ b/fs/gfs2/glock.c
71532@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
71533 if (held1 != held2) {
71534 GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
71535 if (held2)
71536- gl->gl_lockref.count++;
71537+ __lockref_inc(&gl->gl_lockref);
71538 else
71539- gl->gl_lockref.count--;
71540+ __lockref_dec(&gl->gl_lockref);
71541 }
71542 if (held1 && held2 && list_empty(&gl->gl_holders))
71543 clear_bit(GLF_QUEUED, &gl->gl_flags);
71544@@ -614,9 +614,9 @@ out:
71545 out_sched:
71546 clear_bit(GLF_LOCK, &gl->gl_flags);
71547 smp_mb__after_atomic();
71548- gl->gl_lockref.count++;
71549+ __lockref_inc(&gl->gl_lockref);
71550 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71551- gl->gl_lockref.count--;
71552+ __lockref_dec(&gl->gl_lockref);
71553 return;
71554
71555 out_unlock:
71556@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
71557 gl->gl_sbd = sdp;
71558 gl->gl_flags = 0;
71559 gl->gl_name = name;
71560- gl->gl_lockref.count = 1;
71561+ __lockref_set(&gl->gl_lockref, 1);
71562 gl->gl_state = LM_ST_UNLOCKED;
71563 gl->gl_target = LM_ST_UNLOCKED;
71564 gl->gl_demote_state = LM_ST_EXCLUSIVE;
71565@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
71566 if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
71567 test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
71568 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
71569- gl->gl_lockref.count++;
71570+ __lockref_inc(&gl->gl_lockref);
71571 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71572- gl->gl_lockref.count--;
71573+ __lockref_dec(&gl->gl_lockref);
71574 }
71575 run_queue(gl, 1);
71576 spin_unlock(&gl->gl_spin);
71577@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
71578 }
71579 }
71580
71581- gl->gl_lockref.count++;
71582+ __lockref_inc(&gl->gl_lockref);
71583 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
71584 spin_unlock(&gl->gl_spin);
71585
71586@@ -1384,12 +1384,12 @@ add_back_to_lru:
71587 goto add_back_to_lru;
71588 }
71589 clear_bit(GLF_LRU, &gl->gl_flags);
71590- gl->gl_lockref.count++;
71591+ __lockref_inc(&gl->gl_lockref);
71592 if (demote_ok(gl))
71593 handle_callback(gl, LM_ST_UNLOCKED, 0, false);
71594 WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
71595 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71596- gl->gl_lockref.count--;
71597+ __lockref_dec(&gl->gl_lockref);
71598 spin_unlock(&gl->gl_spin);
71599 cond_resched_lock(&lru_lock);
71600 }
71601@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
71602 state2str(gl->gl_demote_state), dtime,
71603 atomic_read(&gl->gl_ail_count),
71604 atomic_read(&gl->gl_revokes),
71605- (int)gl->gl_lockref.count, gl->gl_hold_time);
71606+ __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
71607
71608 list_for_each_entry(gh, &gl->gl_holders, gh_list)
71609 dump_holder(seq, gh);
71610diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
71611index fe91951..ce38a6e 100644
71612--- a/fs/gfs2/glops.c
71613+++ b/fs/gfs2/glops.c
71614@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
71615
71616 if (gl->gl_demote_state == LM_ST_UNLOCKED &&
71617 gl->gl_state == LM_ST_SHARED && ip) {
71618- gl->gl_lockref.count++;
71619+ __lockref_inc(&gl->gl_lockref);
71620 if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
71621- gl->gl_lockref.count--;
71622+ __lockref_dec(&gl->gl_lockref);
71623 }
71624 }
71625
71626diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
71627index 3aa17d4..b338075 100644
71628--- a/fs/gfs2/quota.c
71629+++ b/fs/gfs2/quota.c
71630@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
71631 if (!spin_trylock(&qd->qd_lockref.lock))
71632 return LRU_SKIP;
71633
71634- if (qd->qd_lockref.count == 0) {
71635+ if (__lockref_read(&qd->qd_lockref) == 0) {
71636 lockref_mark_dead(&qd->qd_lockref);
71637 list_lru_isolate_move(lru, &qd->qd_lru, dispose);
71638 }
71639@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
71640 return NULL;
71641
71642 qd->qd_sbd = sdp;
71643- qd->qd_lockref.count = 1;
71644+ __lockref_set(&qd->qd_lockref, 1);
71645 spin_lock_init(&qd->qd_lockref.lock);
71646 qd->qd_id = qid;
71647 qd->qd_slot = -1;
71648@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
71649 if (lockref_put_or_lock(&qd->qd_lockref))
71650 return;
71651
71652- qd->qd_lockref.count = 0;
71653+ __lockref_set(&qd->qd_lockref, 0);
71654 list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
71655 spin_unlock(&qd->qd_lockref.lock);
71656
71657diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
71658index fd62cae..3494dfa 100644
71659--- a/fs/hostfs/hostfs_kern.c
71660+++ b/fs/hostfs/hostfs_kern.c
71661@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
71662
71663 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
71664 {
71665- char *s = nd_get_link(nd);
71666+ const char *s = nd_get_link(nd);
71667 if (!IS_ERR(s))
71668 __putname(s);
71669 }
71670diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
71671index c274aca..772fa5e 100644
71672--- a/fs/hugetlbfs/inode.c
71673+++ b/fs/hugetlbfs/inode.c
71674@@ -148,6 +148,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
71675 struct mm_struct *mm = current->mm;
71676 struct vm_area_struct *vma;
71677 struct hstate *h = hstate_file(file);
71678+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
71679 struct vm_unmapped_area_info info;
71680
71681 if (len & ~huge_page_mask(h))
71682@@ -161,17 +162,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
71683 return addr;
71684 }
71685
71686+#ifdef CONFIG_PAX_RANDMMAP
71687+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
71688+#endif
71689+
71690 if (addr) {
71691 addr = ALIGN(addr, huge_page_size(h));
71692 vma = find_vma(mm, addr);
71693- if (TASK_SIZE - len >= addr &&
71694- (!vma || addr + len <= vma->vm_start))
71695+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
71696 return addr;
71697 }
71698
71699 info.flags = 0;
71700 info.length = len;
71701 info.low_limit = TASK_UNMAPPED_BASE;
71702+
71703+#ifdef CONFIG_PAX_RANDMMAP
71704+ if (mm->pax_flags & MF_PAX_RANDMMAP)
71705+ info.low_limit += mm->delta_mmap;
71706+#endif
71707+
71708 info.high_limit = TASK_SIZE;
71709 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
71710 info.align_offset = 0;
71711@@ -912,7 +922,7 @@ static struct file_system_type hugetlbfs_fs_type = {
71712 };
71713 MODULE_ALIAS_FS("hugetlbfs");
71714
71715-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
71716+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
71717
71718 static int can_do_hugetlb_shm(void)
71719 {
71720diff --git a/fs/inode.c b/fs/inode.c
71721index f00b16f..b653fea 100644
71722--- a/fs/inode.c
71723+++ b/fs/inode.c
71724@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
71725 unsigned int *p = &get_cpu_var(last_ino);
71726 unsigned int res = *p;
71727
71728+start:
71729+
71730 #ifdef CONFIG_SMP
71731 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
71732- static atomic_t shared_last_ino;
71733- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
71734+ static atomic_unchecked_t shared_last_ino;
71735+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
71736
71737 res = next - LAST_INO_BATCH;
71738 }
71739 #endif
71740
71741- *p = ++res;
71742+ if (unlikely(!++res))
71743+ goto start; /* never zero */
71744+ *p = res;
71745 put_cpu_var(last_ino);
71746 return res;
71747 }
71748diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
71749index 4a6cf28..d3a29d3 100644
71750--- a/fs/jffs2/erase.c
71751+++ b/fs/jffs2/erase.c
71752@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
71753 struct jffs2_unknown_node marker = {
71754 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
71755 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
71756- .totlen = cpu_to_je32(c->cleanmarker_size)
71757+ .totlen = cpu_to_je32(c->cleanmarker_size),
71758+ .hdr_crc = cpu_to_je32(0)
71759 };
71760
71761 jffs2_prealloc_raw_node_refs(c, jeb, 1);
71762diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
71763index 09ed551..45684f8 100644
71764--- a/fs/jffs2/wbuf.c
71765+++ b/fs/jffs2/wbuf.c
71766@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
71767 {
71768 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
71769 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
71770- .totlen = constant_cpu_to_je32(8)
71771+ .totlen = constant_cpu_to_je32(8),
71772+ .hdr_crc = constant_cpu_to_je32(0)
71773 };
71774
71775 /*
71776diff --git a/fs/jfs/super.c b/fs/jfs/super.c
71777index 5d30c56..8c45372 100644
71778--- a/fs/jfs/super.c
71779+++ b/fs/jfs/super.c
71780@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
71781
71782 jfs_inode_cachep =
71783 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
71784- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
71785+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
71786 init_once);
71787 if (jfs_inode_cachep == NULL)
71788 return -ENOMEM;
71789diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
71790index 345b35f..da7e0da 100644
71791--- a/fs/kernfs/dir.c
71792+++ b/fs/kernfs/dir.c
71793@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
71794 *
71795 * Returns 31 bit hash of ns + name (so it fits in an off_t )
71796 */
71797-static unsigned int kernfs_name_hash(const char *name, const void *ns)
71798+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
71799 {
71800 unsigned long hash = init_name_hash();
71801 unsigned int len = strlen(name);
71802@@ -838,6 +838,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
71803 ret = scops->mkdir(parent, dentry->d_name.name, mode);
71804
71805 kernfs_put_active(parent);
71806+
71807+ if (!ret) {
71808+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
71809+ ret = PTR_ERR_OR_ZERO(dentry_ret);
71810+ }
71811+
71812 return ret;
71813 }
71814
71815diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
71816index 2bacb99..f745182 100644
71817--- a/fs/kernfs/file.c
71818+++ b/fs/kernfs/file.c
71819@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
71820
71821 struct kernfs_open_node {
71822 atomic_t refcnt;
71823- atomic_t event;
71824+ atomic_unchecked_t event;
71825 wait_queue_head_t poll;
71826 struct list_head files; /* goes through kernfs_open_file.list */
71827 };
71828@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
71829 {
71830 struct kernfs_open_file *of = sf->private;
71831
71832- of->event = atomic_read(&of->kn->attr.open->event);
71833+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
71834
71835 return of->kn->attr.ops->seq_show(sf, v);
71836 }
71837@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
71838 goto out_free;
71839 }
71840
71841- of->event = atomic_read(&of->kn->attr.open->event);
71842+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
71843 ops = kernfs_ops(of->kn);
71844 if (ops->read)
71845 len = ops->read(of, buf, len, *ppos);
71846@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
71847 {
71848 struct kernfs_open_file *of = kernfs_of(file);
71849 const struct kernfs_ops *ops;
71850- size_t len;
71851+ ssize_t len;
71852 char *buf;
71853
71854 if (of->atomic_write_len) {
71855@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
71856 return ret;
71857 }
71858
71859-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
71860- void *buf, int len, int write)
71861+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
71862+ void *buf, size_t len, int write)
71863 {
71864 struct file *file = vma->vm_file;
71865 struct kernfs_open_file *of = kernfs_of(file);
71866- int ret;
71867+ ssize_t ret;
71868
71869 if (!of->vm_ops)
71870 return -EINVAL;
71871@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
71872 return -ENOMEM;
71873
71874 atomic_set(&new_on->refcnt, 0);
71875- atomic_set(&new_on->event, 1);
71876+ atomic_set_unchecked(&new_on->event, 1);
71877 init_waitqueue_head(&new_on->poll);
71878 INIT_LIST_HEAD(&new_on->files);
71879 goto retry;
71880@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
71881
71882 kernfs_put_active(kn);
71883
71884- if (of->event != atomic_read(&on->event))
71885+ if (of->event != atomic_read_unchecked(&on->event))
71886 goto trigger;
71887
71888 return DEFAULT_POLLMASK;
71889@@ -824,7 +824,7 @@ repeat:
71890
71891 on = kn->attr.open;
71892 if (on) {
71893- atomic_inc(&on->event);
71894+ atomic_inc_unchecked(&on->event);
71895 wake_up_interruptible(&on->poll);
71896 }
71897
71898diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
71899index 8a19889..4c3069a 100644
71900--- a/fs/kernfs/symlink.c
71901+++ b/fs/kernfs/symlink.c
71902@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
71903 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
71904 void *cookie)
71905 {
71906- char *page = nd_get_link(nd);
71907+ const char *page = nd_get_link(nd);
71908 if (!IS_ERR(page))
71909 free_page((unsigned long)page);
71910 }
71911diff --git a/fs/libfs.c b/fs/libfs.c
71912index 0ab6512..cd9982d 100644
71913--- a/fs/libfs.c
71914+++ b/fs/libfs.c
71915@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
71916
71917 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
71918 struct dentry *next = list_entry(p, struct dentry, d_child);
71919+ char d_name[sizeof(next->d_iname)];
71920+ const unsigned char *name;
71921+
71922 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
71923 if (!simple_positive(next)) {
71924 spin_unlock(&next->d_lock);
71925@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
71926
71927 spin_unlock(&next->d_lock);
71928 spin_unlock(&dentry->d_lock);
71929- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
71930+ name = next->d_name.name;
71931+ if (name == next->d_iname) {
71932+ memcpy(d_name, name, next->d_name.len);
71933+ name = d_name;
71934+ }
71935+ if (!dir_emit(ctx, name, next->d_name.len,
71936 next->d_inode->i_ino, dt_type(next->d_inode)))
71937 return 0;
71938 spin_lock(&dentry->d_lock);
71939@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
71940 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
71941 void *cookie)
71942 {
71943- char *s = nd_get_link(nd);
71944+ const char *s = nd_get_link(nd);
71945 if (!IS_ERR(s))
71946 kfree(s);
71947 }
71948diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
71949index acd3947..1f896e2 100644
71950--- a/fs/lockd/clntproc.c
71951+++ b/fs/lockd/clntproc.c
71952@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
71953 /*
71954 * Cookie counter for NLM requests
71955 */
71956-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
71957+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
71958
71959 void nlmclnt_next_cookie(struct nlm_cookie *c)
71960 {
71961- u32 cookie = atomic_inc_return(&nlm_cookie);
71962+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
71963
71964 memcpy(c->data, &cookie, 4);
71965 c->len=4;
71966diff --git a/fs/mount.h b/fs/mount.h
71967index 6a61c2b..bd79179 100644
71968--- a/fs/mount.h
71969+++ b/fs/mount.h
71970@@ -13,7 +13,7 @@ struct mnt_namespace {
71971 u64 seq; /* Sequence number to prevent loops */
71972 wait_queue_head_t poll;
71973 u64 event;
71974-};
71975+} __randomize_layout;
71976
71977 struct mnt_pcp {
71978 int mnt_count;
71979@@ -65,7 +65,7 @@ struct mount {
71980 struct hlist_head mnt_pins;
71981 struct fs_pin mnt_umount;
71982 struct dentry *mnt_ex_mountpoint;
71983-};
71984+} __randomize_layout;
71985
71986 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
71987
71988diff --git a/fs/namei.c b/fs/namei.c
71989index 50a8583..44c470a 100644
71990--- a/fs/namei.c
71991+++ b/fs/namei.c
71992@@ -337,17 +337,32 @@ int generic_permission(struct inode *inode, int mask)
71993 if (ret != -EACCES)
71994 return ret;
71995
71996+#ifdef CONFIG_GRKERNSEC
71997+ /* we'll block if we have to log due to a denied capability use */
71998+ if (mask & MAY_NOT_BLOCK)
71999+ return -ECHILD;
72000+#endif
72001+
72002 if (S_ISDIR(inode->i_mode)) {
72003 /* DACs are overridable for directories */
72004- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72005- return 0;
72006 if (!(mask & MAY_WRITE))
72007- if (capable_wrt_inode_uidgid(inode,
72008- CAP_DAC_READ_SEARCH))
72009+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
72010+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72011 return 0;
72012+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72013+ return 0;
72014 return -EACCES;
72015 }
72016 /*
72017+ * Searching includes executable on directories, else just read.
72018+ */
72019+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
72020+ if (mask == MAY_READ)
72021+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
72022+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72023+ return 0;
72024+
72025+ /*
72026 * Read/write DACs are always overridable.
72027 * Executable DACs are overridable when there is
72028 * at least one exec bit set.
72029@@ -356,14 +371,6 @@ int generic_permission(struct inode *inode, int mask)
72030 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72031 return 0;
72032
72033- /*
72034- * Searching includes executable on directories, else just read.
72035- */
72036- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
72037- if (mask == MAY_READ)
72038- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72039- return 0;
72040-
72041 return -EACCES;
72042 }
72043 EXPORT_SYMBOL(generic_permission);
72044@@ -503,7 +510,7 @@ struct nameidata {
72045 int last_type;
72046 unsigned depth;
72047 struct file *base;
72048- char *saved_names[MAX_NESTED_LINKS + 1];
72049+ const char *saved_names[MAX_NESTED_LINKS + 1];
72050 };
72051
72052 /*
72053@@ -714,13 +721,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
72054 nd->flags |= LOOKUP_JUMPED;
72055 }
72056
72057-void nd_set_link(struct nameidata *nd, char *path)
72058+void nd_set_link(struct nameidata *nd, const char *path)
72059 {
72060 nd->saved_names[nd->depth] = path;
72061 }
72062 EXPORT_SYMBOL(nd_set_link);
72063
72064-char *nd_get_link(struct nameidata *nd)
72065+const char *nd_get_link(const struct nameidata *nd)
72066 {
72067 return nd->saved_names[nd->depth];
72068 }
72069@@ -855,7 +862,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
72070 {
72071 struct dentry *dentry = link->dentry;
72072 int error;
72073- char *s;
72074+ const char *s;
72075
72076 BUG_ON(nd->flags & LOOKUP_RCU);
72077
72078@@ -876,6 +883,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
72079 if (error)
72080 goto out_put_nd_path;
72081
72082+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
72083+ dentry->d_inode, dentry, nd->path.mnt)) {
72084+ error = -EACCES;
72085+ goto out_put_nd_path;
72086+ }
72087+
72088 nd->last_type = LAST_BIND;
72089 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
72090 error = PTR_ERR(*p);
72091@@ -1640,6 +1653,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
72092 if (res)
72093 break;
72094 res = walk_component(nd, path, LOOKUP_FOLLOW);
72095+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
72096+ res = -EACCES;
72097 put_link(nd, &link, cookie);
72098 } while (res > 0);
72099
72100@@ -1712,7 +1727,7 @@ EXPORT_SYMBOL(full_name_hash);
72101 static inline u64 hash_name(const char *name)
72102 {
72103 unsigned long a, b, adata, bdata, mask, hash, len;
72104- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
72105+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
72106
72107 hash = a = 0;
72108 len = -sizeof(unsigned long);
72109@@ -2007,6 +2022,8 @@ static int path_lookupat(int dfd, const char *name,
72110 if (err)
72111 break;
72112 err = lookup_last(nd, &path);
72113+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
72114+ err = -EACCES;
72115 put_link(nd, &link, cookie);
72116 }
72117 }
72118@@ -2014,6 +2031,13 @@ static int path_lookupat(int dfd, const char *name,
72119 if (!err)
72120 err = complete_walk(nd);
72121
72122+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
72123+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
72124+ path_put(&nd->path);
72125+ err = -ENOENT;
72126+ }
72127+ }
72128+
72129 if (!err && nd->flags & LOOKUP_DIRECTORY) {
72130 if (!d_can_lookup(nd->path.dentry)) {
72131 path_put(&nd->path);
72132@@ -2035,8 +2059,15 @@ static int filename_lookup(int dfd, struct filename *name,
72133 retval = path_lookupat(dfd, name->name,
72134 flags | LOOKUP_REVAL, nd);
72135
72136- if (likely(!retval))
72137+ if (likely(!retval)) {
72138 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
72139+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
72140+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
72141+ path_put(&nd->path);
72142+ return -ENOENT;
72143+ }
72144+ }
72145+ }
72146 return retval;
72147 }
72148
72149@@ -2615,6 +2646,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
72150 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
72151 return -EPERM;
72152
72153+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
72154+ return -EPERM;
72155+ if (gr_handle_rawio(inode))
72156+ return -EPERM;
72157+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
72158+ return -EACCES;
72159+
72160 return 0;
72161 }
72162
72163@@ -2846,7 +2884,7 @@ looked_up:
72164 * cleared otherwise prior to returning.
72165 */
72166 static int lookup_open(struct nameidata *nd, struct path *path,
72167- struct file *file,
72168+ struct path *link, struct file *file,
72169 const struct open_flags *op,
72170 bool got_write, int *opened)
72171 {
72172@@ -2881,6 +2919,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
72173 /* Negative dentry, just create the file */
72174 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
72175 umode_t mode = op->mode;
72176+
72177+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
72178+ error = -EACCES;
72179+ goto out_dput;
72180+ }
72181+
72182+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
72183+ error = -EACCES;
72184+ goto out_dput;
72185+ }
72186+
72187 if (!IS_POSIXACL(dir->d_inode))
72188 mode &= ~current_umask();
72189 /*
72190@@ -2902,6 +2951,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
72191 nd->flags & LOOKUP_EXCL);
72192 if (error)
72193 goto out_dput;
72194+ else
72195+ gr_handle_create(dentry, nd->path.mnt);
72196 }
72197 out_no_open:
72198 path->dentry = dentry;
72199@@ -2916,7 +2967,7 @@ out_dput:
72200 /*
72201 * Handle the last step of open()
72202 */
72203-static int do_last(struct nameidata *nd, struct path *path,
72204+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
72205 struct file *file, const struct open_flags *op,
72206 int *opened, struct filename *name)
72207 {
72208@@ -2966,6 +3017,15 @@ static int do_last(struct nameidata *nd, struct path *path,
72209 if (error)
72210 return error;
72211
72212+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
72213+ error = -ENOENT;
72214+ goto out;
72215+ }
72216+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
72217+ error = -EACCES;
72218+ goto out;
72219+ }
72220+
72221 audit_inode(name, dir, LOOKUP_PARENT);
72222 error = -EISDIR;
72223 /* trailing slashes? */
72224@@ -2985,7 +3045,7 @@ retry_lookup:
72225 */
72226 }
72227 mutex_lock(&dir->d_inode->i_mutex);
72228- error = lookup_open(nd, path, file, op, got_write, opened);
72229+ error = lookup_open(nd, path, link, file, op, got_write, opened);
72230 mutex_unlock(&dir->d_inode->i_mutex);
72231
72232 if (error <= 0) {
72233@@ -3009,11 +3069,28 @@ retry_lookup:
72234 goto finish_open_created;
72235 }
72236
72237+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
72238+ error = -ENOENT;
72239+ goto exit_dput;
72240+ }
72241+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
72242+ error = -EACCES;
72243+ goto exit_dput;
72244+ }
72245+
72246 /*
72247 * create/update audit record if it already exists.
72248 */
72249- if (d_is_positive(path->dentry))
72250+ if (d_is_positive(path->dentry)) {
72251+ /* only check if O_CREAT is specified, all other checks need to go
72252+ into may_open */
72253+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
72254+ error = -EACCES;
72255+ goto exit_dput;
72256+ }
72257+
72258 audit_inode(name, path->dentry, 0);
72259+ }
72260
72261 /*
72262 * If atomic_open() acquired write access it is dropped now due to
72263@@ -3055,6 +3132,11 @@ finish_lookup:
72264 }
72265 }
72266 BUG_ON(inode != path->dentry->d_inode);
72267+ /* if we're resolving a symlink to another symlink */
72268+ if (link && gr_handle_symlink_owner(link, inode)) {
72269+ error = -EACCES;
72270+ goto out;
72271+ }
72272 return 1;
72273 }
72274
72275@@ -3074,7 +3156,18 @@ finish_open:
72276 path_put(&save_parent);
72277 return error;
72278 }
72279+
72280+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
72281+ error = -ENOENT;
72282+ goto out;
72283+ }
72284+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
72285+ error = -EACCES;
72286+ goto out;
72287+ }
72288+
72289 audit_inode(name, nd->path.dentry, 0);
72290+
72291 error = -EISDIR;
72292 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
72293 goto out;
72294@@ -3235,7 +3328,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
72295 if (unlikely(error))
72296 goto out;
72297
72298- error = do_last(nd, &path, file, op, &opened, pathname);
72299+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
72300 while (unlikely(error > 0)) { /* trailing symlink */
72301 struct path link = path;
72302 void *cookie;
72303@@ -3253,7 +3346,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
72304 error = follow_link(&link, nd, &cookie);
72305 if (unlikely(error))
72306 break;
72307- error = do_last(nd, &path, file, op, &opened, pathname);
72308+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
72309 put_link(nd, &link, cookie);
72310 }
72311 out:
72312@@ -3356,9 +3449,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
72313 goto unlock;
72314
72315 error = -EEXIST;
72316- if (d_is_positive(dentry))
72317+ if (d_is_positive(dentry)) {
72318+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
72319+ error = -ENOENT;
72320 goto fail;
72321-
72322+ }
72323 /*
72324 * Special case - lookup gave negative, but... we had foo/bar/
72325 * From the vfs_mknod() POV we just have a negative dentry -
72326@@ -3423,6 +3518,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
72327 }
72328 EXPORT_SYMBOL(user_path_create);
72329
72330+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
72331+{
72332+ struct filename *tmp = getname(pathname);
72333+ struct dentry *res;
72334+ if (IS_ERR(tmp))
72335+ return ERR_CAST(tmp);
72336+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
72337+ if (IS_ERR(res))
72338+ putname(tmp);
72339+ else
72340+ *to = tmp;
72341+ return res;
72342+}
72343+
72344 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
72345 {
72346 int error = may_create(dir, dentry);
72347@@ -3486,6 +3595,17 @@ retry:
72348
72349 if (!IS_POSIXACL(path.dentry->d_inode))
72350 mode &= ~current_umask();
72351+
72352+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
72353+ error = -EPERM;
72354+ goto out;
72355+ }
72356+
72357+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
72358+ error = -EACCES;
72359+ goto out;
72360+ }
72361+
72362 error = security_path_mknod(&path, dentry, mode, dev);
72363 if (error)
72364 goto out;
72365@@ -3501,6 +3621,8 @@ retry:
72366 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
72367 break;
72368 }
72369+ if (!error)
72370+ gr_handle_create(dentry, path.mnt);
72371 out:
72372 done_path_create(&path, dentry);
72373 if (retry_estale(error, lookup_flags)) {
72374@@ -3555,9 +3677,16 @@ retry:
72375
72376 if (!IS_POSIXACL(path.dentry->d_inode))
72377 mode &= ~current_umask();
72378+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
72379+ error = -EACCES;
72380+ goto out;
72381+ }
72382 error = security_path_mkdir(&path, dentry, mode);
72383 if (!error)
72384 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
72385+ if (!error)
72386+ gr_handle_create(dentry, path.mnt);
72387+out:
72388 done_path_create(&path, dentry);
72389 if (retry_estale(error, lookup_flags)) {
72390 lookup_flags |= LOOKUP_REVAL;
72391@@ -3590,7 +3719,7 @@ void dentry_unhash(struct dentry *dentry)
72392 {
72393 shrink_dcache_parent(dentry);
72394 spin_lock(&dentry->d_lock);
72395- if (dentry->d_lockref.count == 1)
72396+ if (__lockref_read(&dentry->d_lockref) == 1)
72397 __d_drop(dentry);
72398 spin_unlock(&dentry->d_lock);
72399 }
72400@@ -3641,6 +3770,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
72401 struct filename *name;
72402 struct dentry *dentry;
72403 struct nameidata nd;
72404+ u64 saved_ino = 0;
72405+ dev_t saved_dev = 0;
72406 unsigned int lookup_flags = 0;
72407 retry:
72408 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
72409@@ -3673,10 +3804,21 @@ retry:
72410 error = -ENOENT;
72411 goto exit3;
72412 }
72413+
72414+ saved_ino = gr_get_ino_from_dentry(dentry);
72415+ saved_dev = gr_get_dev_from_dentry(dentry);
72416+
72417+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
72418+ error = -EACCES;
72419+ goto exit3;
72420+ }
72421+
72422 error = security_path_rmdir(&nd.path, dentry);
72423 if (error)
72424 goto exit3;
72425 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
72426+ if (!error && (saved_dev || saved_ino))
72427+ gr_handle_delete(saved_ino, saved_dev);
72428 exit3:
72429 dput(dentry);
72430 exit2:
72431@@ -3769,6 +3911,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
72432 struct nameidata nd;
72433 struct inode *inode = NULL;
72434 struct inode *delegated_inode = NULL;
72435+ u64 saved_ino = 0;
72436+ dev_t saved_dev = 0;
72437 unsigned int lookup_flags = 0;
72438 retry:
72439 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
72440@@ -3795,10 +3939,22 @@ retry_deleg:
72441 if (d_is_negative(dentry))
72442 goto slashes;
72443 ihold(inode);
72444+
72445+ if (inode->i_nlink <= 1) {
72446+ saved_ino = gr_get_ino_from_dentry(dentry);
72447+ saved_dev = gr_get_dev_from_dentry(dentry);
72448+ }
72449+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
72450+ error = -EACCES;
72451+ goto exit2;
72452+ }
72453+
72454 error = security_path_unlink(&nd.path, dentry);
72455 if (error)
72456 goto exit2;
72457 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
72458+ if (!error && (saved_ino || saved_dev))
72459+ gr_handle_delete(saved_ino, saved_dev);
72460 exit2:
72461 dput(dentry);
72462 }
72463@@ -3887,9 +4043,17 @@ retry:
72464 if (IS_ERR(dentry))
72465 goto out_putname;
72466
72467+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
72468+ error = -EACCES;
72469+ goto out;
72470+ }
72471+
72472 error = security_path_symlink(&path, dentry, from->name);
72473 if (!error)
72474 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
72475+ if (!error)
72476+ gr_handle_create(dentry, path.mnt);
72477+out:
72478 done_path_create(&path, dentry);
72479 if (retry_estale(error, lookup_flags)) {
72480 lookup_flags |= LOOKUP_REVAL;
72481@@ -3993,6 +4157,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
72482 struct dentry *new_dentry;
72483 struct path old_path, new_path;
72484 struct inode *delegated_inode = NULL;
72485+ struct filename *to = NULL;
72486 int how = 0;
72487 int error;
72488
72489@@ -4016,7 +4181,7 @@ retry:
72490 if (error)
72491 return error;
72492
72493- new_dentry = user_path_create(newdfd, newname, &new_path,
72494+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
72495 (how & LOOKUP_REVAL));
72496 error = PTR_ERR(new_dentry);
72497 if (IS_ERR(new_dentry))
72498@@ -4028,11 +4193,28 @@ retry:
72499 error = may_linkat(&old_path);
72500 if (unlikely(error))
72501 goto out_dput;
72502+
72503+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
72504+ old_path.dentry->d_inode,
72505+ old_path.dentry->d_inode->i_mode, to)) {
72506+ error = -EACCES;
72507+ goto out_dput;
72508+ }
72509+
72510+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
72511+ old_path.dentry, old_path.mnt, to)) {
72512+ error = -EACCES;
72513+ goto out_dput;
72514+ }
72515+
72516 error = security_path_link(old_path.dentry, &new_path, new_dentry);
72517 if (error)
72518 goto out_dput;
72519 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
72520+ if (!error)
72521+ gr_handle_create(new_dentry, new_path.mnt);
72522 out_dput:
72523+ putname(to);
72524 done_path_create(&new_path, new_dentry);
72525 if (delegated_inode) {
72526 error = break_deleg_wait(&delegated_inode);
72527@@ -4348,6 +4530,20 @@ retry_deleg:
72528 if (new_dentry == trap)
72529 goto exit5;
72530
72531+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
72532+ /* use EXDEV error to cause 'mv' to switch to an alternative
72533+ * method for usability
72534+ */
72535+ error = -EXDEV;
72536+ goto exit5;
72537+ }
72538+
72539+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
72540+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
72541+ to, flags);
72542+ if (error)
72543+ goto exit5;
72544+
72545 error = security_path_rename(&oldnd.path, old_dentry,
72546 &newnd.path, new_dentry, flags);
72547 if (error)
72548@@ -4355,6 +4551,9 @@ retry_deleg:
72549 error = vfs_rename(old_dir->d_inode, old_dentry,
72550 new_dir->d_inode, new_dentry,
72551 &delegated_inode, flags);
72552+ if (!error)
72553+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
72554+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
72555 exit5:
72556 dput(new_dentry);
72557 exit4:
72558@@ -4411,14 +4610,24 @@ EXPORT_SYMBOL(vfs_whiteout);
72559
72560 int readlink_copy(char __user *buffer, int buflen, const char *link)
72561 {
72562+ char tmpbuf[64];
72563+ const char *newlink;
72564 int len = PTR_ERR(link);
72565+
72566 if (IS_ERR(link))
72567 goto out;
72568
72569 len = strlen(link);
72570 if (len > (unsigned) buflen)
72571 len = buflen;
72572- if (copy_to_user(buffer, link, len))
72573+
72574+ if (len < sizeof(tmpbuf)) {
72575+ memcpy(tmpbuf, link, len);
72576+ newlink = tmpbuf;
72577+ } else
72578+ newlink = link;
72579+
72580+ if (copy_to_user(buffer, newlink, len))
72581 len = -EFAULT;
72582 out:
72583 return len;
72584diff --git a/fs/namespace.c b/fs/namespace.c
72585index 13b0f7b..1ee96e7 100644
72586--- a/fs/namespace.c
72587+++ b/fs/namespace.c
72588@@ -1480,6 +1480,9 @@ static int do_umount(struct mount *mnt, int flags)
72589 if (!(sb->s_flags & MS_RDONLY))
72590 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
72591 up_write(&sb->s_umount);
72592+
72593+ gr_log_remount(mnt->mnt_devname, retval);
72594+
72595 return retval;
72596 }
72597
72598@@ -1502,6 +1505,9 @@ static int do_umount(struct mount *mnt, int flags)
72599 }
72600 unlock_mount_hash();
72601 namespace_unlock();
72602+
72603+ gr_log_unmount(mnt->mnt_devname, retval);
72604+
72605 return retval;
72606 }
72607
72608@@ -1559,7 +1565,7 @@ static inline bool may_mount(void)
72609 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
72610 */
72611
72612-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
72613+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
72614 {
72615 struct path path;
72616 struct mount *mnt;
72617@@ -1604,7 +1610,7 @@ out:
72618 /*
72619 * The 2.0 compatible umount. No flags.
72620 */
72621-SYSCALL_DEFINE1(oldumount, char __user *, name)
72622+SYSCALL_DEFINE1(oldumount, const char __user *, name)
72623 {
72624 return sys_umount(name, 0);
72625 }
72626@@ -2673,6 +2679,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
72627 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
72628 MS_STRICTATIME);
72629
72630+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
72631+ retval = -EPERM;
72632+ goto dput_out;
72633+ }
72634+
72635+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
72636+ retval = -EPERM;
72637+ goto dput_out;
72638+ }
72639+
72640 if (flags & MS_REMOUNT)
72641 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
72642 data_page);
72643@@ -2686,7 +2702,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
72644 retval = do_new_mount(&path, type_page, flags, mnt_flags,
72645 dev_name, data_page);
72646 dput_out:
72647+ gr_log_mount(dev_name, &path, retval);
72648+
72649 path_put(&path);
72650+
72651 return retval;
72652 }
72653
72654@@ -2704,7 +2723,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
72655 * number incrementing at 10Ghz will take 12,427 years to wrap which
72656 * is effectively never, so we can ignore the possibility.
72657 */
72658-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
72659+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
72660
72661 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72662 {
72663@@ -2720,7 +2739,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72664 return ERR_PTR(ret);
72665 }
72666 new_ns->ns.ops = &mntns_operations;
72667- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
72668+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
72669 atomic_set(&new_ns->count, 1);
72670 new_ns->root = NULL;
72671 INIT_LIST_HEAD(&new_ns->list);
72672@@ -2730,7 +2749,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72673 return new_ns;
72674 }
72675
72676-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
72677+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
72678 struct user_namespace *user_ns, struct fs_struct *new_fs)
72679 {
72680 struct mnt_namespace *new_ns;
72681@@ -2851,8 +2870,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
72682 }
72683 EXPORT_SYMBOL(mount_subtree);
72684
72685-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
72686- char __user *, type, unsigned long, flags, void __user *, data)
72687+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
72688+ const char __user *, type, unsigned long, flags, void __user *, data)
72689 {
72690 int ret;
72691 char *kernel_type;
72692@@ -2958,6 +2977,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
72693 if (error)
72694 goto out2;
72695
72696+ if (gr_handle_chroot_pivot()) {
72697+ error = -EPERM;
72698+ goto out2;
72699+ }
72700+
72701 get_fs_root(current->fs, &root);
72702 old_mp = lock_mount(&old);
72703 error = PTR_ERR(old_mp);
72704@@ -3238,7 +3262,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
72705 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
72706 return -EPERM;
72707
72708- if (fs->users != 1)
72709+ if (atomic_read(&fs->users) != 1)
72710 return -EINVAL;
72711
72712 get_mnt_ns(mnt_ns);
72713diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
72714index 19ca95c..b28702c 100644
72715--- a/fs/nfs/callback_xdr.c
72716+++ b/fs/nfs/callback_xdr.c
72717@@ -51,7 +51,7 @@ struct callback_op {
72718 callback_decode_arg_t decode_args;
72719 callback_encode_res_t encode_res;
72720 long res_maxsize;
72721-};
72722+} __do_const;
72723
72724 static struct callback_op callback_ops[];
72725
72726diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
72727index d42dff6..ecbdf42 100644
72728--- a/fs/nfs/inode.c
72729+++ b/fs/nfs/inode.c
72730@@ -1270,16 +1270,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
72731 return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
72732 }
72733
72734-static atomic_long_t nfs_attr_generation_counter;
72735+static atomic_long_unchecked_t nfs_attr_generation_counter;
72736
72737 static unsigned long nfs_read_attr_generation_counter(void)
72738 {
72739- return atomic_long_read(&nfs_attr_generation_counter);
72740+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
72741 }
72742
72743 unsigned long nfs_inc_attr_generation_counter(void)
72744 {
72745- return atomic_long_inc_return(&nfs_attr_generation_counter);
72746+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
72747 }
72748 EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
72749
72750diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
72751index 5416968..0942042 100644
72752--- a/fs/nfsd/nfs4proc.c
72753+++ b/fs/nfsd/nfs4proc.c
72754@@ -1496,7 +1496,7 @@ struct nfsd4_operation {
72755 nfsd4op_rsize op_rsize_bop;
72756 stateid_getter op_get_currentstateid;
72757 stateid_setter op_set_currentstateid;
72758-};
72759+} __do_const;
72760
72761 static struct nfsd4_operation nfsd4_ops[];
72762
72763diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
72764index 5b33ce1..c2a92aa 100644
72765--- a/fs/nfsd/nfs4xdr.c
72766+++ b/fs/nfsd/nfs4xdr.c
72767@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
72768
72769 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
72770
72771-static nfsd4_dec nfsd4_dec_ops[] = {
72772+static const nfsd4_dec nfsd4_dec_ops[] = {
72773 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
72774 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
72775 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
72776diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
72777index 46ec934..f384e41 100644
72778--- a/fs/nfsd/nfscache.c
72779+++ b/fs/nfsd/nfscache.c
72780@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72781 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
72782 u32 hash;
72783 struct nfsd_drc_bucket *b;
72784- int len;
72785+ long len;
72786 size_t bufsize = 0;
72787
72788 if (!rp)
72789@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72790 hash = nfsd_cache_hash(rp->c_xid);
72791 b = &drc_hashtbl[hash];
72792
72793- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
72794- len >>= 2;
72795+ if (statp) {
72796+ len = (char*)statp - (char*)resv->iov_base;
72797+ len = resv->iov_len - len;
72798+ len >>= 2;
72799+ }
72800
72801 /* Don't cache excessive amounts of data and XDR failures */
72802- if (!statp || len > (256 >> 2)) {
72803+ if (!statp || len > (256 >> 2) || len < 0) {
72804 nfsd_reply_cache_free(b, rp);
72805 return;
72806 }
72807@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72808 switch (cachetype) {
72809 case RC_REPLSTAT:
72810 if (len != 1)
72811- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
72812+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
72813 rp->c_replstat = *statp;
72814 break;
72815 case RC_REPLBUFF:
72816diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
72817index 3685265..e77261e 100644
72818--- a/fs/nfsd/vfs.c
72819+++ b/fs/nfsd/vfs.c
72820@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
72821
72822 oldfs = get_fs();
72823 set_fs(KERNEL_DS);
72824- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
72825+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
72826 set_fs(oldfs);
72827 return nfsd_finish_read(file, count, host_err);
72828 }
72829@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
72830
72831 /* Write the data. */
72832 oldfs = get_fs(); set_fs(KERNEL_DS);
72833- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
72834+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
72835 set_fs(oldfs);
72836 if (host_err < 0)
72837 goto out_nfserr;
72838@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
72839 */
72840
72841 oldfs = get_fs(); set_fs(KERNEL_DS);
72842- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
72843+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
72844 set_fs(oldfs);
72845
72846 if (host_err < 0)
72847diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
72848index 52ccd34..7a6b202 100644
72849--- a/fs/nls/nls_base.c
72850+++ b/fs/nls/nls_base.c
72851@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
72852
72853 int __register_nls(struct nls_table *nls, struct module *owner)
72854 {
72855- struct nls_table ** tmp = &tables;
72856+ struct nls_table *tmp = tables;
72857
72858 if (nls->next)
72859 return -EBUSY;
72860
72861- nls->owner = owner;
72862+ pax_open_kernel();
72863+ *(void **)&nls->owner = owner;
72864+ pax_close_kernel();
72865 spin_lock(&nls_lock);
72866- while (*tmp) {
72867- if (nls == *tmp) {
72868+ while (tmp) {
72869+ if (nls == tmp) {
72870 spin_unlock(&nls_lock);
72871 return -EBUSY;
72872 }
72873- tmp = &(*tmp)->next;
72874+ tmp = tmp->next;
72875 }
72876- nls->next = tables;
72877+ pax_open_kernel();
72878+ *(struct nls_table **)&nls->next = tables;
72879+ pax_close_kernel();
72880 tables = nls;
72881 spin_unlock(&nls_lock);
72882 return 0;
72883@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
72884
72885 int unregister_nls(struct nls_table * nls)
72886 {
72887- struct nls_table ** tmp = &tables;
72888+ struct nls_table * const * tmp = &tables;
72889
72890 spin_lock(&nls_lock);
72891 while (*tmp) {
72892 if (nls == *tmp) {
72893- *tmp = nls->next;
72894+ pax_open_kernel();
72895+ *(struct nls_table **)tmp = nls->next;
72896+ pax_close_kernel();
72897 spin_unlock(&nls_lock);
72898 return 0;
72899 }
72900@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
72901 return -EINVAL;
72902 }
72903
72904-static struct nls_table *find_nls(char *charset)
72905+static struct nls_table *find_nls(const char *charset)
72906 {
72907 struct nls_table *nls;
72908 spin_lock(&nls_lock);
72909@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
72910 return nls;
72911 }
72912
72913-struct nls_table *load_nls(char *charset)
72914+struct nls_table *load_nls(const char *charset)
72915 {
72916 return try_then_request_module(find_nls(charset), "nls_%s", charset);
72917 }
72918diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
72919index 162b3f1..6076a7c 100644
72920--- a/fs/nls/nls_euc-jp.c
72921+++ b/fs/nls/nls_euc-jp.c
72922@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
72923 p_nls = load_nls("cp932");
72924
72925 if (p_nls) {
72926- table.charset2upper = p_nls->charset2upper;
72927- table.charset2lower = p_nls->charset2lower;
72928+ pax_open_kernel();
72929+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
72930+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
72931+ pax_close_kernel();
72932 return register_nls(&table);
72933 }
72934
72935diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
72936index a80a741..7b96e1b 100644
72937--- a/fs/nls/nls_koi8-ru.c
72938+++ b/fs/nls/nls_koi8-ru.c
72939@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
72940 p_nls = load_nls("koi8-u");
72941
72942 if (p_nls) {
72943- table.charset2upper = p_nls->charset2upper;
72944- table.charset2lower = p_nls->charset2lower;
72945+ pax_open_kernel();
72946+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
72947+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
72948+ pax_close_kernel();
72949 return register_nls(&table);
72950 }
72951
72952diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
72953index cf27550..6c70f29d 100644
72954--- a/fs/notify/fanotify/fanotify_user.c
72955+++ b/fs/notify/fanotify/fanotify_user.c
72956@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
72957
72958 fd = fanotify_event_metadata.fd;
72959 ret = -EFAULT;
72960- if (copy_to_user(buf, &fanotify_event_metadata,
72961- fanotify_event_metadata.event_len))
72962+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
72963+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
72964 goto out_close_fd;
72965
72966 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
72967diff --git a/fs/notify/notification.c b/fs/notify/notification.c
72968index a95d8e0..a91a5fd 100644
72969--- a/fs/notify/notification.c
72970+++ b/fs/notify/notification.c
72971@@ -48,7 +48,7 @@
72972 #include <linux/fsnotify_backend.h>
72973 #include "fsnotify.h"
72974
72975-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
72976+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
72977
72978 /**
72979 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
72980@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
72981 */
72982 u32 fsnotify_get_cookie(void)
72983 {
72984- return atomic_inc_return(&fsnotify_sync_cookie);
72985+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
72986 }
72987 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
72988
72989diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
72990index 9e38daf..5727cae 100644
72991--- a/fs/ntfs/dir.c
72992+++ b/fs/ntfs/dir.c
72993@@ -1310,7 +1310,7 @@ find_next_index_buffer:
72994 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
72995 ~(s64)(ndir->itype.index.block_size - 1)));
72996 /* Bounds checks. */
72997- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
72998+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
72999 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
73000 "inode 0x%lx or driver bug.", vdir->i_ino);
73001 goto err_out;
73002diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
73003index 1da9b2d..9cca092a 100644
73004--- a/fs/ntfs/file.c
73005+++ b/fs/ntfs/file.c
73006@@ -1281,7 +1281,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
73007 char *addr;
73008 size_t total = 0;
73009 unsigned len;
73010- int left;
73011+ unsigned left;
73012
73013 do {
73014 len = PAGE_CACHE_SIZE - ofs;
73015diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
73016index 9e1e112..241a52a 100644
73017--- a/fs/ntfs/super.c
73018+++ b/fs/ntfs/super.c
73019@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73020 if (!silent)
73021 ntfs_error(sb, "Primary boot sector is invalid.");
73022 } else if (!silent)
73023- ntfs_error(sb, read_err_str, "primary");
73024+ ntfs_error(sb, read_err_str, "%s", "primary");
73025 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
73026 if (bh_primary)
73027 brelse(bh_primary);
73028@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73029 goto hotfix_primary_boot_sector;
73030 brelse(bh_backup);
73031 } else if (!silent)
73032- ntfs_error(sb, read_err_str, "backup");
73033+ ntfs_error(sb, read_err_str, "%s", "backup");
73034 /* Try to read NT3.51- backup boot sector. */
73035 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
73036 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
73037@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73038 "sector.");
73039 brelse(bh_backup);
73040 } else if (!silent)
73041- ntfs_error(sb, read_err_str, "backup");
73042+ ntfs_error(sb, read_err_str, "%s", "backup");
73043 /* We failed. Cleanup and return. */
73044 if (bh_primary)
73045 brelse(bh_primary);
73046diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
73047index 0440134..d52c93a 100644
73048--- a/fs/ocfs2/localalloc.c
73049+++ b/fs/ocfs2/localalloc.c
73050@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
73051 goto bail;
73052 }
73053
73054- atomic_inc(&osb->alloc_stats.moves);
73055+ atomic_inc_unchecked(&osb->alloc_stats.moves);
73056
73057 bail:
73058 if (handle)
73059diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
73060index 460c6c3..b4ef513 100644
73061--- a/fs/ocfs2/ocfs2.h
73062+++ b/fs/ocfs2/ocfs2.h
73063@@ -247,11 +247,11 @@ enum ocfs2_vol_state
73064
73065 struct ocfs2_alloc_stats
73066 {
73067- atomic_t moves;
73068- atomic_t local_data;
73069- atomic_t bitmap_data;
73070- atomic_t bg_allocs;
73071- atomic_t bg_extends;
73072+ atomic_unchecked_t moves;
73073+ atomic_unchecked_t local_data;
73074+ atomic_unchecked_t bitmap_data;
73075+ atomic_unchecked_t bg_allocs;
73076+ atomic_unchecked_t bg_extends;
73077 };
73078
73079 enum ocfs2_local_alloc_state
73080diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
73081index ee541f9..df3a500 100644
73082--- a/fs/ocfs2/refcounttree.c
73083+++ b/fs/ocfs2/refcounttree.c
73084@@ -4276,7 +4276,7 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
73085 error = posix_acl_create(dir, &mode, &default_acl, &acl);
73086 if (error) {
73087 mlog_errno(error);
73088- goto out;
73089+ return error;
73090 }
73091
73092 error = ocfs2_create_inode_in_orphan(dir, mode,
73093diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
73094index 0cb889a..6a26b24 100644
73095--- a/fs/ocfs2/suballoc.c
73096+++ b/fs/ocfs2/suballoc.c
73097@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
73098 mlog_errno(status);
73099 goto bail;
73100 }
73101- atomic_inc(&osb->alloc_stats.bg_extends);
73102+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
73103
73104 /* You should never ask for this much metadata */
73105 BUG_ON(bits_wanted >
73106@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
73107 mlog_errno(status);
73108 goto bail;
73109 }
73110- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73111+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73112
73113 *suballoc_loc = res.sr_bg_blkno;
73114 *suballoc_bit_start = res.sr_bit_offset;
73115@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
73116 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
73117 res->sr_bits);
73118
73119- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73120+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73121
73122 BUG_ON(res->sr_bits != 1);
73123
73124@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
73125 mlog_errno(status);
73126 goto bail;
73127 }
73128- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73129+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73130
73131 BUG_ON(res.sr_bits != 1);
73132
73133@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
73134 cluster_start,
73135 num_clusters);
73136 if (!status)
73137- atomic_inc(&osb->alloc_stats.local_data);
73138+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
73139 } else {
73140 if (min_clusters > (osb->bitmap_cpg - 1)) {
73141 /* The only paths asking for contiguousness
73142@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
73143 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
73144 res.sr_bg_blkno,
73145 res.sr_bit_offset);
73146- atomic_inc(&osb->alloc_stats.bitmap_data);
73147+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
73148 *num_clusters = res.sr_bits;
73149 }
73150 }
73151diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
73152index 2667518..24bcf79 100644
73153--- a/fs/ocfs2/super.c
73154+++ b/fs/ocfs2/super.c
73155@@ -308,11 +308,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
73156 "%10s => GlobalAllocs: %d LocalAllocs: %d "
73157 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
73158 "Stats",
73159- atomic_read(&osb->alloc_stats.bitmap_data),
73160- atomic_read(&osb->alloc_stats.local_data),
73161- atomic_read(&osb->alloc_stats.bg_allocs),
73162- atomic_read(&osb->alloc_stats.moves),
73163- atomic_read(&osb->alloc_stats.bg_extends));
73164+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
73165+ atomic_read_unchecked(&osb->alloc_stats.local_data),
73166+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
73167+ atomic_read_unchecked(&osb->alloc_stats.moves),
73168+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
73169
73170 out += snprintf(buf + out, len - out,
73171 "%10s => State: %u Descriptor: %llu Size: %u bits "
73172@@ -2093,11 +2093,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
73173
73174 mutex_init(&osb->system_file_mutex);
73175
73176- atomic_set(&osb->alloc_stats.moves, 0);
73177- atomic_set(&osb->alloc_stats.local_data, 0);
73178- atomic_set(&osb->alloc_stats.bitmap_data, 0);
73179- atomic_set(&osb->alloc_stats.bg_allocs, 0);
73180- atomic_set(&osb->alloc_stats.bg_extends, 0);
73181+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
73182+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
73183+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
73184+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
73185+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
73186
73187 /* Copy the blockcheck stats from the superblock probe */
73188 osb->osb_ecc_stats = *stats;
73189diff --git a/fs/open.c b/fs/open.c
73190index 44a3be1..5e97aa1 100644
73191--- a/fs/open.c
73192+++ b/fs/open.c
73193@@ -32,6 +32,8 @@
73194 #include <linux/dnotify.h>
73195 #include <linux/compat.h>
73196
73197+#define CREATE_TRACE_POINTS
73198+#include <trace/events/fs.h>
73199 #include "internal.h"
73200
73201 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
73202@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
73203 error = locks_verify_truncate(inode, NULL, length);
73204 if (!error)
73205 error = security_path_truncate(path);
73206+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
73207+ error = -EACCES;
73208 if (!error)
73209 error = do_truncate(path->dentry, length, 0, NULL);
73210
73211@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
73212 error = locks_verify_truncate(inode, f.file, length);
73213 if (!error)
73214 error = security_path_truncate(&f.file->f_path);
73215+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
73216+ error = -EACCES;
73217 if (!error)
73218 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
73219 sb_end_write(inode->i_sb);
73220@@ -392,6 +398,9 @@ retry:
73221 if (__mnt_is_readonly(path.mnt))
73222 res = -EROFS;
73223
73224+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
73225+ res = -EACCES;
73226+
73227 out_path_release:
73228 path_put(&path);
73229 if (retry_estale(res, lookup_flags)) {
73230@@ -423,6 +432,8 @@ retry:
73231 if (error)
73232 goto dput_and_out;
73233
73234+ gr_log_chdir(path.dentry, path.mnt);
73235+
73236 set_fs_pwd(current->fs, &path);
73237
73238 dput_and_out:
73239@@ -452,6 +463,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
73240 goto out_putf;
73241
73242 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
73243+
73244+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
73245+ error = -EPERM;
73246+
73247+ if (!error)
73248+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
73249+
73250 if (!error)
73251 set_fs_pwd(current->fs, &f.file->f_path);
73252 out_putf:
73253@@ -481,7 +499,13 @@ retry:
73254 if (error)
73255 goto dput_and_out;
73256
73257+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
73258+ goto dput_and_out;
73259+
73260 set_fs_root(current->fs, &path);
73261+
73262+ gr_handle_chroot_chdir(&path);
73263+
73264 error = 0;
73265 dput_and_out:
73266 path_put(&path);
73267@@ -505,6 +529,16 @@ static int chmod_common(struct path *path, umode_t mode)
73268 return error;
73269 retry_deleg:
73270 mutex_lock(&inode->i_mutex);
73271+
73272+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
73273+ error = -EACCES;
73274+ goto out_unlock;
73275+ }
73276+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
73277+ error = -EACCES;
73278+ goto out_unlock;
73279+ }
73280+
73281 error = security_path_chmod(path, mode);
73282 if (error)
73283 goto out_unlock;
73284@@ -570,6 +604,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
73285 uid = make_kuid(current_user_ns(), user);
73286 gid = make_kgid(current_user_ns(), group);
73287
73288+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
73289+ return -EACCES;
73290+
73291 retry_deleg:
73292 newattrs.ia_valid = ATTR_CTIME;
73293 if (user != (uid_t) -1) {
73294@@ -1017,6 +1054,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
73295 } else {
73296 fsnotify_open(f);
73297 fd_install(fd, f);
73298+ trace_do_sys_open(tmp->name, flags, mode);
73299 }
73300 }
73301 putname(tmp);
73302diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
73303index bf8537c..c16ef7d 100644
73304--- a/fs/overlayfs/super.c
73305+++ b/fs/overlayfs/super.c
73306@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
73307 {
73308 struct ovl_entry *oe = dentry->d_fsdata;
73309
73310- *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
73311+ *path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
73312 }
73313
73314 int ovl_want_write(struct dentry *dentry)
73315@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
73316
73317 static int ovl_fill_super(struct super_block *sb, void *data, int silent)
73318 {
73319- struct path upperpath = { NULL, NULL };
73320- struct path workpath = { NULL, NULL };
73321+ struct path upperpath = { .dentry = NULL, .mnt = NULL };
73322+ struct path workpath = { .dentry = NULL, .mnt = NULL };
73323 struct dentry *root_dentry;
73324 struct ovl_entry *oe;
73325 struct ovl_fs *ufs;
73326diff --git a/fs/pipe.c b/fs/pipe.c
73327index 21981e5..2c0bffb 100644
73328--- a/fs/pipe.c
73329+++ b/fs/pipe.c
73330@@ -37,7 +37,7 @@ unsigned int pipe_max_size = 1048576;
73331 /*
73332 * Minimum pipe size, as required by POSIX
73333 */
73334-unsigned int pipe_min_size = PAGE_SIZE;
73335+unsigned int pipe_min_size __read_only = PAGE_SIZE;
73336
73337 /*
73338 * We use a start+len construction, which provides full use of the
73339@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
73340
73341 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
73342 {
73343- if (pipe->files)
73344+ if (atomic_read(&pipe->files))
73345 mutex_lock_nested(&pipe->mutex, subclass);
73346 }
73347
73348@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
73349
73350 void pipe_unlock(struct pipe_inode_info *pipe)
73351 {
73352- if (pipe->files)
73353+ if (atomic_read(&pipe->files))
73354 mutex_unlock(&pipe->mutex);
73355 }
73356 EXPORT_SYMBOL(pipe_unlock);
73357@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
73358 }
73359 if (bufs) /* More to do? */
73360 continue;
73361- if (!pipe->writers)
73362+ if (!atomic_read(&pipe->writers))
73363 break;
73364- if (!pipe->waiting_writers) {
73365+ if (!atomic_read(&pipe->waiting_writers)) {
73366 /* syscall merging: Usually we must not sleep
73367 * if O_NONBLOCK is set, or if we got some data.
73368 * But if a writer sleeps in kernel space, then
73369@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73370
73371 __pipe_lock(pipe);
73372
73373- if (!pipe->readers) {
73374+ if (!atomic_read(&pipe->readers)) {
73375 send_sig(SIGPIPE, current, 0);
73376 ret = -EPIPE;
73377 goto out;
73378@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73379 for (;;) {
73380 int bufs;
73381
73382- if (!pipe->readers) {
73383+ if (!atomic_read(&pipe->readers)) {
73384 send_sig(SIGPIPE, current, 0);
73385 if (!ret)
73386 ret = -EPIPE;
73387@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73388 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
73389 do_wakeup = 0;
73390 }
73391- pipe->waiting_writers++;
73392+ atomic_inc(&pipe->waiting_writers);
73393 pipe_wait(pipe);
73394- pipe->waiting_writers--;
73395+ atomic_dec(&pipe->waiting_writers);
73396 }
73397 out:
73398 __pipe_unlock(pipe);
73399@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
73400 mask = 0;
73401 if (filp->f_mode & FMODE_READ) {
73402 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
73403- if (!pipe->writers && filp->f_version != pipe->w_counter)
73404+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
73405 mask |= POLLHUP;
73406 }
73407
73408@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
73409 * Most Unices do not set POLLERR for FIFOs but on Linux they
73410 * behave exactly like pipes for poll().
73411 */
73412- if (!pipe->readers)
73413+ if (!atomic_read(&pipe->readers))
73414 mask |= POLLERR;
73415 }
73416
73417@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
73418 int kill = 0;
73419
73420 spin_lock(&inode->i_lock);
73421- if (!--pipe->files) {
73422+ if (atomic_dec_and_test(&pipe->files)) {
73423 inode->i_pipe = NULL;
73424 kill = 1;
73425 }
73426@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
73427
73428 __pipe_lock(pipe);
73429 if (file->f_mode & FMODE_READ)
73430- pipe->readers--;
73431+ atomic_dec(&pipe->readers);
73432 if (file->f_mode & FMODE_WRITE)
73433- pipe->writers--;
73434+ atomic_dec(&pipe->writers);
73435
73436- if (pipe->readers || pipe->writers) {
73437+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
73438 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
73439 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
73440 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
73441@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
73442 kfree(pipe);
73443 }
73444
73445-static struct vfsmount *pipe_mnt __read_mostly;
73446+struct vfsmount *pipe_mnt __read_mostly;
73447
73448 /*
73449 * pipefs_dname() is called from d_path().
73450@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
73451 goto fail_iput;
73452
73453 inode->i_pipe = pipe;
73454- pipe->files = 2;
73455- pipe->readers = pipe->writers = 1;
73456+ atomic_set(&pipe->files, 2);
73457+ atomic_set(&pipe->readers, 1);
73458+ atomic_set(&pipe->writers, 1);
73459 inode->i_fop = &pipefifo_fops;
73460
73461 /*
73462@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
73463 spin_lock(&inode->i_lock);
73464 if (inode->i_pipe) {
73465 pipe = inode->i_pipe;
73466- pipe->files++;
73467+ atomic_inc(&pipe->files);
73468 spin_unlock(&inode->i_lock);
73469 } else {
73470 spin_unlock(&inode->i_lock);
73471 pipe = alloc_pipe_info();
73472 if (!pipe)
73473 return -ENOMEM;
73474- pipe->files = 1;
73475+ atomic_set(&pipe->files, 1);
73476 spin_lock(&inode->i_lock);
73477 if (unlikely(inode->i_pipe)) {
73478- inode->i_pipe->files++;
73479+ atomic_inc(&inode->i_pipe->files);
73480 spin_unlock(&inode->i_lock);
73481 free_pipe_info(pipe);
73482 pipe = inode->i_pipe;
73483@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
73484 * opened, even when there is no process writing the FIFO.
73485 */
73486 pipe->r_counter++;
73487- if (pipe->readers++ == 0)
73488+ if (atomic_inc_return(&pipe->readers) == 1)
73489 wake_up_partner(pipe);
73490
73491- if (!is_pipe && !pipe->writers) {
73492+ if (!is_pipe && !atomic_read(&pipe->writers)) {
73493 if ((filp->f_flags & O_NONBLOCK)) {
73494 /* suppress POLLHUP until we have
73495 * seen a writer */
73496@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
73497 * errno=ENXIO when there is no process reading the FIFO.
73498 */
73499 ret = -ENXIO;
73500- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
73501+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
73502 goto err;
73503
73504 pipe->w_counter++;
73505- if (!pipe->writers++)
73506+ if (atomic_inc_return(&pipe->writers) == 1)
73507 wake_up_partner(pipe);
73508
73509- if (!is_pipe && !pipe->readers) {
73510+ if (!is_pipe && !atomic_read(&pipe->readers)) {
73511 if (wait_for_partner(pipe, &pipe->r_counter))
73512 goto err_wr;
73513 }
73514@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
73515 * the process can at least talk to itself.
73516 */
73517
73518- pipe->readers++;
73519- pipe->writers++;
73520+ atomic_inc(&pipe->readers);
73521+ atomic_inc(&pipe->writers);
73522 pipe->r_counter++;
73523 pipe->w_counter++;
73524- if (pipe->readers == 1 || pipe->writers == 1)
73525+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
73526 wake_up_partner(pipe);
73527 break;
73528
73529@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
73530 return 0;
73531
73532 err_rd:
73533- if (!--pipe->readers)
73534+ if (atomic_dec_and_test(&pipe->readers))
73535 wake_up_interruptible(&pipe->wait);
73536 ret = -ERESTARTSYS;
73537 goto err;
73538
73539 err_wr:
73540- if (!--pipe->writers)
73541+ if (atomic_dec_and_test(&pipe->writers))
73542 wake_up_interruptible(&pipe->wait);
73543 ret = -ERESTARTSYS;
73544 goto err;
73545@@ -1010,7 +1011,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
73546 * Currently we rely on the pipe array holding a power-of-2 number
73547 * of pages.
73548 */
73549-static inline unsigned int round_pipe_size(unsigned int size)
73550+static inline unsigned long round_pipe_size(unsigned long size)
73551 {
73552 unsigned long nr_pages;
73553
73554@@ -1058,13 +1059,16 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
73555
73556 switch (cmd) {
73557 case F_SETPIPE_SZ: {
73558- unsigned int size, nr_pages;
73559+ unsigned long size, nr_pages;
73560+
73561+ ret = -EINVAL;
73562+ if (arg < pipe_min_size)
73563+ goto out;
73564
73565 size = round_pipe_size(arg);
73566 nr_pages = size >> PAGE_SHIFT;
73567
73568- ret = -EINVAL;
73569- if (!nr_pages)
73570+ if (size < pipe_min_size)
73571 goto out;
73572
73573 if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
73574diff --git a/fs/posix_acl.c b/fs/posix_acl.c
73575index 3a48bb7..403067b 100644
73576--- a/fs/posix_acl.c
73577+++ b/fs/posix_acl.c
73578@@ -20,6 +20,7 @@
73579 #include <linux/xattr.h>
73580 #include <linux/export.h>
73581 #include <linux/user_namespace.h>
73582+#include <linux/grsecurity.h>
73583
73584 struct posix_acl **acl_by_type(struct inode *inode, int type)
73585 {
73586@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
73587 }
73588 }
73589 if (mode_p)
73590- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
73591+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
73592 return not_equiv;
73593 }
73594 EXPORT_SYMBOL(posix_acl_equiv_mode);
73595@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
73596 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
73597 }
73598
73599- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
73600+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
73601 return not_equiv;
73602 }
73603
73604@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
73605 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
73606 int err = -ENOMEM;
73607 if (clone) {
73608+ *mode_p &= ~gr_acl_umask();
73609+
73610 err = posix_acl_create_masq(clone, mode_p);
73611 if (err < 0) {
73612 posix_acl_release(clone);
73613@@ -663,11 +666,12 @@ struct posix_acl *
73614 posix_acl_from_xattr(struct user_namespace *user_ns,
73615 const void *value, size_t size)
73616 {
73617- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
73618- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
73619+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
73620+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
73621 int count;
73622 struct posix_acl *acl;
73623 struct posix_acl_entry *acl_e;
73624+ umode_t umask = gr_acl_umask();
73625
73626 if (!value)
73627 return NULL;
73628@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
73629
73630 switch(acl_e->e_tag) {
73631 case ACL_USER_OBJ:
73632+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
73633+ break;
73634 case ACL_GROUP_OBJ:
73635 case ACL_MASK:
73636+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
73637+ break;
73638 case ACL_OTHER:
73639+ acl_e->e_perm &= ~(umask & S_IRWXO);
73640 break;
73641
73642 case ACL_USER:
73643+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
73644 acl_e->e_uid =
73645 make_kuid(user_ns,
73646 le32_to_cpu(entry->e_id));
73647@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
73648 goto fail;
73649 break;
73650 case ACL_GROUP:
73651+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
73652 acl_e->e_gid =
73653 make_kgid(user_ns,
73654 le32_to_cpu(entry->e_id));
73655diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
73656index 2183fcf..3c32a98 100644
73657--- a/fs/proc/Kconfig
73658+++ b/fs/proc/Kconfig
73659@@ -30,7 +30,7 @@ config PROC_FS
73660
73661 config PROC_KCORE
73662 bool "/proc/kcore support" if !ARM
73663- depends on PROC_FS && MMU
73664+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
73665 help
73666 Provides a virtual ELF core file of the live kernel. This can
73667 be read with gdb and other ELF tools. No modifications can be
73668@@ -38,8 +38,8 @@ config PROC_KCORE
73669
73670 config PROC_VMCORE
73671 bool "/proc/vmcore support"
73672- depends on PROC_FS && CRASH_DUMP
73673- default y
73674+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
73675+ default n
73676 help
73677 Exports the dump image of crashed kernel in ELF format.
73678
73679@@ -63,8 +63,8 @@ config PROC_SYSCTL
73680 limited in memory.
73681
73682 config PROC_PAGE_MONITOR
73683- default y
73684- depends on PROC_FS && MMU
73685+ default n
73686+ depends on PROC_FS && MMU && !GRKERNSEC
73687 bool "Enable /proc page monitoring" if EXPERT
73688 help
73689 Various /proc files exist to monitor process memory utilization:
73690diff --git a/fs/proc/array.c b/fs/proc/array.c
73691index 1295a00..4c91a6b 100644
73692--- a/fs/proc/array.c
73693+++ b/fs/proc/array.c
73694@@ -60,6 +60,7 @@
73695 #include <linux/tty.h>
73696 #include <linux/string.h>
73697 #include <linux/mman.h>
73698+#include <linux/grsecurity.h>
73699 #include <linux/proc_fs.h>
73700 #include <linux/ioport.h>
73701 #include <linux/uaccess.h>
73702@@ -322,6 +323,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
73703 cpumask_pr_args(&task->cpus_allowed));
73704 }
73705
73706+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73707+static inline void task_pax(struct seq_file *m, struct task_struct *p)
73708+{
73709+ if (p->mm)
73710+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
73711+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
73712+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
73713+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
73714+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
73715+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
73716+ else
73717+ seq_printf(m, "PaX:\t-----\n");
73718+}
73719+#endif
73720+
73721 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
73722 struct pid *pid, struct task_struct *task)
73723 {
73724@@ -340,9 +356,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
73725 task_cpus_allowed(m, task);
73726 cpuset_task_status_allowed(m, task);
73727 task_context_switch_counts(m, task);
73728+
73729+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73730+ task_pax(m, task);
73731+#endif
73732+
73733+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
73734+ task_grsec_rbac(m, task);
73735+#endif
73736+
73737 return 0;
73738 }
73739
73740+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73741+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
73742+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
73743+ _mm->pax_flags & MF_PAX_SEGMEXEC))
73744+#endif
73745+
73746 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73747 struct pid *pid, struct task_struct *task, int whole)
73748 {
73749@@ -364,6 +395,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73750 char tcomm[sizeof(task->comm)];
73751 unsigned long flags;
73752
73753+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73754+ if (current->exec_id != m->exec_id) {
73755+ gr_log_badprocpid("stat");
73756+ return 0;
73757+ }
73758+#endif
73759+
73760 state = *get_task_state(task);
73761 vsize = eip = esp = 0;
73762 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
73763@@ -434,6 +472,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73764 gtime = task_gtime(task);
73765 }
73766
73767+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73768+ if (PAX_RAND_FLAGS(mm)) {
73769+ eip = 0;
73770+ esp = 0;
73771+ wchan = 0;
73772+ }
73773+#endif
73774+#ifdef CONFIG_GRKERNSEC_HIDESYM
73775+ wchan = 0;
73776+ eip =0;
73777+ esp =0;
73778+#endif
73779+
73780 /* scale priority and nice values from timeslices to -20..20 */
73781 /* to make it look like a "normal" Unix priority/nice value */
73782 priority = task_prio(task);
73783@@ -465,9 +516,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73784 seq_put_decimal_ull(m, ' ', vsize);
73785 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
73786 seq_put_decimal_ull(m, ' ', rsslim);
73787+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73788+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
73789+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
73790+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
73791+#else
73792 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
73793 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
73794 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
73795+#endif
73796 seq_put_decimal_ull(m, ' ', esp);
73797 seq_put_decimal_ull(m, ' ', eip);
73798 /* The signal information here is obsolete.
73799@@ -489,7 +546,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73800 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
73801 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
73802
73803- if (mm && permitted) {
73804+ if (mm && permitted
73805+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73806+ && !PAX_RAND_FLAGS(mm)
73807+#endif
73808+ ) {
73809 seq_put_decimal_ull(m, ' ', mm->start_data);
73810 seq_put_decimal_ull(m, ' ', mm->end_data);
73811 seq_put_decimal_ull(m, ' ', mm->start_brk);
73812@@ -527,8 +588,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
73813 struct pid *pid, struct task_struct *task)
73814 {
73815 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
73816- struct mm_struct *mm = get_task_mm(task);
73817+ struct mm_struct *mm;
73818
73819+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73820+ if (current->exec_id != m->exec_id) {
73821+ gr_log_badprocpid("statm");
73822+ return 0;
73823+ }
73824+#endif
73825+ mm = get_task_mm(task);
73826 if (mm) {
73827 size = task_statm(mm, &shared, &text, &data, &resident);
73828 mmput(mm);
73829@@ -551,6 +619,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
73830 return 0;
73831 }
73832
73833+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
73834+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
73835+{
73836+ unsigned long flags;
73837+ u32 curr_ip = 0;
73838+
73839+ if (lock_task_sighand(task, &flags)) {
73840+ curr_ip = task->signal->curr_ip;
73841+ unlock_task_sighand(task, &flags);
73842+ }
73843+ return seq_printf(m, "%pI4\n", &curr_ip);
73844+}
73845+#endif
73846+
73847 #ifdef CONFIG_CHECKPOINT_RESTORE
73848 static struct pid *
73849 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
73850diff --git a/fs/proc/base.c b/fs/proc/base.c
73851index 3f3d7ae..68de109 100644
73852--- a/fs/proc/base.c
73853+++ b/fs/proc/base.c
73854@@ -113,6 +113,14 @@ struct pid_entry {
73855 union proc_op op;
73856 };
73857
73858+struct getdents_callback {
73859+ struct linux_dirent __user * current_dir;
73860+ struct linux_dirent __user * previous;
73861+ struct file * file;
73862+ int count;
73863+ int error;
73864+};
73865+
73866 #define NOD(NAME, MODE, IOP, FOP, OP) { \
73867 .name = (NAME), \
73868 .len = sizeof(NAME) - 1, \
73869@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
73870 return 0;
73871 }
73872
73873+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73874+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
73875+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
73876+ _mm->pax_flags & MF_PAX_SEGMEXEC))
73877+#endif
73878+
73879 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
73880 struct pid *pid, struct task_struct *task)
73881 {
73882 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
73883 if (mm && !IS_ERR(mm)) {
73884 unsigned int nwords = 0;
73885+
73886+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73887+ /* allow if we're currently ptracing this task */
73888+ if (PAX_RAND_FLAGS(mm) &&
73889+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
73890+ mmput(mm);
73891+ return 0;
73892+ }
73893+#endif
73894+
73895 do {
73896 nwords += 2;
73897 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
73898@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
73899 }
73900
73901
73902-#ifdef CONFIG_KALLSYMS
73903+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
73904 /*
73905 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
73906 * Returns the resolved symbol. If that fails, simply return the address.
73907@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
73908 mutex_unlock(&task->signal->cred_guard_mutex);
73909 }
73910
73911-#ifdef CONFIG_STACKTRACE
73912+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
73913
73914 #define MAX_STACK_TRACE_DEPTH 64
73915
73916@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
73917 return 0;
73918 }
73919
73920-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
73921+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
73922 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
73923 struct pid *pid, struct task_struct *task)
73924 {
73925@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
73926 /************************************************************************/
73927
73928 /* permission checks */
73929-static int proc_fd_access_allowed(struct inode *inode)
73930+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
73931 {
73932 struct task_struct *task;
73933 int allowed = 0;
73934@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
73935 */
73936 task = get_proc_task(inode);
73937 if (task) {
73938- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
73939+ if (log)
73940+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
73941+ else
73942+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
73943 put_task_struct(task);
73944 }
73945 return allowed;
73946@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
73947 struct task_struct *task,
73948 int hide_pid_min)
73949 {
73950+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
73951+ return false;
73952+
73953+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
73954+ rcu_read_lock();
73955+ {
73956+ const struct cred *tmpcred = current_cred();
73957+ const struct cred *cred = __task_cred(task);
73958+
73959+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
73960+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
73961+ || in_group_p(grsec_proc_gid)
73962+#endif
73963+ ) {
73964+ rcu_read_unlock();
73965+ return true;
73966+ }
73967+ }
73968+ rcu_read_unlock();
73969+
73970+ if (!pid->hide_pid)
73971+ return false;
73972+#endif
73973+
73974 if (pid->hide_pid < hide_pid_min)
73975 return true;
73976 if (in_group_p(pid->pid_gid))
73977 return true;
73978+
73979 return ptrace_may_access(task, PTRACE_MODE_READ);
73980 }
73981
73982@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
73983 put_task_struct(task);
73984
73985 if (!has_perms) {
73986+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
73987+ {
73988+#else
73989 if (pid->hide_pid == 2) {
73990+#endif
73991 /*
73992 * Let's make getdents(), stat(), and open()
73993 * consistent with each other. If a process
73994@@ -609,6 +665,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
73995
73996 if (task) {
73997 mm = mm_access(task, mode);
73998+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
73999+ mmput(mm);
74000+ mm = ERR_PTR(-EPERM);
74001+ }
74002 put_task_struct(task);
74003
74004 if (!IS_ERR_OR_NULL(mm)) {
74005@@ -630,6 +690,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
74006 return PTR_ERR(mm);
74007
74008 file->private_data = mm;
74009+
74010+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74011+ file->f_version = current->exec_id;
74012+#endif
74013+
74014 return 0;
74015 }
74016
74017@@ -651,6 +716,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
74018 ssize_t copied;
74019 char *page;
74020
74021+#ifdef CONFIG_GRKERNSEC
74022+ if (write)
74023+ return -EPERM;
74024+#endif
74025+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74026+ if (file->f_version != current->exec_id) {
74027+ gr_log_badprocpid("mem");
74028+ return 0;
74029+ }
74030+#endif
74031+
74032 if (!mm)
74033 return 0;
74034
74035@@ -663,7 +739,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
74036 goto free;
74037
74038 while (count > 0) {
74039- int this_len = min_t(int, count, PAGE_SIZE);
74040+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
74041
74042 if (write && copy_from_user(page, buf, this_len)) {
74043 copied = -EFAULT;
74044@@ -755,6 +831,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
74045 if (!mm)
74046 return 0;
74047
74048+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74049+ if (file->f_version != current->exec_id) {
74050+ gr_log_badprocpid("environ");
74051+ return 0;
74052+ }
74053+#endif
74054+
74055 page = (char *)__get_free_page(GFP_TEMPORARY);
74056 if (!page)
74057 return -ENOMEM;
74058@@ -764,7 +847,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
74059 goto free;
74060 while (count > 0) {
74061 size_t this_len, max_len;
74062- int retval;
74063+ ssize_t retval;
74064
74065 if (src >= (mm->env_end - mm->env_start))
74066 break;
74067@@ -1378,7 +1461,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
74068 int error = -EACCES;
74069
74070 /* Are we allowed to snoop on the tasks file descriptors? */
74071- if (!proc_fd_access_allowed(inode))
74072+ if (!proc_fd_access_allowed(inode, 0))
74073 goto out;
74074
74075 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
74076@@ -1422,8 +1505,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
74077 struct path path;
74078
74079 /* Are we allowed to snoop on the tasks file descriptors? */
74080- if (!proc_fd_access_allowed(inode))
74081- goto out;
74082+ /* logging this is needed for learning on chromium to work properly,
74083+ but we don't want to flood the logs from 'ps' which does a readlink
74084+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
74085+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
74086+ */
74087+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
74088+ if (!proc_fd_access_allowed(inode,0))
74089+ goto out;
74090+ } else {
74091+ if (!proc_fd_access_allowed(inode,1))
74092+ goto out;
74093+ }
74094
74095 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
74096 if (error)
74097@@ -1473,7 +1566,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
74098 rcu_read_lock();
74099 cred = __task_cred(task);
74100 inode->i_uid = cred->euid;
74101+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74102+ inode->i_gid = grsec_proc_gid;
74103+#else
74104 inode->i_gid = cred->egid;
74105+#endif
74106 rcu_read_unlock();
74107 }
74108 security_task_to_inode(task, inode);
74109@@ -1509,10 +1606,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
74110 return -ENOENT;
74111 }
74112 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
74113+#ifdef CONFIG_GRKERNSEC_PROC_USER
74114+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
74115+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74116+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
74117+#endif
74118 task_dumpable(task)) {
74119 cred = __task_cred(task);
74120 stat->uid = cred->euid;
74121+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74122+ stat->gid = grsec_proc_gid;
74123+#else
74124 stat->gid = cred->egid;
74125+#endif
74126 }
74127 }
74128 rcu_read_unlock();
74129@@ -1550,11 +1656,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
74130
74131 if (task) {
74132 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
74133+#ifdef CONFIG_GRKERNSEC_PROC_USER
74134+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
74135+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74136+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
74137+#endif
74138 task_dumpable(task)) {
74139 rcu_read_lock();
74140 cred = __task_cred(task);
74141 inode->i_uid = cred->euid;
74142+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74143+ inode->i_gid = grsec_proc_gid;
74144+#else
74145 inode->i_gid = cred->egid;
74146+#endif
74147 rcu_read_unlock();
74148 } else {
74149 inode->i_uid = GLOBAL_ROOT_UID;
74150@@ -2085,6 +2200,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
74151 if (!task)
74152 goto out_no_task;
74153
74154+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74155+ goto out;
74156+
74157 /*
74158 * Yes, it does not scale. And it should not. Don't add
74159 * new entries into /proc/<tgid>/ without very good reasons.
74160@@ -2115,6 +2233,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
74161 if (!task)
74162 return -ENOENT;
74163
74164+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74165+ goto out;
74166+
74167 if (!dir_emit_dots(file, ctx))
74168 goto out;
74169
74170@@ -2557,7 +2678,7 @@ static const struct pid_entry tgid_base_stuff[] = {
74171 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
74172 #endif
74173 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
74174-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74175+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74176 ONE("syscall", S_IRUSR, proc_pid_syscall),
74177 #endif
74178 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
74179@@ -2582,10 +2703,10 @@ static const struct pid_entry tgid_base_stuff[] = {
74180 #ifdef CONFIG_SECURITY
74181 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
74182 #endif
74183-#ifdef CONFIG_KALLSYMS
74184+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74185 ONE("wchan", S_IRUGO, proc_pid_wchan),
74186 #endif
74187-#ifdef CONFIG_STACKTRACE
74188+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74189 ONE("stack", S_IRUSR, proc_pid_stack),
74190 #endif
74191 #ifdef CONFIG_SCHEDSTATS
74192@@ -2619,6 +2740,9 @@ static const struct pid_entry tgid_base_stuff[] = {
74193 #ifdef CONFIG_HARDWALL
74194 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
74195 #endif
74196+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
74197+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
74198+#endif
74199 #ifdef CONFIG_USER_NS
74200 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
74201 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
74202@@ -2751,7 +2875,14 @@ static int proc_pid_instantiate(struct inode *dir,
74203 if (!inode)
74204 goto out;
74205
74206+#ifdef CONFIG_GRKERNSEC_PROC_USER
74207+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
74208+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74209+ inode->i_gid = grsec_proc_gid;
74210+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
74211+#else
74212 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
74213+#endif
74214 inode->i_op = &proc_tgid_base_inode_operations;
74215 inode->i_fop = &proc_tgid_base_operations;
74216 inode->i_flags|=S_IMMUTABLE;
74217@@ -2789,7 +2920,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
74218 if (!task)
74219 goto out;
74220
74221+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74222+ goto out_put_task;
74223+
74224 result = proc_pid_instantiate(dir, dentry, task, NULL);
74225+out_put_task:
74226 put_task_struct(task);
74227 out:
74228 return ERR_PTR(result);
74229@@ -2903,7 +3038,7 @@ static const struct pid_entry tid_base_stuff[] = {
74230 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
74231 #endif
74232 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
74233-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74234+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74235 ONE("syscall", S_IRUSR, proc_pid_syscall),
74236 #endif
74237 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
74238@@ -2930,10 +3065,10 @@ static const struct pid_entry tid_base_stuff[] = {
74239 #ifdef CONFIG_SECURITY
74240 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
74241 #endif
74242-#ifdef CONFIG_KALLSYMS
74243+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74244 ONE("wchan", S_IRUGO, proc_pid_wchan),
74245 #endif
74246-#ifdef CONFIG_STACKTRACE
74247+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74248 ONE("stack", S_IRUSR, proc_pid_stack),
74249 #endif
74250 #ifdef CONFIG_SCHEDSTATS
74251diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
74252index cbd82df..c0407d2 100644
74253--- a/fs/proc/cmdline.c
74254+++ b/fs/proc/cmdline.c
74255@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
74256
74257 static int __init proc_cmdline_init(void)
74258 {
74259+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74260+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
74261+#else
74262 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
74263+#endif
74264 return 0;
74265 }
74266 fs_initcall(proc_cmdline_init);
74267diff --git a/fs/proc/devices.c b/fs/proc/devices.c
74268index 50493ed..248166b 100644
74269--- a/fs/proc/devices.c
74270+++ b/fs/proc/devices.c
74271@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
74272
74273 static int __init proc_devices_init(void)
74274 {
74275+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74276+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
74277+#else
74278 proc_create("devices", 0, NULL, &proc_devinfo_operations);
74279+#endif
74280 return 0;
74281 }
74282 fs_initcall(proc_devices_init);
74283diff --git a/fs/proc/fd.c b/fs/proc/fd.c
74284index 8e5ad83..1f07a8c 100644
74285--- a/fs/proc/fd.c
74286+++ b/fs/proc/fd.c
74287@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
74288 if (!task)
74289 return -ENOENT;
74290
74291- files = get_files_struct(task);
74292+ if (!gr_acl_handle_procpidmem(task))
74293+ files = get_files_struct(task);
74294 put_task_struct(task);
74295
74296 if (files) {
74297@@ -284,11 +285,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
74298 */
74299 int proc_fd_permission(struct inode *inode, int mask)
74300 {
74301+ struct task_struct *task;
74302 int rv = generic_permission(inode, mask);
74303- if (rv == 0)
74304- return 0;
74305+
74306 if (task_tgid(current) == proc_pid(inode))
74307 rv = 0;
74308+
74309+ task = get_proc_task(inode);
74310+ if (task == NULL)
74311+ return rv;
74312+
74313+ if (gr_acl_handle_procpidmem(task))
74314+ rv = -EACCES;
74315+
74316+ put_task_struct(task);
74317+
74318 return rv;
74319 }
74320
74321diff --git a/fs/proc/generic.c b/fs/proc/generic.c
74322index be65b20..2998ba8 100644
74323--- a/fs/proc/generic.c
74324+++ b/fs/proc/generic.c
74325@@ -22,6 +22,7 @@
74326 #include <linux/bitops.h>
74327 #include <linux/spinlock.h>
74328 #include <linux/completion.h>
74329+#include <linux/grsecurity.h>
74330 #include <asm/uaccess.h>
74331
74332 #include "internal.h"
74333@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
74334 return proc_lookup_de(PDE(dir), dir, dentry);
74335 }
74336
74337+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
74338+ unsigned int flags)
74339+{
74340+ if (gr_proc_is_restricted())
74341+ return ERR_PTR(-EACCES);
74342+
74343+ return proc_lookup_de(PDE(dir), dir, dentry);
74344+}
74345+
74346 /*
74347 * This returns non-zero if at EOF, so that the /proc
74348 * root directory can use this and check if it should
74349@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
74350 return proc_readdir_de(PDE(inode), file, ctx);
74351 }
74352
74353+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
74354+{
74355+ struct inode *inode = file_inode(file);
74356+
74357+ if (gr_proc_is_restricted())
74358+ return -EACCES;
74359+
74360+ return proc_readdir_de(PDE(inode), file, ctx);
74361+}
74362+
74363 /*
74364 * These are the generic /proc directory operations. They
74365 * use the in-memory "struct proc_dir_entry" tree to parse
74366@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
74367 .iterate = proc_readdir,
74368 };
74369
74370+static const struct file_operations proc_dir_restricted_operations = {
74371+ .llseek = generic_file_llseek,
74372+ .read = generic_read_dir,
74373+ .iterate = proc_readdir_restrict,
74374+};
74375+
74376 /*
74377 * proc directories can do almost nothing..
74378 */
74379@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
74380 .setattr = proc_notify_change,
74381 };
74382
74383+static const struct inode_operations proc_dir_restricted_inode_operations = {
74384+ .lookup = proc_lookup_restrict,
74385+ .getattr = proc_getattr,
74386+ .setattr = proc_notify_change,
74387+};
74388+
74389 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
74390 {
74391 int ret;
74392@@ -441,6 +473,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
74393 }
74394 EXPORT_SYMBOL_GPL(proc_mkdir_data);
74395
74396+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
74397+ struct proc_dir_entry *parent, void *data)
74398+{
74399+ struct proc_dir_entry *ent;
74400+
74401+ if (mode == 0)
74402+ mode = S_IRUGO | S_IXUGO;
74403+
74404+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
74405+ if (ent) {
74406+ ent->data = data;
74407+ ent->restricted = 1;
74408+ ent->proc_fops = &proc_dir_restricted_operations;
74409+ ent->proc_iops = &proc_dir_restricted_inode_operations;
74410+ parent->nlink++;
74411+ if (proc_register(parent, ent) < 0) {
74412+ kfree(ent);
74413+ parent->nlink--;
74414+ ent = NULL;
74415+ }
74416+ }
74417+ return ent;
74418+}
74419+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
74420+
74421 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
74422 struct proc_dir_entry *parent)
74423 {
74424@@ -455,6 +512,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
74425 }
74426 EXPORT_SYMBOL(proc_mkdir);
74427
74428+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
74429+ struct proc_dir_entry *parent)
74430+{
74431+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
74432+}
74433+EXPORT_SYMBOL(proc_mkdir_restrict);
74434+
74435 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
74436 struct proc_dir_entry *parent,
74437 const struct file_operations *proc_fops,
74438diff --git a/fs/proc/inode.c b/fs/proc/inode.c
74439index 7697b66..8d8e541 100644
74440--- a/fs/proc/inode.c
74441+++ b/fs/proc/inode.c
74442@@ -24,11 +24,17 @@
74443 #include <linux/mount.h>
74444 #include <linux/magic.h>
74445 #include <linux/namei.h>
74446+#include <linux/grsecurity.h>
74447
74448 #include <asm/uaccess.h>
74449
74450 #include "internal.h"
74451
74452+#ifdef CONFIG_PROC_SYSCTL
74453+extern const struct inode_operations proc_sys_inode_operations;
74454+extern const struct inode_operations proc_sys_dir_operations;
74455+#endif
74456+
74457 static void proc_evict_inode(struct inode *inode)
74458 {
74459 struct proc_dir_entry *de;
74460@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
74461 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
74462 sysctl_head_put(head);
74463 }
74464+
74465+#ifdef CONFIG_PROC_SYSCTL
74466+ if (inode->i_op == &proc_sys_inode_operations ||
74467+ inode->i_op == &proc_sys_dir_operations)
74468+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
74469+#endif
74470+
74471 }
74472
74473 static struct kmem_cache * proc_inode_cachep;
74474@@ -426,7 +439,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
74475 if (de->mode) {
74476 inode->i_mode = de->mode;
74477 inode->i_uid = de->uid;
74478+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74479+ inode->i_gid = grsec_proc_gid;
74480+#else
74481 inode->i_gid = de->gid;
74482+#endif
74483 }
74484 if (de->size)
74485 inode->i_size = de->size;
74486diff --git a/fs/proc/internal.h b/fs/proc/internal.h
74487index c835b94..c9e01a3 100644
74488--- a/fs/proc/internal.h
74489+++ b/fs/proc/internal.h
74490@@ -47,9 +47,10 @@ struct proc_dir_entry {
74491 struct completion *pde_unload_completion;
74492 struct list_head pde_openers; /* who did ->open, but not ->release */
74493 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
74494+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
74495 u8 namelen;
74496 char name[];
74497-};
74498+} __randomize_layout;
74499
74500 union proc_op {
74501 int (*proc_get_link)(struct dentry *, struct path *);
74502@@ -67,7 +68,7 @@ struct proc_inode {
74503 struct ctl_table *sysctl_entry;
74504 const struct proc_ns_operations *ns_ops;
74505 struct inode vfs_inode;
74506-};
74507+} __randomize_layout;
74508
74509 /*
74510 * General functions
74511@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
74512 struct pid *, struct task_struct *);
74513 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
74514 struct pid *, struct task_struct *);
74515+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
74516+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
74517+ struct pid *, struct task_struct *);
74518+#endif
74519
74520 /*
74521 * base.c
74522@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
74523 * generic.c
74524 */
74525 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
74526+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
74527 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
74528 struct dentry *);
74529 extern int proc_readdir(struct file *, struct dir_context *);
74530+extern int proc_readdir_restrict(struct file *, struct dir_context *);
74531 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
74532
74533 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
74534diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
74535index a352d57..cb94a5c 100644
74536--- a/fs/proc/interrupts.c
74537+++ b/fs/proc/interrupts.c
74538@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
74539
74540 static int __init proc_interrupts_init(void)
74541 {
74542+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74543+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
74544+#else
74545 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
74546+#endif
74547 return 0;
74548 }
74549 fs_initcall(proc_interrupts_init);
74550diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
74551index 91a4e64..14bf8fa 100644
74552--- a/fs/proc/kcore.c
74553+++ b/fs/proc/kcore.c
74554@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74555 * the addresses in the elf_phdr on our list.
74556 */
74557 start = kc_offset_to_vaddr(*fpos - elf_buflen);
74558- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
74559+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
74560+ if (tsz > buflen)
74561 tsz = buflen;
74562-
74563+
74564 while (buflen) {
74565 struct kcore_list *m;
74566
74567@@ -515,19 +516,20 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74568 } else {
74569 if (kern_addr_valid(start)) {
74570 unsigned long n;
74571+ char *elf_buf;
74572+ mm_segment_t oldfs;
74573
74574- n = copy_to_user(buffer, (char *)start, tsz);
74575- /*
74576- * We cannot distinguish between fault on source
74577- * and fault on destination. When this happens
74578- * we clear too and hope it will trigger the
74579- * EFAULT again.
74580- */
74581- if (n) {
74582- if (clear_user(buffer + tsz - n,
74583- n))
74584- return -EFAULT;
74585- }
74586+ elf_buf = kzalloc(tsz, GFP_KERNEL);
74587+ if (!elf_buf)
74588+ return -ENOMEM;
74589+ oldfs = get_fs();
74590+ set_fs(KERNEL_DS);
74591+ n = __copy_from_user(elf_buf, (const void __user *)start, tsz);
74592+ set_fs(oldfs);
74593+ n = copy_to_user(buffer, elf_buf, tsz);
74594+ kfree(elf_buf);
74595+ if (n)
74596+ return -EFAULT;
74597 } else {
74598 if (clear_user(buffer, tsz))
74599 return -EFAULT;
74600@@ -547,6 +549,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74601
74602 static int open_kcore(struct inode *inode, struct file *filp)
74603 {
74604+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
74605+ return -EPERM;
74606+#endif
74607 if (!capable(CAP_SYS_RAWIO))
74608 return -EPERM;
74609 if (kcore_need_update)
74610@@ -580,7 +585,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
74611 return NOTIFY_OK;
74612 }
74613
74614-static struct notifier_block kcore_callback_nb __meminitdata = {
74615+static struct notifier_block kcore_callback_nb __meminitconst = {
74616 .notifier_call = kcore_callback,
74617 .priority = 0,
74618 };
74619diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
74620index d3ebf2e..6ad42d1 100644
74621--- a/fs/proc/meminfo.c
74622+++ b/fs/proc/meminfo.c
74623@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
74624 vmi.used >> 10,
74625 vmi.largest_chunk >> 10
74626 #ifdef CONFIG_MEMORY_FAILURE
74627- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
74628+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
74629 #endif
74630 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
74631 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
74632diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
74633index d4a3574..b421ce9 100644
74634--- a/fs/proc/nommu.c
74635+++ b/fs/proc/nommu.c
74636@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
74637
74638 if (file) {
74639 seq_pad(m, ' ');
74640- seq_path(m, &file->f_path, "");
74641+ seq_path(m, &file->f_path, "\n\\");
74642 }
74643
74644 seq_putc(m, '\n');
74645diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
74646index 1bde894..22ac7eb 100644
74647--- a/fs/proc/proc_net.c
74648+++ b/fs/proc/proc_net.c
74649@@ -23,9 +23,27 @@
74650 #include <linux/nsproxy.h>
74651 #include <net/net_namespace.h>
74652 #include <linux/seq_file.h>
74653+#include <linux/grsecurity.h>
74654
74655 #include "internal.h"
74656
74657+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
74658+static struct seq_operations *ipv6_seq_ops_addr;
74659+
74660+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
74661+{
74662+ ipv6_seq_ops_addr = addr;
74663+}
74664+
74665+void unregister_ipv6_seq_ops_addr(void)
74666+{
74667+ ipv6_seq_ops_addr = NULL;
74668+}
74669+
74670+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
74671+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
74672+#endif
74673+
74674 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
74675 {
74676 return pde->parent->data;
74677@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
74678 return maybe_get_net(PDE_NET(PDE(inode)));
74679 }
74680
74681+extern const struct seq_operations dev_seq_ops;
74682+
74683 int seq_open_net(struct inode *ino, struct file *f,
74684 const struct seq_operations *ops, int size)
74685 {
74686@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
74687
74688 BUG_ON(size < sizeof(*p));
74689
74690+ /* only permit access to /proc/net/dev */
74691+ if (
74692+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
74693+ ops != ipv6_seq_ops_addr &&
74694+#endif
74695+ ops != &dev_seq_ops && gr_proc_is_restricted())
74696+ return -EACCES;
74697+
74698 net = get_proc_net(ino);
74699 if (net == NULL)
74700 return -ENXIO;
74701@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
74702 int err;
74703 struct net *net;
74704
74705+ if (gr_proc_is_restricted())
74706+ return -EACCES;
74707+
74708 err = -ENXIO;
74709 net = get_proc_net(inode);
74710 if (net == NULL)
74711diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
74712index f92d5dd..26398ac 100644
74713--- a/fs/proc/proc_sysctl.c
74714+++ b/fs/proc/proc_sysctl.c
74715@@ -11,13 +11,21 @@
74716 #include <linux/namei.h>
74717 #include <linux/mm.h>
74718 #include <linux/module.h>
74719+#include <linux/nsproxy.h>
74720+#ifdef CONFIG_GRKERNSEC
74721+#include <net/net_namespace.h>
74722+#endif
74723 #include "internal.h"
74724
74725+extern int gr_handle_chroot_sysctl(const int op);
74726+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
74727+ const int op);
74728+
74729 static const struct dentry_operations proc_sys_dentry_operations;
74730 static const struct file_operations proc_sys_file_operations;
74731-static const struct inode_operations proc_sys_inode_operations;
74732+const struct inode_operations proc_sys_inode_operations;
74733 static const struct file_operations proc_sys_dir_file_operations;
74734-static const struct inode_operations proc_sys_dir_operations;
74735+const struct inode_operations proc_sys_dir_operations;
74736
74737 void proc_sys_poll_notify(struct ctl_table_poll *poll)
74738 {
74739@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
74740
74741 err = NULL;
74742 d_set_d_op(dentry, &proc_sys_dentry_operations);
74743+
74744+ gr_handle_proc_create(dentry, inode);
74745+
74746 d_add(dentry, inode);
74747
74748 out:
74749@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74750 struct inode *inode = file_inode(filp);
74751 struct ctl_table_header *head = grab_header(inode);
74752 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
74753+ int op = write ? MAY_WRITE : MAY_READ;
74754 ssize_t error;
74755 size_t res;
74756
74757@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74758 * and won't be until we finish.
74759 */
74760 error = -EPERM;
74761- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
74762+ if (sysctl_perm(head, table, op))
74763 goto out;
74764
74765 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
74766@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74767 if (!table->proc_handler)
74768 goto out;
74769
74770+#ifdef CONFIG_GRKERNSEC
74771+ error = -EPERM;
74772+ if (gr_handle_chroot_sysctl(op))
74773+ goto out;
74774+ dget(filp->f_path.dentry);
74775+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
74776+ dput(filp->f_path.dentry);
74777+ goto out;
74778+ }
74779+ dput(filp->f_path.dentry);
74780+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
74781+ goto out;
74782+ if (write) {
74783+ if (current->nsproxy->net_ns != table->extra2) {
74784+ if (!capable(CAP_SYS_ADMIN))
74785+ goto out;
74786+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
74787+ goto out;
74788+ }
74789+#endif
74790+
74791 /* careful: calling conventions are nasty here */
74792 res = count;
74793 error = table->proc_handler(table, write, buf, &res, ppos);
74794@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
74795 return false;
74796 } else {
74797 d_set_d_op(child, &proc_sys_dentry_operations);
74798+
74799+ gr_handle_proc_create(child, inode);
74800+
74801 d_add(child, inode);
74802 }
74803 } else {
74804@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
74805 if ((*pos)++ < ctx->pos)
74806 return true;
74807
74808+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
74809+ return 0;
74810+
74811 if (unlikely(S_ISLNK(table->mode)))
74812 res = proc_sys_link_fill_cache(file, ctx, head, table);
74813 else
74814@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
74815 if (IS_ERR(head))
74816 return PTR_ERR(head);
74817
74818+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
74819+ return -ENOENT;
74820+
74821 generic_fillattr(inode, stat);
74822 if (table)
74823 stat->mode = (stat->mode & S_IFMT) | table->mode;
74824@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
74825 .llseek = generic_file_llseek,
74826 };
74827
74828-static const struct inode_operations proc_sys_inode_operations = {
74829+const struct inode_operations proc_sys_inode_operations = {
74830 .permission = proc_sys_permission,
74831 .setattr = proc_sys_setattr,
74832 .getattr = proc_sys_getattr,
74833 };
74834
74835-static const struct inode_operations proc_sys_dir_operations = {
74836+const struct inode_operations proc_sys_dir_operations = {
74837 .lookup = proc_sys_lookup,
74838 .permission = proc_sys_permission,
74839 .setattr = proc_sys_setattr,
74840@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
74841 static struct ctl_dir *new_dir(struct ctl_table_set *set,
74842 const char *name, int namelen)
74843 {
74844- struct ctl_table *table;
74845+ ctl_table_no_const *table;
74846 struct ctl_dir *new;
74847 struct ctl_node *node;
74848 char *new_name;
74849@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
74850 return NULL;
74851
74852 node = (struct ctl_node *)(new + 1);
74853- table = (struct ctl_table *)(node + 1);
74854+ table = (ctl_table_no_const *)(node + 1);
74855 new_name = (char *)(table + 2);
74856 memcpy(new_name, name, namelen);
74857 new_name[namelen] = '\0';
74858@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
74859 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
74860 struct ctl_table_root *link_root)
74861 {
74862- struct ctl_table *link_table, *entry, *link;
74863+ ctl_table_no_const *link_table, *link;
74864+ struct ctl_table *entry;
74865 struct ctl_table_header *links;
74866 struct ctl_node *node;
74867 char *link_name;
74868@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
74869 return NULL;
74870
74871 node = (struct ctl_node *)(links + 1);
74872- link_table = (struct ctl_table *)(node + nr_entries);
74873+ link_table = (ctl_table_no_const *)(node + nr_entries);
74874 link_name = (char *)&link_table[nr_entries + 1];
74875
74876 for (link = link_table, entry = table; entry->procname; link++, entry++) {
74877@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
74878 struct ctl_table_header ***subheader, struct ctl_table_set *set,
74879 struct ctl_table *table)
74880 {
74881- struct ctl_table *ctl_table_arg = NULL;
74882- struct ctl_table *entry, *files;
74883+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
74884+ struct ctl_table *entry;
74885 int nr_files = 0;
74886 int nr_dirs = 0;
74887 int err = -ENOMEM;
74888@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
74889 nr_files++;
74890 }
74891
74892- files = table;
74893 /* If there are mixed files and directories we need a new table */
74894 if (nr_dirs && nr_files) {
74895- struct ctl_table *new;
74896+ ctl_table_no_const *new;
74897 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
74898 GFP_KERNEL);
74899 if (!files)
74900@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
74901 /* Register everything except a directory full of subdirectories */
74902 if (nr_files || !nr_dirs) {
74903 struct ctl_table_header *header;
74904- header = __register_sysctl_table(set, path, files);
74905+ header = __register_sysctl_table(set, path, files ? files : table);
74906 if (!header) {
74907 kfree(ctl_table_arg);
74908 goto out;
74909diff --git a/fs/proc/root.c b/fs/proc/root.c
74910index e74ac9f..35e89f4 100644
74911--- a/fs/proc/root.c
74912+++ b/fs/proc/root.c
74913@@ -188,7 +188,15 @@ void __init proc_root_init(void)
74914 proc_mkdir("openprom", NULL);
74915 #endif
74916 proc_tty_init();
74917+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74918+#ifdef CONFIG_GRKERNSEC_PROC_USER
74919+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
74920+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74921+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
74922+#endif
74923+#else
74924 proc_mkdir("bus", NULL);
74925+#endif
74926 proc_sys_init();
74927 }
74928
74929diff --git a/fs/proc/stat.c b/fs/proc/stat.c
74930index 510413eb..34d9a8c 100644
74931--- a/fs/proc/stat.c
74932+++ b/fs/proc/stat.c
74933@@ -11,6 +11,7 @@
74934 #include <linux/irqnr.h>
74935 #include <linux/cputime.h>
74936 #include <linux/tick.h>
74937+#include <linux/grsecurity.h>
74938
74939 #ifndef arch_irq_stat_cpu
74940 #define arch_irq_stat_cpu(cpu) 0
74941@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
74942 u64 sum_softirq = 0;
74943 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
74944 struct timespec boottime;
74945+ int unrestricted = 1;
74946+
74947+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74948+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74949+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
74950+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74951+ && !in_group_p(grsec_proc_gid)
74952+#endif
74953+ )
74954+ unrestricted = 0;
74955+#endif
74956+#endif
74957
74958 user = nice = system = idle = iowait =
74959 irq = softirq = steal = 0;
74960@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
74961 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
74962 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
74963 idle += get_idle_time(i);
74964- iowait += get_iowait_time(i);
74965- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
74966- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
74967- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
74968- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
74969- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
74970- sum += kstat_cpu_irqs_sum(i);
74971- sum += arch_irq_stat_cpu(i);
74972+ if (unrestricted) {
74973+ iowait += get_iowait_time(i);
74974+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
74975+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
74976+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
74977+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
74978+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
74979+ sum += kstat_cpu_irqs_sum(i);
74980+ sum += arch_irq_stat_cpu(i);
74981+ for (j = 0; j < NR_SOFTIRQS; j++) {
74982+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
74983
74984- for (j = 0; j < NR_SOFTIRQS; j++) {
74985- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
74986-
74987- per_softirq_sums[j] += softirq_stat;
74988- sum_softirq += softirq_stat;
74989+ per_softirq_sums[j] += softirq_stat;
74990+ sum_softirq += softirq_stat;
74991+ }
74992 }
74993 }
74994- sum += arch_irq_stat();
74995+ if (unrestricted)
74996+ sum += arch_irq_stat();
74997
74998 seq_puts(p, "cpu ");
74999 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
75000@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
75001 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
75002 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
75003 idle = get_idle_time(i);
75004- iowait = get_iowait_time(i);
75005- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75006- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75007- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75008- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75009- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75010+ if (unrestricted) {
75011+ iowait = get_iowait_time(i);
75012+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75013+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75014+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75015+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75016+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75017+ }
75018 seq_printf(p, "cpu%d", i);
75019 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
75020 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
75021@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
75022
75023 /* sum again ? it could be updated? */
75024 for_each_irq_nr(j)
75025- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
75026+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
75027
75028 seq_printf(p,
75029 "\nctxt %llu\n"
75030@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
75031 "processes %lu\n"
75032 "procs_running %lu\n"
75033 "procs_blocked %lu\n",
75034- nr_context_switches(),
75035+ unrestricted ? nr_context_switches() : 0ULL,
75036 (unsigned long)jif,
75037- total_forks,
75038- nr_running(),
75039- nr_iowait());
75040+ unrestricted ? total_forks : 0UL,
75041+ unrestricted ? nr_running() : 0UL,
75042+ unrestricted ? nr_iowait() : 0UL);
75043
75044 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
75045
75046diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
75047index 6dee68d..1b4add0 100644
75048--- a/fs/proc/task_mmu.c
75049+++ b/fs/proc/task_mmu.c
75050@@ -13,12 +13,19 @@
75051 #include <linux/swap.h>
75052 #include <linux/swapops.h>
75053 #include <linux/mmu_notifier.h>
75054+#include <linux/grsecurity.h>
75055
75056 #include <asm/elf.h>
75057 #include <asm/uaccess.h>
75058 #include <asm/tlbflush.h>
75059 #include "internal.h"
75060
75061+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75062+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
75063+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
75064+ _mm->pax_flags & MF_PAX_SEGMEXEC))
75065+#endif
75066+
75067 void task_mem(struct seq_file *m, struct mm_struct *mm)
75068 {
75069 unsigned long data, text, lib, swap, ptes, pmds;
75070@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75071 "VmLib:\t%8lu kB\n"
75072 "VmPTE:\t%8lu kB\n"
75073 "VmPMD:\t%8lu kB\n"
75074- "VmSwap:\t%8lu kB\n",
75075- hiwater_vm << (PAGE_SHIFT-10),
75076+ "VmSwap:\t%8lu kB\n"
75077+
75078+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
75079+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
75080+#endif
75081+
75082+ ,hiwater_vm << (PAGE_SHIFT-10),
75083 total_vm << (PAGE_SHIFT-10),
75084 mm->locked_vm << (PAGE_SHIFT-10),
75085 mm->pinned_vm << (PAGE_SHIFT-10),
75086@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75087 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
75088 ptes >> 10,
75089 pmds >> 10,
75090- swap << (PAGE_SHIFT-10));
75091+ swap << (PAGE_SHIFT-10)
75092+
75093+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
75094+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75095+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
75096+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
75097+#else
75098+ , mm->context.user_cs_base
75099+ , mm->context.user_cs_limit
75100+#endif
75101+#endif
75102+
75103+ );
75104 }
75105
75106 unsigned long task_vsize(struct mm_struct *mm)
75107@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75108 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
75109 }
75110
75111- /* We don't show the stack guard page in /proc/maps */
75112+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75113+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
75114+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
75115+#else
75116 start = vma->vm_start;
75117- if (stack_guard_page_start(vma, start))
75118- start += PAGE_SIZE;
75119 end = vma->vm_end;
75120- if (stack_guard_page_end(vma, end))
75121- end -= PAGE_SIZE;
75122+#endif
75123
75124 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
75125 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
75126@@ -301,7 +325,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75127 flags & VM_WRITE ? 'w' : '-',
75128 flags & VM_EXEC ? 'x' : '-',
75129 flags & VM_MAYSHARE ? 's' : 'p',
75130+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75131+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
75132+#else
75133 pgoff,
75134+#endif
75135 MAJOR(dev), MINOR(dev), ino);
75136
75137 /*
75138@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75139 */
75140 if (file) {
75141 seq_pad(m, ' ');
75142- seq_path(m, &file->f_path, "\n");
75143+ seq_path(m, &file->f_path, "\n\\");
75144 goto done;
75145 }
75146
75147@@ -341,8 +369,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75148 * Thread stack in /proc/PID/task/TID/maps or
75149 * the main process stack.
75150 */
75151- if (!is_pid || (vma->vm_start <= mm->start_stack &&
75152- vma->vm_end >= mm->start_stack)) {
75153+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
75154+ (vma->vm_start <= mm->start_stack &&
75155+ vma->vm_end >= mm->start_stack)) {
75156 name = "[stack]";
75157 } else {
75158 /* Thread stack in /proc/PID/maps */
75159@@ -362,6 +391,12 @@ done:
75160
75161 static int show_map(struct seq_file *m, void *v, int is_pid)
75162 {
75163+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75164+ if (current->exec_id != m->exec_id) {
75165+ gr_log_badprocpid("maps");
75166+ return 0;
75167+ }
75168+#endif
75169 show_map_vma(m, v, is_pid);
75170 m_cache_vma(m, v);
75171 return 0;
75172@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
75173 .private = &mss,
75174 };
75175
75176+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75177+ if (current->exec_id != m->exec_id) {
75178+ gr_log_badprocpid("smaps");
75179+ return 0;
75180+ }
75181+#endif
75182 memset(&mss, 0, sizeof mss);
75183- /* mmap_sem is held in m_start */
75184- walk_page_vma(vma, &smaps_walk);
75185+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75186+ if (!PAX_RAND_FLAGS(vma->vm_mm))
75187+#endif
75188+ /* mmap_sem is held in m_start */
75189+ walk_page_vma(vma, &smaps_walk);
75190
75191 show_map_vma(m, vma, is_pid);
75192
75193@@ -641,7 +685,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
75194 "KernelPageSize: %8lu kB\n"
75195 "MMUPageSize: %8lu kB\n"
75196 "Locked: %8lu kB\n",
75197+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75198+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
75199+#else
75200 (vma->vm_end - vma->vm_start) >> 10,
75201+#endif
75202 mss.resident >> 10,
75203 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
75204 mss.shared_clean >> 10,
75205@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
75206 char buffer[64];
75207 int nid;
75208
75209+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75210+ if (current->exec_id != m->exec_id) {
75211+ gr_log_badprocpid("numa_maps");
75212+ return 0;
75213+ }
75214+#endif
75215+
75216 if (!mm)
75217 return 0;
75218
75219@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
75220 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
75221 }
75222
75223+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75224+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
75225+#else
75226 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
75227+#endif
75228
75229 if (file) {
75230 seq_puts(m, " file=");
75231- seq_path(m, &file->f_path, "\n\t= ");
75232+ seq_path(m, &file->f_path, "\n\t\\= ");
75233 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
75234 seq_puts(m, " heap");
75235 } else {
75236diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
75237index 599ec2e..f1413ae 100644
75238--- a/fs/proc/task_nommu.c
75239+++ b/fs/proc/task_nommu.c
75240@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75241 else
75242 bytes += kobjsize(mm);
75243
75244- if (current->fs && current->fs->users > 1)
75245+ if (current->fs && atomic_read(&current->fs->users) > 1)
75246 sbytes += kobjsize(current->fs);
75247 else
75248 bytes += kobjsize(current->fs);
75249@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
75250
75251 if (file) {
75252 seq_pad(m, ' ');
75253- seq_path(m, &file->f_path, "");
75254+ seq_path(m, &file->f_path, "\n\\");
75255 } else if (mm) {
75256 pid_t tid = pid_of_stack(priv, vma, is_pid);
75257
75258diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
75259index 4e61388..1a2523d 100644
75260--- a/fs/proc/vmcore.c
75261+++ b/fs/proc/vmcore.c
75262@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
75263 nr_bytes = count;
75264
75265 /* If pfn is not ram, return zeros for sparse dump files */
75266- if (pfn_is_ram(pfn) == 0)
75267- memset(buf, 0, nr_bytes);
75268- else {
75269+ if (pfn_is_ram(pfn) == 0) {
75270+ if (userbuf) {
75271+ if (clear_user((char __force_user *)buf, nr_bytes))
75272+ return -EFAULT;
75273+ } else
75274+ memset(buf, 0, nr_bytes);
75275+ } else {
75276 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
75277 offset, userbuf);
75278 if (tmp < 0)
75279@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
75280 static int copy_to(void *target, void *src, size_t size, int userbuf)
75281 {
75282 if (userbuf) {
75283- if (copy_to_user((char __user *) target, src, size))
75284+ if (copy_to_user((char __force_user *) target, src, size))
75285 return -EFAULT;
75286 } else {
75287 memcpy(target, src, size);
75288@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
75289 if (*fpos < m->offset + m->size) {
75290 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
75291 start = m->paddr + *fpos - m->offset;
75292- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
75293+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
75294 if (tmp < 0)
75295 return tmp;
75296 buflen -= tsz;
75297@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
75298 static ssize_t read_vmcore(struct file *file, char __user *buffer,
75299 size_t buflen, loff_t *fpos)
75300 {
75301- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
75302+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
75303 }
75304
75305 /*
75306diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
75307index d3fb2b6..43a8140 100644
75308--- a/fs/qnx6/qnx6.h
75309+++ b/fs/qnx6/qnx6.h
75310@@ -74,7 +74,7 @@ enum {
75311 BYTESEX_BE,
75312 };
75313
75314-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
75315+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
75316 {
75317 if (sbi->s_bytesex == BYTESEX_LE)
75318 return le64_to_cpu((__force __le64)n);
75319@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
75320 return (__force __fs64)cpu_to_be64(n);
75321 }
75322
75323-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
75324+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
75325 {
75326 if (sbi->s_bytesex == BYTESEX_LE)
75327 return le32_to_cpu((__force __le32)n);
75328diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
75329index bb2869f..d34ada8 100644
75330--- a/fs/quota/netlink.c
75331+++ b/fs/quota/netlink.c
75332@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
75333 void quota_send_warning(struct kqid qid, dev_t dev,
75334 const char warntype)
75335 {
75336- static atomic_t seq;
75337+ static atomic_unchecked_t seq;
75338 struct sk_buff *skb;
75339 void *msg_head;
75340 int ret;
75341@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
75342 "VFS: Not enough memory to send quota warning.\n");
75343 return;
75344 }
75345- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
75346+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
75347 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
75348 if (!msg_head) {
75349 printk(KERN_ERR
75350diff --git a/fs/read_write.c b/fs/read_write.c
75351index 8e1b687..bad2eec 100644
75352--- a/fs/read_write.c
75353+++ b/fs/read_write.c
75354@@ -553,7 +553,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
75355
75356 old_fs = get_fs();
75357 set_fs(get_ds());
75358- p = (__force const char __user *)buf;
75359+ p = (const char __force_user *)buf;
75360 if (count > MAX_RW_COUNT)
75361 count = MAX_RW_COUNT;
75362 if (file->f_op->write)
75363diff --git a/fs/readdir.c b/fs/readdir.c
75364index ced6791..936687b 100644
75365--- a/fs/readdir.c
75366+++ b/fs/readdir.c
75367@@ -18,6 +18,7 @@
75368 #include <linux/security.h>
75369 #include <linux/syscalls.h>
75370 #include <linux/unistd.h>
75371+#include <linux/namei.h>
75372
75373 #include <asm/uaccess.h>
75374
75375@@ -71,6 +72,7 @@ struct old_linux_dirent {
75376 struct readdir_callback {
75377 struct dir_context ctx;
75378 struct old_linux_dirent __user * dirent;
75379+ struct file * file;
75380 int result;
75381 };
75382
75383@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
75384 buf->result = -EOVERFLOW;
75385 return -EOVERFLOW;
75386 }
75387+
75388+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75389+ return 0;
75390+
75391 buf->result++;
75392 dirent = buf->dirent;
75393 if (!access_ok(VERIFY_WRITE, dirent,
75394@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
75395 if (!f.file)
75396 return -EBADF;
75397
75398+ buf.file = f.file;
75399 error = iterate_dir(f.file, &buf.ctx);
75400 if (buf.result)
75401 error = buf.result;
75402@@ -145,6 +152,7 @@ struct getdents_callback {
75403 struct dir_context ctx;
75404 struct linux_dirent __user * current_dir;
75405 struct linux_dirent __user * previous;
75406+ struct file * file;
75407 int count;
75408 int error;
75409 };
75410@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
75411 buf->error = -EOVERFLOW;
75412 return -EOVERFLOW;
75413 }
75414+
75415+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75416+ return 0;
75417+
75418 dirent = buf->previous;
75419 if (dirent) {
75420 if (__put_user(offset, &dirent->d_off))
75421@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
75422 if (!f.file)
75423 return -EBADF;
75424
75425+ buf.file = f.file;
75426 error = iterate_dir(f.file, &buf.ctx);
75427 if (error >= 0)
75428 error = buf.error;
75429@@ -230,6 +243,7 @@ struct getdents_callback64 {
75430 struct dir_context ctx;
75431 struct linux_dirent64 __user * current_dir;
75432 struct linux_dirent64 __user * previous;
75433+ struct file *file;
75434 int count;
75435 int error;
75436 };
75437@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
75438 buf->error = -EINVAL; /* only used if we fail.. */
75439 if (reclen > buf->count)
75440 return -EINVAL;
75441+
75442+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75443+ return 0;
75444+
75445 dirent = buf->previous;
75446 if (dirent) {
75447 if (__put_user(offset, &dirent->d_off))
75448@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
75449 if (!f.file)
75450 return -EBADF;
75451
75452+ buf.file = f.file;
75453 error = iterate_dir(f.file, &buf.ctx);
75454 if (error >= 0)
75455 error = buf.error;
75456diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
75457index 9c02d96..6562c10 100644
75458--- a/fs/reiserfs/do_balan.c
75459+++ b/fs/reiserfs/do_balan.c
75460@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
75461 return;
75462 }
75463
75464- atomic_inc(&fs_generation(tb->tb_sb));
75465+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
75466 do_balance_starts(tb);
75467
75468 /*
75469diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
75470index aca73dd..e3c558d 100644
75471--- a/fs/reiserfs/item_ops.c
75472+++ b/fs/reiserfs/item_ops.c
75473@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
75474 }
75475
75476 static struct item_operations errcatch_ops = {
75477- errcatch_bytes_number,
75478- errcatch_decrement_key,
75479- errcatch_is_left_mergeable,
75480- errcatch_print_item,
75481- errcatch_check_item,
75482+ .bytes_number = errcatch_bytes_number,
75483+ .decrement_key = errcatch_decrement_key,
75484+ .is_left_mergeable = errcatch_is_left_mergeable,
75485+ .print_item = errcatch_print_item,
75486+ .check_item = errcatch_check_item,
75487
75488- errcatch_create_vi,
75489- errcatch_check_left,
75490- errcatch_check_right,
75491- errcatch_part_size,
75492- errcatch_unit_num,
75493- errcatch_print_vi
75494+ .create_vi = errcatch_create_vi,
75495+ .check_left = errcatch_check_left,
75496+ .check_right = errcatch_check_right,
75497+ .part_size = errcatch_part_size,
75498+ .unit_num = errcatch_unit_num,
75499+ .print_vi = errcatch_print_vi
75500 };
75501
75502 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
75503diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
75504index 621b9f3..af527fd 100644
75505--- a/fs/reiserfs/procfs.c
75506+++ b/fs/reiserfs/procfs.c
75507@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
75508 "SMALL_TAILS " : "NO_TAILS ",
75509 replay_only(sb) ? "REPLAY_ONLY " : "",
75510 convert_reiserfs(sb) ? "CONV " : "",
75511- atomic_read(&r->s_generation_counter),
75512+ atomic_read_unchecked(&r->s_generation_counter),
75513 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
75514 SF(s_do_balance), SF(s_unneeded_left_neighbor),
75515 SF(s_good_search_by_key_reada), SF(s_bmaps),
75516diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
75517index bb79cdd..fcf49ef 100644
75518--- a/fs/reiserfs/reiserfs.h
75519+++ b/fs/reiserfs/reiserfs.h
75520@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
75521 /* Comment? -Hans */
75522 wait_queue_head_t s_wait;
75523 /* increased by one every time the tree gets re-balanced */
75524- atomic_t s_generation_counter;
75525+ atomic_unchecked_t s_generation_counter;
75526
75527 /* File system properties. Currently holds on-disk FS format */
75528 unsigned long s_properties;
75529@@ -2301,7 +2301,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
75530 #define REISERFS_USER_MEM 1 /* user memory mode */
75531
75532 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
75533-#define get_generation(s) atomic_read (&fs_generation(s))
75534+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
75535 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
75536 #define __fs_changed(gen,s) (gen != get_generation (s))
75537 #define fs_changed(gen,s) \
75538diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
75539index 71fbbe3..eff29ba 100644
75540--- a/fs/reiserfs/super.c
75541+++ b/fs/reiserfs/super.c
75542@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
75543 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
75544 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
75545 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
75546+#ifdef CONFIG_REISERFS_FS_XATTR
75547+ /* turn on user xattrs by default */
75548+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
75549+#endif
75550 /* no preallocation minimum, be smart in reiserfs_file_write instead */
75551 sbi->s_alloc_options.preallocmin = 0;
75552 /* Preallocate by 16 blocks (17-1) at once */
75553diff --git a/fs/select.c b/fs/select.c
75554index f684c75..4117611 100644
75555--- a/fs/select.c
75556+++ b/fs/select.c
75557@@ -20,6 +20,7 @@
75558 #include <linux/export.h>
75559 #include <linux/slab.h>
75560 #include <linux/poll.h>
75561+#include <linux/security.h>
75562 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
75563 #include <linux/file.h>
75564 #include <linux/fdtable.h>
75565@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
75566 struct poll_list *walk = head;
75567 unsigned long todo = nfds;
75568
75569+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
75570 if (nfds > rlimit(RLIMIT_NOFILE))
75571 return -EINVAL;
75572
75573diff --git a/fs/seq_file.c b/fs/seq_file.c
75574index 555f821..34684d7 100644
75575--- a/fs/seq_file.c
75576+++ b/fs/seq_file.c
75577@@ -12,6 +12,8 @@
75578 #include <linux/slab.h>
75579 #include <linux/cred.h>
75580 #include <linux/mm.h>
75581+#include <linux/sched.h>
75582+#include <linux/grsecurity.h>
75583
75584 #include <asm/uaccess.h>
75585 #include <asm/page.h>
75586@@ -23,16 +25,7 @@ static void seq_set_overflow(struct seq_file *m)
75587
75588 static void *seq_buf_alloc(unsigned long size)
75589 {
75590- void *buf;
75591-
75592- /*
75593- * __GFP_NORETRY to avoid oom-killings with high-order allocations -
75594- * it's better to fall back to vmalloc() than to kill things.
75595- */
75596- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
75597- if (!buf && size > PAGE_SIZE)
75598- buf = vmalloc(size);
75599- return buf;
75600+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
75601 }
75602
75603 /**
75604@@ -65,6 +58,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
75605 #ifdef CONFIG_USER_NS
75606 p->user_ns = file->f_cred->user_ns;
75607 #endif
75608+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75609+ p->exec_id = current->exec_id;
75610+#endif
75611
75612 /*
75613 * Wrappers around seq_open(e.g. swaps_open) need to be
75614@@ -87,6 +83,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
75615 }
75616 EXPORT_SYMBOL(seq_open);
75617
75618+
75619+int seq_open_restrict(struct file *file, const struct seq_operations *op)
75620+{
75621+ if (gr_proc_is_restricted())
75622+ return -EACCES;
75623+
75624+ return seq_open(file, op);
75625+}
75626+EXPORT_SYMBOL(seq_open_restrict);
75627+
75628 static int traverse(struct seq_file *m, loff_t offset)
75629 {
75630 loff_t pos = 0, index;
75631@@ -158,7 +164,7 @@ Eoverflow:
75632 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
75633 {
75634 struct seq_file *m = file->private_data;
75635- size_t copied = 0;
75636+ ssize_t copied = 0;
75637 loff_t pos;
75638 size_t n;
75639 void *p;
75640@@ -557,7 +563,7 @@ static void single_stop(struct seq_file *p, void *v)
75641 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
75642 void *data)
75643 {
75644- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
75645+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
75646 int res = -ENOMEM;
75647
75648 if (op) {
75649@@ -593,6 +599,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
75650 }
75651 EXPORT_SYMBOL(single_open_size);
75652
75653+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
75654+ void *data)
75655+{
75656+ if (gr_proc_is_restricted())
75657+ return -EACCES;
75658+
75659+ return single_open(file, show, data);
75660+}
75661+EXPORT_SYMBOL(single_open_restrict);
75662+
75663+
75664 int single_release(struct inode *inode, struct file *file)
75665 {
75666 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
75667diff --git a/fs/splice.c b/fs/splice.c
75668index 7968da9..4ce985b 100644
75669--- a/fs/splice.c
75670+++ b/fs/splice.c
75671@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75672 pipe_lock(pipe);
75673
75674 for (;;) {
75675- if (!pipe->readers) {
75676+ if (!atomic_read(&pipe->readers)) {
75677 send_sig(SIGPIPE, current, 0);
75678 if (!ret)
75679 ret = -EPIPE;
75680@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75681 page_nr++;
75682 ret += buf->len;
75683
75684- if (pipe->files)
75685+ if (atomic_read(&pipe->files))
75686 do_wakeup = 1;
75687
75688 if (!--spd->nr_pages)
75689@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75690 do_wakeup = 0;
75691 }
75692
75693- pipe->waiting_writers++;
75694+ atomic_inc(&pipe->waiting_writers);
75695 pipe_wait(pipe);
75696- pipe->waiting_writers--;
75697+ atomic_dec(&pipe->waiting_writers);
75698 }
75699
75700 pipe_unlock(pipe);
75701@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
75702 old_fs = get_fs();
75703 set_fs(get_ds());
75704 /* The cast to a user pointer is valid due to the set_fs() */
75705- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
75706+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
75707 set_fs(old_fs);
75708
75709 return res;
75710@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
75711 old_fs = get_fs();
75712 set_fs(get_ds());
75713 /* The cast to a user pointer is valid due to the set_fs() */
75714- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
75715+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
75716 set_fs(old_fs);
75717
75718 return res;
75719@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
75720 goto err;
75721
75722 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
75723- vec[i].iov_base = (void __user *) page_address(page);
75724+ vec[i].iov_base = (void __force_user *) page_address(page);
75725 vec[i].iov_len = this_len;
75726 spd.pages[i] = page;
75727 spd.nr_pages++;
75728@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
75729 ops->release(pipe, buf);
75730 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
75731 pipe->nrbufs--;
75732- if (pipe->files)
75733+ if (atomic_read(&pipe->files))
75734 sd->need_wakeup = true;
75735 }
75736
75737@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
75738 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
75739 {
75740 while (!pipe->nrbufs) {
75741- if (!pipe->writers)
75742+ if (!atomic_read(&pipe->writers))
75743 return 0;
75744
75745- if (!pipe->waiting_writers && sd->num_spliced)
75746+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
75747 return 0;
75748
75749 if (sd->flags & SPLICE_F_NONBLOCK)
75750@@ -1025,7 +1025,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
75751 ops->release(pipe, buf);
75752 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
75753 pipe->nrbufs--;
75754- if (pipe->files)
75755+ if (atomic_read(&pipe->files))
75756 sd.need_wakeup = true;
75757 } else {
75758 buf->offset += ret;
75759@@ -1159,7 +1159,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75760 long ret, bytes;
75761 umode_t i_mode;
75762 size_t len;
75763- int i, flags;
75764+ int i, flags, more;
75765
75766 /*
75767 * We require the input being a regular file, as we don't want to
75768@@ -1185,7 +1185,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75769 * out of the pipe right after the splice_to_pipe(). So set
75770 * PIPE_READERS appropriately.
75771 */
75772- pipe->readers = 1;
75773+ atomic_set(&pipe->readers, 1);
75774
75775 current->splice_pipe = pipe;
75776 }
75777@@ -1202,6 +1202,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75778 * Don't block on output, we have to drain the direct pipe.
75779 */
75780 sd->flags &= ~SPLICE_F_NONBLOCK;
75781+ more = sd->flags & SPLICE_F_MORE;
75782
75783 while (len) {
75784 size_t read_len;
75785@@ -1215,6 +1216,15 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75786 sd->total_len = read_len;
75787
75788 /*
75789+ * If more data is pending, set SPLICE_F_MORE
75790+ * If this is the last data and SPLICE_F_MORE was not set
75791+ * initially, clears it.
75792+ */
75793+ if (read_len < len)
75794+ sd->flags |= SPLICE_F_MORE;
75795+ else if (!more)
75796+ sd->flags &= ~SPLICE_F_MORE;
75797+ /*
75798 * NOTE: nonblocking mode only applies to the input. We
75799 * must not do the output in nonblocking mode as then we
75800 * could get stuck data in the internal pipe:
75801@@ -1482,6 +1492,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
75802
75803 partial[buffers].offset = off;
75804 partial[buffers].len = plen;
75805+ partial[buffers].private = 0;
75806
75807 off = 0;
75808 len -= plen;
75809@@ -1718,9 +1729,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75810 ret = -ERESTARTSYS;
75811 break;
75812 }
75813- if (!pipe->writers)
75814+ if (!atomic_read(&pipe->writers))
75815 break;
75816- if (!pipe->waiting_writers) {
75817+ if (!atomic_read(&pipe->waiting_writers)) {
75818 if (flags & SPLICE_F_NONBLOCK) {
75819 ret = -EAGAIN;
75820 break;
75821@@ -1752,7 +1763,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75822 pipe_lock(pipe);
75823
75824 while (pipe->nrbufs >= pipe->buffers) {
75825- if (!pipe->readers) {
75826+ if (!atomic_read(&pipe->readers)) {
75827 send_sig(SIGPIPE, current, 0);
75828 ret = -EPIPE;
75829 break;
75830@@ -1765,9 +1776,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75831 ret = -ERESTARTSYS;
75832 break;
75833 }
75834- pipe->waiting_writers++;
75835+ atomic_inc(&pipe->waiting_writers);
75836 pipe_wait(pipe);
75837- pipe->waiting_writers--;
75838+ atomic_dec(&pipe->waiting_writers);
75839 }
75840
75841 pipe_unlock(pipe);
75842@@ -1803,14 +1814,14 @@ retry:
75843 pipe_double_lock(ipipe, opipe);
75844
75845 do {
75846- if (!opipe->readers) {
75847+ if (!atomic_read(&opipe->readers)) {
75848 send_sig(SIGPIPE, current, 0);
75849 if (!ret)
75850 ret = -EPIPE;
75851 break;
75852 }
75853
75854- if (!ipipe->nrbufs && !ipipe->writers)
75855+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
75856 break;
75857
75858 /*
75859@@ -1907,7 +1918,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
75860 pipe_double_lock(ipipe, opipe);
75861
75862 do {
75863- if (!opipe->readers) {
75864+ if (!atomic_read(&opipe->readers)) {
75865 send_sig(SIGPIPE, current, 0);
75866 if (!ret)
75867 ret = -EPIPE;
75868@@ -1952,7 +1963,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
75869 * return EAGAIN if we have the potential of some data in the
75870 * future, otherwise just return 0
75871 */
75872- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
75873+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
75874 ret = -EAGAIN;
75875
75876 pipe_unlock(ipipe);
75877diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
75878index 92fcde7..1687329 100644
75879--- a/fs/squashfs/xattr.c
75880+++ b/fs/squashfs/xattr.c
75881@@ -46,8 +46,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75882 + msblk->xattr_table;
75883 int offset = SQUASHFS_XATTR_OFFSET(squashfs_i(inode)->xattr);
75884 int count = squashfs_i(inode)->xattr_count;
75885- size_t rest = buffer_size;
75886- int err;
75887+ size_t used = 0;
75888+ ssize_t err;
75889
75890 /* check that the file system has xattrs */
75891 if (msblk->xattr_id_table == NULL)
75892@@ -68,11 +68,11 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75893 name_size = le16_to_cpu(entry.size);
75894 handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
75895 if (handler)
75896- prefix_size = handler->list(d, buffer, rest, NULL,
75897+ prefix_size = handler->list(d, buffer, buffer ? buffer_size - used : 0, NULL,
75898 name_size, handler->flags);
75899 if (prefix_size) {
75900 if (buffer) {
75901- if (prefix_size + name_size + 1 > rest) {
75902+ if (prefix_size + name_size + 1 > buffer_size - used) {
75903 err = -ERANGE;
75904 goto failed;
75905 }
75906@@ -86,7 +86,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75907 buffer[name_size] = '\0';
75908 buffer += name_size + 1;
75909 }
75910- rest -= prefix_size + name_size + 1;
75911+ used += prefix_size + name_size + 1;
75912 } else {
75913 /* no handler or insuffficient privileges, so skip */
75914 err = squashfs_read_metadata(sb, NULL, &start,
75915@@ -107,7 +107,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75916 if (err < 0)
75917 goto failed;
75918 }
75919- err = buffer_size - rest;
75920+ err = used;
75921
75922 failed:
75923 return err;
75924diff --git a/fs/stat.c b/fs/stat.c
75925index ae0c3ce..9ee641c 100644
75926--- a/fs/stat.c
75927+++ b/fs/stat.c
75928@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
75929 stat->gid = inode->i_gid;
75930 stat->rdev = inode->i_rdev;
75931 stat->size = i_size_read(inode);
75932- stat->atime = inode->i_atime;
75933- stat->mtime = inode->i_mtime;
75934+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
75935+ stat->atime = inode->i_ctime;
75936+ stat->mtime = inode->i_ctime;
75937+ } else {
75938+ stat->atime = inode->i_atime;
75939+ stat->mtime = inode->i_mtime;
75940+ }
75941 stat->ctime = inode->i_ctime;
75942 stat->blksize = (1 << inode->i_blkbits);
75943 stat->blocks = inode->i_blocks;
75944@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
75945 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
75946 {
75947 struct inode *inode = path->dentry->d_inode;
75948+ int retval;
75949
75950- if (inode->i_op->getattr)
75951- return inode->i_op->getattr(path->mnt, path->dentry, stat);
75952+ if (inode->i_op->getattr) {
75953+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
75954+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
75955+ stat->atime = stat->ctime;
75956+ stat->mtime = stat->ctime;
75957+ }
75958+ return retval;
75959+ }
75960
75961 generic_fillattr(inode, stat);
75962 return 0;
75963diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
75964index 0b45ff4..edf9d3a 100644
75965--- a/fs/sysfs/dir.c
75966+++ b/fs/sysfs/dir.c
75967@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
75968 kfree(buf);
75969 }
75970
75971+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
75972+extern int grsec_enable_sysfs_restrict;
75973+#endif
75974+
75975 /**
75976 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
75977 * @kobj: object we're creating directory for
75978@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
75979 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
75980 {
75981 struct kernfs_node *parent, *kn;
75982+ const char *name;
75983+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
75984+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
75985+ const char *parent_name;
75986+#endif
75987
75988 BUG_ON(!kobj);
75989
75990+ name = kobject_name(kobj);
75991+
75992 if (kobj->parent)
75993 parent = kobj->parent->sd;
75994 else
75995@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
75996 if (!parent)
75997 return -ENOENT;
75998
75999- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
76000- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
76001+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
76002+ parent_name = parent->name;
76003+ mode = S_IRWXU;
76004+
76005+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
76006+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
76007+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
76008+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
76009+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
76010+ if (!grsec_enable_sysfs_restrict)
76011+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
76012+#endif
76013+
76014+ kn = kernfs_create_dir_ns(parent, name,
76015+ mode, kobj, ns);
76016 if (IS_ERR(kn)) {
76017 if (PTR_ERR(kn) == -EEXIST)
76018- sysfs_warn_dup(parent, kobject_name(kobj));
76019+ sysfs_warn_dup(parent, name);
76020 return PTR_ERR(kn);
76021 }
76022
76023diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
76024index 69d4889..a810bd4 100644
76025--- a/fs/sysv/sysv.h
76026+++ b/fs/sysv/sysv.h
76027@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
76028 #endif
76029 }
76030
76031-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
76032+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
76033 {
76034 if (sbi->s_bytesex == BYTESEX_PDP)
76035 return PDP_swab((__force __u32)n);
76036diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
76037index fb08b0c..65fcc7e 100644
76038--- a/fs/ubifs/io.c
76039+++ b/fs/ubifs/io.c
76040@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
76041 return err;
76042 }
76043
76044-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
76045+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
76046 {
76047 int err;
76048
76049diff --git a/fs/udf/misc.c b/fs/udf/misc.c
76050index c175b4d..8f36a16 100644
76051--- a/fs/udf/misc.c
76052+++ b/fs/udf/misc.c
76053@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
76054
76055 u8 udf_tag_checksum(const struct tag *t)
76056 {
76057- u8 *data = (u8 *)t;
76058+ const u8 *data = (const u8 *)t;
76059 u8 checksum = 0;
76060 int i;
76061 for (i = 0; i < sizeof(struct tag); ++i)
76062diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
76063index 8d974c4..b82f6ec 100644
76064--- a/fs/ufs/swab.h
76065+++ b/fs/ufs/swab.h
76066@@ -22,7 +22,7 @@ enum {
76067 BYTESEX_BE
76068 };
76069
76070-static inline u64
76071+static inline u64 __intentional_overflow(-1)
76072 fs64_to_cpu(struct super_block *sbp, __fs64 n)
76073 {
76074 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
76075@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
76076 return (__force __fs64)cpu_to_be64(n);
76077 }
76078
76079-static inline u32
76080+static inline u32 __intentional_overflow(-1)
76081 fs32_to_cpu(struct super_block *sbp, __fs32 n)
76082 {
76083 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
76084diff --git a/fs/utimes.c b/fs/utimes.c
76085index aa138d6..5f3a811 100644
76086--- a/fs/utimes.c
76087+++ b/fs/utimes.c
76088@@ -1,6 +1,7 @@
76089 #include <linux/compiler.h>
76090 #include <linux/file.h>
76091 #include <linux/fs.h>
76092+#include <linux/security.h>
76093 #include <linux/linkage.h>
76094 #include <linux/mount.h>
76095 #include <linux/namei.h>
76096@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
76097 }
76098 }
76099 retry_deleg:
76100+
76101+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
76102+ error = -EACCES;
76103+ goto mnt_drop_write_and_out;
76104+ }
76105+
76106 mutex_lock(&inode->i_mutex);
76107 error = notify_change(path->dentry, &newattrs, &delegated_inode);
76108 mutex_unlock(&inode->i_mutex);
76109diff --git a/fs/xattr.c b/fs/xattr.c
76110index 4ef6985..a6cd6567 100644
76111--- a/fs/xattr.c
76112+++ b/fs/xattr.c
76113@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
76114 return rc;
76115 }
76116
76117+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
76118+ssize_t
76119+pax_getxattr(struct dentry *dentry, void *value, size_t size)
76120+{
76121+ struct inode *inode = dentry->d_inode;
76122+ ssize_t error;
76123+
76124+ error = inode_permission(inode, MAY_EXEC);
76125+ if (error)
76126+ return error;
76127+
76128+ if (inode->i_op->getxattr)
76129+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
76130+ else
76131+ error = -EOPNOTSUPP;
76132+
76133+ return error;
76134+}
76135+EXPORT_SYMBOL(pax_getxattr);
76136+#endif
76137+
76138 ssize_t
76139 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
76140 {
76141@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
76142 * Extended attribute SET operations
76143 */
76144 static long
76145-setxattr(struct dentry *d, const char __user *name, const void __user *value,
76146+setxattr(struct path *path, const char __user *name, const void __user *value,
76147 size_t size, int flags)
76148 {
76149 int error;
76150@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
76151 posix_acl_fix_xattr_from_user(kvalue, size);
76152 }
76153
76154- error = vfs_setxattr(d, kname, kvalue, size, flags);
76155+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
76156+ error = -EACCES;
76157+ goto out;
76158+ }
76159+
76160+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
76161 out:
76162 if (vvalue)
76163 vfree(vvalue);
76164@@ -376,7 +402,7 @@ retry:
76165 return error;
76166 error = mnt_want_write(path.mnt);
76167 if (!error) {
76168- error = setxattr(path.dentry, name, value, size, flags);
76169+ error = setxattr(&path, name, value, size, flags);
76170 mnt_drop_write(path.mnt);
76171 }
76172 path_put(&path);
76173@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
76174 audit_file(f.file);
76175 error = mnt_want_write_file(f.file);
76176 if (!error) {
76177- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
76178+ error = setxattr(&f.file->f_path, name, value, size, flags);
76179 mnt_drop_write_file(f.file);
76180 }
76181 fdput(f);
76182@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
76183 * Extended attribute REMOVE operations
76184 */
76185 static long
76186-removexattr(struct dentry *d, const char __user *name)
76187+removexattr(struct path *path, const char __user *name)
76188 {
76189 int error;
76190 char kname[XATTR_NAME_MAX + 1];
76191@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
76192 if (error < 0)
76193 return error;
76194
76195- return vfs_removexattr(d, kname);
76196+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
76197+ return -EACCES;
76198+
76199+ return vfs_removexattr(path->dentry, kname);
76200 }
76201
76202 static int path_removexattr(const char __user *pathname,
76203@@ -623,7 +652,7 @@ retry:
76204 return error;
76205 error = mnt_want_write(path.mnt);
76206 if (!error) {
76207- error = removexattr(path.dentry, name);
76208+ error = removexattr(&path, name);
76209 mnt_drop_write(path.mnt);
76210 }
76211 path_put(&path);
76212@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
76213 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
76214 {
76215 struct fd f = fdget(fd);
76216+ struct path *path;
76217 int error = -EBADF;
76218
76219 if (!f.file)
76220 return error;
76221+ path = &f.file->f_path;
76222 audit_file(f.file);
76223 error = mnt_want_write_file(f.file);
76224 if (!error) {
76225- error = removexattr(f.file->f_path.dentry, name);
76226+ error = removexattr(path, name);
76227 mnt_drop_write_file(f.file);
76228 }
76229 fdput(f);
76230diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
76231index 61ec015..7c18807 100644
76232--- a/fs/xfs/libxfs/xfs_bmap.c
76233+++ b/fs/xfs/libxfs/xfs_bmap.c
76234@@ -580,7 +580,7 @@ xfs_bmap_validate_ret(
76235
76236 #else
76237 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
76238-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
76239+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
76240 #endif /* DEBUG */
76241
76242 /*
76243diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
76244index 098cd78..724d3f8 100644
76245--- a/fs/xfs/xfs_dir2_readdir.c
76246+++ b/fs/xfs/xfs_dir2_readdir.c
76247@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
76248 ino = dp->d_ops->sf_get_ino(sfp, sfep);
76249 filetype = dp->d_ops->sf_get_ftype(sfep);
76250 ctx->pos = off & 0x7fffffff;
76251- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
76252+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
76253+ char name[sfep->namelen];
76254+ memcpy(name, sfep->name, sfep->namelen);
76255+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
76256+ return 0;
76257+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
76258 xfs_dir3_get_dtype(dp->i_mount, filetype)))
76259 return 0;
76260 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
76261diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
76262index ac4feae..386d551 100644
76263--- a/fs/xfs/xfs_ioctl.c
76264+++ b/fs/xfs/xfs_ioctl.c
76265@@ -120,7 +120,7 @@ xfs_find_handle(
76266 }
76267
76268 error = -EFAULT;
76269- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
76270+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
76271 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
76272 goto out_put;
76273
76274diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
76275index c31d2c2..6ec8f62 100644
76276--- a/fs/xfs/xfs_linux.h
76277+++ b/fs/xfs/xfs_linux.h
76278@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
76279 * of the compiler which do not like us using do_div in the middle
76280 * of large functions.
76281 */
76282-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
76283+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
76284 {
76285 __u32 mod;
76286
76287@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
76288 return 0;
76289 }
76290 #else
76291-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
76292+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
76293 {
76294 __u32 mod;
76295
76296diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
76297new file mode 100644
76298index 0000000..31f8fe4
76299--- /dev/null
76300+++ b/grsecurity/Kconfig
76301@@ -0,0 +1,1182 @@
76302+#
76303+# grecurity configuration
76304+#
76305+menu "Memory Protections"
76306+depends on GRKERNSEC
76307+
76308+config GRKERNSEC_KMEM
76309+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
76310+ default y if GRKERNSEC_CONFIG_AUTO
76311+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
76312+ help
76313+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
76314+ be written to or read from to modify or leak the contents of the running
76315+ kernel. /dev/port will also not be allowed to be opened, writing to
76316+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
76317+ If you have module support disabled, enabling this will close up several
76318+ ways that are currently used to insert malicious code into the running
76319+ kernel.
76320+
76321+ Even with this feature enabled, we still highly recommend that
76322+ you use the RBAC system, as it is still possible for an attacker to
76323+ modify the running kernel through other more obscure methods.
76324+
76325+ It is highly recommended that you say Y here if you meet all the
76326+ conditions above.
76327+
76328+config GRKERNSEC_VM86
76329+ bool "Restrict VM86 mode"
76330+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76331+ depends on X86_32
76332+
76333+ help
76334+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
76335+ make use of a special execution mode on 32bit x86 processors called
76336+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
76337+ video cards and will still work with this option enabled. The purpose
76338+ of the option is to prevent exploitation of emulation errors in
76339+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
76340+ Nearly all users should be able to enable this option.
76341+
76342+config GRKERNSEC_IO
76343+ bool "Disable privileged I/O"
76344+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76345+ depends on X86
76346+ select RTC_CLASS
76347+ select RTC_INTF_DEV
76348+ select RTC_DRV_CMOS
76349+
76350+ help
76351+ If you say Y here, all ioperm and iopl calls will return an error.
76352+ Ioperm and iopl can be used to modify the running kernel.
76353+ Unfortunately, some programs need this access to operate properly,
76354+ the most notable of which are XFree86 and hwclock. hwclock can be
76355+ remedied by having RTC support in the kernel, so real-time
76356+ clock support is enabled if this option is enabled, to ensure
76357+ that hwclock operates correctly. If hwclock still does not work,
76358+ either update udev or symlink /dev/rtc to /dev/rtc0.
76359+
76360+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
76361+ you may not be able to boot into a graphical environment with this
76362+ option enabled. In this case, you should use the RBAC system instead.
76363+
76364+config GRKERNSEC_BPF_HARDEN
76365+ bool "Harden BPF interpreter"
76366+ default y if GRKERNSEC_CONFIG_AUTO
76367+ help
76368+ Unlike previous versions of grsecurity that hardened both the BPF
76369+ interpreted code against corruption at rest as well as the JIT code
76370+ against JIT-spray attacks and attacker-controlled immediate values
76371+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
76372+ and will ensure the interpreted code is read-only at rest. This feature
76373+ may be removed at a later time when eBPF stabilizes to entirely revert
76374+ back to the more secure pre-3.16 BPF interpreter/JIT.
76375+
76376+ If you're using KERNEXEC, it's recommended that you enable this option
76377+ to supplement the hardening of the kernel.
76378+
76379+config GRKERNSEC_PERF_HARDEN
76380+ bool "Disable unprivileged PERF_EVENTS usage by default"
76381+ default y if GRKERNSEC_CONFIG_AUTO
76382+ depends on PERF_EVENTS
76383+ help
76384+ If you say Y here, the range of acceptable values for the
76385+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
76386+ default to a new value: 3. When the sysctl is set to this value, no
76387+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
76388+
76389+ Though PERF_EVENTS can be used legitimately for performance monitoring
76390+ and low-level application profiling, it is forced on regardless of
76391+ configuration, has been at fault for several vulnerabilities, and
76392+ creates new opportunities for side channels and other information leaks.
76393+
76394+ This feature puts PERF_EVENTS into a secure default state and permits
76395+ the administrator to change out of it temporarily if unprivileged
76396+ application profiling is needed.
76397+
76398+config GRKERNSEC_RAND_THREADSTACK
76399+ bool "Insert random gaps between thread stacks"
76400+ default y if GRKERNSEC_CONFIG_AUTO
76401+ depends on PAX_RANDMMAP && !PPC
76402+ help
76403+ If you say Y here, a random-sized gap will be enforced between allocated
76404+ thread stacks. Glibc's NPTL and other threading libraries that
76405+ pass MAP_STACK to the kernel for thread stack allocation are supported.
76406+ The implementation currently provides 8 bits of entropy for the gap.
76407+
76408+ Many distributions do not compile threaded remote services with the
76409+ -fstack-check argument to GCC, causing the variable-sized stack-based
76410+ allocator, alloca(), to not probe the stack on allocation. This
76411+ permits an unbounded alloca() to skip over any guard page and potentially
76412+ modify another thread's stack reliably. An enforced random gap
76413+ reduces the reliability of such an attack and increases the chance
76414+ that such a read/write to another thread's stack instead lands in
76415+ an unmapped area, causing a crash and triggering grsecurity's
76416+ anti-bruteforcing logic.
76417+
76418+config GRKERNSEC_PROC_MEMMAP
76419+ bool "Harden ASLR against information leaks and entropy reduction"
76420+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
76421+ depends on PAX_NOEXEC || PAX_ASLR
76422+ help
76423+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
76424+ give no information about the addresses of its mappings if
76425+ PaX features that rely on random addresses are enabled on the task.
76426+ In addition to sanitizing this information and disabling other
76427+ dangerous sources of information, this option causes reads of sensitive
76428+ /proc/<pid> entries where the file descriptor was opened in a different
76429+ task than the one performing the read. Such attempts are logged.
76430+ This option also limits argv/env strings for suid/sgid binaries
76431+ to 512KB to prevent a complete exhaustion of the stack entropy provided
76432+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
76433+ binaries to prevent alternative mmap layouts from being abused.
76434+
76435+ If you use PaX it is essential that you say Y here as it closes up
76436+ several holes that make full ASLR useless locally.
76437+
76438+
76439+config GRKERNSEC_KSTACKOVERFLOW
76440+ bool "Prevent kernel stack overflows"
76441+ default y if GRKERNSEC_CONFIG_AUTO
76442+ depends on !IA64 && 64BIT
76443+ help
76444+ If you say Y here, the kernel's process stacks will be allocated
76445+ with vmalloc instead of the kernel's default allocator. This
76446+ introduces guard pages that in combination with the alloca checking
76447+ of the STACKLEAK feature prevents all forms of kernel process stack
76448+ overflow abuse. Note that this is different from kernel stack
76449+ buffer overflows.
76450+
76451+config GRKERNSEC_BRUTE
76452+ bool "Deter exploit bruteforcing"
76453+ default y if GRKERNSEC_CONFIG_AUTO
76454+ help
76455+ If you say Y here, attempts to bruteforce exploits against forking
76456+ daemons such as apache or sshd, as well as against suid/sgid binaries
76457+ will be deterred. When a child of a forking daemon is killed by PaX
76458+ or crashes due to an illegal instruction or other suspicious signal,
76459+ the parent process will be delayed 30 seconds upon every subsequent
76460+ fork until the administrator is able to assess the situation and
76461+ restart the daemon.
76462+ In the suid/sgid case, the attempt is logged, the user has all their
76463+ existing instances of the suid/sgid binary terminated and will
76464+ be unable to execute any suid/sgid binaries for 15 minutes.
76465+
76466+ It is recommended that you also enable signal logging in the auditing
76467+ section so that logs are generated when a process triggers a suspicious
76468+ signal.
76469+ If the sysctl option is enabled, a sysctl option with name
76470+ "deter_bruteforce" is created.
76471+
76472+config GRKERNSEC_MODHARDEN
76473+ bool "Harden module auto-loading"
76474+ default y if GRKERNSEC_CONFIG_AUTO
76475+ depends on MODULES
76476+ help
76477+ If you say Y here, module auto-loading in response to use of some
76478+ feature implemented by an unloaded module will be restricted to
76479+ root users. Enabling this option helps defend against attacks
76480+ by unprivileged users who abuse the auto-loading behavior to
76481+ cause a vulnerable module to load that is then exploited.
76482+
76483+ If this option prevents a legitimate use of auto-loading for a
76484+ non-root user, the administrator can execute modprobe manually
76485+ with the exact name of the module mentioned in the alert log.
76486+ Alternatively, the administrator can add the module to the list
76487+ of modules loaded at boot by modifying init scripts.
76488+
76489+ Modification of init scripts will most likely be needed on
76490+ Ubuntu servers with encrypted home directory support enabled,
76491+ as the first non-root user logging in will cause the ecb(aes),
76492+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
76493+
76494+config GRKERNSEC_HIDESYM
76495+ bool "Hide kernel symbols"
76496+ default y if GRKERNSEC_CONFIG_AUTO
76497+ select PAX_USERCOPY_SLABS
76498+ help
76499+ If you say Y here, getting information on loaded modules, and
76500+ displaying all kernel symbols through a syscall will be restricted
76501+ to users with CAP_SYS_MODULE. For software compatibility reasons,
76502+ /proc/kallsyms will be restricted to the root user. The RBAC
76503+ system can hide that entry even from root.
76504+
76505+ This option also prevents leaking of kernel addresses through
76506+ several /proc entries.
76507+
76508+ Note that this option is only effective provided the following
76509+ conditions are met:
76510+ 1) The kernel using grsecurity is not precompiled by some distribution
76511+ 2) You have also enabled GRKERNSEC_DMESG
76512+ 3) You are using the RBAC system and hiding other files such as your
76513+ kernel image and System.map. Alternatively, enabling this option
76514+ causes the permissions on /boot, /lib/modules, and the kernel
76515+ source directory to change at compile time to prevent
76516+ reading by non-root users.
76517+ If the above conditions are met, this option will aid in providing a
76518+ useful protection against local kernel exploitation of overflows
76519+ and arbitrary read/write vulnerabilities.
76520+
76521+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
76522+ in addition to this feature.
76523+
76524+config GRKERNSEC_RANDSTRUCT
76525+ bool "Randomize layout of sensitive kernel structures"
76526+ default y if GRKERNSEC_CONFIG_AUTO
76527+ select GRKERNSEC_HIDESYM
76528+ select MODVERSIONS if MODULES
76529+ help
76530+ If you say Y here, the layouts of a number of sensitive kernel
76531+ structures (task, fs, cred, etc) and all structures composed entirely
76532+ of function pointers (aka "ops" structs) will be randomized at compile-time.
76533+ This can introduce the requirement of an additional infoleak
76534+ vulnerability for exploits targeting these structure types.
76535+
76536+ Enabling this feature will introduce some performance impact, slightly
76537+ increase memory usage, and prevent the use of forensic tools like
76538+ Volatility against the system (unless the kernel source tree isn't
76539+ cleaned after kernel installation).
76540+
76541+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
76542+ It remains after a make clean to allow for external modules to be compiled
76543+ with the existing seed and will be removed by a make mrproper or
76544+ make distclean.
76545+
76546+ Note that the implementation requires gcc 4.6.4. or newer. You may need
76547+ to install the supporting headers explicitly in addition to the normal
76548+ gcc package.
76549+
76550+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
76551+ bool "Use cacheline-aware structure randomization"
76552+ depends on GRKERNSEC_RANDSTRUCT
76553+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
76554+ help
76555+ If you say Y here, the RANDSTRUCT randomization will make a best effort
76556+ at restricting randomization to cacheline-sized groups of elements. It
76557+ will further not randomize bitfields in structures. This reduces the
76558+ performance hit of RANDSTRUCT at the cost of weakened randomization.
76559+
76560+config GRKERNSEC_KERN_LOCKOUT
76561+ bool "Active kernel exploit response"
76562+ default y if GRKERNSEC_CONFIG_AUTO
76563+ depends on X86 || ARM || PPC || SPARC
76564+ help
76565+ If you say Y here, when a PaX alert is triggered due to suspicious
76566+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
76567+ or an OOPS occurs due to bad memory accesses, instead of just
76568+ terminating the offending process (and potentially allowing
76569+ a subsequent exploit from the same user), we will take one of two
76570+ actions:
76571+ If the user was root, we will panic the system
76572+ If the user was non-root, we will log the attempt, terminate
76573+ all processes owned by the user, then prevent them from creating
76574+ any new processes until the system is restarted
76575+ This deters repeated kernel exploitation/bruteforcing attempts
76576+ and is useful for later forensics.
76577+
76578+config GRKERNSEC_OLD_ARM_USERLAND
76579+ bool "Old ARM userland compatibility"
76580+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
76581+ help
76582+ If you say Y here, stubs of executable code to perform such operations
76583+ as "compare-exchange" will be placed at fixed locations in the ARM vector
76584+ table. This is unfortunately needed for old ARM userland meant to run
76585+ across a wide range of processors. Without this option enabled,
76586+ the get_tls and data memory barrier stubs will be emulated by the kernel,
76587+ which is enough for Linaro userlands or other userlands designed for v6
76588+ and newer ARM CPUs. It's recommended that you try without this option enabled
76589+ first, and only enable it if your userland does not boot (it will likely fail
76590+ at init time).
76591+
76592+endmenu
76593+menu "Role Based Access Control Options"
76594+depends on GRKERNSEC
76595+
76596+config GRKERNSEC_RBAC_DEBUG
76597+ bool
76598+
76599+config GRKERNSEC_NO_RBAC
76600+ bool "Disable RBAC system"
76601+ help
76602+ If you say Y here, the /dev/grsec device will be removed from the kernel,
76603+ preventing the RBAC system from being enabled. You should only say Y
76604+ here if you have no intention of using the RBAC system, so as to prevent
76605+ an attacker with root access from misusing the RBAC system to hide files
76606+ and processes when loadable module support and /dev/[k]mem have been
76607+ locked down.
76608+
76609+config GRKERNSEC_ACL_HIDEKERN
76610+ bool "Hide kernel processes"
76611+ help
76612+ If you say Y here, all kernel threads will be hidden to all
76613+ processes but those whose subject has the "view hidden processes"
76614+ flag.
76615+
76616+config GRKERNSEC_ACL_MAXTRIES
76617+ int "Maximum tries before password lockout"
76618+ default 3
76619+ help
76620+ This option enforces the maximum number of times a user can attempt
76621+ to authorize themselves with the grsecurity RBAC system before being
76622+ denied the ability to attempt authorization again for a specified time.
76623+ The lower the number, the harder it will be to brute-force a password.
76624+
76625+config GRKERNSEC_ACL_TIMEOUT
76626+ int "Time to wait after max password tries, in seconds"
76627+ default 30
76628+ help
76629+ This option specifies the time the user must wait after attempting to
76630+ authorize to the RBAC system with the maximum number of invalid
76631+ passwords. The higher the number, the harder it will be to brute-force
76632+ a password.
76633+
76634+endmenu
76635+menu "Filesystem Protections"
76636+depends on GRKERNSEC
76637+
76638+config GRKERNSEC_PROC
76639+ bool "Proc restrictions"
76640+ default y if GRKERNSEC_CONFIG_AUTO
76641+ help
76642+ If you say Y here, the permissions of the /proc filesystem
76643+ will be altered to enhance system security and privacy. You MUST
76644+ choose either a user only restriction or a user and group restriction.
76645+ Depending upon the option you choose, you can either restrict users to
76646+ see only the processes they themselves run, or choose a group that can
76647+ view all processes and files normally restricted to root if you choose
76648+ the "restrict to user only" option. NOTE: If you're running identd or
76649+ ntpd as a non-root user, you will have to run it as the group you
76650+ specify here.
76651+
76652+config GRKERNSEC_PROC_USER
76653+ bool "Restrict /proc to user only"
76654+ depends on GRKERNSEC_PROC
76655+ help
76656+ If you say Y here, non-root users will only be able to view their own
76657+ processes, and restricts them from viewing network-related information,
76658+ and viewing kernel symbol and module information.
76659+
76660+config GRKERNSEC_PROC_USERGROUP
76661+ bool "Allow special group"
76662+ default y if GRKERNSEC_CONFIG_AUTO
76663+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
76664+ help
76665+ If you say Y here, you will be able to select a group that will be
76666+ able to view all processes and network-related information. If you've
76667+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
76668+ remain hidden. This option is useful if you want to run identd as
76669+ a non-root user. The group you select may also be chosen at boot time
76670+ via "grsec_proc_gid=" on the kernel commandline.
76671+
76672+config GRKERNSEC_PROC_GID
76673+ int "GID for special group"
76674+ depends on GRKERNSEC_PROC_USERGROUP
76675+ default 1001
76676+
76677+config GRKERNSEC_PROC_ADD
76678+ bool "Additional restrictions"
76679+ default y if GRKERNSEC_CONFIG_AUTO
76680+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
76681+ help
76682+ If you say Y here, additional restrictions will be placed on
76683+ /proc that keep normal users from viewing device information and
76684+ slabinfo information that could be useful for exploits.
76685+
76686+config GRKERNSEC_LINK
76687+ bool "Linking restrictions"
76688+ default y if GRKERNSEC_CONFIG_AUTO
76689+ help
76690+ If you say Y here, /tmp race exploits will be prevented, since users
76691+ will no longer be able to follow symlinks owned by other users in
76692+ world-writable +t directories (e.g. /tmp), unless the owner of the
76693+ symlink is the owner of the directory. users will also not be
76694+ able to hardlink to files they do not own. If the sysctl option is
76695+ enabled, a sysctl option with name "linking_restrictions" is created.
76696+
76697+config GRKERNSEC_SYMLINKOWN
76698+ bool "Kernel-enforced SymlinksIfOwnerMatch"
76699+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
76700+ help
76701+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
76702+ that prevents it from being used as a security feature. As Apache
76703+ verifies the symlink by performing a stat() against the target of
76704+ the symlink before it is followed, an attacker can setup a symlink
76705+ to point to a same-owned file, then replace the symlink with one
76706+ that targets another user's file just after Apache "validates" the
76707+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
76708+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
76709+ will be in place for the group you specify. If the sysctl option
76710+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
76711+ created.
76712+
76713+config GRKERNSEC_SYMLINKOWN_GID
76714+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
76715+ depends on GRKERNSEC_SYMLINKOWN
76716+ default 1006
76717+ help
76718+ Setting this GID determines what group kernel-enforced
76719+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
76720+ is enabled, a sysctl option with name "symlinkown_gid" is created.
76721+
76722+config GRKERNSEC_FIFO
76723+ bool "FIFO restrictions"
76724+ default y if GRKERNSEC_CONFIG_AUTO
76725+ help
76726+ If you say Y here, users will not be able to write to FIFOs they don't
76727+ own in world-writable +t directories (e.g. /tmp), unless the owner of
76728+ the FIFO is the same owner of the directory it's held in. If the sysctl
76729+ option is enabled, a sysctl option with name "fifo_restrictions" is
76730+ created.
76731+
76732+config GRKERNSEC_SYSFS_RESTRICT
76733+ bool "Sysfs/debugfs restriction"
76734+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76735+ depends on SYSFS
76736+ help
76737+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
76738+ any filesystem normally mounted under it (e.g. debugfs) will be
76739+ mostly accessible only by root. These filesystems generally provide access
76740+ to hardware and debug information that isn't appropriate for unprivileged
76741+ users of the system. Sysfs and debugfs have also become a large source
76742+ of new vulnerabilities, ranging from infoleaks to local compromise.
76743+ There has been very little oversight with an eye toward security involved
76744+ in adding new exporters of information to these filesystems, so their
76745+ use is discouraged.
76746+ For reasons of compatibility, a few directories have been whitelisted
76747+ for access by non-root users:
76748+ /sys/fs/selinux
76749+ /sys/fs/fuse
76750+ /sys/devices/system/cpu
76751+
76752+config GRKERNSEC_ROFS
76753+ bool "Runtime read-only mount protection"
76754+ depends on SYSCTL
76755+ help
76756+ If you say Y here, a sysctl option with name "romount_protect" will
76757+ be created. By setting this option to 1 at runtime, filesystems
76758+ will be protected in the following ways:
76759+ * No new writable mounts will be allowed
76760+ * Existing read-only mounts won't be able to be remounted read/write
76761+ * Write operations will be denied on all block devices
76762+ This option acts independently of grsec_lock: once it is set to 1,
76763+ it cannot be turned off. Therefore, please be mindful of the resulting
76764+ behavior if this option is enabled in an init script on a read-only
76765+ filesystem.
76766+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
76767+ and GRKERNSEC_IO should be enabled and module loading disabled via
76768+ config or at runtime.
76769+ This feature is mainly intended for secure embedded systems.
76770+
76771+
76772+config GRKERNSEC_DEVICE_SIDECHANNEL
76773+ bool "Eliminate stat/notify-based device sidechannels"
76774+ default y if GRKERNSEC_CONFIG_AUTO
76775+ help
76776+ If you say Y here, timing analyses on block or character
76777+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
76778+ will be thwarted for unprivileged users. If a process without
76779+ CAP_MKNOD stats such a device, the last access and last modify times
76780+ will match the device's create time. No access or modify events
76781+ will be triggered through inotify/dnotify/fanotify for such devices.
76782+ This feature will prevent attacks that may at a minimum
76783+ allow an attacker to determine the administrator's password length.
76784+
76785+config GRKERNSEC_CHROOT
76786+ bool "Chroot jail restrictions"
76787+ default y if GRKERNSEC_CONFIG_AUTO
76788+ help
76789+ If you say Y here, you will be able to choose several options that will
76790+ make breaking out of a chrooted jail much more difficult. If you
76791+ encounter no software incompatibilities with the following options, it
76792+ is recommended that you enable each one.
76793+
76794+ Note that the chroot restrictions are not intended to apply to "chroots"
76795+ to directories that are simple bind mounts of the global root filesystem.
76796+ For several other reasons, a user shouldn't expect any significant
76797+ security by performing such a chroot.
76798+
76799+config GRKERNSEC_CHROOT_MOUNT
76800+ bool "Deny mounts"
76801+ default y if GRKERNSEC_CONFIG_AUTO
76802+ depends on GRKERNSEC_CHROOT
76803+ help
76804+ If you say Y here, processes inside a chroot will not be able to
76805+ mount or remount filesystems. If the sysctl option is enabled, a
76806+ sysctl option with name "chroot_deny_mount" is created.
76807+
76808+config GRKERNSEC_CHROOT_DOUBLE
76809+ bool "Deny double-chroots"
76810+ default y if GRKERNSEC_CONFIG_AUTO
76811+ depends on GRKERNSEC_CHROOT
76812+ help
76813+ If you say Y here, processes inside a chroot will not be able to chroot
76814+ again outside the chroot. This is a widely used method of breaking
76815+ out of a chroot jail and should not be allowed. If the sysctl
76816+ option is enabled, a sysctl option with name
76817+ "chroot_deny_chroot" is created.
76818+
76819+config GRKERNSEC_CHROOT_PIVOT
76820+ bool "Deny pivot_root in chroot"
76821+ default y if GRKERNSEC_CONFIG_AUTO
76822+ depends on GRKERNSEC_CHROOT
76823+ help
76824+ If you say Y here, processes inside a chroot will not be able to use
76825+ a function called pivot_root() that was introduced in Linux 2.3.41. It
76826+ works similar to chroot in that it changes the root filesystem. This
76827+ function could be misused in a chrooted process to attempt to break out
76828+ of the chroot, and therefore should not be allowed. If the sysctl
76829+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
76830+ created.
76831+
76832+config GRKERNSEC_CHROOT_CHDIR
76833+ bool "Enforce chdir(\"/\") on all chroots"
76834+ default y if GRKERNSEC_CONFIG_AUTO
76835+ depends on GRKERNSEC_CHROOT
76836+ help
76837+ If you say Y here, the current working directory of all newly-chrooted
76838+ applications will be set to the the root directory of the chroot.
76839+ The man page on chroot(2) states:
76840+ Note that this call does not change the current working
76841+ directory, so that `.' can be outside the tree rooted at
76842+ `/'. In particular, the super-user can escape from a
76843+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
76844+
76845+ It is recommended that you say Y here, since it's not known to break
76846+ any software. If the sysctl option is enabled, a sysctl option with
76847+ name "chroot_enforce_chdir" is created.
76848+
76849+config GRKERNSEC_CHROOT_CHMOD
76850+ bool "Deny (f)chmod +s"
76851+ default y if GRKERNSEC_CONFIG_AUTO
76852+ depends on GRKERNSEC_CHROOT
76853+ help
76854+ If you say Y here, processes inside a chroot will not be able to chmod
76855+ or fchmod files to make them have suid or sgid bits. This protects
76856+ against another published method of breaking a chroot. If the sysctl
76857+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
76858+ created.
76859+
76860+config GRKERNSEC_CHROOT_FCHDIR
76861+ bool "Deny fchdir and fhandle out of chroot"
76862+ default y if GRKERNSEC_CONFIG_AUTO
76863+ depends on GRKERNSEC_CHROOT
76864+ help
76865+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
76866+ to a file descriptor of the chrooting process that points to a directory
76867+ outside the filesystem will be stopped. Additionally, this option prevents
76868+ use of the recently-created syscall for opening files by a guessable "file
76869+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
76870+ with name "chroot_deny_fchdir" is created.
76871+
76872+config GRKERNSEC_CHROOT_MKNOD
76873+ bool "Deny mknod"
76874+ default y if GRKERNSEC_CONFIG_AUTO
76875+ depends on GRKERNSEC_CHROOT
76876+ help
76877+ If you say Y here, processes inside a chroot will not be allowed to
76878+ mknod. The problem with using mknod inside a chroot is that it
76879+ would allow an attacker to create a device entry that is the same
76880+ as one on the physical root of your system, which could range from
76881+ anything from the console device to a device for your harddrive (which
76882+ they could then use to wipe the drive or steal data). It is recommended
76883+ that you say Y here, unless you run into software incompatibilities.
76884+ If the sysctl option is enabled, a sysctl option with name
76885+ "chroot_deny_mknod" is created.
76886+
76887+config GRKERNSEC_CHROOT_SHMAT
76888+ bool "Deny shmat() out of chroot"
76889+ default y if GRKERNSEC_CONFIG_AUTO
76890+ depends on GRKERNSEC_CHROOT
76891+ help
76892+ If you say Y here, processes inside a chroot will not be able to attach
76893+ to shared memory segments that were created outside of the chroot jail.
76894+ It is recommended that you say Y here. If the sysctl option is enabled,
76895+ a sysctl option with name "chroot_deny_shmat" is created.
76896+
76897+config GRKERNSEC_CHROOT_UNIX
76898+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
76899+ default y if GRKERNSEC_CONFIG_AUTO
76900+ depends on GRKERNSEC_CHROOT
76901+ help
76902+ If you say Y here, processes inside a chroot will not be able to
76903+ connect to abstract (meaning not belonging to a filesystem) Unix
76904+ domain sockets that were bound outside of a chroot. It is recommended
76905+ that you say Y here. If the sysctl option is enabled, a sysctl option
76906+ with name "chroot_deny_unix" is created.
76907+
76908+config GRKERNSEC_CHROOT_FINDTASK
76909+ bool "Protect outside processes"
76910+ default y if GRKERNSEC_CONFIG_AUTO
76911+ depends on GRKERNSEC_CHROOT
76912+ help
76913+ If you say Y here, processes inside a chroot will not be able to
76914+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
76915+ getsid, or view any process outside of the chroot. If the sysctl
76916+ option is enabled, a sysctl option with name "chroot_findtask" is
76917+ created.
76918+
76919+config GRKERNSEC_CHROOT_NICE
76920+ bool "Restrict priority changes"
76921+ default y if GRKERNSEC_CONFIG_AUTO
76922+ depends on GRKERNSEC_CHROOT
76923+ help
76924+ If you say Y here, processes inside a chroot will not be able to raise
76925+ the priority of processes in the chroot, or alter the priority of
76926+ processes outside the chroot. This provides more security than simply
76927+ removing CAP_SYS_NICE from the process' capability set. If the
76928+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
76929+ is created.
76930+
76931+config GRKERNSEC_CHROOT_SYSCTL
76932+ bool "Deny sysctl writes"
76933+ default y if GRKERNSEC_CONFIG_AUTO
76934+ depends on GRKERNSEC_CHROOT
76935+ help
76936+ If you say Y here, an attacker in a chroot will not be able to
76937+ write to sysctl entries, either by sysctl(2) or through a /proc
76938+ interface. It is strongly recommended that you say Y here. If the
76939+ sysctl option is enabled, a sysctl option with name
76940+ "chroot_deny_sysctl" is created.
76941+
76942+config GRKERNSEC_CHROOT_RENAME
76943+ bool "Deny bad renames"
76944+ default y if GRKERNSEC_CONFIG_AUTO
76945+ depends on GRKERNSEC_CHROOT
76946+ help
76947+ If you say Y here, an attacker in a chroot will not be able to
76948+ abuse the ability to create double chroots to break out of the
76949+ chroot by exploiting a race condition between a rename of a directory
76950+ within a chroot against an open of a symlink with relative path
76951+ components. This feature will likewise prevent an accomplice outside
76952+ a chroot from enabling a user inside the chroot to break out and make
76953+ use of their credentials on the global filesystem. Enabling this
76954+ feature is essential to prevent root users from breaking out of a
76955+ chroot. If the sysctl option is enabled, a sysctl option with name
76956+ "chroot_deny_bad_rename" is created.
76957+
76958+config GRKERNSEC_CHROOT_CAPS
76959+ bool "Capability restrictions"
76960+ default y if GRKERNSEC_CONFIG_AUTO
76961+ depends on GRKERNSEC_CHROOT
76962+ help
76963+ If you say Y here, the capabilities on all processes within a
76964+ chroot jail will be lowered to stop module insertion, raw i/o,
76965+ system and net admin tasks, rebooting the system, modifying immutable
76966+ files, modifying IPC owned by another, and changing the system time.
76967+ This is left an option because it can break some apps. Disable this
76968+ if your chrooted apps are having problems performing those kinds of
76969+ tasks. If the sysctl option is enabled, a sysctl option with
76970+ name "chroot_caps" is created.
76971+
76972+config GRKERNSEC_CHROOT_INITRD
76973+ bool "Exempt initrd tasks from restrictions"
76974+ default y if GRKERNSEC_CONFIG_AUTO
76975+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
76976+ help
76977+ If you say Y here, tasks started prior to init will be exempted from
76978+ grsecurity's chroot restrictions. This option is mainly meant to
76979+ resolve Plymouth's performing privileged operations unnecessarily
76980+ in a chroot.
76981+
76982+endmenu
76983+menu "Kernel Auditing"
76984+depends on GRKERNSEC
76985+
76986+config GRKERNSEC_AUDIT_GROUP
76987+ bool "Single group for auditing"
76988+ help
76989+ If you say Y here, the exec and chdir logging features will only operate
76990+ on a group you specify. This option is recommended if you only want to
76991+ watch certain users instead of having a large amount of logs from the
76992+ entire system. If the sysctl option is enabled, a sysctl option with
76993+ name "audit_group" is created.
76994+
76995+config GRKERNSEC_AUDIT_GID
76996+ int "GID for auditing"
76997+ depends on GRKERNSEC_AUDIT_GROUP
76998+ default 1007
76999+
77000+config GRKERNSEC_EXECLOG
77001+ bool "Exec logging"
77002+ help
77003+ If you say Y here, all execve() calls will be logged (since the
77004+ other exec*() calls are frontends to execve(), all execution
77005+ will be logged). Useful for shell-servers that like to keep track
77006+ of their users. If the sysctl option is enabled, a sysctl option with
77007+ name "exec_logging" is created.
77008+ WARNING: This option when enabled will produce a LOT of logs, especially
77009+ on an active system.
77010+
77011+config GRKERNSEC_RESLOG
77012+ bool "Resource logging"
77013+ default y if GRKERNSEC_CONFIG_AUTO
77014+ help
77015+ If you say Y here, all attempts to overstep resource limits will
77016+ be logged with the resource name, the requested size, and the current
77017+ limit. It is highly recommended that you say Y here. If the sysctl
77018+ option is enabled, a sysctl option with name "resource_logging" is
77019+ created. If the RBAC system is enabled, the sysctl value is ignored.
77020+
77021+config GRKERNSEC_CHROOT_EXECLOG
77022+ bool "Log execs within chroot"
77023+ help
77024+ If you say Y here, all executions inside a chroot jail will be logged
77025+ to syslog. This can cause a large amount of logs if certain
77026+ applications (eg. djb's daemontools) are installed on the system, and
77027+ is therefore left as an option. If the sysctl option is enabled, a
77028+ sysctl option with name "chroot_execlog" is created.
77029+
77030+config GRKERNSEC_AUDIT_PTRACE
77031+ bool "Ptrace logging"
77032+ help
77033+ If you say Y here, all attempts to attach to a process via ptrace
77034+ will be logged. If the sysctl option is enabled, a sysctl option
77035+ with name "audit_ptrace" is created.
77036+
77037+config GRKERNSEC_AUDIT_CHDIR
77038+ bool "Chdir logging"
77039+ help
77040+ If you say Y here, all chdir() calls will be logged. If the sysctl
77041+ option is enabled, a sysctl option with name "audit_chdir" is created.
77042+
77043+config GRKERNSEC_AUDIT_MOUNT
77044+ bool "(Un)Mount logging"
77045+ help
77046+ If you say Y here, all mounts and unmounts will be logged. If the
77047+ sysctl option is enabled, a sysctl option with name "audit_mount" is
77048+ created.
77049+
77050+config GRKERNSEC_SIGNAL
77051+ bool "Signal logging"
77052+ default y if GRKERNSEC_CONFIG_AUTO
77053+ help
77054+ If you say Y here, certain important signals will be logged, such as
77055+ SIGSEGV, which will as a result inform you of when a error in a program
77056+ occurred, which in some cases could mean a possible exploit attempt.
77057+ If the sysctl option is enabled, a sysctl option with name
77058+ "signal_logging" is created.
77059+
77060+config GRKERNSEC_FORKFAIL
77061+ bool "Fork failure logging"
77062+ help
77063+ If you say Y here, all failed fork() attempts will be logged.
77064+ This could suggest a fork bomb, or someone attempting to overstep
77065+ their process limit. If the sysctl option is enabled, a sysctl option
77066+ with name "forkfail_logging" is created.
77067+
77068+config GRKERNSEC_TIME
77069+ bool "Time change logging"
77070+ default y if GRKERNSEC_CONFIG_AUTO
77071+ help
77072+ If you say Y here, any changes of the system clock will be logged.
77073+ If the sysctl option is enabled, a sysctl option with name
77074+ "timechange_logging" is created.
77075+
77076+config GRKERNSEC_PROC_IPADDR
77077+ bool "/proc/<pid>/ipaddr support"
77078+ default y if GRKERNSEC_CONFIG_AUTO
77079+ help
77080+ If you say Y here, a new entry will be added to each /proc/<pid>
77081+ directory that contains the IP address of the person using the task.
77082+ The IP is carried across local TCP and AF_UNIX stream sockets.
77083+ This information can be useful for IDS/IPSes to perform remote response
77084+ to a local attack. The entry is readable by only the owner of the
77085+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
77086+ the RBAC system), and thus does not create privacy concerns.
77087+
77088+config GRKERNSEC_RWXMAP_LOG
77089+ bool 'Denied RWX mmap/mprotect logging'
77090+ default y if GRKERNSEC_CONFIG_AUTO
77091+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
77092+ help
77093+ If you say Y here, calls to mmap() and mprotect() with explicit
77094+ usage of PROT_WRITE and PROT_EXEC together will be logged when
77095+ denied by the PAX_MPROTECT feature. This feature will also
77096+ log other problematic scenarios that can occur when PAX_MPROTECT
77097+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
77098+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
77099+ is created.
77100+
77101+endmenu
77102+
77103+menu "Executable Protections"
77104+depends on GRKERNSEC
77105+
77106+config GRKERNSEC_DMESG
77107+ bool "Dmesg(8) restriction"
77108+ default y if GRKERNSEC_CONFIG_AUTO
77109+ help
77110+ If you say Y here, non-root users will not be able to use dmesg(8)
77111+ to view the contents of the kernel's circular log buffer.
77112+ The kernel's log buffer often contains kernel addresses and other
77113+ identifying information useful to an attacker in fingerprinting a
77114+ system for a targeted exploit.
77115+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
77116+ created.
77117+
77118+config GRKERNSEC_HARDEN_PTRACE
77119+ bool "Deter ptrace-based process snooping"
77120+ default y if GRKERNSEC_CONFIG_AUTO
77121+ help
77122+ If you say Y here, TTY sniffers and other malicious monitoring
77123+ programs implemented through ptrace will be defeated. If you
77124+ have been using the RBAC system, this option has already been
77125+ enabled for several years for all users, with the ability to make
77126+ fine-grained exceptions.
77127+
77128+ This option only affects the ability of non-root users to ptrace
77129+ processes that are not a descendent of the ptracing process.
77130+ This means that strace ./binary and gdb ./binary will still work,
77131+ but attaching to arbitrary processes will not. If the sysctl
77132+ option is enabled, a sysctl option with name "harden_ptrace" is
77133+ created.
77134+
77135+config GRKERNSEC_PTRACE_READEXEC
77136+ bool "Require read access to ptrace sensitive binaries"
77137+ default y if GRKERNSEC_CONFIG_AUTO
77138+ help
77139+ If you say Y here, unprivileged users will not be able to ptrace unreadable
77140+ binaries. This option is useful in environments that
77141+ remove the read bits (e.g. file mode 4711) from suid binaries to
77142+ prevent infoleaking of their contents. This option adds
77143+ consistency to the use of that file mode, as the binary could normally
77144+ be read out when run without privileges while ptracing.
77145+
77146+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
77147+ is created.
77148+
77149+config GRKERNSEC_SETXID
77150+ bool "Enforce consistent multithreaded privileges"
77151+ default y if GRKERNSEC_CONFIG_AUTO
77152+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
77153+ help
77154+ If you say Y here, a change from a root uid to a non-root uid
77155+ in a multithreaded application will cause the resulting uids,
77156+ gids, supplementary groups, and capabilities in that thread
77157+ to be propagated to the other threads of the process. In most
77158+ cases this is unnecessary, as glibc will emulate this behavior
77159+ on behalf of the application. Other libcs do not act in the
77160+ same way, allowing the other threads of the process to continue
77161+ running with root privileges. If the sysctl option is enabled,
77162+ a sysctl option with name "consistent_setxid" is created.
77163+
77164+config GRKERNSEC_HARDEN_IPC
77165+ bool "Disallow access to overly-permissive IPC objects"
77166+ default y if GRKERNSEC_CONFIG_AUTO
77167+ depends on SYSVIPC
77168+ help
77169+ If you say Y here, access to overly-permissive IPC objects (shared
77170+ memory, message queues, and semaphores) will be denied for processes
77171+ given the following criteria beyond normal permission checks:
77172+ 1) If the IPC object is world-accessible and the euid doesn't match
77173+ that of the creator or current uid for the IPC object
77174+ 2) If the IPC object is group-accessible and the egid doesn't
77175+ match that of the creator or current gid for the IPC object
77176+ It's a common error to grant too much permission to these objects,
77177+ with impact ranging from denial of service and information leaking to
77178+ privilege escalation. This feature was developed in response to
77179+ research by Tim Brown:
77180+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
77181+ who found hundreds of such insecure usages. Processes with
77182+ CAP_IPC_OWNER are still permitted to access these IPC objects.
77183+ If the sysctl option is enabled, a sysctl option with name
77184+ "harden_ipc" is created.
77185+
77186+config GRKERNSEC_TPE
77187+ bool "Trusted Path Execution (TPE)"
77188+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
77189+ help
77190+ If you say Y here, you will be able to choose a gid to add to the
77191+ supplementary groups of users you want to mark as "untrusted."
77192+ These users will not be able to execute any files that are not in
77193+ root-owned directories writable only by root. If the sysctl option
77194+ is enabled, a sysctl option with name "tpe" is created.
77195+
77196+config GRKERNSEC_TPE_ALL
77197+ bool "Partially restrict all non-root users"
77198+ depends on GRKERNSEC_TPE
77199+ help
77200+ If you say Y here, all non-root users will be covered under
77201+ a weaker TPE restriction. This is separate from, and in addition to,
77202+ the main TPE options that you have selected elsewhere. Thus, if a
77203+ "trusted" GID is chosen, this restriction applies to even that GID.
77204+ Under this restriction, all non-root users will only be allowed to
77205+ execute files in directories they own that are not group or
77206+ world-writable, or in directories owned by root and writable only by
77207+ root. If the sysctl option is enabled, a sysctl option with name
77208+ "tpe_restrict_all" is created.
77209+
77210+config GRKERNSEC_TPE_INVERT
77211+ bool "Invert GID option"
77212+ depends on GRKERNSEC_TPE
77213+ help
77214+ If you say Y here, the group you specify in the TPE configuration will
77215+ decide what group TPE restrictions will be *disabled* for. This
77216+ option is useful if you want TPE restrictions to be applied to most
77217+ users on the system. If the sysctl option is enabled, a sysctl option
77218+ with name "tpe_invert" is created. Unlike other sysctl options, this
77219+ entry will default to on for backward-compatibility.
77220+
77221+config GRKERNSEC_TPE_GID
77222+ int
77223+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
77224+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
77225+
77226+config GRKERNSEC_TPE_UNTRUSTED_GID
77227+ int "GID for TPE-untrusted users"
77228+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
77229+ default 1005
77230+ help
77231+ Setting this GID determines what group TPE restrictions will be
77232+ *enabled* for. If the sysctl option is enabled, a sysctl option
77233+ with name "tpe_gid" is created.
77234+
77235+config GRKERNSEC_TPE_TRUSTED_GID
77236+ int "GID for TPE-trusted users"
77237+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
77238+ default 1005
77239+ help
77240+ Setting this GID determines what group TPE restrictions will be
77241+ *disabled* for. If the sysctl option is enabled, a sysctl option
77242+ with name "tpe_gid" is created.
77243+
77244+endmenu
77245+menu "Network Protections"
77246+depends on GRKERNSEC
77247+
77248+config GRKERNSEC_BLACKHOLE
77249+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
77250+ default y if GRKERNSEC_CONFIG_AUTO
77251+ depends on NET
77252+ help
77253+ If you say Y here, neither TCP resets nor ICMP
77254+ destination-unreachable packets will be sent in response to packets
77255+ sent to ports for which no associated listening process exists.
77256+ It will also prevent the sending of ICMP protocol unreachable packets
77257+ in response to packets with unknown protocols.
77258+ This feature supports both IPV4 and IPV6 and exempts the
77259+ loopback interface from blackholing. Enabling this feature
77260+ makes a host more resilient to DoS attacks and reduces network
77261+ visibility against scanners.
77262+
77263+ The blackhole feature as-implemented is equivalent to the FreeBSD
77264+ blackhole feature, as it prevents RST responses to all packets, not
77265+ just SYNs. Under most application behavior this causes no
77266+ problems, but applications (like haproxy) may not close certain
77267+ connections in a way that cleanly terminates them on the remote
77268+ end, leaving the remote host in LAST_ACK state. Because of this
77269+ side-effect and to prevent intentional LAST_ACK DoSes, this
77270+ feature also adds automatic mitigation against such attacks.
77271+ The mitigation drastically reduces the amount of time a socket
77272+ can spend in LAST_ACK state. If you're using haproxy and not
77273+ all servers it connects to have this option enabled, consider
77274+ disabling this feature on the haproxy host.
77275+
77276+ If the sysctl option is enabled, two sysctl options with names
77277+ "ip_blackhole" and "lastack_retries" will be created.
77278+ While "ip_blackhole" takes the standard zero/non-zero on/off
77279+ toggle, "lastack_retries" uses the same kinds of values as
77280+ "tcp_retries1" and "tcp_retries2". The default value of 4
77281+ prevents a socket from lasting more than 45 seconds in LAST_ACK
77282+ state.
77283+
77284+config GRKERNSEC_NO_SIMULT_CONNECT
77285+ bool "Disable TCP Simultaneous Connect"
77286+ default y if GRKERNSEC_CONFIG_AUTO
77287+ depends on NET
77288+ help
77289+ If you say Y here, a feature by Willy Tarreau will be enabled that
77290+ removes a weakness in Linux's strict implementation of TCP that
77291+ allows two clients to connect to each other without either entering
77292+ a listening state. The weakness allows an attacker to easily prevent
77293+ a client from connecting to a known server provided the source port
77294+ for the connection is guessed correctly.
77295+
77296+ As the weakness could be used to prevent an antivirus or IPS from
77297+ fetching updates, or prevent an SSL gateway from fetching a CRL,
77298+ it should be eliminated by enabling this option. Though Linux is
77299+ one of few operating systems supporting simultaneous connect, it
77300+ has no legitimate use in practice and is rarely supported by firewalls.
77301+
77302+config GRKERNSEC_SOCKET
77303+ bool "Socket restrictions"
77304+ depends on NET
77305+ help
77306+ If you say Y here, you will be able to choose from several options.
77307+ If you assign a GID on your system and add it to the supplementary
77308+ groups of users you want to restrict socket access to, this patch
77309+ will perform up to three things, based on the option(s) you choose.
77310+
77311+config GRKERNSEC_SOCKET_ALL
77312+ bool "Deny any sockets to group"
77313+ depends on GRKERNSEC_SOCKET
77314+ help
77315+ If you say Y here, you will be able to choose a GID of whose users will
77316+ be unable to connect to other hosts from your machine or run server
77317+ applications from your machine. If the sysctl option is enabled, a
77318+ sysctl option with name "socket_all" is created.
77319+
77320+config GRKERNSEC_SOCKET_ALL_GID
77321+ int "GID to deny all sockets for"
77322+ depends on GRKERNSEC_SOCKET_ALL
77323+ default 1004
77324+ help
77325+ Here you can choose the GID to disable socket access for. Remember to
77326+ add the users you want socket access disabled for to the GID
77327+ specified here. If the sysctl option is enabled, a sysctl option
77328+ with name "socket_all_gid" is created.
77329+
77330+config GRKERNSEC_SOCKET_CLIENT
77331+ bool "Deny client sockets to group"
77332+ depends on GRKERNSEC_SOCKET
77333+ help
77334+ If you say Y here, you will be able to choose a GID of whose users will
77335+ be unable to connect to other hosts from your machine, but will be
77336+ able to run servers. If this option is enabled, all users in the group
77337+ you specify will have to use passive mode when initiating ftp transfers
77338+ from the shell on your machine. If the sysctl option is enabled, a
77339+ sysctl option with name "socket_client" is created.
77340+
77341+config GRKERNSEC_SOCKET_CLIENT_GID
77342+ int "GID to deny client sockets for"
77343+ depends on GRKERNSEC_SOCKET_CLIENT
77344+ default 1003
77345+ help
77346+ Here you can choose the GID to disable client socket access for.
77347+ Remember to add the users you want client socket access disabled for to
77348+ the GID specified here. If the sysctl option is enabled, a sysctl
77349+ option with name "socket_client_gid" is created.
77350+
77351+config GRKERNSEC_SOCKET_SERVER
77352+ bool "Deny server sockets to group"
77353+ depends on GRKERNSEC_SOCKET
77354+ help
77355+ If you say Y here, you will be able to choose a GID of whose users will
77356+ be unable to run server applications from your machine. If the sysctl
77357+ option is enabled, a sysctl option with name "socket_server" is created.
77358+
77359+config GRKERNSEC_SOCKET_SERVER_GID
77360+ int "GID to deny server sockets for"
77361+ depends on GRKERNSEC_SOCKET_SERVER
77362+ default 1002
77363+ help
77364+ Here you can choose the GID to disable server socket access for.
77365+ Remember to add the users you want server socket access disabled for to
77366+ the GID specified here. If the sysctl option is enabled, a sysctl
77367+ option with name "socket_server_gid" is created.
77368+
77369+endmenu
77370+
77371+menu "Physical Protections"
77372+depends on GRKERNSEC
77373+
77374+config GRKERNSEC_DENYUSB
77375+ bool "Deny new USB connections after toggle"
77376+ default y if GRKERNSEC_CONFIG_AUTO
77377+ depends on SYSCTL && USB_SUPPORT
77378+ help
77379+ If you say Y here, a new sysctl option with name "deny_new_usb"
77380+ will be created. Setting its value to 1 will prevent any new
77381+ USB devices from being recognized by the OS. Any attempted USB
77382+ device insertion will be logged. This option is intended to be
77383+ used against custom USB devices designed to exploit vulnerabilities
77384+ in various USB device drivers.
77385+
77386+ For greatest effectiveness, this sysctl should be set after any
77387+ relevant init scripts. This option is safe to enable in distros
77388+ as each user can choose whether or not to toggle the sysctl.
77389+
77390+config GRKERNSEC_DENYUSB_FORCE
77391+ bool "Reject all USB devices not connected at boot"
77392+ select USB
77393+ depends on GRKERNSEC_DENYUSB
77394+ help
77395+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
77396+ that doesn't involve a sysctl entry. This option should only be
77397+ enabled if you're sure you want to deny all new USB connections
77398+ at runtime and don't want to modify init scripts. This should not
77399+ be enabled by distros. It forces the core USB code to be built
77400+ into the kernel image so that all devices connected at boot time
77401+ can be recognized and new USB device connections can be prevented
77402+ prior to init running.
77403+
77404+endmenu
77405+
77406+menu "Sysctl Support"
77407+depends on GRKERNSEC && SYSCTL
77408+
77409+config GRKERNSEC_SYSCTL
77410+ bool "Sysctl support"
77411+ default y if GRKERNSEC_CONFIG_AUTO
77412+ help
77413+ If you say Y here, you will be able to change the options that
77414+ grsecurity runs with at bootup, without having to recompile your
77415+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
77416+ to enable (1) or disable (0) various features. All the sysctl entries
77417+ are mutable until the "grsec_lock" entry is set to a non-zero value.
77418+ All features enabled in the kernel configuration are disabled at boot
77419+ if you do not say Y to the "Turn on features by default" option.
77420+ All options should be set at startup, and the grsec_lock entry should
77421+ be set to a non-zero value after all the options are set.
77422+ *THIS IS EXTREMELY IMPORTANT*
77423+
77424+config GRKERNSEC_SYSCTL_DISTRO
77425+ bool "Extra sysctl support for distro makers (READ HELP)"
77426+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
77427+ help
77428+ If you say Y here, additional sysctl options will be created
77429+ for features that affect processes running as root. Therefore,
77430+ it is critical when using this option that the grsec_lock entry be
77431+ enabled after boot. Only distros with prebuilt kernel packages
77432+ with this option enabled that can ensure grsec_lock is enabled
77433+ after boot should use this option.
77434+ *Failure to set grsec_lock after boot makes all grsec features
77435+ this option covers useless*
77436+
77437+ Currently this option creates the following sysctl entries:
77438+ "Disable Privileged I/O": "disable_priv_io"
77439+
77440+config GRKERNSEC_SYSCTL_ON
77441+ bool "Turn on features by default"
77442+ default y if GRKERNSEC_CONFIG_AUTO
77443+ depends on GRKERNSEC_SYSCTL
77444+ help
77445+ If you say Y here, instead of having all features enabled in the
77446+ kernel configuration disabled at boot time, the features will be
77447+ enabled at boot time. It is recommended you say Y here unless
77448+ there is some reason you would want all sysctl-tunable features to
77449+ be disabled by default. As mentioned elsewhere, it is important
77450+ to enable the grsec_lock entry once you have finished modifying
77451+ the sysctl entries.
77452+
77453+endmenu
77454+menu "Logging Options"
77455+depends on GRKERNSEC
77456+
77457+config GRKERNSEC_FLOODTIME
77458+ int "Seconds in between log messages (minimum)"
77459+ default 10
77460+ help
77461+ This option allows you to enforce the number of seconds between
77462+ grsecurity log messages. The default should be suitable for most
77463+ people, however, if you choose to change it, choose a value small enough
77464+ to allow informative logs to be produced, but large enough to
77465+ prevent flooding.
77466+
77467+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
77468+ any rate limiting on grsecurity log messages.
77469+
77470+config GRKERNSEC_FLOODBURST
77471+ int "Number of messages in a burst (maximum)"
77472+ default 6
77473+ help
77474+ This option allows you to choose the maximum number of messages allowed
77475+ within the flood time interval you chose in a separate option. The
77476+ default should be suitable for most people, however if you find that
77477+ many of your logs are being interpreted as flooding, you may want to
77478+ raise this value.
77479+
77480+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
77481+ any rate limiting on grsecurity log messages.
77482+
77483+endmenu
77484diff --git a/grsecurity/Makefile b/grsecurity/Makefile
77485new file mode 100644
77486index 0000000..30ababb
77487--- /dev/null
77488+++ b/grsecurity/Makefile
77489@@ -0,0 +1,54 @@
77490+# grsecurity – access control and security hardening for Linux
77491+# All code in this directory and various hooks located throughout the Linux kernel are
77492+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
77493+# http://www.grsecurity.net spender@grsecurity.net
77494+#
77495+# This program is free software; you can redistribute it and/or
77496+# modify it under the terms of the GNU General Public License version 2
77497+# as published by the Free Software Foundation.
77498+#
77499+# This program is distributed in the hope that it will be useful,
77500+# but WITHOUT ANY WARRANTY; without even the implied warranty of
77501+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
77502+# GNU General Public License for more details.
77503+#
77504+# You should have received a copy of the GNU General Public License
77505+# along with this program; if not, write to the Free Software
77506+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
77507+
77508+KBUILD_CFLAGS += -Werror
77509+
77510+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
77511+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
77512+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
77513+ grsec_usb.o grsec_ipc.o grsec_proc.o
77514+
77515+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
77516+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
77517+ gracl_learn.o grsec_log.o gracl_policy.o
77518+ifdef CONFIG_COMPAT
77519+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
77520+endif
77521+
77522+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
77523+
77524+ifdef CONFIG_NET
77525+obj-y += grsec_sock.o
77526+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
77527+endif
77528+
77529+ifndef CONFIG_GRKERNSEC
77530+obj-y += grsec_disabled.o
77531+endif
77532+
77533+ifdef CONFIG_GRKERNSEC_HIDESYM
77534+extra-y := grsec_hidesym.o
77535+$(obj)/grsec_hidesym.o:
77536+ @-chmod -f 500 /boot
77537+ @-chmod -f 500 /lib/modules
77538+ @-chmod -f 500 /lib64/modules
77539+ @-chmod -f 500 /lib32/modules
77540+ @-chmod -f 700 .
77541+ @-chmod -f 700 $(objtree)
77542+ @echo ' grsec: protected kernel image paths'
77543+endif
77544diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
77545new file mode 100644
77546index 0000000..811af1f
77547--- /dev/null
77548+++ b/grsecurity/gracl.c
77549@@ -0,0 +1,2749 @@
77550+#include <linux/kernel.h>
77551+#include <linux/module.h>
77552+#include <linux/sched.h>
77553+#include <linux/mm.h>
77554+#include <linux/file.h>
77555+#include <linux/fs.h>
77556+#include <linux/namei.h>
77557+#include <linux/mount.h>
77558+#include <linux/tty.h>
77559+#include <linux/proc_fs.h>
77560+#include <linux/lglock.h>
77561+#include <linux/slab.h>
77562+#include <linux/vmalloc.h>
77563+#include <linux/types.h>
77564+#include <linux/sysctl.h>
77565+#include <linux/netdevice.h>
77566+#include <linux/ptrace.h>
77567+#include <linux/gracl.h>
77568+#include <linux/gralloc.h>
77569+#include <linux/security.h>
77570+#include <linux/grinternal.h>
77571+#include <linux/pid_namespace.h>
77572+#include <linux/stop_machine.h>
77573+#include <linux/fdtable.h>
77574+#include <linux/percpu.h>
77575+#include <linux/lglock.h>
77576+#include <linux/hugetlb.h>
77577+#include <linux/posix-timers.h>
77578+#include <linux/prefetch.h>
77579+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77580+#include <linux/magic.h>
77581+#include <linux/pagemap.h>
77582+#include "../fs/btrfs/async-thread.h"
77583+#include "../fs/btrfs/ctree.h"
77584+#include "../fs/btrfs/btrfs_inode.h"
77585+#endif
77586+#include "../fs/mount.h"
77587+
77588+#include <asm/uaccess.h>
77589+#include <asm/errno.h>
77590+#include <asm/mman.h>
77591+
77592+#define FOR_EACH_ROLE_START(role) \
77593+ role = running_polstate.role_list; \
77594+ while (role) {
77595+
77596+#define FOR_EACH_ROLE_END(role) \
77597+ role = role->prev; \
77598+ }
77599+
77600+extern struct path gr_real_root;
77601+
77602+static struct gr_policy_state running_polstate;
77603+struct gr_policy_state *polstate = &running_polstate;
77604+extern struct gr_alloc_state *current_alloc_state;
77605+
77606+extern char *gr_shared_page[4];
77607+DEFINE_RWLOCK(gr_inode_lock);
77608+
77609+static unsigned int gr_status __read_only = GR_STATUS_INIT;
77610+
77611+#ifdef CONFIG_NET
77612+extern struct vfsmount *sock_mnt;
77613+#endif
77614+
77615+extern struct vfsmount *pipe_mnt;
77616+extern struct vfsmount *shm_mnt;
77617+
77618+#ifdef CONFIG_HUGETLBFS
77619+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77620+#endif
77621+
77622+extern u16 acl_sp_role_value;
77623+extern struct acl_object_label *fakefs_obj_rw;
77624+extern struct acl_object_label *fakefs_obj_rwx;
77625+
77626+int gr_acl_is_enabled(void)
77627+{
77628+ return (gr_status & GR_READY);
77629+}
77630+
77631+void gr_enable_rbac_system(void)
77632+{
77633+ pax_open_kernel();
77634+ gr_status |= GR_READY;
77635+ pax_close_kernel();
77636+}
77637+
77638+int gr_rbac_disable(void *unused)
77639+{
77640+ pax_open_kernel();
77641+ gr_status &= ~GR_READY;
77642+ pax_close_kernel();
77643+
77644+ return 0;
77645+}
77646+
77647+static inline dev_t __get_dev(const struct dentry *dentry)
77648+{
77649+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77650+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
77651+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
77652+ else
77653+#endif
77654+ return dentry->d_sb->s_dev;
77655+}
77656+
77657+static inline u64 __get_ino(const struct dentry *dentry)
77658+{
77659+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77660+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
77661+ return btrfs_ino(dentry->d_inode);
77662+ else
77663+#endif
77664+ return dentry->d_inode->i_ino;
77665+}
77666+
77667+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
77668+{
77669+ return __get_dev(dentry);
77670+}
77671+
77672+u64 gr_get_ino_from_dentry(struct dentry *dentry)
77673+{
77674+ return __get_ino(dentry);
77675+}
77676+
77677+static char gr_task_roletype_to_char(struct task_struct *task)
77678+{
77679+ switch (task->role->roletype &
77680+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
77681+ GR_ROLE_SPECIAL)) {
77682+ case GR_ROLE_DEFAULT:
77683+ return 'D';
77684+ case GR_ROLE_USER:
77685+ return 'U';
77686+ case GR_ROLE_GROUP:
77687+ return 'G';
77688+ case GR_ROLE_SPECIAL:
77689+ return 'S';
77690+ }
77691+
77692+ return 'X';
77693+}
77694+
77695+char gr_roletype_to_char(void)
77696+{
77697+ return gr_task_roletype_to_char(current);
77698+}
77699+
77700+int
77701+gr_acl_tpe_check(void)
77702+{
77703+ if (unlikely(!(gr_status & GR_READY)))
77704+ return 0;
77705+ if (current->role->roletype & GR_ROLE_TPE)
77706+ return 1;
77707+ else
77708+ return 0;
77709+}
77710+
77711+int
77712+gr_handle_rawio(const struct inode *inode)
77713+{
77714+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77715+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
77716+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
77717+ !capable(CAP_SYS_RAWIO))
77718+ return 1;
77719+#endif
77720+ return 0;
77721+}
77722+
77723+int
77724+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
77725+{
77726+ if (likely(lena != lenb))
77727+ return 0;
77728+
77729+ return !memcmp(a, b, lena);
77730+}
77731+
77732+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
77733+{
77734+ *buflen -= namelen;
77735+ if (*buflen < 0)
77736+ return -ENAMETOOLONG;
77737+ *buffer -= namelen;
77738+ memcpy(*buffer, str, namelen);
77739+ return 0;
77740+}
77741+
77742+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
77743+{
77744+ return prepend(buffer, buflen, name->name, name->len);
77745+}
77746+
77747+static int prepend_path(const struct path *path, struct path *root,
77748+ char **buffer, int *buflen)
77749+{
77750+ struct dentry *dentry = path->dentry;
77751+ struct vfsmount *vfsmnt = path->mnt;
77752+ struct mount *mnt = real_mount(vfsmnt);
77753+ bool slash = false;
77754+ int error = 0;
77755+
77756+ while (dentry != root->dentry || vfsmnt != root->mnt) {
77757+ struct dentry * parent;
77758+
77759+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
77760+ /* Global root? */
77761+ if (!mnt_has_parent(mnt)) {
77762+ goto out;
77763+ }
77764+ dentry = mnt->mnt_mountpoint;
77765+ mnt = mnt->mnt_parent;
77766+ vfsmnt = &mnt->mnt;
77767+ continue;
77768+ }
77769+ parent = dentry->d_parent;
77770+ prefetch(parent);
77771+ spin_lock(&dentry->d_lock);
77772+ error = prepend_name(buffer, buflen, &dentry->d_name);
77773+ spin_unlock(&dentry->d_lock);
77774+ if (!error)
77775+ error = prepend(buffer, buflen, "/", 1);
77776+ if (error)
77777+ break;
77778+
77779+ slash = true;
77780+ dentry = parent;
77781+ }
77782+
77783+out:
77784+ if (!error && !slash)
77785+ error = prepend(buffer, buflen, "/", 1);
77786+
77787+ return error;
77788+}
77789+
77790+/* this must be called with mount_lock and rename_lock held */
77791+
77792+static char *__our_d_path(const struct path *path, struct path *root,
77793+ char *buf, int buflen)
77794+{
77795+ char *res = buf + buflen;
77796+ int error;
77797+
77798+ prepend(&res, &buflen, "\0", 1);
77799+ error = prepend_path(path, root, &res, &buflen);
77800+ if (error)
77801+ return ERR_PTR(error);
77802+
77803+ return res;
77804+}
77805+
77806+static char *
77807+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
77808+{
77809+ char *retval;
77810+
77811+ retval = __our_d_path(path, root, buf, buflen);
77812+ if (unlikely(IS_ERR(retval)))
77813+ retval = strcpy(buf, "<path too long>");
77814+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
77815+ retval[1] = '\0';
77816+
77817+ return retval;
77818+}
77819+
77820+static char *
77821+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
77822+ char *buf, int buflen)
77823+{
77824+ struct path path;
77825+ char *res;
77826+
77827+ path.dentry = (struct dentry *)dentry;
77828+ path.mnt = (struct vfsmount *)vfsmnt;
77829+
77830+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
77831+ by the RBAC system */
77832+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
77833+
77834+ return res;
77835+}
77836+
77837+static char *
77838+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
77839+ char *buf, int buflen)
77840+{
77841+ char *res;
77842+ struct path path;
77843+ struct path root;
77844+ struct task_struct *reaper = init_pid_ns.child_reaper;
77845+
77846+ path.dentry = (struct dentry *)dentry;
77847+ path.mnt = (struct vfsmount *)vfsmnt;
77848+
77849+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
77850+ get_fs_root(reaper->fs, &root);
77851+
77852+ read_seqlock_excl(&mount_lock);
77853+ write_seqlock(&rename_lock);
77854+ res = gen_full_path(&path, &root, buf, buflen);
77855+ write_sequnlock(&rename_lock);
77856+ read_sequnlock_excl(&mount_lock);
77857+
77858+ path_put(&root);
77859+ return res;
77860+}
77861+
77862+char *
77863+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
77864+{
77865+ char *ret;
77866+ read_seqlock_excl(&mount_lock);
77867+ write_seqlock(&rename_lock);
77868+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
77869+ PAGE_SIZE);
77870+ write_sequnlock(&rename_lock);
77871+ read_sequnlock_excl(&mount_lock);
77872+ return ret;
77873+}
77874+
77875+static char *
77876+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
77877+{
77878+ char *ret;
77879+ char *buf;
77880+ int buflen;
77881+
77882+ read_seqlock_excl(&mount_lock);
77883+ write_seqlock(&rename_lock);
77884+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
77885+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
77886+ buflen = (int)(ret - buf);
77887+ if (buflen >= 5)
77888+ prepend(&ret, &buflen, "/proc", 5);
77889+ else
77890+ ret = strcpy(buf, "<path too long>");
77891+ write_sequnlock(&rename_lock);
77892+ read_sequnlock_excl(&mount_lock);
77893+ return ret;
77894+}
77895+
77896+char *
77897+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
77898+{
77899+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
77900+ PAGE_SIZE);
77901+}
77902+
77903+char *
77904+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
77905+{
77906+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
77907+ PAGE_SIZE);
77908+}
77909+
77910+char *
77911+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
77912+{
77913+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
77914+ PAGE_SIZE);
77915+}
77916+
77917+char *
77918+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
77919+{
77920+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
77921+ PAGE_SIZE);
77922+}
77923+
77924+char *
77925+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
77926+{
77927+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
77928+ PAGE_SIZE);
77929+}
77930+
77931+__u32
77932+to_gr_audit(const __u32 reqmode)
77933+{
77934+ /* masks off auditable permission flags, then shifts them to create
77935+ auditing flags, and adds the special case of append auditing if
77936+ we're requesting write */
77937+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
77938+}
77939+
77940+struct acl_role_label *
77941+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
77942+ const gid_t gid)
77943+{
77944+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
77945+ struct acl_role_label *match;
77946+ struct role_allowed_ip *ipp;
77947+ unsigned int x;
77948+ u32 curr_ip = task->signal->saved_ip;
77949+
77950+ match = state->acl_role_set.r_hash[index];
77951+
77952+ while (match) {
77953+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
77954+ for (x = 0; x < match->domain_child_num; x++) {
77955+ if (match->domain_children[x] == uid)
77956+ goto found;
77957+ }
77958+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
77959+ break;
77960+ match = match->next;
77961+ }
77962+found:
77963+ if (match == NULL) {
77964+ try_group:
77965+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
77966+ match = state->acl_role_set.r_hash[index];
77967+
77968+ while (match) {
77969+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
77970+ for (x = 0; x < match->domain_child_num; x++) {
77971+ if (match->domain_children[x] == gid)
77972+ goto found2;
77973+ }
77974+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
77975+ break;
77976+ match = match->next;
77977+ }
77978+found2:
77979+ if (match == NULL)
77980+ match = state->default_role;
77981+ if (match->allowed_ips == NULL)
77982+ return match;
77983+ else {
77984+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
77985+ if (likely
77986+ ((ntohl(curr_ip) & ipp->netmask) ==
77987+ (ntohl(ipp->addr) & ipp->netmask)))
77988+ return match;
77989+ }
77990+ match = state->default_role;
77991+ }
77992+ } else if (match->allowed_ips == NULL) {
77993+ return match;
77994+ } else {
77995+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
77996+ if (likely
77997+ ((ntohl(curr_ip) & ipp->netmask) ==
77998+ (ntohl(ipp->addr) & ipp->netmask)))
77999+ return match;
78000+ }
78001+ goto try_group;
78002+ }
78003+
78004+ return match;
78005+}
78006+
78007+static struct acl_role_label *
78008+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
78009+ const gid_t gid)
78010+{
78011+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
78012+}
78013+
78014+struct acl_subject_label *
78015+lookup_acl_subj_label(const u64 ino, const dev_t dev,
78016+ const struct acl_role_label *role)
78017+{
78018+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
78019+ struct acl_subject_label *match;
78020+
78021+ match = role->subj_hash[index];
78022+
78023+ while (match && (match->inode != ino || match->device != dev ||
78024+ (match->mode & GR_DELETED))) {
78025+ match = match->next;
78026+ }
78027+
78028+ if (match && !(match->mode & GR_DELETED))
78029+ return match;
78030+ else
78031+ return NULL;
78032+}
78033+
78034+struct acl_subject_label *
78035+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
78036+ const struct acl_role_label *role)
78037+{
78038+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
78039+ struct acl_subject_label *match;
78040+
78041+ match = role->subj_hash[index];
78042+
78043+ while (match && (match->inode != ino || match->device != dev ||
78044+ !(match->mode & GR_DELETED))) {
78045+ match = match->next;
78046+ }
78047+
78048+ if (match && (match->mode & GR_DELETED))
78049+ return match;
78050+ else
78051+ return NULL;
78052+}
78053+
78054+static struct acl_object_label *
78055+lookup_acl_obj_label(const u64 ino, const dev_t dev,
78056+ const struct acl_subject_label *subj)
78057+{
78058+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
78059+ struct acl_object_label *match;
78060+
78061+ match = subj->obj_hash[index];
78062+
78063+ while (match && (match->inode != ino || match->device != dev ||
78064+ (match->mode & GR_DELETED))) {
78065+ match = match->next;
78066+ }
78067+
78068+ if (match && !(match->mode & GR_DELETED))
78069+ return match;
78070+ else
78071+ return NULL;
78072+}
78073+
78074+static struct acl_object_label *
78075+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
78076+ const struct acl_subject_label *subj)
78077+{
78078+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
78079+ struct acl_object_label *match;
78080+
78081+ match = subj->obj_hash[index];
78082+
78083+ while (match && (match->inode != ino || match->device != dev ||
78084+ !(match->mode & GR_DELETED))) {
78085+ match = match->next;
78086+ }
78087+
78088+ if (match && (match->mode & GR_DELETED))
78089+ return match;
78090+
78091+ match = subj->obj_hash[index];
78092+
78093+ while (match && (match->inode != ino || match->device != dev ||
78094+ (match->mode & GR_DELETED))) {
78095+ match = match->next;
78096+ }
78097+
78098+ if (match && !(match->mode & GR_DELETED))
78099+ return match;
78100+ else
78101+ return NULL;
78102+}
78103+
78104+struct name_entry *
78105+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
78106+{
78107+ unsigned int len = strlen(name);
78108+ unsigned int key = full_name_hash(name, len);
78109+ unsigned int index = key % state->name_set.n_size;
78110+ struct name_entry *match;
78111+
78112+ match = state->name_set.n_hash[index];
78113+
78114+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
78115+ match = match->next;
78116+
78117+ return match;
78118+}
78119+
78120+static struct name_entry *
78121+lookup_name_entry(const char *name)
78122+{
78123+ return __lookup_name_entry(&running_polstate, name);
78124+}
78125+
78126+static struct name_entry *
78127+lookup_name_entry_create(const char *name)
78128+{
78129+ unsigned int len = strlen(name);
78130+ unsigned int key = full_name_hash(name, len);
78131+ unsigned int index = key % running_polstate.name_set.n_size;
78132+ struct name_entry *match;
78133+
78134+ match = running_polstate.name_set.n_hash[index];
78135+
78136+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
78137+ !match->deleted))
78138+ match = match->next;
78139+
78140+ if (match && match->deleted)
78141+ return match;
78142+
78143+ match = running_polstate.name_set.n_hash[index];
78144+
78145+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
78146+ match->deleted))
78147+ match = match->next;
78148+
78149+ if (match && !match->deleted)
78150+ return match;
78151+ else
78152+ return NULL;
78153+}
78154+
78155+static struct inodev_entry *
78156+lookup_inodev_entry(const u64 ino, const dev_t dev)
78157+{
78158+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
78159+ struct inodev_entry *match;
78160+
78161+ match = running_polstate.inodev_set.i_hash[index];
78162+
78163+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
78164+ match = match->next;
78165+
78166+ return match;
78167+}
78168+
78169+void
78170+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
78171+{
78172+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
78173+ state->inodev_set.i_size);
78174+ struct inodev_entry **curr;
78175+
78176+ entry->prev = NULL;
78177+
78178+ curr = &state->inodev_set.i_hash[index];
78179+ if (*curr != NULL)
78180+ (*curr)->prev = entry;
78181+
78182+ entry->next = *curr;
78183+ *curr = entry;
78184+
78185+ return;
78186+}
78187+
78188+static void
78189+insert_inodev_entry(struct inodev_entry *entry)
78190+{
78191+ __insert_inodev_entry(&running_polstate, entry);
78192+}
78193+
78194+void
78195+insert_acl_obj_label(struct acl_object_label *obj,
78196+ struct acl_subject_label *subj)
78197+{
78198+ unsigned int index =
78199+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
78200+ struct acl_object_label **curr;
78201+
78202+ obj->prev = NULL;
78203+
78204+ curr = &subj->obj_hash[index];
78205+ if (*curr != NULL)
78206+ (*curr)->prev = obj;
78207+
78208+ obj->next = *curr;
78209+ *curr = obj;
78210+
78211+ return;
78212+}
78213+
78214+void
78215+insert_acl_subj_label(struct acl_subject_label *obj,
78216+ struct acl_role_label *role)
78217+{
78218+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
78219+ struct acl_subject_label **curr;
78220+
78221+ obj->prev = NULL;
78222+
78223+ curr = &role->subj_hash[index];
78224+ if (*curr != NULL)
78225+ (*curr)->prev = obj;
78226+
78227+ obj->next = *curr;
78228+ *curr = obj;
78229+
78230+ return;
78231+}
78232+
78233+/* derived from glibc fnmatch() 0: match, 1: no match*/
78234+
78235+static int
78236+glob_match(const char *p, const char *n)
78237+{
78238+ char c;
78239+
78240+ while ((c = *p++) != '\0') {
78241+ switch (c) {
78242+ case '?':
78243+ if (*n == '\0')
78244+ return 1;
78245+ else if (*n == '/')
78246+ return 1;
78247+ break;
78248+ case '\\':
78249+ if (*n != c)
78250+ return 1;
78251+ break;
78252+ case '*':
78253+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
78254+ if (*n == '/')
78255+ return 1;
78256+ else if (c == '?') {
78257+ if (*n == '\0')
78258+ return 1;
78259+ else
78260+ ++n;
78261+ }
78262+ }
78263+ if (c == '\0') {
78264+ return 0;
78265+ } else {
78266+ const char *endp;
78267+
78268+ if ((endp = strchr(n, '/')) == NULL)
78269+ endp = n + strlen(n);
78270+
78271+ if (c == '[') {
78272+ for (--p; n < endp; ++n)
78273+ if (!glob_match(p, n))
78274+ return 0;
78275+ } else if (c == '/') {
78276+ while (*n != '\0' && *n != '/')
78277+ ++n;
78278+ if (*n == '/' && !glob_match(p, n + 1))
78279+ return 0;
78280+ } else {
78281+ for (--p; n < endp; ++n)
78282+ if (*n == c && !glob_match(p, n))
78283+ return 0;
78284+ }
78285+
78286+ return 1;
78287+ }
78288+ case '[':
78289+ {
78290+ int not;
78291+ char cold;
78292+
78293+ if (*n == '\0' || *n == '/')
78294+ return 1;
78295+
78296+ not = (*p == '!' || *p == '^');
78297+ if (not)
78298+ ++p;
78299+
78300+ c = *p++;
78301+ for (;;) {
78302+ unsigned char fn = (unsigned char)*n;
78303+
78304+ if (c == '\0')
78305+ return 1;
78306+ else {
78307+ if (c == fn)
78308+ goto matched;
78309+ cold = c;
78310+ c = *p++;
78311+
78312+ if (c == '-' && *p != ']') {
78313+ unsigned char cend = *p++;
78314+
78315+ if (cend == '\0')
78316+ return 1;
78317+
78318+ if (cold <= fn && fn <= cend)
78319+ goto matched;
78320+
78321+ c = *p++;
78322+ }
78323+ }
78324+
78325+ if (c == ']')
78326+ break;
78327+ }
78328+ if (!not)
78329+ return 1;
78330+ break;
78331+ matched:
78332+ while (c != ']') {
78333+ if (c == '\0')
78334+ return 1;
78335+
78336+ c = *p++;
78337+ }
78338+ if (not)
78339+ return 1;
78340+ }
78341+ break;
78342+ default:
78343+ if (c != *n)
78344+ return 1;
78345+ }
78346+
78347+ ++n;
78348+ }
78349+
78350+ if (*n == '\0')
78351+ return 0;
78352+
78353+ if (*n == '/')
78354+ return 0;
78355+
78356+ return 1;
78357+}
78358+
78359+static struct acl_object_label *
78360+chk_glob_label(struct acl_object_label *globbed,
78361+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
78362+{
78363+ struct acl_object_label *tmp;
78364+
78365+ if (*path == NULL)
78366+ *path = gr_to_filename_nolock(dentry, mnt);
78367+
78368+ tmp = globbed;
78369+
78370+ while (tmp) {
78371+ if (!glob_match(tmp->filename, *path))
78372+ return tmp;
78373+ tmp = tmp->next;
78374+ }
78375+
78376+ return NULL;
78377+}
78378+
78379+static struct acl_object_label *
78380+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
78381+ const u64 curr_ino, const dev_t curr_dev,
78382+ const struct acl_subject_label *subj, char **path, const int checkglob)
78383+{
78384+ struct acl_subject_label *tmpsubj;
78385+ struct acl_object_label *retval;
78386+ struct acl_object_label *retval2;
78387+
78388+ tmpsubj = (struct acl_subject_label *) subj;
78389+ read_lock(&gr_inode_lock);
78390+ do {
78391+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
78392+ if (retval) {
78393+ if (checkglob && retval->globbed) {
78394+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
78395+ if (retval2)
78396+ retval = retval2;
78397+ }
78398+ break;
78399+ }
78400+ } while ((tmpsubj = tmpsubj->parent_subject));
78401+ read_unlock(&gr_inode_lock);
78402+
78403+ return retval;
78404+}
78405+
78406+static struct acl_object_label *
78407+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
78408+ struct dentry *curr_dentry,
78409+ const struct acl_subject_label *subj, char **path, const int checkglob)
78410+{
78411+ int newglob = checkglob;
78412+ u64 inode;
78413+ dev_t device;
78414+
78415+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
78416+ as we don't want a / * rule to match instead of the / object
78417+ don't do this for create lookups that call this function though, since they're looking up
78418+ on the parent and thus need globbing checks on all paths
78419+ */
78420+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
78421+ newglob = GR_NO_GLOB;
78422+
78423+ spin_lock(&curr_dentry->d_lock);
78424+ inode = __get_ino(curr_dentry);
78425+ device = __get_dev(curr_dentry);
78426+ spin_unlock(&curr_dentry->d_lock);
78427+
78428+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
78429+}
78430+
78431+#ifdef CONFIG_HUGETLBFS
78432+static inline bool
78433+is_hugetlbfs_mnt(const struct vfsmount *mnt)
78434+{
78435+ int i;
78436+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
78437+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
78438+ return true;
78439+ }
78440+
78441+ return false;
78442+}
78443+#endif
78444+
78445+static struct acl_object_label *
78446+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78447+ const struct acl_subject_label *subj, char *path, const int checkglob)
78448+{
78449+ struct dentry *dentry = (struct dentry *) l_dentry;
78450+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
78451+ struct mount *real_mnt = real_mount(mnt);
78452+ struct acl_object_label *retval;
78453+ struct dentry *parent;
78454+
78455+ read_seqlock_excl(&mount_lock);
78456+ write_seqlock(&rename_lock);
78457+
78458+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
78459+#ifdef CONFIG_NET
78460+ mnt == sock_mnt ||
78461+#endif
78462+#ifdef CONFIG_HUGETLBFS
78463+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
78464+#endif
78465+ /* ignore Eric Biederman */
78466+ IS_PRIVATE(l_dentry->d_inode))) {
78467+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
78468+ goto out;
78469+ }
78470+
78471+ for (;;) {
78472+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
78473+ break;
78474+
78475+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
78476+ if (!mnt_has_parent(real_mnt))
78477+ break;
78478+
78479+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78480+ if (retval != NULL)
78481+ goto out;
78482+
78483+ dentry = real_mnt->mnt_mountpoint;
78484+ real_mnt = real_mnt->mnt_parent;
78485+ mnt = &real_mnt->mnt;
78486+ continue;
78487+ }
78488+
78489+ parent = dentry->d_parent;
78490+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78491+ if (retval != NULL)
78492+ goto out;
78493+
78494+ dentry = parent;
78495+ }
78496+
78497+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78498+
78499+ /* gr_real_root is pinned so we don't have to hold a reference */
78500+ if (retval == NULL)
78501+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
78502+out:
78503+ write_sequnlock(&rename_lock);
78504+ read_sequnlock_excl(&mount_lock);
78505+
78506+ BUG_ON(retval == NULL);
78507+
78508+ return retval;
78509+}
78510+
78511+static struct acl_object_label *
78512+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78513+ const struct acl_subject_label *subj)
78514+{
78515+ char *path = NULL;
78516+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
78517+}
78518+
78519+static struct acl_object_label *
78520+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78521+ const struct acl_subject_label *subj)
78522+{
78523+ char *path = NULL;
78524+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
78525+}
78526+
78527+static struct acl_object_label *
78528+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78529+ const struct acl_subject_label *subj, char *path)
78530+{
78531+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
78532+}
78533+
78534+struct acl_subject_label *
78535+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78536+ const struct acl_role_label *role)
78537+{
78538+ struct dentry *dentry = (struct dentry *) l_dentry;
78539+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
78540+ struct mount *real_mnt = real_mount(mnt);
78541+ struct acl_subject_label *retval;
78542+ struct dentry *parent;
78543+
78544+ read_seqlock_excl(&mount_lock);
78545+ write_seqlock(&rename_lock);
78546+
78547+ for (;;) {
78548+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
78549+ break;
78550+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
78551+ if (!mnt_has_parent(real_mnt))
78552+ break;
78553+
78554+ spin_lock(&dentry->d_lock);
78555+ read_lock(&gr_inode_lock);
78556+ retval =
78557+ lookup_acl_subj_label(__get_ino(dentry),
78558+ __get_dev(dentry), role);
78559+ read_unlock(&gr_inode_lock);
78560+ spin_unlock(&dentry->d_lock);
78561+ if (retval != NULL)
78562+ goto out;
78563+
78564+ dentry = real_mnt->mnt_mountpoint;
78565+ real_mnt = real_mnt->mnt_parent;
78566+ mnt = &real_mnt->mnt;
78567+ continue;
78568+ }
78569+
78570+ spin_lock(&dentry->d_lock);
78571+ read_lock(&gr_inode_lock);
78572+ retval = lookup_acl_subj_label(__get_ino(dentry),
78573+ __get_dev(dentry), role);
78574+ read_unlock(&gr_inode_lock);
78575+ parent = dentry->d_parent;
78576+ spin_unlock(&dentry->d_lock);
78577+
78578+ if (retval != NULL)
78579+ goto out;
78580+
78581+ dentry = parent;
78582+ }
78583+
78584+ spin_lock(&dentry->d_lock);
78585+ read_lock(&gr_inode_lock);
78586+ retval = lookup_acl_subj_label(__get_ino(dentry),
78587+ __get_dev(dentry), role);
78588+ read_unlock(&gr_inode_lock);
78589+ spin_unlock(&dentry->d_lock);
78590+
78591+ if (unlikely(retval == NULL)) {
78592+ /* gr_real_root is pinned, we don't need to hold a reference */
78593+ read_lock(&gr_inode_lock);
78594+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
78595+ __get_dev(gr_real_root.dentry), role);
78596+ read_unlock(&gr_inode_lock);
78597+ }
78598+out:
78599+ write_sequnlock(&rename_lock);
78600+ read_sequnlock_excl(&mount_lock);
78601+
78602+ BUG_ON(retval == NULL);
78603+
78604+ return retval;
78605+}
78606+
78607+void
78608+assign_special_role(const char *rolename)
78609+{
78610+ struct acl_object_label *obj;
78611+ struct acl_role_label *r;
78612+ struct acl_role_label *assigned = NULL;
78613+ struct task_struct *tsk;
78614+ struct file *filp;
78615+
78616+ FOR_EACH_ROLE_START(r)
78617+ if (!strcmp(rolename, r->rolename) &&
78618+ (r->roletype & GR_ROLE_SPECIAL)) {
78619+ assigned = r;
78620+ break;
78621+ }
78622+ FOR_EACH_ROLE_END(r)
78623+
78624+ if (!assigned)
78625+ return;
78626+
78627+ read_lock(&tasklist_lock);
78628+ read_lock(&grsec_exec_file_lock);
78629+
78630+ tsk = current->real_parent;
78631+ if (tsk == NULL)
78632+ goto out_unlock;
78633+
78634+ filp = tsk->exec_file;
78635+ if (filp == NULL)
78636+ goto out_unlock;
78637+
78638+ tsk->is_writable = 0;
78639+ tsk->inherited = 0;
78640+
78641+ tsk->acl_sp_role = 1;
78642+ tsk->acl_role_id = ++acl_sp_role_value;
78643+ tsk->role = assigned;
78644+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
78645+
78646+ /* ignore additional mmap checks for processes that are writable
78647+ by the default ACL */
78648+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
78649+ if (unlikely(obj->mode & GR_WRITE))
78650+ tsk->is_writable = 1;
78651+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
78652+ if (unlikely(obj->mode & GR_WRITE))
78653+ tsk->is_writable = 1;
78654+
78655+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
78656+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
78657+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
78658+#endif
78659+
78660+out_unlock:
78661+ read_unlock(&grsec_exec_file_lock);
78662+ read_unlock(&tasklist_lock);
78663+ return;
78664+}
78665+
78666+
78667+static void
78668+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
78669+{
78670+ struct task_struct *task = current;
78671+ const struct cred *cred = current_cred();
78672+
78673+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
78674+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78675+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78676+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
78677+
78678+ return;
78679+}
78680+
78681+static void
78682+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
78683+{
78684+ struct task_struct *task = current;
78685+ const struct cred *cred = current_cred();
78686+
78687+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
78688+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78689+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78690+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
78691+
78692+ return;
78693+}
78694+
78695+static void
78696+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
78697+{
78698+ struct task_struct *task = current;
78699+ const struct cred *cred = current_cred();
78700+
78701+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
78702+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78703+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78704+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
78705+
78706+ return;
78707+}
78708+
78709+static void
78710+gr_set_proc_res(struct task_struct *task)
78711+{
78712+ struct acl_subject_label *proc;
78713+ unsigned short i;
78714+
78715+ proc = task->acl;
78716+
78717+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
78718+ return;
78719+
78720+ for (i = 0; i < RLIM_NLIMITS; i++) {
78721+ unsigned long rlim_cur, rlim_max;
78722+
78723+ if (!(proc->resmask & (1U << i)))
78724+ continue;
78725+
78726+ rlim_cur = proc->res[i].rlim_cur;
78727+ rlim_max = proc->res[i].rlim_max;
78728+
78729+ if (i == RLIMIT_NOFILE) {
78730+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
78731+ if (rlim_cur > saved_sysctl_nr_open)
78732+ rlim_cur = saved_sysctl_nr_open;
78733+ if (rlim_max > saved_sysctl_nr_open)
78734+ rlim_max = saved_sysctl_nr_open;
78735+ }
78736+
78737+ task->signal->rlim[i].rlim_cur = rlim_cur;
78738+ task->signal->rlim[i].rlim_max = rlim_max;
78739+
78740+ if (i == RLIMIT_CPU)
78741+ update_rlimit_cpu(task, rlim_cur);
78742+ }
78743+
78744+ return;
78745+}
78746+
78747+/* both of the below must be called with
78748+ rcu_read_lock();
78749+ read_lock(&tasklist_lock);
78750+ read_lock(&grsec_exec_file_lock);
78751+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
78752+*/
78753+
78754+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
78755+{
78756+ char *tmpname;
78757+ struct acl_subject_label *tmpsubj;
78758+ struct file *filp;
78759+ struct name_entry *nmatch;
78760+
78761+ filp = task->exec_file;
78762+ if (filp == NULL)
78763+ return NULL;
78764+
78765+ /* the following is to apply the correct subject
78766+ on binaries running when the RBAC system
78767+ is enabled, when the binaries have been
78768+ replaced or deleted since their execution
78769+ -----
78770+ when the RBAC system starts, the inode/dev
78771+ from exec_file will be one the RBAC system
78772+ is unaware of. It only knows the inode/dev
78773+ of the present file on disk, or the absence
78774+ of it.
78775+ */
78776+
78777+ if (filename)
78778+ nmatch = __lookup_name_entry(state, filename);
78779+ else {
78780+ preempt_disable();
78781+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
78782+
78783+ nmatch = __lookup_name_entry(state, tmpname);
78784+ preempt_enable();
78785+ }
78786+ tmpsubj = NULL;
78787+ if (nmatch) {
78788+ if (nmatch->deleted)
78789+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
78790+ else
78791+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
78792+ }
78793+ /* this also works for the reload case -- if we don't match a potentially inherited subject
78794+ then we fall back to a normal lookup based on the binary's ino/dev
78795+ */
78796+ if (tmpsubj == NULL && fallback)
78797+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
78798+
78799+ return tmpsubj;
78800+}
78801+
78802+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
78803+{
78804+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
78805+}
78806+
78807+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
78808+{
78809+ struct acl_object_label *obj;
78810+ struct file *filp;
78811+
78812+ filp = task->exec_file;
78813+
78814+ task->acl = subj;
78815+ task->is_writable = 0;
78816+ /* ignore additional mmap checks for processes that are writable
78817+ by the default ACL */
78818+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
78819+ if (unlikely(obj->mode & GR_WRITE))
78820+ task->is_writable = 1;
78821+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
78822+ if (unlikely(obj->mode & GR_WRITE))
78823+ task->is_writable = 1;
78824+
78825+ gr_set_proc_res(task);
78826+
78827+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
78828+ 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);
78829+#endif
78830+}
78831+
78832+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
78833+{
78834+ __gr_apply_subject_to_task(&running_polstate, task, subj);
78835+}
78836+
78837+__u32
78838+gr_search_file(const struct dentry * dentry, const __u32 mode,
78839+ const struct vfsmount * mnt)
78840+{
78841+ __u32 retval = mode;
78842+ struct acl_subject_label *curracl;
78843+ struct acl_object_label *currobj;
78844+
78845+ if (unlikely(!(gr_status & GR_READY)))
78846+ return (mode & ~GR_AUDITS);
78847+
78848+ curracl = current->acl;
78849+
78850+ currobj = chk_obj_label(dentry, mnt, curracl);
78851+ retval = currobj->mode & mode;
78852+
78853+ /* if we're opening a specified transfer file for writing
78854+ (e.g. /dev/initctl), then transfer our role to init
78855+ */
78856+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
78857+ current->role->roletype & GR_ROLE_PERSIST)) {
78858+ struct task_struct *task = init_pid_ns.child_reaper;
78859+
78860+ if (task->role != current->role) {
78861+ struct acl_subject_label *subj;
78862+
78863+ task->acl_sp_role = 0;
78864+ task->acl_role_id = current->acl_role_id;
78865+ task->role = current->role;
78866+ rcu_read_lock();
78867+ read_lock(&grsec_exec_file_lock);
78868+ subj = gr_get_subject_for_task(task, NULL, 1);
78869+ gr_apply_subject_to_task(task, subj);
78870+ read_unlock(&grsec_exec_file_lock);
78871+ rcu_read_unlock();
78872+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
78873+ }
78874+ }
78875+
78876+ if (unlikely
78877+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
78878+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
78879+ __u32 new_mode = mode;
78880+
78881+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
78882+
78883+ retval = new_mode;
78884+
78885+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
78886+ new_mode |= GR_INHERIT;
78887+
78888+ if (!(mode & GR_NOLEARN))
78889+ gr_log_learn(dentry, mnt, new_mode);
78890+ }
78891+
78892+ return retval;
78893+}
78894+
78895+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
78896+ const struct dentry *parent,
78897+ const struct vfsmount *mnt)
78898+{
78899+ struct name_entry *match;
78900+ struct acl_object_label *matchpo;
78901+ struct acl_subject_label *curracl;
78902+ char *path;
78903+
78904+ if (unlikely(!(gr_status & GR_READY)))
78905+ return NULL;
78906+
78907+ preempt_disable();
78908+ path = gr_to_filename_rbac(new_dentry, mnt);
78909+ match = lookup_name_entry_create(path);
78910+
78911+ curracl = current->acl;
78912+
78913+ if (match) {
78914+ read_lock(&gr_inode_lock);
78915+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
78916+ read_unlock(&gr_inode_lock);
78917+
78918+ if (matchpo) {
78919+ preempt_enable();
78920+ return matchpo;
78921+ }
78922+ }
78923+
78924+ // lookup parent
78925+
78926+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
78927+
78928+ preempt_enable();
78929+ return matchpo;
78930+}
78931+
78932+__u32
78933+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
78934+ const struct vfsmount * mnt, const __u32 mode)
78935+{
78936+ struct acl_object_label *matchpo;
78937+ __u32 retval;
78938+
78939+ if (unlikely(!(gr_status & GR_READY)))
78940+ return (mode & ~GR_AUDITS);
78941+
78942+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
78943+
78944+ retval = matchpo->mode & mode;
78945+
78946+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
78947+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
78948+ __u32 new_mode = mode;
78949+
78950+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
78951+
78952+ gr_log_learn(new_dentry, mnt, new_mode);
78953+ return new_mode;
78954+ }
78955+
78956+ return retval;
78957+}
78958+
78959+__u32
78960+gr_check_link(const struct dentry * new_dentry,
78961+ const struct dentry * parent_dentry,
78962+ const struct vfsmount * parent_mnt,
78963+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
78964+{
78965+ struct acl_object_label *obj;
78966+ __u32 oldmode, newmode;
78967+ __u32 needmode;
78968+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
78969+ GR_DELETE | GR_INHERIT;
78970+
78971+ if (unlikely(!(gr_status & GR_READY)))
78972+ return (GR_CREATE | GR_LINK);
78973+
78974+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
78975+ oldmode = obj->mode;
78976+
78977+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
78978+ newmode = obj->mode;
78979+
78980+ needmode = newmode & checkmodes;
78981+
78982+ // old name for hardlink must have at least the permissions of the new name
78983+ if ((oldmode & needmode) != needmode)
78984+ goto bad;
78985+
78986+ // if old name had restrictions/auditing, make sure the new name does as well
78987+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
78988+
78989+ // don't allow hardlinking of suid/sgid/fcapped files without permission
78990+ if (is_privileged_binary(old_dentry))
78991+ needmode |= GR_SETID;
78992+
78993+ if ((newmode & needmode) != needmode)
78994+ goto bad;
78995+
78996+ // enforce minimum permissions
78997+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
78998+ return newmode;
78999+bad:
79000+ needmode = oldmode;
79001+ if (is_privileged_binary(old_dentry))
79002+ needmode |= GR_SETID;
79003+
79004+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
79005+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
79006+ return (GR_CREATE | GR_LINK);
79007+ } else if (newmode & GR_SUPPRESS)
79008+ return GR_SUPPRESS;
79009+ else
79010+ return 0;
79011+}
79012+
79013+int
79014+gr_check_hidden_task(const struct task_struct *task)
79015+{
79016+ if (unlikely(!(gr_status & GR_READY)))
79017+ return 0;
79018+
79019+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
79020+ return 1;
79021+
79022+ return 0;
79023+}
79024+
79025+int
79026+gr_check_protected_task(const struct task_struct *task)
79027+{
79028+ if (unlikely(!(gr_status & GR_READY) || !task))
79029+ return 0;
79030+
79031+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
79032+ task->acl != current->acl)
79033+ return 1;
79034+
79035+ return 0;
79036+}
79037+
79038+int
79039+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
79040+{
79041+ struct task_struct *p;
79042+ int ret = 0;
79043+
79044+ if (unlikely(!(gr_status & GR_READY) || !pid))
79045+ return ret;
79046+
79047+ read_lock(&tasklist_lock);
79048+ do_each_pid_task(pid, type, p) {
79049+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
79050+ p->acl != current->acl) {
79051+ ret = 1;
79052+ goto out;
79053+ }
79054+ } while_each_pid_task(pid, type, p);
79055+out:
79056+ read_unlock(&tasklist_lock);
79057+
79058+ return ret;
79059+}
79060+
79061+void
79062+gr_copy_label(struct task_struct *tsk)
79063+{
79064+ struct task_struct *p = current;
79065+
79066+ tsk->inherited = p->inherited;
79067+ tsk->acl_sp_role = 0;
79068+ tsk->acl_role_id = p->acl_role_id;
79069+ tsk->acl = p->acl;
79070+ tsk->role = p->role;
79071+ tsk->signal->used_accept = 0;
79072+ tsk->signal->curr_ip = p->signal->curr_ip;
79073+ tsk->signal->saved_ip = p->signal->saved_ip;
79074+ if (p->exec_file)
79075+ get_file(p->exec_file);
79076+ tsk->exec_file = p->exec_file;
79077+ tsk->is_writable = p->is_writable;
79078+ if (unlikely(p->signal->used_accept)) {
79079+ p->signal->curr_ip = 0;
79080+ p->signal->saved_ip = 0;
79081+ }
79082+
79083+ return;
79084+}
79085+
79086+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
79087+
79088+int
79089+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
79090+{
79091+ unsigned int i;
79092+ __u16 num;
79093+ uid_t *uidlist;
79094+ uid_t curuid;
79095+ int realok = 0;
79096+ int effectiveok = 0;
79097+ int fsok = 0;
79098+ uid_t globalreal, globaleffective, globalfs;
79099+
79100+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
79101+ struct user_struct *user;
79102+
79103+ if (!uid_valid(real))
79104+ goto skipit;
79105+
79106+ /* find user based on global namespace */
79107+
79108+ globalreal = GR_GLOBAL_UID(real);
79109+
79110+ user = find_user(make_kuid(&init_user_ns, globalreal));
79111+ if (user == NULL)
79112+ goto skipit;
79113+
79114+ if (gr_process_kernel_setuid_ban(user)) {
79115+ /* for find_user */
79116+ free_uid(user);
79117+ return 1;
79118+ }
79119+
79120+ /* for find_user */
79121+ free_uid(user);
79122+
79123+skipit:
79124+#endif
79125+
79126+ if (unlikely(!(gr_status & GR_READY)))
79127+ return 0;
79128+
79129+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
79130+ gr_log_learn_uid_change(real, effective, fs);
79131+
79132+ num = current->acl->user_trans_num;
79133+ uidlist = current->acl->user_transitions;
79134+
79135+ if (uidlist == NULL)
79136+ return 0;
79137+
79138+ if (!uid_valid(real)) {
79139+ realok = 1;
79140+ globalreal = (uid_t)-1;
79141+ } else {
79142+ globalreal = GR_GLOBAL_UID(real);
79143+ }
79144+ if (!uid_valid(effective)) {
79145+ effectiveok = 1;
79146+ globaleffective = (uid_t)-1;
79147+ } else {
79148+ globaleffective = GR_GLOBAL_UID(effective);
79149+ }
79150+ if (!uid_valid(fs)) {
79151+ fsok = 1;
79152+ globalfs = (uid_t)-1;
79153+ } else {
79154+ globalfs = GR_GLOBAL_UID(fs);
79155+ }
79156+
79157+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
79158+ for (i = 0; i < num; i++) {
79159+ curuid = uidlist[i];
79160+ if (globalreal == curuid)
79161+ realok = 1;
79162+ if (globaleffective == curuid)
79163+ effectiveok = 1;
79164+ if (globalfs == curuid)
79165+ fsok = 1;
79166+ }
79167+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
79168+ for (i = 0; i < num; i++) {
79169+ curuid = uidlist[i];
79170+ if (globalreal == curuid)
79171+ break;
79172+ if (globaleffective == curuid)
79173+ break;
79174+ if (globalfs == curuid)
79175+ break;
79176+ }
79177+ /* not in deny list */
79178+ if (i == num) {
79179+ realok = 1;
79180+ effectiveok = 1;
79181+ fsok = 1;
79182+ }
79183+ }
79184+
79185+ if (realok && effectiveok && fsok)
79186+ return 0;
79187+ else {
79188+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
79189+ return 1;
79190+ }
79191+}
79192+
79193+int
79194+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
79195+{
79196+ unsigned int i;
79197+ __u16 num;
79198+ gid_t *gidlist;
79199+ gid_t curgid;
79200+ int realok = 0;
79201+ int effectiveok = 0;
79202+ int fsok = 0;
79203+ gid_t globalreal, globaleffective, globalfs;
79204+
79205+ if (unlikely(!(gr_status & GR_READY)))
79206+ return 0;
79207+
79208+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
79209+ gr_log_learn_gid_change(real, effective, fs);
79210+
79211+ num = current->acl->group_trans_num;
79212+ gidlist = current->acl->group_transitions;
79213+
79214+ if (gidlist == NULL)
79215+ return 0;
79216+
79217+ if (!gid_valid(real)) {
79218+ realok = 1;
79219+ globalreal = (gid_t)-1;
79220+ } else {
79221+ globalreal = GR_GLOBAL_GID(real);
79222+ }
79223+ if (!gid_valid(effective)) {
79224+ effectiveok = 1;
79225+ globaleffective = (gid_t)-1;
79226+ } else {
79227+ globaleffective = GR_GLOBAL_GID(effective);
79228+ }
79229+ if (!gid_valid(fs)) {
79230+ fsok = 1;
79231+ globalfs = (gid_t)-1;
79232+ } else {
79233+ globalfs = GR_GLOBAL_GID(fs);
79234+ }
79235+
79236+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
79237+ for (i = 0; i < num; i++) {
79238+ curgid = gidlist[i];
79239+ if (globalreal == curgid)
79240+ realok = 1;
79241+ if (globaleffective == curgid)
79242+ effectiveok = 1;
79243+ if (globalfs == curgid)
79244+ fsok = 1;
79245+ }
79246+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
79247+ for (i = 0; i < num; i++) {
79248+ curgid = gidlist[i];
79249+ if (globalreal == curgid)
79250+ break;
79251+ if (globaleffective == curgid)
79252+ break;
79253+ if (globalfs == curgid)
79254+ break;
79255+ }
79256+ /* not in deny list */
79257+ if (i == num) {
79258+ realok = 1;
79259+ effectiveok = 1;
79260+ fsok = 1;
79261+ }
79262+ }
79263+
79264+ if (realok && effectiveok && fsok)
79265+ return 0;
79266+ else {
79267+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
79268+ return 1;
79269+ }
79270+}
79271+
79272+extern int gr_acl_is_capable(const int cap);
79273+
79274+void
79275+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
79276+{
79277+ struct acl_role_label *role = task->role;
79278+ struct acl_role_label *origrole = role;
79279+ struct acl_subject_label *subj = NULL;
79280+ struct acl_object_label *obj;
79281+ struct file *filp;
79282+ uid_t uid;
79283+ gid_t gid;
79284+
79285+ if (unlikely(!(gr_status & GR_READY)))
79286+ return;
79287+
79288+ uid = GR_GLOBAL_UID(kuid);
79289+ gid = GR_GLOBAL_GID(kgid);
79290+
79291+ filp = task->exec_file;
79292+
79293+ /* kernel process, we'll give them the kernel role */
79294+ if (unlikely(!filp)) {
79295+ task->role = running_polstate.kernel_role;
79296+ task->acl = running_polstate.kernel_role->root_label;
79297+ return;
79298+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
79299+ /* save the current ip at time of role lookup so that the proper
79300+ IP will be learned for role_allowed_ip */
79301+ task->signal->saved_ip = task->signal->curr_ip;
79302+ role = lookup_acl_role_label(task, uid, gid);
79303+ }
79304+
79305+ /* don't change the role if we're not a privileged process */
79306+ if (role && task->role != role &&
79307+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
79308+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
79309+ return;
79310+
79311+ task->role = role;
79312+
79313+ if (task->inherited) {
79314+ /* if we reached our subject through inheritance, then first see
79315+ if there's a subject of the same name in the new role that has
79316+ an object that would result in the same inherited subject
79317+ */
79318+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
79319+ if (subj) {
79320+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
79321+ if (!(obj->mode & GR_INHERIT))
79322+ subj = NULL;
79323+ }
79324+
79325+ }
79326+ if (subj == NULL) {
79327+ /* otherwise:
79328+ perform subject lookup in possibly new role
79329+ we can use this result below in the case where role == task->role
79330+ */
79331+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
79332+ }
79333+
79334+ /* if we changed uid/gid, but result in the same role
79335+ and are using inheritance, don't lose the inherited subject
79336+ if current subject is other than what normal lookup
79337+ would result in, we arrived via inheritance, don't
79338+ lose subject
79339+ */
79340+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
79341+ (subj == task->acl)))
79342+ task->acl = subj;
79343+
79344+ /* leave task->inherited unaffected */
79345+
79346+ task->is_writable = 0;
79347+
79348+ /* ignore additional mmap checks for processes that are writable
79349+ by the default ACL */
79350+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
79351+ if (unlikely(obj->mode & GR_WRITE))
79352+ task->is_writable = 1;
79353+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
79354+ if (unlikely(obj->mode & GR_WRITE))
79355+ task->is_writable = 1;
79356+
79357+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
79358+ 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);
79359+#endif
79360+
79361+ gr_set_proc_res(task);
79362+
79363+ return;
79364+}
79365+
79366+int
79367+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
79368+ const int unsafe_flags)
79369+{
79370+ struct task_struct *task = current;
79371+ struct acl_subject_label *newacl;
79372+ struct acl_object_label *obj;
79373+ __u32 retmode;
79374+
79375+ if (unlikely(!(gr_status & GR_READY)))
79376+ return 0;
79377+
79378+ newacl = chk_subj_label(dentry, mnt, task->role);
79379+
79380+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
79381+ did an exec
79382+ */
79383+ rcu_read_lock();
79384+ read_lock(&tasklist_lock);
79385+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
79386+ (task->parent->acl->mode & GR_POVERRIDE))) {
79387+ read_unlock(&tasklist_lock);
79388+ rcu_read_unlock();
79389+ goto skip_check;
79390+ }
79391+ read_unlock(&tasklist_lock);
79392+ rcu_read_unlock();
79393+
79394+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
79395+ !(task->role->roletype & GR_ROLE_GOD) &&
79396+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
79397+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
79398+ if (unsafe_flags & LSM_UNSAFE_SHARE)
79399+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
79400+ else
79401+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
79402+ return -EACCES;
79403+ }
79404+
79405+skip_check:
79406+
79407+ obj = chk_obj_label(dentry, mnt, task->acl);
79408+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
79409+
79410+ if (!(task->acl->mode & GR_INHERITLEARN) &&
79411+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
79412+ if (obj->nested)
79413+ task->acl = obj->nested;
79414+ else
79415+ task->acl = newacl;
79416+ task->inherited = 0;
79417+ } else {
79418+ task->inherited = 1;
79419+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
79420+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
79421+ }
79422+
79423+ task->is_writable = 0;
79424+
79425+ /* ignore additional mmap checks for processes that are writable
79426+ by the default ACL */
79427+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
79428+ if (unlikely(obj->mode & GR_WRITE))
79429+ task->is_writable = 1;
79430+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
79431+ if (unlikely(obj->mode & GR_WRITE))
79432+ task->is_writable = 1;
79433+
79434+ gr_set_proc_res(task);
79435+
79436+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
79437+ 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);
79438+#endif
79439+ return 0;
79440+}
79441+
79442+/* always called with valid inodev ptr */
79443+static void
79444+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
79445+{
79446+ struct acl_object_label *matchpo;
79447+ struct acl_subject_label *matchps;
79448+ struct acl_subject_label *subj;
79449+ struct acl_role_label *role;
79450+ unsigned int x;
79451+
79452+ FOR_EACH_ROLE_START(role)
79453+ FOR_EACH_SUBJECT_START(role, subj, x)
79454+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
79455+ matchpo->mode |= GR_DELETED;
79456+ FOR_EACH_SUBJECT_END(subj,x)
79457+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
79458+ /* nested subjects aren't in the role's subj_hash table */
79459+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
79460+ matchpo->mode |= GR_DELETED;
79461+ FOR_EACH_NESTED_SUBJECT_END(subj)
79462+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
79463+ matchps->mode |= GR_DELETED;
79464+ FOR_EACH_ROLE_END(role)
79465+
79466+ inodev->nentry->deleted = 1;
79467+
79468+ return;
79469+}
79470+
79471+void
79472+gr_handle_delete(const u64 ino, const dev_t dev)
79473+{
79474+ struct inodev_entry *inodev;
79475+
79476+ if (unlikely(!(gr_status & GR_READY)))
79477+ return;
79478+
79479+ write_lock(&gr_inode_lock);
79480+ inodev = lookup_inodev_entry(ino, dev);
79481+ if (inodev != NULL)
79482+ do_handle_delete(inodev, ino, dev);
79483+ write_unlock(&gr_inode_lock);
79484+
79485+ return;
79486+}
79487+
79488+static void
79489+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
79490+ const u64 newinode, const dev_t newdevice,
79491+ struct acl_subject_label *subj)
79492+{
79493+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
79494+ struct acl_object_label *match;
79495+
79496+ match = subj->obj_hash[index];
79497+
79498+ while (match && (match->inode != oldinode ||
79499+ match->device != olddevice ||
79500+ !(match->mode & GR_DELETED)))
79501+ match = match->next;
79502+
79503+ if (match && (match->inode == oldinode)
79504+ && (match->device == olddevice)
79505+ && (match->mode & GR_DELETED)) {
79506+ if (match->prev == NULL) {
79507+ subj->obj_hash[index] = match->next;
79508+ if (match->next != NULL)
79509+ match->next->prev = NULL;
79510+ } else {
79511+ match->prev->next = match->next;
79512+ if (match->next != NULL)
79513+ match->next->prev = match->prev;
79514+ }
79515+ match->prev = NULL;
79516+ match->next = NULL;
79517+ match->inode = newinode;
79518+ match->device = newdevice;
79519+ match->mode &= ~GR_DELETED;
79520+
79521+ insert_acl_obj_label(match, subj);
79522+ }
79523+
79524+ return;
79525+}
79526+
79527+static void
79528+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
79529+ const u64 newinode, const dev_t newdevice,
79530+ struct acl_role_label *role)
79531+{
79532+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
79533+ struct acl_subject_label *match;
79534+
79535+ match = role->subj_hash[index];
79536+
79537+ while (match && (match->inode != oldinode ||
79538+ match->device != olddevice ||
79539+ !(match->mode & GR_DELETED)))
79540+ match = match->next;
79541+
79542+ if (match && (match->inode == oldinode)
79543+ && (match->device == olddevice)
79544+ && (match->mode & GR_DELETED)) {
79545+ if (match->prev == NULL) {
79546+ role->subj_hash[index] = match->next;
79547+ if (match->next != NULL)
79548+ match->next->prev = NULL;
79549+ } else {
79550+ match->prev->next = match->next;
79551+ if (match->next != NULL)
79552+ match->next->prev = match->prev;
79553+ }
79554+ match->prev = NULL;
79555+ match->next = NULL;
79556+ match->inode = newinode;
79557+ match->device = newdevice;
79558+ match->mode &= ~GR_DELETED;
79559+
79560+ insert_acl_subj_label(match, role);
79561+ }
79562+
79563+ return;
79564+}
79565+
79566+static void
79567+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
79568+ const u64 newinode, const dev_t newdevice)
79569+{
79570+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
79571+ struct inodev_entry *match;
79572+
79573+ match = running_polstate.inodev_set.i_hash[index];
79574+
79575+ while (match && (match->nentry->inode != oldinode ||
79576+ match->nentry->device != olddevice || !match->nentry->deleted))
79577+ match = match->next;
79578+
79579+ if (match && (match->nentry->inode == oldinode)
79580+ && (match->nentry->device == olddevice) &&
79581+ match->nentry->deleted) {
79582+ if (match->prev == NULL) {
79583+ running_polstate.inodev_set.i_hash[index] = match->next;
79584+ if (match->next != NULL)
79585+ match->next->prev = NULL;
79586+ } else {
79587+ match->prev->next = match->next;
79588+ if (match->next != NULL)
79589+ match->next->prev = match->prev;
79590+ }
79591+ match->prev = NULL;
79592+ match->next = NULL;
79593+ match->nentry->inode = newinode;
79594+ match->nentry->device = newdevice;
79595+ match->nentry->deleted = 0;
79596+
79597+ insert_inodev_entry(match);
79598+ }
79599+
79600+ return;
79601+}
79602+
79603+static void
79604+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
79605+{
79606+ struct acl_subject_label *subj;
79607+ struct acl_role_label *role;
79608+ unsigned int x;
79609+
79610+ FOR_EACH_ROLE_START(role)
79611+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
79612+
79613+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
79614+ if ((subj->inode == ino) && (subj->device == dev)) {
79615+ subj->inode = ino;
79616+ subj->device = dev;
79617+ }
79618+ /* nested subjects aren't in the role's subj_hash table */
79619+ update_acl_obj_label(matchn->inode, matchn->device,
79620+ ino, dev, subj);
79621+ FOR_EACH_NESTED_SUBJECT_END(subj)
79622+ FOR_EACH_SUBJECT_START(role, subj, x)
79623+ update_acl_obj_label(matchn->inode, matchn->device,
79624+ ino, dev, subj);
79625+ FOR_EACH_SUBJECT_END(subj,x)
79626+ FOR_EACH_ROLE_END(role)
79627+
79628+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
79629+
79630+ return;
79631+}
79632+
79633+static void
79634+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
79635+ const struct vfsmount *mnt)
79636+{
79637+ u64 ino = __get_ino(dentry);
79638+ dev_t dev = __get_dev(dentry);
79639+
79640+ __do_handle_create(matchn, ino, dev);
79641+
79642+ return;
79643+}
79644+
79645+void
79646+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
79647+{
79648+ struct name_entry *matchn;
79649+
79650+ if (unlikely(!(gr_status & GR_READY)))
79651+ return;
79652+
79653+ preempt_disable();
79654+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
79655+
79656+ if (unlikely((unsigned long)matchn)) {
79657+ write_lock(&gr_inode_lock);
79658+ do_handle_create(matchn, dentry, mnt);
79659+ write_unlock(&gr_inode_lock);
79660+ }
79661+ preempt_enable();
79662+
79663+ return;
79664+}
79665+
79666+void
79667+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
79668+{
79669+ struct name_entry *matchn;
79670+
79671+ if (unlikely(!(gr_status & GR_READY)))
79672+ return;
79673+
79674+ preempt_disable();
79675+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
79676+
79677+ if (unlikely((unsigned long)matchn)) {
79678+ write_lock(&gr_inode_lock);
79679+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
79680+ write_unlock(&gr_inode_lock);
79681+ }
79682+ preempt_enable();
79683+
79684+ return;
79685+}
79686+
79687+void
79688+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
79689+ struct dentry *old_dentry,
79690+ struct dentry *new_dentry,
79691+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
79692+{
79693+ struct name_entry *matchn;
79694+ struct name_entry *matchn2 = NULL;
79695+ struct inodev_entry *inodev;
79696+ struct inode *inode = new_dentry->d_inode;
79697+ u64 old_ino = __get_ino(old_dentry);
79698+ dev_t old_dev = __get_dev(old_dentry);
79699+ unsigned int exchange = flags & RENAME_EXCHANGE;
79700+
79701+ /* vfs_rename swaps the name and parent link for old_dentry and
79702+ new_dentry
79703+ at this point, old_dentry has the new name, parent link, and inode
79704+ for the renamed file
79705+ if a file is being replaced by a rename, new_dentry has the inode
79706+ and name for the replaced file
79707+ */
79708+
79709+ if (unlikely(!(gr_status & GR_READY)))
79710+ return;
79711+
79712+ preempt_disable();
79713+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
79714+
79715+ /* exchange cases:
79716+ a filename exists for the source, but not dest
79717+ do a recreate on source
79718+ a filename exists for the dest, but not source
79719+ do a recreate on dest
79720+ a filename exists for both source and dest
79721+ delete source and dest, then create source and dest
79722+ a filename exists for neither source nor dest
79723+ no updates needed
79724+
79725+ the name entry lookups get us the old inode/dev associated with
79726+ each name, so do the deletes first (if possible) so that when
79727+ we do the create, we pick up on the right entries
79728+ */
79729+
79730+ if (exchange)
79731+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
79732+
79733+ /* we wouldn't have to check d_inode if it weren't for
79734+ NFS silly-renaming
79735+ */
79736+
79737+ write_lock(&gr_inode_lock);
79738+ if (unlikely((replace || exchange) && inode)) {
79739+ u64 new_ino = __get_ino(new_dentry);
79740+ dev_t new_dev = __get_dev(new_dentry);
79741+
79742+ inodev = lookup_inodev_entry(new_ino, new_dev);
79743+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
79744+ do_handle_delete(inodev, new_ino, new_dev);
79745+ }
79746+
79747+ inodev = lookup_inodev_entry(old_ino, old_dev);
79748+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
79749+ do_handle_delete(inodev, old_ino, old_dev);
79750+
79751+ if (unlikely(matchn != NULL))
79752+ do_handle_create(matchn, old_dentry, mnt);
79753+
79754+ if (unlikely(matchn2 != NULL))
79755+ do_handle_create(matchn2, new_dentry, mnt);
79756+
79757+ write_unlock(&gr_inode_lock);
79758+ preempt_enable();
79759+
79760+ return;
79761+}
79762+
79763+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
79764+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
79765+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
79766+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
79767+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
79768+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
79769+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
79770+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
79771+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
79772+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
79773+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
79774+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
79775+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
79776+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
79777+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
79778+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
79779+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
79780+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
79781+};
79782+
79783+void
79784+gr_learn_resource(const struct task_struct *task,
79785+ const int res, const unsigned long wanted, const int gt)
79786+{
79787+ struct acl_subject_label *acl;
79788+ const struct cred *cred;
79789+
79790+ if (unlikely((gr_status & GR_READY) &&
79791+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
79792+ goto skip_reslog;
79793+
79794+ gr_log_resource(task, res, wanted, gt);
79795+skip_reslog:
79796+
79797+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
79798+ return;
79799+
79800+ acl = task->acl;
79801+
79802+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
79803+ !(acl->resmask & (1U << (unsigned short) res))))
79804+ return;
79805+
79806+ if (wanted >= acl->res[res].rlim_cur) {
79807+ unsigned long res_add;
79808+
79809+ res_add = wanted + res_learn_bumps[res];
79810+
79811+ acl->res[res].rlim_cur = res_add;
79812+
79813+ if (wanted > acl->res[res].rlim_max)
79814+ acl->res[res].rlim_max = res_add;
79815+
79816+ /* only log the subject filename, since resource logging is supported for
79817+ single-subject learning only */
79818+ rcu_read_lock();
79819+ cred = __task_cred(task);
79820+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
79821+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
79822+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
79823+ "", (unsigned long) res, &task->signal->saved_ip);
79824+ rcu_read_unlock();
79825+ }
79826+
79827+ return;
79828+}
79829+EXPORT_SYMBOL_GPL(gr_learn_resource);
79830+#endif
79831+
79832+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
79833+void
79834+pax_set_initial_flags(struct linux_binprm *bprm)
79835+{
79836+ struct task_struct *task = current;
79837+ struct acl_subject_label *proc;
79838+ unsigned long flags;
79839+
79840+ if (unlikely(!(gr_status & GR_READY)))
79841+ return;
79842+
79843+ flags = pax_get_flags(task);
79844+
79845+ proc = task->acl;
79846+
79847+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
79848+ flags &= ~MF_PAX_PAGEEXEC;
79849+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
79850+ flags &= ~MF_PAX_SEGMEXEC;
79851+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
79852+ flags &= ~MF_PAX_RANDMMAP;
79853+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
79854+ flags &= ~MF_PAX_EMUTRAMP;
79855+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
79856+ flags &= ~MF_PAX_MPROTECT;
79857+
79858+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
79859+ flags |= MF_PAX_PAGEEXEC;
79860+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
79861+ flags |= MF_PAX_SEGMEXEC;
79862+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
79863+ flags |= MF_PAX_RANDMMAP;
79864+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
79865+ flags |= MF_PAX_EMUTRAMP;
79866+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
79867+ flags |= MF_PAX_MPROTECT;
79868+
79869+ pax_set_flags(task, flags);
79870+
79871+ return;
79872+}
79873+#endif
79874+
79875+int
79876+gr_handle_proc_ptrace(struct task_struct *task)
79877+{
79878+ struct file *filp;
79879+ struct task_struct *tmp = task;
79880+ struct task_struct *curtemp = current;
79881+ __u32 retmode;
79882+
79883+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
79884+ if (unlikely(!(gr_status & GR_READY)))
79885+ return 0;
79886+#endif
79887+
79888+ read_lock(&tasklist_lock);
79889+ read_lock(&grsec_exec_file_lock);
79890+ filp = task->exec_file;
79891+
79892+ while (task_pid_nr(tmp) > 0) {
79893+ if (tmp == curtemp)
79894+ break;
79895+ tmp = tmp->real_parent;
79896+ }
79897+
79898+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
79899+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
79900+ read_unlock(&grsec_exec_file_lock);
79901+ read_unlock(&tasklist_lock);
79902+ return 1;
79903+ }
79904+
79905+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
79906+ if (!(gr_status & GR_READY)) {
79907+ read_unlock(&grsec_exec_file_lock);
79908+ read_unlock(&tasklist_lock);
79909+ return 0;
79910+ }
79911+#endif
79912+
79913+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
79914+ read_unlock(&grsec_exec_file_lock);
79915+ read_unlock(&tasklist_lock);
79916+
79917+ if (retmode & GR_NOPTRACE)
79918+ return 1;
79919+
79920+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
79921+ && (current->acl != task->acl || (current->acl != current->role->root_label
79922+ && task_pid_nr(current) != task_pid_nr(task))))
79923+ return 1;
79924+
79925+ return 0;
79926+}
79927+
79928+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
79929+{
79930+ if (unlikely(!(gr_status & GR_READY)))
79931+ return;
79932+
79933+ if (!(current->role->roletype & GR_ROLE_GOD))
79934+ return;
79935+
79936+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
79937+ p->role->rolename, gr_task_roletype_to_char(p),
79938+ p->acl->filename);
79939+}
79940+
79941+int
79942+gr_handle_ptrace(struct task_struct *task, const long request)
79943+{
79944+ struct task_struct *tmp = task;
79945+ struct task_struct *curtemp = current;
79946+ __u32 retmode;
79947+
79948+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
79949+ if (unlikely(!(gr_status & GR_READY)))
79950+ return 0;
79951+#endif
79952+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
79953+ read_lock(&tasklist_lock);
79954+ while (task_pid_nr(tmp) > 0) {
79955+ if (tmp == curtemp)
79956+ break;
79957+ tmp = tmp->real_parent;
79958+ }
79959+
79960+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
79961+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
79962+ read_unlock(&tasklist_lock);
79963+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
79964+ return 1;
79965+ }
79966+ read_unlock(&tasklist_lock);
79967+ }
79968+
79969+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
79970+ if (!(gr_status & GR_READY))
79971+ return 0;
79972+#endif
79973+
79974+ read_lock(&grsec_exec_file_lock);
79975+ if (unlikely(!task->exec_file)) {
79976+ read_unlock(&grsec_exec_file_lock);
79977+ return 0;
79978+ }
79979+
79980+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
79981+ read_unlock(&grsec_exec_file_lock);
79982+
79983+ if (retmode & GR_NOPTRACE) {
79984+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
79985+ return 1;
79986+ }
79987+
79988+ if (retmode & GR_PTRACERD) {
79989+ switch (request) {
79990+ case PTRACE_SEIZE:
79991+ case PTRACE_POKETEXT:
79992+ case PTRACE_POKEDATA:
79993+ case PTRACE_POKEUSR:
79994+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
79995+ case PTRACE_SETREGS:
79996+ case PTRACE_SETFPREGS:
79997+#endif
79998+#ifdef CONFIG_X86
79999+ case PTRACE_SETFPXREGS:
80000+#endif
80001+#ifdef CONFIG_ALTIVEC
80002+ case PTRACE_SETVRREGS:
80003+#endif
80004+ return 1;
80005+ default:
80006+ return 0;
80007+ }
80008+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
80009+ !(current->role->roletype & GR_ROLE_GOD) &&
80010+ (current->acl != task->acl)) {
80011+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
80012+ return 1;
80013+ }
80014+
80015+ return 0;
80016+}
80017+
80018+static int is_writable_mmap(const struct file *filp)
80019+{
80020+ struct task_struct *task = current;
80021+ struct acl_object_label *obj, *obj2;
80022+
80023+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
80024+ !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))) {
80025+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
80026+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
80027+ task->role->root_label);
80028+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
80029+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
80030+ return 1;
80031+ }
80032+ }
80033+ return 0;
80034+}
80035+
80036+int
80037+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
80038+{
80039+ __u32 mode;
80040+
80041+ if (unlikely(!file || !(prot & PROT_EXEC)))
80042+ return 1;
80043+
80044+ if (is_writable_mmap(file))
80045+ return 0;
80046+
80047+ mode =
80048+ gr_search_file(file->f_path.dentry,
80049+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
80050+ file->f_path.mnt);
80051+
80052+ if (!gr_tpe_allow(file))
80053+ return 0;
80054+
80055+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
80056+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80057+ return 0;
80058+ } else if (unlikely(!(mode & GR_EXEC))) {
80059+ return 0;
80060+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
80061+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80062+ return 1;
80063+ }
80064+
80065+ return 1;
80066+}
80067+
80068+int
80069+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
80070+{
80071+ __u32 mode;
80072+
80073+ if (unlikely(!file || !(prot & PROT_EXEC)))
80074+ return 1;
80075+
80076+ if (is_writable_mmap(file))
80077+ return 0;
80078+
80079+ mode =
80080+ gr_search_file(file->f_path.dentry,
80081+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
80082+ file->f_path.mnt);
80083+
80084+ if (!gr_tpe_allow(file))
80085+ return 0;
80086+
80087+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
80088+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80089+ return 0;
80090+ } else if (unlikely(!(mode & GR_EXEC))) {
80091+ return 0;
80092+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
80093+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80094+ return 1;
80095+ }
80096+
80097+ return 1;
80098+}
80099+
80100+void
80101+gr_acl_handle_psacct(struct task_struct *task, const long code)
80102+{
80103+ unsigned long runtime, cputime;
80104+ cputime_t utime, stime;
80105+ unsigned int wday, cday;
80106+ __u8 whr, chr;
80107+ __u8 wmin, cmin;
80108+ __u8 wsec, csec;
80109+ struct timespec curtime, starttime;
80110+
80111+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
80112+ !(task->acl->mode & GR_PROCACCT)))
80113+ return;
80114+
80115+ curtime = ns_to_timespec(ktime_get_ns());
80116+ starttime = ns_to_timespec(task->start_time);
80117+ runtime = curtime.tv_sec - starttime.tv_sec;
80118+ wday = runtime / (60 * 60 * 24);
80119+ runtime -= wday * (60 * 60 * 24);
80120+ whr = runtime / (60 * 60);
80121+ runtime -= whr * (60 * 60);
80122+ wmin = runtime / 60;
80123+ runtime -= wmin * 60;
80124+ wsec = runtime;
80125+
80126+ task_cputime(task, &utime, &stime);
80127+ cputime = cputime_to_secs(utime + stime);
80128+ cday = cputime / (60 * 60 * 24);
80129+ cputime -= cday * (60 * 60 * 24);
80130+ chr = cputime / (60 * 60);
80131+ cputime -= chr * (60 * 60);
80132+ cmin = cputime / 60;
80133+ cputime -= cmin * 60;
80134+ csec = cputime;
80135+
80136+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
80137+
80138+ return;
80139+}
80140+
80141+#ifdef CONFIG_TASKSTATS
80142+int gr_is_taskstats_denied(int pid)
80143+{
80144+ struct task_struct *task;
80145+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80146+ const struct cred *cred;
80147+#endif
80148+ int ret = 0;
80149+
80150+ /* restrict taskstats viewing to un-chrooted root users
80151+ who have the 'view' subject flag if the RBAC system is enabled
80152+ */
80153+
80154+ rcu_read_lock();
80155+ read_lock(&tasklist_lock);
80156+ task = find_task_by_vpid(pid);
80157+ if (task) {
80158+#ifdef CONFIG_GRKERNSEC_CHROOT
80159+ if (proc_is_chrooted(task))
80160+ ret = -EACCES;
80161+#endif
80162+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80163+ cred = __task_cred(task);
80164+#ifdef CONFIG_GRKERNSEC_PROC_USER
80165+ if (gr_is_global_nonroot(cred->uid))
80166+ ret = -EACCES;
80167+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80168+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
80169+ ret = -EACCES;
80170+#endif
80171+#endif
80172+ if (gr_status & GR_READY) {
80173+ if (!(task->acl->mode & GR_VIEW))
80174+ ret = -EACCES;
80175+ }
80176+ } else
80177+ ret = -ENOENT;
80178+
80179+ read_unlock(&tasklist_lock);
80180+ rcu_read_unlock();
80181+
80182+ return ret;
80183+}
80184+#endif
80185+
80186+/* AUXV entries are filled via a descendant of search_binary_handler
80187+ after we've already applied the subject for the target
80188+*/
80189+int gr_acl_enable_at_secure(void)
80190+{
80191+ if (unlikely(!(gr_status & GR_READY)))
80192+ return 0;
80193+
80194+ if (current->acl->mode & GR_ATSECURE)
80195+ return 1;
80196+
80197+ return 0;
80198+}
80199+
80200+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
80201+{
80202+ struct task_struct *task = current;
80203+ struct dentry *dentry = file->f_path.dentry;
80204+ struct vfsmount *mnt = file->f_path.mnt;
80205+ struct acl_object_label *obj, *tmp;
80206+ struct acl_subject_label *subj;
80207+ unsigned int bufsize;
80208+ int is_not_root;
80209+ char *path;
80210+ dev_t dev = __get_dev(dentry);
80211+
80212+ if (unlikely(!(gr_status & GR_READY)))
80213+ return 1;
80214+
80215+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
80216+ return 1;
80217+
80218+ /* ignore Eric Biederman */
80219+ if (IS_PRIVATE(dentry->d_inode))
80220+ return 1;
80221+
80222+ subj = task->acl;
80223+ read_lock(&gr_inode_lock);
80224+ do {
80225+ obj = lookup_acl_obj_label(ino, dev, subj);
80226+ if (obj != NULL) {
80227+ read_unlock(&gr_inode_lock);
80228+ return (obj->mode & GR_FIND) ? 1 : 0;
80229+ }
80230+ } while ((subj = subj->parent_subject));
80231+ read_unlock(&gr_inode_lock);
80232+
80233+ /* this is purely an optimization since we're looking for an object
80234+ for the directory we're doing a readdir on
80235+ if it's possible for any globbed object to match the entry we're
80236+ filling into the directory, then the object we find here will be
80237+ an anchor point with attached globbed objects
80238+ */
80239+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
80240+ if (obj->globbed == NULL)
80241+ return (obj->mode & GR_FIND) ? 1 : 0;
80242+
80243+ is_not_root = ((obj->filename[0] == '/') &&
80244+ (obj->filename[1] == '\0')) ? 0 : 1;
80245+ bufsize = PAGE_SIZE - namelen - is_not_root;
80246+
80247+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
80248+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
80249+ return 1;
80250+
80251+ preempt_disable();
80252+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
80253+ bufsize);
80254+
80255+ bufsize = strlen(path);
80256+
80257+ /* if base is "/", don't append an additional slash */
80258+ if (is_not_root)
80259+ *(path + bufsize) = '/';
80260+ memcpy(path + bufsize + is_not_root, name, namelen);
80261+ *(path + bufsize + namelen + is_not_root) = '\0';
80262+
80263+ tmp = obj->globbed;
80264+ while (tmp) {
80265+ if (!glob_match(tmp->filename, path)) {
80266+ preempt_enable();
80267+ return (tmp->mode & GR_FIND) ? 1 : 0;
80268+ }
80269+ tmp = tmp->next;
80270+ }
80271+ preempt_enable();
80272+ return (obj->mode & GR_FIND) ? 1 : 0;
80273+}
80274+
80275+void gr_put_exec_file(struct task_struct *task)
80276+{
80277+ struct file *filp;
80278+
80279+ write_lock(&grsec_exec_file_lock);
80280+ filp = task->exec_file;
80281+ task->exec_file = NULL;
80282+ write_unlock(&grsec_exec_file_lock);
80283+
80284+ if (filp)
80285+ fput(filp);
80286+
80287+ return;
80288+}
80289+
80290+
80291+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
80292+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
80293+#endif
80294+#ifdef CONFIG_SECURITY
80295+EXPORT_SYMBOL_GPL(gr_check_user_change);
80296+EXPORT_SYMBOL_GPL(gr_check_group_change);
80297+#endif
80298+
80299diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
80300new file mode 100644
80301index 0000000..9adc75c
80302--- /dev/null
80303+++ b/grsecurity/gracl_alloc.c
80304@@ -0,0 +1,105 @@
80305+#include <linux/kernel.h>
80306+#include <linux/mm.h>
80307+#include <linux/slab.h>
80308+#include <linux/vmalloc.h>
80309+#include <linux/gracl.h>
80310+#include <linux/grsecurity.h>
80311+
80312+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
80313+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
80314+
80315+static int
80316+alloc_pop(void)
80317+{
80318+ if (current_alloc_state->alloc_stack_next == 1)
80319+ return 0;
80320+
80321+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
80322+
80323+ current_alloc_state->alloc_stack_next--;
80324+
80325+ return 1;
80326+}
80327+
80328+static int
80329+alloc_push(void *buf)
80330+{
80331+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
80332+ return 1;
80333+
80334+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
80335+
80336+ current_alloc_state->alloc_stack_next++;
80337+
80338+ return 0;
80339+}
80340+
80341+void *
80342+acl_alloc(unsigned long len)
80343+{
80344+ void *ret = NULL;
80345+
80346+ if (!len || len > PAGE_SIZE)
80347+ goto out;
80348+
80349+ ret = kmalloc(len, GFP_KERNEL);
80350+
80351+ if (ret) {
80352+ if (alloc_push(ret)) {
80353+ kfree(ret);
80354+ ret = NULL;
80355+ }
80356+ }
80357+
80358+out:
80359+ return ret;
80360+}
80361+
80362+void *
80363+acl_alloc_num(unsigned long num, unsigned long len)
80364+{
80365+ if (!len || (num > (PAGE_SIZE / len)))
80366+ return NULL;
80367+
80368+ return acl_alloc(num * len);
80369+}
80370+
80371+void
80372+acl_free_all(void)
80373+{
80374+ if (!current_alloc_state->alloc_stack)
80375+ return;
80376+
80377+ while (alloc_pop()) ;
80378+
80379+ if (current_alloc_state->alloc_stack) {
80380+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
80381+ kfree(current_alloc_state->alloc_stack);
80382+ else
80383+ vfree(current_alloc_state->alloc_stack);
80384+ }
80385+
80386+ current_alloc_state->alloc_stack = NULL;
80387+ current_alloc_state->alloc_stack_size = 1;
80388+ current_alloc_state->alloc_stack_next = 1;
80389+
80390+ return;
80391+}
80392+
80393+int
80394+acl_alloc_stack_init(unsigned long size)
80395+{
80396+ if ((size * sizeof (void *)) <= PAGE_SIZE)
80397+ current_alloc_state->alloc_stack =
80398+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
80399+ else
80400+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
80401+
80402+ current_alloc_state->alloc_stack_size = size;
80403+ current_alloc_state->alloc_stack_next = 1;
80404+
80405+ if (!current_alloc_state->alloc_stack)
80406+ return 0;
80407+ else
80408+ return 1;
80409+}
80410diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
80411new file mode 100644
80412index 0000000..1a94c11
80413--- /dev/null
80414+++ b/grsecurity/gracl_cap.c
80415@@ -0,0 +1,127 @@
80416+#include <linux/kernel.h>
80417+#include <linux/module.h>
80418+#include <linux/sched.h>
80419+#include <linux/gracl.h>
80420+#include <linux/grsecurity.h>
80421+#include <linux/grinternal.h>
80422+
80423+extern const char *captab_log[];
80424+extern int captab_log_entries;
80425+
80426+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
80427+{
80428+ struct acl_subject_label *curracl;
80429+
80430+ if (!gr_acl_is_enabled())
80431+ return 1;
80432+
80433+ curracl = task->acl;
80434+
80435+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
80436+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
80437+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
80438+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
80439+ gr_to_filename(task->exec_file->f_path.dentry,
80440+ task->exec_file->f_path.mnt) : curracl->filename,
80441+ curracl->filename, 0UL,
80442+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
80443+ return 1;
80444+ }
80445+
80446+ return 0;
80447+}
80448+
80449+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
80450+{
80451+ struct acl_subject_label *curracl;
80452+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
80453+ kernel_cap_t cap_audit = __cap_empty_set;
80454+
80455+ if (!gr_acl_is_enabled())
80456+ return 1;
80457+
80458+ curracl = task->acl;
80459+
80460+ cap_drop = curracl->cap_lower;
80461+ cap_mask = curracl->cap_mask;
80462+ cap_audit = curracl->cap_invert_audit;
80463+
80464+ while ((curracl = curracl->parent_subject)) {
80465+ /* if the cap isn't specified in the current computed mask but is specified in the
80466+ current level subject, and is lowered in the current level subject, then add
80467+ it to the set of dropped capabilities
80468+ otherwise, add the current level subject's mask to the current computed mask
80469+ */
80470+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
80471+ cap_raise(cap_mask, cap);
80472+ if (cap_raised(curracl->cap_lower, cap))
80473+ cap_raise(cap_drop, cap);
80474+ if (cap_raised(curracl->cap_invert_audit, cap))
80475+ cap_raise(cap_audit, cap);
80476+ }
80477+ }
80478+
80479+ if (!cap_raised(cap_drop, cap)) {
80480+ if (cap_raised(cap_audit, cap))
80481+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
80482+ return 1;
80483+ }
80484+
80485+ /* only learn the capability use if the process has the capability in the
80486+ general case, the two uses in sys.c of gr_learn_cap are an exception
80487+ to this rule to ensure any role transition involves what the full-learned
80488+ policy believes in a privileged process
80489+ */
80490+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
80491+ return 1;
80492+
80493+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
80494+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
80495+
80496+ return 0;
80497+}
80498+
80499+int
80500+gr_acl_is_capable(const int cap)
80501+{
80502+ return gr_task_acl_is_capable(current, current_cred(), cap);
80503+}
80504+
80505+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
80506+{
80507+ struct acl_subject_label *curracl;
80508+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
80509+
80510+ if (!gr_acl_is_enabled())
80511+ return 1;
80512+
80513+ curracl = task->acl;
80514+
80515+ cap_drop = curracl->cap_lower;
80516+ cap_mask = curracl->cap_mask;
80517+
80518+ while ((curracl = curracl->parent_subject)) {
80519+ /* if the cap isn't specified in the current computed mask but is specified in the
80520+ current level subject, and is lowered in the current level subject, then add
80521+ it to the set of dropped capabilities
80522+ otherwise, add the current level subject's mask to the current computed mask
80523+ */
80524+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
80525+ cap_raise(cap_mask, cap);
80526+ if (cap_raised(curracl->cap_lower, cap))
80527+ cap_raise(cap_drop, cap);
80528+ }
80529+ }
80530+
80531+ if (!cap_raised(cap_drop, cap))
80532+ return 1;
80533+
80534+ return 0;
80535+}
80536+
80537+int
80538+gr_acl_is_capable_nolog(const int cap)
80539+{
80540+ return gr_task_acl_is_capable_nolog(current, cap);
80541+}
80542+
80543diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
80544new file mode 100644
80545index 0000000..a43dd06
80546--- /dev/null
80547+++ b/grsecurity/gracl_compat.c
80548@@ -0,0 +1,269 @@
80549+#include <linux/kernel.h>
80550+#include <linux/gracl.h>
80551+#include <linux/compat.h>
80552+#include <linux/gracl_compat.h>
80553+
80554+#include <asm/uaccess.h>
80555+
80556+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
80557+{
80558+ struct gr_arg_wrapper_compat uwrapcompat;
80559+
80560+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
80561+ return -EFAULT;
80562+
80563+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
80564+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
80565+ return -EINVAL;
80566+
80567+ uwrap->arg = compat_ptr(uwrapcompat.arg);
80568+ uwrap->version = uwrapcompat.version;
80569+ uwrap->size = sizeof(struct gr_arg);
80570+
80571+ return 0;
80572+}
80573+
80574+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
80575+{
80576+ struct gr_arg_compat argcompat;
80577+
80578+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
80579+ return -EFAULT;
80580+
80581+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
80582+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
80583+ arg->role_db.num_roles = argcompat.role_db.num_roles;
80584+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
80585+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
80586+ arg->role_db.num_objects = argcompat.role_db.num_objects;
80587+
80588+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
80589+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
80590+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
80591+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
80592+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
80593+ arg->segv_device = argcompat.segv_device;
80594+ arg->segv_inode = argcompat.segv_inode;
80595+ arg->segv_uid = argcompat.segv_uid;
80596+ arg->num_sprole_pws = argcompat.num_sprole_pws;
80597+ arg->mode = argcompat.mode;
80598+
80599+ return 0;
80600+}
80601+
80602+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
80603+{
80604+ struct acl_object_label_compat objcompat;
80605+
80606+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
80607+ return -EFAULT;
80608+
80609+ obj->filename = compat_ptr(objcompat.filename);
80610+ obj->inode = objcompat.inode;
80611+ obj->device = objcompat.device;
80612+ obj->mode = objcompat.mode;
80613+
80614+ obj->nested = compat_ptr(objcompat.nested);
80615+ obj->globbed = compat_ptr(objcompat.globbed);
80616+
80617+ obj->prev = compat_ptr(objcompat.prev);
80618+ obj->next = compat_ptr(objcompat.next);
80619+
80620+ return 0;
80621+}
80622+
80623+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
80624+{
80625+ unsigned int i;
80626+ struct acl_subject_label_compat subjcompat;
80627+
80628+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
80629+ return -EFAULT;
80630+
80631+ subj->filename = compat_ptr(subjcompat.filename);
80632+ subj->inode = subjcompat.inode;
80633+ subj->device = subjcompat.device;
80634+ subj->mode = subjcompat.mode;
80635+ subj->cap_mask = subjcompat.cap_mask;
80636+ subj->cap_lower = subjcompat.cap_lower;
80637+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
80638+
80639+ for (i = 0; i < GR_NLIMITS; i++) {
80640+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
80641+ subj->res[i].rlim_cur = RLIM_INFINITY;
80642+ else
80643+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
80644+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
80645+ subj->res[i].rlim_max = RLIM_INFINITY;
80646+ else
80647+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
80648+ }
80649+ subj->resmask = subjcompat.resmask;
80650+
80651+ subj->user_trans_type = subjcompat.user_trans_type;
80652+ subj->group_trans_type = subjcompat.group_trans_type;
80653+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
80654+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
80655+ subj->user_trans_num = subjcompat.user_trans_num;
80656+ subj->group_trans_num = subjcompat.group_trans_num;
80657+
80658+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
80659+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
80660+ subj->ip_type = subjcompat.ip_type;
80661+ subj->ips = compat_ptr(subjcompat.ips);
80662+ subj->ip_num = subjcompat.ip_num;
80663+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
80664+
80665+ subj->crashes = subjcompat.crashes;
80666+ subj->expires = subjcompat.expires;
80667+
80668+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
80669+ subj->hash = compat_ptr(subjcompat.hash);
80670+ subj->prev = compat_ptr(subjcompat.prev);
80671+ subj->next = compat_ptr(subjcompat.next);
80672+
80673+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
80674+ subj->obj_hash_size = subjcompat.obj_hash_size;
80675+ subj->pax_flags = subjcompat.pax_flags;
80676+
80677+ return 0;
80678+}
80679+
80680+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
80681+{
80682+ struct acl_role_label_compat rolecompat;
80683+
80684+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
80685+ return -EFAULT;
80686+
80687+ role->rolename = compat_ptr(rolecompat.rolename);
80688+ role->uidgid = rolecompat.uidgid;
80689+ role->roletype = rolecompat.roletype;
80690+
80691+ role->auth_attempts = rolecompat.auth_attempts;
80692+ role->expires = rolecompat.expires;
80693+
80694+ role->root_label = compat_ptr(rolecompat.root_label);
80695+ role->hash = compat_ptr(rolecompat.hash);
80696+
80697+ role->prev = compat_ptr(rolecompat.prev);
80698+ role->next = compat_ptr(rolecompat.next);
80699+
80700+ role->transitions = compat_ptr(rolecompat.transitions);
80701+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
80702+ role->domain_children = compat_ptr(rolecompat.domain_children);
80703+ role->domain_child_num = rolecompat.domain_child_num;
80704+
80705+ role->umask = rolecompat.umask;
80706+
80707+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
80708+ role->subj_hash_size = rolecompat.subj_hash_size;
80709+
80710+ return 0;
80711+}
80712+
80713+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
80714+{
80715+ struct role_allowed_ip_compat roleip_compat;
80716+
80717+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
80718+ return -EFAULT;
80719+
80720+ roleip->addr = roleip_compat.addr;
80721+ roleip->netmask = roleip_compat.netmask;
80722+
80723+ roleip->prev = compat_ptr(roleip_compat.prev);
80724+ roleip->next = compat_ptr(roleip_compat.next);
80725+
80726+ return 0;
80727+}
80728+
80729+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
80730+{
80731+ struct role_transition_compat trans_compat;
80732+
80733+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
80734+ return -EFAULT;
80735+
80736+ trans->rolename = compat_ptr(trans_compat.rolename);
80737+
80738+ trans->prev = compat_ptr(trans_compat.prev);
80739+ trans->next = compat_ptr(trans_compat.next);
80740+
80741+ return 0;
80742+
80743+}
80744+
80745+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
80746+{
80747+ struct gr_hash_struct_compat hash_compat;
80748+
80749+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
80750+ return -EFAULT;
80751+
80752+ hash->table = compat_ptr(hash_compat.table);
80753+ hash->nametable = compat_ptr(hash_compat.nametable);
80754+ hash->first = compat_ptr(hash_compat.first);
80755+
80756+ hash->table_size = hash_compat.table_size;
80757+ hash->used_size = hash_compat.used_size;
80758+
80759+ hash->type = hash_compat.type;
80760+
80761+ return 0;
80762+}
80763+
80764+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
80765+{
80766+ compat_uptr_t ptrcompat;
80767+
80768+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
80769+ return -EFAULT;
80770+
80771+ *(void **)ptr = compat_ptr(ptrcompat);
80772+
80773+ return 0;
80774+}
80775+
80776+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
80777+{
80778+ struct acl_ip_label_compat ip_compat;
80779+
80780+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
80781+ return -EFAULT;
80782+
80783+ ip->iface = compat_ptr(ip_compat.iface);
80784+ ip->addr = ip_compat.addr;
80785+ ip->netmask = ip_compat.netmask;
80786+ ip->low = ip_compat.low;
80787+ ip->high = ip_compat.high;
80788+ ip->mode = ip_compat.mode;
80789+ ip->type = ip_compat.type;
80790+
80791+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
80792+
80793+ ip->prev = compat_ptr(ip_compat.prev);
80794+ ip->next = compat_ptr(ip_compat.next);
80795+
80796+ return 0;
80797+}
80798+
80799+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
80800+{
80801+ struct sprole_pw_compat pw_compat;
80802+
80803+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
80804+ return -EFAULT;
80805+
80806+ pw->rolename = compat_ptr(pw_compat.rolename);
80807+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
80808+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
80809+
80810+ return 0;
80811+}
80812+
80813+size_t get_gr_arg_wrapper_size_compat(void)
80814+{
80815+ return sizeof(struct gr_arg_wrapper_compat);
80816+}
80817+
80818diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
80819new file mode 100644
80820index 0000000..8ee8e4f
80821--- /dev/null
80822+++ b/grsecurity/gracl_fs.c
80823@@ -0,0 +1,447 @@
80824+#include <linux/kernel.h>
80825+#include <linux/sched.h>
80826+#include <linux/types.h>
80827+#include <linux/fs.h>
80828+#include <linux/file.h>
80829+#include <linux/stat.h>
80830+#include <linux/grsecurity.h>
80831+#include <linux/grinternal.h>
80832+#include <linux/gracl.h>
80833+
80834+umode_t
80835+gr_acl_umask(void)
80836+{
80837+ if (unlikely(!gr_acl_is_enabled()))
80838+ return 0;
80839+
80840+ return current->role->umask;
80841+}
80842+
80843+__u32
80844+gr_acl_handle_hidden_file(const struct dentry * dentry,
80845+ const struct vfsmount * mnt)
80846+{
80847+ __u32 mode;
80848+
80849+ if (unlikely(d_is_negative(dentry)))
80850+ return GR_FIND;
80851+
80852+ mode =
80853+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
80854+
80855+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
80856+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
80857+ return mode;
80858+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
80859+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
80860+ return 0;
80861+ } else if (unlikely(!(mode & GR_FIND)))
80862+ return 0;
80863+
80864+ return GR_FIND;
80865+}
80866+
80867+__u32
80868+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
80869+ int acc_mode)
80870+{
80871+ __u32 reqmode = GR_FIND;
80872+ __u32 mode;
80873+
80874+ if (unlikely(d_is_negative(dentry)))
80875+ return reqmode;
80876+
80877+ if (acc_mode & MAY_APPEND)
80878+ reqmode |= GR_APPEND;
80879+ else if (acc_mode & MAY_WRITE)
80880+ reqmode |= GR_WRITE;
80881+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
80882+ reqmode |= GR_READ;
80883+
80884+ mode =
80885+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
80886+ mnt);
80887+
80888+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
80889+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
80890+ reqmode & GR_READ ? " reading" : "",
80891+ reqmode & GR_WRITE ? " writing" : reqmode &
80892+ GR_APPEND ? " appending" : "");
80893+ return reqmode;
80894+ } else
80895+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
80896+ {
80897+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
80898+ reqmode & GR_READ ? " reading" : "",
80899+ reqmode & GR_WRITE ? " writing" : reqmode &
80900+ GR_APPEND ? " appending" : "");
80901+ return 0;
80902+ } else if (unlikely((mode & reqmode) != reqmode))
80903+ return 0;
80904+
80905+ return reqmode;
80906+}
80907+
80908+__u32
80909+gr_acl_handle_creat(const struct dentry * dentry,
80910+ const struct dentry * p_dentry,
80911+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
80912+ const int imode)
80913+{
80914+ __u32 reqmode = GR_WRITE | GR_CREATE;
80915+ __u32 mode;
80916+
80917+ if (acc_mode & MAY_APPEND)
80918+ reqmode |= GR_APPEND;
80919+ // if a directory was required or the directory already exists, then
80920+ // don't count this open as a read
80921+ if ((acc_mode & MAY_READ) &&
80922+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
80923+ reqmode |= GR_READ;
80924+ if ((open_flags & O_CREAT) &&
80925+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
80926+ reqmode |= GR_SETID;
80927+
80928+ mode =
80929+ gr_check_create(dentry, p_dentry, p_mnt,
80930+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
80931+
80932+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
80933+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
80934+ reqmode & GR_READ ? " reading" : "",
80935+ reqmode & GR_WRITE ? " writing" : reqmode &
80936+ GR_APPEND ? " appending" : "");
80937+ return reqmode;
80938+ } else
80939+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
80940+ {
80941+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
80942+ reqmode & GR_READ ? " reading" : "",
80943+ reqmode & GR_WRITE ? " writing" : reqmode &
80944+ GR_APPEND ? " appending" : "");
80945+ return 0;
80946+ } else if (unlikely((mode & reqmode) != reqmode))
80947+ return 0;
80948+
80949+ return reqmode;
80950+}
80951+
80952+__u32
80953+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
80954+ const int fmode)
80955+{
80956+ __u32 mode, reqmode = GR_FIND;
80957+
80958+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
80959+ reqmode |= GR_EXEC;
80960+ if (fmode & S_IWOTH)
80961+ reqmode |= GR_WRITE;
80962+ if (fmode & S_IROTH)
80963+ reqmode |= GR_READ;
80964+
80965+ mode =
80966+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
80967+ mnt);
80968+
80969+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
80970+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
80971+ reqmode & GR_READ ? " reading" : "",
80972+ reqmode & GR_WRITE ? " writing" : "",
80973+ reqmode & GR_EXEC ? " executing" : "");
80974+ return reqmode;
80975+ } else
80976+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
80977+ {
80978+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
80979+ reqmode & GR_READ ? " reading" : "",
80980+ reqmode & GR_WRITE ? " writing" : "",
80981+ reqmode & GR_EXEC ? " executing" : "");
80982+ return 0;
80983+ } else if (unlikely((mode & reqmode) != reqmode))
80984+ return 0;
80985+
80986+ return reqmode;
80987+}
80988+
80989+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
80990+{
80991+ __u32 mode;
80992+
80993+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
80994+
80995+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
80996+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
80997+ return mode;
80998+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
80999+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
81000+ return 0;
81001+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
81002+ return 0;
81003+
81004+ return (reqmode);
81005+}
81006+
81007+__u32
81008+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
81009+{
81010+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
81011+}
81012+
81013+__u32
81014+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
81015+{
81016+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
81017+}
81018+
81019+__u32
81020+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
81021+{
81022+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
81023+}
81024+
81025+__u32
81026+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
81027+{
81028+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
81029+}
81030+
81031+__u32
81032+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
81033+ umode_t *modeptr)
81034+{
81035+ umode_t mode;
81036+
81037+ *modeptr &= ~gr_acl_umask();
81038+ mode = *modeptr;
81039+
81040+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
81041+ return 1;
81042+
81043+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
81044+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
81045+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
81046+ GR_CHMOD_ACL_MSG);
81047+ } else {
81048+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
81049+ }
81050+}
81051+
81052+__u32
81053+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
81054+{
81055+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
81056+}
81057+
81058+__u32
81059+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
81060+{
81061+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
81062+}
81063+
81064+__u32
81065+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
81066+{
81067+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
81068+}
81069+
81070+__u32
81071+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
81072+{
81073+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
81074+}
81075+
81076+__u32
81077+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
81078+{
81079+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
81080+ GR_UNIXCONNECT_ACL_MSG);
81081+}
81082+
81083+/* hardlinks require at minimum create and link permission,
81084+ any additional privilege required is based on the
81085+ privilege of the file being linked to
81086+*/
81087+__u32
81088+gr_acl_handle_link(const struct dentry * new_dentry,
81089+ const struct dentry * parent_dentry,
81090+ const struct vfsmount * parent_mnt,
81091+ const struct dentry * old_dentry,
81092+ const struct vfsmount * old_mnt, const struct filename *to)
81093+{
81094+ __u32 mode;
81095+ __u32 needmode = GR_CREATE | GR_LINK;
81096+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
81097+
81098+ mode =
81099+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
81100+ old_mnt);
81101+
81102+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
81103+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
81104+ return mode;
81105+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
81106+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
81107+ return 0;
81108+ } else if (unlikely((mode & needmode) != needmode))
81109+ return 0;
81110+
81111+ return 1;
81112+}
81113+
81114+__u32
81115+gr_acl_handle_symlink(const struct dentry * new_dentry,
81116+ const struct dentry * parent_dentry,
81117+ const struct vfsmount * parent_mnt, const struct filename *from)
81118+{
81119+ __u32 needmode = GR_WRITE | GR_CREATE;
81120+ __u32 mode;
81121+
81122+ mode =
81123+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
81124+ GR_CREATE | GR_AUDIT_CREATE |
81125+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
81126+
81127+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
81128+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
81129+ return mode;
81130+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
81131+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
81132+ return 0;
81133+ } else if (unlikely((mode & needmode) != needmode))
81134+ return 0;
81135+
81136+ return (GR_WRITE | GR_CREATE);
81137+}
81138+
81139+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)
81140+{
81141+ __u32 mode;
81142+
81143+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
81144+
81145+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
81146+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
81147+ return mode;
81148+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
81149+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
81150+ return 0;
81151+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
81152+ return 0;
81153+
81154+ return (reqmode);
81155+}
81156+
81157+__u32
81158+gr_acl_handle_mknod(const struct dentry * new_dentry,
81159+ const struct dentry * parent_dentry,
81160+ const struct vfsmount * parent_mnt,
81161+ const int mode)
81162+{
81163+ __u32 reqmode = GR_WRITE | GR_CREATE;
81164+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
81165+ reqmode |= GR_SETID;
81166+
81167+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
81168+ reqmode, GR_MKNOD_ACL_MSG);
81169+}
81170+
81171+__u32
81172+gr_acl_handle_mkdir(const struct dentry *new_dentry,
81173+ const struct dentry *parent_dentry,
81174+ const struct vfsmount *parent_mnt)
81175+{
81176+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
81177+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
81178+}
81179+
81180+#define RENAME_CHECK_SUCCESS(old, new) \
81181+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
81182+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
81183+
81184+int
81185+gr_acl_handle_rename(struct dentry *new_dentry,
81186+ struct dentry *parent_dentry,
81187+ const struct vfsmount *parent_mnt,
81188+ struct dentry *old_dentry,
81189+ struct inode *old_parent_inode,
81190+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
81191+{
81192+ __u32 comp1, comp2;
81193+ int error = 0;
81194+
81195+ if (unlikely(!gr_acl_is_enabled()))
81196+ return 0;
81197+
81198+ if (flags & RENAME_EXCHANGE) {
81199+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
81200+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81201+ GR_SUPPRESS, parent_mnt);
81202+ comp2 =
81203+ gr_search_file(old_dentry,
81204+ GR_READ | GR_WRITE | GR_AUDIT_READ |
81205+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
81206+ } else if (d_is_negative(new_dentry)) {
81207+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
81208+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
81209+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
81210+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
81211+ GR_DELETE | GR_AUDIT_DELETE |
81212+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81213+ GR_SUPPRESS, old_mnt);
81214+ } else {
81215+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
81216+ GR_CREATE | GR_DELETE |
81217+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
81218+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81219+ GR_SUPPRESS, parent_mnt);
81220+ comp2 =
81221+ gr_search_file(old_dentry,
81222+ GR_READ | GR_WRITE | GR_AUDIT_READ |
81223+ GR_DELETE | GR_AUDIT_DELETE |
81224+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
81225+ }
81226+
81227+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
81228+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
81229+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
81230+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
81231+ && !(comp2 & GR_SUPPRESS)) {
81232+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
81233+ error = -EACCES;
81234+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
81235+ error = -EACCES;
81236+
81237+ return error;
81238+}
81239+
81240+void
81241+gr_acl_handle_exit(void)
81242+{
81243+ u16 id;
81244+ char *rolename;
81245+
81246+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
81247+ !(current->role->roletype & GR_ROLE_PERSIST))) {
81248+ id = current->acl_role_id;
81249+ rolename = current->role->rolename;
81250+ gr_set_acls(1);
81251+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
81252+ }
81253+
81254+ gr_put_exec_file(current);
81255+ return;
81256+}
81257+
81258+int
81259+gr_acl_handle_procpidmem(const struct task_struct *task)
81260+{
81261+ if (unlikely(!gr_acl_is_enabled()))
81262+ return 0;
81263+
81264+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
81265+ !(current->acl->mode & GR_POVERRIDE) &&
81266+ !(current->role->roletype & GR_ROLE_GOD))
81267+ return -EACCES;
81268+
81269+ return 0;
81270+}
81271diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
81272new file mode 100644
81273index 0000000..f056b81
81274--- /dev/null
81275+++ b/grsecurity/gracl_ip.c
81276@@ -0,0 +1,386 @@
81277+#include <linux/kernel.h>
81278+#include <asm/uaccess.h>
81279+#include <asm/errno.h>
81280+#include <net/sock.h>
81281+#include <linux/file.h>
81282+#include <linux/fs.h>
81283+#include <linux/net.h>
81284+#include <linux/in.h>
81285+#include <linux/skbuff.h>
81286+#include <linux/ip.h>
81287+#include <linux/udp.h>
81288+#include <linux/types.h>
81289+#include <linux/sched.h>
81290+#include <linux/netdevice.h>
81291+#include <linux/inetdevice.h>
81292+#include <linux/gracl.h>
81293+#include <linux/grsecurity.h>
81294+#include <linux/grinternal.h>
81295+
81296+#define GR_BIND 0x01
81297+#define GR_CONNECT 0x02
81298+#define GR_INVERT 0x04
81299+#define GR_BINDOVERRIDE 0x08
81300+#define GR_CONNECTOVERRIDE 0x10
81301+#define GR_SOCK_FAMILY 0x20
81302+
81303+static const char * gr_protocols[IPPROTO_MAX] = {
81304+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
81305+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
81306+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
81307+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
81308+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
81309+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
81310+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
81311+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
81312+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
81313+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
81314+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
81315+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
81316+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
81317+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
81318+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
81319+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
81320+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
81321+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
81322+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
81323+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
81324+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
81325+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
81326+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
81327+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
81328+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
81329+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
81330+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
81331+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
81332+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
81333+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
81334+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
81335+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
81336+ };
81337+
81338+static const char * gr_socktypes[SOCK_MAX] = {
81339+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
81340+ "unknown:7", "unknown:8", "unknown:9", "packet"
81341+ };
81342+
81343+static const char * gr_sockfamilies[AF_MAX+1] = {
81344+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
81345+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
81346+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
81347+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
81348+ };
81349+
81350+const char *
81351+gr_proto_to_name(unsigned char proto)
81352+{
81353+ return gr_protocols[proto];
81354+}
81355+
81356+const char *
81357+gr_socktype_to_name(unsigned char type)
81358+{
81359+ return gr_socktypes[type];
81360+}
81361+
81362+const char *
81363+gr_sockfamily_to_name(unsigned char family)
81364+{
81365+ return gr_sockfamilies[family];
81366+}
81367+
81368+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
81369+
81370+int
81371+gr_search_socket(const int domain, const int type, const int protocol)
81372+{
81373+ struct acl_subject_label *curr;
81374+ const struct cred *cred = current_cred();
81375+
81376+ if (unlikely(!gr_acl_is_enabled()))
81377+ goto exit;
81378+
81379+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
81380+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
81381+ goto exit; // let the kernel handle it
81382+
81383+ curr = current->acl;
81384+
81385+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
81386+ /* the family is allowed, if this is PF_INET allow it only if
81387+ the extra sock type/protocol checks pass */
81388+ if (domain == PF_INET)
81389+ goto inet_check;
81390+ goto exit;
81391+ } else {
81392+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81393+ __u32 fakeip = 0;
81394+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81395+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81396+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81397+ gr_to_filename(current->exec_file->f_path.dentry,
81398+ current->exec_file->f_path.mnt) :
81399+ curr->filename, curr->filename,
81400+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
81401+ &current->signal->saved_ip);
81402+ goto exit;
81403+ }
81404+ goto exit_fail;
81405+ }
81406+
81407+inet_check:
81408+ /* the rest of this checking is for IPv4 only */
81409+ if (!curr->ips)
81410+ goto exit;
81411+
81412+ if ((curr->ip_type & (1U << type)) &&
81413+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
81414+ goto exit;
81415+
81416+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81417+ /* we don't place acls on raw sockets , and sometimes
81418+ dgram/ip sockets are opened for ioctl and not
81419+ bind/connect, so we'll fake a bind learn log */
81420+ if (type == SOCK_RAW || type == SOCK_PACKET) {
81421+ __u32 fakeip = 0;
81422+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81423+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81424+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81425+ gr_to_filename(current->exec_file->f_path.dentry,
81426+ current->exec_file->f_path.mnt) :
81427+ curr->filename, curr->filename,
81428+ &fakeip, 0, type,
81429+ protocol, GR_CONNECT, &current->signal->saved_ip);
81430+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
81431+ __u32 fakeip = 0;
81432+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81433+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81434+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81435+ gr_to_filename(current->exec_file->f_path.dentry,
81436+ current->exec_file->f_path.mnt) :
81437+ curr->filename, curr->filename,
81438+ &fakeip, 0, type,
81439+ protocol, GR_BIND, &current->signal->saved_ip);
81440+ }
81441+ /* we'll log when they use connect or bind */
81442+ goto exit;
81443+ }
81444+
81445+exit_fail:
81446+ if (domain == PF_INET)
81447+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
81448+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
81449+ else if (rcu_access_pointer(net_families[domain]) != NULL)
81450+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
81451+ gr_socktype_to_name(type), protocol);
81452+
81453+ return 0;
81454+exit:
81455+ return 1;
81456+}
81457+
81458+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)
81459+{
81460+ if ((ip->mode & mode) &&
81461+ (ip_port >= ip->low) &&
81462+ (ip_port <= ip->high) &&
81463+ ((ntohl(ip_addr) & our_netmask) ==
81464+ (ntohl(our_addr) & our_netmask))
81465+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
81466+ && (ip->type & (1U << type))) {
81467+ if (ip->mode & GR_INVERT)
81468+ return 2; // specifically denied
81469+ else
81470+ return 1; // allowed
81471+ }
81472+
81473+ return 0; // not specifically allowed, may continue parsing
81474+}
81475+
81476+static int
81477+gr_search_connectbind(const int full_mode, struct sock *sk,
81478+ struct sockaddr_in *addr, const int type)
81479+{
81480+ char iface[IFNAMSIZ] = {0};
81481+ struct acl_subject_label *curr;
81482+ struct acl_ip_label *ip;
81483+ struct inet_sock *isk;
81484+ struct net_device *dev;
81485+ struct in_device *idev;
81486+ unsigned long i;
81487+ int ret;
81488+ int mode = full_mode & (GR_BIND | GR_CONNECT);
81489+ __u32 ip_addr = 0;
81490+ __u32 our_addr;
81491+ __u32 our_netmask;
81492+ char *p;
81493+ __u16 ip_port = 0;
81494+ const struct cred *cred = current_cred();
81495+
81496+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
81497+ return 0;
81498+
81499+ curr = current->acl;
81500+ isk = inet_sk(sk);
81501+
81502+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
81503+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
81504+ addr->sin_addr.s_addr = curr->inaddr_any_override;
81505+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
81506+ struct sockaddr_in saddr;
81507+ int err;
81508+
81509+ saddr.sin_family = AF_INET;
81510+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
81511+ saddr.sin_port = isk->inet_sport;
81512+
81513+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
81514+ if (err)
81515+ return err;
81516+
81517+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
81518+ if (err)
81519+ return err;
81520+ }
81521+
81522+ if (!curr->ips)
81523+ return 0;
81524+
81525+ ip_addr = addr->sin_addr.s_addr;
81526+ ip_port = ntohs(addr->sin_port);
81527+
81528+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81529+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81530+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81531+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81532+ gr_to_filename(current->exec_file->f_path.dentry,
81533+ current->exec_file->f_path.mnt) :
81534+ curr->filename, curr->filename,
81535+ &ip_addr, ip_port, type,
81536+ sk->sk_protocol, mode, &current->signal->saved_ip);
81537+ return 0;
81538+ }
81539+
81540+ for (i = 0; i < curr->ip_num; i++) {
81541+ ip = *(curr->ips + i);
81542+ if (ip->iface != NULL) {
81543+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
81544+ p = strchr(iface, ':');
81545+ if (p != NULL)
81546+ *p = '\0';
81547+ dev = dev_get_by_name(sock_net(sk), iface);
81548+ if (dev == NULL)
81549+ continue;
81550+ idev = in_dev_get(dev);
81551+ if (idev == NULL) {
81552+ dev_put(dev);
81553+ continue;
81554+ }
81555+ rcu_read_lock();
81556+ for_ifa(idev) {
81557+ if (!strcmp(ip->iface, ifa->ifa_label)) {
81558+ our_addr = ifa->ifa_address;
81559+ our_netmask = 0xffffffff;
81560+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
81561+ if (ret == 1) {
81562+ rcu_read_unlock();
81563+ in_dev_put(idev);
81564+ dev_put(dev);
81565+ return 0;
81566+ } else if (ret == 2) {
81567+ rcu_read_unlock();
81568+ in_dev_put(idev);
81569+ dev_put(dev);
81570+ goto denied;
81571+ }
81572+ }
81573+ } endfor_ifa(idev);
81574+ rcu_read_unlock();
81575+ in_dev_put(idev);
81576+ dev_put(dev);
81577+ } else {
81578+ our_addr = ip->addr;
81579+ our_netmask = ip->netmask;
81580+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
81581+ if (ret == 1)
81582+ return 0;
81583+ else if (ret == 2)
81584+ goto denied;
81585+ }
81586+ }
81587+
81588+denied:
81589+ if (mode == GR_BIND)
81590+ 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));
81591+ else if (mode == GR_CONNECT)
81592+ 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));
81593+
81594+ return -EACCES;
81595+}
81596+
81597+int
81598+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
81599+{
81600+ /* always allow disconnection of dgram sockets with connect */
81601+ if (addr->sin_family == AF_UNSPEC)
81602+ return 0;
81603+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
81604+}
81605+
81606+int
81607+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
81608+{
81609+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
81610+}
81611+
81612+int gr_search_listen(struct socket *sock)
81613+{
81614+ struct sock *sk = sock->sk;
81615+ struct sockaddr_in addr;
81616+
81617+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
81618+ addr.sin_port = inet_sk(sk)->inet_sport;
81619+
81620+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
81621+}
81622+
81623+int gr_search_accept(struct socket *sock)
81624+{
81625+ struct sock *sk = sock->sk;
81626+ struct sockaddr_in addr;
81627+
81628+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
81629+ addr.sin_port = inet_sk(sk)->inet_sport;
81630+
81631+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
81632+}
81633+
81634+int
81635+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
81636+{
81637+ if (addr)
81638+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
81639+ else {
81640+ struct sockaddr_in sin;
81641+ const struct inet_sock *inet = inet_sk(sk);
81642+
81643+ sin.sin_addr.s_addr = inet->inet_daddr;
81644+ sin.sin_port = inet->inet_dport;
81645+
81646+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
81647+ }
81648+}
81649+
81650+int
81651+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
81652+{
81653+ struct sockaddr_in sin;
81654+
81655+ if (unlikely(skb->len < sizeof (struct udphdr)))
81656+ return 0; // skip this packet
81657+
81658+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
81659+ sin.sin_port = udp_hdr(skb)->source;
81660+
81661+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
81662+}
81663diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
81664new file mode 100644
81665index 0000000..25f54ef
81666--- /dev/null
81667+++ b/grsecurity/gracl_learn.c
81668@@ -0,0 +1,207 @@
81669+#include <linux/kernel.h>
81670+#include <linux/mm.h>
81671+#include <linux/sched.h>
81672+#include <linux/poll.h>
81673+#include <linux/string.h>
81674+#include <linux/file.h>
81675+#include <linux/types.h>
81676+#include <linux/vmalloc.h>
81677+#include <linux/grinternal.h>
81678+
81679+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
81680+ size_t count, loff_t *ppos);
81681+extern int gr_acl_is_enabled(void);
81682+
81683+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
81684+static int gr_learn_attached;
81685+
81686+/* use a 512k buffer */
81687+#define LEARN_BUFFER_SIZE (512 * 1024)
81688+
81689+static DEFINE_SPINLOCK(gr_learn_lock);
81690+static DEFINE_MUTEX(gr_learn_user_mutex);
81691+
81692+/* we need to maintain two buffers, so that the kernel context of grlearn
81693+ uses a semaphore around the userspace copying, and the other kernel contexts
81694+ use a spinlock when copying into the buffer, since they cannot sleep
81695+*/
81696+static char *learn_buffer;
81697+static char *learn_buffer_user;
81698+static int learn_buffer_len;
81699+static int learn_buffer_user_len;
81700+
81701+static ssize_t
81702+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
81703+{
81704+ DECLARE_WAITQUEUE(wait, current);
81705+ ssize_t retval = 0;
81706+
81707+ add_wait_queue(&learn_wait, &wait);
81708+ set_current_state(TASK_INTERRUPTIBLE);
81709+ do {
81710+ mutex_lock(&gr_learn_user_mutex);
81711+ spin_lock(&gr_learn_lock);
81712+ if (learn_buffer_len)
81713+ break;
81714+ spin_unlock(&gr_learn_lock);
81715+ mutex_unlock(&gr_learn_user_mutex);
81716+ if (file->f_flags & O_NONBLOCK) {
81717+ retval = -EAGAIN;
81718+ goto out;
81719+ }
81720+ if (signal_pending(current)) {
81721+ retval = -ERESTARTSYS;
81722+ goto out;
81723+ }
81724+
81725+ schedule();
81726+ } while (1);
81727+
81728+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
81729+ learn_buffer_user_len = learn_buffer_len;
81730+ retval = learn_buffer_len;
81731+ learn_buffer_len = 0;
81732+
81733+ spin_unlock(&gr_learn_lock);
81734+
81735+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
81736+ retval = -EFAULT;
81737+
81738+ mutex_unlock(&gr_learn_user_mutex);
81739+out:
81740+ set_current_state(TASK_RUNNING);
81741+ remove_wait_queue(&learn_wait, &wait);
81742+ return retval;
81743+}
81744+
81745+static unsigned int
81746+poll_learn(struct file * file, poll_table * wait)
81747+{
81748+ poll_wait(file, &learn_wait, wait);
81749+
81750+ if (learn_buffer_len)
81751+ return (POLLIN | POLLRDNORM);
81752+
81753+ return 0;
81754+}
81755+
81756+void
81757+gr_clear_learn_entries(void)
81758+{
81759+ char *tmp;
81760+
81761+ mutex_lock(&gr_learn_user_mutex);
81762+ spin_lock(&gr_learn_lock);
81763+ tmp = learn_buffer;
81764+ learn_buffer = NULL;
81765+ spin_unlock(&gr_learn_lock);
81766+ if (tmp)
81767+ vfree(tmp);
81768+ if (learn_buffer_user != NULL) {
81769+ vfree(learn_buffer_user);
81770+ learn_buffer_user = NULL;
81771+ }
81772+ learn_buffer_len = 0;
81773+ mutex_unlock(&gr_learn_user_mutex);
81774+
81775+ return;
81776+}
81777+
81778+void
81779+gr_add_learn_entry(const char *fmt, ...)
81780+{
81781+ va_list args;
81782+ unsigned int len;
81783+
81784+ if (!gr_learn_attached)
81785+ return;
81786+
81787+ spin_lock(&gr_learn_lock);
81788+
81789+ /* leave a gap at the end so we know when it's "full" but don't have to
81790+ compute the exact length of the string we're trying to append
81791+ */
81792+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
81793+ spin_unlock(&gr_learn_lock);
81794+ wake_up_interruptible(&learn_wait);
81795+ return;
81796+ }
81797+ if (learn_buffer == NULL) {
81798+ spin_unlock(&gr_learn_lock);
81799+ return;
81800+ }
81801+
81802+ va_start(args, fmt);
81803+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
81804+ va_end(args);
81805+
81806+ learn_buffer_len += len + 1;
81807+
81808+ spin_unlock(&gr_learn_lock);
81809+ wake_up_interruptible(&learn_wait);
81810+
81811+ return;
81812+}
81813+
81814+static int
81815+open_learn(struct inode *inode, struct file *file)
81816+{
81817+ if (file->f_mode & FMODE_READ && gr_learn_attached)
81818+ return -EBUSY;
81819+ if (file->f_mode & FMODE_READ) {
81820+ int retval = 0;
81821+ mutex_lock(&gr_learn_user_mutex);
81822+ if (learn_buffer == NULL)
81823+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
81824+ if (learn_buffer_user == NULL)
81825+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
81826+ if (learn_buffer == NULL) {
81827+ retval = -ENOMEM;
81828+ goto out_error;
81829+ }
81830+ if (learn_buffer_user == NULL) {
81831+ retval = -ENOMEM;
81832+ goto out_error;
81833+ }
81834+ learn_buffer_len = 0;
81835+ learn_buffer_user_len = 0;
81836+ gr_learn_attached = 1;
81837+out_error:
81838+ mutex_unlock(&gr_learn_user_mutex);
81839+ return retval;
81840+ }
81841+ return 0;
81842+}
81843+
81844+static int
81845+close_learn(struct inode *inode, struct file *file)
81846+{
81847+ if (file->f_mode & FMODE_READ) {
81848+ char *tmp = NULL;
81849+ mutex_lock(&gr_learn_user_mutex);
81850+ spin_lock(&gr_learn_lock);
81851+ tmp = learn_buffer;
81852+ learn_buffer = NULL;
81853+ spin_unlock(&gr_learn_lock);
81854+ if (tmp)
81855+ vfree(tmp);
81856+ if (learn_buffer_user != NULL) {
81857+ vfree(learn_buffer_user);
81858+ learn_buffer_user = NULL;
81859+ }
81860+ learn_buffer_len = 0;
81861+ learn_buffer_user_len = 0;
81862+ gr_learn_attached = 0;
81863+ mutex_unlock(&gr_learn_user_mutex);
81864+ }
81865+
81866+ return 0;
81867+}
81868+
81869+const struct file_operations grsec_fops = {
81870+ .read = read_learn,
81871+ .write = write_grsec_handler,
81872+ .open = open_learn,
81873+ .release = close_learn,
81874+ .poll = poll_learn,
81875+};
81876diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
81877new file mode 100644
81878index 0000000..fd26052
81879--- /dev/null
81880+++ b/grsecurity/gracl_policy.c
81881@@ -0,0 +1,1781 @@
81882+#include <linux/kernel.h>
81883+#include <linux/module.h>
81884+#include <linux/sched.h>
81885+#include <linux/mm.h>
81886+#include <linux/file.h>
81887+#include <linux/fs.h>
81888+#include <linux/namei.h>
81889+#include <linux/mount.h>
81890+#include <linux/tty.h>
81891+#include <linux/proc_fs.h>
81892+#include <linux/lglock.h>
81893+#include <linux/slab.h>
81894+#include <linux/vmalloc.h>
81895+#include <linux/types.h>
81896+#include <linux/sysctl.h>
81897+#include <linux/netdevice.h>
81898+#include <linux/ptrace.h>
81899+#include <linux/gracl.h>
81900+#include <linux/gralloc.h>
81901+#include <linux/security.h>
81902+#include <linux/grinternal.h>
81903+#include <linux/pid_namespace.h>
81904+#include <linux/stop_machine.h>
81905+#include <linux/fdtable.h>
81906+#include <linux/percpu.h>
81907+#include <linux/lglock.h>
81908+#include <linux/hugetlb.h>
81909+#include <linux/posix-timers.h>
81910+#include "../fs/mount.h"
81911+
81912+#include <asm/uaccess.h>
81913+#include <asm/errno.h>
81914+#include <asm/mman.h>
81915+
81916+extern struct gr_policy_state *polstate;
81917+
81918+#define FOR_EACH_ROLE_START(role) \
81919+ role = polstate->role_list; \
81920+ while (role) {
81921+
81922+#define FOR_EACH_ROLE_END(role) \
81923+ role = role->prev; \
81924+ }
81925+
81926+struct path gr_real_root;
81927+
81928+extern struct gr_alloc_state *current_alloc_state;
81929+
81930+u16 acl_sp_role_value;
81931+
81932+static DEFINE_MUTEX(gr_dev_mutex);
81933+
81934+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
81935+extern void gr_clear_learn_entries(void);
81936+
81937+struct gr_arg *gr_usermode __read_only;
81938+unsigned char *gr_system_salt __read_only;
81939+unsigned char *gr_system_sum __read_only;
81940+
81941+static unsigned int gr_auth_attempts = 0;
81942+static unsigned long gr_auth_expires = 0UL;
81943+
81944+struct acl_object_label *fakefs_obj_rw;
81945+struct acl_object_label *fakefs_obj_rwx;
81946+
81947+extern int gr_init_uidset(void);
81948+extern void gr_free_uidset(void);
81949+extern void gr_remove_uid(uid_t uid);
81950+extern int gr_find_uid(uid_t uid);
81951+
81952+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);
81953+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
81954+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
81955+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
81956+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);
81957+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
81958+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
81959+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
81960+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
81961+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
81962+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
81963+extern void assign_special_role(const char *rolename);
81964+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
81965+extern int gr_rbac_disable(void *unused);
81966+extern void gr_enable_rbac_system(void);
81967+
81968+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
81969+{
81970+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
81971+ return -EFAULT;
81972+
81973+ return 0;
81974+}
81975+
81976+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
81977+{
81978+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
81979+ return -EFAULT;
81980+
81981+ return 0;
81982+}
81983+
81984+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
81985+{
81986+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
81987+ return -EFAULT;
81988+
81989+ return 0;
81990+}
81991+
81992+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
81993+{
81994+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
81995+ return -EFAULT;
81996+
81997+ return 0;
81998+}
81999+
82000+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
82001+{
82002+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
82003+ return -EFAULT;
82004+
82005+ return 0;
82006+}
82007+
82008+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
82009+{
82010+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
82011+ return -EFAULT;
82012+
82013+ return 0;
82014+}
82015+
82016+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
82017+{
82018+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
82019+ return -EFAULT;
82020+
82021+ return 0;
82022+}
82023+
82024+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
82025+{
82026+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
82027+ return -EFAULT;
82028+
82029+ return 0;
82030+}
82031+
82032+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
82033+{
82034+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
82035+ return -EFAULT;
82036+
82037+ return 0;
82038+}
82039+
82040+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
82041+{
82042+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
82043+ return -EFAULT;
82044+
82045+ if ((uwrap->version != GRSECURITY_VERSION) ||
82046+ (uwrap->size != sizeof(struct gr_arg)))
82047+ return -EINVAL;
82048+
82049+ return 0;
82050+}
82051+
82052+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
82053+{
82054+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
82055+ return -EFAULT;
82056+
82057+ return 0;
82058+}
82059+
82060+static size_t get_gr_arg_wrapper_size_normal(void)
82061+{
82062+ return sizeof(struct gr_arg_wrapper);
82063+}
82064+
82065+#ifdef CONFIG_COMPAT
82066+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
82067+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
82068+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
82069+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
82070+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
82071+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
82072+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
82073+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
82074+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
82075+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
82076+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
82077+extern size_t get_gr_arg_wrapper_size_compat(void);
82078+
82079+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
82080+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
82081+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
82082+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
82083+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
82084+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
82085+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
82086+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
82087+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
82088+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
82089+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
82090+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
82091+
82092+#else
82093+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
82094+#define copy_gr_arg copy_gr_arg_normal
82095+#define copy_gr_hash_struct copy_gr_hash_struct_normal
82096+#define copy_acl_object_label copy_acl_object_label_normal
82097+#define copy_acl_subject_label copy_acl_subject_label_normal
82098+#define copy_acl_role_label copy_acl_role_label_normal
82099+#define copy_acl_ip_label copy_acl_ip_label_normal
82100+#define copy_pointer_from_array copy_pointer_from_array_normal
82101+#define copy_sprole_pw copy_sprole_pw_normal
82102+#define copy_role_transition copy_role_transition_normal
82103+#define copy_role_allowed_ip copy_role_allowed_ip_normal
82104+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
82105+#endif
82106+
82107+static struct acl_subject_label *
82108+lookup_subject_map(const struct acl_subject_label *userp)
82109+{
82110+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
82111+ struct subject_map *match;
82112+
82113+ match = polstate->subj_map_set.s_hash[index];
82114+
82115+ while (match && match->user != userp)
82116+ match = match->next;
82117+
82118+ if (match != NULL)
82119+ return match->kernel;
82120+ else
82121+ return NULL;
82122+}
82123+
82124+static void
82125+insert_subj_map_entry(struct subject_map *subjmap)
82126+{
82127+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
82128+ struct subject_map **curr;
82129+
82130+ subjmap->prev = NULL;
82131+
82132+ curr = &polstate->subj_map_set.s_hash[index];
82133+ if (*curr != NULL)
82134+ (*curr)->prev = subjmap;
82135+
82136+ subjmap->next = *curr;
82137+ *curr = subjmap;
82138+
82139+ return;
82140+}
82141+
82142+static void
82143+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
82144+{
82145+ unsigned int index =
82146+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
82147+ struct acl_role_label **curr;
82148+ struct acl_role_label *tmp, *tmp2;
82149+
82150+ curr = &polstate->acl_role_set.r_hash[index];
82151+
82152+ /* simple case, slot is empty, just set it to our role */
82153+ if (*curr == NULL) {
82154+ *curr = role;
82155+ } else {
82156+ /* example:
82157+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
82158+ 2 -> 3
82159+ */
82160+ /* first check to see if we can already be reached via this slot */
82161+ tmp = *curr;
82162+ while (tmp && tmp != role)
82163+ tmp = tmp->next;
82164+ if (tmp == role) {
82165+ /* we don't need to add ourselves to this slot's chain */
82166+ return;
82167+ }
82168+ /* we need to add ourselves to this chain, two cases */
82169+ if (role->next == NULL) {
82170+ /* simple case, append the current chain to our role */
82171+ role->next = *curr;
82172+ *curr = role;
82173+ } else {
82174+ /* 1 -> 2 -> 3 -> 4
82175+ 2 -> 3 -> 4
82176+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
82177+ */
82178+ /* trickier case: walk our role's chain until we find
82179+ the role for the start of the current slot's chain */
82180+ tmp = role;
82181+ tmp2 = *curr;
82182+ while (tmp->next && tmp->next != tmp2)
82183+ tmp = tmp->next;
82184+ if (tmp->next == tmp2) {
82185+ /* from example above, we found 3, so just
82186+ replace this slot's chain with ours */
82187+ *curr = role;
82188+ } else {
82189+ /* we didn't find a subset of our role's chain
82190+ in the current slot's chain, so append their
82191+ chain to ours, and set us as the first role in
82192+ the slot's chain
82193+
82194+ we could fold this case with the case above,
82195+ but making it explicit for clarity
82196+ */
82197+ tmp->next = tmp2;
82198+ *curr = role;
82199+ }
82200+ }
82201+ }
82202+
82203+ return;
82204+}
82205+
82206+static void
82207+insert_acl_role_label(struct acl_role_label *role)
82208+{
82209+ int i;
82210+
82211+ if (polstate->role_list == NULL) {
82212+ polstate->role_list = role;
82213+ role->prev = NULL;
82214+ } else {
82215+ role->prev = polstate->role_list;
82216+ polstate->role_list = role;
82217+ }
82218+
82219+ /* used for hash chains */
82220+ role->next = NULL;
82221+
82222+ if (role->roletype & GR_ROLE_DOMAIN) {
82223+ for (i = 0; i < role->domain_child_num; i++)
82224+ __insert_acl_role_label(role, role->domain_children[i]);
82225+ } else
82226+ __insert_acl_role_label(role, role->uidgid);
82227+}
82228+
82229+static int
82230+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
82231+{
82232+ struct name_entry **curr, *nentry;
82233+ struct inodev_entry *ientry;
82234+ unsigned int len = strlen(name);
82235+ unsigned int key = full_name_hash(name, len);
82236+ unsigned int index = key % polstate->name_set.n_size;
82237+
82238+ curr = &polstate->name_set.n_hash[index];
82239+
82240+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
82241+ curr = &((*curr)->next);
82242+
82243+ if (*curr != NULL)
82244+ return 1;
82245+
82246+ nentry = acl_alloc(sizeof (struct name_entry));
82247+ if (nentry == NULL)
82248+ return 0;
82249+ ientry = acl_alloc(sizeof (struct inodev_entry));
82250+ if (ientry == NULL)
82251+ return 0;
82252+ ientry->nentry = nentry;
82253+
82254+ nentry->key = key;
82255+ nentry->name = name;
82256+ nentry->inode = inode;
82257+ nentry->device = device;
82258+ nentry->len = len;
82259+ nentry->deleted = deleted;
82260+
82261+ nentry->prev = NULL;
82262+ curr = &polstate->name_set.n_hash[index];
82263+ if (*curr != NULL)
82264+ (*curr)->prev = nentry;
82265+ nentry->next = *curr;
82266+ *curr = nentry;
82267+
82268+ /* insert us into the table searchable by inode/dev */
82269+ __insert_inodev_entry(polstate, ientry);
82270+
82271+ return 1;
82272+}
82273+
82274+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
82275+
82276+static void *
82277+create_table(__u32 * len, int elementsize)
82278+{
82279+ unsigned int table_sizes[] = {
82280+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
82281+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
82282+ 4194301, 8388593, 16777213, 33554393, 67108859
82283+ };
82284+ void *newtable = NULL;
82285+ unsigned int pwr = 0;
82286+
82287+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
82288+ table_sizes[pwr] <= *len)
82289+ pwr++;
82290+
82291+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
82292+ return newtable;
82293+
82294+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
82295+ newtable =
82296+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
82297+ else
82298+ newtable = vmalloc(table_sizes[pwr] * elementsize);
82299+
82300+ *len = table_sizes[pwr];
82301+
82302+ return newtable;
82303+}
82304+
82305+static int
82306+init_variables(const struct gr_arg *arg, bool reload)
82307+{
82308+ struct task_struct *reaper = init_pid_ns.child_reaper;
82309+ unsigned int stacksize;
82310+
82311+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
82312+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
82313+ polstate->name_set.n_size = arg->role_db.num_objects;
82314+ polstate->inodev_set.i_size = arg->role_db.num_objects;
82315+
82316+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
82317+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
82318+ return 1;
82319+
82320+ if (!reload) {
82321+ if (!gr_init_uidset())
82322+ return 1;
82323+ }
82324+
82325+ /* set up the stack that holds allocation info */
82326+
82327+ stacksize = arg->role_db.num_pointers + 5;
82328+
82329+ if (!acl_alloc_stack_init(stacksize))
82330+ return 1;
82331+
82332+ if (!reload) {
82333+ /* grab reference for the real root dentry and vfsmount */
82334+ get_fs_root(reaper->fs, &gr_real_root);
82335+
82336+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
82337+ 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);
82338+#endif
82339+
82340+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
82341+ if (fakefs_obj_rw == NULL)
82342+ return 1;
82343+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
82344+
82345+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
82346+ if (fakefs_obj_rwx == NULL)
82347+ return 1;
82348+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
82349+ }
82350+
82351+ polstate->subj_map_set.s_hash =
82352+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
82353+ polstate->acl_role_set.r_hash =
82354+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
82355+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
82356+ polstate->inodev_set.i_hash =
82357+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
82358+
82359+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
82360+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
82361+ return 1;
82362+
82363+ memset(polstate->subj_map_set.s_hash, 0,
82364+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
82365+ memset(polstate->acl_role_set.r_hash, 0,
82366+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
82367+ memset(polstate->name_set.n_hash, 0,
82368+ sizeof (struct name_entry *) * polstate->name_set.n_size);
82369+ memset(polstate->inodev_set.i_hash, 0,
82370+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
82371+
82372+ return 0;
82373+}
82374+
82375+/* free information not needed after startup
82376+ currently contains user->kernel pointer mappings for subjects
82377+*/
82378+
82379+static void
82380+free_init_variables(void)
82381+{
82382+ __u32 i;
82383+
82384+ if (polstate->subj_map_set.s_hash) {
82385+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
82386+ if (polstate->subj_map_set.s_hash[i]) {
82387+ kfree(polstate->subj_map_set.s_hash[i]);
82388+ polstate->subj_map_set.s_hash[i] = NULL;
82389+ }
82390+ }
82391+
82392+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
82393+ PAGE_SIZE)
82394+ kfree(polstate->subj_map_set.s_hash);
82395+ else
82396+ vfree(polstate->subj_map_set.s_hash);
82397+ }
82398+
82399+ return;
82400+}
82401+
82402+static void
82403+free_variables(bool reload)
82404+{
82405+ struct acl_subject_label *s;
82406+ struct acl_role_label *r;
82407+ struct task_struct *task, *task2;
82408+ unsigned int x;
82409+
82410+ if (!reload) {
82411+ gr_clear_learn_entries();
82412+
82413+ read_lock(&tasklist_lock);
82414+ do_each_thread(task2, task) {
82415+ task->acl_sp_role = 0;
82416+ task->acl_role_id = 0;
82417+ task->inherited = 0;
82418+ task->acl = NULL;
82419+ task->role = NULL;
82420+ } while_each_thread(task2, task);
82421+ read_unlock(&tasklist_lock);
82422+
82423+ kfree(fakefs_obj_rw);
82424+ fakefs_obj_rw = NULL;
82425+ kfree(fakefs_obj_rwx);
82426+ fakefs_obj_rwx = NULL;
82427+
82428+ /* release the reference to the real root dentry and vfsmount */
82429+ path_put(&gr_real_root);
82430+ memset(&gr_real_root, 0, sizeof(gr_real_root));
82431+ }
82432+
82433+ /* free all object hash tables */
82434+
82435+ FOR_EACH_ROLE_START(r)
82436+ if (r->subj_hash == NULL)
82437+ goto next_role;
82438+ FOR_EACH_SUBJECT_START(r, s, x)
82439+ if (s->obj_hash == NULL)
82440+ break;
82441+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
82442+ kfree(s->obj_hash);
82443+ else
82444+ vfree(s->obj_hash);
82445+ FOR_EACH_SUBJECT_END(s, x)
82446+ FOR_EACH_NESTED_SUBJECT_START(r, s)
82447+ if (s->obj_hash == NULL)
82448+ break;
82449+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
82450+ kfree(s->obj_hash);
82451+ else
82452+ vfree(s->obj_hash);
82453+ FOR_EACH_NESTED_SUBJECT_END(s)
82454+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
82455+ kfree(r->subj_hash);
82456+ else
82457+ vfree(r->subj_hash);
82458+ r->subj_hash = NULL;
82459+next_role:
82460+ FOR_EACH_ROLE_END(r)
82461+
82462+ acl_free_all();
82463+
82464+ if (polstate->acl_role_set.r_hash) {
82465+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
82466+ PAGE_SIZE)
82467+ kfree(polstate->acl_role_set.r_hash);
82468+ else
82469+ vfree(polstate->acl_role_set.r_hash);
82470+ }
82471+ if (polstate->name_set.n_hash) {
82472+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
82473+ PAGE_SIZE)
82474+ kfree(polstate->name_set.n_hash);
82475+ else
82476+ vfree(polstate->name_set.n_hash);
82477+ }
82478+
82479+ if (polstate->inodev_set.i_hash) {
82480+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
82481+ PAGE_SIZE)
82482+ kfree(polstate->inodev_set.i_hash);
82483+ else
82484+ vfree(polstate->inodev_set.i_hash);
82485+ }
82486+
82487+ if (!reload)
82488+ gr_free_uidset();
82489+
82490+ memset(&polstate->name_set, 0, sizeof (struct name_db));
82491+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
82492+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
82493+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
82494+
82495+ polstate->default_role = NULL;
82496+ polstate->kernel_role = NULL;
82497+ polstate->role_list = NULL;
82498+
82499+ return;
82500+}
82501+
82502+static struct acl_subject_label *
82503+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
82504+
82505+static int alloc_and_copy_string(char **name, unsigned int maxlen)
82506+{
82507+ unsigned int len = strnlen_user(*name, maxlen);
82508+ char *tmp;
82509+
82510+ if (!len || len >= maxlen)
82511+ return -EINVAL;
82512+
82513+ if ((tmp = (char *) acl_alloc(len)) == NULL)
82514+ return -ENOMEM;
82515+
82516+ if (copy_from_user(tmp, *name, len))
82517+ return -EFAULT;
82518+
82519+ tmp[len-1] = '\0';
82520+ *name = tmp;
82521+
82522+ return 0;
82523+}
82524+
82525+static int
82526+copy_user_glob(struct acl_object_label *obj)
82527+{
82528+ struct acl_object_label *g_tmp, **guser;
82529+ int error;
82530+
82531+ if (obj->globbed == NULL)
82532+ return 0;
82533+
82534+ guser = &obj->globbed;
82535+ while (*guser) {
82536+ g_tmp = (struct acl_object_label *)
82537+ acl_alloc(sizeof (struct acl_object_label));
82538+ if (g_tmp == NULL)
82539+ return -ENOMEM;
82540+
82541+ if (copy_acl_object_label(g_tmp, *guser))
82542+ return -EFAULT;
82543+
82544+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
82545+ if (error)
82546+ return error;
82547+
82548+ *guser = g_tmp;
82549+ guser = &(g_tmp->next);
82550+ }
82551+
82552+ return 0;
82553+}
82554+
82555+static int
82556+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
82557+ struct acl_role_label *role)
82558+{
82559+ struct acl_object_label *o_tmp;
82560+ int ret;
82561+
82562+ while (userp) {
82563+ if ((o_tmp = (struct acl_object_label *)
82564+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
82565+ return -ENOMEM;
82566+
82567+ if (copy_acl_object_label(o_tmp, userp))
82568+ return -EFAULT;
82569+
82570+ userp = o_tmp->prev;
82571+
82572+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
82573+ if (ret)
82574+ return ret;
82575+
82576+ insert_acl_obj_label(o_tmp, subj);
82577+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
82578+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
82579+ return -ENOMEM;
82580+
82581+ ret = copy_user_glob(o_tmp);
82582+ if (ret)
82583+ return ret;
82584+
82585+ if (o_tmp->nested) {
82586+ int already_copied;
82587+
82588+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
82589+ if (IS_ERR(o_tmp->nested))
82590+ return PTR_ERR(o_tmp->nested);
82591+
82592+ /* insert into nested subject list if we haven't copied this one yet
82593+ to prevent duplicate entries */
82594+ if (!already_copied) {
82595+ o_tmp->nested->next = role->hash->first;
82596+ role->hash->first = o_tmp->nested;
82597+ }
82598+ }
82599+ }
82600+
82601+ return 0;
82602+}
82603+
82604+static __u32
82605+count_user_subjs(struct acl_subject_label *userp)
82606+{
82607+ struct acl_subject_label s_tmp;
82608+ __u32 num = 0;
82609+
82610+ while (userp) {
82611+ if (copy_acl_subject_label(&s_tmp, userp))
82612+ break;
82613+
82614+ userp = s_tmp.prev;
82615+ }
82616+
82617+ return num;
82618+}
82619+
82620+static int
82621+copy_user_allowedips(struct acl_role_label *rolep)
82622+{
82623+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
82624+
82625+ ruserip = rolep->allowed_ips;
82626+
82627+ while (ruserip) {
82628+ rlast = rtmp;
82629+
82630+ if ((rtmp = (struct role_allowed_ip *)
82631+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
82632+ return -ENOMEM;
82633+
82634+ if (copy_role_allowed_ip(rtmp, ruserip))
82635+ return -EFAULT;
82636+
82637+ ruserip = rtmp->prev;
82638+
82639+ if (!rlast) {
82640+ rtmp->prev = NULL;
82641+ rolep->allowed_ips = rtmp;
82642+ } else {
82643+ rlast->next = rtmp;
82644+ rtmp->prev = rlast;
82645+ }
82646+
82647+ if (!ruserip)
82648+ rtmp->next = NULL;
82649+ }
82650+
82651+ return 0;
82652+}
82653+
82654+static int
82655+copy_user_transitions(struct acl_role_label *rolep)
82656+{
82657+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
82658+ int error;
82659+
82660+ rusertp = rolep->transitions;
82661+
82662+ while (rusertp) {
82663+ rlast = rtmp;
82664+
82665+ if ((rtmp = (struct role_transition *)
82666+ acl_alloc(sizeof (struct role_transition))) == NULL)
82667+ return -ENOMEM;
82668+
82669+ if (copy_role_transition(rtmp, rusertp))
82670+ return -EFAULT;
82671+
82672+ rusertp = rtmp->prev;
82673+
82674+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
82675+ if (error)
82676+ return error;
82677+
82678+ if (!rlast) {
82679+ rtmp->prev = NULL;
82680+ rolep->transitions = rtmp;
82681+ } else {
82682+ rlast->next = rtmp;
82683+ rtmp->prev = rlast;
82684+ }
82685+
82686+ if (!rusertp)
82687+ rtmp->next = NULL;
82688+ }
82689+
82690+ return 0;
82691+}
82692+
82693+static __u32 count_user_objs(const struct acl_object_label __user *userp)
82694+{
82695+ struct acl_object_label o_tmp;
82696+ __u32 num = 0;
82697+
82698+ while (userp) {
82699+ if (copy_acl_object_label(&o_tmp, userp))
82700+ break;
82701+
82702+ userp = o_tmp.prev;
82703+ num++;
82704+ }
82705+
82706+ return num;
82707+}
82708+
82709+static struct acl_subject_label *
82710+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
82711+{
82712+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
82713+ __u32 num_objs;
82714+ struct acl_ip_label **i_tmp, *i_utmp2;
82715+ struct gr_hash_struct ghash;
82716+ struct subject_map *subjmap;
82717+ unsigned int i_num;
82718+ int err;
82719+
82720+ if (already_copied != NULL)
82721+ *already_copied = 0;
82722+
82723+ s_tmp = lookup_subject_map(userp);
82724+
82725+ /* we've already copied this subject into the kernel, just return
82726+ the reference to it, and don't copy it over again
82727+ */
82728+ if (s_tmp) {
82729+ if (already_copied != NULL)
82730+ *already_copied = 1;
82731+ return(s_tmp);
82732+ }
82733+
82734+ if ((s_tmp = (struct acl_subject_label *)
82735+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
82736+ return ERR_PTR(-ENOMEM);
82737+
82738+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
82739+ if (subjmap == NULL)
82740+ return ERR_PTR(-ENOMEM);
82741+
82742+ subjmap->user = userp;
82743+ subjmap->kernel = s_tmp;
82744+ insert_subj_map_entry(subjmap);
82745+
82746+ if (copy_acl_subject_label(s_tmp, userp))
82747+ return ERR_PTR(-EFAULT);
82748+
82749+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
82750+ if (err)
82751+ return ERR_PTR(err);
82752+
82753+ if (!strcmp(s_tmp->filename, "/"))
82754+ role->root_label = s_tmp;
82755+
82756+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
82757+ return ERR_PTR(-EFAULT);
82758+
82759+ /* copy user and group transition tables */
82760+
82761+ if (s_tmp->user_trans_num) {
82762+ uid_t *uidlist;
82763+
82764+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
82765+ if (uidlist == NULL)
82766+ return ERR_PTR(-ENOMEM);
82767+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
82768+ return ERR_PTR(-EFAULT);
82769+
82770+ s_tmp->user_transitions = uidlist;
82771+ }
82772+
82773+ if (s_tmp->group_trans_num) {
82774+ gid_t *gidlist;
82775+
82776+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
82777+ if (gidlist == NULL)
82778+ return ERR_PTR(-ENOMEM);
82779+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
82780+ return ERR_PTR(-EFAULT);
82781+
82782+ s_tmp->group_transitions = gidlist;
82783+ }
82784+
82785+ /* set up object hash table */
82786+ num_objs = count_user_objs(ghash.first);
82787+
82788+ s_tmp->obj_hash_size = num_objs;
82789+ s_tmp->obj_hash =
82790+ (struct acl_object_label **)
82791+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
82792+
82793+ if (!s_tmp->obj_hash)
82794+ return ERR_PTR(-ENOMEM);
82795+
82796+ memset(s_tmp->obj_hash, 0,
82797+ s_tmp->obj_hash_size *
82798+ sizeof (struct acl_object_label *));
82799+
82800+ /* add in objects */
82801+ err = copy_user_objs(ghash.first, s_tmp, role);
82802+
82803+ if (err)
82804+ return ERR_PTR(err);
82805+
82806+ /* set pointer for parent subject */
82807+ if (s_tmp->parent_subject) {
82808+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
82809+
82810+ if (IS_ERR(s_tmp2))
82811+ return s_tmp2;
82812+
82813+ s_tmp->parent_subject = s_tmp2;
82814+ }
82815+
82816+ /* add in ip acls */
82817+
82818+ if (!s_tmp->ip_num) {
82819+ s_tmp->ips = NULL;
82820+ goto insert;
82821+ }
82822+
82823+ i_tmp =
82824+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
82825+ sizeof (struct acl_ip_label *));
82826+
82827+ if (!i_tmp)
82828+ return ERR_PTR(-ENOMEM);
82829+
82830+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
82831+ *(i_tmp + i_num) =
82832+ (struct acl_ip_label *)
82833+ acl_alloc(sizeof (struct acl_ip_label));
82834+ if (!*(i_tmp + i_num))
82835+ return ERR_PTR(-ENOMEM);
82836+
82837+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
82838+ return ERR_PTR(-EFAULT);
82839+
82840+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
82841+ return ERR_PTR(-EFAULT);
82842+
82843+ if ((*(i_tmp + i_num))->iface == NULL)
82844+ continue;
82845+
82846+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
82847+ if (err)
82848+ return ERR_PTR(err);
82849+ }
82850+
82851+ s_tmp->ips = i_tmp;
82852+
82853+insert:
82854+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
82855+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
82856+ return ERR_PTR(-ENOMEM);
82857+
82858+ return s_tmp;
82859+}
82860+
82861+static int
82862+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
82863+{
82864+ struct acl_subject_label s_pre;
82865+ struct acl_subject_label * ret;
82866+ int err;
82867+
82868+ while (userp) {
82869+ if (copy_acl_subject_label(&s_pre, userp))
82870+ return -EFAULT;
82871+
82872+ ret = do_copy_user_subj(userp, role, NULL);
82873+
82874+ err = PTR_ERR(ret);
82875+ if (IS_ERR(ret))
82876+ return err;
82877+
82878+ insert_acl_subj_label(ret, role);
82879+
82880+ userp = s_pre.prev;
82881+ }
82882+
82883+ return 0;
82884+}
82885+
82886+static int
82887+copy_user_acl(struct gr_arg *arg)
82888+{
82889+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
82890+ struct acl_subject_label *subj_list;
82891+ struct sprole_pw *sptmp;
82892+ struct gr_hash_struct *ghash;
82893+ uid_t *domainlist;
82894+ unsigned int r_num;
82895+ int err = 0;
82896+ __u16 i;
82897+ __u32 num_subjs;
82898+
82899+ /* we need a default and kernel role */
82900+ if (arg->role_db.num_roles < 2)
82901+ return -EINVAL;
82902+
82903+ /* copy special role authentication info from userspace */
82904+
82905+ polstate->num_sprole_pws = arg->num_sprole_pws;
82906+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
82907+
82908+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
82909+ return -ENOMEM;
82910+
82911+ for (i = 0; i < polstate->num_sprole_pws; i++) {
82912+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
82913+ if (!sptmp)
82914+ return -ENOMEM;
82915+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
82916+ return -EFAULT;
82917+
82918+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
82919+ if (err)
82920+ return err;
82921+
82922+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
82923+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
82924+#endif
82925+
82926+ polstate->acl_special_roles[i] = sptmp;
82927+ }
82928+
82929+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
82930+
82931+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
82932+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
82933+
82934+ if (!r_tmp)
82935+ return -ENOMEM;
82936+
82937+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
82938+ return -EFAULT;
82939+
82940+ if (copy_acl_role_label(r_tmp, r_utmp2))
82941+ return -EFAULT;
82942+
82943+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
82944+ if (err)
82945+ return err;
82946+
82947+ if (!strcmp(r_tmp->rolename, "default")
82948+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
82949+ polstate->default_role = r_tmp;
82950+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
82951+ polstate->kernel_role = r_tmp;
82952+ }
82953+
82954+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
82955+ return -ENOMEM;
82956+
82957+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
82958+ return -EFAULT;
82959+
82960+ r_tmp->hash = ghash;
82961+
82962+ num_subjs = count_user_subjs(r_tmp->hash->first);
82963+
82964+ r_tmp->subj_hash_size = num_subjs;
82965+ r_tmp->subj_hash =
82966+ (struct acl_subject_label **)
82967+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
82968+
82969+ if (!r_tmp->subj_hash)
82970+ return -ENOMEM;
82971+
82972+ err = copy_user_allowedips(r_tmp);
82973+ if (err)
82974+ return err;
82975+
82976+ /* copy domain info */
82977+ if (r_tmp->domain_children != NULL) {
82978+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
82979+ if (domainlist == NULL)
82980+ return -ENOMEM;
82981+
82982+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
82983+ return -EFAULT;
82984+
82985+ r_tmp->domain_children = domainlist;
82986+ }
82987+
82988+ err = copy_user_transitions(r_tmp);
82989+ if (err)
82990+ return err;
82991+
82992+ memset(r_tmp->subj_hash, 0,
82993+ r_tmp->subj_hash_size *
82994+ sizeof (struct acl_subject_label *));
82995+
82996+ /* acquire the list of subjects, then NULL out
82997+ the list prior to parsing the subjects for this role,
82998+ as during this parsing the list is replaced with a list
82999+ of *nested* subjects for the role
83000+ */
83001+ subj_list = r_tmp->hash->first;
83002+
83003+ /* set nested subject list to null */
83004+ r_tmp->hash->first = NULL;
83005+
83006+ err = copy_user_subjs(subj_list, r_tmp);
83007+
83008+ if (err)
83009+ return err;
83010+
83011+ insert_acl_role_label(r_tmp);
83012+ }
83013+
83014+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
83015+ return -EINVAL;
83016+
83017+ return err;
83018+}
83019+
83020+static int gracl_reload_apply_policies(void *reload)
83021+{
83022+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
83023+ struct task_struct *task, *task2;
83024+ struct acl_role_label *role, *rtmp;
83025+ struct acl_subject_label *subj;
83026+ const struct cred *cred;
83027+ int role_applied;
83028+ int ret = 0;
83029+
83030+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
83031+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
83032+
83033+ /* first make sure we'll be able to apply the new policy cleanly */
83034+ do_each_thread(task2, task) {
83035+ if (task->exec_file == NULL)
83036+ continue;
83037+ role_applied = 0;
83038+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
83039+ /* preserve special roles */
83040+ FOR_EACH_ROLE_START(role)
83041+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
83042+ rtmp = task->role;
83043+ task->role = role;
83044+ role_applied = 1;
83045+ break;
83046+ }
83047+ FOR_EACH_ROLE_END(role)
83048+ }
83049+ if (!role_applied) {
83050+ cred = __task_cred(task);
83051+ rtmp = task->role;
83052+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83053+ }
83054+ /* this handles non-nested inherited subjects, nested subjects will still
83055+ be dropped currently */
83056+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
83057+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
83058+ /* change the role back so that we've made no modifications to the policy */
83059+ task->role = rtmp;
83060+
83061+ if (subj == NULL || task->tmpacl == NULL) {
83062+ ret = -EINVAL;
83063+ goto out;
83064+ }
83065+ } while_each_thread(task2, task);
83066+
83067+ /* now actually apply the policy */
83068+
83069+ do_each_thread(task2, task) {
83070+ if (task->exec_file) {
83071+ role_applied = 0;
83072+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
83073+ /* preserve special roles */
83074+ FOR_EACH_ROLE_START(role)
83075+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
83076+ task->role = role;
83077+ role_applied = 1;
83078+ break;
83079+ }
83080+ FOR_EACH_ROLE_END(role)
83081+ }
83082+ if (!role_applied) {
83083+ cred = __task_cred(task);
83084+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83085+ }
83086+ /* this handles non-nested inherited subjects, nested subjects will still
83087+ be dropped currently */
83088+ if (!reload_state->oldmode && task->inherited)
83089+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
83090+ else {
83091+ /* looked up and tagged to the task previously */
83092+ subj = task->tmpacl;
83093+ }
83094+ /* subj will be non-null */
83095+ __gr_apply_subject_to_task(polstate, task, subj);
83096+ if (reload_state->oldmode) {
83097+ task->acl_role_id = 0;
83098+ task->acl_sp_role = 0;
83099+ task->inherited = 0;
83100+ }
83101+ } else {
83102+ // it's a kernel process
83103+ task->role = polstate->kernel_role;
83104+ task->acl = polstate->kernel_role->root_label;
83105+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
83106+ task->acl->mode &= ~GR_PROCFIND;
83107+#endif
83108+ }
83109+ } while_each_thread(task2, task);
83110+
83111+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
83112+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
83113+
83114+out:
83115+
83116+ return ret;
83117+}
83118+
83119+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
83120+{
83121+ struct gr_reload_state new_reload_state = { };
83122+ int err;
83123+
83124+ new_reload_state.oldpolicy_ptr = polstate;
83125+ new_reload_state.oldalloc_ptr = current_alloc_state;
83126+ new_reload_state.oldmode = oldmode;
83127+
83128+ current_alloc_state = &new_reload_state.newalloc;
83129+ polstate = &new_reload_state.newpolicy;
83130+
83131+ /* everything relevant is now saved off, copy in the new policy */
83132+ if (init_variables(args, true)) {
83133+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
83134+ err = -ENOMEM;
83135+ goto error;
83136+ }
83137+
83138+ err = copy_user_acl(args);
83139+ free_init_variables();
83140+ if (err)
83141+ goto error;
83142+ /* the new policy is copied in, with the old policy available via saved_state
83143+ first go through applying roles, making sure to preserve special roles
83144+ then apply new subjects, making sure to preserve inherited and nested subjects,
83145+ though currently only inherited subjects will be preserved
83146+ */
83147+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
83148+ if (err)
83149+ goto error;
83150+
83151+ /* we've now applied the new policy, so restore the old policy state to free it */
83152+ polstate = &new_reload_state.oldpolicy;
83153+ current_alloc_state = &new_reload_state.oldalloc;
83154+ free_variables(true);
83155+
83156+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
83157+ to running_polstate/current_alloc_state inside stop_machine
83158+ */
83159+ err = 0;
83160+ goto out;
83161+error:
83162+ /* on error of loading the new policy, we'll just keep the previous
83163+ policy set around
83164+ */
83165+ free_variables(true);
83166+
83167+ /* doesn't affect runtime, but maintains consistent state */
83168+out:
83169+ polstate = new_reload_state.oldpolicy_ptr;
83170+ current_alloc_state = new_reload_state.oldalloc_ptr;
83171+
83172+ return err;
83173+}
83174+
83175+static int
83176+gracl_init(struct gr_arg *args)
83177+{
83178+ int error = 0;
83179+
83180+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
83181+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
83182+
83183+ if (init_variables(args, false)) {
83184+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
83185+ error = -ENOMEM;
83186+ goto out;
83187+ }
83188+
83189+ error = copy_user_acl(args);
83190+ free_init_variables();
83191+ if (error)
83192+ goto out;
83193+
83194+ error = gr_set_acls(0);
83195+ if (error)
83196+ goto out;
83197+
83198+ gr_enable_rbac_system();
83199+
83200+ return 0;
83201+
83202+out:
83203+ free_variables(false);
83204+ return error;
83205+}
83206+
83207+static int
83208+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
83209+ unsigned char **sum)
83210+{
83211+ struct acl_role_label *r;
83212+ struct role_allowed_ip *ipp;
83213+ struct role_transition *trans;
83214+ unsigned int i;
83215+ int found = 0;
83216+ u32 curr_ip = current->signal->curr_ip;
83217+
83218+ current->signal->saved_ip = curr_ip;
83219+
83220+ /* check transition table */
83221+
83222+ for (trans = current->role->transitions; trans; trans = trans->next) {
83223+ if (!strcmp(rolename, trans->rolename)) {
83224+ found = 1;
83225+ break;
83226+ }
83227+ }
83228+
83229+ if (!found)
83230+ return 0;
83231+
83232+ /* handle special roles that do not require authentication
83233+ and check ip */
83234+
83235+ FOR_EACH_ROLE_START(r)
83236+ if (!strcmp(rolename, r->rolename) &&
83237+ (r->roletype & GR_ROLE_SPECIAL)) {
83238+ found = 0;
83239+ if (r->allowed_ips != NULL) {
83240+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
83241+ if ((ntohl(curr_ip) & ipp->netmask) ==
83242+ (ntohl(ipp->addr) & ipp->netmask))
83243+ found = 1;
83244+ }
83245+ } else
83246+ found = 2;
83247+ if (!found)
83248+ return 0;
83249+
83250+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
83251+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
83252+ *salt = NULL;
83253+ *sum = NULL;
83254+ return 1;
83255+ }
83256+ }
83257+ FOR_EACH_ROLE_END(r)
83258+
83259+ for (i = 0; i < polstate->num_sprole_pws; i++) {
83260+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
83261+ *salt = polstate->acl_special_roles[i]->salt;
83262+ *sum = polstate->acl_special_roles[i]->sum;
83263+ return 1;
83264+ }
83265+ }
83266+
83267+ return 0;
83268+}
83269+
83270+int gr_check_secure_terminal(struct task_struct *task)
83271+{
83272+ struct task_struct *p, *p2, *p3;
83273+ struct files_struct *files;
83274+ struct fdtable *fdt;
83275+ struct file *our_file = NULL, *file;
83276+ int i;
83277+
83278+ if (task->signal->tty == NULL)
83279+ return 1;
83280+
83281+ files = get_files_struct(task);
83282+ if (files != NULL) {
83283+ rcu_read_lock();
83284+ fdt = files_fdtable(files);
83285+ for (i=0; i < fdt->max_fds; i++) {
83286+ file = fcheck_files(files, i);
83287+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
83288+ get_file(file);
83289+ our_file = file;
83290+ }
83291+ }
83292+ rcu_read_unlock();
83293+ put_files_struct(files);
83294+ }
83295+
83296+ if (our_file == NULL)
83297+ return 1;
83298+
83299+ read_lock(&tasklist_lock);
83300+ do_each_thread(p2, p) {
83301+ files = get_files_struct(p);
83302+ if (files == NULL ||
83303+ (p->signal && p->signal->tty == task->signal->tty)) {
83304+ if (files != NULL)
83305+ put_files_struct(files);
83306+ continue;
83307+ }
83308+ rcu_read_lock();
83309+ fdt = files_fdtable(files);
83310+ for (i=0; i < fdt->max_fds; i++) {
83311+ file = fcheck_files(files, i);
83312+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
83313+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
83314+ p3 = task;
83315+ while (task_pid_nr(p3) > 0) {
83316+ if (p3 == p)
83317+ break;
83318+ p3 = p3->real_parent;
83319+ }
83320+ if (p3 == p)
83321+ break;
83322+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
83323+ gr_handle_alertkill(p);
83324+ rcu_read_unlock();
83325+ put_files_struct(files);
83326+ read_unlock(&tasklist_lock);
83327+ fput(our_file);
83328+ return 0;
83329+ }
83330+ }
83331+ rcu_read_unlock();
83332+ put_files_struct(files);
83333+ } while_each_thread(p2, p);
83334+ read_unlock(&tasklist_lock);
83335+
83336+ fput(our_file);
83337+ return 1;
83338+}
83339+
83340+ssize_t
83341+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
83342+{
83343+ struct gr_arg_wrapper uwrap;
83344+ unsigned char *sprole_salt = NULL;
83345+ unsigned char *sprole_sum = NULL;
83346+ int error = 0;
83347+ int error2 = 0;
83348+ size_t req_count = 0;
83349+ unsigned char oldmode = 0;
83350+
83351+ mutex_lock(&gr_dev_mutex);
83352+
83353+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
83354+ error = -EPERM;
83355+ goto out;
83356+ }
83357+
83358+#ifdef CONFIG_COMPAT
83359+ pax_open_kernel();
83360+ if (is_compat_task()) {
83361+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
83362+ copy_gr_arg = &copy_gr_arg_compat;
83363+ copy_acl_object_label = &copy_acl_object_label_compat;
83364+ copy_acl_subject_label = &copy_acl_subject_label_compat;
83365+ copy_acl_role_label = &copy_acl_role_label_compat;
83366+ copy_acl_ip_label = &copy_acl_ip_label_compat;
83367+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
83368+ copy_role_transition = &copy_role_transition_compat;
83369+ copy_sprole_pw = &copy_sprole_pw_compat;
83370+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
83371+ copy_pointer_from_array = &copy_pointer_from_array_compat;
83372+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
83373+ } else {
83374+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
83375+ copy_gr_arg = &copy_gr_arg_normal;
83376+ copy_acl_object_label = &copy_acl_object_label_normal;
83377+ copy_acl_subject_label = &copy_acl_subject_label_normal;
83378+ copy_acl_role_label = &copy_acl_role_label_normal;
83379+ copy_acl_ip_label = &copy_acl_ip_label_normal;
83380+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
83381+ copy_role_transition = &copy_role_transition_normal;
83382+ copy_sprole_pw = &copy_sprole_pw_normal;
83383+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
83384+ copy_pointer_from_array = &copy_pointer_from_array_normal;
83385+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
83386+ }
83387+ pax_close_kernel();
83388+#endif
83389+
83390+ req_count = get_gr_arg_wrapper_size();
83391+
83392+ if (count != req_count) {
83393+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
83394+ error = -EINVAL;
83395+ goto out;
83396+ }
83397+
83398+
83399+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
83400+ gr_auth_expires = 0;
83401+ gr_auth_attempts = 0;
83402+ }
83403+
83404+ error = copy_gr_arg_wrapper(buf, &uwrap);
83405+ if (error)
83406+ goto out;
83407+
83408+ error = copy_gr_arg(uwrap.arg, gr_usermode);
83409+ if (error)
83410+ goto out;
83411+
83412+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
83413+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
83414+ time_after(gr_auth_expires, get_seconds())) {
83415+ error = -EBUSY;
83416+ goto out;
83417+ }
83418+
83419+ /* if non-root trying to do anything other than use a special role,
83420+ do not attempt authentication, do not count towards authentication
83421+ locking
83422+ */
83423+
83424+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
83425+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
83426+ gr_is_global_nonroot(current_uid())) {
83427+ error = -EPERM;
83428+ goto out;
83429+ }
83430+
83431+ /* ensure pw and special role name are null terminated */
83432+
83433+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
83434+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
83435+
83436+ /* Okay.
83437+ * We have our enough of the argument structure..(we have yet
83438+ * to copy_from_user the tables themselves) . Copy the tables
83439+ * only if we need them, i.e. for loading operations. */
83440+
83441+ switch (gr_usermode->mode) {
83442+ case GR_STATUS:
83443+ if (gr_acl_is_enabled()) {
83444+ error = 1;
83445+ if (!gr_check_secure_terminal(current))
83446+ error = 3;
83447+ } else
83448+ error = 2;
83449+ goto out;
83450+ case GR_SHUTDOWN:
83451+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83452+ stop_machine(gr_rbac_disable, NULL, NULL);
83453+ free_variables(false);
83454+ memset(gr_usermode, 0, sizeof(struct gr_arg));
83455+ memset(gr_system_salt, 0, GR_SALT_LEN);
83456+ memset(gr_system_sum, 0, GR_SHA_LEN);
83457+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
83458+ } else if (gr_acl_is_enabled()) {
83459+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
83460+ error = -EPERM;
83461+ } else {
83462+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
83463+ error = -EAGAIN;
83464+ }
83465+ break;
83466+ case GR_ENABLE:
83467+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
83468+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
83469+ else {
83470+ if (gr_acl_is_enabled())
83471+ error = -EAGAIN;
83472+ else
83473+ error = error2;
83474+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
83475+ }
83476+ break;
83477+ case GR_OLDRELOAD:
83478+ oldmode = 1;
83479+ case GR_RELOAD:
83480+ if (!gr_acl_is_enabled()) {
83481+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
83482+ error = -EAGAIN;
83483+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83484+ error2 = gracl_reload(gr_usermode, oldmode);
83485+ if (!error2)
83486+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
83487+ else {
83488+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
83489+ error = error2;
83490+ }
83491+ } else {
83492+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
83493+ error = -EPERM;
83494+ }
83495+ break;
83496+ case GR_SEGVMOD:
83497+ if (unlikely(!gr_acl_is_enabled())) {
83498+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
83499+ error = -EAGAIN;
83500+ break;
83501+ }
83502+
83503+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83504+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
83505+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
83506+ struct acl_subject_label *segvacl;
83507+ segvacl =
83508+ lookup_acl_subj_label(gr_usermode->segv_inode,
83509+ gr_usermode->segv_device,
83510+ current->role);
83511+ if (segvacl) {
83512+ segvacl->crashes = 0;
83513+ segvacl->expires = 0;
83514+ }
83515+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
83516+ gr_remove_uid(gr_usermode->segv_uid);
83517+ }
83518+ } else {
83519+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
83520+ error = -EPERM;
83521+ }
83522+ break;
83523+ case GR_SPROLE:
83524+ case GR_SPROLEPAM:
83525+ if (unlikely(!gr_acl_is_enabled())) {
83526+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
83527+ error = -EAGAIN;
83528+ break;
83529+ }
83530+
83531+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
83532+ current->role->expires = 0;
83533+ current->role->auth_attempts = 0;
83534+ }
83535+
83536+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
83537+ time_after(current->role->expires, get_seconds())) {
83538+ error = -EBUSY;
83539+ goto out;
83540+ }
83541+
83542+ if (lookup_special_role_auth
83543+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
83544+ && ((!sprole_salt && !sprole_sum)
83545+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
83546+ char *p = "";
83547+ assign_special_role(gr_usermode->sp_role);
83548+ read_lock(&tasklist_lock);
83549+ if (current->real_parent)
83550+ p = current->real_parent->role->rolename;
83551+ read_unlock(&tasklist_lock);
83552+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
83553+ p, acl_sp_role_value);
83554+ } else {
83555+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
83556+ error = -EPERM;
83557+ if(!(current->role->auth_attempts++))
83558+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
83559+
83560+ goto out;
83561+ }
83562+ break;
83563+ case GR_UNSPROLE:
83564+ if (unlikely(!gr_acl_is_enabled())) {
83565+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
83566+ error = -EAGAIN;
83567+ break;
83568+ }
83569+
83570+ if (current->role->roletype & GR_ROLE_SPECIAL) {
83571+ char *p = "";
83572+ int i = 0;
83573+
83574+ read_lock(&tasklist_lock);
83575+ if (current->real_parent) {
83576+ p = current->real_parent->role->rolename;
83577+ i = current->real_parent->acl_role_id;
83578+ }
83579+ read_unlock(&tasklist_lock);
83580+
83581+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
83582+ gr_set_acls(1);
83583+ } else {
83584+ error = -EPERM;
83585+ goto out;
83586+ }
83587+ break;
83588+ default:
83589+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
83590+ error = -EINVAL;
83591+ break;
83592+ }
83593+
83594+ if (error != -EPERM)
83595+ goto out;
83596+
83597+ if(!(gr_auth_attempts++))
83598+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
83599+
83600+ out:
83601+ mutex_unlock(&gr_dev_mutex);
83602+
83603+ if (!error)
83604+ error = req_count;
83605+
83606+ return error;
83607+}
83608+
83609+int
83610+gr_set_acls(const int type)
83611+{
83612+ struct task_struct *task, *task2;
83613+ struct acl_role_label *role = current->role;
83614+ struct acl_subject_label *subj;
83615+ __u16 acl_role_id = current->acl_role_id;
83616+ const struct cred *cred;
83617+ int ret;
83618+
83619+ rcu_read_lock();
83620+ read_lock(&tasklist_lock);
83621+ read_lock(&grsec_exec_file_lock);
83622+ do_each_thread(task2, task) {
83623+ /* check to see if we're called from the exit handler,
83624+ if so, only replace ACLs that have inherited the admin
83625+ ACL */
83626+
83627+ if (type && (task->role != role ||
83628+ task->acl_role_id != acl_role_id))
83629+ continue;
83630+
83631+ task->acl_role_id = 0;
83632+ task->acl_sp_role = 0;
83633+ task->inherited = 0;
83634+
83635+ if (task->exec_file) {
83636+ cred = __task_cred(task);
83637+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83638+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
83639+ if (subj == NULL) {
83640+ ret = -EINVAL;
83641+ read_unlock(&grsec_exec_file_lock);
83642+ read_unlock(&tasklist_lock);
83643+ rcu_read_unlock();
83644+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
83645+ return ret;
83646+ }
83647+ __gr_apply_subject_to_task(polstate, task, subj);
83648+ } else {
83649+ // it's a kernel process
83650+ task->role = polstate->kernel_role;
83651+ task->acl = polstate->kernel_role->root_label;
83652+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
83653+ task->acl->mode &= ~GR_PROCFIND;
83654+#endif
83655+ }
83656+ } while_each_thread(task2, task);
83657+ read_unlock(&grsec_exec_file_lock);
83658+ read_unlock(&tasklist_lock);
83659+ rcu_read_unlock();
83660+
83661+ return 0;
83662+}
83663diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
83664new file mode 100644
83665index 0000000..39645c9
83666--- /dev/null
83667+++ b/grsecurity/gracl_res.c
83668@@ -0,0 +1,68 @@
83669+#include <linux/kernel.h>
83670+#include <linux/sched.h>
83671+#include <linux/gracl.h>
83672+#include <linux/grinternal.h>
83673+
83674+static const char *restab_log[] = {
83675+ [RLIMIT_CPU] = "RLIMIT_CPU",
83676+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
83677+ [RLIMIT_DATA] = "RLIMIT_DATA",
83678+ [RLIMIT_STACK] = "RLIMIT_STACK",
83679+ [RLIMIT_CORE] = "RLIMIT_CORE",
83680+ [RLIMIT_RSS] = "RLIMIT_RSS",
83681+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
83682+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
83683+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
83684+ [RLIMIT_AS] = "RLIMIT_AS",
83685+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
83686+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
83687+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
83688+ [RLIMIT_NICE] = "RLIMIT_NICE",
83689+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
83690+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
83691+ [GR_CRASH_RES] = "RLIMIT_CRASH"
83692+};
83693+
83694+void
83695+gr_log_resource(const struct task_struct *task,
83696+ const int res, const unsigned long wanted, const int gt)
83697+{
83698+ const struct cred *cred;
83699+ unsigned long rlim;
83700+
83701+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
83702+ return;
83703+
83704+ // not yet supported resource
83705+ if (unlikely(!restab_log[res]))
83706+ return;
83707+
83708+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
83709+ rlim = task_rlimit_max(task, res);
83710+ else
83711+ rlim = task_rlimit(task, res);
83712+
83713+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
83714+ return;
83715+
83716+ rcu_read_lock();
83717+ cred = __task_cred(task);
83718+
83719+ if (res == RLIMIT_NPROC &&
83720+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
83721+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
83722+ goto out_rcu_unlock;
83723+ else if (res == RLIMIT_MEMLOCK &&
83724+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
83725+ goto out_rcu_unlock;
83726+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
83727+ goto out_rcu_unlock;
83728+ rcu_read_unlock();
83729+
83730+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
83731+
83732+ return;
83733+out_rcu_unlock:
83734+ rcu_read_unlock();
83735+ return;
83736+}
83737diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
83738new file mode 100644
83739index 0000000..35d9e65
83740--- /dev/null
83741+++ b/grsecurity/gracl_segv.c
83742@@ -0,0 +1,324 @@
83743+#include <linux/kernel.h>
83744+#include <linux/mm.h>
83745+#include <asm/uaccess.h>
83746+#include <asm/errno.h>
83747+#include <asm/mman.h>
83748+#include <net/sock.h>
83749+#include <linux/file.h>
83750+#include <linux/fs.h>
83751+#include <linux/net.h>
83752+#include <linux/in.h>
83753+#include <linux/slab.h>
83754+#include <linux/types.h>
83755+#include <linux/sched.h>
83756+#include <linux/timer.h>
83757+#include <linux/gracl.h>
83758+#include <linux/grsecurity.h>
83759+#include <linux/grinternal.h>
83760+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83761+#include <linux/magic.h>
83762+#include <linux/pagemap.h>
83763+#include "../fs/btrfs/async-thread.h"
83764+#include "../fs/btrfs/ctree.h"
83765+#include "../fs/btrfs/btrfs_inode.h"
83766+#endif
83767+
83768+static struct crash_uid *uid_set;
83769+static unsigned short uid_used;
83770+static DEFINE_SPINLOCK(gr_uid_lock);
83771+extern rwlock_t gr_inode_lock;
83772+extern struct acl_subject_label *
83773+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
83774+ struct acl_role_label *role);
83775+
83776+static inline dev_t __get_dev(const struct dentry *dentry)
83777+{
83778+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83779+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83780+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
83781+ else
83782+#endif
83783+ return dentry->d_sb->s_dev;
83784+}
83785+
83786+static inline u64 __get_ino(const struct dentry *dentry)
83787+{
83788+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83789+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83790+ return btrfs_ino(dentry->d_inode);
83791+ else
83792+#endif
83793+ return dentry->d_inode->i_ino;
83794+}
83795+
83796+int
83797+gr_init_uidset(void)
83798+{
83799+ uid_set =
83800+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
83801+ uid_used = 0;
83802+
83803+ return uid_set ? 1 : 0;
83804+}
83805+
83806+void
83807+gr_free_uidset(void)
83808+{
83809+ if (uid_set) {
83810+ struct crash_uid *tmpset;
83811+ spin_lock(&gr_uid_lock);
83812+ tmpset = uid_set;
83813+ uid_set = NULL;
83814+ uid_used = 0;
83815+ spin_unlock(&gr_uid_lock);
83816+ if (tmpset)
83817+ kfree(tmpset);
83818+ }
83819+
83820+ return;
83821+}
83822+
83823+int
83824+gr_find_uid(const uid_t uid)
83825+{
83826+ struct crash_uid *tmp = uid_set;
83827+ uid_t buid;
83828+ int low = 0, high = uid_used - 1, mid;
83829+
83830+ while (high >= low) {
83831+ mid = (low + high) >> 1;
83832+ buid = tmp[mid].uid;
83833+ if (buid == uid)
83834+ return mid;
83835+ if (buid > uid)
83836+ high = mid - 1;
83837+ if (buid < uid)
83838+ low = mid + 1;
83839+ }
83840+
83841+ return -1;
83842+}
83843+
83844+static void
83845+gr_insertsort(void)
83846+{
83847+ unsigned short i, j;
83848+ struct crash_uid index;
83849+
83850+ for (i = 1; i < uid_used; i++) {
83851+ index = uid_set[i];
83852+ j = i;
83853+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
83854+ uid_set[j] = uid_set[j - 1];
83855+ j--;
83856+ }
83857+ uid_set[j] = index;
83858+ }
83859+
83860+ return;
83861+}
83862+
83863+static void
83864+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
83865+{
83866+ int loc;
83867+ uid_t uid = GR_GLOBAL_UID(kuid);
83868+
83869+ if (uid_used == GR_UIDTABLE_MAX)
83870+ return;
83871+
83872+ loc = gr_find_uid(uid);
83873+
83874+ if (loc >= 0) {
83875+ uid_set[loc].expires = expires;
83876+ return;
83877+ }
83878+
83879+ uid_set[uid_used].uid = uid;
83880+ uid_set[uid_used].expires = expires;
83881+ uid_used++;
83882+
83883+ gr_insertsort();
83884+
83885+ return;
83886+}
83887+
83888+void
83889+gr_remove_uid(const unsigned short loc)
83890+{
83891+ unsigned short i;
83892+
83893+ for (i = loc + 1; i < uid_used; i++)
83894+ uid_set[i - 1] = uid_set[i];
83895+
83896+ uid_used--;
83897+
83898+ return;
83899+}
83900+
83901+int
83902+gr_check_crash_uid(const kuid_t kuid)
83903+{
83904+ int loc;
83905+ int ret = 0;
83906+ uid_t uid;
83907+
83908+ if (unlikely(!gr_acl_is_enabled()))
83909+ return 0;
83910+
83911+ uid = GR_GLOBAL_UID(kuid);
83912+
83913+ spin_lock(&gr_uid_lock);
83914+ loc = gr_find_uid(uid);
83915+
83916+ if (loc < 0)
83917+ goto out_unlock;
83918+
83919+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
83920+ gr_remove_uid(loc);
83921+ else
83922+ ret = 1;
83923+
83924+out_unlock:
83925+ spin_unlock(&gr_uid_lock);
83926+ return ret;
83927+}
83928+
83929+static int
83930+proc_is_setxid(const struct cred *cred)
83931+{
83932+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
83933+ !uid_eq(cred->uid, cred->fsuid))
83934+ return 1;
83935+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
83936+ !gid_eq(cred->gid, cred->fsgid))
83937+ return 1;
83938+
83939+ return 0;
83940+}
83941+
83942+extern int gr_fake_force_sig(int sig, struct task_struct *t);
83943+
83944+void
83945+gr_handle_crash(struct task_struct *task, const int sig)
83946+{
83947+ struct acl_subject_label *curr;
83948+ struct task_struct *tsk, *tsk2;
83949+ const struct cred *cred;
83950+ const struct cred *cred2;
83951+
83952+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
83953+ return;
83954+
83955+ if (unlikely(!gr_acl_is_enabled()))
83956+ return;
83957+
83958+ curr = task->acl;
83959+
83960+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
83961+ return;
83962+
83963+ if (time_before_eq(curr->expires, get_seconds())) {
83964+ curr->expires = 0;
83965+ curr->crashes = 0;
83966+ }
83967+
83968+ curr->crashes++;
83969+
83970+ if (!curr->expires)
83971+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
83972+
83973+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
83974+ time_after(curr->expires, get_seconds())) {
83975+ rcu_read_lock();
83976+ cred = __task_cred(task);
83977+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
83978+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
83979+ spin_lock(&gr_uid_lock);
83980+ gr_insert_uid(cred->uid, curr->expires);
83981+ spin_unlock(&gr_uid_lock);
83982+ curr->expires = 0;
83983+ curr->crashes = 0;
83984+ read_lock(&tasklist_lock);
83985+ do_each_thread(tsk2, tsk) {
83986+ cred2 = __task_cred(tsk);
83987+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
83988+ gr_fake_force_sig(SIGKILL, tsk);
83989+ } while_each_thread(tsk2, tsk);
83990+ read_unlock(&tasklist_lock);
83991+ } else {
83992+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
83993+ read_lock(&tasklist_lock);
83994+ read_lock(&grsec_exec_file_lock);
83995+ do_each_thread(tsk2, tsk) {
83996+ if (likely(tsk != task)) {
83997+ // if this thread has the same subject as the one that triggered
83998+ // RES_CRASH and it's the same binary, kill it
83999+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
84000+ gr_fake_force_sig(SIGKILL, tsk);
84001+ }
84002+ } while_each_thread(tsk2, tsk);
84003+ read_unlock(&grsec_exec_file_lock);
84004+ read_unlock(&tasklist_lock);
84005+ }
84006+ rcu_read_unlock();
84007+ }
84008+
84009+ return;
84010+}
84011+
84012+int
84013+gr_check_crash_exec(const struct file *filp)
84014+{
84015+ struct acl_subject_label *curr;
84016+ struct dentry *dentry;
84017+
84018+ if (unlikely(!gr_acl_is_enabled()))
84019+ return 0;
84020+
84021+ read_lock(&gr_inode_lock);
84022+ dentry = filp->f_path.dentry;
84023+ curr = lookup_acl_subj_label(__get_ino(dentry), __get_dev(dentry),
84024+ current->role);
84025+ read_unlock(&gr_inode_lock);
84026+
84027+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
84028+ (!curr->crashes && !curr->expires))
84029+ return 0;
84030+
84031+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
84032+ time_after(curr->expires, get_seconds()))
84033+ return 1;
84034+ else if (time_before_eq(curr->expires, get_seconds())) {
84035+ curr->crashes = 0;
84036+ curr->expires = 0;
84037+ }
84038+
84039+ return 0;
84040+}
84041+
84042+void
84043+gr_handle_alertkill(struct task_struct *task)
84044+{
84045+ struct acl_subject_label *curracl;
84046+ __u32 curr_ip;
84047+ struct task_struct *p, *p2;
84048+
84049+ if (unlikely(!gr_acl_is_enabled()))
84050+ return;
84051+
84052+ curracl = task->acl;
84053+ curr_ip = task->signal->curr_ip;
84054+
84055+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
84056+ read_lock(&tasklist_lock);
84057+ do_each_thread(p2, p) {
84058+ if (p->signal->curr_ip == curr_ip)
84059+ gr_fake_force_sig(SIGKILL, p);
84060+ } while_each_thread(p2, p);
84061+ read_unlock(&tasklist_lock);
84062+ } else if (curracl->mode & GR_KILLPROC)
84063+ gr_fake_force_sig(SIGKILL, task);
84064+
84065+ return;
84066+}
84067diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
84068new file mode 100644
84069index 0000000..6b0c9cc
84070--- /dev/null
84071+++ b/grsecurity/gracl_shm.c
84072@@ -0,0 +1,40 @@
84073+#include <linux/kernel.h>
84074+#include <linux/mm.h>
84075+#include <linux/sched.h>
84076+#include <linux/file.h>
84077+#include <linux/ipc.h>
84078+#include <linux/gracl.h>
84079+#include <linux/grsecurity.h>
84080+#include <linux/grinternal.h>
84081+
84082+int
84083+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84084+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
84085+{
84086+ struct task_struct *task;
84087+
84088+ if (!gr_acl_is_enabled())
84089+ return 1;
84090+
84091+ rcu_read_lock();
84092+ read_lock(&tasklist_lock);
84093+
84094+ task = find_task_by_vpid(shm_cprid);
84095+
84096+ if (unlikely(!task))
84097+ task = find_task_by_vpid(shm_lapid);
84098+
84099+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
84100+ (task_pid_nr(task) == shm_lapid)) &&
84101+ (task->acl->mode & GR_PROTSHM) &&
84102+ (task->acl != current->acl))) {
84103+ read_unlock(&tasklist_lock);
84104+ rcu_read_unlock();
84105+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
84106+ return 0;
84107+ }
84108+ read_unlock(&tasklist_lock);
84109+ rcu_read_unlock();
84110+
84111+ return 1;
84112+}
84113diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
84114new file mode 100644
84115index 0000000..bc0be01
84116--- /dev/null
84117+++ b/grsecurity/grsec_chdir.c
84118@@ -0,0 +1,19 @@
84119+#include <linux/kernel.h>
84120+#include <linux/sched.h>
84121+#include <linux/fs.h>
84122+#include <linux/file.h>
84123+#include <linux/grsecurity.h>
84124+#include <linux/grinternal.h>
84125+
84126+void
84127+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
84128+{
84129+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
84130+ if ((grsec_enable_chdir && grsec_enable_group &&
84131+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
84132+ !grsec_enable_group)) {
84133+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
84134+ }
84135+#endif
84136+ return;
84137+}
84138diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
84139new file mode 100644
84140index 0000000..114ea4f
84141--- /dev/null
84142+++ b/grsecurity/grsec_chroot.c
84143@@ -0,0 +1,467 @@
84144+#include <linux/kernel.h>
84145+#include <linux/module.h>
84146+#include <linux/sched.h>
84147+#include <linux/file.h>
84148+#include <linux/fs.h>
84149+#include <linux/mount.h>
84150+#include <linux/types.h>
84151+#include "../fs/mount.h"
84152+#include <linux/grsecurity.h>
84153+#include <linux/grinternal.h>
84154+
84155+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84156+int gr_init_ran;
84157+#endif
84158+
84159+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
84160+{
84161+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84162+ struct dentry *tmpd = dentry;
84163+
84164+ read_seqlock_excl(&mount_lock);
84165+ write_seqlock(&rename_lock);
84166+
84167+ while (tmpd != mnt->mnt_root) {
84168+ atomic_inc(&tmpd->chroot_refcnt);
84169+ tmpd = tmpd->d_parent;
84170+ }
84171+ atomic_inc(&tmpd->chroot_refcnt);
84172+
84173+ write_sequnlock(&rename_lock);
84174+ read_sequnlock_excl(&mount_lock);
84175+#endif
84176+}
84177+
84178+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
84179+{
84180+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84181+ struct dentry *tmpd = dentry;
84182+
84183+ read_seqlock_excl(&mount_lock);
84184+ write_seqlock(&rename_lock);
84185+
84186+ while (tmpd != mnt->mnt_root) {
84187+ atomic_dec(&tmpd->chroot_refcnt);
84188+ tmpd = tmpd->d_parent;
84189+ }
84190+ atomic_dec(&tmpd->chroot_refcnt);
84191+
84192+ write_sequnlock(&rename_lock);
84193+ read_sequnlock_excl(&mount_lock);
84194+#endif
84195+}
84196+
84197+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84198+static struct dentry *get_closest_chroot(struct dentry *dentry)
84199+{
84200+ write_seqlock(&rename_lock);
84201+ do {
84202+ if (atomic_read(&dentry->chroot_refcnt)) {
84203+ write_sequnlock(&rename_lock);
84204+ return dentry;
84205+ }
84206+ dentry = dentry->d_parent;
84207+ } while (!IS_ROOT(dentry));
84208+ write_sequnlock(&rename_lock);
84209+ return NULL;
84210+}
84211+#endif
84212+
84213+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
84214+ struct dentry *newdentry, struct vfsmount *newmnt)
84215+{
84216+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84217+ struct dentry *chroot;
84218+
84219+ if (unlikely(!grsec_enable_chroot_rename))
84220+ return 0;
84221+
84222+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
84223+ return 0;
84224+
84225+ chroot = get_closest_chroot(olddentry);
84226+
84227+ if (chroot == NULL)
84228+ return 0;
84229+
84230+ if (is_subdir(newdentry, chroot))
84231+ return 0;
84232+
84233+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
84234+
84235+ return 1;
84236+#else
84237+ return 0;
84238+#endif
84239+}
84240+
84241+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
84242+{
84243+#ifdef CONFIG_GRKERNSEC
84244+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
84245+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
84246+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84247+ && gr_init_ran
84248+#endif
84249+ )
84250+ task->gr_is_chrooted = 1;
84251+ else {
84252+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84253+ if (task_pid_nr(task) == 1 && !gr_init_ran)
84254+ gr_init_ran = 1;
84255+#endif
84256+ task->gr_is_chrooted = 0;
84257+ }
84258+
84259+ task->gr_chroot_dentry = path->dentry;
84260+#endif
84261+ return;
84262+}
84263+
84264+void gr_clear_chroot_entries(struct task_struct *task)
84265+{
84266+#ifdef CONFIG_GRKERNSEC
84267+ task->gr_is_chrooted = 0;
84268+ task->gr_chroot_dentry = NULL;
84269+#endif
84270+ return;
84271+}
84272+
84273+int
84274+gr_handle_chroot_unix(const pid_t pid)
84275+{
84276+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
84277+ struct task_struct *p;
84278+
84279+ if (unlikely(!grsec_enable_chroot_unix))
84280+ return 1;
84281+
84282+ if (likely(!proc_is_chrooted(current)))
84283+ return 1;
84284+
84285+ rcu_read_lock();
84286+ read_lock(&tasklist_lock);
84287+ p = find_task_by_vpid_unrestricted(pid);
84288+ if (unlikely(p && !have_same_root(current, p))) {
84289+ read_unlock(&tasklist_lock);
84290+ rcu_read_unlock();
84291+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
84292+ return 0;
84293+ }
84294+ read_unlock(&tasklist_lock);
84295+ rcu_read_unlock();
84296+#endif
84297+ return 1;
84298+}
84299+
84300+int
84301+gr_handle_chroot_nice(void)
84302+{
84303+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
84304+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
84305+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
84306+ return -EPERM;
84307+ }
84308+#endif
84309+ return 0;
84310+}
84311+
84312+int
84313+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
84314+{
84315+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
84316+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
84317+ && proc_is_chrooted(current)) {
84318+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
84319+ return -EACCES;
84320+ }
84321+#endif
84322+ return 0;
84323+}
84324+
84325+int
84326+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
84327+{
84328+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
84329+ struct task_struct *p;
84330+ int ret = 0;
84331+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
84332+ return ret;
84333+
84334+ read_lock(&tasklist_lock);
84335+ do_each_pid_task(pid, type, p) {
84336+ if (!have_same_root(current, p)) {
84337+ ret = 1;
84338+ goto out;
84339+ }
84340+ } while_each_pid_task(pid, type, p);
84341+out:
84342+ read_unlock(&tasklist_lock);
84343+ return ret;
84344+#endif
84345+ return 0;
84346+}
84347+
84348+int
84349+gr_pid_is_chrooted(struct task_struct *p)
84350+{
84351+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
84352+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
84353+ return 0;
84354+
84355+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
84356+ !have_same_root(current, p)) {
84357+ return 1;
84358+ }
84359+#endif
84360+ return 0;
84361+}
84362+
84363+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
84364+
84365+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
84366+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
84367+{
84368+ struct path path, currentroot;
84369+ int ret = 0;
84370+
84371+ path.dentry = (struct dentry *)u_dentry;
84372+ path.mnt = (struct vfsmount *)u_mnt;
84373+ get_fs_root(current->fs, &currentroot);
84374+ if (path_is_under(&path, &currentroot))
84375+ ret = 1;
84376+ path_put(&currentroot);
84377+
84378+ return ret;
84379+}
84380+#endif
84381+
84382+int
84383+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
84384+{
84385+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
84386+ if (!grsec_enable_chroot_fchdir)
84387+ return 1;
84388+
84389+ if (!proc_is_chrooted(current))
84390+ return 1;
84391+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
84392+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
84393+ return 0;
84394+ }
84395+#endif
84396+ return 1;
84397+}
84398+
84399+int
84400+gr_chroot_fhandle(void)
84401+{
84402+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
84403+ if (!grsec_enable_chroot_fchdir)
84404+ return 1;
84405+
84406+ if (!proc_is_chrooted(current))
84407+ return 1;
84408+ else {
84409+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
84410+ return 0;
84411+ }
84412+#endif
84413+ return 1;
84414+}
84415+
84416+int
84417+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84418+ const u64 shm_createtime)
84419+{
84420+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
84421+ struct task_struct *p;
84422+
84423+ if (unlikely(!grsec_enable_chroot_shmat))
84424+ return 1;
84425+
84426+ if (likely(!proc_is_chrooted(current)))
84427+ return 1;
84428+
84429+ rcu_read_lock();
84430+ read_lock(&tasklist_lock);
84431+
84432+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
84433+ if (time_before_eq64(p->start_time, shm_createtime)) {
84434+ if (have_same_root(current, p)) {
84435+ goto allow;
84436+ } else {
84437+ read_unlock(&tasklist_lock);
84438+ rcu_read_unlock();
84439+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
84440+ return 0;
84441+ }
84442+ }
84443+ /* creator exited, pid reuse, fall through to next check */
84444+ }
84445+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
84446+ if (unlikely(!have_same_root(current, p))) {
84447+ read_unlock(&tasklist_lock);
84448+ rcu_read_unlock();
84449+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
84450+ return 0;
84451+ }
84452+ }
84453+
84454+allow:
84455+ read_unlock(&tasklist_lock);
84456+ rcu_read_unlock();
84457+#endif
84458+ return 1;
84459+}
84460+
84461+void
84462+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
84463+{
84464+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
84465+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
84466+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
84467+#endif
84468+ return;
84469+}
84470+
84471+int
84472+gr_handle_chroot_mknod(const struct dentry *dentry,
84473+ const struct vfsmount *mnt, const int mode)
84474+{
84475+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
84476+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
84477+ proc_is_chrooted(current)) {
84478+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
84479+ return -EPERM;
84480+ }
84481+#endif
84482+ return 0;
84483+}
84484+
84485+int
84486+gr_handle_chroot_mount(const struct dentry *dentry,
84487+ const struct vfsmount *mnt, const char *dev_name)
84488+{
84489+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
84490+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
84491+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
84492+ return -EPERM;
84493+ }
84494+#endif
84495+ return 0;
84496+}
84497+
84498+int
84499+gr_handle_chroot_pivot(void)
84500+{
84501+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
84502+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
84503+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
84504+ return -EPERM;
84505+ }
84506+#endif
84507+ return 0;
84508+}
84509+
84510+int
84511+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
84512+{
84513+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
84514+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
84515+ !gr_is_outside_chroot(dentry, mnt)) {
84516+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
84517+ return -EPERM;
84518+ }
84519+#endif
84520+ return 0;
84521+}
84522+
84523+extern const char *captab_log[];
84524+extern int captab_log_entries;
84525+
84526+int
84527+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
84528+{
84529+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84530+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
84531+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
84532+ if (cap_raised(chroot_caps, cap)) {
84533+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
84534+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
84535+ }
84536+ return 0;
84537+ }
84538+ }
84539+#endif
84540+ return 1;
84541+}
84542+
84543+int
84544+gr_chroot_is_capable(const int cap)
84545+{
84546+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84547+ return gr_task_chroot_is_capable(current, current_cred(), cap);
84548+#endif
84549+ return 1;
84550+}
84551+
84552+int
84553+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
84554+{
84555+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84556+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
84557+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
84558+ if (cap_raised(chroot_caps, cap)) {
84559+ return 0;
84560+ }
84561+ }
84562+#endif
84563+ return 1;
84564+}
84565+
84566+int
84567+gr_chroot_is_capable_nolog(const int cap)
84568+{
84569+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84570+ return gr_task_chroot_is_capable_nolog(current, cap);
84571+#endif
84572+ return 1;
84573+}
84574+
84575+int
84576+gr_handle_chroot_sysctl(const int op)
84577+{
84578+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
84579+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
84580+ proc_is_chrooted(current))
84581+ return -EACCES;
84582+#endif
84583+ return 0;
84584+}
84585+
84586+void
84587+gr_handle_chroot_chdir(const struct path *path)
84588+{
84589+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
84590+ if (grsec_enable_chroot_chdir)
84591+ set_fs_pwd(current->fs, path);
84592+#endif
84593+ return;
84594+}
84595+
84596+int
84597+gr_handle_chroot_chmod(const struct dentry *dentry,
84598+ const struct vfsmount *mnt, const int mode)
84599+{
84600+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
84601+ /* allow chmod +s on directories, but not files */
84602+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
84603+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
84604+ proc_is_chrooted(current)) {
84605+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
84606+ return -EPERM;
84607+ }
84608+#endif
84609+ return 0;
84610+}
84611diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
84612new file mode 100644
84613index 0000000..946f750
84614--- /dev/null
84615+++ b/grsecurity/grsec_disabled.c
84616@@ -0,0 +1,445 @@
84617+#include <linux/kernel.h>
84618+#include <linux/module.h>
84619+#include <linux/sched.h>
84620+#include <linux/file.h>
84621+#include <linux/fs.h>
84622+#include <linux/kdev_t.h>
84623+#include <linux/net.h>
84624+#include <linux/in.h>
84625+#include <linux/ip.h>
84626+#include <linux/skbuff.h>
84627+#include <linux/sysctl.h>
84628+
84629+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
84630+void
84631+pax_set_initial_flags(struct linux_binprm *bprm)
84632+{
84633+ return;
84634+}
84635+#endif
84636+
84637+#ifdef CONFIG_SYSCTL
84638+__u32
84639+gr_handle_sysctl(const struct ctl_table * table, const int op)
84640+{
84641+ return 0;
84642+}
84643+#endif
84644+
84645+#ifdef CONFIG_TASKSTATS
84646+int gr_is_taskstats_denied(int pid)
84647+{
84648+ return 0;
84649+}
84650+#endif
84651+
84652+int
84653+gr_acl_is_enabled(void)
84654+{
84655+ return 0;
84656+}
84657+
84658+int
84659+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
84660+{
84661+ return 0;
84662+}
84663+
84664+void
84665+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
84666+{
84667+ return;
84668+}
84669+
84670+int
84671+gr_handle_rawio(const struct inode *inode)
84672+{
84673+ return 0;
84674+}
84675+
84676+void
84677+gr_acl_handle_psacct(struct task_struct *task, const long code)
84678+{
84679+ return;
84680+}
84681+
84682+int
84683+gr_handle_ptrace(struct task_struct *task, const long request)
84684+{
84685+ return 0;
84686+}
84687+
84688+int
84689+gr_handle_proc_ptrace(struct task_struct *task)
84690+{
84691+ return 0;
84692+}
84693+
84694+int
84695+gr_set_acls(const int type)
84696+{
84697+ return 0;
84698+}
84699+
84700+int
84701+gr_check_hidden_task(const struct task_struct *tsk)
84702+{
84703+ return 0;
84704+}
84705+
84706+int
84707+gr_check_protected_task(const struct task_struct *task)
84708+{
84709+ return 0;
84710+}
84711+
84712+int
84713+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
84714+{
84715+ return 0;
84716+}
84717+
84718+void
84719+gr_copy_label(struct task_struct *tsk)
84720+{
84721+ return;
84722+}
84723+
84724+void
84725+gr_set_pax_flags(struct task_struct *task)
84726+{
84727+ return;
84728+}
84729+
84730+int
84731+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
84732+ const int unsafe_share)
84733+{
84734+ return 0;
84735+}
84736+
84737+void
84738+gr_handle_delete(const u64 ino, const dev_t dev)
84739+{
84740+ return;
84741+}
84742+
84743+void
84744+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
84745+{
84746+ return;
84747+}
84748+
84749+void
84750+gr_handle_crash(struct task_struct *task, const int sig)
84751+{
84752+ return;
84753+}
84754+
84755+int
84756+gr_check_crash_exec(const struct file *filp)
84757+{
84758+ return 0;
84759+}
84760+
84761+int
84762+gr_check_crash_uid(const kuid_t uid)
84763+{
84764+ return 0;
84765+}
84766+
84767+void
84768+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
84769+ struct dentry *old_dentry,
84770+ struct dentry *new_dentry,
84771+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
84772+{
84773+ return;
84774+}
84775+
84776+int
84777+gr_search_socket(const int family, const int type, const int protocol)
84778+{
84779+ return 1;
84780+}
84781+
84782+int
84783+gr_search_connectbind(const int mode, const struct socket *sock,
84784+ const struct sockaddr_in *addr)
84785+{
84786+ return 0;
84787+}
84788+
84789+void
84790+gr_handle_alertkill(struct task_struct *task)
84791+{
84792+ return;
84793+}
84794+
84795+__u32
84796+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
84797+{
84798+ return 1;
84799+}
84800+
84801+__u32
84802+gr_acl_handle_hidden_file(const struct dentry * dentry,
84803+ const struct vfsmount * mnt)
84804+{
84805+ return 1;
84806+}
84807+
84808+__u32
84809+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
84810+ int acc_mode)
84811+{
84812+ return 1;
84813+}
84814+
84815+__u32
84816+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
84817+{
84818+ return 1;
84819+}
84820+
84821+__u32
84822+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
84823+{
84824+ return 1;
84825+}
84826+
84827+int
84828+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
84829+ unsigned int *vm_flags)
84830+{
84831+ return 1;
84832+}
84833+
84834+__u32
84835+gr_acl_handle_truncate(const struct dentry * dentry,
84836+ const struct vfsmount * mnt)
84837+{
84838+ return 1;
84839+}
84840+
84841+__u32
84842+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
84843+{
84844+ return 1;
84845+}
84846+
84847+__u32
84848+gr_acl_handle_access(const struct dentry * dentry,
84849+ const struct vfsmount * mnt, const int fmode)
84850+{
84851+ return 1;
84852+}
84853+
84854+__u32
84855+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
84856+ umode_t *mode)
84857+{
84858+ return 1;
84859+}
84860+
84861+__u32
84862+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
84863+{
84864+ return 1;
84865+}
84866+
84867+__u32
84868+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
84869+{
84870+ return 1;
84871+}
84872+
84873+__u32
84874+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
84875+{
84876+ return 1;
84877+}
84878+
84879+void
84880+grsecurity_init(void)
84881+{
84882+ return;
84883+}
84884+
84885+umode_t gr_acl_umask(void)
84886+{
84887+ return 0;
84888+}
84889+
84890+__u32
84891+gr_acl_handle_mknod(const struct dentry * new_dentry,
84892+ const struct dentry * parent_dentry,
84893+ const struct vfsmount * parent_mnt,
84894+ const int mode)
84895+{
84896+ return 1;
84897+}
84898+
84899+__u32
84900+gr_acl_handle_mkdir(const struct dentry * new_dentry,
84901+ const struct dentry * parent_dentry,
84902+ const struct vfsmount * parent_mnt)
84903+{
84904+ return 1;
84905+}
84906+
84907+__u32
84908+gr_acl_handle_symlink(const struct dentry * new_dentry,
84909+ const struct dentry * parent_dentry,
84910+ const struct vfsmount * parent_mnt, const struct filename *from)
84911+{
84912+ return 1;
84913+}
84914+
84915+__u32
84916+gr_acl_handle_link(const struct dentry * new_dentry,
84917+ const struct dentry * parent_dentry,
84918+ const struct vfsmount * parent_mnt,
84919+ const struct dentry * old_dentry,
84920+ const struct vfsmount * old_mnt, const struct filename *to)
84921+{
84922+ return 1;
84923+}
84924+
84925+int
84926+gr_acl_handle_rename(const struct dentry *new_dentry,
84927+ const struct dentry *parent_dentry,
84928+ const struct vfsmount *parent_mnt,
84929+ const struct dentry *old_dentry,
84930+ const struct inode *old_parent_inode,
84931+ const struct vfsmount *old_mnt, const struct filename *newname,
84932+ unsigned int flags)
84933+{
84934+ return 0;
84935+}
84936+
84937+int
84938+gr_acl_handle_filldir(const struct file *file, const char *name,
84939+ const int namelen, const u64 ino)
84940+{
84941+ return 1;
84942+}
84943+
84944+int
84945+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84946+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
84947+{
84948+ return 1;
84949+}
84950+
84951+int
84952+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
84953+{
84954+ return 0;
84955+}
84956+
84957+int
84958+gr_search_accept(const struct socket *sock)
84959+{
84960+ return 0;
84961+}
84962+
84963+int
84964+gr_search_listen(const struct socket *sock)
84965+{
84966+ return 0;
84967+}
84968+
84969+int
84970+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
84971+{
84972+ return 0;
84973+}
84974+
84975+__u32
84976+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
84977+{
84978+ return 1;
84979+}
84980+
84981+__u32
84982+gr_acl_handle_creat(const struct dentry * dentry,
84983+ const struct dentry * p_dentry,
84984+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
84985+ const int imode)
84986+{
84987+ return 1;
84988+}
84989+
84990+void
84991+gr_acl_handle_exit(void)
84992+{
84993+ return;
84994+}
84995+
84996+int
84997+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
84998+{
84999+ return 1;
85000+}
85001+
85002+void
85003+gr_set_role_label(const kuid_t uid, const kgid_t gid)
85004+{
85005+ return;
85006+}
85007+
85008+int
85009+gr_acl_handle_procpidmem(const struct task_struct *task)
85010+{
85011+ return 0;
85012+}
85013+
85014+int
85015+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
85016+{
85017+ return 0;
85018+}
85019+
85020+int
85021+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
85022+{
85023+ return 0;
85024+}
85025+
85026+int
85027+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
85028+{
85029+ return 0;
85030+}
85031+
85032+int
85033+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
85034+{
85035+ return 0;
85036+}
85037+
85038+int gr_acl_enable_at_secure(void)
85039+{
85040+ return 0;
85041+}
85042+
85043+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
85044+{
85045+ return dentry->d_sb->s_dev;
85046+}
85047+
85048+u64 gr_get_ino_from_dentry(struct dentry *dentry)
85049+{
85050+ return dentry->d_inode->i_ino;
85051+}
85052+
85053+void gr_put_exec_file(struct task_struct *task)
85054+{
85055+ return;
85056+}
85057+
85058+#ifdef CONFIG_SECURITY
85059+EXPORT_SYMBOL_GPL(gr_check_user_change);
85060+EXPORT_SYMBOL_GPL(gr_check_group_change);
85061+#endif
85062diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
85063new file mode 100644
85064index 0000000..fb7531e
85065--- /dev/null
85066+++ b/grsecurity/grsec_exec.c
85067@@ -0,0 +1,189 @@
85068+#include <linux/kernel.h>
85069+#include <linux/sched.h>
85070+#include <linux/file.h>
85071+#include <linux/binfmts.h>
85072+#include <linux/fs.h>
85073+#include <linux/types.h>
85074+#include <linux/grdefs.h>
85075+#include <linux/grsecurity.h>
85076+#include <linux/grinternal.h>
85077+#include <linux/capability.h>
85078+#include <linux/module.h>
85079+#include <linux/compat.h>
85080+
85081+#include <asm/uaccess.h>
85082+
85083+#ifdef CONFIG_GRKERNSEC_EXECLOG
85084+static char gr_exec_arg_buf[132];
85085+static DEFINE_MUTEX(gr_exec_arg_mutex);
85086+#endif
85087+
85088+struct user_arg_ptr {
85089+#ifdef CONFIG_COMPAT
85090+ bool is_compat;
85091+#endif
85092+ union {
85093+ const char __user *const __user *native;
85094+#ifdef CONFIG_COMPAT
85095+ const compat_uptr_t __user *compat;
85096+#endif
85097+ } ptr;
85098+};
85099+
85100+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
85101+
85102+void
85103+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
85104+{
85105+#ifdef CONFIG_GRKERNSEC_EXECLOG
85106+ char *grarg = gr_exec_arg_buf;
85107+ unsigned int i, x, execlen = 0;
85108+ char c;
85109+
85110+ if (!((grsec_enable_execlog && grsec_enable_group &&
85111+ in_group_p(grsec_audit_gid))
85112+ || (grsec_enable_execlog && !grsec_enable_group)))
85113+ return;
85114+
85115+ mutex_lock(&gr_exec_arg_mutex);
85116+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
85117+
85118+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
85119+ const char __user *p;
85120+ unsigned int len;
85121+
85122+ p = get_user_arg_ptr(argv, i);
85123+ if (IS_ERR(p))
85124+ goto log;
85125+
85126+ len = strnlen_user(p, 128 - execlen);
85127+ if (len > 128 - execlen)
85128+ len = 128 - execlen;
85129+ else if (len > 0)
85130+ len--;
85131+ if (copy_from_user(grarg + execlen, p, len))
85132+ goto log;
85133+
85134+ /* rewrite unprintable characters */
85135+ for (x = 0; x < len; x++) {
85136+ c = *(grarg + execlen + x);
85137+ if (c < 32 || c > 126)
85138+ *(grarg + execlen + x) = ' ';
85139+ }
85140+
85141+ execlen += len;
85142+ *(grarg + execlen) = ' ';
85143+ *(grarg + execlen + 1) = '\0';
85144+ execlen++;
85145+ }
85146+
85147+ log:
85148+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
85149+ bprm->file->f_path.mnt, grarg);
85150+ mutex_unlock(&gr_exec_arg_mutex);
85151+#endif
85152+ return;
85153+}
85154+
85155+#ifdef CONFIG_GRKERNSEC
85156+extern int gr_acl_is_capable(const int cap);
85157+extern int gr_acl_is_capable_nolog(const int cap);
85158+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
85159+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
85160+extern int gr_chroot_is_capable(const int cap);
85161+extern int gr_chroot_is_capable_nolog(const int cap);
85162+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
85163+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
85164+#endif
85165+
85166+const char *captab_log[] = {
85167+ "CAP_CHOWN",
85168+ "CAP_DAC_OVERRIDE",
85169+ "CAP_DAC_READ_SEARCH",
85170+ "CAP_FOWNER",
85171+ "CAP_FSETID",
85172+ "CAP_KILL",
85173+ "CAP_SETGID",
85174+ "CAP_SETUID",
85175+ "CAP_SETPCAP",
85176+ "CAP_LINUX_IMMUTABLE",
85177+ "CAP_NET_BIND_SERVICE",
85178+ "CAP_NET_BROADCAST",
85179+ "CAP_NET_ADMIN",
85180+ "CAP_NET_RAW",
85181+ "CAP_IPC_LOCK",
85182+ "CAP_IPC_OWNER",
85183+ "CAP_SYS_MODULE",
85184+ "CAP_SYS_RAWIO",
85185+ "CAP_SYS_CHROOT",
85186+ "CAP_SYS_PTRACE",
85187+ "CAP_SYS_PACCT",
85188+ "CAP_SYS_ADMIN",
85189+ "CAP_SYS_BOOT",
85190+ "CAP_SYS_NICE",
85191+ "CAP_SYS_RESOURCE",
85192+ "CAP_SYS_TIME",
85193+ "CAP_SYS_TTY_CONFIG",
85194+ "CAP_MKNOD",
85195+ "CAP_LEASE",
85196+ "CAP_AUDIT_WRITE",
85197+ "CAP_AUDIT_CONTROL",
85198+ "CAP_SETFCAP",
85199+ "CAP_MAC_OVERRIDE",
85200+ "CAP_MAC_ADMIN",
85201+ "CAP_SYSLOG",
85202+ "CAP_WAKE_ALARM",
85203+ "CAP_BLOCK_SUSPEND",
85204+ "CAP_AUDIT_READ"
85205+};
85206+
85207+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
85208+
85209+int gr_is_capable(const int cap)
85210+{
85211+#ifdef CONFIG_GRKERNSEC
85212+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
85213+ return 1;
85214+ return 0;
85215+#else
85216+ return 1;
85217+#endif
85218+}
85219+
85220+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
85221+{
85222+#ifdef CONFIG_GRKERNSEC
85223+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
85224+ return 1;
85225+ return 0;
85226+#else
85227+ return 1;
85228+#endif
85229+}
85230+
85231+int gr_is_capable_nolog(const int cap)
85232+{
85233+#ifdef CONFIG_GRKERNSEC
85234+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
85235+ return 1;
85236+ return 0;
85237+#else
85238+ return 1;
85239+#endif
85240+}
85241+
85242+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
85243+{
85244+#ifdef CONFIG_GRKERNSEC
85245+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
85246+ return 1;
85247+ return 0;
85248+#else
85249+ return 1;
85250+#endif
85251+}
85252+
85253+EXPORT_SYMBOL_GPL(gr_is_capable);
85254+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
85255+EXPORT_SYMBOL_GPL(gr_task_is_capable);
85256+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
85257diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
85258new file mode 100644
85259index 0000000..06cc6ea
85260--- /dev/null
85261+++ b/grsecurity/grsec_fifo.c
85262@@ -0,0 +1,24 @@
85263+#include <linux/kernel.h>
85264+#include <linux/sched.h>
85265+#include <linux/fs.h>
85266+#include <linux/file.h>
85267+#include <linux/grinternal.h>
85268+
85269+int
85270+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
85271+ const struct dentry *dir, const int flag, const int acc_mode)
85272+{
85273+#ifdef CONFIG_GRKERNSEC_FIFO
85274+ const struct cred *cred = current_cred();
85275+
85276+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
85277+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
85278+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
85279+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
85280+ if (!inode_permission(dentry->d_inode, acc_mode))
85281+ 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));
85282+ return -EACCES;
85283+ }
85284+#endif
85285+ return 0;
85286+}
85287diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
85288new file mode 100644
85289index 0000000..8ca18bf
85290--- /dev/null
85291+++ b/grsecurity/grsec_fork.c
85292@@ -0,0 +1,23 @@
85293+#include <linux/kernel.h>
85294+#include <linux/sched.h>
85295+#include <linux/grsecurity.h>
85296+#include <linux/grinternal.h>
85297+#include <linux/errno.h>
85298+
85299+void
85300+gr_log_forkfail(const int retval)
85301+{
85302+#ifdef CONFIG_GRKERNSEC_FORKFAIL
85303+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
85304+ switch (retval) {
85305+ case -EAGAIN:
85306+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
85307+ break;
85308+ case -ENOMEM:
85309+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
85310+ break;
85311+ }
85312+ }
85313+#endif
85314+ return;
85315+}
85316diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
85317new file mode 100644
85318index 0000000..4ed9e7d
85319--- /dev/null
85320+++ b/grsecurity/grsec_init.c
85321@@ -0,0 +1,290 @@
85322+#include <linux/kernel.h>
85323+#include <linux/sched.h>
85324+#include <linux/mm.h>
85325+#include <linux/gracl.h>
85326+#include <linux/slab.h>
85327+#include <linux/vmalloc.h>
85328+#include <linux/percpu.h>
85329+#include <linux/module.h>
85330+
85331+int grsec_enable_ptrace_readexec;
85332+int grsec_enable_setxid;
85333+int grsec_enable_symlinkown;
85334+kgid_t grsec_symlinkown_gid;
85335+int grsec_enable_brute;
85336+int grsec_enable_link;
85337+int grsec_enable_dmesg;
85338+int grsec_enable_harden_ptrace;
85339+int grsec_enable_harden_ipc;
85340+int grsec_enable_fifo;
85341+int grsec_enable_execlog;
85342+int grsec_enable_signal;
85343+int grsec_enable_forkfail;
85344+int grsec_enable_audit_ptrace;
85345+int grsec_enable_time;
85346+int grsec_enable_group;
85347+kgid_t grsec_audit_gid;
85348+int grsec_enable_chdir;
85349+int grsec_enable_mount;
85350+int grsec_enable_rofs;
85351+int grsec_deny_new_usb;
85352+int grsec_enable_chroot_findtask;
85353+int grsec_enable_chroot_mount;
85354+int grsec_enable_chroot_shmat;
85355+int grsec_enable_chroot_fchdir;
85356+int grsec_enable_chroot_double;
85357+int grsec_enable_chroot_pivot;
85358+int grsec_enable_chroot_chdir;
85359+int grsec_enable_chroot_chmod;
85360+int grsec_enable_chroot_mknod;
85361+int grsec_enable_chroot_nice;
85362+int grsec_enable_chroot_execlog;
85363+int grsec_enable_chroot_caps;
85364+int grsec_enable_chroot_rename;
85365+int grsec_enable_chroot_sysctl;
85366+int grsec_enable_chroot_unix;
85367+int grsec_enable_tpe;
85368+kgid_t grsec_tpe_gid;
85369+int grsec_enable_blackhole;
85370+#ifdef CONFIG_IPV6_MODULE
85371+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
85372+#endif
85373+int grsec_lastack_retries;
85374+int grsec_enable_tpe_all;
85375+int grsec_enable_tpe_invert;
85376+int grsec_enable_socket_all;
85377+kgid_t grsec_socket_all_gid;
85378+int grsec_enable_socket_client;
85379+kgid_t grsec_socket_client_gid;
85380+int grsec_enable_socket_server;
85381+kgid_t grsec_socket_server_gid;
85382+int grsec_resource_logging;
85383+int grsec_disable_privio;
85384+int grsec_enable_log_rwxmaps;
85385+int grsec_lock;
85386+
85387+DEFINE_SPINLOCK(grsec_alert_lock);
85388+unsigned long grsec_alert_wtime = 0;
85389+unsigned long grsec_alert_fyet = 0;
85390+
85391+DEFINE_SPINLOCK(grsec_audit_lock);
85392+
85393+DEFINE_RWLOCK(grsec_exec_file_lock);
85394+
85395+char *gr_shared_page[4];
85396+
85397+char *gr_alert_log_fmt;
85398+char *gr_audit_log_fmt;
85399+char *gr_alert_log_buf;
85400+char *gr_audit_log_buf;
85401+
85402+extern struct gr_arg *gr_usermode;
85403+extern unsigned char *gr_system_salt;
85404+extern unsigned char *gr_system_sum;
85405+
85406+void __init
85407+grsecurity_init(void)
85408+{
85409+ int j;
85410+ /* create the per-cpu shared pages */
85411+
85412+#ifdef CONFIG_X86
85413+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
85414+#endif
85415+
85416+ for (j = 0; j < 4; j++) {
85417+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
85418+ if (gr_shared_page[j] == NULL) {
85419+ panic("Unable to allocate grsecurity shared page");
85420+ return;
85421+ }
85422+ }
85423+
85424+ /* allocate log buffers */
85425+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
85426+ if (!gr_alert_log_fmt) {
85427+ panic("Unable to allocate grsecurity alert log format buffer");
85428+ return;
85429+ }
85430+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
85431+ if (!gr_audit_log_fmt) {
85432+ panic("Unable to allocate grsecurity audit log format buffer");
85433+ return;
85434+ }
85435+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
85436+ if (!gr_alert_log_buf) {
85437+ panic("Unable to allocate grsecurity alert log buffer");
85438+ return;
85439+ }
85440+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
85441+ if (!gr_audit_log_buf) {
85442+ panic("Unable to allocate grsecurity audit log buffer");
85443+ return;
85444+ }
85445+
85446+ /* allocate memory for authentication structure */
85447+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
85448+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
85449+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
85450+
85451+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
85452+ panic("Unable to allocate grsecurity authentication structure");
85453+ return;
85454+ }
85455+
85456+#ifdef CONFIG_GRKERNSEC_IO
85457+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
85458+ grsec_disable_privio = 1;
85459+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
85460+ grsec_disable_privio = 1;
85461+#else
85462+ grsec_disable_privio = 0;
85463+#endif
85464+#endif
85465+
85466+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
85467+ /* for backward compatibility, tpe_invert always defaults to on if
85468+ enabled in the kernel
85469+ */
85470+ grsec_enable_tpe_invert = 1;
85471+#endif
85472+
85473+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
85474+#ifndef CONFIG_GRKERNSEC_SYSCTL
85475+ grsec_lock = 1;
85476+#endif
85477+
85478+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
85479+ grsec_enable_log_rwxmaps = 1;
85480+#endif
85481+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
85482+ grsec_enable_group = 1;
85483+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
85484+#endif
85485+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
85486+ grsec_enable_ptrace_readexec = 1;
85487+#endif
85488+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
85489+ grsec_enable_chdir = 1;
85490+#endif
85491+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
85492+ grsec_enable_harden_ptrace = 1;
85493+#endif
85494+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
85495+ grsec_enable_harden_ipc = 1;
85496+#endif
85497+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
85498+ grsec_enable_mount = 1;
85499+#endif
85500+#ifdef CONFIG_GRKERNSEC_LINK
85501+ grsec_enable_link = 1;
85502+#endif
85503+#ifdef CONFIG_GRKERNSEC_BRUTE
85504+ grsec_enable_brute = 1;
85505+#endif
85506+#ifdef CONFIG_GRKERNSEC_DMESG
85507+ grsec_enable_dmesg = 1;
85508+#endif
85509+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
85510+ grsec_enable_blackhole = 1;
85511+ grsec_lastack_retries = 4;
85512+#endif
85513+#ifdef CONFIG_GRKERNSEC_FIFO
85514+ grsec_enable_fifo = 1;
85515+#endif
85516+#ifdef CONFIG_GRKERNSEC_EXECLOG
85517+ grsec_enable_execlog = 1;
85518+#endif
85519+#ifdef CONFIG_GRKERNSEC_SETXID
85520+ grsec_enable_setxid = 1;
85521+#endif
85522+#ifdef CONFIG_GRKERNSEC_SIGNAL
85523+ grsec_enable_signal = 1;
85524+#endif
85525+#ifdef CONFIG_GRKERNSEC_FORKFAIL
85526+ grsec_enable_forkfail = 1;
85527+#endif
85528+#ifdef CONFIG_GRKERNSEC_TIME
85529+ grsec_enable_time = 1;
85530+#endif
85531+#ifdef CONFIG_GRKERNSEC_RESLOG
85532+ grsec_resource_logging = 1;
85533+#endif
85534+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
85535+ grsec_enable_chroot_findtask = 1;
85536+#endif
85537+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
85538+ grsec_enable_chroot_unix = 1;
85539+#endif
85540+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
85541+ grsec_enable_chroot_mount = 1;
85542+#endif
85543+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
85544+ grsec_enable_chroot_fchdir = 1;
85545+#endif
85546+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
85547+ grsec_enable_chroot_shmat = 1;
85548+#endif
85549+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
85550+ grsec_enable_audit_ptrace = 1;
85551+#endif
85552+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
85553+ grsec_enable_chroot_double = 1;
85554+#endif
85555+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
85556+ grsec_enable_chroot_pivot = 1;
85557+#endif
85558+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
85559+ grsec_enable_chroot_chdir = 1;
85560+#endif
85561+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
85562+ grsec_enable_chroot_chmod = 1;
85563+#endif
85564+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
85565+ grsec_enable_chroot_mknod = 1;
85566+#endif
85567+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
85568+ grsec_enable_chroot_nice = 1;
85569+#endif
85570+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
85571+ grsec_enable_chroot_execlog = 1;
85572+#endif
85573+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
85574+ grsec_enable_chroot_caps = 1;
85575+#endif
85576+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
85577+ grsec_enable_chroot_rename = 1;
85578+#endif
85579+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
85580+ grsec_enable_chroot_sysctl = 1;
85581+#endif
85582+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
85583+ grsec_enable_symlinkown = 1;
85584+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
85585+#endif
85586+#ifdef CONFIG_GRKERNSEC_TPE
85587+ grsec_enable_tpe = 1;
85588+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
85589+#ifdef CONFIG_GRKERNSEC_TPE_ALL
85590+ grsec_enable_tpe_all = 1;
85591+#endif
85592+#endif
85593+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
85594+ grsec_enable_socket_all = 1;
85595+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
85596+#endif
85597+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
85598+ grsec_enable_socket_client = 1;
85599+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
85600+#endif
85601+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
85602+ grsec_enable_socket_server = 1;
85603+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
85604+#endif
85605+#endif
85606+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
85607+ grsec_deny_new_usb = 1;
85608+#endif
85609+
85610+ return;
85611+}
85612diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
85613new file mode 100644
85614index 0000000..1773300
85615--- /dev/null
85616+++ b/grsecurity/grsec_ipc.c
85617@@ -0,0 +1,48 @@
85618+#include <linux/kernel.h>
85619+#include <linux/mm.h>
85620+#include <linux/sched.h>
85621+#include <linux/file.h>
85622+#include <linux/ipc.h>
85623+#include <linux/ipc_namespace.h>
85624+#include <linux/grsecurity.h>
85625+#include <linux/grinternal.h>
85626+
85627+int
85628+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
85629+{
85630+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
85631+ int write;
85632+ int orig_granted_mode;
85633+ kuid_t euid;
85634+ kgid_t egid;
85635+
85636+ if (!grsec_enable_harden_ipc)
85637+ return 1;
85638+
85639+ euid = current_euid();
85640+ egid = current_egid();
85641+
85642+ write = requested_mode & 00002;
85643+ orig_granted_mode = ipcp->mode;
85644+
85645+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
85646+ orig_granted_mode >>= 6;
85647+ else {
85648+ /* if likely wrong permissions, lock to user */
85649+ if (orig_granted_mode & 0007)
85650+ orig_granted_mode = 0;
85651+ /* otherwise do a egid-only check */
85652+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
85653+ orig_granted_mode >>= 3;
85654+ /* otherwise, no access */
85655+ else
85656+ orig_granted_mode = 0;
85657+ }
85658+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
85659+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
85660+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
85661+ return 0;
85662+ }
85663+#endif
85664+ return 1;
85665+}
85666diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
85667new file mode 100644
85668index 0000000..5e05e20
85669--- /dev/null
85670+++ b/grsecurity/grsec_link.c
85671@@ -0,0 +1,58 @@
85672+#include <linux/kernel.h>
85673+#include <linux/sched.h>
85674+#include <linux/fs.h>
85675+#include <linux/file.h>
85676+#include <linux/grinternal.h>
85677+
85678+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
85679+{
85680+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
85681+ const struct inode *link_inode = link->dentry->d_inode;
85682+
85683+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
85684+ /* ignore root-owned links, e.g. /proc/self */
85685+ gr_is_global_nonroot(link_inode->i_uid) && target &&
85686+ !uid_eq(link_inode->i_uid, target->i_uid)) {
85687+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
85688+ return 1;
85689+ }
85690+#endif
85691+ return 0;
85692+}
85693+
85694+int
85695+gr_handle_follow_link(const struct inode *parent,
85696+ const struct inode *inode,
85697+ const struct dentry *dentry, const struct vfsmount *mnt)
85698+{
85699+#ifdef CONFIG_GRKERNSEC_LINK
85700+ const struct cred *cred = current_cred();
85701+
85702+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
85703+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
85704+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
85705+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
85706+ return -EACCES;
85707+ }
85708+#endif
85709+ return 0;
85710+}
85711+
85712+int
85713+gr_handle_hardlink(const struct dentry *dentry,
85714+ const struct vfsmount *mnt,
85715+ struct inode *inode, const int mode, const struct filename *to)
85716+{
85717+#ifdef CONFIG_GRKERNSEC_LINK
85718+ const struct cred *cred = current_cred();
85719+
85720+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
85721+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
85722+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
85723+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
85724+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
85725+ return -EPERM;
85726+ }
85727+#endif
85728+ return 0;
85729+}
85730diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
85731new file mode 100644
85732index 0000000..dbe0a6b
85733--- /dev/null
85734+++ b/grsecurity/grsec_log.c
85735@@ -0,0 +1,341 @@
85736+#include <linux/kernel.h>
85737+#include <linux/sched.h>
85738+#include <linux/file.h>
85739+#include <linux/tty.h>
85740+#include <linux/fs.h>
85741+#include <linux/mm.h>
85742+#include <linux/grinternal.h>
85743+
85744+#ifdef CONFIG_TREE_PREEMPT_RCU
85745+#define DISABLE_PREEMPT() preempt_disable()
85746+#define ENABLE_PREEMPT() preempt_enable()
85747+#else
85748+#define DISABLE_PREEMPT()
85749+#define ENABLE_PREEMPT()
85750+#endif
85751+
85752+#define BEGIN_LOCKS(x) \
85753+ DISABLE_PREEMPT(); \
85754+ rcu_read_lock(); \
85755+ read_lock(&tasklist_lock); \
85756+ read_lock(&grsec_exec_file_lock); \
85757+ if (x != GR_DO_AUDIT) \
85758+ spin_lock(&grsec_alert_lock); \
85759+ else \
85760+ spin_lock(&grsec_audit_lock)
85761+
85762+#define END_LOCKS(x) \
85763+ if (x != GR_DO_AUDIT) \
85764+ spin_unlock(&grsec_alert_lock); \
85765+ else \
85766+ spin_unlock(&grsec_audit_lock); \
85767+ read_unlock(&grsec_exec_file_lock); \
85768+ read_unlock(&tasklist_lock); \
85769+ rcu_read_unlock(); \
85770+ ENABLE_PREEMPT(); \
85771+ if (x == GR_DONT_AUDIT) \
85772+ gr_handle_alertkill(current)
85773+
85774+enum {
85775+ FLOODING,
85776+ NO_FLOODING
85777+};
85778+
85779+extern char *gr_alert_log_fmt;
85780+extern char *gr_audit_log_fmt;
85781+extern char *gr_alert_log_buf;
85782+extern char *gr_audit_log_buf;
85783+
85784+static int gr_log_start(int audit)
85785+{
85786+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
85787+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
85788+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85789+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
85790+ unsigned long curr_secs = get_seconds();
85791+
85792+ if (audit == GR_DO_AUDIT)
85793+ goto set_fmt;
85794+
85795+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
85796+ grsec_alert_wtime = curr_secs;
85797+ grsec_alert_fyet = 0;
85798+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
85799+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
85800+ grsec_alert_fyet++;
85801+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
85802+ grsec_alert_wtime = curr_secs;
85803+ grsec_alert_fyet++;
85804+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
85805+ return FLOODING;
85806+ }
85807+ else return FLOODING;
85808+
85809+set_fmt:
85810+#endif
85811+ memset(buf, 0, PAGE_SIZE);
85812+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
85813+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
85814+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
85815+ } else if (current->signal->curr_ip) {
85816+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
85817+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
85818+ } else if (gr_acl_is_enabled()) {
85819+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
85820+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
85821+ } else {
85822+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
85823+ strcpy(buf, fmt);
85824+ }
85825+
85826+ return NO_FLOODING;
85827+}
85828+
85829+static void gr_log_middle(int audit, const char *msg, va_list ap)
85830+ __attribute__ ((format (printf, 2, 0)));
85831+
85832+static void gr_log_middle(int audit, const char *msg, va_list ap)
85833+{
85834+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85835+ unsigned int len = strlen(buf);
85836+
85837+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
85838+
85839+ return;
85840+}
85841+
85842+static void gr_log_middle_varargs(int audit, const char *msg, ...)
85843+ __attribute__ ((format (printf, 2, 3)));
85844+
85845+static void gr_log_middle_varargs(int audit, const char *msg, ...)
85846+{
85847+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85848+ unsigned int len = strlen(buf);
85849+ va_list ap;
85850+
85851+ va_start(ap, msg);
85852+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
85853+ va_end(ap);
85854+
85855+ return;
85856+}
85857+
85858+static void gr_log_end(int audit, int append_default)
85859+{
85860+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85861+ if (append_default) {
85862+ struct task_struct *task = current;
85863+ struct task_struct *parent = task->real_parent;
85864+ const struct cred *cred = __task_cred(task);
85865+ const struct cred *pcred = __task_cred(parent);
85866+ unsigned int len = strlen(buf);
85867+
85868+ 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));
85869+ }
85870+
85871+ printk("%s\n", buf);
85872+
85873+ return;
85874+}
85875+
85876+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
85877+{
85878+ int logtype;
85879+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
85880+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
85881+ void *voidptr = NULL;
85882+ int num1 = 0, num2 = 0;
85883+ unsigned long ulong1 = 0, ulong2 = 0;
85884+ struct dentry *dentry = NULL;
85885+ struct vfsmount *mnt = NULL;
85886+ struct file *file = NULL;
85887+ struct task_struct *task = NULL;
85888+ struct vm_area_struct *vma = NULL;
85889+ const struct cred *cred, *pcred;
85890+ va_list ap;
85891+
85892+ BEGIN_LOCKS(audit);
85893+ logtype = gr_log_start(audit);
85894+ if (logtype == FLOODING) {
85895+ END_LOCKS(audit);
85896+ return;
85897+ }
85898+ va_start(ap, argtypes);
85899+ switch (argtypes) {
85900+ case GR_TTYSNIFF:
85901+ task = va_arg(ap, struct task_struct *);
85902+ 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));
85903+ break;
85904+ case GR_SYSCTL_HIDDEN:
85905+ str1 = va_arg(ap, char *);
85906+ gr_log_middle_varargs(audit, msg, result, str1);
85907+ break;
85908+ case GR_RBAC:
85909+ dentry = va_arg(ap, struct dentry *);
85910+ mnt = va_arg(ap, struct vfsmount *);
85911+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
85912+ break;
85913+ case GR_RBAC_STR:
85914+ dentry = va_arg(ap, struct dentry *);
85915+ mnt = va_arg(ap, struct vfsmount *);
85916+ str1 = va_arg(ap, char *);
85917+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
85918+ break;
85919+ case GR_STR_RBAC:
85920+ str1 = va_arg(ap, char *);
85921+ dentry = va_arg(ap, struct dentry *);
85922+ mnt = va_arg(ap, struct vfsmount *);
85923+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
85924+ break;
85925+ case GR_RBAC_MODE2:
85926+ dentry = va_arg(ap, struct dentry *);
85927+ mnt = va_arg(ap, struct vfsmount *);
85928+ str1 = va_arg(ap, char *);
85929+ str2 = va_arg(ap, char *);
85930+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
85931+ break;
85932+ case GR_RBAC_MODE3:
85933+ dentry = va_arg(ap, struct dentry *);
85934+ mnt = va_arg(ap, struct vfsmount *);
85935+ str1 = va_arg(ap, char *);
85936+ str2 = va_arg(ap, char *);
85937+ str3 = va_arg(ap, char *);
85938+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
85939+ break;
85940+ case GR_FILENAME:
85941+ dentry = va_arg(ap, struct dentry *);
85942+ mnt = va_arg(ap, struct vfsmount *);
85943+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
85944+ break;
85945+ case GR_STR_FILENAME:
85946+ str1 = va_arg(ap, char *);
85947+ dentry = va_arg(ap, struct dentry *);
85948+ mnt = va_arg(ap, struct vfsmount *);
85949+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
85950+ break;
85951+ case GR_FILENAME_STR:
85952+ dentry = va_arg(ap, struct dentry *);
85953+ mnt = va_arg(ap, struct vfsmount *);
85954+ str1 = va_arg(ap, char *);
85955+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
85956+ break;
85957+ case GR_FILENAME_TWO_INT:
85958+ dentry = va_arg(ap, struct dentry *);
85959+ mnt = va_arg(ap, struct vfsmount *);
85960+ num1 = va_arg(ap, int);
85961+ num2 = va_arg(ap, int);
85962+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
85963+ break;
85964+ case GR_FILENAME_TWO_INT_STR:
85965+ dentry = va_arg(ap, struct dentry *);
85966+ mnt = va_arg(ap, struct vfsmount *);
85967+ num1 = va_arg(ap, int);
85968+ num2 = va_arg(ap, int);
85969+ str1 = va_arg(ap, char *);
85970+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
85971+ break;
85972+ case GR_TEXTREL:
85973+ file = va_arg(ap, struct file *);
85974+ ulong1 = va_arg(ap, unsigned long);
85975+ ulong2 = va_arg(ap, unsigned long);
85976+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
85977+ break;
85978+ case GR_PTRACE:
85979+ task = va_arg(ap, struct task_struct *);
85980+ 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));
85981+ break;
85982+ case GR_RESOURCE:
85983+ task = va_arg(ap, struct task_struct *);
85984+ cred = __task_cred(task);
85985+ pcred = __task_cred(task->real_parent);
85986+ ulong1 = va_arg(ap, unsigned long);
85987+ str1 = va_arg(ap, char *);
85988+ ulong2 = va_arg(ap, unsigned long);
85989+ 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));
85990+ break;
85991+ case GR_CAP:
85992+ task = va_arg(ap, struct task_struct *);
85993+ cred = __task_cred(task);
85994+ pcred = __task_cred(task->real_parent);
85995+ str1 = va_arg(ap, char *);
85996+ 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));
85997+ break;
85998+ case GR_SIG:
85999+ str1 = va_arg(ap, char *);
86000+ voidptr = va_arg(ap, void *);
86001+ gr_log_middle_varargs(audit, msg, str1, voidptr);
86002+ break;
86003+ case GR_SIG2:
86004+ task = va_arg(ap, struct task_struct *);
86005+ cred = __task_cred(task);
86006+ pcred = __task_cred(task->real_parent);
86007+ num1 = va_arg(ap, int);
86008+ 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));
86009+ break;
86010+ case GR_CRASH1:
86011+ task = va_arg(ap, struct task_struct *);
86012+ cred = __task_cred(task);
86013+ pcred = __task_cred(task->real_parent);
86014+ ulong1 = va_arg(ap, unsigned long);
86015+ 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);
86016+ break;
86017+ case GR_CRASH2:
86018+ task = va_arg(ap, struct task_struct *);
86019+ cred = __task_cred(task);
86020+ pcred = __task_cred(task->real_parent);
86021+ ulong1 = va_arg(ap, unsigned long);
86022+ 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);
86023+ break;
86024+ case GR_RWXMAP:
86025+ file = va_arg(ap, struct file *);
86026+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
86027+ break;
86028+ case GR_RWXMAPVMA:
86029+ vma = va_arg(ap, struct vm_area_struct *);
86030+ if (vma->vm_file)
86031+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
86032+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
86033+ str1 = "<stack>";
86034+ else if (vma->vm_start <= current->mm->brk &&
86035+ vma->vm_end >= current->mm->start_brk)
86036+ str1 = "<heap>";
86037+ else
86038+ str1 = "<anonymous mapping>";
86039+ gr_log_middle_varargs(audit, msg, str1);
86040+ break;
86041+ case GR_PSACCT:
86042+ {
86043+ unsigned int wday, cday;
86044+ __u8 whr, chr;
86045+ __u8 wmin, cmin;
86046+ __u8 wsec, csec;
86047+ char cur_tty[64] = { 0 };
86048+ char parent_tty[64] = { 0 };
86049+
86050+ task = va_arg(ap, struct task_struct *);
86051+ wday = va_arg(ap, unsigned int);
86052+ cday = va_arg(ap, unsigned int);
86053+ whr = va_arg(ap, int);
86054+ chr = va_arg(ap, int);
86055+ wmin = va_arg(ap, int);
86056+ cmin = va_arg(ap, int);
86057+ wsec = va_arg(ap, int);
86058+ csec = va_arg(ap, int);
86059+ ulong1 = va_arg(ap, unsigned long);
86060+ cred = __task_cred(task);
86061+ pcred = __task_cred(task->real_parent);
86062+
86063+ 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));
86064+ }
86065+ break;
86066+ default:
86067+ gr_log_middle(audit, msg, ap);
86068+ }
86069+ va_end(ap);
86070+ // these don't need DEFAULTSECARGS printed on the end
86071+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
86072+ gr_log_end(audit, 0);
86073+ else
86074+ gr_log_end(audit, 1);
86075+ END_LOCKS(audit);
86076+}
86077diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
86078new file mode 100644
86079index 0000000..0e39d8c
86080--- /dev/null
86081+++ b/grsecurity/grsec_mem.c
86082@@ -0,0 +1,48 @@
86083+#include <linux/kernel.h>
86084+#include <linux/sched.h>
86085+#include <linux/mm.h>
86086+#include <linux/mman.h>
86087+#include <linux/module.h>
86088+#include <linux/grinternal.h>
86089+
86090+void gr_handle_msr_write(void)
86091+{
86092+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
86093+ return;
86094+}
86095+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
86096+
86097+void
86098+gr_handle_ioperm(void)
86099+{
86100+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
86101+ return;
86102+}
86103+
86104+void
86105+gr_handle_iopl(void)
86106+{
86107+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
86108+ return;
86109+}
86110+
86111+void
86112+gr_handle_mem_readwrite(u64 from, u64 to)
86113+{
86114+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
86115+ return;
86116+}
86117+
86118+void
86119+gr_handle_vm86(void)
86120+{
86121+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
86122+ return;
86123+}
86124+
86125+void
86126+gr_log_badprocpid(const char *entry)
86127+{
86128+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
86129+ return;
86130+}
86131diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
86132new file mode 100644
86133index 0000000..6f9eb73
86134--- /dev/null
86135+++ b/grsecurity/grsec_mount.c
86136@@ -0,0 +1,65 @@
86137+#include <linux/kernel.h>
86138+#include <linux/sched.h>
86139+#include <linux/mount.h>
86140+#include <linux/major.h>
86141+#include <linux/grsecurity.h>
86142+#include <linux/grinternal.h>
86143+
86144+void
86145+gr_log_remount(const char *devname, const int retval)
86146+{
86147+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86148+ if (grsec_enable_mount && (retval >= 0))
86149+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
86150+#endif
86151+ return;
86152+}
86153+
86154+void
86155+gr_log_unmount(const char *devname, const int retval)
86156+{
86157+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86158+ if (grsec_enable_mount && (retval >= 0))
86159+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
86160+#endif
86161+ return;
86162+}
86163+
86164+void
86165+gr_log_mount(const char *from, struct path *to, const int retval)
86166+{
86167+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86168+ if (grsec_enable_mount && (retval >= 0))
86169+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
86170+#endif
86171+ return;
86172+}
86173+
86174+int
86175+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
86176+{
86177+#ifdef CONFIG_GRKERNSEC_ROFS
86178+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
86179+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
86180+ return -EPERM;
86181+ } else
86182+ return 0;
86183+#endif
86184+ return 0;
86185+}
86186+
86187+int
86188+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
86189+{
86190+#ifdef CONFIG_GRKERNSEC_ROFS
86191+ struct inode *inode = dentry->d_inode;
86192+
86193+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
86194+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
86195+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
86196+ return -EPERM;
86197+ } else
86198+ return 0;
86199+#endif
86200+ return 0;
86201+}
86202diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
86203new file mode 100644
86204index 0000000..6ee9d50
86205--- /dev/null
86206+++ b/grsecurity/grsec_pax.c
86207@@ -0,0 +1,45 @@
86208+#include <linux/kernel.h>
86209+#include <linux/sched.h>
86210+#include <linux/mm.h>
86211+#include <linux/file.h>
86212+#include <linux/grinternal.h>
86213+#include <linux/grsecurity.h>
86214+
86215+void
86216+gr_log_textrel(struct vm_area_struct * vma)
86217+{
86218+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86219+ if (grsec_enable_log_rwxmaps)
86220+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
86221+#endif
86222+ return;
86223+}
86224+
86225+void gr_log_ptgnustack(struct file *file)
86226+{
86227+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86228+ if (grsec_enable_log_rwxmaps)
86229+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
86230+#endif
86231+ return;
86232+}
86233+
86234+void
86235+gr_log_rwxmmap(struct file *file)
86236+{
86237+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86238+ if (grsec_enable_log_rwxmaps)
86239+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
86240+#endif
86241+ return;
86242+}
86243+
86244+void
86245+gr_log_rwxmprotect(struct vm_area_struct *vma)
86246+{
86247+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86248+ if (grsec_enable_log_rwxmaps)
86249+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
86250+#endif
86251+ return;
86252+}
86253diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
86254new file mode 100644
86255index 0000000..2005a3a
86256--- /dev/null
86257+++ b/grsecurity/grsec_proc.c
86258@@ -0,0 +1,20 @@
86259+#include <linux/kernel.h>
86260+#include <linux/sched.h>
86261+#include <linux/grsecurity.h>
86262+#include <linux/grinternal.h>
86263+
86264+int gr_proc_is_restricted(void)
86265+{
86266+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86267+ const struct cred *cred = current_cred();
86268+#endif
86269+
86270+#ifdef CONFIG_GRKERNSEC_PROC_USER
86271+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
86272+ return -EACCES;
86273+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86274+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
86275+ return -EACCES;
86276+#endif
86277+ return 0;
86278+}
86279diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
86280new file mode 100644
86281index 0000000..f7f29aa
86282--- /dev/null
86283+++ b/grsecurity/grsec_ptrace.c
86284@@ -0,0 +1,30 @@
86285+#include <linux/kernel.h>
86286+#include <linux/sched.h>
86287+#include <linux/grinternal.h>
86288+#include <linux/security.h>
86289+
86290+void
86291+gr_audit_ptrace(struct task_struct *task)
86292+{
86293+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
86294+ if (grsec_enable_audit_ptrace)
86295+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
86296+#endif
86297+ return;
86298+}
86299+
86300+int
86301+gr_ptrace_readexec(struct file *file, int unsafe_flags)
86302+{
86303+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
86304+ const struct dentry *dentry = file->f_path.dentry;
86305+ const struct vfsmount *mnt = file->f_path.mnt;
86306+
86307+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
86308+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
86309+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
86310+ return -EACCES;
86311+ }
86312+#endif
86313+ return 0;
86314+}
86315diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
86316new file mode 100644
86317index 0000000..3860c7e
86318--- /dev/null
86319+++ b/grsecurity/grsec_sig.c
86320@@ -0,0 +1,236 @@
86321+#include <linux/kernel.h>
86322+#include <linux/sched.h>
86323+#include <linux/fs.h>
86324+#include <linux/delay.h>
86325+#include <linux/grsecurity.h>
86326+#include <linux/grinternal.h>
86327+#include <linux/hardirq.h>
86328+
86329+char *signames[] = {
86330+ [SIGSEGV] = "Segmentation fault",
86331+ [SIGILL] = "Illegal instruction",
86332+ [SIGABRT] = "Abort",
86333+ [SIGBUS] = "Invalid alignment/Bus error"
86334+};
86335+
86336+void
86337+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
86338+{
86339+#ifdef CONFIG_GRKERNSEC_SIGNAL
86340+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
86341+ (sig == SIGABRT) || (sig == SIGBUS))) {
86342+ if (task_pid_nr(t) == task_pid_nr(current)) {
86343+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
86344+ } else {
86345+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
86346+ }
86347+ }
86348+#endif
86349+ return;
86350+}
86351+
86352+int
86353+gr_handle_signal(const struct task_struct *p, const int sig)
86354+{
86355+#ifdef CONFIG_GRKERNSEC
86356+ /* ignore the 0 signal for protected task checks */
86357+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
86358+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
86359+ return -EPERM;
86360+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
86361+ return -EPERM;
86362+ }
86363+#endif
86364+ return 0;
86365+}
86366+
86367+#ifdef CONFIG_GRKERNSEC
86368+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
86369+
86370+int gr_fake_force_sig(int sig, struct task_struct *t)
86371+{
86372+ unsigned long int flags;
86373+ int ret, blocked, ignored;
86374+ struct k_sigaction *action;
86375+
86376+ spin_lock_irqsave(&t->sighand->siglock, flags);
86377+ action = &t->sighand->action[sig-1];
86378+ ignored = action->sa.sa_handler == SIG_IGN;
86379+ blocked = sigismember(&t->blocked, sig);
86380+ if (blocked || ignored) {
86381+ action->sa.sa_handler = SIG_DFL;
86382+ if (blocked) {
86383+ sigdelset(&t->blocked, sig);
86384+ recalc_sigpending_and_wake(t);
86385+ }
86386+ }
86387+ if (action->sa.sa_handler == SIG_DFL)
86388+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
86389+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
86390+
86391+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
86392+
86393+ return ret;
86394+}
86395+#endif
86396+
86397+#define GR_USER_BAN_TIME (15 * 60)
86398+#define GR_DAEMON_BRUTE_TIME (30 * 60)
86399+
86400+void gr_handle_brute_attach(int dumpable)
86401+{
86402+#ifdef CONFIG_GRKERNSEC_BRUTE
86403+ struct task_struct *p = current;
86404+ kuid_t uid = GLOBAL_ROOT_UID;
86405+ int daemon = 0;
86406+
86407+ if (!grsec_enable_brute)
86408+ return;
86409+
86410+ rcu_read_lock();
86411+ read_lock(&tasklist_lock);
86412+ read_lock(&grsec_exec_file_lock);
86413+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
86414+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
86415+ p->real_parent->brute = 1;
86416+ daemon = 1;
86417+ } else {
86418+ const struct cred *cred = __task_cred(p), *cred2;
86419+ struct task_struct *tsk, *tsk2;
86420+
86421+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
86422+ struct user_struct *user;
86423+
86424+ uid = cred->uid;
86425+
86426+ /* this is put upon execution past expiration */
86427+ user = find_user(uid);
86428+ if (user == NULL)
86429+ goto unlock;
86430+ user->suid_banned = 1;
86431+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
86432+ if (user->suid_ban_expires == ~0UL)
86433+ user->suid_ban_expires--;
86434+
86435+ /* only kill other threads of the same binary, from the same user */
86436+ do_each_thread(tsk2, tsk) {
86437+ cred2 = __task_cred(tsk);
86438+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
86439+ gr_fake_force_sig(SIGKILL, tsk);
86440+ } while_each_thread(tsk2, tsk);
86441+ }
86442+ }
86443+unlock:
86444+ read_unlock(&grsec_exec_file_lock);
86445+ read_unlock(&tasklist_lock);
86446+ rcu_read_unlock();
86447+
86448+ if (gr_is_global_nonroot(uid))
86449+ 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);
86450+ else if (daemon)
86451+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
86452+
86453+#endif
86454+ return;
86455+}
86456+
86457+void gr_handle_brute_check(void)
86458+{
86459+#ifdef CONFIG_GRKERNSEC_BRUTE
86460+ struct task_struct *p = current;
86461+
86462+ if (unlikely(p->brute)) {
86463+ if (!grsec_enable_brute)
86464+ p->brute = 0;
86465+ else if (time_before(get_seconds(), p->brute_expires))
86466+ msleep(30 * 1000);
86467+ }
86468+#endif
86469+ return;
86470+}
86471+
86472+void gr_handle_kernel_exploit(void)
86473+{
86474+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86475+ const struct cred *cred;
86476+ struct task_struct *tsk, *tsk2;
86477+ struct user_struct *user;
86478+ kuid_t uid;
86479+
86480+ if (in_irq() || in_serving_softirq() || in_nmi())
86481+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
86482+
86483+ uid = current_uid();
86484+
86485+ if (gr_is_global_root(uid))
86486+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
86487+ else {
86488+ /* kill all the processes of this user, hold a reference
86489+ to their creds struct, and prevent them from creating
86490+ another process until system reset
86491+ */
86492+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
86493+ GR_GLOBAL_UID(uid));
86494+ /* we intentionally leak this ref */
86495+ user = get_uid(current->cred->user);
86496+ if (user)
86497+ user->kernel_banned = 1;
86498+
86499+ /* kill all processes of this user */
86500+ read_lock(&tasklist_lock);
86501+ do_each_thread(tsk2, tsk) {
86502+ cred = __task_cred(tsk);
86503+ if (uid_eq(cred->uid, uid))
86504+ gr_fake_force_sig(SIGKILL, tsk);
86505+ } while_each_thread(tsk2, tsk);
86506+ read_unlock(&tasklist_lock);
86507+ }
86508+#endif
86509+}
86510+
86511+#ifdef CONFIG_GRKERNSEC_BRUTE
86512+static bool suid_ban_expired(struct user_struct *user)
86513+{
86514+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
86515+ user->suid_banned = 0;
86516+ user->suid_ban_expires = 0;
86517+ free_uid(user);
86518+ return true;
86519+ }
86520+
86521+ return false;
86522+}
86523+#endif
86524+
86525+int gr_process_kernel_exec_ban(void)
86526+{
86527+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86528+ if (unlikely(current->cred->user->kernel_banned))
86529+ return -EPERM;
86530+#endif
86531+ return 0;
86532+}
86533+
86534+int gr_process_kernel_setuid_ban(struct user_struct *user)
86535+{
86536+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86537+ if (unlikely(user->kernel_banned))
86538+ gr_fake_force_sig(SIGKILL, current);
86539+#endif
86540+ return 0;
86541+}
86542+
86543+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
86544+{
86545+#ifdef CONFIG_GRKERNSEC_BRUTE
86546+ struct user_struct *user = current->cred->user;
86547+ if (unlikely(user->suid_banned)) {
86548+ if (suid_ban_expired(user))
86549+ return 0;
86550+ /* disallow execution of suid binaries only */
86551+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
86552+ return -EPERM;
86553+ }
86554+#endif
86555+ return 0;
86556+}
86557diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
86558new file mode 100644
86559index 0000000..a523bd2
86560--- /dev/null
86561+++ b/grsecurity/grsec_sock.c
86562@@ -0,0 +1,244 @@
86563+#include <linux/kernel.h>
86564+#include <linux/module.h>
86565+#include <linux/sched.h>
86566+#include <linux/file.h>
86567+#include <linux/net.h>
86568+#include <linux/in.h>
86569+#include <linux/ip.h>
86570+#include <net/sock.h>
86571+#include <net/inet_sock.h>
86572+#include <linux/grsecurity.h>
86573+#include <linux/grinternal.h>
86574+#include <linux/gracl.h>
86575+
86576+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
86577+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
86578+
86579+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
86580+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
86581+
86582+#ifdef CONFIG_UNIX_MODULE
86583+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
86584+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
86585+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
86586+EXPORT_SYMBOL_GPL(gr_handle_create);
86587+#endif
86588+
86589+#ifdef CONFIG_GRKERNSEC
86590+#define gr_conn_table_size 32749
86591+struct conn_table_entry {
86592+ struct conn_table_entry *next;
86593+ struct signal_struct *sig;
86594+};
86595+
86596+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
86597+DEFINE_SPINLOCK(gr_conn_table_lock);
86598+
86599+extern const char * gr_socktype_to_name(unsigned char type);
86600+extern const char * gr_proto_to_name(unsigned char proto);
86601+extern const char * gr_sockfamily_to_name(unsigned char family);
86602+
86603+static int
86604+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
86605+{
86606+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
86607+}
86608+
86609+static int
86610+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
86611+ __u16 sport, __u16 dport)
86612+{
86613+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
86614+ sig->gr_sport == sport && sig->gr_dport == dport))
86615+ return 1;
86616+ else
86617+ return 0;
86618+}
86619+
86620+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
86621+{
86622+ struct conn_table_entry **match;
86623+ unsigned int index;
86624+
86625+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
86626+ sig->gr_sport, sig->gr_dport,
86627+ gr_conn_table_size);
86628+
86629+ newent->sig = sig;
86630+
86631+ match = &gr_conn_table[index];
86632+ newent->next = *match;
86633+ *match = newent;
86634+
86635+ return;
86636+}
86637+
86638+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
86639+{
86640+ struct conn_table_entry *match, *last = NULL;
86641+ unsigned int index;
86642+
86643+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
86644+ sig->gr_sport, sig->gr_dport,
86645+ gr_conn_table_size);
86646+
86647+ match = gr_conn_table[index];
86648+ while (match && !conn_match(match->sig,
86649+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
86650+ sig->gr_dport)) {
86651+ last = match;
86652+ match = match->next;
86653+ }
86654+
86655+ if (match) {
86656+ if (last)
86657+ last->next = match->next;
86658+ else
86659+ gr_conn_table[index] = NULL;
86660+ kfree(match);
86661+ }
86662+
86663+ return;
86664+}
86665+
86666+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
86667+ __u16 sport, __u16 dport)
86668+{
86669+ struct conn_table_entry *match;
86670+ unsigned int index;
86671+
86672+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
86673+
86674+ match = gr_conn_table[index];
86675+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
86676+ match = match->next;
86677+
86678+ if (match)
86679+ return match->sig;
86680+ else
86681+ return NULL;
86682+}
86683+
86684+#endif
86685+
86686+void gr_update_task_in_ip_table(const struct inet_sock *inet)
86687+{
86688+#ifdef CONFIG_GRKERNSEC
86689+ struct signal_struct *sig = current->signal;
86690+ struct conn_table_entry *newent;
86691+
86692+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
86693+ if (newent == NULL)
86694+ return;
86695+ /* no bh lock needed since we are called with bh disabled */
86696+ spin_lock(&gr_conn_table_lock);
86697+ gr_del_task_from_ip_table_nolock(sig);
86698+ sig->gr_saddr = inet->inet_rcv_saddr;
86699+ sig->gr_daddr = inet->inet_daddr;
86700+ sig->gr_sport = inet->inet_sport;
86701+ sig->gr_dport = inet->inet_dport;
86702+ gr_add_to_task_ip_table_nolock(sig, newent);
86703+ spin_unlock(&gr_conn_table_lock);
86704+#endif
86705+ return;
86706+}
86707+
86708+void gr_del_task_from_ip_table(struct task_struct *task)
86709+{
86710+#ifdef CONFIG_GRKERNSEC
86711+ spin_lock_bh(&gr_conn_table_lock);
86712+ gr_del_task_from_ip_table_nolock(task->signal);
86713+ spin_unlock_bh(&gr_conn_table_lock);
86714+#endif
86715+ return;
86716+}
86717+
86718+void
86719+gr_attach_curr_ip(const struct sock *sk)
86720+{
86721+#ifdef CONFIG_GRKERNSEC
86722+ struct signal_struct *p, *set;
86723+ const struct inet_sock *inet = inet_sk(sk);
86724+
86725+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
86726+ return;
86727+
86728+ set = current->signal;
86729+
86730+ spin_lock_bh(&gr_conn_table_lock);
86731+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
86732+ inet->inet_dport, inet->inet_sport);
86733+ if (unlikely(p != NULL)) {
86734+ set->curr_ip = p->curr_ip;
86735+ set->used_accept = 1;
86736+ gr_del_task_from_ip_table_nolock(p);
86737+ spin_unlock_bh(&gr_conn_table_lock);
86738+ return;
86739+ }
86740+ spin_unlock_bh(&gr_conn_table_lock);
86741+
86742+ set->curr_ip = inet->inet_daddr;
86743+ set->used_accept = 1;
86744+#endif
86745+ return;
86746+}
86747+
86748+int
86749+gr_handle_sock_all(const int family, const int type, const int protocol)
86750+{
86751+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
86752+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
86753+ (family != AF_UNIX)) {
86754+ if (family == AF_INET)
86755+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
86756+ else
86757+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
86758+ return -EACCES;
86759+ }
86760+#endif
86761+ return 0;
86762+}
86763+
86764+int
86765+gr_handle_sock_server(const struct sockaddr *sck)
86766+{
86767+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
86768+ if (grsec_enable_socket_server &&
86769+ in_group_p(grsec_socket_server_gid) &&
86770+ sck && (sck->sa_family != AF_UNIX) &&
86771+ (sck->sa_family != AF_LOCAL)) {
86772+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
86773+ return -EACCES;
86774+ }
86775+#endif
86776+ return 0;
86777+}
86778+
86779+int
86780+gr_handle_sock_server_other(const struct sock *sck)
86781+{
86782+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
86783+ if (grsec_enable_socket_server &&
86784+ in_group_p(grsec_socket_server_gid) &&
86785+ sck && (sck->sk_family != AF_UNIX) &&
86786+ (sck->sk_family != AF_LOCAL)) {
86787+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
86788+ return -EACCES;
86789+ }
86790+#endif
86791+ return 0;
86792+}
86793+
86794+int
86795+gr_handle_sock_client(const struct sockaddr *sck)
86796+{
86797+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
86798+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
86799+ sck && (sck->sa_family != AF_UNIX) &&
86800+ (sck->sa_family != AF_LOCAL)) {
86801+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
86802+ return -EACCES;
86803+ }
86804+#endif
86805+ return 0;
86806+}
86807diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
86808new file mode 100644
86809index 0000000..cce889e
86810--- /dev/null
86811+++ b/grsecurity/grsec_sysctl.c
86812@@ -0,0 +1,488 @@
86813+#include <linux/kernel.h>
86814+#include <linux/sched.h>
86815+#include <linux/sysctl.h>
86816+#include <linux/grsecurity.h>
86817+#include <linux/grinternal.h>
86818+
86819+int
86820+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
86821+{
86822+#ifdef CONFIG_GRKERNSEC_SYSCTL
86823+ if (dirname == NULL || name == NULL)
86824+ return 0;
86825+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
86826+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
86827+ return -EACCES;
86828+ }
86829+#endif
86830+ return 0;
86831+}
86832+
86833+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
86834+static int __maybe_unused __read_only one = 1;
86835+#endif
86836+
86837+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
86838+ defined(CONFIG_GRKERNSEC_DENYUSB)
86839+struct ctl_table grsecurity_table[] = {
86840+#ifdef CONFIG_GRKERNSEC_SYSCTL
86841+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
86842+#ifdef CONFIG_GRKERNSEC_IO
86843+ {
86844+ .procname = "disable_priv_io",
86845+ .data = &grsec_disable_privio,
86846+ .maxlen = sizeof(int),
86847+ .mode = 0600,
86848+ .proc_handler = &proc_dointvec,
86849+ },
86850+#endif
86851+#endif
86852+#ifdef CONFIG_GRKERNSEC_LINK
86853+ {
86854+ .procname = "linking_restrictions",
86855+ .data = &grsec_enable_link,
86856+ .maxlen = sizeof(int),
86857+ .mode = 0600,
86858+ .proc_handler = &proc_dointvec,
86859+ },
86860+#endif
86861+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
86862+ {
86863+ .procname = "enforce_symlinksifowner",
86864+ .data = &grsec_enable_symlinkown,
86865+ .maxlen = sizeof(int),
86866+ .mode = 0600,
86867+ .proc_handler = &proc_dointvec,
86868+ },
86869+ {
86870+ .procname = "symlinkown_gid",
86871+ .data = &grsec_symlinkown_gid,
86872+ .maxlen = sizeof(int),
86873+ .mode = 0600,
86874+ .proc_handler = &proc_dointvec,
86875+ },
86876+#endif
86877+#ifdef CONFIG_GRKERNSEC_BRUTE
86878+ {
86879+ .procname = "deter_bruteforce",
86880+ .data = &grsec_enable_brute,
86881+ .maxlen = sizeof(int),
86882+ .mode = 0600,
86883+ .proc_handler = &proc_dointvec,
86884+ },
86885+#endif
86886+#ifdef CONFIG_GRKERNSEC_FIFO
86887+ {
86888+ .procname = "fifo_restrictions",
86889+ .data = &grsec_enable_fifo,
86890+ .maxlen = sizeof(int),
86891+ .mode = 0600,
86892+ .proc_handler = &proc_dointvec,
86893+ },
86894+#endif
86895+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
86896+ {
86897+ .procname = "ptrace_readexec",
86898+ .data = &grsec_enable_ptrace_readexec,
86899+ .maxlen = sizeof(int),
86900+ .mode = 0600,
86901+ .proc_handler = &proc_dointvec,
86902+ },
86903+#endif
86904+#ifdef CONFIG_GRKERNSEC_SETXID
86905+ {
86906+ .procname = "consistent_setxid",
86907+ .data = &grsec_enable_setxid,
86908+ .maxlen = sizeof(int),
86909+ .mode = 0600,
86910+ .proc_handler = &proc_dointvec,
86911+ },
86912+#endif
86913+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
86914+ {
86915+ .procname = "ip_blackhole",
86916+ .data = &grsec_enable_blackhole,
86917+ .maxlen = sizeof(int),
86918+ .mode = 0600,
86919+ .proc_handler = &proc_dointvec,
86920+ },
86921+ {
86922+ .procname = "lastack_retries",
86923+ .data = &grsec_lastack_retries,
86924+ .maxlen = sizeof(int),
86925+ .mode = 0600,
86926+ .proc_handler = &proc_dointvec,
86927+ },
86928+#endif
86929+#ifdef CONFIG_GRKERNSEC_EXECLOG
86930+ {
86931+ .procname = "exec_logging",
86932+ .data = &grsec_enable_execlog,
86933+ .maxlen = sizeof(int),
86934+ .mode = 0600,
86935+ .proc_handler = &proc_dointvec,
86936+ },
86937+#endif
86938+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86939+ {
86940+ .procname = "rwxmap_logging",
86941+ .data = &grsec_enable_log_rwxmaps,
86942+ .maxlen = sizeof(int),
86943+ .mode = 0600,
86944+ .proc_handler = &proc_dointvec,
86945+ },
86946+#endif
86947+#ifdef CONFIG_GRKERNSEC_SIGNAL
86948+ {
86949+ .procname = "signal_logging",
86950+ .data = &grsec_enable_signal,
86951+ .maxlen = sizeof(int),
86952+ .mode = 0600,
86953+ .proc_handler = &proc_dointvec,
86954+ },
86955+#endif
86956+#ifdef CONFIG_GRKERNSEC_FORKFAIL
86957+ {
86958+ .procname = "forkfail_logging",
86959+ .data = &grsec_enable_forkfail,
86960+ .maxlen = sizeof(int),
86961+ .mode = 0600,
86962+ .proc_handler = &proc_dointvec,
86963+ },
86964+#endif
86965+#ifdef CONFIG_GRKERNSEC_TIME
86966+ {
86967+ .procname = "timechange_logging",
86968+ .data = &grsec_enable_time,
86969+ .maxlen = sizeof(int),
86970+ .mode = 0600,
86971+ .proc_handler = &proc_dointvec,
86972+ },
86973+#endif
86974+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
86975+ {
86976+ .procname = "chroot_deny_shmat",
86977+ .data = &grsec_enable_chroot_shmat,
86978+ .maxlen = sizeof(int),
86979+ .mode = 0600,
86980+ .proc_handler = &proc_dointvec,
86981+ },
86982+#endif
86983+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
86984+ {
86985+ .procname = "chroot_deny_unix",
86986+ .data = &grsec_enable_chroot_unix,
86987+ .maxlen = sizeof(int),
86988+ .mode = 0600,
86989+ .proc_handler = &proc_dointvec,
86990+ },
86991+#endif
86992+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
86993+ {
86994+ .procname = "chroot_deny_mount",
86995+ .data = &grsec_enable_chroot_mount,
86996+ .maxlen = sizeof(int),
86997+ .mode = 0600,
86998+ .proc_handler = &proc_dointvec,
86999+ },
87000+#endif
87001+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
87002+ {
87003+ .procname = "chroot_deny_fchdir",
87004+ .data = &grsec_enable_chroot_fchdir,
87005+ .maxlen = sizeof(int),
87006+ .mode = 0600,
87007+ .proc_handler = &proc_dointvec,
87008+ },
87009+#endif
87010+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
87011+ {
87012+ .procname = "chroot_deny_chroot",
87013+ .data = &grsec_enable_chroot_double,
87014+ .maxlen = sizeof(int),
87015+ .mode = 0600,
87016+ .proc_handler = &proc_dointvec,
87017+ },
87018+#endif
87019+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
87020+ {
87021+ .procname = "chroot_deny_pivot",
87022+ .data = &grsec_enable_chroot_pivot,
87023+ .maxlen = sizeof(int),
87024+ .mode = 0600,
87025+ .proc_handler = &proc_dointvec,
87026+ },
87027+#endif
87028+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
87029+ {
87030+ .procname = "chroot_enforce_chdir",
87031+ .data = &grsec_enable_chroot_chdir,
87032+ .maxlen = sizeof(int),
87033+ .mode = 0600,
87034+ .proc_handler = &proc_dointvec,
87035+ },
87036+#endif
87037+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
87038+ {
87039+ .procname = "chroot_deny_chmod",
87040+ .data = &grsec_enable_chroot_chmod,
87041+ .maxlen = sizeof(int),
87042+ .mode = 0600,
87043+ .proc_handler = &proc_dointvec,
87044+ },
87045+#endif
87046+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
87047+ {
87048+ .procname = "chroot_deny_mknod",
87049+ .data = &grsec_enable_chroot_mknod,
87050+ .maxlen = sizeof(int),
87051+ .mode = 0600,
87052+ .proc_handler = &proc_dointvec,
87053+ },
87054+#endif
87055+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
87056+ {
87057+ .procname = "chroot_restrict_nice",
87058+ .data = &grsec_enable_chroot_nice,
87059+ .maxlen = sizeof(int),
87060+ .mode = 0600,
87061+ .proc_handler = &proc_dointvec,
87062+ },
87063+#endif
87064+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
87065+ {
87066+ .procname = "chroot_execlog",
87067+ .data = &grsec_enable_chroot_execlog,
87068+ .maxlen = sizeof(int),
87069+ .mode = 0600,
87070+ .proc_handler = &proc_dointvec,
87071+ },
87072+#endif
87073+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
87074+ {
87075+ .procname = "chroot_caps",
87076+ .data = &grsec_enable_chroot_caps,
87077+ .maxlen = sizeof(int),
87078+ .mode = 0600,
87079+ .proc_handler = &proc_dointvec,
87080+ },
87081+#endif
87082+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
87083+ {
87084+ .procname = "chroot_deny_bad_rename",
87085+ .data = &grsec_enable_chroot_rename,
87086+ .maxlen = sizeof(int),
87087+ .mode = 0600,
87088+ .proc_handler = &proc_dointvec,
87089+ },
87090+#endif
87091+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
87092+ {
87093+ .procname = "chroot_deny_sysctl",
87094+ .data = &grsec_enable_chroot_sysctl,
87095+ .maxlen = sizeof(int),
87096+ .mode = 0600,
87097+ .proc_handler = &proc_dointvec,
87098+ },
87099+#endif
87100+#ifdef CONFIG_GRKERNSEC_TPE
87101+ {
87102+ .procname = "tpe",
87103+ .data = &grsec_enable_tpe,
87104+ .maxlen = sizeof(int),
87105+ .mode = 0600,
87106+ .proc_handler = &proc_dointvec,
87107+ },
87108+ {
87109+ .procname = "tpe_gid",
87110+ .data = &grsec_tpe_gid,
87111+ .maxlen = sizeof(int),
87112+ .mode = 0600,
87113+ .proc_handler = &proc_dointvec,
87114+ },
87115+#endif
87116+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
87117+ {
87118+ .procname = "tpe_invert",
87119+ .data = &grsec_enable_tpe_invert,
87120+ .maxlen = sizeof(int),
87121+ .mode = 0600,
87122+ .proc_handler = &proc_dointvec,
87123+ },
87124+#endif
87125+#ifdef CONFIG_GRKERNSEC_TPE_ALL
87126+ {
87127+ .procname = "tpe_restrict_all",
87128+ .data = &grsec_enable_tpe_all,
87129+ .maxlen = sizeof(int),
87130+ .mode = 0600,
87131+ .proc_handler = &proc_dointvec,
87132+ },
87133+#endif
87134+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
87135+ {
87136+ .procname = "socket_all",
87137+ .data = &grsec_enable_socket_all,
87138+ .maxlen = sizeof(int),
87139+ .mode = 0600,
87140+ .proc_handler = &proc_dointvec,
87141+ },
87142+ {
87143+ .procname = "socket_all_gid",
87144+ .data = &grsec_socket_all_gid,
87145+ .maxlen = sizeof(int),
87146+ .mode = 0600,
87147+ .proc_handler = &proc_dointvec,
87148+ },
87149+#endif
87150+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
87151+ {
87152+ .procname = "socket_client",
87153+ .data = &grsec_enable_socket_client,
87154+ .maxlen = sizeof(int),
87155+ .mode = 0600,
87156+ .proc_handler = &proc_dointvec,
87157+ },
87158+ {
87159+ .procname = "socket_client_gid",
87160+ .data = &grsec_socket_client_gid,
87161+ .maxlen = sizeof(int),
87162+ .mode = 0600,
87163+ .proc_handler = &proc_dointvec,
87164+ },
87165+#endif
87166+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
87167+ {
87168+ .procname = "socket_server",
87169+ .data = &grsec_enable_socket_server,
87170+ .maxlen = sizeof(int),
87171+ .mode = 0600,
87172+ .proc_handler = &proc_dointvec,
87173+ },
87174+ {
87175+ .procname = "socket_server_gid",
87176+ .data = &grsec_socket_server_gid,
87177+ .maxlen = sizeof(int),
87178+ .mode = 0600,
87179+ .proc_handler = &proc_dointvec,
87180+ },
87181+#endif
87182+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
87183+ {
87184+ .procname = "audit_group",
87185+ .data = &grsec_enable_group,
87186+ .maxlen = sizeof(int),
87187+ .mode = 0600,
87188+ .proc_handler = &proc_dointvec,
87189+ },
87190+ {
87191+ .procname = "audit_gid",
87192+ .data = &grsec_audit_gid,
87193+ .maxlen = sizeof(int),
87194+ .mode = 0600,
87195+ .proc_handler = &proc_dointvec,
87196+ },
87197+#endif
87198+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
87199+ {
87200+ .procname = "audit_chdir",
87201+ .data = &grsec_enable_chdir,
87202+ .maxlen = sizeof(int),
87203+ .mode = 0600,
87204+ .proc_handler = &proc_dointvec,
87205+ },
87206+#endif
87207+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
87208+ {
87209+ .procname = "audit_mount",
87210+ .data = &grsec_enable_mount,
87211+ .maxlen = sizeof(int),
87212+ .mode = 0600,
87213+ .proc_handler = &proc_dointvec,
87214+ },
87215+#endif
87216+#ifdef CONFIG_GRKERNSEC_DMESG
87217+ {
87218+ .procname = "dmesg",
87219+ .data = &grsec_enable_dmesg,
87220+ .maxlen = sizeof(int),
87221+ .mode = 0600,
87222+ .proc_handler = &proc_dointvec,
87223+ },
87224+#endif
87225+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
87226+ {
87227+ .procname = "chroot_findtask",
87228+ .data = &grsec_enable_chroot_findtask,
87229+ .maxlen = sizeof(int),
87230+ .mode = 0600,
87231+ .proc_handler = &proc_dointvec,
87232+ },
87233+#endif
87234+#ifdef CONFIG_GRKERNSEC_RESLOG
87235+ {
87236+ .procname = "resource_logging",
87237+ .data = &grsec_resource_logging,
87238+ .maxlen = sizeof(int),
87239+ .mode = 0600,
87240+ .proc_handler = &proc_dointvec,
87241+ },
87242+#endif
87243+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
87244+ {
87245+ .procname = "audit_ptrace",
87246+ .data = &grsec_enable_audit_ptrace,
87247+ .maxlen = sizeof(int),
87248+ .mode = 0600,
87249+ .proc_handler = &proc_dointvec,
87250+ },
87251+#endif
87252+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
87253+ {
87254+ .procname = "harden_ptrace",
87255+ .data = &grsec_enable_harden_ptrace,
87256+ .maxlen = sizeof(int),
87257+ .mode = 0600,
87258+ .proc_handler = &proc_dointvec,
87259+ },
87260+#endif
87261+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
87262+ {
87263+ .procname = "harden_ipc",
87264+ .data = &grsec_enable_harden_ipc,
87265+ .maxlen = sizeof(int),
87266+ .mode = 0600,
87267+ .proc_handler = &proc_dointvec,
87268+ },
87269+#endif
87270+ {
87271+ .procname = "grsec_lock",
87272+ .data = &grsec_lock,
87273+ .maxlen = sizeof(int),
87274+ .mode = 0600,
87275+ .proc_handler = &proc_dointvec,
87276+ },
87277+#endif
87278+#ifdef CONFIG_GRKERNSEC_ROFS
87279+ {
87280+ .procname = "romount_protect",
87281+ .data = &grsec_enable_rofs,
87282+ .maxlen = sizeof(int),
87283+ .mode = 0600,
87284+ .proc_handler = &proc_dointvec_minmax,
87285+ .extra1 = &one,
87286+ .extra2 = &one,
87287+ },
87288+#endif
87289+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
87290+ {
87291+ .procname = "deny_new_usb",
87292+ .data = &grsec_deny_new_usb,
87293+ .maxlen = sizeof(int),
87294+ .mode = 0600,
87295+ .proc_handler = &proc_dointvec,
87296+ },
87297+#endif
87298+ { }
87299+};
87300+#endif
87301diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
87302new file mode 100644
87303index 0000000..61b514e
87304--- /dev/null
87305+++ b/grsecurity/grsec_time.c
87306@@ -0,0 +1,16 @@
87307+#include <linux/kernel.h>
87308+#include <linux/sched.h>
87309+#include <linux/grinternal.h>
87310+#include <linux/module.h>
87311+
87312+void
87313+gr_log_timechange(void)
87314+{
87315+#ifdef CONFIG_GRKERNSEC_TIME
87316+ if (grsec_enable_time)
87317+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
87318+#endif
87319+ return;
87320+}
87321+
87322+EXPORT_SYMBOL_GPL(gr_log_timechange);
87323diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
87324new file mode 100644
87325index 0000000..d1953de
87326--- /dev/null
87327+++ b/grsecurity/grsec_tpe.c
87328@@ -0,0 +1,78 @@
87329+#include <linux/kernel.h>
87330+#include <linux/sched.h>
87331+#include <linux/file.h>
87332+#include <linux/fs.h>
87333+#include <linux/grinternal.h>
87334+
87335+extern int gr_acl_tpe_check(void);
87336+
87337+int
87338+gr_tpe_allow(const struct file *file)
87339+{
87340+#ifdef CONFIG_GRKERNSEC
87341+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
87342+ struct inode *file_inode = file->f_path.dentry->d_inode;
87343+ const struct cred *cred = current_cred();
87344+ char *msg = NULL;
87345+ char *msg2 = NULL;
87346+
87347+ // never restrict root
87348+ if (gr_is_global_root(cred->uid))
87349+ return 1;
87350+
87351+ if (grsec_enable_tpe) {
87352+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
87353+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
87354+ msg = "not being in trusted group";
87355+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
87356+ msg = "being in untrusted group";
87357+#else
87358+ if (in_group_p(grsec_tpe_gid))
87359+ msg = "being in untrusted group";
87360+#endif
87361+ }
87362+ if (!msg && gr_acl_tpe_check())
87363+ msg = "being in untrusted role";
87364+
87365+ // not in any affected group/role
87366+ if (!msg)
87367+ goto next_check;
87368+
87369+ if (gr_is_global_nonroot(inode->i_uid))
87370+ msg2 = "file in non-root-owned directory";
87371+ else if (inode->i_mode & S_IWOTH)
87372+ msg2 = "file in world-writable directory";
87373+ else if (inode->i_mode & S_IWGRP)
87374+ msg2 = "file in group-writable directory";
87375+ else if (file_inode->i_mode & S_IWOTH)
87376+ msg2 = "file is world-writable";
87377+
87378+ if (msg && msg2) {
87379+ char fullmsg[70] = {0};
87380+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
87381+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
87382+ return 0;
87383+ }
87384+ msg = NULL;
87385+next_check:
87386+#ifdef CONFIG_GRKERNSEC_TPE_ALL
87387+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
87388+ return 1;
87389+
87390+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
87391+ msg = "directory not owned by user";
87392+ else if (inode->i_mode & S_IWOTH)
87393+ msg = "file in world-writable directory";
87394+ else if (inode->i_mode & S_IWGRP)
87395+ msg = "file in group-writable directory";
87396+ else if (file_inode->i_mode & S_IWOTH)
87397+ msg = "file is world-writable";
87398+
87399+ if (msg) {
87400+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
87401+ return 0;
87402+ }
87403+#endif
87404+#endif
87405+ return 1;
87406+}
87407diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
87408new file mode 100644
87409index 0000000..ae02d8e
87410--- /dev/null
87411+++ b/grsecurity/grsec_usb.c
87412@@ -0,0 +1,15 @@
87413+#include <linux/kernel.h>
87414+#include <linux/grinternal.h>
87415+#include <linux/module.h>
87416+
87417+int gr_handle_new_usb(void)
87418+{
87419+#ifdef CONFIG_GRKERNSEC_DENYUSB
87420+ if (grsec_deny_new_usb) {
87421+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
87422+ return 1;
87423+ }
87424+#endif
87425+ return 0;
87426+}
87427+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
87428diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
87429new file mode 100644
87430index 0000000..158b330
87431--- /dev/null
87432+++ b/grsecurity/grsum.c
87433@@ -0,0 +1,64 @@
87434+#include <linux/err.h>
87435+#include <linux/kernel.h>
87436+#include <linux/sched.h>
87437+#include <linux/mm.h>
87438+#include <linux/scatterlist.h>
87439+#include <linux/crypto.h>
87440+#include <linux/gracl.h>
87441+
87442+
87443+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
87444+#error "crypto and sha256 must be built into the kernel"
87445+#endif
87446+
87447+int
87448+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
87449+{
87450+ struct crypto_hash *tfm;
87451+ struct hash_desc desc;
87452+ struct scatterlist sg[2];
87453+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
87454+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
87455+ unsigned long *sumptr = (unsigned long *)sum;
87456+ int cryptres;
87457+ int retval = 1;
87458+ volatile int mismatched = 0;
87459+ volatile int dummy = 0;
87460+ unsigned int i;
87461+
87462+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
87463+ if (IS_ERR(tfm)) {
87464+ /* should never happen, since sha256 should be built in */
87465+ memset(entry->pw, 0, GR_PW_LEN);
87466+ return 1;
87467+ }
87468+
87469+ sg_init_table(sg, 2);
87470+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
87471+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
87472+
87473+ desc.tfm = tfm;
87474+ desc.flags = 0;
87475+
87476+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
87477+ temp_sum);
87478+
87479+ memset(entry->pw, 0, GR_PW_LEN);
87480+
87481+ if (cryptres)
87482+ goto out;
87483+
87484+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
87485+ if (sumptr[i] != tmpsumptr[i])
87486+ mismatched = 1;
87487+ else
87488+ dummy = 1; // waste a cycle
87489+
87490+ if (!mismatched)
87491+ retval = dummy - 1;
87492+
87493+out:
87494+ crypto_free_hash(tfm);
87495+
87496+ return retval;
87497+}
87498diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
87499index 5bdab6b..9ae82fe 100644
87500--- a/include/asm-generic/4level-fixup.h
87501+++ b/include/asm-generic/4level-fixup.h
87502@@ -14,8 +14,10 @@
87503 #define pmd_alloc(mm, pud, address) \
87504 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
87505 NULL: pmd_offset(pud, address))
87506+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
87507
87508 #define pud_alloc(mm, pgd, address) (pgd)
87509+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
87510 #define pud_offset(pgd, start) (pgd)
87511 #define pud_none(pud) 0
87512 #define pud_bad(pud) 0
87513diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
87514index b7babf0..1e4b4f1 100644
87515--- a/include/asm-generic/atomic-long.h
87516+++ b/include/asm-generic/atomic-long.h
87517@@ -22,6 +22,12 @@
87518
87519 typedef atomic64_t atomic_long_t;
87520
87521+#ifdef CONFIG_PAX_REFCOUNT
87522+typedef atomic64_unchecked_t atomic_long_unchecked_t;
87523+#else
87524+typedef atomic64_t atomic_long_unchecked_t;
87525+#endif
87526+
87527 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
87528
87529 static inline long atomic_long_read(atomic_long_t *l)
87530@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
87531 return (long)atomic64_read(v);
87532 }
87533
87534+#ifdef CONFIG_PAX_REFCOUNT
87535+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
87536+{
87537+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87538+
87539+ return (long)atomic64_read_unchecked(v);
87540+}
87541+#endif
87542+
87543 static inline void atomic_long_set(atomic_long_t *l, long i)
87544 {
87545 atomic64_t *v = (atomic64_t *)l;
87546@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
87547 atomic64_set(v, i);
87548 }
87549
87550+#ifdef CONFIG_PAX_REFCOUNT
87551+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
87552+{
87553+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87554+
87555+ atomic64_set_unchecked(v, i);
87556+}
87557+#endif
87558+
87559 static inline void atomic_long_inc(atomic_long_t *l)
87560 {
87561 atomic64_t *v = (atomic64_t *)l;
87562@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
87563 atomic64_inc(v);
87564 }
87565
87566+#ifdef CONFIG_PAX_REFCOUNT
87567+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
87568+{
87569+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87570+
87571+ atomic64_inc_unchecked(v);
87572+}
87573+#endif
87574+
87575 static inline void atomic_long_dec(atomic_long_t *l)
87576 {
87577 atomic64_t *v = (atomic64_t *)l;
87578@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
87579 atomic64_dec(v);
87580 }
87581
87582+#ifdef CONFIG_PAX_REFCOUNT
87583+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
87584+{
87585+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87586+
87587+ atomic64_dec_unchecked(v);
87588+}
87589+#endif
87590+
87591 static inline void atomic_long_add(long i, atomic_long_t *l)
87592 {
87593 atomic64_t *v = (atomic64_t *)l;
87594@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
87595 atomic64_add(i, v);
87596 }
87597
87598+#ifdef CONFIG_PAX_REFCOUNT
87599+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
87600+{
87601+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87602+
87603+ atomic64_add_unchecked(i, v);
87604+}
87605+#endif
87606+
87607 static inline void atomic_long_sub(long i, atomic_long_t *l)
87608 {
87609 atomic64_t *v = (atomic64_t *)l;
87610@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
87611 atomic64_sub(i, v);
87612 }
87613
87614+#ifdef CONFIG_PAX_REFCOUNT
87615+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
87616+{
87617+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87618+
87619+ atomic64_sub_unchecked(i, v);
87620+}
87621+#endif
87622+
87623 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
87624 {
87625 atomic64_t *v = (atomic64_t *)l;
87626@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
87627 return atomic64_add_negative(i, v);
87628 }
87629
87630-static inline long atomic_long_add_return(long i, atomic_long_t *l)
87631+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
87632 {
87633 atomic64_t *v = (atomic64_t *)l;
87634
87635 return (long)atomic64_add_return(i, v);
87636 }
87637
87638+#ifdef CONFIG_PAX_REFCOUNT
87639+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
87640+{
87641+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87642+
87643+ return (long)atomic64_add_return_unchecked(i, v);
87644+}
87645+#endif
87646+
87647 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
87648 {
87649 atomic64_t *v = (atomic64_t *)l;
87650@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
87651 return (long)atomic64_inc_return(v);
87652 }
87653
87654+#ifdef CONFIG_PAX_REFCOUNT
87655+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
87656+{
87657+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87658+
87659+ return (long)atomic64_inc_return_unchecked(v);
87660+}
87661+#endif
87662+
87663 static inline long atomic_long_dec_return(atomic_long_t *l)
87664 {
87665 atomic64_t *v = (atomic64_t *)l;
87666@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
87667
87668 typedef atomic_t atomic_long_t;
87669
87670+#ifdef CONFIG_PAX_REFCOUNT
87671+typedef atomic_unchecked_t atomic_long_unchecked_t;
87672+#else
87673+typedef atomic_t atomic_long_unchecked_t;
87674+#endif
87675+
87676 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
87677 static inline long atomic_long_read(atomic_long_t *l)
87678 {
87679@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
87680 return (long)atomic_read(v);
87681 }
87682
87683+#ifdef CONFIG_PAX_REFCOUNT
87684+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
87685+{
87686+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87687+
87688+ return (long)atomic_read_unchecked(v);
87689+}
87690+#endif
87691+
87692 static inline void atomic_long_set(atomic_long_t *l, long i)
87693 {
87694 atomic_t *v = (atomic_t *)l;
87695@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
87696 atomic_set(v, i);
87697 }
87698
87699+#ifdef CONFIG_PAX_REFCOUNT
87700+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
87701+{
87702+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87703+
87704+ atomic_set_unchecked(v, i);
87705+}
87706+#endif
87707+
87708 static inline void atomic_long_inc(atomic_long_t *l)
87709 {
87710 atomic_t *v = (atomic_t *)l;
87711@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
87712 atomic_inc(v);
87713 }
87714
87715+#ifdef CONFIG_PAX_REFCOUNT
87716+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
87717+{
87718+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87719+
87720+ atomic_inc_unchecked(v);
87721+}
87722+#endif
87723+
87724 static inline void atomic_long_dec(atomic_long_t *l)
87725 {
87726 atomic_t *v = (atomic_t *)l;
87727@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
87728 atomic_dec(v);
87729 }
87730
87731+#ifdef CONFIG_PAX_REFCOUNT
87732+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
87733+{
87734+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87735+
87736+ atomic_dec_unchecked(v);
87737+}
87738+#endif
87739+
87740 static inline void atomic_long_add(long i, atomic_long_t *l)
87741 {
87742 atomic_t *v = (atomic_t *)l;
87743@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
87744 atomic_add(i, v);
87745 }
87746
87747+#ifdef CONFIG_PAX_REFCOUNT
87748+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
87749+{
87750+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87751+
87752+ atomic_add_unchecked(i, v);
87753+}
87754+#endif
87755+
87756 static inline void atomic_long_sub(long i, atomic_long_t *l)
87757 {
87758 atomic_t *v = (atomic_t *)l;
87759@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
87760 atomic_sub(i, v);
87761 }
87762
87763+#ifdef CONFIG_PAX_REFCOUNT
87764+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
87765+{
87766+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87767+
87768+ atomic_sub_unchecked(i, v);
87769+}
87770+#endif
87771+
87772 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
87773 {
87774 atomic_t *v = (atomic_t *)l;
87775@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
87776 return atomic_add_negative(i, v);
87777 }
87778
87779-static inline long atomic_long_add_return(long i, atomic_long_t *l)
87780+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
87781 {
87782 atomic_t *v = (atomic_t *)l;
87783
87784 return (long)atomic_add_return(i, v);
87785 }
87786
87787+#ifdef CONFIG_PAX_REFCOUNT
87788+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
87789+{
87790+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87791+
87792+ return (long)atomic_add_return_unchecked(i, v);
87793+}
87794+
87795+#endif
87796+
87797 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
87798 {
87799 atomic_t *v = (atomic_t *)l;
87800@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
87801 return (long)atomic_inc_return(v);
87802 }
87803
87804+#ifdef CONFIG_PAX_REFCOUNT
87805+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
87806+{
87807+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87808+
87809+ return (long)atomic_inc_return_unchecked(v);
87810+}
87811+#endif
87812+
87813 static inline long atomic_long_dec_return(atomic_long_t *l)
87814 {
87815 atomic_t *v = (atomic_t *)l;
87816@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
87817
87818 #endif /* BITS_PER_LONG == 64 */
87819
87820+#ifdef CONFIG_PAX_REFCOUNT
87821+static inline void pax_refcount_needs_these_functions(void)
87822+{
87823+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
87824+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
87825+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
87826+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
87827+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
87828+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
87829+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
87830+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
87831+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
87832+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
87833+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
87834+#ifdef CONFIG_X86
87835+ atomic_clear_mask_unchecked(0, NULL);
87836+ atomic_set_mask_unchecked(0, NULL);
87837+#endif
87838+
87839+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
87840+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
87841+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
87842+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
87843+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
87844+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
87845+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
87846+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
87847+}
87848+#else
87849+#define atomic_read_unchecked(v) atomic_read(v)
87850+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
87851+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
87852+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
87853+#define atomic_inc_unchecked(v) atomic_inc(v)
87854+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
87855+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
87856+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
87857+#define atomic_dec_unchecked(v) atomic_dec(v)
87858+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
87859+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
87860+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
87861+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
87862+
87863+#define atomic_long_read_unchecked(v) atomic_long_read(v)
87864+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
87865+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
87866+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
87867+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
87868+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
87869+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
87870+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
87871+#endif
87872+
87873 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
87874diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
87875index 30ad9c8..c70c170 100644
87876--- a/include/asm-generic/atomic64.h
87877+++ b/include/asm-generic/atomic64.h
87878@@ -16,6 +16,8 @@ typedef struct {
87879 long long counter;
87880 } atomic64_t;
87881
87882+typedef atomic64_t atomic64_unchecked_t;
87883+
87884 #define ATOMIC64_INIT(i) { (i) }
87885
87886 extern long long atomic64_read(const atomic64_t *v);
87887@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
87888 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
87889 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
87890
87891+#define atomic64_read_unchecked(v) atomic64_read(v)
87892+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
87893+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
87894+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
87895+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
87896+#define atomic64_inc_unchecked(v) atomic64_inc(v)
87897+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
87898+#define atomic64_dec_unchecked(v) atomic64_dec(v)
87899+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
87900+
87901 #endif /* _ASM_GENERIC_ATOMIC64_H */
87902diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
87903index f5c40b0..e902f9d 100644
87904--- a/include/asm-generic/barrier.h
87905+++ b/include/asm-generic/barrier.h
87906@@ -82,7 +82,7 @@
87907 do { \
87908 compiletime_assert_atomic_type(*p); \
87909 smp_mb(); \
87910- ACCESS_ONCE(*p) = (v); \
87911+ ACCESS_ONCE_RW(*p) = (v); \
87912 } while (0)
87913
87914 #define smp_load_acquire(p) \
87915diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
87916index a60a7cc..0fe12f2 100644
87917--- a/include/asm-generic/bitops/__fls.h
87918+++ b/include/asm-generic/bitops/__fls.h
87919@@ -9,7 +9,7 @@
87920 *
87921 * Undefined if no set bit exists, so code should check against 0 first.
87922 */
87923-static __always_inline unsigned long __fls(unsigned long word)
87924+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
87925 {
87926 int num = BITS_PER_LONG - 1;
87927
87928diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
87929index 0576d1f..dad6c71 100644
87930--- a/include/asm-generic/bitops/fls.h
87931+++ b/include/asm-generic/bitops/fls.h
87932@@ -9,7 +9,7 @@
87933 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
87934 */
87935
87936-static __always_inline int fls(int x)
87937+static __always_inline int __intentional_overflow(-1) fls(int x)
87938 {
87939 int r = 32;
87940
87941diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
87942index b097cf8..3d40e14 100644
87943--- a/include/asm-generic/bitops/fls64.h
87944+++ b/include/asm-generic/bitops/fls64.h
87945@@ -15,7 +15,7 @@
87946 * at position 64.
87947 */
87948 #if BITS_PER_LONG == 32
87949-static __always_inline int fls64(__u64 x)
87950+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
87951 {
87952 __u32 h = x >> 32;
87953 if (h)
87954@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
87955 return fls(x);
87956 }
87957 #elif BITS_PER_LONG == 64
87958-static __always_inline int fls64(__u64 x)
87959+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
87960 {
87961 if (x == 0)
87962 return 0;
87963diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
87964index 630dd23..8c1dcb6b 100644
87965--- a/include/asm-generic/bug.h
87966+++ b/include/asm-generic/bug.h
87967@@ -62,13 +62,13 @@ struct bug_entry {
87968 * to provide better diagnostics.
87969 */
87970 #ifndef __WARN_TAINT
87971-extern __printf(3, 4)
87972+extern __printf(3, 4) __nocapture(1, 3, 4)
87973 void warn_slowpath_fmt(const char *file, const int line,
87974 const char *fmt, ...);
87975-extern __printf(4, 5)
87976+extern __printf(4, 5) __nocapture(1, 4, 5)
87977 void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
87978 const char *fmt, ...);
87979-extern void warn_slowpath_null(const char *file, const int line);
87980+extern __nocapture(1) void warn_slowpath_null(const char *file, const int line);
87981 #define WANT_WARN_ON_SLOWPATH
87982 #define __WARN() warn_slowpath_null(__FILE__, __LINE__)
87983 #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
87984diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
87985index 1bfcfe5..e04c5c9 100644
87986--- a/include/asm-generic/cache.h
87987+++ b/include/asm-generic/cache.h
87988@@ -6,7 +6,7 @@
87989 * cache lines need to provide their own cache.h.
87990 */
87991
87992-#define L1_CACHE_SHIFT 5
87993-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
87994+#define L1_CACHE_SHIFT 5UL
87995+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
87996
87997 #endif /* __ASM_GENERIC_CACHE_H */
87998diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
87999index 0d68a1e..b74a761 100644
88000--- a/include/asm-generic/emergency-restart.h
88001+++ b/include/asm-generic/emergency-restart.h
88002@@ -1,7 +1,7 @@
88003 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
88004 #define _ASM_GENERIC_EMERGENCY_RESTART_H
88005
88006-static inline void machine_emergency_restart(void)
88007+static inline __noreturn void machine_emergency_restart(void)
88008 {
88009 machine_restart(NULL);
88010 }
88011diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
88012index 90f99c7..00ce236 100644
88013--- a/include/asm-generic/kmap_types.h
88014+++ b/include/asm-generic/kmap_types.h
88015@@ -2,9 +2,9 @@
88016 #define _ASM_GENERIC_KMAP_TYPES_H
88017
88018 #ifdef __WITH_KM_FENCE
88019-# define KM_TYPE_NR 41
88020+# define KM_TYPE_NR 42
88021 #else
88022-# define KM_TYPE_NR 20
88023+# define KM_TYPE_NR 21
88024 #endif
88025
88026 #endif
88027diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
88028index 9ceb03b..62b0b8f 100644
88029--- a/include/asm-generic/local.h
88030+++ b/include/asm-generic/local.h
88031@@ -23,24 +23,37 @@ typedef struct
88032 atomic_long_t a;
88033 } local_t;
88034
88035+typedef struct {
88036+ atomic_long_unchecked_t a;
88037+} local_unchecked_t;
88038+
88039 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
88040
88041 #define local_read(l) atomic_long_read(&(l)->a)
88042+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
88043 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
88044+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
88045 #define local_inc(l) atomic_long_inc(&(l)->a)
88046+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
88047 #define local_dec(l) atomic_long_dec(&(l)->a)
88048+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
88049 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
88050+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
88051 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
88052+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
88053
88054 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
88055 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
88056 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
88057 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
88058 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
88059+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
88060 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
88061 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
88062+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
88063
88064 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
88065+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
88066 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
88067 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
88068 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
88069diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
88070index 725612b..9cc513a 100644
88071--- a/include/asm-generic/pgtable-nopmd.h
88072+++ b/include/asm-generic/pgtable-nopmd.h
88073@@ -1,14 +1,19 @@
88074 #ifndef _PGTABLE_NOPMD_H
88075 #define _PGTABLE_NOPMD_H
88076
88077-#ifndef __ASSEMBLY__
88078-
88079 #include <asm-generic/pgtable-nopud.h>
88080
88081-struct mm_struct;
88082-
88083 #define __PAGETABLE_PMD_FOLDED
88084
88085+#define PMD_SHIFT PUD_SHIFT
88086+#define PTRS_PER_PMD 1
88087+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
88088+#define PMD_MASK (~(PMD_SIZE-1))
88089+
88090+#ifndef __ASSEMBLY__
88091+
88092+struct mm_struct;
88093+
88094 /*
88095 * Having the pmd type consist of a pud gets the size right, and allows
88096 * us to conceptually access the pud entry that this pmd is folded into
88097@@ -16,11 +21,6 @@ struct mm_struct;
88098 */
88099 typedef struct { pud_t pud; } pmd_t;
88100
88101-#define PMD_SHIFT PUD_SHIFT
88102-#define PTRS_PER_PMD 1
88103-#define PMD_SIZE (1UL << PMD_SHIFT)
88104-#define PMD_MASK (~(PMD_SIZE-1))
88105-
88106 /*
88107 * The "pud_xxx()" functions here are trivial for a folded two-level
88108 * setup: the pmd is never bad, and a pmd always exists (as it's folded
88109diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
88110index 810431d..0ec4804f 100644
88111--- a/include/asm-generic/pgtable-nopud.h
88112+++ b/include/asm-generic/pgtable-nopud.h
88113@@ -1,10 +1,15 @@
88114 #ifndef _PGTABLE_NOPUD_H
88115 #define _PGTABLE_NOPUD_H
88116
88117-#ifndef __ASSEMBLY__
88118-
88119 #define __PAGETABLE_PUD_FOLDED
88120
88121+#define PUD_SHIFT PGDIR_SHIFT
88122+#define PTRS_PER_PUD 1
88123+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
88124+#define PUD_MASK (~(PUD_SIZE-1))
88125+
88126+#ifndef __ASSEMBLY__
88127+
88128 /*
88129 * Having the pud type consist of a pgd gets the size right, and allows
88130 * us to conceptually access the pgd entry that this pud is folded into
88131@@ -12,11 +17,6 @@
88132 */
88133 typedef struct { pgd_t pgd; } pud_t;
88134
88135-#define PUD_SHIFT PGDIR_SHIFT
88136-#define PTRS_PER_PUD 1
88137-#define PUD_SIZE (1UL << PUD_SHIFT)
88138-#define PUD_MASK (~(PUD_SIZE-1))
88139-
88140 /*
88141 * The "pgd_xxx()" functions here are trivial for a folded two-level
88142 * setup: the pud is never bad, and a pud always exists (as it's folded
88143@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
88144 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
88145
88146 #define pgd_populate(mm, pgd, pud) do { } while (0)
88147+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
88148 /*
88149 * (puds are folded into pgds so this doesn't get actually called,
88150 * but the define is needed for a generic inline function.)
88151diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
88152index 4d46085..f4e92ef 100644
88153--- a/include/asm-generic/pgtable.h
88154+++ b/include/asm-generic/pgtable.h
88155@@ -689,6 +689,22 @@ static inline int pmd_protnone(pmd_t pmd)
88156 }
88157 #endif /* CONFIG_NUMA_BALANCING */
88158
88159+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
88160+#ifdef CONFIG_PAX_KERNEXEC
88161+#error KERNEXEC requires pax_open_kernel
88162+#else
88163+static inline unsigned long pax_open_kernel(void) { return 0; }
88164+#endif
88165+#endif
88166+
88167+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
88168+#ifdef CONFIG_PAX_KERNEXEC
88169+#error KERNEXEC requires pax_close_kernel
88170+#else
88171+static inline unsigned long pax_close_kernel(void) { return 0; }
88172+#endif
88173+#endif
88174+
88175 #endif /* CONFIG_MMU */
88176
88177 #endif /* !__ASSEMBLY__ */
88178diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
88179index 72d8803..cb9749c 100644
88180--- a/include/asm-generic/uaccess.h
88181+++ b/include/asm-generic/uaccess.h
88182@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
88183 return __clear_user(to, n);
88184 }
88185
88186+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
88187+#ifdef CONFIG_PAX_MEMORY_UDEREF
88188+#error UDEREF requires pax_open_userland
88189+#else
88190+static inline unsigned long pax_open_userland(void) { return 0; }
88191+#endif
88192+#endif
88193+
88194+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
88195+#ifdef CONFIG_PAX_MEMORY_UDEREF
88196+#error UDEREF requires pax_close_userland
88197+#else
88198+static inline unsigned long pax_close_userland(void) { return 0; }
88199+#endif
88200+#endif
88201+
88202 #endif /* __ASM_GENERIC_UACCESS_H */
88203diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
88204index ac78910..8b5f068 100644
88205--- a/include/asm-generic/vmlinux.lds.h
88206+++ b/include/asm-generic/vmlinux.lds.h
88207@@ -234,6 +234,7 @@
88208 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
88209 VMLINUX_SYMBOL(__start_rodata) = .; \
88210 *(.rodata) *(.rodata.*) \
88211+ *(.data..read_only) \
88212 *(__vermagic) /* Kernel version magic */ \
88213 . = ALIGN(8); \
88214 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
88215@@ -492,6 +493,7 @@
88216 KERNEL_CTORS() \
88217 MCOUNT_REC() \
88218 *(.init.rodata) \
88219+ *(.init.rodata.*) \
88220 FTRACE_EVENTS() \
88221 TRACE_SYSCALLS() \
88222 KPROBE_BLACKLIST() \
88223@@ -511,6 +513,8 @@
88224
88225 #define EXIT_DATA \
88226 *(.exit.data) \
88227+ *(.exit.rodata) \
88228+ *(.exit.rodata.*) \
88229 MEM_DISCARD(exit.data) \
88230 MEM_DISCARD(exit.rodata)
88231
88232@@ -727,17 +731,18 @@
88233 * section in the linker script will go there too. @phdr should have
88234 * a leading colon.
88235 *
88236- * Note that this macros defines __per_cpu_load as an absolute symbol.
88237+ * Note that this macros defines per_cpu_load as an absolute symbol.
88238 * If there is no need to put the percpu section at a predetermined
88239 * address, use PERCPU_SECTION.
88240 */
88241 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
88242- VMLINUX_SYMBOL(__per_cpu_load) = .; \
88243- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
88244+ per_cpu_load = .; \
88245+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
88246 - LOAD_OFFSET) { \
88247+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
88248 PERCPU_INPUT(cacheline) \
88249 } phdr \
88250- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
88251+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
88252
88253 /**
88254 * PERCPU_SECTION - define output section for percpu area, simple version
88255diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
88256index 623a59c..1e79ab9 100644
88257--- a/include/crypto/algapi.h
88258+++ b/include/crypto/algapi.h
88259@@ -34,7 +34,7 @@ struct crypto_type {
88260 unsigned int maskclear;
88261 unsigned int maskset;
88262 unsigned int tfmsize;
88263-};
88264+} __do_const;
88265
88266 struct crypto_instance {
88267 struct crypto_alg alg;
88268diff --git a/include/drm/drmP.h b/include/drm/drmP.h
88269index e928625..ff97886 100644
88270--- a/include/drm/drmP.h
88271+++ b/include/drm/drmP.h
88272@@ -59,6 +59,7 @@
88273
88274 #include <asm/mman.h>
88275 #include <asm/pgalloc.h>
88276+#include <asm/local.h>
88277 #include <asm/uaccess.h>
88278
88279 #include <uapi/drm/drm.h>
88280@@ -133,17 +134,18 @@ void drm_err(const char *format, ...);
88281 /*@{*/
88282
88283 /* driver capabilities and requirements mask */
88284-#define DRIVER_USE_AGP 0x1
88285-#define DRIVER_PCI_DMA 0x8
88286-#define DRIVER_SG 0x10
88287-#define DRIVER_HAVE_DMA 0x20
88288-#define DRIVER_HAVE_IRQ 0x40
88289-#define DRIVER_IRQ_SHARED 0x80
88290-#define DRIVER_GEM 0x1000
88291-#define DRIVER_MODESET 0x2000
88292-#define DRIVER_PRIME 0x4000
88293-#define DRIVER_RENDER 0x8000
88294-#define DRIVER_ATOMIC 0x10000
88295+#define DRIVER_USE_AGP 0x1
88296+#define DRIVER_PCI_DMA 0x8
88297+#define DRIVER_SG 0x10
88298+#define DRIVER_HAVE_DMA 0x20
88299+#define DRIVER_HAVE_IRQ 0x40
88300+#define DRIVER_IRQ_SHARED 0x80
88301+#define DRIVER_GEM 0x1000
88302+#define DRIVER_MODESET 0x2000
88303+#define DRIVER_PRIME 0x4000
88304+#define DRIVER_RENDER 0x8000
88305+#define DRIVER_ATOMIC 0x10000
88306+#define DRIVER_KMS_LEGACY_CONTEXT 0x20000
88307
88308 /***********************************************************************/
88309 /** \name Macros to make printk easier */
88310@@ -224,10 +226,12 @@ void drm_err(const char *format, ...);
88311 * \param cmd command.
88312 * \param arg argument.
88313 */
88314-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
88315+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
88316+ struct drm_file *file_priv);
88317+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
88318 struct drm_file *file_priv);
88319
88320-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
88321+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
88322 unsigned long arg);
88323
88324 #define DRM_IOCTL_NR(n) _IOC_NR(n)
88325@@ -243,10 +247,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
88326 struct drm_ioctl_desc {
88327 unsigned int cmd;
88328 int flags;
88329- drm_ioctl_t *func;
88330+ drm_ioctl_t func;
88331 unsigned int cmd_drv;
88332 const char *name;
88333-};
88334+} __do_const;
88335
88336 /**
88337 * Creates a driver or general drm_ioctl_desc array entry for the given
88338@@ -632,7 +636,8 @@ struct drm_info_list {
88339 int (*show)(struct seq_file*, void*); /** show callback */
88340 u32 driver_features; /**< Required driver features for this entry */
88341 void *data;
88342-};
88343+} __do_const;
88344+typedef struct drm_info_list __no_const drm_info_list_no_const;
88345
88346 /**
88347 * debugfs node structure. This structure represents a debugfs file.
88348@@ -716,7 +721,7 @@ struct drm_device {
88349
88350 /** \name Usage Counters */
88351 /*@{ */
88352- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
88353+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
88354 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
88355 int buf_use; /**< Buffers in use -- cannot alloc */
88356 atomic_t buf_alloc; /**< Buffer allocation in progress */
88357diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
88358index c250a22..59d2094 100644
88359--- a/include/drm/drm_crtc_helper.h
88360+++ b/include/drm/drm_crtc_helper.h
88361@@ -160,7 +160,7 @@ struct drm_encoder_helper_funcs {
88362 int (*atomic_check)(struct drm_encoder *encoder,
88363 struct drm_crtc_state *crtc_state,
88364 struct drm_connector_state *conn_state);
88365-};
88366+} __no_const;
88367
88368 /**
88369 * struct drm_connector_helper_funcs - helper operations for connectors
88370diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
88371index d016dc5..3951fe0 100644
88372--- a/include/drm/i915_pciids.h
88373+++ b/include/drm/i915_pciids.h
88374@@ -37,7 +37,7 @@
88375 */
88376 #define INTEL_VGA_DEVICE(id, info) { \
88377 0x8086, id, \
88378- ~0, ~0, \
88379+ PCI_ANY_ID, PCI_ANY_ID, \
88380 0x030000, 0xff0000, \
88381 (unsigned long) info }
88382
88383diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
88384index 72dcbe8..8db58d7 100644
88385--- a/include/drm/ttm/ttm_memory.h
88386+++ b/include/drm/ttm/ttm_memory.h
88387@@ -48,7 +48,7 @@
88388
88389 struct ttm_mem_shrink {
88390 int (*do_shrink) (struct ttm_mem_shrink *);
88391-};
88392+} __no_const;
88393
88394 /**
88395 * struct ttm_mem_global - Global memory accounting structure.
88396diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
88397index 49a8284..9643967 100644
88398--- a/include/drm/ttm/ttm_page_alloc.h
88399+++ b/include/drm/ttm/ttm_page_alloc.h
88400@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
88401 */
88402 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
88403
88404+struct device;
88405 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
88406 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
88407
88408diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
88409index 4b840e8..155d235 100644
88410--- a/include/keys/asymmetric-subtype.h
88411+++ b/include/keys/asymmetric-subtype.h
88412@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
88413 /* Verify the signature on a key of this subtype (optional) */
88414 int (*verify_signature)(const struct key *key,
88415 const struct public_key_signature *sig);
88416-};
88417+} __do_const;
88418
88419 /**
88420 * asymmetric_key_subtype - Get the subtype from an asymmetric key
88421diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
88422index c1da539..1dcec55 100644
88423--- a/include/linux/atmdev.h
88424+++ b/include/linux/atmdev.h
88425@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
88426 #endif
88427
88428 struct k_atm_aal_stats {
88429-#define __HANDLE_ITEM(i) atomic_t i
88430+#define __HANDLE_ITEM(i) atomic_unchecked_t i
88431 __AAL_STAT_ITEMS
88432 #undef __HANDLE_ITEM
88433 };
88434@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
88435 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
88436 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
88437 struct module *owner;
88438-};
88439+} __do_const ;
88440
88441 struct atmphy_ops {
88442 int (*start)(struct atm_dev *dev);
88443diff --git a/include/linux/atomic.h b/include/linux/atomic.h
88444index 5b08a85..60922fb 100644
88445--- a/include/linux/atomic.h
88446+++ b/include/linux/atomic.h
88447@@ -12,7 +12,7 @@
88448 * Atomically adds @a to @v, so long as @v was not already @u.
88449 * Returns non-zero if @v was not @u, and zero otherwise.
88450 */
88451-static inline int atomic_add_unless(atomic_t *v, int a, int u)
88452+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
88453 {
88454 return __atomic_add_unless(v, a, u) != u;
88455 }
88456diff --git a/include/linux/audit.h b/include/linux/audit.h
88457index c2e7e3a..8bfc0e1 100644
88458--- a/include/linux/audit.h
88459+++ b/include/linux/audit.h
88460@@ -223,7 +223,7 @@ static inline void audit_ptrace(struct task_struct *t)
88461 extern unsigned int audit_serial(void);
88462 extern int auditsc_get_stamp(struct audit_context *ctx,
88463 struct timespec *t, unsigned int *serial);
88464-extern int audit_set_loginuid(kuid_t loginuid);
88465+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
88466
88467 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
88468 {
88469diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
88470index 576e463..28fd926 100644
88471--- a/include/linux/binfmts.h
88472+++ b/include/linux/binfmts.h
88473@@ -44,7 +44,7 @@ struct linux_binprm {
88474 unsigned interp_flags;
88475 unsigned interp_data;
88476 unsigned long loader, exec;
88477-};
88478+} __randomize_layout;
88479
88480 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
88481 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
88482@@ -77,8 +77,10 @@ struct linux_binfmt {
88483 int (*load_binary)(struct linux_binprm *);
88484 int (*load_shlib)(struct file *);
88485 int (*core_dump)(struct coredump_params *cprm);
88486+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
88487+ void (*handle_mmap)(struct file *);
88488 unsigned long min_coredump; /* minimal dump size */
88489-};
88490+} __do_const __randomize_layout;
88491
88492 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
88493
88494diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
88495index dbfbf49..10be372 100644
88496--- a/include/linux/bitmap.h
88497+++ b/include/linux/bitmap.h
88498@@ -299,7 +299,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
88499 return __bitmap_full(src, nbits);
88500 }
88501
88502-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
88503+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
88504 {
88505 if (small_const_nbits(nbits))
88506 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
88507diff --git a/include/linux/bitops.h b/include/linux/bitops.h
88508index 5d858e0..336c1d9 100644
88509--- a/include/linux/bitops.h
88510+++ b/include/linux/bitops.h
88511@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
88512 * @word: value to rotate
88513 * @shift: bits to roll
88514 */
88515-static inline __u32 rol32(__u32 word, unsigned int shift)
88516+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
88517 {
88518 return (word << shift) | (word >> (32 - shift));
88519 }
88520@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
88521 * @word: value to rotate
88522 * @shift: bits to roll
88523 */
88524-static inline __u32 ror32(__u32 word, unsigned int shift)
88525+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
88526 {
88527 return (word >> shift) | (word << (32 - shift));
88528 }
88529@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
88530 return (__s32)(value << shift) >> shift;
88531 }
88532
88533-static inline unsigned fls_long(unsigned long l)
88534+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
88535 {
88536 if (sizeof(l) == 4)
88537 return fls(l);
88538diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
88539index 7f9a516..8889453 100644
88540--- a/include/linux/blkdev.h
88541+++ b/include/linux/blkdev.h
88542@@ -1616,7 +1616,7 @@ struct block_device_operations {
88543 /* this callback is with swap_lock and sometimes page table lock held */
88544 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
88545 struct module *owner;
88546-};
88547+} __do_const;
88548
88549 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
88550 unsigned long);
88551diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
88552index afc1343..9735539 100644
88553--- a/include/linux/blktrace_api.h
88554+++ b/include/linux/blktrace_api.h
88555@@ -25,7 +25,7 @@ struct blk_trace {
88556 struct dentry *dropped_file;
88557 struct dentry *msg_file;
88558 struct list_head running_list;
88559- atomic_t dropped;
88560+ atomic_unchecked_t dropped;
88561 };
88562
88563 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
88564diff --git a/include/linux/cache.h b/include/linux/cache.h
88565index 17e7e82..1d7da26 100644
88566--- a/include/linux/cache.h
88567+++ b/include/linux/cache.h
88568@@ -16,6 +16,14 @@
88569 #define __read_mostly
88570 #endif
88571
88572+#ifndef __read_only
88573+#ifdef CONFIG_PAX_KERNEXEC
88574+#error KERNEXEC requires __read_only
88575+#else
88576+#define __read_only __read_mostly
88577+#endif
88578+#endif
88579+
88580 #ifndef ____cacheline_aligned
88581 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
88582 #endif
88583diff --git a/include/linux/capability.h b/include/linux/capability.h
88584index aa93e5e..985a1b0 100644
88585--- a/include/linux/capability.h
88586+++ b/include/linux/capability.h
88587@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
88588 extern bool capable(int cap);
88589 extern bool ns_capable(struct user_namespace *ns, int cap);
88590 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
88591+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
88592 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
88593+extern bool capable_nolog(int cap);
88594+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
88595
88596 /* audit system wants to get cap info from files as well */
88597 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
88598
88599+extern int is_privileged_binary(const struct dentry *dentry);
88600+
88601 #endif /* !_LINUX_CAPABILITY_H */
88602diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
88603index 8609d57..86e4d79 100644
88604--- a/include/linux/cdrom.h
88605+++ b/include/linux/cdrom.h
88606@@ -87,7 +87,6 @@ struct cdrom_device_ops {
88607
88608 /* driver specifications */
88609 const int capability; /* capability flags */
88610- int n_minors; /* number of active minor devices */
88611 /* handle uniform packets for scsi type devices (scsi,atapi) */
88612 int (*generic_packet) (struct cdrom_device_info *,
88613 struct packet_command *);
88614diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
88615index 4ce9056..86caac6 100644
88616--- a/include/linux/cleancache.h
88617+++ b/include/linux/cleancache.h
88618@@ -31,7 +31,7 @@ struct cleancache_ops {
88619 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
88620 void (*invalidate_inode)(int, struct cleancache_filekey);
88621 void (*invalidate_fs)(int);
88622-};
88623+} __no_const;
88624
88625 extern struct cleancache_ops *
88626 cleancache_register_ops(struct cleancache_ops *ops);
88627diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
88628index 5591ea7..61b77ce 100644
88629--- a/include/linux/clk-provider.h
88630+++ b/include/linux/clk-provider.h
88631@@ -195,6 +195,7 @@ struct clk_ops {
88632 void (*init)(struct clk_hw *hw);
88633 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
88634 };
88635+typedef struct clk_ops __no_const clk_ops_no_const;
88636
88637 /**
88638 * struct clk_init_data - holds init data that's common to all clocks and is
88639diff --git a/include/linux/compat.h b/include/linux/compat.h
88640index ab25814..d1540d1 100644
88641--- a/include/linux/compat.h
88642+++ b/include/linux/compat.h
88643@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
88644 compat_size_t __user *len_ptr);
88645
88646 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
88647-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
88648+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
88649 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
88650 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
88651 compat_ssize_t msgsz, int msgflg);
88652@@ -325,7 +325,7 @@ asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
88653 long compat_sys_msgctl(int first, int second, void __user *uptr);
88654 long compat_sys_shmctl(int first, int second, void __user *uptr);
88655 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
88656- unsigned nsems, const struct compat_timespec __user *timeout);
88657+ compat_long_t nsems, const struct compat_timespec __user *timeout);
88658 asmlinkage long compat_sys_keyctl(u32 option,
88659 u32 arg2, u32 arg3, u32 arg4, u32 arg5);
88660 asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
88661@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
88662 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
88663 compat_ulong_t addr, compat_ulong_t data);
88664 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
88665- compat_long_t addr, compat_long_t data);
88666+ compat_ulong_t addr, compat_ulong_t data);
88667
88668 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
88669 /*
88670diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
88671index cdf13ca..ba5e086 100644
88672--- a/include/linux/compiler-gcc.h
88673+++ b/include/linux/compiler-gcc.h
88674@@ -94,8 +94,8 @@
88675 */
88676 #define __pure __attribute__((pure))
88677 #define __aligned(x) __attribute__((aligned(x)))
88678-#define __printf(a, b) __attribute__((format(printf, a, b)))
88679-#define __scanf(a, b) __attribute__((format(scanf, a, b)))
88680+#define __printf(a, b) __attribute__((format(printf, a, b))) __nocapture(a, b)
88681+#define __scanf(a, b) __attribute__((format(scanf, a, b))) __nocapture(a, b)
88682 #define noinline __attribute__((noinline))
88683 #define __attribute_const__ __attribute__((__const__))
88684 #define __maybe_unused __attribute__((unused))
88685diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
88686index 769e198..7ee7cb5 100644
88687--- a/include/linux/compiler-gcc4.h
88688+++ b/include/linux/compiler-gcc4.h
88689@@ -39,9 +39,38 @@
88690 # define __compiletime_warning(message) __attribute__((warning(message)))
88691 # define __compiletime_error(message) __attribute__((error(message)))
88692 #endif /* __CHECKER__ */
88693+
88694+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
88695+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
88696+#define __bos0(ptr) __bos((ptr), 0)
88697+#define __bos1(ptr) __bos((ptr), 1)
88698 #endif /* GCC_VERSION >= 40300 */
88699
88700 #if GCC_VERSION >= 40500
88701+
88702+#ifdef RANDSTRUCT_PLUGIN
88703+#define __randomize_layout __attribute__((randomize_layout))
88704+#define __no_randomize_layout __attribute__((no_randomize_layout))
88705+#endif
88706+
88707+#ifdef CONSTIFY_PLUGIN
88708+#define __no_const __attribute__((no_const))
88709+#define __do_const __attribute__((do_const))
88710+#endif
88711+
88712+#ifdef SIZE_OVERFLOW_PLUGIN
88713+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
88714+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
88715+#endif
88716+
88717+#ifdef LATENT_ENTROPY_PLUGIN
88718+#define __latent_entropy __attribute__((latent_entropy))
88719+#endif
88720+
88721+#ifdef INITIFY_PLUGIN
88722+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
88723+#endif
88724+
88725 /*
88726 * Mark a position in code as unreachable. This can be used to
88727 * suppress control flow warnings after asm blocks that transfer
88728diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
88729index efee493..8aa8f6b 100644
88730--- a/include/linux/compiler-gcc5.h
88731+++ b/include/linux/compiler-gcc5.h
88732@@ -28,6 +28,34 @@
88733 # define __compiletime_error(message) __attribute__((error(message)))
88734 #endif /* __CHECKER__ */
88735
88736+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
88737+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
88738+#define __bos0(ptr) __bos((ptr), 0)
88739+#define __bos1(ptr) __bos((ptr), 1)
88740+
88741+#ifdef RANDSTRUCT_PLUGIN
88742+#define __randomize_layout __attribute__((randomize_layout))
88743+#define __no_randomize_layout __attribute__((no_randomize_layout))
88744+#endif
88745+
88746+#ifdef CONSTIFY_PLUGIN
88747+#define __no_const __attribute__((no_const))
88748+#define __do_const __attribute__((do_const))
88749+#endif
88750+
88751+#ifdef SIZE_OVERFLOW_PLUGIN
88752+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
88753+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
88754+#endif
88755+
88756+#ifdef LATENT_ENTROPY_PLUGIN
88757+#define __latent_entropy __attribute__((latent_entropy))
88758+#endif
88759+
88760+#ifdef INITIFY_PLUGIN
88761+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
88762+#endif
88763+
88764 /*
88765 * Mark a position in code as unreachable. This can be used to
88766 * suppress control flow warnings after asm blocks that transfer
88767diff --git a/include/linux/compiler.h b/include/linux/compiler.h
88768index 1b45e4a..eff29a7 100644
88769--- a/include/linux/compiler.h
88770+++ b/include/linux/compiler.h
88771@@ -5,11 +5,14 @@
88772
88773 #ifdef __CHECKER__
88774 # define __user __attribute__((noderef, address_space(1)))
88775+# define __force_user __force __user
88776 # define __kernel __attribute__((address_space(0)))
88777+# define __force_kernel __force __kernel
88778 # define __safe __attribute__((safe))
88779 # define __force __attribute__((force))
88780 # define __nocast __attribute__((nocast))
88781 # define __iomem __attribute__((noderef, address_space(2)))
88782+# define __force_iomem __force __iomem
88783 # define __must_hold(x) __attribute__((context(x,1,1)))
88784 # define __acquires(x) __attribute__((context(x,0,1)))
88785 # define __releases(x) __attribute__((context(x,1,0)))
88786@@ -17,20 +20,37 @@
88787 # define __release(x) __context__(x,-1)
88788 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
88789 # define __percpu __attribute__((noderef, address_space(3)))
88790+# define __force_percpu __force __percpu
88791 #ifdef CONFIG_SPARSE_RCU_POINTER
88792 # define __rcu __attribute__((noderef, address_space(4)))
88793+# define __force_rcu __force __rcu
88794 #else
88795 # define __rcu
88796+# define __force_rcu
88797 #endif
88798 extern void __chk_user_ptr(const volatile void __user *);
88799 extern void __chk_io_ptr(const volatile void __iomem *);
88800 #else
88801-# define __user
88802-# define __kernel
88803+# ifdef CHECKER_PLUGIN
88804+//# define __user
88805+//# define __force_user
88806+//# define __kernel
88807+//# define __force_kernel
88808+# else
88809+# ifdef STRUCTLEAK_PLUGIN
88810+# define __user __attribute__((user))
88811+# else
88812+# define __user
88813+# endif
88814+# define __force_user
88815+# define __kernel
88816+# define __force_kernel
88817+# endif
88818 # define __safe
88819 # define __force
88820 # define __nocast
88821 # define __iomem
88822+# define __force_iomem
88823 # define __chk_user_ptr(x) (void)0
88824 # define __chk_io_ptr(x) (void)0
88825 # define __builtin_warning(x, y...) (1)
88826@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
88827 # define __release(x) (void)0
88828 # define __cond_lock(x,c) (c)
88829 # define __percpu
88830+# define __force_percpu
88831 # define __rcu
88832+# define __force_rcu
88833 #endif
88834
88835 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
88836@@ -205,32 +227,32 @@ static __always_inline void data_access_exceeds_word_size(void)
88837 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
88838 {
88839 switch (size) {
88840- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
88841- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
88842- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
88843+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
88844+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
88845+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
88846 #ifdef CONFIG_64BIT
88847- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
88848+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
88849 #endif
88850 default:
88851 barrier();
88852- __builtin_memcpy((void *)res, (const void *)p, size);
88853+ __builtin_memcpy(res, (const void *)p, size);
88854 data_access_exceeds_word_size();
88855 barrier();
88856 }
88857 }
88858
88859-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
88860+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
88861 {
88862 switch (size) {
88863- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
88864- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
88865- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
88866+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
88867+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
88868+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
88869 #ifdef CONFIG_64BIT
88870- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
88871+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
88872 #endif
88873 default:
88874 barrier();
88875- __builtin_memcpy((void *)p, (const void *)res, size);
88876+ __builtin_memcpy((void *)p, res, size);
88877 data_access_exceeds_word_size();
88878 barrier();
88879 }
88880@@ -364,6 +386,38 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
88881 # define __attribute_const__ /* unimplemented */
88882 #endif
88883
88884+#ifndef __randomize_layout
88885+# define __randomize_layout
88886+#endif
88887+
88888+#ifndef __no_randomize_layout
88889+# define __no_randomize_layout
88890+#endif
88891+
88892+#ifndef __no_const
88893+# define __no_const
88894+#endif
88895+
88896+#ifndef __do_const
88897+# define __do_const
88898+#endif
88899+
88900+#ifndef __size_overflow
88901+# define __size_overflow(...)
88902+#endif
88903+
88904+#ifndef __intentional_overflow
88905+# define __intentional_overflow(...)
88906+#endif
88907+
88908+#ifndef __latent_entropy
88909+# define __latent_entropy
88910+#endif
88911+
88912+#ifndef __nocapture
88913+# define __nocapture(...)
88914+#endif
88915+
88916 /*
88917 * Tell gcc if a function is cold. The compiler will assume any path
88918 * directly leading to the call is unlikely.
88919@@ -373,6 +427,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
88920 #define __cold
88921 #endif
88922
88923+#ifndef __alloc_size
88924+#define __alloc_size(...)
88925+#endif
88926+
88927+#ifndef __bos
88928+#define __bos(ptr, arg)
88929+#endif
88930+
88931+#ifndef __bos0
88932+#define __bos0(ptr)
88933+#endif
88934+
88935+#ifndef __bos1
88936+#define __bos1(ptr)
88937+#endif
88938+
88939 /* Simple shorthand for a section definition */
88940 #ifndef __section
88941 # define __section(S) __attribute__ ((__section__(#S)))
88942@@ -387,6 +457,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
88943 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
88944 #endif
88945
88946+#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))
88947+
88948 /* Is this type a native word size -- useful for atomic operations */
88949 #ifndef __native_word
88950 # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
88951@@ -466,8 +538,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
88952 */
88953 #define __ACCESS_ONCE(x) ({ \
88954 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
88955- (volatile typeof(x) *)&(x); })
88956+ (volatile const typeof(x) *)&(x); })
88957 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
88958+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
88959
88960 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
88961 #ifdef CONFIG_KPROBES
88962diff --git a/include/linux/completion.h b/include/linux/completion.h
88963index 5d5aaae..0ea9b84 100644
88964--- a/include/linux/completion.h
88965+++ b/include/linux/completion.h
88966@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
88967
88968 extern void wait_for_completion(struct completion *);
88969 extern void wait_for_completion_io(struct completion *);
88970-extern int wait_for_completion_interruptible(struct completion *x);
88971-extern int wait_for_completion_killable(struct completion *x);
88972+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
88973+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
88974 extern unsigned long wait_for_completion_timeout(struct completion *x,
88975- unsigned long timeout);
88976+ unsigned long timeout) __intentional_overflow(-1);
88977 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
88978- unsigned long timeout);
88979+ unsigned long timeout) __intentional_overflow(-1);
88980 extern long wait_for_completion_interruptible_timeout(
88981- struct completion *x, unsigned long timeout);
88982+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
88983 extern long wait_for_completion_killable_timeout(
88984- struct completion *x, unsigned long timeout);
88985+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
88986 extern bool try_wait_for_completion(struct completion *x);
88987 extern bool completion_done(struct completion *x);
88988
88989diff --git a/include/linux/configfs.h b/include/linux/configfs.h
88990index 34025df..d94bbbc 100644
88991--- a/include/linux/configfs.h
88992+++ b/include/linux/configfs.h
88993@@ -125,7 +125,7 @@ struct configfs_attribute {
88994 const char *ca_name;
88995 struct module *ca_owner;
88996 umode_t ca_mode;
88997-};
88998+} __do_const;
88999
89000 /*
89001 * Users often need to create attribute structures for their configurable
89002diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
89003index 2ee4888..0451f5e 100644
89004--- a/include/linux/cpufreq.h
89005+++ b/include/linux/cpufreq.h
89006@@ -207,6 +207,7 @@ struct global_attr {
89007 ssize_t (*store)(struct kobject *a, struct attribute *b,
89008 const char *c, size_t count);
89009 };
89010+typedef struct global_attr __no_const global_attr_no_const;
89011
89012 #define define_one_global_ro(_name) \
89013 static struct global_attr _name = \
89014@@ -278,7 +279,7 @@ struct cpufreq_driver {
89015 bool boost_supported;
89016 bool boost_enabled;
89017 int (*set_boost)(int state);
89018-};
89019+} __do_const;
89020
89021 /* flags */
89022 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
89023diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
89024index 9c5e892..feb34e0 100644
89025--- a/include/linux/cpuidle.h
89026+++ b/include/linux/cpuidle.h
89027@@ -59,7 +59,8 @@ struct cpuidle_state {
89028 void (*enter_freeze) (struct cpuidle_device *dev,
89029 struct cpuidle_driver *drv,
89030 int index);
89031-};
89032+} __do_const;
89033+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
89034
89035 /* Idle State Flags */
89036 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
89037@@ -227,7 +228,7 @@ struct cpuidle_governor {
89038 void (*reflect) (struct cpuidle_device *dev, int index);
89039
89040 struct module *owner;
89041-};
89042+} __do_const;
89043
89044 #ifdef CONFIG_CPU_IDLE
89045 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
89046diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
89047index 086549a..a572d94 100644
89048--- a/include/linux/cpumask.h
89049+++ b/include/linux/cpumask.h
89050@@ -126,17 +126,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
89051 }
89052
89053 /* Valid inputs for n are -1 and 0. */
89054-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89055+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
89056 {
89057 return n+1;
89058 }
89059
89060-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89061+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
89062 {
89063 return n+1;
89064 }
89065
89066-static inline unsigned int cpumask_next_and(int n,
89067+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
89068 const struct cpumask *srcp,
89069 const struct cpumask *andp)
89070 {
89071@@ -182,7 +182,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
89072 *
89073 * Returns >= nr_cpu_ids if no further cpus set.
89074 */
89075-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89076+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
89077 {
89078 /* -1 is a legal arg here. */
89079 if (n != -1)
89080@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89081 *
89082 * Returns >= nr_cpu_ids if no further cpus unset.
89083 */
89084-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89085+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
89086 {
89087 /* -1 is a legal arg here. */
89088 if (n != -1)
89089@@ -205,7 +205,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89090 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
89091 }
89092
89093-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
89094+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
89095 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
89096 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
89097
89098@@ -472,7 +472,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
89099 * cpumask_weight - Count of bits in *srcp
89100 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
89101 */
89102-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
89103+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
89104 {
89105 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
89106 }
89107diff --git a/include/linux/cred.h b/include/linux/cred.h
89108index 2fb2ca2..d6a3340 100644
89109--- a/include/linux/cred.h
89110+++ b/include/linux/cred.h
89111@@ -35,7 +35,7 @@ struct group_info {
89112 int nblocks;
89113 kgid_t small_block[NGROUPS_SMALL];
89114 kgid_t *blocks[0];
89115-};
89116+} __randomize_layout;
89117
89118 /**
89119 * get_group_info - Get a reference to a group info structure
89120@@ -137,7 +137,7 @@ struct cred {
89121 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
89122 struct group_info *group_info; /* supplementary groups for euid/fsgid */
89123 struct rcu_head rcu; /* RCU deletion hook */
89124-};
89125+} __randomize_layout;
89126
89127 extern void __put_cred(struct cred *);
89128 extern void exit_creds(struct task_struct *);
89129@@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
89130 static inline void validate_process_creds(void)
89131 {
89132 }
89133+static inline void validate_task_creds(struct task_struct *task)
89134+{
89135+}
89136 #endif
89137
89138 /**
89139@@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
89140
89141 #define task_uid(task) (task_cred_xxx((task), uid))
89142 #define task_euid(task) (task_cred_xxx((task), euid))
89143+#define task_securebits(task) (task_cred_xxx((task), securebits))
89144
89145 #define current_cred_xxx(xxx) \
89146 ({ \
89147diff --git a/include/linux/crypto.h b/include/linux/crypto.h
89148index fb5ef16..05d1e59 100644
89149--- a/include/linux/crypto.h
89150+++ b/include/linux/crypto.h
89151@@ -626,7 +626,7 @@ struct cipher_tfm {
89152 const u8 *key, unsigned int keylen);
89153 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
89154 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
89155-};
89156+} __no_const;
89157
89158 struct hash_tfm {
89159 int (*init)(struct hash_desc *desc);
89160@@ -647,13 +647,13 @@ struct compress_tfm {
89161 int (*cot_decompress)(struct crypto_tfm *tfm,
89162 const u8 *src, unsigned int slen,
89163 u8 *dst, unsigned int *dlen);
89164-};
89165+} __no_const;
89166
89167 struct rng_tfm {
89168 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
89169 unsigned int dlen);
89170 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
89171-};
89172+} __no_const;
89173
89174 #define crt_ablkcipher crt_u.ablkcipher
89175 #define crt_aead crt_u.aead
89176diff --git a/include/linux/ctype.h b/include/linux/ctype.h
89177index 653589e..4ef254a 100644
89178--- a/include/linux/ctype.h
89179+++ b/include/linux/ctype.h
89180@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
89181 * Fast implementation of tolower() for internal usage. Do not use in your
89182 * code.
89183 */
89184-static inline char _tolower(const char c)
89185+static inline unsigned char _tolower(const unsigned char c)
89186 {
89187 return c | 0x20;
89188 }
89189diff --git a/include/linux/dcache.h b/include/linux/dcache.h
89190index d835879..c8e5b92 100644
89191--- a/include/linux/dcache.h
89192+++ b/include/linux/dcache.h
89193@@ -123,6 +123,9 @@ struct dentry {
89194 unsigned long d_time; /* used by d_revalidate */
89195 void *d_fsdata; /* fs-specific data */
89196
89197+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
89198+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
89199+#endif
89200 struct list_head d_lru; /* LRU list */
89201 struct list_head d_child; /* child of parent list */
89202 struct list_head d_subdirs; /* our children */
89203@@ -133,7 +136,7 @@ struct dentry {
89204 struct hlist_node d_alias; /* inode alias list */
89205 struct rcu_head d_rcu;
89206 } d_u;
89207-};
89208+} __randomize_layout;
89209
89210 /*
89211 * dentry->d_lock spinlock nesting subclasses:
89212@@ -319,7 +322,7 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
89213
89214 static inline unsigned d_count(const struct dentry *dentry)
89215 {
89216- return dentry->d_lockref.count;
89217+ return __lockref_read(&dentry->d_lockref);
89218 }
89219
89220 /*
89221@@ -347,7 +350,7 @@ extern char *dentry_path(struct dentry *, char *, int);
89222 static inline struct dentry *dget_dlock(struct dentry *dentry)
89223 {
89224 if (dentry)
89225- dentry->d_lockref.count++;
89226+ __lockref_inc(&dentry->d_lockref);
89227 return dentry;
89228 }
89229
89230diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
89231index 7925bf0..d5143d2 100644
89232--- a/include/linux/decompress/mm.h
89233+++ b/include/linux/decompress/mm.h
89234@@ -77,7 +77,7 @@ static void free(void *where)
89235 * warnings when not needed (indeed large_malloc / large_free are not
89236 * needed by inflate */
89237
89238-#define malloc(a) kmalloc(a, GFP_KERNEL)
89239+#define malloc(a) kmalloc((a), GFP_KERNEL)
89240 #define free(a) kfree(a)
89241
89242 #define large_malloc(a) vmalloc(a)
89243diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
89244index ce447f0..83c66bd 100644
89245--- a/include/linux/devfreq.h
89246+++ b/include/linux/devfreq.h
89247@@ -114,7 +114,7 @@ struct devfreq_governor {
89248 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
89249 int (*event_handler)(struct devfreq *devfreq,
89250 unsigned int event, void *data);
89251-};
89252+} __do_const;
89253
89254 /**
89255 * struct devfreq - Device devfreq structure
89256diff --git a/include/linux/device.h b/include/linux/device.h
89257index 0eb8ee2..c603b6a 100644
89258--- a/include/linux/device.h
89259+++ b/include/linux/device.h
89260@@ -311,7 +311,7 @@ struct subsys_interface {
89261 struct list_head node;
89262 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
89263 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
89264-};
89265+} __do_const;
89266
89267 int subsys_interface_register(struct subsys_interface *sif);
89268 void subsys_interface_unregister(struct subsys_interface *sif);
89269@@ -507,7 +507,7 @@ struct device_type {
89270 void (*release)(struct device *dev);
89271
89272 const struct dev_pm_ops *pm;
89273-};
89274+} __do_const;
89275
89276 /* interface for exporting device attributes */
89277 struct device_attribute {
89278@@ -517,11 +517,12 @@ struct device_attribute {
89279 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
89280 const char *buf, size_t count);
89281 };
89282+typedef struct device_attribute __no_const device_attribute_no_const;
89283
89284 struct dev_ext_attribute {
89285 struct device_attribute attr;
89286 void *var;
89287-};
89288+} __do_const;
89289
89290 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
89291 char *buf);
89292diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
89293index c3007cb..43efc8c 100644
89294--- a/include/linux/dma-mapping.h
89295+++ b/include/linux/dma-mapping.h
89296@@ -60,7 +60,7 @@ struct dma_map_ops {
89297 u64 (*get_required_mask)(struct device *dev);
89298 #endif
89299 int is_phys;
89300-};
89301+} __do_const;
89302
89303 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
89304
89305diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
89306index b6997a0..108be6c 100644
89307--- a/include/linux/dmaengine.h
89308+++ b/include/linux/dmaengine.h
89309@@ -1133,9 +1133,9 @@ struct dma_pinned_list {
89310 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
89311 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
89312
89313-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
89314+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
89315 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
89316-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
89317+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
89318 struct dma_pinned_list *pinned_list, struct page *page,
89319 unsigned int offset, size_t len);
89320
89321diff --git a/include/linux/efi.h b/include/linux/efi.h
89322index cf7e431..d239dce 100644
89323--- a/include/linux/efi.h
89324+++ b/include/linux/efi.h
89325@@ -1056,6 +1056,7 @@ struct efivar_operations {
89326 efi_set_variable_nonblocking_t *set_variable_nonblocking;
89327 efi_query_variable_store_t *query_variable_store;
89328 };
89329+typedef struct efivar_operations __no_const efivar_operations_no_const;
89330
89331 struct efivars {
89332 /*
89333diff --git a/include/linux/elf.h b/include/linux/elf.h
89334index 20fa8d8..3d0dd18 100644
89335--- a/include/linux/elf.h
89336+++ b/include/linux/elf.h
89337@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
89338 #define elf_note elf32_note
89339 #define elf_addr_t Elf32_Off
89340 #define Elf_Half Elf32_Half
89341+#define elf_dyn Elf32_Dyn
89342
89343 #else
89344
89345@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
89346 #define elf_note elf64_note
89347 #define elf_addr_t Elf64_Off
89348 #define Elf_Half Elf64_Half
89349+#define elf_dyn Elf64_Dyn
89350
89351 #endif
89352
89353diff --git a/include/linux/err.h b/include/linux/err.h
89354index a729120..6ede2c9 100644
89355--- a/include/linux/err.h
89356+++ b/include/linux/err.h
89357@@ -20,12 +20,12 @@
89358
89359 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
89360
89361-static inline void * __must_check ERR_PTR(long error)
89362+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
89363 {
89364 return (void *) error;
89365 }
89366
89367-static inline long __must_check PTR_ERR(__force const void *ptr)
89368+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
89369 {
89370 return (long) ptr;
89371 }
89372diff --git a/include/linux/extcon.h b/include/linux/extcon.h
89373index 36f49c4..a2a1f4c 100644
89374--- a/include/linux/extcon.h
89375+++ b/include/linux/extcon.h
89376@@ -135,7 +135,7 @@ struct extcon_dev {
89377 /* /sys/class/extcon/.../mutually_exclusive/... */
89378 struct attribute_group attr_g_muex;
89379 struct attribute **attrs_muex;
89380- struct device_attribute *d_attrs_muex;
89381+ device_attribute_no_const *d_attrs_muex;
89382 };
89383
89384 /**
89385diff --git a/include/linux/fb.h b/include/linux/fb.h
89386index 043f328..180ccbf 100644
89387--- a/include/linux/fb.h
89388+++ b/include/linux/fb.h
89389@@ -305,7 +305,8 @@ struct fb_ops {
89390 /* called at KDB enter and leave time to prepare the console */
89391 int (*fb_debug_enter)(struct fb_info *info);
89392 int (*fb_debug_leave)(struct fb_info *info);
89393-};
89394+} __do_const;
89395+typedef struct fb_ops __no_const fb_ops_no_const;
89396
89397 #ifdef CONFIG_FB_TILEBLITTING
89398 #define FB_TILE_CURSOR_NONE 0
89399diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
89400index 230f87b..1fd0485 100644
89401--- a/include/linux/fdtable.h
89402+++ b/include/linux/fdtable.h
89403@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
89404 void put_files_struct(struct files_struct *fs);
89405 void reset_files_struct(struct files_struct *);
89406 int unshare_files(struct files_struct **);
89407-struct files_struct *dup_fd(struct files_struct *, int *);
89408+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
89409 void do_close_on_exec(struct files_struct *);
89410 int iterate_fd(struct files_struct *, unsigned,
89411 int (*)(const void *, struct file *, unsigned),
89412diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
89413index 8293262..2b3b8bd 100644
89414--- a/include/linux/frontswap.h
89415+++ b/include/linux/frontswap.h
89416@@ -11,7 +11,7 @@ struct frontswap_ops {
89417 int (*load)(unsigned, pgoff_t, struct page *);
89418 void (*invalidate_page)(unsigned, pgoff_t);
89419 void (*invalidate_area)(unsigned);
89420-};
89421+} __no_const;
89422
89423 extern bool frontswap_enabled;
89424 extern struct frontswap_ops *
89425diff --git a/include/linux/fs.h b/include/linux/fs.h
89426index 52cc449..31f35cb 100644
89427--- a/include/linux/fs.h
89428+++ b/include/linux/fs.h
89429@@ -410,7 +410,7 @@ struct address_space {
89430 spinlock_t private_lock; /* for use by the address_space */
89431 struct list_head private_list; /* ditto */
89432 void *private_data; /* ditto */
89433-} __attribute__((aligned(sizeof(long))));
89434+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
89435 /*
89436 * On most architectures that alignment is already the case; but
89437 * must be enforced here for CRIS, to let the least significant bit
89438@@ -453,7 +453,7 @@ struct block_device {
89439 int bd_fsfreeze_count;
89440 /* Mutex for freeze */
89441 struct mutex bd_fsfreeze_mutex;
89442-};
89443+} __randomize_layout;
89444
89445 /*
89446 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
89447@@ -639,7 +639,7 @@ struct inode {
89448 #endif
89449
89450 void *i_private; /* fs or device private pointer */
89451-};
89452+} __randomize_layout;
89453
89454 static inline int inode_unhashed(struct inode *inode)
89455 {
89456@@ -834,7 +834,7 @@ struct file {
89457 struct list_head f_tfile_llink;
89458 #endif /* #ifdef CONFIG_EPOLL */
89459 struct address_space *f_mapping;
89460-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
89461+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
89462
89463 struct file_handle {
89464 __u32 handle_bytes;
89465@@ -962,7 +962,7 @@ struct file_lock {
89466 int state; /* state of grant or error if -ve */
89467 } afs;
89468 } fl_u;
89469-};
89470+} __randomize_layout;
89471
89472 struct file_lock_context {
89473 spinlock_t flc_lock;
89474@@ -1316,7 +1316,7 @@ struct super_block {
89475 * Indicates how deep in a filesystem stack this SB is
89476 */
89477 int s_stack_depth;
89478-};
89479+} __randomize_layout;
89480
89481 extern struct timespec current_fs_time(struct super_block *sb);
89482
89483@@ -1570,7 +1570,8 @@ struct file_operations {
89484 #ifndef CONFIG_MMU
89485 unsigned (*mmap_capabilities)(struct file *);
89486 #endif
89487-};
89488+} __do_const __randomize_layout;
89489+typedef struct file_operations __no_const file_operations_no_const;
89490
89491 struct inode_operations {
89492 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
89493@@ -2269,7 +2270,7 @@ extern int register_chrdev_region(dev_t, unsigned, const char *);
89494 extern int __register_chrdev(unsigned int major, unsigned int baseminor,
89495 unsigned int count, const char *name,
89496 const struct file_operations *fops);
89497-extern void __unregister_chrdev(unsigned int major, unsigned int baseminor,
89498+extern __nocapture(4) void __unregister_chrdev(unsigned int major, unsigned int baseminor,
89499 unsigned int count, const char *name);
89500 extern void unregister_chrdev_region(dev_t, unsigned);
89501 extern void chrdev_show(struct seq_file *,off_t);
89502@@ -2918,4 +2919,14 @@ static inline bool dir_relax(struct inode *inode)
89503 return !IS_DEADDIR(inode);
89504 }
89505
89506+static inline bool is_sidechannel_device(const struct inode *inode)
89507+{
89508+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
89509+ umode_t mode = inode->i_mode;
89510+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
89511+#else
89512+ return false;
89513+#endif
89514+}
89515+
89516 #endif /* _LINUX_FS_H */
89517diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
89518index 0efc3e6..fd23610 100644
89519--- a/include/linux/fs_struct.h
89520+++ b/include/linux/fs_struct.h
89521@@ -6,13 +6,13 @@
89522 #include <linux/seqlock.h>
89523
89524 struct fs_struct {
89525- int users;
89526+ atomic_t users;
89527 spinlock_t lock;
89528 seqcount_t seq;
89529 int umask;
89530 int in_exec;
89531 struct path root, pwd;
89532-};
89533+} __randomize_layout;
89534
89535 extern struct kmem_cache *fs_cachep;
89536
89537diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
89538index 7714849..a4a5c7a 100644
89539--- a/include/linux/fscache-cache.h
89540+++ b/include/linux/fscache-cache.h
89541@@ -113,7 +113,7 @@ struct fscache_operation {
89542 fscache_operation_release_t release;
89543 };
89544
89545-extern atomic_t fscache_op_debug_id;
89546+extern atomic_unchecked_t fscache_op_debug_id;
89547 extern void fscache_op_work_func(struct work_struct *work);
89548
89549 extern void fscache_enqueue_operation(struct fscache_operation *);
89550@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
89551 INIT_WORK(&op->work, fscache_op_work_func);
89552 atomic_set(&op->usage, 1);
89553 op->state = FSCACHE_OP_ST_INITIALISED;
89554- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
89555+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
89556 op->processor = processor;
89557 op->release = release;
89558 INIT_LIST_HEAD(&op->pend_link);
89559diff --git a/include/linux/fscache.h b/include/linux/fscache.h
89560index 115bb81..e7b812b 100644
89561--- a/include/linux/fscache.h
89562+++ b/include/linux/fscache.h
89563@@ -152,7 +152,7 @@ struct fscache_cookie_def {
89564 * - this is mandatory for any object that may have data
89565 */
89566 void (*now_uncached)(void *cookie_netfs_data);
89567-};
89568+} __do_const;
89569
89570 /*
89571 * fscache cached network filesystem type
89572diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
89573index 7ee1774..72505b8 100644
89574--- a/include/linux/fsnotify.h
89575+++ b/include/linux/fsnotify.h
89576@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
89577 struct inode *inode = file_inode(file);
89578 __u32 mask = FS_ACCESS;
89579
89580+ if (is_sidechannel_device(inode))
89581+ return;
89582+
89583 if (S_ISDIR(inode->i_mode))
89584 mask |= FS_ISDIR;
89585
89586@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
89587 struct inode *inode = file_inode(file);
89588 __u32 mask = FS_MODIFY;
89589
89590+ if (is_sidechannel_device(inode))
89591+ return;
89592+
89593 if (S_ISDIR(inode->i_mode))
89594 mask |= FS_ISDIR;
89595
89596@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
89597 */
89598 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
89599 {
89600- return kstrdup(name, GFP_KERNEL);
89601+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
89602 }
89603
89604 /*
89605diff --git a/include/linux/genhd.h b/include/linux/genhd.h
89606index ec274e0..e678159 100644
89607--- a/include/linux/genhd.h
89608+++ b/include/linux/genhd.h
89609@@ -194,7 +194,7 @@ struct gendisk {
89610 struct kobject *slave_dir;
89611
89612 struct timer_rand_state *random;
89613- atomic_t sync_io; /* RAID */
89614+ atomic_unchecked_t sync_io; /* RAID */
89615 struct disk_events *ev;
89616 #ifdef CONFIG_BLK_DEV_INTEGRITY
89617 struct blk_integrity *integrity;
89618@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
89619 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
89620
89621 /* drivers/char/random.c */
89622-extern void add_disk_randomness(struct gendisk *disk);
89623+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
89624 extern void rand_initialize_disk(struct gendisk *disk);
89625
89626 static inline sector_t get_start_sect(struct block_device *bdev)
89627diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
89628index 667c311..abac2a7 100644
89629--- a/include/linux/genl_magic_func.h
89630+++ b/include/linux/genl_magic_func.h
89631@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
89632 },
89633
89634 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
89635-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
89636+static struct genl_ops ZZZ_genl_ops[] = {
89637 #include GENL_MAGIC_INCLUDE_FILE
89638 };
89639
89640diff --git a/include/linux/gfp.h b/include/linux/gfp.h
89641index eb6fafe..9360779 100644
89642--- a/include/linux/gfp.h
89643+++ b/include/linux/gfp.h
89644@@ -35,6 +35,13 @@ struct vm_area_struct;
89645 #define ___GFP_NO_KSWAPD 0x400000u
89646 #define ___GFP_OTHER_NODE 0x800000u
89647 #define ___GFP_WRITE 0x1000000u
89648+
89649+#ifdef CONFIG_PAX_USERCOPY_SLABS
89650+#define ___GFP_USERCOPY 0x2000000u
89651+#else
89652+#define ___GFP_USERCOPY 0
89653+#endif
89654+
89655 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
89656
89657 /*
89658@@ -92,6 +99,7 @@ struct vm_area_struct;
89659 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
89660 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
89661 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
89662+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
89663
89664 /*
89665 * This may seem redundant, but it's a way of annotating false positives vs.
89666@@ -99,7 +107,7 @@ struct vm_area_struct;
89667 */
89668 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
89669
89670-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
89671+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
89672 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
89673
89674 /* This equals 0, but use constants in case they ever change */
89675@@ -154,6 +162,8 @@ struct vm_area_struct;
89676 /* 4GB DMA on some platforms */
89677 #define GFP_DMA32 __GFP_DMA32
89678
89679+#define GFP_USERCOPY __GFP_USERCOPY
89680+
89681 /* Convert GFP flags to their corresponding migrate type */
89682 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
89683 {
89684diff --git a/include/linux/gracl.h b/include/linux/gracl.h
89685new file mode 100644
89686index 0000000..91858e4
89687--- /dev/null
89688+++ b/include/linux/gracl.h
89689@@ -0,0 +1,342 @@
89690+#ifndef GR_ACL_H
89691+#define GR_ACL_H
89692+
89693+#include <linux/grdefs.h>
89694+#include <linux/resource.h>
89695+#include <linux/capability.h>
89696+#include <linux/dcache.h>
89697+#include <asm/resource.h>
89698+
89699+/* Major status information */
89700+
89701+#define GR_VERSION "grsecurity 3.1"
89702+#define GRSECURITY_VERSION 0x3100
89703+
89704+enum {
89705+ GR_SHUTDOWN = 0,
89706+ GR_ENABLE = 1,
89707+ GR_SPROLE = 2,
89708+ GR_OLDRELOAD = 3,
89709+ GR_SEGVMOD = 4,
89710+ GR_STATUS = 5,
89711+ GR_UNSPROLE = 6,
89712+ GR_PASSSET = 7,
89713+ GR_SPROLEPAM = 8,
89714+ GR_RELOAD = 9,
89715+};
89716+
89717+/* Password setup definitions
89718+ * kernel/grhash.c */
89719+enum {
89720+ GR_PW_LEN = 128,
89721+ GR_SALT_LEN = 16,
89722+ GR_SHA_LEN = 32,
89723+};
89724+
89725+enum {
89726+ GR_SPROLE_LEN = 64,
89727+};
89728+
89729+enum {
89730+ GR_NO_GLOB = 0,
89731+ GR_REG_GLOB,
89732+ GR_CREATE_GLOB
89733+};
89734+
89735+#define GR_NLIMITS 32
89736+
89737+/* Begin Data Structures */
89738+
89739+struct sprole_pw {
89740+ unsigned char *rolename;
89741+ unsigned char salt[GR_SALT_LEN];
89742+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
89743+};
89744+
89745+struct name_entry {
89746+ __u32 key;
89747+ u64 inode;
89748+ dev_t device;
89749+ char *name;
89750+ __u16 len;
89751+ __u8 deleted;
89752+ struct name_entry *prev;
89753+ struct name_entry *next;
89754+};
89755+
89756+struct inodev_entry {
89757+ struct name_entry *nentry;
89758+ struct inodev_entry *prev;
89759+ struct inodev_entry *next;
89760+};
89761+
89762+struct acl_role_db {
89763+ struct acl_role_label **r_hash;
89764+ __u32 r_size;
89765+};
89766+
89767+struct inodev_db {
89768+ struct inodev_entry **i_hash;
89769+ __u32 i_size;
89770+};
89771+
89772+struct name_db {
89773+ struct name_entry **n_hash;
89774+ __u32 n_size;
89775+};
89776+
89777+struct crash_uid {
89778+ uid_t uid;
89779+ unsigned long expires;
89780+};
89781+
89782+struct gr_hash_struct {
89783+ void **table;
89784+ void **nametable;
89785+ void *first;
89786+ __u32 table_size;
89787+ __u32 used_size;
89788+ int type;
89789+};
89790+
89791+/* Userspace Grsecurity ACL data structures */
89792+
89793+struct acl_subject_label {
89794+ char *filename;
89795+ u64 inode;
89796+ dev_t device;
89797+ __u32 mode;
89798+ kernel_cap_t cap_mask;
89799+ kernel_cap_t cap_lower;
89800+ kernel_cap_t cap_invert_audit;
89801+
89802+ struct rlimit res[GR_NLIMITS];
89803+ __u32 resmask;
89804+
89805+ __u8 user_trans_type;
89806+ __u8 group_trans_type;
89807+ uid_t *user_transitions;
89808+ gid_t *group_transitions;
89809+ __u16 user_trans_num;
89810+ __u16 group_trans_num;
89811+
89812+ __u32 sock_families[2];
89813+ __u32 ip_proto[8];
89814+ __u32 ip_type;
89815+ struct acl_ip_label **ips;
89816+ __u32 ip_num;
89817+ __u32 inaddr_any_override;
89818+
89819+ __u32 crashes;
89820+ unsigned long expires;
89821+
89822+ struct acl_subject_label *parent_subject;
89823+ struct gr_hash_struct *hash;
89824+ struct acl_subject_label *prev;
89825+ struct acl_subject_label *next;
89826+
89827+ struct acl_object_label **obj_hash;
89828+ __u32 obj_hash_size;
89829+ __u16 pax_flags;
89830+};
89831+
89832+struct role_allowed_ip {
89833+ __u32 addr;
89834+ __u32 netmask;
89835+
89836+ struct role_allowed_ip *prev;
89837+ struct role_allowed_ip *next;
89838+};
89839+
89840+struct role_transition {
89841+ char *rolename;
89842+
89843+ struct role_transition *prev;
89844+ struct role_transition *next;
89845+};
89846+
89847+struct acl_role_label {
89848+ char *rolename;
89849+ uid_t uidgid;
89850+ __u16 roletype;
89851+
89852+ __u16 auth_attempts;
89853+ unsigned long expires;
89854+
89855+ struct acl_subject_label *root_label;
89856+ struct gr_hash_struct *hash;
89857+
89858+ struct acl_role_label *prev;
89859+ struct acl_role_label *next;
89860+
89861+ struct role_transition *transitions;
89862+ struct role_allowed_ip *allowed_ips;
89863+ uid_t *domain_children;
89864+ __u16 domain_child_num;
89865+
89866+ umode_t umask;
89867+
89868+ struct acl_subject_label **subj_hash;
89869+ __u32 subj_hash_size;
89870+};
89871+
89872+struct user_acl_role_db {
89873+ struct acl_role_label **r_table;
89874+ __u32 num_pointers; /* Number of allocations to track */
89875+ __u32 num_roles; /* Number of roles */
89876+ __u32 num_domain_children; /* Number of domain children */
89877+ __u32 num_subjects; /* Number of subjects */
89878+ __u32 num_objects; /* Number of objects */
89879+};
89880+
89881+struct acl_object_label {
89882+ char *filename;
89883+ u64 inode;
89884+ dev_t device;
89885+ __u32 mode;
89886+
89887+ struct acl_subject_label *nested;
89888+ struct acl_object_label *globbed;
89889+
89890+ /* next two structures not used */
89891+
89892+ struct acl_object_label *prev;
89893+ struct acl_object_label *next;
89894+};
89895+
89896+struct acl_ip_label {
89897+ char *iface;
89898+ __u32 addr;
89899+ __u32 netmask;
89900+ __u16 low, high;
89901+ __u8 mode;
89902+ __u32 type;
89903+ __u32 proto[8];
89904+
89905+ /* next two structures not used */
89906+
89907+ struct acl_ip_label *prev;
89908+ struct acl_ip_label *next;
89909+};
89910+
89911+struct gr_arg {
89912+ struct user_acl_role_db role_db;
89913+ unsigned char pw[GR_PW_LEN];
89914+ unsigned char salt[GR_SALT_LEN];
89915+ unsigned char sum[GR_SHA_LEN];
89916+ unsigned char sp_role[GR_SPROLE_LEN];
89917+ struct sprole_pw *sprole_pws;
89918+ dev_t segv_device;
89919+ u64 segv_inode;
89920+ uid_t segv_uid;
89921+ __u16 num_sprole_pws;
89922+ __u16 mode;
89923+};
89924+
89925+struct gr_arg_wrapper {
89926+ struct gr_arg *arg;
89927+ __u32 version;
89928+ __u32 size;
89929+};
89930+
89931+struct subject_map {
89932+ struct acl_subject_label *user;
89933+ struct acl_subject_label *kernel;
89934+ struct subject_map *prev;
89935+ struct subject_map *next;
89936+};
89937+
89938+struct acl_subj_map_db {
89939+ struct subject_map **s_hash;
89940+ __u32 s_size;
89941+};
89942+
89943+struct gr_policy_state {
89944+ struct sprole_pw **acl_special_roles;
89945+ __u16 num_sprole_pws;
89946+ struct acl_role_label *kernel_role;
89947+ struct acl_role_label *role_list;
89948+ struct acl_role_label *default_role;
89949+ struct acl_role_db acl_role_set;
89950+ struct acl_subj_map_db subj_map_set;
89951+ struct name_db name_set;
89952+ struct inodev_db inodev_set;
89953+};
89954+
89955+struct gr_alloc_state {
89956+ unsigned long alloc_stack_next;
89957+ unsigned long alloc_stack_size;
89958+ void **alloc_stack;
89959+};
89960+
89961+struct gr_reload_state {
89962+ struct gr_policy_state oldpolicy;
89963+ struct gr_alloc_state oldalloc;
89964+ struct gr_policy_state newpolicy;
89965+ struct gr_alloc_state newalloc;
89966+ struct gr_policy_state *oldpolicy_ptr;
89967+ struct gr_alloc_state *oldalloc_ptr;
89968+ unsigned char oldmode;
89969+};
89970+
89971+/* End Data Structures Section */
89972+
89973+/* Hash functions generated by empirical testing by Brad Spengler
89974+ Makes good use of the low bits of the inode. Generally 0-1 times
89975+ in loop for successful match. 0-3 for unsuccessful match.
89976+ Shift/add algorithm with modulus of table size and an XOR*/
89977+
89978+static __inline__ unsigned int
89979+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
89980+{
89981+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
89982+}
89983+
89984+ static __inline__ unsigned int
89985+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
89986+{
89987+ return ((const unsigned long)userp % sz);
89988+}
89989+
89990+static __inline__ unsigned int
89991+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
89992+{
89993+ unsigned int rem;
89994+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
89995+ return rem;
89996+}
89997+
89998+static __inline__ unsigned int
89999+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
90000+{
90001+ return full_name_hash((const unsigned char *)name, len) % sz;
90002+}
90003+
90004+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
90005+ subj = NULL; \
90006+ iter = 0; \
90007+ while (iter < role->subj_hash_size) { \
90008+ if (subj == NULL) \
90009+ subj = role->subj_hash[iter]; \
90010+ if (subj == NULL) { \
90011+ iter++; \
90012+ continue; \
90013+ }
90014+
90015+#define FOR_EACH_SUBJECT_END(subj,iter) \
90016+ subj = subj->next; \
90017+ if (subj == NULL) \
90018+ iter++; \
90019+ }
90020+
90021+
90022+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
90023+ subj = role->hash->first; \
90024+ while (subj != NULL) {
90025+
90026+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
90027+ subj = subj->next; \
90028+ }
90029+
90030+#endif
90031+
90032diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
90033new file mode 100644
90034index 0000000..af64092
90035--- /dev/null
90036+++ b/include/linux/gracl_compat.h
90037@@ -0,0 +1,156 @@
90038+#ifndef GR_ACL_COMPAT_H
90039+#define GR_ACL_COMPAT_H
90040+
90041+#include <linux/resource.h>
90042+#include <asm/resource.h>
90043+
90044+struct sprole_pw_compat {
90045+ compat_uptr_t rolename;
90046+ unsigned char salt[GR_SALT_LEN];
90047+ unsigned char sum[GR_SHA_LEN];
90048+};
90049+
90050+struct gr_hash_struct_compat {
90051+ compat_uptr_t table;
90052+ compat_uptr_t nametable;
90053+ compat_uptr_t first;
90054+ __u32 table_size;
90055+ __u32 used_size;
90056+ int type;
90057+};
90058+
90059+struct acl_subject_label_compat {
90060+ compat_uptr_t filename;
90061+ compat_u64 inode;
90062+ __u32 device;
90063+ __u32 mode;
90064+ kernel_cap_t cap_mask;
90065+ kernel_cap_t cap_lower;
90066+ kernel_cap_t cap_invert_audit;
90067+
90068+ struct compat_rlimit res[GR_NLIMITS];
90069+ __u32 resmask;
90070+
90071+ __u8 user_trans_type;
90072+ __u8 group_trans_type;
90073+ compat_uptr_t user_transitions;
90074+ compat_uptr_t group_transitions;
90075+ __u16 user_trans_num;
90076+ __u16 group_trans_num;
90077+
90078+ __u32 sock_families[2];
90079+ __u32 ip_proto[8];
90080+ __u32 ip_type;
90081+ compat_uptr_t ips;
90082+ __u32 ip_num;
90083+ __u32 inaddr_any_override;
90084+
90085+ __u32 crashes;
90086+ compat_ulong_t expires;
90087+
90088+ compat_uptr_t parent_subject;
90089+ compat_uptr_t hash;
90090+ compat_uptr_t prev;
90091+ compat_uptr_t next;
90092+
90093+ compat_uptr_t obj_hash;
90094+ __u32 obj_hash_size;
90095+ __u16 pax_flags;
90096+};
90097+
90098+struct role_allowed_ip_compat {
90099+ __u32 addr;
90100+ __u32 netmask;
90101+
90102+ compat_uptr_t prev;
90103+ compat_uptr_t next;
90104+};
90105+
90106+struct role_transition_compat {
90107+ compat_uptr_t rolename;
90108+
90109+ compat_uptr_t prev;
90110+ compat_uptr_t next;
90111+};
90112+
90113+struct acl_role_label_compat {
90114+ compat_uptr_t rolename;
90115+ uid_t uidgid;
90116+ __u16 roletype;
90117+
90118+ __u16 auth_attempts;
90119+ compat_ulong_t expires;
90120+
90121+ compat_uptr_t root_label;
90122+ compat_uptr_t hash;
90123+
90124+ compat_uptr_t prev;
90125+ compat_uptr_t next;
90126+
90127+ compat_uptr_t transitions;
90128+ compat_uptr_t allowed_ips;
90129+ compat_uptr_t domain_children;
90130+ __u16 domain_child_num;
90131+
90132+ umode_t umask;
90133+
90134+ compat_uptr_t subj_hash;
90135+ __u32 subj_hash_size;
90136+};
90137+
90138+struct user_acl_role_db_compat {
90139+ compat_uptr_t r_table;
90140+ __u32 num_pointers;
90141+ __u32 num_roles;
90142+ __u32 num_domain_children;
90143+ __u32 num_subjects;
90144+ __u32 num_objects;
90145+};
90146+
90147+struct acl_object_label_compat {
90148+ compat_uptr_t filename;
90149+ compat_u64 inode;
90150+ __u32 device;
90151+ __u32 mode;
90152+
90153+ compat_uptr_t nested;
90154+ compat_uptr_t globbed;
90155+
90156+ compat_uptr_t prev;
90157+ compat_uptr_t next;
90158+};
90159+
90160+struct acl_ip_label_compat {
90161+ compat_uptr_t iface;
90162+ __u32 addr;
90163+ __u32 netmask;
90164+ __u16 low, high;
90165+ __u8 mode;
90166+ __u32 type;
90167+ __u32 proto[8];
90168+
90169+ compat_uptr_t prev;
90170+ compat_uptr_t next;
90171+};
90172+
90173+struct gr_arg_compat {
90174+ struct user_acl_role_db_compat role_db;
90175+ unsigned char pw[GR_PW_LEN];
90176+ unsigned char salt[GR_SALT_LEN];
90177+ unsigned char sum[GR_SHA_LEN];
90178+ unsigned char sp_role[GR_SPROLE_LEN];
90179+ compat_uptr_t sprole_pws;
90180+ __u32 segv_device;
90181+ compat_u64 segv_inode;
90182+ uid_t segv_uid;
90183+ __u16 num_sprole_pws;
90184+ __u16 mode;
90185+};
90186+
90187+struct gr_arg_wrapper_compat {
90188+ compat_uptr_t arg;
90189+ __u32 version;
90190+ __u32 size;
90191+};
90192+
90193+#endif
90194diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
90195new file mode 100644
90196index 0000000..323ecf2
90197--- /dev/null
90198+++ b/include/linux/gralloc.h
90199@@ -0,0 +1,9 @@
90200+#ifndef __GRALLOC_H
90201+#define __GRALLOC_H
90202+
90203+void acl_free_all(void);
90204+int acl_alloc_stack_init(unsigned long size);
90205+void *acl_alloc(unsigned long len);
90206+void *acl_alloc_num(unsigned long num, unsigned long len);
90207+
90208+#endif
90209diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
90210new file mode 100644
90211index 0000000..be66033
90212--- /dev/null
90213+++ b/include/linux/grdefs.h
90214@@ -0,0 +1,140 @@
90215+#ifndef GRDEFS_H
90216+#define GRDEFS_H
90217+
90218+/* Begin grsecurity status declarations */
90219+
90220+enum {
90221+ GR_READY = 0x01,
90222+ GR_STATUS_INIT = 0x00 // disabled state
90223+};
90224+
90225+/* Begin ACL declarations */
90226+
90227+/* Role flags */
90228+
90229+enum {
90230+ GR_ROLE_USER = 0x0001,
90231+ GR_ROLE_GROUP = 0x0002,
90232+ GR_ROLE_DEFAULT = 0x0004,
90233+ GR_ROLE_SPECIAL = 0x0008,
90234+ GR_ROLE_AUTH = 0x0010,
90235+ GR_ROLE_NOPW = 0x0020,
90236+ GR_ROLE_GOD = 0x0040,
90237+ GR_ROLE_LEARN = 0x0080,
90238+ GR_ROLE_TPE = 0x0100,
90239+ GR_ROLE_DOMAIN = 0x0200,
90240+ GR_ROLE_PAM = 0x0400,
90241+ GR_ROLE_PERSIST = 0x0800
90242+};
90243+
90244+/* ACL Subject and Object mode flags */
90245+enum {
90246+ GR_DELETED = 0x80000000
90247+};
90248+
90249+/* ACL Object-only mode flags */
90250+enum {
90251+ GR_READ = 0x00000001,
90252+ GR_APPEND = 0x00000002,
90253+ GR_WRITE = 0x00000004,
90254+ GR_EXEC = 0x00000008,
90255+ GR_FIND = 0x00000010,
90256+ GR_INHERIT = 0x00000020,
90257+ GR_SETID = 0x00000040,
90258+ GR_CREATE = 0x00000080,
90259+ GR_DELETE = 0x00000100,
90260+ GR_LINK = 0x00000200,
90261+ GR_AUDIT_READ = 0x00000400,
90262+ GR_AUDIT_APPEND = 0x00000800,
90263+ GR_AUDIT_WRITE = 0x00001000,
90264+ GR_AUDIT_EXEC = 0x00002000,
90265+ GR_AUDIT_FIND = 0x00004000,
90266+ GR_AUDIT_INHERIT= 0x00008000,
90267+ GR_AUDIT_SETID = 0x00010000,
90268+ GR_AUDIT_CREATE = 0x00020000,
90269+ GR_AUDIT_DELETE = 0x00040000,
90270+ GR_AUDIT_LINK = 0x00080000,
90271+ GR_PTRACERD = 0x00100000,
90272+ GR_NOPTRACE = 0x00200000,
90273+ GR_SUPPRESS = 0x00400000,
90274+ GR_NOLEARN = 0x00800000,
90275+ GR_INIT_TRANSFER= 0x01000000
90276+};
90277+
90278+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
90279+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
90280+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
90281+
90282+/* ACL subject-only mode flags */
90283+enum {
90284+ GR_KILL = 0x00000001,
90285+ GR_VIEW = 0x00000002,
90286+ GR_PROTECTED = 0x00000004,
90287+ GR_LEARN = 0x00000008,
90288+ GR_OVERRIDE = 0x00000010,
90289+ /* just a placeholder, this mode is only used in userspace */
90290+ GR_DUMMY = 0x00000020,
90291+ GR_PROTSHM = 0x00000040,
90292+ GR_KILLPROC = 0x00000080,
90293+ GR_KILLIPPROC = 0x00000100,
90294+ /* just a placeholder, this mode is only used in userspace */
90295+ GR_NOTROJAN = 0x00000200,
90296+ GR_PROTPROCFD = 0x00000400,
90297+ GR_PROCACCT = 0x00000800,
90298+ GR_RELAXPTRACE = 0x00001000,
90299+ //GR_NESTED = 0x00002000,
90300+ GR_INHERITLEARN = 0x00004000,
90301+ GR_PROCFIND = 0x00008000,
90302+ GR_POVERRIDE = 0x00010000,
90303+ GR_KERNELAUTH = 0x00020000,
90304+ GR_ATSECURE = 0x00040000,
90305+ GR_SHMEXEC = 0x00080000
90306+};
90307+
90308+enum {
90309+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
90310+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
90311+ GR_PAX_ENABLE_MPROTECT = 0x0004,
90312+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
90313+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
90314+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
90315+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
90316+ GR_PAX_DISABLE_MPROTECT = 0x0400,
90317+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
90318+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
90319+};
90320+
90321+enum {
90322+ GR_ID_USER = 0x01,
90323+ GR_ID_GROUP = 0x02,
90324+};
90325+
90326+enum {
90327+ GR_ID_ALLOW = 0x01,
90328+ GR_ID_DENY = 0x02,
90329+};
90330+
90331+#define GR_CRASH_RES 31
90332+#define GR_UIDTABLE_MAX 500
90333+
90334+/* begin resource learning section */
90335+enum {
90336+ GR_RLIM_CPU_BUMP = 60,
90337+ GR_RLIM_FSIZE_BUMP = 50000,
90338+ GR_RLIM_DATA_BUMP = 10000,
90339+ GR_RLIM_STACK_BUMP = 1000,
90340+ GR_RLIM_CORE_BUMP = 10000,
90341+ GR_RLIM_RSS_BUMP = 500000,
90342+ GR_RLIM_NPROC_BUMP = 1,
90343+ GR_RLIM_NOFILE_BUMP = 5,
90344+ GR_RLIM_MEMLOCK_BUMP = 50000,
90345+ GR_RLIM_AS_BUMP = 500000,
90346+ GR_RLIM_LOCKS_BUMP = 2,
90347+ GR_RLIM_SIGPENDING_BUMP = 5,
90348+ GR_RLIM_MSGQUEUE_BUMP = 10000,
90349+ GR_RLIM_NICE_BUMP = 1,
90350+ GR_RLIM_RTPRIO_BUMP = 1,
90351+ GR_RLIM_RTTIME_BUMP = 1000000
90352+};
90353+
90354+#endif
90355diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
90356new file mode 100644
90357index 0000000..fb1de5d
90358--- /dev/null
90359+++ b/include/linux/grinternal.h
90360@@ -0,0 +1,230 @@
90361+#ifndef __GRINTERNAL_H
90362+#define __GRINTERNAL_H
90363+
90364+#ifdef CONFIG_GRKERNSEC
90365+
90366+#include <linux/fs.h>
90367+#include <linux/mnt_namespace.h>
90368+#include <linux/nsproxy.h>
90369+#include <linux/gracl.h>
90370+#include <linux/grdefs.h>
90371+#include <linux/grmsg.h>
90372+
90373+void gr_add_learn_entry(const char *fmt, ...)
90374+ __attribute__ ((format (printf, 1, 2)));
90375+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
90376+ const struct vfsmount *mnt);
90377+__u32 gr_check_create(const struct dentry *new_dentry,
90378+ const struct dentry *parent,
90379+ const struct vfsmount *mnt, const __u32 mode);
90380+int gr_check_protected_task(const struct task_struct *task);
90381+__u32 to_gr_audit(const __u32 reqmode);
90382+int gr_set_acls(const int type);
90383+int gr_acl_is_enabled(void);
90384+char gr_roletype_to_char(void);
90385+
90386+void gr_handle_alertkill(struct task_struct *task);
90387+char *gr_to_filename(const struct dentry *dentry,
90388+ const struct vfsmount *mnt);
90389+char *gr_to_filename1(const struct dentry *dentry,
90390+ const struct vfsmount *mnt);
90391+char *gr_to_filename2(const struct dentry *dentry,
90392+ const struct vfsmount *mnt);
90393+char *gr_to_filename3(const struct dentry *dentry,
90394+ const struct vfsmount *mnt);
90395+
90396+extern int grsec_enable_ptrace_readexec;
90397+extern int grsec_enable_harden_ptrace;
90398+extern int grsec_enable_link;
90399+extern int grsec_enable_fifo;
90400+extern int grsec_enable_execve;
90401+extern int grsec_enable_shm;
90402+extern int grsec_enable_execlog;
90403+extern int grsec_enable_signal;
90404+extern int grsec_enable_audit_ptrace;
90405+extern int grsec_enable_forkfail;
90406+extern int grsec_enable_time;
90407+extern int grsec_enable_rofs;
90408+extern int grsec_deny_new_usb;
90409+extern int grsec_enable_chroot_shmat;
90410+extern int grsec_enable_chroot_mount;
90411+extern int grsec_enable_chroot_double;
90412+extern int grsec_enable_chroot_pivot;
90413+extern int grsec_enable_chroot_chdir;
90414+extern int grsec_enable_chroot_chmod;
90415+extern int grsec_enable_chroot_mknod;
90416+extern int grsec_enable_chroot_fchdir;
90417+extern int grsec_enable_chroot_nice;
90418+extern int grsec_enable_chroot_execlog;
90419+extern int grsec_enable_chroot_caps;
90420+extern int grsec_enable_chroot_rename;
90421+extern int grsec_enable_chroot_sysctl;
90422+extern int grsec_enable_chroot_unix;
90423+extern int grsec_enable_symlinkown;
90424+extern kgid_t grsec_symlinkown_gid;
90425+extern int grsec_enable_tpe;
90426+extern kgid_t grsec_tpe_gid;
90427+extern int grsec_enable_tpe_all;
90428+extern int grsec_enable_tpe_invert;
90429+extern int grsec_enable_socket_all;
90430+extern kgid_t grsec_socket_all_gid;
90431+extern int grsec_enable_socket_client;
90432+extern kgid_t grsec_socket_client_gid;
90433+extern int grsec_enable_socket_server;
90434+extern kgid_t grsec_socket_server_gid;
90435+extern kgid_t grsec_audit_gid;
90436+extern int grsec_enable_group;
90437+extern int grsec_enable_log_rwxmaps;
90438+extern int grsec_enable_mount;
90439+extern int grsec_enable_chdir;
90440+extern int grsec_resource_logging;
90441+extern int grsec_enable_blackhole;
90442+extern int grsec_lastack_retries;
90443+extern int grsec_enable_brute;
90444+extern int grsec_enable_harden_ipc;
90445+extern int grsec_lock;
90446+
90447+extern spinlock_t grsec_alert_lock;
90448+extern unsigned long grsec_alert_wtime;
90449+extern unsigned long grsec_alert_fyet;
90450+
90451+extern spinlock_t grsec_audit_lock;
90452+
90453+extern rwlock_t grsec_exec_file_lock;
90454+
90455+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
90456+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
90457+ (tsk)->exec_file->f_path.mnt) : "/")
90458+
90459+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
90460+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
90461+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
90462+
90463+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
90464+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
90465+ (tsk)->exec_file->f_path.mnt) : "/")
90466+
90467+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
90468+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
90469+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
90470+
90471+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
90472+
90473+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
90474+
90475+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
90476+{
90477+ if (file1 && file2) {
90478+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
90479+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
90480+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
90481+ return true;
90482+ }
90483+
90484+ return false;
90485+}
90486+
90487+#define GR_CHROOT_CAPS {{ \
90488+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
90489+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
90490+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
90491+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
90492+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
90493+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
90494+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
90495+
90496+#define security_learn(normal_msg,args...) \
90497+({ \
90498+ read_lock(&grsec_exec_file_lock); \
90499+ gr_add_learn_entry(normal_msg "\n", ## args); \
90500+ read_unlock(&grsec_exec_file_lock); \
90501+})
90502+
90503+enum {
90504+ GR_DO_AUDIT,
90505+ GR_DONT_AUDIT,
90506+ /* used for non-audit messages that we shouldn't kill the task on */
90507+ GR_DONT_AUDIT_GOOD
90508+};
90509+
90510+enum {
90511+ GR_TTYSNIFF,
90512+ GR_RBAC,
90513+ GR_RBAC_STR,
90514+ GR_STR_RBAC,
90515+ GR_RBAC_MODE2,
90516+ GR_RBAC_MODE3,
90517+ GR_FILENAME,
90518+ GR_SYSCTL_HIDDEN,
90519+ GR_NOARGS,
90520+ GR_ONE_INT,
90521+ GR_ONE_INT_TWO_STR,
90522+ GR_ONE_STR,
90523+ GR_STR_INT,
90524+ GR_TWO_STR_INT,
90525+ GR_TWO_INT,
90526+ GR_TWO_U64,
90527+ GR_THREE_INT,
90528+ GR_FIVE_INT_TWO_STR,
90529+ GR_TWO_STR,
90530+ GR_THREE_STR,
90531+ GR_FOUR_STR,
90532+ GR_STR_FILENAME,
90533+ GR_FILENAME_STR,
90534+ GR_FILENAME_TWO_INT,
90535+ GR_FILENAME_TWO_INT_STR,
90536+ GR_TEXTREL,
90537+ GR_PTRACE,
90538+ GR_RESOURCE,
90539+ GR_CAP,
90540+ GR_SIG,
90541+ GR_SIG2,
90542+ GR_CRASH1,
90543+ GR_CRASH2,
90544+ GR_PSACCT,
90545+ GR_RWXMAP,
90546+ GR_RWXMAPVMA
90547+};
90548+
90549+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
90550+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
90551+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
90552+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
90553+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
90554+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
90555+#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)
90556+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
90557+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
90558+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
90559+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
90560+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
90561+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
90562+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
90563+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
90564+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
90565+#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)
90566+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
90567+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
90568+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
90569+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
90570+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
90571+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
90572+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
90573+#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)
90574+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
90575+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
90576+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
90577+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
90578+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
90579+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
90580+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
90581+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
90582+#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)
90583+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
90584+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
90585+
90586+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
90587+
90588+#endif
90589+
90590+#endif
90591diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
90592new file mode 100644
90593index 0000000..26ef560
90594--- /dev/null
90595+++ b/include/linux/grmsg.h
90596@@ -0,0 +1,118 @@
90597+#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"
90598+#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"
90599+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
90600+#define GR_STOPMOD_MSG "denied modification of module state by "
90601+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
90602+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
90603+#define GR_IOPERM_MSG "denied use of ioperm() by "
90604+#define GR_IOPL_MSG "denied use of iopl() by "
90605+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
90606+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
90607+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
90608+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
90609+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
90610+#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"
90611+#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"
90612+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
90613+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
90614+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
90615+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
90616+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
90617+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
90618+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
90619+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
90620+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
90621+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
90622+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
90623+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
90624+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
90625+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
90626+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
90627+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
90628+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
90629+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
90630+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
90631+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
90632+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
90633+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
90634+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
90635+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
90636+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
90637+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
90638+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
90639+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
90640+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
90641+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
90642+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
90643+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
90644+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
90645+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
90646+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
90647+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
90648+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
90649+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
90650+#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"
90651+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
90652+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
90653+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
90654+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
90655+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
90656+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
90657+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
90658+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
90659+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
90660+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
90661+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
90662+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
90663+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
90664+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
90665+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
90666+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
90667+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
90668+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
90669+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
90670+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
90671+#define GR_FAILFORK_MSG "failed fork with errno %s by "
90672+#define GR_NICE_CHROOT_MSG "denied priority change by "
90673+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
90674+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
90675+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
90676+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
90677+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
90678+#define GR_TIME_MSG "time set by "
90679+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
90680+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
90681+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
90682+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
90683+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
90684+#define GR_BIND_MSG "denied bind() by "
90685+#define GR_CONNECT_MSG "denied connect() by "
90686+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
90687+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
90688+#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"
90689+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
90690+#define GR_CAP_ACL_MSG "use of %s denied for "
90691+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
90692+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
90693+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
90694+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
90695+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
90696+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
90697+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
90698+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
90699+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
90700+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
90701+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
90702+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
90703+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
90704+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
90705+#define GR_VM86_MSG "denied use of vm86 by "
90706+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
90707+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
90708+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
90709+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
90710+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
90711+#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 "
90712+#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 "
90713+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
90714+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
90715diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
90716new file mode 100644
90717index 0000000..63c1850
90718--- /dev/null
90719+++ b/include/linux/grsecurity.h
90720@@ -0,0 +1,250 @@
90721+#ifndef GR_SECURITY_H
90722+#define GR_SECURITY_H
90723+#include <linux/fs.h>
90724+#include <linux/fs_struct.h>
90725+#include <linux/binfmts.h>
90726+#include <linux/gracl.h>
90727+
90728+/* notify of brain-dead configs */
90729+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90730+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
90731+#endif
90732+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90733+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
90734+#endif
90735+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
90736+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
90737+#endif
90738+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
90739+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
90740+#endif
90741+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
90742+#error "CONFIG_PAX enabled, but no PaX options are enabled."
90743+#endif
90744+
90745+int gr_handle_new_usb(void);
90746+
90747+void gr_handle_brute_attach(int dumpable);
90748+void gr_handle_brute_check(void);
90749+void gr_handle_kernel_exploit(void);
90750+
90751+char gr_roletype_to_char(void);
90752+
90753+int gr_proc_is_restricted(void);
90754+
90755+int gr_acl_enable_at_secure(void);
90756+
90757+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
90758+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
90759+
90760+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
90761+
90762+void gr_del_task_from_ip_table(struct task_struct *p);
90763+
90764+int gr_pid_is_chrooted(struct task_struct *p);
90765+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
90766+int gr_handle_chroot_nice(void);
90767+int gr_handle_chroot_sysctl(const int op);
90768+int gr_handle_chroot_setpriority(struct task_struct *p,
90769+ const int niceval);
90770+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
90771+int gr_chroot_fhandle(void);
90772+int gr_handle_chroot_chroot(const struct dentry *dentry,
90773+ const struct vfsmount *mnt);
90774+void gr_handle_chroot_chdir(const struct path *path);
90775+int gr_handle_chroot_chmod(const struct dentry *dentry,
90776+ const struct vfsmount *mnt, const int mode);
90777+int gr_handle_chroot_mknod(const struct dentry *dentry,
90778+ const struct vfsmount *mnt, const int mode);
90779+int gr_handle_chroot_mount(const struct dentry *dentry,
90780+ const struct vfsmount *mnt,
90781+ const char *dev_name);
90782+int gr_handle_chroot_pivot(void);
90783+int gr_handle_chroot_unix(const pid_t pid);
90784+
90785+int gr_handle_rawio(const struct inode *inode);
90786+
90787+void gr_handle_ioperm(void);
90788+void gr_handle_iopl(void);
90789+void gr_handle_msr_write(void);
90790+
90791+umode_t gr_acl_umask(void);
90792+
90793+int gr_tpe_allow(const struct file *file);
90794+
90795+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
90796+void gr_clear_chroot_entries(struct task_struct *task);
90797+
90798+void gr_log_forkfail(const int retval);
90799+void gr_log_timechange(void);
90800+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
90801+void gr_log_chdir(const struct dentry *dentry,
90802+ const struct vfsmount *mnt);
90803+void gr_log_chroot_exec(const struct dentry *dentry,
90804+ const struct vfsmount *mnt);
90805+void gr_log_remount(const char *devname, const int retval);
90806+void gr_log_unmount(const char *devname, const int retval);
90807+void gr_log_mount(const char *from, struct path *to, const int retval);
90808+void gr_log_textrel(struct vm_area_struct *vma);
90809+void gr_log_ptgnustack(struct file *file);
90810+void gr_log_rwxmmap(struct file *file);
90811+void gr_log_rwxmprotect(struct vm_area_struct *vma);
90812+
90813+int gr_handle_follow_link(const struct inode *parent,
90814+ const struct inode *inode,
90815+ const struct dentry *dentry,
90816+ const struct vfsmount *mnt);
90817+int gr_handle_fifo(const struct dentry *dentry,
90818+ const struct vfsmount *mnt,
90819+ const struct dentry *dir, const int flag,
90820+ const int acc_mode);
90821+int gr_handle_hardlink(const struct dentry *dentry,
90822+ const struct vfsmount *mnt,
90823+ struct inode *inode,
90824+ const int mode, const struct filename *to);
90825+
90826+int gr_is_capable(const int cap);
90827+int gr_is_capable_nolog(const int cap);
90828+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
90829+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
90830+
90831+void gr_copy_label(struct task_struct *tsk);
90832+void gr_handle_crash(struct task_struct *task, const int sig);
90833+int gr_handle_signal(const struct task_struct *p, const int sig);
90834+int gr_check_crash_uid(const kuid_t uid);
90835+int gr_check_protected_task(const struct task_struct *task);
90836+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
90837+int gr_acl_handle_mmap(const struct file *file,
90838+ const unsigned long prot);
90839+int gr_acl_handle_mprotect(const struct file *file,
90840+ const unsigned long prot);
90841+int gr_check_hidden_task(const struct task_struct *tsk);
90842+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
90843+ const struct vfsmount *mnt);
90844+__u32 gr_acl_handle_utime(const struct dentry *dentry,
90845+ const struct vfsmount *mnt);
90846+__u32 gr_acl_handle_access(const struct dentry *dentry,
90847+ const struct vfsmount *mnt, const int fmode);
90848+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
90849+ const struct vfsmount *mnt, umode_t *mode);
90850+__u32 gr_acl_handle_chown(const struct dentry *dentry,
90851+ const struct vfsmount *mnt);
90852+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
90853+ const struct vfsmount *mnt);
90854+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
90855+ const struct vfsmount *mnt);
90856+int gr_handle_ptrace(struct task_struct *task, const long request);
90857+int gr_handle_proc_ptrace(struct task_struct *task);
90858+__u32 gr_acl_handle_execve(const struct dentry *dentry,
90859+ const struct vfsmount *mnt);
90860+int gr_check_crash_exec(const struct file *filp);
90861+int gr_acl_is_enabled(void);
90862+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
90863+ const kgid_t gid);
90864+int gr_set_proc_label(const struct dentry *dentry,
90865+ const struct vfsmount *mnt,
90866+ const int unsafe_flags);
90867+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
90868+ const struct vfsmount *mnt);
90869+__u32 gr_acl_handle_open(const struct dentry *dentry,
90870+ const struct vfsmount *mnt, int acc_mode);
90871+__u32 gr_acl_handle_creat(const struct dentry *dentry,
90872+ const struct dentry *p_dentry,
90873+ const struct vfsmount *p_mnt,
90874+ int open_flags, int acc_mode, const int imode);
90875+void gr_handle_create(const struct dentry *dentry,
90876+ const struct vfsmount *mnt);
90877+void gr_handle_proc_create(const struct dentry *dentry,
90878+ const struct inode *inode);
90879+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
90880+ const struct dentry *parent_dentry,
90881+ const struct vfsmount *parent_mnt,
90882+ const int mode);
90883+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
90884+ const struct dentry *parent_dentry,
90885+ const struct vfsmount *parent_mnt);
90886+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
90887+ const struct vfsmount *mnt);
90888+void gr_handle_delete(const u64 ino, const dev_t dev);
90889+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
90890+ const struct vfsmount *mnt);
90891+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
90892+ const struct dentry *parent_dentry,
90893+ const struct vfsmount *parent_mnt,
90894+ const struct filename *from);
90895+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
90896+ const struct dentry *parent_dentry,
90897+ const struct vfsmount *parent_mnt,
90898+ const struct dentry *old_dentry,
90899+ const struct vfsmount *old_mnt, const struct filename *to);
90900+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
90901+int gr_acl_handle_rename(struct dentry *new_dentry,
90902+ struct dentry *parent_dentry,
90903+ const struct vfsmount *parent_mnt,
90904+ struct dentry *old_dentry,
90905+ struct inode *old_parent_inode,
90906+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
90907+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
90908+ struct dentry *old_dentry,
90909+ struct dentry *new_dentry,
90910+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
90911+__u32 gr_check_link(const struct dentry *new_dentry,
90912+ const struct dentry *parent_dentry,
90913+ const struct vfsmount *parent_mnt,
90914+ const struct dentry *old_dentry,
90915+ const struct vfsmount *old_mnt);
90916+int gr_acl_handle_filldir(const struct file *file, const char *name,
90917+ const unsigned int namelen, const u64 ino);
90918+
90919+__u32 gr_acl_handle_unix(const struct dentry *dentry,
90920+ const struct vfsmount *mnt);
90921+void gr_acl_handle_exit(void);
90922+void gr_acl_handle_psacct(struct task_struct *task, const long code);
90923+int gr_acl_handle_procpidmem(const struct task_struct *task);
90924+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
90925+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
90926+void gr_audit_ptrace(struct task_struct *task);
90927+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
90928+u64 gr_get_ino_from_dentry(struct dentry *dentry);
90929+void gr_put_exec_file(struct task_struct *task);
90930+
90931+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
90932+
90933+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
90934+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
90935+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
90936+ struct dentry *newdentry, struct vfsmount *newmnt);
90937+
90938+#ifdef CONFIG_GRKERNSEC_RESLOG
90939+extern void gr_log_resource(const struct task_struct *task, const int res,
90940+ const unsigned long wanted, const int gt);
90941+#else
90942+static inline void gr_log_resource(const struct task_struct *task, const int res,
90943+ const unsigned long wanted, const int gt)
90944+{
90945+}
90946+#endif
90947+
90948+#ifdef CONFIG_GRKERNSEC
90949+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
90950+void gr_handle_vm86(void);
90951+void gr_handle_mem_readwrite(u64 from, u64 to);
90952+
90953+void gr_log_badprocpid(const char *entry);
90954+
90955+extern int grsec_enable_dmesg;
90956+extern int grsec_disable_privio;
90957+
90958+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
90959+extern kgid_t grsec_proc_gid;
90960+#endif
90961+
90962+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90963+extern int grsec_enable_chroot_findtask;
90964+#endif
90965+#ifdef CONFIG_GRKERNSEC_SETXID
90966+extern int grsec_enable_setxid;
90967+#endif
90968+#endif
90969+
90970+#endif
90971diff --git a/include/linux/grsock.h b/include/linux/grsock.h
90972new file mode 100644
90973index 0000000..e7ffaaf
90974--- /dev/null
90975+++ b/include/linux/grsock.h
90976@@ -0,0 +1,19 @@
90977+#ifndef __GRSOCK_H
90978+#define __GRSOCK_H
90979+
90980+extern void gr_attach_curr_ip(const struct sock *sk);
90981+extern int gr_handle_sock_all(const int family, const int type,
90982+ const int protocol);
90983+extern int gr_handle_sock_server(const struct sockaddr *sck);
90984+extern int gr_handle_sock_server_other(const struct sock *sck);
90985+extern int gr_handle_sock_client(const struct sockaddr *sck);
90986+extern int gr_search_connect(struct socket * sock,
90987+ struct sockaddr_in * addr);
90988+extern int gr_search_bind(struct socket * sock,
90989+ struct sockaddr_in * addr);
90990+extern int gr_search_listen(struct socket * sock);
90991+extern int gr_search_accept(struct socket * sock);
90992+extern int gr_search_socket(const int domain, const int type,
90993+ const int protocol);
90994+
90995+#endif
90996diff --git a/include/linux/highmem.h b/include/linux/highmem.h
90997index 9286a46..373f27f 100644
90998--- a/include/linux/highmem.h
90999+++ b/include/linux/highmem.h
91000@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
91001 kunmap_atomic(kaddr);
91002 }
91003
91004+static inline void sanitize_highpage(struct page *page)
91005+{
91006+ void *kaddr;
91007+ unsigned long flags;
91008+
91009+ local_irq_save(flags);
91010+ kaddr = kmap_atomic(page);
91011+ clear_page(kaddr);
91012+ kunmap_atomic(kaddr);
91013+ local_irq_restore(flags);
91014+}
91015+
91016 static inline void zero_user_segments(struct page *page,
91017 unsigned start1, unsigned end1,
91018 unsigned start2, unsigned end2)
91019diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
91020index 1c7b89a..7dda400 100644
91021--- a/include/linux/hwmon-sysfs.h
91022+++ b/include/linux/hwmon-sysfs.h
91023@@ -25,7 +25,8 @@
91024 struct sensor_device_attribute{
91025 struct device_attribute dev_attr;
91026 int index;
91027-};
91028+} __do_const;
91029+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
91030 #define to_sensor_dev_attr(_dev_attr) \
91031 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
91032
91033@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
91034 struct device_attribute dev_attr;
91035 u8 index;
91036 u8 nr;
91037-};
91038+} __do_const;
91039+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
91040 #define to_sensor_dev_attr_2(_dev_attr) \
91041 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
91042
91043diff --git a/include/linux/i2c.h b/include/linux/i2c.h
91044index f17da50..2f8b203 100644
91045--- a/include/linux/i2c.h
91046+++ b/include/linux/i2c.h
91047@@ -409,6 +409,7 @@ struct i2c_algorithm {
91048 int (*unreg_slave)(struct i2c_client *client);
91049 #endif
91050 };
91051+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
91052
91053 /**
91054 * struct i2c_bus_recovery_info - I2C bus recovery information
91055diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
91056index aff7ad8..3942bbd 100644
91057--- a/include/linux/if_pppox.h
91058+++ b/include/linux/if_pppox.h
91059@@ -76,7 +76,7 @@ struct pppox_proto {
91060 int (*ioctl)(struct socket *sock, unsigned int cmd,
91061 unsigned long arg);
91062 struct module *owner;
91063-};
91064+} __do_const;
91065
91066 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
91067 extern void unregister_pppox_proto(int proto_num);
91068diff --git a/include/linux/init.h b/include/linux/init.h
91069index 2df8e8d..3e1280d 100644
91070--- a/include/linux/init.h
91071+++ b/include/linux/init.h
91072@@ -37,9 +37,17 @@
91073 * section.
91074 */
91075
91076+#define add_init_latent_entropy __latent_entropy
91077+
91078+#ifdef CONFIG_MEMORY_HOTPLUG
91079+#define add_meminit_latent_entropy
91080+#else
91081+#define add_meminit_latent_entropy __latent_entropy
91082+#endif
91083+
91084 /* These are for everybody (although not all archs will actually
91085 discard it in modules) */
91086-#define __init __section(.init.text) __cold notrace
91087+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
91088 #define __initdata __section(.init.data)
91089 #define __initconst __constsection(.init.rodata)
91090 #define __exitdata __section(.exit.data)
91091@@ -100,7 +108,7 @@
91092 #define __cpuexitconst
91093
91094 /* Used for MEMORY_HOTPLUG */
91095-#define __meminit __section(.meminit.text) __cold notrace
91096+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
91097 #define __meminitdata __section(.meminit.data)
91098 #define __meminitconst __constsection(.meminit.rodata)
91099 #define __memexit __section(.memexit.text) __exitused __cold notrace
91100diff --git a/include/linux/init_task.h b/include/linux/init_task.h
91101index 696d223..6d6b39f 100644
91102--- a/include/linux/init_task.h
91103+++ b/include/linux/init_task.h
91104@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
91105
91106 #define INIT_TASK_COMM "swapper"
91107
91108+#ifdef CONFIG_X86
91109+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
91110+#else
91111+#define INIT_TASK_THREAD_INFO
91112+#endif
91113+
91114 #ifdef CONFIG_RT_MUTEXES
91115 # define INIT_RT_MUTEXES(tsk) \
91116 .pi_waiters = RB_ROOT, \
91117@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
91118 RCU_POINTER_INITIALIZER(cred, &init_cred), \
91119 .comm = INIT_TASK_COMM, \
91120 .thread = INIT_THREAD, \
91121+ INIT_TASK_THREAD_INFO \
91122 .fs = &init_fs, \
91123 .files = &init_files, \
91124 .signal = &init_signals, \
91125diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
91126index 2e88580..f6a99a0 100644
91127--- a/include/linux/interrupt.h
91128+++ b/include/linux/interrupt.h
91129@@ -420,8 +420,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
91130
91131 struct softirq_action
91132 {
91133- void (*action)(struct softirq_action *);
91134-};
91135+ void (*action)(void);
91136+} __no_const;
91137
91138 asmlinkage void do_softirq(void);
91139 asmlinkage void __do_softirq(void);
91140@@ -435,7 +435,7 @@ static inline void do_softirq_own_stack(void)
91141 }
91142 #endif
91143
91144-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
91145+extern void open_softirq(int nr, void (*action)(void));
91146 extern void softirq_init(void);
91147 extern void __raise_softirq_irqoff(unsigned int nr);
91148
91149diff --git a/include/linux/iommu.h b/include/linux/iommu.h
91150index 38daa45..4de4317 100644
91151--- a/include/linux/iommu.h
91152+++ b/include/linux/iommu.h
91153@@ -147,7 +147,7 @@ struct iommu_ops {
91154
91155 unsigned long pgsize_bitmap;
91156 void *priv;
91157-};
91158+} __do_const;
91159
91160 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
91161 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
91162diff --git a/include/linux/ioport.h b/include/linux/ioport.h
91163index 2c525022..345b106 100644
91164--- a/include/linux/ioport.h
91165+++ b/include/linux/ioport.h
91166@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
91167 int adjust_resource(struct resource *res, resource_size_t start,
91168 resource_size_t size);
91169 resource_size_t resource_alignment(struct resource *res);
91170-static inline resource_size_t resource_size(const struct resource *res)
91171+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
91172 {
91173 return res->end - res->start + 1;
91174 }
91175diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
91176index 1eee6bc..9cf4912 100644
91177--- a/include/linux/ipc_namespace.h
91178+++ b/include/linux/ipc_namespace.h
91179@@ -60,7 +60,7 @@ struct ipc_namespace {
91180 struct user_namespace *user_ns;
91181
91182 struct ns_common ns;
91183-};
91184+} __randomize_layout;
91185
91186 extern struct ipc_namespace init_ipc_ns;
91187 extern atomic_t nr_ipc_ns;
91188diff --git a/include/linux/irq.h b/include/linux/irq.h
91189index d09ec7a..f373eb5 100644
91190--- a/include/linux/irq.h
91191+++ b/include/linux/irq.h
91192@@ -364,7 +364,8 @@ struct irq_chip {
91193 void (*irq_write_msi_msg)(struct irq_data *data, struct msi_msg *msg);
91194
91195 unsigned long flags;
91196-};
91197+} __do_const;
91198+typedef struct irq_chip __no_const irq_chip_no_const;
91199
91200 /*
91201 * irq_chip specific flags
91202diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
91203index 71d706d..817cdec 100644
91204--- a/include/linux/irqchip/arm-gic.h
91205+++ b/include/linux/irqchip/arm-gic.h
91206@@ -95,7 +95,7 @@
91207
91208 struct device_node;
91209
91210-extern struct irq_chip gic_arch_extn;
91211+extern irq_chip_no_const gic_arch_extn;
91212
91213 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
91214 u32 offset, struct device_node *);
91215diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
91216index dd1109f..4f4fdda 100644
91217--- a/include/linux/irqdesc.h
91218+++ b/include/linux/irqdesc.h
91219@@ -61,7 +61,7 @@ struct irq_desc {
91220 unsigned int irq_count; /* For detecting broken IRQs */
91221 unsigned long last_unhandled; /* Aging timer for unhandled count */
91222 unsigned int irqs_unhandled;
91223- atomic_t threads_handled;
91224+ atomic_unchecked_t threads_handled;
91225 int threads_handled_last;
91226 raw_spinlock_t lock;
91227 struct cpumask *percpu_enabled;
91228diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
91229index 676d730..8d3a1ad 100644
91230--- a/include/linux/irqdomain.h
91231+++ b/include/linux/irqdomain.h
91232@@ -40,6 +40,7 @@ struct device_node;
91233 struct irq_domain;
91234 struct of_device_id;
91235 struct irq_chip;
91236+typedef struct irq_chip __no_const irq_chip_no_const;
91237 struct irq_data;
91238
91239 /* Number of irqs reserved for a legacy isa controller */
91240diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
91241index c367cbd..c9b79e6 100644
91242--- a/include/linux/jiffies.h
91243+++ b/include/linux/jiffies.h
91244@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
91245 /*
91246 * Convert various time units to each other:
91247 */
91248-extern unsigned int jiffies_to_msecs(const unsigned long j);
91249-extern unsigned int jiffies_to_usecs(const unsigned long j);
91250+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
91251+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
91252
91253-static inline u64 jiffies_to_nsecs(const unsigned long j)
91254+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
91255 {
91256 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
91257 }
91258
91259-extern unsigned long msecs_to_jiffies(const unsigned int m);
91260-extern unsigned long usecs_to_jiffies(const unsigned int u);
91261+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
91262+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
91263 extern unsigned long timespec_to_jiffies(const struct timespec *value);
91264 extern void jiffies_to_timespec(const unsigned long jiffies,
91265- struct timespec *value);
91266-extern unsigned long timeval_to_jiffies(const struct timeval *value);
91267+ struct timespec *value) __intentional_overflow(-1);
91268+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
91269 extern void jiffies_to_timeval(const unsigned long jiffies,
91270 struct timeval *value);
91271
91272diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
91273index 6883e19..e854fcb 100644
91274--- a/include/linux/kallsyms.h
91275+++ b/include/linux/kallsyms.h
91276@@ -15,7 +15,8 @@
91277
91278 struct module;
91279
91280-#ifdef CONFIG_KALLSYMS
91281+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
91282+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
91283 /* Lookup the address for a symbol. Returns 0 if not found. */
91284 unsigned long kallsyms_lookup_name(const char *name);
91285
91286@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
91287 /* Stupid that this does nothing, but I didn't create this mess. */
91288 #define __print_symbol(fmt, addr)
91289 #endif /*CONFIG_KALLSYMS*/
91290+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
91291+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
91292+extern unsigned long kallsyms_lookup_name(const char *name);
91293+extern void __print_symbol(const char *fmt, unsigned long address);
91294+extern int sprint_backtrace(char *buffer, unsigned long address);
91295+extern int sprint_symbol(char *buffer, unsigned long address);
91296+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
91297+const char *kallsyms_lookup(unsigned long addr,
91298+ unsigned long *symbolsize,
91299+ unsigned long *offset,
91300+ char **modname, char *namebuf);
91301+extern int kallsyms_lookup_size_offset(unsigned long addr,
91302+ unsigned long *symbolsize,
91303+ unsigned long *offset);
91304+#endif
91305
91306 /* This macro allows us to keep printk typechecking */
91307 static __printf(1, 2)
91308diff --git a/include/linux/kernel.h b/include/linux/kernel.h
91309index d6d630d..feea1f5 100644
91310--- a/include/linux/kernel.h
91311+++ b/include/linux/kernel.h
91312@@ -378,7 +378,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
91313 /* Obsolete, do not use. Use kstrto<foo> instead */
91314
91315 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
91316-extern long simple_strtol(const char *,char **,unsigned int);
91317+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
91318 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
91319 extern long long simple_strtoll(const char *,char **,unsigned int);
91320
91321diff --git a/include/linux/key-type.h b/include/linux/key-type.h
91322index ff9f1d3..6712be5 100644
91323--- a/include/linux/key-type.h
91324+++ b/include/linux/key-type.h
91325@@ -152,7 +152,7 @@ struct key_type {
91326 /* internal fields */
91327 struct list_head link; /* link in types list */
91328 struct lock_class_key lock_class; /* key->sem lock class */
91329-};
91330+} __do_const;
91331
91332 extern struct key_type key_type_keyring;
91333
91334diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
91335index e465bb1..19f605fd 100644
91336--- a/include/linux/kgdb.h
91337+++ b/include/linux/kgdb.h
91338@@ -52,7 +52,7 @@ extern int kgdb_connected;
91339 extern int kgdb_io_module_registered;
91340
91341 extern atomic_t kgdb_setting_breakpoint;
91342-extern atomic_t kgdb_cpu_doing_single_step;
91343+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
91344
91345 extern struct task_struct *kgdb_usethread;
91346 extern struct task_struct *kgdb_contthread;
91347@@ -254,7 +254,7 @@ struct kgdb_arch {
91348 void (*correct_hw_break)(void);
91349
91350 void (*enable_nmi)(bool on);
91351-};
91352+} __do_const;
91353
91354 /**
91355 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
91356@@ -279,7 +279,7 @@ struct kgdb_io {
91357 void (*pre_exception) (void);
91358 void (*post_exception) (void);
91359 int is_console;
91360-};
91361+} __do_const;
91362
91363 extern struct kgdb_arch arch_kgdb_ops;
91364
91365diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
91366index e705467..a92471d 100644
91367--- a/include/linux/kmemleak.h
91368+++ b/include/linux/kmemleak.h
91369@@ -27,7 +27,7 @@
91370
91371 extern void kmemleak_init(void) __ref;
91372 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
91373- gfp_t gfp) __ref;
91374+ gfp_t gfp) __ref __size_overflow(2);
91375 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size) __ref;
91376 extern void kmemleak_free(const void *ptr) __ref;
91377 extern void kmemleak_free_part(const void *ptr, size_t size) __ref;
91378@@ -62,7 +62,7 @@ static inline void kmemleak_erase(void **ptr)
91379 static inline void kmemleak_init(void)
91380 {
91381 }
91382-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
91383+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
91384 gfp_t gfp)
91385 {
91386 }
91387diff --git a/include/linux/kmod.h b/include/linux/kmod.h
91388index 0555cc6..40116ce 100644
91389--- a/include/linux/kmod.h
91390+++ b/include/linux/kmod.h
91391@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
91392 * usually useless though. */
91393 extern __printf(2, 3)
91394 int __request_module(bool wait, const char *name, ...);
91395+extern __printf(3, 4)
91396+int ___request_module(bool wait, char *param_name, const char *name, ...);
91397 #define request_module(mod...) __request_module(true, mod)
91398 #define request_module_nowait(mod...) __request_module(false, mod)
91399 #define try_then_request_module(x, mod...) \
91400@@ -57,6 +59,9 @@ struct subprocess_info {
91401 struct work_struct work;
91402 struct completion *complete;
91403 char *path;
91404+#ifdef CONFIG_GRKERNSEC
91405+ char *origpath;
91406+#endif
91407 char **argv;
91408 char **envp;
91409 int wait;
91410diff --git a/include/linux/kobject.h b/include/linux/kobject.h
91411index 2d61b90..a1d0a13 100644
91412--- a/include/linux/kobject.h
91413+++ b/include/linux/kobject.h
91414@@ -118,7 +118,7 @@ struct kobj_type {
91415 struct attribute **default_attrs;
91416 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
91417 const void *(*namespace)(struct kobject *kobj);
91418-};
91419+} __do_const;
91420
91421 struct kobj_uevent_env {
91422 char *argv[3];
91423@@ -142,6 +142,7 @@ struct kobj_attribute {
91424 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
91425 const char *buf, size_t count);
91426 };
91427+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
91428
91429 extern const struct sysfs_ops kobj_sysfs_ops;
91430
91431@@ -169,7 +170,7 @@ struct kset {
91432 spinlock_t list_lock;
91433 struct kobject kobj;
91434 const struct kset_uevent_ops *uevent_ops;
91435-};
91436+} __randomize_layout;
91437
91438 extern void kset_init(struct kset *kset);
91439 extern int __must_check kset_register(struct kset *kset);
91440diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
91441index df32d25..fb52e27 100644
91442--- a/include/linux/kobject_ns.h
91443+++ b/include/linux/kobject_ns.h
91444@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
91445 const void *(*netlink_ns)(struct sock *sk);
91446 const void *(*initial_ns)(void);
91447 void (*drop_ns)(void *);
91448-};
91449+} __do_const;
91450
91451 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
91452 int kobj_ns_type_registered(enum kobj_ns_type type);
91453diff --git a/include/linux/kref.h b/include/linux/kref.h
91454index 484604d..0f6c5b6 100644
91455--- a/include/linux/kref.h
91456+++ b/include/linux/kref.h
91457@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
91458 static inline int kref_sub(struct kref *kref, unsigned int count,
91459 void (*release)(struct kref *kref))
91460 {
91461- WARN_ON(release == NULL);
91462+ BUG_ON(release == NULL);
91463
91464 if (atomic_sub_and_test((int) count, &kref->refcount)) {
91465 release(kref);
91466diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
91467index d12b210..d91fd76 100644
91468--- a/include/linux/kvm_host.h
91469+++ b/include/linux/kvm_host.h
91470@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
91471 {
91472 }
91473 #endif
91474-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
91475+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
91476 struct module *module);
91477 void kvm_exit(void);
91478
91479@@ -633,7 +633,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
91480 struct kvm_guest_debug *dbg);
91481 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
91482
91483-int kvm_arch_init(void *opaque);
91484+int kvm_arch_init(const void *opaque);
91485 void kvm_arch_exit(void);
91486
91487 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
91488diff --git a/include/linux/libata.h b/include/linux/libata.h
91489index f8994b4..c1dec7a 100644
91490--- a/include/linux/libata.h
91491+++ b/include/linux/libata.h
91492@@ -989,7 +989,7 @@ struct ata_port_operations {
91493 * fields must be pointers.
91494 */
91495 const struct ata_port_operations *inherits;
91496-};
91497+} __do_const;
91498
91499 struct ata_port_info {
91500 unsigned long flags;
91501diff --git a/include/linux/linkage.h b/include/linux/linkage.h
91502index a6a42dd..6c5ebce 100644
91503--- a/include/linux/linkage.h
91504+++ b/include/linux/linkage.h
91505@@ -36,6 +36,7 @@
91506 #endif
91507
91508 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
91509+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
91510 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
91511
91512 /*
91513diff --git a/include/linux/list.h b/include/linux/list.h
91514index feb773c..98f3075 100644
91515--- a/include/linux/list.h
91516+++ b/include/linux/list.h
91517@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
91518 extern void list_del(struct list_head *entry);
91519 #endif
91520
91521+extern void __pax_list_add(struct list_head *new,
91522+ struct list_head *prev,
91523+ struct list_head *next);
91524+static inline void pax_list_add(struct list_head *new, struct list_head *head)
91525+{
91526+ __pax_list_add(new, head, head->next);
91527+}
91528+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
91529+{
91530+ __pax_list_add(new, head->prev, head);
91531+}
91532+extern void pax_list_del(struct list_head *entry);
91533+
91534 /**
91535 * list_replace - replace old entry by new one
91536 * @old : the element to be replaced
91537@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
91538 INIT_LIST_HEAD(entry);
91539 }
91540
91541+extern void pax_list_del_init(struct list_head *entry);
91542+
91543 /**
91544 * list_move - delete from one list and add as another's head
91545 * @list: the entry to move
91546diff --git a/include/linux/lockref.h b/include/linux/lockref.h
91547index b10b122..d37b3de 100644
91548--- a/include/linux/lockref.h
91549+++ b/include/linux/lockref.h
91550@@ -28,7 +28,7 @@ struct lockref {
91551 #endif
91552 struct {
91553 spinlock_t lock;
91554- int count;
91555+ atomic_t count;
91556 };
91557 };
91558 };
91559@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
91560 extern int lockref_get_not_dead(struct lockref *);
91561
91562 /* Must be called under spinlock for reliable results */
91563-static inline int __lockref_is_dead(const struct lockref *l)
91564+static inline int __lockref_is_dead(const struct lockref *lockref)
91565 {
91566- return ((int)l->count < 0);
91567+ return atomic_read(&lockref->count) < 0;
91568+}
91569+
91570+static inline int __lockref_read(const struct lockref *lockref)
91571+{
91572+ return atomic_read(&lockref->count);
91573+}
91574+
91575+static inline void __lockref_set(struct lockref *lockref, int count)
91576+{
91577+ atomic_set(&lockref->count, count);
91578+}
91579+
91580+static inline void __lockref_inc(struct lockref *lockref)
91581+{
91582+ atomic_inc(&lockref->count);
91583+}
91584+
91585+static inline void __lockref_dec(struct lockref *lockref)
91586+{
91587+ atomic_dec(&lockref->count);
91588 }
91589
91590 #endif /* __LINUX_LOCKREF_H */
91591diff --git a/include/linux/math64.h b/include/linux/math64.h
91592index c45c089..298841c 100644
91593--- a/include/linux/math64.h
91594+++ b/include/linux/math64.h
91595@@ -15,7 +15,7 @@
91596 * This is commonly provided by 32bit archs to provide an optimized 64bit
91597 * divide.
91598 */
91599-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91600+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91601 {
91602 *remainder = dividend % divisor;
91603 return dividend / divisor;
91604@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
91605 /**
91606 * div64_u64 - unsigned 64bit divide with 64bit divisor
91607 */
91608-static inline u64 div64_u64(u64 dividend, u64 divisor)
91609+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
91610 {
91611 return dividend / divisor;
91612 }
91613@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
91614 #define div64_ul(x, y) div_u64((x), (y))
91615
91616 #ifndef div_u64_rem
91617-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91618+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91619 {
91620 *remainder = do_div(dividend, divisor);
91621 return dividend;
91622@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
91623 #endif
91624
91625 #ifndef div64_u64
91626-extern u64 div64_u64(u64 dividend, u64 divisor);
91627+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
91628 #endif
91629
91630 #ifndef div64_s64
91631@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
91632 * divide.
91633 */
91634 #ifndef div_u64
91635-static inline u64 div_u64(u64 dividend, u32 divisor)
91636+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
91637 {
91638 u32 remainder;
91639 return div_u64_rem(dividend, divisor, &remainder);
91640diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
91641index 3d385c8..deacb6a 100644
91642--- a/include/linux/mempolicy.h
91643+++ b/include/linux/mempolicy.h
91644@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
91645 }
91646
91647 #define vma_policy(vma) ((vma)->vm_policy)
91648+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
91649+{
91650+ vma->vm_policy = pol;
91651+}
91652
91653 static inline void mpol_get(struct mempolicy *pol)
91654 {
91655@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
91656 }
91657
91658 #define vma_policy(vma) NULL
91659+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
91660+{
91661+}
91662
91663 static inline int
91664 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
91665diff --git a/include/linux/mm.h b/include/linux/mm.h
91666index 47a9392..ef645bc 100644
91667--- a/include/linux/mm.h
91668+++ b/include/linux/mm.h
91669@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
91670
91671 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
91672 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
91673+
91674+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
91675+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
91676+#endif
91677+
91678 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
91679 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
91680 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
91681@@ -254,8 +259,8 @@ struct vm_operations_struct {
91682 /* called by access_process_vm when get_user_pages() fails, typically
91683 * for use by special VMAs that can switch between memory and hardware
91684 */
91685- int (*access)(struct vm_area_struct *vma, unsigned long addr,
91686- void *buf, int len, int write);
91687+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
91688+ void *buf, size_t len, int write);
91689
91690 /* Called by the /proc/PID/maps code to ask the vma whether it
91691 * has a special name. Returning non-NULL will also cause this
91692@@ -293,6 +298,7 @@ struct vm_operations_struct {
91693 struct page *(*find_special_page)(struct vm_area_struct *vma,
91694 unsigned long addr);
91695 };
91696+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
91697
91698 struct mmu_gather;
91699 struct inode;
91700@@ -1213,8 +1219,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
91701 unsigned long *pfn);
91702 int follow_phys(struct vm_area_struct *vma, unsigned long address,
91703 unsigned int flags, unsigned long *prot, resource_size_t *phys);
91704-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
91705- void *buf, int len, int write);
91706+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
91707+ void *buf, size_t len, int write);
91708
91709 static inline void unmap_shared_mapping_range(struct address_space *mapping,
91710 loff_t const holebegin, loff_t const holelen)
91711@@ -1254,9 +1260,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
91712 }
91713 #endif
91714
91715-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
91716-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
91717- void *buf, int len, int write);
91718+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
91719+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
91720+ void *buf, size_t len, int write);
91721
91722 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
91723 unsigned long start, unsigned long nr_pages,
91724@@ -1299,34 +1305,6 @@ int set_page_dirty_lock(struct page *page);
91725 int clear_page_dirty_for_io(struct page *page);
91726 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
91727
91728-/* Is the vma a continuation of the stack vma above it? */
91729-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
91730-{
91731- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
91732-}
91733-
91734-static inline int stack_guard_page_start(struct vm_area_struct *vma,
91735- unsigned long addr)
91736-{
91737- return (vma->vm_flags & VM_GROWSDOWN) &&
91738- (vma->vm_start == addr) &&
91739- !vma_growsdown(vma->vm_prev, addr);
91740-}
91741-
91742-/* Is the vma a continuation of the stack vma below it? */
91743-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
91744-{
91745- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
91746-}
91747-
91748-static inline int stack_guard_page_end(struct vm_area_struct *vma,
91749- unsigned long addr)
91750-{
91751- return (vma->vm_flags & VM_GROWSUP) &&
91752- (vma->vm_end == addr) &&
91753- !vma_growsup(vma->vm_next, addr);
91754-}
91755-
91756 extern struct task_struct *task_of_stack(struct task_struct *task,
91757 struct vm_area_struct *vma, bool in_group);
91758
91759@@ -1449,8 +1427,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
91760 {
91761 return 0;
91762 }
91763+
91764+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
91765+ unsigned long address)
91766+{
91767+ return 0;
91768+}
91769 #else
91770 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
91771+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
91772 #endif
91773
91774 #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
91775@@ -1460,6 +1445,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
91776 return 0;
91777 }
91778
91779+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
91780+ unsigned long address)
91781+{
91782+ return 0;
91783+}
91784+
91785 static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
91786
91787 static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
91788@@ -1472,6 +1463,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
91789
91790 #else
91791 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
91792+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
91793
91794 static inline void mm_nr_pmds_init(struct mm_struct *mm)
91795 {
91796@@ -1509,11 +1501,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
91797 NULL: pud_offset(pgd, address);
91798 }
91799
91800+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
91801+{
91802+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
91803+ NULL: pud_offset(pgd, address);
91804+}
91805+
91806 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
91807 {
91808 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
91809 NULL: pmd_offset(pud, address);
91810 }
91811+
91812+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
91813+{
91814+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
91815+ NULL: pmd_offset(pud, address);
91816+}
91817 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
91818
91819 #if USE_SPLIT_PTE_PTLOCKS
91820@@ -1890,12 +1894,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
91821 bool *need_rmap_locks);
91822 extern void exit_mmap(struct mm_struct *);
91823
91824+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
91825+extern void gr_learn_resource(const struct task_struct *task, const int res,
91826+ const unsigned long wanted, const int gt);
91827+#else
91828+static inline void gr_learn_resource(const struct task_struct *task, const int res,
91829+ const unsigned long wanted, const int gt)
91830+{
91831+}
91832+#endif
91833+
91834 static inline int check_data_rlimit(unsigned long rlim,
91835 unsigned long new,
91836 unsigned long start,
91837 unsigned long end_data,
91838 unsigned long start_data)
91839 {
91840+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
91841 if (rlim < RLIM_INFINITY) {
91842 if (((new - start) + (end_data - start_data)) > rlim)
91843 return -ENOSPC;
91844@@ -1920,7 +1935,7 @@ extern int install_special_mapping(struct mm_struct *mm,
91845 unsigned long addr, unsigned long len,
91846 unsigned long flags, struct page **pages);
91847
91848-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
91849+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
91850
91851 extern unsigned long mmap_region(struct file *file, unsigned long addr,
91852 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
91853@@ -1928,6 +1943,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
91854 unsigned long len, unsigned long prot, unsigned long flags,
91855 unsigned long pgoff, unsigned long *populate);
91856 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
91857+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
91858
91859 #ifdef CONFIG_MMU
91860 extern int __mm_populate(unsigned long addr, unsigned long len,
91861@@ -1956,10 +1972,11 @@ struct vm_unmapped_area_info {
91862 unsigned long high_limit;
91863 unsigned long align_mask;
91864 unsigned long align_offset;
91865+ unsigned long threadstack_offset;
91866 };
91867
91868-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
91869-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
91870+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
91871+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
91872
91873 /*
91874 * Search for an unmapped address range.
91875@@ -1971,7 +1988,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
91876 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
91877 */
91878 static inline unsigned long
91879-vm_unmapped_area(struct vm_unmapped_area_info *info)
91880+vm_unmapped_area(const struct vm_unmapped_area_info *info)
91881 {
91882 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
91883 return unmapped_area(info);
91884@@ -2033,6 +2050,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
91885 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
91886 struct vm_area_struct **pprev);
91887
91888+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
91889+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
91890+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
91891+
91892 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
91893 NULL if none. Assume start_addr < end_addr. */
91894 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
91895@@ -2062,10 +2083,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
91896 }
91897
91898 #ifdef CONFIG_MMU
91899-pgprot_t vm_get_page_prot(unsigned long vm_flags);
91900+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
91901 void vma_set_page_prot(struct vm_area_struct *vma);
91902 #else
91903-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
91904+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
91905 {
91906 return __pgprot(0);
91907 }
91908@@ -2127,6 +2148,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
91909 static inline void vm_stat_account(struct mm_struct *mm,
91910 unsigned long flags, struct file *file, long pages)
91911 {
91912+
91913+#ifdef CONFIG_PAX_RANDMMAP
91914+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
91915+#endif
91916+
91917 mm->total_vm += pages;
91918 }
91919 #endif /* CONFIG_PROC_FS */
91920@@ -2229,7 +2255,7 @@ extern int unpoison_memory(unsigned long pfn);
91921 extern int sysctl_memory_failure_early_kill;
91922 extern int sysctl_memory_failure_recovery;
91923 extern void shake_page(struct page *p, int access);
91924-extern atomic_long_t num_poisoned_pages;
91925+extern atomic_long_unchecked_t num_poisoned_pages;
91926 extern int soft_offline_page(struct page *page, int flags);
91927
91928 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
91929@@ -2280,5 +2306,11 @@ void __init setup_nr_node_ids(void);
91930 static inline void setup_nr_node_ids(void) {}
91931 #endif
91932
91933+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
91934+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
91935+#else
91936+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
91937+#endif
91938+
91939 #endif /* __KERNEL__ */
91940 #endif /* _LINUX_MM_H */
91941diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
91942index 199a03a..7328440 100644
91943--- a/include/linux/mm_types.h
91944+++ b/include/linux/mm_types.h
91945@@ -313,7 +313,9 @@ struct vm_area_struct {
91946 #ifdef CONFIG_NUMA
91947 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
91948 #endif
91949-};
91950+
91951+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
91952+} __randomize_layout;
91953
91954 struct core_thread {
91955 struct task_struct *task;
91956@@ -464,7 +466,25 @@ struct mm_struct {
91957 /* address of the bounds directory */
91958 void __user *bd_addr;
91959 #endif
91960-};
91961+
91962+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
91963+ unsigned long pax_flags;
91964+#endif
91965+
91966+#ifdef CONFIG_PAX_DLRESOLVE
91967+ unsigned long call_dl_resolve;
91968+#endif
91969+
91970+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
91971+ unsigned long call_syscall;
91972+#endif
91973+
91974+#ifdef CONFIG_PAX_ASLR
91975+ unsigned long delta_mmap; /* randomized offset */
91976+ unsigned long delta_stack; /* randomized offset */
91977+#endif
91978+
91979+} __randomize_layout;
91980
91981 static inline void mm_init_cpumask(struct mm_struct *mm)
91982 {
91983diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
91984index 160448f..7b332b7 100644
91985--- a/include/linux/mmc/core.h
91986+++ b/include/linux/mmc/core.h
91987@@ -79,7 +79,7 @@ struct mmc_command {
91988 #define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_MASK)
91989
91990 unsigned int retries; /* max number of retries */
91991- unsigned int error; /* command error */
91992+ int error; /* command error */
91993
91994 /*
91995 * Standard errno values are used for errors, but some have specific
91996diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
91997index c5d5278..f0b68c8 100644
91998--- a/include/linux/mmiotrace.h
91999+++ b/include/linux/mmiotrace.h
92000@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
92001 /* Called from ioremap.c */
92002 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
92003 void __iomem *addr);
92004-extern void mmiotrace_iounmap(volatile void __iomem *addr);
92005+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
92006
92007 /* For anyone to insert markers. Remember trailing newline. */
92008 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
92009@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
92010 {
92011 }
92012
92013-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
92014+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
92015 {
92016 }
92017
92018diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
92019index 2782df4..abe756e 100644
92020--- a/include/linux/mmzone.h
92021+++ b/include/linux/mmzone.h
92022@@ -526,7 +526,7 @@ struct zone {
92023
92024 ZONE_PADDING(_pad3_)
92025 /* Zone statistics */
92026- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
92027+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
92028 } ____cacheline_internodealigned_in_smp;
92029
92030 enum zone_flags {
92031diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
92032index e530533..c9620c7 100644
92033--- a/include/linux/mod_devicetable.h
92034+++ b/include/linux/mod_devicetable.h
92035@@ -139,7 +139,7 @@ struct usb_device_id {
92036 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
92037 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
92038
92039-#define HID_ANY_ID (~0)
92040+#define HID_ANY_ID (~0U)
92041 #define HID_BUS_ANY 0xffff
92042 #define HID_GROUP_ANY 0x0000
92043
92044@@ -470,7 +470,7 @@ struct dmi_system_id {
92045 const char *ident;
92046 struct dmi_strmatch matches[4];
92047 void *driver_data;
92048-};
92049+} __do_const;
92050 /*
92051 * struct dmi_device_id appears during expansion of
92052 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
92053diff --git a/include/linux/module.h b/include/linux/module.h
92054index b03485b..a26974f 100644
92055--- a/include/linux/module.h
92056+++ b/include/linux/module.h
92057@@ -17,9 +17,11 @@
92058 #include <linux/moduleparam.h>
92059 #include <linux/jump_label.h>
92060 #include <linux/export.h>
92061+#include <linux/fs.h>
92062
92063 #include <linux/percpu.h>
92064 #include <asm/module.h>
92065+#include <asm/pgtable.h>
92066
92067 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
92068 #define MODULE_SIG_STRING "~Module signature appended~\n"
92069@@ -42,7 +44,7 @@ struct module_kobject {
92070 struct kobject *drivers_dir;
92071 struct module_param_attrs *mp;
92072 struct completion *kobj_completion;
92073-};
92074+} __randomize_layout;
92075
92076 struct module_attribute {
92077 struct attribute attr;
92078@@ -54,12 +56,13 @@ struct module_attribute {
92079 int (*test)(struct module *);
92080 void (*free)(struct module *);
92081 };
92082+typedef struct module_attribute __no_const module_attribute_no_const;
92083
92084 struct module_version_attribute {
92085 struct module_attribute mattr;
92086 const char *module_name;
92087 const char *version;
92088-} __attribute__ ((__aligned__(sizeof(void *))));
92089+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
92090
92091 extern ssize_t __modver_version_show(struct module_attribute *,
92092 struct module_kobject *, char *);
92093@@ -221,7 +224,7 @@ struct module {
92094
92095 /* Sysfs stuff. */
92096 struct module_kobject mkobj;
92097- struct module_attribute *modinfo_attrs;
92098+ module_attribute_no_const *modinfo_attrs;
92099 const char *version;
92100 const char *srcversion;
92101 struct kobject *holders_dir;
92102@@ -270,19 +273,16 @@ struct module {
92103 int (*init)(void);
92104
92105 /* If this is non-NULL, vfree after init() returns */
92106- void *module_init;
92107+ void *module_init_rx, *module_init_rw;
92108
92109 /* Here is the actual code + data, vfree'd on unload. */
92110- void *module_core;
92111+ void *module_core_rx, *module_core_rw;
92112
92113 /* Here are the sizes of the init and core sections */
92114- unsigned int init_size, core_size;
92115+ unsigned int init_size_rw, core_size_rw;
92116
92117 /* The size of the executable code in each section. */
92118- unsigned int init_text_size, core_text_size;
92119-
92120- /* Size of RO sections of the module (text+rodata) */
92121- unsigned int init_ro_size, core_ro_size;
92122+ unsigned int init_size_rx, core_size_rx;
92123
92124 /* Arch-specific module values */
92125 struct mod_arch_specific arch;
92126@@ -338,6 +338,10 @@ struct module {
92127 #ifdef CONFIG_EVENT_TRACING
92128 struct ftrace_event_call **trace_events;
92129 unsigned int num_trace_events;
92130+ struct file_operations trace_id;
92131+ struct file_operations trace_enable;
92132+ struct file_operations trace_format;
92133+ struct file_operations trace_filter;
92134 #endif
92135 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
92136 unsigned int num_ftrace_callsites;
92137@@ -365,7 +369,7 @@ struct module {
92138 ctor_fn_t *ctors;
92139 unsigned int num_ctors;
92140 #endif
92141-};
92142+} __randomize_layout;
92143 #ifndef MODULE_ARCH_INIT
92144 #define MODULE_ARCH_INIT {}
92145 #endif
92146@@ -386,18 +390,48 @@ bool is_module_address(unsigned long addr);
92147 bool is_module_percpu_address(unsigned long addr);
92148 bool is_module_text_address(unsigned long addr);
92149
92150+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
92151+{
92152+
92153+#ifdef CONFIG_PAX_KERNEXEC
92154+ if (ktla_ktva(addr) >= (unsigned long)start &&
92155+ ktla_ktva(addr) < (unsigned long)start + size)
92156+ return 1;
92157+#endif
92158+
92159+ return ((void *)addr >= start && (void *)addr < start + size);
92160+}
92161+
92162+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
92163+{
92164+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
92165+}
92166+
92167+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
92168+{
92169+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
92170+}
92171+
92172+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
92173+{
92174+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
92175+}
92176+
92177+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
92178+{
92179+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
92180+}
92181+
92182 static inline bool within_module_core(unsigned long addr,
92183 const struct module *mod)
92184 {
92185- return (unsigned long)mod->module_core <= addr &&
92186- addr < (unsigned long)mod->module_core + mod->core_size;
92187+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
92188 }
92189
92190 static inline bool within_module_init(unsigned long addr,
92191 const struct module *mod)
92192 {
92193- return (unsigned long)mod->module_init <= addr &&
92194- addr < (unsigned long)mod->module_init + mod->init_size;
92195+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
92196 }
92197
92198 static inline bool within_module(unsigned long addr, const struct module *mod)
92199diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
92200index 4d0cb9b..3169ac7 100644
92201--- a/include/linux/moduleloader.h
92202+++ b/include/linux/moduleloader.h
92203@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
92204 sections. Returns NULL on failure. */
92205 void *module_alloc(unsigned long size);
92206
92207+#ifdef CONFIG_PAX_KERNEXEC
92208+void *module_alloc_exec(unsigned long size);
92209+#else
92210+#define module_alloc_exec(x) module_alloc(x)
92211+#endif
92212+
92213 /* Free memory returned from module_alloc. */
92214 void module_memfree(void *module_region);
92215
92216+#ifdef CONFIG_PAX_KERNEXEC
92217+void module_memfree_exec(void *module_region);
92218+#else
92219+#define module_memfree_exec(x) module_memfree((x))
92220+#endif
92221+
92222 /*
92223 * Apply the given relocation to the (simplified) ELF. Return -error
92224 * or 0.
92225@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
92226 unsigned int relsec,
92227 struct module *me)
92228 {
92229+#ifdef CONFIG_MODULES
92230 printk(KERN_ERR "module %s: REL relocation unsupported\n",
92231 module_name(me));
92232+#endif
92233 return -ENOEXEC;
92234 }
92235 #endif
92236@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
92237 unsigned int relsec,
92238 struct module *me)
92239 {
92240+#ifdef CONFIG_MODULES
92241 printk(KERN_ERR "module %s: REL relocation unsupported\n",
92242 module_name(me));
92243+#endif
92244 return -ENOEXEC;
92245 }
92246 #endif
92247diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
92248index 1c9effa..1160bdd 100644
92249--- a/include/linux/moduleparam.h
92250+++ b/include/linux/moduleparam.h
92251@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
92252 * @len is usually just sizeof(string).
92253 */
92254 #define module_param_string(name, string, len, perm) \
92255- static const struct kparam_string __param_string_##name \
92256+ static const struct kparam_string __param_string_##name __used \
92257 = { len, string }; \
92258 __module_param_call(MODULE_PARAM_PREFIX, name, \
92259 &param_ops_string, \
92260@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
92261 */
92262 #define module_param_array_named(name, array, type, nump, perm) \
92263 param_check_##type(name, &(array)[0]); \
92264- static const struct kparam_array __param_arr_##name \
92265+ static const struct kparam_array __param_arr_##name __used \
92266 = { .max = ARRAY_SIZE(array), .num = nump, \
92267 .ops = &param_ops_##type, \
92268 .elemsize = sizeof(array[0]), .elem = array }; \
92269diff --git a/include/linux/mount.h b/include/linux/mount.h
92270index 564beee..653be6f 100644
92271--- a/include/linux/mount.h
92272+++ b/include/linux/mount.h
92273@@ -67,7 +67,7 @@ struct vfsmount {
92274 struct dentry *mnt_root; /* root of the mounted tree */
92275 struct super_block *mnt_sb; /* pointer to superblock */
92276 int mnt_flags;
92277-};
92278+} __randomize_layout;
92279
92280 struct file; /* forward dec */
92281 struct path;
92282diff --git a/include/linux/namei.h b/include/linux/namei.h
92283index c899077..b9a2010 100644
92284--- a/include/linux/namei.h
92285+++ b/include/linux/namei.h
92286@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
92287 extern void unlock_rename(struct dentry *, struct dentry *);
92288
92289 extern void nd_jump_link(struct nameidata *nd, struct path *path);
92290-extern void nd_set_link(struct nameidata *nd, char *path);
92291-extern char *nd_get_link(struct nameidata *nd);
92292+extern void nd_set_link(struct nameidata *nd, const char *path);
92293+extern const char *nd_get_link(const struct nameidata *nd);
92294
92295 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
92296 {
92297diff --git a/include/linux/net.h b/include/linux/net.h
92298index 17d8339..81656c0 100644
92299--- a/include/linux/net.h
92300+++ b/include/linux/net.h
92301@@ -192,7 +192,7 @@ struct net_proto_family {
92302 int (*create)(struct net *net, struct socket *sock,
92303 int protocol, int kern);
92304 struct module *owner;
92305-};
92306+} __do_const;
92307
92308 struct iovec;
92309 struct kvec;
92310diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
92311index 2787388..1dd8e88 100644
92312--- a/include/linux/netdevice.h
92313+++ b/include/linux/netdevice.h
92314@@ -1198,6 +1198,7 @@ struct net_device_ops {
92315 u8 state);
92316 #endif
92317 };
92318+typedef struct net_device_ops __no_const net_device_ops_no_const;
92319
92320 /**
92321 * enum net_device_priv_flags - &struct net_device priv_flags
92322@@ -1546,10 +1547,10 @@ struct net_device {
92323
92324 struct net_device_stats stats;
92325
92326- atomic_long_t rx_dropped;
92327- atomic_long_t tx_dropped;
92328+ atomic_long_unchecked_t rx_dropped;
92329+ atomic_long_unchecked_t tx_dropped;
92330
92331- atomic_t carrier_changes;
92332+ atomic_unchecked_t carrier_changes;
92333
92334 #ifdef CONFIG_WIRELESS_EXT
92335 const struct iw_handler_def * wireless_handlers;
92336diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
92337index 2517ece..0bbfcfb 100644
92338--- a/include/linux/netfilter.h
92339+++ b/include/linux/netfilter.h
92340@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
92341 #endif
92342 /* Use the module struct to lock set/get code in place */
92343 struct module *owner;
92344-};
92345+} __do_const;
92346
92347 /* Function to register/unregister hook points. */
92348 int nf_register_hook(struct nf_hook_ops *reg);
92349diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
92350index e955d47..04a5338 100644
92351--- a/include/linux/netfilter/nfnetlink.h
92352+++ b/include/linux/netfilter/nfnetlink.h
92353@@ -19,7 +19,7 @@ struct nfnl_callback {
92354 const struct nlattr * const cda[]);
92355 const struct nla_policy *policy; /* netlink attribute policy */
92356 const u_int16_t attr_count; /* number of nlattr's */
92357-};
92358+} __do_const;
92359
92360 struct nfnetlink_subsystem {
92361 const char *name;
92362diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
92363new file mode 100644
92364index 0000000..33f4af8
92365--- /dev/null
92366+++ b/include/linux/netfilter/xt_gradm.h
92367@@ -0,0 +1,9 @@
92368+#ifndef _LINUX_NETFILTER_XT_GRADM_H
92369+#define _LINUX_NETFILTER_XT_GRADM_H 1
92370+
92371+struct xt_gradm_mtinfo {
92372+ __u16 flags;
92373+ __u16 invflags;
92374+};
92375+
92376+#endif
92377diff --git a/include/linux/nls.h b/include/linux/nls.h
92378index 520681b..2b7fabb 100644
92379--- a/include/linux/nls.h
92380+++ b/include/linux/nls.h
92381@@ -31,7 +31,7 @@ struct nls_table {
92382 const unsigned char *charset2upper;
92383 struct module *owner;
92384 struct nls_table *next;
92385-};
92386+} __do_const;
92387
92388 /* this value hold the maximum octet of charset */
92389 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
92390@@ -46,7 +46,7 @@ enum utf16_endian {
92391 /* nls_base.c */
92392 extern int __register_nls(struct nls_table *, struct module *);
92393 extern int unregister_nls(struct nls_table *);
92394-extern struct nls_table *load_nls(char *);
92395+extern struct nls_table *load_nls(const char *);
92396 extern void unload_nls(struct nls_table *);
92397 extern struct nls_table *load_nls_default(void);
92398 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
92399diff --git a/include/linux/notifier.h b/include/linux/notifier.h
92400index d14a4c3..a078786 100644
92401--- a/include/linux/notifier.h
92402+++ b/include/linux/notifier.h
92403@@ -54,7 +54,8 @@ struct notifier_block {
92404 notifier_fn_t notifier_call;
92405 struct notifier_block __rcu *next;
92406 int priority;
92407-};
92408+} __do_const;
92409+typedef struct notifier_block __no_const notifier_block_no_const;
92410
92411 struct atomic_notifier_head {
92412 spinlock_t lock;
92413diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
92414index b2a0f15..4d7da32 100644
92415--- a/include/linux/oprofile.h
92416+++ b/include/linux/oprofile.h
92417@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
92418 int oprofilefs_create_ro_ulong(struct dentry * root,
92419 char const * name, ulong * val);
92420
92421-/** Create a file for read-only access to an atomic_t. */
92422+/** Create a file for read-only access to an atomic_unchecked_t. */
92423 int oprofilefs_create_ro_atomic(struct dentry * root,
92424- char const * name, atomic_t * val);
92425+ char const * name, atomic_unchecked_t * val);
92426
92427 /** create a directory */
92428 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
92429diff --git a/include/linux/padata.h b/include/linux/padata.h
92430index 4386946..f50c615 100644
92431--- a/include/linux/padata.h
92432+++ b/include/linux/padata.h
92433@@ -129,7 +129,7 @@ struct parallel_data {
92434 struct padata_serial_queue __percpu *squeue;
92435 atomic_t reorder_objects;
92436 atomic_t refcnt;
92437- atomic_t seq_nr;
92438+ atomic_unchecked_t seq_nr;
92439 struct padata_cpumask cpumask;
92440 spinlock_t lock ____cacheline_aligned;
92441 unsigned int processed;
92442diff --git a/include/linux/path.h b/include/linux/path.h
92443index d137218..be0c176 100644
92444--- a/include/linux/path.h
92445+++ b/include/linux/path.h
92446@@ -1,13 +1,15 @@
92447 #ifndef _LINUX_PATH_H
92448 #define _LINUX_PATH_H
92449
92450+#include <linux/compiler.h>
92451+
92452 struct dentry;
92453 struct vfsmount;
92454
92455 struct path {
92456 struct vfsmount *mnt;
92457 struct dentry *dentry;
92458-};
92459+} __randomize_layout;
92460
92461 extern void path_get(const struct path *);
92462 extern void path_put(const struct path *);
92463diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
92464index 8c78950..0d74ed9 100644
92465--- a/include/linux/pci_hotplug.h
92466+++ b/include/linux/pci_hotplug.h
92467@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
92468 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
92469 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
92470 int (*reset_slot) (struct hotplug_slot *slot, int probe);
92471-};
92472+} __do_const;
92473+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
92474
92475 /**
92476 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
92477diff --git a/include/linux/percpu.h b/include/linux/percpu.h
92478index caebf2a..4c3ae9d 100644
92479--- a/include/linux/percpu.h
92480+++ b/include/linux/percpu.h
92481@@ -34,7 +34,7 @@
92482 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
92483 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
92484 */
92485-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
92486+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
92487 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
92488
92489 /*
92490diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
92491index 2b62198..2b74233 100644
92492--- a/include/linux/perf_event.h
92493+++ b/include/linux/perf_event.h
92494@@ -343,8 +343,8 @@ struct perf_event {
92495
92496 enum perf_event_active_state state;
92497 unsigned int attach_state;
92498- local64_t count;
92499- atomic64_t child_count;
92500+ local64_t count; /* PaX: fix it one day */
92501+ atomic64_unchecked_t child_count;
92502
92503 /*
92504 * These are the total time in nanoseconds that the event
92505@@ -395,8 +395,8 @@ struct perf_event {
92506 * These accumulate total time (in nanoseconds) that children
92507 * events have been enabled and running, respectively.
92508 */
92509- atomic64_t child_total_time_enabled;
92510- atomic64_t child_total_time_running;
92511+ atomic64_unchecked_t child_total_time_enabled;
92512+ atomic64_unchecked_t child_total_time_running;
92513
92514 /*
92515 * Protect attach/detach and child_list:
92516@@ -752,7 +752,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
92517 entry->ip[entry->nr++] = ip;
92518 }
92519
92520-extern int sysctl_perf_event_paranoid;
92521+extern int sysctl_perf_event_legitimately_concerned;
92522 extern int sysctl_perf_event_mlock;
92523 extern int sysctl_perf_event_sample_rate;
92524 extern int sysctl_perf_cpu_time_max_percent;
92525@@ -767,19 +767,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
92526 loff_t *ppos);
92527
92528
92529+static inline bool perf_paranoid_any(void)
92530+{
92531+ return sysctl_perf_event_legitimately_concerned > 2;
92532+}
92533+
92534 static inline bool perf_paranoid_tracepoint_raw(void)
92535 {
92536- return sysctl_perf_event_paranoid > -1;
92537+ return sysctl_perf_event_legitimately_concerned > -1;
92538 }
92539
92540 static inline bool perf_paranoid_cpu(void)
92541 {
92542- return sysctl_perf_event_paranoid > 0;
92543+ return sysctl_perf_event_legitimately_concerned > 0;
92544 }
92545
92546 static inline bool perf_paranoid_kernel(void)
92547 {
92548- return sysctl_perf_event_paranoid > 1;
92549+ return sysctl_perf_event_legitimately_concerned > 1;
92550 }
92551
92552 extern void perf_event_init(void);
92553@@ -912,7 +917,7 @@ struct perf_pmu_events_attr {
92554 struct device_attribute attr;
92555 u64 id;
92556 const char *event_str;
92557-};
92558+} __do_const;
92559
92560 ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
92561 char *page);
92562diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
92563index 918b117..7af374b7 100644
92564--- a/include/linux/pid_namespace.h
92565+++ b/include/linux/pid_namespace.h
92566@@ -45,7 +45,7 @@ struct pid_namespace {
92567 int hide_pid;
92568 int reboot; /* group exit code if this pidns was rebooted */
92569 struct ns_common ns;
92570-};
92571+} __randomize_layout;
92572
92573 extern struct pid_namespace init_pid_ns;
92574
92575diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
92576index eb8b8ac..62649e1 100644
92577--- a/include/linux/pipe_fs_i.h
92578+++ b/include/linux/pipe_fs_i.h
92579@@ -47,10 +47,10 @@ struct pipe_inode_info {
92580 struct mutex mutex;
92581 wait_queue_head_t wait;
92582 unsigned int nrbufs, curbuf, buffers;
92583- unsigned int readers;
92584- unsigned int writers;
92585- unsigned int files;
92586- unsigned int waiting_writers;
92587+ atomic_t readers;
92588+ atomic_t writers;
92589+ atomic_t files;
92590+ atomic_t waiting_writers;
92591 unsigned int r_counter;
92592 unsigned int w_counter;
92593 struct page *tmp_page;
92594diff --git a/include/linux/pm.h b/include/linux/pm.h
92595index e2f1be6..78a0506 100644
92596--- a/include/linux/pm.h
92597+++ b/include/linux/pm.h
92598@@ -608,6 +608,7 @@ struct dev_pm_domain {
92599 struct dev_pm_ops ops;
92600 void (*detach)(struct device *dev, bool power_off);
92601 };
92602+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
92603
92604 /*
92605 * The PM_EVENT_ messages are also used by drivers implementing the legacy
92606diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
92607index 080e778..cbdaef7 100644
92608--- a/include/linux/pm_domain.h
92609+++ b/include/linux/pm_domain.h
92610@@ -39,11 +39,11 @@ struct gpd_dev_ops {
92611 int (*save_state)(struct device *dev);
92612 int (*restore_state)(struct device *dev);
92613 bool (*active_wakeup)(struct device *dev);
92614-};
92615+} __no_const;
92616
92617 struct gpd_cpuidle_data {
92618 unsigned int saved_exit_latency;
92619- struct cpuidle_state *idle_state;
92620+ cpuidle_state_no_const *idle_state;
92621 };
92622
92623 struct generic_pm_domain {
92624diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
92625index 30e84d4..22278b4 100644
92626--- a/include/linux/pm_runtime.h
92627+++ b/include/linux/pm_runtime.h
92628@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
92629
92630 static inline void pm_runtime_mark_last_busy(struct device *dev)
92631 {
92632- ACCESS_ONCE(dev->power.last_busy) = jiffies;
92633+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
92634 }
92635
92636 static inline bool pm_runtime_is_irq_safe(struct device *dev)
92637diff --git a/include/linux/pnp.h b/include/linux/pnp.h
92638index 6512e9c..ec27fa2 100644
92639--- a/include/linux/pnp.h
92640+++ b/include/linux/pnp.h
92641@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
92642 struct pnp_fixup {
92643 char id[7];
92644 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
92645-};
92646+} __do_const;
92647
92648 /* config parameters */
92649 #define PNP_CONFIG_NORMAL 0x0001
92650diff --git a/include/linux/poison.h b/include/linux/poison.h
92651index 2110a81..13a11bb 100644
92652--- a/include/linux/poison.h
92653+++ b/include/linux/poison.h
92654@@ -19,8 +19,8 @@
92655 * under normal circumstances, used to verify that nobody uses
92656 * non-initialized list entries.
92657 */
92658-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
92659-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
92660+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
92661+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
92662
92663 /********** include/linux/timer.h **********/
92664 /*
92665diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
92666index d8b187c3..9a9257a 100644
92667--- a/include/linux/power/smartreflex.h
92668+++ b/include/linux/power/smartreflex.h
92669@@ -238,7 +238,7 @@ struct omap_sr_class_data {
92670 int (*notify)(struct omap_sr *sr, u32 status);
92671 u8 notify_flags;
92672 u8 class_type;
92673-};
92674+} __do_const;
92675
92676 /**
92677 * struct omap_sr_nvalue_table - Smartreflex n-target value info
92678diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
92679index 4ea1d37..80f4b33 100644
92680--- a/include/linux/ppp-comp.h
92681+++ b/include/linux/ppp-comp.h
92682@@ -84,7 +84,7 @@ struct compressor {
92683 struct module *owner;
92684 /* Extra skb space needed by the compressor algorithm */
92685 unsigned int comp_extra;
92686-};
92687+} __do_const;
92688
92689 /*
92690 * The return value from decompress routine is the length of the
92691diff --git a/include/linux/preempt.h b/include/linux/preempt.h
92692index de83b4e..c4b997d 100644
92693--- a/include/linux/preempt.h
92694+++ b/include/linux/preempt.h
92695@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
92696 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
92697 #endif
92698
92699+#define raw_preempt_count_add(val) __preempt_count_add(val)
92700+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
92701+
92702 #define __preempt_count_inc() __preempt_count_add(1)
92703 #define __preempt_count_dec() __preempt_count_sub(1)
92704
92705 #define preempt_count_inc() preempt_count_add(1)
92706+#define raw_preempt_count_inc() raw_preempt_count_add(1)
92707 #define preempt_count_dec() preempt_count_sub(1)
92708+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
92709
92710 #ifdef CONFIG_PREEMPT_COUNT
92711
92712@@ -41,6 +46,12 @@ do { \
92713 barrier(); \
92714 } while (0)
92715
92716+#define raw_preempt_disable() \
92717+do { \
92718+ raw_preempt_count_inc(); \
92719+ barrier(); \
92720+} while (0)
92721+
92722 #define sched_preempt_enable_no_resched() \
92723 do { \
92724 barrier(); \
92725@@ -49,6 +60,12 @@ do { \
92726
92727 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
92728
92729+#define raw_preempt_enable_no_resched() \
92730+do { \
92731+ barrier(); \
92732+ raw_preempt_count_dec(); \
92733+} while (0)
92734+
92735 #ifdef CONFIG_PREEMPT
92736 #define preempt_enable() \
92737 do { \
92738@@ -113,8 +130,10 @@ do { \
92739 * region.
92740 */
92741 #define preempt_disable() barrier()
92742+#define raw_preempt_disable() barrier()
92743 #define sched_preempt_enable_no_resched() barrier()
92744 #define preempt_enable_no_resched() barrier()
92745+#define raw_preempt_enable_no_resched() barrier()
92746 #define preempt_enable() barrier()
92747 #define preempt_check_resched() do { } while (0)
92748
92749@@ -128,11 +147,13 @@ do { \
92750 /*
92751 * Modules have no business playing preemption tricks.
92752 */
92753+#ifndef CONFIG_PAX_KERNEXEC
92754 #undef sched_preempt_enable_no_resched
92755 #undef preempt_enable_no_resched
92756 #undef preempt_enable_no_resched_notrace
92757 #undef preempt_check_resched
92758 #endif
92759+#endif
92760
92761 #define preempt_set_need_resched() \
92762 do { \
92763diff --git a/include/linux/printk.h b/include/linux/printk.h
92764index baa3f97..168cff1 100644
92765--- a/include/linux/printk.h
92766+++ b/include/linux/printk.h
92767@@ -121,6 +121,7 @@ void early_printk(const char *s, ...) { }
92768 #endif
92769
92770 typedef int(*printk_func_t)(const char *fmt, va_list args);
92771+extern int kptr_restrict;
92772
92773 #ifdef CONFIG_PRINTK
92774 asmlinkage __printf(5, 0)
92775@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
92776
92777 extern int printk_delay_msec;
92778 extern int dmesg_restrict;
92779-extern int kptr_restrict;
92780
92781 extern void wake_up_klogd(void);
92782
92783diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
92784index b97bf2e..f14c92d4 100644
92785--- a/include/linux/proc_fs.h
92786+++ b/include/linux/proc_fs.h
92787@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
92788 extern struct proc_dir_entry *proc_symlink(const char *,
92789 struct proc_dir_entry *, const char *);
92790 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
92791+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
92792 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
92793 struct proc_dir_entry *, void *);
92794+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
92795+ struct proc_dir_entry *, void *);
92796 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
92797 struct proc_dir_entry *);
92798
92799@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
92800 return proc_create_data(name, mode, parent, proc_fops, NULL);
92801 }
92802
92803+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
92804+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
92805+{
92806+#ifdef CONFIG_GRKERNSEC_PROC_USER
92807+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
92808+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92809+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
92810+#else
92811+ return proc_create_data(name, mode, parent, proc_fops, NULL);
92812+#endif
92813+}
92814+
92815+
92816 extern void proc_set_size(struct proc_dir_entry *, loff_t);
92817 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
92818 extern void *PDE_DATA(const struct inode *);
92819@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
92820 struct proc_dir_entry *parent,const char *dest) { return NULL;}
92821 static inline struct proc_dir_entry *proc_mkdir(const char *name,
92822 struct proc_dir_entry *parent) {return NULL;}
92823+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
92824+ struct proc_dir_entry *parent) { return NULL; }
92825 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
92826 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
92827+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
92828+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
92829 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
92830 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
92831 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
92832@@ -79,7 +99,7 @@ struct net;
92833 static inline struct proc_dir_entry *proc_net_mkdir(
92834 struct net *net, const char *name, struct proc_dir_entry *parent)
92835 {
92836- return proc_mkdir_data(name, 0, parent, net);
92837+ return proc_mkdir_data_restrict(name, 0, parent, net);
92838 }
92839
92840 #endif /* _LINUX_PROC_FS_H */
92841diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
92842index 42dfc61..8113a99 100644
92843--- a/include/linux/proc_ns.h
92844+++ b/include/linux/proc_ns.h
92845@@ -16,7 +16,7 @@ struct proc_ns_operations {
92846 struct ns_common *(*get)(struct task_struct *task);
92847 void (*put)(struct ns_common *ns);
92848 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
92849-};
92850+} __do_const __randomize_layout;
92851
92852 extern const struct proc_ns_operations netns_operations;
92853 extern const struct proc_ns_operations utsns_operations;
92854diff --git a/include/linux/quota.h b/include/linux/quota.h
92855index d534e8e..782e604 100644
92856--- a/include/linux/quota.h
92857+++ b/include/linux/quota.h
92858@@ -75,7 +75,7 @@ struct kqid { /* Type in which we store the quota identifier */
92859
92860 extern bool qid_eq(struct kqid left, struct kqid right);
92861 extern bool qid_lt(struct kqid left, struct kqid right);
92862-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
92863+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
92864 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
92865 extern bool qid_valid(struct kqid qid);
92866
92867diff --git a/include/linux/random.h b/include/linux/random.h
92868index b05856e..0a9f14e 100644
92869--- a/include/linux/random.h
92870+++ b/include/linux/random.h
92871@@ -9,9 +9,19 @@
92872 #include <uapi/linux/random.h>
92873
92874 extern void add_device_randomness(const void *, unsigned int);
92875+
92876+static inline void add_latent_entropy(void)
92877+{
92878+
92879+#ifdef LATENT_ENTROPY_PLUGIN
92880+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
92881+#endif
92882+
92883+}
92884+
92885 extern void add_input_randomness(unsigned int type, unsigned int code,
92886- unsigned int value);
92887-extern void add_interrupt_randomness(int irq, int irq_flags);
92888+ unsigned int value) __latent_entropy;
92889+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
92890
92891 extern void get_random_bytes(void *buf, int nbytes);
92892 extern void get_random_bytes_arch(void *buf, int nbytes);
92893@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
92894 extern const struct file_operations random_fops, urandom_fops;
92895 #endif
92896
92897-unsigned int get_random_int(void);
92898+unsigned int __intentional_overflow(-1) get_random_int(void);
92899 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
92900
92901-u32 prandom_u32(void);
92902+u32 prandom_u32(void) __intentional_overflow(-1);
92903 void prandom_bytes(void *buf, size_t nbytes);
92904 void prandom_seed(u32 seed);
92905 void prandom_reseed_late(void);
92906@@ -37,6 +47,11 @@ struct rnd_state {
92907 u32 prandom_u32_state(struct rnd_state *state);
92908 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
92909
92910+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
92911+{
92912+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
92913+}
92914+
92915 /**
92916 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
92917 * @ep_ro: right open interval endpoint
92918@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
92919 *
92920 * Returns: pseudo-random number in interval [0, ep_ro)
92921 */
92922-static inline u32 prandom_u32_max(u32 ep_ro)
92923+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
92924 {
92925 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
92926 }
92927diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
92928index 378c5ee..aa84a47 100644
92929--- a/include/linux/rbtree_augmented.h
92930+++ b/include/linux/rbtree_augmented.h
92931@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
92932 old->rbaugmented = rbcompute(old); \
92933 } \
92934 rbstatic const struct rb_augment_callbacks rbname = { \
92935- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
92936+ .propagate = rbname ## _propagate, \
92937+ .copy = rbname ## _copy, \
92938+ .rotate = rbname ## _rotate \
92939 };
92940
92941
92942diff --git a/include/linux/rculist.h b/include/linux/rculist.h
92943index a18b16f..2683096 100644
92944--- a/include/linux/rculist.h
92945+++ b/include/linux/rculist.h
92946@@ -29,8 +29,8 @@
92947 */
92948 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
92949 {
92950- ACCESS_ONCE(list->next) = list;
92951- ACCESS_ONCE(list->prev) = list;
92952+ ACCESS_ONCE_RW(list->next) = list;
92953+ ACCESS_ONCE_RW(list->prev) = list;
92954 }
92955
92956 /*
92957@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
92958 struct list_head *prev, struct list_head *next);
92959 #endif
92960
92961+void __pax_list_add_rcu(struct list_head *new,
92962+ struct list_head *prev, struct list_head *next);
92963+
92964 /**
92965 * list_add_rcu - add a new entry to rcu-protected list
92966 * @new: new entry to be added
92967@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
92968 __list_add_rcu(new, head, head->next);
92969 }
92970
92971+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
92972+{
92973+ __pax_list_add_rcu(new, head, head->next);
92974+}
92975+
92976 /**
92977 * list_add_tail_rcu - add a new entry to rcu-protected list
92978 * @new: new entry to be added
92979@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
92980 __list_add_rcu(new, head->prev, head);
92981 }
92982
92983+static inline void pax_list_add_tail_rcu(struct list_head *new,
92984+ struct list_head *head)
92985+{
92986+ __pax_list_add_rcu(new, head->prev, head);
92987+}
92988+
92989 /**
92990 * list_del_rcu - deletes entry from list without re-initialization
92991 * @entry: the element to delete from the list.
92992@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
92993 entry->prev = LIST_POISON2;
92994 }
92995
92996+extern void pax_list_del_rcu(struct list_head *entry);
92997+
92998 /**
92999 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
93000 * @n: the element to delete from the hash list.
93001diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
93002index 7809749..1cd9315 100644
93003--- a/include/linux/rcupdate.h
93004+++ b/include/linux/rcupdate.h
93005@@ -333,7 +333,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
93006 do { \
93007 rcu_all_qs(); \
93008 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
93009- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
93010+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
93011 } while (0)
93012 #else /* #ifdef CONFIG_TASKS_RCU */
93013 #define TASKS_RCU(x) do { } while (0)
93014diff --git a/include/linux/reboot.h b/include/linux/reboot.h
93015index 67fc8fc..a90f7d8 100644
93016--- a/include/linux/reboot.h
93017+++ b/include/linux/reboot.h
93018@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
93019 */
93020
93021 extern void migrate_to_reboot_cpu(void);
93022-extern void machine_restart(char *cmd);
93023-extern void machine_halt(void);
93024-extern void machine_power_off(void);
93025+extern void machine_restart(char *cmd) __noreturn;
93026+extern void machine_halt(void) __noreturn;
93027+extern void machine_power_off(void) __noreturn;
93028
93029 extern void machine_shutdown(void);
93030 struct pt_regs;
93031@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
93032 */
93033
93034 extern void kernel_restart_prepare(char *cmd);
93035-extern void kernel_restart(char *cmd);
93036-extern void kernel_halt(void);
93037-extern void kernel_power_off(void);
93038+extern void kernel_restart(char *cmd) __noreturn;
93039+extern void kernel_halt(void) __noreturn;
93040+extern void kernel_power_off(void) __noreturn;
93041
93042 extern int C_A_D; /* for sysctl */
93043 void ctrl_alt_del(void);
93044@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
93045 * Emergency restart, callable from an interrupt handler.
93046 */
93047
93048-extern void emergency_restart(void);
93049+extern void emergency_restart(void) __noreturn;
93050 #include <asm/emergency-restart.h>
93051
93052 #endif /* _LINUX_REBOOT_H */
93053diff --git a/include/linux/regset.h b/include/linux/regset.h
93054index 8e0c9fe..ac4d221 100644
93055--- a/include/linux/regset.h
93056+++ b/include/linux/regset.h
93057@@ -161,7 +161,8 @@ struct user_regset {
93058 unsigned int align;
93059 unsigned int bias;
93060 unsigned int core_note_type;
93061-};
93062+} __do_const;
93063+typedef struct user_regset __no_const user_regset_no_const;
93064
93065 /**
93066 * struct user_regset_view - available regsets
93067diff --git a/include/linux/relay.h b/include/linux/relay.h
93068index d7c8359..818daf5 100644
93069--- a/include/linux/relay.h
93070+++ b/include/linux/relay.h
93071@@ -157,7 +157,7 @@ struct rchan_callbacks
93072 * The callback should return 0 if successful, negative if not.
93073 */
93074 int (*remove_buf_file)(struct dentry *dentry);
93075-};
93076+} __no_const;
93077
93078 /*
93079 * CONFIG_RELAY kernel API, kernel/relay.c
93080diff --git a/include/linux/rio.h b/include/linux/rio.h
93081index 6bda06f..bf39a9b 100644
93082--- a/include/linux/rio.h
93083+++ b/include/linux/rio.h
93084@@ -358,7 +358,7 @@ struct rio_ops {
93085 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
93086 u64 rstart, u32 size, u32 flags);
93087 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
93088-};
93089+} __no_const;
93090
93091 #define RIO_RESOURCE_MEM 0x00000100
93092 #define RIO_RESOURCE_DOORBELL 0x00000200
93093diff --git a/include/linux/rmap.h b/include/linux/rmap.h
93094index c4c559a..6ba9a26 100644
93095--- a/include/linux/rmap.h
93096+++ b/include/linux/rmap.h
93097@@ -154,8 +154,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
93098 void anon_vma_init(void); /* create anon_vma_cachep */
93099 int anon_vma_prepare(struct vm_area_struct *);
93100 void unlink_anon_vmas(struct vm_area_struct *);
93101-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
93102-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
93103+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
93104+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
93105
93106 static inline void anon_vma_merge(struct vm_area_struct *vma,
93107 struct vm_area_struct *next)
93108diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
93109index ed8f9e70..999bc96 100644
93110--- a/include/linux/scatterlist.h
93111+++ b/include/linux/scatterlist.h
93112@@ -1,6 +1,7 @@
93113 #ifndef _LINUX_SCATTERLIST_H
93114 #define _LINUX_SCATTERLIST_H
93115
93116+#include <linux/sched.h>
93117 #include <linux/string.h>
93118 #include <linux/bug.h>
93119 #include <linux/mm.h>
93120@@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
93121 #ifdef CONFIG_DEBUG_SG
93122 BUG_ON(!virt_addr_valid(buf));
93123 #endif
93124+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93125+ if (object_starts_on_stack(buf)) {
93126+ void *adjbuf = buf - current->stack + current->lowmem_stack;
93127+ sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
93128+ } else
93129+#endif
93130 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
93131 }
93132
93133diff --git a/include/linux/sched.h b/include/linux/sched.h
93134index 51348f7..8c8b0ba 100644
93135--- a/include/linux/sched.h
93136+++ b/include/linux/sched.h
93137@@ -133,6 +133,7 @@ struct fs_struct;
93138 struct perf_event_context;
93139 struct blk_plug;
93140 struct filename;
93141+struct linux_binprm;
93142
93143 #define VMACACHE_BITS 2
93144 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
93145@@ -420,7 +421,7 @@ extern char __sched_text_start[], __sched_text_end[];
93146 extern int in_sched_functions(unsigned long addr);
93147
93148 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
93149-extern signed long schedule_timeout(signed long timeout);
93150+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
93151 extern signed long schedule_timeout_interruptible(signed long timeout);
93152 extern signed long schedule_timeout_killable(signed long timeout);
93153 extern signed long schedule_timeout_uninterruptible(signed long timeout);
93154@@ -438,6 +439,19 @@ struct nsproxy;
93155 struct user_namespace;
93156
93157 #ifdef CONFIG_MMU
93158+
93159+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
93160+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
93161+#else
93162+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
93163+{
93164+ return 0;
93165+}
93166+#endif
93167+
93168+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
93169+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
93170+
93171 extern void arch_pick_mmap_layout(struct mm_struct *mm);
93172 extern unsigned long
93173 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
93174@@ -736,6 +750,17 @@ struct signal_struct {
93175 #ifdef CONFIG_TASKSTATS
93176 struct taskstats *stats;
93177 #endif
93178+
93179+#ifdef CONFIG_GRKERNSEC
93180+ u32 curr_ip;
93181+ u32 saved_ip;
93182+ u32 gr_saddr;
93183+ u32 gr_daddr;
93184+ u16 gr_sport;
93185+ u16 gr_dport;
93186+ u8 used_accept:1;
93187+#endif
93188+
93189 #ifdef CONFIG_AUDIT
93190 unsigned audit_tty;
93191 unsigned audit_tty_log_passwd;
93192@@ -762,7 +787,7 @@ struct signal_struct {
93193 struct mutex cred_guard_mutex; /* guard against foreign influences on
93194 * credential calculations
93195 * (notably. ptrace) */
93196-};
93197+} __randomize_layout;
93198
93199 /*
93200 * Bits in flags field of signal_struct.
93201@@ -815,6 +840,14 @@ struct user_struct {
93202 struct key *session_keyring; /* UID's default session keyring */
93203 #endif
93204
93205+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
93206+ unsigned char kernel_banned;
93207+#endif
93208+#ifdef CONFIG_GRKERNSEC_BRUTE
93209+ unsigned char suid_banned;
93210+ unsigned long suid_ban_expires;
93211+#endif
93212+
93213 /* Hash table maintenance information */
93214 struct hlist_node uidhash_node;
93215 kuid_t uid;
93216@@ -822,7 +855,7 @@ struct user_struct {
93217 #ifdef CONFIG_PERF_EVENTS
93218 atomic_long_t locked_vm;
93219 #endif
93220-};
93221+} __randomize_layout;
93222
93223 extern int uids_sysfs_init(void);
93224
93225@@ -1286,6 +1319,9 @@ enum perf_event_task_context {
93226 struct task_struct {
93227 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
93228 void *stack;
93229+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93230+ void *lowmem_stack;
93231+#endif
93232 atomic_t usage;
93233 unsigned int flags; /* per process flags, defined below */
93234 unsigned int ptrace;
93235@@ -1419,8 +1455,8 @@ struct task_struct {
93236 struct list_head thread_node;
93237
93238 struct completion *vfork_done; /* for vfork() */
93239- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
93240- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
93241+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
93242+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
93243
93244 cputime_t utime, stime, utimescaled, stimescaled;
93245 cputime_t gtime;
93246@@ -1445,11 +1481,6 @@ struct task_struct {
93247 struct task_cputime cputime_expires;
93248 struct list_head cpu_timers[3];
93249
93250-/* process credentials */
93251- const struct cred __rcu *real_cred; /* objective and real subjective task
93252- * credentials (COW) */
93253- const struct cred __rcu *cred; /* effective (overridable) subjective task
93254- * credentials (COW) */
93255 char comm[TASK_COMM_LEN]; /* executable name excluding path
93256 - access with [gs]et_task_comm (which lock
93257 it with task_lock())
93258@@ -1467,6 +1498,10 @@ struct task_struct {
93259 #endif
93260 /* CPU-specific state of this task */
93261 struct thread_struct thread;
93262+/* thread_info moved to task_struct */
93263+#ifdef CONFIG_X86
93264+ struct thread_info tinfo;
93265+#endif
93266 /* filesystem information */
93267 struct fs_struct *fs;
93268 /* open file information */
93269@@ -1541,6 +1576,10 @@ struct task_struct {
93270 gfp_t lockdep_reclaim_gfp;
93271 #endif
93272
93273+/* process credentials */
93274+ const struct cred __rcu *real_cred; /* objective and real subjective task
93275+ * credentials (COW) */
93276+
93277 /* journalling filesystem info */
93278 void *journal_info;
93279
93280@@ -1579,6 +1618,10 @@ struct task_struct {
93281 /* cg_list protected by css_set_lock and tsk->alloc_lock */
93282 struct list_head cg_list;
93283 #endif
93284+
93285+ const struct cred __rcu *cred; /* effective (overridable) subjective task
93286+ * credentials (COW) */
93287+
93288 #ifdef CONFIG_FUTEX
93289 struct robust_list_head __user *robust_list;
93290 #ifdef CONFIG_COMPAT
93291@@ -1690,7 +1733,7 @@ struct task_struct {
93292 * Number of functions that haven't been traced
93293 * because of depth overrun.
93294 */
93295- atomic_t trace_overrun;
93296+ atomic_unchecked_t trace_overrun;
93297 /* Pause for the tracing */
93298 atomic_t tracing_graph_pause;
93299 #endif
93300@@ -1718,7 +1761,78 @@ struct task_struct {
93301 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
93302 unsigned long task_state_change;
93303 #endif
93304-};
93305+
93306+#ifdef CONFIG_GRKERNSEC
93307+ /* grsecurity */
93308+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93309+ u64 exec_id;
93310+#endif
93311+#ifdef CONFIG_GRKERNSEC_SETXID
93312+ const struct cred *delayed_cred;
93313+#endif
93314+ struct dentry *gr_chroot_dentry;
93315+ struct acl_subject_label *acl;
93316+ struct acl_subject_label *tmpacl;
93317+ struct acl_role_label *role;
93318+ struct file *exec_file;
93319+ unsigned long brute_expires;
93320+ u16 acl_role_id;
93321+ u8 inherited;
93322+ /* is this the task that authenticated to the special role */
93323+ u8 acl_sp_role;
93324+ u8 is_writable;
93325+ u8 brute;
93326+ u8 gr_is_chrooted;
93327+#endif
93328+
93329+} __randomize_layout;
93330+
93331+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
93332+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
93333+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
93334+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
93335+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
93336+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
93337+
93338+#ifdef CONFIG_PAX_SOFTMODE
93339+extern int pax_softmode;
93340+#endif
93341+
93342+extern int pax_check_flags(unsigned long *);
93343+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
93344+
93345+/* if tsk != current then task_lock must be held on it */
93346+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
93347+static inline unsigned long pax_get_flags(struct task_struct *tsk)
93348+{
93349+ if (likely(tsk->mm))
93350+ return tsk->mm->pax_flags;
93351+ else
93352+ return 0UL;
93353+}
93354+
93355+/* if tsk != current then task_lock must be held on it */
93356+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
93357+{
93358+ if (likely(tsk->mm)) {
93359+ tsk->mm->pax_flags = flags;
93360+ return 0;
93361+ }
93362+ return -EINVAL;
93363+}
93364+#endif
93365+
93366+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
93367+extern void pax_set_initial_flags(struct linux_binprm *bprm);
93368+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
93369+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
93370+#endif
93371+
93372+struct path;
93373+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
93374+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
93375+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
93376+extern void pax_report_refcount_overflow(struct pt_regs *regs);
93377
93378 /* Future-safe accessor for struct task_struct's cpus_allowed. */
93379 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
93380@@ -1801,7 +1915,7 @@ struct pid_namespace;
93381 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
93382 struct pid_namespace *ns);
93383
93384-static inline pid_t task_pid_nr(struct task_struct *tsk)
93385+static inline pid_t task_pid_nr(const struct task_struct *tsk)
93386 {
93387 return tsk->pid;
93388 }
93389@@ -2169,6 +2283,25 @@ extern u64 sched_clock_cpu(int cpu);
93390
93391 extern void sched_clock_init(void);
93392
93393+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93394+static inline void populate_stack(void)
93395+{
93396+ struct task_struct *curtask = current;
93397+ int c;
93398+ int *ptr = curtask->stack;
93399+ int *end = curtask->stack + THREAD_SIZE;
93400+
93401+ while (ptr < end) {
93402+ c = *(volatile int *)ptr;
93403+ ptr += PAGE_SIZE/sizeof(int);
93404+ }
93405+}
93406+#else
93407+static inline void populate_stack(void)
93408+{
93409+}
93410+#endif
93411+
93412 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
93413 static inline void sched_clock_tick(void)
93414 {
93415@@ -2302,7 +2435,9 @@ void yield(void);
93416 extern struct exec_domain default_exec_domain;
93417
93418 union thread_union {
93419+#ifndef CONFIG_X86
93420 struct thread_info thread_info;
93421+#endif
93422 unsigned long stack[THREAD_SIZE/sizeof(long)];
93423 };
93424
93425@@ -2335,6 +2470,7 @@ extern struct pid_namespace init_pid_ns;
93426 */
93427
93428 extern struct task_struct *find_task_by_vpid(pid_t nr);
93429+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
93430 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
93431 struct pid_namespace *ns);
93432
93433@@ -2499,7 +2635,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
93434 extern void exit_itimers(struct signal_struct *);
93435 extern void flush_itimer_signals(void);
93436
93437-extern void do_group_exit(int);
93438+extern __noreturn void do_group_exit(int);
93439
93440 extern int do_execve(struct filename *,
93441 const char __user * const __user *,
93442@@ -2720,9 +2856,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
93443 #define task_stack_end_corrupted(task) \
93444 (*(end_of_stack(task)) != STACK_END_MAGIC)
93445
93446-static inline int object_is_on_stack(void *obj)
93447+static inline int object_starts_on_stack(const void *obj)
93448 {
93449- void *stack = task_stack_page(current);
93450+ const void *stack = task_stack_page(current);
93451
93452 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
93453 }
93454diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
93455index 596a0e0..bea77ec 100644
93456--- a/include/linux/sched/sysctl.h
93457+++ b/include/linux/sched/sysctl.h
93458@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
93459 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
93460
93461 extern int sysctl_max_map_count;
93462+extern unsigned long sysctl_heap_stack_gap;
93463
93464 extern unsigned int sysctl_sched_latency;
93465 extern unsigned int sysctl_sched_min_granularity;
93466diff --git a/include/linux/security.h b/include/linux/security.h
93467index a1b7dbd..036f47f 100644
93468--- a/include/linux/security.h
93469+++ b/include/linux/security.h
93470@@ -27,6 +27,7 @@
93471 #include <linux/slab.h>
93472 #include <linux/err.h>
93473 #include <linux/string.h>
93474+#include <linux/grsecurity.h>
93475
93476 struct linux_binprm;
93477 struct cred;
93478@@ -116,8 +117,6 @@ struct seq_file;
93479
93480 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
93481
93482-void reset_security_ops(void);
93483-
93484 #ifdef CONFIG_MMU
93485 extern unsigned long mmap_min_addr;
93486 extern unsigned long dac_mmap_min_addr;
93487@@ -1756,7 +1755,7 @@ struct security_operations {
93488 struct audit_context *actx);
93489 void (*audit_rule_free) (void *lsmrule);
93490 #endif /* CONFIG_AUDIT */
93491-};
93492+} __randomize_layout;
93493
93494 /* prototypes */
93495 extern int security_init(void);
93496diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
93497index dc368b8..e895209 100644
93498--- a/include/linux/semaphore.h
93499+++ b/include/linux/semaphore.h
93500@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
93501 }
93502
93503 extern void down(struct semaphore *sem);
93504-extern int __must_check down_interruptible(struct semaphore *sem);
93505+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
93506 extern int __must_check down_killable(struct semaphore *sem);
93507 extern int __must_check down_trylock(struct semaphore *sem);
93508 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
93509diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
93510index afbb1fd..e1d205d 100644
93511--- a/include/linux/seq_file.h
93512+++ b/include/linux/seq_file.h
93513@@ -27,6 +27,9 @@ struct seq_file {
93514 struct mutex lock;
93515 const struct seq_operations *op;
93516 int poll_event;
93517+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93518+ u64 exec_id;
93519+#endif
93520 #ifdef CONFIG_USER_NS
93521 struct user_namespace *user_ns;
93522 #endif
93523@@ -39,6 +42,7 @@ struct seq_operations {
93524 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
93525 int (*show) (struct seq_file *m, void *v);
93526 };
93527+typedef struct seq_operations __no_const seq_operations_no_const;
93528
93529 #define SEQ_SKIP 1
93530
93531@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
93532
93533 char *mangle_path(char *s, const char *p, const char *esc);
93534 int seq_open(struct file *, const struct seq_operations *);
93535+int seq_open_restrict(struct file *, const struct seq_operations *);
93536 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
93537 loff_t seq_lseek(struct file *, loff_t, int);
93538 int seq_release(struct inode *, struct file *);
93539@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
93540 const struct path *root, const char *esc);
93541
93542 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
93543+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
93544 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
93545 int single_release(struct inode *, struct file *);
93546 void *__seq_open_private(struct file *, const struct seq_operations *, int);
93547diff --git a/include/linux/shm.h b/include/linux/shm.h
93548index 6fb8016..ab4465e 100644
93549--- a/include/linux/shm.h
93550+++ b/include/linux/shm.h
93551@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
93552 /* The task created the shm object. NULL if the task is dead. */
93553 struct task_struct *shm_creator;
93554 struct list_head shm_clist; /* list by creator */
93555+#ifdef CONFIG_GRKERNSEC
93556+ u64 shm_createtime;
93557+ pid_t shm_lapid;
93558+#endif
93559 };
93560
93561 /* shm_mode upper byte flags */
93562diff --git a/include/linux/signal.h b/include/linux/signal.h
93563index ab1e039..ad4229e 100644
93564--- a/include/linux/signal.h
93565+++ b/include/linux/signal.h
93566@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
93567 * know it'll be handled, so that they don't get converted to
93568 * SIGKILL or just silently dropped.
93569 */
93570- kernel_sigaction(sig, (__force __sighandler_t)2);
93571+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
93572 }
93573
93574 static inline void disallow_signal(int sig)
93575diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
93576index bdccc4b..e9f8670 100644
93577--- a/include/linux/skbuff.h
93578+++ b/include/linux/skbuff.h
93579@@ -771,7 +771,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
93580 int node);
93581 struct sk_buff *__build_skb(void *data, unsigned int frag_size);
93582 struct sk_buff *build_skb(void *data, unsigned int frag_size);
93583-static inline struct sk_buff *alloc_skb(unsigned int size,
93584+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
93585 gfp_t priority)
93586 {
93587 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
93588@@ -1967,7 +1967,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
93589 return skb->inner_transport_header - skb->inner_network_header;
93590 }
93591
93592-static inline int skb_network_offset(const struct sk_buff *skb)
93593+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
93594 {
93595 return skb_network_header(skb) - skb->data;
93596 }
93597@@ -2027,7 +2027,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
93598 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
93599 */
93600 #ifndef NET_SKB_PAD
93601-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
93602+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
93603 #endif
93604
93605 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
93606@@ -2669,9 +2669,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
93607 int *err);
93608 unsigned int datagram_poll(struct file *file, struct socket *sock,
93609 struct poll_table_struct *wait);
93610-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
93611+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
93612 struct iov_iter *to, int size);
93613-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
93614+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
93615 struct msghdr *msg, int size)
93616 {
93617 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
93618@@ -3193,6 +3193,9 @@ static inline void nf_reset(struct sk_buff *skb)
93619 nf_bridge_put(skb->nf_bridge);
93620 skb->nf_bridge = NULL;
93621 #endif
93622+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
93623+ skb->nf_trace = 0;
93624+#endif
93625 }
93626
93627 static inline void nf_reset_trace(struct sk_buff *skb)
93628diff --git a/include/linux/slab.h b/include/linux/slab.h
93629index 76f1fee..d95e6d2 100644
93630--- a/include/linux/slab.h
93631+++ b/include/linux/slab.h
93632@@ -14,15 +14,29 @@
93633 #include <linux/gfp.h>
93634 #include <linux/types.h>
93635 #include <linux/workqueue.h>
93636-
93637+#include <linux/err.h>
93638
93639 /*
93640 * Flags to pass to kmem_cache_create().
93641 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
93642 */
93643 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
93644+
93645+#ifdef CONFIG_PAX_USERCOPY_SLABS
93646+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
93647+#else
93648+#define SLAB_USERCOPY 0x00000000UL
93649+#endif
93650+
93651 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
93652 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
93653+
93654+#ifdef CONFIG_PAX_MEMORY_SANITIZE
93655+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
93656+#else
93657+#define SLAB_NO_SANITIZE 0x00000000UL
93658+#endif
93659+
93660 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
93661 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
93662 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
93663@@ -98,10 +112,13 @@
93664 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
93665 * Both make kfree a no-op.
93666 */
93667-#define ZERO_SIZE_PTR ((void *)16)
93668+#define ZERO_SIZE_PTR \
93669+({ \
93670+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
93671+ (void *)(-MAX_ERRNO-1L); \
93672+})
93673
93674-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
93675- (unsigned long)ZERO_SIZE_PTR)
93676+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
93677
93678 #include <linux/kmemleak.h>
93679 #include <linux/kasan.h>
93680@@ -143,6 +160,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
93681 void kfree(const void *);
93682 void kzfree(const void *);
93683 size_t ksize(const void *);
93684+const char *check_heap_object(const void *ptr, unsigned long n);
93685+bool is_usercopy_object(const void *ptr);
93686
93687 /*
93688 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
93689@@ -235,6 +254,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
93690 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
93691 #endif
93692
93693+#ifdef CONFIG_PAX_USERCOPY_SLABS
93694+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
93695+#endif
93696+
93697 /*
93698 * Figure out which kmalloc slab an allocation of a certain size
93699 * belongs to.
93700@@ -243,7 +266,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
93701 * 2 = 120 .. 192 bytes
93702 * n = 2^(n-1) .. 2^n -1
93703 */
93704-static __always_inline int kmalloc_index(size_t size)
93705+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
93706 {
93707 if (!size)
93708 return 0;
93709@@ -286,15 +309,15 @@ static __always_inline int kmalloc_index(size_t size)
93710 }
93711 #endif /* !CONFIG_SLOB */
93712
93713-void *__kmalloc(size_t size, gfp_t flags);
93714+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
93715 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
93716 void kmem_cache_free(struct kmem_cache *, void *);
93717
93718 #ifdef CONFIG_NUMA
93719-void *__kmalloc_node(size_t size, gfp_t flags, int node);
93720+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
93721 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
93722 #else
93723-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
93724+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
93725 {
93726 return __kmalloc(size, flags);
93727 }
93728diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
93729index 33d0490..70a6313 100644
93730--- a/include/linux/slab_def.h
93731+++ b/include/linux/slab_def.h
93732@@ -40,7 +40,7 @@ struct kmem_cache {
93733 /* 4) cache creation/removal */
93734 const char *name;
93735 struct list_head list;
93736- int refcount;
93737+ atomic_t refcount;
93738 int object_size;
93739 int align;
93740
93741@@ -56,10 +56,14 @@ struct kmem_cache {
93742 unsigned long node_allocs;
93743 unsigned long node_frees;
93744 unsigned long node_overflow;
93745- atomic_t allochit;
93746- atomic_t allocmiss;
93747- atomic_t freehit;
93748- atomic_t freemiss;
93749+ atomic_unchecked_t allochit;
93750+ atomic_unchecked_t allocmiss;
93751+ atomic_unchecked_t freehit;
93752+ atomic_unchecked_t freemiss;
93753+#ifdef CONFIG_PAX_MEMORY_SANITIZE
93754+ atomic_unchecked_t sanitized;
93755+ atomic_unchecked_t not_sanitized;
93756+#endif
93757
93758 /*
93759 * If debugging is enabled, then the allocator can add additional
93760diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
93761index 3388511..6252f90 100644
93762--- a/include/linux/slub_def.h
93763+++ b/include/linux/slub_def.h
93764@@ -74,7 +74,7 @@ struct kmem_cache {
93765 struct kmem_cache_order_objects max;
93766 struct kmem_cache_order_objects min;
93767 gfp_t allocflags; /* gfp flags to use on each alloc */
93768- int refcount; /* Refcount for slab cache destroy */
93769+ atomic_t refcount; /* Refcount for slab cache destroy */
93770 void (*ctor)(void *);
93771 int inuse; /* Offset to metadata */
93772 int align; /* Alignment */
93773diff --git a/include/linux/smp.h b/include/linux/smp.h
93774index be91db2..3f23232 100644
93775--- a/include/linux/smp.h
93776+++ b/include/linux/smp.h
93777@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
93778 #endif
93779
93780 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
93781+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
93782 #define put_cpu() preempt_enable()
93783+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
93784
93785 /*
93786 * Callback to arch code if there's nosmp or maxcpus=0 on the
93787diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
93788index 46cca4c..3323536 100644
93789--- a/include/linux/sock_diag.h
93790+++ b/include/linux/sock_diag.h
93791@@ -11,7 +11,7 @@ struct sock;
93792 struct sock_diag_handler {
93793 __u8 family;
93794 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
93795-};
93796+} __do_const;
93797
93798 int sock_diag_register(const struct sock_diag_handler *h);
93799 void sock_diag_unregister(const struct sock_diag_handler *h);
93800diff --git a/include/linux/sonet.h b/include/linux/sonet.h
93801index 680f9a3..f13aeb0 100644
93802--- a/include/linux/sonet.h
93803+++ b/include/linux/sonet.h
93804@@ -7,7 +7,7 @@
93805 #include <uapi/linux/sonet.h>
93806
93807 struct k_sonet_stats {
93808-#define __HANDLE_ITEM(i) atomic_t i
93809+#define __HANDLE_ITEM(i) atomic_unchecked_t i
93810 __SONET_ITEMS
93811 #undef __HANDLE_ITEM
93812 };
93813diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
93814index 07d8e53..dc934c9 100644
93815--- a/include/linux/sunrpc/addr.h
93816+++ b/include/linux/sunrpc/addr.h
93817@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
93818 {
93819 switch (sap->sa_family) {
93820 case AF_INET:
93821- return ntohs(((struct sockaddr_in *)sap)->sin_port);
93822+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
93823 case AF_INET6:
93824- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
93825+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
93826 }
93827 return 0;
93828 }
93829@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
93830 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
93831 const struct sockaddr *src)
93832 {
93833- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
93834+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
93835 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
93836
93837 dsin->sin_family = ssin->sin_family;
93838@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
93839 if (sa->sa_family != AF_INET6)
93840 return 0;
93841
93842- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
93843+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
93844 }
93845
93846 #endif /* _LINUX_SUNRPC_ADDR_H */
93847diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
93848index 598ba80..d90cba6 100644
93849--- a/include/linux/sunrpc/clnt.h
93850+++ b/include/linux/sunrpc/clnt.h
93851@@ -100,7 +100,7 @@ struct rpc_procinfo {
93852 unsigned int p_timer; /* Which RTT timer to use */
93853 u32 p_statidx; /* Which procedure to account */
93854 const char * p_name; /* name of procedure */
93855-};
93856+} __do_const;
93857
93858 #ifdef __KERNEL__
93859
93860diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
93861index fae6fb9..023fbcd 100644
93862--- a/include/linux/sunrpc/svc.h
93863+++ b/include/linux/sunrpc/svc.h
93864@@ -420,7 +420,7 @@ struct svc_procedure {
93865 unsigned int pc_count; /* call count */
93866 unsigned int pc_cachetype; /* cache info (NFS) */
93867 unsigned int pc_xdrressize; /* maximum size of XDR reply */
93868-};
93869+} __do_const;
93870
93871 /*
93872 * Function prototypes.
93873diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
93874index df8edf8..d140fec 100644
93875--- a/include/linux/sunrpc/svc_rdma.h
93876+++ b/include/linux/sunrpc/svc_rdma.h
93877@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
93878 extern unsigned int svcrdma_max_requests;
93879 extern unsigned int svcrdma_max_req_size;
93880
93881-extern atomic_t rdma_stat_recv;
93882-extern atomic_t rdma_stat_read;
93883-extern atomic_t rdma_stat_write;
93884-extern atomic_t rdma_stat_sq_starve;
93885-extern atomic_t rdma_stat_rq_starve;
93886-extern atomic_t rdma_stat_rq_poll;
93887-extern atomic_t rdma_stat_rq_prod;
93888-extern atomic_t rdma_stat_sq_poll;
93889-extern atomic_t rdma_stat_sq_prod;
93890+extern atomic_unchecked_t rdma_stat_recv;
93891+extern atomic_unchecked_t rdma_stat_read;
93892+extern atomic_unchecked_t rdma_stat_write;
93893+extern atomic_unchecked_t rdma_stat_sq_starve;
93894+extern atomic_unchecked_t rdma_stat_rq_starve;
93895+extern atomic_unchecked_t rdma_stat_rq_poll;
93896+extern atomic_unchecked_t rdma_stat_rq_prod;
93897+extern atomic_unchecked_t rdma_stat_sq_poll;
93898+extern atomic_unchecked_t rdma_stat_sq_prod;
93899
93900 /*
93901 * Contexts are built when an RDMA request is created and are a
93902diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
93903index 8d71d65..f79586e 100644
93904--- a/include/linux/sunrpc/svcauth.h
93905+++ b/include/linux/sunrpc/svcauth.h
93906@@ -120,7 +120,7 @@ struct auth_ops {
93907 int (*release)(struct svc_rqst *rq);
93908 void (*domain_release)(struct auth_domain *);
93909 int (*set_client)(struct svc_rqst *rq);
93910-};
93911+} __do_const;
93912
93913 #define SVC_GARBAGE 1
93914 #define SVC_SYSERR 2
93915diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
93916index e7a018e..49f8b17 100644
93917--- a/include/linux/swiotlb.h
93918+++ b/include/linux/swiotlb.h
93919@@ -60,7 +60,8 @@ extern void
93920
93921 extern void
93922 swiotlb_free_coherent(struct device *hwdev, size_t size,
93923- void *vaddr, dma_addr_t dma_handle);
93924+ void *vaddr, dma_addr_t dma_handle,
93925+ struct dma_attrs *attrs);
93926
93927 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
93928 unsigned long offset, size_t size,
93929diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
93930index 76d1e38..200776e 100644
93931--- a/include/linux/syscalls.h
93932+++ b/include/linux/syscalls.h
93933@@ -102,7 +102,12 @@ union bpf_attr;
93934 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
93935 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
93936 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
93937-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
93938+#define __SC_LONG(t, a) __typeof__( \
93939+ __builtin_choose_expr( \
93940+ sizeof(t) > sizeof(int), \
93941+ (t) 0, \
93942+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
93943+ )) a
93944 #define __SC_CAST(t, a) (t) a
93945 #define __SC_ARGS(t, a) a
93946 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
93947@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
93948 asmlinkage long sys_fsync(unsigned int fd);
93949 asmlinkage long sys_fdatasync(unsigned int fd);
93950 asmlinkage long sys_bdflush(int func, long data);
93951-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
93952- char __user *type, unsigned long flags,
93953+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
93954+ const char __user *type, unsigned long flags,
93955 void __user *data);
93956-asmlinkage long sys_umount(char __user *name, int flags);
93957-asmlinkage long sys_oldumount(char __user *name);
93958+asmlinkage long sys_umount(const char __user *name, int flags);
93959+asmlinkage long sys_oldumount(const char __user *name);
93960 asmlinkage long sys_truncate(const char __user *path, long length);
93961 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
93962 asmlinkage long sys_stat(const char __user *filename,
93963@@ -604,7 +609,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
93964 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
93965 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
93966 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
93967- struct sockaddr __user *, int);
93968+ struct sockaddr __user *, int) __intentional_overflow(0);
93969 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
93970 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
93971 unsigned int vlen, unsigned flags);
93972@@ -663,10 +668,10 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
93973
93974 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
93975 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
93976- unsigned nsops);
93977+ long nsops);
93978 asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
93979 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
93980- unsigned nsops,
93981+ long nsops,
93982 const struct timespec __user *timeout);
93983 asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
93984 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
93985diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
93986index 27b3b0b..e093dd9 100644
93987--- a/include/linux/syscore_ops.h
93988+++ b/include/linux/syscore_ops.h
93989@@ -16,7 +16,7 @@ struct syscore_ops {
93990 int (*suspend)(void);
93991 void (*resume)(void);
93992 void (*shutdown)(void);
93993-};
93994+} __do_const;
93995
93996 extern void register_syscore_ops(struct syscore_ops *ops);
93997 extern void unregister_syscore_ops(struct syscore_ops *ops);
93998diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
93999index b7361f8..341a15a 100644
94000--- a/include/linux/sysctl.h
94001+++ b/include/linux/sysctl.h
94002@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
94003
94004 extern int proc_dostring(struct ctl_table *, int,
94005 void __user *, size_t *, loff_t *);
94006+extern int proc_dostring_modpriv(struct ctl_table *, int,
94007+ void __user *, size_t *, loff_t *);
94008 extern int proc_dointvec(struct ctl_table *, int,
94009 void __user *, size_t *, loff_t *);
94010 extern int proc_dointvec_minmax(struct ctl_table *, int,
94011@@ -113,7 +115,8 @@ struct ctl_table
94012 struct ctl_table_poll *poll;
94013 void *extra1;
94014 void *extra2;
94015-};
94016+} __do_const __randomize_layout;
94017+typedef struct ctl_table __no_const ctl_table_no_const;
94018
94019 struct ctl_node {
94020 struct rb_node node;
94021diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
94022index ddad161..a3efd26 100644
94023--- a/include/linux/sysfs.h
94024+++ b/include/linux/sysfs.h
94025@@ -34,7 +34,8 @@ struct attribute {
94026 struct lock_class_key *key;
94027 struct lock_class_key skey;
94028 #endif
94029-};
94030+} __do_const;
94031+typedef struct attribute __no_const attribute_no_const;
94032
94033 /**
94034 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
94035@@ -63,7 +64,8 @@ struct attribute_group {
94036 struct attribute *, int);
94037 struct attribute **attrs;
94038 struct bin_attribute **bin_attrs;
94039-};
94040+} __do_const;
94041+typedef struct attribute_group __no_const attribute_group_no_const;
94042
94043 /**
94044 * Use these macros to make defining attributes easier. See include/linux/device.h
94045@@ -137,7 +139,8 @@ struct bin_attribute {
94046 char *, loff_t, size_t);
94047 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
94048 struct vm_area_struct *vma);
94049-};
94050+} __do_const;
94051+typedef struct bin_attribute __no_const bin_attribute_no_const;
94052
94053 /**
94054 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
94055diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
94056index 387fa7d..3fcde6b 100644
94057--- a/include/linux/sysrq.h
94058+++ b/include/linux/sysrq.h
94059@@ -16,6 +16,7 @@
94060
94061 #include <linux/errno.h>
94062 #include <linux/types.h>
94063+#include <linux/compiler.h>
94064
94065 /* Possible values of bitmask for enabling sysrq functions */
94066 /* 0x0001 is reserved for enable everything */
94067@@ -33,7 +34,7 @@ struct sysrq_key_op {
94068 char *help_msg;
94069 char *action_msg;
94070 int enable_mask;
94071-};
94072+} __do_const;
94073
94074 #ifdef CONFIG_MAGIC_SYSRQ
94075
94076diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
94077index ff307b5..f1a4468 100644
94078--- a/include/linux/thread_info.h
94079+++ b/include/linux/thread_info.h
94080@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
94081 #error "no set_restore_sigmask() provided and default one won't work"
94082 #endif
94083
94084+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
94085+
94086+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
94087+{
94088+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
94089+}
94090+
94091 #endif /* __KERNEL__ */
94092
94093 #endif /* _LINUX_THREAD_INFO_H */
94094diff --git a/include/linux/tty.h b/include/linux/tty.h
94095index 790752a..36d9b54 100644
94096--- a/include/linux/tty.h
94097+++ b/include/linux/tty.h
94098@@ -225,7 +225,7 @@ struct tty_port {
94099 const struct tty_port_operations *ops; /* Port operations */
94100 spinlock_t lock; /* Lock protecting tty field */
94101 int blocked_open; /* Waiting to open */
94102- int count; /* Usage count */
94103+ atomic_t count; /* Usage count */
94104 wait_queue_head_t open_wait; /* Open waiters */
94105 wait_queue_head_t close_wait; /* Close waiters */
94106 wait_queue_head_t delta_msr_wait; /* Modem status change */
94107@@ -313,7 +313,7 @@ struct tty_struct {
94108 /* If the tty has a pending do_SAK, queue it here - akpm */
94109 struct work_struct SAK_work;
94110 struct tty_port *port;
94111-};
94112+} __randomize_layout;
94113
94114 /* Each of a tty's open files has private_data pointing to tty_file_private */
94115 struct tty_file_private {
94116@@ -572,7 +572,7 @@ extern int tty_port_open(struct tty_port *port,
94117 struct tty_struct *tty, struct file *filp);
94118 static inline int tty_port_users(struct tty_port *port)
94119 {
94120- return port->count + port->blocked_open;
94121+ return atomic_read(&port->count) + port->blocked_open;
94122 }
94123
94124 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
94125diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
94126index 92e337c..f46757b 100644
94127--- a/include/linux/tty_driver.h
94128+++ b/include/linux/tty_driver.h
94129@@ -291,7 +291,7 @@ struct tty_operations {
94130 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
94131 #endif
94132 const struct file_operations *proc_fops;
94133-};
94134+} __do_const __randomize_layout;
94135
94136 struct tty_driver {
94137 int magic; /* magic number for this structure */
94138@@ -325,7 +325,7 @@ struct tty_driver {
94139
94140 const struct tty_operations *ops;
94141 struct list_head tty_drivers;
94142-};
94143+} __randomize_layout;
94144
94145 extern struct list_head tty_drivers;
94146
94147diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
94148index 00c9d68..bc0188b 100644
94149--- a/include/linux/tty_ldisc.h
94150+++ b/include/linux/tty_ldisc.h
94151@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
94152
94153 struct module *owner;
94154
94155- int refcount;
94156+ atomic_t refcount;
94157 };
94158
94159 struct tty_ldisc {
94160diff --git a/include/linux/types.h b/include/linux/types.h
94161index 6747247..fc7ec8b 100644
94162--- a/include/linux/types.h
94163+++ b/include/linux/types.h
94164@@ -174,10 +174,26 @@ typedef struct {
94165 int counter;
94166 } atomic_t;
94167
94168+#ifdef CONFIG_PAX_REFCOUNT
94169+typedef struct {
94170+ int counter;
94171+} atomic_unchecked_t;
94172+#else
94173+typedef atomic_t atomic_unchecked_t;
94174+#endif
94175+
94176 #ifdef CONFIG_64BIT
94177 typedef struct {
94178 long counter;
94179 } atomic64_t;
94180+
94181+#ifdef CONFIG_PAX_REFCOUNT
94182+typedef struct {
94183+ long counter;
94184+} atomic64_unchecked_t;
94185+#else
94186+typedef atomic64_t atomic64_unchecked_t;
94187+#endif
94188 #endif
94189
94190 struct list_head {
94191diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
94192index ecd3319..8a36ded 100644
94193--- a/include/linux/uaccess.h
94194+++ b/include/linux/uaccess.h
94195@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
94196 long ret; \
94197 mm_segment_t old_fs = get_fs(); \
94198 \
94199- set_fs(KERNEL_DS); \
94200 pagefault_disable(); \
94201- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
94202- pagefault_enable(); \
94203+ set_fs(KERNEL_DS); \
94204+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
94205 set_fs(old_fs); \
94206+ pagefault_enable(); \
94207 ret; \
94208 })
94209
94210diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
94211index 2d1f9b6..d7a9fce 100644
94212--- a/include/linux/uidgid.h
94213+++ b/include/linux/uidgid.h
94214@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
94215
94216 #endif /* CONFIG_USER_NS */
94217
94218+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
94219+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
94220+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
94221+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
94222+
94223 #endif /* _LINUX_UIDGID_H */
94224diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
94225index 32c0e83..671eb35 100644
94226--- a/include/linux/uio_driver.h
94227+++ b/include/linux/uio_driver.h
94228@@ -67,7 +67,7 @@ struct uio_device {
94229 struct module *owner;
94230 struct device *dev;
94231 int minor;
94232- atomic_t event;
94233+ atomic_unchecked_t event;
94234 struct fasync_struct *async_queue;
94235 wait_queue_head_t wait;
94236 struct uio_info *info;
94237diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
94238index 99c1b4d..562e6f3 100644
94239--- a/include/linux/unaligned/access_ok.h
94240+++ b/include/linux/unaligned/access_ok.h
94241@@ -4,34 +4,34 @@
94242 #include <linux/kernel.h>
94243 #include <asm/byteorder.h>
94244
94245-static inline u16 get_unaligned_le16(const void *p)
94246+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
94247 {
94248- return le16_to_cpup((__le16 *)p);
94249+ return le16_to_cpup((const __le16 *)p);
94250 }
94251
94252-static inline u32 get_unaligned_le32(const void *p)
94253+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
94254 {
94255- return le32_to_cpup((__le32 *)p);
94256+ return le32_to_cpup((const __le32 *)p);
94257 }
94258
94259-static inline u64 get_unaligned_le64(const void *p)
94260+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
94261 {
94262- return le64_to_cpup((__le64 *)p);
94263+ return le64_to_cpup((const __le64 *)p);
94264 }
94265
94266-static inline u16 get_unaligned_be16(const void *p)
94267+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
94268 {
94269- return be16_to_cpup((__be16 *)p);
94270+ return be16_to_cpup((const __be16 *)p);
94271 }
94272
94273-static inline u32 get_unaligned_be32(const void *p)
94274+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
94275 {
94276- return be32_to_cpup((__be32 *)p);
94277+ return be32_to_cpup((const __be32 *)p);
94278 }
94279
94280-static inline u64 get_unaligned_be64(const void *p)
94281+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
94282 {
94283- return be64_to_cpup((__be64 *)p);
94284+ return be64_to_cpup((const __be64 *)p);
94285 }
94286
94287 static inline void put_unaligned_le16(u16 val, void *p)
94288diff --git a/include/linux/usb.h b/include/linux/usb.h
94289index 447fe29..9fc875f 100644
94290--- a/include/linux/usb.h
94291+++ b/include/linux/usb.h
94292@@ -592,7 +592,7 @@ struct usb_device {
94293 int maxchild;
94294
94295 u32 quirks;
94296- atomic_t urbnum;
94297+ atomic_unchecked_t urbnum;
94298
94299 unsigned long active_duration;
94300
94301@@ -1676,7 +1676,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
94302
94303 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
94304 __u8 request, __u8 requesttype, __u16 value, __u16 index,
94305- void *data, __u16 size, int timeout);
94306+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
94307 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
94308 void *data, int len, int *actual_length, int timeout);
94309 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
94310diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
94311index 9fd9e48..e2c5f35 100644
94312--- a/include/linux/usb/renesas_usbhs.h
94313+++ b/include/linux/usb/renesas_usbhs.h
94314@@ -39,7 +39,7 @@ enum {
94315 */
94316 struct renesas_usbhs_driver_callback {
94317 int (*notify_hotplug)(struct platform_device *pdev);
94318-};
94319+} __no_const;
94320
94321 /*
94322 * callback functions for platform
94323diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
94324index 8297e5b..0dfae27 100644
94325--- a/include/linux/user_namespace.h
94326+++ b/include/linux/user_namespace.h
94327@@ -39,7 +39,7 @@ struct user_namespace {
94328 struct key *persistent_keyring_register;
94329 struct rw_semaphore persistent_keyring_register_sem;
94330 #endif
94331-};
94332+} __randomize_layout;
94333
94334 extern struct user_namespace init_user_ns;
94335
94336diff --git a/include/linux/utsname.h b/include/linux/utsname.h
94337index 5093f58..c103e58 100644
94338--- a/include/linux/utsname.h
94339+++ b/include/linux/utsname.h
94340@@ -25,7 +25,7 @@ struct uts_namespace {
94341 struct new_utsname name;
94342 struct user_namespace *user_ns;
94343 struct ns_common ns;
94344-};
94345+} __randomize_layout;
94346 extern struct uts_namespace init_uts_ns;
94347
94348 #ifdef CONFIG_UTS_NS
94349diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
94350index 6f8fbcf..4efc177 100644
94351--- a/include/linux/vermagic.h
94352+++ b/include/linux/vermagic.h
94353@@ -25,9 +25,42 @@
94354 #define MODULE_ARCH_VERMAGIC ""
94355 #endif
94356
94357+#ifdef CONFIG_PAX_REFCOUNT
94358+#define MODULE_PAX_REFCOUNT "REFCOUNT "
94359+#else
94360+#define MODULE_PAX_REFCOUNT ""
94361+#endif
94362+
94363+#ifdef CONSTIFY_PLUGIN
94364+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
94365+#else
94366+#define MODULE_CONSTIFY_PLUGIN ""
94367+#endif
94368+
94369+#ifdef STACKLEAK_PLUGIN
94370+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
94371+#else
94372+#define MODULE_STACKLEAK_PLUGIN ""
94373+#endif
94374+
94375+#ifdef RANDSTRUCT_PLUGIN
94376+#include <generated/randomize_layout_hash.h>
94377+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
94378+#else
94379+#define MODULE_RANDSTRUCT_PLUGIN
94380+#endif
94381+
94382+#ifdef CONFIG_GRKERNSEC
94383+#define MODULE_GRSEC "GRSEC "
94384+#else
94385+#define MODULE_GRSEC ""
94386+#endif
94387+
94388 #define VERMAGIC_STRING \
94389 UTS_RELEASE " " \
94390 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
94391 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
94392- MODULE_ARCH_VERMAGIC
94393+ MODULE_ARCH_VERMAGIC \
94394+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
94395+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
94396
94397diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
94398index b483abd..af305ad 100644
94399--- a/include/linux/vga_switcheroo.h
94400+++ b/include/linux/vga_switcheroo.h
94401@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
94402
94403 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
94404
94405-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
94406+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
94407 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
94408-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
94409+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
94410 #else
94411
94412 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
94413@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
94414
94415 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
94416
94417-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
94418+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
94419 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
94420-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
94421+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
94422
94423 #endif
94424 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
94425diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
94426index 0ec5983..cc61051 100644
94427--- a/include/linux/vmalloc.h
94428+++ b/include/linux/vmalloc.h
94429@@ -18,6 +18,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
94430 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
94431 #define VM_NO_GUARD 0x00000040 /* don't add guard page */
94432 #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
94433+
94434+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
94435+#define VM_KERNEXEC 0x00000100 /* allocate from executable kernel memory range */
94436+#endif
94437+
94438 /* bits [20..32] reserved for arch specific ioremap internals */
94439
94440 /*
94441@@ -86,6 +91,10 @@ extern void *vmap(struct page **pages, unsigned int count,
94442 unsigned long flags, pgprot_t prot);
94443 extern void vunmap(const void *addr);
94444
94445+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
94446+extern void unmap_process_stacks(struct task_struct *task);
94447+#endif
94448+
94449 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
94450 unsigned long uaddr, void *kaddr,
94451 unsigned long size);
94452@@ -150,7 +159,7 @@ extern void free_vm_area(struct vm_struct *area);
94453
94454 /* for /dev/kmem */
94455 extern long vread(char *buf, char *addr, unsigned long count);
94456-extern long vwrite(char *buf, char *addr, unsigned long count);
94457+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
94458
94459 /*
94460 * Internals. Dont't use..
94461diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
94462index 82e7db7..f8ce3d0 100644
94463--- a/include/linux/vmstat.h
94464+++ b/include/linux/vmstat.h
94465@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
94466 /*
94467 * Zone based page accounting with per cpu differentials.
94468 */
94469-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
94470+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
94471
94472 static inline void zone_page_state_add(long x, struct zone *zone,
94473 enum zone_stat_item item)
94474 {
94475- atomic_long_add(x, &zone->vm_stat[item]);
94476- atomic_long_add(x, &vm_stat[item]);
94477+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
94478+ atomic_long_add_unchecked(x, &vm_stat[item]);
94479 }
94480
94481-static inline unsigned long global_page_state(enum zone_stat_item item)
94482+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
94483 {
94484- long x = atomic_long_read(&vm_stat[item]);
94485+ long x = atomic_long_read_unchecked(&vm_stat[item]);
94486 #ifdef CONFIG_SMP
94487 if (x < 0)
94488 x = 0;
94489@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
94490 return x;
94491 }
94492
94493-static inline unsigned long zone_page_state(struct zone *zone,
94494+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
94495 enum zone_stat_item item)
94496 {
94497- long x = atomic_long_read(&zone->vm_stat[item]);
94498+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
94499 #ifdef CONFIG_SMP
94500 if (x < 0)
94501 x = 0;
94502@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
94503 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
94504 enum zone_stat_item item)
94505 {
94506- long x = atomic_long_read(&zone->vm_stat[item]);
94507+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
94508
94509 #ifdef CONFIG_SMP
94510 int cpu;
94511@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
94512
94513 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
94514 {
94515- atomic_long_inc(&zone->vm_stat[item]);
94516- atomic_long_inc(&vm_stat[item]);
94517+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
94518+ atomic_long_inc_unchecked(&vm_stat[item]);
94519 }
94520
94521 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
94522 {
94523- atomic_long_dec(&zone->vm_stat[item]);
94524- atomic_long_dec(&vm_stat[item]);
94525+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
94526+ atomic_long_dec_unchecked(&vm_stat[item]);
94527 }
94528
94529 static inline void __inc_zone_page_state(struct page *page,
94530diff --git a/include/linux/xattr.h b/include/linux/xattr.h
94531index 91b0a68..0e9adf6 100644
94532--- a/include/linux/xattr.h
94533+++ b/include/linux/xattr.h
94534@@ -28,7 +28,7 @@ struct xattr_handler {
94535 size_t size, int handler_flags);
94536 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
94537 size_t size, int flags, int handler_flags);
94538-};
94539+} __do_const;
94540
94541 struct xattr {
94542 const char *name;
94543@@ -37,6 +37,9 @@ struct xattr {
94544 };
94545
94546 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
94547+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
94548+ssize_t pax_getxattr(struct dentry *, void *, size_t);
94549+#endif
94550 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
94551 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
94552 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
94553diff --git a/include/linux/zlib.h b/include/linux/zlib.h
94554index 92dbbd3..13ab0b3 100644
94555--- a/include/linux/zlib.h
94556+++ b/include/linux/zlib.h
94557@@ -31,6 +31,7 @@
94558 #define _ZLIB_H
94559
94560 #include <linux/zconf.h>
94561+#include <linux/compiler.h>
94562
94563 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
94564 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
94565@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
94566
94567 /* basic functions */
94568
94569-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
94570+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
94571 /*
94572 Returns the number of bytes that needs to be allocated for a per-
94573 stream workspace with the specified parameters. A pointer to this
94574diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
94575index 3e4fddf..5ec9104 100644
94576--- a/include/media/v4l2-dev.h
94577+++ b/include/media/v4l2-dev.h
94578@@ -75,7 +75,7 @@ struct v4l2_file_operations {
94579 int (*mmap) (struct file *, struct vm_area_struct *);
94580 int (*open) (struct file *);
94581 int (*release) (struct file *);
94582-};
94583+} __do_const;
94584
94585 /*
94586 * Newer version of video_device, handled by videodev2.c
94587diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
94588index ffb69da..040393e 100644
94589--- a/include/media/v4l2-device.h
94590+++ b/include/media/v4l2-device.h
94591@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
94592 this function returns 0. If the name ends with a digit (e.g. cx18),
94593 then the name will be set to cx18-0 since cx180 looks really odd. */
94594 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
94595- atomic_t *instance);
94596+ atomic_unchecked_t *instance);
94597
94598 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
94599 Since the parent disappears this ensures that v4l2_dev doesn't have an
94600diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
94601index 2a25dec..bf6dd8a 100644
94602--- a/include/net/9p/transport.h
94603+++ b/include/net/9p/transport.h
94604@@ -62,7 +62,7 @@ struct p9_trans_module {
94605 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
94606 int (*zc_request)(struct p9_client *, struct p9_req_t *,
94607 char *, char *, int , int, int, int);
94608-};
94609+} __do_const;
94610
94611 void v9fs_register_trans(struct p9_trans_module *m);
94612 void v9fs_unregister_trans(struct p9_trans_module *m);
94613diff --git a/include/net/af_unix.h b/include/net/af_unix.h
94614index a175ba4..196eb8242 100644
94615--- a/include/net/af_unix.h
94616+++ b/include/net/af_unix.h
94617@@ -36,7 +36,7 @@ struct unix_skb_parms {
94618 u32 secid; /* Security ID */
94619 #endif
94620 u32 consumed;
94621-};
94622+} __randomize_layout;
94623
94624 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
94625 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
94626diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
94627index 2239a37..a83461f 100644
94628--- a/include/net/bluetooth/l2cap.h
94629+++ b/include/net/bluetooth/l2cap.h
94630@@ -609,7 +609,7 @@ struct l2cap_ops {
94631 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
94632 unsigned long hdr_len,
94633 unsigned long len, int nb);
94634-};
94635+} __do_const;
94636
94637 struct l2cap_conn {
94638 struct hci_conn *hcon;
94639diff --git a/include/net/bonding.h b/include/net/bonding.h
94640index fda6fee..dbdf83c 100644
94641--- a/include/net/bonding.h
94642+++ b/include/net/bonding.h
94643@@ -665,7 +665,7 @@ extern struct rtnl_link_ops bond_link_ops;
94644
94645 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
94646 {
94647- atomic_long_inc(&dev->tx_dropped);
94648+ atomic_long_inc_unchecked(&dev->tx_dropped);
94649 dev_kfree_skb_any(skb);
94650 }
94651
94652diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
94653index f2ae33d..c457cf0 100644
94654--- a/include/net/caif/cfctrl.h
94655+++ b/include/net/caif/cfctrl.h
94656@@ -52,7 +52,7 @@ struct cfctrl_rsp {
94657 void (*radioset_rsp)(void);
94658 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
94659 struct cflayer *client_layer);
94660-};
94661+} __no_const;
94662
94663 /* Link Setup Parameters for CAIF-Links. */
94664 struct cfctrl_link_param {
94665@@ -101,8 +101,8 @@ struct cfctrl_request_info {
94666 struct cfctrl {
94667 struct cfsrvl serv;
94668 struct cfctrl_rsp res;
94669- atomic_t req_seq_no;
94670- atomic_t rsp_seq_no;
94671+ atomic_unchecked_t req_seq_no;
94672+ atomic_unchecked_t rsp_seq_no;
94673 struct list_head list;
94674 /* Protects from simultaneous access to first_req list */
94675 spinlock_t info_list_lock;
94676diff --git a/include/net/flow.h b/include/net/flow.h
94677index 8109a15..504466d 100644
94678--- a/include/net/flow.h
94679+++ b/include/net/flow.h
94680@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
94681
94682 void flow_cache_flush(struct net *net);
94683 void flow_cache_flush_deferred(struct net *net);
94684-extern atomic_t flow_cache_genid;
94685+extern atomic_unchecked_t flow_cache_genid;
94686
94687 #endif
94688diff --git a/include/net/genetlink.h b/include/net/genetlink.h
94689index 0574abd..0f16881 100644
94690--- a/include/net/genetlink.h
94691+++ b/include/net/genetlink.h
94692@@ -130,7 +130,7 @@ struct genl_ops {
94693 u8 cmd;
94694 u8 internal_flags;
94695 u8 flags;
94696-};
94697+} __do_const;
94698
94699 int __genl_register_family(struct genl_family *family);
94700
94701diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
94702index 0f712c0..cd762c4 100644
94703--- a/include/net/gro_cells.h
94704+++ b/include/net/gro_cells.h
94705@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
94706 cell = this_cpu_ptr(gcells->cells);
94707
94708 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
94709- atomic_long_inc(&dev->rx_dropped);
94710+ atomic_long_inc_unchecked(&dev->rx_dropped);
94711 kfree_skb(skb);
94712 return;
94713 }
94714diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
94715index 5976bde..3a81660 100644
94716--- a/include/net/inet_connection_sock.h
94717+++ b/include/net/inet_connection_sock.h
94718@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
94719 int (*bind_conflict)(const struct sock *sk,
94720 const struct inet_bind_bucket *tb, bool relax);
94721 void (*mtu_reduced)(struct sock *sk);
94722-};
94723+} __do_const;
94724
94725 /** inet_connection_sock - INET connection oriented sock
94726 *
94727diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
94728index 80479ab..0c3f647 100644
94729--- a/include/net/inetpeer.h
94730+++ b/include/net/inetpeer.h
94731@@ -47,7 +47,7 @@ struct inet_peer {
94732 */
94733 union {
94734 struct {
94735- atomic_t rid; /* Frag reception counter */
94736+ atomic_unchecked_t rid; /* Frag reception counter */
94737 };
94738 struct rcu_head rcu;
94739 struct inet_peer *gc_next;
94740diff --git a/include/net/ip.h b/include/net/ip.h
94741index 6cc1eaf..14059b0 100644
94742--- a/include/net/ip.h
94743+++ b/include/net/ip.h
94744@@ -317,7 +317,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
94745 }
94746 }
94747
94748-u32 ip_idents_reserve(u32 hash, int segs);
94749+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
94750 void __ip_select_ident(struct iphdr *iph, int segs);
94751
94752 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
94753diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
94754index 5bd120e4..03fb812 100644
94755--- a/include/net/ip_fib.h
94756+++ b/include/net/ip_fib.h
94757@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
94758
94759 #define FIB_RES_SADDR(net, res) \
94760 ((FIB_RES_NH(res).nh_saddr_genid == \
94761- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
94762+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
94763 FIB_RES_NH(res).nh_saddr : \
94764 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
94765 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
94766diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
94767index 615b20b..fd4cbd8 100644
94768--- a/include/net/ip_vs.h
94769+++ b/include/net/ip_vs.h
94770@@ -534,7 +534,7 @@ struct ip_vs_conn {
94771 struct ip_vs_conn *control; /* Master control connection */
94772 atomic_t n_control; /* Number of controlled ones */
94773 struct ip_vs_dest *dest; /* real server */
94774- atomic_t in_pkts; /* incoming packet counter */
94775+ atomic_unchecked_t in_pkts; /* incoming packet counter */
94776
94777 /* Packet transmitter for different forwarding methods. If it
94778 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
94779@@ -682,7 +682,7 @@ struct ip_vs_dest {
94780 __be16 port; /* port number of the server */
94781 union nf_inet_addr addr; /* IP address of the server */
94782 volatile unsigned int flags; /* dest status flags */
94783- atomic_t conn_flags; /* flags to copy to conn */
94784+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
94785 atomic_t weight; /* server weight */
94786
94787 atomic_t refcnt; /* reference counter */
94788@@ -928,11 +928,11 @@ struct netns_ipvs {
94789 /* ip_vs_lblc */
94790 int sysctl_lblc_expiration;
94791 struct ctl_table_header *lblc_ctl_header;
94792- struct ctl_table *lblc_ctl_table;
94793+ ctl_table_no_const *lblc_ctl_table;
94794 /* ip_vs_lblcr */
94795 int sysctl_lblcr_expiration;
94796 struct ctl_table_header *lblcr_ctl_header;
94797- struct ctl_table *lblcr_ctl_table;
94798+ ctl_table_no_const *lblcr_ctl_table;
94799 /* ip_vs_est */
94800 struct list_head est_list; /* estimator list */
94801 spinlock_t est_lock;
94802diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
94803index 8d4f588..2e37ad2 100644
94804--- a/include/net/irda/ircomm_tty.h
94805+++ b/include/net/irda/ircomm_tty.h
94806@@ -33,6 +33,7 @@
94807 #include <linux/termios.h>
94808 #include <linux/timer.h>
94809 #include <linux/tty.h> /* struct tty_struct */
94810+#include <asm/local.h>
94811
94812 #include <net/irda/irias_object.h>
94813 #include <net/irda/ircomm_core.h>
94814diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
94815index 714cc9a..ea05f3e 100644
94816--- a/include/net/iucv/af_iucv.h
94817+++ b/include/net/iucv/af_iucv.h
94818@@ -149,7 +149,7 @@ struct iucv_skb_cb {
94819 struct iucv_sock_list {
94820 struct hlist_head head;
94821 rwlock_t lock;
94822- atomic_t autobind_name;
94823+ atomic_unchecked_t autobind_name;
94824 };
94825
94826 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
94827diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
94828index f3be818..bf46196 100644
94829--- a/include/net/llc_c_ac.h
94830+++ b/include/net/llc_c_ac.h
94831@@ -87,7 +87,7 @@
94832 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
94833 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
94834
94835-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
94836+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
94837
94838 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
94839 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
94840diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
94841index 3948cf1..83b28c4 100644
94842--- a/include/net/llc_c_ev.h
94843+++ b/include/net/llc_c_ev.h
94844@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
94845 return (struct llc_conn_state_ev *)skb->cb;
94846 }
94847
94848-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
94849-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
94850+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
94851+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
94852
94853 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
94854 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
94855diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
94856index 48f3f89..0e92c50 100644
94857--- a/include/net/llc_c_st.h
94858+++ b/include/net/llc_c_st.h
94859@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
94860 u8 next_state;
94861 const llc_conn_ev_qfyr_t *ev_qualifiers;
94862 const llc_conn_action_t *ev_actions;
94863-};
94864+} __do_const;
94865
94866 struct llc_conn_state {
94867 u8 current_state;
94868diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
94869index a61b98c..aade1eb 100644
94870--- a/include/net/llc_s_ac.h
94871+++ b/include/net/llc_s_ac.h
94872@@ -23,7 +23,7 @@
94873 #define SAP_ACT_TEST_IND 9
94874
94875 /* All action functions must look like this */
94876-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
94877+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
94878
94879 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
94880 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
94881diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
94882index c4359e2..76dbc4a 100644
94883--- a/include/net/llc_s_st.h
94884+++ b/include/net/llc_s_st.h
94885@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
94886 llc_sap_ev_t ev;
94887 u8 next_state;
94888 const llc_sap_action_t *ev_actions;
94889-};
94890+} __do_const;
94891
94892 struct llc_sap_state {
94893 u8 curr_state;
94894diff --git a/include/net/mac80211.h b/include/net/mac80211.h
94895index d52914b..2b13cec 100644
94896--- a/include/net/mac80211.h
94897+++ b/include/net/mac80211.h
94898@@ -4915,7 +4915,7 @@ struct rate_control_ops {
94899 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
94900
94901 u32 (*get_expected_throughput)(void *priv_sta);
94902-};
94903+} __do_const;
94904
94905 static inline int rate_supported(struct ieee80211_sta *sta,
94906 enum ieee80211_band band,
94907diff --git a/include/net/neighbour.h b/include/net/neighbour.h
94908index 76f7084..8f36e39 100644
94909--- a/include/net/neighbour.h
94910+++ b/include/net/neighbour.h
94911@@ -163,7 +163,7 @@ struct neigh_ops {
94912 void (*error_report)(struct neighbour *, struct sk_buff *);
94913 int (*output)(struct neighbour *, struct sk_buff *);
94914 int (*connected_output)(struct neighbour *, struct sk_buff *);
94915-};
94916+} __do_const;
94917
94918 struct pneigh_entry {
94919 struct pneigh_entry *next;
94920@@ -217,7 +217,7 @@ struct neigh_table {
94921 struct neigh_statistics __percpu *stats;
94922 struct neigh_hash_table __rcu *nht;
94923 struct pneigh_entry **phash_buckets;
94924-};
94925+} __randomize_layout;
94926
94927 enum {
94928 NEIGH_ARP_TABLE = 0,
94929diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
94930index 36faf49..6927638 100644
94931--- a/include/net/net_namespace.h
94932+++ b/include/net/net_namespace.h
94933@@ -131,8 +131,8 @@ struct net {
94934 struct netns_ipvs *ipvs;
94935 #endif
94936 struct sock *diag_nlsk;
94937- atomic_t fnhe_genid;
94938-};
94939+ atomic_unchecked_t fnhe_genid;
94940+} __randomize_layout;
94941
94942 #include <linux/seq_file_net.h>
94943
94944@@ -288,7 +288,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
94945 #define __net_init __init
94946 #define __net_exit __exit_refok
94947 #define __net_initdata __initdata
94948+#ifdef CONSTIFY_PLUGIN
94949 #define __net_initconst __initconst
94950+#else
94951+#define __net_initconst __initdata
94952+#endif
94953 #endif
94954
94955 int peernet2id(struct net *net, struct net *peer);
94956@@ -301,7 +305,7 @@ struct pernet_operations {
94957 void (*exit_batch)(struct list_head *net_exit_list);
94958 int *id;
94959 size_t size;
94960-};
94961+} __do_const;
94962
94963 /*
94964 * Use these carefully. If you implement a network device and it
94965@@ -349,12 +353,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
94966
94967 static inline int rt_genid_ipv4(struct net *net)
94968 {
94969- return atomic_read(&net->ipv4.rt_genid);
94970+ return atomic_read_unchecked(&net->ipv4.rt_genid);
94971 }
94972
94973 static inline void rt_genid_bump_ipv4(struct net *net)
94974 {
94975- atomic_inc(&net->ipv4.rt_genid);
94976+ atomic_inc_unchecked(&net->ipv4.rt_genid);
94977 }
94978
94979 extern void (*__fib6_flush_trees)(struct net *net);
94980@@ -381,12 +385,12 @@ static inline void rt_genid_bump_all(struct net *net)
94981
94982 static inline int fnhe_genid(struct net *net)
94983 {
94984- return atomic_read(&net->fnhe_genid);
94985+ return atomic_read_unchecked(&net->fnhe_genid);
94986 }
94987
94988 static inline void fnhe_genid_bump(struct net *net)
94989 {
94990- atomic_inc(&net->fnhe_genid);
94991+ atomic_inc_unchecked(&net->fnhe_genid);
94992 }
94993
94994 #endif /* __NET_NET_NAMESPACE_H */
94995diff --git a/include/net/netlink.h b/include/net/netlink.h
94996index e010ee8..405b9f4 100644
94997--- a/include/net/netlink.h
94998+++ b/include/net/netlink.h
94999@@ -518,7 +518,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
95000 {
95001 if (mark) {
95002 WARN_ON((unsigned char *) mark < skb->data);
95003- skb_trim(skb, (unsigned char *) mark - skb->data);
95004+ skb_trim(skb, (const unsigned char *) mark - skb->data);
95005 }
95006 }
95007
95008diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
95009index 29d6a94..235d3d84 100644
95010--- a/include/net/netns/conntrack.h
95011+++ b/include/net/netns/conntrack.h
95012@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
95013 struct nf_proto_net {
95014 #ifdef CONFIG_SYSCTL
95015 struct ctl_table_header *ctl_table_header;
95016- struct ctl_table *ctl_table;
95017+ ctl_table_no_const *ctl_table;
95018 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
95019 struct ctl_table_header *ctl_compat_header;
95020- struct ctl_table *ctl_compat_table;
95021+ ctl_table_no_const *ctl_compat_table;
95022 #endif
95023 #endif
95024 unsigned int users;
95025@@ -60,7 +60,7 @@ struct nf_ip_net {
95026 struct nf_icmp_net icmpv6;
95027 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
95028 struct ctl_table_header *ctl_table_header;
95029- struct ctl_table *ctl_table;
95030+ ctl_table_no_const *ctl_table;
95031 #endif
95032 };
95033
95034diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
95035index dbe2254..ed0c151 100644
95036--- a/include/net/netns/ipv4.h
95037+++ b/include/net/netns/ipv4.h
95038@@ -87,7 +87,7 @@ struct netns_ipv4 {
95039
95040 struct ping_group_range ping_group_range;
95041
95042- atomic_t dev_addr_genid;
95043+ atomic_unchecked_t dev_addr_genid;
95044
95045 #ifdef CONFIG_SYSCTL
95046 unsigned long *sysctl_local_reserved_ports;
95047@@ -101,6 +101,6 @@ struct netns_ipv4 {
95048 struct fib_rules_ops *mr_rules_ops;
95049 #endif
95050 #endif
95051- atomic_t rt_genid;
95052+ atomic_unchecked_t rt_genid;
95053 };
95054 #endif
95055diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
95056index 69ae41f..4f94868 100644
95057--- a/include/net/netns/ipv6.h
95058+++ b/include/net/netns/ipv6.h
95059@@ -75,8 +75,8 @@ struct netns_ipv6 {
95060 struct fib_rules_ops *mr6_rules_ops;
95061 #endif
95062 #endif
95063- atomic_t dev_addr_genid;
95064- atomic_t fib6_sernum;
95065+ atomic_unchecked_t dev_addr_genid;
95066+ atomic_unchecked_t fib6_sernum;
95067 };
95068
95069 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
95070diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
95071index 730d82a..045f2c4 100644
95072--- a/include/net/netns/xfrm.h
95073+++ b/include/net/netns/xfrm.h
95074@@ -78,7 +78,7 @@ struct netns_xfrm {
95075
95076 /* flow cache part */
95077 struct flow_cache flow_cache_global;
95078- atomic_t flow_cache_genid;
95079+ atomic_unchecked_t flow_cache_genid;
95080 struct list_head flow_cache_gc_list;
95081 spinlock_t flow_cache_gc_lock;
95082 struct work_struct flow_cache_gc_work;
95083diff --git a/include/net/ping.h b/include/net/ping.h
95084index cc16d41..664f40b 100644
95085--- a/include/net/ping.h
95086+++ b/include/net/ping.h
95087@@ -54,7 +54,7 @@ struct ping_iter_state {
95088
95089 extern struct proto ping_prot;
95090 #if IS_ENABLED(CONFIG_IPV6)
95091-extern struct pingv6_ops pingv6_ops;
95092+extern struct pingv6_ops *pingv6_ops;
95093 #endif
95094
95095 struct pingfakehdr {
95096diff --git a/include/net/protocol.h b/include/net/protocol.h
95097index d6fcc1f..ca277058 100644
95098--- a/include/net/protocol.h
95099+++ b/include/net/protocol.h
95100@@ -49,7 +49,7 @@ struct net_protocol {
95101 * socket lookup?
95102 */
95103 icmp_strict_tag_validation:1;
95104-};
95105+} __do_const;
95106
95107 #if IS_ENABLED(CONFIG_IPV6)
95108 struct inet6_protocol {
95109@@ -62,7 +62,7 @@ struct inet6_protocol {
95110 u8 type, u8 code, int offset,
95111 __be32 info);
95112 unsigned int flags; /* INET6_PROTO_xxx */
95113-};
95114+} __do_const;
95115
95116 #define INET6_PROTO_NOPOLICY 0x1
95117 #define INET6_PROTO_FINAL 0x2
95118diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
95119index 6c6d539..af70817 100644
95120--- a/include/net/rtnetlink.h
95121+++ b/include/net/rtnetlink.h
95122@@ -95,7 +95,7 @@ struct rtnl_link_ops {
95123 const struct net_device *dev,
95124 const struct net_device *slave_dev);
95125 struct net *(*get_link_net)(const struct net_device *dev);
95126-};
95127+} __do_const;
95128
95129 int __rtnl_link_register(struct rtnl_link_ops *ops);
95130 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
95131diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
95132index 4a5b9a3..ca27d73 100644
95133--- a/include/net/sctp/checksum.h
95134+++ b/include/net/sctp/checksum.h
95135@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
95136 unsigned int offset)
95137 {
95138 struct sctphdr *sh = sctp_hdr(skb);
95139- __le32 ret, old = sh->checksum;
95140- const struct skb_checksum_ops ops = {
95141+ __le32 ret, old = sh->checksum;
95142+ static const struct skb_checksum_ops ops = {
95143 .update = sctp_csum_update,
95144 .combine = sctp_csum_combine,
95145 };
95146diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
95147index 487ef34..d457f98 100644
95148--- a/include/net/sctp/sm.h
95149+++ b/include/net/sctp/sm.h
95150@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
95151 typedef struct {
95152 sctp_state_fn_t *fn;
95153 const char *name;
95154-} sctp_sm_table_entry_t;
95155+} __do_const sctp_sm_table_entry_t;
95156
95157 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
95158 * currently in use.
95159@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
95160 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
95161
95162 /* Extern declarations for major data structures. */
95163-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
95164+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
95165
95166
95167 /* Get the size of a DATA chunk payload. */
95168diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
95169index 2bb2fcf..d17c291 100644
95170--- a/include/net/sctp/structs.h
95171+++ b/include/net/sctp/structs.h
95172@@ -509,7 +509,7 @@ struct sctp_pf {
95173 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
95174 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
95175 struct sctp_af *af;
95176-};
95177+} __do_const;
95178
95179
95180 /* Structure to track chunk fragments that have been acked, but peer
95181diff --git a/include/net/sock.h b/include/net/sock.h
95182index e4079c2..79c5d3a 100644
95183--- a/include/net/sock.h
95184+++ b/include/net/sock.h
95185@@ -362,7 +362,7 @@ struct sock {
95186 unsigned int sk_napi_id;
95187 unsigned int sk_ll_usec;
95188 #endif
95189- atomic_t sk_drops;
95190+ atomic_unchecked_t sk_drops;
95191 int sk_rcvbuf;
95192
95193 struct sk_filter __rcu *sk_filter;
95194@@ -1039,7 +1039,7 @@ struct proto {
95195 void (*destroy_cgroup)(struct mem_cgroup *memcg);
95196 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
95197 #endif
95198-};
95199+} __randomize_layout;
95200
95201 /*
95202 * Bits in struct cg_proto.flags
95203@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
95204 page_counter_uncharge(&prot->memory_allocated, amt);
95205 }
95206
95207-static inline long
95208+static inline long __intentional_overflow(-1)
95209 sk_memory_allocated(const struct sock *sk)
95210 {
95211 struct proto *prot = sk->sk_prot;
95212@@ -1778,7 +1778,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
95213 }
95214
95215 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
95216- struct iov_iter *from, char *to,
95217+ struct iov_iter *from, unsigned char *to,
95218 int copy, int offset)
95219 {
95220 if (skb->ip_summed == CHECKSUM_NONE) {
95221@@ -2025,7 +2025,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
95222 }
95223 }
95224
95225-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
95226+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
95227
95228 /**
95229 * sk_page_frag - return an appropriate page_frag
95230diff --git a/include/net/tcp.h b/include/net/tcp.h
95231index 8d6b983..5813205 100644
95232--- a/include/net/tcp.h
95233+++ b/include/net/tcp.h
95234@@ -516,7 +516,7 @@ void tcp_retransmit_timer(struct sock *sk);
95235 void tcp_xmit_retransmit_queue(struct sock *);
95236 void tcp_simple_retransmit(struct sock *);
95237 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
95238-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
95239+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
95240
95241 void tcp_send_probe0(struct sock *);
95242 void tcp_send_partial(struct sock *);
95243@@ -694,8 +694,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
95244 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
95245 */
95246 struct tcp_skb_cb {
95247- __u32 seq; /* Starting sequence number */
95248- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
95249+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
95250+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
95251 union {
95252 /* Note : tcp_tw_isn is used in input path only
95253 * (isn chosen by tcp_timewait_state_process())
95254@@ -720,7 +720,7 @@ struct tcp_skb_cb {
95255
95256 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
95257 /* 1 byte hole */
95258- __u32 ack_seq; /* Sequence number ACK'd */
95259+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
95260 union {
95261 struct inet_skb_parm h4;
95262 #if IS_ENABLED(CONFIG_IPV6)
95263diff --git a/include/net/xfrm.h b/include/net/xfrm.h
95264index dc4865e..152ee4c 100644
95265--- a/include/net/xfrm.h
95266+++ b/include/net/xfrm.h
95267@@ -285,7 +285,6 @@ struct xfrm_dst;
95268 struct xfrm_policy_afinfo {
95269 unsigned short family;
95270 struct dst_ops *dst_ops;
95271- void (*garbage_collect)(struct net *net);
95272 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
95273 const xfrm_address_t *saddr,
95274 const xfrm_address_t *daddr);
95275@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
95276 struct net_device *dev,
95277 const struct flowi *fl);
95278 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
95279-};
95280+} __do_const;
95281
95282 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
95283 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
95284@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
95285 int (*transport_finish)(struct sk_buff *skb,
95286 int async);
95287 void (*local_error)(struct sk_buff *skb, u32 mtu);
95288-};
95289+} __do_const;
95290
95291 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
95292 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
95293@@ -437,7 +436,7 @@ struct xfrm_mode {
95294 struct module *owner;
95295 unsigned int encap;
95296 int flags;
95297-};
95298+} __do_const;
95299
95300 /* Flags for xfrm_mode. */
95301 enum {
95302@@ -534,7 +533,7 @@ struct xfrm_policy {
95303 struct timer_list timer;
95304
95305 struct flow_cache_object flo;
95306- atomic_t genid;
95307+ atomic_unchecked_t genid;
95308 u32 priority;
95309 u32 index;
95310 struct xfrm_mark mark;
95311@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
95312 }
95313
95314 void xfrm_garbage_collect(struct net *net);
95315+void xfrm_garbage_collect_deferred(struct net *net);
95316
95317 #else
95318
95319@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
95320 static inline void xfrm_garbage_collect(struct net *net)
95321 {
95322 }
95323+static inline void xfrm_garbage_collect_deferred(struct net *net)
95324+{
95325+}
95326 #endif
95327
95328 static __inline__
95329diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
95330index 1017e0b..227aa4d 100644
95331--- a/include/rdma/iw_cm.h
95332+++ b/include/rdma/iw_cm.h
95333@@ -122,7 +122,7 @@ struct iw_cm_verbs {
95334 int backlog);
95335
95336 int (*destroy_listen)(struct iw_cm_id *cm_id);
95337-};
95338+} __no_const;
95339
95340 /**
95341 * iw_create_cm_id - Create an IW CM identifier.
95342diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
95343index 93d14da..734b3d8 100644
95344--- a/include/scsi/libfc.h
95345+++ b/include/scsi/libfc.h
95346@@ -771,6 +771,7 @@ struct libfc_function_template {
95347 */
95348 void (*disc_stop_final) (struct fc_lport *);
95349 };
95350+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
95351
95352 /**
95353 * struct fc_disc - Discovery context
95354@@ -875,7 +876,7 @@ struct fc_lport {
95355 struct fc_vport *vport;
95356
95357 /* Operational Information */
95358- struct libfc_function_template tt;
95359+ libfc_function_template_no_const tt;
95360 u8 link_up;
95361 u8 qfull;
95362 enum fc_lport_state state;
95363diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
95364index a4c9336..d6f8f34 100644
95365--- a/include/scsi/scsi_device.h
95366+++ b/include/scsi/scsi_device.h
95367@@ -185,9 +185,9 @@ struct scsi_device {
95368 unsigned int max_device_blocked; /* what device_blocked counts down from */
95369 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
95370
95371- atomic_t iorequest_cnt;
95372- atomic_t iodone_cnt;
95373- atomic_t ioerr_cnt;
95374+ atomic_unchecked_t iorequest_cnt;
95375+ atomic_unchecked_t iodone_cnt;
95376+ atomic_unchecked_t ioerr_cnt;
95377
95378 struct device sdev_gendev,
95379 sdev_dev;
95380diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
95381index 007a0bc..7188db8 100644
95382--- a/include/scsi/scsi_transport_fc.h
95383+++ b/include/scsi/scsi_transport_fc.h
95384@@ -756,7 +756,8 @@ struct fc_function_template {
95385 unsigned long show_host_system_hostname:1;
95386
95387 unsigned long disable_target_scan:1;
95388-};
95389+} __do_const;
95390+typedef struct fc_function_template __no_const fc_function_template_no_const;
95391
95392
95393 /**
95394diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
95395index f48089d..73abe48 100644
95396--- a/include/sound/compress_driver.h
95397+++ b/include/sound/compress_driver.h
95398@@ -130,7 +130,7 @@ struct snd_compr_ops {
95399 struct snd_compr_caps *caps);
95400 int (*get_codec_caps) (struct snd_compr_stream *stream,
95401 struct snd_compr_codec_caps *codec);
95402-};
95403+} __no_const;
95404
95405 /**
95406 * struct snd_compr: Compressed device
95407diff --git a/include/sound/soc.h b/include/sound/soc.h
95408index 0d1ade1..34e77d3 100644
95409--- a/include/sound/soc.h
95410+++ b/include/sound/soc.h
95411@@ -856,7 +856,7 @@ struct snd_soc_codec_driver {
95412 enum snd_soc_dapm_type, int);
95413
95414 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
95415-};
95416+} __do_const;
95417
95418 /* SoC platform interface */
95419 struct snd_soc_platform_driver {
95420@@ -883,7 +883,7 @@ struct snd_soc_platform_driver {
95421 const struct snd_compr_ops *compr_ops;
95422
95423 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
95424-};
95425+} __do_const;
95426
95427 struct snd_soc_dai_link_component {
95428 const char *name;
95429diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
95430index 985ca4c..b55b54a 100644
95431--- a/include/target/target_core_base.h
95432+++ b/include/target/target_core_base.h
95433@@ -767,7 +767,7 @@ struct se_device {
95434 atomic_long_t write_bytes;
95435 /* Active commands on this virtual SE device */
95436 atomic_t simple_cmds;
95437- atomic_t dev_ordered_id;
95438+ atomic_unchecked_t dev_ordered_id;
95439 atomic_t dev_ordered_sync;
95440 atomic_t dev_qf_count;
95441 int export_count;
95442diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
95443new file mode 100644
95444index 0000000..fb634b7
95445--- /dev/null
95446+++ b/include/trace/events/fs.h
95447@@ -0,0 +1,53 @@
95448+#undef TRACE_SYSTEM
95449+#define TRACE_SYSTEM fs
95450+
95451+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
95452+#define _TRACE_FS_H
95453+
95454+#include <linux/fs.h>
95455+#include <linux/tracepoint.h>
95456+
95457+TRACE_EVENT(do_sys_open,
95458+
95459+ TP_PROTO(const char *filename, int flags, int mode),
95460+
95461+ TP_ARGS(filename, flags, mode),
95462+
95463+ TP_STRUCT__entry(
95464+ __string( filename, filename )
95465+ __field( int, flags )
95466+ __field( int, mode )
95467+ ),
95468+
95469+ TP_fast_assign(
95470+ __assign_str(filename, filename);
95471+ __entry->flags = flags;
95472+ __entry->mode = mode;
95473+ ),
95474+
95475+ TP_printk("\"%s\" %x %o",
95476+ __get_str(filename), __entry->flags, __entry->mode)
95477+);
95478+
95479+TRACE_EVENT(open_exec,
95480+
95481+ TP_PROTO(const char *filename),
95482+
95483+ TP_ARGS(filename),
95484+
95485+ TP_STRUCT__entry(
95486+ __string( filename, filename )
95487+ ),
95488+
95489+ TP_fast_assign(
95490+ __assign_str(filename, filename);
95491+ ),
95492+
95493+ TP_printk("\"%s\"",
95494+ __get_str(filename))
95495+);
95496+
95497+#endif /* _TRACE_FS_H */
95498+
95499+/* This part must be outside protection */
95500+#include <trace/define_trace.h>
95501diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
95502index 3608beb..df39d8a 100644
95503--- a/include/trace/events/irq.h
95504+++ b/include/trace/events/irq.h
95505@@ -36,7 +36,7 @@ struct softirq_action;
95506 */
95507 TRACE_EVENT(irq_handler_entry,
95508
95509- TP_PROTO(int irq, struct irqaction *action),
95510+ TP_PROTO(int irq, const struct irqaction *action),
95511
95512 TP_ARGS(irq, action),
95513
95514@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
95515 */
95516 TRACE_EVENT(irq_handler_exit,
95517
95518- TP_PROTO(int irq, struct irqaction *action, int ret),
95519+ TP_PROTO(int irq, const struct irqaction *action, int ret),
95520
95521 TP_ARGS(irq, action, ret),
95522
95523diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
95524index 6eed16b..3e05750 100644
95525--- a/include/uapi/drm/i915_drm.h
95526+++ b/include/uapi/drm/i915_drm.h
95527@@ -347,6 +347,7 @@ typedef struct drm_i915_irq_wait {
95528 #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
95529 #define I915_PARAM_MMAP_VERSION 30
95530 #define I915_PARAM_HAS_BSD2 31
95531+#define I915_PARAM_HAS_LEGACY_CONTEXT 35
95532
95533 typedef struct drm_i915_getparam {
95534 int param;
95535diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
95536index 7caf44c..23c6f27 100644
95537--- a/include/uapi/linux/a.out.h
95538+++ b/include/uapi/linux/a.out.h
95539@@ -39,6 +39,14 @@ enum machine_type {
95540 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
95541 };
95542
95543+/* Constants for the N_FLAGS field */
95544+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
95545+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
95546+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
95547+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
95548+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
95549+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
95550+
95551 #if !defined (N_MAGIC)
95552 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
95553 #endif
95554diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
95555index 22b6ad3..aeba37e 100644
95556--- a/include/uapi/linux/bcache.h
95557+++ b/include/uapi/linux/bcache.h
95558@@ -5,6 +5,7 @@
95559 * Bcache on disk data structures
95560 */
95561
95562+#include <linux/compiler.h>
95563 #include <asm/types.h>
95564
95565 #define BITMASK(name, type, field, offset, size) \
95566@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
95567 /* Btree keys - all units are in sectors */
95568
95569 struct bkey {
95570- __u64 high;
95571- __u64 low;
95572+ __u64 high __intentional_overflow(-1);
95573+ __u64 low __intentional_overflow(-1);
95574 __u64 ptr[];
95575 };
95576
95577diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
95578index d876736..ccce5c0 100644
95579--- a/include/uapi/linux/byteorder/little_endian.h
95580+++ b/include/uapi/linux/byteorder/little_endian.h
95581@@ -42,51 +42,51 @@
95582
95583 static inline __le64 __cpu_to_le64p(const __u64 *p)
95584 {
95585- return (__force __le64)*p;
95586+ return (__force const __le64)*p;
95587 }
95588-static inline __u64 __le64_to_cpup(const __le64 *p)
95589+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
95590 {
95591- return (__force __u64)*p;
95592+ return (__force const __u64)*p;
95593 }
95594 static inline __le32 __cpu_to_le32p(const __u32 *p)
95595 {
95596- return (__force __le32)*p;
95597+ return (__force const __le32)*p;
95598 }
95599 static inline __u32 __le32_to_cpup(const __le32 *p)
95600 {
95601- return (__force __u32)*p;
95602+ return (__force const __u32)*p;
95603 }
95604 static inline __le16 __cpu_to_le16p(const __u16 *p)
95605 {
95606- return (__force __le16)*p;
95607+ return (__force const __le16)*p;
95608 }
95609 static inline __u16 __le16_to_cpup(const __le16 *p)
95610 {
95611- return (__force __u16)*p;
95612+ return (__force const __u16)*p;
95613 }
95614 static inline __be64 __cpu_to_be64p(const __u64 *p)
95615 {
95616- return (__force __be64)__swab64p(p);
95617+ return (__force const __be64)__swab64p(p);
95618 }
95619 static inline __u64 __be64_to_cpup(const __be64 *p)
95620 {
95621- return __swab64p((__u64 *)p);
95622+ return __swab64p((const __u64 *)p);
95623 }
95624 static inline __be32 __cpu_to_be32p(const __u32 *p)
95625 {
95626- return (__force __be32)__swab32p(p);
95627+ return (__force const __be32)__swab32p(p);
95628 }
95629-static inline __u32 __be32_to_cpup(const __be32 *p)
95630+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
95631 {
95632- return __swab32p((__u32 *)p);
95633+ return __swab32p((const __u32 *)p);
95634 }
95635 static inline __be16 __cpu_to_be16p(const __u16 *p)
95636 {
95637- return (__force __be16)__swab16p(p);
95638+ return (__force const __be16)__swab16p(p);
95639 }
95640 static inline __u16 __be16_to_cpup(const __be16 *p)
95641 {
95642- return __swab16p((__u16 *)p);
95643+ return __swab16p((const __u16 *)p);
95644 }
95645 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
95646 #define __le64_to_cpus(x) do { (void)(x); } while (0)
95647diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
95648index 71e1d0e..6cc9caf 100644
95649--- a/include/uapi/linux/elf.h
95650+++ b/include/uapi/linux/elf.h
95651@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
95652 #define PT_GNU_EH_FRAME 0x6474e550
95653
95654 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
95655+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
95656+
95657+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
95658+
95659+/* Constants for the e_flags field */
95660+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
95661+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
95662+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
95663+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
95664+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
95665+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
95666
95667 /*
95668 * Extended Numbering
95669@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
95670 #define DT_DEBUG 21
95671 #define DT_TEXTREL 22
95672 #define DT_JMPREL 23
95673+#define DT_FLAGS 30
95674+ #define DF_TEXTREL 0x00000004
95675 #define DT_ENCODING 32
95676 #define OLD_DT_LOOS 0x60000000
95677 #define DT_LOOS 0x6000000d
95678@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
95679 #define PF_W 0x2
95680 #define PF_X 0x1
95681
95682+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
95683+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
95684+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
95685+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
95686+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
95687+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
95688+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
95689+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
95690+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
95691+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
95692+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
95693+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
95694+
95695 typedef struct elf32_phdr{
95696 Elf32_Word p_type;
95697 Elf32_Off p_offset;
95698@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
95699 #define EI_OSABI 7
95700 #define EI_PAD 8
95701
95702+#define EI_PAX 14
95703+
95704 #define ELFMAG0 0x7f /* EI_MAG */
95705 #define ELFMAG1 'E'
95706 #define ELFMAG2 'L'
95707diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
95708index aa169c4..6a2771d 100644
95709--- a/include/uapi/linux/personality.h
95710+++ b/include/uapi/linux/personality.h
95711@@ -30,6 +30,7 @@ enum {
95712 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
95713 ADDR_NO_RANDOMIZE | \
95714 ADDR_COMPAT_LAYOUT | \
95715+ ADDR_LIMIT_3GB | \
95716 MMAP_PAGE_ZERO)
95717
95718 /*
95719diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
95720index 7530e74..e714828 100644
95721--- a/include/uapi/linux/screen_info.h
95722+++ b/include/uapi/linux/screen_info.h
95723@@ -43,7 +43,8 @@ struct screen_info {
95724 __u16 pages; /* 0x32 */
95725 __u16 vesa_attributes; /* 0x34 */
95726 __u32 capabilities; /* 0x36 */
95727- __u8 _reserved[6]; /* 0x3a */
95728+ __u16 vesapm_size; /* 0x3a */
95729+ __u8 _reserved[4]; /* 0x3c */
95730 } __attribute__((packed));
95731
95732 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
95733diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
95734index 0e011eb..82681b1 100644
95735--- a/include/uapi/linux/swab.h
95736+++ b/include/uapi/linux/swab.h
95737@@ -43,7 +43,7 @@
95738 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
95739 */
95740
95741-static inline __attribute_const__ __u16 __fswab16(__u16 val)
95742+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
95743 {
95744 #ifdef __HAVE_BUILTIN_BSWAP16__
95745 return __builtin_bswap16(val);
95746@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
95747 #endif
95748 }
95749
95750-static inline __attribute_const__ __u32 __fswab32(__u32 val)
95751+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
95752 {
95753 #ifdef __HAVE_BUILTIN_BSWAP32__
95754 return __builtin_bswap32(val);
95755@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
95756 #endif
95757 }
95758
95759-static inline __attribute_const__ __u64 __fswab64(__u64 val)
95760+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
95761 {
95762 #ifdef __HAVE_BUILTIN_BSWAP64__
95763 return __builtin_bswap64(val);
95764diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
95765index 1590c49..5eab462 100644
95766--- a/include/uapi/linux/xattr.h
95767+++ b/include/uapi/linux/xattr.h
95768@@ -73,5 +73,9 @@
95769 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
95770 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
95771
95772+/* User namespace */
95773+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
95774+#define XATTR_PAX_FLAGS_SUFFIX "flags"
95775+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
95776
95777 #endif /* _UAPI_LINUX_XATTR_H */
95778diff --git a/include/video/udlfb.h b/include/video/udlfb.h
95779index f9466fa..f4e2b81 100644
95780--- a/include/video/udlfb.h
95781+++ b/include/video/udlfb.h
95782@@ -53,10 +53,10 @@ struct dlfb_data {
95783 u32 pseudo_palette[256];
95784 int blank_mode; /*one of FB_BLANK_ */
95785 /* blit-only rendering path metrics, exposed through sysfs */
95786- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
95787- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
95788- atomic_t bytes_sent; /* to usb, after compression including overhead */
95789- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
95790+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
95791+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
95792+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
95793+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
95794 };
95795
95796 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
95797diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
95798index 30f5362..8ed8ac9 100644
95799--- a/include/video/uvesafb.h
95800+++ b/include/video/uvesafb.h
95801@@ -122,6 +122,7 @@ struct uvesafb_par {
95802 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
95803 u8 pmi_setpal; /* PMI for palette changes */
95804 u16 *pmi_base; /* protected mode interface location */
95805+ u8 *pmi_code; /* protected mode code location */
95806 void *pmi_start;
95807 void *pmi_pal;
95808 u8 *vbe_state_orig; /*
95809diff --git a/init/Kconfig b/init/Kconfig
95810index f5dbc6d..8259396 100644
95811--- a/init/Kconfig
95812+++ b/init/Kconfig
95813@@ -1136,6 +1136,7 @@ endif # CGROUPS
95814
95815 config CHECKPOINT_RESTORE
95816 bool "Checkpoint/restore support" if EXPERT
95817+ depends on !GRKERNSEC
95818 default n
95819 help
95820 Enables additional kernel features in a sake of checkpoint/restore.
95821@@ -1646,7 +1647,7 @@ config SLUB_DEBUG
95822
95823 config COMPAT_BRK
95824 bool "Disable heap randomization"
95825- default y
95826+ default n
95827 help
95828 Randomizing heap placement makes heap exploits harder, but it
95829 also breaks ancient binaries (including anything libc5 based).
95830@@ -1977,7 +1978,7 @@ config INIT_ALL_POSSIBLE
95831 config STOP_MACHINE
95832 bool
95833 default y
95834- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
95835+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
95836 help
95837 Need stop_machine() primitive.
95838
95839diff --git a/init/Makefile b/init/Makefile
95840index 7bc47ee..6da2dc7 100644
95841--- a/init/Makefile
95842+++ b/init/Makefile
95843@@ -2,6 +2,9 @@
95844 # Makefile for the linux kernel.
95845 #
95846
95847+ccflags-y := $(GCC_PLUGINS_CFLAGS)
95848+asflags-y := $(GCC_PLUGINS_AFLAGS)
95849+
95850 obj-y := main.o version.o mounts.o
95851 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
95852 obj-y += noinitramfs.o
95853diff --git a/init/do_mounts.c b/init/do_mounts.c
95854index eb41008..f5dbbf9 100644
95855--- a/init/do_mounts.c
95856+++ b/init/do_mounts.c
95857@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
95858 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
95859 {
95860 struct super_block *s;
95861- int err = sys_mount(name, "/root", fs, flags, data);
95862+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
95863 if (err)
95864 return err;
95865
95866- sys_chdir("/root");
95867+ sys_chdir((const char __force_user *)"/root");
95868 s = current->fs->pwd.dentry->d_sb;
95869 ROOT_DEV = s->s_dev;
95870 printk(KERN_INFO
95871@@ -487,18 +487,18 @@ void __init change_floppy(char *fmt, ...)
95872 va_start(args, fmt);
95873 vsprintf(buf, fmt, args);
95874 va_end(args);
95875- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
95876+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
95877 if (fd >= 0) {
95878 sys_ioctl(fd, FDEJECT, 0);
95879 sys_close(fd);
95880 }
95881 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
95882- fd = sys_open("/dev/console", O_RDWR, 0);
95883+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
95884 if (fd >= 0) {
95885 sys_ioctl(fd, TCGETS, (long)&termios);
95886 termios.c_lflag &= ~ICANON;
95887 sys_ioctl(fd, TCSETSF, (long)&termios);
95888- sys_read(fd, &c, 1);
95889+ sys_read(fd, (char __user *)&c, 1);
95890 termios.c_lflag |= ICANON;
95891 sys_ioctl(fd, TCSETSF, (long)&termios);
95892 sys_close(fd);
95893@@ -592,8 +592,8 @@ void __init prepare_namespace(void)
95894 mount_root();
95895 out:
95896 devtmpfs_mount("dev");
95897- sys_mount(".", "/", NULL, MS_MOVE, NULL);
95898- sys_chroot(".");
95899+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
95900+ sys_chroot((const char __force_user *)".");
95901 }
95902
95903 static bool is_tmpfs;
95904diff --git a/init/do_mounts.h b/init/do_mounts.h
95905index f5b978a..69dbfe8 100644
95906--- a/init/do_mounts.h
95907+++ b/init/do_mounts.h
95908@@ -15,15 +15,15 @@ extern int root_mountflags;
95909
95910 static inline int create_dev(char *name, dev_t dev)
95911 {
95912- sys_unlink(name);
95913- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
95914+ sys_unlink((char __force_user *)name);
95915+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
95916 }
95917
95918 #if BITS_PER_LONG == 32
95919 static inline u32 bstat(char *name)
95920 {
95921 struct stat64 stat;
95922- if (sys_stat64(name, &stat) != 0)
95923+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
95924 return 0;
95925 if (!S_ISBLK(stat.st_mode))
95926 return 0;
95927@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
95928 static inline u32 bstat(char *name)
95929 {
95930 struct stat stat;
95931- if (sys_newstat(name, &stat) != 0)
95932+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
95933 return 0;
95934 if (!S_ISBLK(stat.st_mode))
95935 return 0;
95936diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
95937index 3e0878e..8a9d7a0 100644
95938--- a/init/do_mounts_initrd.c
95939+++ b/init/do_mounts_initrd.c
95940@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
95941 {
95942 sys_unshare(CLONE_FS | CLONE_FILES);
95943 /* stdin/stdout/stderr for /linuxrc */
95944- sys_open("/dev/console", O_RDWR, 0);
95945+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
95946 sys_dup(0);
95947 sys_dup(0);
95948 /* move initrd over / and chdir/chroot in initrd root */
95949- sys_chdir("/root");
95950- sys_mount(".", "/", NULL, MS_MOVE, NULL);
95951- sys_chroot(".");
95952+ sys_chdir((const char __force_user *)"/root");
95953+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
95954+ sys_chroot((const char __force_user *)".");
95955 sys_setsid();
95956 return 0;
95957 }
95958@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
95959 create_dev("/dev/root.old", Root_RAM0);
95960 /* mount initrd on rootfs' /root */
95961 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
95962- sys_mkdir("/old", 0700);
95963- sys_chdir("/old");
95964+ sys_mkdir((const char __force_user *)"/old", 0700);
95965+ sys_chdir((const char __force_user *)"/old");
95966
95967 /* try loading default modules from initrd */
95968 load_default_modules();
95969@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
95970 current->flags &= ~PF_FREEZER_SKIP;
95971
95972 /* move initrd to rootfs' /old */
95973- sys_mount("..", ".", NULL, MS_MOVE, NULL);
95974+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
95975 /* switch root and cwd back to / of rootfs */
95976- sys_chroot("..");
95977+ sys_chroot((const char __force_user *)"..");
95978
95979 if (new_decode_dev(real_root_dev) == Root_RAM0) {
95980- sys_chdir("/old");
95981+ sys_chdir((const char __force_user *)"/old");
95982 return;
95983 }
95984
95985- sys_chdir("/");
95986+ sys_chdir((const char __force_user *)"/");
95987 ROOT_DEV = new_decode_dev(real_root_dev);
95988 mount_root();
95989
95990 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
95991- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
95992+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
95993 if (!error)
95994 printk("okay\n");
95995 else {
95996- int fd = sys_open("/dev/root.old", O_RDWR, 0);
95997+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
95998 if (error == -ENOENT)
95999 printk("/initrd does not exist. Ignored.\n");
96000 else
96001 printk("failed\n");
96002 printk(KERN_NOTICE "Unmounting old root\n");
96003- sys_umount("/old", MNT_DETACH);
96004+ sys_umount((char __force_user *)"/old", MNT_DETACH);
96005 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
96006 if (fd < 0) {
96007 error = fd;
96008@@ -127,11 +127,11 @@ int __init initrd_load(void)
96009 * mounted in the normal path.
96010 */
96011 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
96012- sys_unlink("/initrd.image");
96013+ sys_unlink((const char __force_user *)"/initrd.image");
96014 handle_initrd();
96015 return 1;
96016 }
96017 }
96018- sys_unlink("/initrd.image");
96019+ sys_unlink((const char __force_user *)"/initrd.image");
96020 return 0;
96021 }
96022diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
96023index 8cb6db5..d729f50 100644
96024--- a/init/do_mounts_md.c
96025+++ b/init/do_mounts_md.c
96026@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
96027 partitioned ? "_d" : "", minor,
96028 md_setup_args[ent].device_names);
96029
96030- fd = sys_open(name, 0, 0);
96031+ fd = sys_open((char __force_user *)name, 0, 0);
96032 if (fd < 0) {
96033 printk(KERN_ERR "md: open failed - cannot start "
96034 "array %s\n", name);
96035@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
96036 * array without it
96037 */
96038 sys_close(fd);
96039- fd = sys_open(name, 0, 0);
96040+ fd = sys_open((char __force_user *)name, 0, 0);
96041 sys_ioctl(fd, BLKRRPART, 0);
96042 }
96043 sys_close(fd);
96044@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
96045
96046 wait_for_device_probe();
96047
96048- fd = sys_open("/dev/md0", 0, 0);
96049+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
96050 if (fd >= 0) {
96051 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
96052 sys_close(fd);
96053diff --git a/init/init_task.c b/init/init_task.c
96054index ba0a7f36..2bcf1d5 100644
96055--- a/init/init_task.c
96056+++ b/init/init_task.c
96057@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
96058 * Initial thread structure. Alignment of this is handled by a special
96059 * linker map entry.
96060 */
96061+#ifdef CONFIG_X86
96062+union thread_union init_thread_union __init_task_data;
96063+#else
96064 union thread_union init_thread_union __init_task_data =
96065 { INIT_THREAD_INFO(init_task) };
96066+#endif
96067diff --git a/init/initramfs.c b/init/initramfs.c
96068index ad1bd77..dca2c1b 100644
96069--- a/init/initramfs.c
96070+++ b/init/initramfs.c
96071@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
96072
96073 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
96074 while (count) {
96075- ssize_t rv = sys_write(fd, p, count);
96076+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
96077
96078 if (rv < 0) {
96079 if (rv == -EINTR || rv == -EAGAIN)
96080@@ -107,7 +107,7 @@ static void __init free_hash(void)
96081 }
96082 }
96083
96084-static long __init do_utime(char *filename, time_t mtime)
96085+static long __init do_utime(char __force_user *filename, time_t mtime)
96086 {
96087 struct timespec t[2];
96088
96089@@ -142,7 +142,7 @@ static void __init dir_utime(void)
96090 struct dir_entry *de, *tmp;
96091 list_for_each_entry_safe(de, tmp, &dir_list, list) {
96092 list_del(&de->list);
96093- do_utime(de->name, de->mtime);
96094+ do_utime((char __force_user *)de->name, de->mtime);
96095 kfree(de->name);
96096 kfree(de);
96097 }
96098@@ -304,7 +304,7 @@ static int __init maybe_link(void)
96099 if (nlink >= 2) {
96100 char *old = find_link(major, minor, ino, mode, collected);
96101 if (old)
96102- return (sys_link(old, collected) < 0) ? -1 : 1;
96103+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
96104 }
96105 return 0;
96106 }
96107@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
96108 {
96109 struct stat st;
96110
96111- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
96112+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
96113 if (S_ISDIR(st.st_mode))
96114- sys_rmdir(path);
96115+ sys_rmdir((char __force_user *)path);
96116 else
96117- sys_unlink(path);
96118+ sys_unlink((char __force_user *)path);
96119 }
96120 }
96121
96122@@ -338,7 +338,7 @@ static int __init do_name(void)
96123 int openflags = O_WRONLY|O_CREAT;
96124 if (ml != 1)
96125 openflags |= O_TRUNC;
96126- wfd = sys_open(collected, openflags, mode);
96127+ wfd = sys_open((char __force_user *)collected, openflags, mode);
96128
96129 if (wfd >= 0) {
96130 sys_fchown(wfd, uid, gid);
96131@@ -350,17 +350,17 @@ static int __init do_name(void)
96132 }
96133 }
96134 } else if (S_ISDIR(mode)) {
96135- sys_mkdir(collected, mode);
96136- sys_chown(collected, uid, gid);
96137- sys_chmod(collected, mode);
96138+ sys_mkdir((char __force_user *)collected, mode);
96139+ sys_chown((char __force_user *)collected, uid, gid);
96140+ sys_chmod((char __force_user *)collected, mode);
96141 dir_add(collected, mtime);
96142 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
96143 S_ISFIFO(mode) || S_ISSOCK(mode)) {
96144 if (maybe_link() == 0) {
96145- sys_mknod(collected, mode, rdev);
96146- sys_chown(collected, uid, gid);
96147- sys_chmod(collected, mode);
96148- do_utime(collected, mtime);
96149+ sys_mknod((char __force_user *)collected, mode, rdev);
96150+ sys_chown((char __force_user *)collected, uid, gid);
96151+ sys_chmod((char __force_user *)collected, mode);
96152+ do_utime((char __force_user *)collected, mtime);
96153 }
96154 }
96155 return 0;
96156@@ -372,7 +372,7 @@ static int __init do_copy(void)
96157 if (xwrite(wfd, victim, body_len) != body_len)
96158 error("write error");
96159 sys_close(wfd);
96160- do_utime(vcollected, mtime);
96161+ do_utime((char __force_user *)vcollected, mtime);
96162 kfree(vcollected);
96163 eat(body_len);
96164 state = SkipIt;
96165@@ -390,9 +390,9 @@ static int __init do_symlink(void)
96166 {
96167 collected[N_ALIGN(name_len) + body_len] = '\0';
96168 clean_path(collected, 0);
96169- sys_symlink(collected + N_ALIGN(name_len), collected);
96170- sys_lchown(collected, uid, gid);
96171- do_utime(collected, mtime);
96172+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
96173+ sys_lchown((char __force_user *)collected, uid, gid);
96174+ do_utime((char __force_user *)collected, mtime);
96175 state = SkipIt;
96176 next_state = Reset;
96177 return 0;
96178diff --git a/init/main.c b/init/main.c
96179index 6f0f1c5f..a542824 100644
96180--- a/init/main.c
96181+++ b/init/main.c
96182@@ -96,6 +96,8 @@ extern void radix_tree_init(void);
96183 static inline void mark_rodata_ro(void) { }
96184 #endif
96185
96186+extern void grsecurity_init(void);
96187+
96188 /*
96189 * Debug helper: via this flag we know that we are in 'early bootup code'
96190 * where only the boot processor is running with IRQ disabled. This means
96191@@ -157,6 +159,85 @@ static int __init set_reset_devices(char *str)
96192
96193 __setup("reset_devices", set_reset_devices);
96194
96195+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
96196+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
96197+static int __init setup_grsec_proc_gid(char *str)
96198+{
96199+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
96200+ return 1;
96201+}
96202+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
96203+#endif
96204+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
96205+int grsec_enable_sysfs_restrict = 1;
96206+static int __init setup_grsec_sysfs_restrict(char *str)
96207+{
96208+ if (!simple_strtol(str, NULL, 0))
96209+ grsec_enable_sysfs_restrict = 0;
96210+ return 1;
96211+}
96212+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
96213+#endif
96214+
96215+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
96216+unsigned long pax_user_shadow_base __read_only;
96217+EXPORT_SYMBOL(pax_user_shadow_base);
96218+extern char pax_enter_kernel_user[];
96219+extern char pax_exit_kernel_user[];
96220+#endif
96221+
96222+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
96223+static int __init setup_pax_nouderef(char *str)
96224+{
96225+#ifdef CONFIG_X86_32
96226+ unsigned int cpu;
96227+ struct desc_struct *gdt;
96228+
96229+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
96230+ gdt = get_cpu_gdt_table(cpu);
96231+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
96232+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
96233+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
96234+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
96235+ }
96236+ loadsegment(ds, __KERNEL_DS);
96237+ loadsegment(es, __KERNEL_DS);
96238+ loadsegment(ss, __KERNEL_DS);
96239+#else
96240+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
96241+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
96242+ clone_pgd_mask = ~(pgdval_t)0UL;
96243+ pax_user_shadow_base = 0UL;
96244+ setup_clear_cpu_cap(X86_FEATURE_PCID);
96245+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
96246+#endif
96247+
96248+ return 0;
96249+}
96250+early_param("pax_nouderef", setup_pax_nouderef);
96251+
96252+#ifdef CONFIG_X86_64
96253+static int __init setup_pax_weakuderef(char *str)
96254+{
96255+ if (clone_pgd_mask != ~(pgdval_t)0UL)
96256+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
96257+ return 1;
96258+}
96259+__setup("pax_weakuderef", setup_pax_weakuderef);
96260+#endif
96261+#endif
96262+
96263+#ifdef CONFIG_PAX_SOFTMODE
96264+int pax_softmode;
96265+
96266+static int __init setup_pax_softmode(char *str)
96267+{
96268+ get_option(&str, &pax_softmode);
96269+ return 1;
96270+}
96271+__setup("pax_softmode=", setup_pax_softmode);
96272+#endif
96273+
96274 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
96275 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
96276 static const char *panic_later, *panic_param;
96277@@ -722,7 +803,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
96278 struct blacklist_entry *entry;
96279 char *fn_name;
96280
96281- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
96282+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
96283 if (!fn_name)
96284 return false;
96285
96286@@ -774,7 +855,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
96287 {
96288 int count = preempt_count();
96289 int ret;
96290- char msgbuf[64];
96291+ const char *msg1 = "", *msg2 = "";
96292
96293 if (initcall_blacklisted(fn))
96294 return -EPERM;
96295@@ -784,18 +865,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
96296 else
96297 ret = fn();
96298
96299- msgbuf[0] = 0;
96300-
96301 if (preempt_count() != count) {
96302- sprintf(msgbuf, "preemption imbalance ");
96303+ msg1 = " preemption imbalance";
96304 preempt_count_set(count);
96305 }
96306 if (irqs_disabled()) {
96307- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
96308+ msg2 = " disabled interrupts";
96309 local_irq_enable();
96310 }
96311- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
96312+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
96313
96314+ add_latent_entropy();
96315 return ret;
96316 }
96317
96318@@ -901,8 +981,8 @@ static int run_init_process(const char *init_filename)
96319 {
96320 argv_init[0] = init_filename;
96321 return do_execve(getname_kernel(init_filename),
96322- (const char __user *const __user *)argv_init,
96323- (const char __user *const __user *)envp_init);
96324+ (const char __user *const __force_user *)argv_init,
96325+ (const char __user *const __force_user *)envp_init);
96326 }
96327
96328 static int try_to_run_init_process(const char *init_filename)
96329@@ -919,6 +999,10 @@ static int try_to_run_init_process(const char *init_filename)
96330 return ret;
96331 }
96332
96333+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
96334+extern int gr_init_ran;
96335+#endif
96336+
96337 static noinline void __init kernel_init_freeable(void);
96338
96339 static int __ref kernel_init(void *unused)
96340@@ -943,6 +1027,11 @@ static int __ref kernel_init(void *unused)
96341 ramdisk_execute_command, ret);
96342 }
96343
96344+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
96345+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
96346+ gr_init_ran = 1;
96347+#endif
96348+
96349 /*
96350 * We try each of these until one succeeds.
96351 *
96352@@ -998,7 +1087,7 @@ static noinline void __init kernel_init_freeable(void)
96353 do_basic_setup();
96354
96355 /* Open the /dev/console on the rootfs, this should never fail */
96356- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
96357+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
96358 pr_err("Warning: unable to open an initial console.\n");
96359
96360 (void) sys_dup(0);
96361@@ -1011,11 +1100,13 @@ static noinline void __init kernel_init_freeable(void)
96362 if (!ramdisk_execute_command)
96363 ramdisk_execute_command = "/init";
96364
96365- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
96366+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
96367 ramdisk_execute_command = NULL;
96368 prepare_namespace();
96369 }
96370
96371+ grsecurity_init();
96372+
96373 /*
96374 * Ok, we have completed the initial bootup, and
96375 * we're essentially up and running. Get rid of the
96376diff --git a/ipc/compat.c b/ipc/compat.c
96377index 9b3c85f..5266b0f 100644
96378--- a/ipc/compat.c
96379+++ b/ipc/compat.c
96380@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
96381 COMPAT_SHMLBA);
96382 if (err < 0)
96383 return err;
96384- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
96385+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
96386 }
96387 case SHMDT:
96388 return sys_shmdt(compat_ptr(ptr));
96389@@ -747,7 +747,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)
96390 }
96391
96392 COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
96393- unsigned, nsops,
96394+ compat_long_t, nsops,
96395 const struct compat_timespec __user *, timeout)
96396 {
96397 struct timespec __user *ts64;
96398diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
96399index 8ad93c2..efd80f8 100644
96400--- a/ipc/ipc_sysctl.c
96401+++ b/ipc/ipc_sysctl.c
96402@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
96403 static int proc_ipc_dointvec(struct ctl_table *table, int write,
96404 void __user *buffer, size_t *lenp, loff_t *ppos)
96405 {
96406- struct ctl_table ipc_table;
96407+ ctl_table_no_const ipc_table;
96408
96409 memcpy(&ipc_table, table, sizeof(ipc_table));
96410 ipc_table.data = get_ipc(table);
96411@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
96412 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
96413 void __user *buffer, size_t *lenp, loff_t *ppos)
96414 {
96415- struct ctl_table ipc_table;
96416+ ctl_table_no_const ipc_table;
96417
96418 memcpy(&ipc_table, table, sizeof(ipc_table));
96419 ipc_table.data = get_ipc(table);
96420@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
96421 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
96422 void __user *buffer, size_t *lenp, loff_t *ppos)
96423 {
96424- struct ctl_table ipc_table;
96425+ ctl_table_no_const ipc_table;
96426 memcpy(&ipc_table, table, sizeof(ipc_table));
96427 ipc_table.data = get_ipc(table);
96428
96429@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
96430 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
96431 void __user *buffer, size_t *lenp, loff_t *ppos)
96432 {
96433- struct ctl_table ipc_table;
96434+ ctl_table_no_const ipc_table;
96435 int dummy = 0;
96436
96437 memcpy(&ipc_table, table, sizeof(ipc_table));
96438diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
96439index 68d4e95..1477ded 100644
96440--- a/ipc/mq_sysctl.c
96441+++ b/ipc/mq_sysctl.c
96442@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
96443 static int proc_mq_dointvec(struct ctl_table *table, int write,
96444 void __user *buffer, size_t *lenp, loff_t *ppos)
96445 {
96446- struct ctl_table mq_table;
96447+ ctl_table_no_const mq_table;
96448 memcpy(&mq_table, table, sizeof(mq_table));
96449 mq_table.data = get_mq(table);
96450
96451@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
96452 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
96453 void __user *buffer, size_t *lenp, loff_t *ppos)
96454 {
96455- struct ctl_table mq_table;
96456+ ctl_table_no_const mq_table;
96457 memcpy(&mq_table, table, sizeof(mq_table));
96458 mq_table.data = get_mq(table);
96459
96460diff --git a/ipc/mqueue.c b/ipc/mqueue.c
96461index 7635a1c..7432cb6 100644
96462--- a/ipc/mqueue.c
96463+++ b/ipc/mqueue.c
96464@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
96465 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
96466 info->attr.mq_msgsize);
96467
96468+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
96469 spin_lock(&mq_lock);
96470 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
96471 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
96472diff --git a/ipc/sem.c b/ipc/sem.c
96473index 9284211..bca5b1b 100644
96474--- a/ipc/sem.c
96475+++ b/ipc/sem.c
96476@@ -1780,7 +1780,7 @@ static int get_queue_result(struct sem_queue *q)
96477 }
96478
96479 SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
96480- unsigned, nsops, const struct timespec __user *, timeout)
96481+ long, nsops, const struct timespec __user *, timeout)
96482 {
96483 int error = -EINVAL;
96484 struct sem_array *sma;
96485@@ -2015,7 +2015,7 @@ out_free:
96486 }
96487
96488 SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
96489- unsigned, nsops)
96490+ long, nsops)
96491 {
96492 return sys_semtimedop(semid, tsops, nsops, NULL);
96493 }
96494diff --git a/ipc/shm.c b/ipc/shm.c
96495index 19633b4..d454904 100644
96496--- a/ipc/shm.c
96497+++ b/ipc/shm.c
96498@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
96499 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
96500 #endif
96501
96502+#ifdef CONFIG_GRKERNSEC
96503+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
96504+ const u64 shm_createtime, const kuid_t cuid,
96505+ const int shmid);
96506+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
96507+ const u64 shm_createtime);
96508+#endif
96509+
96510 void shm_init_ns(struct ipc_namespace *ns)
96511 {
96512 ns->shm_ctlmax = SHMMAX;
96513@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
96514 shp->shm_lprid = 0;
96515 shp->shm_atim = shp->shm_dtim = 0;
96516 shp->shm_ctim = get_seconds();
96517+#ifdef CONFIG_GRKERNSEC
96518+ shp->shm_createtime = ktime_get_ns();
96519+#endif
96520 shp->shm_segsz = size;
96521 shp->shm_nattch = 0;
96522 shp->shm_file = file;
96523@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96524 f_mode = FMODE_READ | FMODE_WRITE;
96525 }
96526 if (shmflg & SHM_EXEC) {
96527+
96528+#ifdef CONFIG_PAX_MPROTECT
96529+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
96530+ goto out;
96531+#endif
96532+
96533 prot |= PROT_EXEC;
96534 acc_mode |= S_IXUGO;
96535 }
96536@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96537 if (err)
96538 goto out_unlock;
96539
96540+#ifdef CONFIG_GRKERNSEC
96541+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
96542+ shp->shm_perm.cuid, shmid) ||
96543+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
96544+ err = -EACCES;
96545+ goto out_unlock;
96546+ }
96547+#endif
96548+
96549 ipc_lock_object(&shp->shm_perm);
96550
96551 /* check if shm_destroy() is tearing down shp */
96552@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96553 path = shp->shm_file->f_path;
96554 path_get(&path);
96555 shp->shm_nattch++;
96556+#ifdef CONFIG_GRKERNSEC
96557+ shp->shm_lapid = current->pid;
96558+#endif
96559 size = i_size_read(path.dentry->d_inode);
96560 ipc_unlock_object(&shp->shm_perm);
96561 rcu_read_unlock();
96562diff --git a/ipc/util.c b/ipc/util.c
96563index 106bed0..f851429 100644
96564--- a/ipc/util.c
96565+++ b/ipc/util.c
96566@@ -71,6 +71,8 @@ struct ipc_proc_iface {
96567 int (*show)(struct seq_file *, void *);
96568 };
96569
96570+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
96571+
96572 /**
96573 * ipc_init - initialise ipc subsystem
96574 *
96575@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
96576 granted_mode >>= 6;
96577 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
96578 granted_mode >>= 3;
96579+
96580+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
96581+ return -1;
96582+
96583 /* is there some bit set in requested_mode but not in granted_mode? */
96584 if ((requested_mode & ~granted_mode & 0007) &&
96585 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
96586diff --git a/kernel/audit.c b/kernel/audit.c
96587index 72ab759..757deba 100644
96588--- a/kernel/audit.c
96589+++ b/kernel/audit.c
96590@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
96591 3) suppressed due to audit_rate_limit
96592 4) suppressed due to audit_backlog_limit
96593 */
96594-static atomic_t audit_lost = ATOMIC_INIT(0);
96595+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
96596
96597 /* The netlink socket. */
96598 static struct sock *audit_sock;
96599@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
96600 unsigned long now;
96601 int print;
96602
96603- atomic_inc(&audit_lost);
96604+ atomic_inc_unchecked(&audit_lost);
96605
96606 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
96607
96608@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
96609 if (print) {
96610 if (printk_ratelimit())
96611 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
96612- atomic_read(&audit_lost),
96613+ atomic_read_unchecked(&audit_lost),
96614 audit_rate_limit,
96615 audit_backlog_limit);
96616 audit_panic(message);
96617@@ -831,7 +831,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
96618 s.pid = audit_pid;
96619 s.rate_limit = audit_rate_limit;
96620 s.backlog_limit = audit_backlog_limit;
96621- s.lost = atomic_read(&audit_lost);
96622+ s.lost = atomic_read_unchecked(&audit_lost);
96623 s.backlog = skb_queue_len(&audit_skb_queue);
96624 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
96625 s.backlog_wait_time = audit_backlog_wait_time;
96626diff --git a/kernel/auditsc.c b/kernel/auditsc.c
96627index dc4ae70..2a2bddc 100644
96628--- a/kernel/auditsc.c
96629+++ b/kernel/auditsc.c
96630@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
96631 }
96632
96633 /* global counter which is incremented every time something logs in */
96634-static atomic_t session_id = ATOMIC_INIT(0);
96635+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
96636
96637 static int audit_set_loginuid_perm(kuid_t loginuid)
96638 {
96639@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
96640
96641 /* are we setting or clearing? */
96642 if (uid_valid(loginuid))
96643- sessionid = (unsigned int)atomic_inc_return(&session_id);
96644+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
96645
96646 task->sessionid = sessionid;
96647 task->loginuid = loginuid;
96648diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
96649index 0c5796e..a9414e2 100644
96650--- a/kernel/bpf/core.c
96651+++ b/kernel/bpf/core.c
96652@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
96653 * random section of illegal instructions.
96654 */
96655 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
96656- hdr = module_alloc(size);
96657+ hdr = module_alloc_exec(size);
96658 if (hdr == NULL)
96659 return NULL;
96660
96661 /* Fill space with illegal/arch-dep instructions. */
96662 bpf_fill_ill_insns(hdr, size);
96663
96664+ pax_open_kernel();
96665 hdr->pages = size / PAGE_SIZE;
96666+ pax_close_kernel();
96667+
96668 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
96669 PAGE_SIZE - sizeof(*hdr));
96670 start = (prandom_u32() % hole) & ~(alignment - 1);
96671@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
96672
96673 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
96674 {
96675- module_memfree(hdr);
96676+ module_memfree_exec(hdr);
96677 }
96678 #endif /* CONFIG_BPF_JIT */
96679
96680diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
96681index 536edc2..d28c85d 100644
96682--- a/kernel/bpf/syscall.c
96683+++ b/kernel/bpf/syscall.c
96684@@ -548,11 +548,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
96685 int err;
96686
96687 /* the syscall is limited to root temporarily. This restriction will be
96688- * lifted when security audit is clean. Note that eBPF+tracing must have
96689- * this restriction, since it may pass kernel data to user space
96690+ * lifted by upstream when a half-assed security audit is clean. Note
96691+ * that eBPF+tracing must have this restriction, since it may pass
96692+ * kernel data to user space
96693 */
96694 if (!capable(CAP_SYS_ADMIN))
96695 return -EPERM;
96696+#ifdef CONFIG_GRKERNSEC
96697+ return -EPERM;
96698+#endif
96699
96700 if (!access_ok(VERIFY_READ, uattr, 1))
96701 return -EFAULT;
96702diff --git a/kernel/capability.c b/kernel/capability.c
96703index 989f5bf..d317ca0 100644
96704--- a/kernel/capability.c
96705+++ b/kernel/capability.c
96706@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
96707 * before modification is attempted and the application
96708 * fails.
96709 */
96710+ if (tocopy > ARRAY_SIZE(kdata))
96711+ return -EFAULT;
96712+
96713 if (copy_to_user(dataptr, kdata, tocopy
96714 * sizeof(struct __user_cap_data_struct))) {
96715 return -EFAULT;
96716@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
96717 int ret;
96718
96719 rcu_read_lock();
96720- ret = security_capable(__task_cred(t), ns, cap);
96721+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
96722+ gr_task_is_capable(t, __task_cred(t), cap);
96723 rcu_read_unlock();
96724
96725- return (ret == 0);
96726+ return ret;
96727 }
96728
96729 /**
96730@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
96731 int ret;
96732
96733 rcu_read_lock();
96734- ret = security_capable_noaudit(__task_cred(t), ns, cap);
96735+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
96736 rcu_read_unlock();
96737
96738- return (ret == 0);
96739+ return ret;
96740 }
96741
96742 /**
96743@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
96744 BUG();
96745 }
96746
96747- if (security_capable(current_cred(), ns, cap) == 0) {
96748+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
96749 current->flags |= PF_SUPERPRIV;
96750 return true;
96751 }
96752@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
96753 }
96754 EXPORT_SYMBOL(ns_capable);
96755
96756+bool ns_capable_nolog(struct user_namespace *ns, int cap)
96757+{
96758+ if (unlikely(!cap_valid(cap))) {
96759+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
96760+ BUG();
96761+ }
96762+
96763+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
96764+ current->flags |= PF_SUPERPRIV;
96765+ return true;
96766+ }
96767+ return false;
96768+}
96769+EXPORT_SYMBOL(ns_capable_nolog);
96770+
96771 /**
96772 * file_ns_capable - Determine if the file's opener had a capability in effect
96773 * @file: The file we want to check
96774@@ -427,6 +446,12 @@ bool capable(int cap)
96775 }
96776 EXPORT_SYMBOL(capable);
96777
96778+bool capable_nolog(int cap)
96779+{
96780+ return ns_capable_nolog(&init_user_ns, cap);
96781+}
96782+EXPORT_SYMBOL(capable_nolog);
96783+
96784 /**
96785 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
96786 * @inode: The inode in question
96787@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
96788 kgid_has_mapping(ns, inode->i_gid);
96789 }
96790 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
96791+
96792+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
96793+{
96794+ struct user_namespace *ns = current_user_ns();
96795+
96796+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
96797+ kgid_has_mapping(ns, inode->i_gid);
96798+}
96799+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
96800diff --git a/kernel/cgroup.c b/kernel/cgroup.c
96801index 29a7b2c..a64e30a 100644
96802--- a/kernel/cgroup.c
96803+++ b/kernel/cgroup.c
96804@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
96805 if (!pathbuf || !agentbuf)
96806 goto out;
96807
96808+ if (agentbuf[0] == '\0')
96809+ goto out;
96810+
96811 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
96812 if (!path)
96813 goto out;
96814@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
96815 struct task_struct *task;
96816 int count = 0;
96817
96818- seq_printf(seq, "css_set %p\n", cset);
96819+ seq_printf(seq, "css_set %pK\n", cset);
96820
96821 list_for_each_entry(task, &cset->tasks, cg_list) {
96822 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
96823diff --git a/kernel/compat.c b/kernel/compat.c
96824index 24f0061..762ec00 100644
96825--- a/kernel/compat.c
96826+++ b/kernel/compat.c
96827@@ -13,6 +13,7 @@
96828
96829 #include <linux/linkage.h>
96830 #include <linux/compat.h>
96831+#include <linux/module.h>
96832 #include <linux/errno.h>
96833 #include <linux/time.h>
96834 #include <linux/signal.h>
96835@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
96836 mm_segment_t oldfs;
96837 long ret;
96838
96839- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
96840+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
96841 oldfs = get_fs();
96842 set_fs(KERNEL_DS);
96843 ret = hrtimer_nanosleep_restart(restart);
96844@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
96845 oldfs = get_fs();
96846 set_fs(KERNEL_DS);
96847 ret = hrtimer_nanosleep(&tu,
96848- rmtp ? (struct timespec __user *)&rmt : NULL,
96849+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
96850 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
96851 set_fs(oldfs);
96852
96853@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
96854 mm_segment_t old_fs = get_fs();
96855
96856 set_fs(KERNEL_DS);
96857- ret = sys_sigpending((old_sigset_t __user *) &s);
96858+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
96859 set_fs(old_fs);
96860 if (ret == 0)
96861 ret = put_user(s, set);
96862@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
96863 mm_segment_t old_fs = get_fs();
96864
96865 set_fs(KERNEL_DS);
96866- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
96867+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
96868 set_fs(old_fs);
96869
96870 if (!ret) {
96871@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
96872 set_fs (KERNEL_DS);
96873 ret = sys_wait4(pid,
96874 (stat_addr ?
96875- (unsigned int __user *) &status : NULL),
96876- options, (struct rusage __user *) &r);
96877+ (unsigned int __force_user *) &status : NULL),
96878+ options, (struct rusage __force_user *) &r);
96879 set_fs (old_fs);
96880
96881 if (ret > 0) {
96882@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
96883 memset(&info, 0, sizeof(info));
96884
96885 set_fs(KERNEL_DS);
96886- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
96887- uru ? (struct rusage __user *)&ru : NULL);
96888+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
96889+ uru ? (struct rusage __force_user *)&ru : NULL);
96890 set_fs(old_fs);
96891
96892 if ((ret < 0) || (info.si_signo == 0))
96893@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
96894 oldfs = get_fs();
96895 set_fs(KERNEL_DS);
96896 err = sys_timer_settime(timer_id, flags,
96897- (struct itimerspec __user *) &newts,
96898- (struct itimerspec __user *) &oldts);
96899+ (struct itimerspec __force_user *) &newts,
96900+ (struct itimerspec __force_user *) &oldts);
96901 set_fs(oldfs);
96902 if (!err && old && put_compat_itimerspec(old, &oldts))
96903 return -EFAULT;
96904@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
96905 oldfs = get_fs();
96906 set_fs(KERNEL_DS);
96907 err = sys_timer_gettime(timer_id,
96908- (struct itimerspec __user *) &ts);
96909+ (struct itimerspec __force_user *) &ts);
96910 set_fs(oldfs);
96911 if (!err && put_compat_itimerspec(setting, &ts))
96912 return -EFAULT;
96913@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
96914 oldfs = get_fs();
96915 set_fs(KERNEL_DS);
96916 err = sys_clock_settime(which_clock,
96917- (struct timespec __user *) &ts);
96918+ (struct timespec __force_user *) &ts);
96919 set_fs(oldfs);
96920 return err;
96921 }
96922@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
96923 oldfs = get_fs();
96924 set_fs(KERNEL_DS);
96925 err = sys_clock_gettime(which_clock,
96926- (struct timespec __user *) &ts);
96927+ (struct timespec __force_user *) &ts);
96928 set_fs(oldfs);
96929 if (!err && compat_put_timespec(&ts, tp))
96930 return -EFAULT;
96931@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
96932
96933 oldfs = get_fs();
96934 set_fs(KERNEL_DS);
96935- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
96936+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
96937 set_fs(oldfs);
96938
96939 err = compat_put_timex(utp, &txc);
96940@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
96941 oldfs = get_fs();
96942 set_fs(KERNEL_DS);
96943 err = sys_clock_getres(which_clock,
96944- (struct timespec __user *) &ts);
96945+ (struct timespec __force_user *) &ts);
96946 set_fs(oldfs);
96947 if (!err && tp && compat_put_timespec(&ts, tp))
96948 return -EFAULT;
96949@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
96950 struct timespec tu;
96951 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
96952
96953- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
96954+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
96955 oldfs = get_fs();
96956 set_fs(KERNEL_DS);
96957 err = clock_nanosleep_restart(restart);
96958@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
96959 oldfs = get_fs();
96960 set_fs(KERNEL_DS);
96961 err = sys_clock_nanosleep(which_clock, flags,
96962- (struct timespec __user *) &in,
96963- (struct timespec __user *) &out);
96964+ (struct timespec __force_user *) &in,
96965+ (struct timespec __force_user *) &out);
96966 set_fs(oldfs);
96967
96968 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
96969@@ -912,7 +913,8 @@ long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask,
96970 * bitmap. We must however ensure the end of the
96971 * kernel bitmap is zeroed.
96972 */
96973- if (nr_compat_longs-- > 0) {
96974+ if (nr_compat_longs) {
96975+ nr_compat_longs--;
96976 if (__get_user(um, umask))
96977 return -EFAULT;
96978 } else {
96979@@ -954,7 +956,8 @@ long compat_put_bitmap(compat_ulong_t __user *umask, unsigned long *mask,
96980 * We dont want to write past the end of the userspace
96981 * bitmap.
96982 */
96983- if (nr_compat_longs-- > 0) {
96984+ if (nr_compat_longs) {
96985+ nr_compat_longs--;
96986 if (__put_user(um, umask))
96987 return -EFAULT;
96988 }
96989@@ -1145,7 +1148,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
96990 mm_segment_t old_fs = get_fs();
96991
96992 set_fs(KERNEL_DS);
96993- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
96994+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
96995 set_fs(old_fs);
96996 if (compat_put_timespec(&t, interval))
96997 return -EFAULT;
96998diff --git a/kernel/configs.c b/kernel/configs.c
96999index c18b1f1..b9a0132 100644
97000--- a/kernel/configs.c
97001+++ b/kernel/configs.c
97002@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
97003 struct proc_dir_entry *entry;
97004
97005 /* create the current config file */
97006+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
97007+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
97008+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
97009+ &ikconfig_file_ops);
97010+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
97011+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
97012+ &ikconfig_file_ops);
97013+#endif
97014+#else
97015 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
97016 &ikconfig_file_ops);
97017+#endif
97018+
97019 if (!entry)
97020 return -ENOMEM;
97021
97022diff --git a/kernel/cred.c b/kernel/cred.c
97023index e0573a4..26c0fd3 100644
97024--- a/kernel/cred.c
97025+++ b/kernel/cred.c
97026@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
97027 validate_creds(cred);
97028 alter_cred_subscribers(cred, -1);
97029 put_cred(cred);
97030+
97031+#ifdef CONFIG_GRKERNSEC_SETXID
97032+ cred = (struct cred *) tsk->delayed_cred;
97033+ if (cred != NULL) {
97034+ tsk->delayed_cred = NULL;
97035+ validate_creds(cred);
97036+ alter_cred_subscribers(cred, -1);
97037+ put_cred(cred);
97038+ }
97039+#endif
97040 }
97041
97042 /**
97043@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
97044 * Always returns 0 thus allowing this function to be tail-called at the end
97045 * of, say, sys_setgid().
97046 */
97047-int commit_creds(struct cred *new)
97048+static int __commit_creds(struct cred *new)
97049 {
97050 struct task_struct *task = current;
97051 const struct cred *old = task->real_cred;
97052@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
97053
97054 get_cred(new); /* we will require a ref for the subj creds too */
97055
97056+ gr_set_role_label(task, new->uid, new->gid);
97057+
97058 /* dumpability changes */
97059 if (!uid_eq(old->euid, new->euid) ||
97060 !gid_eq(old->egid, new->egid) ||
97061@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
97062 put_cred(old);
97063 return 0;
97064 }
97065+#ifdef CONFIG_GRKERNSEC_SETXID
97066+extern int set_user(struct cred *new);
97067+
97068+void gr_delayed_cred_worker(void)
97069+{
97070+ const struct cred *new = current->delayed_cred;
97071+ struct cred *ncred;
97072+
97073+ current->delayed_cred = NULL;
97074+
97075+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
97076+ // from doing get_cred on it when queueing this
97077+ put_cred(new);
97078+ return;
97079+ } else if (new == NULL)
97080+ return;
97081+
97082+ ncred = prepare_creds();
97083+ if (!ncred)
97084+ goto die;
97085+ // uids
97086+ ncred->uid = new->uid;
97087+ ncred->euid = new->euid;
97088+ ncred->suid = new->suid;
97089+ ncred->fsuid = new->fsuid;
97090+ // gids
97091+ ncred->gid = new->gid;
97092+ ncred->egid = new->egid;
97093+ ncred->sgid = new->sgid;
97094+ ncred->fsgid = new->fsgid;
97095+ // groups
97096+ set_groups(ncred, new->group_info);
97097+ // caps
97098+ ncred->securebits = new->securebits;
97099+ ncred->cap_inheritable = new->cap_inheritable;
97100+ ncred->cap_permitted = new->cap_permitted;
97101+ ncred->cap_effective = new->cap_effective;
97102+ ncred->cap_bset = new->cap_bset;
97103+
97104+ if (set_user(ncred)) {
97105+ abort_creds(ncred);
97106+ goto die;
97107+ }
97108+
97109+ // from doing get_cred on it when queueing this
97110+ put_cred(new);
97111+
97112+ __commit_creds(ncred);
97113+ return;
97114+die:
97115+ // from doing get_cred on it when queueing this
97116+ put_cred(new);
97117+ do_group_exit(SIGKILL);
97118+}
97119+#endif
97120+
97121+int commit_creds(struct cred *new)
97122+{
97123+#ifdef CONFIG_GRKERNSEC_SETXID
97124+ int ret;
97125+ int schedule_it = 0;
97126+ struct task_struct *t;
97127+ unsigned oldsecurebits = current_cred()->securebits;
97128+
97129+ /* we won't get called with tasklist_lock held for writing
97130+ and interrupts disabled as the cred struct in that case is
97131+ init_cred
97132+ */
97133+ if (grsec_enable_setxid && !current_is_single_threaded() &&
97134+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
97135+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
97136+ schedule_it = 1;
97137+ }
97138+ ret = __commit_creds(new);
97139+ if (schedule_it) {
97140+ rcu_read_lock();
97141+ read_lock(&tasklist_lock);
97142+ for (t = next_thread(current); t != current;
97143+ t = next_thread(t)) {
97144+ /* we'll check if the thread has uid 0 in
97145+ * the delayed worker routine
97146+ */
97147+ if (task_securebits(t) == oldsecurebits &&
97148+ t->delayed_cred == NULL) {
97149+ t->delayed_cred = get_cred(new);
97150+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
97151+ set_tsk_need_resched(t);
97152+ }
97153+ }
97154+ read_unlock(&tasklist_lock);
97155+ rcu_read_unlock();
97156+ }
97157+
97158+ return ret;
97159+#else
97160+ return __commit_creds(new);
97161+#endif
97162+}
97163+
97164 EXPORT_SYMBOL(commit_creds);
97165
97166 /**
97167diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
97168index 0874e2e..5b32cc9 100644
97169--- a/kernel/debug/debug_core.c
97170+++ b/kernel/debug/debug_core.c
97171@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
97172 */
97173 static atomic_t masters_in_kgdb;
97174 static atomic_t slaves_in_kgdb;
97175-static atomic_t kgdb_break_tasklet_var;
97176+static atomic_unchecked_t kgdb_break_tasklet_var;
97177 atomic_t kgdb_setting_breakpoint;
97178
97179 struct task_struct *kgdb_usethread;
97180@@ -137,7 +137,7 @@ int kgdb_single_step;
97181 static pid_t kgdb_sstep_pid;
97182
97183 /* to keep track of the CPU which is doing the single stepping*/
97184-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
97185+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
97186
97187 /*
97188 * If you are debugging a problem where roundup (the collection of
97189@@ -552,7 +552,7 @@ return_normal:
97190 * kernel will only try for the value of sstep_tries before
97191 * giving up and continuing on.
97192 */
97193- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
97194+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
97195 (kgdb_info[cpu].task &&
97196 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
97197 atomic_set(&kgdb_active, -1);
97198@@ -654,8 +654,8 @@ cpu_master_loop:
97199 }
97200
97201 kgdb_restore:
97202- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
97203- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
97204+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
97205+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
97206 if (kgdb_info[sstep_cpu].task)
97207 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
97208 else
97209@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
97210 static void kgdb_tasklet_bpt(unsigned long ing)
97211 {
97212 kgdb_breakpoint();
97213- atomic_set(&kgdb_break_tasklet_var, 0);
97214+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
97215 }
97216
97217 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
97218
97219 void kgdb_schedule_breakpoint(void)
97220 {
97221- if (atomic_read(&kgdb_break_tasklet_var) ||
97222+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
97223 atomic_read(&kgdb_active) != -1 ||
97224 atomic_read(&kgdb_setting_breakpoint))
97225 return;
97226- atomic_inc(&kgdb_break_tasklet_var);
97227+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
97228 tasklet_schedule(&kgdb_tasklet_breakpoint);
97229 }
97230 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
97231diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
97232index 41213454..861e178 100644
97233--- a/kernel/debug/kdb/kdb_main.c
97234+++ b/kernel/debug/kdb/kdb_main.c
97235@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
97236 continue;
97237
97238 kdb_printf("%-20s%8u 0x%p ", mod->name,
97239- mod->core_size, (void *)mod);
97240+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
97241 #ifdef CONFIG_MODULE_UNLOAD
97242 kdb_printf("%4d ", module_refcount(mod));
97243 #endif
97244@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
97245 kdb_printf(" (Loading)");
97246 else
97247 kdb_printf(" (Live)");
97248- kdb_printf(" 0x%p", mod->module_core);
97249+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
97250
97251 #ifdef CONFIG_MODULE_UNLOAD
97252 {
97253diff --git a/kernel/events/core.c b/kernel/events/core.c
97254index 2fabc06..79cceec 100644
97255--- a/kernel/events/core.c
97256+++ b/kernel/events/core.c
97257@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
97258 * 0 - disallow raw tracepoint access for unpriv
97259 * 1 - disallow cpu events for unpriv
97260 * 2 - disallow kernel profiling for unpriv
97261+ * 3 - disallow all unpriv perf event use
97262 */
97263-int sysctl_perf_event_paranoid __read_mostly = 1;
97264+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
97265+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
97266+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
97267+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
97268+#else
97269+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
97270+#endif
97271
97272 /* Minimum for 512 kiB + 1 user control page */
97273 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
97274@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
97275
97276 tmp *= sysctl_perf_cpu_time_max_percent;
97277 do_div(tmp, 100);
97278- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
97279+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
97280 }
97281
97282 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
97283@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
97284 }
97285 }
97286
97287-static atomic64_t perf_event_id;
97288+static atomic64_unchecked_t perf_event_id;
97289
97290 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
97291 enum event_type_t event_type);
97292@@ -3220,7 +3227,7 @@ static void __perf_event_read(void *info)
97293
97294 static inline u64 perf_event_count(struct perf_event *event)
97295 {
97296- return local64_read(&event->count) + atomic64_read(&event->child_count);
97297+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
97298 }
97299
97300 static u64 perf_event_read(struct perf_event *event)
97301@@ -3656,9 +3663,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
97302 mutex_lock(&event->child_mutex);
97303 total += perf_event_read(event);
97304 *enabled += event->total_time_enabled +
97305- atomic64_read(&event->child_total_time_enabled);
97306+ atomic64_read_unchecked(&event->child_total_time_enabled);
97307 *running += event->total_time_running +
97308- atomic64_read(&event->child_total_time_running);
97309+ atomic64_read_unchecked(&event->child_total_time_running);
97310
97311 list_for_each_entry(child, &event->child_list, child_list) {
97312 total += perf_event_read(child);
97313@@ -4147,10 +4154,10 @@ void perf_event_update_userpage(struct perf_event *event)
97314 userpg->offset -= local64_read(&event->hw.prev_count);
97315
97316 userpg->time_enabled = enabled +
97317- atomic64_read(&event->child_total_time_enabled);
97318+ atomic64_read_unchecked(&event->child_total_time_enabled);
97319
97320 userpg->time_running = running +
97321- atomic64_read(&event->child_total_time_running);
97322+ atomic64_read_unchecked(&event->child_total_time_running);
97323
97324 arch_perf_update_userpage(event, userpg, now);
97325
97326@@ -4740,7 +4747,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
97327
97328 /* Data. */
97329 sp = perf_user_stack_pointer(regs);
97330- rem = __output_copy_user(handle, (void *) sp, dump_size);
97331+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
97332 dyn_size = dump_size - rem;
97333
97334 perf_output_skip(handle, rem);
97335@@ -4831,11 +4838,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
97336 values[n++] = perf_event_count(event);
97337 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
97338 values[n++] = enabled +
97339- atomic64_read(&event->child_total_time_enabled);
97340+ atomic64_read_unchecked(&event->child_total_time_enabled);
97341 }
97342 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
97343 values[n++] = running +
97344- atomic64_read(&event->child_total_time_running);
97345+ atomic64_read_unchecked(&event->child_total_time_running);
97346 }
97347 if (read_format & PERF_FORMAT_ID)
97348 values[n++] = primary_event_id(event);
97349@@ -7180,7 +7187,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
97350 event->parent = parent_event;
97351
97352 event->ns = get_pid_ns(task_active_pid_ns(current));
97353- event->id = atomic64_inc_return(&perf_event_id);
97354+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
97355
97356 event->state = PERF_EVENT_STATE_INACTIVE;
97357
97358@@ -7470,6 +7477,11 @@ SYSCALL_DEFINE5(perf_event_open,
97359 if (flags & ~PERF_FLAG_ALL)
97360 return -EINVAL;
97361
97362+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
97363+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
97364+ return -EACCES;
97365+#endif
97366+
97367 err = perf_copy_attr(attr_uptr, &attr);
97368 if (err)
97369 return err;
97370@@ -7892,10 +7904,10 @@ static void sync_child_event(struct perf_event *child_event,
97371 /*
97372 * Add back the child's count to the parent's count:
97373 */
97374- atomic64_add(child_val, &parent_event->child_count);
97375- atomic64_add(child_event->total_time_enabled,
97376+ atomic64_add_unchecked(child_val, &parent_event->child_count);
97377+ atomic64_add_unchecked(child_event->total_time_enabled,
97378 &parent_event->child_total_time_enabled);
97379- atomic64_add(child_event->total_time_running,
97380+ atomic64_add_unchecked(child_event->total_time_running,
97381 &parent_event->child_total_time_running);
97382
97383 /*
97384diff --git a/kernel/events/internal.h b/kernel/events/internal.h
97385index 569b2187..19940d9 100644
97386--- a/kernel/events/internal.h
97387+++ b/kernel/events/internal.h
97388@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
97389 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
97390 }
97391
97392-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
97393+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
97394 static inline unsigned long \
97395 func_name(struct perf_output_handle *handle, \
97396- const void *buf, unsigned long len) \
97397+ const void user *buf, unsigned long len) \
97398 { \
97399 unsigned long size, written; \
97400 \
97401@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
97402 return 0;
97403 }
97404
97405-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
97406+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
97407
97408 static inline unsigned long
97409 memcpy_skip(void *dst, const void *src, unsigned long n)
97410@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
97411 return 0;
97412 }
97413
97414-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
97415+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
97416
97417 #ifndef arch_perf_out_copy_user
97418 #define arch_perf_out_copy_user arch_perf_out_copy_user
97419@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
97420 }
97421 #endif
97422
97423-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
97424+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
97425
97426 /* Callchain handling */
97427 extern struct perf_callchain_entry *
97428diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
97429index cb346f2..e4dc317 100644
97430--- a/kernel/events/uprobes.c
97431+++ b/kernel/events/uprobes.c
97432@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
97433 {
97434 struct page *page;
97435 uprobe_opcode_t opcode;
97436- int result;
97437+ long result;
97438
97439 pagefault_disable();
97440 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
97441diff --git a/kernel/exit.c b/kernel/exit.c
97442index feff10b..f623dd5 100644
97443--- a/kernel/exit.c
97444+++ b/kernel/exit.c
97445@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
97446 struct task_struct *leader;
97447 int zap_leader;
97448 repeat:
97449+#ifdef CONFIG_NET
97450+ gr_del_task_from_ip_table(p);
97451+#endif
97452+
97453 /* don't need to get the RCU readlock here - the process is dead and
97454 * can't be modifying its own credentials. But shut RCU-lockdep up */
97455 rcu_read_lock();
97456@@ -656,6 +660,8 @@ void do_exit(long code)
97457 int group_dead;
97458 TASKS_RCU(int tasks_rcu_i);
97459
97460+ set_fs(USER_DS);
97461+
97462 profile_task_exit(tsk);
97463
97464 WARN_ON(blk_needs_flush_plug(tsk));
97465@@ -672,7 +678,6 @@ void do_exit(long code)
97466 * mm_release()->clear_child_tid() from writing to a user-controlled
97467 * kernel address.
97468 */
97469- set_fs(USER_DS);
97470
97471 ptrace_event(PTRACE_EVENT_EXIT, code);
97472
97473@@ -730,6 +735,9 @@ void do_exit(long code)
97474 tsk->exit_code = code;
97475 taskstats_exit(tsk, group_dead);
97476
97477+ gr_acl_handle_psacct(tsk, code);
97478+ gr_acl_handle_exit();
97479+
97480 exit_mm(tsk);
97481
97482 if (group_dead)
97483@@ -849,7 +857,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
97484 * Take down every thread in the group. This is called by fatal signals
97485 * as well as by sys_exit_group (below).
97486 */
97487-void
97488+__noreturn void
97489 do_group_exit(int exit_code)
97490 {
97491 struct signal_struct *sig = current->signal;
97492diff --git a/kernel/fork.c b/kernel/fork.c
97493index cf65139..704476e 100644
97494--- a/kernel/fork.c
97495+++ b/kernel/fork.c
97496@@ -177,12 +177,54 @@ static void free_thread_info(struct thread_info *ti)
97497 void thread_info_cache_init(void)
97498 {
97499 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
97500- THREAD_SIZE, 0, NULL);
97501+ THREAD_SIZE, SLAB_USERCOPY, NULL);
97502 BUG_ON(thread_info_cache == NULL);
97503 }
97504 # endif
97505 #endif
97506
97507+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97508+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
97509+ int node, void **lowmem_stack)
97510+{
97511+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
97512+ void *ret = NULL;
97513+ unsigned int i;
97514+
97515+ *lowmem_stack = alloc_thread_info_node(tsk, node);
97516+ if (*lowmem_stack == NULL)
97517+ goto out;
97518+
97519+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
97520+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
97521+
97522+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
97523+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
97524+ if (ret == NULL) {
97525+ free_thread_info(*lowmem_stack);
97526+ *lowmem_stack = NULL;
97527+ }
97528+
97529+out:
97530+ return ret;
97531+}
97532+
97533+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
97534+{
97535+ unmap_process_stacks(tsk);
97536+}
97537+#else
97538+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
97539+ int node, void **lowmem_stack)
97540+{
97541+ return alloc_thread_info_node(tsk, node);
97542+}
97543+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
97544+{
97545+ free_thread_info(ti);
97546+}
97547+#endif
97548+
97549 /* SLAB cache for signal_struct structures (tsk->signal) */
97550 static struct kmem_cache *signal_cachep;
97551
97552@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
97553 /* SLAB cache for mm_struct structures (tsk->mm) */
97554 static struct kmem_cache *mm_cachep;
97555
97556-static void account_kernel_stack(struct thread_info *ti, int account)
97557+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
97558 {
97559+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97560+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
97561+#else
97562 struct zone *zone = page_zone(virt_to_page(ti));
97563+#endif
97564
97565 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
97566 }
97567
97568 void free_task(struct task_struct *tsk)
97569 {
97570- account_kernel_stack(tsk->stack, -1);
97571+ account_kernel_stack(tsk, tsk->stack, -1);
97572 arch_release_thread_info(tsk->stack);
97573- free_thread_info(tsk->stack);
97574+ gr_free_thread_info(tsk, tsk->stack);
97575 rt_mutex_debug_task_free(tsk);
97576 ftrace_graph_exit_task(tsk);
97577 put_seccomp_filter(tsk);
97578@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97579 {
97580 struct task_struct *tsk;
97581 struct thread_info *ti;
97582+ void *lowmem_stack;
97583 int node = tsk_fork_get_node(orig);
97584 int err;
97585
97586@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97587 if (!tsk)
97588 return NULL;
97589
97590- ti = alloc_thread_info_node(tsk, node);
97591+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
97592 if (!ti)
97593 goto free_tsk;
97594
97595@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97596 goto free_ti;
97597
97598 tsk->stack = ti;
97599+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97600+ tsk->lowmem_stack = lowmem_stack;
97601+#endif
97602 #ifdef CONFIG_SECCOMP
97603 /*
97604 * We must handle setting up seccomp filters once we're under
97605@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97606 set_task_stack_end_magic(tsk);
97607
97608 #ifdef CONFIG_CC_STACKPROTECTOR
97609- tsk->stack_canary = get_random_int();
97610+ tsk->stack_canary = pax_get_random_long();
97611 #endif
97612
97613 /*
97614@@ -352,24 +402,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97615 tsk->splice_pipe = NULL;
97616 tsk->task_frag.page = NULL;
97617
97618- account_kernel_stack(ti, 1);
97619+ account_kernel_stack(tsk, ti, 1);
97620
97621 return tsk;
97622
97623 free_ti:
97624- free_thread_info(ti);
97625+ gr_free_thread_info(tsk, ti);
97626 free_tsk:
97627 free_task_struct(tsk);
97628 return NULL;
97629 }
97630
97631 #ifdef CONFIG_MMU
97632-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97633+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
97634+{
97635+ struct vm_area_struct *tmp;
97636+ unsigned long charge;
97637+ struct file *file;
97638+ int retval;
97639+
97640+ charge = 0;
97641+ if (mpnt->vm_flags & VM_ACCOUNT) {
97642+ unsigned long len = vma_pages(mpnt);
97643+
97644+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
97645+ goto fail_nomem;
97646+ charge = len;
97647+ }
97648+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97649+ if (!tmp)
97650+ goto fail_nomem;
97651+ *tmp = *mpnt;
97652+ tmp->vm_mm = mm;
97653+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
97654+ retval = vma_dup_policy(mpnt, tmp);
97655+ if (retval)
97656+ goto fail_nomem_policy;
97657+ if (anon_vma_fork(tmp, mpnt))
97658+ goto fail_nomem_anon_vma_fork;
97659+ tmp->vm_flags &= ~VM_LOCKED;
97660+ tmp->vm_next = tmp->vm_prev = NULL;
97661+ tmp->vm_mirror = NULL;
97662+ file = tmp->vm_file;
97663+ if (file) {
97664+ struct inode *inode = file_inode(file);
97665+ struct address_space *mapping = file->f_mapping;
97666+
97667+ get_file(file);
97668+ if (tmp->vm_flags & VM_DENYWRITE)
97669+ atomic_dec(&inode->i_writecount);
97670+ i_mmap_lock_write(mapping);
97671+ if (tmp->vm_flags & VM_SHARED)
97672+ atomic_inc(&mapping->i_mmap_writable);
97673+ flush_dcache_mmap_lock(mapping);
97674+ /* insert tmp into the share list, just after mpnt */
97675+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
97676+ flush_dcache_mmap_unlock(mapping);
97677+ i_mmap_unlock_write(mapping);
97678+ }
97679+
97680+ /*
97681+ * Clear hugetlb-related page reserves for children. This only
97682+ * affects MAP_PRIVATE mappings. Faults generated by the child
97683+ * are not guaranteed to succeed, even if read-only
97684+ */
97685+ if (is_vm_hugetlb_page(tmp))
97686+ reset_vma_resv_huge_pages(tmp);
97687+
97688+ return tmp;
97689+
97690+fail_nomem_anon_vma_fork:
97691+ mpol_put(vma_policy(tmp));
97692+fail_nomem_policy:
97693+ kmem_cache_free(vm_area_cachep, tmp);
97694+fail_nomem:
97695+ vm_unacct_memory(charge);
97696+ return NULL;
97697+}
97698+
97699+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97700 {
97701 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
97702 struct rb_node **rb_link, *rb_parent;
97703 int retval;
97704- unsigned long charge;
97705
97706 uprobe_start_dup_mmap();
97707 down_write(&oldmm->mmap_sem);
97708@@ -397,51 +512,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97709
97710 prev = NULL;
97711 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
97712- struct file *file;
97713-
97714 if (mpnt->vm_flags & VM_DONTCOPY) {
97715 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
97716 -vma_pages(mpnt));
97717 continue;
97718 }
97719- charge = 0;
97720- if (mpnt->vm_flags & VM_ACCOUNT) {
97721- unsigned long len = vma_pages(mpnt);
97722-
97723- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
97724- goto fail_nomem;
97725- charge = len;
97726- }
97727- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97728- if (!tmp)
97729- goto fail_nomem;
97730- *tmp = *mpnt;
97731- INIT_LIST_HEAD(&tmp->anon_vma_chain);
97732- retval = vma_dup_policy(mpnt, tmp);
97733- if (retval)
97734- goto fail_nomem_policy;
97735- tmp->vm_mm = mm;
97736- if (anon_vma_fork(tmp, mpnt))
97737- goto fail_nomem_anon_vma_fork;
97738- tmp->vm_flags &= ~VM_LOCKED;
97739- tmp->vm_next = tmp->vm_prev = NULL;
97740- file = tmp->vm_file;
97741- if (file) {
97742- struct inode *inode = file_inode(file);
97743- struct address_space *mapping = file->f_mapping;
97744-
97745- get_file(file);
97746- if (tmp->vm_flags & VM_DENYWRITE)
97747- atomic_dec(&inode->i_writecount);
97748- i_mmap_lock_write(mapping);
97749- if (tmp->vm_flags & VM_SHARED)
97750- atomic_inc(&mapping->i_mmap_writable);
97751- flush_dcache_mmap_lock(mapping);
97752- /* insert tmp into the share list, just after mpnt */
97753- vma_interval_tree_insert_after(tmp, mpnt,
97754- &mapping->i_mmap);
97755- flush_dcache_mmap_unlock(mapping);
97756- i_mmap_unlock_write(mapping);
97757+ tmp = dup_vma(mm, oldmm, mpnt);
97758+ if (!tmp) {
97759+ retval = -ENOMEM;
97760+ goto out;
97761 }
97762
97763 /*
97764@@ -473,6 +552,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97765 if (retval)
97766 goto out;
97767 }
97768+
97769+#ifdef CONFIG_PAX_SEGMEXEC
97770+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
97771+ struct vm_area_struct *mpnt_m;
97772+
97773+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
97774+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
97775+
97776+ if (!mpnt->vm_mirror)
97777+ continue;
97778+
97779+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
97780+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
97781+ mpnt->vm_mirror = mpnt_m;
97782+ } else {
97783+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
97784+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
97785+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
97786+ mpnt->vm_mirror->vm_mirror = mpnt;
97787+ }
97788+ }
97789+ BUG_ON(mpnt_m);
97790+ }
97791+#endif
97792+
97793 /* a new mm has just been created */
97794 arch_dup_mmap(oldmm, mm);
97795 retval = 0;
97796@@ -482,14 +586,6 @@ out:
97797 up_write(&oldmm->mmap_sem);
97798 uprobe_end_dup_mmap();
97799 return retval;
97800-fail_nomem_anon_vma_fork:
97801- mpol_put(vma_policy(tmp));
97802-fail_nomem_policy:
97803- kmem_cache_free(vm_area_cachep, tmp);
97804-fail_nomem:
97805- retval = -ENOMEM;
97806- vm_unacct_memory(charge);
97807- goto out;
97808 }
97809
97810 static inline int mm_alloc_pgd(struct mm_struct *mm)
97811@@ -739,8 +835,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
97812 return ERR_PTR(err);
97813
97814 mm = get_task_mm(task);
97815- if (mm && mm != current->mm &&
97816- !ptrace_may_access(task, mode)) {
97817+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
97818+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
97819 mmput(mm);
97820 mm = ERR_PTR(-EACCES);
97821 }
97822@@ -943,13 +1039,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
97823 spin_unlock(&fs->lock);
97824 return -EAGAIN;
97825 }
97826- fs->users++;
97827+ atomic_inc(&fs->users);
97828 spin_unlock(&fs->lock);
97829 return 0;
97830 }
97831 tsk->fs = copy_fs_struct(fs);
97832 if (!tsk->fs)
97833 return -ENOMEM;
97834+ /* Carry through gr_chroot_dentry and is_chrooted instead
97835+ of recomputing it here. Already copied when the task struct
97836+ is duplicated. This allows pivot_root to not be treated as
97837+ a chroot
97838+ */
97839+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
97840+
97841 return 0;
97842 }
97843
97844@@ -1187,7 +1290,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
97845 * parts of the process environment (as per the clone
97846 * flags). The actual kick-off is left to the caller.
97847 */
97848-static struct task_struct *copy_process(unsigned long clone_flags,
97849+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
97850 unsigned long stack_start,
97851 unsigned long stack_size,
97852 int __user *child_tidptr,
97853@@ -1258,6 +1361,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
97854 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
97855 #endif
97856 retval = -EAGAIN;
97857+
97858+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
97859+
97860 if (atomic_read(&p->real_cred->user->processes) >=
97861 task_rlimit(p, RLIMIT_NPROC)) {
97862 if (p->real_cred->user != INIT_USER &&
97863@@ -1507,6 +1613,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
97864 goto bad_fork_free_pid;
97865 }
97866
97867+ /* synchronizes with gr_set_acls()
97868+ we need to call this past the point of no return for fork()
97869+ */
97870+ gr_copy_label(p);
97871+
97872 if (likely(p->pid)) {
97873 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
97874
97875@@ -1597,6 +1708,8 @@ bad_fork_cleanup_count:
97876 bad_fork_free:
97877 free_task(p);
97878 fork_out:
97879+ gr_log_forkfail(retval);
97880+
97881 return ERR_PTR(retval);
97882 }
97883
97884@@ -1658,6 +1771,7 @@ long do_fork(unsigned long clone_flags,
97885
97886 p = copy_process(clone_flags, stack_start, stack_size,
97887 child_tidptr, NULL, trace);
97888+ add_latent_entropy();
97889 /*
97890 * Do this prior waking up the new thread - the thread pointer
97891 * might get invalid after that point, if the thread exits quickly.
97892@@ -1674,6 +1788,8 @@ long do_fork(unsigned long clone_flags,
97893 if (clone_flags & CLONE_PARENT_SETTID)
97894 put_user(nr, parent_tidptr);
97895
97896+ gr_handle_brute_check();
97897+
97898 if (clone_flags & CLONE_VFORK) {
97899 p->vfork_done = &vfork;
97900 init_completion(&vfork);
97901@@ -1792,7 +1908,7 @@ void __init proc_caches_init(void)
97902 mm_cachep = kmem_cache_create("mm_struct",
97903 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
97904 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
97905- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
97906+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
97907 mmap_init();
97908 nsproxy_cache_init();
97909 }
97910@@ -1832,7 +1948,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
97911 return 0;
97912
97913 /* don't need lock here; in the worst case we'll do useless copy */
97914- if (fs->users == 1)
97915+ if (atomic_read(&fs->users) == 1)
97916 return 0;
97917
97918 *new_fsp = copy_fs_struct(fs);
97919@@ -1944,7 +2060,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
97920 fs = current->fs;
97921 spin_lock(&fs->lock);
97922 current->fs = new_fs;
97923- if (--fs->users)
97924+ gr_set_chroot_entries(current, &current->fs->root);
97925+ if (atomic_dec_return(&fs->users))
97926 new_fs = NULL;
97927 else
97928 new_fs = fs;
97929diff --git a/kernel/futex.c b/kernel/futex.c
97930index 2a5e383..878bac6 100644
97931--- a/kernel/futex.c
97932+++ b/kernel/futex.c
97933@@ -201,7 +201,7 @@ struct futex_pi_state {
97934 atomic_t refcount;
97935
97936 union futex_key key;
97937-};
97938+} __randomize_layout;
97939
97940 /**
97941 * struct futex_q - The hashed futex queue entry, one per waiting task
97942@@ -235,7 +235,7 @@ struct futex_q {
97943 struct rt_mutex_waiter *rt_waiter;
97944 union futex_key *requeue_pi_key;
97945 u32 bitset;
97946-};
97947+} __randomize_layout;
97948
97949 static const struct futex_q futex_q_init = {
97950 /* list gets initialized in queue_me()*/
97951@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
97952 struct page *page, *page_head;
97953 int err, ro = 0;
97954
97955+#ifdef CONFIG_PAX_SEGMEXEC
97956+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
97957+ return -EFAULT;
97958+#endif
97959+
97960 /*
97961 * The futex address must be "naturally" aligned.
97962 */
97963@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
97964
97965 static int get_futex_value_locked(u32 *dest, u32 __user *from)
97966 {
97967- int ret;
97968+ unsigned long ret;
97969
97970 pagefault_disable();
97971 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
97972@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
97973 {
97974 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
97975 u32 curval;
97976+ mm_segment_t oldfs;
97977
97978 /*
97979 * This will fail and we want it. Some arch implementations do
97980@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
97981 * implementation, the non-functional ones will return
97982 * -ENOSYS.
97983 */
97984+ oldfs = get_fs();
97985+ set_fs(USER_DS);
97986 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
97987 futex_cmpxchg_enabled = 1;
97988+ set_fs(oldfs);
97989 #endif
97990 }
97991
97992diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
97993index 55c8c93..9ba7ad6 100644
97994--- a/kernel/futex_compat.c
97995+++ b/kernel/futex_compat.c
97996@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
97997 return 0;
97998 }
97999
98000-static void __user *futex_uaddr(struct robust_list __user *entry,
98001+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
98002 compat_long_t futex_offset)
98003 {
98004 compat_uptr_t base = ptr_to_compat(entry);
98005diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
98006index b358a80..fc25240 100644
98007--- a/kernel/gcov/base.c
98008+++ b/kernel/gcov/base.c
98009@@ -114,11 +114,6 @@ void gcov_enable_events(void)
98010 }
98011
98012 #ifdef CONFIG_MODULES
98013-static inline int within(void *addr, void *start, unsigned long size)
98014-{
98015- return ((addr >= start) && (addr < start + size));
98016-}
98017-
98018 /* Update list and generate events when modules are unloaded. */
98019 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
98020 void *data)
98021@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
98022
98023 /* Remove entries located in module from linked list. */
98024 while ((info = gcov_info_next(info))) {
98025- if (within(info, mod->module_core, mod->core_size)) {
98026+ if (within_module_core_rw((unsigned long)info, mod)) {
98027 gcov_info_unlink(prev, info);
98028 if (gcov_events_enabled)
98029 gcov_event(GCOV_REMOVE, info);
98030diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
98031index 886d09e..c7ff4e5 100644
98032--- a/kernel/irq/manage.c
98033+++ b/kernel/irq/manage.c
98034@@ -874,7 +874,7 @@ static int irq_thread(void *data)
98035
98036 action_ret = handler_fn(desc, action);
98037 if (action_ret == IRQ_HANDLED)
98038- atomic_inc(&desc->threads_handled);
98039+ atomic_inc_unchecked(&desc->threads_handled);
98040
98041 wake_threads_waitq(desc);
98042 }
98043diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
98044index e2514b0..de3dfe0 100644
98045--- a/kernel/irq/spurious.c
98046+++ b/kernel/irq/spurious.c
98047@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
98048 * count. We just care about the count being
98049 * different than the one we saw before.
98050 */
98051- handled = atomic_read(&desc->threads_handled);
98052+ handled = atomic_read_unchecked(&desc->threads_handled);
98053 handled |= SPURIOUS_DEFERRED;
98054 if (handled != desc->threads_handled_last) {
98055 action_ret = IRQ_HANDLED;
98056diff --git a/kernel/jump_label.c b/kernel/jump_label.c
98057index 9019f15..9a3c42e 100644
98058--- a/kernel/jump_label.c
98059+++ b/kernel/jump_label.c
98060@@ -14,6 +14,7 @@
98061 #include <linux/err.h>
98062 #include <linux/static_key.h>
98063 #include <linux/jump_label_ratelimit.h>
98064+#include <linux/mm.h>
98065
98066 #ifdef HAVE_JUMP_LABEL
98067
98068@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
98069
98070 size = (((unsigned long)stop - (unsigned long)start)
98071 / sizeof(struct jump_entry));
98072+ pax_open_kernel();
98073 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
98074+ pax_close_kernel();
98075 }
98076
98077 static void jump_label_update(struct static_key *key, int enable);
98078@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
98079 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
98080 struct jump_entry *iter;
98081
98082+ pax_open_kernel();
98083 for (iter = iter_start; iter < iter_stop; iter++) {
98084 if (within_module_init(iter->code, mod))
98085 iter->code = 0;
98086 }
98087+ pax_close_kernel();
98088 }
98089
98090 static int
98091diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
98092index 5c5987f..bc502b0 100644
98093--- a/kernel/kallsyms.c
98094+++ b/kernel/kallsyms.c
98095@@ -11,6 +11,9 @@
98096 * Changed the compression method from stem compression to "table lookup"
98097 * compression (see scripts/kallsyms.c for a more complete description)
98098 */
98099+#ifdef CONFIG_GRKERNSEC_HIDESYM
98100+#define __INCLUDED_BY_HIDESYM 1
98101+#endif
98102 #include <linux/kallsyms.h>
98103 #include <linux/module.h>
98104 #include <linux/init.h>
98105@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
98106
98107 static inline int is_kernel_inittext(unsigned long addr)
98108 {
98109+ if (system_state != SYSTEM_BOOTING)
98110+ return 0;
98111+
98112 if (addr >= (unsigned long)_sinittext
98113 && addr <= (unsigned long)_einittext)
98114 return 1;
98115 return 0;
98116 }
98117
98118+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98119+#ifdef CONFIG_MODULES
98120+static inline int is_module_text(unsigned long addr)
98121+{
98122+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
98123+ return 1;
98124+
98125+ addr = ktla_ktva(addr);
98126+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
98127+}
98128+#else
98129+static inline int is_module_text(unsigned long addr)
98130+{
98131+ return 0;
98132+}
98133+#endif
98134+#endif
98135+
98136 static inline int is_kernel_text(unsigned long addr)
98137 {
98138 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
98139@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
98140
98141 static inline int is_kernel(unsigned long addr)
98142 {
98143+
98144+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98145+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
98146+ return 1;
98147+
98148+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
98149+#else
98150 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
98151+#endif
98152+
98153 return 1;
98154 return in_gate_area_no_mm(addr);
98155 }
98156
98157 static int is_ksym_addr(unsigned long addr)
98158 {
98159+
98160+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98161+ if (is_module_text(addr))
98162+ return 0;
98163+#endif
98164+
98165 if (all_var)
98166 return is_kernel(addr);
98167
98168@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
98169
98170 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
98171 {
98172- iter->name[0] = '\0';
98173 iter->nameoff = get_symbol_offset(new_pos);
98174 iter->pos = new_pos;
98175 }
98176@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
98177 {
98178 struct kallsym_iter *iter = m->private;
98179
98180+#ifdef CONFIG_GRKERNSEC_HIDESYM
98181+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
98182+ return 0;
98183+#endif
98184+
98185 /* Some debugging symbols have no name. Ignore them. */
98186 if (!iter->name[0])
98187 return 0;
98188@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
98189 */
98190 type = iter->exported ? toupper(iter->type) :
98191 tolower(iter->type);
98192+
98193 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
98194 type, iter->name, iter->module_name);
98195 } else
98196diff --git a/kernel/kcmp.c b/kernel/kcmp.c
98197index 0aa69ea..a7fcafb 100644
98198--- a/kernel/kcmp.c
98199+++ b/kernel/kcmp.c
98200@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
98201 struct task_struct *task1, *task2;
98202 int ret;
98203
98204+#ifdef CONFIG_GRKERNSEC
98205+ return -ENOSYS;
98206+#endif
98207+
98208 rcu_read_lock();
98209
98210 /*
98211diff --git a/kernel/kexec.c b/kernel/kexec.c
98212index 38c25b1..12b3f69 100644
98213--- a/kernel/kexec.c
98214+++ b/kernel/kexec.c
98215@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
98216 compat_ulong_t, flags)
98217 {
98218 struct compat_kexec_segment in;
98219- struct kexec_segment out, __user *ksegments;
98220+ struct kexec_segment out;
98221+ struct kexec_segment __user *ksegments;
98222 unsigned long i, result;
98223
98224 /* Don't allow clients that don't understand the native
98225diff --git a/kernel/kmod.c b/kernel/kmod.c
98226index 2777f40..a689506 100644
98227--- a/kernel/kmod.c
98228+++ b/kernel/kmod.c
98229@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
98230 kfree(info->argv);
98231 }
98232
98233-static int call_modprobe(char *module_name, int wait)
98234+static int call_modprobe(char *module_name, char *module_param, int wait)
98235 {
98236 struct subprocess_info *info;
98237 static char *envp[] = {
98238@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
98239 NULL
98240 };
98241
98242- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
98243+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
98244 if (!argv)
98245 goto out;
98246
98247@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
98248 argv[1] = "-q";
98249 argv[2] = "--";
98250 argv[3] = module_name; /* check free_modprobe_argv() */
98251- argv[4] = NULL;
98252+ argv[4] = module_param;
98253+ argv[5] = NULL;
98254
98255 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
98256 NULL, free_modprobe_argv, NULL);
98257@@ -122,9 +123,8 @@ out:
98258 * If module auto-loading support is disabled then this function
98259 * becomes a no-operation.
98260 */
98261-int __request_module(bool wait, const char *fmt, ...)
98262+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
98263 {
98264- va_list args;
98265 char module_name[MODULE_NAME_LEN];
98266 unsigned int max_modprobes;
98267 int ret;
98268@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
98269 if (!modprobe_path[0])
98270 return 0;
98271
98272- va_start(args, fmt);
98273- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
98274- va_end(args);
98275+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
98276 if (ret >= MODULE_NAME_LEN)
98277 return -ENAMETOOLONG;
98278
98279@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
98280 if (ret)
98281 return ret;
98282
98283+#ifdef CONFIG_GRKERNSEC_MODHARDEN
98284+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
98285+ /* hack to workaround consolekit/udisks stupidity */
98286+ read_lock(&tasklist_lock);
98287+ if (!strcmp(current->comm, "mount") &&
98288+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
98289+ read_unlock(&tasklist_lock);
98290+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
98291+ return -EPERM;
98292+ }
98293+ read_unlock(&tasklist_lock);
98294+ }
98295+#endif
98296+
98297 /* If modprobe needs a service that is in a module, we get a recursive
98298 * loop. Limit the number of running kmod threads to max_threads/2 or
98299 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
98300@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
98301
98302 trace_module_request(module_name, wait, _RET_IP_);
98303
98304- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
98305+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
98306
98307 atomic_dec(&kmod_concurrent);
98308 return ret;
98309 }
98310+
98311+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
98312+{
98313+ va_list args;
98314+ int ret;
98315+
98316+ va_start(args, fmt);
98317+ ret = ____request_module(wait, module_param, fmt, args);
98318+ va_end(args);
98319+
98320+ return ret;
98321+}
98322+
98323+int __request_module(bool wait, const char *fmt, ...)
98324+{
98325+ va_list args;
98326+ int ret;
98327+
98328+#ifdef CONFIG_GRKERNSEC_MODHARDEN
98329+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
98330+ char module_param[MODULE_NAME_LEN];
98331+
98332+ memset(module_param, 0, sizeof(module_param));
98333+
98334+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
98335+
98336+ va_start(args, fmt);
98337+ ret = ____request_module(wait, module_param, fmt, args);
98338+ va_end(args);
98339+
98340+ return ret;
98341+ }
98342+#endif
98343+
98344+ va_start(args, fmt);
98345+ ret = ____request_module(wait, NULL, fmt, args);
98346+ va_end(args);
98347+
98348+ return ret;
98349+}
98350+
98351 EXPORT_SYMBOL(__request_module);
98352 #endif /* CONFIG_MODULES */
98353
98354 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
98355 {
98356+#ifdef CONFIG_GRKERNSEC
98357+ kfree(info->path);
98358+ info->path = info->origpath;
98359+#endif
98360 if (info->cleanup)
98361 (*info->cleanup)(info);
98362 kfree(info);
98363@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
98364 */
98365 set_user_nice(current, 0);
98366
98367+#ifdef CONFIG_GRKERNSEC
98368+ /* this is race-free as far as userland is concerned as we copied
98369+ out the path to be used prior to this point and are now operating
98370+ on that copy
98371+ */
98372+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
98373+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
98374+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
98375+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
98376+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
98377+ retval = -EPERM;
98378+ goto out;
98379+ }
98380+#endif
98381+
98382 retval = -ENOMEM;
98383 new = prepare_kernel_cred(current);
98384 if (!new)
98385@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
98386 commit_creds(new);
98387
98388 retval = do_execve(getname_kernel(sub_info->path),
98389- (const char __user *const __user *)sub_info->argv,
98390- (const char __user *const __user *)sub_info->envp);
98391+ (const char __user *const __force_user *)sub_info->argv,
98392+ (const char __user *const __force_user *)sub_info->envp);
98393 out:
98394 sub_info->retval = retval;
98395 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
98396@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
98397 *
98398 * Thus the __user pointer cast is valid here.
98399 */
98400- sys_wait4(pid, (int __user *)&ret, 0, NULL);
98401+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
98402
98403 /*
98404 * If ret is 0, either ____call_usermodehelper failed and the
98405@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
98406 goto out;
98407
98408 INIT_WORK(&sub_info->work, __call_usermodehelper);
98409+#ifdef CONFIG_GRKERNSEC
98410+ sub_info->origpath = path;
98411+ sub_info->path = kstrdup(path, gfp_mask);
98412+#else
98413 sub_info->path = path;
98414+#endif
98415 sub_info->argv = argv;
98416 sub_info->envp = envp;
98417
98418@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
98419 static int proc_cap_handler(struct ctl_table *table, int write,
98420 void __user *buffer, size_t *lenp, loff_t *ppos)
98421 {
98422- struct ctl_table t;
98423+ ctl_table_no_const t;
98424 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
98425 kernel_cap_t new_cap;
98426 int err, i;
98427diff --git a/kernel/kprobes.c b/kernel/kprobes.c
98428index c90e417..e6c515d 100644
98429--- a/kernel/kprobes.c
98430+++ b/kernel/kprobes.c
98431@@ -31,6 +31,9 @@
98432 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
98433 * <prasanna@in.ibm.com> added function-return probes.
98434 */
98435+#ifdef CONFIG_GRKERNSEC_HIDESYM
98436+#define __INCLUDED_BY_HIDESYM 1
98437+#endif
98438 #include <linux/kprobes.h>
98439 #include <linux/hash.h>
98440 #include <linux/init.h>
98441@@ -122,12 +125,12 @@ enum kprobe_slot_state {
98442
98443 static void *alloc_insn_page(void)
98444 {
98445- return module_alloc(PAGE_SIZE);
98446+ return module_alloc_exec(PAGE_SIZE);
98447 }
98448
98449 static void free_insn_page(void *page)
98450 {
98451- module_memfree(page);
98452+ module_memfree_exec(page);
98453 }
98454
98455 struct kprobe_insn_cache kprobe_insn_slots = {
98456@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
98457 kprobe_type = "k";
98458
98459 if (sym)
98460- seq_printf(pi, "%p %s %s+0x%x %s ",
98461+ seq_printf(pi, "%pK %s %s+0x%x %s ",
98462 p->addr, kprobe_type, sym, offset,
98463 (modname ? modname : " "));
98464 else
98465- seq_printf(pi, "%p %s %p ",
98466+ seq_printf(pi, "%pK %s %pK ",
98467 p->addr, kprobe_type, p->addr);
98468
98469 if (!pp)
98470diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
98471index 6683cce..daf8999 100644
98472--- a/kernel/ksysfs.c
98473+++ b/kernel/ksysfs.c
98474@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
98475 {
98476 if (count+1 > UEVENT_HELPER_PATH_LEN)
98477 return -ENOENT;
98478+ if (!capable(CAP_SYS_ADMIN))
98479+ return -EPERM;
98480 memcpy(uevent_helper, buf, count);
98481 uevent_helper[count] = '\0';
98482 if (count && uevent_helper[count-1] == '\n')
98483@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
98484 return count;
98485 }
98486
98487-static struct bin_attribute notes_attr = {
98488+static bin_attribute_no_const notes_attr __read_only = {
98489 .attr = {
98490 .name = "notes",
98491 .mode = S_IRUGO,
98492diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
98493index ba77ab5..d6a3e20 100644
98494--- a/kernel/locking/lockdep.c
98495+++ b/kernel/locking/lockdep.c
98496@@ -599,6 +599,10 @@ static int static_obj(void *obj)
98497 end = (unsigned long) &_end,
98498 addr = (unsigned long) obj;
98499
98500+#ifdef CONFIG_PAX_KERNEXEC
98501+ start = ktla_ktva(start);
98502+#endif
98503+
98504 /*
98505 * static variable?
98506 */
98507@@ -743,6 +747,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
98508 if (!static_obj(lock->key)) {
98509 debug_locks_off();
98510 printk("INFO: trying to register non-static key.\n");
98511+ printk("lock:%pS key:%pS.\n", lock, lock->key);
98512 printk("the code is fine but needs lockdep annotation.\n");
98513 printk("turning off the locking correctness validator.\n");
98514 dump_stack();
98515@@ -3088,7 +3093,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
98516 if (!class)
98517 return 0;
98518 }
98519- atomic_inc((atomic_t *)&class->ops);
98520+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
98521 if (very_verbose(class)) {
98522 printk("\nacquire class [%p] %s", class->key, class->name);
98523 if (class->name_version > 1)
98524diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
98525index ef43ac4..2720dfa 100644
98526--- a/kernel/locking/lockdep_proc.c
98527+++ b/kernel/locking/lockdep_proc.c
98528@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
98529 return 0;
98530 }
98531
98532- seq_printf(m, "%p", class->key);
98533+ seq_printf(m, "%pK", class->key);
98534 #ifdef CONFIG_DEBUG_LOCKDEP
98535 seq_printf(m, " OPS:%8ld", class->ops);
98536 #endif
98537@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
98538
98539 list_for_each_entry(entry, &class->locks_after, entry) {
98540 if (entry->distance == 1) {
98541- seq_printf(m, " -> [%p] ", entry->class->key);
98542+ seq_printf(m, " -> [%pK] ", entry->class->key);
98543 print_name(m, entry->class);
98544 seq_puts(m, "\n");
98545 }
98546@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
98547 if (!class->key)
98548 continue;
98549
98550- seq_printf(m, "[%p] ", class->key);
98551+ seq_printf(m, "[%pK] ", class->key);
98552 print_name(m, class);
98553 seq_puts(m, "\n");
98554 }
98555@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
98556 if (!i)
98557 seq_line(m, '-', 40-namelen, namelen);
98558
98559- snprintf(ip, sizeof(ip), "[<%p>]",
98560+ snprintf(ip, sizeof(ip), "[<%pK>]",
98561 (void *)class->contention_point[i]);
98562 seq_printf(m, "%40s %14lu %29s %pS\n",
98563 name, stats->contention_point[i],
98564@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
98565 if (!i)
98566 seq_line(m, '-', 40-namelen, namelen);
98567
98568- snprintf(ip, sizeof(ip), "[<%p>]",
98569+ snprintf(ip, sizeof(ip), "[<%pK>]",
98570 (void *)class->contending_point[i]);
98571 seq_printf(m, "%40s %14lu %29s %pS\n",
98572 name, stats->contending_point[i],
98573diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
98574index d1fe2ba..180cd65e 100644
98575--- a/kernel/locking/mcs_spinlock.h
98576+++ b/kernel/locking/mcs_spinlock.h
98577@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
98578 */
98579 return;
98580 }
98581- ACCESS_ONCE(prev->next) = node;
98582+ ACCESS_ONCE_RW(prev->next) = node;
98583
98584 /* Wait until the lock holder passes the lock down. */
98585 arch_mcs_spin_lock_contended(&node->locked);
98586diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
98587index 3ef3736..9c951fa 100644
98588--- a/kernel/locking/mutex-debug.c
98589+++ b/kernel/locking/mutex-debug.c
98590@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
98591 }
98592
98593 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98594- struct thread_info *ti)
98595+ struct task_struct *task)
98596 {
98597 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
98598
98599 /* Mark the current thread as blocked on the lock: */
98600- ti->task->blocked_on = waiter;
98601+ task->blocked_on = waiter;
98602 }
98603
98604 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98605- struct thread_info *ti)
98606+ struct task_struct *task)
98607 {
98608 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
98609- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
98610- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
98611- ti->task->blocked_on = NULL;
98612+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
98613+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
98614+ task->blocked_on = NULL;
98615
98616 list_del_init(&waiter->list);
98617 waiter->task = NULL;
98618diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
98619index 0799fd3..d06ae3b 100644
98620--- a/kernel/locking/mutex-debug.h
98621+++ b/kernel/locking/mutex-debug.h
98622@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
98623 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
98624 extern void debug_mutex_add_waiter(struct mutex *lock,
98625 struct mutex_waiter *waiter,
98626- struct thread_info *ti);
98627+ struct task_struct *task);
98628 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98629- struct thread_info *ti);
98630+ struct task_struct *task);
98631 extern void debug_mutex_unlock(struct mutex *lock);
98632 extern void debug_mutex_init(struct mutex *lock, const char *name,
98633 struct lock_class_key *key);
98634diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
98635index 94674e5..de4966f 100644
98636--- a/kernel/locking/mutex.c
98637+++ b/kernel/locking/mutex.c
98638@@ -542,7 +542,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
98639 goto skip_wait;
98640
98641 debug_mutex_lock_common(lock, &waiter);
98642- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
98643+ debug_mutex_add_waiter(lock, &waiter, task);
98644
98645 /* add waiting tasks to the end of the waitqueue (FIFO): */
98646 list_add_tail(&waiter.list, &lock->wait_list);
98647@@ -589,7 +589,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
98648 }
98649 __set_task_state(task, TASK_RUNNING);
98650
98651- mutex_remove_waiter(lock, &waiter, current_thread_info());
98652+ mutex_remove_waiter(lock, &waiter, task);
98653 /* set it to 0 if there are no waiters left: */
98654 if (likely(list_empty(&lock->wait_list)))
98655 atomic_set(&lock->count, 0);
98656@@ -610,7 +610,7 @@ skip_wait:
98657 return 0;
98658
98659 err:
98660- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
98661+ mutex_remove_waiter(lock, &waiter, task);
98662 spin_unlock_mutex(&lock->wait_lock, flags);
98663 debug_mutex_free_waiter(&waiter);
98664 mutex_release(&lock->dep_map, 1, ip);
98665diff --git a/kernel/locking/osq_lock.c b/kernel/locking/osq_lock.c
98666index c112d00..1946ad9 100644
98667--- a/kernel/locking/osq_lock.c
98668+++ b/kernel/locking/osq_lock.c
98669@@ -98,7 +98,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
98670
98671 prev = decode_cpu(old);
98672 node->prev = prev;
98673- ACCESS_ONCE(prev->next) = node;
98674+ ACCESS_ONCE_RW(prev->next) = node;
98675
98676 /*
98677 * Normally @prev is untouchable after the above store; because at that
98678@@ -170,8 +170,8 @@ unqueue:
98679 * it will wait in Step-A.
98680 */
98681
98682- ACCESS_ONCE(next->prev) = prev;
98683- ACCESS_ONCE(prev->next) = next;
98684+ ACCESS_ONCE_RW(next->prev) = prev;
98685+ ACCESS_ONCE_RW(prev->next) = next;
98686
98687 return false;
98688 }
98689@@ -193,11 +193,11 @@ void osq_unlock(struct optimistic_spin_queue *lock)
98690 node = this_cpu_ptr(&osq_node);
98691 next = xchg(&node->next, NULL);
98692 if (next) {
98693- ACCESS_ONCE(next->locked) = 1;
98694+ ACCESS_ONCE_RW(next->locked) = 1;
98695 return;
98696 }
98697
98698 next = osq_wait_next(lock, node, NULL);
98699 if (next)
98700- ACCESS_ONCE(next->locked) = 1;
98701+ ACCESS_ONCE_RW(next->locked) = 1;
98702 }
98703diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
98704index 1d96dd0..994ff19 100644
98705--- a/kernel/locking/rtmutex-tester.c
98706+++ b/kernel/locking/rtmutex-tester.c
98707@@ -22,7 +22,7 @@
98708 #define MAX_RT_TEST_MUTEXES 8
98709
98710 static spinlock_t rttest_lock;
98711-static atomic_t rttest_event;
98712+static atomic_unchecked_t rttest_event;
98713
98714 struct test_thread_data {
98715 int opcode;
98716@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98717
98718 case RTTEST_LOCKCONT:
98719 td->mutexes[td->opdata] = 1;
98720- td->event = atomic_add_return(1, &rttest_event);
98721+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98722 return 0;
98723
98724 case RTTEST_RESET:
98725@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98726 return 0;
98727
98728 case RTTEST_RESETEVENT:
98729- atomic_set(&rttest_event, 0);
98730+ atomic_set_unchecked(&rttest_event, 0);
98731 return 0;
98732
98733 default:
98734@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98735 return ret;
98736
98737 td->mutexes[id] = 1;
98738- td->event = atomic_add_return(1, &rttest_event);
98739+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98740 rt_mutex_lock(&mutexes[id]);
98741- td->event = atomic_add_return(1, &rttest_event);
98742+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98743 td->mutexes[id] = 4;
98744 return 0;
98745
98746@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98747 return ret;
98748
98749 td->mutexes[id] = 1;
98750- td->event = atomic_add_return(1, &rttest_event);
98751+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98752 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
98753- td->event = atomic_add_return(1, &rttest_event);
98754+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98755 td->mutexes[id] = ret ? 0 : 4;
98756 return ret ? -EINTR : 0;
98757
98758@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98759 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
98760 return ret;
98761
98762- td->event = atomic_add_return(1, &rttest_event);
98763+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98764 rt_mutex_unlock(&mutexes[id]);
98765- td->event = atomic_add_return(1, &rttest_event);
98766+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98767 td->mutexes[id] = 0;
98768 return 0;
98769
98770@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98771 break;
98772
98773 td->mutexes[dat] = 2;
98774- td->event = atomic_add_return(1, &rttest_event);
98775+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98776 break;
98777
98778 default:
98779@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98780 return;
98781
98782 td->mutexes[dat] = 3;
98783- td->event = atomic_add_return(1, &rttest_event);
98784+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98785 break;
98786
98787 case RTTEST_LOCKNOWAIT:
98788@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98789 return;
98790
98791 td->mutexes[dat] = 1;
98792- td->event = atomic_add_return(1, &rttest_event);
98793+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98794 return;
98795
98796 default:
98797diff --git a/kernel/module.c b/kernel/module.c
98798index 538794c..76d7957 100644
98799--- a/kernel/module.c
98800+++ b/kernel/module.c
98801@@ -59,6 +59,7 @@
98802 #include <linux/jump_label.h>
98803 #include <linux/pfn.h>
98804 #include <linux/bsearch.h>
98805+#include <linux/grsecurity.h>
98806 #include <uapi/linux/module.h>
98807 #include "module-internal.h"
98808
98809@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
98810
98811 /* Bounds of module allocation, for speeding __module_address.
98812 * Protected by module_mutex. */
98813-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
98814+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
98815+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
98816
98817 int register_module_notifier(struct notifier_block *nb)
98818 {
98819@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
98820 return true;
98821
98822 list_for_each_entry_rcu(mod, &modules, list) {
98823- struct symsearch arr[] = {
98824+ struct symsearch modarr[] = {
98825 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
98826 NOT_GPL_ONLY, false },
98827 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
98828@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
98829 if (mod->state == MODULE_STATE_UNFORMED)
98830 continue;
98831
98832- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
98833+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
98834 return true;
98835 }
98836 return false;
98837@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
98838 if (!pcpusec->sh_size)
98839 return 0;
98840
98841- if (align > PAGE_SIZE) {
98842+ if (align-1 >= PAGE_SIZE) {
98843 pr_warn("%s: per-cpu alignment %li > %li\n",
98844 mod->name, align, PAGE_SIZE);
98845 align = PAGE_SIZE;
98846@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
98847 static ssize_t show_coresize(struct module_attribute *mattr,
98848 struct module_kobject *mk, char *buffer)
98849 {
98850- return sprintf(buffer, "%u\n", mk->mod->core_size);
98851+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
98852 }
98853
98854 static struct module_attribute modinfo_coresize =
98855@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
98856 static ssize_t show_initsize(struct module_attribute *mattr,
98857 struct module_kobject *mk, char *buffer)
98858 {
98859- return sprintf(buffer, "%u\n", mk->mod->init_size);
98860+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
98861 }
98862
98863 static struct module_attribute modinfo_initsize =
98864@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
98865 goto bad_version;
98866 }
98867
98868+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
98869+ /*
98870+ * avoid potentially printing jibberish on attempted load
98871+ * of a module randomized with a different seed
98872+ */
98873+ pr_warn("no symbol version for %s\n", symname);
98874+#else
98875 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
98876+#endif
98877 return 0;
98878
98879 bad_version:
98880+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
98881+ /*
98882+ * avoid potentially printing jibberish on attempted load
98883+ * of a module randomized with a different seed
98884+ */
98885+ pr_warn("attempted module disagrees about version of symbol %s\n",
98886+ symname);
98887+#else
98888 pr_warn("%s: disagrees about version of symbol %s\n",
98889 mod->name, symname);
98890+#endif
98891 return 0;
98892 }
98893
98894@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
98895 */
98896 #ifdef CONFIG_SYSFS
98897
98898-#ifdef CONFIG_KALLSYMS
98899+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
98900 static inline bool sect_empty(const Elf_Shdr *sect)
98901 {
98902 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
98903@@ -1419,7 +1438,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
98904 {
98905 unsigned int notes, loaded, i;
98906 struct module_notes_attrs *notes_attrs;
98907- struct bin_attribute *nattr;
98908+ bin_attribute_no_const *nattr;
98909
98910 /* failed to create section attributes, so can't create notes */
98911 if (!mod->sect_attrs)
98912@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
98913 static int module_add_modinfo_attrs(struct module *mod)
98914 {
98915 struct module_attribute *attr;
98916- struct module_attribute *temp_attr;
98917+ module_attribute_no_const *temp_attr;
98918 int error = 0;
98919 int i;
98920
98921@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
98922
98923 static void unset_module_core_ro_nx(struct module *mod)
98924 {
98925- set_page_attributes(mod->module_core + mod->core_text_size,
98926- mod->module_core + mod->core_size,
98927+ set_page_attributes(mod->module_core_rw,
98928+ mod->module_core_rw + mod->core_size_rw,
98929 set_memory_x);
98930- set_page_attributes(mod->module_core,
98931- mod->module_core + mod->core_ro_size,
98932+ set_page_attributes(mod->module_core_rx,
98933+ mod->module_core_rx + mod->core_size_rx,
98934 set_memory_rw);
98935 }
98936
98937 static void unset_module_init_ro_nx(struct module *mod)
98938 {
98939- set_page_attributes(mod->module_init + mod->init_text_size,
98940- mod->module_init + mod->init_size,
98941+ set_page_attributes(mod->module_init_rw,
98942+ mod->module_init_rw + mod->init_size_rw,
98943 set_memory_x);
98944- set_page_attributes(mod->module_init,
98945- mod->module_init + mod->init_ro_size,
98946+ set_page_attributes(mod->module_init_rx,
98947+ mod->module_init_rx + mod->init_size_rx,
98948 set_memory_rw);
98949 }
98950
98951@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
98952 list_for_each_entry_rcu(mod, &modules, list) {
98953 if (mod->state == MODULE_STATE_UNFORMED)
98954 continue;
98955- if ((mod->module_core) && (mod->core_text_size)) {
98956- set_page_attributes(mod->module_core,
98957- mod->module_core + mod->core_text_size,
98958+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
98959+ set_page_attributes(mod->module_core_rx,
98960+ mod->module_core_rx + mod->core_size_rx,
98961 set_memory_rw);
98962 }
98963- if ((mod->module_init) && (mod->init_text_size)) {
98964- set_page_attributes(mod->module_init,
98965- mod->module_init + mod->init_text_size,
98966+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
98967+ set_page_attributes(mod->module_init_rx,
98968+ mod->module_init_rx + mod->init_size_rx,
98969 set_memory_rw);
98970 }
98971 }
98972@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
98973 list_for_each_entry_rcu(mod, &modules, list) {
98974 if (mod->state == MODULE_STATE_UNFORMED)
98975 continue;
98976- if ((mod->module_core) && (mod->core_text_size)) {
98977- set_page_attributes(mod->module_core,
98978- mod->module_core + mod->core_text_size,
98979+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
98980+ set_page_attributes(mod->module_core_rx,
98981+ mod->module_core_rx + mod->core_size_rx,
98982 set_memory_ro);
98983 }
98984- if ((mod->module_init) && (mod->init_text_size)) {
98985- set_page_attributes(mod->module_init,
98986- mod->module_init + mod->init_text_size,
98987+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
98988+ set_page_attributes(mod->module_init_rx,
98989+ mod->module_init_rx + mod->init_size_rx,
98990 set_memory_ro);
98991 }
98992 }
98993@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
98994 #else
98995 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
98996 static void unset_module_core_ro_nx(struct module *mod) { }
98997-static void unset_module_init_ro_nx(struct module *mod) { }
98998+static void unset_module_init_ro_nx(struct module *mod)
98999+{
99000+
99001+#ifdef CONFIG_PAX_KERNEXEC
99002+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
99003+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
99004+#endif
99005+
99006+}
99007 #endif
99008
99009 void __weak module_memfree(void *module_region)
99010@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
99011 /* This may be NULL, but that's OK */
99012 unset_module_init_ro_nx(mod);
99013 module_arch_freeing_init(mod);
99014- module_memfree(mod->module_init);
99015+ module_memfree(mod->module_init_rw);
99016+ module_memfree_exec(mod->module_init_rx);
99017 kfree(mod->args);
99018 percpu_modfree(mod);
99019
99020 /* Free lock-classes; relies on the preceding sync_rcu(). */
99021- lockdep_free_key_range(mod->module_core, mod->core_size);
99022+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
99023+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
99024
99025 /* Finally, free the core (containing the module structure) */
99026 unset_module_core_ro_nx(mod);
99027- module_memfree(mod->module_core);
99028+ module_memfree_exec(mod->module_core_rx);
99029+ module_memfree(mod->module_core_rw);
99030
99031 #ifdef CONFIG_MPU
99032 update_protections(current->mm);
99033@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99034 int ret = 0;
99035 const struct kernel_symbol *ksym;
99036
99037+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99038+ int is_fs_load = 0;
99039+ int register_filesystem_found = 0;
99040+ char *p;
99041+
99042+ p = strstr(mod->args, "grsec_modharden_fs");
99043+ if (p) {
99044+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
99045+ /* copy \0 as well */
99046+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
99047+ is_fs_load = 1;
99048+ }
99049+#endif
99050+
99051 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
99052 const char *name = info->strtab + sym[i].st_name;
99053
99054+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99055+ /* it's a real shame this will never get ripped and copied
99056+ upstream! ;(
99057+ */
99058+ if (is_fs_load && !strcmp(name, "register_filesystem"))
99059+ register_filesystem_found = 1;
99060+#endif
99061+
99062 switch (sym[i].st_shndx) {
99063 case SHN_COMMON:
99064 /* Ignore common symbols */
99065@@ -1966,7 +2018,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99066 ksym = resolve_symbol_wait(mod, info, name);
99067 /* Ok if resolved. */
99068 if (ksym && !IS_ERR(ksym)) {
99069+ pax_open_kernel();
99070 sym[i].st_value = ksym->value;
99071+ pax_close_kernel();
99072 break;
99073 }
99074
99075@@ -1985,11 +2039,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99076 secbase = (unsigned long)mod_percpu(mod);
99077 else
99078 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
99079+ pax_open_kernel();
99080 sym[i].st_value += secbase;
99081+ pax_close_kernel();
99082 break;
99083 }
99084 }
99085
99086+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99087+ if (is_fs_load && !register_filesystem_found) {
99088+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
99089+ ret = -EPERM;
99090+ }
99091+#endif
99092+
99093 return ret;
99094 }
99095
99096@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
99097 || s->sh_entsize != ~0UL
99098 || strstarts(sname, ".init"))
99099 continue;
99100- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
99101+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
99102+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
99103+ else
99104+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
99105 pr_debug("\t%s\n", sname);
99106 }
99107- switch (m) {
99108- case 0: /* executable */
99109- mod->core_size = debug_align(mod->core_size);
99110- mod->core_text_size = mod->core_size;
99111- break;
99112- case 1: /* RO: text and ro-data */
99113- mod->core_size = debug_align(mod->core_size);
99114- mod->core_ro_size = mod->core_size;
99115- break;
99116- case 3: /* whole core */
99117- mod->core_size = debug_align(mod->core_size);
99118- break;
99119- }
99120 }
99121
99122 pr_debug("Init section allocation order:\n");
99123@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
99124 || s->sh_entsize != ~0UL
99125 || !strstarts(sname, ".init"))
99126 continue;
99127- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
99128- | INIT_OFFSET_MASK);
99129+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
99130+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
99131+ else
99132+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
99133+ s->sh_entsize |= INIT_OFFSET_MASK;
99134 pr_debug("\t%s\n", sname);
99135 }
99136- switch (m) {
99137- case 0: /* executable */
99138- mod->init_size = debug_align(mod->init_size);
99139- mod->init_text_size = mod->init_size;
99140- break;
99141- case 1: /* RO: text and ro-data */
99142- mod->init_size = debug_align(mod->init_size);
99143- mod->init_ro_size = mod->init_size;
99144- break;
99145- case 3: /* whole init */
99146- mod->init_size = debug_align(mod->init_size);
99147- break;
99148- }
99149 }
99150 }
99151
99152@@ -2291,7 +2334,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
99153
99154 /* Put symbol section at end of init part of module. */
99155 symsect->sh_flags |= SHF_ALLOC;
99156- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
99157+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
99158 info->index.sym) | INIT_OFFSET_MASK;
99159 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
99160
99161@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
99162 }
99163
99164 /* Append room for core symbols at end of core part. */
99165- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
99166- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
99167- mod->core_size += strtab_size;
99168- mod->core_size = debug_align(mod->core_size);
99169+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
99170+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
99171+ mod->core_size_rx += strtab_size;
99172+ mod->core_size_rx = debug_align(mod->core_size_rx);
99173
99174 /* Put string table section at end of init part of module. */
99175 strsect->sh_flags |= SHF_ALLOC;
99176- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
99177+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
99178 info->index.str) | INIT_OFFSET_MASK;
99179- mod->init_size = debug_align(mod->init_size);
99180+ mod->init_size_rx = debug_align(mod->init_size_rx);
99181 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
99182 }
99183
99184@@ -2334,12 +2377,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
99185 /* Make sure we get permanent strtab: don't use info->strtab. */
99186 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
99187
99188+ pax_open_kernel();
99189+
99190 /* Set types up while we still have access to sections. */
99191 for (i = 0; i < mod->num_symtab; i++)
99192 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
99193
99194- mod->core_symtab = dst = mod->module_core + info->symoffs;
99195- mod->core_strtab = s = mod->module_core + info->stroffs;
99196+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
99197+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
99198 src = mod->symtab;
99199 for (ndst = i = 0; i < mod->num_symtab; i++) {
99200 if (i == 0 ||
99201@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
99202 }
99203 }
99204 mod->core_num_syms = ndst;
99205+
99206+ pax_close_kernel();
99207 }
99208 #else
99209 static inline void layout_symtab(struct module *mod, struct load_info *info)
99210@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
99211 return vmalloc_exec(size);
99212 }
99213
99214-static void *module_alloc_update_bounds(unsigned long size)
99215+static void *module_alloc_update_bounds_rw(unsigned long size)
99216 {
99217 void *ret = module_alloc(size);
99218
99219 if (ret) {
99220 mutex_lock(&module_mutex);
99221 /* Update module bounds. */
99222- if ((unsigned long)ret < module_addr_min)
99223- module_addr_min = (unsigned long)ret;
99224- if ((unsigned long)ret + size > module_addr_max)
99225- module_addr_max = (unsigned long)ret + size;
99226+ if ((unsigned long)ret < module_addr_min_rw)
99227+ module_addr_min_rw = (unsigned long)ret;
99228+ if ((unsigned long)ret + size > module_addr_max_rw)
99229+ module_addr_max_rw = (unsigned long)ret + size;
99230+ mutex_unlock(&module_mutex);
99231+ }
99232+ return ret;
99233+}
99234+
99235+static void *module_alloc_update_bounds_rx(unsigned long size)
99236+{
99237+ void *ret = module_alloc_exec(size);
99238+
99239+ if (ret) {
99240+ mutex_lock(&module_mutex);
99241+ /* Update module bounds. */
99242+ if ((unsigned long)ret < module_addr_min_rx)
99243+ module_addr_min_rx = (unsigned long)ret;
99244+ if ((unsigned long)ret + size > module_addr_max_rx)
99245+ module_addr_max_rx = (unsigned long)ret + size;
99246 mutex_unlock(&module_mutex);
99247 }
99248 return ret;
99249@@ -2665,7 +2728,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
99250 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
99251
99252 if (info->index.sym == 0) {
99253+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
99254+ /*
99255+ * avoid potentially printing jibberish on attempted load
99256+ * of a module randomized with a different seed
99257+ */
99258+ pr_warn("module has no symbols (stripped?)\n");
99259+#else
99260 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
99261+#endif
99262 return ERR_PTR(-ENOEXEC);
99263 }
99264
99265@@ -2681,8 +2752,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
99266 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
99267 {
99268 const char *modmagic = get_modinfo(info, "vermagic");
99269+ const char *license = get_modinfo(info, "license");
99270 int err;
99271
99272+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
99273+ if (!license || !license_is_gpl_compatible(license))
99274+ return -ENOEXEC;
99275+#endif
99276+
99277 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
99278 modmagic = NULL;
99279
99280@@ -2707,7 +2784,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
99281 }
99282
99283 /* Set up license info based on the info section */
99284- set_license(mod, get_modinfo(info, "license"));
99285+ set_license(mod, license);
99286
99287 return 0;
99288 }
99289@@ -2801,7 +2878,7 @@ static int move_module(struct module *mod, struct load_info *info)
99290 void *ptr;
99291
99292 /* Do the allocs. */
99293- ptr = module_alloc_update_bounds(mod->core_size);
99294+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
99295 /*
99296 * The pointer to this block is stored in the module structure
99297 * which is inside the block. Just mark it as not being a
99298@@ -2811,11 +2888,11 @@ static int move_module(struct module *mod, struct load_info *info)
99299 if (!ptr)
99300 return -ENOMEM;
99301
99302- memset(ptr, 0, mod->core_size);
99303- mod->module_core = ptr;
99304+ memset(ptr, 0, mod->core_size_rw);
99305+ mod->module_core_rw = ptr;
99306
99307- if (mod->init_size) {
99308- ptr = module_alloc_update_bounds(mod->init_size);
99309+ if (mod->init_size_rw) {
99310+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
99311 /*
99312 * The pointer to this block is stored in the module structure
99313 * which is inside the block. This block doesn't need to be
99314@@ -2824,13 +2901,45 @@ static int move_module(struct module *mod, struct load_info *info)
99315 */
99316 kmemleak_ignore(ptr);
99317 if (!ptr) {
99318- module_memfree(mod->module_core);
99319+ module_memfree(mod->module_core_rw);
99320 return -ENOMEM;
99321 }
99322- memset(ptr, 0, mod->init_size);
99323- mod->module_init = ptr;
99324+ memset(ptr, 0, mod->init_size_rw);
99325+ mod->module_init_rw = ptr;
99326 } else
99327- mod->module_init = NULL;
99328+ mod->module_init_rw = NULL;
99329+
99330+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
99331+ kmemleak_not_leak(ptr);
99332+ if (!ptr) {
99333+ if (mod->module_init_rw)
99334+ module_memfree(mod->module_init_rw);
99335+ module_memfree(mod->module_core_rw);
99336+ return -ENOMEM;
99337+ }
99338+
99339+ pax_open_kernel();
99340+ memset(ptr, 0, mod->core_size_rx);
99341+ pax_close_kernel();
99342+ mod->module_core_rx = ptr;
99343+
99344+ if (mod->init_size_rx) {
99345+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
99346+ kmemleak_ignore(ptr);
99347+ if (!ptr && mod->init_size_rx) {
99348+ module_memfree_exec(mod->module_core_rx);
99349+ if (mod->module_init_rw)
99350+ module_memfree(mod->module_init_rw);
99351+ module_memfree(mod->module_core_rw);
99352+ return -ENOMEM;
99353+ }
99354+
99355+ pax_open_kernel();
99356+ memset(ptr, 0, mod->init_size_rx);
99357+ pax_close_kernel();
99358+ mod->module_init_rx = ptr;
99359+ } else
99360+ mod->module_init_rx = NULL;
99361
99362 /* Transfer each section which specifies SHF_ALLOC */
99363 pr_debug("final section addresses:\n");
99364@@ -2841,16 +2950,45 @@ static int move_module(struct module *mod, struct load_info *info)
99365 if (!(shdr->sh_flags & SHF_ALLOC))
99366 continue;
99367
99368- if (shdr->sh_entsize & INIT_OFFSET_MASK)
99369- dest = mod->module_init
99370- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99371- else
99372- dest = mod->module_core + shdr->sh_entsize;
99373+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
99374+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
99375+ dest = mod->module_init_rw
99376+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99377+ else
99378+ dest = mod->module_init_rx
99379+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99380+ } else {
99381+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
99382+ dest = mod->module_core_rw + shdr->sh_entsize;
99383+ else
99384+ dest = mod->module_core_rx + shdr->sh_entsize;
99385+ }
99386+
99387+ if (shdr->sh_type != SHT_NOBITS) {
99388+
99389+#ifdef CONFIG_PAX_KERNEXEC
99390+#ifdef CONFIG_X86_64
99391+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
99392+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
99393+#endif
99394+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
99395+ pax_open_kernel();
99396+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
99397+ pax_close_kernel();
99398+ } else
99399+#endif
99400
99401- if (shdr->sh_type != SHT_NOBITS)
99402 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
99403+ }
99404 /* Update sh_addr to point to copy in image. */
99405- shdr->sh_addr = (unsigned long)dest;
99406+
99407+#ifdef CONFIG_PAX_KERNEXEC
99408+ if (shdr->sh_flags & SHF_EXECINSTR)
99409+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
99410+ else
99411+#endif
99412+
99413+ shdr->sh_addr = (unsigned long)dest;
99414 pr_debug("\t0x%lx %s\n",
99415 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
99416 }
99417@@ -2907,12 +3045,12 @@ static void flush_module_icache(const struct module *mod)
99418 * Do it before processing of module parameters, so the module
99419 * can provide parameter accessor functions of its own.
99420 */
99421- if (mod->module_init)
99422- flush_icache_range((unsigned long)mod->module_init,
99423- (unsigned long)mod->module_init
99424- + mod->init_size);
99425- flush_icache_range((unsigned long)mod->module_core,
99426- (unsigned long)mod->module_core + mod->core_size);
99427+ if (mod->module_init_rx)
99428+ flush_icache_range((unsigned long)mod->module_init_rx,
99429+ (unsigned long)mod->module_init_rx
99430+ + mod->init_size_rx);
99431+ flush_icache_range((unsigned long)mod->module_core_rx,
99432+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
99433
99434 set_fs(old_fs);
99435 }
99436@@ -2970,8 +3108,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
99437 {
99438 percpu_modfree(mod);
99439 module_arch_freeing_init(mod);
99440- module_memfree(mod->module_init);
99441- module_memfree(mod->module_core);
99442+ module_memfree_exec(mod->module_init_rx);
99443+ module_memfree_exec(mod->module_core_rx);
99444+ module_memfree(mod->module_init_rw);
99445+ module_memfree(mod->module_core_rw);
99446 }
99447
99448 int __weak module_finalize(const Elf_Ehdr *hdr,
99449@@ -2984,7 +3124,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
99450 static int post_relocation(struct module *mod, const struct load_info *info)
99451 {
99452 /* Sort exception table now relocations are done. */
99453+ pax_open_kernel();
99454 sort_extable(mod->extable, mod->extable + mod->num_exentries);
99455+ pax_close_kernel();
99456
99457 /* Copy relocated percpu area over. */
99458 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
99459@@ -3032,13 +3174,15 @@ static void do_mod_ctors(struct module *mod)
99460 /* For freeing module_init on success, in case kallsyms traversing */
99461 struct mod_initfree {
99462 struct rcu_head rcu;
99463- void *module_init;
99464+ void *module_init_rw;
99465+ void *module_init_rx;
99466 };
99467
99468 static void do_free_init(struct rcu_head *head)
99469 {
99470 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
99471- module_memfree(m->module_init);
99472+ module_memfree(m->module_init_rw);
99473+ module_memfree_exec(m->module_init_rx);
99474 kfree(m);
99475 }
99476
99477@@ -3058,7 +3202,8 @@ static noinline int do_init_module(struct module *mod)
99478 ret = -ENOMEM;
99479 goto fail;
99480 }
99481- freeinit->module_init = mod->module_init;
99482+ freeinit->module_init_rw = mod->module_init_rw;
99483+ freeinit->module_init_rx = mod->module_init_rx;
99484
99485 /*
99486 * We want to find out whether @mod uses async during init. Clear
99487@@ -3117,10 +3262,10 @@ static noinline int do_init_module(struct module *mod)
99488 #endif
99489 unset_module_init_ro_nx(mod);
99490 module_arch_freeing_init(mod);
99491- mod->module_init = NULL;
99492- mod->init_size = 0;
99493- mod->init_ro_size = 0;
99494- mod->init_text_size = 0;
99495+ mod->module_init_rw = NULL;
99496+ mod->module_init_rx = NULL;
99497+ mod->init_size_rw = 0;
99498+ mod->init_size_rx = 0;
99499 /*
99500 * We want to free module_init, but be aware that kallsyms may be
99501 * walking this with preempt disabled. In all the failure paths,
99502@@ -3208,16 +3353,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
99503 module_bug_finalize(info->hdr, info->sechdrs, mod);
99504
99505 /* Set RO and NX regions for core */
99506- set_section_ro_nx(mod->module_core,
99507- mod->core_text_size,
99508- mod->core_ro_size,
99509- mod->core_size);
99510+ set_section_ro_nx(mod->module_core_rx,
99511+ mod->core_size_rx,
99512+ mod->core_size_rx,
99513+ mod->core_size_rx);
99514
99515 /* Set RO and NX regions for init */
99516- set_section_ro_nx(mod->module_init,
99517- mod->init_text_size,
99518- mod->init_ro_size,
99519- mod->init_size);
99520+ set_section_ro_nx(mod->module_init_rx,
99521+ mod->init_size_rx,
99522+ mod->init_size_rx,
99523+ mod->init_size_rx);
99524
99525 /* Mark state as coming so strong_try_module_get() ignores us,
99526 * but kallsyms etc. can see us. */
99527@@ -3301,9 +3446,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
99528 if (err)
99529 goto free_unload;
99530
99531+ /* Now copy in args */
99532+ mod->args = strndup_user(uargs, ~0UL >> 1);
99533+ if (IS_ERR(mod->args)) {
99534+ err = PTR_ERR(mod->args);
99535+ goto free_unload;
99536+ }
99537+
99538 /* Set up MODINFO_ATTR fields */
99539 setup_modinfo(mod, info);
99540
99541+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99542+ {
99543+ char *p, *p2;
99544+
99545+ if (strstr(mod->args, "grsec_modharden_netdev")) {
99546+ 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);
99547+ err = -EPERM;
99548+ goto free_modinfo;
99549+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
99550+ p += sizeof("grsec_modharden_normal") - 1;
99551+ p2 = strstr(p, "_");
99552+ if (p2) {
99553+ *p2 = '\0';
99554+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
99555+ *p2 = '_';
99556+ }
99557+ err = -EPERM;
99558+ goto free_modinfo;
99559+ }
99560+ }
99561+#endif
99562+
99563 /* Fix up syms, so that st_value is a pointer to location. */
99564 err = simplify_symbols(mod, info);
99565 if (err < 0)
99566@@ -3319,13 +3493,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
99567
99568 flush_module_icache(mod);
99569
99570- /* Now copy in args */
99571- mod->args = strndup_user(uargs, ~0UL >> 1);
99572- if (IS_ERR(mod->args)) {
99573- err = PTR_ERR(mod->args);
99574- goto free_arch_cleanup;
99575- }
99576-
99577 dynamic_debug_setup(info->debug, info->num_debug);
99578
99579 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
99580@@ -3376,11 +3543,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
99581 ddebug_cleanup:
99582 dynamic_debug_remove(info->debug);
99583 synchronize_sched();
99584- kfree(mod->args);
99585- free_arch_cleanup:
99586 module_arch_cleanup(mod);
99587 free_modinfo:
99588 free_modinfo(mod);
99589+ kfree(mod->args);
99590 free_unload:
99591 module_unload_free(mod);
99592 unlink_mod:
99593@@ -3393,7 +3559,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
99594 mutex_unlock(&module_mutex);
99595 free_module:
99596 /* Free lock-classes; relies on the preceding sync_rcu() */
99597- lockdep_free_key_range(mod->module_core, mod->core_size);
99598+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
99599+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
99600
99601 module_deallocate(mod, info);
99602 free_copy:
99603@@ -3470,10 +3637,16 @@ static const char *get_ksymbol(struct module *mod,
99604 unsigned long nextval;
99605
99606 /* At worse, next value is at end of module */
99607- if (within_module_init(addr, mod))
99608- nextval = (unsigned long)mod->module_init+mod->init_text_size;
99609+ if (within_module_init_rx(addr, mod))
99610+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
99611+ else if (within_module_init_rw(addr, mod))
99612+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
99613+ else if (within_module_core_rx(addr, mod))
99614+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
99615+ else if (within_module_core_rw(addr, mod))
99616+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
99617 else
99618- nextval = (unsigned long)mod->module_core+mod->core_text_size;
99619+ return NULL;
99620
99621 /* Scan for closest preceding symbol, and next symbol. (ELF
99622 starts real symbols at 1). */
99623@@ -3721,7 +3894,7 @@ static int m_show(struct seq_file *m, void *p)
99624 return 0;
99625
99626 seq_printf(m, "%s %u",
99627- mod->name, mod->init_size + mod->core_size);
99628+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
99629 print_unload_info(m, mod);
99630
99631 /* Informative for users. */
99632@@ -3730,7 +3903,7 @@ static int m_show(struct seq_file *m, void *p)
99633 mod->state == MODULE_STATE_COMING ? "Loading" :
99634 "Live");
99635 /* Used by oprofile and other similar tools. */
99636- seq_printf(m, " 0x%pK", mod->module_core);
99637+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
99638
99639 /* Taints info */
99640 if (mod->taints)
99641@@ -3766,7 +3939,17 @@ static const struct file_operations proc_modules_operations = {
99642
99643 static int __init proc_modules_init(void)
99644 {
99645+#ifndef CONFIG_GRKERNSEC_HIDESYM
99646+#ifdef CONFIG_GRKERNSEC_PROC_USER
99647+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
99648+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99649+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
99650+#else
99651 proc_create("modules", 0, NULL, &proc_modules_operations);
99652+#endif
99653+#else
99654+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
99655+#endif
99656 return 0;
99657 }
99658 module_init(proc_modules_init);
99659@@ -3827,7 +4010,8 @@ struct module *__module_address(unsigned long addr)
99660 {
99661 struct module *mod;
99662
99663- if (addr < module_addr_min || addr > module_addr_max)
99664+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
99665+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
99666 return NULL;
99667
99668 list_for_each_entry_rcu(mod, &modules, list) {
99669@@ -3868,11 +4052,20 @@ bool is_module_text_address(unsigned long addr)
99670 */
99671 struct module *__module_text_address(unsigned long addr)
99672 {
99673- struct module *mod = __module_address(addr);
99674+ struct module *mod;
99675+
99676+#ifdef CONFIG_X86_32
99677+ addr = ktla_ktva(addr);
99678+#endif
99679+
99680+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
99681+ return NULL;
99682+
99683+ mod = __module_address(addr);
99684+
99685 if (mod) {
99686 /* Make sure it's within the text section. */
99687- if (!within(addr, mod->module_init, mod->init_text_size)
99688- && !within(addr, mod->module_core, mod->core_text_size))
99689+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
99690 mod = NULL;
99691 }
99692 return mod;
99693diff --git a/kernel/notifier.c b/kernel/notifier.c
99694index ae9fc7c..5085fbf 100644
99695--- a/kernel/notifier.c
99696+++ b/kernel/notifier.c
99697@@ -5,6 +5,7 @@
99698 #include <linux/rcupdate.h>
99699 #include <linux/vmalloc.h>
99700 #include <linux/reboot.h>
99701+#include <linux/mm.h>
99702
99703 /*
99704 * Notifier list for kernel code which wants to be called
99705@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
99706 while ((*nl) != NULL) {
99707 if (n->priority > (*nl)->priority)
99708 break;
99709- nl = &((*nl)->next);
99710+ nl = (struct notifier_block **)&((*nl)->next);
99711 }
99712- n->next = *nl;
99713+ pax_open_kernel();
99714+ *(const void **)&n->next = *nl;
99715 rcu_assign_pointer(*nl, n);
99716+ pax_close_kernel();
99717 return 0;
99718 }
99719
99720@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
99721 return 0;
99722 if (n->priority > (*nl)->priority)
99723 break;
99724- nl = &((*nl)->next);
99725+ nl = (struct notifier_block **)&((*nl)->next);
99726 }
99727- n->next = *nl;
99728+ pax_open_kernel();
99729+ *(const void **)&n->next = *nl;
99730 rcu_assign_pointer(*nl, n);
99731+ pax_close_kernel();
99732 return 0;
99733 }
99734
99735@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
99736 {
99737 while ((*nl) != NULL) {
99738 if ((*nl) == n) {
99739+ pax_open_kernel();
99740 rcu_assign_pointer(*nl, n->next);
99741+ pax_close_kernel();
99742 return 0;
99743 }
99744- nl = &((*nl)->next);
99745+ nl = (struct notifier_block **)&((*nl)->next);
99746 }
99747 return -ENOENT;
99748 }
99749diff --git a/kernel/padata.c b/kernel/padata.c
99750index b38bea9..91acfbe 100644
99751--- a/kernel/padata.c
99752+++ b/kernel/padata.c
99753@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
99754 * seq_nr mod. number of cpus in use.
99755 */
99756
99757- seq_nr = atomic_inc_return(&pd->seq_nr);
99758+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
99759 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
99760
99761 return padata_index_to_cpu(pd, cpu_index);
99762@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
99763 padata_init_pqueues(pd);
99764 padata_init_squeues(pd);
99765 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
99766- atomic_set(&pd->seq_nr, -1);
99767+ atomic_set_unchecked(&pd->seq_nr, -1);
99768 atomic_set(&pd->reorder_objects, 0);
99769 atomic_set(&pd->refcnt, 0);
99770 pd->pinst = pinst;
99771diff --git a/kernel/panic.c b/kernel/panic.c
99772index 8136ad7..15c857b 100644
99773--- a/kernel/panic.c
99774+++ b/kernel/panic.c
99775@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
99776 /*
99777 * Stop ourself in panic -- architecture code may override this
99778 */
99779-void __weak panic_smp_self_stop(void)
99780+void __weak __noreturn panic_smp_self_stop(void)
99781 {
99782 while (1)
99783 cpu_relax();
99784@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
99785 disable_trace_on_warning();
99786
99787 pr_warn("------------[ cut here ]------------\n");
99788- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
99789+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
99790 raw_smp_processor_id(), current->pid, file, line, caller);
99791
99792 if (args)
99793@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
99794 */
99795 __visible void __stack_chk_fail(void)
99796 {
99797- panic("stack-protector: Kernel stack is corrupted in: %p\n",
99798+ dump_stack();
99799+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
99800 __builtin_return_address(0));
99801 }
99802 EXPORT_SYMBOL(__stack_chk_fail);
99803diff --git a/kernel/pid.c b/kernel/pid.c
99804index cd36a5e..11f185d 100644
99805--- a/kernel/pid.c
99806+++ b/kernel/pid.c
99807@@ -33,6 +33,7 @@
99808 #include <linux/rculist.h>
99809 #include <linux/bootmem.h>
99810 #include <linux/hash.h>
99811+#include <linux/security.h>
99812 #include <linux/pid_namespace.h>
99813 #include <linux/init_task.h>
99814 #include <linux/syscalls.h>
99815@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
99816
99817 int pid_max = PID_MAX_DEFAULT;
99818
99819-#define RESERVED_PIDS 300
99820+#define RESERVED_PIDS 500
99821
99822 int pid_max_min = RESERVED_PIDS + 1;
99823 int pid_max_max = PID_MAX_LIMIT;
99824@@ -450,10 +451,18 @@ EXPORT_SYMBOL(pid_task);
99825 */
99826 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
99827 {
99828+ struct task_struct *task;
99829+
99830 rcu_lockdep_assert(rcu_read_lock_held(),
99831 "find_task_by_pid_ns() needs rcu_read_lock()"
99832 " protection");
99833- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
99834+
99835+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
99836+
99837+ if (gr_pid_is_chrooted(task))
99838+ return NULL;
99839+
99840+ return task;
99841 }
99842
99843 struct task_struct *find_task_by_vpid(pid_t vnr)
99844@@ -461,6 +470,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
99845 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
99846 }
99847
99848+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
99849+{
99850+ rcu_lockdep_assert(rcu_read_lock_held(),
99851+ "find_task_by_pid_ns() needs rcu_read_lock()"
99852+ " protection");
99853+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
99854+}
99855+
99856 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
99857 {
99858 struct pid *pid;
99859diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
99860index a65ba13..f600dbb 100644
99861--- a/kernel/pid_namespace.c
99862+++ b/kernel/pid_namespace.c
99863@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
99864 void __user *buffer, size_t *lenp, loff_t *ppos)
99865 {
99866 struct pid_namespace *pid_ns = task_active_pid_ns(current);
99867- struct ctl_table tmp = *table;
99868+ ctl_table_no_const tmp = *table;
99869
99870 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
99871 return -EPERM;
99872diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
99873index 7e01f78..f5da19d 100644
99874--- a/kernel/power/Kconfig
99875+++ b/kernel/power/Kconfig
99876@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
99877 config HIBERNATION
99878 bool "Hibernation (aka 'suspend to disk')"
99879 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
99880+ depends on !GRKERNSEC_KMEM
99881+ depends on !PAX_MEMORY_SANITIZE
99882 select HIBERNATE_CALLBACKS
99883 select LZO_COMPRESS
99884 select LZO_DECOMPRESS
99885diff --git a/kernel/power/process.c b/kernel/power/process.c
99886index 564f786..361a18e 100644
99887--- a/kernel/power/process.c
99888+++ b/kernel/power/process.c
99889@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
99890 unsigned int elapsed_msecs;
99891 bool wakeup = false;
99892 int sleep_usecs = USEC_PER_MSEC;
99893+ bool timedout = false;
99894
99895 do_gettimeofday(&start);
99896
99897@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
99898
99899 while (true) {
99900 todo = 0;
99901+ if (time_after(jiffies, end_time))
99902+ timedout = true;
99903 read_lock(&tasklist_lock);
99904 for_each_process_thread(g, p) {
99905 if (p == current || !freeze_task(p))
99906 continue;
99907
99908- if (!freezer_should_skip(p))
99909+ if (!freezer_should_skip(p)) {
99910 todo++;
99911+ if (timedout) {
99912+ printk(KERN_ERR "Task refusing to freeze:\n");
99913+ sched_show_task(p);
99914+ }
99915+ }
99916 }
99917 read_unlock(&tasklist_lock);
99918
99919@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
99920 todo += wq_busy;
99921 }
99922
99923- if (!todo || time_after(jiffies, end_time))
99924+ if (!todo || timedout)
99925 break;
99926
99927 if (pm_wakeup_pending()) {
99928diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
99929index bb0635b..9aff9f3 100644
99930--- a/kernel/printk/printk.c
99931+++ b/kernel/printk/printk.c
99932@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
99933 if (from_file && type != SYSLOG_ACTION_OPEN)
99934 return 0;
99935
99936+#ifdef CONFIG_GRKERNSEC_DMESG
99937+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
99938+ return -EPERM;
99939+#endif
99940+
99941 if (syslog_action_restricted(type)) {
99942 if (capable(CAP_SYSLOG))
99943 return 0;
99944diff --git a/kernel/profile.c b/kernel/profile.c
99945index a7bcd28..5b368fa 100644
99946--- a/kernel/profile.c
99947+++ b/kernel/profile.c
99948@@ -37,7 +37,7 @@ struct profile_hit {
99949 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
99950 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
99951
99952-static atomic_t *prof_buffer;
99953+static atomic_unchecked_t *prof_buffer;
99954 static unsigned long prof_len, prof_shift;
99955
99956 int prof_on __read_mostly;
99957@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
99958 hits[i].pc = 0;
99959 continue;
99960 }
99961- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
99962+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
99963 hits[i].hits = hits[i].pc = 0;
99964 }
99965 }
99966@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
99967 * Add the current hit(s) and flush the write-queue out
99968 * to the global buffer:
99969 */
99970- atomic_add(nr_hits, &prof_buffer[pc]);
99971+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
99972 for (i = 0; i < NR_PROFILE_HIT; ++i) {
99973- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
99974+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
99975 hits[i].pc = hits[i].hits = 0;
99976 }
99977 out:
99978@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
99979 {
99980 unsigned long pc;
99981 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
99982- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
99983+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
99984 }
99985 #endif /* !CONFIG_SMP */
99986
99987@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
99988 return -EFAULT;
99989 buf++; p++; count--; read++;
99990 }
99991- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
99992+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
99993 if (copy_to_user(buf, (void *)pnt, count))
99994 return -EFAULT;
99995 read += count;
99996@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
99997 }
99998 #endif
99999 profile_discard_flip_buffers();
100000- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
100001+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
100002 return count;
100003 }
100004
100005diff --git a/kernel/ptrace.c b/kernel/ptrace.c
100006index 9a34bd8..38d90e5 100644
100007--- a/kernel/ptrace.c
100008+++ b/kernel/ptrace.c
100009@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
100010 if (seize)
100011 flags |= PT_SEIZED;
100012 rcu_read_lock();
100013- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
100014+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
100015 flags |= PT_PTRACE_CAP;
100016 rcu_read_unlock();
100017 task->ptrace = flags;
100018@@ -515,7 +515,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
100019 break;
100020 return -EIO;
100021 }
100022- if (copy_to_user(dst, buf, retval))
100023+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
100024 return -EFAULT;
100025 copied += retval;
100026 src += retval;
100027@@ -803,7 +803,7 @@ int ptrace_request(struct task_struct *child, long request,
100028 bool seized = child->ptrace & PT_SEIZED;
100029 int ret = -EIO;
100030 siginfo_t siginfo, *si;
100031- void __user *datavp = (void __user *) data;
100032+ void __user *datavp = (__force void __user *) data;
100033 unsigned long __user *datalp = datavp;
100034 unsigned long flags;
100035
100036@@ -1049,14 +1049,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
100037 goto out;
100038 }
100039
100040+ if (gr_handle_ptrace(child, request)) {
100041+ ret = -EPERM;
100042+ goto out_put_task_struct;
100043+ }
100044+
100045 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
100046 ret = ptrace_attach(child, request, addr, data);
100047 /*
100048 * Some architectures need to do book-keeping after
100049 * a ptrace attach.
100050 */
100051- if (!ret)
100052+ if (!ret) {
100053 arch_ptrace_attach(child);
100054+ gr_audit_ptrace(child);
100055+ }
100056 goto out_put_task_struct;
100057 }
100058
100059@@ -1084,7 +1091,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
100060 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
100061 if (copied != sizeof(tmp))
100062 return -EIO;
100063- return put_user(tmp, (unsigned long __user *)data);
100064+ return put_user(tmp, (__force unsigned long __user *)data);
100065 }
100066
100067 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
100068@@ -1177,7 +1184,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
100069 }
100070
100071 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
100072- compat_long_t, addr, compat_long_t, data)
100073+ compat_ulong_t, addr, compat_ulong_t, data)
100074 {
100075 struct task_struct *child;
100076 long ret;
100077@@ -1193,14 +1200,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
100078 goto out;
100079 }
100080
100081+ if (gr_handle_ptrace(child, request)) {
100082+ ret = -EPERM;
100083+ goto out_put_task_struct;
100084+ }
100085+
100086 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
100087 ret = ptrace_attach(child, request, addr, data);
100088 /*
100089 * Some architectures need to do book-keeping after
100090 * a ptrace attach.
100091 */
100092- if (!ret)
100093+ if (!ret) {
100094 arch_ptrace_attach(child);
100095+ gr_audit_ptrace(child);
100096+ }
100097 goto out_put_task_struct;
100098 }
100099
100100diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
100101index 30d42aa..cac5d66 100644
100102--- a/kernel/rcu/rcutorture.c
100103+++ b/kernel/rcu/rcutorture.c
100104@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
100105 rcu_torture_count) = { 0 };
100106 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
100107 rcu_torture_batch) = { 0 };
100108-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
100109-static atomic_t n_rcu_torture_alloc;
100110-static atomic_t n_rcu_torture_alloc_fail;
100111-static atomic_t n_rcu_torture_free;
100112-static atomic_t n_rcu_torture_mberror;
100113-static atomic_t n_rcu_torture_error;
100114+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
100115+static atomic_unchecked_t n_rcu_torture_alloc;
100116+static atomic_unchecked_t n_rcu_torture_alloc_fail;
100117+static atomic_unchecked_t n_rcu_torture_free;
100118+static atomic_unchecked_t n_rcu_torture_mberror;
100119+static atomic_unchecked_t n_rcu_torture_error;
100120 static long n_rcu_torture_barrier_error;
100121 static long n_rcu_torture_boost_ktrerror;
100122 static long n_rcu_torture_boost_rterror;
100123@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
100124 static long n_rcu_torture_timers;
100125 static long n_barrier_attempts;
100126 static long n_barrier_successes;
100127-static atomic_long_t n_cbfloods;
100128+static atomic_long_unchecked_t n_cbfloods;
100129 static struct list_head rcu_torture_removed;
100130
100131 static int rcu_torture_writer_state;
100132@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
100133
100134 spin_lock_bh(&rcu_torture_lock);
100135 if (list_empty(&rcu_torture_freelist)) {
100136- atomic_inc(&n_rcu_torture_alloc_fail);
100137+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
100138 spin_unlock_bh(&rcu_torture_lock);
100139 return NULL;
100140 }
100141- atomic_inc(&n_rcu_torture_alloc);
100142+ atomic_inc_unchecked(&n_rcu_torture_alloc);
100143 p = rcu_torture_freelist.next;
100144 list_del_init(p);
100145 spin_unlock_bh(&rcu_torture_lock);
100146@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
100147 static void
100148 rcu_torture_free(struct rcu_torture *p)
100149 {
100150- atomic_inc(&n_rcu_torture_free);
100151+ atomic_inc_unchecked(&n_rcu_torture_free);
100152 spin_lock_bh(&rcu_torture_lock);
100153 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
100154 spin_unlock_bh(&rcu_torture_lock);
100155@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
100156 i = rp->rtort_pipe_count;
100157 if (i > RCU_TORTURE_PIPE_LEN)
100158 i = RCU_TORTURE_PIPE_LEN;
100159- atomic_inc(&rcu_torture_wcount[i]);
100160+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
100161 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
100162 rp->rtort_mbtest = 0;
100163 return true;
100164@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
100165 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
100166 do {
100167 schedule_timeout_interruptible(cbflood_inter_holdoff);
100168- atomic_long_inc(&n_cbfloods);
100169+ atomic_long_inc_unchecked(&n_cbfloods);
100170 WARN_ON(signal_pending(current));
100171 for (i = 0; i < cbflood_n_burst; i++) {
100172 for (j = 0; j < cbflood_n_per_burst; j++) {
100173@@ -915,7 +915,7 @@ rcu_torture_writer(void *arg)
100174 i = old_rp->rtort_pipe_count;
100175 if (i > RCU_TORTURE_PIPE_LEN)
100176 i = RCU_TORTURE_PIPE_LEN;
100177- atomic_inc(&rcu_torture_wcount[i]);
100178+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
100179 old_rp->rtort_pipe_count++;
100180 switch (synctype[torture_random(&rand) % nsynctypes]) {
100181 case RTWS_DEF_FREE:
100182@@ -1036,7 +1036,7 @@ static void rcu_torture_timer(unsigned long unused)
100183 return;
100184 }
100185 if (p->rtort_mbtest == 0)
100186- atomic_inc(&n_rcu_torture_mberror);
100187+ atomic_inc_unchecked(&n_rcu_torture_mberror);
100188 spin_lock(&rand_lock);
100189 cur_ops->read_delay(&rand);
100190 n_rcu_torture_timers++;
100191@@ -1111,7 +1111,7 @@ rcu_torture_reader(void *arg)
100192 continue;
100193 }
100194 if (p->rtort_mbtest == 0)
100195- atomic_inc(&n_rcu_torture_mberror);
100196+ atomic_inc_unchecked(&n_rcu_torture_mberror);
100197 cur_ops->read_delay(&rand);
100198 preempt_disable();
100199 pipe_count = p->rtort_pipe_count;
100200@@ -1180,11 +1180,11 @@ rcu_torture_stats_print(void)
100201 rcu_torture_current,
100202 rcu_torture_current_version,
100203 list_empty(&rcu_torture_freelist),
100204- atomic_read(&n_rcu_torture_alloc),
100205- atomic_read(&n_rcu_torture_alloc_fail),
100206- atomic_read(&n_rcu_torture_free));
100207+ atomic_read_unchecked(&n_rcu_torture_alloc),
100208+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
100209+ atomic_read_unchecked(&n_rcu_torture_free));
100210 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
100211- atomic_read(&n_rcu_torture_mberror),
100212+ atomic_read_unchecked(&n_rcu_torture_mberror),
100213 n_rcu_torture_boost_ktrerror,
100214 n_rcu_torture_boost_rterror);
100215 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
100216@@ -1196,17 +1196,17 @@ rcu_torture_stats_print(void)
100217 n_barrier_successes,
100218 n_barrier_attempts,
100219 n_rcu_torture_barrier_error);
100220- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
100221+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
100222
100223 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
100224- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
100225+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
100226 n_rcu_torture_barrier_error != 0 ||
100227 n_rcu_torture_boost_ktrerror != 0 ||
100228 n_rcu_torture_boost_rterror != 0 ||
100229 n_rcu_torture_boost_failure != 0 ||
100230 i > 1) {
100231 pr_cont("%s", "!!! ");
100232- atomic_inc(&n_rcu_torture_error);
100233+ atomic_inc_unchecked(&n_rcu_torture_error);
100234 WARN_ON_ONCE(1);
100235 }
100236 pr_cont("Reader Pipe: ");
100237@@ -1223,7 +1223,7 @@ rcu_torture_stats_print(void)
100238 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
100239 pr_cont("Free-Block Circulation: ");
100240 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
100241- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
100242+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
100243 }
100244 pr_cont("\n");
100245
100246@@ -1570,7 +1570,7 @@ rcu_torture_cleanup(void)
100247
100248 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
100249
100250- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
100251+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
100252 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
100253 else if (torture_onoff_failures())
100254 rcu_torture_print_module_parms(cur_ops,
100255@@ -1695,18 +1695,18 @@ rcu_torture_init(void)
100256
100257 rcu_torture_current = NULL;
100258 rcu_torture_current_version = 0;
100259- atomic_set(&n_rcu_torture_alloc, 0);
100260- atomic_set(&n_rcu_torture_alloc_fail, 0);
100261- atomic_set(&n_rcu_torture_free, 0);
100262- atomic_set(&n_rcu_torture_mberror, 0);
100263- atomic_set(&n_rcu_torture_error, 0);
100264+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
100265+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
100266+ atomic_set_unchecked(&n_rcu_torture_free, 0);
100267+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
100268+ atomic_set_unchecked(&n_rcu_torture_error, 0);
100269 n_rcu_torture_barrier_error = 0;
100270 n_rcu_torture_boost_ktrerror = 0;
100271 n_rcu_torture_boost_rterror = 0;
100272 n_rcu_torture_boost_failure = 0;
100273 n_rcu_torture_boosts = 0;
100274 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
100275- atomic_set(&rcu_torture_wcount[i], 0);
100276+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
100277 for_each_possible_cpu(cpu) {
100278 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
100279 per_cpu(rcu_torture_count, cpu)[i] = 0;
100280diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
100281index cc9ceca..ce075a6 100644
100282--- a/kernel/rcu/tiny.c
100283+++ b/kernel/rcu/tiny.c
100284@@ -42,7 +42,7 @@
100285 /* Forward declarations for tiny_plugin.h. */
100286 struct rcu_ctrlblk;
100287 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
100288-static void rcu_process_callbacks(struct softirq_action *unused);
100289+static void rcu_process_callbacks(void);
100290 static void __call_rcu(struct rcu_head *head,
100291 void (*func)(struct rcu_head *rcu),
100292 struct rcu_ctrlblk *rcp);
100293@@ -210,7 +210,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
100294 false));
100295 }
100296
100297-static void rcu_process_callbacks(struct softirq_action *unused)
100298+static __latent_entropy void rcu_process_callbacks(void)
100299 {
100300 __rcu_process_callbacks(&rcu_sched_ctrlblk);
100301 __rcu_process_callbacks(&rcu_bh_ctrlblk);
100302diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
100303index f94e209..d2985bd 100644
100304--- a/kernel/rcu/tiny_plugin.h
100305+++ b/kernel/rcu/tiny_plugin.h
100306@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
100307 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
100308 jiffies - rcp->gp_start, rcp->qlen);
100309 dump_stack();
100310- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
100311+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
100312 3 * rcu_jiffies_till_stall_check() + 3;
100313 } else if (ULONG_CMP_GE(j, js)) {
100314- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100315+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100316 }
100317 }
100318
100319@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
100320 {
100321 rcp->ticks_this_gp = 0;
100322 rcp->gp_start = jiffies;
100323- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100324+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100325 }
100326
100327 static void check_cpu_stalls(void)
100328diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
100329index 48d640c..9401d30 100644
100330--- a/kernel/rcu/tree.c
100331+++ b/kernel/rcu/tree.c
100332@@ -268,7 +268,7 @@ static void rcu_momentary_dyntick_idle(void)
100333 */
100334 rdtp = this_cpu_ptr(&rcu_dynticks);
100335 smp_mb__before_atomic(); /* Earlier stuff before QS. */
100336- atomic_add(2, &rdtp->dynticks); /* QS. */
100337+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
100338 smp_mb__after_atomic(); /* Later stuff after QS. */
100339 break;
100340 }
100341@@ -580,9 +580,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
100342 rcu_prepare_for_idle();
100343 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
100344 smp_mb__before_atomic(); /* See above. */
100345- atomic_inc(&rdtp->dynticks);
100346+ atomic_inc_unchecked(&rdtp->dynticks);
100347 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
100348- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
100349+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
100350 rcu_dynticks_task_enter();
100351
100352 /*
100353@@ -703,10 +703,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
100354
100355 rcu_dynticks_task_exit();
100356 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
100357- atomic_inc(&rdtp->dynticks);
100358+ atomic_inc_unchecked(&rdtp->dynticks);
100359 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
100360 smp_mb__after_atomic(); /* See above. */
100361- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100362+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100363 rcu_cleanup_after_idle();
100364 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
100365 if (!user && !is_idle_task(current)) {
100366@@ -840,12 +840,12 @@ void rcu_nmi_enter(void)
100367 * to be in the outermost NMI handler that interrupted an RCU-idle
100368 * period (observation due to Andy Lutomirski).
100369 */
100370- if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
100371+ if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
100372 smp_mb__before_atomic(); /* Force delay from prior write. */
100373- atomic_inc(&rdtp->dynticks);
100374+ atomic_inc_unchecked(&rdtp->dynticks);
100375 /* atomic_inc() before later RCU read-side crit sects */
100376 smp_mb__after_atomic(); /* See above. */
100377- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100378+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100379 incby = 1;
100380 }
100381 rdtp->dynticks_nmi_nesting += incby;
100382@@ -870,7 +870,7 @@ void rcu_nmi_exit(void)
100383 * to us!)
100384 */
100385 WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
100386- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100387+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100388
100389 /*
100390 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
100391@@ -885,9 +885,9 @@ void rcu_nmi_exit(void)
100392 rdtp->dynticks_nmi_nesting = 0;
100393 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
100394 smp_mb__before_atomic(); /* See above. */
100395- atomic_inc(&rdtp->dynticks);
100396+ atomic_inc_unchecked(&rdtp->dynticks);
100397 smp_mb__after_atomic(); /* Force delay to next write. */
100398- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
100399+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
100400 }
100401
100402 /**
100403@@ -900,7 +900,7 @@ void rcu_nmi_exit(void)
100404 */
100405 bool notrace __rcu_is_watching(void)
100406 {
100407- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
100408+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
100409 }
100410
100411 /**
100412@@ -983,7 +983,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
100413 static int dyntick_save_progress_counter(struct rcu_data *rdp,
100414 bool *isidle, unsigned long *maxj)
100415 {
100416- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
100417+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
100418 rcu_sysidle_check_cpu(rdp, isidle, maxj);
100419 if ((rdp->dynticks_snap & 0x1) == 0) {
100420 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
100421@@ -991,7 +991,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
100422 } else {
100423 if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
100424 rdp->mynode->gpnum))
100425- ACCESS_ONCE(rdp->gpwrap) = true;
100426+ ACCESS_ONCE_RW(rdp->gpwrap) = true;
100427 return 0;
100428 }
100429 }
100430@@ -1009,7 +1009,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
100431 int *rcrmp;
100432 unsigned int snap;
100433
100434- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
100435+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
100436 snap = (unsigned int)rdp->dynticks_snap;
100437
100438 /*
100439@@ -1072,10 +1072,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
100440 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
100441 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
100442 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
100443- ACCESS_ONCE(rdp->cond_resched_completed) =
100444+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
100445 ACCESS_ONCE(rdp->mynode->completed);
100446 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
100447- ACCESS_ONCE(*rcrmp) =
100448+ ACCESS_ONCE_RW(*rcrmp) =
100449 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
100450 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
100451 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
100452@@ -1097,7 +1097,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
100453 rsp->gp_start = j;
100454 smp_wmb(); /* Record start time before stall time. */
100455 j1 = rcu_jiffies_till_stall_check();
100456- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
100457+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
100458 rsp->jiffies_resched = j + j1 / 2;
100459 rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
100460 }
100461@@ -1156,7 +1156,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
100462 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100463 return;
100464 }
100465- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
100466+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
100467 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100468
100469 /*
100470@@ -1240,7 +1240,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
100471
100472 raw_spin_lock_irqsave(&rnp->lock, flags);
100473 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
100474- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
100475+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
100476 3 * rcu_jiffies_till_stall_check() + 3;
100477 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100478
100479@@ -1324,7 +1324,7 @@ void rcu_cpu_stall_reset(void)
100480 struct rcu_state *rsp;
100481
100482 for_each_rcu_flavor(rsp)
100483- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
100484+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
100485 }
100486
100487 /*
100488@@ -1671,7 +1671,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
100489 rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
100490 rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
100491 zero_cpu_stall_ticks(rdp);
100492- ACCESS_ONCE(rdp->gpwrap) = false;
100493+ ACCESS_ONCE_RW(rdp->gpwrap) = false;
100494 }
100495 return ret;
100496 }
100497@@ -1706,7 +1706,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100498 struct rcu_data *rdp;
100499 struct rcu_node *rnp = rcu_get_root(rsp);
100500
100501- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100502+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100503 rcu_bind_gp_kthread();
100504 raw_spin_lock_irq(&rnp->lock);
100505 smp_mb__after_unlock_lock();
100506@@ -1715,7 +1715,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100507 raw_spin_unlock_irq(&rnp->lock);
100508 return 0;
100509 }
100510- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
100511+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
100512
100513 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
100514 /*
100515@@ -1756,9 +1756,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
100516 rdp = this_cpu_ptr(rsp->rda);
100517 rcu_preempt_check_blocked_tasks(rnp);
100518 rnp->qsmask = rnp->qsmaskinit;
100519- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
100520+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
100521 WARN_ON_ONCE(rnp->completed != rsp->completed);
100522- ACCESS_ONCE(rnp->completed) = rsp->completed;
100523+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
100524 if (rnp == rdp->mynode)
100525 (void)__note_gp_changes(rsp, rnp, rdp);
100526 rcu_preempt_boost_start_gp(rnp);
100527@@ -1767,7 +1767,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100528 rnp->grphi, rnp->qsmask);
100529 raw_spin_unlock_irq(&rnp->lock);
100530 cond_resched_rcu_qs();
100531- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100532+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100533 }
100534
100535 mutex_unlock(&rsp->onoff_mutex);
100536@@ -1784,7 +1784,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
100537 unsigned long maxj;
100538 struct rcu_node *rnp = rcu_get_root(rsp);
100539
100540- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100541+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100542 rsp->n_force_qs++;
100543 if (fqs_state == RCU_SAVE_DYNTICK) {
100544 /* Collect dyntick-idle snapshots. */
100545@@ -1805,7 +1805,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
100546 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
100547 raw_spin_lock_irq(&rnp->lock);
100548 smp_mb__after_unlock_lock();
100549- ACCESS_ONCE(rsp->gp_flags) =
100550+ ACCESS_ONCE_RW(rsp->gp_flags) =
100551 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
100552 raw_spin_unlock_irq(&rnp->lock);
100553 }
100554@@ -1823,7 +1823,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100555 struct rcu_data *rdp;
100556 struct rcu_node *rnp = rcu_get_root(rsp);
100557
100558- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100559+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100560 raw_spin_lock_irq(&rnp->lock);
100561 smp_mb__after_unlock_lock();
100562 gp_duration = jiffies - rsp->gp_start;
100563@@ -1852,7 +1852,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100564 rcu_for_each_node_breadth_first(rsp, rnp) {
100565 raw_spin_lock_irq(&rnp->lock);
100566 smp_mb__after_unlock_lock();
100567- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
100568+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
100569 rdp = this_cpu_ptr(rsp->rda);
100570 if (rnp == rdp->mynode)
100571 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
100572@@ -1860,7 +1860,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100573 nocb += rcu_future_gp_cleanup(rsp, rnp);
100574 raw_spin_unlock_irq(&rnp->lock);
100575 cond_resched_rcu_qs();
100576- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100577+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100578 }
100579 rnp = rcu_get_root(rsp);
100580 raw_spin_lock_irq(&rnp->lock);
100581@@ -1868,14 +1868,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100582 rcu_nocb_gp_set(rnp, nocb);
100583
100584 /* Declare grace period done. */
100585- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
100586+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
100587 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
100588 rsp->fqs_state = RCU_GP_IDLE;
100589 rdp = this_cpu_ptr(rsp->rda);
100590 /* Advance CBs to reduce false positives below. */
100591 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
100592 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
100593- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100594+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100595 trace_rcu_grace_period(rsp->name,
100596 ACCESS_ONCE(rsp->gpnum),
100597 TPS("newreq"));
100598@@ -1910,7 +1910,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
100599 if (rcu_gp_init(rsp))
100600 break;
100601 cond_resched_rcu_qs();
100602- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100603+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100604 WARN_ON(signal_pending(current));
100605 trace_rcu_grace_period(rsp->name,
100606 ACCESS_ONCE(rsp->gpnum),
100607@@ -1954,11 +1954,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
100608 ACCESS_ONCE(rsp->gpnum),
100609 TPS("fqsend"));
100610 cond_resched_rcu_qs();
100611- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100612+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100613 } else {
100614 /* Deal with stray signal. */
100615 cond_resched_rcu_qs();
100616- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100617+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100618 WARN_ON(signal_pending(current));
100619 trace_rcu_grace_period(rsp->name,
100620 ACCESS_ONCE(rsp->gpnum),
100621@@ -2003,7 +2003,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
100622 */
100623 return false;
100624 }
100625- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100626+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100627 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
100628 TPS("newreq"));
100629
100630@@ -2228,7 +2228,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
100631 rsp->qlen += rdp->qlen;
100632 rdp->n_cbs_orphaned += rdp->qlen;
100633 rdp->qlen_lazy = 0;
100634- ACCESS_ONCE(rdp->qlen) = 0;
100635+ ACCESS_ONCE_RW(rdp->qlen) = 0;
100636 }
100637
100638 /*
100639@@ -2490,7 +2490,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
100640 }
100641 smp_mb(); /* List handling before counting for rcu_barrier(). */
100642 rdp->qlen_lazy -= count_lazy;
100643- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
100644+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
100645 rdp->n_cbs_invoked += count;
100646
100647 /* Reinstate batch limit if we have worked down the excess. */
100648@@ -2647,7 +2647,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
100649 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
100650 return; /* Someone beat us to it. */
100651 }
100652- ACCESS_ONCE(rsp->gp_flags) =
100653+ ACCESS_ONCE_RW(rsp->gp_flags) =
100654 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
100655 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
100656 rcu_gp_kthread_wake(rsp);
100657@@ -2693,7 +2693,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
100658 /*
100659 * Do RCU core processing for the current CPU.
100660 */
100661-static void rcu_process_callbacks(struct softirq_action *unused)
100662+static void rcu_process_callbacks(void)
100663 {
100664 struct rcu_state *rsp;
100665
100666@@ -2805,7 +2805,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
100667 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
100668 if (debug_rcu_head_queue(head)) {
100669 /* Probable double call_rcu(), so leak the callback. */
100670- ACCESS_ONCE(head->func) = rcu_leak_callback;
100671+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
100672 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
100673 return;
100674 }
100675@@ -2833,7 +2833,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
100676 local_irq_restore(flags);
100677 return;
100678 }
100679- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
100680+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
100681 if (lazy)
100682 rdp->qlen_lazy++;
100683 else
100684@@ -3106,11 +3106,11 @@ void synchronize_sched_expedited(void)
100685 * counter wrap on a 32-bit system. Quite a few more CPUs would of
100686 * course be required on a 64-bit system.
100687 */
100688- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
100689+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
100690 (ulong)atomic_long_read(&rsp->expedited_done) +
100691 ULONG_MAX / 8)) {
100692 synchronize_sched();
100693- atomic_long_inc(&rsp->expedited_wrap);
100694+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
100695 return;
100696 }
100697
100698@@ -3118,12 +3118,12 @@ void synchronize_sched_expedited(void)
100699 * Take a ticket. Note that atomic_inc_return() implies a
100700 * full memory barrier.
100701 */
100702- snap = atomic_long_inc_return(&rsp->expedited_start);
100703+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
100704 firstsnap = snap;
100705 if (!try_get_online_cpus()) {
100706 /* CPU hotplug operation in flight, fall back to normal GP. */
100707 wait_rcu_gp(call_rcu_sched);
100708- atomic_long_inc(&rsp->expedited_normal);
100709+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100710 return;
100711 }
100712 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
100713@@ -3136,7 +3136,7 @@ void synchronize_sched_expedited(void)
100714 for_each_cpu(cpu, cm) {
100715 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
100716
100717- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
100718+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
100719 cpumask_clear_cpu(cpu, cm);
100720 }
100721 if (cpumask_weight(cm) == 0)
100722@@ -3151,14 +3151,14 @@ void synchronize_sched_expedited(void)
100723 synchronize_sched_expedited_cpu_stop,
100724 NULL) == -EAGAIN) {
100725 put_online_cpus();
100726- atomic_long_inc(&rsp->expedited_tryfail);
100727+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
100728
100729 /* Check to see if someone else did our work for us. */
100730 s = atomic_long_read(&rsp->expedited_done);
100731 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
100732 /* ensure test happens before caller kfree */
100733 smp_mb__before_atomic(); /* ^^^ */
100734- atomic_long_inc(&rsp->expedited_workdone1);
100735+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
100736 free_cpumask_var(cm);
100737 return;
100738 }
100739@@ -3168,7 +3168,7 @@ void synchronize_sched_expedited(void)
100740 udelay(trycount * num_online_cpus());
100741 } else {
100742 wait_rcu_gp(call_rcu_sched);
100743- atomic_long_inc(&rsp->expedited_normal);
100744+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100745 free_cpumask_var(cm);
100746 return;
100747 }
100748@@ -3178,7 +3178,7 @@ void synchronize_sched_expedited(void)
100749 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
100750 /* ensure test happens before caller kfree */
100751 smp_mb__before_atomic(); /* ^^^ */
100752- atomic_long_inc(&rsp->expedited_workdone2);
100753+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
100754 free_cpumask_var(cm);
100755 return;
100756 }
100757@@ -3193,14 +3193,14 @@ void synchronize_sched_expedited(void)
100758 if (!try_get_online_cpus()) {
100759 /* CPU hotplug operation in flight, use normal GP. */
100760 wait_rcu_gp(call_rcu_sched);
100761- atomic_long_inc(&rsp->expedited_normal);
100762+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100763 free_cpumask_var(cm);
100764 return;
100765 }
100766- snap = atomic_long_read(&rsp->expedited_start);
100767+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
100768 smp_mb(); /* ensure read is before try_stop_cpus(). */
100769 }
100770- atomic_long_inc(&rsp->expedited_stoppedcpus);
100771+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
100772
100773 all_cpus_idle:
100774 free_cpumask_var(cm);
100775@@ -3212,16 +3212,16 @@ all_cpus_idle:
100776 * than we did already did their update.
100777 */
100778 do {
100779- atomic_long_inc(&rsp->expedited_done_tries);
100780+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
100781 s = atomic_long_read(&rsp->expedited_done);
100782 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
100783 /* ensure test happens before caller kfree */
100784 smp_mb__before_atomic(); /* ^^^ */
100785- atomic_long_inc(&rsp->expedited_done_lost);
100786+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
100787 break;
100788 }
100789 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
100790- atomic_long_inc(&rsp->expedited_done_exit);
100791+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
100792
100793 put_online_cpus();
100794 }
100795@@ -3431,7 +3431,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
100796 * ACCESS_ONCE() to prevent the compiler from speculating
100797 * the increment to precede the early-exit check.
100798 */
100799- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100800+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100801 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
100802 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
100803 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
100804@@ -3487,7 +3487,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
100805
100806 /* Increment ->n_barrier_done to prevent duplicate work. */
100807 smp_mb(); /* Keep increment after above mechanism. */
100808- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100809+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100810 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
100811 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
100812 smp_mb(); /* Keep increment before caller's subsequent code. */
100813@@ -3532,7 +3532,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
100814 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
100815 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
100816 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
100817- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
100818+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
100819 rdp->cpu = cpu;
100820 rdp->rsp = rsp;
100821 rcu_boot_init_nocb_percpu_data(rdp);
100822@@ -3565,8 +3565,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
100823 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
100824 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
100825 rcu_sysidle_init_percpu_data(rdp->dynticks);
100826- atomic_set(&rdp->dynticks->dynticks,
100827- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
100828+ atomic_set_unchecked(&rdp->dynticks->dynticks,
100829+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
100830 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
100831
100832 /* Add CPU to rcu_node bitmasks. */
100833diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
100834index 119de39..f07d31a 100644
100835--- a/kernel/rcu/tree.h
100836+++ b/kernel/rcu/tree.h
100837@@ -86,11 +86,11 @@ struct rcu_dynticks {
100838 long long dynticks_nesting; /* Track irq/process nesting level. */
100839 /* Process level is worth LLONG_MAX/2. */
100840 int dynticks_nmi_nesting; /* Track NMI nesting level. */
100841- atomic_t dynticks; /* Even value for idle, else odd. */
100842+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
100843 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
100844 long long dynticks_idle_nesting;
100845 /* irq/process nesting level from idle. */
100846- atomic_t dynticks_idle; /* Even value for idle, else odd. */
100847+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
100848 /* "Idle" excludes userspace execution. */
100849 unsigned long dynticks_idle_jiffies;
100850 /* End of last non-NMI non-idle period. */
100851@@ -457,17 +457,17 @@ struct rcu_state {
100852 /* _rcu_barrier(). */
100853 /* End of fields guarded by barrier_mutex. */
100854
100855- atomic_long_t expedited_start; /* Starting ticket. */
100856- atomic_long_t expedited_done; /* Done ticket. */
100857- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
100858- atomic_long_t expedited_tryfail; /* # acquisition failures. */
100859- atomic_long_t expedited_workdone1; /* # done by others #1. */
100860- atomic_long_t expedited_workdone2; /* # done by others #2. */
100861- atomic_long_t expedited_normal; /* # fallbacks to normal. */
100862- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
100863- atomic_long_t expedited_done_tries; /* # tries to update _done. */
100864- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
100865- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
100866+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
100867+ atomic_long_t expedited_done; /* Done ticket. */
100868+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
100869+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
100870+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
100871+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
100872+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
100873+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
100874+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
100875+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
100876+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
100877
100878 unsigned long jiffies_force_qs; /* Time at which to invoke */
100879 /* force_quiescent_state(). */
100880diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
100881index 0a571e9..fbfd611 100644
100882--- a/kernel/rcu/tree_plugin.h
100883+++ b/kernel/rcu/tree_plugin.h
100884@@ -619,7 +619,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
100885 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
100886 {
100887 return !rcu_preempted_readers_exp(rnp) &&
100888- ACCESS_ONCE(rnp->expmask) == 0;
100889+ ACCESS_ONCE_RW(rnp->expmask) == 0;
100890 }
100891
100892 /*
100893@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
100894
100895 /* Clean up and exit. */
100896 smp_mb(); /* ensure expedited GP seen before counter increment. */
100897- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
100898+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
100899 sync_rcu_preempt_exp_count + 1;
100900 unlock_mb_ret:
100901 mutex_unlock(&sync_rcu_preempt_exp_mutex);
100902@@ -1290,7 +1290,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
100903 free_cpumask_var(cm);
100904 }
100905
100906-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
100907+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
100908 .store = &rcu_cpu_kthread_task,
100909 .thread_should_run = rcu_cpu_kthread_should_run,
100910 .thread_fn = rcu_cpu_kthread,
100911@@ -1761,7 +1761,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
100912 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
100913 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u fqs=%ld %s\n",
100914 cpu, ticks_value, ticks_title,
100915- atomic_read(&rdtp->dynticks) & 0xfff,
100916+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
100917 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
100918 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
100919 ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
100920@@ -1906,7 +1906,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
100921 return;
100922 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
100923 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
100924- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
100925+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
100926 wake_up(&rdp_leader->nocb_wq);
100927 }
100928 }
100929@@ -1978,7 +1978,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
100930 atomic_long_add(rhcount, &rdp->nocb_q_count);
100931 /* rcu_barrier() relies on ->nocb_q_count add before xchg. */
100932 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
100933- ACCESS_ONCE(*old_rhpp) = rhp;
100934+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
100935 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
100936 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
100937
100938@@ -2167,7 +2167,7 @@ wait_again:
100939 continue; /* No CBs here, try next follower. */
100940
100941 /* Move callbacks to wait-for-GP list, which is empty. */
100942- ACCESS_ONCE(rdp->nocb_head) = NULL;
100943+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
100944 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
100945 gotcbs = true;
100946 }
100947@@ -2288,7 +2288,7 @@ static int rcu_nocb_kthread(void *arg)
100948 list = ACCESS_ONCE(rdp->nocb_follower_head);
100949 BUG_ON(!list);
100950 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
100951- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
100952+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
100953 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
100954
100955 /* Each pass through the following loop invokes a callback. */
100956@@ -2338,7 +2338,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
100957 if (!rcu_nocb_need_deferred_wakeup(rdp))
100958 return;
100959 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
100960- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
100961+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
100962 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
100963 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
100964 }
100965@@ -2461,7 +2461,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
100966 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
100967 "rcuo%c/%d", rsp->abbr, cpu);
100968 BUG_ON(IS_ERR(t));
100969- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
100970+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
100971 }
100972
100973 /*
100974@@ -2666,11 +2666,11 @@ static void rcu_sysidle_enter(int irq)
100975
100976 /* Record start of fully idle period. */
100977 j = jiffies;
100978- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
100979+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
100980 smp_mb__before_atomic();
100981- atomic_inc(&rdtp->dynticks_idle);
100982+ atomic_inc_unchecked(&rdtp->dynticks_idle);
100983 smp_mb__after_atomic();
100984- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
100985+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
100986 }
100987
100988 /*
100989@@ -2741,9 +2741,9 @@ static void rcu_sysidle_exit(int irq)
100990
100991 /* Record end of idle period. */
100992 smp_mb__before_atomic();
100993- atomic_inc(&rdtp->dynticks_idle);
100994+ atomic_inc_unchecked(&rdtp->dynticks_idle);
100995 smp_mb__after_atomic();
100996- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
100997+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
100998
100999 /*
101000 * If we are the timekeeping CPU, we are permitted to be non-idle
101001@@ -2788,7 +2788,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
101002 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
101003
101004 /* Pick up current idle and NMI-nesting counter and check. */
101005- cur = atomic_read(&rdtp->dynticks_idle);
101006+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
101007 if (cur & 0x1) {
101008 *isidle = false; /* We are not idle! */
101009 return;
101010@@ -2837,7 +2837,7 @@ static void rcu_sysidle(unsigned long j)
101011 case RCU_SYSIDLE_NOT:
101012
101013 /* First time all are idle, so note a short idle period. */
101014- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
101015+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
101016 break;
101017
101018 case RCU_SYSIDLE_SHORT:
101019@@ -2875,7 +2875,7 @@ static void rcu_sysidle_cancel(void)
101020 {
101021 smp_mb();
101022 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
101023- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
101024+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
101025 }
101026
101027 /*
101028@@ -2927,7 +2927,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
101029 smp_mb(); /* grace period precedes setting inuse. */
101030
101031 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
101032- ACCESS_ONCE(rshp->inuse) = 0;
101033+ ACCESS_ONCE_RW(rshp->inuse) = 0;
101034 }
101035
101036 /*
101037@@ -3080,7 +3080,7 @@ static void rcu_bind_gp_kthread(void)
101038 static void rcu_dynticks_task_enter(void)
101039 {
101040 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
101041- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
101042+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
101043 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
101044 }
101045
101046@@ -3088,6 +3088,6 @@ static void rcu_dynticks_task_enter(void)
101047 static void rcu_dynticks_task_exit(void)
101048 {
101049 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
101050- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
101051+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
101052 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
101053 }
101054diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
101055index fbb6240..f6c5097 100644
101056--- a/kernel/rcu/tree_trace.c
101057+++ b/kernel/rcu/tree_trace.c
101058@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
101059 rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
101060 rdp->qs_pending);
101061 seq_printf(m, " dt=%d/%llx/%d df=%lu",
101062- atomic_read(&rdp->dynticks->dynticks),
101063+ atomic_read_unchecked(&rdp->dynticks->dynticks),
101064 rdp->dynticks->dynticks_nesting,
101065 rdp->dynticks->dynticks_nmi_nesting,
101066 rdp->dynticks_fqs);
101067@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
101068 struct rcu_state *rsp = (struct rcu_state *)m->private;
101069
101070 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",
101071- atomic_long_read(&rsp->expedited_start),
101072+ atomic_long_read_unchecked(&rsp->expedited_start),
101073 atomic_long_read(&rsp->expedited_done),
101074- atomic_long_read(&rsp->expedited_wrap),
101075- atomic_long_read(&rsp->expedited_tryfail),
101076- atomic_long_read(&rsp->expedited_workdone1),
101077- atomic_long_read(&rsp->expedited_workdone2),
101078- atomic_long_read(&rsp->expedited_normal),
101079- atomic_long_read(&rsp->expedited_stoppedcpus),
101080- atomic_long_read(&rsp->expedited_done_tries),
101081- atomic_long_read(&rsp->expedited_done_lost),
101082- atomic_long_read(&rsp->expedited_done_exit));
101083+ atomic_long_read_unchecked(&rsp->expedited_wrap),
101084+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
101085+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
101086+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
101087+ atomic_long_read_unchecked(&rsp->expedited_normal),
101088+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
101089+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
101090+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
101091+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
101092 return 0;
101093 }
101094
101095diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
101096index e0d31a3..f4dafe3 100644
101097--- a/kernel/rcu/update.c
101098+++ b/kernel/rcu/update.c
101099@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
101100 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
101101 */
101102 if (till_stall_check < 3) {
101103- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
101104+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
101105 till_stall_check = 3;
101106 } else if (till_stall_check > 300) {
101107- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
101108+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
101109 till_stall_check = 300;
101110 }
101111 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
101112@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
101113 !ACCESS_ONCE(t->on_rq) ||
101114 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
101115 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
101116- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
101117+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
101118 list_del_init(&t->rcu_tasks_holdout_list);
101119 put_task_struct(t);
101120 return;
101121@@ -589,7 +589,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
101122 !is_idle_task(t)) {
101123 get_task_struct(t);
101124 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
101125- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
101126+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
101127 list_add(&t->rcu_tasks_holdout_list,
101128 &rcu_tasks_holdouts);
101129 }
101130@@ -686,7 +686,7 @@ static void rcu_spawn_tasks_kthread(void)
101131 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
101132 BUG_ON(IS_ERR(t));
101133 smp_mb(); /* Ensure others see full kthread. */
101134- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
101135+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
101136 mutex_unlock(&rcu_tasks_kthread_mutex);
101137 }
101138
101139diff --git a/kernel/resource.c b/kernel/resource.c
101140index 19f2357..ebe7f35 100644
101141--- a/kernel/resource.c
101142+++ b/kernel/resource.c
101143@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
101144
101145 static int __init ioresources_init(void)
101146 {
101147+#ifdef CONFIG_GRKERNSEC_PROC_ADD
101148+#ifdef CONFIG_GRKERNSEC_PROC_USER
101149+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
101150+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
101151+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
101152+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
101153+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
101154+#endif
101155+#else
101156 proc_create("ioports", 0, NULL, &proc_ioports_operations);
101157 proc_create("iomem", 0, NULL, &proc_iomem_operations);
101158+#endif
101159 return 0;
101160 }
101161 __initcall(ioresources_init);
101162diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
101163index eae160d..c9aa22e 100644
101164--- a/kernel/sched/auto_group.c
101165+++ b/kernel/sched/auto_group.c
101166@@ -11,7 +11,7 @@
101167
101168 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
101169 static struct autogroup autogroup_default;
101170-static atomic_t autogroup_seq_nr;
101171+static atomic_unchecked_t autogroup_seq_nr;
101172
101173 void __init autogroup_init(struct task_struct *init_task)
101174 {
101175@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
101176
101177 kref_init(&ag->kref);
101178 init_rwsem(&ag->lock);
101179- ag->id = atomic_inc_return(&autogroup_seq_nr);
101180+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
101181 ag->tg = tg;
101182 #ifdef CONFIG_RT_GROUP_SCHED
101183 /*
101184diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
101185index 8d0f35d..c16360d 100644
101186--- a/kernel/sched/completion.c
101187+++ b/kernel/sched/completion.c
101188@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
101189 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
101190 * or number of jiffies left till timeout) if completed.
101191 */
101192-long __sched
101193+long __sched __intentional_overflow(-1)
101194 wait_for_completion_interruptible_timeout(struct completion *x,
101195 unsigned long timeout)
101196 {
101197@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
101198 *
101199 * Return: -ERESTARTSYS if interrupted, 0 if completed.
101200 */
101201-int __sched wait_for_completion_killable(struct completion *x)
101202+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
101203 {
101204 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
101205 if (t == -ERESTARTSYS)
101206@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
101207 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
101208 * or number of jiffies left till timeout) if completed.
101209 */
101210-long __sched
101211+long __sched __intentional_overflow(-1)
101212 wait_for_completion_killable_timeout(struct completion *x,
101213 unsigned long timeout)
101214 {
101215diff --git a/kernel/sched/core.c b/kernel/sched/core.c
101216index f4da2cb..e44587b 100644
101217--- a/kernel/sched/core.c
101218+++ b/kernel/sched/core.c
101219@@ -1862,7 +1862,7 @@ void set_numabalancing_state(bool enabled)
101220 int sysctl_numa_balancing(struct ctl_table *table, int write,
101221 void __user *buffer, size_t *lenp, loff_t *ppos)
101222 {
101223- struct ctl_table t;
101224+ ctl_table_no_const t;
101225 int err;
101226 int state = numabalancing_enabled;
101227
101228@@ -2312,8 +2312,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
101229 next->active_mm = oldmm;
101230 atomic_inc(&oldmm->mm_count);
101231 enter_lazy_tlb(oldmm, next);
101232- } else
101233+ } else {
101234 switch_mm(oldmm, mm, next);
101235+ populate_stack();
101236+ }
101237
101238 if (!prev->mm) {
101239 prev->active_mm = NULL;
101240@@ -3124,6 +3126,8 @@ int can_nice(const struct task_struct *p, const int nice)
101241 /* convert nice value [19,-20] to rlimit style value [1,40] */
101242 int nice_rlim = nice_to_rlimit(nice);
101243
101244+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
101245+
101246 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
101247 capable(CAP_SYS_NICE));
101248 }
101249@@ -3150,7 +3154,8 @@ SYSCALL_DEFINE1(nice, int, increment)
101250 nice = task_nice(current) + increment;
101251
101252 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
101253- if (increment < 0 && !can_nice(current, nice))
101254+ if (increment < 0 && (!can_nice(current, nice) ||
101255+ gr_handle_chroot_nice()))
101256 return -EPERM;
101257
101258 retval = security_task_setnice(current, nice);
101259@@ -3462,6 +3467,7 @@ recheck:
101260 if (policy != p->policy && !rlim_rtprio)
101261 return -EPERM;
101262
101263+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
101264 /* can't increase priority */
101265 if (attr->sched_priority > p->rt_priority &&
101266 attr->sched_priority > rlim_rtprio)
101267@@ -4945,6 +4951,7 @@ void idle_task_exit(void)
101268
101269 if (mm != &init_mm) {
101270 switch_mm(mm, &init_mm, current);
101271+ populate_stack();
101272 finish_arch_post_lock_switch();
101273 }
101274 mmdrop(mm);
101275@@ -5040,7 +5047,7 @@ static void migrate_tasks(unsigned int dead_cpu)
101276
101277 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
101278
101279-static struct ctl_table sd_ctl_dir[] = {
101280+static ctl_table_no_const sd_ctl_dir[] __read_only = {
101281 {
101282 .procname = "sched_domain",
101283 .mode = 0555,
101284@@ -5057,17 +5064,17 @@ static struct ctl_table sd_ctl_root[] = {
101285 {}
101286 };
101287
101288-static struct ctl_table *sd_alloc_ctl_entry(int n)
101289+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
101290 {
101291- struct ctl_table *entry =
101292+ ctl_table_no_const *entry =
101293 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
101294
101295 return entry;
101296 }
101297
101298-static void sd_free_ctl_entry(struct ctl_table **tablep)
101299+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
101300 {
101301- struct ctl_table *entry;
101302+ ctl_table_no_const *entry;
101303
101304 /*
101305 * In the intermediate directories, both the child directory and
101306@@ -5075,22 +5082,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
101307 * will always be set. In the lowest directory the names are
101308 * static strings and all have proc handlers.
101309 */
101310- for (entry = *tablep; entry->mode; entry++) {
101311- if (entry->child)
101312- sd_free_ctl_entry(&entry->child);
101313+ for (entry = tablep; entry->mode; entry++) {
101314+ if (entry->child) {
101315+ sd_free_ctl_entry(entry->child);
101316+ pax_open_kernel();
101317+ entry->child = NULL;
101318+ pax_close_kernel();
101319+ }
101320 if (entry->proc_handler == NULL)
101321 kfree(entry->procname);
101322 }
101323
101324- kfree(*tablep);
101325- *tablep = NULL;
101326+ kfree(tablep);
101327 }
101328
101329 static int min_load_idx = 0;
101330 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
101331
101332 static void
101333-set_table_entry(struct ctl_table *entry,
101334+set_table_entry(ctl_table_no_const *entry,
101335 const char *procname, void *data, int maxlen,
101336 umode_t mode, proc_handler *proc_handler,
101337 bool load_idx)
101338@@ -5110,7 +5120,7 @@ set_table_entry(struct ctl_table *entry,
101339 static struct ctl_table *
101340 sd_alloc_ctl_domain_table(struct sched_domain *sd)
101341 {
101342- struct ctl_table *table = sd_alloc_ctl_entry(14);
101343+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
101344
101345 if (table == NULL)
101346 return NULL;
101347@@ -5148,9 +5158,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
101348 return table;
101349 }
101350
101351-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
101352+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
101353 {
101354- struct ctl_table *entry, *table;
101355+ ctl_table_no_const *entry, *table;
101356 struct sched_domain *sd;
101357 int domain_num = 0, i;
101358 char buf[32];
101359@@ -5177,11 +5187,13 @@ static struct ctl_table_header *sd_sysctl_header;
101360 static void register_sched_domain_sysctl(void)
101361 {
101362 int i, cpu_num = num_possible_cpus();
101363- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
101364+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
101365 char buf[32];
101366
101367 WARN_ON(sd_ctl_dir[0].child);
101368+ pax_open_kernel();
101369 sd_ctl_dir[0].child = entry;
101370+ pax_close_kernel();
101371
101372 if (entry == NULL)
101373 return;
101374@@ -5204,8 +5216,12 @@ static void unregister_sched_domain_sysctl(void)
101375 if (sd_sysctl_header)
101376 unregister_sysctl_table(sd_sysctl_header);
101377 sd_sysctl_header = NULL;
101378- if (sd_ctl_dir[0].child)
101379- sd_free_ctl_entry(&sd_ctl_dir[0].child);
101380+ if (sd_ctl_dir[0].child) {
101381+ sd_free_ctl_entry(sd_ctl_dir[0].child);
101382+ pax_open_kernel();
101383+ sd_ctl_dir[0].child = NULL;
101384+ pax_close_kernel();
101385+ }
101386 }
101387 #else
101388 static void register_sched_domain_sysctl(void)
101389diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
101390index 241213b..6a64c91 100644
101391--- a/kernel/sched/fair.c
101392+++ b/kernel/sched/fair.c
101393@@ -2092,7 +2092,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
101394
101395 static void reset_ptenuma_scan(struct task_struct *p)
101396 {
101397- ACCESS_ONCE(p->mm->numa_scan_seq)++;
101398+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
101399 p->mm->numa_scan_offset = 0;
101400 }
101401
101402@@ -7656,7 +7656,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
101403 * run_rebalance_domains is triggered when needed from the scheduler tick.
101404 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
101405 */
101406-static void run_rebalance_domains(struct softirq_action *h)
101407+static __latent_entropy void run_rebalance_domains(void)
101408 {
101409 struct rq *this_rq = this_rq();
101410 enum cpu_idle_type idle = this_rq->idle_balance ?
101411diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
101412index dc0f435..ae2e085 100644
101413--- a/kernel/sched/sched.h
101414+++ b/kernel/sched/sched.h
101415@@ -1200,7 +1200,7 @@ struct sched_class {
101416 #ifdef CONFIG_FAIR_GROUP_SCHED
101417 void (*task_move_group) (struct task_struct *p, int on_rq);
101418 #endif
101419-};
101420+} __do_const;
101421
101422 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
101423 {
101424diff --git a/kernel/signal.c b/kernel/signal.c
101425index a390499..ebe9a21 100644
101426--- a/kernel/signal.c
101427+++ b/kernel/signal.c
101428@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
101429
101430 int print_fatal_signals __read_mostly;
101431
101432-static void __user *sig_handler(struct task_struct *t, int sig)
101433+static __sighandler_t sig_handler(struct task_struct *t, int sig)
101434 {
101435 return t->sighand->action[sig - 1].sa.sa_handler;
101436 }
101437
101438-static int sig_handler_ignored(void __user *handler, int sig)
101439+static int sig_handler_ignored(__sighandler_t handler, int sig)
101440 {
101441 /* Is it explicitly or implicitly ignored? */
101442 return handler == SIG_IGN ||
101443@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
101444
101445 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
101446 {
101447- void __user *handler;
101448+ __sighandler_t handler;
101449
101450 handler = sig_handler(t, sig);
101451
101452@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
101453 atomic_inc(&user->sigpending);
101454 rcu_read_unlock();
101455
101456+ if (!override_rlimit)
101457+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
101458+
101459 if (override_rlimit ||
101460 atomic_read(&user->sigpending) <=
101461 task_rlimit(t, RLIMIT_SIGPENDING)) {
101462@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
101463
101464 int unhandled_signal(struct task_struct *tsk, int sig)
101465 {
101466- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
101467+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
101468 if (is_global_init(tsk))
101469 return 1;
101470 if (handler != SIG_IGN && handler != SIG_DFL)
101471@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
101472 }
101473 }
101474
101475+ /* allow glibc communication via tgkill to other threads in our
101476+ thread group */
101477+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
101478+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
101479+ && gr_handle_signal(t, sig))
101480+ return -EPERM;
101481+
101482 return security_task_kill(t, info, sig, 0);
101483 }
101484
101485@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
101486 return send_signal(sig, info, p, 1);
101487 }
101488
101489-static int
101490+int
101491 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101492 {
101493 return send_signal(sig, info, t, 0);
101494@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101495 unsigned long int flags;
101496 int ret, blocked, ignored;
101497 struct k_sigaction *action;
101498+ int is_unhandled = 0;
101499
101500 spin_lock_irqsave(&t->sighand->siglock, flags);
101501 action = &t->sighand->action[sig-1];
101502@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101503 }
101504 if (action->sa.sa_handler == SIG_DFL)
101505 t->signal->flags &= ~SIGNAL_UNKILLABLE;
101506+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
101507+ is_unhandled = 1;
101508 ret = specific_send_sig_info(sig, info, t);
101509 spin_unlock_irqrestore(&t->sighand->siglock, flags);
101510
101511+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
101512+ normal operation */
101513+ if (is_unhandled) {
101514+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
101515+ gr_handle_crash(t, sig);
101516+ }
101517+
101518 return ret;
101519 }
101520
101521@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
101522 ret = check_kill_permission(sig, info, p);
101523 rcu_read_unlock();
101524
101525- if (!ret && sig)
101526+ if (!ret && sig) {
101527 ret = do_send_sig_info(sig, info, p, true);
101528+ if (!ret)
101529+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
101530+ }
101531
101532 return ret;
101533 }
101534@@ -2915,7 +2938,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
101535 int error = -ESRCH;
101536
101537 rcu_read_lock();
101538- p = find_task_by_vpid(pid);
101539+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
101540+ /* allow glibc communication via tgkill to other threads in our
101541+ thread group */
101542+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
101543+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
101544+ p = find_task_by_vpid_unrestricted(pid);
101545+ else
101546+#endif
101547+ p = find_task_by_vpid(pid);
101548 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
101549 error = check_kill_permission(sig, info, p);
101550 /*
101551@@ -3248,8 +3279,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
101552 }
101553 seg = get_fs();
101554 set_fs(KERNEL_DS);
101555- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
101556- (stack_t __force __user *) &uoss,
101557+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
101558+ (stack_t __force_user *) &uoss,
101559 compat_user_stack_pointer());
101560 set_fs(seg);
101561 if (ret >= 0 && uoss_ptr) {
101562diff --git a/kernel/smpboot.c b/kernel/smpboot.c
101563index 40190f2..8861d40 100644
101564--- a/kernel/smpboot.c
101565+++ b/kernel/smpboot.c
101566@@ -290,7 +290,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
101567 }
101568 smpboot_unpark_thread(plug_thread, cpu);
101569 }
101570- list_add(&plug_thread->list, &hotplug_threads);
101571+ pax_list_add(&plug_thread->list, &hotplug_threads);
101572 out:
101573 mutex_unlock(&smpboot_threads_lock);
101574 put_online_cpus();
101575@@ -308,7 +308,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
101576 {
101577 get_online_cpus();
101578 mutex_lock(&smpboot_threads_lock);
101579- list_del(&plug_thread->list);
101580+ pax_list_del(&plug_thread->list);
101581 smpboot_destroy_threads(plug_thread);
101582 mutex_unlock(&smpboot_threads_lock);
101583 put_online_cpus();
101584diff --git a/kernel/softirq.c b/kernel/softirq.c
101585index 479e443..66d845e1 100644
101586--- a/kernel/softirq.c
101587+++ b/kernel/softirq.c
101588@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
101589 EXPORT_SYMBOL(irq_stat);
101590 #endif
101591
101592-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
101593+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
101594
101595 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
101596
101597@@ -270,7 +270,7 @@ restart:
101598 kstat_incr_softirqs_this_cpu(vec_nr);
101599
101600 trace_softirq_entry(vec_nr);
101601- h->action(h);
101602+ h->action();
101603 trace_softirq_exit(vec_nr);
101604 if (unlikely(prev_count != preempt_count())) {
101605 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
101606@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
101607 or_softirq_pending(1UL << nr);
101608 }
101609
101610-void open_softirq(int nr, void (*action)(struct softirq_action *))
101611+void __init open_softirq(int nr, void (*action)(void))
101612 {
101613 softirq_vec[nr].action = action;
101614 }
101615@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
101616 }
101617 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
101618
101619-static void tasklet_action(struct softirq_action *a)
101620+static void tasklet_action(void)
101621 {
101622 struct tasklet_struct *list;
101623
101624@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
101625 }
101626 }
101627
101628-static void tasklet_hi_action(struct softirq_action *a)
101629+static __latent_entropy void tasklet_hi_action(void)
101630 {
101631 struct tasklet_struct *list;
101632
101633@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
101634 .notifier_call = cpu_callback
101635 };
101636
101637-static struct smp_hotplug_thread softirq_threads = {
101638+static struct smp_hotplug_thread softirq_threads __read_only = {
101639 .store = &ksoftirqd,
101640 .thread_should_run = ksoftirqd_should_run,
101641 .thread_fn = run_ksoftirqd,
101642diff --git a/kernel/sys.c b/kernel/sys.c
101643index a03d9cd..55dbe9c 100644
101644--- a/kernel/sys.c
101645+++ b/kernel/sys.c
101646@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
101647 error = -EACCES;
101648 goto out;
101649 }
101650+
101651+ if (gr_handle_chroot_setpriority(p, niceval)) {
101652+ error = -EACCES;
101653+ goto out;
101654+ }
101655+
101656 no_nice = security_task_setnice(p, niceval);
101657 if (no_nice) {
101658 error = no_nice;
101659@@ -365,6 +371,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
101660 goto error;
101661 }
101662
101663+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
101664+ goto error;
101665+
101666+ if (!gid_eq(new->gid, old->gid)) {
101667+ /* make sure we generate a learn log for what will
101668+ end up being a role transition after a full-learning
101669+ policy is generated
101670+ CAP_SETGID is required to perform a transition
101671+ we may not log a CAP_SETGID check above, e.g.
101672+ in the case where new rgid = old egid
101673+ */
101674+ gr_learn_cap(current, new, CAP_SETGID);
101675+ }
101676+
101677 if (rgid != (gid_t) -1 ||
101678 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
101679 new->sgid = new->egid;
101680@@ -400,6 +420,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
101681 old = current_cred();
101682
101683 retval = -EPERM;
101684+
101685+ if (gr_check_group_change(kgid, kgid, kgid))
101686+ goto error;
101687+
101688 if (ns_capable(old->user_ns, CAP_SETGID))
101689 new->gid = new->egid = new->sgid = new->fsgid = kgid;
101690 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
101691@@ -417,7 +441,7 @@ error:
101692 /*
101693 * change the user struct in a credentials set to match the new UID
101694 */
101695-static int set_user(struct cred *new)
101696+int set_user(struct cred *new)
101697 {
101698 struct user_struct *new_user;
101699
101700@@ -497,7 +521,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
101701 goto error;
101702 }
101703
101704+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
101705+ goto error;
101706+
101707 if (!uid_eq(new->uid, old->uid)) {
101708+ /* make sure we generate a learn log for what will
101709+ end up being a role transition after a full-learning
101710+ policy is generated
101711+ CAP_SETUID is required to perform a transition
101712+ we may not log a CAP_SETUID check above, e.g.
101713+ in the case where new ruid = old euid
101714+ */
101715+ gr_learn_cap(current, new, CAP_SETUID);
101716 retval = set_user(new);
101717 if (retval < 0)
101718 goto error;
101719@@ -547,6 +582,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
101720 old = current_cred();
101721
101722 retval = -EPERM;
101723+
101724+ if (gr_check_crash_uid(kuid))
101725+ goto error;
101726+ if (gr_check_user_change(kuid, kuid, kuid))
101727+ goto error;
101728+
101729 if (ns_capable(old->user_ns, CAP_SETUID)) {
101730 new->suid = new->uid = kuid;
101731 if (!uid_eq(kuid, old->uid)) {
101732@@ -616,6 +657,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
101733 goto error;
101734 }
101735
101736+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
101737+ goto error;
101738+
101739 if (ruid != (uid_t) -1) {
101740 new->uid = kruid;
101741 if (!uid_eq(kruid, old->uid)) {
101742@@ -700,6 +744,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
101743 goto error;
101744 }
101745
101746+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
101747+ goto error;
101748+
101749 if (rgid != (gid_t) -1)
101750 new->gid = krgid;
101751 if (egid != (gid_t) -1)
101752@@ -764,12 +811,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
101753 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
101754 ns_capable(old->user_ns, CAP_SETUID)) {
101755 if (!uid_eq(kuid, old->fsuid)) {
101756+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
101757+ goto error;
101758+
101759 new->fsuid = kuid;
101760 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
101761 goto change_okay;
101762 }
101763 }
101764
101765+error:
101766 abort_creds(new);
101767 return old_fsuid;
101768
101769@@ -802,12 +853,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
101770 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
101771 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
101772 ns_capable(old->user_ns, CAP_SETGID)) {
101773+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
101774+ goto error;
101775+
101776 if (!gid_eq(kgid, old->fsgid)) {
101777 new->fsgid = kgid;
101778 goto change_okay;
101779 }
101780 }
101781
101782+error:
101783 abort_creds(new);
101784 return old_fsgid;
101785
101786@@ -1185,19 +1240,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
101787 return -EFAULT;
101788
101789 down_read(&uts_sem);
101790- error = __copy_to_user(&name->sysname, &utsname()->sysname,
101791+ error = __copy_to_user(name->sysname, &utsname()->sysname,
101792 __OLD_UTS_LEN);
101793 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
101794- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
101795+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
101796 __OLD_UTS_LEN);
101797 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
101798- error |= __copy_to_user(&name->release, &utsname()->release,
101799+ error |= __copy_to_user(name->release, &utsname()->release,
101800 __OLD_UTS_LEN);
101801 error |= __put_user(0, name->release + __OLD_UTS_LEN);
101802- error |= __copy_to_user(&name->version, &utsname()->version,
101803+ error |= __copy_to_user(name->version, &utsname()->version,
101804 __OLD_UTS_LEN);
101805 error |= __put_user(0, name->version + __OLD_UTS_LEN);
101806- error |= __copy_to_user(&name->machine, &utsname()->machine,
101807+ error |= __copy_to_user(name->machine, &utsname()->machine,
101808 __OLD_UTS_LEN);
101809 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
101810 up_read(&uts_sem);
101811@@ -1398,6 +1453,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
101812 */
101813 new_rlim->rlim_cur = 1;
101814 }
101815+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
101816+ is changed to a lower value. Since tasks can be created by the same
101817+ user in between this limit change and an execve by this task, force
101818+ a recheck only for this task by setting PF_NPROC_EXCEEDED
101819+ */
101820+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
101821+ tsk->flags |= PF_NPROC_EXCEEDED;
101822 }
101823 if (!retval) {
101824 if (old_rlim)
101825diff --git a/kernel/sysctl.c b/kernel/sysctl.c
101826index ce410bb..cd276f0 100644
101827--- a/kernel/sysctl.c
101828+++ b/kernel/sysctl.c
101829@@ -94,7 +94,6 @@
101830
101831
101832 #if defined(CONFIG_SYSCTL)
101833-
101834 /* External variables not in a header file. */
101835 extern int max_threads;
101836 extern int suid_dumpable;
101837@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
101838
101839 /* Constants used for minimum and maximum */
101840 #ifdef CONFIG_LOCKUP_DETECTOR
101841-static int sixty = 60;
101842+static int sixty __read_only = 60;
101843 #endif
101844
101845-static int __maybe_unused neg_one = -1;
101846+static int __maybe_unused neg_one __read_only = -1;
101847
101848-static int zero;
101849-static int __maybe_unused one = 1;
101850-static int __maybe_unused two = 2;
101851-static int __maybe_unused four = 4;
101852-static unsigned long one_ul = 1;
101853-static int one_hundred = 100;
101854+static int zero __read_only = 0;
101855+static int __maybe_unused one __read_only = 1;
101856+static int __maybe_unused two __read_only = 2;
101857+static int __maybe_unused three __read_only = 3;
101858+static int __maybe_unused four __read_only = 4;
101859+static unsigned long one_ul __read_only = 1;
101860+static int one_hundred __read_only = 100;
101861 #ifdef CONFIG_PRINTK
101862-static int ten_thousand = 10000;
101863+static int ten_thousand __read_only = 10000;
101864 #endif
101865
101866 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
101867@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
101868 void __user *buffer, size_t *lenp, loff_t *ppos);
101869 #endif
101870
101871-#ifdef CONFIG_PRINTK
101872 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
101873 void __user *buffer, size_t *lenp, loff_t *ppos);
101874-#endif
101875
101876 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
101877 void __user *buffer, size_t *lenp, loff_t *ppos);
101878@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
101879
101880 #endif
101881
101882+extern struct ctl_table grsecurity_table[];
101883+
101884 static struct ctl_table kern_table[];
101885 static struct ctl_table vm_table[];
101886 static struct ctl_table fs_table[];
101887@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
101888 int sysctl_legacy_va_layout;
101889 #endif
101890
101891+#ifdef CONFIG_PAX_SOFTMODE
101892+static struct ctl_table pax_table[] = {
101893+ {
101894+ .procname = "softmode",
101895+ .data = &pax_softmode,
101896+ .maxlen = sizeof(unsigned int),
101897+ .mode = 0600,
101898+ .proc_handler = &proc_dointvec,
101899+ },
101900+
101901+ { }
101902+};
101903+#endif
101904+
101905 /* The default sysctl tables: */
101906
101907 static struct ctl_table sysctl_base_table[] = {
101908@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
101909 #endif
101910
101911 static struct ctl_table kern_table[] = {
101912+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
101913+ {
101914+ .procname = "grsecurity",
101915+ .mode = 0500,
101916+ .child = grsecurity_table,
101917+ },
101918+#endif
101919+
101920+#ifdef CONFIG_PAX_SOFTMODE
101921+ {
101922+ .procname = "pax",
101923+ .mode = 0500,
101924+ .child = pax_table,
101925+ },
101926+#endif
101927+
101928 {
101929 .procname = "sched_child_runs_first",
101930 .data = &sysctl_sched_child_runs_first,
101931@@ -649,7 +679,7 @@ static struct ctl_table kern_table[] = {
101932 .data = &modprobe_path,
101933 .maxlen = KMOD_PATH_LEN,
101934 .mode = 0644,
101935- .proc_handler = proc_dostring,
101936+ .proc_handler = proc_dostring_modpriv,
101937 },
101938 {
101939 .procname = "modules_disabled",
101940@@ -816,16 +846,20 @@ static struct ctl_table kern_table[] = {
101941 .extra1 = &zero,
101942 .extra2 = &one,
101943 },
101944+#endif
101945 {
101946 .procname = "kptr_restrict",
101947 .data = &kptr_restrict,
101948 .maxlen = sizeof(int),
101949 .mode = 0644,
101950 .proc_handler = proc_dointvec_minmax_sysadmin,
101951+#ifdef CONFIG_GRKERNSEC_HIDESYM
101952+ .extra1 = &two,
101953+#else
101954 .extra1 = &zero,
101955+#endif
101956 .extra2 = &two,
101957 },
101958-#endif
101959 {
101960 .procname = "ngroups_max",
101961 .data = &ngroups_max,
101962@@ -1072,10 +1106,17 @@ static struct ctl_table kern_table[] = {
101963 */
101964 {
101965 .procname = "perf_event_paranoid",
101966- .data = &sysctl_perf_event_paranoid,
101967- .maxlen = sizeof(sysctl_perf_event_paranoid),
101968+ .data = &sysctl_perf_event_legitimately_concerned,
101969+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
101970 .mode = 0644,
101971- .proc_handler = proc_dointvec,
101972+ /* go ahead, be a hero */
101973+ .proc_handler = proc_dointvec_minmax_sysadmin,
101974+ .extra1 = &neg_one,
101975+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
101976+ .extra2 = &three,
101977+#else
101978+ .extra2 = &two,
101979+#endif
101980 },
101981 {
101982 .procname = "perf_event_mlock_kb",
101983@@ -1348,6 +1389,13 @@ static struct ctl_table vm_table[] = {
101984 .proc_handler = proc_dointvec_minmax,
101985 .extra1 = &zero,
101986 },
101987+ {
101988+ .procname = "heap_stack_gap",
101989+ .data = &sysctl_heap_stack_gap,
101990+ .maxlen = sizeof(sysctl_heap_stack_gap),
101991+ .mode = 0644,
101992+ .proc_handler = proc_doulongvec_minmax,
101993+ },
101994 #else
101995 {
101996 .procname = "nr_trim_pages",
101997@@ -1830,6 +1878,16 @@ int proc_dostring(struct ctl_table *table, int write,
101998 (char __user *)buffer, lenp, ppos);
101999 }
102000
102001+int proc_dostring_modpriv(struct ctl_table *table, int write,
102002+ void __user *buffer, size_t *lenp, loff_t *ppos)
102003+{
102004+ if (write && !capable(CAP_SYS_MODULE))
102005+ return -EPERM;
102006+
102007+ return _proc_do_string(table->data, table->maxlen, write,
102008+ buffer, lenp, ppos);
102009+}
102010+
102011 static size_t proc_skip_spaces(char **buf)
102012 {
102013 size_t ret;
102014@@ -1935,6 +1993,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
102015 len = strlen(tmp);
102016 if (len > *size)
102017 len = *size;
102018+ if (len > sizeof(tmp))
102019+ len = sizeof(tmp);
102020 if (copy_to_user(*buf, tmp, len))
102021 return -EFAULT;
102022 *size -= len;
102023@@ -2112,7 +2172,7 @@ int proc_dointvec(struct ctl_table *table, int write,
102024 static int proc_taint(struct ctl_table *table, int write,
102025 void __user *buffer, size_t *lenp, loff_t *ppos)
102026 {
102027- struct ctl_table t;
102028+ ctl_table_no_const t;
102029 unsigned long tmptaint = get_taint();
102030 int err;
102031
102032@@ -2140,7 +2200,6 @@ static int proc_taint(struct ctl_table *table, int write,
102033 return err;
102034 }
102035
102036-#ifdef CONFIG_PRINTK
102037 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102038 void __user *buffer, size_t *lenp, loff_t *ppos)
102039 {
102040@@ -2149,7 +2208,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102041
102042 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
102043 }
102044-#endif
102045
102046 struct do_proc_dointvec_minmax_conv_param {
102047 int *min;
102048@@ -2709,6 +2767,12 @@ int proc_dostring(struct ctl_table *table, int write,
102049 return -ENOSYS;
102050 }
102051
102052+int proc_dostring_modpriv(struct ctl_table *table, int write,
102053+ void __user *buffer, size_t *lenp, loff_t *ppos)
102054+{
102055+ return -ENOSYS;
102056+}
102057+
102058 int proc_dointvec(struct ctl_table *table, int write,
102059 void __user *buffer, size_t *lenp, loff_t *ppos)
102060 {
102061@@ -2765,5 +2829,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
102062 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
102063 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
102064 EXPORT_SYMBOL(proc_dostring);
102065+EXPORT_SYMBOL(proc_dostring_modpriv);
102066 EXPORT_SYMBOL(proc_doulongvec_minmax);
102067 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
102068diff --git a/kernel/taskstats.c b/kernel/taskstats.c
102069index 21f82c2..c1984e5 100644
102070--- a/kernel/taskstats.c
102071+++ b/kernel/taskstats.c
102072@@ -28,9 +28,12 @@
102073 #include <linux/fs.h>
102074 #include <linux/file.h>
102075 #include <linux/pid_namespace.h>
102076+#include <linux/grsecurity.h>
102077 #include <net/genetlink.h>
102078 #include <linux/atomic.h>
102079
102080+extern int gr_is_taskstats_denied(int pid);
102081+
102082 /*
102083 * Maximum length of a cpumask that can be specified in
102084 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
102085@@ -567,6 +570,9 @@ err:
102086
102087 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
102088 {
102089+ if (gr_is_taskstats_denied(current->pid))
102090+ return -EACCES;
102091+
102092 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
102093 return cmd_attr_register_cpumask(info);
102094 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
102095diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
102096index 1b001ed..55ef9e4 100644
102097--- a/kernel/time/alarmtimer.c
102098+++ b/kernel/time/alarmtimer.c
102099@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
102100 struct platform_device *pdev;
102101 int error = 0;
102102 int i;
102103- struct k_clock alarm_clock = {
102104+ static struct k_clock alarm_clock = {
102105 .clock_getres = alarm_clock_getres,
102106 .clock_get = alarm_clock_get,
102107 .timer_create = alarm_timer_create,
102108diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
102109index 38f586c..14386a7 100644
102110--- a/kernel/time/hrtimer.c
102111+++ b/kernel/time/hrtimer.c
102112@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
102113 local_irq_restore(flags);
102114 }
102115
102116-static void run_hrtimer_softirq(struct softirq_action *h)
102117+static __latent_entropy void run_hrtimer_softirq(void)
102118 {
102119 hrtimer_peek_ahead_timers();
102120 }
102121diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
102122index 0075da7..63cc872 100644
102123--- a/kernel/time/posix-cpu-timers.c
102124+++ b/kernel/time/posix-cpu-timers.c
102125@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
102126
102127 static __init int init_posix_cpu_timers(void)
102128 {
102129- struct k_clock process = {
102130+ static struct k_clock process = {
102131 .clock_getres = process_cpu_clock_getres,
102132 .clock_get = process_cpu_clock_get,
102133 .timer_create = process_cpu_timer_create,
102134 .nsleep = process_cpu_nsleep,
102135 .nsleep_restart = process_cpu_nsleep_restart,
102136 };
102137- struct k_clock thread = {
102138+ static struct k_clock thread = {
102139 .clock_getres = thread_cpu_clock_getres,
102140 .clock_get = thread_cpu_clock_get,
102141 .timer_create = thread_cpu_timer_create,
102142diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
102143index 31ea01f..7fc61ef 100644
102144--- a/kernel/time/posix-timers.c
102145+++ b/kernel/time/posix-timers.c
102146@@ -43,6 +43,7 @@
102147 #include <linux/hash.h>
102148 #include <linux/posix-clock.h>
102149 #include <linux/posix-timers.h>
102150+#include <linux/grsecurity.h>
102151 #include <linux/syscalls.h>
102152 #include <linux/wait.h>
102153 #include <linux/workqueue.h>
102154@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
102155 * which we beg off on and pass to do_sys_settimeofday().
102156 */
102157
102158-static struct k_clock posix_clocks[MAX_CLOCKS];
102159+static struct k_clock *posix_clocks[MAX_CLOCKS];
102160
102161 /*
102162 * These ones are defined below.
102163@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
102164 */
102165 static __init int init_posix_timers(void)
102166 {
102167- struct k_clock clock_realtime = {
102168+ static struct k_clock clock_realtime = {
102169 .clock_getres = hrtimer_get_res,
102170 .clock_get = posix_clock_realtime_get,
102171 .clock_set = posix_clock_realtime_set,
102172@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
102173 .timer_get = common_timer_get,
102174 .timer_del = common_timer_del,
102175 };
102176- struct k_clock clock_monotonic = {
102177+ static struct k_clock clock_monotonic = {
102178 .clock_getres = hrtimer_get_res,
102179 .clock_get = posix_ktime_get_ts,
102180 .nsleep = common_nsleep,
102181@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
102182 .timer_get = common_timer_get,
102183 .timer_del = common_timer_del,
102184 };
102185- struct k_clock clock_monotonic_raw = {
102186+ static struct k_clock clock_monotonic_raw = {
102187 .clock_getres = hrtimer_get_res,
102188 .clock_get = posix_get_monotonic_raw,
102189 };
102190- struct k_clock clock_realtime_coarse = {
102191+ static struct k_clock clock_realtime_coarse = {
102192 .clock_getres = posix_get_coarse_res,
102193 .clock_get = posix_get_realtime_coarse,
102194 };
102195- struct k_clock clock_monotonic_coarse = {
102196+ static struct k_clock clock_monotonic_coarse = {
102197 .clock_getres = posix_get_coarse_res,
102198 .clock_get = posix_get_monotonic_coarse,
102199 };
102200- struct k_clock clock_tai = {
102201+ static struct k_clock clock_tai = {
102202 .clock_getres = hrtimer_get_res,
102203 .clock_get = posix_get_tai,
102204 .nsleep = common_nsleep,
102205@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
102206 .timer_get = common_timer_get,
102207 .timer_del = common_timer_del,
102208 };
102209- struct k_clock clock_boottime = {
102210+ static struct k_clock clock_boottime = {
102211 .clock_getres = hrtimer_get_res,
102212 .clock_get = posix_get_boottime,
102213 .nsleep = common_nsleep,
102214@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
102215 return;
102216 }
102217
102218- posix_clocks[clock_id] = *new_clock;
102219+ posix_clocks[clock_id] = new_clock;
102220 }
102221 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
102222
102223@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
102224 return (id & CLOCKFD_MASK) == CLOCKFD ?
102225 &clock_posix_dynamic : &clock_posix_cpu;
102226
102227- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
102228+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
102229 return NULL;
102230- return &posix_clocks[id];
102231+ return posix_clocks[id];
102232 }
102233
102234 static int common_timer_create(struct k_itimer *new_timer)
102235@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
102236 struct k_clock *kc = clockid_to_kclock(which_clock);
102237 struct k_itimer *new_timer;
102238 int error, new_timer_id;
102239- sigevent_t event;
102240+ sigevent_t event = { };
102241 int it_id_set = IT_ID_NOT_SET;
102242
102243 if (!kc)
102244@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
102245 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
102246 return -EFAULT;
102247
102248+ /* only the CLOCK_REALTIME clock can be set, all other clocks
102249+ have their clock_set fptr set to a nosettime dummy function
102250+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
102251+ call common_clock_set, which calls do_sys_settimeofday, which
102252+ we hook
102253+ */
102254+
102255 return kc->clock_set(which_clock, &new_tp);
102256 }
102257
102258diff --git a/kernel/time/time.c b/kernel/time/time.c
102259index 2c85b77..6530536 100644
102260--- a/kernel/time/time.c
102261+++ b/kernel/time/time.c
102262@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
102263 return error;
102264
102265 if (tz) {
102266+ /* we log in do_settimeofday called below, so don't log twice
102267+ */
102268+ if (!tv)
102269+ gr_log_timechange();
102270+
102271 sys_tz = *tz;
102272 update_vsyscall_tz();
102273 if (firsttime) {
102274diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
102275index 91db941..a371671 100644
102276--- a/kernel/time/timekeeping.c
102277+++ b/kernel/time/timekeeping.c
102278@@ -15,6 +15,7 @@
102279 #include <linux/init.h>
102280 #include <linux/mm.h>
102281 #include <linux/sched.h>
102282+#include <linux/grsecurity.h>
102283 #include <linux/syscore_ops.h>
102284 #include <linux/clocksource.h>
102285 #include <linux/jiffies.h>
102286@@ -802,6 +803,8 @@ int do_settimeofday64(const struct timespec64 *ts)
102287 if (!timespec64_valid_strict(ts))
102288 return -EINVAL;
102289
102290+ gr_log_timechange();
102291+
102292 raw_spin_lock_irqsave(&timekeeper_lock, flags);
102293 write_seqcount_begin(&tk_core.seq);
102294
102295diff --git a/kernel/time/timer.c b/kernel/time/timer.c
102296index 2d3f5c5..7ed7dc5 100644
102297--- a/kernel/time/timer.c
102298+++ b/kernel/time/timer.c
102299@@ -1393,7 +1393,7 @@ void update_process_times(int user_tick)
102300 /*
102301 * This function runs timers and the timer-tq in bottom half context.
102302 */
102303-static void run_timer_softirq(struct softirq_action *h)
102304+static __latent_entropy void run_timer_softirq(void)
102305 {
102306 struct tvec_base *base = __this_cpu_read(tvec_bases);
102307
102308@@ -1456,7 +1456,7 @@ static void process_timeout(unsigned long __data)
102309 *
102310 * In all cases the return value is guaranteed to be non-negative.
102311 */
102312-signed long __sched schedule_timeout(signed long timeout)
102313+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
102314 {
102315 struct timer_list timer;
102316 unsigned long expire;
102317diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
102318index 61ed862..3b52c65 100644
102319--- a/kernel/time/timer_list.c
102320+++ b/kernel/time/timer_list.c
102321@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
102322
102323 static void print_name_offset(struct seq_file *m, void *sym)
102324 {
102325+#ifdef CONFIG_GRKERNSEC_HIDESYM
102326+ SEQ_printf(m, "<%p>", NULL);
102327+#else
102328 char symname[KSYM_NAME_LEN];
102329
102330 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
102331 SEQ_printf(m, "<%pK>", sym);
102332 else
102333 SEQ_printf(m, "%s", symname);
102334+#endif
102335 }
102336
102337 static void
102338@@ -119,7 +123,11 @@ next_one:
102339 static void
102340 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
102341 {
102342+#ifdef CONFIG_GRKERNSEC_HIDESYM
102343+ SEQ_printf(m, " .base: %p\n", NULL);
102344+#else
102345 SEQ_printf(m, " .base: %pK\n", base);
102346+#endif
102347 SEQ_printf(m, " .index: %d\n",
102348 base->index);
102349 SEQ_printf(m, " .resolution: %Lu nsecs\n",
102350@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
102351 {
102352 struct proc_dir_entry *pe;
102353
102354+#ifdef CONFIG_GRKERNSEC_PROC_ADD
102355+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
102356+#else
102357 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
102358+#endif
102359 if (!pe)
102360 return -ENOMEM;
102361 return 0;
102362diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
102363index 1fb08f2..ca4bb1e 100644
102364--- a/kernel/time/timer_stats.c
102365+++ b/kernel/time/timer_stats.c
102366@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
102367 static unsigned long nr_entries;
102368 static struct entry entries[MAX_ENTRIES];
102369
102370-static atomic_t overflow_count;
102371+static atomic_unchecked_t overflow_count;
102372
102373 /*
102374 * The entries are in a hash-table, for fast lookup:
102375@@ -140,7 +140,7 @@ static void reset_entries(void)
102376 nr_entries = 0;
102377 memset(entries, 0, sizeof(entries));
102378 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
102379- atomic_set(&overflow_count, 0);
102380+ atomic_set_unchecked(&overflow_count, 0);
102381 }
102382
102383 static struct entry *alloc_entry(void)
102384@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
102385 if (likely(entry))
102386 entry->count++;
102387 else
102388- atomic_inc(&overflow_count);
102389+ atomic_inc_unchecked(&overflow_count);
102390
102391 out_unlock:
102392 raw_spin_unlock_irqrestore(lock, flags);
102393@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
102394
102395 static void print_name_offset(struct seq_file *m, unsigned long addr)
102396 {
102397+#ifdef CONFIG_GRKERNSEC_HIDESYM
102398+ seq_printf(m, "<%p>", NULL);
102399+#else
102400 char symname[KSYM_NAME_LEN];
102401
102402 if (lookup_symbol_name(addr, symname) < 0)
102403- seq_printf(m, "<%p>", (void *)addr);
102404+ seq_printf(m, "<%pK>", (void *)addr);
102405 else
102406 seq_printf(m, "%s", symname);
102407+#endif
102408 }
102409
102410 static int tstats_show(struct seq_file *m, void *v)
102411@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
102412
102413 seq_puts(m, "Timer Stats Version: v0.3\n");
102414 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
102415- if (atomic_read(&overflow_count))
102416- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
102417+ if (atomic_read_unchecked(&overflow_count))
102418+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
102419 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
102420
102421 for (i = 0; i < nr_entries; i++) {
102422@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
102423 {
102424 struct proc_dir_entry *pe;
102425
102426+#ifdef CONFIG_GRKERNSEC_PROC_ADD
102427+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
102428+#else
102429 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
102430+#endif
102431 if (!pe)
102432 return -ENOMEM;
102433 return 0;
102434diff --git a/kernel/torture.c b/kernel/torture.c
102435index dd70993..0bf694b 100644
102436--- a/kernel/torture.c
102437+++ b/kernel/torture.c
102438@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
102439 mutex_lock(&fullstop_mutex);
102440 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
102441 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
102442- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
102443+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
102444 } else {
102445 pr_warn("Concurrent rmmod and shutdown illegal!\n");
102446 }
102447@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
102448 if (!torture_must_stop()) {
102449 if (stutter > 1) {
102450 schedule_timeout_interruptible(stutter - 1);
102451- ACCESS_ONCE(stutter_pause_test) = 2;
102452+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
102453 }
102454 schedule_timeout_interruptible(1);
102455- ACCESS_ONCE(stutter_pause_test) = 1;
102456+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
102457 }
102458 if (!torture_must_stop())
102459 schedule_timeout_interruptible(stutter);
102460- ACCESS_ONCE(stutter_pause_test) = 0;
102461+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
102462 torture_shutdown_absorb("torture_stutter");
102463 } while (!torture_must_stop());
102464 torture_kthread_stopping("torture_stutter");
102465@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
102466 schedule_timeout_uninterruptible(10);
102467 return true;
102468 }
102469- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
102470+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
102471 mutex_unlock(&fullstop_mutex);
102472 torture_shutdown_cleanup();
102473 torture_shuffle_cleanup();
102474diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
102475index 483cecf..ac46091 100644
102476--- a/kernel/trace/blktrace.c
102477+++ b/kernel/trace/blktrace.c
102478@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
102479 struct blk_trace *bt = filp->private_data;
102480 char buf[16];
102481
102482- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
102483+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
102484
102485 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
102486 }
102487@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
102488 return 1;
102489
102490 bt = buf->chan->private_data;
102491- atomic_inc(&bt->dropped);
102492+ atomic_inc_unchecked(&bt->dropped);
102493 return 0;
102494 }
102495
102496@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
102497
102498 bt->dir = dir;
102499 bt->dev = dev;
102500- atomic_set(&bt->dropped, 0);
102501+ atomic_set_unchecked(&bt->dropped, 0);
102502 INIT_LIST_HEAD(&bt->running_list);
102503
102504 ret = -EIO;
102505diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
102506index 4f22802..bd268b1 100644
102507--- a/kernel/trace/ftrace.c
102508+++ b/kernel/trace/ftrace.c
102509@@ -2382,12 +2382,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
102510 if (unlikely(ftrace_disabled))
102511 return 0;
102512
102513+ ret = ftrace_arch_code_modify_prepare();
102514+ FTRACE_WARN_ON(ret);
102515+ if (ret)
102516+ return 0;
102517+
102518 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
102519+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
102520 if (ret) {
102521 ftrace_bug(ret, rec);
102522- return 0;
102523 }
102524- return 1;
102525+ return ret ? 0 : 1;
102526 }
102527
102528 /*
102529@@ -4776,8 +4781,10 @@ static int ftrace_process_locs(struct module *mod,
102530 if (!count)
102531 return 0;
102532
102533+ pax_open_kernel();
102534 sort(start, count, sizeof(*start),
102535 ftrace_cmp_ips, ftrace_swap_ips);
102536+ pax_close_kernel();
102537
102538 start_pg = ftrace_allocate_pages(count);
102539 if (!start_pg)
102540@@ -5653,7 +5660,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
102541
102542 if (t->ret_stack == NULL) {
102543 atomic_set(&t->tracing_graph_pause, 0);
102544- atomic_set(&t->trace_overrun, 0);
102545+ atomic_set_unchecked(&t->trace_overrun, 0);
102546 t->curr_ret_stack = -1;
102547 /* Make sure the tasks see the -1 first: */
102548 smp_wmb();
102549@@ -5876,7 +5883,7 @@ static void
102550 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
102551 {
102552 atomic_set(&t->tracing_graph_pause, 0);
102553- atomic_set(&t->trace_overrun, 0);
102554+ atomic_set_unchecked(&t->trace_overrun, 0);
102555 t->ftrace_timestamp = 0;
102556 /* make curr_ret_stack visible before we add the ret_stack */
102557 smp_wmb();
102558diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
102559index 922048a..bb71a55 100644
102560--- a/kernel/trace/ring_buffer.c
102561+++ b/kernel/trace/ring_buffer.c
102562@@ -348,9 +348,9 @@ struct buffer_data_page {
102563 */
102564 struct buffer_page {
102565 struct list_head list; /* list of buffer pages */
102566- local_t write; /* index for next write */
102567+ local_unchecked_t write; /* index for next write */
102568 unsigned read; /* index for next read */
102569- local_t entries; /* entries on this page */
102570+ local_unchecked_t entries; /* entries on this page */
102571 unsigned long real_end; /* real end of data */
102572 struct buffer_data_page *page; /* Actual data page */
102573 };
102574@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
102575 unsigned long last_overrun;
102576 local_t entries_bytes;
102577 local_t entries;
102578- local_t overrun;
102579- local_t commit_overrun;
102580- local_t dropped_events;
102581+ local_unchecked_t overrun;
102582+ local_unchecked_t commit_overrun;
102583+ local_unchecked_t dropped_events;
102584 local_t committing;
102585- local_t commits;
102586+ local_unchecked_t commits;
102587 unsigned long read;
102588 unsigned long read_bytes;
102589 u64 write_stamp;
102590@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
102591 *
102592 * We add a counter to the write field to denote this.
102593 */
102594- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
102595- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
102596+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
102597+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
102598
102599 /*
102600 * Just make sure we have seen our old_write and synchronize
102601@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
102602 * cmpxchg to only update if an interrupt did not already
102603 * do it for us. If the cmpxchg fails, we don't care.
102604 */
102605- (void)local_cmpxchg(&next_page->write, old_write, val);
102606- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
102607+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
102608+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
102609
102610 /*
102611 * No need to worry about races with clearing out the commit.
102612@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
102613
102614 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
102615 {
102616- return local_read(&bpage->entries) & RB_WRITE_MASK;
102617+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
102618 }
102619
102620 static inline unsigned long rb_page_write(struct buffer_page *bpage)
102621 {
102622- return local_read(&bpage->write) & RB_WRITE_MASK;
102623+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
102624 }
102625
102626 static int
102627@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
102628 * bytes consumed in ring buffer from here.
102629 * Increment overrun to account for the lost events.
102630 */
102631- local_add(page_entries, &cpu_buffer->overrun);
102632+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
102633 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
102634 }
102635
102636@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
102637 * it is our responsibility to update
102638 * the counters.
102639 */
102640- local_add(entries, &cpu_buffer->overrun);
102641+ local_add_unchecked(entries, &cpu_buffer->overrun);
102642 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
102643
102644 /*
102645@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102646 if (tail == BUF_PAGE_SIZE)
102647 tail_page->real_end = 0;
102648
102649- local_sub(length, &tail_page->write);
102650+ local_sub_unchecked(length, &tail_page->write);
102651 return;
102652 }
102653
102654@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102655 rb_event_set_padding(event);
102656
102657 /* Set the write back to the previous setting */
102658- local_sub(length, &tail_page->write);
102659+ local_sub_unchecked(length, &tail_page->write);
102660 return;
102661 }
102662
102663@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102664
102665 /* Set write to end of buffer */
102666 length = (tail + length) - BUF_PAGE_SIZE;
102667- local_sub(length, &tail_page->write);
102668+ local_sub_unchecked(length, &tail_page->write);
102669 }
102670
102671 /*
102672@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102673 * about it.
102674 */
102675 if (unlikely(next_page == commit_page)) {
102676- local_inc(&cpu_buffer->commit_overrun);
102677+ local_inc_unchecked(&cpu_buffer->commit_overrun);
102678 goto out_reset;
102679 }
102680
102681@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102682 * this is easy, just stop here.
102683 */
102684 if (!(buffer->flags & RB_FL_OVERWRITE)) {
102685- local_inc(&cpu_buffer->dropped_events);
102686+ local_inc_unchecked(&cpu_buffer->dropped_events);
102687 goto out_reset;
102688 }
102689
102690@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102691 cpu_buffer->tail_page) &&
102692 (cpu_buffer->commit_page ==
102693 cpu_buffer->reader_page))) {
102694- local_inc(&cpu_buffer->commit_overrun);
102695+ local_inc_unchecked(&cpu_buffer->commit_overrun);
102696 goto out_reset;
102697 }
102698 }
102699@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
102700 length += RB_LEN_TIME_EXTEND;
102701
102702 tail_page = cpu_buffer->tail_page;
102703- write = local_add_return(length, &tail_page->write);
102704+ write = local_add_return_unchecked(length, &tail_page->write);
102705
102706 /* set write to only the index of the write */
102707 write &= RB_WRITE_MASK;
102708@@ -2456,7 +2456,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
102709 kmemcheck_annotate_bitfield(event, bitfield);
102710 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
102711
102712- local_inc(&tail_page->entries);
102713+ local_inc_unchecked(&tail_page->entries);
102714
102715 /*
102716 * If this is the first commit on the page, then update
102717@@ -2489,7 +2489,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102718
102719 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
102720 unsigned long write_mask =
102721- local_read(&bpage->write) & ~RB_WRITE_MASK;
102722+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
102723 unsigned long event_length = rb_event_length(event);
102724 /*
102725 * This is on the tail page. It is possible that
102726@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102727 */
102728 old_index += write_mask;
102729 new_index += write_mask;
102730- index = local_cmpxchg(&bpage->write, old_index, new_index);
102731+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
102732 if (index == old_index) {
102733 /* update counters */
102734 local_sub(event_length, &cpu_buffer->entries_bytes);
102735@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102736 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
102737 {
102738 local_inc(&cpu_buffer->committing);
102739- local_inc(&cpu_buffer->commits);
102740+ local_inc_unchecked(&cpu_buffer->commits);
102741 }
102742
102743 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102744@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102745 return;
102746
102747 again:
102748- commits = local_read(&cpu_buffer->commits);
102749+ commits = local_read_unchecked(&cpu_buffer->commits);
102750 /* synchronize with interrupts */
102751 barrier();
102752 if (local_read(&cpu_buffer->committing) == 1)
102753@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102754 * updating of the commit page and the clearing of the
102755 * committing counter.
102756 */
102757- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
102758+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
102759 !local_read(&cpu_buffer->committing)) {
102760 local_inc(&cpu_buffer->committing);
102761 goto again;
102762@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
102763 barrier();
102764 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
102765 local_dec(&cpu_buffer->committing);
102766- local_dec(&cpu_buffer->commits);
102767+ local_dec_unchecked(&cpu_buffer->commits);
102768 return NULL;
102769 }
102770 #endif
102771@@ -2901,7 +2901,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
102772
102773 /* Do the likely case first */
102774 if (likely(bpage->page == (void *)addr)) {
102775- local_dec(&bpage->entries);
102776+ local_dec_unchecked(&bpage->entries);
102777 return;
102778 }
102779
102780@@ -2913,7 +2913,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
102781 start = bpage;
102782 do {
102783 if (bpage->page == (void *)addr) {
102784- local_dec(&bpage->entries);
102785+ local_dec_unchecked(&bpage->entries);
102786 return;
102787 }
102788 rb_inc_page(cpu_buffer, &bpage);
102789@@ -3197,7 +3197,7 @@ static inline unsigned long
102790 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
102791 {
102792 return local_read(&cpu_buffer->entries) -
102793- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
102794+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
102795 }
102796
102797 /**
102798@@ -3286,7 +3286,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
102799 return 0;
102800
102801 cpu_buffer = buffer->buffers[cpu];
102802- ret = local_read(&cpu_buffer->overrun);
102803+ ret = local_read_unchecked(&cpu_buffer->overrun);
102804
102805 return ret;
102806 }
102807@@ -3309,7 +3309,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
102808 return 0;
102809
102810 cpu_buffer = buffer->buffers[cpu];
102811- ret = local_read(&cpu_buffer->commit_overrun);
102812+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
102813
102814 return ret;
102815 }
102816@@ -3331,7 +3331,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
102817 return 0;
102818
102819 cpu_buffer = buffer->buffers[cpu];
102820- ret = local_read(&cpu_buffer->dropped_events);
102821+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
102822
102823 return ret;
102824 }
102825@@ -3394,7 +3394,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
102826 /* if you care about this being correct, lock the buffer */
102827 for_each_buffer_cpu(buffer, cpu) {
102828 cpu_buffer = buffer->buffers[cpu];
102829- overruns += local_read(&cpu_buffer->overrun);
102830+ overruns += local_read_unchecked(&cpu_buffer->overrun);
102831 }
102832
102833 return overruns;
102834@@ -3565,8 +3565,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
102835 /*
102836 * Reset the reader page to size zero.
102837 */
102838- local_set(&cpu_buffer->reader_page->write, 0);
102839- local_set(&cpu_buffer->reader_page->entries, 0);
102840+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
102841+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
102842 local_set(&cpu_buffer->reader_page->page->commit, 0);
102843 cpu_buffer->reader_page->real_end = 0;
102844
102845@@ -3600,7 +3600,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
102846 * want to compare with the last_overrun.
102847 */
102848 smp_mb();
102849- overwrite = local_read(&(cpu_buffer->overrun));
102850+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
102851
102852 /*
102853 * Here's the tricky part.
102854@@ -4172,8 +4172,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
102855
102856 cpu_buffer->head_page
102857 = list_entry(cpu_buffer->pages, struct buffer_page, list);
102858- local_set(&cpu_buffer->head_page->write, 0);
102859- local_set(&cpu_buffer->head_page->entries, 0);
102860+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
102861+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
102862 local_set(&cpu_buffer->head_page->page->commit, 0);
102863
102864 cpu_buffer->head_page->read = 0;
102865@@ -4183,18 +4183,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
102866
102867 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
102868 INIT_LIST_HEAD(&cpu_buffer->new_pages);
102869- local_set(&cpu_buffer->reader_page->write, 0);
102870- local_set(&cpu_buffer->reader_page->entries, 0);
102871+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
102872+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
102873 local_set(&cpu_buffer->reader_page->page->commit, 0);
102874 cpu_buffer->reader_page->read = 0;
102875
102876 local_set(&cpu_buffer->entries_bytes, 0);
102877- local_set(&cpu_buffer->overrun, 0);
102878- local_set(&cpu_buffer->commit_overrun, 0);
102879- local_set(&cpu_buffer->dropped_events, 0);
102880+ local_set_unchecked(&cpu_buffer->overrun, 0);
102881+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
102882+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
102883 local_set(&cpu_buffer->entries, 0);
102884 local_set(&cpu_buffer->committing, 0);
102885- local_set(&cpu_buffer->commits, 0);
102886+ local_set_unchecked(&cpu_buffer->commits, 0);
102887 cpu_buffer->read = 0;
102888 cpu_buffer->read_bytes = 0;
102889
102890@@ -4595,8 +4595,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
102891 rb_init_page(bpage);
102892 bpage = reader->page;
102893 reader->page = *data_page;
102894- local_set(&reader->write, 0);
102895- local_set(&reader->entries, 0);
102896+ local_set_unchecked(&reader->write, 0);
102897+ local_set_unchecked(&reader->entries, 0);
102898 reader->read = 0;
102899 *data_page = bpage;
102900
102901diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
102902index 62c6506..5c25989 100644
102903--- a/kernel/trace/trace.c
102904+++ b/kernel/trace/trace.c
102905@@ -3500,7 +3500,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
102906 return 0;
102907 }
102908
102909-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
102910+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
102911 {
102912 /* do nothing if flag is already set */
102913 if (!!(trace_flags & mask) == !!enabled)
102914diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
102915index dd8205a..1aae87a 100644
102916--- a/kernel/trace/trace.h
102917+++ b/kernel/trace/trace.h
102918@@ -1271,7 +1271,7 @@ extern const char *__stop___tracepoint_str[];
102919 void trace_printk_init_buffers(void);
102920 void trace_printk_start_comm(void);
102921 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
102922-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
102923+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
102924
102925 /*
102926 * Normal trace_printk() and friends allocates special buffers
102927diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
102928index 57b67b1..66082a9 100644
102929--- a/kernel/trace/trace_clock.c
102930+++ b/kernel/trace/trace_clock.c
102931@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
102932 return now;
102933 }
102934
102935-static atomic64_t trace_counter;
102936+static atomic64_unchecked_t trace_counter;
102937
102938 /*
102939 * trace_clock_counter(): simply an atomic counter.
102940@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
102941 */
102942 u64 notrace trace_clock_counter(void)
102943 {
102944- return atomic64_add_return(1, &trace_counter);
102945+ return atomic64_inc_return_unchecked(&trace_counter);
102946 }
102947diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
102948index a9c10a3..1864f6b 100644
102949--- a/kernel/trace/trace_events.c
102950+++ b/kernel/trace/trace_events.c
102951@@ -1762,7 +1762,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
102952 return 0;
102953 }
102954
102955-struct ftrace_module_file_ops;
102956 static void __add_event_to_tracers(struct ftrace_event_call *call);
102957
102958 /* Add an additional event_call dynamically */
102959diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
102960index b6fce36..d9f11a3 100644
102961--- a/kernel/trace/trace_functions_graph.c
102962+++ b/kernel/trace/trace_functions_graph.c
102963@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
102964
102965 /* The return trace stack is full */
102966 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
102967- atomic_inc(&current->trace_overrun);
102968+ atomic_inc_unchecked(&current->trace_overrun);
102969 return -EBUSY;
102970 }
102971
102972@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
102973 *ret = current->ret_stack[index].ret;
102974 trace->func = current->ret_stack[index].func;
102975 trace->calltime = current->ret_stack[index].calltime;
102976- trace->overrun = atomic_read(&current->trace_overrun);
102977+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
102978 trace->depth = index;
102979 }
102980
102981diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
102982index 7a9ba62..2e0e4a1 100644
102983--- a/kernel/trace/trace_mmiotrace.c
102984+++ b/kernel/trace/trace_mmiotrace.c
102985@@ -24,7 +24,7 @@ struct header_iter {
102986 static struct trace_array *mmio_trace_array;
102987 static bool overrun_detected;
102988 static unsigned long prev_overruns;
102989-static atomic_t dropped_count;
102990+static atomic_unchecked_t dropped_count;
102991
102992 static void mmio_reset_data(struct trace_array *tr)
102993 {
102994@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
102995
102996 static unsigned long count_overruns(struct trace_iterator *iter)
102997 {
102998- unsigned long cnt = atomic_xchg(&dropped_count, 0);
102999+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
103000 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
103001
103002 if (over > prev_overruns)
103003@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
103004 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
103005 sizeof(*entry), 0, pc);
103006 if (!event) {
103007- atomic_inc(&dropped_count);
103008+ atomic_inc_unchecked(&dropped_count);
103009 return;
103010 }
103011 entry = ring_buffer_event_data(event);
103012@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
103013 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
103014 sizeof(*entry), 0, pc);
103015 if (!event) {
103016- atomic_inc(&dropped_count);
103017+ atomic_inc_unchecked(&dropped_count);
103018 return;
103019 }
103020 entry = ring_buffer_event_data(event);
103021diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
103022index 692bf71..6d9a9cd 100644
103023--- a/kernel/trace/trace_output.c
103024+++ b/kernel/trace/trace_output.c
103025@@ -751,14 +751,16 @@ int register_ftrace_event(struct trace_event *event)
103026 goto out;
103027 }
103028
103029+ pax_open_kernel();
103030 if (event->funcs->trace == NULL)
103031- event->funcs->trace = trace_nop_print;
103032+ *(void **)&event->funcs->trace = trace_nop_print;
103033 if (event->funcs->raw == NULL)
103034- event->funcs->raw = trace_nop_print;
103035+ *(void **)&event->funcs->raw = trace_nop_print;
103036 if (event->funcs->hex == NULL)
103037- event->funcs->hex = trace_nop_print;
103038+ *(void **)&event->funcs->hex = trace_nop_print;
103039 if (event->funcs->binary == NULL)
103040- event->funcs->binary = trace_nop_print;
103041+ *(void **)&event->funcs->binary = trace_nop_print;
103042+ pax_close_kernel();
103043
103044 key = event->type & (EVENT_HASHSIZE - 1);
103045
103046diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
103047index e694c9f..6775a38 100644
103048--- a/kernel/trace/trace_seq.c
103049+++ b/kernel/trace/trace_seq.c
103050@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
103051 return 0;
103052 }
103053
103054- seq_buf_path(&s->seq, path, "\n");
103055+ seq_buf_path(&s->seq, path, "\n\\");
103056
103057 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
103058 s->seq.len = save_len;
103059diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
103060index c3e4fcf..ef6cc43 100644
103061--- a/kernel/trace/trace_stack.c
103062+++ b/kernel/trace/trace_stack.c
103063@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
103064 return;
103065
103066 /* we do not handle interrupt stacks yet */
103067- if (!object_is_on_stack(stack))
103068+ if (!object_starts_on_stack(stack))
103069 return;
103070
103071 local_irq_save(flags);
103072diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
103073index f97f6e3..d367b48 100644
103074--- a/kernel/trace/trace_syscalls.c
103075+++ b/kernel/trace/trace_syscalls.c
103076@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
103077 int num;
103078
103079 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103080+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103081+ return -EINVAL;
103082
103083 mutex_lock(&syscall_trace_lock);
103084 if (!sys_perf_refcount_enter)
103085@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
103086 int num;
103087
103088 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103089+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103090+ return;
103091
103092 mutex_lock(&syscall_trace_lock);
103093 sys_perf_refcount_enter--;
103094@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
103095 int num;
103096
103097 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103098+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103099+ return -EINVAL;
103100
103101 mutex_lock(&syscall_trace_lock);
103102 if (!sys_perf_refcount_exit)
103103@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
103104 int num;
103105
103106 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103107+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103108+ return;
103109
103110 mutex_lock(&syscall_trace_lock);
103111 sys_perf_refcount_exit--;
103112diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
103113index 4109f83..fe1f830 100644
103114--- a/kernel/user_namespace.c
103115+++ b/kernel/user_namespace.c
103116@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
103117 !kgid_has_mapping(parent_ns, group))
103118 return -EPERM;
103119
103120+#ifdef CONFIG_GRKERNSEC
103121+ /*
103122+ * This doesn't really inspire confidence:
103123+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
103124+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
103125+ * Increases kernel attack surface in areas developers
103126+ * previously cared little about ("low importance due
103127+ * to requiring "root" capability")
103128+ * To be removed when this code receives *proper* review
103129+ */
103130+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
103131+ !capable(CAP_SETGID))
103132+ return -EPERM;
103133+#endif
103134+
103135 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
103136 if (!ns)
103137 return -ENOMEM;
103138@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
103139 if (atomic_read(&current->mm->mm_users) > 1)
103140 return -EINVAL;
103141
103142- if (current->fs->users != 1)
103143+ if (atomic_read(&current->fs->users) != 1)
103144 return -EINVAL;
103145
103146 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
103147diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
103148index c8eac43..4b5f08f 100644
103149--- a/kernel/utsname_sysctl.c
103150+++ b/kernel/utsname_sysctl.c
103151@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
103152 static int proc_do_uts_string(struct ctl_table *table, int write,
103153 void __user *buffer, size_t *lenp, loff_t *ppos)
103154 {
103155- struct ctl_table uts_table;
103156+ ctl_table_no_const uts_table;
103157 int r;
103158 memcpy(&uts_table, table, sizeof(uts_table));
103159 uts_table.data = get_uts(table, write);
103160diff --git a/kernel/watchdog.c b/kernel/watchdog.c
103161index 3174bf8..3553520 100644
103162--- a/kernel/watchdog.c
103163+++ b/kernel/watchdog.c
103164@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
103165 static void watchdog_nmi_disable(unsigned int cpu) { return; }
103166 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
103167
103168-static struct smp_hotplug_thread watchdog_threads = {
103169+static struct smp_hotplug_thread watchdog_threads __read_only = {
103170 .store = &softlockup_watchdog,
103171 .thread_should_run = watchdog_should_run,
103172 .thread_fn = watchdog,
103173diff --git a/kernel/workqueue.c b/kernel/workqueue.c
103174index 41ff75b..5ad683a 100644
103175--- a/kernel/workqueue.c
103176+++ b/kernel/workqueue.c
103177@@ -4564,7 +4564,7 @@ static void rebind_workers(struct worker_pool *pool)
103178 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
103179 worker_flags |= WORKER_REBOUND;
103180 worker_flags &= ~WORKER_UNBOUND;
103181- ACCESS_ONCE(worker->flags) = worker_flags;
103182+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
103183 }
103184
103185 spin_unlock_irq(&pool->lock);
103186diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
103187index c5cefb3..a4241e3 100644
103188--- a/lib/Kconfig.debug
103189+++ b/lib/Kconfig.debug
103190@@ -923,7 +923,7 @@ config DEBUG_MUTEXES
103191
103192 config DEBUG_WW_MUTEX_SLOWPATH
103193 bool "Wait/wound mutex debugging: Slowpath testing"
103194- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103195+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103196 select DEBUG_LOCK_ALLOC
103197 select DEBUG_SPINLOCK
103198 select DEBUG_MUTEXES
103199@@ -940,7 +940,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
103200
103201 config DEBUG_LOCK_ALLOC
103202 bool "Lock debugging: detect incorrect freeing of live locks"
103203- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103204+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103205 select DEBUG_SPINLOCK
103206 select DEBUG_MUTEXES
103207 select LOCKDEP
103208@@ -954,7 +954,7 @@ config DEBUG_LOCK_ALLOC
103209
103210 config PROVE_LOCKING
103211 bool "Lock debugging: prove locking correctness"
103212- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103213+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103214 select LOCKDEP
103215 select DEBUG_SPINLOCK
103216 select DEBUG_MUTEXES
103217@@ -1005,7 +1005,7 @@ config LOCKDEP
103218
103219 config LOCK_STAT
103220 bool "Lock usage statistics"
103221- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103222+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103223 select LOCKDEP
103224 select DEBUG_SPINLOCK
103225 select DEBUG_MUTEXES
103226@@ -1467,6 +1467,7 @@ config LATENCYTOP
103227 depends on DEBUG_KERNEL
103228 depends on STACKTRACE_SUPPORT
103229 depends on PROC_FS
103230+ depends on !GRKERNSEC_HIDESYM
103231 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
103232 select KALLSYMS
103233 select KALLSYMS_ALL
103234@@ -1483,7 +1484,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
103235 config DEBUG_STRICT_USER_COPY_CHECKS
103236 bool "Strict user copy size checks"
103237 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
103238- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
103239+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
103240 help
103241 Enabling this option turns a certain set of sanity checks for user
103242 copy operations into compile time failures.
103243@@ -1614,7 +1615,7 @@ endmenu # runtime tests
103244
103245 config PROVIDE_OHCI1394_DMA_INIT
103246 bool "Remote debugging over FireWire early on boot"
103247- depends on PCI && X86
103248+ depends on PCI && X86 && !GRKERNSEC
103249 help
103250 If you want to debug problems which hang or crash the kernel early
103251 on boot and the crashing machine has a FireWire port, you can use
103252diff --git a/lib/Makefile b/lib/Makefile
103253index 58f74d2..08e011f 100644
103254--- a/lib/Makefile
103255+++ b/lib/Makefile
103256@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
103257 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
103258 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
103259 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
103260-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
103261+obj-y += list_debug.o
103262 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
103263
103264 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
103265diff --git a/lib/average.c b/lib/average.c
103266index 114d1be..ab0350c 100644
103267--- a/lib/average.c
103268+++ b/lib/average.c
103269@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
103270 {
103271 unsigned long internal = ACCESS_ONCE(avg->internal);
103272
103273- ACCESS_ONCE(avg->internal) = internal ?
103274+ ACCESS_ONCE_RW(avg->internal) = internal ?
103275 (((internal << avg->weight) - internal) +
103276 (val << avg->factor)) >> avg->weight :
103277 (val << avg->factor);
103278diff --git a/lib/bitmap.c b/lib/bitmap.c
103279index d456f4c1..29a0308 100644
103280--- a/lib/bitmap.c
103281+++ b/lib/bitmap.c
103282@@ -264,7 +264,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
103283 }
103284 EXPORT_SYMBOL(__bitmap_subset);
103285
103286-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
103287+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
103288 {
103289 unsigned int k, lim = bits/BITS_PER_LONG;
103290 int w = 0;
103291@@ -391,7 +391,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
103292 {
103293 int c, old_c, totaldigits, ndigits, nchunks, nbits;
103294 u32 chunk;
103295- const char __user __force *ubuf = (const char __user __force *)buf;
103296+ const char __user *ubuf = (const char __force_user *)buf;
103297
103298 bitmap_zero(maskp, nmaskbits);
103299
103300@@ -476,7 +476,7 @@ int bitmap_parse_user(const char __user *ubuf,
103301 {
103302 if (!access_ok(VERIFY_READ, ubuf, ulen))
103303 return -EFAULT;
103304- return __bitmap_parse((const char __force *)ubuf,
103305+ return __bitmap_parse((const char __force_kernel *)ubuf,
103306 ulen, 1, maskp, nmaskbits);
103307
103308 }
103309@@ -535,7 +535,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
103310 {
103311 unsigned a, b;
103312 int c, old_c, totaldigits;
103313- const char __user __force *ubuf = (const char __user __force *)buf;
103314+ const char __user *ubuf = (const char __force_user *)buf;
103315 int exp_digit, in_range;
103316
103317 totaldigits = c = 0;
103318@@ -630,7 +630,7 @@ int bitmap_parselist_user(const char __user *ubuf,
103319 {
103320 if (!access_ok(VERIFY_READ, ubuf, ulen))
103321 return -EFAULT;
103322- return __bitmap_parselist((const char __force *)ubuf,
103323+ return __bitmap_parselist((const char __force_kernel *)ubuf,
103324 ulen, 1, maskp, nmaskbits);
103325 }
103326 EXPORT_SYMBOL(bitmap_parselist_user);
103327diff --git a/lib/bug.c b/lib/bug.c
103328index 0c3bd95..5a615a1 100644
103329--- a/lib/bug.c
103330+++ b/lib/bug.c
103331@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
103332 return BUG_TRAP_TYPE_NONE;
103333
103334 bug = find_bug(bugaddr);
103335+ if (!bug)
103336+ return BUG_TRAP_TYPE_NONE;
103337
103338 file = NULL;
103339 line = 0;
103340diff --git a/lib/debugobjects.c b/lib/debugobjects.c
103341index 547f7f9..a6d4ba0 100644
103342--- a/lib/debugobjects.c
103343+++ b/lib/debugobjects.c
103344@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
103345 if (limit > 4)
103346 return;
103347
103348- is_on_stack = object_is_on_stack(addr);
103349+ is_on_stack = object_starts_on_stack(addr);
103350 if (is_on_stack == onstack)
103351 return;
103352
103353diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
103354index 6dd0335..1e9c239 100644
103355--- a/lib/decompress_bunzip2.c
103356+++ b/lib/decompress_bunzip2.c
103357@@ -665,7 +665,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
103358
103359 /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
103360 uncompressed data. Allocate intermediate buffer for block. */
103361- bd->dbufSize = 100000*(i-BZh0);
103362+ i -= BZh0;
103363+ bd->dbufSize = 100000 * i;
103364
103365 bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
103366 if (!bd->dbuf)
103367diff --git a/lib/div64.c b/lib/div64.c
103368index 4382ad7..08aa558 100644
103369--- a/lib/div64.c
103370+++ b/lib/div64.c
103371@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
103372 EXPORT_SYMBOL(__div64_32);
103373
103374 #ifndef div_s64_rem
103375-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
103376+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
103377 {
103378 u64 quotient;
103379
103380@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
103381 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
103382 */
103383 #ifndef div64_u64
103384-u64 div64_u64(u64 dividend, u64 divisor)
103385+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
103386 {
103387 u32 high = divisor >> 32;
103388 u64 quot;
103389diff --git a/lib/dma-debug.c b/lib/dma-debug.c
103390index 9722bd2..0d826f4 100644
103391--- a/lib/dma-debug.c
103392+++ b/lib/dma-debug.c
103393@@ -979,7 +979,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
103394
103395 void dma_debug_add_bus(struct bus_type *bus)
103396 {
103397- struct notifier_block *nb;
103398+ notifier_block_no_const *nb;
103399
103400 if (dma_debug_disabled())
103401 return;
103402@@ -1161,7 +1161,7 @@ static void check_unmap(struct dma_debug_entry *ref)
103403
103404 static void check_for_stack(struct device *dev, void *addr)
103405 {
103406- if (object_is_on_stack(addr))
103407+ if (object_starts_on_stack(addr))
103408 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
103409 "stack [addr=%p]\n", addr);
103410 }
103411diff --git a/lib/inflate.c b/lib/inflate.c
103412index 013a761..c28f3fc 100644
103413--- a/lib/inflate.c
103414+++ b/lib/inflate.c
103415@@ -269,7 +269,7 @@ static void free(void *where)
103416 malloc_ptr = free_mem_ptr;
103417 }
103418 #else
103419-#define malloc(a) kmalloc(a, GFP_KERNEL)
103420+#define malloc(a) kmalloc((a), GFP_KERNEL)
103421 #define free(a) kfree(a)
103422 #endif
103423
103424diff --git a/lib/ioremap.c b/lib/ioremap.c
103425index 0c9216c..863bd89 100644
103426--- a/lib/ioremap.c
103427+++ b/lib/ioremap.c
103428@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
103429 unsigned long next;
103430
103431 phys_addr -= addr;
103432- pmd = pmd_alloc(&init_mm, pud, addr);
103433+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
103434 if (!pmd)
103435 return -ENOMEM;
103436 do {
103437@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
103438 unsigned long next;
103439
103440 phys_addr -= addr;
103441- pud = pud_alloc(&init_mm, pgd, addr);
103442+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
103443 if (!pud)
103444 return -ENOMEM;
103445 do {
103446diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
103447index bd2bea9..6b3c95e 100644
103448--- a/lib/is_single_threaded.c
103449+++ b/lib/is_single_threaded.c
103450@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
103451 struct task_struct *p, *t;
103452 bool ret;
103453
103454+ if (!mm)
103455+ return true;
103456+
103457 if (atomic_read(&task->signal->live) != 1)
103458 return false;
103459
103460diff --git a/lib/kobject.c b/lib/kobject.c
103461index 03d4ab3..46f6374 100644
103462--- a/lib/kobject.c
103463+++ b/lib/kobject.c
103464@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
103465
103466
103467 static DEFINE_SPINLOCK(kobj_ns_type_lock);
103468-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
103469+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
103470
103471-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
103472+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
103473 {
103474 enum kobj_ns_type type = ops->type;
103475 int error;
103476diff --git a/lib/list_debug.c b/lib/list_debug.c
103477index c24c2f7..f0296f4 100644
103478--- a/lib/list_debug.c
103479+++ b/lib/list_debug.c
103480@@ -11,7 +11,9 @@
103481 #include <linux/bug.h>
103482 #include <linux/kernel.h>
103483 #include <linux/rculist.h>
103484+#include <linux/mm.h>
103485
103486+#ifdef CONFIG_DEBUG_LIST
103487 /*
103488 * Insert a new entry between two known consecutive entries.
103489 *
103490@@ -19,21 +21,40 @@
103491 * the prev/next entries already!
103492 */
103493
103494+static bool __list_add_debug(struct list_head *new,
103495+ struct list_head *prev,
103496+ struct list_head *next)
103497+{
103498+ if (unlikely(next->prev != prev)) {
103499+ printk(KERN_ERR "list_add corruption. next->prev should be "
103500+ "prev (%p), but was %p. (next=%p).\n",
103501+ prev, next->prev, next);
103502+ BUG();
103503+ return false;
103504+ }
103505+ if (unlikely(prev->next != next)) {
103506+ printk(KERN_ERR "list_add corruption. prev->next should be "
103507+ "next (%p), but was %p. (prev=%p).\n",
103508+ next, prev->next, prev);
103509+ BUG();
103510+ return false;
103511+ }
103512+ if (unlikely(new == prev || new == next)) {
103513+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
103514+ new, prev, next);
103515+ BUG();
103516+ return false;
103517+ }
103518+ return true;
103519+}
103520+
103521 void __list_add(struct list_head *new,
103522- struct list_head *prev,
103523- struct list_head *next)
103524+ struct list_head *prev,
103525+ struct list_head *next)
103526 {
103527- WARN(next->prev != prev,
103528- "list_add corruption. next->prev should be "
103529- "prev (%p), but was %p. (next=%p).\n",
103530- prev, next->prev, next);
103531- WARN(prev->next != next,
103532- "list_add corruption. prev->next should be "
103533- "next (%p), but was %p. (prev=%p).\n",
103534- next, prev->next, prev);
103535- WARN(new == prev || new == next,
103536- "list_add double add: new=%p, prev=%p, next=%p.\n",
103537- new, prev, next);
103538+ if (!__list_add_debug(new, prev, next))
103539+ return;
103540+
103541 next->prev = new;
103542 new->next = next;
103543 new->prev = prev;
103544@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
103545 }
103546 EXPORT_SYMBOL(__list_add);
103547
103548-void __list_del_entry(struct list_head *entry)
103549+static bool __list_del_entry_debug(struct list_head *entry)
103550 {
103551 struct list_head *prev, *next;
103552
103553 prev = entry->prev;
103554 next = entry->next;
103555
103556- if (WARN(next == LIST_POISON1,
103557- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
103558- entry, LIST_POISON1) ||
103559- WARN(prev == LIST_POISON2,
103560- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
103561- entry, LIST_POISON2) ||
103562- WARN(prev->next != entry,
103563- "list_del corruption. prev->next should be %p, "
103564- "but was %p\n", entry, prev->next) ||
103565- WARN(next->prev != entry,
103566- "list_del corruption. next->prev should be %p, "
103567- "but was %p\n", entry, next->prev))
103568+ if (unlikely(next == LIST_POISON1)) {
103569+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
103570+ entry, LIST_POISON1);
103571+ BUG();
103572+ return false;
103573+ }
103574+ if (unlikely(prev == LIST_POISON2)) {
103575+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
103576+ entry, LIST_POISON2);
103577+ BUG();
103578+ return false;
103579+ }
103580+ if (unlikely(entry->prev->next != entry)) {
103581+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
103582+ "but was %p\n", entry, prev->next);
103583+ BUG();
103584+ return false;
103585+ }
103586+ if (unlikely(entry->next->prev != entry)) {
103587+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
103588+ "but was %p\n", entry, next->prev);
103589+ BUG();
103590+ return false;
103591+ }
103592+ return true;
103593+}
103594+
103595+void __list_del_entry(struct list_head *entry)
103596+{
103597+ if (!__list_del_entry_debug(entry))
103598 return;
103599
103600- __list_del(prev, next);
103601+ __list_del(entry->prev, entry->next);
103602 }
103603 EXPORT_SYMBOL(__list_del_entry);
103604
103605@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
103606 void __list_add_rcu(struct list_head *new,
103607 struct list_head *prev, struct list_head *next)
103608 {
103609- WARN(next->prev != prev,
103610- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
103611- prev, next->prev, next);
103612- WARN(prev->next != next,
103613- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
103614- next, prev->next, prev);
103615+ if (!__list_add_debug(new, prev, next))
103616+ return;
103617+
103618 new->next = next;
103619 new->prev = prev;
103620 rcu_assign_pointer(list_next_rcu(prev), new);
103621 next->prev = new;
103622 }
103623 EXPORT_SYMBOL(__list_add_rcu);
103624+#endif
103625+
103626+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
103627+{
103628+#ifdef CONFIG_DEBUG_LIST
103629+ if (!__list_add_debug(new, prev, next))
103630+ return;
103631+#endif
103632+
103633+ pax_open_kernel();
103634+ next->prev = new;
103635+ new->next = next;
103636+ new->prev = prev;
103637+ prev->next = new;
103638+ pax_close_kernel();
103639+}
103640+EXPORT_SYMBOL(__pax_list_add);
103641+
103642+void pax_list_del(struct list_head *entry)
103643+{
103644+#ifdef CONFIG_DEBUG_LIST
103645+ if (!__list_del_entry_debug(entry))
103646+ return;
103647+#endif
103648+
103649+ pax_open_kernel();
103650+ __list_del(entry->prev, entry->next);
103651+ entry->next = LIST_POISON1;
103652+ entry->prev = LIST_POISON2;
103653+ pax_close_kernel();
103654+}
103655+EXPORT_SYMBOL(pax_list_del);
103656+
103657+void pax_list_del_init(struct list_head *entry)
103658+{
103659+ pax_open_kernel();
103660+ __list_del(entry->prev, entry->next);
103661+ INIT_LIST_HEAD(entry);
103662+ pax_close_kernel();
103663+}
103664+EXPORT_SYMBOL(pax_list_del_init);
103665+
103666+void __pax_list_add_rcu(struct list_head *new,
103667+ struct list_head *prev, struct list_head *next)
103668+{
103669+#ifdef CONFIG_DEBUG_LIST
103670+ if (!__list_add_debug(new, prev, next))
103671+ return;
103672+#endif
103673+
103674+ pax_open_kernel();
103675+ new->next = next;
103676+ new->prev = prev;
103677+ rcu_assign_pointer(list_next_rcu(prev), new);
103678+ next->prev = new;
103679+ pax_close_kernel();
103680+}
103681+EXPORT_SYMBOL(__pax_list_add_rcu);
103682+
103683+void pax_list_del_rcu(struct list_head *entry)
103684+{
103685+#ifdef CONFIG_DEBUG_LIST
103686+ if (!__list_del_entry_debug(entry))
103687+ return;
103688+#endif
103689+
103690+ pax_open_kernel();
103691+ __list_del(entry->prev, entry->next);
103692+ entry->next = LIST_POISON1;
103693+ entry->prev = LIST_POISON2;
103694+ pax_close_kernel();
103695+}
103696+EXPORT_SYMBOL(pax_list_del_rcu);
103697diff --git a/lib/lockref.c b/lib/lockref.c
103698index ecb9a66..a044fc5 100644
103699--- a/lib/lockref.c
103700+++ b/lib/lockref.c
103701@@ -48,13 +48,13 @@
103702 void lockref_get(struct lockref *lockref)
103703 {
103704 CMPXCHG_LOOP(
103705- new.count++;
103706+ __lockref_inc(&new);
103707 ,
103708 return;
103709 );
103710
103711 spin_lock(&lockref->lock);
103712- lockref->count++;
103713+ __lockref_inc(lockref);
103714 spin_unlock(&lockref->lock);
103715 }
103716 EXPORT_SYMBOL(lockref_get);
103717@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
103718 int retval;
103719
103720 CMPXCHG_LOOP(
103721- new.count++;
103722- if (old.count <= 0)
103723+ __lockref_inc(&new);
103724+ if (__lockref_read(&old) <= 0)
103725 return 0;
103726 ,
103727 return 1;
103728@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
103729
103730 spin_lock(&lockref->lock);
103731 retval = 0;
103732- if (lockref->count > 0) {
103733- lockref->count++;
103734+ if (__lockref_read(lockref) > 0) {
103735+ __lockref_inc(lockref);
103736 retval = 1;
103737 }
103738 spin_unlock(&lockref->lock);
103739@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
103740 int lockref_get_or_lock(struct lockref *lockref)
103741 {
103742 CMPXCHG_LOOP(
103743- new.count++;
103744- if (old.count <= 0)
103745+ __lockref_inc(&new);
103746+ if (__lockref_read(&old) <= 0)
103747 break;
103748 ,
103749 return 1;
103750 );
103751
103752 spin_lock(&lockref->lock);
103753- if (lockref->count <= 0)
103754+ if (__lockref_read(lockref) <= 0)
103755 return 0;
103756- lockref->count++;
103757+ __lockref_inc(lockref);
103758 spin_unlock(&lockref->lock);
103759 return 1;
103760 }
103761@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
103762 int lockref_put_return(struct lockref *lockref)
103763 {
103764 CMPXCHG_LOOP(
103765- new.count--;
103766- if (old.count <= 0)
103767+ __lockref_dec(&new);
103768+ if (__lockref_read(&old) <= 0)
103769 return -1;
103770 ,
103771- return new.count;
103772+ return __lockref_read(&new);
103773 );
103774 return -1;
103775 }
103776@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
103777 int lockref_put_or_lock(struct lockref *lockref)
103778 {
103779 CMPXCHG_LOOP(
103780- new.count--;
103781- if (old.count <= 1)
103782+ __lockref_dec(&new);
103783+ if (__lockref_read(&old) <= 1)
103784 break;
103785 ,
103786 return 1;
103787 );
103788
103789 spin_lock(&lockref->lock);
103790- if (lockref->count <= 1)
103791+ if (__lockref_read(lockref) <= 1)
103792 return 0;
103793- lockref->count--;
103794+ __lockref_dec(lockref);
103795 spin_unlock(&lockref->lock);
103796 return 1;
103797 }
103798@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
103799 void lockref_mark_dead(struct lockref *lockref)
103800 {
103801 assert_spin_locked(&lockref->lock);
103802- lockref->count = -128;
103803+ __lockref_set(lockref, -128);
103804 }
103805 EXPORT_SYMBOL(lockref_mark_dead);
103806
103807@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
103808 int retval;
103809
103810 CMPXCHG_LOOP(
103811- new.count++;
103812- if (old.count < 0)
103813+ __lockref_inc(&new);
103814+ if (__lockref_read(&old) < 0)
103815 return 0;
103816 ,
103817 return 1;
103818@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
103819
103820 spin_lock(&lockref->lock);
103821 retval = 0;
103822- if (lockref->count >= 0) {
103823- lockref->count++;
103824+ if (__lockref_read(lockref) >= 0) {
103825+ __lockref_inc(lockref);
103826 retval = 1;
103827 }
103828 spin_unlock(&lockref->lock);
103829diff --git a/lib/nlattr.c b/lib/nlattr.c
103830index f5907d2..36072be 100644
103831--- a/lib/nlattr.c
103832+++ b/lib/nlattr.c
103833@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
103834 {
103835 int minlen = min_t(int, count, nla_len(src));
103836
103837+ BUG_ON(minlen < 0);
103838+
103839 memcpy(dest, nla_data(src), minlen);
103840 if (count > minlen)
103841 memset(dest + minlen, 0, count - minlen);
103842diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
103843index 6111bcb..02e816b 100644
103844--- a/lib/percpu-refcount.c
103845+++ b/lib/percpu-refcount.c
103846@@ -31,7 +31,7 @@
103847 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
103848 */
103849
103850-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
103851+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
103852
103853 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
103854
103855diff --git a/lib/radix-tree.c b/lib/radix-tree.c
103856index 3d2aa27..a472f20 100644
103857--- a/lib/radix-tree.c
103858+++ b/lib/radix-tree.c
103859@@ -67,7 +67,7 @@ struct radix_tree_preload {
103860 int nr;
103861 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
103862 };
103863-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
103864+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
103865
103866 static inline void *ptr_to_indirect(void *ptr)
103867 {
103868diff --git a/lib/random32.c b/lib/random32.c
103869index 0bee183..526f12f 100644
103870--- a/lib/random32.c
103871+++ b/lib/random32.c
103872@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
103873 }
103874 #endif
103875
103876-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
103877+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
103878
103879 /**
103880 * prandom_u32_state - seeded pseudo-random number generator.
103881diff --git a/lib/rbtree.c b/lib/rbtree.c
103882index c16c81a..4dcbda1 100644
103883--- a/lib/rbtree.c
103884+++ b/lib/rbtree.c
103885@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
103886 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
103887
103888 static const struct rb_augment_callbacks dummy_callbacks = {
103889- dummy_propagate, dummy_copy, dummy_rotate
103890+ .propagate = dummy_propagate,
103891+ .copy = dummy_copy,
103892+ .rotate = dummy_rotate
103893 };
103894
103895 void rb_insert_color(struct rb_node *node, struct rb_root *root)
103896diff --git a/lib/show_mem.c b/lib/show_mem.c
103897index adc98e18..0ce83c2 100644
103898--- a/lib/show_mem.c
103899+++ b/lib/show_mem.c
103900@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
103901 quicklist_total_size());
103902 #endif
103903 #ifdef CONFIG_MEMORY_FAILURE
103904- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
103905+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
103906 #endif
103907 }
103908diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
103909index e0af6ff..fcc9f15 100644
103910--- a/lib/strncpy_from_user.c
103911+++ b/lib/strncpy_from_user.c
103912@@ -22,7 +22,7 @@
103913 */
103914 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
103915 {
103916- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
103917+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
103918 long res = 0;
103919
103920 /*
103921diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
103922index 1164961..02dccaa 100644
103923--- a/lib/strnlen_user.c
103924+++ b/lib/strnlen_user.c
103925@@ -26,7 +26,7 @@
103926 */
103927 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
103928 {
103929- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
103930+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
103931 long align, res = 0;
103932 unsigned long c;
103933
103934diff --git a/lib/swiotlb.c b/lib/swiotlb.c
103935index 4abda07..b9d3765 100644
103936--- a/lib/swiotlb.c
103937+++ b/lib/swiotlb.c
103938@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
103939
103940 void
103941 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
103942- dma_addr_t dev_addr)
103943+ dma_addr_t dev_addr, struct dma_attrs *attrs)
103944 {
103945 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
103946
103947diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
103948index daf29a39..56f44ac 100644
103949--- a/lib/test-hexdump.c
103950+++ b/lib/test-hexdump.c
103951@@ -18,26 +18,26 @@ static const unsigned char data_b[] = {
103952
103953 static const unsigned char data_a[] = ".2.{....p..$}.4...1.....L...C...";
103954
103955-static const char *test_data_1_le[] __initconst = {
103956+static const char * const test_data_1_le[] __initconst = {
103957 "be", "32", "db", "7b", "0a", "18", "93", "b2",
103958 "70", "ba", "c4", "24", "7d", "83", "34", "9b",
103959 "a6", "9c", "31", "ad", "9c", "0f", "ac", "e9",
103960 "4c", "d1", "19", "99", "43", "b1", "af", "0c",
103961 };
103962
103963-static const char *test_data_2_le[] __initconst = {
103964+static const char * const test_data_2_le[] __initconst = {
103965 "32be", "7bdb", "180a", "b293",
103966 "ba70", "24c4", "837d", "9b34",
103967 "9ca6", "ad31", "0f9c", "e9ac",
103968 "d14c", "9919", "b143", "0caf",
103969 };
103970
103971-static const char *test_data_4_le[] __initconst = {
103972+static const char * const test_data_4_le[] __initconst = {
103973 "7bdb32be", "b293180a", "24c4ba70", "9b34837d",
103974 "ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
103975 };
103976
103977-static const char *test_data_8_le[] __initconst = {
103978+static const char * const test_data_8_le[] __initconst = {
103979 "b293180a7bdb32be", "9b34837d24c4ba70",
103980 "e9ac0f9cad319ca6", "0cafb1439919d14c",
103981 };
103982diff --git a/lib/usercopy.c b/lib/usercopy.c
103983index 4f5b1dd..7cab418 100644
103984--- a/lib/usercopy.c
103985+++ b/lib/usercopy.c
103986@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
103987 WARN(1, "Buffer overflow detected!\n");
103988 }
103989 EXPORT_SYMBOL(copy_from_user_overflow);
103990+
103991+void copy_to_user_overflow(void)
103992+{
103993+ WARN(1, "Buffer overflow detected!\n");
103994+}
103995+EXPORT_SYMBOL(copy_to_user_overflow);
103996diff --git a/lib/vsprintf.c b/lib/vsprintf.c
103997index b235c96..343ffc1 100644
103998--- a/lib/vsprintf.c
103999+++ b/lib/vsprintf.c
104000@@ -16,6 +16,9 @@
104001 * - scnprintf and vscnprintf
104002 */
104003
104004+#ifdef CONFIG_GRKERNSEC_HIDESYM
104005+#define __INCLUDED_BY_HIDESYM 1
104006+#endif
104007 #include <stdarg.h>
104008 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
104009 #include <linux/types.h>
104010@@ -626,7 +629,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
104011 #ifdef CONFIG_KALLSYMS
104012 if (*fmt == 'B')
104013 sprint_backtrace(sym, value);
104014- else if (*fmt != 'f' && *fmt != 's')
104015+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
104016 sprint_symbol(sym, value);
104017 else
104018 sprint_symbol_no_offset(sym, value);
104019@@ -1322,7 +1325,11 @@ char *address_val(char *buf, char *end, const void *addr,
104020 return number(buf, end, num, spec);
104021 }
104022
104023+#ifdef CONFIG_GRKERNSEC_HIDESYM
104024+int kptr_restrict __read_mostly = 2;
104025+#else
104026 int kptr_restrict __read_mostly;
104027+#endif
104028
104029 /*
104030 * Show a '%p' thing. A kernel extension is that the '%p' is followed
104031@@ -1333,8 +1340,10 @@ int kptr_restrict __read_mostly;
104032 *
104033 * - 'F' For symbolic function descriptor pointers with offset
104034 * - 'f' For simple symbolic function names without offset
104035+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
104036 * - 'S' For symbolic direct pointers with offset
104037 * - 's' For symbolic direct pointers without offset
104038+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
104039 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
104040 * - 'B' For backtraced symbolic direct pointers with offset
104041 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
104042@@ -1417,12 +1426,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104043
104044 if (!ptr && *fmt != 'K') {
104045 /*
104046- * Print (null) with the same width as a pointer so it makes
104047+ * Print (nil) with the same width as a pointer so it makes
104048 * tabular output look nice.
104049 */
104050 if (spec.field_width == -1)
104051 spec.field_width = default_width;
104052- return string(buf, end, "(null)", spec);
104053+ return string(buf, end, "(nil)", spec);
104054 }
104055
104056 switch (*fmt) {
104057@@ -1432,6 +1441,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104058 /* Fallthrough */
104059 case 'S':
104060 case 's':
104061+#ifdef CONFIG_GRKERNSEC_HIDESYM
104062+ break;
104063+#else
104064+ return symbol_string(buf, end, ptr, spec, fmt);
104065+#endif
104066+ case 'X':
104067+ ptr = dereference_function_descriptor(ptr);
104068+ case 'A':
104069 case 'B':
104070 return symbol_string(buf, end, ptr, spec, fmt);
104071 case 'R':
104072@@ -1496,6 +1513,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104073 va_end(va);
104074 return buf;
104075 }
104076+ case 'P':
104077+ break;
104078 case 'K':
104079 /*
104080 * %pK cannot be used in IRQ context because its test
104081@@ -1553,6 +1572,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104082 ((const struct file *)ptr)->f_path.dentry,
104083 spec, fmt);
104084 }
104085+
104086+#ifdef CONFIG_GRKERNSEC_HIDESYM
104087+ /* 'P' = approved pointers to copy to userland,
104088+ as in the /proc/kallsyms case, as we make it display nothing
104089+ for non-root users, and the real contents for root users
104090+ 'X' = approved simple symbols
104091+ Also ignore 'K' pointers, since we force their NULLing for non-root users
104092+ above
104093+ */
104094+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
104095+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
104096+ dump_stack();
104097+ ptr = NULL;
104098+ }
104099+#endif
104100+
104101 spec.flags |= SMALL;
104102 if (spec.field_width == -1) {
104103 spec.field_width = default_width;
104104@@ -2254,11 +2289,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
104105 typeof(type) value; \
104106 if (sizeof(type) == 8) { \
104107 args = PTR_ALIGN(args, sizeof(u32)); \
104108- *(u32 *)&value = *(u32 *)args; \
104109- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
104110+ *(u32 *)&value = *(const u32 *)args; \
104111+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
104112 } else { \
104113 args = PTR_ALIGN(args, sizeof(type)); \
104114- value = *(typeof(type) *)args; \
104115+ value = *(const typeof(type) *)args; \
104116 } \
104117 args += sizeof(type); \
104118 value; \
104119@@ -2321,7 +2356,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
104120 case FORMAT_TYPE_STR: {
104121 const char *str_arg = args;
104122 args += strlen(str_arg) + 1;
104123- str = string(str, end, (char *)str_arg, spec);
104124+ str = string(str, end, str_arg, spec);
104125 break;
104126 }
104127
104128diff --git a/localversion-grsec b/localversion-grsec
104129new file mode 100644
104130index 0000000..7cd6065
104131--- /dev/null
104132+++ b/localversion-grsec
104133@@ -0,0 +1 @@
104134+-grsec
104135diff --git a/mm/Kconfig b/mm/Kconfig
104136index a03131b..1b1bafb 100644
104137--- a/mm/Kconfig
104138+++ b/mm/Kconfig
104139@@ -342,10 +342,11 @@ config KSM
104140 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
104141
104142 config DEFAULT_MMAP_MIN_ADDR
104143- int "Low address space to protect from user allocation"
104144+ int "Low address space to protect from user allocation"
104145 depends on MMU
104146- default 4096
104147- help
104148+ default 32768 if ALPHA || ARM || PARISC || SPARC32
104149+ default 65536
104150+ help
104151 This is the portion of low virtual memory which should be protected
104152 from userspace allocation. Keeping a user from writing to low pages
104153 can help reduce the impact of kernel NULL pointer bugs.
104154@@ -376,7 +377,7 @@ config MEMORY_FAILURE
104155
104156 config HWPOISON_INJECT
104157 tristate "HWPoison pages injector"
104158- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
104159+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
104160 select PROC_PAGE_MONITOR
104161
104162 config NOMMU_INITIAL_TRIM_EXCESS
104163diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
104164index 957d3da..1d34e20 100644
104165--- a/mm/Kconfig.debug
104166+++ b/mm/Kconfig.debug
104167@@ -10,6 +10,7 @@ config PAGE_EXTENSION
104168 config DEBUG_PAGEALLOC
104169 bool "Debug page memory allocations"
104170 depends on DEBUG_KERNEL
104171+ depends on !PAX_MEMORY_SANITIZE
104172 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
104173 depends on !KMEMCHECK
104174 select PAGE_EXTENSION
104175diff --git a/mm/backing-dev.c b/mm/backing-dev.c
104176index 6dc4580..e031ec1 100644
104177--- a/mm/backing-dev.c
104178+++ b/mm/backing-dev.c
104179@@ -12,7 +12,7 @@
104180 #include <linux/device.h>
104181 #include <trace/events/writeback.h>
104182
104183-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
104184+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
104185
104186 struct backing_dev_info noop_backing_dev_info = {
104187 .name = "noop",
104188@@ -474,7 +474,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
104189 return err;
104190
104191 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
104192- atomic_long_inc_return(&bdi_seq));
104193+ atomic_long_inc_return_unchecked(&bdi_seq));
104194 if (err) {
104195 bdi_destroy(bdi);
104196 return err;
104197diff --git a/mm/filemap.c b/mm/filemap.c
104198index ad72420..0a20ef2 100644
104199--- a/mm/filemap.c
104200+++ b/mm/filemap.c
104201@@ -2097,7 +2097,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
104202 struct address_space *mapping = file->f_mapping;
104203
104204 if (!mapping->a_ops->readpage)
104205- return -ENOEXEC;
104206+ return -ENODEV;
104207 file_accessed(file);
104208 vma->vm_ops = &generic_file_vm_ops;
104209 return 0;
104210@@ -2275,6 +2275,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
104211 *pos = i_size_read(inode);
104212
104213 if (limit != RLIM_INFINITY) {
104214+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
104215 if (*pos >= limit) {
104216 send_sig(SIGXFSZ, current, 0);
104217 return -EFBIG;
104218diff --git a/mm/gup.c b/mm/gup.c
104219index a6e24e2..72dd2cf 100644
104220--- a/mm/gup.c
104221+++ b/mm/gup.c
104222@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
104223 unsigned int fault_flags = 0;
104224 int ret;
104225
104226- /* For mlock, just skip the stack guard page. */
104227- if ((*flags & FOLL_MLOCK) &&
104228- (stack_guard_page_start(vma, address) ||
104229- stack_guard_page_end(vma, address + PAGE_SIZE)))
104230- return -ENOENT;
104231 if (*flags & FOLL_WRITE)
104232 fault_flags |= FAULT_FLAG_WRITE;
104233 if (nonblocking)
104234@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
104235 if (!(gup_flags & FOLL_FORCE))
104236 gup_flags |= FOLL_NUMA;
104237
104238- do {
104239+ while (nr_pages) {
104240 struct page *page;
104241 unsigned int foll_flags = gup_flags;
104242 unsigned int page_increm;
104243
104244 /* first iteration or cross vma bound */
104245 if (!vma || start >= vma->vm_end) {
104246- vma = find_extend_vma(mm, start);
104247+ vma = find_vma(mm, start);
104248 if (!vma && in_gate_area(mm, start)) {
104249 int ret;
104250 ret = get_gate_page(mm, start & PAGE_MASK,
104251@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
104252 goto next_page;
104253 }
104254
104255- if (!vma || check_vma_flags(vma, gup_flags))
104256+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
104257 return i ? : -EFAULT;
104258 if (is_vm_hugetlb_page(vma)) {
104259 i = follow_hugetlb_page(mm, vma, pages, vmas,
104260@@ -509,7 +504,7 @@ next_page:
104261 i += page_increm;
104262 start += page_increm * PAGE_SIZE;
104263 nr_pages -= page_increm;
104264- } while (nr_pages);
104265+ }
104266 return i;
104267 }
104268 EXPORT_SYMBOL(__get_user_pages);
104269diff --git a/mm/highmem.c b/mm/highmem.c
104270index 123bcd3..0de52ba 100644
104271--- a/mm/highmem.c
104272+++ b/mm/highmem.c
104273@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
104274 * So no dangers, even with speculative execution.
104275 */
104276 page = pte_page(pkmap_page_table[i]);
104277+ pax_open_kernel();
104278 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
104279-
104280+ pax_close_kernel();
104281 set_page_address(page, NULL);
104282 need_flush = 1;
104283 }
104284@@ -259,9 +260,11 @@ start:
104285 }
104286 }
104287 vaddr = PKMAP_ADDR(last_pkmap_nr);
104288+
104289+ pax_open_kernel();
104290 set_pte_at(&init_mm, vaddr,
104291 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
104292-
104293+ pax_close_kernel();
104294 pkmap_count[last_pkmap_nr] = 1;
104295 set_page_address(page, (void *)vaddr);
104296
104297diff --git a/mm/hugetlb.c b/mm/hugetlb.c
104298index caad3c5..4f68807 100644
104299--- a/mm/hugetlb.c
104300+++ b/mm/hugetlb.c
104301@@ -2260,6 +2260,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
104302 struct ctl_table *table, int write,
104303 void __user *buffer, size_t *length, loff_t *ppos)
104304 {
104305+ ctl_table_no_const t;
104306 struct hstate *h = &default_hstate;
104307 unsigned long tmp = h->max_huge_pages;
104308 int ret;
104309@@ -2267,9 +2268,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
104310 if (!hugepages_supported())
104311 return -ENOTSUPP;
104312
104313- table->data = &tmp;
104314- table->maxlen = sizeof(unsigned long);
104315- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
104316+ t = *table;
104317+ t.data = &tmp;
104318+ t.maxlen = sizeof(unsigned long);
104319+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
104320 if (ret)
104321 goto out;
104322
104323@@ -2304,6 +2306,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
104324 struct hstate *h = &default_hstate;
104325 unsigned long tmp;
104326 int ret;
104327+ ctl_table_no_const hugetlb_table;
104328
104329 if (!hugepages_supported())
104330 return -ENOTSUPP;
104331@@ -2313,9 +2316,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
104332 if (write && hstate_is_gigantic(h))
104333 return -EINVAL;
104334
104335- table->data = &tmp;
104336- table->maxlen = sizeof(unsigned long);
104337- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
104338+ hugetlb_table = *table;
104339+ hugetlb_table.data = &tmp;
104340+ hugetlb_table.maxlen = sizeof(unsigned long);
104341+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
104342 if (ret)
104343 goto out;
104344
104345@@ -2800,6 +2804,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
104346 i_mmap_unlock_write(mapping);
104347 }
104348
104349+#ifdef CONFIG_PAX_SEGMEXEC
104350+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
104351+{
104352+ struct mm_struct *mm = vma->vm_mm;
104353+ struct vm_area_struct *vma_m;
104354+ unsigned long address_m;
104355+ pte_t *ptep_m;
104356+
104357+ vma_m = pax_find_mirror_vma(vma);
104358+ if (!vma_m)
104359+ return;
104360+
104361+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104362+ address_m = address + SEGMEXEC_TASK_SIZE;
104363+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
104364+ get_page(page_m);
104365+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
104366+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
104367+}
104368+#endif
104369+
104370 /*
104371 * Hugetlb_cow() should be called with page lock of the original hugepage held.
104372 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
104373@@ -2912,6 +2937,11 @@ retry_avoidcopy:
104374 make_huge_pte(vma, new_page, 1));
104375 page_remove_rmap(old_page);
104376 hugepage_add_new_anon_rmap(new_page, vma, address);
104377+
104378+#ifdef CONFIG_PAX_SEGMEXEC
104379+ pax_mirror_huge_pte(vma, address, new_page);
104380+#endif
104381+
104382 /* Make the old page be freed below */
104383 new_page = old_page;
104384 }
104385@@ -3072,6 +3102,10 @@ retry:
104386 && (vma->vm_flags & VM_SHARED)));
104387 set_huge_pte_at(mm, address, ptep, new_pte);
104388
104389+#ifdef CONFIG_PAX_SEGMEXEC
104390+ pax_mirror_huge_pte(vma, address, page);
104391+#endif
104392+
104393 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
104394 /* Optimization, do the COW without a second fault */
104395 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
104396@@ -3139,6 +3173,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
104397 struct address_space *mapping;
104398 int need_wait_lock = 0;
104399
104400+#ifdef CONFIG_PAX_SEGMEXEC
104401+ struct vm_area_struct *vma_m;
104402+#endif
104403+
104404 address &= huge_page_mask(h);
104405
104406 ptep = huge_pte_offset(mm, address);
104407@@ -3152,6 +3190,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
104408 VM_FAULT_SET_HINDEX(hstate_index(h));
104409 }
104410
104411+#ifdef CONFIG_PAX_SEGMEXEC
104412+ vma_m = pax_find_mirror_vma(vma);
104413+ if (vma_m) {
104414+ unsigned long address_m;
104415+
104416+ if (vma->vm_start > vma_m->vm_start) {
104417+ address_m = address;
104418+ address -= SEGMEXEC_TASK_SIZE;
104419+ vma = vma_m;
104420+ h = hstate_vma(vma);
104421+ } else
104422+ address_m = address + SEGMEXEC_TASK_SIZE;
104423+
104424+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
104425+ return VM_FAULT_OOM;
104426+ address_m &= HPAGE_MASK;
104427+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
104428+ }
104429+#endif
104430+
104431 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
104432 if (!ptep)
104433 return VM_FAULT_OOM;
104434diff --git a/mm/internal.h b/mm/internal.h
104435index a96da5b..42ebd54 100644
104436--- a/mm/internal.h
104437+++ b/mm/internal.h
104438@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
104439
104440 extern int __isolate_free_page(struct page *page, unsigned int order);
104441 extern void __free_pages_bootmem(struct page *page, unsigned int order);
104442+extern void free_compound_page(struct page *page);
104443 extern void prep_compound_page(struct page *page, unsigned long order);
104444 #ifdef CONFIG_MEMORY_FAILURE
104445 extern bool is_free_buddy_page(struct page *page);
104446@@ -411,7 +412,7 @@ extern u32 hwpoison_filter_enable;
104447
104448 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
104449 unsigned long, unsigned long,
104450- unsigned long, unsigned long);
104451+ unsigned long, unsigned long) __intentional_overflow(-1);
104452
104453 extern void set_pageblock_order(void);
104454 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
104455diff --git a/mm/kmemleak.c b/mm/kmemleak.c
104456index f0fe4f2..898208c 100644
104457--- a/mm/kmemleak.c
104458+++ b/mm/kmemleak.c
104459@@ -366,7 +366,7 @@ static void print_unreferenced(struct seq_file *seq,
104460
104461 for (i = 0; i < object->trace_len; i++) {
104462 void *ptr = (void *)object->trace[i];
104463- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
104464+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
104465 }
104466 }
104467
104468@@ -1912,7 +1912,7 @@ static int __init kmemleak_late_init(void)
104469 return -ENOMEM;
104470 }
104471
104472- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
104473+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
104474 &kmemleak_fops);
104475 if (!dentry)
104476 pr_warning("Failed to create the debugfs kmemleak file\n");
104477diff --git a/mm/maccess.c b/mm/maccess.c
104478index d53adf9..03a24bf 100644
104479--- a/mm/maccess.c
104480+++ b/mm/maccess.c
104481@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
104482 set_fs(KERNEL_DS);
104483 pagefault_disable();
104484 ret = __copy_from_user_inatomic(dst,
104485- (__force const void __user *)src, size);
104486+ (const void __force_user *)src, size);
104487 pagefault_enable();
104488 set_fs(old_fs);
104489
104490@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
104491
104492 set_fs(KERNEL_DS);
104493 pagefault_disable();
104494- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
104495+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
104496 pagefault_enable();
104497 set_fs(old_fs);
104498
104499diff --git a/mm/madvise.c b/mm/madvise.c
104500index d551475..8fdd7f3 100644
104501--- a/mm/madvise.c
104502+++ b/mm/madvise.c
104503@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
104504 pgoff_t pgoff;
104505 unsigned long new_flags = vma->vm_flags;
104506
104507+#ifdef CONFIG_PAX_SEGMEXEC
104508+ struct vm_area_struct *vma_m;
104509+#endif
104510+
104511 switch (behavior) {
104512 case MADV_NORMAL:
104513 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
104514@@ -126,6 +130,13 @@ success:
104515 /*
104516 * vm_flags is protected by the mmap_sem held in write mode.
104517 */
104518+
104519+#ifdef CONFIG_PAX_SEGMEXEC
104520+ vma_m = pax_find_mirror_vma(vma);
104521+ if (vma_m)
104522+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
104523+#endif
104524+
104525 vma->vm_flags = new_flags;
104526
104527 out:
104528@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
104529 struct vm_area_struct **prev,
104530 unsigned long start, unsigned long end)
104531 {
104532+
104533+#ifdef CONFIG_PAX_SEGMEXEC
104534+ struct vm_area_struct *vma_m;
104535+#endif
104536+
104537 *prev = vma;
104538 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
104539 return -EINVAL;
104540
104541 zap_page_range(vma, start, end - start, NULL);
104542+
104543+#ifdef CONFIG_PAX_SEGMEXEC
104544+ vma_m = pax_find_mirror_vma(vma);
104545+ if (vma_m) {
104546+ if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
104547+ return -EINVAL;
104548+
104549+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
104550+ }
104551+#endif
104552+
104553 return 0;
104554 }
104555
104556@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
104557 if (end < start)
104558 return error;
104559
104560+#ifdef CONFIG_PAX_SEGMEXEC
104561+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
104562+ if (end > SEGMEXEC_TASK_SIZE)
104563+ return error;
104564+ } else
104565+#endif
104566+
104567+ if (end > TASK_SIZE)
104568+ return error;
104569+
104570 error = 0;
104571 if (end == start)
104572 return error;
104573diff --git a/mm/memory-failure.c b/mm/memory-failure.c
104574index 72a5224..51ba846 100644
104575--- a/mm/memory-failure.c
104576+++ b/mm/memory-failure.c
104577@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
104578
104579 int sysctl_memory_failure_recovery __read_mostly = 1;
104580
104581-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
104582+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
104583
104584 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
104585
104586@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
104587 pfn, t->comm, t->pid);
104588 si.si_signo = SIGBUS;
104589 si.si_errno = 0;
104590- si.si_addr = (void *)addr;
104591+ si.si_addr = (void __user *)addr;
104592 #ifdef __ARCH_SI_TRAPNO
104593 si.si_trapno = trapno;
104594 #endif
104595@@ -779,7 +779,7 @@ static struct page_state {
104596 unsigned long res;
104597 char *msg;
104598 int (*action)(struct page *p, unsigned long pfn);
104599-} error_states[] = {
104600+} __do_const error_states[] = {
104601 { reserved, reserved, "reserved kernel", me_kernel },
104602 /*
104603 * free pages are specially detected outside this table:
104604@@ -1087,7 +1087,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104605 nr_pages = 1 << compound_order(hpage);
104606 else /* normal page or thp */
104607 nr_pages = 1;
104608- atomic_long_add(nr_pages, &num_poisoned_pages);
104609+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
104610
104611 /*
104612 * We need/can do nothing about count=0 pages.
104613@@ -1116,7 +1116,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104614 if (PageHWPoison(hpage)) {
104615 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
104616 || (p != hpage && TestSetPageHWPoison(hpage))) {
104617- atomic_long_sub(nr_pages, &num_poisoned_pages);
104618+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104619 unlock_page(hpage);
104620 return 0;
104621 }
104622@@ -1184,14 +1184,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104623 */
104624 if (!PageHWPoison(p)) {
104625 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
104626- atomic_long_sub(nr_pages, &num_poisoned_pages);
104627+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104628 put_page(hpage);
104629 res = 0;
104630 goto out;
104631 }
104632 if (hwpoison_filter(p)) {
104633 if (TestClearPageHWPoison(p))
104634- atomic_long_sub(nr_pages, &num_poisoned_pages);
104635+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104636 unlock_page(hpage);
104637 put_page(hpage);
104638 return 0;
104639@@ -1421,7 +1421,7 @@ int unpoison_memory(unsigned long pfn)
104640 return 0;
104641 }
104642 if (TestClearPageHWPoison(p))
104643- atomic_long_dec(&num_poisoned_pages);
104644+ atomic_long_dec_unchecked(&num_poisoned_pages);
104645 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
104646 return 0;
104647 }
104648@@ -1435,7 +1435,7 @@ int unpoison_memory(unsigned long pfn)
104649 */
104650 if (TestClearPageHWPoison(page)) {
104651 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
104652- atomic_long_sub(nr_pages, &num_poisoned_pages);
104653+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104654 freeit = 1;
104655 if (PageHuge(page))
104656 clear_page_hwpoison_huge_page(page);
104657@@ -1560,11 +1560,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
104658 if (PageHuge(page)) {
104659 set_page_hwpoison_huge_page(hpage);
104660 dequeue_hwpoisoned_huge_page(hpage);
104661- atomic_long_add(1 << compound_order(hpage),
104662+ atomic_long_add_unchecked(1 << compound_order(hpage),
104663 &num_poisoned_pages);
104664 } else {
104665 SetPageHWPoison(page);
104666- atomic_long_inc(&num_poisoned_pages);
104667+ atomic_long_inc_unchecked(&num_poisoned_pages);
104668 }
104669 }
104670 return ret;
104671@@ -1603,7 +1603,7 @@ static int __soft_offline_page(struct page *page, int flags)
104672 put_page(page);
104673 pr_info("soft_offline: %#lx: invalidated\n", pfn);
104674 SetPageHWPoison(page);
104675- atomic_long_inc(&num_poisoned_pages);
104676+ atomic_long_inc_unchecked(&num_poisoned_pages);
104677 return 0;
104678 }
104679
104680@@ -1652,7 +1652,7 @@ static int __soft_offline_page(struct page *page, int flags)
104681 if (!is_free_buddy_page(page))
104682 pr_info("soft offline: %#lx: page leaked\n",
104683 pfn);
104684- atomic_long_inc(&num_poisoned_pages);
104685+ atomic_long_inc_unchecked(&num_poisoned_pages);
104686 }
104687 } else {
104688 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
104689@@ -1722,11 +1722,11 @@ int soft_offline_page(struct page *page, int flags)
104690 if (PageHuge(page)) {
104691 set_page_hwpoison_huge_page(hpage);
104692 if (!dequeue_hwpoisoned_huge_page(hpage))
104693- atomic_long_add(1 << compound_order(hpage),
104694+ atomic_long_add_unchecked(1 << compound_order(hpage),
104695 &num_poisoned_pages);
104696 } else {
104697 if (!TestSetPageHWPoison(page))
104698- atomic_long_inc(&num_poisoned_pages);
104699+ atomic_long_inc_unchecked(&num_poisoned_pages);
104700 }
104701 }
104702 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
104703diff --git a/mm/memory.c b/mm/memory.c
104704index 97839f5..4bc5530 100644
104705--- a/mm/memory.c
104706+++ b/mm/memory.c
104707@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
104708 free_pte_range(tlb, pmd, addr);
104709 } while (pmd++, addr = next, addr != end);
104710
104711+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
104712 start &= PUD_MASK;
104713 if (start < floor)
104714 return;
104715@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
104716 pud_clear(pud);
104717 pmd_free_tlb(tlb, pmd, start);
104718 mm_dec_nr_pmds(tlb->mm);
104719+#endif
104720 }
104721
104722 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104723@@ -448,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104724 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
104725 } while (pud++, addr = next, addr != end);
104726
104727+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
104728 start &= PGDIR_MASK;
104729 if (start < floor)
104730 return;
104731@@ -462,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104732 pud = pud_offset(pgd, start);
104733 pgd_clear(pgd);
104734 pud_free_tlb(tlb, pud, start);
104735+#endif
104736+
104737 }
104738
104739 /*
104740@@ -691,10 +696,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
104741 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
104742 */
104743 if (vma->vm_ops)
104744- printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
104745+ printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
104746 vma->vm_ops->fault);
104747 if (vma->vm_file)
104748- printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
104749+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
104750 vma->vm_file->f_op->mmap);
104751 dump_stack();
104752 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
104753@@ -1464,6 +1469,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
104754 page_add_file_rmap(page);
104755 set_pte_at(mm, addr, pte, mk_pte(page, prot));
104756
104757+#ifdef CONFIG_PAX_SEGMEXEC
104758+ pax_mirror_file_pte(vma, addr, page, ptl);
104759+#endif
104760+
104761 retval = 0;
104762 pte_unmap_unlock(pte, ptl);
104763 return retval;
104764@@ -1508,9 +1517,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
104765 if (!page_count(page))
104766 return -EINVAL;
104767 if (!(vma->vm_flags & VM_MIXEDMAP)) {
104768+
104769+#ifdef CONFIG_PAX_SEGMEXEC
104770+ struct vm_area_struct *vma_m;
104771+#endif
104772+
104773 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
104774 BUG_ON(vma->vm_flags & VM_PFNMAP);
104775 vma->vm_flags |= VM_MIXEDMAP;
104776+
104777+#ifdef CONFIG_PAX_SEGMEXEC
104778+ vma_m = pax_find_mirror_vma(vma);
104779+ if (vma_m)
104780+ vma_m->vm_flags |= VM_MIXEDMAP;
104781+#endif
104782+
104783 }
104784 return insert_page(vma, addr, page, vma->vm_page_prot);
104785 }
104786@@ -1593,6 +1614,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
104787 unsigned long pfn)
104788 {
104789 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
104790+ BUG_ON(vma->vm_mirror);
104791
104792 if (addr < vma->vm_start || addr >= vma->vm_end)
104793 return -EFAULT;
104794@@ -1840,7 +1862,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
104795
104796 BUG_ON(pud_huge(*pud));
104797
104798- pmd = pmd_alloc(mm, pud, addr);
104799+ pmd = (mm == &init_mm) ?
104800+ pmd_alloc_kernel(mm, pud, addr) :
104801+ pmd_alloc(mm, pud, addr);
104802 if (!pmd)
104803 return -ENOMEM;
104804 do {
104805@@ -1860,7 +1884,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
104806 unsigned long next;
104807 int err;
104808
104809- pud = pud_alloc(mm, pgd, addr);
104810+ pud = (mm == &init_mm) ?
104811+ pud_alloc_kernel(mm, pgd, addr) :
104812+ pud_alloc(mm, pgd, addr);
104813 if (!pud)
104814 return -ENOMEM;
104815 do {
104816@@ -1982,6 +2008,185 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
104817 return ret;
104818 }
104819
104820+#ifdef CONFIG_PAX_SEGMEXEC
104821+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
104822+{
104823+ struct mm_struct *mm = vma->vm_mm;
104824+ spinlock_t *ptl;
104825+ pte_t *pte, entry;
104826+
104827+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
104828+ entry = *pte;
104829+ if (!pte_present(entry)) {
104830+ if (!pte_none(entry)) {
104831+ free_swap_and_cache(pte_to_swp_entry(entry));
104832+ pte_clear_not_present_full(mm, address, pte, 0);
104833+ }
104834+ } else {
104835+ struct page *page;
104836+
104837+ flush_cache_page(vma, address, pte_pfn(entry));
104838+ entry = ptep_clear_flush(vma, address, pte);
104839+ BUG_ON(pte_dirty(entry));
104840+ page = vm_normal_page(vma, address, entry);
104841+ if (page) {
104842+ update_hiwater_rss(mm);
104843+ if (PageAnon(page))
104844+ dec_mm_counter_fast(mm, MM_ANONPAGES);
104845+ else
104846+ dec_mm_counter_fast(mm, MM_FILEPAGES);
104847+ page_remove_rmap(page);
104848+ page_cache_release(page);
104849+ }
104850+ }
104851+ pte_unmap_unlock(pte, ptl);
104852+}
104853+
104854+/* PaX: if vma is mirrored, synchronize the mirror's PTE
104855+ *
104856+ * the ptl of the lower mapped page is held on entry and is not released on exit
104857+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
104858+ */
104859+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
104860+{
104861+ struct mm_struct *mm = vma->vm_mm;
104862+ unsigned long address_m;
104863+ spinlock_t *ptl_m;
104864+ struct vm_area_struct *vma_m;
104865+ pmd_t *pmd_m;
104866+ pte_t *pte_m, entry_m;
104867+
104868+ BUG_ON(!page_m || !PageAnon(page_m));
104869+
104870+ vma_m = pax_find_mirror_vma(vma);
104871+ if (!vma_m)
104872+ return;
104873+
104874+ BUG_ON(!PageLocked(page_m));
104875+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104876+ address_m = address + SEGMEXEC_TASK_SIZE;
104877+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
104878+ pte_m = pte_offset_map(pmd_m, address_m);
104879+ ptl_m = pte_lockptr(mm, pmd_m);
104880+ if (ptl != ptl_m) {
104881+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
104882+ if (!pte_none(*pte_m))
104883+ goto out;
104884+ }
104885+
104886+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
104887+ page_cache_get(page_m);
104888+ page_add_anon_rmap(page_m, vma_m, address_m);
104889+ inc_mm_counter_fast(mm, MM_ANONPAGES);
104890+ set_pte_at(mm, address_m, pte_m, entry_m);
104891+ update_mmu_cache(vma_m, address_m, pte_m);
104892+out:
104893+ if (ptl != ptl_m)
104894+ spin_unlock(ptl_m);
104895+ pte_unmap(pte_m);
104896+ unlock_page(page_m);
104897+}
104898+
104899+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
104900+{
104901+ struct mm_struct *mm = vma->vm_mm;
104902+ unsigned long address_m;
104903+ spinlock_t *ptl_m;
104904+ struct vm_area_struct *vma_m;
104905+ pmd_t *pmd_m;
104906+ pte_t *pte_m, entry_m;
104907+
104908+ BUG_ON(!page_m || PageAnon(page_m));
104909+
104910+ vma_m = pax_find_mirror_vma(vma);
104911+ if (!vma_m)
104912+ return;
104913+
104914+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104915+ address_m = address + SEGMEXEC_TASK_SIZE;
104916+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
104917+ pte_m = pte_offset_map(pmd_m, address_m);
104918+ ptl_m = pte_lockptr(mm, pmd_m);
104919+ if (ptl != ptl_m) {
104920+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
104921+ if (!pte_none(*pte_m))
104922+ goto out;
104923+ }
104924+
104925+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
104926+ page_cache_get(page_m);
104927+ page_add_file_rmap(page_m);
104928+ inc_mm_counter_fast(mm, MM_FILEPAGES);
104929+ set_pte_at(mm, address_m, pte_m, entry_m);
104930+ update_mmu_cache(vma_m, address_m, pte_m);
104931+out:
104932+ if (ptl != ptl_m)
104933+ spin_unlock(ptl_m);
104934+ pte_unmap(pte_m);
104935+}
104936+
104937+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
104938+{
104939+ struct mm_struct *mm = vma->vm_mm;
104940+ unsigned long address_m;
104941+ spinlock_t *ptl_m;
104942+ struct vm_area_struct *vma_m;
104943+ pmd_t *pmd_m;
104944+ pte_t *pte_m, entry_m;
104945+
104946+ vma_m = pax_find_mirror_vma(vma);
104947+ if (!vma_m)
104948+ return;
104949+
104950+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104951+ address_m = address + SEGMEXEC_TASK_SIZE;
104952+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
104953+ pte_m = pte_offset_map(pmd_m, address_m);
104954+ ptl_m = pte_lockptr(mm, pmd_m);
104955+ if (ptl != ptl_m) {
104956+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
104957+ if (!pte_none(*pte_m))
104958+ goto out;
104959+ }
104960+
104961+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
104962+ set_pte_at(mm, address_m, pte_m, entry_m);
104963+out:
104964+ if (ptl != ptl_m)
104965+ spin_unlock(ptl_m);
104966+ pte_unmap(pte_m);
104967+}
104968+
104969+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
104970+{
104971+ struct page *page_m;
104972+ pte_t entry;
104973+
104974+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
104975+ goto out;
104976+
104977+ entry = *pte;
104978+ page_m = vm_normal_page(vma, address, entry);
104979+ if (!page_m)
104980+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
104981+ else if (PageAnon(page_m)) {
104982+ if (pax_find_mirror_vma(vma)) {
104983+ pte_unmap_unlock(pte, ptl);
104984+ lock_page(page_m);
104985+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
104986+ if (pte_same(entry, *pte))
104987+ pax_mirror_anon_pte(vma, address, page_m, ptl);
104988+ else
104989+ unlock_page(page_m);
104990+ }
104991+ } else
104992+ pax_mirror_file_pte(vma, address, page_m, ptl);
104993+
104994+out:
104995+ pte_unmap_unlock(pte, ptl);
104996+}
104997+#endif
104998+
104999 /*
105000 * This routine handles present pages, when users try to write
105001 * to a shared page. It is done by copying the page to a new address
105002@@ -2172,6 +2377,12 @@ gotten:
105003 */
105004 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
105005 if (likely(pte_same(*page_table, orig_pte))) {
105006+
105007+#ifdef CONFIG_PAX_SEGMEXEC
105008+ if (pax_find_mirror_vma(vma))
105009+ BUG_ON(!trylock_page(new_page));
105010+#endif
105011+
105012 if (old_page) {
105013 if (!PageAnon(old_page)) {
105014 dec_mm_counter_fast(mm, MM_FILEPAGES);
105015@@ -2225,6 +2436,10 @@ gotten:
105016 page_remove_rmap(old_page);
105017 }
105018
105019+#ifdef CONFIG_PAX_SEGMEXEC
105020+ pax_mirror_anon_pte(vma, address, new_page, ptl);
105021+#endif
105022+
105023 /* Free the old page.. */
105024 new_page = old_page;
105025 ret |= VM_FAULT_WRITE;
105026@@ -2483,6 +2698,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
105027 swap_free(entry);
105028 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
105029 try_to_free_swap(page);
105030+
105031+#ifdef CONFIG_PAX_SEGMEXEC
105032+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
105033+#endif
105034+
105035 unlock_page(page);
105036 if (page != swapcache) {
105037 /*
105038@@ -2506,6 +2726,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
105039
105040 /* No need to invalidate - it was non-present before */
105041 update_mmu_cache(vma, address, page_table);
105042+
105043+#ifdef CONFIG_PAX_SEGMEXEC
105044+ pax_mirror_anon_pte(vma, address, page, ptl);
105045+#endif
105046+
105047 unlock:
105048 pte_unmap_unlock(page_table, ptl);
105049 out:
105050@@ -2525,40 +2750,6 @@ out_release:
105051 }
105052
105053 /*
105054- * This is like a special single-page "expand_{down|up}wards()",
105055- * except we must first make sure that 'address{-|+}PAGE_SIZE'
105056- * doesn't hit another vma.
105057- */
105058-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
105059-{
105060- address &= PAGE_MASK;
105061- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
105062- struct vm_area_struct *prev = vma->vm_prev;
105063-
105064- /*
105065- * Is there a mapping abutting this one below?
105066- *
105067- * That's only ok if it's the same stack mapping
105068- * that has gotten split..
105069- */
105070- if (prev && prev->vm_end == address)
105071- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
105072-
105073- return expand_downwards(vma, address - PAGE_SIZE);
105074- }
105075- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
105076- struct vm_area_struct *next = vma->vm_next;
105077-
105078- /* As VM_GROWSDOWN but s/below/above/ */
105079- if (next && next->vm_start == address + PAGE_SIZE)
105080- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
105081-
105082- return expand_upwards(vma, address + PAGE_SIZE);
105083- }
105084- return 0;
105085-}
105086-
105087-/*
105088 * We enter with non-exclusive mmap_sem (to exclude vma changes,
105089 * but allow concurrent faults), and pte mapped but not yet locked.
105090 * We return with mmap_sem still held, but pte unmapped and unlocked.
105091@@ -2568,27 +2759,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
105092 unsigned int flags)
105093 {
105094 struct mem_cgroup *memcg;
105095- struct page *page;
105096+ struct page *page = NULL;
105097 spinlock_t *ptl;
105098 pte_t entry;
105099
105100- pte_unmap(page_table);
105101-
105102- /* Check if we need to add a guard page to the stack */
105103- if (check_stack_guard_page(vma, address) < 0)
105104- return VM_FAULT_SIGSEGV;
105105-
105106- /* Use the zero-page for reads */
105107 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
105108 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
105109 vma->vm_page_prot));
105110- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
105111+ ptl = pte_lockptr(mm, pmd);
105112+ spin_lock(ptl);
105113 if (!pte_none(*page_table))
105114 goto unlock;
105115 goto setpte;
105116 }
105117
105118 /* Allocate our own private page. */
105119+ pte_unmap(page_table);
105120+
105121 if (unlikely(anon_vma_prepare(vma)))
105122 goto oom;
105123 page = alloc_zeroed_user_highpage_movable(vma, address);
105124@@ -2612,6 +2799,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
105125 if (!pte_none(*page_table))
105126 goto release;
105127
105128+#ifdef CONFIG_PAX_SEGMEXEC
105129+ if (pax_find_mirror_vma(vma))
105130+ BUG_ON(!trylock_page(page));
105131+#endif
105132+
105133 inc_mm_counter_fast(mm, MM_ANONPAGES);
105134 page_add_new_anon_rmap(page, vma, address);
105135 mem_cgroup_commit_charge(page, memcg, false);
105136@@ -2621,6 +2813,12 @@ setpte:
105137
105138 /* No need to invalidate - it was non-present before */
105139 update_mmu_cache(vma, address, page_table);
105140+
105141+#ifdef CONFIG_PAX_SEGMEXEC
105142+ if (page)
105143+ pax_mirror_anon_pte(vma, address, page, ptl);
105144+#endif
105145+
105146 unlock:
105147 pte_unmap_unlock(page_table, ptl);
105148 return 0;
105149@@ -2853,6 +3051,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105150 return ret;
105151 }
105152 do_set_pte(vma, address, fault_page, pte, false, false);
105153+
105154+#ifdef CONFIG_PAX_SEGMEXEC
105155+ pax_mirror_file_pte(vma, address, fault_page, ptl);
105156+#endif
105157+
105158 unlock_page(fault_page);
105159 unlock_out:
105160 pte_unmap_unlock(pte, ptl);
105161@@ -2904,7 +3107,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105162 }
105163 goto uncharge_out;
105164 }
105165+
105166+#ifdef CONFIG_PAX_SEGMEXEC
105167+ if (pax_find_mirror_vma(vma))
105168+ BUG_ON(!trylock_page(new_page));
105169+#endif
105170+
105171 do_set_pte(vma, address, new_page, pte, true, true);
105172+
105173+#ifdef CONFIG_PAX_SEGMEXEC
105174+ pax_mirror_anon_pte(vma, address, new_page, ptl);
105175+#endif
105176+
105177 mem_cgroup_commit_charge(new_page, memcg, false);
105178 lru_cache_add_active_or_unevictable(new_page, vma);
105179 pte_unmap_unlock(pte, ptl);
105180@@ -2962,6 +3176,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105181 return ret;
105182 }
105183 do_set_pte(vma, address, fault_page, pte, true, false);
105184+
105185+#ifdef CONFIG_PAX_SEGMEXEC
105186+ pax_mirror_file_pte(vma, address, fault_page, ptl);
105187+#endif
105188+
105189 pte_unmap_unlock(pte, ptl);
105190
105191 if (set_page_dirty(fault_page))
105192@@ -3185,6 +3404,12 @@ static int handle_pte_fault(struct mm_struct *mm,
105193 if (flags & FAULT_FLAG_WRITE)
105194 flush_tlb_fix_spurious_fault(vma, address);
105195 }
105196+
105197+#ifdef CONFIG_PAX_SEGMEXEC
105198+ pax_mirror_pte(vma, address, pte, pmd, ptl);
105199+ return 0;
105200+#endif
105201+
105202 unlock:
105203 pte_unmap_unlock(pte, ptl);
105204 return 0;
105205@@ -3204,9 +3429,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105206 pmd_t *pmd;
105207 pte_t *pte;
105208
105209+#ifdef CONFIG_PAX_SEGMEXEC
105210+ struct vm_area_struct *vma_m;
105211+#endif
105212+
105213 if (unlikely(is_vm_hugetlb_page(vma)))
105214 return hugetlb_fault(mm, vma, address, flags);
105215
105216+#ifdef CONFIG_PAX_SEGMEXEC
105217+ vma_m = pax_find_mirror_vma(vma);
105218+ if (vma_m) {
105219+ unsigned long address_m;
105220+ pgd_t *pgd_m;
105221+ pud_t *pud_m;
105222+ pmd_t *pmd_m;
105223+
105224+ if (vma->vm_start > vma_m->vm_start) {
105225+ address_m = address;
105226+ address -= SEGMEXEC_TASK_SIZE;
105227+ vma = vma_m;
105228+ } else
105229+ address_m = address + SEGMEXEC_TASK_SIZE;
105230+
105231+ pgd_m = pgd_offset(mm, address_m);
105232+ pud_m = pud_alloc(mm, pgd_m, address_m);
105233+ if (!pud_m)
105234+ return VM_FAULT_OOM;
105235+ pmd_m = pmd_alloc(mm, pud_m, address_m);
105236+ if (!pmd_m)
105237+ return VM_FAULT_OOM;
105238+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
105239+ return VM_FAULT_OOM;
105240+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
105241+ }
105242+#endif
105243+
105244 pgd = pgd_offset(mm, address);
105245 pud = pud_alloc(mm, pgd, address);
105246 if (!pud)
105247@@ -3341,6 +3598,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
105248 spin_unlock(&mm->page_table_lock);
105249 return 0;
105250 }
105251+
105252+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
105253+{
105254+ pud_t *new = pud_alloc_one(mm, address);
105255+ if (!new)
105256+ return -ENOMEM;
105257+
105258+ smp_wmb(); /* See comment in __pte_alloc */
105259+
105260+ spin_lock(&mm->page_table_lock);
105261+ if (pgd_present(*pgd)) /* Another has populated it */
105262+ pud_free(mm, new);
105263+ else
105264+ pgd_populate_kernel(mm, pgd, new);
105265+ spin_unlock(&mm->page_table_lock);
105266+ return 0;
105267+}
105268 #endif /* __PAGETABLE_PUD_FOLDED */
105269
105270 #ifndef __PAGETABLE_PMD_FOLDED
105271@@ -3373,6 +3647,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
105272 spin_unlock(&mm->page_table_lock);
105273 return 0;
105274 }
105275+
105276+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
105277+{
105278+ pmd_t *new = pmd_alloc_one(mm, address);
105279+ if (!new)
105280+ return -ENOMEM;
105281+
105282+ smp_wmb(); /* See comment in __pte_alloc */
105283+
105284+ spin_lock(&mm->page_table_lock);
105285+#ifndef __ARCH_HAS_4LEVEL_HACK
105286+ if (!pud_present(*pud)) {
105287+ mm_inc_nr_pmds(mm);
105288+ pud_populate_kernel(mm, pud, new);
105289+ } else /* Another has populated it */
105290+ pmd_free(mm, new);
105291+#else
105292+ if (!pgd_present(*pud)) {
105293+ mm_inc_nr_pmds(mm);
105294+ pgd_populate_kernel(mm, pud, new);
105295+ } else /* Another has populated it */
105296+ pmd_free(mm, new);
105297+#endif /* __ARCH_HAS_4LEVEL_HACK */
105298+ spin_unlock(&mm->page_table_lock);
105299+ return 0;
105300+}
105301 #endif /* __PAGETABLE_PMD_FOLDED */
105302
105303 static int __follow_pte(struct mm_struct *mm, unsigned long address,
105304@@ -3482,8 +3782,8 @@ out:
105305 return ret;
105306 }
105307
105308-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
105309- void *buf, int len, int write)
105310+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
105311+ void *buf, size_t len, int write)
105312 {
105313 resource_size_t phys_addr;
105314 unsigned long prot = 0;
105315@@ -3509,8 +3809,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
105316 * Access another process' address space as given in mm. If non-NULL, use the
105317 * given task for page fault accounting.
105318 */
105319-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105320- unsigned long addr, void *buf, int len, int write)
105321+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105322+ unsigned long addr, void *buf, size_t len, int write)
105323 {
105324 struct vm_area_struct *vma;
105325 void *old_buf = buf;
105326@@ -3518,7 +3818,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105327 down_read(&mm->mmap_sem);
105328 /* ignore errors, just check how much was successfully transferred */
105329 while (len) {
105330- int bytes, ret, offset;
105331+ ssize_t bytes, ret, offset;
105332 void *maddr;
105333 struct page *page = NULL;
105334
105335@@ -3579,8 +3879,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105336 *
105337 * The caller must hold a reference on @mm.
105338 */
105339-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
105340- void *buf, int len, int write)
105341+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
105342+ void *buf, size_t len, int write)
105343 {
105344 return __access_remote_vm(NULL, mm, addr, buf, len, write);
105345 }
105346@@ -3590,11 +3890,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
105347 * Source/target buffer must be kernel space,
105348 * Do not walk the page table directly, use get_user_pages
105349 */
105350-int access_process_vm(struct task_struct *tsk, unsigned long addr,
105351- void *buf, int len, int write)
105352+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
105353+ void *buf, size_t len, int write)
105354 {
105355 struct mm_struct *mm;
105356- int ret;
105357+ ssize_t ret;
105358
105359 mm = get_task_mm(tsk);
105360 if (!mm)
105361diff --git a/mm/mempolicy.c b/mm/mempolicy.c
105362index 0f7d73b..737047f 100644
105363--- a/mm/mempolicy.c
105364+++ b/mm/mempolicy.c
105365@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
105366 unsigned long vmstart;
105367 unsigned long vmend;
105368
105369+#ifdef CONFIG_PAX_SEGMEXEC
105370+ struct vm_area_struct *vma_m;
105371+#endif
105372+
105373 vma = find_vma(mm, start);
105374 if (!vma || vma->vm_start > start)
105375 return -EFAULT;
105376@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
105377 err = vma_replace_policy(vma, new_pol);
105378 if (err)
105379 goto out;
105380+
105381+#ifdef CONFIG_PAX_SEGMEXEC
105382+ vma_m = pax_find_mirror_vma(vma);
105383+ if (vma_m) {
105384+ err = vma_replace_policy(vma_m, new_pol);
105385+ if (err)
105386+ goto out;
105387+ }
105388+#endif
105389+
105390 }
105391
105392 out:
105393@@ -1160,6 +1174,17 @@ static long do_mbind(unsigned long start, unsigned long len,
105394
105395 if (end < start)
105396 return -EINVAL;
105397+
105398+#ifdef CONFIG_PAX_SEGMEXEC
105399+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
105400+ if (end > SEGMEXEC_TASK_SIZE)
105401+ return -EINVAL;
105402+ } else
105403+#endif
105404+
105405+ if (end > TASK_SIZE)
105406+ return -EINVAL;
105407+
105408 if (end == start)
105409 return 0;
105410
105411@@ -1385,8 +1410,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
105412 */
105413 tcred = __task_cred(task);
105414 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
105415- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
105416- !capable(CAP_SYS_NICE)) {
105417+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
105418 rcu_read_unlock();
105419 err = -EPERM;
105420 goto out_put;
105421@@ -1417,6 +1441,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
105422 goto out;
105423 }
105424
105425+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
105426+ if (mm != current->mm &&
105427+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
105428+ mmput(mm);
105429+ err = -EPERM;
105430+ goto out;
105431+ }
105432+#endif
105433+
105434 err = do_migrate_pages(mm, old, new,
105435 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
105436
105437diff --git a/mm/migrate.c b/mm/migrate.c
105438index 85e0426..be49beb 100644
105439--- a/mm/migrate.c
105440+++ b/mm/migrate.c
105441@@ -1472,8 +1472,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
105442 */
105443 tcred = __task_cred(task);
105444 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
105445- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
105446- !capable(CAP_SYS_NICE)) {
105447+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
105448 rcu_read_unlock();
105449 err = -EPERM;
105450 goto out;
105451diff --git a/mm/mlock.c b/mm/mlock.c
105452index 8a54cd2..92f1747 100644
105453--- a/mm/mlock.c
105454+++ b/mm/mlock.c
105455@@ -14,6 +14,7 @@
105456 #include <linux/pagevec.h>
105457 #include <linux/mempolicy.h>
105458 #include <linux/syscalls.h>
105459+#include <linux/security.h>
105460 #include <linux/sched.h>
105461 #include <linux/export.h>
105462 #include <linux/rmap.h>
105463@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
105464 {
105465 unsigned long nstart, end, tmp;
105466 struct vm_area_struct * vma, * prev;
105467- int error;
105468+ int error = 0;
105469
105470 VM_BUG_ON(start & ~PAGE_MASK);
105471 VM_BUG_ON(len != PAGE_ALIGN(len));
105472@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
105473 return -EINVAL;
105474 if (end == start)
105475 return 0;
105476+ if (end > TASK_SIZE)
105477+ return -EINVAL;
105478+
105479 vma = find_vma(current->mm, start);
105480 if (!vma || vma->vm_start > start)
105481 return -ENOMEM;
105482@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
105483 for (nstart = start ; ; ) {
105484 vm_flags_t newflags;
105485
105486+#ifdef CONFIG_PAX_SEGMEXEC
105487+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
105488+ break;
105489+#endif
105490+
105491 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
105492
105493 newflags = vma->vm_flags & ~VM_LOCKED;
105494@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
105495 locked += current->mm->locked_vm;
105496
105497 /* check against resource limits */
105498+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
105499 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
105500 error = do_mlock(start, len, 1);
105501
105502@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
105503 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
105504 vm_flags_t newflags;
105505
105506+#ifdef CONFIG_PAX_SEGMEXEC
105507+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
105508+ break;
105509+#endif
105510+
105511 newflags = vma->vm_flags & ~VM_LOCKED;
105512 if (flags & MCL_CURRENT)
105513 newflags |= VM_LOCKED;
105514@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
105515 lock_limit >>= PAGE_SHIFT;
105516
105517 ret = -ENOMEM;
105518+
105519+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
105520+
105521 down_write(&current->mm->mmap_sem);
105522-
105523 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
105524 capable(CAP_IPC_LOCK))
105525 ret = do_mlockall(flags);
105526diff --git a/mm/mm_init.c b/mm/mm_init.c
105527index 5f420f7..dd42fb1b 100644
105528--- a/mm/mm_init.c
105529+++ b/mm/mm_init.c
105530@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
105531 return NOTIFY_OK;
105532 }
105533
105534-static struct notifier_block compute_batch_nb __meminitdata = {
105535+static struct notifier_block compute_batch_nb __meminitconst = {
105536 .notifier_call = mm_compute_batch_notifier,
105537 .priority = IPC_CALLBACK_PRI, /* use lowest priority */
105538 };
105539diff --git a/mm/mmap.c b/mm/mmap.c
105540index 9ec50a3..0476e2d 100644
105541--- a/mm/mmap.c
105542+++ b/mm/mmap.c
105543@@ -41,6 +41,7 @@
105544 #include <linux/notifier.h>
105545 #include <linux/memory.h>
105546 #include <linux/printk.h>
105547+#include <linux/random.h>
105548
105549 #include <asm/uaccess.h>
105550 #include <asm/cacheflush.h>
105551@@ -57,6 +58,16 @@
105552 #define arch_rebalance_pgtables(addr, len) (addr)
105553 #endif
105554
105555+static inline void verify_mm_writelocked(struct mm_struct *mm)
105556+{
105557+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
105558+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
105559+ up_read(&mm->mmap_sem);
105560+ BUG();
105561+ }
105562+#endif
105563+}
105564+
105565 static void unmap_region(struct mm_struct *mm,
105566 struct vm_area_struct *vma, struct vm_area_struct *prev,
105567 unsigned long start, unsigned long end);
105568@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
105569 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
105570 *
105571 */
105572-pgprot_t protection_map[16] = {
105573+pgprot_t protection_map[16] __read_only = {
105574 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
105575 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
105576 };
105577
105578-pgprot_t vm_get_page_prot(unsigned long vm_flags)
105579+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
105580 {
105581- return __pgprot(pgprot_val(protection_map[vm_flags &
105582+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
105583 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
105584 pgprot_val(arch_vm_get_page_prot(vm_flags)));
105585+
105586+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
105587+ if (!(__supported_pte_mask & _PAGE_NX) &&
105588+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
105589+ (vm_flags & (VM_READ | VM_WRITE)))
105590+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
105591+#endif
105592+
105593+ return prot;
105594 }
105595 EXPORT_SYMBOL(vm_get_page_prot);
105596
105597@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
105598 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
105599 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
105600 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
105601+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
105602 /*
105603 * Make sure vm_committed_as in one cacheline and not cacheline shared with
105604 * other variables. It can be updated by several CPUs frequently.
105605@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
105606 struct vm_area_struct *next = vma->vm_next;
105607
105608 might_sleep();
105609+ BUG_ON(vma->vm_mirror);
105610 if (vma->vm_ops && vma->vm_ops->close)
105611 vma->vm_ops->close(vma);
105612 if (vma->vm_file)
105613@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
105614
105615 SYSCALL_DEFINE1(brk, unsigned long, brk)
105616 {
105617+ unsigned long rlim;
105618 unsigned long retval;
105619 unsigned long newbrk, oldbrk;
105620 struct mm_struct *mm = current->mm;
105621@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
105622 * segment grow beyond its set limit the in case where the limit is
105623 * not page aligned -Ram Gupta
105624 */
105625- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
105626+ rlim = rlimit(RLIMIT_DATA);
105627+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
105628+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
105629+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
105630+ rlim = 4096 * PAGE_SIZE;
105631+#endif
105632+ if (check_data_rlimit(rlim, brk, mm->start_brk,
105633 mm->end_data, mm->start_data))
105634 goto out;
105635
105636@@ -967,6 +996,12 @@ static int
105637 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
105638 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
105639 {
105640+
105641+#ifdef CONFIG_PAX_SEGMEXEC
105642+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
105643+ return 0;
105644+#endif
105645+
105646 if (is_mergeable_vma(vma, file, vm_flags) &&
105647 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
105648 if (vma->vm_pgoff == vm_pgoff)
105649@@ -986,6 +1021,12 @@ static int
105650 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
105651 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
105652 {
105653+
105654+#ifdef CONFIG_PAX_SEGMEXEC
105655+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
105656+ return 0;
105657+#endif
105658+
105659 if (is_mergeable_vma(vma, file, vm_flags) &&
105660 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
105661 pgoff_t vm_pglen;
105662@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105663 struct vm_area_struct *area, *next;
105664 int err;
105665
105666+#ifdef CONFIG_PAX_SEGMEXEC
105667+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
105668+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
105669+
105670+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
105671+#endif
105672+
105673 /*
105674 * We later require that vma->vm_flags == vm_flags,
105675 * so this tests vma->vm_flags & VM_SPECIAL, too.
105676@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105677 if (next && next->vm_end == end) /* cases 6, 7, 8 */
105678 next = next->vm_next;
105679
105680+#ifdef CONFIG_PAX_SEGMEXEC
105681+ if (prev)
105682+ prev_m = pax_find_mirror_vma(prev);
105683+ if (area)
105684+ area_m = pax_find_mirror_vma(area);
105685+ if (next)
105686+ next_m = pax_find_mirror_vma(next);
105687+#endif
105688+
105689 /*
105690 * Can it merge with the predecessor?
105691 */
105692@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105693 /* cases 1, 6 */
105694 err = vma_adjust(prev, prev->vm_start,
105695 next->vm_end, prev->vm_pgoff, NULL);
105696- } else /* cases 2, 5, 7 */
105697+
105698+#ifdef CONFIG_PAX_SEGMEXEC
105699+ if (!err && prev_m)
105700+ err = vma_adjust(prev_m, prev_m->vm_start,
105701+ next_m->vm_end, prev_m->vm_pgoff, NULL);
105702+#endif
105703+
105704+ } else { /* cases 2, 5, 7 */
105705 err = vma_adjust(prev, prev->vm_start,
105706 end, prev->vm_pgoff, NULL);
105707+
105708+#ifdef CONFIG_PAX_SEGMEXEC
105709+ if (!err && prev_m)
105710+ err = vma_adjust(prev_m, prev_m->vm_start,
105711+ end_m, prev_m->vm_pgoff, NULL);
105712+#endif
105713+
105714+ }
105715 if (err)
105716 return NULL;
105717 khugepaged_enter_vma_merge(prev, vm_flags);
105718@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105719 mpol_equal(policy, vma_policy(next)) &&
105720 can_vma_merge_before(next, vm_flags,
105721 anon_vma, file, pgoff+pglen)) {
105722- if (prev && addr < prev->vm_end) /* case 4 */
105723+ if (prev && addr < prev->vm_end) { /* case 4 */
105724 err = vma_adjust(prev, prev->vm_start,
105725 addr, prev->vm_pgoff, NULL);
105726- else /* cases 3, 8 */
105727+
105728+#ifdef CONFIG_PAX_SEGMEXEC
105729+ if (!err && prev_m)
105730+ err = vma_adjust(prev_m, prev_m->vm_start,
105731+ addr_m, prev_m->vm_pgoff, NULL);
105732+#endif
105733+
105734+ } else { /* cases 3, 8 */
105735 err = vma_adjust(area, addr, next->vm_end,
105736 next->vm_pgoff - pglen, NULL);
105737+
105738+#ifdef CONFIG_PAX_SEGMEXEC
105739+ if (!err && area_m)
105740+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
105741+ next_m->vm_pgoff - pglen, NULL);
105742+#endif
105743+
105744+ }
105745 if (err)
105746 return NULL;
105747 khugepaged_enter_vma_merge(area, vm_flags);
105748@@ -1199,8 +1286,10 @@ none:
105749 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
105750 struct file *file, long pages)
105751 {
105752- const unsigned long stack_flags
105753- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
105754+
105755+#ifdef CONFIG_PAX_RANDMMAP
105756+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
105757+#endif
105758
105759 mm->total_vm += pages;
105760
105761@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
105762 mm->shared_vm += pages;
105763 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
105764 mm->exec_vm += pages;
105765- } else if (flags & stack_flags)
105766+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
105767 mm->stack_vm += pages;
105768 }
105769 #endif /* CONFIG_PROC_FS */
105770@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
105771 locked += mm->locked_vm;
105772 lock_limit = rlimit(RLIMIT_MEMLOCK);
105773 lock_limit >>= PAGE_SHIFT;
105774+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
105775 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
105776 return -EAGAIN;
105777 }
105778@@ -1264,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105779 * (the exception is when the underlying filesystem is noexec
105780 * mounted, in which case we dont add PROT_EXEC.)
105781 */
105782- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
105783+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
105784 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
105785 prot |= PROT_EXEC;
105786
105787@@ -1290,7 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105788 /* Obtain the address to map to. we verify (or select) it and ensure
105789 * that it represents a valid section of the address space.
105790 */
105791- addr = get_unmapped_area(file, addr, len, pgoff, flags);
105792+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
105793 if (addr & ~PAGE_MASK)
105794 return addr;
105795
105796@@ -1301,6 +1391,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105797 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
105798 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
105799
105800+#ifdef CONFIG_PAX_MPROTECT
105801+ if (mm->pax_flags & MF_PAX_MPROTECT) {
105802+
105803+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
105804+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
105805+ mm->binfmt->handle_mmap)
105806+ mm->binfmt->handle_mmap(file);
105807+#endif
105808+
105809+#ifndef CONFIG_PAX_MPROTECT_COMPAT
105810+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
105811+ gr_log_rwxmmap(file);
105812+
105813+#ifdef CONFIG_PAX_EMUPLT
105814+ vm_flags &= ~VM_EXEC;
105815+#else
105816+ return -EPERM;
105817+#endif
105818+
105819+ }
105820+
105821+ if (!(vm_flags & VM_EXEC))
105822+ vm_flags &= ~VM_MAYEXEC;
105823+#else
105824+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
105825+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
105826+#endif
105827+ else
105828+ vm_flags &= ~VM_MAYWRITE;
105829+ }
105830+#endif
105831+
105832+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
105833+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
105834+ vm_flags &= ~VM_PAGEEXEC;
105835+#endif
105836+
105837 if (flags & MAP_LOCKED)
105838 if (!can_do_mlock())
105839 return -EPERM;
105840@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105841 vm_flags |= VM_NORESERVE;
105842 }
105843
105844+ if (!gr_acl_handle_mmap(file, prot))
105845+ return -EACCES;
105846+
105847 addr = mmap_region(file, addr, len, vm_flags, pgoff);
105848 if (!IS_ERR_VALUE(addr) &&
105849 ((vm_flags & VM_LOCKED) ||
105850@@ -1481,7 +1611,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
105851 vm_flags_t vm_flags = vma->vm_flags;
105852
105853 /* If it was private or non-writable, the write bit is already clear */
105854- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
105855+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
105856 return 0;
105857
105858 /* The backer wishes to know when pages are first written to? */
105859@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
105860 struct rb_node **rb_link, *rb_parent;
105861 unsigned long charged = 0;
105862
105863+#ifdef CONFIG_PAX_SEGMEXEC
105864+ struct vm_area_struct *vma_m = NULL;
105865+#endif
105866+
105867+ /*
105868+ * mm->mmap_sem is required to protect against another thread
105869+ * changing the mappings in case we sleep.
105870+ */
105871+ verify_mm_writelocked(mm);
105872+
105873 /* Check against address space limit. */
105874+
105875+#ifdef CONFIG_PAX_RANDMMAP
105876+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
105877+#endif
105878+
105879 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
105880 unsigned long nr_pages;
105881
105882@@ -1551,11 +1696,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
105883
105884 /* Clear old maps */
105885 error = -ENOMEM;
105886-munmap_back:
105887 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
105888 if (do_munmap(mm, addr, len))
105889 return -ENOMEM;
105890- goto munmap_back;
105891+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
105892 }
105893
105894 /*
105895@@ -1586,6 +1730,16 @@ munmap_back:
105896 goto unacct_error;
105897 }
105898
105899+#ifdef CONFIG_PAX_SEGMEXEC
105900+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
105901+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
105902+ if (!vma_m) {
105903+ error = -ENOMEM;
105904+ goto free_vma;
105905+ }
105906+ }
105907+#endif
105908+
105909 vma->vm_mm = mm;
105910 vma->vm_start = addr;
105911 vma->vm_end = addr + len;
105912@@ -1616,6 +1770,13 @@ munmap_back:
105913 if (error)
105914 goto unmap_and_free_vma;
105915
105916+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
105917+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
105918+ vma->vm_flags |= VM_PAGEEXEC;
105919+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
105920+ }
105921+#endif
105922+
105923 /* Can addr have changed??
105924 *
105925 * Answer: Yes, several device drivers can do it in their
105926@@ -1634,6 +1795,12 @@ munmap_back:
105927 }
105928
105929 vma_link(mm, vma, prev, rb_link, rb_parent);
105930+
105931+#ifdef CONFIG_PAX_SEGMEXEC
105932+ if (vma_m)
105933+ BUG_ON(pax_mirror_vma(vma_m, vma));
105934+#endif
105935+
105936 /* Once vma denies write, undo our temporary denial count */
105937 if (file) {
105938 if (vm_flags & VM_SHARED)
105939@@ -1646,6 +1813,7 @@ out:
105940 perf_event_mmap(vma);
105941
105942 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
105943+ track_exec_limit(mm, addr, addr + len, vm_flags);
105944 if (vm_flags & VM_LOCKED) {
105945 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
105946 vma == get_gate_vma(current->mm)))
105947@@ -1683,6 +1851,12 @@ allow_write_and_free_vma:
105948 if (vm_flags & VM_DENYWRITE)
105949 allow_write_access(file);
105950 free_vma:
105951+
105952+#ifdef CONFIG_PAX_SEGMEXEC
105953+ if (vma_m)
105954+ kmem_cache_free(vm_area_cachep, vma_m);
105955+#endif
105956+
105957 kmem_cache_free(vm_area_cachep, vma);
105958 unacct_error:
105959 if (charged)
105960@@ -1690,7 +1864,63 @@ unacct_error:
105961 return error;
105962 }
105963
105964-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
105965+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
105966+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
105967+{
105968+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
105969+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
105970+
105971+ return 0;
105972+}
105973+#endif
105974+
105975+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
105976+{
105977+ if (!vma) {
105978+#ifdef CONFIG_STACK_GROWSUP
105979+ if (addr > sysctl_heap_stack_gap)
105980+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
105981+ else
105982+ vma = find_vma(current->mm, 0);
105983+ if (vma && (vma->vm_flags & VM_GROWSUP))
105984+ return false;
105985+#endif
105986+ return true;
105987+ }
105988+
105989+ if (addr + len > vma->vm_start)
105990+ return false;
105991+
105992+ if (vma->vm_flags & VM_GROWSDOWN)
105993+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
105994+#ifdef CONFIG_STACK_GROWSUP
105995+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
105996+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
105997+#endif
105998+ else if (offset)
105999+ return offset <= vma->vm_start - addr - len;
106000+
106001+ return true;
106002+}
106003+
106004+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
106005+{
106006+ if (vma->vm_start < len)
106007+ return -ENOMEM;
106008+
106009+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
106010+ if (offset <= vma->vm_start - len)
106011+ return vma->vm_start - len - offset;
106012+ else
106013+ return -ENOMEM;
106014+ }
106015+
106016+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
106017+ return vma->vm_start - len - sysctl_heap_stack_gap;
106018+ return -ENOMEM;
106019+}
106020+
106021+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
106022 {
106023 /*
106024 * We implement the search by looking for an rbtree node that
106025@@ -1738,11 +1968,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
106026 }
106027 }
106028
106029- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
106030+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
106031 check_current:
106032 /* Check if current node has a suitable gap */
106033 if (gap_start > high_limit)
106034 return -ENOMEM;
106035+
106036+ if (gap_end - gap_start > info->threadstack_offset)
106037+ gap_start += info->threadstack_offset;
106038+ else
106039+ gap_start = gap_end;
106040+
106041+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
106042+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106043+ gap_start += sysctl_heap_stack_gap;
106044+ else
106045+ gap_start = gap_end;
106046+ }
106047+ if (vma->vm_flags & VM_GROWSDOWN) {
106048+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106049+ gap_end -= sysctl_heap_stack_gap;
106050+ else
106051+ gap_end = gap_start;
106052+ }
106053 if (gap_end >= low_limit && gap_end - gap_start >= length)
106054 goto found;
106055
106056@@ -1792,7 +2040,7 @@ found:
106057 return gap_start;
106058 }
106059
106060-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
106061+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
106062 {
106063 struct mm_struct *mm = current->mm;
106064 struct vm_area_struct *vma;
106065@@ -1846,6 +2094,24 @@ check_current:
106066 gap_end = vma->vm_start;
106067 if (gap_end < low_limit)
106068 return -ENOMEM;
106069+
106070+ if (gap_end - gap_start > info->threadstack_offset)
106071+ gap_end -= info->threadstack_offset;
106072+ else
106073+ gap_end = gap_start;
106074+
106075+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
106076+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106077+ gap_start += sysctl_heap_stack_gap;
106078+ else
106079+ gap_start = gap_end;
106080+ }
106081+ if (vma->vm_flags & VM_GROWSDOWN) {
106082+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106083+ gap_end -= sysctl_heap_stack_gap;
106084+ else
106085+ gap_end = gap_start;
106086+ }
106087 if (gap_start <= high_limit && gap_end - gap_start >= length)
106088 goto found;
106089
106090@@ -1909,6 +2175,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106091 struct mm_struct *mm = current->mm;
106092 struct vm_area_struct *vma;
106093 struct vm_unmapped_area_info info;
106094+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
106095
106096 if (len > TASK_SIZE - mmap_min_addr)
106097 return -ENOMEM;
106098@@ -1916,11 +2183,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106099 if (flags & MAP_FIXED)
106100 return addr;
106101
106102+#ifdef CONFIG_PAX_RANDMMAP
106103+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
106104+#endif
106105+
106106 if (addr) {
106107 addr = PAGE_ALIGN(addr);
106108 vma = find_vma(mm, addr);
106109 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
106110- (!vma || addr + len <= vma->vm_start))
106111+ check_heap_stack_gap(vma, addr, len, offset))
106112 return addr;
106113 }
106114
106115@@ -1929,6 +2200,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106116 info.low_limit = mm->mmap_base;
106117 info.high_limit = TASK_SIZE;
106118 info.align_mask = 0;
106119+ info.threadstack_offset = offset;
106120 return vm_unmapped_area(&info);
106121 }
106122 #endif
106123@@ -1947,6 +2219,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106124 struct mm_struct *mm = current->mm;
106125 unsigned long addr = addr0;
106126 struct vm_unmapped_area_info info;
106127+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
106128
106129 /* requested length too big for entire address space */
106130 if (len > TASK_SIZE - mmap_min_addr)
106131@@ -1955,12 +2228,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106132 if (flags & MAP_FIXED)
106133 return addr;
106134
106135+#ifdef CONFIG_PAX_RANDMMAP
106136+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
106137+#endif
106138+
106139 /* requesting a specific address */
106140 if (addr) {
106141 addr = PAGE_ALIGN(addr);
106142 vma = find_vma(mm, addr);
106143 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
106144- (!vma || addr + len <= vma->vm_start))
106145+ check_heap_stack_gap(vma, addr, len, offset))
106146 return addr;
106147 }
106148
106149@@ -1969,6 +2246,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106150 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
106151 info.high_limit = mm->mmap_base;
106152 info.align_mask = 0;
106153+ info.threadstack_offset = offset;
106154 addr = vm_unmapped_area(&info);
106155
106156 /*
106157@@ -1981,6 +2259,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106158 VM_BUG_ON(addr != -ENOMEM);
106159 info.flags = 0;
106160 info.low_limit = TASK_UNMAPPED_BASE;
106161+
106162+#ifdef CONFIG_PAX_RANDMMAP
106163+ if (mm->pax_flags & MF_PAX_RANDMMAP)
106164+ info.low_limit += mm->delta_mmap;
106165+#endif
106166+
106167 info.high_limit = TASK_SIZE;
106168 addr = vm_unmapped_area(&info);
106169 }
106170@@ -2081,6 +2365,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
106171 return vma;
106172 }
106173
106174+#ifdef CONFIG_PAX_SEGMEXEC
106175+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
106176+{
106177+ struct vm_area_struct *vma_m;
106178+
106179+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
106180+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
106181+ BUG_ON(vma->vm_mirror);
106182+ return NULL;
106183+ }
106184+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
106185+ vma_m = vma->vm_mirror;
106186+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
106187+ BUG_ON(vma->vm_file != vma_m->vm_file);
106188+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
106189+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
106190+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
106191+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
106192+ return vma_m;
106193+}
106194+#endif
106195+
106196 /*
106197 * Verify that the stack growth is acceptable and
106198 * update accounting. This is shared with both the
106199@@ -2098,8 +2404,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106200
106201 /* Stack limit test */
106202 actual_size = size;
106203- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
106204- actual_size -= PAGE_SIZE;
106205+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
106206 if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
106207 return -ENOMEM;
106208
106209@@ -2110,6 +2415,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106210 locked = mm->locked_vm + grow;
106211 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
106212 limit >>= PAGE_SHIFT;
106213+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
106214 if (locked > limit && !capable(CAP_IPC_LOCK))
106215 return -ENOMEM;
106216 }
106217@@ -2139,37 +2445,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106218 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
106219 * vma is the last one with address > vma->vm_end. Have to extend vma.
106220 */
106221+#ifndef CONFIG_IA64
106222+static
106223+#endif
106224 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
106225 {
106226 int error;
106227+ bool locknext;
106228
106229 if (!(vma->vm_flags & VM_GROWSUP))
106230 return -EFAULT;
106231
106232+ /* Also guard against wrapping around to address 0. */
106233+ if (address < PAGE_ALIGN(address+1))
106234+ address = PAGE_ALIGN(address+1);
106235+ else
106236+ return -ENOMEM;
106237+
106238 /*
106239 * We must make sure the anon_vma is allocated
106240 * so that the anon_vma locking is not a noop.
106241 */
106242 if (unlikely(anon_vma_prepare(vma)))
106243 return -ENOMEM;
106244+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
106245+ if (locknext && anon_vma_prepare(vma->vm_next))
106246+ return -ENOMEM;
106247 vma_lock_anon_vma(vma);
106248+ if (locknext)
106249+ vma_lock_anon_vma(vma->vm_next);
106250
106251 /*
106252 * vma->vm_start/vm_end cannot change under us because the caller
106253 * is required to hold the mmap_sem in read mode. We need the
106254- * anon_vma lock to serialize against concurrent expand_stacks.
106255- * Also guard against wrapping around to address 0.
106256+ * anon_vma locks to serialize against concurrent expand_stacks
106257+ * and expand_upwards.
106258 */
106259- if (address < PAGE_ALIGN(address+4))
106260- address = PAGE_ALIGN(address+4);
106261- else {
106262- vma_unlock_anon_vma(vma);
106263- return -ENOMEM;
106264- }
106265 error = 0;
106266
106267 /* Somebody else might have raced and expanded it already */
106268- if (address > vma->vm_end) {
106269+ 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)
106270+ error = -ENOMEM;
106271+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
106272 unsigned long size, grow;
106273
106274 size = address - vma->vm_start;
106275@@ -2204,6 +2521,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
106276 }
106277 }
106278 }
106279+ if (locknext)
106280+ vma_unlock_anon_vma(vma->vm_next);
106281 vma_unlock_anon_vma(vma);
106282 khugepaged_enter_vma_merge(vma, vma->vm_flags);
106283 validate_mm(vma->vm_mm);
106284@@ -2218,6 +2537,8 @@ int expand_downwards(struct vm_area_struct *vma,
106285 unsigned long address)
106286 {
106287 int error;
106288+ bool lockprev = false;
106289+ struct vm_area_struct *prev;
106290
106291 /*
106292 * We must make sure the anon_vma is allocated
106293@@ -2231,6 +2552,15 @@ int expand_downwards(struct vm_area_struct *vma,
106294 if (error)
106295 return error;
106296
106297+ prev = vma->vm_prev;
106298+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
106299+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
106300+#endif
106301+ if (lockprev && anon_vma_prepare(prev))
106302+ return -ENOMEM;
106303+ if (lockprev)
106304+ vma_lock_anon_vma(prev);
106305+
106306 vma_lock_anon_vma(vma);
106307
106308 /*
106309@@ -2240,9 +2570,17 @@ int expand_downwards(struct vm_area_struct *vma,
106310 */
106311
106312 /* Somebody else might have raced and expanded it already */
106313- if (address < vma->vm_start) {
106314+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
106315+ error = -ENOMEM;
106316+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
106317 unsigned long size, grow;
106318
106319+#ifdef CONFIG_PAX_SEGMEXEC
106320+ struct vm_area_struct *vma_m;
106321+
106322+ vma_m = pax_find_mirror_vma(vma);
106323+#endif
106324+
106325 size = vma->vm_end - address;
106326 grow = (vma->vm_start - address) >> PAGE_SHIFT;
106327
106328@@ -2267,13 +2605,27 @@ int expand_downwards(struct vm_area_struct *vma,
106329 vma->vm_pgoff -= grow;
106330 anon_vma_interval_tree_post_update_vma(vma);
106331 vma_gap_update(vma);
106332+
106333+#ifdef CONFIG_PAX_SEGMEXEC
106334+ if (vma_m) {
106335+ anon_vma_interval_tree_pre_update_vma(vma_m);
106336+ vma_m->vm_start -= grow << PAGE_SHIFT;
106337+ vma_m->vm_pgoff -= grow;
106338+ anon_vma_interval_tree_post_update_vma(vma_m);
106339+ vma_gap_update(vma_m);
106340+ }
106341+#endif
106342+
106343 spin_unlock(&vma->vm_mm->page_table_lock);
106344
106345+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
106346 perf_event_mmap(vma);
106347 }
106348 }
106349 }
106350 vma_unlock_anon_vma(vma);
106351+ if (lockprev)
106352+ vma_unlock_anon_vma(prev);
106353 khugepaged_enter_vma_merge(vma, vma->vm_flags);
106354 validate_mm(vma->vm_mm);
106355 return error;
106356@@ -2373,6 +2725,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
106357 do {
106358 long nrpages = vma_pages(vma);
106359
106360+#ifdef CONFIG_PAX_SEGMEXEC
106361+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
106362+ vma = remove_vma(vma);
106363+ continue;
106364+ }
106365+#endif
106366+
106367 if (vma->vm_flags & VM_ACCOUNT)
106368 nr_accounted += nrpages;
106369 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
106370@@ -2417,6 +2776,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
106371 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
106372 vma->vm_prev = NULL;
106373 do {
106374+
106375+#ifdef CONFIG_PAX_SEGMEXEC
106376+ if (vma->vm_mirror) {
106377+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
106378+ vma->vm_mirror->vm_mirror = NULL;
106379+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
106380+ vma->vm_mirror = NULL;
106381+ }
106382+#endif
106383+
106384 vma_rb_erase(vma, &mm->mm_rb);
106385 mm->map_count--;
106386 tail_vma = vma;
106387@@ -2444,14 +2813,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106388 struct vm_area_struct *new;
106389 int err = -ENOMEM;
106390
106391+#ifdef CONFIG_PAX_SEGMEXEC
106392+ struct vm_area_struct *vma_m, *new_m = NULL;
106393+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
106394+#endif
106395+
106396 if (is_vm_hugetlb_page(vma) && (addr &
106397 ~(huge_page_mask(hstate_vma(vma)))))
106398 return -EINVAL;
106399
106400+#ifdef CONFIG_PAX_SEGMEXEC
106401+ vma_m = pax_find_mirror_vma(vma);
106402+#endif
106403+
106404 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
106405 if (!new)
106406 goto out_err;
106407
106408+#ifdef CONFIG_PAX_SEGMEXEC
106409+ if (vma_m) {
106410+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
106411+ if (!new_m) {
106412+ kmem_cache_free(vm_area_cachep, new);
106413+ goto out_err;
106414+ }
106415+ }
106416+#endif
106417+
106418 /* most fields are the same, copy all, and then fixup */
106419 *new = *vma;
106420
106421@@ -2464,6 +2852,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106422 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
106423 }
106424
106425+#ifdef CONFIG_PAX_SEGMEXEC
106426+ if (vma_m) {
106427+ *new_m = *vma_m;
106428+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
106429+ new_m->vm_mirror = new;
106430+ new->vm_mirror = new_m;
106431+
106432+ if (new_below)
106433+ new_m->vm_end = addr_m;
106434+ else {
106435+ new_m->vm_start = addr_m;
106436+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
106437+ }
106438+ }
106439+#endif
106440+
106441 err = vma_dup_policy(vma, new);
106442 if (err)
106443 goto out_free_vma;
106444@@ -2484,6 +2888,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106445 else
106446 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
106447
106448+#ifdef CONFIG_PAX_SEGMEXEC
106449+ if (!err && vma_m) {
106450+ struct mempolicy *pol = vma_policy(new);
106451+
106452+ if (anon_vma_clone(new_m, vma_m))
106453+ goto out_free_mpol;
106454+
106455+ mpol_get(pol);
106456+ set_vma_policy(new_m, pol);
106457+
106458+ if (new_m->vm_file)
106459+ get_file(new_m->vm_file);
106460+
106461+ if (new_m->vm_ops && new_m->vm_ops->open)
106462+ new_m->vm_ops->open(new_m);
106463+
106464+ if (new_below)
106465+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
106466+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
106467+ else
106468+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
106469+
106470+ if (err) {
106471+ if (new_m->vm_ops && new_m->vm_ops->close)
106472+ new_m->vm_ops->close(new_m);
106473+ if (new_m->vm_file)
106474+ fput(new_m->vm_file);
106475+ mpol_put(pol);
106476+ }
106477+ }
106478+#endif
106479+
106480 /* Success. */
106481 if (!err)
106482 return 0;
106483@@ -2493,10 +2929,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106484 new->vm_ops->close(new);
106485 if (new->vm_file)
106486 fput(new->vm_file);
106487- unlink_anon_vmas(new);
106488 out_free_mpol:
106489 mpol_put(vma_policy(new));
106490 out_free_vma:
106491+
106492+#ifdef CONFIG_PAX_SEGMEXEC
106493+ if (new_m) {
106494+ unlink_anon_vmas(new_m);
106495+ kmem_cache_free(vm_area_cachep, new_m);
106496+ }
106497+#endif
106498+
106499+ unlink_anon_vmas(new);
106500 kmem_cache_free(vm_area_cachep, new);
106501 out_err:
106502 return err;
106503@@ -2509,6 +2953,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106504 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106505 unsigned long addr, int new_below)
106506 {
106507+
106508+#ifdef CONFIG_PAX_SEGMEXEC
106509+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
106510+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
106511+ if (mm->map_count >= sysctl_max_map_count-1)
106512+ return -ENOMEM;
106513+ } else
106514+#endif
106515+
106516 if (mm->map_count >= sysctl_max_map_count)
106517 return -ENOMEM;
106518
106519@@ -2520,11 +2973,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106520 * work. This now handles partial unmappings.
106521 * Jeremy Fitzhardinge <jeremy@goop.org>
106522 */
106523+#ifdef CONFIG_PAX_SEGMEXEC
106524 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106525 {
106526+ int ret = __do_munmap(mm, start, len);
106527+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
106528+ return ret;
106529+
106530+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
106531+}
106532+
106533+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106534+#else
106535+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106536+#endif
106537+{
106538 unsigned long end;
106539 struct vm_area_struct *vma, *prev, *last;
106540
106541+ /*
106542+ * mm->mmap_sem is required to protect against another thread
106543+ * changing the mappings in case we sleep.
106544+ */
106545+ verify_mm_writelocked(mm);
106546+
106547 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
106548 return -EINVAL;
106549
106550@@ -2602,6 +3074,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106551 /* Fix up all other VM information */
106552 remove_vma_list(mm, vma);
106553
106554+ track_exec_limit(mm, start, end, 0UL);
106555+
106556 return 0;
106557 }
106558
106559@@ -2610,6 +3084,13 @@ int vm_munmap(unsigned long start, size_t len)
106560 int ret;
106561 struct mm_struct *mm = current->mm;
106562
106563+
106564+#ifdef CONFIG_PAX_SEGMEXEC
106565+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
106566+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
106567+ return -EINVAL;
106568+#endif
106569+
106570 down_write(&mm->mmap_sem);
106571 ret = do_munmap(mm, start, len);
106572 up_write(&mm->mmap_sem);
106573@@ -2656,6 +3137,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
106574 down_write(&mm->mmap_sem);
106575 vma = find_vma(mm, start);
106576
106577+#ifdef CONFIG_PAX_SEGMEXEC
106578+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
106579+ goto out;
106580+#endif
106581+
106582 if (!vma || !(vma->vm_flags & VM_SHARED))
106583 goto out;
106584
106585@@ -2692,16 +3178,6 @@ out:
106586 return ret;
106587 }
106588
106589-static inline void verify_mm_writelocked(struct mm_struct *mm)
106590-{
106591-#ifdef CONFIG_DEBUG_VM
106592- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
106593- WARN_ON(1);
106594- up_read(&mm->mmap_sem);
106595- }
106596-#endif
106597-}
106598-
106599 /*
106600 * this is really a simplified "do_mmap". it only handles
106601 * anonymous maps. eventually we may be able to do some
106602@@ -2715,6 +3191,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106603 struct rb_node **rb_link, *rb_parent;
106604 pgoff_t pgoff = addr >> PAGE_SHIFT;
106605 int error;
106606+ unsigned long charged;
106607
106608 len = PAGE_ALIGN(len);
106609 if (!len)
106610@@ -2722,10 +3199,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106611
106612 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
106613
106614+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
106615+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
106616+ flags &= ~VM_EXEC;
106617+
106618+#ifdef CONFIG_PAX_MPROTECT
106619+ if (mm->pax_flags & MF_PAX_MPROTECT)
106620+ flags &= ~VM_MAYEXEC;
106621+#endif
106622+
106623+ }
106624+#endif
106625+
106626 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
106627 if (error & ~PAGE_MASK)
106628 return error;
106629
106630+ charged = len >> PAGE_SHIFT;
106631+
106632 error = mlock_future_check(mm, mm->def_flags, len);
106633 if (error)
106634 return error;
106635@@ -2739,21 +3230,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106636 /*
106637 * Clear old maps. this also does some error checking for us
106638 */
106639- munmap_back:
106640 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
106641 if (do_munmap(mm, addr, len))
106642 return -ENOMEM;
106643- goto munmap_back;
106644+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
106645 }
106646
106647 /* Check against address space limits *after* clearing old maps... */
106648- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
106649+ if (!may_expand_vm(mm, charged))
106650 return -ENOMEM;
106651
106652 if (mm->map_count > sysctl_max_map_count)
106653 return -ENOMEM;
106654
106655- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
106656+ if (security_vm_enough_memory_mm(mm, charged))
106657 return -ENOMEM;
106658
106659 /* Can we just expand an old private anonymous mapping? */
106660@@ -2767,7 +3257,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106661 */
106662 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106663 if (!vma) {
106664- vm_unacct_memory(len >> PAGE_SHIFT);
106665+ vm_unacct_memory(charged);
106666 return -ENOMEM;
106667 }
106668
106669@@ -2781,10 +3271,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106670 vma_link(mm, vma, prev, rb_link, rb_parent);
106671 out:
106672 perf_event_mmap(vma);
106673- mm->total_vm += len >> PAGE_SHIFT;
106674+ mm->total_vm += charged;
106675 if (flags & VM_LOCKED)
106676- mm->locked_vm += (len >> PAGE_SHIFT);
106677+ mm->locked_vm += charged;
106678 vma->vm_flags |= VM_SOFTDIRTY;
106679+ track_exec_limit(mm, addr, addr + len, flags);
106680 return addr;
106681 }
106682
106683@@ -2846,6 +3337,7 @@ void exit_mmap(struct mm_struct *mm)
106684 while (vma) {
106685 if (vma->vm_flags & VM_ACCOUNT)
106686 nr_accounted += vma_pages(vma);
106687+ vma->vm_mirror = NULL;
106688 vma = remove_vma(vma);
106689 }
106690 vm_unacct_memory(nr_accounted);
106691@@ -2860,6 +3352,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
106692 struct vm_area_struct *prev;
106693 struct rb_node **rb_link, *rb_parent;
106694
106695+#ifdef CONFIG_PAX_SEGMEXEC
106696+ struct vm_area_struct *vma_m = NULL;
106697+#endif
106698+
106699+ if (security_mmap_addr(vma->vm_start))
106700+ return -EPERM;
106701+
106702 /*
106703 * The vm_pgoff of a purely anonymous vma should be irrelevant
106704 * until its first write fault, when page's anon_vma and index
106705@@ -2883,7 +3382,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
106706 security_vm_enough_memory_mm(mm, vma_pages(vma)))
106707 return -ENOMEM;
106708
106709+#ifdef CONFIG_PAX_SEGMEXEC
106710+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
106711+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106712+ if (!vma_m)
106713+ return -ENOMEM;
106714+ }
106715+#endif
106716+
106717 vma_link(mm, vma, prev, rb_link, rb_parent);
106718+
106719+#ifdef CONFIG_PAX_SEGMEXEC
106720+ if (vma_m)
106721+ BUG_ON(pax_mirror_vma(vma_m, vma));
106722+#endif
106723+
106724 return 0;
106725 }
106726
106727@@ -2902,6 +3415,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
106728 struct rb_node **rb_link, *rb_parent;
106729 bool faulted_in_anon_vma = true;
106730
106731+ BUG_ON(vma->vm_mirror);
106732+
106733 /*
106734 * If anonymous vma has not yet been faulted, update new pgoff
106735 * to match new location, to increase its chance of merging.
106736@@ -2966,6 +3481,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
106737 return NULL;
106738 }
106739
106740+#ifdef CONFIG_PAX_SEGMEXEC
106741+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
106742+{
106743+ struct vm_area_struct *prev_m;
106744+ struct rb_node **rb_link_m, *rb_parent_m;
106745+ struct mempolicy *pol_m;
106746+
106747+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
106748+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
106749+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
106750+ *vma_m = *vma;
106751+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
106752+ if (anon_vma_clone(vma_m, vma))
106753+ return -ENOMEM;
106754+ pol_m = vma_policy(vma_m);
106755+ mpol_get(pol_m);
106756+ set_vma_policy(vma_m, pol_m);
106757+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
106758+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
106759+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
106760+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
106761+ if (vma_m->vm_file)
106762+ get_file(vma_m->vm_file);
106763+ if (vma_m->vm_ops && vma_m->vm_ops->open)
106764+ vma_m->vm_ops->open(vma_m);
106765+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
106766+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
106767+ vma_m->vm_mirror = vma;
106768+ vma->vm_mirror = vma_m;
106769+ return 0;
106770+}
106771+#endif
106772+
106773 /*
106774 * Return true if the calling process may expand its vm space by the passed
106775 * number of pages
106776@@ -2977,6 +3525,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
106777
106778 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
106779
106780+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
106781 if (cur + npages > lim)
106782 return 0;
106783 return 1;
106784@@ -3059,6 +3608,22 @@ static struct vm_area_struct *__install_special_mapping(
106785 vma->vm_start = addr;
106786 vma->vm_end = addr + len;
106787
106788+#ifdef CONFIG_PAX_MPROTECT
106789+ if (mm->pax_flags & MF_PAX_MPROTECT) {
106790+#ifndef CONFIG_PAX_MPROTECT_COMPAT
106791+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
106792+ return ERR_PTR(-EPERM);
106793+ if (!(vm_flags & VM_EXEC))
106794+ vm_flags &= ~VM_MAYEXEC;
106795+#else
106796+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
106797+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
106798+#endif
106799+ else
106800+ vm_flags &= ~VM_MAYWRITE;
106801+ }
106802+#endif
106803+
106804 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
106805 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
106806
106807diff --git a/mm/mprotect.c b/mm/mprotect.c
106808index 8858483..8145fa5 100644
106809--- a/mm/mprotect.c
106810+++ b/mm/mprotect.c
106811@@ -24,10 +24,18 @@
106812 #include <linux/migrate.h>
106813 #include <linux/perf_event.h>
106814 #include <linux/ksm.h>
106815+#include <linux/sched/sysctl.h>
106816+
106817+#ifdef CONFIG_PAX_MPROTECT
106818+#include <linux/elf.h>
106819+#include <linux/binfmts.h>
106820+#endif
106821+
106822 #include <asm/uaccess.h>
106823 #include <asm/pgtable.h>
106824 #include <asm/cacheflush.h>
106825 #include <asm/tlbflush.h>
106826+#include <asm/mmu_context.h>
106827
106828 /*
106829 * For a prot_numa update we only hold mmap_sem for read so there is a
106830@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
106831 return pages;
106832 }
106833
106834+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
106835+/* called while holding the mmap semaphor for writing except stack expansion */
106836+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
106837+{
106838+ unsigned long oldlimit, newlimit = 0UL;
106839+
106840+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
106841+ return;
106842+
106843+ spin_lock(&mm->page_table_lock);
106844+ oldlimit = mm->context.user_cs_limit;
106845+ if ((prot & VM_EXEC) && oldlimit < end)
106846+ /* USER_CS limit moved up */
106847+ newlimit = end;
106848+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
106849+ /* USER_CS limit moved down */
106850+ newlimit = start;
106851+
106852+ if (newlimit) {
106853+ mm->context.user_cs_limit = newlimit;
106854+
106855+#ifdef CONFIG_SMP
106856+ wmb();
106857+ cpus_clear(mm->context.cpu_user_cs_mask);
106858+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
106859+#endif
106860+
106861+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
106862+ }
106863+ spin_unlock(&mm->page_table_lock);
106864+ if (newlimit == end) {
106865+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
106866+
106867+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
106868+ if (is_vm_hugetlb_page(vma))
106869+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
106870+ else
106871+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
106872+ }
106873+}
106874+#endif
106875+
106876 int
106877 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
106878 unsigned long start, unsigned long end, unsigned long newflags)
106879@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
106880 int error;
106881 int dirty_accountable = 0;
106882
106883+#ifdef CONFIG_PAX_SEGMEXEC
106884+ struct vm_area_struct *vma_m = NULL;
106885+ unsigned long start_m, end_m;
106886+
106887+ start_m = start + SEGMEXEC_TASK_SIZE;
106888+ end_m = end + SEGMEXEC_TASK_SIZE;
106889+#endif
106890+
106891 if (newflags == oldflags) {
106892 *pprev = vma;
106893 return 0;
106894 }
106895
106896+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
106897+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
106898+
106899+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
106900+ return -ENOMEM;
106901+
106902+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
106903+ return -ENOMEM;
106904+ }
106905+
106906 /*
106907 * If we make a private mapping writable we increase our commit;
106908 * but (without finer accounting) cannot reduce our commit if we
106909@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
106910 }
106911 }
106912
106913+#ifdef CONFIG_PAX_SEGMEXEC
106914+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
106915+ if (start != vma->vm_start) {
106916+ error = split_vma(mm, vma, start, 1);
106917+ if (error)
106918+ goto fail;
106919+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
106920+ *pprev = (*pprev)->vm_next;
106921+ }
106922+
106923+ if (end != vma->vm_end) {
106924+ error = split_vma(mm, vma, end, 0);
106925+ if (error)
106926+ goto fail;
106927+ }
106928+
106929+ if (pax_find_mirror_vma(vma)) {
106930+ error = __do_munmap(mm, start_m, end_m - start_m);
106931+ if (error)
106932+ goto fail;
106933+ } else {
106934+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106935+ if (!vma_m) {
106936+ error = -ENOMEM;
106937+ goto fail;
106938+ }
106939+ vma->vm_flags = newflags;
106940+ error = pax_mirror_vma(vma_m, vma);
106941+ if (error) {
106942+ vma->vm_flags = oldflags;
106943+ goto fail;
106944+ }
106945+ }
106946+ }
106947+#endif
106948+
106949 /*
106950 * First try to merge with previous and/or next vma.
106951 */
106952@@ -315,7 +419,19 @@ success:
106953 * vm_flags and vm_page_prot are protected by the mmap_sem
106954 * held in write mode.
106955 */
106956+
106957+#ifdef CONFIG_PAX_SEGMEXEC
106958+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
106959+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
106960+#endif
106961+
106962 vma->vm_flags = newflags;
106963+
106964+#ifdef CONFIG_PAX_MPROTECT
106965+ if (mm->binfmt && mm->binfmt->handle_mprotect)
106966+ mm->binfmt->handle_mprotect(vma, newflags);
106967+#endif
106968+
106969 dirty_accountable = vma_wants_writenotify(vma);
106970 vma_set_page_prot(vma);
106971
106972@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
106973 end = start + len;
106974 if (end <= start)
106975 return -ENOMEM;
106976+
106977+#ifdef CONFIG_PAX_SEGMEXEC
106978+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
106979+ if (end > SEGMEXEC_TASK_SIZE)
106980+ return -EINVAL;
106981+ } else
106982+#endif
106983+
106984+ if (end > TASK_SIZE)
106985+ return -EINVAL;
106986+
106987 if (!arch_validate_prot(prot))
106988 return -EINVAL;
106989
106990@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
106991 /*
106992 * Does the application expect PROT_READ to imply PROT_EXEC:
106993 */
106994- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
106995+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
106996 prot |= PROT_EXEC;
106997
106998 vm_flags = calc_vm_prot_bits(prot);
106999@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107000 if (start > vma->vm_start)
107001 prev = vma;
107002
107003+#ifdef CONFIG_PAX_MPROTECT
107004+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
107005+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
107006+#endif
107007+
107008 for (nstart = start ; ; ) {
107009 unsigned long newflags;
107010
107011@@ -400,6 +532,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107012
107013 /* newflags >> 4 shift VM_MAY% in place of VM_% */
107014 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
107015+ if (prot & (PROT_WRITE | PROT_EXEC))
107016+ gr_log_rwxmprotect(vma);
107017+
107018+ error = -EACCES;
107019+ goto out;
107020+ }
107021+
107022+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
107023 error = -EACCES;
107024 goto out;
107025 }
107026@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107027 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
107028 if (error)
107029 goto out;
107030+
107031+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
107032+
107033 nstart = tmp;
107034
107035 if (nstart < prev->vm_end)
107036diff --git a/mm/mremap.c b/mm/mremap.c
107037index 2dc44b1..caa1819 100644
107038--- a/mm/mremap.c
107039+++ b/mm/mremap.c
107040@@ -142,6 +142,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
107041 continue;
107042 pte = ptep_get_and_clear(mm, old_addr, old_pte);
107043 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
107044+
107045+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
107046+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
107047+ pte = pte_exprotect(pte);
107048+#endif
107049+
107050 pte = move_soft_dirty_pte(pte);
107051 set_pte_at(mm, new_addr, new_pte, pte);
107052 }
107053@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
107054 if (is_vm_hugetlb_page(vma))
107055 goto Einval;
107056
107057+#ifdef CONFIG_PAX_SEGMEXEC
107058+ if (pax_find_mirror_vma(vma))
107059+ goto Einval;
107060+#endif
107061+
107062 /* We can't remap across vm area boundaries */
107063 if (old_len > vma->vm_end - addr)
107064 goto Efault;
107065@@ -405,20 +416,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
107066 unsigned long ret = -EINVAL;
107067 unsigned long charged = 0;
107068 unsigned long map_flags;
107069+ unsigned long pax_task_size = TASK_SIZE;
107070
107071 if (new_addr & ~PAGE_MASK)
107072 goto out;
107073
107074- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
107075+#ifdef CONFIG_PAX_SEGMEXEC
107076+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
107077+ pax_task_size = SEGMEXEC_TASK_SIZE;
107078+#endif
107079+
107080+ pax_task_size -= PAGE_SIZE;
107081+
107082+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
107083 goto out;
107084
107085 /* Check if the location we're moving into overlaps the
107086 * old location at all, and fail if it does.
107087 */
107088- if ((new_addr <= addr) && (new_addr+new_len) > addr)
107089- goto out;
107090-
107091- if ((addr <= new_addr) && (addr+old_len) > new_addr)
107092+ if (addr + old_len > new_addr && new_addr + new_len > addr)
107093 goto out;
107094
107095 ret = do_munmap(mm, new_addr, new_len);
107096@@ -487,6 +503,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107097 unsigned long ret = -EINVAL;
107098 unsigned long charged = 0;
107099 bool locked = false;
107100+ unsigned long pax_task_size = TASK_SIZE;
107101
107102 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
107103 return ret;
107104@@ -508,6 +525,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107105 if (!new_len)
107106 return ret;
107107
107108+#ifdef CONFIG_PAX_SEGMEXEC
107109+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
107110+ pax_task_size = SEGMEXEC_TASK_SIZE;
107111+#endif
107112+
107113+ pax_task_size -= PAGE_SIZE;
107114+
107115+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
107116+ old_len > pax_task_size || addr > pax_task_size-old_len)
107117+ return ret;
107118+
107119 down_write(&current->mm->mmap_sem);
107120
107121 if (flags & MREMAP_FIXED) {
107122@@ -558,6 +586,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107123 new_addr = addr;
107124 }
107125 ret = addr;
107126+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
107127 goto out;
107128 }
107129 }
107130@@ -581,7 +610,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107131 goto out;
107132 }
107133
107134+ map_flags = vma->vm_flags;
107135 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
107136+ if (!(ret & ~PAGE_MASK)) {
107137+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
107138+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
107139+ }
107140 }
107141 out:
107142 if (ret & ~PAGE_MASK)
107143diff --git a/mm/nommu.c b/mm/nommu.c
107144index 3fba2dc..fdad748 100644
107145--- a/mm/nommu.c
107146+++ b/mm/nommu.c
107147@@ -72,7 +72,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
107148 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
107149 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
107150 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
107151-int heap_stack_gap = 0;
107152
107153 atomic_long_t mmap_pages_allocated;
107154
107155@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
107156 EXPORT_SYMBOL(find_vma);
107157
107158 /*
107159- * find a VMA
107160- * - we don't extend stack VMAs under NOMMU conditions
107161- */
107162-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
107163-{
107164- return find_vma(mm, addr);
107165-}
107166-
107167-/*
107168 * expand a stack to a given address
107169 * - not supported under NOMMU conditions
107170 */
107171@@ -1585,6 +1575,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
107172
107173 /* most fields are the same, copy all, and then fixup */
107174 *new = *vma;
107175+ INIT_LIST_HEAD(&new->anon_vma_chain);
107176 *region = *vma->vm_region;
107177 new->vm_region = region;
107178
107179@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
107180 }
107181 EXPORT_SYMBOL(filemap_map_pages);
107182
107183-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107184- unsigned long addr, void *buf, int len, int write)
107185+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107186+ unsigned long addr, void *buf, size_t len, int write)
107187 {
107188 struct vm_area_struct *vma;
107189
107190@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107191 *
107192 * The caller must hold a reference on @mm.
107193 */
107194-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
107195- void *buf, int len, int write)
107196+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
107197+ void *buf, size_t len, int write)
107198 {
107199 return __access_remote_vm(NULL, mm, addr, buf, len, write);
107200 }
107201@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
107202 * Access another process' address space.
107203 * - source/target buffer must be kernel space
107204 */
107205-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
107206+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
107207 {
107208 struct mm_struct *mm;
107209
107210diff --git a/mm/page-writeback.c b/mm/page-writeback.c
107211index ad05f2f..cee723a 100644
107212--- a/mm/page-writeback.c
107213+++ b/mm/page-writeback.c
107214@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
107215 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
107216 * - the bdi dirty thresh drops quickly due to change of JBOD workload
107217 */
107218-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
107219+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
107220 unsigned long thresh,
107221 unsigned long bg_thresh,
107222 unsigned long dirty,
107223diff --git a/mm/page_alloc.c b/mm/page_alloc.c
107224index 40e2942..0eb29a2 100644
107225--- a/mm/page_alloc.c
107226+++ b/mm/page_alloc.c
107227@@ -61,6 +61,7 @@
107228 #include <linux/hugetlb.h>
107229 #include <linux/sched/rt.h>
107230 #include <linux/page_owner.h>
107231+#include <linux/random.h>
107232
107233 #include <asm/sections.h>
107234 #include <asm/tlbflush.h>
107235@@ -357,7 +358,7 @@ out:
107236 * This usage means that zero-order pages may not be compound.
107237 */
107238
107239-static void free_compound_page(struct page *page)
107240+void free_compound_page(struct page *page)
107241 {
107242 __free_pages_ok(page, compound_order(page));
107243 }
107244@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
107245 __mod_zone_freepage_state(zone, (1 << order), migratetype);
107246 }
107247 #else
107248-struct page_ext_operations debug_guardpage_ops = { NULL, };
107249+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
107250 static inline void set_page_guard(struct zone *zone, struct page *page,
107251 unsigned int order, int migratetype) {}
107252 static inline void clear_page_guard(struct zone *zone, struct page *page,
107253@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
107254 bool compound = PageCompound(page);
107255 int i, bad = 0;
107256
107257+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107258+ unsigned long index = 1UL << order;
107259+#endif
107260+
107261 VM_BUG_ON_PAGE(PageTail(page), page);
107262 VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
107263
107264@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
107265 debug_check_no_obj_freed(page_address(page),
107266 PAGE_SIZE << order);
107267 }
107268+
107269+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107270+ for (; index; --index)
107271+ sanitize_highpage(page + index - 1);
107272+#endif
107273+
107274 arch_free_page(page, order);
107275 kernel_map_pages(page, 1 << order, 0);
107276
107277@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
107278 local_irq_restore(flags);
107279 }
107280
107281+#ifdef CONFIG_PAX_LATENT_ENTROPY
107282+bool __meminitdata extra_latent_entropy;
107283+
107284+static int __init setup_pax_extra_latent_entropy(char *str)
107285+{
107286+ extra_latent_entropy = true;
107287+ return 0;
107288+}
107289+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
107290+
107291+volatile u64 latent_entropy __latent_entropy;
107292+EXPORT_SYMBOL(latent_entropy);
107293+#endif
107294+
107295 void __init __free_pages_bootmem(struct page *page, unsigned int order)
107296 {
107297 unsigned int nr_pages = 1 << order;
107298@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
107299 __ClearPageReserved(p);
107300 set_page_count(p, 0);
107301
107302+#ifdef CONFIG_PAX_LATENT_ENTROPY
107303+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
107304+ u64 hash = 0;
107305+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
107306+ const u64 *data = lowmem_page_address(page);
107307+
107308+ for (index = 0; index < end; index++)
107309+ hash ^= hash + data[index];
107310+ latent_entropy ^= hash;
107311+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
107312+ }
107313+#endif
107314+
107315 page_zone(page)->managed_pages += nr_pages;
107316 set_page_refcounted(page);
107317 __free_pages(page, order);
107318@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
107319 kernel_map_pages(page, 1 << order, 1);
107320 kasan_alloc_pages(page, order);
107321
107322+#ifndef CONFIG_PAX_MEMORY_SANITIZE
107323 if (gfp_flags & __GFP_ZERO)
107324 prep_zero_page(page, order, gfp_flags);
107325+#endif
107326
107327 if (order && (gfp_flags & __GFP_COMP))
107328 prep_compound_page(page, order);
107329@@ -1699,7 +1739,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
107330 }
107331
107332 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
107333- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
107334+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
107335 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
107336 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
107337
107338@@ -2018,7 +2058,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
107339 do {
107340 mod_zone_page_state(zone, NR_ALLOC_BATCH,
107341 high_wmark_pages(zone) - low_wmark_pages(zone) -
107342- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
107343+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
107344 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
107345 } while (zone++ != preferred_zone);
107346 }
107347@@ -5738,7 +5778,7 @@ static void __setup_per_zone_wmarks(void)
107348
107349 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
107350 high_wmark_pages(zone) - low_wmark_pages(zone) -
107351- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
107352+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
107353
107354 setup_zone_migrate_reserve(zone);
107355 spin_unlock_irqrestore(&zone->lock, flags);
107356diff --git a/mm/percpu.c b/mm/percpu.c
107357index 73c97a5..508ee25 100644
107358--- a/mm/percpu.c
107359+++ b/mm/percpu.c
107360@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
107361 static unsigned int pcpu_high_unit_cpu __read_mostly;
107362
107363 /* the address of the first chunk which starts with the kernel static area */
107364-void *pcpu_base_addr __read_mostly;
107365+void *pcpu_base_addr __read_only;
107366 EXPORT_SYMBOL_GPL(pcpu_base_addr);
107367
107368 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
107369diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
107370index b159769..d07037f 100644
107371--- a/mm/process_vm_access.c
107372+++ b/mm/process_vm_access.c
107373@@ -13,6 +13,7 @@
107374 #include <linux/uio.h>
107375 #include <linux/sched.h>
107376 #include <linux/highmem.h>
107377+#include <linux/security.h>
107378 #include <linux/ptrace.h>
107379 #include <linux/slab.h>
107380 #include <linux/syscalls.h>
107381@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
107382 ssize_t iov_len;
107383 size_t total_len = iov_iter_count(iter);
107384
107385+ return -ENOSYS; // PaX: until properly audited
107386+
107387 /*
107388 * Work out how many pages of struct pages we're going to need
107389 * when eventually calling get_user_pages
107390 */
107391 for (i = 0; i < riovcnt; i++) {
107392 iov_len = rvec[i].iov_len;
107393- if (iov_len > 0) {
107394- nr_pages_iov = ((unsigned long)rvec[i].iov_base
107395- + iov_len)
107396- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
107397- / PAGE_SIZE + 1;
107398- nr_pages = max(nr_pages, nr_pages_iov);
107399- }
107400+ if (iov_len <= 0)
107401+ continue;
107402+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
107403+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
107404+ nr_pages = max(nr_pages, nr_pages_iov);
107405 }
107406
107407 if (nr_pages == 0)
107408@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
107409 goto free_proc_pages;
107410 }
107411
107412+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
107413+ rc = -EPERM;
107414+ goto put_task_struct;
107415+ }
107416+
107417 mm = mm_access(task, PTRACE_MODE_ATTACH);
107418 if (!mm || IS_ERR(mm)) {
107419 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
107420diff --git a/mm/rmap.c b/mm/rmap.c
107421index c161a14..8a069bb 100644
107422--- a/mm/rmap.c
107423+++ b/mm/rmap.c
107424@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107425 struct anon_vma *anon_vma = vma->anon_vma;
107426 struct anon_vma_chain *avc;
107427
107428+#ifdef CONFIG_PAX_SEGMEXEC
107429+ struct anon_vma_chain *avc_m = NULL;
107430+#endif
107431+
107432 might_sleep();
107433 if (unlikely(!anon_vma)) {
107434 struct mm_struct *mm = vma->vm_mm;
107435@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107436 if (!avc)
107437 goto out_enomem;
107438
107439+#ifdef CONFIG_PAX_SEGMEXEC
107440+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
107441+ if (!avc_m)
107442+ goto out_enomem_free_avc;
107443+#endif
107444+
107445 anon_vma = find_mergeable_anon_vma(vma);
107446 allocated = NULL;
107447 if (!anon_vma) {
107448@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107449 /* page_table_lock to protect against threads */
107450 spin_lock(&mm->page_table_lock);
107451 if (likely(!vma->anon_vma)) {
107452+
107453+#ifdef CONFIG_PAX_SEGMEXEC
107454+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
107455+
107456+ if (vma_m) {
107457+ BUG_ON(vma_m->anon_vma);
107458+ vma_m->anon_vma = anon_vma;
107459+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
107460+ anon_vma->degree++;
107461+ avc_m = NULL;
107462+ }
107463+#endif
107464+
107465 vma->anon_vma = anon_vma;
107466 anon_vma_chain_link(vma, avc, anon_vma);
107467 /* vma reference or self-parent link for new root */
107468@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107469
107470 if (unlikely(allocated))
107471 put_anon_vma(allocated);
107472+
107473+#ifdef CONFIG_PAX_SEGMEXEC
107474+ if (unlikely(avc_m))
107475+ anon_vma_chain_free(avc_m);
107476+#endif
107477+
107478 if (unlikely(avc))
107479 anon_vma_chain_free(avc);
107480 }
107481 return 0;
107482
107483 out_enomem_free_avc:
107484+
107485+#ifdef CONFIG_PAX_SEGMEXEC
107486+ if (avc_m)
107487+ anon_vma_chain_free(avc_m);
107488+#endif
107489+
107490 anon_vma_chain_free(avc);
107491 out_enomem:
107492 return -ENOMEM;
107493@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
107494 * good chance of avoiding scanning the whole hierarchy when it searches where
107495 * page is mapped.
107496 */
107497-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
107498+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
107499 {
107500 struct anon_vma_chain *avc, *pavc;
107501 struct anon_vma *root = NULL;
107502@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
107503 * the corresponding VMA in the parent process is attached to.
107504 * Returns 0 on success, non-zero on failure.
107505 */
107506-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
107507+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
107508 {
107509 struct anon_vma_chain *avc;
107510 struct anon_vma *anon_vma;
107511@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
107512 void __init anon_vma_init(void)
107513 {
107514 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
107515- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
107516- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
107517+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
107518+ anon_vma_ctor);
107519+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
107520+ SLAB_PANIC|SLAB_NO_SANITIZE);
107521 }
107522
107523 /*
107524diff --git a/mm/shmem.c b/mm/shmem.c
107525index cf2d0ca..ec06b8b 100644
107526--- a/mm/shmem.c
107527+++ b/mm/shmem.c
107528@@ -33,7 +33,7 @@
107529 #include <linux/swap.h>
107530 #include <linux/aio.h>
107531
107532-static struct vfsmount *shm_mnt;
107533+struct vfsmount *shm_mnt;
107534
107535 #ifdef CONFIG_SHMEM
107536 /*
107537@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
107538 #define BOGO_DIRENT_SIZE 20
107539
107540 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
107541-#define SHORT_SYMLINK_LEN 128
107542+#define SHORT_SYMLINK_LEN 64
107543
107544 /*
107545 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
107546@@ -2555,6 +2555,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
107547 static int shmem_xattr_validate(const char *name)
107548 {
107549 struct { const char *prefix; size_t len; } arr[] = {
107550+
107551+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
107552+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
107553+#endif
107554+
107555 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
107556 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
107557 };
107558@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
107559 if (err)
107560 return err;
107561
107562+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
107563+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
107564+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
107565+ return -EOPNOTSUPP;
107566+ if (size > 8)
107567+ return -EINVAL;
107568+ }
107569+#endif
107570+
107571 return simple_xattr_set(&info->xattrs, name, value, size, flags);
107572 }
107573
107574@@ -2993,8 +3007,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
107575 int err = -ENOMEM;
107576
107577 /* Round up to L1_CACHE_BYTES to resist false sharing */
107578- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
107579- L1_CACHE_BYTES), GFP_KERNEL);
107580+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
107581 if (!sbinfo)
107582 return -ENOMEM;
107583
107584diff --git a/mm/slab.c b/mm/slab.c
107585index c4b89ea..20990be 100644
107586--- a/mm/slab.c
107587+++ b/mm/slab.c
107588@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
107589 if ((x)->max_freeable < i) \
107590 (x)->max_freeable = i; \
107591 } while (0)
107592-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
107593-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
107594-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
107595-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
107596+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
107597+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
107598+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
107599+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
107600+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
107601+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
107602 #else
107603 #define STATS_INC_ACTIVE(x) do { } while (0)
107604 #define STATS_DEC_ACTIVE(x) do { } while (0)
107605@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
107606 #define STATS_INC_ALLOCMISS(x) do { } while (0)
107607 #define STATS_INC_FREEHIT(x) do { } while (0)
107608 #define STATS_INC_FREEMISS(x) do { } while (0)
107609+#define STATS_INC_SANITIZED(x) do { } while (0)
107610+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
107611 #endif
107612
107613 #if DEBUG
107614@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
107615 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
107616 */
107617 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
107618- const struct page *page, void *obj)
107619+ const struct page *page, const void *obj)
107620 {
107621 u32 offset = (obj - page->s_mem);
107622 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
107623@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
107624 * structures first. Without this, further allocations will bug.
107625 */
107626 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
107627- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
107628+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
107629 slab_state = PARTIAL_NODE;
107630
107631 slab_early_init = 0;
107632@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
107633
107634 cachep = find_mergeable(size, align, flags, name, ctor);
107635 if (cachep) {
107636- cachep->refcount++;
107637+ atomic_inc(&cachep->refcount);
107638
107639 /*
107640 * Adjust the object sizes so that we clear
107641@@ -3357,6 +3361,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
107642 struct array_cache *ac = cpu_cache_get(cachep);
107643
107644 check_irq_off();
107645+
107646+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107647+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
107648+ STATS_INC_NOT_SANITIZED(cachep);
107649+ else {
107650+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
107651+
107652+ if (cachep->ctor)
107653+ cachep->ctor(objp);
107654+
107655+ STATS_INC_SANITIZED(cachep);
107656+ }
107657+#endif
107658+
107659 kmemleak_free_recursive(objp, cachep->flags);
107660 objp = cache_free_debugcheck(cachep, objp, caller);
107661
107662@@ -3469,7 +3487,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
107663 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
107664 }
107665
107666-void *__kmalloc_node(size_t size, gfp_t flags, int node)
107667+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
107668 {
107669 return __do_kmalloc_node(size, flags, node, _RET_IP_);
107670 }
107671@@ -3489,7 +3507,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
107672 * @flags: the type of memory to allocate (see kmalloc).
107673 * @caller: function caller for debug tracking of the caller
107674 */
107675-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
107676+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
107677 unsigned long caller)
107678 {
107679 struct kmem_cache *cachep;
107680@@ -3562,6 +3580,7 @@ void kfree(const void *objp)
107681
107682 if (unlikely(ZERO_OR_NULL_PTR(objp)))
107683 return;
107684+ VM_BUG_ON(!virt_addr_valid(objp));
107685 local_irq_save(flags);
107686 kfree_debugcheck(objp);
107687 c = virt_to_cache(objp);
107688@@ -3981,14 +4000,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
107689 }
107690 /* cpu stats */
107691 {
107692- unsigned long allochit = atomic_read(&cachep->allochit);
107693- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
107694- unsigned long freehit = atomic_read(&cachep->freehit);
107695- unsigned long freemiss = atomic_read(&cachep->freemiss);
107696+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
107697+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
107698+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
107699+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
107700
107701 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
107702 allochit, allocmiss, freehit, freemiss);
107703 }
107704+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107705+ {
107706+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
107707+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
107708+
107709+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
107710+ }
107711+#endif
107712 #endif
107713 }
107714
107715@@ -4196,13 +4223,69 @@ static const struct file_operations proc_slabstats_operations = {
107716 static int __init slab_proc_init(void)
107717 {
107718 #ifdef CONFIG_DEBUG_SLAB_LEAK
107719- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
107720+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
107721 #endif
107722 return 0;
107723 }
107724 module_init(slab_proc_init);
107725 #endif
107726
107727+bool is_usercopy_object(const void *ptr)
107728+{
107729+ struct page *page;
107730+ struct kmem_cache *cachep;
107731+
107732+ if (ZERO_OR_NULL_PTR(ptr))
107733+ return false;
107734+
107735+ if (!slab_is_available())
107736+ return false;
107737+
107738+ if (!virt_addr_valid(ptr))
107739+ return false;
107740+
107741+ page = virt_to_head_page(ptr);
107742+
107743+ if (!PageSlab(page))
107744+ return false;
107745+
107746+ cachep = page->slab_cache;
107747+ return cachep->flags & SLAB_USERCOPY;
107748+}
107749+
107750+#ifdef CONFIG_PAX_USERCOPY
107751+const char *check_heap_object(const void *ptr, unsigned long n)
107752+{
107753+ struct page *page;
107754+ struct kmem_cache *cachep;
107755+ unsigned int objnr;
107756+ unsigned long offset;
107757+
107758+ if (ZERO_OR_NULL_PTR(ptr))
107759+ return "<null>";
107760+
107761+ if (!virt_addr_valid(ptr))
107762+ return NULL;
107763+
107764+ page = virt_to_head_page(ptr);
107765+
107766+ if (!PageSlab(page))
107767+ return NULL;
107768+
107769+ cachep = page->slab_cache;
107770+ if (!(cachep->flags & SLAB_USERCOPY))
107771+ return cachep->name;
107772+
107773+ objnr = obj_to_index(cachep, page, ptr);
107774+ BUG_ON(objnr >= cachep->num);
107775+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
107776+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
107777+ return NULL;
107778+
107779+ return cachep->name;
107780+}
107781+#endif
107782+
107783 /**
107784 * ksize - get the actual amount of memory allocated for a given object
107785 * @objp: Pointer to the object
107786diff --git a/mm/slab.h b/mm/slab.h
107787index 4c3ac12..7b2e470 100644
107788--- a/mm/slab.h
107789+++ b/mm/slab.h
107790@@ -22,7 +22,7 @@ struct kmem_cache {
107791 unsigned int align; /* Alignment as calculated */
107792 unsigned long flags; /* Active flags on the slab */
107793 const char *name; /* Slab name for sysfs */
107794- int refcount; /* Use counter */
107795+ atomic_t refcount; /* Use counter */
107796 void (*ctor)(void *); /* Called on object slot creation */
107797 struct list_head list; /* List of all slab caches on the system */
107798 };
107799@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
107800 /* The slab cache that manages slab cache information */
107801 extern struct kmem_cache *kmem_cache;
107802
107803+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107804+#ifdef CONFIG_X86_64
107805+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
107806+#else
107807+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
107808+#endif
107809+enum pax_sanitize_mode {
107810+ PAX_SANITIZE_SLAB_OFF = 0,
107811+ PAX_SANITIZE_SLAB_FAST,
107812+ PAX_SANITIZE_SLAB_FULL,
107813+};
107814+extern enum pax_sanitize_mode pax_sanitize_slab;
107815+#endif
107816+
107817 unsigned long calculate_alignment(unsigned long flags,
107818 unsigned long align, unsigned long size);
107819
107820@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
107821
107822 /* Legal flag mask for kmem_cache_create(), for various configurations */
107823 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
107824- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
107825+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
107826+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
107827
107828 #if defined(CONFIG_DEBUG_SLAB)
107829 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
107830@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
107831 return s;
107832
107833 page = virt_to_head_page(x);
107834+
107835+ BUG_ON(!PageSlab(page));
107836+
107837 cachep = page->slab_cache;
107838 if (slab_equal_or_root(cachep, s))
107839 return cachep;
107840diff --git a/mm/slab_common.c b/mm/slab_common.c
107841index 999bb34..9843aea 100644
107842--- a/mm/slab_common.c
107843+++ b/mm/slab_common.c
107844@@ -25,11 +25,35 @@
107845
107846 #include "slab.h"
107847
107848-enum slab_state slab_state;
107849+enum slab_state slab_state __read_only;
107850 LIST_HEAD(slab_caches);
107851 DEFINE_MUTEX(slab_mutex);
107852 struct kmem_cache *kmem_cache;
107853
107854+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107855+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
107856+static int __init pax_sanitize_slab_setup(char *str)
107857+{
107858+ if (!str)
107859+ return 0;
107860+
107861+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
107862+ pr_info("PaX slab sanitization: %s\n", "disabled");
107863+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
107864+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
107865+ pr_info("PaX slab sanitization: %s\n", "fast");
107866+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
107867+ } else if (!strcmp(str, "full")) {
107868+ pr_info("PaX slab sanitization: %s\n", "full");
107869+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
107870+ } else
107871+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
107872+
107873+ return 0;
107874+}
107875+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
107876+#endif
107877+
107878 /*
107879 * Set of flags that will prevent slab merging
107880 */
107881@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
107882 * Merge control. If this is set then no merging of slab caches will occur.
107883 * (Could be removed. This was introduced to pacify the merge skeptics.)
107884 */
107885-static int slab_nomerge;
107886+static int slab_nomerge = 1;
107887
107888 static int __init setup_slab_nomerge(char *str)
107889 {
107890@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
107891 /*
107892 * We may have set a slab to be unmergeable during bootstrap.
107893 */
107894- if (s->refcount < 0)
107895+ if (atomic_read(&s->refcount) < 0)
107896 return 1;
107897
107898 return 0;
107899@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
107900 if (err)
107901 goto out_free_cache;
107902
107903- s->refcount = 1;
107904+ atomic_set(&s->refcount, 1);
107905 list_add(&s->list, &slab_caches);
107906 out:
107907 if (err)
107908@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
107909 */
107910 flags &= CACHE_CREATE_MASK;
107911
107912+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107913+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
107914+ flags |= SLAB_NO_SANITIZE;
107915+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
107916+ flags &= ~SLAB_NO_SANITIZE;
107917+#endif
107918+
107919 s = __kmem_cache_alias(name, size, align, flags, ctor);
107920 if (s)
107921 goto out_unlock;
107922@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
107923 rcu_barrier();
107924
107925 list_for_each_entry_safe(s, s2, release, list) {
107926-#ifdef SLAB_SUPPORTS_SYSFS
107927+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
107928 sysfs_slab_remove(s);
107929 #else
107930 slab_kmem_cache_release(s);
107931@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
107932
107933 mutex_lock(&slab_mutex);
107934
107935- s->refcount--;
107936- if (s->refcount)
107937+ if (!atomic_dec_and_test(&s->refcount))
107938 goto out_unlock;
107939
107940 for_each_memcg_cache_safe(c, c2, s) {
107941@@ -691,7 +721,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
107942 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
107943 name, size, err);
107944
107945- s->refcount = -1; /* Exempt from merging for now */
107946+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
107947 }
107948
107949 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
107950@@ -704,7 +734,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
107951
107952 create_boot_cache(s, name, size, flags);
107953 list_add(&s->list, &slab_caches);
107954- s->refcount = 1;
107955+ atomic_set(&s->refcount, 1);
107956 return s;
107957 }
107958
107959@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
107960 EXPORT_SYMBOL(kmalloc_dma_caches);
107961 #endif
107962
107963+#ifdef CONFIG_PAX_USERCOPY_SLABS
107964+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
107965+EXPORT_SYMBOL(kmalloc_usercopy_caches);
107966+#endif
107967+
107968 /*
107969 * Conversion table for small slabs sizes / 8 to the index in the
107970 * kmalloc array. This is necessary for slabs < 192 since we have non power
107971@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
107972 return kmalloc_dma_caches[index];
107973
107974 #endif
107975+
107976+#ifdef CONFIG_PAX_USERCOPY_SLABS
107977+ if (unlikely((flags & GFP_USERCOPY)))
107978+ return kmalloc_usercopy_caches[index];
107979+
107980+#endif
107981+
107982 return kmalloc_caches[index];
107983 }
107984
107985@@ -836,7 +878,7 @@ void __init create_kmalloc_caches(unsigned long flags)
107986 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
107987 if (!kmalloc_caches[i]) {
107988 kmalloc_caches[i] = create_kmalloc_cache(NULL,
107989- 1 << i, flags);
107990+ 1 << i, SLAB_USERCOPY | flags);
107991 }
107992
107993 /*
107994@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
107995 * earlier power of two caches
107996 */
107997 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
107998- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
107999+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
108000
108001 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
108002- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
108003+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
108004 }
108005
108006 /* Kmalloc array is now usable */
108007@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
108008 }
108009 }
108010 #endif
108011+
108012+#ifdef CONFIG_PAX_USERCOPY_SLABS
108013+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
108014+ struct kmem_cache *s = kmalloc_caches[i];
108015+
108016+ if (s) {
108017+ int size = kmalloc_size(i);
108018+ char *n = kasprintf(GFP_NOWAIT,
108019+ "usercopy-kmalloc-%d", size);
108020+
108021+ BUG_ON(!n);
108022+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
108023+ size, SLAB_USERCOPY | flags);
108024+ }
108025+ }
108026+#endif
108027+
108028 }
108029 #endif /* !CONFIG_SLOB */
108030
108031@@ -940,6 +999,9 @@ static void print_slabinfo_header(struct seq_file *m)
108032 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
108033 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
108034 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
108035+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108036+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
108037+#endif
108038 #endif
108039 seq_putc(m, '\n');
108040 }
108041@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
108042 module_init(slab_proc_init);
108043 #endif /* CONFIG_SLABINFO */
108044
108045-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
108046+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
108047 gfp_t flags)
108048 {
108049 void *ret;
108050diff --git a/mm/slob.c b/mm/slob.c
108051index 94a7fed..cf3fb1a 100644
108052--- a/mm/slob.c
108053+++ b/mm/slob.c
108054@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
108055 /*
108056 * Return the size of a slob block.
108057 */
108058-static slobidx_t slob_units(slob_t *s)
108059+static slobidx_t slob_units(const slob_t *s)
108060 {
108061 if (s->units > 0)
108062 return s->units;
108063@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
108064 /*
108065 * Return the next free slob block pointer after this one.
108066 */
108067-static slob_t *slob_next(slob_t *s)
108068+static slob_t *slob_next(const slob_t *s)
108069 {
108070 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
108071 slobidx_t next;
108072@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
108073 /*
108074 * Returns true if s is the last free block in its page.
108075 */
108076-static int slob_last(slob_t *s)
108077+static int slob_last(const slob_t *s)
108078 {
108079 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
108080 }
108081
108082-static void *slob_new_pages(gfp_t gfp, int order, int node)
108083+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
108084 {
108085- void *page;
108086+ struct page *page;
108087
108088 #ifdef CONFIG_NUMA
108089 if (node != NUMA_NO_NODE)
108090@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
108091 if (!page)
108092 return NULL;
108093
108094- return page_address(page);
108095+ __SetPageSlab(page);
108096+ return page;
108097 }
108098
108099-static void slob_free_pages(void *b, int order)
108100+static void slob_free_pages(struct page *sp, int order)
108101 {
108102 if (current->reclaim_state)
108103 current->reclaim_state->reclaimed_slab += 1 << order;
108104- free_pages((unsigned long)b, order);
108105+ __ClearPageSlab(sp);
108106+ page_mapcount_reset(sp);
108107+ sp->private = 0;
108108+ __free_pages(sp, order);
108109 }
108110
108111 /*
108112@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
108113
108114 /* Not enough space: must allocate a new page */
108115 if (!b) {
108116- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
108117- if (!b)
108118+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
108119+ if (!sp)
108120 return NULL;
108121- sp = virt_to_page(b);
108122- __SetPageSlab(sp);
108123+ b = page_address(sp);
108124
108125 spin_lock_irqsave(&slob_lock, flags);
108126 sp->units = SLOB_UNITS(PAGE_SIZE);
108127 sp->freelist = b;
108128+ sp->private = 0;
108129 INIT_LIST_HEAD(&sp->lru);
108130 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
108131 set_slob_page_free(sp, slob_list);
108132@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
108133 /*
108134 * slob_free: entry point into the slob allocator.
108135 */
108136-static void slob_free(void *block, int size)
108137+static void slob_free(struct kmem_cache *c, void *block, int size)
108138 {
108139 struct page *sp;
108140 slob_t *prev, *next, *b = (slob_t *)block;
108141@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
108142 if (slob_page_free(sp))
108143 clear_slob_page_free(sp);
108144 spin_unlock_irqrestore(&slob_lock, flags);
108145- __ClearPageSlab(sp);
108146- page_mapcount_reset(sp);
108147- slob_free_pages(b, 0);
108148+ slob_free_pages(sp, 0);
108149 return;
108150 }
108151
108152+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108153+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
108154+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
108155+#endif
108156+
108157 if (!slob_page_free(sp)) {
108158 /* This slob page is about to become partially free. Easy! */
108159 sp->units = units;
108160@@ -424,11 +431,10 @@ out:
108161 */
108162
108163 static __always_inline void *
108164-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108165+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
108166 {
108167- unsigned int *m;
108168- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108169- void *ret;
108170+ slob_t *m;
108171+ void *ret = NULL;
108172
108173 gfp &= gfp_allowed_mask;
108174
108175@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108176
108177 if (!m)
108178 return NULL;
108179- *m = size;
108180+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
108181+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
108182+ m[0].units = size;
108183+ m[1].units = align;
108184 ret = (void *)m + align;
108185
108186 trace_kmalloc_node(caller, ret,
108187 size, size + align, gfp, node);
108188 } else {
108189 unsigned int order = get_order(size);
108190+ struct page *page;
108191
108192 if (likely(order))
108193 gfp |= __GFP_COMP;
108194- ret = slob_new_pages(gfp, order, node);
108195+ page = slob_new_pages(gfp, order, node);
108196+ if (page) {
108197+ ret = page_address(page);
108198+ page->private = size;
108199+ }
108200
108201 trace_kmalloc_node(caller, ret,
108202 size, PAGE_SIZE << order, gfp, node);
108203 }
108204
108205- kmemleak_alloc(ret, size, 1, gfp);
108206 return ret;
108207 }
108208
108209-void *__kmalloc(size_t size, gfp_t gfp)
108210+static __always_inline void *
108211+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108212+{
108213+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108214+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
108215+
108216+ if (!ZERO_OR_NULL_PTR(ret))
108217+ kmemleak_alloc(ret, size, 1, gfp);
108218+ return ret;
108219+}
108220+
108221+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
108222 {
108223 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
108224 }
108225@@ -491,34 +515,112 @@ void kfree(const void *block)
108226 return;
108227 kmemleak_free(block);
108228
108229+ VM_BUG_ON(!virt_addr_valid(block));
108230 sp = virt_to_page(block);
108231- if (PageSlab(sp)) {
108232+ VM_BUG_ON(!PageSlab(sp));
108233+ if (!sp->private) {
108234 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108235- unsigned int *m = (unsigned int *)(block - align);
108236- slob_free(m, *m + align);
108237- } else
108238+ slob_t *m = (slob_t *)(block - align);
108239+ slob_free(NULL, m, m[0].units + align);
108240+ } else {
108241+ __ClearPageSlab(sp);
108242+ page_mapcount_reset(sp);
108243+ sp->private = 0;
108244 __free_pages(sp, compound_order(sp));
108245+ }
108246 }
108247 EXPORT_SYMBOL(kfree);
108248
108249+bool is_usercopy_object(const void *ptr)
108250+{
108251+ if (!slab_is_available())
108252+ return false;
108253+
108254+ // PAX: TODO
108255+
108256+ return false;
108257+}
108258+
108259+#ifdef CONFIG_PAX_USERCOPY
108260+const char *check_heap_object(const void *ptr, unsigned long n)
108261+{
108262+ struct page *page;
108263+ const slob_t *free;
108264+ const void *base;
108265+ unsigned long flags;
108266+
108267+ if (ZERO_OR_NULL_PTR(ptr))
108268+ return "<null>";
108269+
108270+ if (!virt_addr_valid(ptr))
108271+ return NULL;
108272+
108273+ page = virt_to_head_page(ptr);
108274+ if (!PageSlab(page))
108275+ return NULL;
108276+
108277+ if (page->private) {
108278+ base = page;
108279+ if (base <= ptr && n <= page->private - (ptr - base))
108280+ return NULL;
108281+ return "<slob>";
108282+ }
108283+
108284+ /* some tricky double walking to find the chunk */
108285+ spin_lock_irqsave(&slob_lock, flags);
108286+ base = (void *)((unsigned long)ptr & PAGE_MASK);
108287+ free = page->freelist;
108288+
108289+ while (!slob_last(free) && (void *)free <= ptr) {
108290+ base = free + slob_units(free);
108291+ free = slob_next(free);
108292+ }
108293+
108294+ while (base < (void *)free) {
108295+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
108296+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
108297+ int offset;
108298+
108299+ if (ptr < base + align)
108300+ break;
108301+
108302+ offset = ptr - base - align;
108303+ if (offset >= m) {
108304+ base += size;
108305+ continue;
108306+ }
108307+
108308+ if (n > m - offset)
108309+ break;
108310+
108311+ spin_unlock_irqrestore(&slob_lock, flags);
108312+ return NULL;
108313+ }
108314+
108315+ spin_unlock_irqrestore(&slob_lock, flags);
108316+ return "<slob>";
108317+}
108318+#endif
108319+
108320 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
108321 size_t ksize(const void *block)
108322 {
108323 struct page *sp;
108324 int align;
108325- unsigned int *m;
108326+ slob_t *m;
108327
108328 BUG_ON(!block);
108329 if (unlikely(block == ZERO_SIZE_PTR))
108330 return 0;
108331
108332 sp = virt_to_page(block);
108333- if (unlikely(!PageSlab(sp)))
108334- return PAGE_SIZE << compound_order(sp);
108335+ VM_BUG_ON(!PageSlab(sp));
108336+ if (sp->private)
108337+ return sp->private;
108338
108339 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108340- m = (unsigned int *)(block - align);
108341- return SLOB_UNITS(*m) * SLOB_UNIT;
108342+ m = (slob_t *)(block - align);
108343+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
108344 }
108345 EXPORT_SYMBOL(ksize);
108346
108347@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
108348
108349 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
108350 {
108351- void *b;
108352+ void *b = NULL;
108353
108354 flags &= gfp_allowed_mask;
108355
108356 lockdep_trace_alloc(flags);
108357
108358+#ifdef CONFIG_PAX_USERCOPY_SLABS
108359+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
108360+#else
108361 if (c->size < PAGE_SIZE) {
108362 b = slob_alloc(c->size, flags, c->align, node);
108363 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
108364 SLOB_UNITS(c->size) * SLOB_UNIT,
108365 flags, node);
108366 } else {
108367- b = slob_new_pages(flags, get_order(c->size), node);
108368+ struct page *sp;
108369+
108370+ sp = slob_new_pages(flags, get_order(c->size), node);
108371+ if (sp) {
108372+ b = page_address(sp);
108373+ sp->private = c->size;
108374+ }
108375 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
108376 PAGE_SIZE << get_order(c->size),
108377 flags, node);
108378 }
108379+#endif
108380
108381 if (b && c->ctor)
108382 c->ctor(b);
108383@@ -567,7 +679,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
108384 EXPORT_SYMBOL(kmem_cache_alloc);
108385
108386 #ifdef CONFIG_NUMA
108387-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
108388+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
108389 {
108390 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
108391 }
108392@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
108393 EXPORT_SYMBOL(kmem_cache_alloc_node);
108394 #endif
108395
108396-static void __kmem_cache_free(void *b, int size)
108397+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
108398 {
108399- if (size < PAGE_SIZE)
108400- slob_free(b, size);
108401+ struct page *sp;
108402+
108403+ sp = virt_to_page(b);
108404+ BUG_ON(!PageSlab(sp));
108405+ if (!sp->private)
108406+ slob_free(c, b, size);
108407 else
108408- slob_free_pages(b, get_order(size));
108409+ slob_free_pages(sp, get_order(size));
108410 }
108411
108412 static void kmem_rcu_free(struct rcu_head *head)
108413@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
108414 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
108415 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
108416
108417- __kmem_cache_free(b, slob_rcu->size);
108418+ __kmem_cache_free(NULL, b, slob_rcu->size);
108419 }
108420
108421 void kmem_cache_free(struct kmem_cache *c, void *b)
108422 {
108423+ int size = c->size;
108424+
108425+#ifdef CONFIG_PAX_USERCOPY_SLABS
108426+ if (size + c->align < PAGE_SIZE) {
108427+ size += c->align;
108428+ b -= c->align;
108429+ }
108430+#endif
108431+
108432 kmemleak_free_recursive(b, c->flags);
108433 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
108434 struct slob_rcu *slob_rcu;
108435- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
108436- slob_rcu->size = c->size;
108437+ slob_rcu = b + (size - sizeof(struct slob_rcu));
108438+ slob_rcu->size = size;
108439 call_rcu(&slob_rcu->head, kmem_rcu_free);
108440 } else {
108441- __kmem_cache_free(b, c->size);
108442+ __kmem_cache_free(c, b, size);
108443 }
108444
108445+#ifdef CONFIG_PAX_USERCOPY_SLABS
108446+ trace_kfree(_RET_IP_, b);
108447+#else
108448 trace_kmem_cache_free(_RET_IP_, b);
108449+#endif
108450+
108451 }
108452 EXPORT_SYMBOL(kmem_cache_free);
108453
108454diff --git a/mm/slub.c b/mm/slub.c
108455index 82c4737..55c316a 100644
108456--- a/mm/slub.c
108457+++ b/mm/slub.c
108458@@ -198,7 +198,7 @@ struct track {
108459
108460 enum track_item { TRACK_ALLOC, TRACK_FREE };
108461
108462-#ifdef CONFIG_SYSFS
108463+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108464 static int sysfs_slab_add(struct kmem_cache *);
108465 static int sysfs_slab_alias(struct kmem_cache *, const char *);
108466 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
108467@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
108468 if (!t->addr)
108469 return;
108470
108471- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
108472+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
108473 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
108474 #ifdef CONFIG_STACKTRACE
108475 {
108476@@ -2709,6 +2709,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
108477
108478 slab_free_hook(s, x);
108479
108480+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108481+ if (!(s->flags & SLAB_NO_SANITIZE)) {
108482+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
108483+ if (s->ctor)
108484+ s->ctor(x);
108485+ }
108486+#endif
108487+
108488 redo:
108489 /*
108490 * Determine the currently cpus per cpu slab.
108491@@ -3050,6 +3058,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
108492 s->inuse = size;
108493
108494 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
108495+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108496+ (!(flags & SLAB_NO_SANITIZE)) ||
108497+#endif
108498 s->ctor)) {
108499 /*
108500 * Relocate free pointer after the object if it is not
108501@@ -3304,7 +3315,7 @@ static int __init setup_slub_min_objects(char *str)
108502
108503 __setup("slub_min_objects=", setup_slub_min_objects);
108504
108505-void *__kmalloc(size_t size, gfp_t flags)
108506+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
108507 {
108508 struct kmem_cache *s;
108509 void *ret;
108510@@ -3342,7 +3353,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
108511 return ptr;
108512 }
108513
108514-void *__kmalloc_node(size_t size, gfp_t flags, int node)
108515+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
108516 {
108517 struct kmem_cache *s;
108518 void *ret;
108519@@ -3390,6 +3401,59 @@ static size_t __ksize(const void *object)
108520 return slab_ksize(page->slab_cache);
108521 }
108522
108523+bool is_usercopy_object(const void *ptr)
108524+{
108525+ struct page *page;
108526+ struct kmem_cache *s;
108527+
108528+ if (ZERO_OR_NULL_PTR(ptr))
108529+ return false;
108530+
108531+ if (!slab_is_available())
108532+ return false;
108533+
108534+ if (!virt_addr_valid(ptr))
108535+ return false;
108536+
108537+ page = virt_to_head_page(ptr);
108538+
108539+ if (!PageSlab(page))
108540+ return false;
108541+
108542+ s = page->slab_cache;
108543+ return s->flags & SLAB_USERCOPY;
108544+}
108545+
108546+#ifdef CONFIG_PAX_USERCOPY
108547+const char *check_heap_object(const void *ptr, unsigned long n)
108548+{
108549+ struct page *page;
108550+ struct kmem_cache *s;
108551+ unsigned long offset;
108552+
108553+ if (ZERO_OR_NULL_PTR(ptr))
108554+ return "<null>";
108555+
108556+ if (!virt_addr_valid(ptr))
108557+ return NULL;
108558+
108559+ page = virt_to_head_page(ptr);
108560+
108561+ if (!PageSlab(page))
108562+ return NULL;
108563+
108564+ s = page->slab_cache;
108565+ if (!(s->flags & SLAB_USERCOPY))
108566+ return s->name;
108567+
108568+ offset = (ptr - page_address(page)) % s->size;
108569+ if (offset <= s->object_size && n <= s->object_size - offset)
108570+ return NULL;
108571+
108572+ return s->name;
108573+}
108574+#endif
108575+
108576 size_t ksize(const void *object)
108577 {
108578 size_t size = __ksize(object);
108579@@ -3410,6 +3474,7 @@ void kfree(const void *x)
108580 if (unlikely(ZERO_OR_NULL_PTR(x)))
108581 return;
108582
108583+ VM_BUG_ON(!virt_addr_valid(x));
108584 page = virt_to_head_page(x);
108585 if (unlikely(!PageSlab(page))) {
108586 BUG_ON(!PageCompound(page));
108587@@ -3726,7 +3791,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
108588
108589 s = find_mergeable(size, align, flags, name, ctor);
108590 if (s) {
108591- s->refcount++;
108592+ atomic_inc(&s->refcount);
108593
108594 /*
108595 * Adjust the object sizes so that we clear
108596@@ -3742,7 +3807,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
108597 }
108598
108599 if (sysfs_slab_alias(s, name)) {
108600- s->refcount--;
108601+ atomic_dec(&s->refcount);
108602 s = NULL;
108603 }
108604 }
108605@@ -3859,7 +3924,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
108606 }
108607 #endif
108608
108609-#ifdef CONFIG_SYSFS
108610+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108611 static int count_inuse(struct page *page)
108612 {
108613 return page->inuse;
108614@@ -4140,7 +4205,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
108615 len += sprintf(buf + len, "%7ld ", l->count);
108616
108617 if (l->addr)
108618+#ifdef CONFIG_GRKERNSEC_HIDESYM
108619+ len += sprintf(buf + len, "%pS", NULL);
108620+#else
108621 len += sprintf(buf + len, "%pS", (void *)l->addr);
108622+#endif
108623 else
108624 len += sprintf(buf + len, "<not-available>");
108625
108626@@ -4238,12 +4307,12 @@ static void __init resiliency_test(void)
108627 validate_slab_cache(kmalloc_caches[9]);
108628 }
108629 #else
108630-#ifdef CONFIG_SYSFS
108631+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108632 static void resiliency_test(void) {};
108633 #endif
108634 #endif
108635
108636-#ifdef CONFIG_SYSFS
108637+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108638 enum slab_stat_type {
108639 SL_ALL, /* All slabs */
108640 SL_PARTIAL, /* Only partially allocated slabs */
108641@@ -4480,13 +4549,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
108642 {
108643 if (!s->ctor)
108644 return 0;
108645+#ifdef CONFIG_GRKERNSEC_HIDESYM
108646+ return sprintf(buf, "%pS\n", NULL);
108647+#else
108648 return sprintf(buf, "%pS\n", s->ctor);
108649+#endif
108650 }
108651 SLAB_ATTR_RO(ctor);
108652
108653 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
108654 {
108655- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
108656+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
108657 }
108658 SLAB_ATTR_RO(aliases);
108659
108660@@ -4574,6 +4647,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
108661 SLAB_ATTR_RO(cache_dma);
108662 #endif
108663
108664+#ifdef CONFIG_PAX_USERCOPY_SLABS
108665+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
108666+{
108667+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
108668+}
108669+SLAB_ATTR_RO(usercopy);
108670+#endif
108671+
108672+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108673+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
108674+{
108675+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
108676+}
108677+SLAB_ATTR_RO(sanitize);
108678+#endif
108679+
108680 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
108681 {
108682 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
108683@@ -4629,7 +4718,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
108684 * as well as cause other issues like converting a mergeable
108685 * cache into an umergeable one.
108686 */
108687- if (s->refcount > 1)
108688+ if (atomic_read(&s->refcount) > 1)
108689 return -EINVAL;
108690
108691 s->flags &= ~SLAB_TRACE;
108692@@ -4749,7 +4838,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
108693 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
108694 size_t length)
108695 {
108696- if (s->refcount > 1)
108697+ if (atomic_read(&s->refcount) > 1)
108698 return -EINVAL;
108699
108700 s->flags &= ~SLAB_FAILSLAB;
108701@@ -4916,6 +5005,12 @@ static struct attribute *slab_attrs[] = {
108702 #ifdef CONFIG_ZONE_DMA
108703 &cache_dma_attr.attr,
108704 #endif
108705+#ifdef CONFIG_PAX_USERCOPY_SLABS
108706+ &usercopy_attr.attr,
108707+#endif
108708+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108709+ &sanitize_attr.attr,
108710+#endif
108711 #ifdef CONFIG_NUMA
108712 &remote_node_defrag_ratio_attr.attr,
108713 #endif
108714@@ -5157,6 +5252,7 @@ static char *create_unique_id(struct kmem_cache *s)
108715 return name;
108716 }
108717
108718+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108719 static int sysfs_slab_add(struct kmem_cache *s)
108720 {
108721 int err;
108722@@ -5230,6 +5326,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
108723 kobject_del(&s->kobj);
108724 kobject_put(&s->kobj);
108725 }
108726+#endif
108727
108728 /*
108729 * Need to buffer aliases during bootup until sysfs becomes
108730@@ -5243,6 +5340,7 @@ struct saved_alias {
108731
108732 static struct saved_alias *alias_list;
108733
108734+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108735 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
108736 {
108737 struct saved_alias *al;
108738@@ -5265,6 +5363,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
108739 alias_list = al;
108740 return 0;
108741 }
108742+#endif
108743
108744 static int __init slab_sysfs_init(void)
108745 {
108746diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
108747index 4cba9c2..b4f9fcc 100644
108748--- a/mm/sparse-vmemmap.c
108749+++ b/mm/sparse-vmemmap.c
108750@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
108751 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
108752 if (!p)
108753 return NULL;
108754- pud_populate(&init_mm, pud, p);
108755+ pud_populate_kernel(&init_mm, pud, p);
108756 }
108757 return pud;
108758 }
108759@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
108760 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
108761 if (!p)
108762 return NULL;
108763- pgd_populate(&init_mm, pgd, p);
108764+ pgd_populate_kernel(&init_mm, pgd, p);
108765 }
108766 return pgd;
108767 }
108768diff --git a/mm/sparse.c b/mm/sparse.c
108769index d1b48b6..6e8590e 100644
108770--- a/mm/sparse.c
108771+++ b/mm/sparse.c
108772@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
108773
108774 for (i = 0; i < PAGES_PER_SECTION; i++) {
108775 if (PageHWPoison(&memmap[i])) {
108776- atomic_long_sub(1, &num_poisoned_pages);
108777+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
108778 ClearPageHWPoison(&memmap[i]);
108779 }
108780 }
108781diff --git a/mm/swap.c b/mm/swap.c
108782index cd3a5e6..40c0c8f 100644
108783--- a/mm/swap.c
108784+++ b/mm/swap.c
108785@@ -31,6 +31,7 @@
108786 #include <linux/memcontrol.h>
108787 #include <linux/gfp.h>
108788 #include <linux/uio.h>
108789+#include <linux/hugetlb.h>
108790
108791 #include "internal.h"
108792
108793@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
108794
108795 __page_cache_release(page);
108796 dtor = get_compound_page_dtor(page);
108797+ if (!PageHuge(page))
108798+ BUG_ON(dtor != free_compound_page);
108799 (*dtor)(page);
108800 }
108801
108802diff --git a/mm/swapfile.c b/mm/swapfile.c
108803index 63f55cc..31874e6 100644
108804--- a/mm/swapfile.c
108805+++ b/mm/swapfile.c
108806@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
108807
108808 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
108809 /* Activity counter to indicate that a swapon or swapoff has occurred */
108810-static atomic_t proc_poll_event = ATOMIC_INIT(0);
108811+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
108812
108813 static inline unsigned char swap_count(unsigned char ent)
108814 {
108815@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
108816 spin_unlock(&swap_lock);
108817
108818 err = 0;
108819- atomic_inc(&proc_poll_event);
108820+ atomic_inc_unchecked(&proc_poll_event);
108821 wake_up_interruptible(&proc_poll_wait);
108822
108823 out_dput:
108824@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
108825
108826 poll_wait(file, &proc_poll_wait, wait);
108827
108828- if (seq->poll_event != atomic_read(&proc_poll_event)) {
108829- seq->poll_event = atomic_read(&proc_poll_event);
108830+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
108831+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
108832 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
108833 }
108834
108835@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
108836 return ret;
108837
108838 seq = file->private_data;
108839- seq->poll_event = atomic_read(&proc_poll_event);
108840+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
108841 return 0;
108842 }
108843
108844@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
108845 (frontswap_map) ? "FS" : "");
108846
108847 mutex_unlock(&swapon_mutex);
108848- atomic_inc(&proc_poll_event);
108849+ atomic_inc_unchecked(&proc_poll_event);
108850 wake_up_interruptible(&proc_poll_wait);
108851
108852 if (S_ISREG(inode->i_mode))
108853diff --git a/mm/util.c b/mm/util.c
108854index 3981ae9..28b585b 100644
108855--- a/mm/util.c
108856+++ b/mm/util.c
108857@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
108858 void arch_pick_mmap_layout(struct mm_struct *mm)
108859 {
108860 mm->mmap_base = TASK_UNMAPPED_BASE;
108861+
108862+#ifdef CONFIG_PAX_RANDMMAP
108863+ if (mm->pax_flags & MF_PAX_RANDMMAP)
108864+ mm->mmap_base += mm->delta_mmap;
108865+#endif
108866+
108867 mm->get_unmapped_area = arch_get_unmapped_area;
108868 }
108869 #endif
108870@@ -403,6 +409,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
108871 if (!mm->arg_end)
108872 goto out_mm; /* Shh! No looking before we're done */
108873
108874+ if (gr_acl_handle_procpidmem(task))
108875+ goto out_mm;
108876+
108877 len = mm->arg_end - mm->arg_start;
108878
108879 if (len > buflen)
108880diff --git a/mm/vmalloc.c b/mm/vmalloc.c
108881index 49abccf..7bd1931 100644
108882--- a/mm/vmalloc.c
108883+++ b/mm/vmalloc.c
108884@@ -39,20 +39,65 @@ struct vfree_deferred {
108885 struct work_struct wq;
108886 };
108887 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
108888+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
108889+
108890+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
108891+struct stack_deferred_llist {
108892+ struct llist_head list;
108893+ void *stack;
108894+ void *lowmem_stack;
108895+};
108896+
108897+struct stack_deferred {
108898+ struct stack_deferred_llist list;
108899+ struct work_struct wq;
108900+};
108901+
108902+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
108903+#endif
108904
108905 static void __vunmap(const void *, int);
108906
108907-static void free_work(struct work_struct *w)
108908+static void vfree_work(struct work_struct *w)
108909 {
108910 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
108911 struct llist_node *llnode = llist_del_all(&p->list);
108912 while (llnode) {
108913- void *p = llnode;
108914+ void *x = llnode;
108915 llnode = llist_next(llnode);
108916- __vunmap(p, 1);
108917+ __vunmap(x, 1);
108918 }
108919 }
108920
108921+static void vunmap_work(struct work_struct *w)
108922+{
108923+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
108924+ struct llist_node *llnode = llist_del_all(&p->list);
108925+ while (llnode) {
108926+ void *x = llnode;
108927+ llnode = llist_next(llnode);
108928+ __vunmap(x, 0);
108929+ }
108930+}
108931+
108932+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
108933+static void unmap_work(struct work_struct *w)
108934+{
108935+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
108936+ struct llist_node *llnode = llist_del_all(&p->list.list);
108937+ while (llnode) {
108938+ struct stack_deferred_llist *x =
108939+ llist_entry((struct llist_head *)llnode,
108940+ struct stack_deferred_llist, list);
108941+ void *stack = ACCESS_ONCE(x->stack);
108942+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
108943+ llnode = llist_next(llnode);
108944+ __vunmap(stack, 0);
108945+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
108946+ }
108947+}
108948+#endif
108949+
108950 /*** Page table manipulation functions ***/
108951
108952 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
108953@@ -61,8 +106,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
108954
108955 pte = pte_offset_kernel(pmd, addr);
108956 do {
108957- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
108958- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
108959+
108960+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
108961+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
108962+ BUG_ON(!pte_exec(*pte));
108963+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
108964+ continue;
108965+ }
108966+#endif
108967+
108968+ {
108969+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
108970+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
108971+ }
108972 } while (pte++, addr += PAGE_SIZE, addr != end);
108973 }
108974
108975@@ -122,16 +178,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
108976 pte = pte_alloc_kernel(pmd, addr);
108977 if (!pte)
108978 return -ENOMEM;
108979+
108980+ pax_open_kernel();
108981 do {
108982 struct page *page = pages[*nr];
108983
108984- if (WARN_ON(!pte_none(*pte)))
108985+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
108986+ if (pgprot_val(prot) & _PAGE_NX)
108987+#endif
108988+
108989+ if (!pte_none(*pte)) {
108990+ pax_close_kernel();
108991+ WARN_ON(1);
108992 return -EBUSY;
108993- if (WARN_ON(!page))
108994+ }
108995+ if (!page) {
108996+ pax_close_kernel();
108997+ WARN_ON(1);
108998 return -ENOMEM;
108999+ }
109000 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
109001 (*nr)++;
109002 } while (pte++, addr += PAGE_SIZE, addr != end);
109003+ pax_close_kernel();
109004 return 0;
109005 }
109006
109007@@ -141,7 +210,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
109008 pmd_t *pmd;
109009 unsigned long next;
109010
109011- pmd = pmd_alloc(&init_mm, pud, addr);
109012+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
109013 if (!pmd)
109014 return -ENOMEM;
109015 do {
109016@@ -158,7 +227,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
109017 pud_t *pud;
109018 unsigned long next;
109019
109020- pud = pud_alloc(&init_mm, pgd, addr);
109021+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
109022 if (!pud)
109023 return -ENOMEM;
109024 do {
109025@@ -218,6 +287,12 @@ int is_vmalloc_or_module_addr(const void *x)
109026 if (addr >= MODULES_VADDR && addr < MODULES_END)
109027 return 1;
109028 #endif
109029+
109030+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
109031+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
109032+ return 1;
109033+#endif
109034+
109035 return is_vmalloc_addr(x);
109036 }
109037
109038@@ -238,8 +313,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
109039
109040 if (!pgd_none(*pgd)) {
109041 pud_t *pud = pud_offset(pgd, addr);
109042+#ifdef CONFIG_X86
109043+ if (!pud_large(*pud))
109044+#endif
109045 if (!pud_none(*pud)) {
109046 pmd_t *pmd = pmd_offset(pud, addr);
109047+#ifdef CONFIG_X86
109048+ if (!pmd_large(*pmd))
109049+#endif
109050 if (!pmd_none(*pmd)) {
109051 pte_t *ptep, pte;
109052
109053@@ -341,7 +422,7 @@ static void purge_vmap_area_lazy(void);
109054 * Allocate a region of KVA of the specified size and alignment, within the
109055 * vstart and vend.
109056 */
109057-static struct vmap_area *alloc_vmap_area(unsigned long size,
109058+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
109059 unsigned long align,
109060 unsigned long vstart, unsigned long vend,
109061 int node, gfp_t gfp_mask)
109062@@ -1182,13 +1263,27 @@ void __init vmalloc_init(void)
109063 for_each_possible_cpu(i) {
109064 struct vmap_block_queue *vbq;
109065 struct vfree_deferred *p;
109066+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109067+ struct stack_deferred *p2;
109068+#endif
109069
109070 vbq = &per_cpu(vmap_block_queue, i);
109071 spin_lock_init(&vbq->lock);
109072 INIT_LIST_HEAD(&vbq->free);
109073+
109074 p = &per_cpu(vfree_deferred, i);
109075 init_llist_head(&p->list);
109076- INIT_WORK(&p->wq, free_work);
109077+ INIT_WORK(&p->wq, vfree_work);
109078+
109079+ p = &per_cpu(vunmap_deferred, i);
109080+ init_llist_head(&p->list);
109081+ INIT_WORK(&p->wq, vunmap_work);
109082+
109083+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109084+ p2 = &per_cpu(stack_deferred, i);
109085+ init_llist_head(&p2->list.list);
109086+ INIT_WORK(&p2->wq, unmap_work);
109087+#endif
109088 }
109089
109090 /* Import existing vmlist entries. */
109091@@ -1313,6 +1408,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
109092 struct vm_struct *area;
109093
109094 BUG_ON(in_interrupt());
109095+
109096+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109097+ if (flags & VM_KERNEXEC) {
109098+ if (start != VMALLOC_START || end != VMALLOC_END)
109099+ return NULL;
109100+ start = (unsigned long)MODULES_EXEC_VADDR;
109101+ end = (unsigned long)MODULES_EXEC_END;
109102+ }
109103+#endif
109104+
109105 if (flags & VM_IOREMAP)
109106 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
109107
109108@@ -1510,13 +1615,36 @@ EXPORT_SYMBOL(vfree);
109109 */
109110 void vunmap(const void *addr)
109111 {
109112- BUG_ON(in_interrupt());
109113- might_sleep();
109114- if (addr)
109115+ if (!addr)
109116+ return;
109117+ if (unlikely(in_interrupt())) {
109118+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
109119+ if (llist_add((struct llist_node *)addr, &p->list))
109120+ schedule_work(&p->wq);
109121+ } else {
109122+ might_sleep();
109123 __vunmap(addr, 0);
109124+ }
109125 }
109126 EXPORT_SYMBOL(vunmap);
109127
109128+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109129+void unmap_process_stacks(struct task_struct *task)
109130+{
109131+ if (unlikely(in_interrupt())) {
109132+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
109133+ struct stack_deferred_llist *list = task->stack;
109134+ list->stack = task->stack;
109135+ list->lowmem_stack = task->lowmem_stack;
109136+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
109137+ schedule_work(&p->wq);
109138+ } else {
109139+ __vunmap(task->stack, 0);
109140+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
109141+ }
109142+}
109143+#endif
109144+
109145 /**
109146 * vmap - map an array of pages into virtually contiguous space
109147 * @pages: array of page pointers
109148@@ -1537,6 +1665,11 @@ void *vmap(struct page **pages, unsigned int count,
109149 if (count > totalram_pages)
109150 return NULL;
109151
109152+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109153+ if (!(pgprot_val(prot) & _PAGE_NX))
109154+ flags |= VM_KERNEXEC;
109155+#endif
109156+
109157 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
109158 __builtin_return_address(0));
109159 if (!area)
109160@@ -1641,6 +1774,14 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
109161 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
109162 goto fail;
109163
109164+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109165+ if (!(pgprot_val(prot) & _PAGE_NX)) {
109166+ vm_flags |= VM_KERNEXEC;
109167+ start = VMALLOC_START;
109168+ end = VMALLOC_END;
109169+ }
109170+#endif
109171+
109172 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
109173 vm_flags, start, end, node, gfp_mask, caller);
109174 if (!area)
109175@@ -1817,10 +1958,9 @@ EXPORT_SYMBOL(vzalloc_node);
109176 * For tight control over page level allocator and protection flags
109177 * use __vmalloc() instead.
109178 */
109179-
109180 void *vmalloc_exec(unsigned long size)
109181 {
109182- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
109183+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
109184 NUMA_NO_NODE, __builtin_return_address(0));
109185 }
109186
109187@@ -2127,6 +2267,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
109188 {
109189 struct vm_struct *area;
109190
109191+ BUG_ON(vma->vm_mirror);
109192+
109193 size = PAGE_ALIGN(size);
109194
109195 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
109196@@ -2609,7 +2751,11 @@ static int s_show(struct seq_file *m, void *p)
109197 v->addr, v->addr + v->size, v->size);
109198
109199 if (v->caller)
109200+#ifdef CONFIG_GRKERNSEC_HIDESYM
109201+ seq_printf(m, " %pK", v->caller);
109202+#else
109203 seq_printf(m, " %pS", v->caller);
109204+#endif
109205
109206 if (v->nr_pages)
109207 seq_printf(m, " pages=%d", v->nr_pages);
109208diff --git a/mm/vmstat.c b/mm/vmstat.c
109209index 4f5cd97..9fb715a 100644
109210--- a/mm/vmstat.c
109211+++ b/mm/vmstat.c
109212@@ -27,6 +27,7 @@
109213 #include <linux/mm_inline.h>
109214 #include <linux/page_ext.h>
109215 #include <linux/page_owner.h>
109216+#include <linux/grsecurity.h>
109217
109218 #include "internal.h"
109219
109220@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
109221 *
109222 * vm_stat contains the global counters
109223 */
109224-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
109225+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
109226 EXPORT_SYMBOL(vm_stat);
109227
109228 #ifdef CONFIG_SMP
109229@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
109230
109231 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
109232 if (diff[i]) {
109233- atomic_long_add(diff[i], &vm_stat[i]);
109234+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
109235 changes++;
109236 }
109237 return changes;
109238@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
109239 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
109240 if (v) {
109241
109242- atomic_long_add(v, &zone->vm_stat[i]);
109243+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109244 global_diff[i] += v;
109245 #ifdef CONFIG_NUMA
109246 /* 3 seconds idle till flush */
109247@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
109248
109249 v = p->vm_stat_diff[i];
109250 p->vm_stat_diff[i] = 0;
109251- atomic_long_add(v, &zone->vm_stat[i]);
109252+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109253 global_diff[i] += v;
109254 }
109255 }
109256@@ -560,8 +561,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
109257 if (pset->vm_stat_diff[i]) {
109258 int v = pset->vm_stat_diff[i];
109259 pset->vm_stat_diff[i] = 0;
109260- atomic_long_add(v, &zone->vm_stat[i]);
109261- atomic_long_add(v, &vm_stat[i]);
109262+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109263+ atomic_long_add_unchecked(v, &vm_stat[i]);
109264 }
109265 }
109266 #endif
109267@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
109268 stat_items_size += sizeof(struct vm_event_state);
109269 #endif
109270
109271- v = kmalloc(stat_items_size, GFP_KERNEL);
109272+ v = kzalloc(stat_items_size, GFP_KERNEL);
109273 m->private = v;
109274 if (!v)
109275 return ERR_PTR(-ENOMEM);
109276+
109277+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109278+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
109279+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
109280+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
109281+ && !in_group_p(grsec_proc_gid)
109282+#endif
109283+ )
109284+ return (unsigned long *)m->private + *pos;
109285+#endif
109286+#endif
109287+
109288 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
109289 v[i] = global_page_state(i);
109290 v += NR_VM_ZONE_STAT_ITEMS;
109291@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
109292 cpu_notifier_register_done();
109293 #endif
109294 #ifdef CONFIG_PROC_FS
109295- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
109296- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
109297- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
109298- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
109299+ {
109300+ mode_t gr_mode = S_IRUGO;
109301+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109302+ gr_mode = S_IRUSR;
109303+#endif
109304+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
109305+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
109306+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
109307+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
109308+ }
109309 #endif
109310 return 0;
109311 }
109312diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
109313index 64c6bed..b79a5de 100644
109314--- a/net/8021q/vlan.c
109315+++ b/net/8021q/vlan.c
109316@@ -481,7 +481,7 @@ out:
109317 return NOTIFY_DONE;
109318 }
109319
109320-static struct notifier_block vlan_notifier_block __read_mostly = {
109321+static struct notifier_block vlan_notifier_block = {
109322 .notifier_call = vlan_device_event,
109323 };
109324
109325@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
109326 err = -EPERM;
109327 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
109328 break;
109329- if ((args.u.name_type >= 0) &&
109330- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
109331+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
109332 struct vlan_net *vn;
109333
109334 vn = net_generic(net, vlan_net_id);
109335diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
109336index c92b52f..006c052 100644
109337--- a/net/8021q/vlan_netlink.c
109338+++ b/net/8021q/vlan_netlink.c
109339@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
109340 return dev_net(real_dev);
109341 }
109342
109343-struct rtnl_link_ops vlan_link_ops __read_mostly = {
109344+struct rtnl_link_ops vlan_link_ops = {
109345 .kind = "vlan",
109346 .maxtype = IFLA_VLAN_MAX,
109347 .policy = vlan_policy,
109348diff --git a/net/9p/client.c b/net/9p/client.c
109349index e86a9bea..e91f70e 100644
109350--- a/net/9p/client.c
109351+++ b/net/9p/client.c
109352@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
109353 len - inline_len);
109354 } else {
109355 err = copy_from_user(ename + inline_len,
109356- uidata, len - inline_len);
109357+ (char __force_user *)uidata, len - inline_len);
109358 if (err) {
109359 err = -EFAULT;
109360 goto out_err;
109361@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
109362 kernel_buf = 1;
109363 indata = data;
109364 } else
109365- indata = (__force char *)udata;
109366+ indata = (__force_kernel char *)udata;
109367 /*
109368 * response header len is 11
109369 * PDU Header(7) + IO Size (4)
109370@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
109371 kernel_buf = 1;
109372 odata = data;
109373 } else
109374- odata = (char *)udata;
109375+ odata = (char __force_kernel *)udata;
109376 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
109377 P9_ZC_HDR_SZ, kernel_buf, "dqd",
109378 fid->fid, offset, rsize);
109379diff --git a/net/9p/mod.c b/net/9p/mod.c
109380index 6ab36ae..6f1841b 100644
109381--- a/net/9p/mod.c
109382+++ b/net/9p/mod.c
109383@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
109384 void v9fs_register_trans(struct p9_trans_module *m)
109385 {
109386 spin_lock(&v9fs_trans_lock);
109387- list_add_tail(&m->list, &v9fs_trans_list);
109388+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
109389 spin_unlock(&v9fs_trans_lock);
109390 }
109391 EXPORT_SYMBOL(v9fs_register_trans);
109392@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
109393 void v9fs_unregister_trans(struct p9_trans_module *m)
109394 {
109395 spin_lock(&v9fs_trans_lock);
109396- list_del_init(&m->list);
109397+ pax_list_del_init((struct list_head *)&m->list);
109398 spin_unlock(&v9fs_trans_lock);
109399 }
109400 EXPORT_SYMBOL(v9fs_unregister_trans);
109401diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
109402index 80d08f6..de63fd1 100644
109403--- a/net/9p/trans_fd.c
109404+++ b/net/9p/trans_fd.c
109405@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
109406 oldfs = get_fs();
109407 set_fs(get_ds());
109408 /* The cast to a user pointer is valid due to the set_fs() */
109409- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
109410+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
109411 set_fs(oldfs);
109412
109413 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
109414diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
109415index af46bc4..f9adfcd 100644
109416--- a/net/appletalk/atalk_proc.c
109417+++ b/net/appletalk/atalk_proc.c
109418@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
109419 struct proc_dir_entry *p;
109420 int rc = -ENOMEM;
109421
109422- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
109423+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
109424 if (!atalk_proc_dir)
109425 goto out;
109426
109427diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
109428index 876fbe8..8bbea9f 100644
109429--- a/net/atm/atm_misc.c
109430+++ b/net/atm/atm_misc.c
109431@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
109432 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
109433 return 1;
109434 atm_return(vcc, truesize);
109435- atomic_inc(&vcc->stats->rx_drop);
109436+ atomic_inc_unchecked(&vcc->stats->rx_drop);
109437 return 0;
109438 }
109439 EXPORT_SYMBOL(atm_charge);
109440@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
109441 }
109442 }
109443 atm_return(vcc, guess);
109444- atomic_inc(&vcc->stats->rx_drop);
109445+ atomic_inc_unchecked(&vcc->stats->rx_drop);
109446 return NULL;
109447 }
109448 EXPORT_SYMBOL(atm_alloc_charge);
109449@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
109450
109451 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
109452 {
109453-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
109454+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
109455 __SONET_ITEMS
109456 #undef __HANDLE_ITEM
109457 }
109458@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
109459
109460 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
109461 {
109462-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
109463+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
109464 __SONET_ITEMS
109465 #undef __HANDLE_ITEM
109466 }
109467diff --git a/net/atm/lec.c b/net/atm/lec.c
109468index 4b98f89..5a2f6cb 100644
109469--- a/net/atm/lec.c
109470+++ b/net/atm/lec.c
109471@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
109472 }
109473
109474 static struct lane2_ops lane2_ops = {
109475- lane2_resolve, /* resolve, spec 3.1.3 */
109476- lane2_associate_req, /* associate_req, spec 3.1.4 */
109477- NULL /* associate indicator, spec 3.1.5 */
109478+ .resolve = lane2_resolve,
109479+ .associate_req = lane2_associate_req,
109480+ .associate_indicator = NULL
109481 };
109482
109483 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
109484diff --git a/net/atm/lec.h b/net/atm/lec.h
109485index 4149db1..f2ab682 100644
109486--- a/net/atm/lec.h
109487+++ b/net/atm/lec.h
109488@@ -48,7 +48,7 @@ struct lane2_ops {
109489 const u8 *tlvs, u32 sizeoftlvs);
109490 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
109491 const u8 *tlvs, u32 sizeoftlvs);
109492-};
109493+} __no_const;
109494
109495 /*
109496 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
109497diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
109498index d1b2d9a..d549f7f 100644
109499--- a/net/atm/mpoa_caches.c
109500+++ b/net/atm/mpoa_caches.c
109501@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
109502
109503
109504 static struct in_cache_ops ingress_ops = {
109505- in_cache_add_entry, /* add_entry */
109506- in_cache_get, /* get */
109507- in_cache_get_with_mask, /* get_with_mask */
109508- in_cache_get_by_vcc, /* get_by_vcc */
109509- in_cache_put, /* put */
109510- in_cache_remove_entry, /* remove_entry */
109511- cache_hit, /* cache_hit */
109512- clear_count_and_expired, /* clear_count */
109513- check_resolving_entries, /* check_resolving */
109514- refresh_entries, /* refresh */
109515- in_destroy_cache /* destroy_cache */
109516+ .add_entry = in_cache_add_entry,
109517+ .get = in_cache_get,
109518+ .get_with_mask = in_cache_get_with_mask,
109519+ .get_by_vcc = in_cache_get_by_vcc,
109520+ .put = in_cache_put,
109521+ .remove_entry = in_cache_remove_entry,
109522+ .cache_hit = cache_hit,
109523+ .clear_count = clear_count_and_expired,
109524+ .check_resolving = check_resolving_entries,
109525+ .refresh = refresh_entries,
109526+ .destroy_cache = in_destroy_cache
109527 };
109528
109529 static struct eg_cache_ops egress_ops = {
109530- eg_cache_add_entry, /* add_entry */
109531- eg_cache_get_by_cache_id, /* get_by_cache_id */
109532- eg_cache_get_by_tag, /* get_by_tag */
109533- eg_cache_get_by_vcc, /* get_by_vcc */
109534- eg_cache_get_by_src_ip, /* get_by_src_ip */
109535- eg_cache_put, /* put */
109536- eg_cache_remove_entry, /* remove_entry */
109537- update_eg_cache_entry, /* update */
109538- clear_expired, /* clear_expired */
109539- eg_destroy_cache /* destroy_cache */
109540+ .add_entry = eg_cache_add_entry,
109541+ .get_by_cache_id = eg_cache_get_by_cache_id,
109542+ .get_by_tag = eg_cache_get_by_tag,
109543+ .get_by_vcc = eg_cache_get_by_vcc,
109544+ .get_by_src_ip = eg_cache_get_by_src_ip,
109545+ .put = eg_cache_put,
109546+ .remove_entry = eg_cache_remove_entry,
109547+ .update = update_eg_cache_entry,
109548+ .clear_expired = clear_expired,
109549+ .destroy_cache = eg_destroy_cache
109550 };
109551
109552
109553diff --git a/net/atm/proc.c b/net/atm/proc.c
109554index bbb6461..cf04016 100644
109555--- a/net/atm/proc.c
109556+++ b/net/atm/proc.c
109557@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
109558 const struct k_atm_aal_stats *stats)
109559 {
109560 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
109561- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
109562- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
109563- atomic_read(&stats->rx_drop));
109564+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
109565+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
109566+ atomic_read_unchecked(&stats->rx_drop));
109567 }
109568
109569 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
109570diff --git a/net/atm/resources.c b/net/atm/resources.c
109571index 0447d5d..3cf4728 100644
109572--- a/net/atm/resources.c
109573+++ b/net/atm/resources.c
109574@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
109575 static void copy_aal_stats(struct k_atm_aal_stats *from,
109576 struct atm_aal_stats *to)
109577 {
109578-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
109579+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
109580 __AAL_STAT_ITEMS
109581 #undef __HANDLE_ITEM
109582 }
109583@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
109584 static void subtract_aal_stats(struct k_atm_aal_stats *from,
109585 struct atm_aal_stats *to)
109586 {
109587-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
109588+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
109589 __AAL_STAT_ITEMS
109590 #undef __HANDLE_ITEM
109591 }
109592diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
109593index 919a5ce..cc6b444 100644
109594--- a/net/ax25/sysctl_net_ax25.c
109595+++ b/net/ax25/sysctl_net_ax25.c
109596@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
109597 {
109598 char path[sizeof("net/ax25/") + IFNAMSIZ];
109599 int k;
109600- struct ctl_table *table;
109601+ ctl_table_no_const *table;
109602
109603 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
109604 if (!table)
109605diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
109606index 00e00e0..710fcd2 100644
109607--- a/net/batman-adv/bat_iv_ogm.c
109608+++ b/net/batman-adv/bat_iv_ogm.c
109609@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
109610
109611 /* randomize initial seqno to avoid collision */
109612 get_random_bytes(&random_seqno, sizeof(random_seqno));
109613- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
109614+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
109615
109616 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
109617 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
109618@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
109619 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
109620
109621 /* change sequence number to network order */
109622- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
109623+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
109624 batadv_ogm_packet->seqno = htonl(seqno);
109625- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
109626+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
109627
109628 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
109629
109630@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
109631 return;
109632
109633 /* could be changed by schedule_own_packet() */
109634- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
109635+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
109636
109637 if (ogm_packet->flags & BATADV_DIRECTLINK)
109638 has_directlink_flag = true;
109639diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
109640index 3d1dcaa..4699f4e 100644
109641--- a/net/batman-adv/fragmentation.c
109642+++ b/net/batman-adv/fragmentation.c
109643@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
109644 frag_header.packet_type = BATADV_UNICAST_FRAG;
109645 frag_header.version = BATADV_COMPAT_VERSION;
109646 frag_header.ttl = BATADV_TTL;
109647- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
109648+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
109649 frag_header.reserved = 0;
109650 frag_header.no = 0;
109651 frag_header.total_size = htons(skb->len);
109652diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
109653index 5ec31d7..e371631 100644
109654--- a/net/batman-adv/soft-interface.c
109655+++ b/net/batman-adv/soft-interface.c
109656@@ -295,7 +295,7 @@ send:
109657 primary_if->net_dev->dev_addr);
109658
109659 /* set broadcast sequence number */
109660- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
109661+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
109662 bcast_packet->seqno = htonl(seqno);
109663
109664 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
109665@@ -760,7 +760,7 @@ static int batadv_softif_init_late(struct net_device *dev)
109666 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
109667
109668 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
109669- atomic_set(&bat_priv->bcast_seqno, 1);
109670+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
109671 atomic_set(&bat_priv->tt.vn, 0);
109672 atomic_set(&bat_priv->tt.local_changes, 0);
109673 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
109674@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
109675
109676 /* randomize initial seqno to avoid collision */
109677 get_random_bytes(&random_seqno, sizeof(random_seqno));
109678- atomic_set(&bat_priv->frag_seqno, random_seqno);
109679+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
109680
109681 bat_priv->primary_if = NULL;
109682 bat_priv->num_ifaces = 0;
109683@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
109684 return 0;
109685 }
109686
109687-struct rtnl_link_ops batadv_link_ops __read_mostly = {
109688+struct rtnl_link_ops batadv_link_ops = {
109689 .kind = "batadv",
109690 .priv_size = sizeof(struct batadv_priv),
109691 .setup = batadv_softif_init_early,
109692diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
109693index 9398c3f..0e79657 100644
109694--- a/net/batman-adv/types.h
109695+++ b/net/batman-adv/types.h
109696@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
109697 struct batadv_hard_iface_bat_iv {
109698 unsigned char *ogm_buff;
109699 int ogm_buff_len;
109700- atomic_t ogm_seqno;
109701+ atomic_unchecked_t ogm_seqno;
109702 };
109703
109704 /**
109705@@ -766,7 +766,7 @@ struct batadv_priv {
109706 atomic_t bonding;
109707 atomic_t fragmentation;
109708 atomic_t packet_size_max;
109709- atomic_t frag_seqno;
109710+ atomic_unchecked_t frag_seqno;
109711 #ifdef CONFIG_BATMAN_ADV_BLA
109712 atomic_t bridge_loop_avoidance;
109713 #endif
109714@@ -785,7 +785,7 @@ struct batadv_priv {
109715 #endif
109716 uint32_t isolation_mark;
109717 uint32_t isolation_mark_mask;
109718- atomic_t bcast_seqno;
109719+ atomic_unchecked_t bcast_seqno;
109720 atomic_t bcast_queue_left;
109721 atomic_t batman_queue_left;
109722 char num_ifaces;
109723diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
109724index 1d65c5b..43e55fd 100644
109725--- a/net/bluetooth/hci_sock.c
109726+++ b/net/bluetooth/hci_sock.c
109727@@ -1042,7 +1042,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
109728 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
109729 }
109730
109731- len = min_t(unsigned int, len, sizeof(uf));
109732+ len = min((size_t)len, sizeof(uf));
109733 if (copy_from_user(&uf, optval, len)) {
109734 err = -EFAULT;
109735 break;
109736diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
109737index 6ba33f9..4afc26f 100644
109738--- a/net/bluetooth/l2cap_core.c
109739+++ b/net/bluetooth/l2cap_core.c
109740@@ -3534,8 +3534,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
109741 break;
109742
109743 case L2CAP_CONF_RFC:
109744- if (olen == sizeof(rfc))
109745- memcpy(&rfc, (void *)val, olen);
109746+ if (olen != sizeof(rfc))
109747+ break;
109748+
109749+ memcpy(&rfc, (void *)val, olen);
109750
109751 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
109752 rfc.mode != chan->mode)
109753diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
109754index 60694f0..32623ed 100644
109755--- a/net/bluetooth/l2cap_sock.c
109756+++ b/net/bluetooth/l2cap_sock.c
109757@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
109758 struct sock *sk = sock->sk;
109759 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
109760 struct l2cap_options opts;
109761- int len, err = 0;
109762+ int err = 0;
109763+ size_t len = optlen;
109764 u32 opt;
109765
109766 BT_DBG("sk %p", sk);
109767@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
109768 opts.max_tx = chan->max_tx;
109769 opts.txwin_size = chan->tx_win;
109770
109771- len = min_t(unsigned int, sizeof(opts), optlen);
109772+ len = min(sizeof(opts), len);
109773 if (copy_from_user((char *) &opts, optval, len)) {
109774 err = -EFAULT;
109775 break;
109776@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
109777 struct bt_security sec;
109778 struct bt_power pwr;
109779 struct l2cap_conn *conn;
109780- int len, err = 0;
109781+ int err = 0;
109782+ size_t len = optlen;
109783 u32 opt;
109784
109785 BT_DBG("sk %p", sk);
109786@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
109787
109788 sec.level = BT_SECURITY_LOW;
109789
109790- len = min_t(unsigned int, sizeof(sec), optlen);
109791+ len = min(sizeof(sec), len);
109792 if (copy_from_user((char *) &sec, optval, len)) {
109793 err = -EFAULT;
109794 break;
109795@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
109796
109797 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
109798
109799- len = min_t(unsigned int, sizeof(pwr), optlen);
109800+ len = min(sizeof(pwr), len);
109801 if (copy_from_user((char *) &pwr, optval, len)) {
109802 err = -EFAULT;
109803 break;
109804diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
109805index 3c6d2c8..6afc970 100644
109806--- a/net/bluetooth/rfcomm/sock.c
109807+++ b/net/bluetooth/rfcomm/sock.c
109808@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
109809 struct sock *sk = sock->sk;
109810 struct bt_security sec;
109811 int err = 0;
109812- size_t len;
109813+ size_t len = optlen;
109814 u32 opt;
109815
109816 BT_DBG("sk %p", sk);
109817@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
109818
109819 sec.level = BT_SECURITY_LOW;
109820
109821- len = min_t(unsigned int, sizeof(sec), optlen);
109822+ len = min(sizeof(sec), len);
109823 if (copy_from_user((char *) &sec, optval, len)) {
109824 err = -EFAULT;
109825 break;
109826diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
109827index 8e385a0..a5bdd8e 100644
109828--- a/net/bluetooth/rfcomm/tty.c
109829+++ b/net/bluetooth/rfcomm/tty.c
109830@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
109831 BT_DBG("tty %p id %d", tty, tty->index);
109832
109833 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
109834- dev->channel, dev->port.count);
109835+ dev->channel, atomic_read(&dev->port.count));
109836
109837 err = tty_port_open(&dev->port, tty, filp);
109838 if (err)
109839@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
109840 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
109841
109842 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
109843- dev->port.count);
109844+ atomic_read(&dev->port.count));
109845
109846 tty_port_close(&dev->port, tty, filp);
109847 }
109848diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
109849index 4fbcea0..69a6786 100644
109850--- a/net/bridge/br_netlink.c
109851+++ b/net/bridge/br_netlink.c
109852@@ -726,7 +726,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
109853 .get_link_af_size = br_get_link_af_size,
109854 };
109855
109856-struct rtnl_link_ops br_link_ops __read_mostly = {
109857+struct rtnl_link_ops br_link_ops = {
109858 .kind = "bridge",
109859 .priv_size = sizeof(struct net_bridge),
109860 .setup = br_dev_setup,
109861diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
109862index 91180a7..1301daa 100644
109863--- a/net/bridge/netfilter/ebtables.c
109864+++ b/net/bridge/netfilter/ebtables.c
109865@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
109866 tmp.valid_hooks = t->table->valid_hooks;
109867 }
109868 mutex_unlock(&ebt_mutex);
109869- if (copy_to_user(user, &tmp, *len) != 0) {
109870+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
109871 BUGPRINT("c2u Didn't work\n");
109872 ret = -EFAULT;
109873 break;
109874@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
109875 goto out;
109876 tmp.valid_hooks = t->valid_hooks;
109877
109878- if (copy_to_user(user, &tmp, *len) != 0) {
109879+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
109880 ret = -EFAULT;
109881 break;
109882 }
109883@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
109884 tmp.entries_size = t->table->entries_size;
109885 tmp.valid_hooks = t->table->valid_hooks;
109886
109887- if (copy_to_user(user, &tmp, *len) != 0) {
109888+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
109889 ret = -EFAULT;
109890 break;
109891 }
109892diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
109893index f5afda1..dcf770a 100644
109894--- a/net/caif/cfctrl.c
109895+++ b/net/caif/cfctrl.c
109896@@ -10,6 +10,7 @@
109897 #include <linux/spinlock.h>
109898 #include <linux/slab.h>
109899 #include <linux/pkt_sched.h>
109900+#include <linux/sched.h>
109901 #include <net/caif/caif_layer.h>
109902 #include <net/caif/cfpkt.h>
109903 #include <net/caif/cfctrl.h>
109904@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
109905 memset(&dev_info, 0, sizeof(dev_info));
109906 dev_info.id = 0xff;
109907 cfsrvl_init(&this->serv, 0, &dev_info, false);
109908- atomic_set(&this->req_seq_no, 1);
109909- atomic_set(&this->rsp_seq_no, 1);
109910+ atomic_set_unchecked(&this->req_seq_no, 1);
109911+ atomic_set_unchecked(&this->rsp_seq_no, 1);
109912 this->serv.layer.receive = cfctrl_recv;
109913 sprintf(this->serv.layer.name, "ctrl");
109914 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
109915@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
109916 struct cfctrl_request_info *req)
109917 {
109918 spin_lock_bh(&ctrl->info_list_lock);
109919- atomic_inc(&ctrl->req_seq_no);
109920- req->sequence_no = atomic_read(&ctrl->req_seq_no);
109921+ atomic_inc_unchecked(&ctrl->req_seq_no);
109922+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
109923 list_add_tail(&req->list, &ctrl->list);
109924 spin_unlock_bh(&ctrl->info_list_lock);
109925 }
109926@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
109927 if (p != first)
109928 pr_warn("Requests are not received in order\n");
109929
109930- atomic_set(&ctrl->rsp_seq_no,
109931+ atomic_set_unchecked(&ctrl->rsp_seq_no,
109932 p->sequence_no);
109933 list_del(&p->list);
109934 goto out;
109935diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
109936index 67a4a36..8d28068 100644
109937--- a/net/caif/chnl_net.c
109938+++ b/net/caif/chnl_net.c
109939@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
109940 };
109941
109942
109943-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
109944+static struct rtnl_link_ops ipcaif_link_ops = {
109945 .kind = "caif",
109946 .priv_size = sizeof(struct chnl_net),
109947 .setup = ipcaif_net_setup,
109948diff --git a/net/can/af_can.c b/net/can/af_can.c
109949index 32d710e..93bcf05 100644
109950--- a/net/can/af_can.c
109951+++ b/net/can/af_can.c
109952@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
109953 };
109954
109955 /* notifier block for netdevice event */
109956-static struct notifier_block can_netdev_notifier __read_mostly = {
109957+static struct notifier_block can_netdev_notifier = {
109958 .notifier_call = can_notifier,
109959 };
109960
109961diff --git a/net/can/bcm.c b/net/can/bcm.c
109962index ee9ffd9..dfdf3d4 100644
109963--- a/net/can/bcm.c
109964+++ b/net/can/bcm.c
109965@@ -1619,7 +1619,7 @@ static int __init bcm_module_init(void)
109966 }
109967
109968 /* create /proc/net/can-bcm directory */
109969- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
109970+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
109971 return 0;
109972 }
109973
109974diff --git a/net/can/gw.c b/net/can/gw.c
109975index a6f448e..5902171 100644
109976--- a/net/can/gw.c
109977+++ b/net/can/gw.c
109978@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
109979 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
109980
109981 static HLIST_HEAD(cgw_list);
109982-static struct notifier_block notifier;
109983
109984 static struct kmem_cache *cgw_cache __read_mostly;
109985
109986@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
109987 return err;
109988 }
109989
109990+static struct notifier_block notifier = {
109991+ .notifier_call = cgw_notifier
109992+};
109993+
109994 static __init int cgw_module_init(void)
109995 {
109996 /* sanitize given module parameter */
109997@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
109998 return -ENOMEM;
109999
110000 /* set notifier */
110001- notifier.notifier_call = cgw_notifier;
110002 register_netdevice_notifier(&notifier);
110003
110004 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
110005diff --git a/net/can/proc.c b/net/can/proc.c
110006index 1a19b98..df2b4ec 100644
110007--- a/net/can/proc.c
110008+++ b/net/can/proc.c
110009@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
110010 void can_init_proc(void)
110011 {
110012 /* create /proc/net/can directory */
110013- can_dir = proc_mkdir("can", init_net.proc_net);
110014+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
110015
110016 if (!can_dir) {
110017 printk(KERN_INFO "can: failed to create /proc/net/can . "
110018diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
110019index a9f4ae4..ee19b92 100644
110020--- a/net/ceph/messenger.c
110021+++ b/net/ceph/messenger.c
110022@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
110023 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
110024
110025 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
110026-static atomic_t addr_str_seq = ATOMIC_INIT(0);
110027+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
110028
110029 static struct page *zero_page; /* used in certain error cases */
110030
110031@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
110032 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
110033 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
110034
110035- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
110036+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
110037 s = addr_str[i];
110038
110039 switch (ss->ss_family) {
110040diff --git a/net/compat.c b/net/compat.c
110041index f7bd286..76ea56a 100644
110042--- a/net/compat.c
110043+++ b/net/compat.c
110044@@ -100,20 +100,20 @@ ssize_t get_compat_msghdr(struct msghdr *kmsg,
110045
110046 #define CMSG_COMPAT_FIRSTHDR(msg) \
110047 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
110048- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
110049+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
110050 (struct compat_cmsghdr __user *)NULL)
110051
110052 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
110053 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
110054 (ucmlen) <= (unsigned long) \
110055 ((mhdr)->msg_controllen - \
110056- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
110057+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
110058
110059 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
110060 struct compat_cmsghdr __user *cmsg, int cmsg_len)
110061 {
110062 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
110063- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
110064+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
110065 msg->msg_controllen)
110066 return NULL;
110067 return (struct compat_cmsghdr __user *)ptr;
110068@@ -203,7 +203,7 @@ Efault:
110069
110070 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
110071 {
110072- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
110073+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
110074 struct compat_cmsghdr cmhdr;
110075 struct compat_timeval ctv;
110076 struct compat_timespec cts[3];
110077@@ -259,7 +259,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
110078
110079 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
110080 {
110081- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
110082+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
110083 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
110084 int fdnum = scm->fp->count;
110085 struct file **fp = scm->fp->fp;
110086@@ -347,7 +347,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
110087 return -EFAULT;
110088 old_fs = get_fs();
110089 set_fs(KERNEL_DS);
110090- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
110091+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
110092 set_fs(old_fs);
110093
110094 return err;
110095@@ -408,7 +408,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
110096 len = sizeof(ktime);
110097 old_fs = get_fs();
110098 set_fs(KERNEL_DS);
110099- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
110100+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
110101 set_fs(old_fs);
110102
110103 if (!err) {
110104@@ -551,7 +551,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110105 case MCAST_JOIN_GROUP:
110106 case MCAST_LEAVE_GROUP:
110107 {
110108- struct compat_group_req __user *gr32 = (void *)optval;
110109+ struct compat_group_req __user *gr32 = (void __user *)optval;
110110 struct group_req __user *kgr =
110111 compat_alloc_user_space(sizeof(struct group_req));
110112 u32 interface;
110113@@ -572,7 +572,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110114 case MCAST_BLOCK_SOURCE:
110115 case MCAST_UNBLOCK_SOURCE:
110116 {
110117- struct compat_group_source_req __user *gsr32 = (void *)optval;
110118+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
110119 struct group_source_req __user *kgsr = compat_alloc_user_space(
110120 sizeof(struct group_source_req));
110121 u32 interface;
110122@@ -593,7 +593,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110123 }
110124 case MCAST_MSFILTER:
110125 {
110126- struct compat_group_filter __user *gf32 = (void *)optval;
110127+ struct compat_group_filter __user *gf32 = (void __user *)optval;
110128 struct group_filter __user *kgf;
110129 u32 interface, fmode, numsrc;
110130
110131@@ -631,7 +631,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
110132 char __user *optval, int __user *optlen,
110133 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
110134 {
110135- struct compat_group_filter __user *gf32 = (void *)optval;
110136+ struct compat_group_filter __user *gf32 = (void __user *)optval;
110137 struct group_filter __user *kgf;
110138 int __user *koptlen;
110139 u32 interface, fmode, numsrc;
110140@@ -775,7 +775,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
110141
110142 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
110143 return -EINVAL;
110144- if (copy_from_user(a, args, nas[call]))
110145+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
110146 return -EFAULT;
110147 a0 = a[0];
110148 a1 = a[1];
110149diff --git a/net/core/datagram.c b/net/core/datagram.c
110150index df493d6..1145766 100644
110151--- a/net/core/datagram.c
110152+++ b/net/core/datagram.c
110153@@ -302,7 +302,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
110154 }
110155
110156 kfree_skb(skb);
110157- atomic_inc(&sk->sk_drops);
110158+ atomic_inc_unchecked(&sk->sk_drops);
110159 sk_mem_reclaim_partial(sk);
110160
110161 return err;
110162diff --git a/net/core/dev.c b/net/core/dev.c
110163index 22a53ac..1d19af7 100644
110164--- a/net/core/dev.c
110165+++ b/net/core/dev.c
110166@@ -1681,14 +1681,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
110167 {
110168 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
110169 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
110170- atomic_long_inc(&dev->rx_dropped);
110171+ atomic_long_inc_unchecked(&dev->rx_dropped);
110172 kfree_skb(skb);
110173 return NET_RX_DROP;
110174 }
110175 }
110176
110177 if (unlikely(!is_skb_forwardable(dev, skb))) {
110178- atomic_long_inc(&dev->rx_dropped);
110179+ atomic_long_inc_unchecked(&dev->rx_dropped);
110180 kfree_skb(skb);
110181 return NET_RX_DROP;
110182 }
110183@@ -2987,7 +2987,7 @@ recursion_alert:
110184 drop:
110185 rcu_read_unlock_bh();
110186
110187- atomic_long_inc(&dev->tx_dropped);
110188+ atomic_long_inc_unchecked(&dev->tx_dropped);
110189 kfree_skb_list(skb);
110190 return rc;
110191 out:
110192@@ -3336,7 +3336,7 @@ enqueue:
110193
110194 local_irq_restore(flags);
110195
110196- atomic_long_inc(&skb->dev->rx_dropped);
110197+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
110198 kfree_skb(skb);
110199 return NET_RX_DROP;
110200 }
110201@@ -3413,7 +3413,7 @@ int netif_rx_ni(struct sk_buff *skb)
110202 }
110203 EXPORT_SYMBOL(netif_rx_ni);
110204
110205-static void net_tx_action(struct softirq_action *h)
110206+static __latent_entropy void net_tx_action(void)
110207 {
110208 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
110209
110210@@ -3751,7 +3751,7 @@ ncls:
110211 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
110212 } else {
110213 drop:
110214- atomic_long_inc(&skb->dev->rx_dropped);
110215+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
110216 kfree_skb(skb);
110217 /* Jamal, now you will not able to escape explaining
110218 * me how you were going to use this. :-)
110219@@ -4640,7 +4640,7 @@ out_unlock:
110220 return work;
110221 }
110222
110223-static void net_rx_action(struct softirq_action *h)
110224+static __latent_entropy void net_rx_action(void)
110225 {
110226 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
110227 unsigned long time_limit = jiffies + 2;
110228@@ -6676,8 +6676,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
110229 } else {
110230 netdev_stats_to_stats64(storage, &dev->stats);
110231 }
110232- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
110233- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
110234+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
110235+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
110236 return storage;
110237 }
110238 EXPORT_SYMBOL(dev_get_stats);
110239diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
110240index b94b1d2..da3ed7c 100644
110241--- a/net/core/dev_ioctl.c
110242+++ b/net/core/dev_ioctl.c
110243@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
110244 no_module = !dev;
110245 if (no_module && capable(CAP_NET_ADMIN))
110246 no_module = request_module("netdev-%s", name);
110247- if (no_module && capable(CAP_SYS_MODULE))
110248+ if (no_module && capable(CAP_SYS_MODULE)) {
110249+#ifdef CONFIG_GRKERNSEC_MODHARDEN
110250+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
110251+#else
110252 request_module("%s", name);
110253+#endif
110254+ }
110255 }
110256 EXPORT_SYMBOL(dev_load);
110257
110258diff --git a/net/core/filter.c b/net/core/filter.c
110259index f6bdc2b..76eba8e 100644
110260--- a/net/core/filter.c
110261+++ b/net/core/filter.c
110262@@ -533,7 +533,11 @@ do_pass:
110263
110264 /* Unknown instruction. */
110265 default:
110266- goto err;
110267+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
110268+ fp->code, fp->jt, fp->jf, fp->k);
110269+ kfree(addrs);
110270+ BUG();
110271+ return -EINVAL;
110272 }
110273
110274 insn++;
110275@@ -577,7 +581,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
110276 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
110277 int pc, ret = 0;
110278
110279- BUILD_BUG_ON(BPF_MEMWORDS > 16);
110280+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
110281
110282 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
110283 if (!masks)
110284@@ -992,7 +996,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
110285 if (!fp)
110286 return -ENOMEM;
110287
110288- memcpy(fp->insns, fprog->filter, fsize);
110289+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
110290
110291 fp->len = fprog->len;
110292 /* Since unattached filters are not copied back to user
110293diff --git a/net/core/flow.c b/net/core/flow.c
110294index 1033725..340f65d 100644
110295--- a/net/core/flow.c
110296+++ b/net/core/flow.c
110297@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
110298 static int flow_entry_valid(struct flow_cache_entry *fle,
110299 struct netns_xfrm *xfrm)
110300 {
110301- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
110302+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
110303 return 0;
110304 if (fle->object && !fle->object->ops->check(fle->object))
110305 return 0;
110306@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
110307 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
110308 fcp->hash_count++;
110309 }
110310- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
110311+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
110312 flo = fle->object;
110313 if (!flo)
110314 goto ret_object;
110315@@ -263,7 +263,7 @@ nocache:
110316 }
110317 flo = resolver(net, key, family, dir, flo, ctx);
110318 if (fle) {
110319- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
110320+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
110321 if (!IS_ERR(flo))
110322 fle->object = flo;
110323 else
110324diff --git a/net/core/neighbour.c b/net/core/neighbour.c
110325index 70fe9e1..926784c 100644
110326--- a/net/core/neighbour.c
110327+++ b/net/core/neighbour.c
110328@@ -2806,7 +2806,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
110329 void __user *buffer, size_t *lenp, loff_t *ppos)
110330 {
110331 int size, ret;
110332- struct ctl_table tmp = *ctl;
110333+ ctl_table_no_const tmp = *ctl;
110334
110335 tmp.extra1 = &zero;
110336 tmp.extra2 = &unres_qlen_max;
110337@@ -2868,7 +2868,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
110338 void __user *buffer,
110339 size_t *lenp, loff_t *ppos)
110340 {
110341- struct ctl_table tmp = *ctl;
110342+ ctl_table_no_const tmp = *ctl;
110343 int ret;
110344
110345 tmp.extra1 = &zero;
110346diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
110347index 2bf8329..2eb1423 100644
110348--- a/net/core/net-procfs.c
110349+++ b/net/core/net-procfs.c
110350@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
110351 struct rtnl_link_stats64 temp;
110352 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
110353
110354- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110355+ if (gr_proc_is_restricted())
110356+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110357+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
110358+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
110359+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
110360+ else
110361+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110362 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
110363 dev->name, stats->rx_bytes, stats->rx_packets,
110364 stats->rx_errors,
110365@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
110366 return 0;
110367 }
110368
110369-static const struct seq_operations dev_seq_ops = {
110370+const struct seq_operations dev_seq_ops = {
110371 .start = dev_seq_start,
110372 .next = dev_seq_next,
110373 .stop = dev_seq_stop,
110374@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
110375
110376 static int softnet_seq_open(struct inode *inode, struct file *file)
110377 {
110378- return seq_open(file, &softnet_seq_ops);
110379+ return seq_open_restrict(file, &softnet_seq_ops);
110380 }
110381
110382 static const struct file_operations softnet_seq_fops = {
110383@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
110384 else
110385 seq_printf(seq, "%04x", ntohs(pt->type));
110386
110387+#ifdef CONFIG_GRKERNSEC_HIDESYM
110388+ seq_printf(seq, " %-8s %pf\n",
110389+ pt->dev ? pt->dev->name : "", NULL);
110390+#else
110391 seq_printf(seq, " %-8s %pf\n",
110392 pt->dev ? pt->dev->name : "", pt->func);
110393+#endif
110394 }
110395
110396 return 0;
110397diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
110398index f2aa73b..0d1a1ea 100644
110399--- a/net/core/net-sysfs.c
110400+++ b/net/core/net-sysfs.c
110401@@ -279,7 +279,7 @@ static ssize_t carrier_changes_show(struct device *dev,
110402 {
110403 struct net_device *netdev = to_net_dev(dev);
110404 return sprintf(buf, fmt_dec,
110405- atomic_read(&netdev->carrier_changes));
110406+ atomic_read_unchecked(&netdev->carrier_changes));
110407 }
110408 static DEVICE_ATTR_RO(carrier_changes);
110409
110410diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
110411index 70d3450..eb7c528 100644
110412--- a/net/core/net_namespace.c
110413+++ b/net/core/net_namespace.c
110414@@ -663,7 +663,7 @@ static int __register_pernet_operations(struct list_head *list,
110415 int error;
110416 LIST_HEAD(net_exit_list);
110417
110418- list_add_tail(&ops->list, list);
110419+ pax_list_add_tail((struct list_head *)&ops->list, list);
110420 if (ops->init || (ops->id && ops->size)) {
110421 for_each_net(net) {
110422 error = ops_init(ops, net);
110423@@ -676,7 +676,7 @@ static int __register_pernet_operations(struct list_head *list,
110424
110425 out_undo:
110426 /* If I have an error cleanup all namespaces I initialized */
110427- list_del(&ops->list);
110428+ pax_list_del((struct list_head *)&ops->list);
110429 ops_exit_list(ops, &net_exit_list);
110430 ops_free_list(ops, &net_exit_list);
110431 return error;
110432@@ -687,7 +687,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
110433 struct net *net;
110434 LIST_HEAD(net_exit_list);
110435
110436- list_del(&ops->list);
110437+ pax_list_del((struct list_head *)&ops->list);
110438 for_each_net(net)
110439 list_add_tail(&net->exit_list, &net_exit_list);
110440 ops_exit_list(ops, &net_exit_list);
110441@@ -821,7 +821,7 @@ int register_pernet_device(struct pernet_operations *ops)
110442 mutex_lock(&net_mutex);
110443 error = register_pernet_operations(&pernet_list, ops);
110444 if (!error && (first_device == &pernet_list))
110445- first_device = &ops->list;
110446+ first_device = (struct list_head *)&ops->list;
110447 mutex_unlock(&net_mutex);
110448 return error;
110449 }
110450diff --git a/net/core/netpoll.c b/net/core/netpoll.c
110451index c126a87..10ad89d 100644
110452--- a/net/core/netpoll.c
110453+++ b/net/core/netpoll.c
110454@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
110455 struct udphdr *udph;
110456 struct iphdr *iph;
110457 struct ethhdr *eth;
110458- static atomic_t ip_ident;
110459+ static atomic_unchecked_t ip_ident;
110460 struct ipv6hdr *ip6h;
110461
110462 udp_len = len + sizeof(*udph);
110463@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
110464 put_unaligned(0x45, (unsigned char *)iph);
110465 iph->tos = 0;
110466 put_unaligned(htons(ip_len), &(iph->tot_len));
110467- iph->id = htons(atomic_inc_return(&ip_ident));
110468+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
110469 iph->frag_off = 0;
110470 iph->ttl = 64;
110471 iph->protocol = IPPROTO_UDP;
110472diff --git a/net/core/pktgen.c b/net/core/pktgen.c
110473index 508155b..fad080f 100644
110474--- a/net/core/pktgen.c
110475+++ b/net/core/pktgen.c
110476@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
110477 pn->net = net;
110478 INIT_LIST_HEAD(&pn->pktgen_threads);
110479 pn->pktgen_exiting = false;
110480- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
110481+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
110482 if (!pn->proc_dir) {
110483 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
110484 return -ENODEV;
110485diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
110486index 7ebed55..378bf34 100644
110487--- a/net/core/rtnetlink.c
110488+++ b/net/core/rtnetlink.c
110489@@ -61,7 +61,7 @@ struct rtnl_link {
110490 rtnl_doit_func doit;
110491 rtnl_dumpit_func dumpit;
110492 rtnl_calcit_func calcit;
110493-};
110494+} __no_const;
110495
110496 static DEFINE_MUTEX(rtnl_mutex);
110497
110498@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
110499 * to use the ops for creating device. So do not
110500 * fill up dellink as well. That disables rtnl_dellink.
110501 */
110502- if (ops->setup && !ops->dellink)
110503- ops->dellink = unregister_netdevice_queue;
110504+ if (ops->setup && !ops->dellink) {
110505+ pax_open_kernel();
110506+ *(void **)&ops->dellink = unregister_netdevice_queue;
110507+ pax_close_kernel();
110508+ }
110509
110510- list_add_tail(&ops->list, &link_ops);
110511+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
110512 return 0;
110513 }
110514 EXPORT_SYMBOL_GPL(__rtnl_link_register);
110515@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
110516 for_each_net(net) {
110517 __rtnl_kill_links(net, ops);
110518 }
110519- list_del(&ops->list);
110520+ pax_list_del((struct list_head *)&ops->list);
110521 }
110522 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
110523
110524@@ -1047,7 +1050,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
110525 (dev->ifalias &&
110526 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
110527 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
110528- atomic_read(&dev->carrier_changes)))
110529+ atomic_read_unchecked(&dev->carrier_changes)))
110530 goto nla_put_failure;
110531
110532 if (1) {
110533diff --git a/net/core/scm.c b/net/core/scm.c
110534index 3b6899b..cf36238 100644
110535--- a/net/core/scm.c
110536+++ b/net/core/scm.c
110537@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
110538 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
110539 {
110540 struct cmsghdr __user *cm
110541- = (__force struct cmsghdr __user *)msg->msg_control;
110542+ = (struct cmsghdr __force_user *)msg->msg_control;
110543 struct cmsghdr cmhdr;
110544 int cmlen = CMSG_LEN(len);
110545 int err;
110546@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
110547 err = -EFAULT;
110548 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
110549 goto out;
110550- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
110551+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
110552 goto out;
110553 cmlen = CMSG_SPACE(len);
110554 if (msg->msg_controllen < cmlen)
110555@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
110556 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
110557 {
110558 struct cmsghdr __user *cm
110559- = (__force struct cmsghdr __user*)msg->msg_control;
110560+ = (struct cmsghdr __force_user *)msg->msg_control;
110561
110562 int fdmax = 0;
110563 int fdnum = scm->fp->count;
110564@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
110565 if (fdnum < fdmax)
110566 fdmax = fdnum;
110567
110568- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
110569+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
110570 i++, cmfptr++)
110571 {
110572 struct socket *sock;
110573diff --git a/net/core/skbuff.c b/net/core/skbuff.c
110574index e9f9a15..6eb024e 100644
110575--- a/net/core/skbuff.c
110576+++ b/net/core/skbuff.c
110577@@ -2139,7 +2139,7 @@ EXPORT_SYMBOL(__skb_checksum);
110578 __wsum skb_checksum(const struct sk_buff *skb, int offset,
110579 int len, __wsum csum)
110580 {
110581- const struct skb_checksum_ops ops = {
110582+ static const struct skb_checksum_ops ops = {
110583 .update = csum_partial_ext,
110584 .combine = csum_block_add_ext,
110585 };
110586@@ -3379,12 +3379,14 @@ void __init skb_init(void)
110587 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
110588 sizeof(struct sk_buff),
110589 0,
110590- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
110591+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
110592+ SLAB_NO_SANITIZE,
110593 NULL);
110594 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
110595 sizeof(struct sk_buff_fclones),
110596 0,
110597- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
110598+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
110599+ SLAB_NO_SANITIZE,
110600 NULL);
110601 }
110602
110603diff --git a/net/core/sock.c b/net/core/sock.c
110604index 71e3e5f..ab90920 100644
110605--- a/net/core/sock.c
110606+++ b/net/core/sock.c
110607@@ -443,7 +443,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110608 struct sk_buff_head *list = &sk->sk_receive_queue;
110609
110610 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
110611- atomic_inc(&sk->sk_drops);
110612+ atomic_inc_unchecked(&sk->sk_drops);
110613 trace_sock_rcvqueue_full(sk, skb);
110614 return -ENOMEM;
110615 }
110616@@ -453,7 +453,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110617 return err;
110618
110619 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
110620- atomic_inc(&sk->sk_drops);
110621+ atomic_inc_unchecked(&sk->sk_drops);
110622 return -ENOBUFS;
110623 }
110624
110625@@ -466,7 +466,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110626 skb_dst_force(skb);
110627
110628 spin_lock_irqsave(&list->lock, flags);
110629- skb->dropcount = atomic_read(&sk->sk_drops);
110630+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
110631 __skb_queue_tail(list, skb);
110632 spin_unlock_irqrestore(&list->lock, flags);
110633
110634@@ -486,7 +486,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
110635 skb->dev = NULL;
110636
110637 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
110638- atomic_inc(&sk->sk_drops);
110639+ atomic_inc_unchecked(&sk->sk_drops);
110640 goto discard_and_relse;
110641 }
110642 if (nested)
110643@@ -504,7 +504,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
110644 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
110645 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
110646 bh_unlock_sock(sk);
110647- atomic_inc(&sk->sk_drops);
110648+ atomic_inc_unchecked(&sk->sk_drops);
110649 goto discard_and_relse;
110650 }
110651
110652@@ -910,6 +910,7 @@ set_rcvbuf:
110653 }
110654 break;
110655
110656+#ifndef GRKERNSEC_BPF_HARDEN
110657 case SO_ATTACH_BPF:
110658 ret = -EINVAL;
110659 if (optlen == sizeof(u32)) {
110660@@ -922,7 +923,7 @@ set_rcvbuf:
110661 ret = sk_attach_bpf(ufd, sk);
110662 }
110663 break;
110664-
110665+#endif
110666 case SO_DETACH_FILTER:
110667 ret = sk_detach_filter(sk);
110668 break;
110669@@ -1026,12 +1027,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110670 struct timeval tm;
110671 } v;
110672
110673- int lv = sizeof(int);
110674- int len;
110675+ unsigned int lv = sizeof(int);
110676+ unsigned int len;
110677
110678 if (get_user(len, optlen))
110679 return -EFAULT;
110680- if (len < 0)
110681+ if (len > INT_MAX)
110682 return -EINVAL;
110683
110684 memset(&v, 0, sizeof(v));
110685@@ -1169,11 +1170,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110686
110687 case SO_PEERNAME:
110688 {
110689- char address[128];
110690+ char address[_K_SS_MAXSIZE];
110691
110692 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
110693 return -ENOTCONN;
110694- if (lv < len)
110695+ if (lv < len || sizeof address < len)
110696 return -EINVAL;
110697 if (copy_to_user(optval, address, len))
110698 return -EFAULT;
110699@@ -1258,7 +1259,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110700
110701 if (len > lv)
110702 len = lv;
110703- if (copy_to_user(optval, &v, len))
110704+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
110705 return -EFAULT;
110706 lenout:
110707 if (put_user(len, optlen))
110708@@ -2375,7 +2376,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
110709 */
110710 smp_wmb();
110711 atomic_set(&sk->sk_refcnt, 1);
110712- atomic_set(&sk->sk_drops, 0);
110713+ atomic_set_unchecked(&sk->sk_drops, 0);
110714 }
110715 EXPORT_SYMBOL(sock_init_data);
110716
110717@@ -2503,6 +2504,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
110718 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
110719 int level, int type)
110720 {
110721+ struct sock_extended_err ee;
110722 struct sock_exterr_skb *serr;
110723 struct sk_buff *skb;
110724 int copied, err;
110725@@ -2524,7 +2526,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
110726 sock_recv_timestamp(msg, sk, skb);
110727
110728 serr = SKB_EXT_ERR(skb);
110729- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
110730+ ee = serr->ee;
110731+ put_cmsg(msg, level, type, sizeof ee, &ee);
110732
110733 msg->msg_flags |= MSG_ERRQUEUE;
110734 err = copied;
110735diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
110736index ad704c7..ca48aff 100644
110737--- a/net/core/sock_diag.c
110738+++ b/net/core/sock_diag.c
110739@@ -9,26 +9,33 @@
110740 #include <linux/inet_diag.h>
110741 #include <linux/sock_diag.h>
110742
110743-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
110744+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
110745 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
110746 static DEFINE_MUTEX(sock_diag_table_mutex);
110747
110748 int sock_diag_check_cookie(void *sk, __u32 *cookie)
110749 {
110750+#ifndef CONFIG_GRKERNSEC_HIDESYM
110751 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
110752 cookie[1] != INET_DIAG_NOCOOKIE) &&
110753 ((u32)(unsigned long)sk != cookie[0] ||
110754 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
110755 return -ESTALE;
110756 else
110757+#endif
110758 return 0;
110759 }
110760 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
110761
110762 void sock_diag_save_cookie(void *sk, __u32 *cookie)
110763 {
110764+#ifdef CONFIG_GRKERNSEC_HIDESYM
110765+ cookie[0] = 0;
110766+ cookie[1] = 0;
110767+#else
110768 cookie[0] = (u32)(unsigned long)sk;
110769 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
110770+#endif
110771 }
110772 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
110773
110774@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
110775 mutex_lock(&sock_diag_table_mutex);
110776 if (sock_diag_handlers[hndl->family])
110777 err = -EBUSY;
110778- else
110779+ else {
110780+ pax_open_kernel();
110781 sock_diag_handlers[hndl->family] = hndl;
110782+ pax_close_kernel();
110783+ }
110784 mutex_unlock(&sock_diag_table_mutex);
110785
110786 return err;
110787@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
110788
110789 mutex_lock(&sock_diag_table_mutex);
110790 BUG_ON(sock_diag_handlers[family] != hnld);
110791+ pax_open_kernel();
110792 sock_diag_handlers[family] = NULL;
110793+ pax_close_kernel();
110794 mutex_unlock(&sock_diag_table_mutex);
110795 }
110796 EXPORT_SYMBOL_GPL(sock_diag_unregister);
110797diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
110798index 8ce351f..2c388f7 100644
110799--- a/net/core/sysctl_net_core.c
110800+++ b/net/core/sysctl_net_core.c
110801@@ -36,7 +36,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
110802 {
110803 unsigned int orig_size, size;
110804 int ret, i;
110805- struct ctl_table tmp = {
110806+ ctl_table_no_const tmp = {
110807 .data = &size,
110808 .maxlen = sizeof(size),
110809 .mode = table->mode
110810@@ -204,7 +204,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
110811 void __user *buffer, size_t *lenp, loff_t *ppos)
110812 {
110813 char id[IFNAMSIZ];
110814- struct ctl_table tbl = {
110815+ ctl_table_no_const tbl = {
110816 .data = id,
110817 .maxlen = IFNAMSIZ,
110818 };
110819@@ -222,7 +222,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
110820 static int proc_do_rss_key(struct ctl_table *table, int write,
110821 void __user *buffer, size_t *lenp, loff_t *ppos)
110822 {
110823- struct ctl_table fake_table;
110824+ ctl_table_no_const fake_table;
110825 char buf[NETDEV_RSS_KEY_LEN * 3];
110826
110827 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
110828@@ -286,7 +286,7 @@ static struct ctl_table net_core_table[] = {
110829 .mode = 0444,
110830 .proc_handler = proc_do_rss_key,
110831 },
110832-#ifdef CONFIG_BPF_JIT
110833+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
110834 {
110835 .procname = "bpf_jit_enable",
110836 .data = &bpf_jit_enable,
110837@@ -411,13 +411,12 @@ static struct ctl_table netns_core_table[] = {
110838
110839 static __net_init int sysctl_core_net_init(struct net *net)
110840 {
110841- struct ctl_table *tbl;
110842+ ctl_table_no_const *tbl = NULL;
110843
110844 net->core.sysctl_somaxconn = SOMAXCONN;
110845
110846- tbl = netns_core_table;
110847 if (!net_eq(net, &init_net)) {
110848- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
110849+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
110850 if (tbl == NULL)
110851 goto err_dup;
110852
110853@@ -427,17 +426,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
110854 if (net->user_ns != &init_user_ns) {
110855 tbl[0].procname = NULL;
110856 }
110857- }
110858-
110859- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
110860+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
110861+ } else
110862+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
110863 if (net->core.sysctl_hdr == NULL)
110864 goto err_reg;
110865
110866 return 0;
110867
110868 err_reg:
110869- if (tbl != netns_core_table)
110870- kfree(tbl);
110871+ kfree(tbl);
110872 err_dup:
110873 return -ENOMEM;
110874 }
110875@@ -452,7 +450,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
110876 kfree(tbl);
110877 }
110878
110879-static __net_initdata struct pernet_operations sysctl_core_ops = {
110880+static __net_initconst struct pernet_operations sysctl_core_ops = {
110881 .init = sysctl_core_net_init,
110882 .exit = sysctl_core_net_exit,
110883 };
110884diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
110885index 8102286..a0c2755 100644
110886--- a/net/decnet/af_decnet.c
110887+++ b/net/decnet/af_decnet.c
110888@@ -466,6 +466,7 @@ static struct proto dn_proto = {
110889 .sysctl_rmem = sysctl_decnet_rmem,
110890 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
110891 .obj_size = sizeof(struct dn_sock),
110892+ .slab_flags = SLAB_USERCOPY,
110893 };
110894
110895 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
110896diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
110897index b2c26b0..41f803e 100644
110898--- a/net/decnet/dn_dev.c
110899+++ b/net/decnet/dn_dev.c
110900@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
110901 .extra1 = &min_t3,
110902 .extra2 = &max_t3
110903 },
110904- {0}
110905+ { }
110906 },
110907 };
110908
110909diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
110910index 5325b54..a0d4d69 100644
110911--- a/net/decnet/sysctl_net_decnet.c
110912+++ b/net/decnet/sysctl_net_decnet.c
110913@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
110914
110915 if (len > *lenp) len = *lenp;
110916
110917- if (copy_to_user(buffer, addr, len))
110918+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
110919 return -EFAULT;
110920
110921 *lenp = len;
110922@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
110923
110924 if (len > *lenp) len = *lenp;
110925
110926- if (copy_to_user(buffer, devname, len))
110927+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
110928 return -EFAULT;
110929
110930 *lenp = len;
110931diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
110932index a2c7e4c..3dc9f67 100644
110933--- a/net/hsr/hsr_netlink.c
110934+++ b/net/hsr/hsr_netlink.c
110935@@ -102,7 +102,7 @@ nla_put_failure:
110936 return -EMSGSIZE;
110937 }
110938
110939-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
110940+static struct rtnl_link_ops hsr_link_ops = {
110941 .kind = "hsr",
110942 .maxtype = IFLA_HSR_MAX,
110943 .policy = hsr_policy,
110944diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
110945index 055fbb7..c0dbe60 100644
110946--- a/net/ieee802154/6lowpan/core.c
110947+++ b/net/ieee802154/6lowpan/core.c
110948@@ -217,7 +217,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
110949 dev_put(real_dev);
110950 }
110951
110952-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
110953+static struct rtnl_link_ops lowpan_link_ops = {
110954 .kind = "lowpan",
110955 .priv_size = sizeof(struct lowpan_dev_info),
110956 .setup = lowpan_setup,
110957diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
110958index f46e4d1..30231f1 100644
110959--- a/net/ieee802154/6lowpan/reassembly.c
110960+++ b/net/ieee802154/6lowpan/reassembly.c
110961@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
110962
110963 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
110964 {
110965- struct ctl_table *table;
110966+ ctl_table_no_const *table = NULL;
110967 struct ctl_table_header *hdr;
110968 struct netns_ieee802154_lowpan *ieee802154_lowpan =
110969 net_ieee802154_lowpan(net);
110970
110971- table = lowpan_frags_ns_ctl_table;
110972 if (!net_eq(net, &init_net)) {
110973- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
110974+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
110975 GFP_KERNEL);
110976 if (table == NULL)
110977 goto err_alloc;
110978@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
110979 /* Don't export sysctls to unprivileged users */
110980 if (net->user_ns != &init_user_ns)
110981 table[0].procname = NULL;
110982- }
110983-
110984- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
110985+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
110986+ } else
110987+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
110988 if (hdr == NULL)
110989 goto err_reg;
110990
110991@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
110992 return 0;
110993
110994 err_reg:
110995- if (!net_eq(net, &init_net))
110996- kfree(table);
110997+ kfree(table);
110998 err_alloc:
110999 return -ENOMEM;
111000 }
111001diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
111002index d2e49ba..f78e8aa 100644
111003--- a/net/ipv4/af_inet.c
111004+++ b/net/ipv4/af_inet.c
111005@@ -1390,7 +1390,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
111006 return ip_recv_error(sk, msg, len, addr_len);
111007 #if IS_ENABLED(CONFIG_IPV6)
111008 if (sk->sk_family == AF_INET6)
111009- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
111010+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
111011 #endif
111012 return -EINVAL;
111013 }
111014diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
111015index 3a8985c..9d2a870 100644
111016--- a/net/ipv4/devinet.c
111017+++ b/net/ipv4/devinet.c
111018@@ -69,7 +69,8 @@
111019
111020 static struct ipv4_devconf ipv4_devconf = {
111021 .data = {
111022- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
111023+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
111024+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
111025 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
111026 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
111027 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
111028@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
111029
111030 static struct ipv4_devconf ipv4_devconf_dflt = {
111031 .data = {
111032- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
111033+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
111034+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
111035 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
111036 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
111037 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
111038@@ -1549,7 +1551,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
111039 idx = 0;
111040 head = &net->dev_index_head[h];
111041 rcu_read_lock();
111042- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
111043+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
111044 net->dev_base_seq;
111045 hlist_for_each_entry_rcu(dev, head, index_hlist) {
111046 if (idx < s_idx)
111047@@ -1868,7 +1870,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
111048 idx = 0;
111049 head = &net->dev_index_head[h];
111050 rcu_read_lock();
111051- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
111052+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
111053 net->dev_base_seq;
111054 hlist_for_each_entry_rcu(dev, head, index_hlist) {
111055 if (idx < s_idx)
111056@@ -2103,7 +2105,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
111057 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
111058 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
111059
111060-static struct devinet_sysctl_table {
111061+static const struct devinet_sysctl_table {
111062 struct ctl_table_header *sysctl_header;
111063 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
111064 } devinet_sysctl = {
111065@@ -2235,7 +2237,7 @@ static __net_init int devinet_init_net(struct net *net)
111066 int err;
111067 struct ipv4_devconf *all, *dflt;
111068 #ifdef CONFIG_SYSCTL
111069- struct ctl_table *tbl = ctl_forward_entry;
111070+ ctl_table_no_const *tbl = NULL;
111071 struct ctl_table_header *forw_hdr;
111072 #endif
111073
111074@@ -2253,7 +2255,7 @@ static __net_init int devinet_init_net(struct net *net)
111075 goto err_alloc_dflt;
111076
111077 #ifdef CONFIG_SYSCTL
111078- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
111079+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
111080 if (tbl == NULL)
111081 goto err_alloc_ctl;
111082
111083@@ -2273,7 +2275,10 @@ static __net_init int devinet_init_net(struct net *net)
111084 goto err_reg_dflt;
111085
111086 err = -ENOMEM;
111087- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
111088+ if (!net_eq(net, &init_net))
111089+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
111090+ else
111091+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
111092 if (forw_hdr == NULL)
111093 goto err_reg_ctl;
111094 net->ipv4.forw_hdr = forw_hdr;
111095@@ -2289,8 +2294,7 @@ err_reg_ctl:
111096 err_reg_dflt:
111097 __devinet_sysctl_unregister(all);
111098 err_reg_all:
111099- if (tbl != ctl_forward_entry)
111100- kfree(tbl);
111101+ kfree(tbl);
111102 err_alloc_ctl:
111103 #endif
111104 if (dflt != &ipv4_devconf_dflt)
111105diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
111106index 23b9b3e..60cf0c4 100644
111107--- a/net/ipv4/fib_frontend.c
111108+++ b/net/ipv4/fib_frontend.c
111109@@ -1020,12 +1020,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
111110 #ifdef CONFIG_IP_ROUTE_MULTIPATH
111111 fib_sync_up(dev);
111112 #endif
111113- atomic_inc(&net->ipv4.dev_addr_genid);
111114+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111115 rt_cache_flush(dev_net(dev));
111116 break;
111117 case NETDEV_DOWN:
111118 fib_del_ifaddr(ifa, NULL);
111119- atomic_inc(&net->ipv4.dev_addr_genid);
111120+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111121 if (ifa->ifa_dev->ifa_list == NULL) {
111122 /* Last address was deleted from this interface.
111123 * Disable IP.
111124@@ -1063,7 +1063,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
111125 #ifdef CONFIG_IP_ROUTE_MULTIPATH
111126 fib_sync_up(dev);
111127 #endif
111128- atomic_inc(&net->ipv4.dev_addr_genid);
111129+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111130 rt_cache_flush(net);
111131 break;
111132 case NETDEV_DOWN:
111133diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
111134index 1e2090e..351a724 100644
111135--- a/net/ipv4/fib_semantics.c
111136+++ b/net/ipv4/fib_semantics.c
111137@@ -753,7 +753,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
111138 nh->nh_saddr = inet_select_addr(nh->nh_dev,
111139 nh->nh_gw,
111140 nh->nh_parent->fib_scope);
111141- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
111142+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
111143
111144 return nh->nh_saddr;
111145 }
111146diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
111147index ff069f6..335e752 100644
111148--- a/net/ipv4/fou.c
111149+++ b/net/ipv4/fou.c
111150@@ -771,12 +771,12 @@ EXPORT_SYMBOL(gue_build_header);
111151
111152 #ifdef CONFIG_NET_FOU_IP_TUNNELS
111153
111154-static const struct ip_tunnel_encap_ops __read_mostly fou_iptun_ops = {
111155+static const struct ip_tunnel_encap_ops fou_iptun_ops = {
111156 .encap_hlen = fou_encap_hlen,
111157 .build_header = fou_build_header,
111158 };
111159
111160-static const struct ip_tunnel_encap_ops __read_mostly gue_iptun_ops = {
111161+static const struct ip_tunnel_encap_ops gue_iptun_ops = {
111162 .encap_hlen = gue_encap_hlen,
111163 .build_header = gue_build_header,
111164 };
111165diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
111166index 9111a4e..3576905 100644
111167--- a/net/ipv4/inet_hashtables.c
111168+++ b/net/ipv4/inet_hashtables.c
111169@@ -18,6 +18,7 @@
111170 #include <linux/sched.h>
111171 #include <linux/slab.h>
111172 #include <linux/wait.h>
111173+#include <linux/security.h>
111174
111175 #include <net/inet_connection_sock.h>
111176 #include <net/inet_hashtables.h>
111177@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
111178 return inet_ehashfn(net, laddr, lport, faddr, fport);
111179 }
111180
111181+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
111182+
111183 /*
111184 * Allocate and initialize a new local port bind bucket.
111185 * The bindhash mutex for snum's hash chain must be held here.
111186@@ -554,6 +557,8 @@ ok:
111187 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
111188 spin_unlock(&head->lock);
111189
111190+ gr_update_task_in_ip_table(inet_sk(sk));
111191+
111192 if (tw) {
111193 inet_twsk_deschedule(tw, death_row);
111194 while (twrefcnt) {
111195diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
111196index 241afd7..31b95d5 100644
111197--- a/net/ipv4/inetpeer.c
111198+++ b/net/ipv4/inetpeer.c
111199@@ -461,7 +461,7 @@ relookup:
111200 if (p) {
111201 p->daddr = *daddr;
111202 atomic_set(&p->refcnt, 1);
111203- atomic_set(&p->rid, 0);
111204+ atomic_set_unchecked(&p->rid, 0);
111205 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
111206 p->rate_tokens = 0;
111207 /* 60*HZ is arbitrary, but chosen enough high so that the first
111208diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
111209index 145a50c..5dd8cc5 100644
111210--- a/net/ipv4/ip_fragment.c
111211+++ b/net/ipv4/ip_fragment.c
111212@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
111213 return 0;
111214
111215 start = qp->rid;
111216- end = atomic_inc_return(&peer->rid);
111217+ end = atomic_inc_return_unchecked(&peer->rid);
111218 qp->rid = end;
111219
111220 rc = qp->q.fragments && (end - start) > max;
111221@@ -748,12 +748,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
111222
111223 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111224 {
111225- struct ctl_table *table;
111226+ ctl_table_no_const *table = NULL;
111227 struct ctl_table_header *hdr;
111228
111229- table = ip4_frags_ns_ctl_table;
111230 if (!net_eq(net, &init_net)) {
111231- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
111232+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
111233 if (table == NULL)
111234 goto err_alloc;
111235
111236@@ -767,9 +766,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111237 /* Don't export sysctls to unprivileged users */
111238 if (net->user_ns != &init_user_ns)
111239 table[0].procname = NULL;
111240- }
111241+ hdr = register_net_sysctl(net, "net/ipv4", table);
111242+ } else
111243+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
111244
111245- hdr = register_net_sysctl(net, "net/ipv4", table);
111246 if (hdr == NULL)
111247 goto err_reg;
111248
111249@@ -777,8 +777,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111250 return 0;
111251
111252 err_reg:
111253- if (!net_eq(net, &init_net))
111254- kfree(table);
111255+ kfree(table);
111256 err_alloc:
111257 return -ENOMEM;
111258 }
111259diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
111260index 6207275f..00323a2 100644
111261--- a/net/ipv4/ip_gre.c
111262+++ b/net/ipv4/ip_gre.c
111263@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
111264 module_param(log_ecn_error, bool, 0644);
111265 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
111266
111267-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
111268+static struct rtnl_link_ops ipgre_link_ops;
111269 static int ipgre_tunnel_init(struct net_device *dev);
111270
111271 static int ipgre_net_id __read_mostly;
111272@@ -817,7 +817,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
111273 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
111274 };
111275
111276-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
111277+static struct rtnl_link_ops ipgre_link_ops = {
111278 .kind = "gre",
111279 .maxtype = IFLA_GRE_MAX,
111280 .policy = ipgre_policy,
111281@@ -832,7 +832,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
111282 .get_link_net = ip_tunnel_get_link_net,
111283 };
111284
111285-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
111286+static struct rtnl_link_ops ipgre_tap_ops = {
111287 .kind = "gretap",
111288 .maxtype = IFLA_GRE_MAX,
111289 .policy = ipgre_policy,
111290diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
111291index 3d4da2c..40f9c29 100644
111292--- a/net/ipv4/ip_input.c
111293+++ b/net/ipv4/ip_input.c
111294@@ -147,6 +147,10 @@
111295 #include <linux/mroute.h>
111296 #include <linux/netlink.h>
111297
111298+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111299+extern int grsec_enable_blackhole;
111300+#endif
111301+
111302 /*
111303 * Process Router Attention IP option (RFC 2113)
111304 */
111305@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
111306 if (!raw) {
111307 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
111308 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
111309+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111310+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
111311+#endif
111312 icmp_send(skb, ICMP_DEST_UNREACH,
111313 ICMP_PROT_UNREACH, 0);
111314 }
111315diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
111316index 5cd9927..8610b9f 100644
111317--- a/net/ipv4/ip_sockglue.c
111318+++ b/net/ipv4/ip_sockglue.c
111319@@ -1254,7 +1254,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
111320 len = min_t(unsigned int, len, opt->optlen);
111321 if (put_user(len, optlen))
111322 return -EFAULT;
111323- if (copy_to_user(optval, opt->__data, len))
111324+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
111325+ copy_to_user(optval, opt->__data, len))
111326 return -EFAULT;
111327 return 0;
111328 }
111329@@ -1388,7 +1389,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
111330 if (sk->sk_type != SOCK_STREAM)
111331 return -ENOPROTOOPT;
111332
111333- msg.msg_control = (__force void *) optval;
111334+ msg.msg_control = (__force_kernel void *) optval;
111335 msg.msg_controllen = len;
111336 msg.msg_flags = flags;
111337
111338diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
111339index 94efe14..1453fcc 100644
111340--- a/net/ipv4/ip_vti.c
111341+++ b/net/ipv4/ip_vti.c
111342@@ -45,7 +45,7 @@
111343 #include <net/net_namespace.h>
111344 #include <net/netns/generic.h>
111345
111346-static struct rtnl_link_ops vti_link_ops __read_mostly;
111347+static struct rtnl_link_ops vti_link_ops;
111348
111349 static int vti_net_id __read_mostly;
111350 static int vti_tunnel_init(struct net_device *dev);
111351@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
111352 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
111353 };
111354
111355-static struct rtnl_link_ops vti_link_ops __read_mostly = {
111356+static struct rtnl_link_ops vti_link_ops = {
111357 .kind = "vti",
111358 .maxtype = IFLA_VTI_MAX,
111359 .policy = vti_policy,
111360diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
111361index b26376e..fc3d733 100644
111362--- a/net/ipv4/ipconfig.c
111363+++ b/net/ipv4/ipconfig.c
111364@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
111365
111366 mm_segment_t oldfs = get_fs();
111367 set_fs(get_ds());
111368- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
111369+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
111370 set_fs(oldfs);
111371 return res;
111372 }
111373@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
111374
111375 mm_segment_t oldfs = get_fs();
111376 set_fs(get_ds());
111377- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
111378+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
111379 set_fs(oldfs);
111380 return res;
111381 }
111382@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
111383
111384 mm_segment_t oldfs = get_fs();
111385 set_fs(get_ds());
111386- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
111387+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
111388 set_fs(oldfs);
111389 return res;
111390 }
111391diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
111392index 915d215..48d1db7 100644
111393--- a/net/ipv4/ipip.c
111394+++ b/net/ipv4/ipip.c
111395@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
111396 static int ipip_net_id __read_mostly;
111397
111398 static int ipip_tunnel_init(struct net_device *dev);
111399-static struct rtnl_link_ops ipip_link_ops __read_mostly;
111400+static struct rtnl_link_ops ipip_link_ops;
111401
111402 static int ipip_err(struct sk_buff *skb, u32 info)
111403 {
111404@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
111405 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
111406 };
111407
111408-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
111409+static struct rtnl_link_ops ipip_link_ops = {
111410 .kind = "ipip",
111411 .maxtype = IFLA_IPTUN_MAX,
111412 .policy = ipip_policy,
111413diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
111414index f95b6f9..2ee2097 100644
111415--- a/net/ipv4/netfilter/arp_tables.c
111416+++ b/net/ipv4/netfilter/arp_tables.c
111417@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
111418 #endif
111419
111420 static int get_info(struct net *net, void __user *user,
111421- const int *len, int compat)
111422+ int len, int compat)
111423 {
111424 char name[XT_TABLE_MAXNAMELEN];
111425 struct xt_table *t;
111426 int ret;
111427
111428- if (*len != sizeof(struct arpt_getinfo)) {
111429- duprintf("length %u != %Zu\n", *len,
111430+ if (len != sizeof(struct arpt_getinfo)) {
111431+ duprintf("length %u != %Zu\n", len,
111432 sizeof(struct arpt_getinfo));
111433 return -EINVAL;
111434 }
111435@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
111436 info.size = private->size;
111437 strcpy(info.name, name);
111438
111439- if (copy_to_user(user, &info, *len) != 0)
111440+ if (copy_to_user(user, &info, len) != 0)
111441 ret = -EFAULT;
111442 else
111443 ret = 0;
111444@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
111445
111446 switch (cmd) {
111447 case ARPT_SO_GET_INFO:
111448- ret = get_info(sock_net(sk), user, len, 1);
111449+ ret = get_info(sock_net(sk), user, *len, 1);
111450 break;
111451 case ARPT_SO_GET_ENTRIES:
111452 ret = compat_get_entries(sock_net(sk), user, len);
111453@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
111454
111455 switch (cmd) {
111456 case ARPT_SO_GET_INFO:
111457- ret = get_info(sock_net(sk), user, len, 0);
111458+ ret = get_info(sock_net(sk), user, *len, 0);
111459 break;
111460
111461 case ARPT_SO_GET_ENTRIES:
111462diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
111463index cf5e82f..75a20f5 100644
111464--- a/net/ipv4/netfilter/ip_tables.c
111465+++ b/net/ipv4/netfilter/ip_tables.c
111466@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
111467 #endif
111468
111469 static int get_info(struct net *net, void __user *user,
111470- const int *len, int compat)
111471+ int len, int compat)
111472 {
111473 char name[XT_TABLE_MAXNAMELEN];
111474 struct xt_table *t;
111475 int ret;
111476
111477- if (*len != sizeof(struct ipt_getinfo)) {
111478- duprintf("length %u != %zu\n", *len,
111479+ if (len != sizeof(struct ipt_getinfo)) {
111480+ duprintf("length %u != %zu\n", len,
111481 sizeof(struct ipt_getinfo));
111482 return -EINVAL;
111483 }
111484@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
111485 info.size = private->size;
111486 strcpy(info.name, name);
111487
111488- if (copy_to_user(user, &info, *len) != 0)
111489+ if (copy_to_user(user, &info, len) != 0)
111490 ret = -EFAULT;
111491 else
111492 ret = 0;
111493@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
111494
111495 switch (cmd) {
111496 case IPT_SO_GET_INFO:
111497- ret = get_info(sock_net(sk), user, len, 1);
111498+ ret = get_info(sock_net(sk), user, *len, 1);
111499 break;
111500 case IPT_SO_GET_ENTRIES:
111501 ret = compat_get_entries(sock_net(sk), user, len);
111502@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
111503
111504 switch (cmd) {
111505 case IPT_SO_GET_INFO:
111506- ret = get_info(sock_net(sk), user, len, 0);
111507+ ret = get_info(sock_net(sk), user, *len, 0);
111508 break;
111509
111510 case IPT_SO_GET_ENTRIES:
111511diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
111512index e90f83a..3e6acca 100644
111513--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
111514+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
111515@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
111516 spin_lock_init(&cn->lock);
111517
111518 #ifdef CONFIG_PROC_FS
111519- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
111520+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
111521 if (!cn->procdir) {
111522 pr_err("Unable to proc dir entry\n");
111523 return -ENOMEM;
111524diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
111525index 787b0d6..ab6c0ba 100644
111526--- a/net/ipv4/ping.c
111527+++ b/net/ipv4/ping.c
111528@@ -59,7 +59,7 @@ struct ping_table {
111529 };
111530
111531 static struct ping_table ping_table;
111532-struct pingv6_ops pingv6_ops;
111533+struct pingv6_ops *pingv6_ops;
111534 EXPORT_SYMBOL_GPL(pingv6_ops);
111535
111536 static u16 ping_port_rover;
111537@@ -359,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
111538 return -ENODEV;
111539 }
111540 }
111541- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
111542+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
111543 scoped);
111544 rcu_read_unlock();
111545
111546@@ -567,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
111547 }
111548 #if IS_ENABLED(CONFIG_IPV6)
111549 } else if (skb->protocol == htons(ETH_P_IPV6)) {
111550- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
111551+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
111552 #endif
111553 }
111554
111555@@ -585,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
111556 info, (u8 *)icmph);
111557 #if IS_ENABLED(CONFIG_IPV6)
111558 } else if (family == AF_INET6) {
111559- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
111560+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
111561 info, (u8 *)icmph);
111562 #endif
111563 }
111564@@ -919,10 +919,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
111565 }
111566
111567 if (inet6_sk(sk)->rxopt.all)
111568- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
111569+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
111570 if (skb->protocol == htons(ETH_P_IPV6) &&
111571 inet6_sk(sk)->rxopt.all)
111572- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
111573+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
111574 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
111575 ip_cmsg_recv(msg, skb);
111576 #endif
111577@@ -1117,7 +1117,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
111578 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
111579 0, sock_i_ino(sp),
111580 atomic_read(&sp->sk_refcnt), sp,
111581- atomic_read(&sp->sk_drops));
111582+ atomic_read_unchecked(&sp->sk_drops));
111583 }
111584
111585 static int ping_v4_seq_show(struct seq_file *seq, void *v)
111586diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
111587index f027a70..2e64edc 100644
111588--- a/net/ipv4/raw.c
111589+++ b/net/ipv4/raw.c
111590@@ -324,7 +324,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
111591 int raw_rcv(struct sock *sk, struct sk_buff *skb)
111592 {
111593 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
111594- atomic_inc(&sk->sk_drops);
111595+ atomic_inc_unchecked(&sk->sk_drops);
111596 kfree_skb(skb);
111597 return NET_RX_DROP;
111598 }
111599@@ -773,16 +773,20 @@ static int raw_init(struct sock *sk)
111600
111601 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
111602 {
111603+ struct icmp_filter filter;
111604+
111605 if (optlen > sizeof(struct icmp_filter))
111606 optlen = sizeof(struct icmp_filter);
111607- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
111608+ if (copy_from_user(&filter, optval, optlen))
111609 return -EFAULT;
111610+ raw_sk(sk)->filter = filter;
111611 return 0;
111612 }
111613
111614 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
111615 {
111616 int len, ret = -EFAULT;
111617+ struct icmp_filter filter;
111618
111619 if (get_user(len, optlen))
111620 goto out;
111621@@ -792,8 +796,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
111622 if (len > sizeof(struct icmp_filter))
111623 len = sizeof(struct icmp_filter);
111624 ret = -EFAULT;
111625- if (put_user(len, optlen) ||
111626- copy_to_user(optval, &raw_sk(sk)->filter, len))
111627+ filter = raw_sk(sk)->filter;
111628+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
111629 goto out;
111630 ret = 0;
111631 out: return ret;
111632@@ -1022,7 +1026,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
111633 0, 0L, 0,
111634 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
111635 0, sock_i_ino(sp),
111636- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
111637+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
111638 }
111639
111640 static int raw_seq_show(struct seq_file *seq, void *v)
111641diff --git a/net/ipv4/route.c b/net/ipv4/route.c
111642index 20fc020..3ba426f 100644
111643--- a/net/ipv4/route.c
111644+++ b/net/ipv4/route.c
111645@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
111646
111647 static int rt_cache_seq_open(struct inode *inode, struct file *file)
111648 {
111649- return seq_open(file, &rt_cache_seq_ops);
111650+ return seq_open_restrict(file, &rt_cache_seq_ops);
111651 }
111652
111653 static const struct file_operations rt_cache_seq_fops = {
111654@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
111655
111656 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
111657 {
111658- return seq_open(file, &rt_cpu_seq_ops);
111659+ return seq_open_restrict(file, &rt_cpu_seq_ops);
111660 }
111661
111662 static const struct file_operations rt_cpu_seq_fops = {
111663@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
111664
111665 static int rt_acct_proc_open(struct inode *inode, struct file *file)
111666 {
111667- return single_open(file, rt_acct_proc_show, NULL);
111668+ return single_open_restrict(file, rt_acct_proc_show, NULL);
111669 }
111670
111671 static const struct file_operations rt_acct_proc_fops = {
111672@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
111673
111674 #define IP_IDENTS_SZ 2048u
111675 struct ip_ident_bucket {
111676- atomic_t id;
111677+ atomic_unchecked_t id;
111678 u32 stamp32;
111679 };
111680
111681-static struct ip_ident_bucket *ip_idents __read_mostly;
111682+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
111683
111684 /* In order to protect privacy, we add a perturbation to identifiers
111685 * if one generator is seldom used. This makes hard for an attacker
111686@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
111687 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
111688 delta = prandom_u32_max(now - old);
111689
111690- return atomic_add_return(segs + delta, &bucket->id) - segs;
111691+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
111692 }
111693 EXPORT_SYMBOL(ip_idents_reserve);
111694
111695@@ -2639,34 +2639,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
111696 .maxlen = sizeof(int),
111697 .mode = 0200,
111698 .proc_handler = ipv4_sysctl_rtcache_flush,
111699+ .extra1 = &init_net,
111700 },
111701 { },
111702 };
111703
111704 static __net_init int sysctl_route_net_init(struct net *net)
111705 {
111706- struct ctl_table *tbl;
111707+ ctl_table_no_const *tbl = NULL;
111708
111709- tbl = ipv4_route_flush_table;
111710 if (!net_eq(net, &init_net)) {
111711- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
111712+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
111713 if (tbl == NULL)
111714 goto err_dup;
111715
111716 /* Don't export sysctls to unprivileged users */
111717 if (net->user_ns != &init_user_ns)
111718 tbl[0].procname = NULL;
111719- }
111720- tbl[0].extra1 = net;
111721+ tbl[0].extra1 = net;
111722+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
111723+ } else
111724+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
111725
111726- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
111727 if (net->ipv4.route_hdr == NULL)
111728 goto err_reg;
111729 return 0;
111730
111731 err_reg:
111732- if (tbl != ipv4_route_flush_table)
111733- kfree(tbl);
111734+ kfree(tbl);
111735 err_dup:
111736 return -ENOMEM;
111737 }
111738@@ -2689,8 +2689,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
111739
111740 static __net_init int rt_genid_init(struct net *net)
111741 {
111742- atomic_set(&net->ipv4.rt_genid, 0);
111743- atomic_set(&net->fnhe_genid, 0);
111744+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
111745+ atomic_set_unchecked(&net->fnhe_genid, 0);
111746 get_random_bytes(&net->ipv4.dev_addr_genid,
111747 sizeof(net->ipv4.dev_addr_genid));
111748 return 0;
111749@@ -2734,11 +2734,7 @@ int __init ip_rt_init(void)
111750 int rc = 0;
111751 int cpu;
111752
111753- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
111754- if (!ip_idents)
111755- panic("IP: failed to allocate ip_idents\n");
111756-
111757- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
111758+ prandom_bytes(ip_idents, sizeof(ip_idents));
111759
111760 for_each_possible_cpu(cpu) {
111761 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
111762diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
111763index d151539..5f5e247 100644
111764--- a/net/ipv4/sysctl_net_ipv4.c
111765+++ b/net/ipv4/sysctl_net_ipv4.c
111766@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
111767 container_of(table->data, struct net, ipv4.ip_local_ports.range);
111768 int ret;
111769 int range[2];
111770- struct ctl_table tmp = {
111771+ ctl_table_no_const tmp = {
111772 .data = &range,
111773 .maxlen = sizeof(range),
111774 .mode = table->mode,
111775@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
111776 int ret;
111777 gid_t urange[2];
111778 kgid_t low, high;
111779- struct ctl_table tmp = {
111780+ ctl_table_no_const tmp = {
111781 .data = &urange,
111782 .maxlen = sizeof(urange),
111783 .mode = table->mode,
111784@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
111785 void __user *buffer, size_t *lenp, loff_t *ppos)
111786 {
111787 char val[TCP_CA_NAME_MAX];
111788- struct ctl_table tbl = {
111789+ ctl_table_no_const tbl = {
111790 .data = val,
111791 .maxlen = TCP_CA_NAME_MAX,
111792 };
111793@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
111794 void __user *buffer, size_t *lenp,
111795 loff_t *ppos)
111796 {
111797- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
111798+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
111799 int ret;
111800
111801 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
111802@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
111803 void __user *buffer, size_t *lenp,
111804 loff_t *ppos)
111805 {
111806- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
111807+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
111808 int ret;
111809
111810 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
111811@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
111812 void __user *buffer, size_t *lenp,
111813 loff_t *ppos)
111814 {
111815- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
111816+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
111817 struct tcp_fastopen_context *ctxt;
111818 int ret;
111819 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
111820@@ -888,13 +888,12 @@ static struct ctl_table ipv4_net_table[] = {
111821
111822 static __net_init int ipv4_sysctl_init_net(struct net *net)
111823 {
111824- struct ctl_table *table;
111825+ ctl_table_no_const *table = NULL;
111826
111827- table = ipv4_net_table;
111828 if (!net_eq(net, &init_net)) {
111829 int i;
111830
111831- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
111832+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
111833 if (table == NULL)
111834 goto err_alloc;
111835
111836@@ -903,7 +902,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
111837 table[i].data += (void *)net - (void *)&init_net;
111838 }
111839
111840- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
111841+ if (!net_eq(net, &init_net))
111842+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
111843+ else
111844+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
111845 if (net->ipv4.ipv4_hdr == NULL)
111846 goto err_reg;
111847
111848diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
111849index 995a225..e1e9183 100644
111850--- a/net/ipv4/tcp.c
111851+++ b/net/ipv4/tcp.c
111852@@ -520,8 +520,10 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
111853
111854 /* Race breaker. If space is freed after
111855 * wspace test but before the flags are set,
111856- * IO signal will be lost.
111857+ * IO signal will be lost. Memory barrier
111858+ * pairs with the input side.
111859 */
111860+ smp_mb__after_atomic();
111861 if (sk_stream_is_writeable(sk))
111862 mask |= POLLOUT | POLLWRNORM;
111863 }
111864diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
111865index f501ac04..0c5a1b2 100644
111866--- a/net/ipv4/tcp_input.c
111867+++ b/net/ipv4/tcp_input.c
111868@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
111869 * without any lock. We want to make sure compiler wont store
111870 * intermediate values in this location.
111871 */
111872- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
111873+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
111874 sk->sk_max_pacing_rate);
111875 }
111876
111877@@ -4541,7 +4541,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
111878 * simplifies code)
111879 */
111880 static void
111881-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
111882+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
111883 struct sk_buff *head, struct sk_buff *tail,
111884 u32 start, u32 end)
111885 {
111886@@ -4799,6 +4799,8 @@ static void tcp_check_space(struct sock *sk)
111887 {
111888 if (sock_flag(sk, SOCK_QUEUE_SHRUNK)) {
111889 sock_reset_flag(sk, SOCK_QUEUE_SHRUNK);
111890+ /* pairs with tcp_poll() */
111891+ smp_mb__after_atomic();
111892 if (sk->sk_socket &&
111893 test_bit(SOCK_NOSPACE, &sk->sk_socket->flags))
111894 tcp_new_space(sk);
111895@@ -5525,6 +5527,7 @@ discard:
111896 tcp_paws_reject(&tp->rx_opt, 0))
111897 goto discard_and_undo;
111898
111899+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
111900 if (th->syn) {
111901 /* We see SYN without ACK. It is attempt of
111902 * simultaneous connect with crossed SYNs.
111903@@ -5575,6 +5578,7 @@ discard:
111904 goto discard;
111905 #endif
111906 }
111907+#endif
111908 /* "fifth, if neither of the SYN or RST bits is set then
111909 * drop the segment and return."
111910 */
111911@@ -5621,7 +5625,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
111912 goto discard;
111913
111914 if (th->syn) {
111915- if (th->fin)
111916+ if (th->fin || th->urg || th->psh)
111917 goto discard;
111918 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
111919 return 1;
111920diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
111921index f1756ee..8908cb0 100644
111922--- a/net/ipv4/tcp_ipv4.c
111923+++ b/net/ipv4/tcp_ipv4.c
111924@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
111925 int sysctl_tcp_low_latency __read_mostly;
111926 EXPORT_SYMBOL(sysctl_tcp_low_latency);
111927
111928+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111929+extern int grsec_enable_blackhole;
111930+#endif
111931+
111932 #ifdef CONFIG_TCP_MD5SIG
111933 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
111934 __be32 daddr, __be32 saddr, const struct tcphdr *th);
111935@@ -1475,6 +1479,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
111936 return 0;
111937
111938 reset:
111939+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111940+ if (!grsec_enable_blackhole)
111941+#endif
111942 tcp_v4_send_reset(rsk, skb);
111943 discard:
111944 kfree_skb(skb);
111945@@ -1639,12 +1646,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
111946 TCP_SKB_CB(skb)->sacked = 0;
111947
111948 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
111949- if (!sk)
111950+ if (!sk) {
111951+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111952+ ret = 1;
111953+#endif
111954 goto no_tcp_socket;
111955-
111956+ }
111957 process:
111958- if (sk->sk_state == TCP_TIME_WAIT)
111959+ if (sk->sk_state == TCP_TIME_WAIT) {
111960+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111961+ ret = 2;
111962+#endif
111963 goto do_time_wait;
111964+ }
111965
111966 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
111967 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
111968@@ -1700,6 +1714,10 @@ csum_error:
111969 bad_packet:
111970 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
111971 } else {
111972+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111973+ if (!grsec_enable_blackhole || (ret == 1 &&
111974+ (skb->dev->flags & IFF_LOOPBACK)))
111975+#endif
111976 tcp_v4_send_reset(NULL, skb);
111977 }
111978
111979diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
111980index dd11ac7..c0872da 100644
111981--- a/net/ipv4/tcp_minisocks.c
111982+++ b/net/ipv4/tcp_minisocks.c
111983@@ -27,6 +27,10 @@
111984 #include <net/inet_common.h>
111985 #include <net/xfrm.h>
111986
111987+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111988+extern int grsec_enable_blackhole;
111989+#endif
111990+
111991 int sysctl_tcp_syncookies __read_mostly = 1;
111992 EXPORT_SYMBOL(sysctl_tcp_syncookies);
111993
111994@@ -785,7 +789,10 @@ embryonic_reset:
111995 * avoid becoming vulnerable to outside attack aiming at
111996 * resetting legit local connections.
111997 */
111998- req->rsk_ops->send_reset(sk, skb);
111999+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112000+ if (!grsec_enable_blackhole)
112001+#endif
112002+ req->rsk_ops->send_reset(sk, skb);
112003 } else if (fastopen) { /* received a valid RST pkt */
112004 reqsk_fastopen_remove(sk, req, true);
112005 tcp_reset(sk);
112006diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
112007index ebf5ff5..4d1ff32 100644
112008--- a/net/ipv4/tcp_probe.c
112009+++ b/net/ipv4/tcp_probe.c
112010@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
112011 if (cnt + width >= len)
112012 break;
112013
112014- if (copy_to_user(buf + cnt, tbuf, width))
112015+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
112016 return -EFAULT;
112017 cnt += width;
112018 }
112019diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
112020index 0732b78..a82bdc6 100644
112021--- a/net/ipv4/tcp_timer.c
112022+++ b/net/ipv4/tcp_timer.c
112023@@ -22,6 +22,10 @@
112024 #include <linux/gfp.h>
112025 #include <net/tcp.h>
112026
112027+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112028+extern int grsec_lastack_retries;
112029+#endif
112030+
112031 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
112032 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
112033 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
112034@@ -194,6 +198,13 @@ static int tcp_write_timeout(struct sock *sk)
112035 }
112036 }
112037
112038+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112039+ if ((sk->sk_state == TCP_LAST_ACK) &&
112040+ (grsec_lastack_retries > 0) &&
112041+ (grsec_lastack_retries < retry_until))
112042+ retry_until = grsec_lastack_retries;
112043+#endif
112044+
112045 if (retransmits_timed_out(sk, retry_until,
112046 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
112047 /* Has it gone just too far? */
112048diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
112049index 97ef1f8b..abeb965 100644
112050--- a/net/ipv4/udp.c
112051+++ b/net/ipv4/udp.c
112052@@ -87,6 +87,7 @@
112053 #include <linux/types.h>
112054 #include <linux/fcntl.h>
112055 #include <linux/module.h>
112056+#include <linux/security.h>
112057 #include <linux/socket.h>
112058 #include <linux/sockios.h>
112059 #include <linux/igmp.h>
112060@@ -114,6 +115,10 @@
112061 #include <net/busy_poll.h>
112062 #include "udp_impl.h"
112063
112064+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112065+extern int grsec_enable_blackhole;
112066+#endif
112067+
112068 struct udp_table udp_table __read_mostly;
112069 EXPORT_SYMBOL(udp_table);
112070
112071@@ -608,6 +613,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
112072 return true;
112073 }
112074
112075+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
112076+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
112077+
112078 /*
112079 * This routine is called by the ICMP module when it gets some
112080 * sort of error condition. If err < 0 then the socket should
112081@@ -945,9 +953,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
112082 dport = usin->sin_port;
112083 if (dport == 0)
112084 return -EINVAL;
112085+
112086+ err = gr_search_udp_sendmsg(sk, usin);
112087+ if (err)
112088+ return err;
112089 } else {
112090 if (sk->sk_state != TCP_ESTABLISHED)
112091 return -EDESTADDRREQ;
112092+
112093+ err = gr_search_udp_sendmsg(sk, NULL);
112094+ if (err)
112095+ return err;
112096+
112097 daddr = inet->inet_daddr;
112098 dport = inet->inet_dport;
112099 /* Open fast path for connected socket.
112100@@ -1195,7 +1212,7 @@ static unsigned int first_packet_length(struct sock *sk)
112101 IS_UDPLITE(sk));
112102 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112103 IS_UDPLITE(sk));
112104- atomic_inc(&sk->sk_drops);
112105+ atomic_inc_unchecked(&sk->sk_drops);
112106 __skb_unlink(skb, rcvq);
112107 __skb_queue_tail(&list_kill, skb);
112108 }
112109@@ -1275,6 +1292,10 @@ try_again:
112110 if (!skb)
112111 goto out;
112112
112113+ err = gr_search_udp_recvmsg(sk, skb);
112114+ if (err)
112115+ goto out_free;
112116+
112117 ulen = skb->len - sizeof(struct udphdr);
112118 copied = len;
112119 if (copied > ulen)
112120@@ -1307,7 +1328,7 @@ try_again:
112121 if (unlikely(err)) {
112122 trace_kfree_skb(skb, udp_recvmsg);
112123 if (!peeked) {
112124- atomic_inc(&sk->sk_drops);
112125+ atomic_inc_unchecked(&sk->sk_drops);
112126 UDP_INC_STATS_USER(sock_net(sk),
112127 UDP_MIB_INERRORS, is_udplite);
112128 }
112129@@ -1348,10 +1369,8 @@ csum_copy_err:
112130 }
112131 unlock_sock_fast(sk, slow);
112132
112133- if (noblock)
112134- return -EAGAIN;
112135-
112136- /* starting over for a new packet */
112137+ /* starting over for a new packet, but check if we need to yield */
112138+ cond_resched();
112139 msg->msg_flags &= ~MSG_TRUNC;
112140 goto try_again;
112141 }
112142@@ -1605,7 +1624,7 @@ csum_error:
112143 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
112144 drop:
112145 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
112146- atomic_inc(&sk->sk_drops);
112147+ atomic_inc_unchecked(&sk->sk_drops);
112148 kfree_skb(skb);
112149 return -1;
112150 }
112151@@ -1624,7 +1643,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
112152 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
112153
112154 if (!skb1) {
112155- atomic_inc(&sk->sk_drops);
112156+ atomic_inc_unchecked(&sk->sk_drops);
112157 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
112158 IS_UDPLITE(sk));
112159 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112160@@ -1830,6 +1849,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
112161 goto csum_error;
112162
112163 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
112164+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112165+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
112166+#endif
112167 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
112168
112169 /*
112170@@ -2416,7 +2438,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
112171 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
112172 0, sock_i_ino(sp),
112173 atomic_read(&sp->sk_refcnt), sp,
112174- atomic_read(&sp->sk_drops));
112175+ atomic_read_unchecked(&sp->sk_drops));
112176 }
112177
112178 int udp4_seq_show(struct seq_file *seq, void *v)
112179diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
112180index 6156f68..d6ab46d 100644
112181--- a/net/ipv4/xfrm4_policy.c
112182+++ b/net/ipv4/xfrm4_policy.c
112183@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
112184 fl4->flowi4_tos = iph->tos;
112185 }
112186
112187-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
112188+static int xfrm4_garbage_collect(struct dst_ops *ops)
112189 {
112190 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
112191
112192- xfrm4_policy_afinfo.garbage_collect(net);
112193+ xfrm_garbage_collect_deferred(net);
112194 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
112195 }
112196
112197@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
112198
112199 static int __net_init xfrm4_net_init(struct net *net)
112200 {
112201- struct ctl_table *table;
112202+ ctl_table_no_const *table = NULL;
112203 struct ctl_table_header *hdr;
112204
112205- table = xfrm4_policy_table;
112206 if (!net_eq(net, &init_net)) {
112207- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
112208+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
112209 if (!table)
112210 goto err_alloc;
112211
112212 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
112213- }
112214-
112215- hdr = register_net_sysctl(net, "net/ipv4", table);
112216+ hdr = register_net_sysctl(net, "net/ipv4", table);
112217+ } else
112218+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
112219 if (!hdr)
112220 goto err_reg;
112221
112222@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
112223 return 0;
112224
112225 err_reg:
112226- if (!net_eq(net, &init_net))
112227- kfree(table);
112228+ kfree(table);
112229 err_alloc:
112230 return -ENOMEM;
112231 }
112232diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
112233index b603002..0de5c88 100644
112234--- a/net/ipv6/addrconf.c
112235+++ b/net/ipv6/addrconf.c
112236@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
112237 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
112238 .mtu6 = IPV6_MIN_MTU,
112239 .accept_ra = 1,
112240- .accept_redirects = 1,
112241+ .accept_redirects = 0,
112242 .autoconf = 1,
112243 .force_mld_version = 0,
112244 .mldv1_unsolicited_report_interval = 10 * HZ,
112245@@ -209,7 +209,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
112246 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
112247 .mtu6 = IPV6_MIN_MTU,
112248 .accept_ra = 1,
112249- .accept_redirects = 1,
112250+ .accept_redirects = 0,
112251 .autoconf = 1,
112252 .force_mld_version = 0,
112253 .mldv1_unsolicited_report_interval = 10 * HZ,
112254@@ -607,7 +607,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
112255 idx = 0;
112256 head = &net->dev_index_head[h];
112257 rcu_read_lock();
112258- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
112259+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
112260 net->dev_base_seq;
112261 hlist_for_each_entry_rcu(dev, head, index_hlist) {
112262 if (idx < s_idx)
112263@@ -2438,7 +2438,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
112264 p.iph.ihl = 5;
112265 p.iph.protocol = IPPROTO_IPV6;
112266 p.iph.ttl = 64;
112267- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
112268+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
112269
112270 if (ops->ndo_do_ioctl) {
112271 mm_segment_t oldfs = get_fs();
112272@@ -3587,16 +3587,23 @@ static const struct file_operations if6_fops = {
112273 .release = seq_release_net,
112274 };
112275
112276+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
112277+extern void unregister_ipv6_seq_ops_addr(void);
112278+
112279 static int __net_init if6_proc_net_init(struct net *net)
112280 {
112281- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
112282+ register_ipv6_seq_ops_addr(&if6_seq_ops);
112283+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
112284+ unregister_ipv6_seq_ops_addr();
112285 return -ENOMEM;
112286+ }
112287 return 0;
112288 }
112289
112290 static void __net_exit if6_proc_net_exit(struct net *net)
112291 {
112292 remove_proc_entry("if_inet6", net->proc_net);
112293+ unregister_ipv6_seq_ops_addr();
112294 }
112295
112296 static struct pernet_operations if6_proc_net_ops = {
112297@@ -4215,7 +4222,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
112298 s_ip_idx = ip_idx = cb->args[2];
112299
112300 rcu_read_lock();
112301- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
112302+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
112303 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
112304 idx = 0;
112305 head = &net->dev_index_head[h];
112306@@ -4864,7 +4871,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
112307 rt_genid_bump_ipv6(net);
112308 break;
112309 }
112310- atomic_inc(&net->ipv6.dev_addr_genid);
112311+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
112312 }
112313
112314 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
112315@@ -4884,7 +4891,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
112316 int *valp = ctl->data;
112317 int val = *valp;
112318 loff_t pos = *ppos;
112319- struct ctl_table lctl;
112320+ ctl_table_no_const lctl;
112321 int ret;
112322
112323 /*
112324@@ -4909,7 +4916,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
112325 {
112326 struct inet6_dev *idev = ctl->extra1;
112327 int min_mtu = IPV6_MIN_MTU;
112328- struct ctl_table lctl;
112329+ ctl_table_no_const lctl;
112330
112331 lctl = *ctl;
112332 lctl.extra1 = &min_mtu;
112333@@ -4984,7 +4991,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
112334 int *valp = ctl->data;
112335 int val = *valp;
112336 loff_t pos = *ppos;
112337- struct ctl_table lctl;
112338+ ctl_table_no_const lctl;
112339 int ret;
112340
112341 /*
112342diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
112343index 98cc4cd..0768c4e 100644
112344--- a/net/ipv6/addrconf_core.c
112345+++ b/net/ipv6/addrconf_core.c
112346@@ -133,6 +133,14 @@ static void snmp6_free_dev(struct inet6_dev *idev)
112347 free_percpu(idev->stats.ipv6);
112348 }
112349
112350+static void in6_dev_finish_destroy_rcu(struct rcu_head *head)
112351+{
112352+ struct inet6_dev *idev = container_of(head, struct inet6_dev, rcu);
112353+
112354+ snmp6_free_dev(idev);
112355+ kfree(idev);
112356+}
112357+
112358 /* Nobody refers to this device, we may destroy it. */
112359
112360 void in6_dev_finish_destroy(struct inet6_dev *idev)
112361@@ -151,7 +159,6 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)
112362 pr_warn("Freeing alive inet6 device %p\n", idev);
112363 return;
112364 }
112365- snmp6_free_dev(idev);
112366- kfree_rcu(idev, rcu);
112367+ call_rcu(&idev->rcu, in6_dev_finish_destroy_rcu);
112368 }
112369 EXPORT_SYMBOL(in6_dev_finish_destroy);
112370diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
112371index e8c4400..a4cd5da 100644
112372--- a/net/ipv6/af_inet6.c
112373+++ b/net/ipv6/af_inet6.c
112374@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
112375 net->ipv6.sysctl.icmpv6_time = 1*HZ;
112376 net->ipv6.sysctl.flowlabel_consistency = 1;
112377 net->ipv6.sysctl.auto_flowlabels = 0;
112378- atomic_set(&net->ipv6.fib6_sernum, 1);
112379+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
112380
112381 err = ipv6_init_mibs(net);
112382 if (err)
112383diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
112384index ace8dac..bd6942d 100644
112385--- a/net/ipv6/datagram.c
112386+++ b/net/ipv6/datagram.c
112387@@ -957,5 +957,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
112388 0,
112389 sock_i_ino(sp),
112390 atomic_read(&sp->sk_refcnt), sp,
112391- atomic_read(&sp->sk_drops));
112392+ atomic_read_unchecked(&sp->sk_drops));
112393 }
112394diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
112395index a5e9519..16b7412 100644
112396--- a/net/ipv6/icmp.c
112397+++ b/net/ipv6/icmp.c
112398@@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
112399
112400 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
112401 {
112402- struct ctl_table *table;
112403+ ctl_table_no_const *table;
112404
112405 table = kmemdup(ipv6_icmp_table_template,
112406 sizeof(ipv6_icmp_table_template),
112407diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
112408index 263ef41..88c7be8 100644
112409--- a/net/ipv6/ip6_fib.c
112410+++ b/net/ipv6/ip6_fib.c
112411@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
112412 int new, old;
112413
112414 do {
112415- old = atomic_read(&net->ipv6.fib6_sernum);
112416+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
112417 new = old < INT_MAX ? old + 1 : 1;
112418- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
112419+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
112420 old, new) != old);
112421 return new;
112422 }
112423diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
112424index bc28b7d..a08feea 100644
112425--- a/net/ipv6/ip6_gre.c
112426+++ b/net/ipv6/ip6_gre.c
112427@@ -71,8 +71,8 @@ struct ip6gre_net {
112428 struct net_device *fb_tunnel_dev;
112429 };
112430
112431-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
112432-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
112433+static struct rtnl_link_ops ip6gre_link_ops;
112434+static struct rtnl_link_ops ip6gre_tap_ops;
112435 static int ip6gre_tunnel_init(struct net_device *dev);
112436 static void ip6gre_tunnel_setup(struct net_device *dev);
112437 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
112438@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
112439 }
112440
112441
112442-static struct inet6_protocol ip6gre_protocol __read_mostly = {
112443+static struct inet6_protocol ip6gre_protocol = {
112444 .handler = ip6gre_rcv,
112445 .err_handler = ip6gre_err,
112446 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
112447@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
112448 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
112449 };
112450
112451-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
112452+static struct rtnl_link_ops ip6gre_link_ops = {
112453 .kind = "ip6gre",
112454 .maxtype = IFLA_GRE_MAX,
112455 .policy = ip6gre_policy,
112456@@ -1665,7 +1665,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
112457 .get_link_net = ip6_tnl_get_link_net,
112458 };
112459
112460-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
112461+static struct rtnl_link_ops ip6gre_tap_ops = {
112462 .kind = "ip6gretap",
112463 .maxtype = IFLA_GRE_MAX,
112464 .policy = ip6gre_policy,
112465diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
112466index ddd94ec..b7cfefb 100644
112467--- a/net/ipv6/ip6_tunnel.c
112468+++ b/net/ipv6/ip6_tunnel.c
112469@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
112470
112471 static int ip6_tnl_dev_init(struct net_device *dev);
112472 static void ip6_tnl_dev_setup(struct net_device *dev);
112473-static struct rtnl_link_ops ip6_link_ops __read_mostly;
112474+static struct rtnl_link_ops ip6_link_ops;
112475
112476 static int ip6_tnl_net_id __read_mostly;
112477 struct ip6_tnl_net {
112478@@ -1780,7 +1780,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
112479 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
112480 };
112481
112482-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
112483+static struct rtnl_link_ops ip6_link_ops = {
112484 .kind = "ip6tnl",
112485 .maxtype = IFLA_IPTUN_MAX,
112486 .policy = ip6_tnl_policy,
112487diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
112488index 5fb9e21..92bf04b 100644
112489--- a/net/ipv6/ip6_vti.c
112490+++ b/net/ipv6/ip6_vti.c
112491@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
112492
112493 static int vti6_dev_init(struct net_device *dev);
112494 static void vti6_dev_setup(struct net_device *dev);
112495-static struct rtnl_link_ops vti6_link_ops __read_mostly;
112496+static struct rtnl_link_ops vti6_link_ops;
112497
112498 static int vti6_net_id __read_mostly;
112499 struct vti6_net {
112500@@ -1004,7 +1004,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
112501 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
112502 };
112503
112504-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
112505+static struct rtnl_link_ops vti6_link_ops = {
112506 .kind = "vti6",
112507 .maxtype = IFLA_VTI_MAX,
112508 .policy = vti6_policy,
112509diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
112510index 8d766d9..dcdfea7 100644
112511--- a/net/ipv6/ipv6_sockglue.c
112512+++ b/net/ipv6/ipv6_sockglue.c
112513@@ -989,7 +989,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
112514 if (sk->sk_type != SOCK_STREAM)
112515 return -ENOPROTOOPT;
112516
112517- msg.msg_control = optval;
112518+ msg.msg_control = (void __force_kernel *)optval;
112519 msg.msg_controllen = len;
112520 msg.msg_flags = flags;
112521
112522diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
112523index bb00c6f..16c90d7 100644
112524--- a/net/ipv6/netfilter/ip6_tables.c
112525+++ b/net/ipv6/netfilter/ip6_tables.c
112526@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
112527 #endif
112528
112529 static int get_info(struct net *net, void __user *user,
112530- const int *len, int compat)
112531+ int len, int compat)
112532 {
112533 char name[XT_TABLE_MAXNAMELEN];
112534 struct xt_table *t;
112535 int ret;
112536
112537- if (*len != sizeof(struct ip6t_getinfo)) {
112538- duprintf("length %u != %zu\n", *len,
112539+ if (len != sizeof(struct ip6t_getinfo)) {
112540+ duprintf("length %u != %zu\n", len,
112541 sizeof(struct ip6t_getinfo));
112542 return -EINVAL;
112543 }
112544@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
112545 info.size = private->size;
112546 strcpy(info.name, name);
112547
112548- if (copy_to_user(user, &info, *len) != 0)
112549+ if (copy_to_user(user, &info, len) != 0)
112550 ret = -EFAULT;
112551 else
112552 ret = 0;
112553@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
112554
112555 switch (cmd) {
112556 case IP6T_SO_GET_INFO:
112557- ret = get_info(sock_net(sk), user, len, 1);
112558+ ret = get_info(sock_net(sk), user, *len, 1);
112559 break;
112560 case IP6T_SO_GET_ENTRIES:
112561 ret = compat_get_entries(sock_net(sk), user, len);
112562@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
112563
112564 switch (cmd) {
112565 case IP6T_SO_GET_INFO:
112566- ret = get_info(sock_net(sk), user, len, 0);
112567+ ret = get_info(sock_net(sk), user, *len, 0);
112568 break;
112569
112570 case IP6T_SO_GET_ENTRIES:
112571diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
112572index 6f187c8..34b367f 100644
112573--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
112574+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
112575@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
112576
112577 static int nf_ct_frag6_sysctl_register(struct net *net)
112578 {
112579- struct ctl_table *table;
112580+ ctl_table_no_const *table = NULL;
112581 struct ctl_table_header *hdr;
112582
112583- table = nf_ct_frag6_sysctl_table;
112584 if (!net_eq(net, &init_net)) {
112585- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
112586+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
112587 GFP_KERNEL);
112588 if (table == NULL)
112589 goto err_alloc;
112590@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
112591 table[2].data = &net->nf_frag.frags.high_thresh;
112592 table[2].extra1 = &net->nf_frag.frags.low_thresh;
112593 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
112594- }
112595-
112596- hdr = register_net_sysctl(net, "net/netfilter", table);
112597+ hdr = register_net_sysctl(net, "net/netfilter", table);
112598+ } else
112599+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
112600 if (hdr == NULL)
112601 goto err_reg;
112602
112603@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
112604 return 0;
112605
112606 err_reg:
112607- if (!net_eq(net, &init_net))
112608- kfree(table);
112609+ kfree(table);
112610 err_alloc:
112611 return -ENOMEM;
112612 }
112613diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
112614index a2dfff6..1e52e6d 100644
112615--- a/net/ipv6/ping.c
112616+++ b/net/ipv6/ping.c
112617@@ -241,6 +241,24 @@ static struct pernet_operations ping_v6_net_ops = {
112618 };
112619 #endif
112620
112621+static struct pingv6_ops real_pingv6_ops = {
112622+ .ipv6_recv_error = ipv6_recv_error,
112623+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
112624+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
112625+ .icmpv6_err_convert = icmpv6_err_convert,
112626+ .ipv6_icmp_error = ipv6_icmp_error,
112627+ .ipv6_chk_addr = ipv6_chk_addr,
112628+};
112629+
112630+static struct pingv6_ops dummy_pingv6_ops = {
112631+ .ipv6_recv_error = dummy_ipv6_recv_error,
112632+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
112633+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
112634+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
112635+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
112636+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
112637+};
112638+
112639 int __init pingv6_init(void)
112640 {
112641 #ifdef CONFIG_PROC_FS
112642@@ -248,13 +266,7 @@ int __init pingv6_init(void)
112643 if (ret)
112644 return ret;
112645 #endif
112646- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
112647- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
112648- pingv6_ops.ip6_datagram_recv_specific_ctl =
112649- ip6_datagram_recv_specific_ctl;
112650- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
112651- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
112652- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
112653+ pingv6_ops = &real_pingv6_ops;
112654 return inet6_register_protosw(&pingv6_protosw);
112655 }
112656
112657@@ -263,14 +275,9 @@ int __init pingv6_init(void)
112658 */
112659 void pingv6_exit(void)
112660 {
112661- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
112662- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
112663- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
112664- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
112665- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
112666- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
112667 #ifdef CONFIG_PROC_FS
112668 unregister_pernet_subsys(&ping_v6_net_ops);
112669 #endif
112670+ pingv6_ops = &dummy_pingv6_ops;
112671 inet6_unregister_protosw(&pingv6_protosw);
112672 }
112673diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
112674index 679253d0..70b653c 100644
112675--- a/net/ipv6/proc.c
112676+++ b/net/ipv6/proc.c
112677@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
112678 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
112679 goto proc_snmp6_fail;
112680
112681- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
112682+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
112683 if (!net->mib.proc_net_devsnmp6)
112684 goto proc_dev_snmp6_fail;
112685 return 0;
112686diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
112687index dae7f1a..783b20d 100644
112688--- a/net/ipv6/raw.c
112689+++ b/net/ipv6/raw.c
112690@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
112691 {
112692 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
112693 skb_checksum_complete(skb)) {
112694- atomic_inc(&sk->sk_drops);
112695+ atomic_inc_unchecked(&sk->sk_drops);
112696 kfree_skb(skb);
112697 return NET_RX_DROP;
112698 }
112699@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
112700 struct raw6_sock *rp = raw6_sk(sk);
112701
112702 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
112703- atomic_inc(&sk->sk_drops);
112704+ atomic_inc_unchecked(&sk->sk_drops);
112705 kfree_skb(skb);
112706 return NET_RX_DROP;
112707 }
112708@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
112709
112710 if (inet->hdrincl) {
112711 if (skb_checksum_complete(skb)) {
112712- atomic_inc(&sk->sk_drops);
112713+ atomic_inc_unchecked(&sk->sk_drops);
112714 kfree_skb(skb);
112715 return NET_RX_DROP;
112716 }
112717@@ -609,7 +609,7 @@ out:
112718 return err;
112719 }
112720
112721-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
112722+static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
112723 struct flowi6 *fl6, struct dst_entry **dstp,
112724 unsigned int flags)
112725 {
112726@@ -915,12 +915,15 @@ do_confirm:
112727 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
112728 char __user *optval, int optlen)
112729 {
112730+ struct icmp6_filter filter;
112731+
112732 switch (optname) {
112733 case ICMPV6_FILTER:
112734 if (optlen > sizeof(struct icmp6_filter))
112735 optlen = sizeof(struct icmp6_filter);
112736- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
112737+ if (copy_from_user(&filter, optval, optlen))
112738 return -EFAULT;
112739+ raw6_sk(sk)->filter = filter;
112740 return 0;
112741 default:
112742 return -ENOPROTOOPT;
112743@@ -933,6 +936,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
112744 char __user *optval, int __user *optlen)
112745 {
112746 int len;
112747+ struct icmp6_filter filter;
112748
112749 switch (optname) {
112750 case ICMPV6_FILTER:
112751@@ -944,7 +948,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
112752 len = sizeof(struct icmp6_filter);
112753 if (put_user(len, optlen))
112754 return -EFAULT;
112755- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
112756+ filter = raw6_sk(sk)->filter;
112757+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
112758 return -EFAULT;
112759 return 0;
112760 default:
112761diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
112762index d7d70e6..bd5e9fc 100644
112763--- a/net/ipv6/reassembly.c
112764+++ b/net/ipv6/reassembly.c
112765@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
112766
112767 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
112768 {
112769- struct ctl_table *table;
112770+ ctl_table_no_const *table = NULL;
112771 struct ctl_table_header *hdr;
112772
112773- table = ip6_frags_ns_ctl_table;
112774 if (!net_eq(net, &init_net)) {
112775- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
112776+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
112777 if (table == NULL)
112778 goto err_alloc;
112779
112780@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
112781 /* Don't export sysctls to unprivileged users */
112782 if (net->user_ns != &init_user_ns)
112783 table[0].procname = NULL;
112784- }
112785+ hdr = register_net_sysctl(net, "net/ipv6", table);
112786+ } else
112787+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
112788
112789- hdr = register_net_sysctl(net, "net/ipv6", table);
112790 if (hdr == NULL)
112791 goto err_reg;
112792
112793@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
112794 return 0;
112795
112796 err_reg:
112797- if (!net_eq(net, &init_net))
112798- kfree(table);
112799+ kfree(table);
112800 err_alloc:
112801 return -ENOMEM;
112802 }
112803diff --git a/net/ipv6/route.c b/net/ipv6/route.c
112804index 4688bd4..584453d 100644
112805--- a/net/ipv6/route.c
112806+++ b/net/ipv6/route.c
112807@@ -3029,7 +3029,7 @@ struct ctl_table ipv6_route_table_template[] = {
112808
112809 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
112810 {
112811- struct ctl_table *table;
112812+ ctl_table_no_const *table;
112813
112814 table = kmemdup(ipv6_route_table_template,
112815 sizeof(ipv6_route_table_template),
112816diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
112817index e4cbd57..02b1aaa 100644
112818--- a/net/ipv6/sit.c
112819+++ b/net/ipv6/sit.c
112820@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
112821 static void ipip6_dev_free(struct net_device *dev);
112822 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
112823 __be32 *v4dst);
112824-static struct rtnl_link_ops sit_link_ops __read_mostly;
112825+static struct rtnl_link_ops sit_link_ops;
112826
112827 static int sit_net_id __read_mostly;
112828 struct sit_net {
112829@@ -1751,7 +1751,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
112830 unregister_netdevice_queue(dev, head);
112831 }
112832
112833-static struct rtnl_link_ops sit_link_ops __read_mostly = {
112834+static struct rtnl_link_ops sit_link_ops = {
112835 .kind = "sit",
112836 .maxtype = IFLA_IPTUN_MAX,
112837 .policy = ipip6_policy,
112838diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
112839index c5c10fa..2577d51 100644
112840--- a/net/ipv6/sysctl_net_ipv6.c
112841+++ b/net/ipv6/sysctl_net_ipv6.c
112842@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
112843
112844 static int __net_init ipv6_sysctl_net_init(struct net *net)
112845 {
112846- struct ctl_table *ipv6_table;
112847+ ctl_table_no_const *ipv6_table;
112848 struct ctl_table *ipv6_route_table;
112849 struct ctl_table *ipv6_icmp_table;
112850 int err;
112851diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
112852index 1f5e622..8387d90 100644
112853--- a/net/ipv6/tcp_ipv6.c
112854+++ b/net/ipv6/tcp_ipv6.c
112855@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
112856 }
112857 }
112858
112859+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112860+extern int grsec_enable_blackhole;
112861+#endif
112862+
112863 static void tcp_v6_hash(struct sock *sk)
112864 {
112865 if (sk->sk_state != TCP_CLOSE) {
112866@@ -1345,6 +1349,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
112867 return 0;
112868
112869 reset:
112870+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112871+ if (!grsec_enable_blackhole)
112872+#endif
112873 tcp_v6_send_reset(sk, skb);
112874 discard:
112875 if (opt_skb)
112876@@ -1454,12 +1461,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
112877
112878 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
112879 inet6_iif(skb));
112880- if (!sk)
112881+ if (!sk) {
112882+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112883+ ret = 1;
112884+#endif
112885 goto no_tcp_socket;
112886+ }
112887
112888 process:
112889- if (sk->sk_state == TCP_TIME_WAIT)
112890+ if (sk->sk_state == TCP_TIME_WAIT) {
112891+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112892+ ret = 2;
112893+#endif
112894 goto do_time_wait;
112895+ }
112896
112897 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
112898 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
112899@@ -1510,6 +1525,10 @@ csum_error:
112900 bad_packet:
112901 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
112902 } else {
112903+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112904+ if (!grsec_enable_blackhole || (ret == 1 &&
112905+ (skb->dev->flags & IFF_LOOPBACK)))
112906+#endif
112907 tcp_v6_send_reset(NULL, skb);
112908 }
112909
112910diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
112911index d048d46..cacb4d2 100644
112912--- a/net/ipv6/udp.c
112913+++ b/net/ipv6/udp.c
112914@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
112915 udp_ipv6_hash_secret + net_hash_mix(net));
112916 }
112917
112918+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112919+extern int grsec_enable_blackhole;
112920+#endif
112921+
112922 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
112923 {
112924 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
112925@@ -448,7 +452,7 @@ try_again:
112926 if (unlikely(err)) {
112927 trace_kfree_skb(skb, udpv6_recvmsg);
112928 if (!peeked) {
112929- atomic_inc(&sk->sk_drops);
112930+ atomic_inc_unchecked(&sk->sk_drops);
112931 if (is_udp4)
112932 UDP_INC_STATS_USER(sock_net(sk),
112933 UDP_MIB_INERRORS,
112934@@ -528,10 +532,8 @@ csum_copy_err:
112935 }
112936 unlock_sock_fast(sk, slow);
112937
112938- if (noblock)
112939- return -EAGAIN;
112940-
112941- /* starting over for a new packet */
112942+ /* starting over for a new packet, but check if we need to yield */
112943+ cond_resched();
112944 msg->msg_flags &= ~MSG_TRUNC;
112945 goto try_again;
112946 }
112947@@ -714,7 +716,7 @@ csum_error:
112948 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
112949 drop:
112950 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
112951- atomic_inc(&sk->sk_drops);
112952+ atomic_inc_unchecked(&sk->sk_drops);
112953 kfree_skb(skb);
112954 return -1;
112955 }
112956@@ -753,7 +755,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
112957 if (likely(skb1 == NULL))
112958 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
112959 if (!skb1) {
112960- atomic_inc(&sk->sk_drops);
112961+ atomic_inc_unchecked(&sk->sk_drops);
112962 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
112963 IS_UDPLITE(sk));
112964 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112965@@ -937,6 +939,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
112966 goto csum_error;
112967
112968 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
112969+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112970+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
112971+#endif
112972 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
112973
112974 kfree_skb(skb);
112975diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
112976index 8d2d01b4..313511e 100644
112977--- a/net/ipv6/xfrm6_policy.c
112978+++ b/net/ipv6/xfrm6_policy.c
112979@@ -224,11 +224,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
112980 }
112981 }
112982
112983-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
112984+static int xfrm6_garbage_collect(struct dst_ops *ops)
112985 {
112986 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
112987
112988- xfrm6_policy_afinfo.garbage_collect(net);
112989+ xfrm_garbage_collect_deferred(net);
112990 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
112991 }
112992
112993@@ -341,19 +341,19 @@ static struct ctl_table xfrm6_policy_table[] = {
112994
112995 static int __net_init xfrm6_net_init(struct net *net)
112996 {
112997- struct ctl_table *table;
112998+ ctl_table_no_const *table = NULL;
112999 struct ctl_table_header *hdr;
113000
113001- table = xfrm6_policy_table;
113002 if (!net_eq(net, &init_net)) {
113003- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
113004+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
113005 if (!table)
113006 goto err_alloc;
113007
113008 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
113009- }
113010+ hdr = register_net_sysctl(net, "net/ipv6", table);
113011+ } else
113012+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
113013
113014- hdr = register_net_sysctl(net, "net/ipv6", table);
113015 if (!hdr)
113016 goto err_reg;
113017
113018@@ -361,8 +361,7 @@ static int __net_init xfrm6_net_init(struct net *net)
113019 return 0;
113020
113021 err_reg:
113022- if (!net_eq(net, &init_net))
113023- kfree(table);
113024+ kfree(table);
113025 err_alloc:
113026 return -ENOMEM;
113027 }
113028diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
113029index c1d247e..9e5949d 100644
113030--- a/net/ipx/ipx_proc.c
113031+++ b/net/ipx/ipx_proc.c
113032@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
113033 struct proc_dir_entry *p;
113034 int rc = -ENOMEM;
113035
113036- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
113037+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
113038
113039 if (!ipx_proc_dir)
113040 goto out;
113041diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
113042index 683346d..cb0e12d 100644
113043--- a/net/irda/ircomm/ircomm_tty.c
113044+++ b/net/irda/ircomm/ircomm_tty.c
113045@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113046 add_wait_queue(&port->open_wait, &wait);
113047
113048 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
113049- __FILE__, __LINE__, tty->driver->name, port->count);
113050+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113051
113052 spin_lock_irqsave(&port->lock, flags);
113053- port->count--;
113054+ atomic_dec(&port->count);
113055 port->blocked_open++;
113056 spin_unlock_irqrestore(&port->lock, flags);
113057
113058@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113059 }
113060
113061 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
113062- __FILE__, __LINE__, tty->driver->name, port->count);
113063+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113064
113065 schedule();
113066 }
113067@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113068
113069 spin_lock_irqsave(&port->lock, flags);
113070 if (!tty_hung_up_p(filp))
113071- port->count++;
113072+ atomic_inc(&port->count);
113073 port->blocked_open--;
113074 spin_unlock_irqrestore(&port->lock, flags);
113075
113076 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
113077- __FILE__, __LINE__, tty->driver->name, port->count);
113078+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113079
113080 if (!retval)
113081 port->flags |= ASYNC_NORMAL_ACTIVE;
113082@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
113083
113084 /* ++ is not atomic, so this should be protected - Jean II */
113085 spin_lock_irqsave(&self->port.lock, flags);
113086- self->port.count++;
113087+ atomic_inc(&self->port.count);
113088 spin_unlock_irqrestore(&self->port.lock, flags);
113089 tty_port_tty_set(&self->port, tty);
113090
113091 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
113092- self->line, self->port.count);
113093+ self->line, atomic_read(&self->port.count));
113094
113095 /* Not really used by us, but lets do it anyway */
113096 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
113097@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
113098 tty_kref_put(port->tty);
113099 }
113100 port->tty = NULL;
113101- port->count = 0;
113102+ atomic_set(&port->count, 0);
113103 spin_unlock_irqrestore(&port->lock, flags);
113104
113105 wake_up_interruptible(&port->open_wait);
113106@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
113107 seq_putc(m, '\n');
113108
113109 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
113110- seq_printf(m, "Open count: %d\n", self->port.count);
113111+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
113112 seq_printf(m, "Max data size: %d\n", self->max_data_size);
113113 seq_printf(m, "Max header size: %d\n", self->max_header_size);
113114
113115diff --git a/net/irda/irproc.c b/net/irda/irproc.c
113116index b9ac598..f88cc56 100644
113117--- a/net/irda/irproc.c
113118+++ b/net/irda/irproc.c
113119@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
113120 {
113121 int i;
113122
113123- proc_irda = proc_mkdir("irda", init_net.proc_net);
113124+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
113125 if (proc_irda == NULL)
113126 return;
113127
113128diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
113129index 53d9311..cbaf99f 100644
113130--- a/net/iucv/af_iucv.c
113131+++ b/net/iucv/af_iucv.c
113132@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
113133 {
113134 char name[12];
113135
113136- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
113137+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
113138 while (__iucv_get_sock_by_name(name)) {
113139 sprintf(name, "%08x",
113140- atomic_inc_return(&iucv_sk_list.autobind_name));
113141+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
113142 }
113143 memcpy(iucv->src_name, name, 8);
113144 }
113145diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
113146index 2a6a1fd..6c112b0 100644
113147--- a/net/iucv/iucv.c
113148+++ b/net/iucv/iucv.c
113149@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
113150 return NOTIFY_OK;
113151 }
113152
113153-static struct notifier_block __refdata iucv_cpu_notifier = {
113154+static struct notifier_block iucv_cpu_notifier = {
113155 .notifier_call = iucv_cpu_notify,
113156 };
113157
113158diff --git a/net/key/af_key.c b/net/key/af_key.c
113159index f8ac939..1e189bf 100644
113160--- a/net/key/af_key.c
113161+++ b/net/key/af_key.c
113162@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
113163 static u32 get_acqseq(void)
113164 {
113165 u32 res;
113166- static atomic_t acqseq;
113167+ static atomic_unchecked_t acqseq;
113168
113169 do {
113170- res = atomic_inc_return(&acqseq);
113171+ res = atomic_inc_return_unchecked(&acqseq);
113172 } while (!res);
113173 return res;
113174 }
113175diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
113176index 781b3a2..73a7434 100644
113177--- a/net/l2tp/l2tp_eth.c
113178+++ b/net/l2tp/l2tp_eth.c
113179@@ -42,12 +42,12 @@ struct l2tp_eth {
113180 struct sock *tunnel_sock;
113181 struct l2tp_session *session;
113182 struct list_head list;
113183- atomic_long_t tx_bytes;
113184- atomic_long_t tx_packets;
113185- atomic_long_t tx_dropped;
113186- atomic_long_t rx_bytes;
113187- atomic_long_t rx_packets;
113188- atomic_long_t rx_errors;
113189+ atomic_long_unchecked_t tx_bytes;
113190+ atomic_long_unchecked_t tx_packets;
113191+ atomic_long_unchecked_t tx_dropped;
113192+ atomic_long_unchecked_t rx_bytes;
113193+ atomic_long_unchecked_t rx_packets;
113194+ atomic_long_unchecked_t rx_errors;
113195 };
113196
113197 /* via l2tp_session_priv() */
113198@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
113199 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
113200
113201 if (likely(ret == NET_XMIT_SUCCESS)) {
113202- atomic_long_add(len, &priv->tx_bytes);
113203- atomic_long_inc(&priv->tx_packets);
113204+ atomic_long_add_unchecked(len, &priv->tx_bytes);
113205+ atomic_long_inc_unchecked(&priv->tx_packets);
113206 } else {
113207- atomic_long_inc(&priv->tx_dropped);
113208+ atomic_long_inc_unchecked(&priv->tx_dropped);
113209 }
113210 return NETDEV_TX_OK;
113211 }
113212@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
113213 {
113214 struct l2tp_eth *priv = netdev_priv(dev);
113215
113216- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
113217- stats->tx_packets = atomic_long_read(&priv->tx_packets);
113218- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
113219- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
113220- stats->rx_packets = atomic_long_read(&priv->rx_packets);
113221- stats->rx_errors = atomic_long_read(&priv->rx_errors);
113222+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
113223+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
113224+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
113225+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
113226+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
113227+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
113228 return stats;
113229 }
113230
113231@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
113232 nf_reset(skb);
113233
113234 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
113235- atomic_long_inc(&priv->rx_packets);
113236- atomic_long_add(data_len, &priv->rx_bytes);
113237+ atomic_long_inc_unchecked(&priv->rx_packets);
113238+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
113239 } else {
113240- atomic_long_inc(&priv->rx_errors);
113241+ atomic_long_inc_unchecked(&priv->rx_errors);
113242 }
113243 return;
113244
113245 error:
113246- atomic_long_inc(&priv->rx_errors);
113247+ atomic_long_inc_unchecked(&priv->rx_errors);
113248 kfree_skb(skb);
113249 }
113250
113251diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
113252index 05dfc8aa..df6cfd7 100644
113253--- a/net/l2tp/l2tp_ip.c
113254+++ b/net/l2tp/l2tp_ip.c
113255@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
113256 .ops = &l2tp_ip_ops,
113257 };
113258
113259-static struct net_protocol l2tp_ip_protocol __read_mostly = {
113260+static const struct net_protocol l2tp_ip_protocol = {
113261 .handler = l2tp_ip_recv,
113262 .netns_ok = 1,
113263 };
113264diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
113265index 8611f1b..bc60a2d 100644
113266--- a/net/l2tp/l2tp_ip6.c
113267+++ b/net/l2tp/l2tp_ip6.c
113268@@ -757,7 +757,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
113269 .ops = &l2tp_ip6_ops,
113270 };
113271
113272-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
113273+static const struct inet6_protocol l2tp_ip6_protocol = {
113274 .handler = l2tp_ip6_recv,
113275 };
113276
113277diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
113278index 1a3c7e0..80f8b0c 100644
113279--- a/net/llc/llc_proc.c
113280+++ b/net/llc/llc_proc.c
113281@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
113282 int rc = -ENOMEM;
113283 struct proc_dir_entry *p;
113284
113285- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
113286+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
113287 if (!llc_proc_dir)
113288 goto out;
113289
113290diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
113291index dd4ff36..3462997 100644
113292--- a/net/mac80211/cfg.c
113293+++ b/net/mac80211/cfg.c
113294@@ -581,7 +581,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
113295 ret = ieee80211_vif_use_channel(sdata, chandef,
113296 IEEE80211_CHANCTX_EXCLUSIVE);
113297 }
113298- } else if (local->open_count == local->monitors) {
113299+ } else if (local_read(&local->open_count) == local->monitors) {
113300 local->_oper_chandef = *chandef;
113301 ieee80211_hw_config(local, 0);
113302 }
113303@@ -3468,7 +3468,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
113304 else
113305 local->probe_req_reg--;
113306
113307- if (!local->open_count)
113308+ if (!local_read(&local->open_count))
113309 break;
113310
113311 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
113312@@ -3603,8 +3603,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
113313 if (chanctx_conf) {
113314 *chandef = sdata->vif.bss_conf.chandef;
113315 ret = 0;
113316- } else if (local->open_count > 0 &&
113317- local->open_count == local->monitors &&
113318+ } else if (local_read(&local->open_count) > 0 &&
113319+ local_read(&local->open_count) == local->monitors &&
113320 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
113321 if (local->use_chanctx)
113322 *chandef = local->monitor_chandef;
113323diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
113324index 81e8dc5..5b77c58 100644
113325--- a/net/mac80211/ieee80211_i.h
113326+++ b/net/mac80211/ieee80211_i.h
113327@@ -29,6 +29,7 @@
113328 #include <net/ieee80211_radiotap.h>
113329 #include <net/cfg80211.h>
113330 #include <net/mac80211.h>
113331+#include <asm/local.h>
113332 #include "key.h"
113333 #include "sta_info.h"
113334 #include "debug.h"
113335@@ -1129,7 +1130,7 @@ struct ieee80211_local {
113336 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
113337 spinlock_t queue_stop_reason_lock;
113338
113339- int open_count;
113340+ local_t open_count;
113341 int monitors, cooked_mntrs;
113342 /* number of interfaces with corresponding FIF_ flags */
113343 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
113344diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
113345index 81a2751..c06a026 100644
113346--- a/net/mac80211/iface.c
113347+++ b/net/mac80211/iface.c
113348@@ -544,7 +544,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113349 break;
113350 }
113351
113352- if (local->open_count == 0) {
113353+ if (local_read(&local->open_count) == 0) {
113354 res = drv_start(local);
113355 if (res)
113356 goto err_del_bss;
113357@@ -591,7 +591,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113358 res = drv_add_interface(local, sdata);
113359 if (res)
113360 goto err_stop;
113361- } else if (local->monitors == 0 && local->open_count == 0) {
113362+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
113363 res = ieee80211_add_virtual_monitor(local);
113364 if (res)
113365 goto err_stop;
113366@@ -701,7 +701,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113367 atomic_inc(&local->iff_promiscs);
113368
113369 if (coming_up)
113370- local->open_count++;
113371+ local_inc(&local->open_count);
113372
113373 if (hw_reconf_flags)
113374 ieee80211_hw_config(local, hw_reconf_flags);
113375@@ -739,7 +739,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113376 err_del_interface:
113377 drv_remove_interface(local, sdata);
113378 err_stop:
113379- if (!local->open_count)
113380+ if (!local_read(&local->open_count))
113381 drv_stop(local);
113382 err_del_bss:
113383 sdata->bss = NULL;
113384@@ -907,7 +907,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113385 }
113386
113387 if (going_down)
113388- local->open_count--;
113389+ local_dec(&local->open_count);
113390
113391 switch (sdata->vif.type) {
113392 case NL80211_IFTYPE_AP_VLAN:
113393@@ -969,7 +969,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113394 }
113395 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
113396
113397- if (local->open_count == 0)
113398+ if (local_read(&local->open_count) == 0)
113399 ieee80211_clear_tx_pending(local);
113400
113401 /*
113402@@ -1012,7 +1012,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113403 if (cancel_scan)
113404 flush_delayed_work(&local->scan_work);
113405
113406- if (local->open_count == 0) {
113407+ if (local_read(&local->open_count) == 0) {
113408 ieee80211_stop_device(local);
113409
113410 /* no reconfiguring after stop! */
113411@@ -1023,7 +1023,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113412 ieee80211_configure_filter(local);
113413 ieee80211_hw_config(local, hw_reconf_flags);
113414
113415- if (local->monitors == local->open_count)
113416+ if (local->monitors == local_read(&local->open_count))
113417 ieee80211_add_virtual_monitor(local);
113418 }
113419
113420diff --git a/net/mac80211/main.c b/net/mac80211/main.c
113421index 5e09d35..e2fdbe2 100644
113422--- a/net/mac80211/main.c
113423+++ b/net/mac80211/main.c
113424@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
113425 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
113426 IEEE80211_CONF_CHANGE_POWER);
113427
113428- if (changed && local->open_count) {
113429+ if (changed && local_read(&local->open_count)) {
113430 ret = drv_config(local, changed);
113431 /*
113432 * Goal:
113433diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
113434index ca405b6..6cc8bee 100644
113435--- a/net/mac80211/pm.c
113436+++ b/net/mac80211/pm.c
113437@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113438 struct ieee80211_sub_if_data *sdata;
113439 struct sta_info *sta;
113440
113441- if (!local->open_count)
113442+ if (!local_read(&local->open_count))
113443 goto suspend;
113444
113445 ieee80211_scan_cancel(local);
113446@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113447 cancel_work_sync(&local->dynamic_ps_enable_work);
113448 del_timer_sync(&local->dynamic_ps_timer);
113449
113450- local->wowlan = wowlan && local->open_count;
113451+ local->wowlan = wowlan && local_read(&local->open_count);
113452 if (local->wowlan) {
113453 int err = drv_suspend(local, wowlan);
113454 if (err < 0) {
113455@@ -126,7 +126,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113456 WARN_ON(!list_empty(&local->chanctx_list));
113457
113458 /* stop hardware - this must stop RX */
113459- if (local->open_count)
113460+ if (local_read(&local->open_count))
113461 ieee80211_stop_device(local);
113462
113463 suspend:
113464diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
113465index d53355b..21f583a 100644
113466--- a/net/mac80211/rate.c
113467+++ b/net/mac80211/rate.c
113468@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
113469
113470 ASSERT_RTNL();
113471
113472- if (local->open_count)
113473+ if (local_read(&local->open_count))
113474 return -EBUSY;
113475
113476 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
113477diff --git a/net/mac80211/util.c b/net/mac80211/util.c
113478index 747bdcf..eb2b981 100644
113479--- a/net/mac80211/util.c
113480+++ b/net/mac80211/util.c
113481@@ -1741,7 +1741,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113482 bool sched_scan_stopped = false;
113483
113484 /* nothing to do if HW shouldn't run */
113485- if (!local->open_count)
113486+ if (!local_read(&local->open_count))
113487 goto wake_up;
113488
113489 #ifdef CONFIG_PM
113490@@ -1993,7 +1993,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113491 local->in_reconfig = false;
113492 barrier();
113493
113494- if (local->monitors == local->open_count && local->monitors > 0)
113495+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
113496 ieee80211_add_virtual_monitor(local);
113497
113498 /*
113499@@ -2048,7 +2048,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113500 * If this is for hw restart things are still running.
113501 * We may want to change that later, however.
113502 */
113503- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
113504+ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
113505 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
113506
113507 if (!local->suspended)
113508@@ -2072,7 +2072,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113509 flush_delayed_work(&local->scan_work);
113510 }
113511
113512- if (local->open_count && !reconfig_due_to_wowlan)
113513+ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
113514 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
113515
113516 list_for_each_entry(sdata, &local->interfaces, list) {
113517diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
113518index b02660f..c0f791c 100644
113519--- a/net/netfilter/Kconfig
113520+++ b/net/netfilter/Kconfig
113521@@ -1122,6 +1122,16 @@ config NETFILTER_XT_MATCH_ESP
113522
113523 To compile it as a module, choose M here. If unsure, say N.
113524
113525+config NETFILTER_XT_MATCH_GRADM
113526+ tristate '"gradm" match support'
113527+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
113528+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
113529+ ---help---
113530+ The gradm match allows to match on grsecurity RBAC being enabled.
113531+ It is useful when iptables rules are applied early on bootup to
113532+ prevent connections to the machine (except from a trusted host)
113533+ while the RBAC system is disabled.
113534+
113535 config NETFILTER_XT_MATCH_HASHLIMIT
113536 tristate '"hashlimit" match support'
113537 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
113538diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
113539index 89f73a9..e4e5bd9 100644
113540--- a/net/netfilter/Makefile
113541+++ b/net/netfilter/Makefile
113542@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
113543 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
113544 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
113545 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
113546+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
113547 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
113548 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
113549 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
113550diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
113551index d259da3..6a32b2c 100644
113552--- a/net/netfilter/ipset/ip_set_core.c
113553+++ b/net/netfilter/ipset/ip_set_core.c
113554@@ -1952,7 +1952,7 @@ done:
113555 return ret;
113556 }
113557
113558-static struct nf_sockopt_ops so_set __read_mostly = {
113559+static struct nf_sockopt_ops so_set = {
113560 .pf = PF_INET,
113561 .get_optmin = SO_IP_SET,
113562 .get_optmax = SO_IP_SET + 1,
113563diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
113564index b0f7b62..0541842 100644
113565--- a/net/netfilter/ipvs/ip_vs_conn.c
113566+++ b/net/netfilter/ipvs/ip_vs_conn.c
113567@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
113568 /* Increase the refcnt counter of the dest */
113569 ip_vs_dest_hold(dest);
113570
113571- conn_flags = atomic_read(&dest->conn_flags);
113572+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
113573 if (cp->protocol != IPPROTO_UDP)
113574 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
113575 flags = cp->flags;
113576@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
113577
113578 cp->control = NULL;
113579 atomic_set(&cp->n_control, 0);
113580- atomic_set(&cp->in_pkts, 0);
113581+ atomic_set_unchecked(&cp->in_pkts, 0);
113582
113583 cp->packet_xmit = NULL;
113584 cp->app = NULL;
113585@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
113586
113587 /* Don't drop the entry if its number of incoming packets is not
113588 located in [0, 8] */
113589- i = atomic_read(&cp->in_pkts);
113590+ i = atomic_read_unchecked(&cp->in_pkts);
113591 if (i > 8 || i < 0) return 0;
113592
113593 if (!todrop_rate[i]) return 0;
113594diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
113595index b87ca32..76c7799 100644
113596--- a/net/netfilter/ipvs/ip_vs_core.c
113597+++ b/net/netfilter/ipvs/ip_vs_core.c
113598@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
113599 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
113600 /* do not touch skb anymore */
113601
113602- atomic_inc(&cp->in_pkts);
113603+ atomic_inc_unchecked(&cp->in_pkts);
113604 ip_vs_conn_put(cp);
113605 return ret;
113606 }
113607@@ -1723,7 +1723,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
113608 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
113609 pkts = sysctl_sync_threshold(ipvs);
113610 else
113611- pkts = atomic_add_return(1, &cp->in_pkts);
113612+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113613
113614 if (ipvs->sync_state & IP_VS_STATE_MASTER)
113615 ip_vs_sync_conn(net, cp, pkts);
113616diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
113617index ed99448..3ba6cad 100644
113618--- a/net/netfilter/ipvs/ip_vs_ctl.c
113619+++ b/net/netfilter/ipvs/ip_vs_ctl.c
113620@@ -799,7 +799,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
113621 */
113622 ip_vs_rs_hash(ipvs, dest);
113623 }
113624- atomic_set(&dest->conn_flags, conn_flags);
113625+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
113626
113627 /* bind the service */
113628 old_svc = rcu_dereference_protected(dest->svc, 1);
113629@@ -1664,7 +1664,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
113630 * align with netns init in ip_vs_control_net_init()
113631 */
113632
113633-static struct ctl_table vs_vars[] = {
113634+static ctl_table_no_const vs_vars[] __read_only = {
113635 {
113636 .procname = "amemthresh",
113637 .maxlen = sizeof(int),
113638@@ -1999,7 +1999,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
113639 " %-7s %-6d %-10d %-10d\n",
113640 &dest->addr.in6,
113641 ntohs(dest->port),
113642- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
113643+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
113644 atomic_read(&dest->weight),
113645 atomic_read(&dest->activeconns),
113646 atomic_read(&dest->inactconns));
113647@@ -2010,7 +2010,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
113648 "%-7s %-6d %-10d %-10d\n",
113649 ntohl(dest->addr.ip),
113650 ntohs(dest->port),
113651- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
113652+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
113653 atomic_read(&dest->weight),
113654 atomic_read(&dest->activeconns),
113655 atomic_read(&dest->inactconns));
113656@@ -2499,7 +2499,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
113657
113658 entry.addr = dest->addr.ip;
113659 entry.port = dest->port;
113660- entry.conn_flags = atomic_read(&dest->conn_flags);
113661+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
113662 entry.weight = atomic_read(&dest->weight);
113663 entry.u_threshold = dest->u_threshold;
113664 entry.l_threshold = dest->l_threshold;
113665@@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
113666 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
113667 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
113668 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
113669- (atomic_read(&dest->conn_flags) &
113670+ (atomic_read_unchecked(&dest->conn_flags) &
113671 IP_VS_CONN_F_FWD_MASK)) ||
113672 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
113673 atomic_read(&dest->weight)) ||
113674@@ -3675,7 +3675,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
113675 {
113676 int idx;
113677 struct netns_ipvs *ipvs = net_ipvs(net);
113678- struct ctl_table *tbl;
113679+ ctl_table_no_const *tbl;
113680
113681 atomic_set(&ipvs->dropentry, 0);
113682 spin_lock_init(&ipvs->dropentry_lock);
113683diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
113684index 127f140..553d652 100644
113685--- a/net/netfilter/ipvs/ip_vs_lblc.c
113686+++ b/net/netfilter/ipvs/ip_vs_lblc.c
113687@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
113688 * IPVS LBLC sysctl table
113689 */
113690 #ifdef CONFIG_SYSCTL
113691-static struct ctl_table vs_vars_table[] = {
113692+static ctl_table_no_const vs_vars_table[] __read_only = {
113693 {
113694 .procname = "lblc_expiration",
113695 .data = NULL,
113696diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
113697index 2229d2d..b32b785 100644
113698--- a/net/netfilter/ipvs/ip_vs_lblcr.c
113699+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
113700@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
113701 * IPVS LBLCR sysctl table
113702 */
113703
113704-static struct ctl_table vs_vars_table[] = {
113705+static ctl_table_no_const vs_vars_table[] __read_only = {
113706 {
113707 .procname = "lblcr_expiration",
113708 .data = NULL,
113709diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
113710index d93ceeb..4556144 100644
113711--- a/net/netfilter/ipvs/ip_vs_sync.c
113712+++ b/net/netfilter/ipvs/ip_vs_sync.c
113713@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
113714 cp = cp->control;
113715 if (cp) {
113716 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
113717- pkts = atomic_add_return(1, &cp->in_pkts);
113718+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113719 else
113720 pkts = sysctl_sync_threshold(ipvs);
113721 ip_vs_sync_conn(net, cp->control, pkts);
113722@@ -771,7 +771,7 @@ control:
113723 if (!cp)
113724 return;
113725 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
113726- pkts = atomic_add_return(1, &cp->in_pkts);
113727+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113728 else
113729 pkts = sysctl_sync_threshold(ipvs);
113730 goto sloop;
113731@@ -902,7 +902,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
113732
113733 if (opt)
113734 memcpy(&cp->in_seq, opt, sizeof(*opt));
113735- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
113736+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
113737 cp->state = state;
113738 cp->old_state = cp->state;
113739 /*
113740diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
113741index 3aedbda..6a63567 100644
113742--- a/net/netfilter/ipvs/ip_vs_xmit.c
113743+++ b/net/netfilter/ipvs/ip_vs_xmit.c
113744@@ -1214,7 +1214,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
113745 else
113746 rc = NF_ACCEPT;
113747 /* do not touch skb anymore */
113748- atomic_inc(&cp->in_pkts);
113749+ atomic_inc_unchecked(&cp->in_pkts);
113750 goto out;
113751 }
113752
113753@@ -1307,7 +1307,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
113754 else
113755 rc = NF_ACCEPT;
113756 /* do not touch skb anymore */
113757- atomic_inc(&cp->in_pkts);
113758+ atomic_inc_unchecked(&cp->in_pkts);
113759 goto out;
113760 }
113761
113762diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
113763index a4b5e2a..13b1de3 100644
113764--- a/net/netfilter/nf_conntrack_acct.c
113765+++ b/net/netfilter/nf_conntrack_acct.c
113766@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
113767 #ifdef CONFIG_SYSCTL
113768 static int nf_conntrack_acct_init_sysctl(struct net *net)
113769 {
113770- struct ctl_table *table;
113771+ ctl_table_no_const *table;
113772
113773 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
113774 GFP_KERNEL);
113775diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
113776index 13fad86..18c984c 100644
113777--- a/net/netfilter/nf_conntrack_core.c
113778+++ b/net/netfilter/nf_conntrack_core.c
113779@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
113780 #define DYING_NULLS_VAL ((1<<30)+1)
113781 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
113782
113783+#ifdef CONFIG_GRKERNSEC_HIDESYM
113784+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
113785+#endif
113786+
113787 int nf_conntrack_init_net(struct net *net)
113788 {
113789 int ret = -ENOMEM;
113790@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
113791 if (!net->ct.stat)
113792 goto err_pcpu_lists;
113793
113794+#ifdef CONFIG_GRKERNSEC_HIDESYM
113795+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
113796+#else
113797 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
113798+#endif
113799 if (!net->ct.slabname)
113800 goto err_slabname;
113801
113802diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
113803index 4e78c57..ec8fb74 100644
113804--- a/net/netfilter/nf_conntrack_ecache.c
113805+++ b/net/netfilter/nf_conntrack_ecache.c
113806@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
113807 #ifdef CONFIG_SYSCTL
113808 static int nf_conntrack_event_init_sysctl(struct net *net)
113809 {
113810- struct ctl_table *table;
113811+ ctl_table_no_const *table;
113812
113813 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
113814 GFP_KERNEL);
113815diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
113816index bd9d315..989947e 100644
113817--- a/net/netfilter/nf_conntrack_helper.c
113818+++ b/net/netfilter/nf_conntrack_helper.c
113819@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
113820
113821 static int nf_conntrack_helper_init_sysctl(struct net *net)
113822 {
113823- struct ctl_table *table;
113824+ ctl_table_no_const *table;
113825
113826 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
113827 GFP_KERNEL);
113828diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
113829index b65d586..beec902 100644
113830--- a/net/netfilter/nf_conntrack_proto.c
113831+++ b/net/netfilter/nf_conntrack_proto.c
113832@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
113833
113834 static void
113835 nf_ct_unregister_sysctl(struct ctl_table_header **header,
113836- struct ctl_table **table,
113837+ ctl_table_no_const **table,
113838 unsigned int users)
113839 {
113840 if (users > 0)
113841diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
113842index fc823fa..8311af3 100644
113843--- a/net/netfilter/nf_conntrack_standalone.c
113844+++ b/net/netfilter/nf_conntrack_standalone.c
113845@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
113846
113847 static int nf_conntrack_standalone_init_sysctl(struct net *net)
113848 {
113849- struct ctl_table *table;
113850+ ctl_table_no_const *table;
113851
113852 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
113853 GFP_KERNEL);
113854diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
113855index 7a394df..bd91a8a 100644
113856--- a/net/netfilter/nf_conntrack_timestamp.c
113857+++ b/net/netfilter/nf_conntrack_timestamp.c
113858@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
113859 #ifdef CONFIG_SYSCTL
113860 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
113861 {
113862- struct ctl_table *table;
113863+ ctl_table_no_const *table;
113864
113865 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
113866 GFP_KERNEL);
113867diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
113868index 675d12c..b36e825 100644
113869--- a/net/netfilter/nf_log.c
113870+++ b/net/netfilter/nf_log.c
113871@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
113872
113873 #ifdef CONFIG_SYSCTL
113874 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
113875-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
113876+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
113877
113878 static int nf_log_proc_dostring(struct ctl_table *table, int write,
113879 void __user *buffer, size_t *lenp, loff_t *ppos)
113880@@ -417,13 +417,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
113881 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
113882 mutex_unlock(&nf_log_mutex);
113883 } else {
113884+ ctl_table_no_const nf_log_table = *table;
113885+
113886 mutex_lock(&nf_log_mutex);
113887 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
113888 if (!logger)
113889- table->data = "NONE";
113890+ nf_log_table.data = "NONE";
113891 else
113892- table->data = logger->name;
113893- r = proc_dostring(table, write, buffer, lenp, ppos);
113894+ nf_log_table.data = logger->name;
113895+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
113896 mutex_unlock(&nf_log_mutex);
113897 }
113898
113899diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
113900index c68c1e5..8b5d670 100644
113901--- a/net/netfilter/nf_sockopt.c
113902+++ b/net/netfilter/nf_sockopt.c
113903@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
113904 }
113905 }
113906
113907- list_add(&reg->list, &nf_sockopts);
113908+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
113909 out:
113910 mutex_unlock(&nf_sockopt_mutex);
113911 return ret;
113912@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
113913 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
113914 {
113915 mutex_lock(&nf_sockopt_mutex);
113916- list_del(&reg->list);
113917+ pax_list_del((struct list_head *)&reg->list);
113918 mutex_unlock(&nf_sockopt_mutex);
113919 }
113920 EXPORT_SYMBOL(nf_unregister_sockopt);
113921diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
113922index 11d85b3..7fcc420 100644
113923--- a/net/netfilter/nfnetlink_log.c
113924+++ b/net/netfilter/nfnetlink_log.c
113925@@ -83,7 +83,7 @@ static int nfnl_log_net_id __read_mostly;
113926 struct nfnl_log_net {
113927 spinlock_t instances_lock;
113928 struct hlist_head instance_table[INSTANCE_BUCKETS];
113929- atomic_t global_seq;
113930+ atomic_unchecked_t global_seq;
113931 };
113932
113933 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
113934@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
113935 /* global sequence number */
113936 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
113937 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
113938- htonl(atomic_inc_return(&log->global_seq))))
113939+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
113940 goto nla_put_failure;
113941
113942 if (data_len) {
113943diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
113944index 65f3e2b..2e9d6a0 100644
113945--- a/net/netfilter/nft_compat.c
113946+++ b/net/netfilter/nft_compat.c
113947@@ -317,14 +317,7 @@ static void nft_match_eval(const struct nft_expr *expr,
113948 return;
113949 }
113950
113951- switch(ret) {
113952- case true:
113953- data[NFT_REG_VERDICT].verdict = NFT_CONTINUE;
113954- break;
113955- case false:
113956- data[NFT_REG_VERDICT].verdict = NFT_BREAK;
113957- break;
113958- }
113959+ data[NFT_REG_VERDICT].verdict = ret ? NFT_CONTINUE : NFT_BREAK;
113960 }
113961
113962 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
113963diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
113964new file mode 100644
113965index 0000000..c566332
113966--- /dev/null
113967+++ b/net/netfilter/xt_gradm.c
113968@@ -0,0 +1,51 @@
113969+/*
113970+ * gradm match for netfilter
113971